diff options
| -rw-r--r-- | locale/de/LC_MESSAGES/django.po | 1709 | ||||
| -rw-r--r-- | locale/es/LC_MESSAGES/django.po | 1695 | ||||
| -rw-r--r-- | locale/fr/LC_MESSAGES/django.po | 1718 | ||||
| -rw-r--r-- | locale/pt/LC_MESSAGES/django.po | 1695 |
4 files changed, 4515 insertions, 2302 deletions
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 9d975fdbe..854d74123 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: 2026-01-14 18:22+0100\n" +"POT-Creation-Date: 2026-02-18 15:49+0100\n" "PO-Revision-Date: 2019-11-01 18:52+0000\n" "Last-Translator: Valérie-Emma Leroux <valerie-emma.leroux@iggdrasil.net>\n" "Language-Team: German <http://translate.iggdrasil.net/projects/ishtar/wip-" @@ -24,6 +24,7 @@ msgstr "" #: archaeological_context_records/models.py:580 #: archaeological_context_records/models.py:882 #: archaeological_context_records/templates/ishtar/forms/qa_contextrecord_duplicate.html:12 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:228 #: archaeological_context_records/wizards.py:85 #: archaeological_finds/models_finds.py:1317 #: archaeological_finds/models_finds.py:2960 @@ -42,8 +43,11 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:246 #: archaeological_operations/wizards.py:258 -#: archaeological_warehouse/models.py:884 ishtar_common/forms_common.py:2593 -#: ishtar_common/models.py:6244 ishtar_common/views.py:603 +#: archaeological_warehouse/models.py:884 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:249 +#: ishtar_common/forms_common.py:2593 ishtar_common/models.py:6244 +#: ishtar_common/views.py:603 na_app/templates/ishtar/sheet_operation.html:4 +#: pdl_app/templates/ishtar/sheet_operation.html:4 msgid "Operation" msgstr "" @@ -106,7 +110,7 @@ msgid "ID" msgstr "" #: archaeological_context_records/forms.py:144 archaeological_files/forms.py:88 -#: archaeological_files/models.py:460 archaeological_finds/models_finds.py:1320 +#: archaeological_files/models.py:562 archaeological_finds/models_finds.py:1320 #: archaeological_operations/models.py:387 #: archaeological_operations/models.py:1165 #: archaeological_warehouse/forms.py:155 ishtar_common/admin.py:1736 @@ -185,13 +189,27 @@ msgstr "" #: ishtar_common/templates/ishtar/merge_organization.html:21 #: ishtar_common/templates/ishtar/sheet_organization.html:30 #: ishtar_common/templates/ishtar/sheet_organization.html:57 +#: man_app/templates/ishtar/sheet_find_treatments.html:120 +#: man_app/templates/ishtar/sheet_find_treatments.html:158 +#: man_app/templates/ishtar/sheet_find_treatments.html:243 +#: na_app/templates/ishtar/sheet_find.html:445 +#: na_app/templates/ishtar/sheet_find.html:483 +#: na_app/templates/ishtar/sheet_find.html:521 +#: na_app/templates/ishtar/sheet_operation.html:554 +#: na_app/templates/ishtar/sheet_operation.html:618 +#: pdl_app/templates/ishtar/sheet_find.html:438 +#: pdl_app/templates/ishtar/sheet_find.html:476 +#: pdl_app/templates/ishtar/sheet_find.html:514 +#: pdl_app/templates/ishtar/sheet_operation.html:571 +#: pdl_app/templates/ishtar/sheet_operation.html:635 msgid "Type" msgstr "" #: archaeological_context_records/forms.py:167 #: archaeological_context_records/forms.py:338 #: archaeological_context_records/models.py:898 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:137 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:136 msgid "Excavator" msgstr "" @@ -199,8 +217,10 @@ msgstr "" #: archaeological_context_records/forms.py:551 #: archaeological_context_records/forms.py:817 #: archaeological_context_records/models.py:583 -#: archaeological_context_records/models.py:982 ishtar_common/admin.py:1063 -#: ishtar_common/models.py:3533 +#: archaeological_context_records/models.py:982 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:174 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:182 +#: ishtar_common/admin.py:1063 ishtar_common/models.py:3533 msgid "Activity" msgstr "" @@ -209,14 +229,21 @@ msgstr "" #: archaeological_context_records/forms.py:818 #: archaeological_context_records/models.py:582 #: archaeological_context_records/models.py:974 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:175 #: archaeological_finds/forms.py:390 archaeological_finds/forms.py:781 #: archaeological_finds/forms.py:1021 archaeological_finds/forms.py:1022 #: archaeological_finds/templates/ishtar/sheet_find.html:99 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:99 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:183 +#: cd17_app/templates/ishtar/sheet_find.html:107 #: ishtar_common/forms_common.py:2283 #: ishtar_common/templates/ishtar/organization_person_form.html:9 #: ishtar_common/templates/ishtar/person_form.html:9 #: ishtar_common/templates/ishtar/sheet_document.html:34 +#: man_app/templates/ishtar/sheet_museum_find.html:100 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:138 +#: na_app/templates/ishtar/sheet_find.html:157 +#: pdl_app/templates/ishtar/sheet_find.html:145 msgid "Identification" msgstr "" @@ -242,7 +269,7 @@ msgstr "" #: archaeological_context_records/forms.py:367 #: archaeological_context_records/models.py:895 #: archaeological_context_records/models.py:1583 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:143 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:134 #: archaeological_finds/forms.py:453 archaeological_finds/forms.py:458 #: archaeological_finds/forms.py:621 archaeological_finds/forms.py:788 #: archaeological_finds/forms.py:790 archaeological_finds/forms.py:1024 @@ -260,11 +287,17 @@ msgstr "" #: archaeological_operations/forms.py:1336 #: archaeological_operations/models.py:662 #: archaeological_operations/templates/ishtar/sheet_site.html:57 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:142 +#: cd17_app/templates/ishtar/sheet_find.html:125 #: ishtar_common/forms_common.py:2226 ishtar_common/forms_common.py:2517 #: ishtar_common/models.py:1094 ishtar_common/models.py:5305 #: ishtar_common/models_imports.py:165 ishtar_common/models_imports.py:446 #: ishtar_common/models_imports.py:714 ishtar_common/models_imports.py:814 #: ishtar_common/models_imports.py:833 +#: man_app/templates/ishtar/sheet_museum_find.html:118 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:156 +#: na_app/templates/ishtar/sheet_find.html:179 +#: pdl_app/templates/ishtar/sheet_find.html:172 msgid "Description" msgstr "" @@ -275,6 +308,11 @@ msgstr "" #: archaeological_finds/models_finds.py:2302 #: archaeological_finds/templates/ishtar/sheet_find.html:142 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:142 +#: cd17_app/templates/ishtar/sheet_find.html:150 +#: man_app/templates/ishtar/sheet_museum_find.html:143 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:181 +#: na_app/templates/ishtar/sheet_find.html:204 +#: pdl_app/templates/ishtar/sheet_find.html:197 msgid "General comment" msgstr "" @@ -288,8 +326,10 @@ msgstr "" #: archaeological_context_records/forms.py:538 #: archaeological_context_records/forms.py:549 #: archaeological_context_records/models.py:937 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:49 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:205 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:172 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:176 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:180 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:184 msgid "Interpretation" msgstr "" @@ -301,7 +341,7 @@ msgstr "" #: archaeological_context_records/models.py:570 #: archaeological_context_records/models.py:866 #: archaeological_context_records/models.py:1582 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:119 #: archaeological_files/forms.py:89 archaeological_files/forms.py:1147 #: archaeological_finds/models_finds.py:1275 #: archaeological_operations/forms.py:502 @@ -310,6 +350,7 @@ msgstr "" #: archaeological_operations/models.py:3507 #: archaeological_operations/models.py:3817 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:124 msgid "Parcel" msgstr "" @@ -332,13 +373,15 @@ msgstr "" #: archaeological_context_records/forms.py:187 #: archaeological_context_records/forms.py:370 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:149 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:140 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:148 msgid "Structure" msgstr "" #: archaeological_context_records/forms.py:188 #: archaeological_context_records/forms.py:376 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:150 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:141 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:149 msgid "Texture" msgstr "" @@ -351,14 +394,16 @@ msgstr "" #: archaeological_context_records/forms.py:190 #: archaeological_context_records/forms.py:388 #: archaeological_context_records/forms.py:821 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:152 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:143 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:151 msgid "Colors" msgstr "" #: archaeological_context_records/forms.py:191 #: archaeological_context_records/forms.py:393 #: archaeological_context_records/models.py:925 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:153 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:144 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:152 msgid "Details on color" msgstr "" @@ -383,10 +428,14 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:40 #: archaeological_warehouse/templates/ishtar/sheet_container.html:28 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:24 +#: cd93_app/templates/ishtar/sheet_administrativeact.html:40 #: ishtar_common/templates/ishtar/sheet_area.html:30 #: ishtar_common/templates/ishtar/sheet_import_gen.html:18 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:20 #: ishtar_common/templates/ishtar/sheet_town.html:33 +#: na_app/templates/ishtar/sheet_container.html:28 +#: na_app/templates/ishtar/sheet_operation.html:45 +#: pdl_app/templates/ishtar/sheet_operation.html:45 msgid "General" msgstr "" @@ -409,7 +458,7 @@ msgstr "" #: archaeological_warehouse/forms.py:154 archaeological_warehouse/models.py:299 #: ishtar_common/forms_common.py:98 ishtar_common/forms_common.py:120 #: ishtar_common/models.py:2741 ishtar_common/models.py:3006 -#: ishtar_common/models_common.py:3665 ishtar_common/models_common.py:4725 +#: ishtar_common/models_common.py:3675 ishtar_common/models_common.py:4735 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 #: ishtar_common/templates/ishtar/sheet_person.html:58 #: ishtar_common/templates/ishtar/sheet_person.html:78 @@ -439,12 +488,15 @@ msgstr "" #: archaeological_context_records/forms.py:358 #: archaeological_context_records/models.py:902 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:258 -#: archaeological_files/models.py:715 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:239 +#: archaeological_files/models.py:817 #: archaeological_files/templates/ishtar/sheet_file.html:78 #: archaeological_operations/models.py:1553 #: archaeological_operations/templates/ishtar/sheet_operation.html:211 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:260 #: ishtar_common/forms.py:1184 ishtar_common/forms.py:1185 +#: na_app/templates/ishtar/sheet_operation.html:208 +#: pdl_app/templates/ishtar/sheet_operation.html:211 msgid "Closing date" msgstr "" @@ -455,20 +507,27 @@ msgstr "" #: archaeological_finds/models_treatments.py:398 #: archaeological_finds/models_treatments.py:1050 #: archaeological_warehouse/templates/ishtar/sheet_container.html:94 +#: na_app/templates/ishtar/sheet_container.html:101 msgid "Location" msgstr "" #: archaeological_context_records/forms.py:394 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:159 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:150 #: archaeological_finds/forms.py:526 archaeological_finds/forms.py:837 #: archaeological_finds/forms.py:1656 #: archaeological_finds/templates/ishtar/sheet_find.html:184 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:184 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:158 +#: cd17_app/templates/ishtar/sheet_find.html:192 +#: man_app/templates/ishtar/sheet_museum_find.html:186 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:223 +#: na_app/templates/ishtar/sheet_find.html:208 +#: pdl_app/templates/ishtar/sheet_find.html:201 msgid "Dimensions" msgstr "" #: archaeological_context_records/forms.py:398 -#: archaeological_files/forms.py:312 archaeological_files/models.py:752 +#: archaeological_files/forms.py:312 archaeological_files/models.py:854 msgid "Total surface (m²)" msgstr "" @@ -479,7 +538,8 @@ msgstr "" #: archaeological_context_records/forms.py:405 #: archaeological_context_records/models.py:904 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:170 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:161 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:169 msgid "Excavated length (m)" msgstr "" @@ -490,7 +550,8 @@ msgstr "" #: archaeological_context_records/forms.py:407 #: archaeological_context_records/models.py:906 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:172 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:163 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:171 msgid "Excavated width (m)" msgstr "" @@ -527,8 +588,13 @@ msgstr "" #: archaeological_context_records/models.py:157 #: archaeological_finds/forms.py:1593 archaeological_finds/forms.py:1614 #: archaeological_finds/models_finds.py:2212 -#: archaeological_finds/templates/ishtar/sheet_find.html:204 +#: archaeological_finds/templates/ishtar/sheet_find.html:207 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:204 +#: cd17_app/templates/ishtar/sheet_find.html:215 +#: man_app/templates/ishtar/sheet_museum_find.html:206 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:243 +#: na_app/templates/ishtar/sheet_find.html:259 +#: pdl_app/templates/ishtar/sheet_find.html:252 msgid "Dating" msgstr "" @@ -537,19 +603,26 @@ msgstr "" #: archaeological_context_records/models.py:581 #: archaeological_finds/forms.py:1183 archaeological_finds/forms.py:1600 #: archaeological_finds/models_finds.py:1326 -#: archaeological_finds/templates/ishtar/sheet_find.html:213 +#: archaeological_finds/templates/ishtar/sheet_find.html:216 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:213 #: archaeological_operations/forms.py:797 #: archaeological_operations/templates/ishtar/sheet_operation.html:559 #: archaeological_operations/templates/ishtar/sheet_operation.html:597 +#: cd17_app/templates/ishtar/sheet_find.html:224 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:4 +#: man_app/templates/ishtar/sheet_museum_find.html:215 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:252 +#: na_app/templates/ishtar/sheet_operation.html:564 +#: na_app/templates/ishtar/sheet_operation.html:601 +#: pdl_app/templates/ishtar/sheet_operation.html:581 +#: pdl_app/templates/ishtar/sheet_operation.html:618 msgid "Chronological period" msgstr "" #: archaeological_context_records/forms.py:517 #: archaeological_context_records/models.py:111 -#: archaeological_files/forms.py:757 archaeological_files/models.py:80 -#: archaeological_files/models.py:829 +#: archaeological_files/forms.py:757 archaeological_files/models.py:90 +#: archaeological_files/models.py:931 #: archaeological_files/templates/ishtar/sheet_file.html:200 #: archaeological_finds/forms.py:1602 #: archaeological_finds/forms_treatments.py:73 @@ -558,7 +631,7 @@ msgstr "" #: archaeological_finds/models_finds.py:3963 #: archaeological_finds/models_treatments.py:436 #: archaeological_finds/models_treatments.py:1048 -#: archaeological_finds/templates/ishtar/sheet_find.html:214 +#: archaeological_finds/templates/ishtar/sheet_find.html:217 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:67 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:105 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:214 @@ -567,14 +640,23 @@ msgstr "" #: archaeological_operations/models.py:105 #: archaeological_operations/models.py:1554 #: archaeological_operations/models.py:3821 +#: cd17_app/templates/ishtar/sheet_find.html:225 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:5 +#: man_app/templates/ishtar/sheet_find_treatments.html:125 +#: man_app/templates/ishtar/sheet_find_treatments.html:163 +#: man_app/templates/ishtar/sheet_museum_find.html:216 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:253 +#: na_app/templates/ishtar/sheet_find.html:450 +#: na_app/templates/ishtar/sheet_find.html:488 +#: pdl_app/templates/ishtar/sheet_find.html:443 +#: pdl_app/templates/ishtar/sheet_find.html:481 msgid "Start date" msgstr "" #: archaeological_context_records/forms.py:518 #: archaeological_context_records/models.py:112 #: archaeological_files/forms.py:640 archaeological_files/forms.py:762 -#: archaeological_files/models.py:81 archaeological_files/models.py:830 +#: archaeological_files/models.py:91 archaeological_files/models.py:932 #: archaeological_finds/forms.py:1603 #: archaeological_finds/forms_treatments.py:74 #: archaeological_finds/forms_treatments.py:236 @@ -584,7 +666,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:437 #: archaeological_finds/models_treatments.py:1049 #: archaeological_finds/models_treatments.py:1438 -#: archaeological_finds/templates/ishtar/sheet_find.html:215 +#: archaeological_finds/templates/ishtar/sheet_find.html:218 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:68 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:106 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:191 @@ -592,17 +674,32 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:90 #: archaeological_operations/models.py:106 #: archaeological_operations/models.py:3822 +#: cd17_app/templates/ishtar/sheet_find.html:226 #: ishtar_common/models_imports.py:1448 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:6 +#: man_app/templates/ishtar/sheet_find_treatments.html:126 +#: man_app/templates/ishtar/sheet_find_treatments.html:164 +#: man_app/templates/ishtar/sheet_find_treatments.html:249 +#: man_app/templates/ishtar/sheet_museum_find.html:217 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:254 +#: na_app/templates/ishtar/sheet_find.html:451 +#: na_app/templates/ishtar/sheet_find.html:489 +#: na_app/templates/ishtar/sheet_find.html:527 +#: pdl_app/templates/ishtar/sheet_find.html:444 +#: pdl_app/templates/ishtar/sheet_find.html:482 +#: pdl_app/templates/ishtar/sheet_find.html:520 msgid "End date" msgstr "" #: archaeological_context_records/forms.py:519 #: archaeological_context_records/models.py:122 #: archaeological_finds/forms.py:1604 -#: archaeological_finds/templates/ishtar/sheet_find.html:217 +#: archaeological_finds/templates/ishtar/sheet_find.html:220 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:217 +#: cd17_app/templates/ishtar/sheet_find.html:228 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:8 +#: man_app/templates/ishtar/sheet_museum_find.html:219 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:256 msgid "Quality" msgstr "" @@ -610,18 +707,24 @@ msgstr "" #: archaeological_context_records/models.py:84 #: archaeological_context_records/models.py:115 #: archaeological_finds/forms.py:1601 -#: archaeological_finds/templates/ishtar/sheet_find.html:216 +#: archaeological_finds/templates/ishtar/sheet_find.html:219 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:216 +#: cd17_app/templates/ishtar/sheet_find.html:227 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:7 +#: man_app/templates/ishtar/sheet_museum_find.html:218 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:255 msgid "Dating type" msgstr "" #: archaeological_context_records/forms.py:521 #: archaeological_context_records/models.py:127 #: archaeological_finds/forms.py:1605 -#: archaeological_finds/templates/ishtar/sheet_find.html:218 +#: archaeological_finds/templates/ishtar/sheet_find.html:221 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:218 +#: cd17_app/templates/ishtar/sheet_find.html:229 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:9 +#: man_app/templates/ishtar/sheet_museum_find.html:220 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:257 msgid "Precise on this dating" msgstr "" @@ -634,7 +737,8 @@ msgid "Context record - 040 - Interpretation" msgstr "" #: archaeological_context_records/forms.py:557 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:221 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:210 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:231 msgid "Dating complements" msgstr "" @@ -862,8 +966,8 @@ msgid "Dating quality types" msgstr "" #: archaeological_context_records/models.py:131 -#: archaeological_context_records/tests.py:938 -#: archaeological_finds/tests.py:1571 archaeological_finds/tests.py:1800 +#: archaeological_context_records/tests.py:998 +#: archaeological_finds/tests.py:1611 archaeological_finds/tests.py:1840 msgctxt "key for text search" msgid "datings-period" msgstr "" @@ -907,16 +1011,20 @@ msgstr "" #: archaeological_finds/models_treatments.py:1030 #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:4 +#: cd17_app/templates/ishtar/sheet_find.html:4 #: ishtar_common/forms_common.py:2627 ishtar_common/models.py:6247 -#: ishtar_common/views.py:611 +#: ishtar_common/views.py:611 man_app/templates/ishtar/sheet_museum_find.html:4 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:4 +#: na_app/templates/ishtar/sheet_find.html:4 +#: pdl_app/templates/ishtar/sheet_find.html:4 msgid "Find" msgstr "" #: archaeological_context_records/models.py:299 #: archaeological_context_records/models.py:322 -#: archaeological_files/models.py:79 archaeological_files/models.py:109 -#: archaeological_files/models.py:183 archaeological_files/models.py:199 -#: archaeological_files/models.py:259 archaeological_finds/models_finds.py:105 +#: archaeological_files/models.py:89 archaeological_files/models.py:211 +#: archaeological_files/models.py:285 archaeological_files/models.py:301 +#: archaeological_files/models.py:361 archaeological_finds/models_finds.py:105 #: archaeological_finds/models_finds.py:119 #: archaeological_finds/models_finds.py:136 #: archaeological_finds/models_finds.py:260 @@ -935,9 +1043,9 @@ msgstr "" #: ishtar_common/models.py:772 ishtar_common/models.py:823 #: ishtar_common/models.py:1936 ishtar_common/models.py:4530 #: ishtar_common/models.py:6019 ishtar_common/models_common.py:762 -#: ishtar_common/models_common.py:2264 ishtar_common/models_common.py:2300 -#: ishtar_common/models_common.py:2317 ishtar_common/models_common.py:2334 -#: ishtar_common/models_common.py:2347 ishtar_common/models_imports.py:481 +#: ishtar_common/models_common.py:2274 ishtar_common/models_common.py:2310 +#: ishtar_common/models_common.py:2327 ishtar_common/models_common.py:2344 +#: ishtar_common/models_common.py:2357 ishtar_common/models_imports.py:481 msgid "Order" msgstr "" @@ -1083,25 +1191,25 @@ msgid "id" msgstr "" #: archaeological_context_records/models.py:638 -#: archaeological_context_records/tests.py:764 -#: archaeological_files/models.py:550 archaeological_finds/models_finds.py:1446 +#: archaeological_context_records/tests.py:824 +#: archaeological_files/models.py:652 archaeological_finds/models_finds.py:1446 #: archaeological_operations/models.py:491 #: archaeological_operations/models.py:1332 #: archaeological_operations/tests.py:3308 #: archaeological_warehouse/models.py:329 #: archaeological_warehouse/models.py:1055 ishtar_common/models.py:5064 -#: ishtar_common/models_common.py:4216 +#: ishtar_common/models_common.py:4226 msgctxt "key for text search" msgid "town" msgstr "" #: archaeological_context_records/models.py:641 -#: archaeological_files/models.py:613 archaeological_finds/models_finds.py:1466 +#: archaeological_files/models.py:715 archaeological_finds/models_finds.py:1466 #: archaeological_operations/models.py:494 #: archaeological_operations/models.py:1335 #: archaeological_warehouse/models.py:333 #: archaeological_warehouse/models.py:1059 ishtar_common/models.py:5069 -#: ishtar_common/models_common.py:4220 +#: ishtar_common/models_common.py:4230 msgctxt "key for text search" msgid "area" msgstr "" @@ -1112,8 +1220,8 @@ msgid "operation-year" msgstr "" #: archaeological_context_records/models.py:647 -#: archaeological_files/models.py:565 archaeological_finds/models_finds.py:1783 -#: archaeological_finds/tests.py:1620 +#: archaeological_files/models.py:667 archaeological_finds/models_finds.py:1783 +#: archaeological_finds/tests.py:1660 msgctxt "key for text search" msgid "operation-name" msgstr "" @@ -1156,7 +1264,7 @@ msgid "site" msgstr "" #: archaeological_context_records/models.py:668 -#: archaeological_context_records/tests.py:831 +#: archaeological_context_records/tests.py:891 #: archaeological_finds/models_finds.py:1501 msgctxt "key for text search" msgid "operation-relation-type" @@ -1174,7 +1282,7 @@ msgid "period" msgstr "" #: archaeological_context_records/models.py:676 -#: archaeological_context_records/tests.py:890 +#: archaeological_context_records/tests.py:950 msgctxt "key for text search" msgid "unit-type" msgstr "" @@ -1185,7 +1293,7 @@ msgid "activity" msgstr "" #: archaeological_context_records/models.py:682 -#: archaeological_files/models.py:553 archaeological_operations/models.py:1338 +#: archaeological_files/models.py:655 archaeological_operations/models.py:1338 #: archaeological_operations/models.py:3030 msgctxt "key for text search" msgid "parcel" @@ -1198,7 +1306,7 @@ msgid "has-finds" msgstr "" #: archaeological_context_records/models.py:689 -#: archaeological_context_records/tests.py:796 +#: archaeological_context_records/tests.py:856 msgctxt "key for text search" msgid "record-relation-type" msgstr "" @@ -1228,7 +1336,7 @@ msgid "documentation" msgstr "E-Mail-Adresse" #: archaeological_context_records/models.py:709 -#: archaeological_finds/models_finds.py:1534 archaeological_finds/tests.py:1637 +#: archaeological_finds/models_finds.py:1534 archaeological_finds/tests.py:1677 #: archaeological_operations/models.py:497 ishtar_common/models.py:4929 msgctxt "key for text search" msgid "description" @@ -1245,7 +1353,7 @@ msgid "interpretation" msgstr "" #: archaeological_context_records/models.py:721 -#: archaeological_files/models.py:596 archaeological_finds/models_finds.py:1652 +#: archaeological_files/models.py:698 archaeological_finds/models_finds.py:1652 #: archaeological_operations/models.py:506 #: archaeological_operations/models.py:1391 #: archaeological_operations/models.py:3122 @@ -1294,7 +1402,7 @@ msgid "Lock/Unlock" msgstr "" #: archaeological_context_records/models.py:812 -#: archaeological_files/models.py:633 archaeological_finds/models_finds.py:1981 +#: archaeological_files/models.py:735 archaeological_finds/models_finds.py:1981 #: archaeological_operations/models.py:597 #: archaeological_operations/models.py:1492 #: archaeological_warehouse/models.py:369 @@ -1335,7 +1443,7 @@ msgid "Duplicate" msgstr "" #: archaeological_context_records/models.py:860 -#: archaeological_files/models.py:652 archaeological_finds/models_finds.py:613 +#: archaeological_files/models.py:754 archaeological_finds/models_finds.py:613 #: archaeological_finds/models_finds.py:2142 #: archaeological_finds/models_treatments.py:431 #: archaeological_operations/models.py:3496 @@ -1345,7 +1453,7 @@ msgid "External ID" msgstr "" #: archaeological_context_records/models.py:862 -#: archaeological_files/models.py:655 archaeological_finds/models_finds.py:615 +#: archaeological_files/models.py:757 archaeological_finds/models_finds.py:615 #: archaeological_finds/models_finds.py:2144 #: archaeological_operations/models.py:3499 #: archaeological_warehouse/models.py:428 @@ -1388,8 +1496,8 @@ msgid "Estimation of a \"Terminus Post Quem\"" msgstr "" #: archaeological_context_records/models.py:996 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 -#: archaeological_files/models.py:850 archaeological_finds/models_finds.py:2435 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:83 +#: archaeological_files/models.py:952 archaeological_finds/models_finds.py:2435 #: archaeological_finds/models_treatments.py:451 #: archaeological_finds/models_treatments.py:1471 #: archaeological_finds/models_treatments.py:1718 @@ -1406,12 +1514,14 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:50 #: archaeological_warehouse/templates/ishtar/sheet_container.html:202 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:46 -#: ishtar_common/models.py:1040 ishtar_common/models.py:2544 -#: ishtar_common/models.py:4634 ishtar_common/models.py:4652 -#: ishtar_common/models.py:4681 ishtar_common/models.py:4695 -#: ishtar_common/models.py:4709 ishtar_common/models.py:4721 -#: ishtar_common/models.py:5338 ishtar_common/models.py:5348 -#: ishtar_common/models_common.py:3652 ishtar_common/models_imports.py:3087 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:86 +#: cd17_app/templates/ishtar/sheet_find.html:64 ishtar_common/models.py:1040 +#: ishtar_common/models.py:2544 ishtar_common/models.py:4634 +#: ishtar_common/models.py:4652 ishtar_common/models.py:4681 +#: ishtar_common/models.py:4695 ishtar_common/models.py:4709 +#: ishtar_common/models.py:4721 ishtar_common/models.py:5338 +#: ishtar_common/models.py:5348 ishtar_common/models_common.py:3662 +#: ishtar_common/models_imports.py:3087 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:184 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:292 @@ -1419,11 +1529,19 @@ msgstr "" #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:492 #: ishtar_common/templates/ishtar/sheet_person.html:172 #: ishtar_common/views.py:190 +#: man_app/templates/ishtar/sheet_museum_find.html:65 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:103 +#: na_app/templates/ishtar/sheet_container.html:50 +#: na_app/templates/ishtar/sheet_container.html:207 +#: na_app/templates/ishtar/sheet_find.html:63 +#: na_app/templates/ishtar/sheet_operation.html:62 +#: pdl_app/templates/ishtar/sheet_find.html:63 +#: pdl_app/templates/ishtar/sheet_operation.html:62 msgid "Documents" msgstr "" #: archaeological_context_records/models.py:1003 -#: archaeological_files/models.py:856 archaeological_finds/models_finds.py:2441 +#: archaeological_files/models.py:958 archaeological_finds/models_finds.py:2441 #: archaeological_finds/models_treatments.py:457 #: archaeological_finds/models_treatments.py:1478 #: archaeological_finds/models_treatments.py:1725 @@ -1432,7 +1550,7 @@ msgstr "" #: archaeological_operations/models.py:3247 #: archaeological_warehouse/models.py:422 #: archaeological_warehouse/models.py:1226 ishtar_common/models.py:2550 -#: ishtar_common/models_common.py:3658 +#: ishtar_common/models_common.py:3668 msgid "Main image" msgstr "" @@ -1454,7 +1572,7 @@ msgstr "" #: archaeological_operations/models.py:1769 #: archaeological_operations/models.py:1775 #: archaeological_operations/models.py:1781 -#: archaeological_operations/models.py:1787 ishtar_common/models_common.py:4901 +#: archaeological_operations/models.py:1787 ishtar_common/models_common.py:4911 msgid "Generated automatically - do not edit" msgstr "" @@ -1466,6 +1584,7 @@ msgstr "" #: archaeological_context_records/models.py:1022 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:4 #: archaeological_finds/models_finds.py:626 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:4 msgid "Context Record" msgstr "" @@ -1594,20 +1713,29 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:41 #: archaeological_finds/templates/ishtar/sheet_find.html:42 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:42 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:44 +#: cd17_app/templates/ishtar/sheet_find.html:42 +#: man_app/templates/ishtar/sheet_museum_find.html:41 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:81 +#: na_app/templates/ishtar/sheet_find.html:48 +#: pdl_app/templates/ishtar/sheet_find.html:48 msgid "Identification / Description" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:58 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:218 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:49 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:207 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:52 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:228 msgid "Datations" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:66 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:57 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:60 msgid "Operation / Archaeological site" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:74 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:289 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:65 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:270 #: archaeological_finds/forms.py:2253 archaeological_finds/models_finds.py:97 #: archaeological_finds/models_finds.py:111 #: archaeological_finds/models_finds.py:128 @@ -1643,23 +1771,37 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:197 #: archaeological_warehouse/templates/ishtar/sheet_container.html:244 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:208 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:68 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:302 #: ishtar_common/templates/ishtar/sheet_document.html:127 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:149 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:252 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:358 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:457 -#: ishtar_common/views.py:178 +#: ishtar_common/views.py:178 na_app/templates/ishtar/sheet_container.html:202 +#: na_app/templates/ishtar/sheet_container.html:249 +#: na_app/templates/ishtar/sheet_operation.html:89 +#: na_app/templates/ishtar/sheet_operation.html:481 +#: na_app/templates/ishtar/sheet_operation.html:573 +#: pdl_app/templates/ishtar/sheet_operation.html:89 +#: pdl_app/templates/ishtar/sheet_operation.html:498 +#: pdl_app/templates/ishtar/sheet_operation.html:590 msgid "Finds" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:83 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:74 #: archaeological_operations/templates/ishtar/sheet_operation.html:72 #: archaeological_operations/templates/ishtar/sheet_operation.html:415 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:77 #: ishtar_common/templates/ishtar/forms/modify_relations.html:28 +#: na_app/templates/ishtar/sheet_operation.html:71 +#: na_app/templates/ishtar/sheet_operation.html:422 +#: pdl_app/templates/ishtar/sheet_operation.html:71 +#: pdl_app/templates/ishtar/sheet_operation.html:439 msgid "Relations" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:101 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 #: archaeological_finds/templates/ishtar/sheet_find.html:73 #: archaeological_finds/templates/ishtar/sheet_find.html:325 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:73 @@ -1668,38 +1810,68 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:121 #: archaeological_warehouse/templates/ishtar/sheet_container.html:59 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:55 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:95 +#: cd17_app/templates/ishtar/sheet_find.html:73 +#: cd17_app/templates/ishtar/sheet_find.html:333 #: ishtar_common/templates/ishtar/blocks/sheet_map.html:10 #: ishtar_common/templates/ishtar/sheet_town.html:41 +#: man_app/templates/ishtar/sheet_museum_find.html:74 +#: man_app/templates/ishtar/sheet_museum_find.html:331 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:112 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:374 +#: na_app/templates/ishtar/sheet_container.html:59 +#: na_app/templates/ishtar/sheet_find.html:72 +#: na_app/templates/ishtar/sheet_find.html:566 +#: na_app/templates/ishtar/sheet_operation.html:98 +#: pdl_app/templates/ishtar/sheet_find.html:72 +#: pdl_app/templates/ishtar/sheet_find.html:559 +#: pdl_app/templates/ishtar/sheet_operation.html:98 msgid "Geographic data" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:110 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:101 #: archaeological_finds/templates/ishtar/sheet_find.html:82 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:82 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:76 #: archaeological_operations/templates/ishtar/sheet_operation.html:108 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:106 +#: cd17_app/templates/ishtar/sheet_find.html:82 +#: cd93_app/templates/ishtar/sheet_administrativeact.html:77 +#: man_app/templates/ishtar/sheet_museum_find.html:83 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:121 +#: na_app/templates/ishtar/sheet_find.html:81 +#: na_app/templates/ishtar/sheet_operation.html:107 +#: pdl_app/templates/ishtar/sheet_find.html:81 +#: pdl_app/templates/ishtar/sheet_operation.html:107 msgid "Custom fields" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:126 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:117 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:122 #: ishtar_common/models.py:4876 msgid "Identifier" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:145 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:136 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:144 msgid "Excavation technics" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:151 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:142 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:150 msgid "Inclusion" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:163 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:154 #: archaeological_files/templates/ishtar/sheet_file.html:102 #: archaeological_files/templates/ishtar/sheet_file.html:284 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:60 #: archaeological_operations/templates/ishtar/sheet_operation.html:219 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:162 +#: cd93_app/templates/ishtar/sheet_administrativeact.html:61 #: ishtar_common/templates/ishtar/sheet_town.html:71 +#: na_app/templates/ishtar/sheet_operation.html:216 +#: pdl_app/templates/ishtar/sheet_operation.html:219 msgid "Surface" msgstr "" @@ -1710,7 +1882,12 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:334 #: archaeological_operations/templates/ishtar/sheet_site.html:78 #: archaeological_warehouse/templates/ishtar/sheet_container.html:167 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:202 #: ishtar_common/templates/ishtar/sheet_town.html:110 +#: man_app/templates/ishtar/sheet_basefind.html:56 +#: na_app/templates/ishtar/sheet_container.html:174 +#: na_app/templates/ishtar/sheet_operation.html:340 +#: pdl_app/templates/ishtar/sheet_operation.html:357 msgid "Geographic localisation" msgstr "" @@ -1720,7 +1897,7 @@ msgstr "" #: archaeological_finds/forms.py:1025 #: archaeological_finds/templates/ishtar/sheet_basefind.html:72 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:93 -#: archaeological_finds/templates/ishtar/sheet_find.html:252 +#: archaeological_finds/templates/ishtar/sheet_find.html:255 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:252 #: archaeological_finds/templates/ishtar/sheet_treatment.html:104 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:94 @@ -1729,85 +1906,167 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:127 #: archaeological_warehouse/templates/ishtar/sheet_container.html:177 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:131 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:216 +#: cd17_app/templates/ishtar/sheet_find.html:263 +#: cd93_app/templates/ishtar/sheet_administrativeact.html:90 #: ishtar_common/templates/ishtar/blocks/window_image.html:6 #: ishtar_common/templates/ishtar/sheet_document.html:147 #: ishtar_common/templates/ishtar/sheet_organization.html:86 #: ishtar_common/templates/ishtar/sheet_person.html:178 +#: man_app/templates/ishtar/sheet_basefind.html:67 +#: man_app/templates/ishtar/sheet_museum_find.html:254 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:291 +#: na_app/templates/ishtar/sheet_container.html:183 +#: na_app/templates/ishtar/sheet_find.html:274 +#: na_app/templates/ishtar/sheet_operation.html:361 +#: pdl_app/templates/ishtar/sheet_find.html:267 +#: pdl_app/templates/ishtar/sheet_operation.html:378 msgid "Sheet" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:237 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:226 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:247 msgid "Operation summary" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:240 -#: archaeological_operations/templates/ishtar/sheet_operation.html:305 -msgid "Patriarche OA code not yet recorded!" +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:229 +#: archaeological_files/forms.py:84 archaeological_files/forms.py:211 +#: archaeological_files/forms.py:632 archaeological_files/forms.py:1105 +#: archaeological_files/forms.py:1141 archaeological_files/models.py:560 +#: archaeological_files/models.py:746 +#: archaeological_files/templates/ishtar/sheet_file.html:224 +#: archaeological_finds/forms.py:1759 +#: archaeological_finds/forms_treatments.py:59 +#: archaeological_finds/forms_treatments.py:190 +#: archaeological_finds/forms_treatments.py:469 +#: archaeological_finds/forms_treatments.py:625 +#: archaeological_finds/forms_treatments.py:701 +#: archaeological_finds/forms_treatments.py:773 +#: archaeological_finds/forms_treatments.py:884 +#: archaeological_finds/forms_treatments.py:966 +#: archaeological_finds/forms_treatments.py:1004 +#: archaeological_finds/models_finds.py:1319 +#: archaeological_finds/models_treatments.py:360 +#: archaeological_finds/models_treatments.py:1400 +#: archaeological_finds/models_treatments.py:1690 +#: archaeological_finds/templates/ishtar/sheet_exhibition.html:51 +#: archaeological_operations/forms.py:73 archaeological_operations/forms.py:489 +#: archaeological_operations/forms.py:711 +#: archaeological_operations/forms.py:1448 +#: archaeological_operations/forms.py:1766 +#: archaeological_operations/models.py:1164 +#: archaeological_operations/models.py:1591 +#: archaeological_operations/models.py:2980 +#: archaeological_operations/models.py:3219 +#: archaeological_operations/models.py:3486 +#: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 +#: archaeological_operations/templates/ishtar/sheet_operation.html:150 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:250 +#: ishtar_common/models_imports.py:1133 +#: na_app/templates/ishtar/sheet_operation.html:149 +#: pdl_app/templates/ishtar/sheet_operation.html:152 +msgid "Year" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:246 -msgid "Numerical reference" +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:230 +#: archaeological_operations/forms.py:729 +#: archaeological_operations/models.py:1565 +#: archaeological_operations/models.py:3176 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:251 +msgid "Head scientist" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:252 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:233 #: archaeological_finds/models_treatments.py:239 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:63 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:101 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:140 #: archaeological_operations/templates/ishtar/sheet_operation.html:183 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:254 #: ishtar_common/models.py:4029 ishtar_common/models.py:6138 #: ishtar_common/models.py:6275 ishtar_common/models.py:6354 -#: ishtar_common/models_common.py:2193 ishtar_common/models_common.py:2208 +#: ishtar_common/models_common.py:2203 ishtar_common/models_common.py:2218 #: ishtar_common/models_imports.py:1591 ishtar_common/models_imports.py:1993 +#: man_app/templates/ishtar/sheet_find_treatments.html:121 +#: man_app/templates/ishtar/sheet_find_treatments.html:159 +#: man_app/templates/ishtar/sheet_find_treatments.html:198 +#: na_app/templates/ishtar/sheet_find.html:399 +#: na_app/templates/ishtar/sheet_find.html:446 +#: na_app/templates/ishtar/sheet_find.html:484 +#: na_app/templates/ishtar/sheet_operation.html:179 +#: pdl_app/templates/ishtar/sheet_find.html:392 +#: pdl_app/templates/ishtar/sheet_find.html:439 +#: pdl_app/templates/ishtar/sheet_find.html:477 +#: pdl_app/templates/ishtar/sheet_operation.html:182 msgid "State" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:253 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:234 #: archaeological_files/templates/ishtar/sheet_file.html:72 #: archaeological_operations/templates/ishtar/sheet_operation.html:188 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:255 +#: na_app/templates/ishtar/sheet_operation.html:184 +#: pdl_app/templates/ishtar/sheet_operation.html:187 msgid "Active file" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:253 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:234 #: archaeological_operations/templates/ishtar/sheet_operation.html:191 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:255 +#: na_app/templates/ishtar/sheet_operation.html:187 +#: pdl_app/templates/ishtar/sheet_operation.html:190 msgid "Closed operation" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:260 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:241 #: archaeological_files/templates/ishtar/sheet_file.html:80 #: archaeological_operations/templates/ishtar/sheet_operation.html:213 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:262 +#: na_app/templates/ishtar/sheet_operation.html:210 +#: pdl_app/templates/ishtar/sheet_operation.html:213 msgid "by" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:272 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:253 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:274 msgid "No operation linked to this context record!" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:294 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:275 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:307 #, fuzzy #| msgid "email address" msgid "No associated finds." msgstr "E-Mail-Adresse" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:298 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:279 #: archaeological_operations/templates/ishtar/sheet_operation.html:481 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:311 +#: na_app/templates/ishtar/sheet_operation.html:486 +#: pdl_app/templates/ishtar/sheet_operation.html:503 msgid "Documents from associated finds" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:311 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:292 #: archaeological_operations/templates/ishtar/sheet_operation.html:447 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:324 +#: na_app/templates/ishtar/sheet_operation.html:452 +#: pdl_app/templates/ishtar/sheet_operation.html:469 msgid "Context record relations" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:317 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:298 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:330 msgid "Diagram of stratigraphic relations - above" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:325 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:306 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:338 msgid "Diagram of stratigraphic relations - below" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:333 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:314 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:346 msgid "Diagram of stratigraphic relations - full" msgstr "" @@ -1834,77 +2093,55 @@ msgstr "" msgid "Add context record" msgstr "" -#: archaeological_files/admin.py:141 +#: archaeological_files/admin.py:146 msgid "Copy from" msgstr "" -#: archaeological_files/admin.py:145 +#: archaeological_files/admin.py:150 msgid "To" msgstr "" -#: archaeological_files/admin.py:162 archaeological_files/tests.py:312 +#: archaeological_files/admin.py:167 archaeological_files/tests.py:312 msgid "Source and destination must be different." msgstr "" -#: archaeological_files/admin.py:184 +#: archaeological_files/admin.py:189 msgid "Cannot change price agreement." msgstr "" -#: archaeological_files/admin.py:237 +#: archaeological_files/admin.py:242 msgid "{} item(s) created." msgstr "" -#: archaeological_files/admin.py:241 +#: archaeological_files/admin.py:246 msgid "{} item(s) already in database." msgstr "" -#: archaeological_files/forms.py:77 -msgid "File - 001 - Search" +#: archaeological_files/admin.py:266 +msgid "Select only one price agreement." msgstr "" -#: archaeological_files/forms.py:84 archaeological_files/forms.py:211 -#: archaeological_files/forms.py:632 archaeological_files/forms.py:1105 -#: archaeological_files/forms.py:1141 archaeological_files/models.py:458 -#: archaeological_files/models.py:644 -#: archaeological_files/templates/ishtar/sheet_file.html:224 -#: archaeological_finds/forms.py:1759 -#: archaeological_finds/forms_treatments.py:59 -#: archaeological_finds/forms_treatments.py:190 -#: archaeological_finds/forms_treatments.py:469 -#: archaeological_finds/forms_treatments.py:625 -#: archaeological_finds/forms_treatments.py:701 -#: archaeological_finds/forms_treatments.py:773 -#: archaeological_finds/forms_treatments.py:884 -#: archaeological_finds/forms_treatments.py:966 -#: archaeological_finds/forms_treatments.py:1004 -#: archaeological_finds/models_finds.py:1319 -#: archaeological_finds/models_treatments.py:360 -#: archaeological_finds/models_treatments.py:1400 -#: archaeological_finds/models_treatments.py:1690 -#: archaeological_finds/templates/ishtar/sheet_exhibition.html:51 -#: archaeological_operations/forms.py:73 archaeological_operations/forms.py:489 -#: archaeological_operations/forms.py:711 -#: archaeological_operations/forms.py:1448 -#: archaeological_operations/forms.py:1766 -#: archaeological_operations/models.py:1164 -#: archaeological_operations/models.py:1591 -#: archaeological_operations/models.py:2980 -#: archaeological_operations/models.py:3219 -#: archaeological_operations/models.py:3486 -#: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 -#: archaeological_operations/templates/ishtar/sheet_operation.html:150 -#: ishtar_common/models_imports.py:1133 -msgid "Year" +#: archaeological_files/admin.py:275 ishtar_common/admin.py:3130 +msgid "" +"Document not generated: is the LibreOffice daemon configured and running?" +msgstr "" + +#: archaeological_files/admin.py:293 +msgid "Export prices" +msgstr "" + +#: archaeological_files/forms.py:77 +msgid "File - 001 - Search" msgstr "" #: archaeological_files/forms.py:85 archaeological_files/forms.py:638 -#: archaeological_files/models.py:646 +#: archaeological_files/models.py:748 msgid "Numeric reference" msgstr "" #: archaeological_files/forms.py:86 archaeological_files/forms.py:220 #: archaeological_files/forms.py:1107 archaeological_files/forms.py:1143 -#: archaeological_files/models.py:649 +#: archaeological_files/models.py:751 #: archaeological_finds/models_treatments.py:1403 #: archaeological_operations/forms.py:1450 #: archaeological_operations/forms.py:1515 @@ -1916,11 +2153,11 @@ msgid "Internal reference" msgstr "" #: archaeological_files/forms.py:92 archaeological_files/forms.py:1113 -#: archaeological_files/forms.py:1150 archaeological_files/models.py:1709 +#: archaeological_files/forms.py:1150 archaeological_files/models.py:1811 #: archaeological_operations/forms.py:505 #: archaeological_operations/forms.py:1461 -#: archaeological_operations/models.py:2841 ishtar_common/models_common.py:2216 -#: ishtar_common/models_common.py:3632 +#: archaeological_operations/models.py:2841 ishtar_common/models_common.py:2226 +#: ishtar_common/models_common.py:3642 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" @@ -1930,7 +2167,7 @@ msgid "File name" msgstr "" #: archaeological_files/forms.py:95 archaeological_files/forms.py:288 -#: archaeological_files/forms.py:339 archaeological_files/models.py:658 +#: archaeological_files/forms.py:339 archaeological_files/models.py:760 #: archaeological_files/templates/ishtar/sheet_file.html:63 #, fuzzy #| msgid "email address" @@ -1938,8 +2175,8 @@ msgid "Operation name" msgstr "E-Mail-Adresse" #: archaeological_files/forms.py:96 archaeological_files/forms.py:209 -#: archaeological_files/models.py:459 archaeological_files/models.py:464 -#: archaeological_files/models.py:659 +#: archaeological_files/models.py:561 archaeological_files/models.py:566 +#: archaeological_files/models.py:761 msgid "File type" msgstr "" @@ -1948,7 +2185,7 @@ msgid "Is active?" msgstr "" #: archaeological_files/forms.py:98 archaeological_files/forms.py:290 -#: archaeological_files/models.py:401 archaeological_files/models.py:809 +#: archaeological_files/models.py:503 archaeological_files/models.py:911 #: archaeological_files/templates/ishtar/sheet_file.html:124 msgid "Development type" msgstr "" @@ -1958,26 +2195,28 @@ msgid "Saisine type" msgstr "" #: archaeological_files/forms.py:100 archaeological_files/forms.py:448 -#: archaeological_files/models.py:813 +#: archaeological_files/models.py:915 #: archaeological_files/templates/ishtar/sheet_file.html:125 msgid "Monitoring justification" msgstr "" #: archaeological_files/forms.py:101 archaeological_files/forms.py:265 -#: archaeological_files/models.py:352 archaeological_files/models.py:463 -#: archaeological_files/models.py:708 +#: archaeological_files/models.py:454 archaeological_files/models.py:565 +#: archaeological_files/models.py:810 msgid "Permit type" msgstr "" #: archaeological_files/forms.py:102 archaeological_files/forms.py:450 -#: archaeological_files/models.py:713 +#: archaeological_files/models.py:815 #: archaeological_files/templates/ishtar/sheet_file.html:137 #: archaeological_operations/templates/ishtar/sheet_operation.html:282 +#: na_app/templates/ishtar/sheet_operation.html:280 +#: pdl_app/templates/ishtar/sheet_operation.html:305 msgid "Permit/order reference" msgstr "" #: archaeological_files/forms.py:103 archaeological_files/forms.py:629 -#: archaeological_files/models.py:761 archaeological_finds/forms.py:831 +#: archaeological_files/models.py:863 archaeological_finds/forms.py:831 #: archaeological_finds/forms.py:1174 archaeological_finds/forms.py:1461 #: archaeological_finds/forms.py:2507 #: archaeological_finds/forms_treatments.py:241 @@ -2003,7 +2242,7 @@ msgstr "" #: ishtar_common/forms_common.py:2562 ishtar_common/forms_common.py:3189 #: ishtar_common/models.py:3114 ishtar_common/models.py:4414 #: ishtar_common/models.py:5314 ishtar_common/models_common.py:192 -#: ishtar_common/models_common.py:2461 ishtar_common/models_imports.py:897 +#: ishtar_common/models_common.py:2471 ishtar_common/models_imports.py:897 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:13 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:170 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:39 @@ -2020,7 +2259,7 @@ msgstr "" #: archaeological_files/forms.py:115 archaeological_files/forms.py:357 #: archaeological_files/forms.py:367 archaeological_files/forms.py:1157 -#: archaeological_files/models.py:671 +#: archaeological_files/models.py:773 msgid "General contractor" msgstr "" @@ -2048,7 +2287,7 @@ msgstr "" msgid "Archaeological file - 010 - General" msgstr "" -#: archaeological_files/forms.py:218 archaeological_files/models.py:728 +#: archaeological_files/forms.py:218 archaeological_files/models.py:830 #: archaeological_files/templates/ishtar/sheet_file.html:64 #: archaeological_finds/models_treatments.py:1440 #: archaeological_operations/models.py:1552 ishtar_common/forms_common.py:2222 @@ -2058,10 +2297,13 @@ msgstr "" msgid "Creation date" msgstr "" -#: archaeological_files/forms.py:219 archaeological_files/models.py:730 +#: archaeological_files/forms.py:219 archaeological_files/models.py:832 #: archaeological_finds/forms_treatments.py:813 #: archaeological_finds/models_treatments.py:1442 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:190 +#: man_app/templates/ishtar/sheet_find_treatments.html:248 +#: na_app/templates/ishtar/sheet_find.html:526 +#: pdl_app/templates/ishtar/sheet_find.html:519 msgid "Reception date" msgstr "" @@ -2092,7 +2334,7 @@ msgid "This name is used on creation for the associated operation" msgstr "E-Mail-Adresse" #: archaeological_files/forms.py:293 archaeological_files/forms.py:342 -#: archaeological_files/models.py:530 archaeological_files/models.py:725 +#: archaeological_files/models.py:632 archaeological_files/models.py:827 #: archaeological_operations/forms.py:710 #: archaeological_operations/forms.py:1005 #: archaeological_operations/forms.py:1021 @@ -2107,15 +2349,17 @@ msgstr "E-Mail-Adresse" #: archaeological_operations/templates/ishtar/sheet_operation.html:152 #: ishtar_common/forms_common.py:1851 ishtar_common/forms_common.py:1865 #: ishtar_common/forms_common.py:1866 ishtar_common/models.py:2531 -#: ishtar_common/models_common.py:3666 +#: ishtar_common/models_common.py:3676 #: ishtar_common/templates/ishtar/sheet_area.html:71 #: ishtar_common/templates/ishtar/sheet_document.html:133 +#: na_app/templates/ishtar/sheet_operation.html:150 +#: pdl_app/templates/ishtar/sheet_operation.html:153 msgid "Towns" msgstr "" #: archaeological_files/forms.py:297 archaeological_files/forms.py:345 -#: archaeological_files/models.py:764 archaeological_operations/models.py:3225 -#: ishtar_common/models_common.py:2217 +#: archaeological_files/models.py:866 archaeological_operations/models.py:3225 +#: ishtar_common/models_common.py:2227 msgid "Departments" msgstr "" @@ -2124,7 +2368,7 @@ msgid "Only relevant when no town is provided." msgstr "" #: archaeological_files/forms.py:301 archaeological_files/forms.py:347 -#: archaeological_files/models.py:756 +#: archaeological_files/models.py:858 msgid "Locality" msgstr "" @@ -2138,7 +2382,7 @@ msgstr "" #: archaeological_files/forms.py:307 archaeological_files/forms.py:353 #: archaeological_warehouse/forms.py:255 ishtar_common/forms_common.py:787 -#: ishtar_common/forms_common.py:1206 ishtar_common/models_common.py:4165 +#: ishtar_common/forms_common.py:1206 ishtar_common/models_common.py:4175 msgid "Postal code" msgstr "" @@ -2146,7 +2390,7 @@ msgstr "" msgid "Surfaces" msgstr "" -#: archaeological_files/forms.py:320 archaeological_files/models.py:754 +#: archaeological_files/forms.py:320 archaeological_files/models.py:856 msgid "Total developed surface (m²)" msgstr "" @@ -2157,7 +2401,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:90 #: archaeological_warehouse/forms.py:242 archaeological_warehouse/forms.py:251 #: ishtar_common/forms_common.py:783 ishtar_common/forms_common.py:1202 -#: ishtar_common/models_common.py:4160 ishtar_common/models_common.py:4367 +#: ishtar_common/models_common.py:4170 ishtar_common/models_common.py:4377 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 msgid "Address" msgstr "" @@ -2191,7 +2435,7 @@ msgstr "" msgid "Archaeological file - 040 - Planning service" msgstr "" -#: archaeological_files/forms.py:452 archaeological_files/models.py:732 +#: archaeological_files/forms.py:452 archaeological_files/models.py:834 msgid "Date of planning service file" msgstr "" @@ -2209,12 +2453,12 @@ msgstr "" msgid "Archaeological file - 045 - Research - General" msgstr "" -#: archaeological_files/forms.py:562 archaeological_files/models.py:788 +#: archaeological_files/forms.py:562 archaeological_files/models.py:890 #: archaeological_operations/forms.py:517 msgid "Scientist in charge" msgstr "" -#: archaeological_files/forms.py:566 archaeological_files/models.py:772 +#: archaeological_files/forms.py:566 archaeological_files/models.py:874 msgid "Requested operation type" msgstr "" @@ -2222,16 +2466,16 @@ msgstr "" msgid "Lead organization" msgstr "" -#: archaeological_files/forms.py:584 archaeological_files/models.py:791 +#: archaeological_files/forms.py:584 archaeological_files/models.py:893 #: archaeological_files/templates/ishtar/sheet_file.html:176 msgid "Research archaeology comment" msgstr "" -#: archaeological_files/forms.py:593 archaeological_files/models.py:794 +#: archaeological_files/forms.py:593 archaeological_files/models.py:896 msgid "Classified area" msgstr "" -#: archaeological_files/forms.py:594 archaeological_files/models.py:796 +#: archaeological_files/forms.py:594 archaeological_files/models.py:898 msgid "Protected area" msgstr "" @@ -2248,11 +2492,11 @@ msgstr "" msgid "File managed by" msgstr "" -#: archaeological_files/forms.py:622 archaeological_files/models.py:736 +#: archaeological_files/forms.py:622 archaeological_files/models.py:838 msgid "Related file" msgstr "" -#: archaeological_files/forms.py:630 archaeological_files/models.py:750 +#: archaeological_files/forms.py:630 archaeological_files/models.py:852 #: archaeological_files/templates/ishtar/sheet_file.html:66 msgid "Instruction deadline" msgstr "" @@ -2284,27 +2528,27 @@ msgstr "" msgid "Archaeological royalties" msgstr "" -#: archaeological_files/forms.py:742 archaeological_files/models.py:821 +#: archaeological_files/forms.py:742 archaeological_files/models.py:923 msgid "Intervention period" msgstr "" -#: archaeological_files/forms.py:747 archaeological_files/models.py:824 +#: archaeological_files/forms.py:747 archaeological_files/models.py:926 msgid "Study period" msgstr "" -#: archaeological_files/forms.py:752 archaeological_files/models.py:827 +#: archaeological_files/forms.py:752 archaeological_files/models.py:929 msgid "Report due period" msgstr "" -#: archaeological_files/forms.py:767 archaeological_files/models.py:831 +#: archaeological_files/forms.py:767 archaeological_files/models.py:933 msgid "Ground start date" msgstr "" -#: archaeological_files/forms.py:772 archaeological_files/models.py:832 +#: archaeological_files/forms.py:772 archaeological_files/models.py:934 msgid "Ground end date" msgstr "" -#: archaeological_files/forms.py:777 archaeological_files/models.py:834 +#: archaeological_files/forms.py:777 archaeological_files/models.py:936 msgid "Execution report date" msgstr "" @@ -2336,16 +2580,16 @@ msgstr "" msgid "Days" msgstr "" -#: archaeological_files/forms.py:864 archaeological_files/models.py:120 -#: archaeological_files/models.py:1751 archaeological_files/models.py:1770 +#: archaeological_files/forms.py:864 archaeological_files/models.py:222 +#: archaeological_files/models.py:1853 archaeological_files/models.py:1872 #: archaeological_files/templates/ishtar/sheet_file.html:298 #: archaeological_files/templates/ishtar/sheet_file.html:350 msgid "Job" msgstr "" -#: archaeological_files/forms.py:885 archaeological_files/models.py:84 -#: archaeological_files/models.py:85 archaeological_files/models.py:97 -#: archaeological_files/models.py:230 archaeological_files/models.py:817 +#: archaeological_files/forms.py:885 archaeological_files/models.py:94 +#: archaeological_files/models.py:95 archaeological_files/models.py:199 +#: archaeological_files/models.py:332 archaeological_files/models.py:919 msgid "Price agreement" msgstr "" @@ -2396,6 +2640,9 @@ msgstr "" #: archaeological_warehouse/forms.py:465 archaeological_warehouse/forms.py:527 #: archaeological_warehouse/models.py:1200 ishtar_common/admin.py:649 #: ishtar_common/models.py:5197 +#: man_app/templates/ishtar/sheet_find_treatments.html:94 +#: na_app/templates/ishtar/sheet_find.html:374 +#: pdl_app/templates/ishtar/sheet_find.html:367 msgid "Index" msgstr "" @@ -2468,7 +2715,7 @@ msgstr "" msgid "Administrative act - Archaeological file - General" msgstr "" -#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:880 +#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:982 #: archaeological_files/templates/ishtar/sheet_file.html:4 #: archaeological_files/wizards.py:226 archaeological_files/wizards.py:238 #: archaeological_operations/forms.py:663 @@ -2494,140 +2741,204 @@ msgstr "" #: archaeological_operations/models.py:1942 #: archaeological_operations/models.py:3256 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 +#: cd93_app/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "" -#: archaeological_files/models.py:92 archaeological_files/models.py:127 -#: archaeological_files/models.py:192 archaeological_files/models.py:208 -#: archaeological_files/models.py:278 archaeological_files/models.py:380 -#: archaeological_files/models.py:392 archaeological_files/models.py:404 -#: archaeological_files/models.py:424 archaeological_files/models.py:1757 -#: archaeological_files/models.py:1776 archaeological_files/models.py:1803 +#: archaeological_files/models.py:102 archaeological_files/models.py:229 +#: archaeological_files/models.py:294 archaeological_files/models.py:310 +#: archaeological_files/models.py:380 archaeological_files/models.py:482 +#: archaeological_files/models.py:494 archaeological_files/models.py:506 +#: archaeological_files/models.py:526 archaeological_files/models.py:1859 +#: archaeological_files/models.py:1878 archaeological_files/models.py:1905 #: archaeological_files/templates/ishtar/sheet_file.html:29 #: archaeological_operations/templates/ishtar/sheet_operation.html:310 #: ishtar_common/models.py:6077 +#: na_app/templates/ishtar/sheet_operation.html:316 +#: pdl_app/templates/ishtar/sheet_operation.html:333 msgid "Preventive" msgstr "" -#: archaeological_files/models.py:100 +#: archaeological_files/models.py:136 +msgid "Equipment - service costs" +msgstr "" + +#: archaeological_files/models.py:137 archaeological_files/models.py:148 +#: archaeological_finds/forms.py:2503 +#: archaeological_finds/forms_treatments.py:57 +#: archaeological_finds/forms_treatments.py:67 +#: archaeological_finds/forms_treatments.py:194 +#: archaeological_finds/models_treatments.py:356 +#: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 +#: archaeological_finds/templates/ishtar/sheet_find_treatments.html:61 +#: archaeological_finds/templates/ishtar/sheet_find_treatments.html:99 +#: ishtar_common/forms_common.py:2026 ishtar_common/models.py:1015 +#: ishtar_common/models.py:1935 ishtar_common/models.py:4413 +#: ishtar_common/models_common.py:181 ishtar_common/models_common.py:232 +#: ishtar_common/models_common.py:2198 ishtar_common/models_common.py:2214 +#: ishtar_common/models_imports.py:706 +#: man_app/templates/ishtar/sheet_find_treatments.html:119 +#: man_app/templates/ishtar/sheet_find_treatments.html:157 +#: na_app/templates/ishtar/sheet_find.html:444 +#: na_app/templates/ishtar/sheet_find.html:482 +#: pdl_app/templates/ishtar/sheet_find.html:437 +#: pdl_app/templates/ishtar/sheet_find.html:475 +msgid "Label" +msgstr "" + +#: archaeological_files/models.py:137 archaeological_files/models.py:354 +#: ishtar_common/models_imports.py:1086 +msgid "Unit" +msgstr "" + +#: archaeological_files/models.py:137 +msgid "Price" +msgstr "" + +#: archaeological_files/models.py:144 archaeological_finds/tests.py:1864 +#: archaeological_finds/tests.py:1890 archaeological_finds/tests.py:1900 +#: archaeological_operations/tests.py:3371 ishtar_common/forms.py:1353 +#: ishtar_common/forms.py:1445 +#: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 +#: ishtar_common/templatetags/window_field.py:19 +#: ishtar_common/views_item.py:798 ishtar_common/views_item.py:1071 +#: ishtar_common/views_item.py:1108 ishtar_common/wizards.py:511 +msgid "Yes" +msgstr "" + +#: archaeological_files/models.py:144 archaeological_finds/tests.py:1865 +#: archaeological_finds/tests.py:1891 archaeological_finds/tests.py:1901 +#: ishtar_common/forms.py:1354 ishtar_common/forms.py:1447 +#: ishtar_common/templatetags/window_field.py:24 ishtar_common/wizards.py:513 +msgid "No" +msgstr "" + +#: archaeological_files/models.py:148 archaeological_files/models.py:205 +#: archaeological_files/models.py:273 +msgid "Permanent contract" +msgstr "" + +#: archaeological_files/models.py:149 archaeological_files/models.py:202 msgid "Ground daily cost" msgstr "" -#: archaeological_files/models.py:101 +#: archaeological_files/models.py:149 archaeological_files/models.py:203 msgid "Daily cost" msgstr "" -#: archaeological_files/models.py:103 archaeological_files/models.py:171 -msgid "Permanent contract" +#: archaeological_files/models.py:150 +msgid "Job cost" +msgstr "" + +#: archaeological_files/models.py:155 +msgid "ishtar-price-agreement" msgstr "" -#: archaeological_files/models.py:106 +#: archaeological_files/models.py:208 msgid "Def. daily number on ground" msgstr "" -#: archaeological_files/models.py:108 +#: archaeological_files/models.py:210 msgid "Def. daily number on study" msgstr "" -#: archaeological_files/models.py:114 +#: archaeological_files/models.py:216 msgid "Child" msgstr "" -#: archaeological_files/models.py:115 +#: archaeological_files/models.py:217 msgid "Auto-add this job when a parent is added" msgstr "" -#: archaeological_files/models.py:121 +#: archaeological_files/models.py:223 msgid "Jobs" msgstr "" -#: archaeological_files/models.py:133 +#: archaeological_files/models.py:235 msgid "fixed-term contract" msgstr "" -#: archaeological_files/models.py:175 +#: archaeological_files/models.py:277 msgid "Fixed-term contract" msgstr "" -#: archaeological_files/models.py:186 +#: archaeological_files/models.py:288 msgid "Generic equipment type" msgstr "" -#: archaeological_files/models.py:187 +#: archaeological_files/models.py:289 msgid "Generic equipment types" msgstr "" -#: archaeological_files/models.py:197 +#: archaeological_files/models.py:299 msgid "Generic type" msgstr "" -#: archaeological_files/models.py:202 +#: archaeological_files/models.py:304 msgid "Equipment/service type" msgstr "" -#: archaeological_files/models.py:203 +#: archaeological_files/models.py:305 msgid "Equipment/service types" msgstr "" -#: archaeological_files/models.py:212 +#: archaeological_files/models.py:314 #: archaeological_operations/templates/ishtar/sheet_operation.html:236 +#: na_app/templates/ishtar/sheet_operation.html:233 +#: pdl_app/templates/ishtar/sheet_operation.html:236 msgid "days" msgstr "" -#: archaeological_files/models.py:213 +#: archaeological_files/models.py:315 msgid "weeks" msgstr "" -#: archaeological_files/models.py:214 +#: archaeological_files/models.py:316 msgid "months" msgstr "" -#: archaeological_files/models.py:215 +#: archaeological_files/models.py:317 msgid "linear m." msgstr "" -#: archaeological_files/models.py:234 +#: archaeological_files/models.py:336 msgid "Equipment/Service" msgstr "" -#: archaeological_files/models.py:237 archaeological_warehouse/forms.py:215 +#: archaeological_files/models.py:339 archaeological_warehouse/forms.py:215 #: archaeological_warehouse/models.py:385 ishtar_common/models.py:3398 #: ishtar_common/models_common.py:183 ishtar_common/models_common.py:232 msgid "Textual ID" msgstr "" -#: archaeological_files/models.py:241 ishtar_common/models.py:3401 +#: archaeological_files/models.py:343 ishtar_common/models.py:3401 #: ishtar_common/models_common.py:187 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:247 +#: archaeological_files/models.py:349 msgid "Service provider" msgstr "" -#: archaeological_files/models.py:249 archaeological_files/models.py:312 +#: archaeological_files/models.py:351 archaeological_files/models.py:414 msgid "Flat rate" msgstr "" -#: archaeological_files/models.py:250 +#: archaeological_files/models.py:352 msgid "Unitary cost" msgstr "" -#: archaeological_files/models.py:252 ishtar_common/models_imports.py:1086 -msgid "Unit" -msgstr "" - -#: archaeological_files/models.py:255 +#: archaeological_files/models.py:357 msgid "Specificity" msgstr "" -#: archaeological_files/models.py:258 +#: archaeological_files/models.py:360 msgid "Default quantity by day" msgstr "" -#: archaeological_files/models.py:260 ishtar_common/models.py:1728 +#: archaeological_files/models.py:362 ishtar_common/models.py:1728 #: ishtar_common/models.py:2205 ishtar_common/models.py:4425 #: ishtar_common/models_common.py:193 ishtar_common/models_imports.py:170 #: ishtar_common/models_imports.py:448 ishtar_common/models_imports.py:959 @@ -2635,86 +2946,86 @@ msgstr "" msgid "Available" msgstr "" -#: archaeological_files/models.py:266 ishtar_common/admin.py:1559 +#: archaeological_files/models.py:368 ishtar_common/admin.py:1559 #: ishtar_common/models.py:2538 ishtar_common/models_common.py:779 msgid "Parent" msgstr "" -#: archaeological_files/models.py:267 +#: archaeological_files/models.py:369 msgid "Auto-add this cost when a parent is added" msgstr "" -#: archaeological_files/models.py:272 +#: archaeological_files/models.py:374 msgid "Equipment/service cost" msgstr "" -#: archaeological_files/models.py:273 +#: archaeological_files/models.py:375 msgid "Equipment/service costs" msgstr "" -#: archaeological_files/models.py:332 +#: archaeological_files/models.py:434 msgid "Archaeological file type" msgstr "" -#: archaeological_files/models.py:333 +#: archaeological_files/models.py:435 msgid "Archaeological file types" msgstr "" -#: archaeological_files/models.py:353 +#: archaeological_files/models.py:455 msgid "Permit types" msgstr "" -#: archaeological_files/models.py:364 +#: archaeological_files/models.py:466 msgid "Delay (in days)" msgstr "" -#: archaeological_files/models.py:377 +#: archaeological_files/models.py:479 msgid "Agreement type - France" msgstr "" -#: archaeological_files/models.py:378 +#: archaeological_files/models.py:480 msgid "Agreement types - France" msgstr "" -#: archaeological_files/models.py:389 +#: archaeological_files/models.py:491 msgid "Monitoring justification type" msgstr "" -#: archaeological_files/models.py:390 +#: archaeological_files/models.py:492 msgid "Monitoring justification types" msgstr "" -#: archaeological_files/models.py:402 +#: archaeological_files/models.py:504 msgid "Development types" msgstr "" -#: archaeological_files/models.py:413 +#: archaeological_files/models.py:515 msgid "Increase coefficient" msgstr "" -#: archaeological_files/models.py:415 +#: archaeological_files/models.py:517 msgid "Increased final value" msgstr "" -#: archaeological_files/models.py:417 +#: archaeological_files/models.py:519 msgid "Category" msgstr "" -#: archaeological_files/models.py:421 +#: archaeological_files/models.py:523 msgid "Operation type for royalties - France" msgstr "" -#: archaeological_files/models.py:422 +#: archaeological_files/models.py:524 msgid "Operation types for royalties - France" msgstr "" -#: archaeological_files/models.py:461 archaeological_finds/models_finds.py:1323 +#: archaeological_files/models.py:563 archaeological_finds/models_finds.py:1323 #: archaeological_operations/models.py:388 #: archaeological_operations/models.py:1166 msgid "Extended area" msgstr "" -#: archaeological_files/models.py:470 archaeological_finds/models_finds.py:1345 +#: archaeological_files/models.py:572 archaeological_finds/models_finds.py:1345 #: archaeological_operations/templates/ishtar/sheet_operation.html:549 #: archaeological_operations/templates/ishtar/sheet_operation.html:559 #: archaeological_operations/templates/ishtar/sheet_operation.html:577 @@ -2722,23 +3033,35 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:597 #: archaeological_operations/templates/ishtar/sheet_operation.html:614 #: ishtar_common/models.py:2060 ishtar_common/models_common.py:826 -#: ishtar_common/models_common.py:2189 ishtar_common/models_common.py:2205 +#: ishtar_common/models_common.py:2199 ishtar_common/models_common.py:2215 #: ishtar_common/templates/ishtar/sheet_person.html:30 +#: na_app/templates/ishtar/sheet_operation.html:554 +#: na_app/templates/ishtar/sheet_operation.html:564 +#: na_app/templates/ishtar/sheet_operation.html:581 +#: na_app/templates/ishtar/sheet_operation.html:591 +#: na_app/templates/ishtar/sheet_operation.html:601 +#: na_app/templates/ishtar/sheet_operation.html:618 +#: pdl_app/templates/ishtar/sheet_operation.html:571 +#: pdl_app/templates/ishtar/sheet_operation.html:581 +#: pdl_app/templates/ishtar/sheet_operation.html:598 +#: pdl_app/templates/ishtar/sheet_operation.html:608 +#: pdl_app/templates/ishtar/sheet_operation.html:618 +#: pdl_app/templates/ishtar/sheet_operation.html:635 msgid "Number" msgstr "" -#: archaeological_files/models.py:471 +#: archaeological_files/models.py:573 msgid "Total surface (km²)" msgstr "" -#: archaeological_files/models.py:472 +#: archaeological_files/models.py:574 msgid "Total developed surface (km²)" msgstr "" -#: archaeological_files/models.py:541 archaeological_finds/models_finds.py:1450 +#: archaeological_files/models.py:643 archaeological_finds/models_finds.py:1450 #: archaeological_finds/models_treatments.py:265 #: archaeological_finds/models_treatments.py:1361 -#: archaeological_finds/tests.py:1659 archaeological_operations/models.py:1319 +#: archaeological_finds/tests.py:1699 archaeological_operations/models.py:1319 #: archaeological_operations/models.py:3005 #: archaeological_operations/tests.py:3292 #: archaeological_operations/tests.py:3406 @@ -2746,7 +3069,7 @@ msgctxt "key for text search" msgid "year" msgstr "" -#: archaeological_files/models.py:543 +#: archaeological_files/models.py:645 #: archaeological_finds/models_treatments.py:262 #: archaeological_finds/models_treatments.py:1358 #: archaeological_operations/models.py:456 @@ -2755,18 +3078,18 @@ msgctxt "key for text search" msgid "reference" msgstr "" -#: archaeological_files/models.py:546 archaeological_operations/models.py:3009 +#: archaeological_files/models.py:648 archaeological_operations/models.py:3009 #: ishtar_common/models.py:4925 msgctxt "key for text search" msgid "internal-reference" msgstr "" -#: archaeological_files/models.py:558 archaeological_operations/models.py:1343 +#: archaeological_files/models.py:660 archaeological_operations/models.py:1343 msgctxt "key for text search" msgid "department" msgstr "" -#: archaeological_files/models.py:562 +#: archaeological_files/models.py:664 #: archaeological_finds/models_treatments.py:1355 #: archaeological_operations/models.py:459 #: archaeological_operations/models.py:1347 @@ -2778,7 +3101,7 @@ msgctxt "key for text search" msgid "name" msgstr "" -#: archaeological_files/models.py:568 +#: archaeological_files/models.py:670 #: archaeological_finds/models_treatments.py:268 #: archaeological_finds/models_treatments.py:1364 #: archaeological_operations/models.py:466 @@ -2793,54 +3116,54 @@ msgctxt "key for text search" msgid "type" msgstr "" -#: archaeological_files/models.py:571 +#: archaeological_files/models.py:673 msgctxt "key for text search" msgid "active" msgstr "" -#: archaeological_files/models.py:574 +#: archaeological_files/models.py:676 msgctxt "key for text search" msgid "saisine-type" msgstr "" -#: archaeological_files/models.py:579 +#: archaeological_files/models.py:681 msgctxt "key for text search" msgid "development-type" msgstr "" -#: archaeological_files/models.py:583 +#: archaeological_files/models.py:685 msgctxt "key for text search" msgid "monitoring-justification" msgstr "" -#: archaeological_files/models.py:587 +#: archaeological_files/models.py:689 msgctxt "key for text search" msgid "permit-type" msgstr "" -#: archaeological_files/models.py:592 +#: archaeological_files/models.py:694 msgctxt "key for text search" msgid "permit-reference" msgstr "" -#: archaeological_files/models.py:599 archaeological_finds/models_finds.py:1771 +#: archaeological_files/models.py:701 archaeological_finds/models_finds.py:1771 #: archaeological_finds/models_treatments.py:1367 -#: archaeological_finds/tests.py:1694 +#: archaeological_finds/tests.py:1734 msgctxt "key for text search" msgid "in-charge" msgstr "" -#: archaeological_files/models.py:603 archaeological_operations/models.py:3057 +#: archaeological_files/models.py:705 archaeological_operations/models.py:3057 msgctxt "key for text search" msgid "general-contractor" msgstr "" -#: archaeological_files/models.py:608 archaeological_operations/models.py:3061 +#: archaeological_files/models.py:710 archaeological_operations/models.py:3061 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "" -#: archaeological_files/models.py:657 +#: archaeological_files/models.py:759 #: archaeological_finds/forms_treatments.py:699 #: archaeological_finds/forms_treatments.py:771 #: archaeological_finds/forms_treatments.py:964 @@ -2868,8 +3191,8 @@ msgstr "" #: ishtar_common/models.py:2793 ishtar_common/models.py:3109 #: ishtar_common/models.py:3708 ishtar_common/models.py:4023 #: ishtar_common/models.py:6113 ishtar_common/models_common.py:956 -#: ishtar_common/models_common.py:2427 ishtar_common/models_common.py:3215 -#: ishtar_common/models_common.py:3622 ishtar_common/models_common.py:3688 +#: ishtar_common/models_common.py:2437 ishtar_common/models_common.py:3225 +#: ishtar_common/models_common.py:3632 ishtar_common/models_common.py:3698 #: ishtar_common/models_imports.py:129 ishtar_common/models_imports.py:162 #: ishtar_common/models_imports.py:443 ishtar_common/models_imports.py:813 #: ishtar_common/models_imports.py:831 ishtar_common/models_imports.py:954 @@ -2888,50 +3211,58 @@ msgstr "" #: ishtar_common/templates/ishtar/sheet_organization.html:28 #: ishtar_common/templates/ishtar/sheet_organization.html:56 #: ishtar_common/templates/ishtar/sheet_town.html:63 +#: man_app/templates/ishtar/sheet_find_treatments.html:244 +#: na_app/templates/ishtar/sheet_find.html:522 +#: na_app/templates/ishtar/sheet_operation.html:157 +#: pdl_app/templates/ishtar/sheet_find.html:515 +#: pdl_app/templates/ishtar/sheet_operation.html:160 msgid "Name" msgstr "" -#: archaeological_files/models.py:663 +#: archaeological_files/models.py:765 #: archaeological_finds/models_treatments.py:1417 #: archaeological_finds/models_treatments.py:1697 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:187 #: archaeological_warehouse/forms.py:230 archaeological_warehouse/models.py:393 +#: man_app/templates/ishtar/sheet_find_treatments.html:245 +#: na_app/templates/ishtar/sheet_find.html:523 +#: pdl_app/templates/ishtar/sheet_find.html:516 msgid "Person in charge" msgstr "" -#: archaeological_files/models.py:677 +#: archaeological_files/models.py:779 msgid "General contractor (raw)" msgstr "" -#: archaeological_files/models.py:682 +#: archaeological_files/models.py:784 msgid "General contractor organization" msgstr "" -#: archaeological_files/models.py:692 +#: archaeological_files/models.py:794 msgid "Responsible for planning service" msgstr "" -#: archaeological_files/models.py:696 +#: archaeological_files/models.py:798 msgid "Planning service (raw)" msgstr "" -#: archaeological_files/models.py:703 +#: archaeological_files/models.py:805 msgid "Planning service organization" msgstr "" -#: archaeological_files/models.py:718 +#: archaeological_files/models.py:820 msgid "Main town" msgstr "" -#: archaeological_files/models.py:757 +#: archaeological_files/models.py:859 msgid "Main address" msgstr "" -#: archaeological_files/models.py:759 +#: archaeological_files/models.py:861 msgid "Main address - postal code" msgstr "" -#: archaeological_files/models.py:778 +#: archaeological_files/models.py:880 #: archaeological_finds/forms_treatments.py:91 #: archaeological_finds/forms_treatments.py:227 #: archaeological_finds/forms_treatments.py:480 @@ -2949,23 +3280,23 @@ msgstr "" msgid "Organization" msgstr "" -#: archaeological_files/models.py:836 +#: archaeological_files/models.py:938 msgid "Linear meter" msgstr "" -#: archaeological_files/models.py:840 +#: archaeological_files/models.py:942 msgid "Type of agreement" msgstr "" -#: archaeological_files/models.py:845 +#: archaeological_files/models.py:947 msgid "Operation type for royalties" msgstr "" -#: archaeological_files/models.py:861 +#: archaeological_files/models.py:963 msgid "Imported line" msgstr "" -#: archaeological_files/models.py:881 +#: archaeological_files/models.py:983 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:121 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:220 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:330 @@ -2975,108 +3306,108 @@ msgstr "" msgid "Archaeological files" msgstr "" -#: archaeological_files/models.py:907 +#: archaeological_files/models.py:1009 msgid "FILE" msgstr "" -#: archaeological_files/models.py:1370 +#: archaeological_files/models.py:1472 msgid "Multi-town" msgstr "" -#: archaeological_files/models.py:1376 +#: archaeological_files/models.py:1478 msgid "No town" msgstr "" -#: archaeological_files/models.py:1595 archaeological_operations/models.py:2213 +#: archaeological_files/models.py:1697 archaeological_operations/models.py:2213 msgid "Modify parcels" msgstr "" -#: archaeological_files/models.py:1597 archaeological_operations/models.py:2215 +#: archaeological_files/models.py:1699 archaeological_operations/models.py:2215 msgid "parcels" msgstr "" -#: archaeological_files/models.py:1607 +#: archaeological_files/models.py:1709 msgid "Edit intervention plan" msgstr "" -#: archaeological_files/models.py:1609 +#: archaeological_files/models.py:1711 msgid "plan" msgstr "" -#: archaeological_files/models.py:1618 +#: archaeological_files/models.py:1720 #: archaeological_finds/models_treatments.py:590 #: archaeological_finds/models_treatments.py:1569 #: archaeological_operations/models.py:2251 msgid "Add associated administrative act" msgstr "" -#: archaeological_files/models.py:1620 +#: archaeological_files/models.py:1722 #: archaeological_finds/models_treatments.py:592 #: archaeological_finds/models_treatments.py:1571 #: archaeological_operations/models.py:2253 msgid "admin. act" msgstr "" -#: archaeological_files/models.py:1629 +#: archaeological_files/models.py:1731 msgid "Add operation" msgstr "" -#: archaeological_files/models.py:1631 +#: archaeological_files/models.py:1733 #: archaeological_files/templates/ishtar/blocks/window_file_nav.html:6 #: ishtar_common/admin.py:1879 msgid "operation" msgstr "" -#: archaeological_files/models.py:1706 archaeological_operations/models.py:1596 +#: archaeological_files/models.py:1808 archaeological_operations/models.py:1596 #: archaeological_operations/models.py:3473 ishtar_common/forms_common.py:2664 msgid "File" msgstr "" -#: archaeological_files/models.py:1725 +#: archaeological_files/models.py:1827 msgid "Man by day - planned" msgstr "" -#: archaeological_files/models.py:1727 archaeological_files/models.py:1793 +#: archaeological_files/models.py:1829 archaeological_files/models.py:1895 msgid "Days - planned" msgstr "" -#: archaeological_files/models.py:1729 +#: archaeological_files/models.py:1831 msgid "Man by day - worked" msgstr "" -#: archaeological_files/models.py:1731 archaeological_files/models.py:1797 +#: archaeological_files/models.py:1833 archaeological_files/models.py:1899 msgid "Days - worked" msgstr "" -#: archaeological_files/models.py:1755 +#: archaeological_files/models.py:1857 msgid "Human requirement on field" msgstr "" -#: archaeological_files/models.py:1756 +#: archaeological_files/models.py:1858 msgid "Human requirements on field" msgstr "" -#: archaeological_files/models.py:1774 +#: archaeological_files/models.py:1876 msgid "Human requirement for post-excavation" msgstr "" -#: archaeological_files/models.py:1775 +#: archaeological_files/models.py:1877 msgid "Human requirements for post-excavation" msgstr "" -#: archaeological_files/models.py:1791 +#: archaeological_files/models.py:1893 msgid "Quantity by day - planned" msgstr "" -#: archaeological_files/models.py:1795 +#: archaeological_files/models.py:1897 msgid "Quantity by day - worked" msgstr "" -#: archaeological_files/models.py:1801 +#: archaeological_files/models.py:1903 msgid "Equipment requirement" msgstr "" -#: archaeological_files/models.py:1802 +#: archaeological_files/models.py:1904 msgid "Equipment requirements" msgstr "" @@ -3134,8 +3465,12 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:26 #: archaeological_warehouse/templates/ishtar/sheet_container.html:83 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:76 -#: ishtar_common/models_common.py:4904 +#: ishtar_common/models_common.py:4914 #: ishtar_common/templates/ishtar/sheet_document.html:37 +#: na_app/templates/ishtar/sheet_container.html:90 +#: na_app/templates/ishtar/sheet_find.html:162 +#: na_app/templates/ishtar/sheet_operation.html:143 +#: pdl_app/templates/ishtar/sheet_find.html:150 msgid "Complete identifier" msgstr "" @@ -3157,6 +3492,8 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:184 #: archaeological_operations/templates/ishtar/sheet_operation.html:390 +#: na_app/templates/ishtar/sheet_operation.html:393 +#: pdl_app/templates/ishtar/sheet_operation.html:410 msgid "Associated parcels" msgstr "" @@ -3173,7 +3510,10 @@ msgstr "" #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:300 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:400 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:499 -#: ishtar_common/views.py:187 +#: ishtar_common/views.py:187 na_app/templates/ishtar/sheet_operation.html:398 +#: na_app/templates/ishtar/sheet_operation.html:535 +#: pdl_app/templates/ishtar/sheet_operation.html:415 +#: pdl_app/templates/ishtar/sheet_operation.html:552 msgid "Administrative acts" msgstr "" @@ -3246,6 +3586,8 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:410 #: archaeological_files/templates/ishtar/sheet_file.html:413 #: archaeological_operations/templates/ishtar/sheet_operation.html:227 +#: na_app/templates/ishtar/sheet_operation.html:224 +#: pdl_app/templates/ishtar/sheet_operation.html:227 msgid "Cost" msgstr "" @@ -3257,6 +3599,8 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:217 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:242 #: ishtar_common/models.py:2053 ishtar_common/models.py:2085 +#: na_app/templates/ishtar/sheet_container.html:259 +#: na_app/templates/ishtar/sheet_container.html:283 msgid "Total" msgstr "" @@ -3436,6 +3780,8 @@ msgstr "" #: archaeological_finds/forms.py:405 archaeological_finds/forms.py:1023 #: archaeological_finds/templates/ishtar/sheet_find.html:146 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:146 +#: cd17_app/templates/ishtar/sheet_find.html:154 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:185 msgid "Ownership" msgstr "" @@ -3445,6 +3791,8 @@ msgstr "" #: archaeological_finds/models_finds.py:2317 #: archaeological_finds/templates/ishtar/sheet_find.html:148 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:148 +#: cd17_app/templates/ishtar/sheet_find.html:156 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:187 msgid "Ownership status" msgstr "" @@ -3452,7 +3800,9 @@ msgstr "" #: archaeological_finds/models_finds.py:2321 #: archaeological_finds/templates/ishtar/sheet_find.html:149 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:149 -#: archaeological_operations/models.py:3811 ishtar_common/models.py:4423 +#: archaeological_operations/models.py:3811 +#: cd17_app/templates/ishtar/sheet_find.html:157 ishtar_common/models.py:4423 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:188 msgid "Owner" msgstr "" @@ -3513,6 +3863,8 @@ msgstr "" #: archaeological_finds/models_finds.py:2351 #: archaeological_finds/templates/ishtar/sheet_find.html:169 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:169 +#: cd17_app/templates/ishtar/sheet_find.html:177 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:208 msgid "Donors, testators or vendors" msgstr "" @@ -3520,6 +3872,8 @@ msgstr "" #: archaeological_finds/models_finds.py:2367 #: archaeological_finds/templates/ishtar/sheet_find.html:158 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:158 +#: cd17_app/templates/ishtar/sheet_find.html:166 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:197 #, fuzzy #| msgid "email address" msgid "Collections" @@ -3724,6 +4078,11 @@ msgstr "" #: archaeological_finds/forms.py:2398 #: archaeological_finds/templates/ishtar/sheet_find.html:193 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:193 +#: cd17_app/templates/ishtar/sheet_find.html:201 +#: man_app/templates/ishtar/sheet_museum_find.html:195 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:232 +#: na_app/templates/ishtar/sheet_find.html:217 +#: pdl_app/templates/ishtar/sheet_find.html:210 msgid "Weight (g)" msgstr "" @@ -3770,6 +4129,7 @@ msgstr "" #: archaeological_finds/forms.py:731 archaeological_finds/models_finds.py:619 #: archaeological_finds/templates/ishtar/sheet_basefind.html:51 +#: man_app/templates/ishtar/sheet_basefind.html:47 msgid "Comment on the circumstances of discovery" msgstr "" @@ -3781,12 +4141,14 @@ msgstr "" #: archaeological_finds/forms.py:741 archaeological_finds/forms.py:1850 #: archaeological_finds/models_finds.py:630 #: archaeological_finds/templates/ishtar/sheet_basefind.html:33 +#: man_app/templates/ishtar/sheet_basefind.html:29 msgid "Discovery date (exact or beginning)" msgstr "" #: archaeological_finds/forms.py:744 archaeological_finds/forms.py:1851 #: archaeological_finds/models_finds.py:633 #: archaeological_finds/templates/ishtar/sheet_basefind.html:35 +#: man_app/templates/ishtar/sheet_basefind.html:31 msgid "Discovery date (end)" msgstr "" @@ -3858,6 +4220,9 @@ msgstr "" #: archaeological_finds/forms.py:1027 archaeological_finds/forms.py:1502 #: archaeological_finds/forms.py:1673 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:14 +#: man_app/templates/ishtar/sheet_find_treatments.html:15 +#: na_app/templates/ishtar/sheet_find.html:295 +#: pdl_app/templates/ishtar/sheet_find.html:288 msgid "Preservation" msgstr "" @@ -3881,6 +4246,9 @@ msgstr "" #: archaeological_finds/forms.py:1941 archaeological_finds/models_finds.py:1330 #: archaeological_finds/models_finds.py:2395 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:18 +#: man_app/templates/ishtar/sheet_find_treatments.html:19 +#: na_app/templates/ishtar/sheet_find.html:299 +#: pdl_app/templates/ishtar/sheet_find.html:292 msgid "Conservatory states" msgstr "" @@ -3927,6 +4295,7 @@ msgstr "" #: archaeological_finds/forms.py:1951 archaeological_finds/models_finds.py:1349 #: archaeological_finds/models_finds.py:2429 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:24 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:70 msgid "Insurance value" msgstr "" @@ -3968,7 +4337,7 @@ msgstr "" #: archaeological_finds/forms.py:1459 archaeological_finds/forms.py:2505 #: ishtar_common/models.py:1089 ishtar_common/models.py:2175 -#: ishtar_common/models.py:4415 ishtar_common/models_common.py:3216 +#: ishtar_common/models.py:4415 ishtar_common/models_common.py:3226 #: ishtar_common/models_imports.py:163 ishtar_common/models_imports.py:444 #: ishtar_common/models_imports.py:832 ishtar_common/models_imports.py:3041 msgid "Slug" @@ -4120,6 +4489,8 @@ msgstr "" #: archaeological_finds/models_finds.py:1327 #: archaeological_operations/templates/ishtar/sheet_operation.html:577 #: archaeological_warehouse/forms.py:587 +#: na_app/templates/ishtar/sheet_operation.html:581 +#: pdl_app/templates/ishtar/sheet_operation.html:598 msgid "Material type" msgstr "" @@ -4127,6 +4498,8 @@ msgstr "" #: archaeological_finds/models_finds.py:1328 #: archaeological_operations/templates/ishtar/sheet_operation.html:587 #: archaeological_warehouse/forms.py:593 ishtar_common/models_imports.py:1103 +#: na_app/templates/ishtar/sheet_operation.html:591 +#: pdl_app/templates/ishtar/sheet_operation.html:608 msgid "Object type" msgstr "" @@ -4238,6 +4611,9 @@ msgstr "" #: archaeological_finds/models_finds.py:2231 #: archaeological_finds/templates/ishtar/sheet_find_containers.html:4 #: ishtar_common/forms_common.py:2096 +#: man_app/templates/ishtar/sheet_find_treatments.html:36 +#: na_app/templates/ishtar/sheet_find.html:316 +#: pdl_app/templates/ishtar/sheet_find.html:309 msgid "Reference container" msgstr "" @@ -4248,6 +4624,10 @@ msgstr "" #: archaeological_finds/forms.py:2108 archaeological_finds/models_finds.py:1285 #: archaeological_finds/templates/ishtar/sheet_find_containers.html:29 #: ishtar_common/forms_common.py:2088 +#: man_app/templates/ishtar/sheet_find_treatments.html:61 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:41 +#: na_app/templates/ishtar/sheet_find.html:341 +#: pdl_app/templates/ishtar/sheet_find.html:334 msgid "Current container" msgstr "" @@ -4291,22 +4671,6 @@ msgstr "" msgid "Find basket" msgstr "" -#: archaeological_finds/forms.py:2503 -#: archaeological_finds/forms_treatments.py:57 -#: archaeological_finds/forms_treatments.py:67 -#: archaeological_finds/forms_treatments.py:194 -#: archaeological_finds/models_treatments.py:356 -#: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 -#: archaeological_finds/templates/ishtar/sheet_find_treatments.html:61 -#: archaeological_finds/templates/ishtar/sheet_find_treatments.html:99 -#: ishtar_common/forms_common.py:2026 ishtar_common/models.py:1015 -#: ishtar_common/models.py:1935 ishtar_common/models.py:4413 -#: ishtar_common/models_common.py:181 ishtar_common/models_common.py:232 -#: ishtar_common/models_common.py:2188 ishtar_common/models_common.py:2204 -#: ishtar_common/models_imports.py:706 -msgid "Label" -msgstr "" - #: archaeological_finds/forms.py:2545 archaeological_finds/forms.py:2600 msgid "A basket with this slug already exists." msgstr "" @@ -4339,6 +4703,9 @@ msgstr "" #: ishtar_common/forms_common.py:2515 ishtar_common/forms_common.py:2800 #: ishtar_common/models.py:2533 #: ishtar_common/templates/ishtar/sheet_document.html:40 +#: man_app/templates/ishtar/sheet_find_treatments.html:231 +#: na_app/templates/ishtar/sheet_find.html:432 +#: pdl_app/templates/ishtar/sheet_find.html:425 msgid "Reference" msgstr "" @@ -4558,6 +4925,16 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 #: ishtar_common/forms_common.py:2654 ishtar_common/forms_common.py:2866 #: ishtar_common/templates/ishtar/sheet_document.html:103 +#: man_app/templates/ishtar/sheet_find_treatments.html:124 +#: man_app/templates/ishtar/sheet_find_treatments.html:162 +#: man_app/templates/ishtar/sheet_find_treatments.html:201 +#: na_app/templates/ishtar/sheet_container.html:4 +#: na_app/templates/ishtar/sheet_find.html:402 +#: na_app/templates/ishtar/sheet_find.html:449 +#: na_app/templates/ishtar/sheet_find.html:487 +#: pdl_app/templates/ishtar/sheet_find.html:395 +#: pdl_app/templates/ishtar/sheet_find.html:442 +#: pdl_app/templates/ishtar/sheet_find.html:480 msgid "Container" msgstr "" @@ -4617,6 +4994,9 @@ msgstr "" #: archaeological_finds/models_treatments.py:1425 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:188 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:61 +#: man_app/templates/ishtar/sheet_find_treatments.html:246 +#: na_app/templates/ishtar/sheet_find.html:524 +#: pdl_app/templates/ishtar/sheet_find.html:517 msgid "Applicant" msgstr "" @@ -4625,6 +5005,9 @@ msgstr "" #: archaeological_finds/models_treatments.py:1433 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:189 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:69 +#: man_app/templates/ishtar/sheet_find_treatments.html:247 +#: na_app/templates/ishtar/sheet_find.html:525 +#: pdl_app/templates/ishtar/sheet_find.html:518 msgid "Applicant organisation" msgstr "" @@ -5235,8 +5618,8 @@ msgctxt "key for text search" msgid "denomination" msgstr "" -#: archaeological_finds/models_finds.py:1458 archaeological_finds/tests.py:1588 -#: archaeological_finds/tests.py:1801 archaeological_warehouse/models.py:966 +#: archaeological_finds/models_finds.py:1458 archaeological_finds/tests.py:1628 +#: archaeological_finds/tests.py:1841 archaeological_warehouse/models.py:966 msgctxt "key for text search" msgid "code-patriarche" msgstr "" @@ -5288,8 +5671,8 @@ msgctxt "key for text search" msgid "context-record-relation-type" msgstr "" -#: archaeological_finds/models_finds.py:1509 archaeological_finds/tests.py:1495 -#: archaeological_finds/tests.py:1799 archaeological_warehouse/models.py:1001 +#: archaeological_finds/models_finds.py:1509 archaeological_finds/tests.py:1535 +#: archaeological_finds/tests.py:1839 archaeological_warehouse/models.py:1001 msgctxt "key for text search" msgid "material" msgstr "" @@ -5306,7 +5689,7 @@ msgctxt "key for text search" msgid "recommended-treatments" msgstr "" -#: archaeological_finds/models_finds.py:1522 archaeological_finds/tests.py:1742 +#: archaeological_finds/models_finds.py:1522 archaeological_finds/tests.py:1782 #: archaeological_warehouse/models.py:1013 msgctxt "key for text search" msgid "conservatory" @@ -5369,12 +5752,12 @@ msgid "last-modified-by" msgstr "" #: archaeological_finds/models_finds.py:1572 -#: ishtar_common/models_common.py:1711 +#: ishtar_common/models_common.py:1721 msgctxt "key for text search" msgid "created-by" msgstr "" -#: archaeological_finds/models_finds.py:1575 archaeological_finds/tests.py:1821 +#: archaeological_finds/models_finds.py:1575 archaeological_finds/tests.py:1861 msgctxt "key for text search" msgid "loan" msgstr "" @@ -5627,7 +6010,7 @@ msgctxt "key for text search" msgid "technical-process" msgstr "" -#: archaeological_finds/models_finds.py:1767 archaeological_finds/tests.py:1682 +#: archaeological_finds/models_finds.py:1767 archaeological_finds/tests.py:1722 #, fuzzy #| msgid "email address" msgctxt "key for text search" @@ -5640,7 +6023,7 @@ msgctxt "key for text search" msgid "scientist" msgstr "" -#: archaeological_finds/models_finds.py:1779 archaeological_finds/tests.py:1608 +#: archaeological_finds/models_finds.py:1779 archaeological_finds/tests.py:1648 #: archaeological_operations/models.py:1370 #: archaeological_operations/tests.py:3098 #: archaeological_operations/tests.py:3799 @@ -5806,11 +6189,17 @@ msgstr "" #: archaeological_finds/models_finds.py:2201 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:56 +#: man_app/templates/ishtar/sheet_find_treatments.html:114 +#: na_app/templates/ishtar/sheet_find.html:439 +#: pdl_app/templates/ishtar/sheet_find.html:432 msgid "Upstream treatment" msgstr "" #: archaeological_finds/models_finds.py:2208 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:94 +#: man_app/templates/ishtar/sheet_find_treatments.html:152 +#: na_app/templates/ishtar/sheet_find.html:477 +#: pdl_app/templates/ishtar/sheet_find.html:470 msgid "Downstream treatment" msgstr "" @@ -5846,6 +6235,8 @@ msgstr "" #: archaeological_finds/models_finds.py:2372 #: archaeological_finds/templates/ishtar/sheet_find.html:159 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:159 +#: cd17_app/templates/ishtar/sheet_find.html:167 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:198 msgid "Former collection" msgstr "" @@ -5911,11 +6302,17 @@ msgstr "" #: archaeological_finds/models_finds.py:3890 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:167 +#: man_app/templates/ishtar/sheet_find_treatments.html:225 +#: na_app/templates/ishtar/sheet_find.html:426 +#: pdl_app/templates/ishtar/sheet_find.html:419 msgid "Current" msgstr "" #: archaeological_finds/models_finds.py:3892 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:167 +#: man_app/templates/ishtar/sheet_find_treatments.html:225 +#: na_app/templates/ishtar/sheet_find.html:426 +#: pdl_app/templates/ishtar/sheet_find.html:419 msgid "Reference/current" msgstr "" @@ -6108,6 +6505,14 @@ msgstr "" #: archaeological_finds/models_treatments.py:1052 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:65 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:103 +#: man_app/templates/ishtar/sheet_find_treatments.html:123 +#: man_app/templates/ishtar/sheet_find_treatments.html:161 +#: na_app/templates/ishtar/sheet_find.html:401 +#: na_app/templates/ishtar/sheet_find.html:448 +#: na_app/templates/ishtar/sheet_find.html:486 +#: pdl_app/templates/ishtar/sheet_find.html:394 +#: pdl_app/templates/ishtar/sheet_find.html:441 +#: pdl_app/templates/ishtar/sheet_find.html:479 msgid "Doer" msgstr "" @@ -6156,6 +6561,9 @@ msgstr "" #: archaeological_finds/models_treatments.py:1491 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:180 +#: man_app/templates/ishtar/sheet_find_treatments.html:238 +#: na_app/templates/ishtar/sheet_find.html:516 +#: pdl_app/templates/ishtar/sheet_find.html:509 msgid "Treatment requests" msgstr "" @@ -6239,14 +6647,17 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:10 #: ishtar_common/templates/ishtar/blocks/sheet_external_id.html:3 +#: man_app/templates/ishtar/sheet_basefind.html:7 msgid "Internal ID" msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:27 +#: man_app/templates/ishtar/sheet_basefind.html:23 msgid "Discovery date" msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:30 +#: man_app/templates/ishtar/sheet_basefind.html:26 msgid "Discovery year" msgstr "" @@ -6257,6 +6668,11 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:14 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:14 +#: cd17_app/templates/ishtar/sheet_find.html:14 +#: man_app/templates/ishtar/sheet_museum_find.html:14 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:14 +#: na_app/templates/ishtar/sheet_find.html:14 +#: pdl_app/templates/ishtar/sheet_find.html:14 msgid "" "This sheet has a downstream treatment: it is related to an old version of " "the find." @@ -6264,38 +6680,70 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:49 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:49 +#: cd17_app/templates/ishtar/sheet_find.html:49 +#: man_app/templates/ishtar/sheet_museum_find.html:48 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:88 msgid "Archaeological context" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:56 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:56 +#: cd17_app/templates/ishtar/sheet_find.html:56 +#: man_app/templates/ishtar/sheet_museum_find.html:56 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:95 +#: na_app/templates/ishtar/sheet_find.html:55 +#: pdl_app/templates/ishtar/sheet_find.html:55 msgid "Preservation / Treatments" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:154 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:154 +#: cd17_app/templates/ishtar/sheet_find.html:162 +#: man_app/templates/ishtar/sheet_museum_find.html:147 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:193 +#: na_app/templates/ishtar/sheet_find.html:227 +#: pdl_app/templates/ishtar/sheet_find.html:220 msgid "Museum / legal status" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:166 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:166 +#: cd17_app/templates/ishtar/sheet_find.html:174 +#: man_app/templates/ishtar/sheet_museum_find.html:159 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:205 +#: na_app/templates/ishtar/sheet_find.html:239 +#: pdl_app/templates/ishtar/sheet_find.html:232 msgid "Museum entry date" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:254 +#: archaeological_finds/templates/ishtar/sheet_find.html:257 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:254 +#: cd17_app/templates/ishtar/sheet_find.html:265 +#: man_app/templates/ishtar/sheet_museum_find.html:256 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:293 +#: na_app/templates/ishtar/sheet_find.html:276 +#: pdl_app/templates/ishtar/sheet_find.html:269 msgid "Checked" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_containers.html:30 +#: man_app/templates/ishtar/sheet_find_treatments.html:62 +#: na_app/templates/ishtar/sheet_find.html:342 +#: pdl_app/templates/ishtar/sheet_find.html:335 msgid "Reference container / current container" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:31 +#: man_app/templates/ishtar/sheet_find_treatments.html:32 +#: na_app/templates/ishtar/sheet_find.html:312 +#: pdl_app/templates/ishtar/sheet_find.html:305 msgid "Warehouse - container" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:48 +#: man_app/templates/ishtar/sheet_find_treatments.html:106 +#: na_app/templates/ishtar/sheet_find.html:386 +#: pdl_app/templates/ishtar/sheet_find.html:379 msgid "Container information not available." msgstr "" @@ -6303,12 +6751,33 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:98 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:138 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:184 +#: man_app/templates/ishtar/sheet_find_treatments.html:118 +#: man_app/templates/ishtar/sheet_find_treatments.html:156 +#: man_app/templates/ishtar/sheet_find_treatments.html:196 +#: man_app/templates/ishtar/sheet_find_treatments.html:242 +#: na_app/templates/ishtar/sheet_find.html:397 +#: na_app/templates/ishtar/sheet_find.html:443 +#: na_app/templates/ishtar/sheet_find.html:481 +#: na_app/templates/ishtar/sheet_find.html:520 +#: pdl_app/templates/ishtar/sheet_find.html:390 +#: pdl_app/templates/ishtar/sheet_find.html:436 +#: pdl_app/templates/ishtar/sheet_find.html:474 +#: pdl_app/templates/ishtar/sheet_find.html:513 msgid "Year - index" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:64 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:102 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:141 +#: man_app/templates/ishtar/sheet_find_treatments.html:122 +#: man_app/templates/ishtar/sheet_find_treatments.html:160 +#: man_app/templates/ishtar/sheet_find_treatments.html:199 +#: na_app/templates/ishtar/sheet_find.html:400 +#: na_app/templates/ishtar/sheet_find.html:447 +#: na_app/templates/ishtar/sheet_find.html:485 +#: pdl_app/templates/ishtar/sheet_find.html:393 +#: pdl_app/templates/ishtar/sheet_find.html:440 +#: pdl_app/templates/ishtar/sheet_find.html:478 msgid "Related finds (max. 15 displayed)" msgstr "" @@ -6318,6 +6787,9 @@ msgstr "" #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:48 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:51 +#: man_app/templates/ishtar/sheet_find_treatments.html:148 +#: na_app/templates/ishtar/sheet_find.html:473 +#: pdl_app/templates/ishtar/sheet_find.html:466 msgid "Export as CSV" msgstr "" @@ -6327,27 +6799,49 @@ msgstr "" #: ishtar_common/templates/blocks/JQueryJqGrid.html:29 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:48 +#: man_app/templates/ishtar/sheet_find_treatments.html:148 +#: man_app/templates/ishtar/sheet_find_treatments.html:187 +#: na_app/templates/ishtar/sheet_find.html:473 +#: na_app/templates/ishtar/sheet_find.html:512 +#: pdl_app/templates/ishtar/sheet_find.html:466 +#: pdl_app/templates/ishtar/sheet_find.html:505 msgid "CSV" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:134 +#: man_app/templates/ishtar/sheet_find_treatments.html:192 +#: na_app/templates/ishtar/sheet_find.html:393 +#: pdl_app/templates/ishtar/sheet_find.html:386 msgid "Simple treatments" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:139 +#: man_app/templates/ishtar/sheet_find_treatments.html:197 +#: na_app/templates/ishtar/sheet_find.html:398 +#: pdl_app/templates/ishtar/sheet_find.html:391 msgid "Label/type" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:142 +#: man_app/templates/ishtar/sheet_find_treatments.html:200 msgid "Organization/responsible" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:144 +#: man_app/templates/ishtar/sheet_find_treatments.html:202 +#: na_app/templates/ishtar/sheet_find.html:403 +#: pdl_app/templates/ishtar/sheet_find.html:396 msgid "Date start/end" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:166 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:172 +#: man_app/templates/ishtar/sheet_find_treatments.html:224 +#: man_app/templates/ishtar/sheet_find_treatments.html:230 +#: na_app/templates/ishtar/sheet_find.html:425 +#: na_app/templates/ishtar/sheet_find.html:431 +#: pdl_app/templates/ishtar/sheet_find.html:418 +#: pdl_app/templates/ishtar/sheet_find.html:424 msgid "First packaging" msgstr "" @@ -6376,6 +6870,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:31 #: ishtar_common/forms_common.py:2285 #: ishtar_common/templates/ishtar/sheet_document.html:58 +#: na_app/templates/ishtar/sheet_container.html:35 msgid "Content" msgstr "" @@ -6450,24 +6945,6 @@ msgstr "" msgid "The division {} {} do not exist for the location {}." msgstr "" -#: archaeological_finds/tests.py:1824 archaeological_finds/tests.py:1850 -#: archaeological_finds/tests.py:1860 archaeological_operations/tests.py:3371 -#: ishtar_common/forms.py:1353 ishtar_common/forms.py:1445 -#: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 -#: ishtar_common/templatetags/window_field.py:19 -#: ishtar_common/views_item.py:788 ishtar_common/views_item.py:1061 -#: ishtar_common/views_item.py:1098 ishtar_common/wizards.py:511 -#: views_item.py:785 views_item.py:1058 views_item.py:1095 -msgid "Yes" -msgstr "" - -#: archaeological_finds/tests.py:1825 archaeological_finds/tests.py:1851 -#: archaeological_finds/tests.py:1861 ishtar_common/forms.py:1354 -#: ishtar_common/forms.py:1447 ishtar_common/templatetags/window_field.py:24 -#: ishtar_common/wizards.py:513 -msgid "No" -msgstr "" - #: archaeological_finds/views.py:335 msgid "Basket modify" msgstr "" @@ -6592,6 +7069,8 @@ msgstr "" #: archaeological_operations/models.py:3508 #: archaeological_operations/templates/ishtar/sheet_operation.html:536 #: ishtar_common/templates/ishtar/forms/modify_parcels.html:27 +#: na_app/templates/ishtar/sheet_operation.html:541 +#: pdl_app/templates/ishtar/sheet_operation.html:558 msgid "Parcels" msgstr "" @@ -6709,6 +7188,8 @@ msgstr "" #: archaeological_operations/forms.py:707 #: archaeological_operations/models.py:1675 #: archaeological_operations/templates/ishtar/sheet_operation.html:161 +#: na_app/templates/ishtar/sheet_operation.html:158 +#: pdl_app/templates/ishtar/sheet_operation.html:161 msgid "Address / Locality" msgstr "" @@ -6806,6 +7287,8 @@ msgstr "" #: archaeological_operations/forms.py:1713 #: archaeological_operations/models.py:1719 #: archaeological_operations/templates/ishtar/sheet_operation.html:256 +#: na_app/templates/ishtar/sheet_operation.html:254 +#: pdl_app/templates/ishtar/sheet_operation.html:268 msgid "Documentation deposit date" msgstr "" @@ -6826,6 +7309,8 @@ msgstr "" #: archaeological_operations/forms.py:1720 #: archaeological_operations/models.py:1726 #: archaeological_operations/templates/ishtar/sheet_operation.html:264 +#: na_app/templates/ishtar/sheet_operation.html:262 +#: pdl_app/templates/ishtar/sheet_operation.html:287 msgid "Finds deposit date" msgstr "" @@ -6851,12 +7336,6 @@ msgstr "" msgid "Actors" msgstr "" -#: archaeological_operations/forms.py:729 -#: archaeological_operations/models.py:1565 -#: archaeological_operations/models.py:3176 -msgid "Head scientist" -msgstr "" - #: archaeological_operations/forms.py:751 #: archaeological_operations/forms.py:1335 #: archaeological_operations/forms.py:1723 @@ -6924,6 +7403,8 @@ msgstr "E-Mail-Adresse" #: archaeological_operations/forms.py:935 #: archaeological_operations/templates/ishtar/sheet_operation.html:324 +#: na_app/templates/ishtar/sheet_operation.html:330 +#: pdl_app/templates/ishtar/sheet_operation.html:347 msgid "Court-ordered seizure" msgstr "" @@ -7447,7 +7928,8 @@ msgstr "" #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:236 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:344 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:443 -#: ishtar_common/views.py:172 +#: ishtar_common/views.py:172 na_app/templates/ishtar/sheet_operation.html:372 +#: pdl_app/templates/ishtar/sheet_operation.html:389 msgid "Archaeological sites" msgstr "" @@ -7469,8 +7951,7 @@ msgstr "E-Mail-Adresse" #: archaeological_operations/models.py:983 ishtar_common/forms.py:1352 #: ishtar_common/models.py:6152 ishtar_common/models.py:6313 -#: ishtar_common/models.py:6373 ishtar_common/views_item.py:2039 -#: views_item.py:2037 +#: ishtar_common/models.py:6373 ishtar_common/views_item.py:2049 msgid "Unknown" msgstr "" @@ -7645,7 +8126,7 @@ msgctxt "key for text search" msgid "file" msgstr "" -#: archaeological_operations/models.py:1607 ishtar_common/models_common.py:3623 +#: archaeological_operations/models.py:1607 ishtar_common/models_common.py:3633 msgid "Surface (m2)" msgstr "" @@ -7954,8 +8435,8 @@ msgstr "" #: archaeological_operations/models.py:3503 ishtar_common/models.py:2808 #: ishtar_common/models.py:3125 ishtar_common/models.py:4558 -#: ishtar_common/models_common.py:3649 ishtar_common/models_common.py:3688 -#: ishtar_common/models_common.py:4897 +#: ishtar_common/models_common.py:3659 ishtar_common/models_common.py:3698 +#: ishtar_common/models_common.py:4907 msgid "Cached name" msgstr "" @@ -7992,11 +8473,14 @@ msgid "No parcel" msgstr "" #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:28 +#: cd93_app/templates/ishtar/sheet_administrativeact.html:28 #: ishtar_common/templates/ishtar/sheet_document.html:28 msgid "View PDF" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:54 +#: na_app/templates/ishtar/sheet_operation.html:53 +#: pdl_app/templates/ishtar/sheet_operation.html:53 msgid "Archaeological sites/parcels/Administrativ acts" msgstr "" @@ -8010,7 +8494,12 @@ msgstr "" #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:244 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:351 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:450 -#: ishtar_common/views.py:175 +#: ishtar_common/views.py:175 na_app/templates/ishtar/sheet_operation.html:80 +#: na_app/templates/ishtar/sheet_operation.html:448 +#: na_app/templates/ishtar/sheet_operation.html:546 +#: pdl_app/templates/ishtar/sheet_operation.html:80 +#: pdl_app/templates/ishtar/sheet_operation.html:465 +#: pdl_app/templates/ishtar/sheet_operation.html:563 msgid "Context records" msgstr "" @@ -8021,35 +8510,61 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:38 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:174 #: ishtar_common/templates/blocks/DataTables-tabs.html:30 +#: na_app/templates/ishtar/sheet_container.html:42 +#: na_app/templates/ishtar/sheet_container.html:222 +#: na_app/templates/ishtar/sheet_operation.html:116 +#: na_app/templates/ishtar/sheet_operation.html:515 +#: pdl_app/templates/ishtar/sheet_operation.html:116 +#: pdl_app/templates/ishtar/sheet_operation.html:532 msgid "Statistics" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:166 +#: na_app/templates/ishtar/sheet_operation.html:163 +#: pdl_app/templates/ishtar/sheet_operation.html:166 msgid "Excavation dates (start/end)" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:235 +#: na_app/templates/ishtar/sheet_operation.html:232 +#: pdl_app/templates/ishtar/sheet_operation.html:235 msgid "Duration" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:298 +#: na_app/templates/ishtar/sheet_operation.html:304 +#: pdl_app/templates/ishtar/sheet_operation.html:321 msgid "This operation is virtual." msgstr "" +#: archaeological_operations/templates/ishtar/sheet_operation.html:305 +#: na_app/templates/ishtar/sheet_operation.html:311 +#: pdl_app/templates/ishtar/sheet_operation.html:328 +msgid "Patriarche OA code not yet recorded!" +msgstr "" + #: archaeological_operations/templates/ishtar/sheet_operation.html:432 +#: na_app/templates/ishtar/sheet_operation.html:439 +#: pdl_app/templates/ishtar/sheet_operation.html:456 msgid "No relations" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:453 +#: na_app/templates/ishtar/sheet_operation.html:458 +#: pdl_app/templates/ishtar/sheet_operation.html:475 msgid "Documents from associated context records" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:459 +#: na_app/templates/ishtar/sheet_operation.html:463 +#: pdl_app/templates/ishtar/sheet_operation.html:480 msgid "Diagram of stratigraphic relations" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:487 #: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:8 +#: na_app/templates/ishtar/sheet_operation.html:492 +#: pdl_app/templates/ishtar/sheet_operation.html:509 msgid "Associated containers" msgstr "" @@ -8063,26 +8578,39 @@ msgstr "" #: ishtar_common/templates/ishtar/blocks/window_nav.html:86 #: ishtar_common/templates/ishtar/blocks/window_nav.html:92 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:46 +#: na_app/templates/ishtar/sheet_container.html:227 +#: na_app/templates/ishtar/sheet_operation.html:520 +#: pdl_app/templates/ishtar/sheet_operation.html:537 msgid "Export" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:520 #: archaeological_warehouse/templates/ishtar/sheet_container.html:227 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:190 +#: na_app/templates/ishtar/sheet_container.html:232 +#: na_app/templates/ishtar/sheet_operation.html:525 +#: pdl_app/templates/ishtar/sheet_operation.html:542 msgid "Regenerate statistics" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:525 #: archaeological_warehouse/templates/ishtar/sheet_container.html:232 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:195 +#: na_app/templates/ishtar/sheet_container.html:237 +#: na_app/templates/ishtar/sheet_operation.html:530 +#: pdl_app/templates/ishtar/sheet_operation.html:547 msgid "Last update:" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:606 +#: na_app/templates/ishtar/sheet_operation.html:610 +#: pdl_app/templates/ishtar/sheet_operation.html:627 msgid "Sources" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:624 +#: na_app/templates/ishtar/sheet_operation.html:628 +#: pdl_app/templates/ishtar/sheet_operation.html:645 msgid "Finds by context records" msgstr "" @@ -8119,7 +8647,7 @@ msgstr "" msgid "This item has been locked. Edition is disabled." msgstr "" -#: archaeological_operations/tests.py:3376 ishtar_common/models_common.py:1719 +#: archaeological_operations/tests.py:3376 ishtar_common/models_common.py:1729 msgctxt "key for text search" msgid "created" msgstr "" @@ -8250,6 +8778,7 @@ msgstr "" #: archaeological_warehouse/forms.py:138 archaeological_warehouse/models.py:408 #: archaeological_warehouse/templates/ishtar/sheet_container.html:190 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:142 +#: na_app/templates/ishtar/sheet_container.html:195 msgid "Divisions" msgstr "" @@ -8293,27 +8822,27 @@ msgid "" msgstr "" #: archaeological_warehouse/forms.py:253 ishtar_common/forms_common.py:785 -#: ishtar_common/forms_common.py:1204 ishtar_common/models_common.py:4162 -#: ishtar_common/models_common.py:4372 +#: ishtar_common/forms_common.py:1204 ishtar_common/models_common.py:4172 +#: ishtar_common/models_common.py:4382 msgid "Address complement" msgstr "" #: archaeological_warehouse/forms.py:256 ishtar_common/forms_common.py:788 -#: ishtar_common/forms_common.py:1207 ishtar_common/models_common.py:4167 +#: ishtar_common/forms_common.py:1207 ishtar_common/models_common.py:4177 #: ishtar_common/templates/ishtar/sheet_person.html:57 #: ishtar_common/templates/ishtar/sheet_person.html:77 msgid "Town (freeform)" msgstr "" #: archaeological_warehouse/forms.py:258 ishtar_common/forms_common.py:790 -#: ishtar_common/forms_common.py:1209 ishtar_common/models_common.py:4173 +#: ishtar_common/forms_common.py:1209 ishtar_common/models_common.py:4183 msgid "Country" msgstr "" #: archaeological_warehouse/forms.py:259 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:124 #: ishtar_common/forms_common.py:792 ishtar_common/forms_common.py:1180 -#: ishtar_common/models_common.py:4187 ishtar_common/models_common.py:4384 +#: ishtar_common/models_common.py:4197 ishtar_common/models_common.py:4394 #: ishtar_common/templates/ishtar/sheet_person.html:27 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:35 msgid "Phone" @@ -8322,7 +8851,7 @@ msgstr "" #: archaeological_warehouse/forms.py:261 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:125 #: ishtar_common/forms_common.py:794 ishtar_common/forms_common.py:1190 -#: ishtar_common/models_common.py:4203 +#: ishtar_common/models_common.py:4213 #: ishtar_common/templates/ishtar/sheet_person.html:45 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:56 msgid "Mobile phone" @@ -8355,6 +8884,7 @@ msgstr "" #: archaeological_warehouse/models.py:1179 #: archaeological_warehouse/templates/ishtar/sheet_container.html:154 #: ishtar_common/models_imports.py:1095 +#: na_app/templates/ishtar/sheet_container.html:161 msgid "Container type" msgstr "" @@ -8505,7 +9035,7 @@ msgstr "" #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:284 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:386 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:485 -#: ishtar_common/views.py:183 +#: ishtar_common/views.py:183 na_app/templates/ishtar/sheet_container.html:197 msgid "Containers" msgstr "" @@ -8789,52 +9319,63 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:108 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:90 +#: na_app/templates/ishtar/sheet_container.html:115 msgid "Number of containers" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:112 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:94 +#: na_app/templates/ishtar/sheet_container.html:119 msgid "Number of divisions" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:116 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:98 +#: na_app/templates/ishtar/sheet_container.html:123 msgid "Number of owned finds" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:120 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:102 +#: na_app/templates/ishtar/sheet_container.html:127 #, fuzzy #| msgid "email address" msgid "Number of hosted finds" msgstr "E-Mail-Adresse" #: archaeological_warehouse/templates/ishtar/sheet_container.html:129 +#: na_app/templates/ishtar/sheet_container.html:136 msgid "Measured weight (kg)" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:130 +#: na_app/templates/ishtar/sheet_container.html:137 msgid "Calculated weight (kg)" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:134 +#: na_app/templates/ishtar/sheet_container.html:141 #, python-format msgid "Calculated weight and measured weight are too different (over 10%%)." msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:209 +#: na_app/templates/ishtar/sheet_container.html:214 msgid "Empty" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:240 +#: na_app/templates/ishtar/sheet_container.html:245 msgid "No container/division inside this container." msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:246 +#: na_app/templates/ishtar/sheet_container.html:251 msgid "Finds by location" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:270 +#: na_app/templates/ishtar/sheet_container.html:275 msgid "Containers by location" msgstr "" @@ -9000,13 +9541,12 @@ msgid "Export selected as CSV file" msgstr "" #: ishtar_common/admin.py:204 ishtar_common/models_imports.py:943 -#: ishtar_common/views_item.py:789 ishtar_common/views_item.py:1857 -#: views_item.py:786 views_item.py:1855 +#: ishtar_common/views_item.py:799 ishtar_common/views_item.py:1867 msgid "True" msgstr "" #: ishtar_common/admin.py:204 ishtar_common/models_imports.py:943 -#: ishtar_common/views_item.py:1859 views_item.py:1857 +#: ishtar_common/views_item.py:1869 msgid "False" msgstr "" @@ -9269,7 +9809,7 @@ msgstr "" msgid "No json file found in zipfile" msgstr "" -#: ishtar_common/admin.py:1402 ishtar_common/models_common.py:3747 +#: ishtar_common/admin.py:1402 ishtar_common/models_common.py:3757 msgid "Town limit" msgstr "" @@ -9505,11 +10045,6 @@ msgstr "" msgid "Update table, export format and types from source" msgstr "" -#: ishtar_common/admin.py:3130 -msgid "" -"Document not generated: is the LibreOffice daemon configured and running?" -msgstr "" - #: ishtar_common/admin.py:3150 msgid "Generate match document" msgstr "" @@ -9615,184 +10150,184 @@ msgstr "" msgid "changelog" msgstr "" -#: ishtar_common/data_importer.py:283 +#: ishtar_common/data_importer.py:290 #, python-format msgid "\"%(value)s\" is too long. The max length is %(length)d characters." msgstr "" -#: ishtar_common/data_importer.py:302 +#: ishtar_common/data_importer.py:309 #, python-format msgid "\"%(value)s\" not equal to yes or no" msgstr "" -#: ishtar_common/data_importer.py:314 +#: ishtar_common/data_importer.py:321 #, python-format msgid "\"%(value)s\" is not a float" msgstr "" -#: ishtar_common/data_importer.py:324 +#: ishtar_common/data_importer.py:331 #, python-brace-format msgid "\"{value}\" is not an appropriate INSEE code" msgstr "" -#: ishtar_common/data_importer.py:381 ishtar_common/data_importer.py:395 -#: ishtar_common/data_importer.py:619 +#: ishtar_common/data_importer.py:388 ishtar_common/data_importer.py:402 +#: ishtar_common/data_importer.py:626 #, python-format msgid "\"%(value)s\" is not a valid date" msgstr "" -#: ishtar_common/data_importer.py:408 +#: ishtar_common/data_importer.py:415 #, python-format msgid "\"%(value)s\" is not an integer" msgstr "" -#: ishtar_common/data_importer.py:477 +#: ishtar_common/data_importer.py:484 #, python-format msgid "Choice for \"%s\" is not available. Which one is relevant?\n" msgstr "" -#: ishtar_common/data_importer.py:484 +#: ishtar_common/data_importer.py:491 #, python-format msgid "%d. None of the above - create new" msgstr "" -#: ishtar_common/data_importer.py:486 +#: ishtar_common/data_importer.py:493 #, python-format msgid "%d. None of the above - skip" msgstr "" -#: ishtar_common/data_importer.py:642 +#: ishtar_common/data_importer.py:649 #, python-format msgid "\"%(full_link)s\" is not a valid path" msgstr "" -#: ishtar_common/data_importer.py:670 +#: ishtar_common/data_importer.py:677 #, python-format msgid "\"%(value)s\" is not a valid path for the given archive" msgstr "" -#: ishtar_common/data_importer.py:781 +#: ishtar_common/data_importer.py:788 msgid "" "The given file is not correct. Check the file format. If you use a CSV file: " "check that column separator and encoding are similar to the ones used by the " "reference file." msgstr "" -#: ishtar_common/data_importer.py:787 +#: ishtar_common/data_importer.py:794 #, python-format msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d" msgstr "" -#: ishtar_common/data_importer.py:789 ishtar_common/views.py:2123 +#: ishtar_common/data_importer.py:796 ishtar_common/views.py:2123 msgid "No data provided" msgstr "" -#: ishtar_common/data_importer.py:790 +#: ishtar_common/data_importer.py:797 msgid "Value is required" msgstr "" -#: ishtar_common/data_importer.py:791 +#: ishtar_common/data_importer.py:798 #, python-format msgid "At least %d columns must be filled" msgstr "" -#: ishtar_common/data_importer.py:792 +#: ishtar_common/data_importer.py:799 msgid "The regexp doesn't match." msgstr "" -#: ishtar_common/data_importer.py:794 +#: ishtar_common/data_importer.py:801 msgid "" "Forced creation is set for model {} but this model is not in the list of " "models allowed to be created." msgstr "" -#: ishtar_common/data_importer.py:798 +#: ishtar_common/data_importer.py:805 msgid "" "{} with values {} doesn't exist in the database. Create it first or fix your " "source file." msgstr "" -#: ishtar_common/data_importer.py:802 +#: ishtar_common/data_importer.py:809 msgid "" "Related object not found. Can not create the geographic item. Context: {}." msgstr "" -#: ishtar_common/data_importer.py:898 +#: ishtar_common/data_importer.py:905 msgid "" "Item {} with values: {} not identified for post-treatment - need a non " "ambiguous key" msgstr "" -#: ishtar_common/data_importer.py:1514 ishtar_common/views.py:2201 +#: ishtar_common/data_importer.py:1521 ishtar_common/views.py:2201 #: ishtar_common/views.py:2211 msgid "Not imported" msgstr "" -#: ishtar_common/data_importer.py:1811 +#: ishtar_common/data_importer.py:1818 msgid "Importer configuration error: \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1816 +#: ishtar_common/data_importer.py:1823 msgid "Import error: {} - \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1904 +#: ishtar_common/data_importer.py:1911 msgid "Importer configuration error: field \"{}\" does not exist for {}." msgstr "" -#: ishtar_common/data_importer.py:2035 +#: ishtar_common/data_importer.py:2042 msgid "* created *" msgstr "" -#: ishtar_common/data_importer.py:2105 +#: ishtar_common/data_importer.py:2112 msgid "* match not find *" msgstr "" -#: ishtar_common/data_importer.py:2113 +#: ishtar_common/data_importer.py:2120 msgid "* the query match more than 10 results*" msgstr "" -#: ishtar_common/data_importer.py:2118 +#: ishtar_common/data_importer.py:2125 msgid " or " msgstr "" -#: ishtar_common/data_importer.py:2208 +#: ishtar_common/data_importer.py:2213 msgid "unicity key(s) \"{}\" is/are missing" msgstr "" -#: ishtar_common/data_importer.py:2211 +#: ishtar_common/data_importer.py:2216 msgid "Import error {}, {}" msgstr "" -#: ishtar_common/data_importer.py:2298 +#: ishtar_common/data_importer.py:2303 msgid "Import error {}, path \"{}\", context : {}, error : {}" msgstr "" -#: ishtar_common/data_importer.py:2328 +#: ishtar_common/data_importer.py:2333 msgid "line" msgstr "" -#: ishtar_common/data_importer.py:2328 +#: ishtar_common/data_importer.py:2333 msgid "col" msgstr "" -#: ishtar_common/data_importer.py:2328 +#: ishtar_common/data_importer.py:2333 msgid "error" msgstr "" -#: ishtar_common/data_importer.py:2335 +#: ishtar_common/data_importer.py:2340 msgid "field" msgstr "" -#: ishtar_common/data_importer.py:2335 +#: ishtar_common/data_importer.py:2340 msgid "source" msgstr "" -#: ishtar_common/data_importer.py:2335 +#: ishtar_common/data_importer.py:2340 msgid "result" msgstr "" -#: ishtar_common/data_importer.py:2351 +#: ishtar_common/data_importer.py:2356 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "" @@ -10090,8 +10625,8 @@ msgstr "" #: ishtar_common/forms_common.py:791 ishtar_common/forms_common.py:1040 #: ishtar_common/forms_common.py:1176 ishtar_common/forms_common.py:1271 -#: ishtar_common/forms_common.py:1530 ishtar_common/models_common.py:4205 -#: ishtar_common/models_common.py:4394 ishtar_common/wizards.py:2050 +#: ishtar_common/forms_common.py:1530 ishtar_common/models_common.py:4215 +#: ishtar_common/models_common.py:4404 ishtar_common/wizards.py:2050 msgid "Email" msgstr "E-Mail-Adresse" @@ -10172,12 +10707,12 @@ msgstr "" msgid "Raw name" msgstr "" -#: ishtar_common/forms_common.py:1178 ishtar_common/models_common.py:4189 +#: ishtar_common/forms_common.py:1178 ishtar_common/models_common.py:4199 msgid "Phone description" msgstr "" -#: ishtar_common/forms_common.py:1182 ishtar_common/models_common.py:4192 -#: ishtar_common/models_common.py:4195 +#: ishtar_common/forms_common.py:1182 ishtar_common/models_common.py:4202 +#: ishtar_common/models_common.py:4205 msgid "Phone description 2" msgstr "" @@ -10185,11 +10720,11 @@ msgstr "" msgid "Phone 2" msgstr "" -#: ishtar_common/forms_common.py:1186 ishtar_common/models_common.py:4199 +#: ishtar_common/forms_common.py:1186 ishtar_common/models_common.py:4209 msgid "Phone description 3" msgstr "" -#: ishtar_common/forms_common.py:1188 ishtar_common/models_common.py:4197 +#: ishtar_common/forms_common.py:1188 ishtar_common/models_common.py:4207 msgid "Phone 3" msgstr "" @@ -10197,23 +10732,23 @@ msgstr "" msgid "Current organization" msgstr "" -#: ishtar_common/forms_common.py:1211 ishtar_common/models_common.py:4174 +#: ishtar_common/forms_common.py:1211 ishtar_common/models_common.py:4184 msgid "Other address: address" msgstr "" -#: ishtar_common/forms_common.py:1214 ishtar_common/models_common.py:4176 +#: ishtar_common/forms_common.py:1214 ishtar_common/models_common.py:4186 msgid "Other address: address complement" msgstr "" -#: ishtar_common/forms_common.py:1219 ishtar_common/models_common.py:4179 +#: ishtar_common/forms_common.py:1219 ishtar_common/models_common.py:4189 msgid "Other address: postal code" msgstr "" -#: ishtar_common/forms_common.py:1222 ishtar_common/models_common.py:4182 +#: ishtar_common/forms_common.py:1222 ishtar_common/models_common.py:4192 msgid "Other address: town" msgstr "" -#: ishtar_common/forms_common.py:1225 ishtar_common/models_common.py:4185 +#: ishtar_common/forms_common.py:1225 ishtar_common/models_common.py:4195 msgid "Other address: country" msgstr "" @@ -10275,7 +10810,7 @@ msgstr "E-Mail-Adresse" #: ishtar_common/ishtar_menu.py:83 ishtar_common/models.py:3620 #: ishtar_common/models.py:3704 ishtar_common/models.py:3743 #: ishtar_common/models.py:4128 ishtar_common/models_common.py:940 -#: ishtar_common/models_common.py:968 ishtar_common/models_common.py:3238 +#: ishtar_common/models_common.py:968 ishtar_common/models_common.py:3248 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:4 #: ishtar_common/templates/ishtar/sheet_person.html:21 msgid "Account" @@ -10667,7 +11202,7 @@ msgid "There are identical authors." msgstr "" #: ishtar_common/forms_common.py:3046 ishtar_common/forms_common.py:3111 -#: ishtar_common/models.py:1016 ishtar_common/models_common.py:3218 +#: ishtar_common/models.py:1016 ishtar_common/models_common.py:3228 msgid "Query" msgstr "" @@ -10695,7 +11230,7 @@ msgstr "" msgid "Geo item - 010 - General" msgstr "" -#: ishtar_common/forms_common.py:3157 ishtar_common/models_common.py:2434 +#: ishtar_common/forms_common.py:3157 ishtar_common/models_common.py:2444 msgid "Import key" msgstr "" @@ -10705,19 +11240,19 @@ msgid "" "overwrite the data." msgstr "" -#: ishtar_common/forms_common.py:3172 ishtar_common/models_common.py:2449 +#: ishtar_common/forms_common.py:3172 ishtar_common/models_common.py:2459 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:6 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:33 msgid "Data type" msgstr "" -#: ishtar_common/forms_common.py:3175 ishtar_common/models_common.py:2441 +#: ishtar_common/forms_common.py:3175 ishtar_common/models_common.py:2451 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:10 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:30 msgid "Origin" msgstr "" -#: ishtar_common/forms_common.py:3178 ishtar_common/models_common.py:2457 +#: ishtar_common/forms_common.py:3178 ishtar_common/models_common.py:2467 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:11 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:36 msgid "Provider" @@ -10731,7 +11266,7 @@ msgid "Acquisition date" msgstr "E-Mail-Adresse" #: ishtar_common/forms_common.py:3182 ishtar_common/forms_common.py:3233 -#: ishtar_common/models_common.py:2422 +#: ishtar_common/models_common.py:2432 msgid "Buffer" msgstr "" @@ -10739,18 +11274,18 @@ msgstr "" msgid "Buffer type" msgstr "" -#: ishtar_common/forms_common.py:3191 ishtar_common/models_common.py:2471 -#: ishtar_common/models_common.py:4731 +#: ishtar_common/forms_common.py:3191 ishtar_common/models_common.py:2481 +#: ishtar_common/models_common.py:4741 msgid "Estimated error for X" msgstr "" -#: ishtar_common/forms_common.py:3196 ishtar_common/models_common.py:2474 -#: ishtar_common/models_common.py:4734 +#: ishtar_common/forms_common.py:3196 ishtar_common/models_common.py:2484 +#: ishtar_common/models_common.py:4744 msgid "Estimated error for Y" msgstr "" -#: ishtar_common/forms_common.py:3201 ishtar_common/models_common.py:2477 -#: ishtar_common/models_common.py:4737 +#: ishtar_common/forms_common.py:3201 ishtar_common/models_common.py:2487 +#: ishtar_common/models_common.py:4747 msgid "Estimated error for Z" msgstr "" @@ -10759,10 +11294,10 @@ msgid "Metadata" msgstr "" #: ishtar_common/forms_common.py:3232 ishtar_common/models.py:2559 -#: ishtar_common/models_common.py:2219 ishtar_common/models_common.py:2277 -#: ishtar_common/models_common.py:2309 ishtar_common/models_common.py:2326 -#: ishtar_common/models_common.py:2343 ishtar_common/models_common.py:2356 -#: ishtar_common/models_common.py:2501 ishtar_common/models_common.py:3670 +#: ishtar_common/models_common.py:2229 ishtar_common/models_common.py:2287 +#: ishtar_common/models_common.py:2319 ishtar_common/models_common.py:2336 +#: ishtar_common/models_common.py:2353 ishtar_common/models_common.py:2366 +#: ishtar_common/models_common.py:2511 ishtar_common/models_common.py:3680 msgid "Geography" msgstr "" @@ -10790,8 +11325,8 @@ msgstr "" msgid "Coordinates" msgstr "" -#: ishtar_common/forms_common.py:3513 ishtar_common/models_common.py:2376 -#: ishtar_common/models_common.py:4746 +#: ishtar_common/forms_common.py:3513 ishtar_common/models_common.py:2386 +#: ishtar_common/models_common.py:4756 msgid "Point" msgstr "" @@ -12163,7 +12698,7 @@ msgstr "" msgid "Groups" msgstr "" -#: ishtar_common/models.py:3608 ishtar_common/models_common.py:3242 +#: ishtar_common/models.py:3608 ishtar_common/models_common.py:3252 msgid "Permissions queries" msgstr "" @@ -12290,7 +12825,7 @@ msgstr "" msgid "Ishtar users" msgstr "" -#: ishtar_common/models.py:4305 ishtar_common/models_common.py:1730 +#: ishtar_common/models.py:4305 ishtar_common/models_common.py:1740 #, fuzzy #| msgid "email address" msgctxt "key for text search" @@ -12303,7 +12838,7 @@ msgstr "E-Mail-Adresse" msgid "Regenerate permissions" msgstr "E-Mail-Adresse" -#: ishtar_common/models.py:4373 ishtar_common/models_common.py:3605 +#: ishtar_common/models.py:4373 ishtar_common/models_common.py:3615 msgid "regen." msgstr "" @@ -12521,7 +13056,7 @@ msgctxt "key for text search" msgid "warehouse" msgstr "" -#: ishtar_common/models.py:5073 ishtar_common/models_common.py:2003 +#: ishtar_common/models.py:5073 ishtar_common/models_common.py:2013 msgctxt "key for text search" msgid "has-image" msgstr "" @@ -12857,439 +13392,439 @@ msgstr "" msgid "Auto filled at save" msgstr "" -#: ishtar_common/models_common.py:1272 +#: ishtar_common/models_common.py:1274 #, fuzzy #| msgid "email address" msgid "Created by imports" msgstr "E-Mail-Adresse" -#: ishtar_common/models_common.py:1274 +#: ishtar_common/models_common.py:1276 msgid "Timestamp geo" msgstr "" -#: ishtar_common/models_common.py:1275 +#: ishtar_common/models_common.py:1277 msgid "Timestamp label" msgstr "" -#: ishtar_common/models_common.py:1278 +#: ishtar_common/models_common.py:1280 #, fuzzy #| msgid "email address" msgid "Updated by imports" msgstr "E-Mail-Adresse" -#: ishtar_common/models_common.py:1283 +#: ishtar_common/models_common.py:1285 msgctxt "key for text search" msgid "imports" msgstr "" -#: ishtar_common/models_common.py:1667 +#: ishtar_common/models_common.py:1677 msgid "Last editor" msgstr "" -#: ishtar_common/models_common.py:1675 +#: ishtar_common/models_common.py:1685 msgid "Creator" msgstr "" -#: ishtar_common/models_common.py:1682 ishtar_common/models_common.py:2426 +#: ishtar_common/models_common.py:1692 ishtar_common/models_common.py:2436 msgid "Need update" msgstr "" -#: ishtar_common/models_common.py:1684 +#: ishtar_common/models_common.py:1694 msgid "Item locked for edition" msgstr "" -#: ishtar_common/models_common.py:1690 +#: ishtar_common/models_common.py:1700 msgid "Locked by" msgstr "" -#: ishtar_common/models_common.py:1715 +#: ishtar_common/models_common.py:1725 msgctxt "key for text search" msgid "modified-by" msgstr "" -#: ishtar_common/models_common.py:1723 +#: ishtar_common/models_common.py:1733 msgctxt "key for text search" msgid "modified" msgstr "" -#: ishtar_common/models_common.py:1727 +#: ishtar_common/models_common.py:1737 msgctxt "key for text search" msgid "locked" msgstr "" -#: ishtar_common/models_common.py:2007 +#: ishtar_common/models_common.py:2017 msgctxt "key for text search" msgid "has-url" msgstr "" -#: ishtar_common/models_common.py:2011 +#: ishtar_common/models_common.py:2021 msgctxt "key for text search" msgid "has-attached-file" msgstr "" -#: ishtar_common/models_common.py:2015 +#: ishtar_common/models_common.py:2025 msgctxt "key for text search" msgid "document-type" msgstr "" -#: ishtar_common/models_common.py:2100 +#: ishtar_common/models_common.py:2110 msgid "Add document/image" msgstr "" -#: ishtar_common/models_common.py:2102 +#: ishtar_common/models_common.py:2112 msgid "doc./image" msgstr "" -#: ishtar_common/models_common.py:2265 ishtar_common/models_common.py:2286 +#: ishtar_common/models_common.py:2275 ishtar_common/models_common.py:2296 msgid "Authority name" msgstr "" -#: ishtar_common/models_common.py:2266 ishtar_common/models_common.py:2286 +#: ishtar_common/models_common.py:2276 ishtar_common/models_common.py:2296 msgid "Authority SRID" msgstr "" -#: ishtar_common/models_common.py:2267 +#: ishtar_common/models_common.py:2277 msgid "Number of decimal places" msgstr "" -#: ishtar_common/models_common.py:2268 +#: ishtar_common/models_common.py:2278 msgid "Number of decimal places for Z" msgstr "" -#: ishtar_common/models_common.py:2271 +#: ishtar_common/models_common.py:2281 msgid "Geographic - Spatial reference system" msgstr "" -#: ishtar_common/models_common.py:2272 +#: ishtar_common/models_common.py:2282 msgid "Geographic - Spatial reference systems" msgstr "" -#: ishtar_common/models_common.py:2303 +#: ishtar_common/models_common.py:2313 msgid "Geographic - Origin type" msgstr "" -#: ishtar_common/models_common.py:2304 +#: ishtar_common/models_common.py:2314 msgid "Geographic - Origin types" msgstr "" -#: ishtar_common/models_common.py:2320 +#: ishtar_common/models_common.py:2330 msgid "Geographic - Data type" msgstr "" -#: ishtar_common/models_common.py:2321 +#: ishtar_common/models_common.py:2331 msgid "Geographic - Data types" msgstr "" -#: ishtar_common/models_common.py:2337 +#: ishtar_common/models_common.py:2347 msgid "Geographic - Provider type" msgstr "" -#: ishtar_common/models_common.py:2338 +#: ishtar_common/models_common.py:2348 msgid "Geographic - Provider types" msgstr "" -#: ishtar_common/models_common.py:2350 +#: ishtar_common/models_common.py:2360 msgid "Geographic - Buffer type" msgstr "" -#: ishtar_common/models_common.py:2351 +#: ishtar_common/models_common.py:2361 msgid "Geographic - Buffer types" msgstr "" -#: ishtar_common/models_common.py:2377 +#: ishtar_common/models_common.py:2387 msgid "Line(s)" msgstr "" -#: ishtar_common/models_common.py:2378 +#: ishtar_common/models_common.py:2388 msgid "Point(s)" msgstr "" -#: ishtar_common/models_common.py:2379 +#: ishtar_common/models_common.py:2389 msgid "Polygon(s)" msgstr "" -#: ishtar_common/models_common.py:2435 +#: ishtar_common/models_common.py:2445 msgid "Use this for update imports" msgstr "" -#: ishtar_common/models_common.py:2442 +#: ishtar_common/models_common.py:2452 msgid "For instance: topographical survey, georeferencing, ..." msgstr "" -#: ishtar_common/models_common.py:2450 +#: ishtar_common/models_common.py:2460 msgid "For instance: outline, z-sup, ..." msgstr "" -#: ishtar_common/models_common.py:2458 +#: ishtar_common/models_common.py:2468 msgid "Data provider" msgstr "" -#: ishtar_common/models_common.py:2462 ishtar_common/models_common.py:4727 +#: ishtar_common/models_common.py:2472 ishtar_common/models_common.py:4737 msgid "X" msgstr "" -#: ishtar_common/models_common.py:2462 ishtar_common/models_common.py:2463 -#: ishtar_common/models_common.py:2464 +#: ishtar_common/models_common.py:2472 ishtar_common/models_common.py:2473 +#: ishtar_common/models_common.py:2474 msgid "User input" msgstr "" -#: ishtar_common/models_common.py:2463 ishtar_common/models_common.py:4728 +#: ishtar_common/models_common.py:2473 ishtar_common/models_common.py:4738 msgid "Y" msgstr "" -#: ishtar_common/models_common.py:2464 ishtar_common/models_common.py:4729 +#: ishtar_common/models_common.py:2474 ishtar_common/models_common.py:4739 msgid "Z" msgstr "" -#: ishtar_common/models_common.py:2467 +#: ishtar_common/models_common.py:2477 msgid "X (cached)" msgstr "" -#: ishtar_common/models_common.py:2468 +#: ishtar_common/models_common.py:2478 msgid "Y (cached)" msgstr "" -#: ishtar_common/models_common.py:2469 +#: ishtar_common/models_common.py:2479 msgid "Z (cached)" msgstr "" -#: ishtar_common/models_common.py:2481 ishtar_common/models_common.py:4741 +#: ishtar_common/models_common.py:2491 ishtar_common/models_common.py:4751 msgid "Spatial Reference System" msgstr "" -#: ishtar_common/models_common.py:2486 ishtar_common/models_common.py:4747 +#: ishtar_common/models_common.py:2496 ishtar_common/models_common.py:4757 msgid "Point (2D)" msgstr "" -#: ishtar_common/models_common.py:2487 +#: ishtar_common/models_common.py:2497 msgid "Point (3D)" msgstr "" -#: ishtar_common/models_common.py:2488 +#: ishtar_common/models_common.py:2498 msgid "Multi points" msgstr "" -#: ishtar_common/models_common.py:2489 +#: ishtar_common/models_common.py:2499 msgid "Multi lines" msgstr "" -#: ishtar_common/models_common.py:2490 +#: ishtar_common/models_common.py:2500 msgid "Multi polygons" msgstr "" -#: ishtar_common/models_common.py:2493 ishtar_common/models_common.py:2494 +#: ishtar_common/models_common.py:2503 ishtar_common/models_common.py:2504 msgid "Geographic - Vector data" msgstr "" -#: ishtar_common/models_common.py:2630 +#: ishtar_common/models_common.py:2640 msgid "Only 2 or 3 dimensions" msgstr "" -#: ishtar_common/models_common.py:3103 +#: ishtar_common/models_common.py:3113 msgid "Main geodata" msgstr "" -#: ishtar_common/models_common.py:3107 +#: ishtar_common/models_common.py:3117 msgid "Geodata" msgstr "" -#: ishtar_common/models_common.py:3111 +#: ishtar_common/models_common.py:3121 #, fuzzy #| msgid "username" msgctxt "key for text search" msgid "geo-name" msgstr "Benutzername" -#: ishtar_common/models_common.py:3114 +#: ishtar_common/models_common.py:3124 msgctxt "key for text search" msgid "geo-type" msgstr "" -#: ishtar_common/models_common.py:3117 +#: ishtar_common/models_common.py:3127 msgctxt "key for text search" msgid "geo-origin" msgstr "" -#: ishtar_common/models_common.py:3120 +#: ishtar_common/models_common.py:3130 msgctxt "key for text search" msgid "geo-provider" msgstr "" -#: ishtar_common/models_common.py:3123 +#: ishtar_common/models_common.py:3133 msgctxt "key for text search" msgid "z" msgstr "" -#: ishtar_common/models_common.py:3127 +#: ishtar_common/models_common.py:3137 msgctxt "key for text search" msgid "geo-comment" msgstr "" -#: ishtar_common/models_common.py:3153 +#: ishtar_common/models_common.py:3163 msgid "Add geographic item" msgstr "" -#: ishtar_common/models_common.py:3155 +#: ishtar_common/models_common.py:3165 msgid "geo." msgstr "" -#: ishtar_common/models_common.py:3214 +#: ishtar_common/models_common.py:3224 msgid "Model" msgstr "" -#: ishtar_common/models_common.py:3219 +#: ishtar_common/models_common.py:3229 msgid "Use 'text' query used in Ishtar search input" msgstr "" -#: ishtar_common/models_common.py:3221 +#: ishtar_common/models_common.py:3231 msgid "Active" msgstr "" -#: ishtar_common/models_common.py:3223 +#: ishtar_common/models_common.py:3233 #, fuzzy #| msgid "email address" msgid "Include associated items" msgstr "E-Mail-Adresse" -#: ishtar_common/models_common.py:3224 +#: ishtar_common/models_common.py:3234 msgid "All items associated items match the request" msgstr "" -#: ishtar_common/models_common.py:3227 +#: ishtar_common/models_common.py:3237 msgid "Include upstream items" msgstr "" -#: ishtar_common/models_common.py:3229 +#: ishtar_common/models_common.py:3239 msgid "" "All items associated by upstream link math the request. For instance, match " "is done for all finds associated with own context records" msgstr "" -#: ishtar_common/models_common.py:3234 +#: ishtar_common/models_common.py:3244 msgid "Limit request to attached areas" msgstr "" -#: ishtar_common/models_common.py:3235 +#: ishtar_common/models_common.py:3245 msgid "Request is limited to areas attached to the ishtar user" msgstr "" -#: ishtar_common/models_common.py:3241 +#: ishtar_common/models_common.py:3251 #, fuzzy #| msgid "email address" msgid "Permission query" msgstr "E-Mail-Adresse" -#: ishtar_common/models_common.py:3603 +#: ishtar_common/models_common.py:3613 msgid "Regenerate ID" msgstr "" -#: ishtar_common/models_common.py:3625 +#: ishtar_common/models_common.py:3635 msgid "Localisation" msgstr "" -#: ishtar_common/models_common.py:3627 +#: ishtar_common/models_common.py:3637 msgid "Limit" msgstr "" -#: ishtar_common/models_common.py:3629 +#: ishtar_common/models_common.py:3639 #: ishtar_common/templates/ishtar/sheet_town.html:107 msgid "Notice" msgstr "" -#: ishtar_common/models_common.py:3638 +#: ishtar_common/models_common.py:3648 msgid "Year of creation" msgstr "" -#: ishtar_common/models_common.py:3642 +#: ishtar_common/models_common.py:3652 msgid "Filling this field is relevant to distinguish old towns from new towns." msgstr "" -#: ishtar_common/models_common.py:3646 +#: ishtar_common/models_common.py:3656 msgid "Town children" msgstr "" -#: ishtar_common/models_common.py:3704 ishtar_common/models_common.py:3798 -#: ishtar_common/models_common.py:3851 +#: ishtar_common/models_common.py:3714 ishtar_common/models_common.py:3808 +#: ishtar_common/models_common.py:3861 msgid "INSEE code is missing" msgstr "" -#: ishtar_common/models_common.py:3705 +#: ishtar_common/models_common.py:3715 msgid "Geo INSEE is missing" msgstr "" -#: ishtar_common/models_common.py:3984 +#: ishtar_common/models_common.py:3994 msgid ", old town of " msgstr "" -#: ishtar_common/models_common.py:4169 +#: ishtar_common/models_common.py:4179 msgid "Town (precise)" msgstr "" -#: ishtar_common/models_common.py:4201 +#: ishtar_common/models_common.py:4211 msgid "Raw phone" msgstr "" -#: ishtar_common/models_common.py:4207 +#: ishtar_common/models_common.py:4217 msgid "Alternative address is prefered" msgstr "" -#: ishtar_common/models_common.py:4210 +#: ishtar_common/models_common.py:4220 #, fuzzy #| msgid "email address" msgid "Cached town" msgstr "E-Mail-Adresse" -#: ishtar_common/models_common.py:4261 +#: ishtar_common/models_common.py:4271 msgid "Town with code: {} does not exists" msgstr "" -#: ishtar_common/models_common.py:4298 +#: ishtar_common/models_common.py:4308 #, fuzzy #| msgid "email address" msgid "No associated address" msgstr "E-Mail-Adresse" -#: ishtar_common/models_common.py:4379 +#: ishtar_common/models_common.py:4389 msgid "Postal code - Town" msgstr "" -#: ishtar_common/models_common.py:4389 +#: ishtar_common/models_common.py:4399 msgid "Mobile" msgstr "" -#: ishtar_common/models_common.py:4412 +#: ishtar_common/models_common.py:4422 msgid "Merge key" msgstr "" -#: ishtar_common/models_common.py:4725 +#: ishtar_common/models_common.py:4735 msgid "Precise" msgstr "" -#: ishtar_common/models_common.py:4725 +#: ishtar_common/models_common.py:4735 msgid "Polygon" msgstr "" -#: ishtar_common/models_common.py:4749 +#: ishtar_common/models_common.py:4759 msgid "Point source" msgstr "" -#: ishtar_common/models_common.py:4752 +#: ishtar_common/models_common.py:4762 msgid "Point source item" msgstr "" -#: ishtar_common/models_common.py:4754 +#: ishtar_common/models_common.py:4764 msgid "Multi polygon" msgstr "" -#: ishtar_common/models_common.py:4756 +#: ishtar_common/models_common.py:4766 msgid "Multi-polygon source" msgstr "" -#: ishtar_common/models_common.py:4763 +#: ishtar_common/models_common.py:4773 msgid "Multi polygon source item" msgstr "" -#: ishtar_common/models_common.py:4906 +#: ishtar_common/models_common.py:4916 msgid "Custom index" msgstr "" @@ -14469,6 +15004,7 @@ msgstr "" #: ishtar_common/templates/blocks/DataTables-stats-detail.html:48 #: ishtar_common/templates/ishtar/blocks/sheet_json.html:9 +#: man_app/templates/ishtar/blocks/sheet_json.html:10 msgid "No data" msgstr "" @@ -14697,6 +15233,9 @@ msgstr "" #: ishtar_common/templates/ishtar/blocks/sheet_document_list.html:3 #: ishtar_common/templates/ishtar/sheet_document.html:140 +#: man_app/templates/ishtar/sheet_museum_find.html:318 +#: na_app/templates/ishtar/sheet_find.html:553 +#: pdl_app/templates/ishtar/sheet_find.html:546 msgid "Associated documents" msgstr "" @@ -16242,7 +16781,6 @@ msgstr "" #: ishtar_common/views.py:1262 ishtar_common/views_item.py:270 #: ishtar_common/views_item.py:316 ishtar_common/views_item.py:335 -#: views_item.py:268 views_item.py:313 views_item.py:332 msgid "Operation not permitted." msgstr "" @@ -16378,17 +16916,17 @@ msgstr "" msgid "Delete geographic item" msgstr "" -#: ishtar_common/views_item.py:282 views_item.py:280 +#: ishtar_common/views_item.py:282 #, python-format msgid "New %s" msgstr "" -#: ishtar_common/views_item.py:349 views_item.py:346 +#: ishtar_common/views_item.py:349 #, python-format msgid "Modify a %s" msgstr "" -#: ishtar_common/views_item.py:1169 views_item.py:1166 +#: ishtar_common/views_item.py:1179 msgctxt "key for text search" msgid "today" msgstr "" @@ -16448,6 +16986,29 @@ msgid "" "If the profile has been changed, don't forget to regenerate permissions." msgstr "" +#: na_app/templates/ishtar/sheet_container.html:303 +#, fuzzy +#| msgid "email address" +msgid "Document for this container" +msgstr "E-Mail-Adresse" + +#: na_app/templates/ishtar/sheet_find.html:41 +#: pdl_app/templates/ishtar/sheet_find.html:41 +msgid "Image / Base find" +msgstr "" + +#: na_app/templates/ishtar/sheet_find.html:174 +#: pdl_app/templates/ishtar/sheet_find.html:162 +msgid "Administrative index" +msgstr "" + +#: na_app/templates/ishtar/sheet_operation.html:407 +#: pdl_app/templates/ishtar/sheet_operation.html:424 +#, fuzzy +#| msgid "email address" +msgid "Document from this operation" +msgstr "E-Mail-Adresse" + #: overload_translation/models.py:8 msgid "Translation context" msgstr "" @@ -16471,16 +17032,6 @@ msgstr "" #, fuzzy #~| msgid "email address" -#~ msgid "Document for this container" -#~ msgstr "E-Mail-Adresse" - -#, fuzzy -#~| msgid "email address" -#~ msgid "Document from this operation" -#~ msgstr "E-Mail-Adresse" - -#, fuzzy -#~| msgid "email address" #~ msgid "Create associated operation" #~ msgstr "E-Mail-Adresse" diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 1f3b85f0d..15535bb59 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: 2026-01-14 18:22+0100\n" +"POT-Creation-Date: 2026-02-18 15:49+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -23,6 +23,7 @@ msgstr "" #: archaeological_context_records/models.py:580 #: archaeological_context_records/models.py:882 #: archaeological_context_records/templates/ishtar/forms/qa_contextrecord_duplicate.html:12 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:228 #: archaeological_context_records/wizards.py:85 #: archaeological_finds/models_finds.py:1317 #: archaeological_finds/models_finds.py:2960 @@ -41,8 +42,11 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:246 #: archaeological_operations/wizards.py:258 -#: archaeological_warehouse/models.py:884 ishtar_common/forms_common.py:2593 -#: ishtar_common/models.py:6244 ishtar_common/views.py:603 +#: archaeological_warehouse/models.py:884 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:249 +#: ishtar_common/forms_common.py:2593 ishtar_common/models.py:6244 +#: ishtar_common/views.py:603 na_app/templates/ishtar/sheet_operation.html:4 +#: pdl_app/templates/ishtar/sheet_operation.html:4 msgid "Operation" msgstr "" @@ -105,7 +109,7 @@ msgid "ID" msgstr "" #: archaeological_context_records/forms.py:144 archaeological_files/forms.py:88 -#: archaeological_files/models.py:460 archaeological_finds/models_finds.py:1320 +#: archaeological_files/models.py:562 archaeological_finds/models_finds.py:1320 #: archaeological_operations/models.py:387 #: archaeological_operations/models.py:1165 #: archaeological_warehouse/forms.py:155 ishtar_common/admin.py:1736 @@ -180,13 +184,27 @@ msgstr "" #: ishtar_common/templates/ishtar/merge_organization.html:21 #: ishtar_common/templates/ishtar/sheet_organization.html:30 #: ishtar_common/templates/ishtar/sheet_organization.html:57 +#: man_app/templates/ishtar/sheet_find_treatments.html:120 +#: man_app/templates/ishtar/sheet_find_treatments.html:158 +#: man_app/templates/ishtar/sheet_find_treatments.html:243 +#: na_app/templates/ishtar/sheet_find.html:445 +#: na_app/templates/ishtar/sheet_find.html:483 +#: na_app/templates/ishtar/sheet_find.html:521 +#: na_app/templates/ishtar/sheet_operation.html:554 +#: na_app/templates/ishtar/sheet_operation.html:618 +#: pdl_app/templates/ishtar/sheet_find.html:438 +#: pdl_app/templates/ishtar/sheet_find.html:476 +#: pdl_app/templates/ishtar/sheet_find.html:514 +#: pdl_app/templates/ishtar/sheet_operation.html:571 +#: pdl_app/templates/ishtar/sheet_operation.html:635 msgid "Type" msgstr "" #: archaeological_context_records/forms.py:167 #: archaeological_context_records/forms.py:338 #: archaeological_context_records/models.py:898 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:137 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:136 msgid "Excavator" msgstr "" @@ -194,8 +212,10 @@ msgstr "" #: archaeological_context_records/forms.py:551 #: archaeological_context_records/forms.py:817 #: archaeological_context_records/models.py:583 -#: archaeological_context_records/models.py:982 ishtar_common/admin.py:1063 -#: ishtar_common/models.py:3533 +#: archaeological_context_records/models.py:982 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:174 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:182 +#: ishtar_common/admin.py:1063 ishtar_common/models.py:3533 msgid "Activity" msgstr "" @@ -204,14 +224,21 @@ msgstr "" #: archaeological_context_records/forms.py:818 #: archaeological_context_records/models.py:582 #: archaeological_context_records/models.py:974 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:175 #: archaeological_finds/forms.py:390 archaeological_finds/forms.py:781 #: archaeological_finds/forms.py:1021 archaeological_finds/forms.py:1022 #: archaeological_finds/templates/ishtar/sheet_find.html:99 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:99 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:183 +#: cd17_app/templates/ishtar/sheet_find.html:107 #: ishtar_common/forms_common.py:2283 #: ishtar_common/templates/ishtar/organization_person_form.html:9 #: ishtar_common/templates/ishtar/person_form.html:9 #: ishtar_common/templates/ishtar/sheet_document.html:34 +#: man_app/templates/ishtar/sheet_museum_find.html:100 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:138 +#: na_app/templates/ishtar/sheet_find.html:157 +#: pdl_app/templates/ishtar/sheet_find.html:145 msgid "Identification" msgstr "" @@ -237,7 +264,7 @@ msgstr "" #: archaeological_context_records/forms.py:367 #: archaeological_context_records/models.py:895 #: archaeological_context_records/models.py:1583 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:143 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:134 #: archaeological_finds/forms.py:453 archaeological_finds/forms.py:458 #: archaeological_finds/forms.py:621 archaeological_finds/forms.py:788 #: archaeological_finds/forms.py:790 archaeological_finds/forms.py:1024 @@ -255,11 +282,17 @@ msgstr "" #: archaeological_operations/forms.py:1336 #: archaeological_operations/models.py:662 #: archaeological_operations/templates/ishtar/sheet_site.html:57 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:142 +#: cd17_app/templates/ishtar/sheet_find.html:125 #: ishtar_common/forms_common.py:2226 ishtar_common/forms_common.py:2517 #: ishtar_common/models.py:1094 ishtar_common/models.py:5305 #: ishtar_common/models_imports.py:165 ishtar_common/models_imports.py:446 #: ishtar_common/models_imports.py:714 ishtar_common/models_imports.py:814 #: ishtar_common/models_imports.py:833 +#: man_app/templates/ishtar/sheet_museum_find.html:118 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:156 +#: na_app/templates/ishtar/sheet_find.html:179 +#: pdl_app/templates/ishtar/sheet_find.html:172 msgid "Description" msgstr "" @@ -270,6 +303,11 @@ msgstr "" #: archaeological_finds/models_finds.py:2302 #: archaeological_finds/templates/ishtar/sheet_find.html:142 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:142 +#: cd17_app/templates/ishtar/sheet_find.html:150 +#: man_app/templates/ishtar/sheet_museum_find.html:143 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:181 +#: na_app/templates/ishtar/sheet_find.html:204 +#: pdl_app/templates/ishtar/sheet_find.html:197 msgid "General comment" msgstr "" @@ -283,8 +321,10 @@ msgstr "" #: archaeological_context_records/forms.py:538 #: archaeological_context_records/forms.py:549 #: archaeological_context_records/models.py:937 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:49 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:205 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:172 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:176 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:180 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:184 msgid "Interpretation" msgstr "" @@ -296,7 +336,7 @@ msgstr "" #: archaeological_context_records/models.py:570 #: archaeological_context_records/models.py:866 #: archaeological_context_records/models.py:1582 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:119 #: archaeological_files/forms.py:89 archaeological_files/forms.py:1147 #: archaeological_finds/models_finds.py:1275 #: archaeological_operations/forms.py:502 @@ -305,6 +345,7 @@ msgstr "" #: archaeological_operations/models.py:3507 #: archaeological_operations/models.py:3817 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:124 msgid "Parcel" msgstr "" @@ -327,13 +368,15 @@ msgstr "" #: archaeological_context_records/forms.py:187 #: archaeological_context_records/forms.py:370 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:149 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:140 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:148 msgid "Structure" msgstr "" #: archaeological_context_records/forms.py:188 #: archaeological_context_records/forms.py:376 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:150 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:141 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:149 msgid "Texture" msgstr "" @@ -346,14 +389,16 @@ msgstr "" #: archaeological_context_records/forms.py:190 #: archaeological_context_records/forms.py:388 #: archaeological_context_records/forms.py:821 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:152 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:143 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:151 msgid "Colors" msgstr "" #: archaeological_context_records/forms.py:191 #: archaeological_context_records/forms.py:393 #: archaeological_context_records/models.py:925 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:153 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:144 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:152 msgid "Details on color" msgstr "" @@ -378,10 +423,14 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:40 #: archaeological_warehouse/templates/ishtar/sheet_container.html:28 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:24 +#: cd93_app/templates/ishtar/sheet_administrativeact.html:40 #: ishtar_common/templates/ishtar/sheet_area.html:30 #: ishtar_common/templates/ishtar/sheet_import_gen.html:18 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:20 #: ishtar_common/templates/ishtar/sheet_town.html:33 +#: na_app/templates/ishtar/sheet_container.html:28 +#: na_app/templates/ishtar/sheet_operation.html:45 +#: pdl_app/templates/ishtar/sheet_operation.html:45 msgid "General" msgstr "" @@ -404,7 +453,7 @@ msgstr "" #: archaeological_warehouse/forms.py:154 archaeological_warehouse/models.py:299 #: ishtar_common/forms_common.py:98 ishtar_common/forms_common.py:120 #: ishtar_common/models.py:2741 ishtar_common/models.py:3006 -#: ishtar_common/models_common.py:3665 ishtar_common/models_common.py:4725 +#: ishtar_common/models_common.py:3675 ishtar_common/models_common.py:4735 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 #: ishtar_common/templates/ishtar/sheet_person.html:58 #: ishtar_common/templates/ishtar/sheet_person.html:78 @@ -434,12 +483,15 @@ msgstr "" #: archaeological_context_records/forms.py:358 #: archaeological_context_records/models.py:902 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:258 -#: archaeological_files/models.py:715 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:239 +#: archaeological_files/models.py:817 #: archaeological_files/templates/ishtar/sheet_file.html:78 #: archaeological_operations/models.py:1553 #: archaeological_operations/templates/ishtar/sheet_operation.html:211 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:260 #: ishtar_common/forms.py:1184 ishtar_common/forms.py:1185 +#: na_app/templates/ishtar/sheet_operation.html:208 +#: pdl_app/templates/ishtar/sheet_operation.html:211 msgid "Closing date" msgstr "" @@ -450,20 +502,27 @@ msgstr "" #: archaeological_finds/models_treatments.py:398 #: archaeological_finds/models_treatments.py:1050 #: archaeological_warehouse/templates/ishtar/sheet_container.html:94 +#: na_app/templates/ishtar/sheet_container.html:101 msgid "Location" msgstr "" #: archaeological_context_records/forms.py:394 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:159 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:150 #: archaeological_finds/forms.py:526 archaeological_finds/forms.py:837 #: archaeological_finds/forms.py:1656 #: archaeological_finds/templates/ishtar/sheet_find.html:184 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:184 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:158 +#: cd17_app/templates/ishtar/sheet_find.html:192 +#: man_app/templates/ishtar/sheet_museum_find.html:186 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:223 +#: na_app/templates/ishtar/sheet_find.html:208 +#: pdl_app/templates/ishtar/sheet_find.html:201 msgid "Dimensions" msgstr "" #: archaeological_context_records/forms.py:398 -#: archaeological_files/forms.py:312 archaeological_files/models.py:752 +#: archaeological_files/forms.py:312 archaeological_files/models.py:854 msgid "Total surface (m²)" msgstr "" @@ -474,7 +533,8 @@ msgstr "" #: archaeological_context_records/forms.py:405 #: archaeological_context_records/models.py:904 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:170 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:161 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:169 msgid "Excavated length (m)" msgstr "" @@ -485,7 +545,8 @@ msgstr "" #: archaeological_context_records/forms.py:407 #: archaeological_context_records/models.py:906 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:172 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:163 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:171 msgid "Excavated width (m)" msgstr "" @@ -522,8 +583,13 @@ msgstr "" #: archaeological_context_records/models.py:157 #: archaeological_finds/forms.py:1593 archaeological_finds/forms.py:1614 #: archaeological_finds/models_finds.py:2212 -#: archaeological_finds/templates/ishtar/sheet_find.html:204 +#: archaeological_finds/templates/ishtar/sheet_find.html:207 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:204 +#: cd17_app/templates/ishtar/sheet_find.html:215 +#: man_app/templates/ishtar/sheet_museum_find.html:206 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:243 +#: na_app/templates/ishtar/sheet_find.html:259 +#: pdl_app/templates/ishtar/sheet_find.html:252 msgid "Dating" msgstr "" @@ -532,19 +598,26 @@ msgstr "" #: archaeological_context_records/models.py:581 #: archaeological_finds/forms.py:1183 archaeological_finds/forms.py:1600 #: archaeological_finds/models_finds.py:1326 -#: archaeological_finds/templates/ishtar/sheet_find.html:213 +#: archaeological_finds/templates/ishtar/sheet_find.html:216 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:213 #: archaeological_operations/forms.py:797 #: archaeological_operations/templates/ishtar/sheet_operation.html:559 #: archaeological_operations/templates/ishtar/sheet_operation.html:597 +#: cd17_app/templates/ishtar/sheet_find.html:224 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:4 +#: man_app/templates/ishtar/sheet_museum_find.html:215 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:252 +#: na_app/templates/ishtar/sheet_operation.html:564 +#: na_app/templates/ishtar/sheet_operation.html:601 +#: pdl_app/templates/ishtar/sheet_operation.html:581 +#: pdl_app/templates/ishtar/sheet_operation.html:618 msgid "Chronological period" msgstr "" #: archaeological_context_records/forms.py:517 #: archaeological_context_records/models.py:111 -#: archaeological_files/forms.py:757 archaeological_files/models.py:80 -#: archaeological_files/models.py:829 +#: archaeological_files/forms.py:757 archaeological_files/models.py:90 +#: archaeological_files/models.py:931 #: archaeological_files/templates/ishtar/sheet_file.html:200 #: archaeological_finds/forms.py:1602 #: archaeological_finds/forms_treatments.py:73 @@ -553,7 +626,7 @@ msgstr "" #: archaeological_finds/models_finds.py:3963 #: archaeological_finds/models_treatments.py:436 #: archaeological_finds/models_treatments.py:1048 -#: archaeological_finds/templates/ishtar/sheet_find.html:214 +#: archaeological_finds/templates/ishtar/sheet_find.html:217 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:67 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:105 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:214 @@ -562,14 +635,23 @@ msgstr "" #: archaeological_operations/models.py:105 #: archaeological_operations/models.py:1554 #: archaeological_operations/models.py:3821 +#: cd17_app/templates/ishtar/sheet_find.html:225 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:5 +#: man_app/templates/ishtar/sheet_find_treatments.html:125 +#: man_app/templates/ishtar/sheet_find_treatments.html:163 +#: man_app/templates/ishtar/sheet_museum_find.html:216 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:253 +#: na_app/templates/ishtar/sheet_find.html:450 +#: na_app/templates/ishtar/sheet_find.html:488 +#: pdl_app/templates/ishtar/sheet_find.html:443 +#: pdl_app/templates/ishtar/sheet_find.html:481 msgid "Start date" msgstr "" #: archaeological_context_records/forms.py:518 #: archaeological_context_records/models.py:112 #: archaeological_files/forms.py:640 archaeological_files/forms.py:762 -#: archaeological_files/models.py:81 archaeological_files/models.py:830 +#: archaeological_files/models.py:91 archaeological_files/models.py:932 #: archaeological_finds/forms.py:1603 #: archaeological_finds/forms_treatments.py:74 #: archaeological_finds/forms_treatments.py:236 @@ -579,7 +661,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:437 #: archaeological_finds/models_treatments.py:1049 #: archaeological_finds/models_treatments.py:1438 -#: archaeological_finds/templates/ishtar/sheet_find.html:215 +#: archaeological_finds/templates/ishtar/sheet_find.html:218 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:68 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:106 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:191 @@ -587,17 +669,32 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:90 #: archaeological_operations/models.py:106 #: archaeological_operations/models.py:3822 +#: cd17_app/templates/ishtar/sheet_find.html:226 #: ishtar_common/models_imports.py:1448 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:6 +#: man_app/templates/ishtar/sheet_find_treatments.html:126 +#: man_app/templates/ishtar/sheet_find_treatments.html:164 +#: man_app/templates/ishtar/sheet_find_treatments.html:249 +#: man_app/templates/ishtar/sheet_museum_find.html:217 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:254 +#: na_app/templates/ishtar/sheet_find.html:451 +#: na_app/templates/ishtar/sheet_find.html:489 +#: na_app/templates/ishtar/sheet_find.html:527 +#: pdl_app/templates/ishtar/sheet_find.html:444 +#: pdl_app/templates/ishtar/sheet_find.html:482 +#: pdl_app/templates/ishtar/sheet_find.html:520 msgid "End date" msgstr "" #: archaeological_context_records/forms.py:519 #: archaeological_context_records/models.py:122 #: archaeological_finds/forms.py:1604 -#: archaeological_finds/templates/ishtar/sheet_find.html:217 +#: archaeological_finds/templates/ishtar/sheet_find.html:220 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:217 +#: cd17_app/templates/ishtar/sheet_find.html:228 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:8 +#: man_app/templates/ishtar/sheet_museum_find.html:219 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:256 msgid "Quality" msgstr "" @@ -605,18 +702,24 @@ msgstr "" #: archaeological_context_records/models.py:84 #: archaeological_context_records/models.py:115 #: archaeological_finds/forms.py:1601 -#: archaeological_finds/templates/ishtar/sheet_find.html:216 +#: archaeological_finds/templates/ishtar/sheet_find.html:219 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:216 +#: cd17_app/templates/ishtar/sheet_find.html:227 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:7 +#: man_app/templates/ishtar/sheet_museum_find.html:218 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:255 msgid "Dating type" msgstr "" #: archaeological_context_records/forms.py:521 #: archaeological_context_records/models.py:127 #: archaeological_finds/forms.py:1605 -#: archaeological_finds/templates/ishtar/sheet_find.html:218 +#: archaeological_finds/templates/ishtar/sheet_find.html:221 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:218 +#: cd17_app/templates/ishtar/sheet_find.html:229 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:9 +#: man_app/templates/ishtar/sheet_museum_find.html:220 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:257 msgid "Precise on this dating" msgstr "" @@ -629,7 +732,8 @@ msgid "Context record - 040 - Interpretation" msgstr "" #: archaeological_context_records/forms.py:557 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:221 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:210 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:231 msgid "Dating complements" msgstr "" @@ -855,8 +959,8 @@ msgid "Dating quality types" msgstr "" #: archaeological_context_records/models.py:131 -#: archaeological_context_records/tests.py:938 -#: archaeological_finds/tests.py:1571 archaeological_finds/tests.py:1800 +#: archaeological_context_records/tests.py:998 +#: archaeological_finds/tests.py:1611 archaeological_finds/tests.py:1840 msgctxt "key for text search" msgid "datings-period" msgstr "" @@ -900,16 +1004,20 @@ msgstr "" #: archaeological_finds/models_treatments.py:1030 #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:4 +#: cd17_app/templates/ishtar/sheet_find.html:4 #: ishtar_common/forms_common.py:2627 ishtar_common/models.py:6247 -#: ishtar_common/views.py:611 +#: ishtar_common/views.py:611 man_app/templates/ishtar/sheet_museum_find.html:4 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:4 +#: na_app/templates/ishtar/sheet_find.html:4 +#: pdl_app/templates/ishtar/sheet_find.html:4 msgid "Find" msgstr "" #: archaeological_context_records/models.py:299 #: archaeological_context_records/models.py:322 -#: archaeological_files/models.py:79 archaeological_files/models.py:109 -#: archaeological_files/models.py:183 archaeological_files/models.py:199 -#: archaeological_files/models.py:259 archaeological_finds/models_finds.py:105 +#: archaeological_files/models.py:89 archaeological_files/models.py:211 +#: archaeological_files/models.py:285 archaeological_files/models.py:301 +#: archaeological_files/models.py:361 archaeological_finds/models_finds.py:105 #: archaeological_finds/models_finds.py:119 #: archaeological_finds/models_finds.py:136 #: archaeological_finds/models_finds.py:260 @@ -928,9 +1036,9 @@ msgstr "" #: ishtar_common/models.py:772 ishtar_common/models.py:823 #: ishtar_common/models.py:1936 ishtar_common/models.py:4530 #: ishtar_common/models.py:6019 ishtar_common/models_common.py:762 -#: ishtar_common/models_common.py:2264 ishtar_common/models_common.py:2300 -#: ishtar_common/models_common.py:2317 ishtar_common/models_common.py:2334 -#: ishtar_common/models_common.py:2347 ishtar_common/models_imports.py:481 +#: ishtar_common/models_common.py:2274 ishtar_common/models_common.py:2310 +#: ishtar_common/models_common.py:2327 ishtar_common/models_common.py:2344 +#: ishtar_common/models_common.py:2357 ishtar_common/models_imports.py:481 msgid "Order" msgstr "" @@ -1076,25 +1184,25 @@ msgid "id" msgstr "" #: archaeological_context_records/models.py:638 -#: archaeological_context_records/tests.py:764 -#: archaeological_files/models.py:550 archaeological_finds/models_finds.py:1446 +#: archaeological_context_records/tests.py:824 +#: archaeological_files/models.py:652 archaeological_finds/models_finds.py:1446 #: archaeological_operations/models.py:491 #: archaeological_operations/models.py:1332 #: archaeological_operations/tests.py:3308 #: archaeological_warehouse/models.py:329 #: archaeological_warehouse/models.py:1055 ishtar_common/models.py:5064 -#: ishtar_common/models_common.py:4216 +#: ishtar_common/models_common.py:4226 msgctxt "key for text search" msgid "town" msgstr "" #: archaeological_context_records/models.py:641 -#: archaeological_files/models.py:613 archaeological_finds/models_finds.py:1466 +#: archaeological_files/models.py:715 archaeological_finds/models_finds.py:1466 #: archaeological_operations/models.py:494 #: archaeological_operations/models.py:1335 #: archaeological_warehouse/models.py:333 #: archaeological_warehouse/models.py:1059 ishtar_common/models.py:5069 -#: ishtar_common/models_common.py:4220 +#: ishtar_common/models_common.py:4230 msgctxt "key for text search" msgid "area" msgstr "" @@ -1105,8 +1213,8 @@ msgid "operation-year" msgstr "" #: archaeological_context_records/models.py:647 -#: archaeological_files/models.py:565 archaeological_finds/models_finds.py:1783 -#: archaeological_finds/tests.py:1620 +#: archaeological_files/models.py:667 archaeological_finds/models_finds.py:1783 +#: archaeological_finds/tests.py:1660 msgctxt "key for text search" msgid "operation-name" msgstr "" @@ -1149,7 +1257,7 @@ msgid "site" msgstr "" #: archaeological_context_records/models.py:668 -#: archaeological_context_records/tests.py:831 +#: archaeological_context_records/tests.py:891 #: archaeological_finds/models_finds.py:1501 msgctxt "key for text search" msgid "operation-relation-type" @@ -1167,7 +1275,7 @@ msgid "period" msgstr "" #: archaeological_context_records/models.py:676 -#: archaeological_context_records/tests.py:890 +#: archaeological_context_records/tests.py:950 msgctxt "key for text search" msgid "unit-type" msgstr "" @@ -1178,7 +1286,7 @@ msgid "activity" msgstr "" #: archaeological_context_records/models.py:682 -#: archaeological_files/models.py:553 archaeological_operations/models.py:1338 +#: archaeological_files/models.py:655 archaeological_operations/models.py:1338 #: archaeological_operations/models.py:3030 msgctxt "key for text search" msgid "parcel" @@ -1191,7 +1299,7 @@ msgid "has-finds" msgstr "" #: archaeological_context_records/models.py:689 -#: archaeological_context_records/tests.py:796 +#: archaeological_context_records/tests.py:856 msgctxt "key for text search" msgid "record-relation-type" msgstr "" @@ -1219,7 +1327,7 @@ msgid "documentation" msgstr "" #: archaeological_context_records/models.py:709 -#: archaeological_finds/models_finds.py:1534 archaeological_finds/tests.py:1637 +#: archaeological_finds/models_finds.py:1534 archaeological_finds/tests.py:1677 #: archaeological_operations/models.py:497 ishtar_common/models.py:4929 msgctxt "key for text search" msgid "description" @@ -1236,7 +1344,7 @@ msgid "interpretation" msgstr "" #: archaeological_context_records/models.py:721 -#: archaeological_files/models.py:596 archaeological_finds/models_finds.py:1652 +#: archaeological_files/models.py:698 archaeological_finds/models_finds.py:1652 #: archaeological_operations/models.py:506 #: archaeological_operations/models.py:1391 #: archaeological_operations/models.py:3122 @@ -1285,7 +1393,7 @@ msgid "Lock/Unlock" msgstr "" #: archaeological_context_records/models.py:812 -#: archaeological_files/models.py:633 archaeological_finds/models_finds.py:1981 +#: archaeological_files/models.py:735 archaeological_finds/models_finds.py:1981 #: archaeological_operations/models.py:597 #: archaeological_operations/models.py:1492 #: archaeological_warehouse/models.py:369 @@ -1326,7 +1434,7 @@ msgid "Duplicate" msgstr "" #: archaeological_context_records/models.py:860 -#: archaeological_files/models.py:652 archaeological_finds/models_finds.py:613 +#: archaeological_files/models.py:754 archaeological_finds/models_finds.py:613 #: archaeological_finds/models_finds.py:2142 #: archaeological_finds/models_treatments.py:431 #: archaeological_operations/models.py:3496 @@ -1336,7 +1444,7 @@ msgid "External ID" msgstr "" #: archaeological_context_records/models.py:862 -#: archaeological_files/models.py:655 archaeological_finds/models_finds.py:615 +#: archaeological_files/models.py:757 archaeological_finds/models_finds.py:615 #: archaeological_finds/models_finds.py:2144 #: archaeological_operations/models.py:3499 #: archaeological_warehouse/models.py:428 @@ -1379,8 +1487,8 @@ msgid "Estimation of a \"Terminus Post Quem\"" msgstr "" #: archaeological_context_records/models.py:996 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 -#: archaeological_files/models.py:850 archaeological_finds/models_finds.py:2435 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:83 +#: archaeological_files/models.py:952 archaeological_finds/models_finds.py:2435 #: archaeological_finds/models_treatments.py:451 #: archaeological_finds/models_treatments.py:1471 #: archaeological_finds/models_treatments.py:1718 @@ -1397,12 +1505,14 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:50 #: archaeological_warehouse/templates/ishtar/sheet_container.html:202 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:46 -#: ishtar_common/models.py:1040 ishtar_common/models.py:2544 -#: ishtar_common/models.py:4634 ishtar_common/models.py:4652 -#: ishtar_common/models.py:4681 ishtar_common/models.py:4695 -#: ishtar_common/models.py:4709 ishtar_common/models.py:4721 -#: ishtar_common/models.py:5338 ishtar_common/models.py:5348 -#: ishtar_common/models_common.py:3652 ishtar_common/models_imports.py:3087 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:86 +#: cd17_app/templates/ishtar/sheet_find.html:64 ishtar_common/models.py:1040 +#: ishtar_common/models.py:2544 ishtar_common/models.py:4634 +#: ishtar_common/models.py:4652 ishtar_common/models.py:4681 +#: ishtar_common/models.py:4695 ishtar_common/models.py:4709 +#: ishtar_common/models.py:4721 ishtar_common/models.py:5338 +#: ishtar_common/models.py:5348 ishtar_common/models_common.py:3662 +#: ishtar_common/models_imports.py:3087 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:184 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:292 @@ -1410,11 +1520,19 @@ msgstr "" #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:492 #: ishtar_common/templates/ishtar/sheet_person.html:172 #: ishtar_common/views.py:190 +#: man_app/templates/ishtar/sheet_museum_find.html:65 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:103 +#: na_app/templates/ishtar/sheet_container.html:50 +#: na_app/templates/ishtar/sheet_container.html:207 +#: na_app/templates/ishtar/sheet_find.html:63 +#: na_app/templates/ishtar/sheet_operation.html:62 +#: pdl_app/templates/ishtar/sheet_find.html:63 +#: pdl_app/templates/ishtar/sheet_operation.html:62 msgid "Documents" msgstr "" #: archaeological_context_records/models.py:1003 -#: archaeological_files/models.py:856 archaeological_finds/models_finds.py:2441 +#: archaeological_files/models.py:958 archaeological_finds/models_finds.py:2441 #: archaeological_finds/models_treatments.py:457 #: archaeological_finds/models_treatments.py:1478 #: archaeological_finds/models_treatments.py:1725 @@ -1423,7 +1541,7 @@ msgstr "" #: archaeological_operations/models.py:3247 #: archaeological_warehouse/models.py:422 #: archaeological_warehouse/models.py:1226 ishtar_common/models.py:2550 -#: ishtar_common/models_common.py:3658 +#: ishtar_common/models_common.py:3668 msgid "Main image" msgstr "" @@ -1445,7 +1563,7 @@ msgstr "" #: archaeological_operations/models.py:1769 #: archaeological_operations/models.py:1775 #: archaeological_operations/models.py:1781 -#: archaeological_operations/models.py:1787 ishtar_common/models_common.py:4901 +#: archaeological_operations/models.py:1787 ishtar_common/models_common.py:4911 msgid "Generated automatically - do not edit" msgstr "" @@ -1457,6 +1575,7 @@ msgstr "" #: archaeological_context_records/models.py:1022 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:4 #: archaeological_finds/models_finds.py:626 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:4 msgid "Context Record" msgstr "" @@ -1581,20 +1700,29 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:41 #: archaeological_finds/templates/ishtar/sheet_find.html:42 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:42 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:44 +#: cd17_app/templates/ishtar/sheet_find.html:42 +#: man_app/templates/ishtar/sheet_museum_find.html:41 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:81 +#: na_app/templates/ishtar/sheet_find.html:48 +#: pdl_app/templates/ishtar/sheet_find.html:48 msgid "Identification / Description" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:58 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:218 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:49 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:207 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:52 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:228 msgid "Datations" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:66 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:57 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:60 msgid "Operation / Archaeological site" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:74 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:289 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:65 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:270 #: archaeological_finds/forms.py:2253 archaeological_finds/models_finds.py:97 #: archaeological_finds/models_finds.py:111 #: archaeological_finds/models_finds.py:128 @@ -1630,23 +1758,37 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:197 #: archaeological_warehouse/templates/ishtar/sheet_container.html:244 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:208 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:68 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:302 #: ishtar_common/templates/ishtar/sheet_document.html:127 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:149 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:252 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:358 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:457 -#: ishtar_common/views.py:178 +#: ishtar_common/views.py:178 na_app/templates/ishtar/sheet_container.html:202 +#: na_app/templates/ishtar/sheet_container.html:249 +#: na_app/templates/ishtar/sheet_operation.html:89 +#: na_app/templates/ishtar/sheet_operation.html:481 +#: na_app/templates/ishtar/sheet_operation.html:573 +#: pdl_app/templates/ishtar/sheet_operation.html:89 +#: pdl_app/templates/ishtar/sheet_operation.html:498 +#: pdl_app/templates/ishtar/sheet_operation.html:590 msgid "Finds" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:83 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:74 #: archaeological_operations/templates/ishtar/sheet_operation.html:72 #: archaeological_operations/templates/ishtar/sheet_operation.html:415 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:77 #: ishtar_common/templates/ishtar/forms/modify_relations.html:28 +#: na_app/templates/ishtar/sheet_operation.html:71 +#: na_app/templates/ishtar/sheet_operation.html:422 +#: pdl_app/templates/ishtar/sheet_operation.html:71 +#: pdl_app/templates/ishtar/sheet_operation.html:439 msgid "Relations" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:101 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 #: archaeological_finds/templates/ishtar/sheet_find.html:73 #: archaeological_finds/templates/ishtar/sheet_find.html:325 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:73 @@ -1655,38 +1797,68 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:121 #: archaeological_warehouse/templates/ishtar/sheet_container.html:59 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:55 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:95 +#: cd17_app/templates/ishtar/sheet_find.html:73 +#: cd17_app/templates/ishtar/sheet_find.html:333 #: ishtar_common/templates/ishtar/blocks/sheet_map.html:10 #: ishtar_common/templates/ishtar/sheet_town.html:41 +#: man_app/templates/ishtar/sheet_museum_find.html:74 +#: man_app/templates/ishtar/sheet_museum_find.html:331 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:112 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:374 +#: na_app/templates/ishtar/sheet_container.html:59 +#: na_app/templates/ishtar/sheet_find.html:72 +#: na_app/templates/ishtar/sheet_find.html:566 +#: na_app/templates/ishtar/sheet_operation.html:98 +#: pdl_app/templates/ishtar/sheet_find.html:72 +#: pdl_app/templates/ishtar/sheet_find.html:559 +#: pdl_app/templates/ishtar/sheet_operation.html:98 msgid "Geographic data" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:110 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:101 #: archaeological_finds/templates/ishtar/sheet_find.html:82 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:82 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:76 #: archaeological_operations/templates/ishtar/sheet_operation.html:108 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:106 +#: cd17_app/templates/ishtar/sheet_find.html:82 +#: cd93_app/templates/ishtar/sheet_administrativeact.html:77 +#: man_app/templates/ishtar/sheet_museum_find.html:83 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:121 +#: na_app/templates/ishtar/sheet_find.html:81 +#: na_app/templates/ishtar/sheet_operation.html:107 +#: pdl_app/templates/ishtar/sheet_find.html:81 +#: pdl_app/templates/ishtar/sheet_operation.html:107 msgid "Custom fields" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:126 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:117 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:122 #: ishtar_common/models.py:4876 msgid "Identifier" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:145 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:136 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:144 msgid "Excavation technics" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:151 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:142 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:150 msgid "Inclusion" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:163 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:154 #: archaeological_files/templates/ishtar/sheet_file.html:102 #: archaeological_files/templates/ishtar/sheet_file.html:284 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:60 #: archaeological_operations/templates/ishtar/sheet_operation.html:219 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:162 +#: cd93_app/templates/ishtar/sheet_administrativeact.html:61 #: ishtar_common/templates/ishtar/sheet_town.html:71 +#: na_app/templates/ishtar/sheet_operation.html:216 +#: pdl_app/templates/ishtar/sheet_operation.html:219 msgid "Surface" msgstr "" @@ -1697,7 +1869,12 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:334 #: archaeological_operations/templates/ishtar/sheet_site.html:78 #: archaeological_warehouse/templates/ishtar/sheet_container.html:167 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:202 #: ishtar_common/templates/ishtar/sheet_town.html:110 +#: man_app/templates/ishtar/sheet_basefind.html:56 +#: na_app/templates/ishtar/sheet_container.html:174 +#: na_app/templates/ishtar/sheet_operation.html:340 +#: pdl_app/templates/ishtar/sheet_operation.html:357 msgid "Geographic localisation" msgstr "" @@ -1707,7 +1884,7 @@ msgstr "" #: archaeological_finds/forms.py:1025 #: archaeological_finds/templates/ishtar/sheet_basefind.html:72 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:93 -#: archaeological_finds/templates/ishtar/sheet_find.html:252 +#: archaeological_finds/templates/ishtar/sheet_find.html:255 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:252 #: archaeological_finds/templates/ishtar/sheet_treatment.html:104 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:94 @@ -1716,83 +1893,165 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:127 #: archaeological_warehouse/templates/ishtar/sheet_container.html:177 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:131 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:216 +#: cd17_app/templates/ishtar/sheet_find.html:263 +#: cd93_app/templates/ishtar/sheet_administrativeact.html:90 #: ishtar_common/templates/ishtar/blocks/window_image.html:6 #: ishtar_common/templates/ishtar/sheet_document.html:147 #: ishtar_common/templates/ishtar/sheet_organization.html:86 #: ishtar_common/templates/ishtar/sheet_person.html:178 +#: man_app/templates/ishtar/sheet_basefind.html:67 +#: man_app/templates/ishtar/sheet_museum_find.html:254 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:291 +#: na_app/templates/ishtar/sheet_container.html:183 +#: na_app/templates/ishtar/sheet_find.html:274 +#: na_app/templates/ishtar/sheet_operation.html:361 +#: pdl_app/templates/ishtar/sheet_find.html:267 +#: pdl_app/templates/ishtar/sheet_operation.html:378 msgid "Sheet" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:237 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:226 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:247 msgid "Operation summary" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:240 -#: archaeological_operations/templates/ishtar/sheet_operation.html:305 -msgid "Patriarche OA code not yet recorded!" +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:229 +#: archaeological_files/forms.py:84 archaeological_files/forms.py:211 +#: archaeological_files/forms.py:632 archaeological_files/forms.py:1105 +#: archaeological_files/forms.py:1141 archaeological_files/models.py:560 +#: archaeological_files/models.py:746 +#: archaeological_files/templates/ishtar/sheet_file.html:224 +#: archaeological_finds/forms.py:1759 +#: archaeological_finds/forms_treatments.py:59 +#: archaeological_finds/forms_treatments.py:190 +#: archaeological_finds/forms_treatments.py:469 +#: archaeological_finds/forms_treatments.py:625 +#: archaeological_finds/forms_treatments.py:701 +#: archaeological_finds/forms_treatments.py:773 +#: archaeological_finds/forms_treatments.py:884 +#: archaeological_finds/forms_treatments.py:966 +#: archaeological_finds/forms_treatments.py:1004 +#: archaeological_finds/models_finds.py:1319 +#: archaeological_finds/models_treatments.py:360 +#: archaeological_finds/models_treatments.py:1400 +#: archaeological_finds/models_treatments.py:1690 +#: archaeological_finds/templates/ishtar/sheet_exhibition.html:51 +#: archaeological_operations/forms.py:73 archaeological_operations/forms.py:489 +#: archaeological_operations/forms.py:711 +#: archaeological_operations/forms.py:1448 +#: archaeological_operations/forms.py:1766 +#: archaeological_operations/models.py:1164 +#: archaeological_operations/models.py:1591 +#: archaeological_operations/models.py:2980 +#: archaeological_operations/models.py:3219 +#: archaeological_operations/models.py:3486 +#: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 +#: archaeological_operations/templates/ishtar/sheet_operation.html:150 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:250 +#: ishtar_common/models_imports.py:1133 +#: na_app/templates/ishtar/sheet_operation.html:149 +#: pdl_app/templates/ishtar/sheet_operation.html:152 +msgid "Year" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:246 -msgid "Numerical reference" +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:230 +#: archaeological_operations/forms.py:729 +#: archaeological_operations/models.py:1565 +#: archaeological_operations/models.py:3176 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:251 +msgid "Head scientist" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:252 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:233 #: archaeological_finds/models_treatments.py:239 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:63 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:101 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:140 #: archaeological_operations/templates/ishtar/sheet_operation.html:183 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:254 #: ishtar_common/models.py:4029 ishtar_common/models.py:6138 #: ishtar_common/models.py:6275 ishtar_common/models.py:6354 -#: ishtar_common/models_common.py:2193 ishtar_common/models_common.py:2208 +#: ishtar_common/models_common.py:2203 ishtar_common/models_common.py:2218 #: ishtar_common/models_imports.py:1591 ishtar_common/models_imports.py:1993 +#: man_app/templates/ishtar/sheet_find_treatments.html:121 +#: man_app/templates/ishtar/sheet_find_treatments.html:159 +#: man_app/templates/ishtar/sheet_find_treatments.html:198 +#: na_app/templates/ishtar/sheet_find.html:399 +#: na_app/templates/ishtar/sheet_find.html:446 +#: na_app/templates/ishtar/sheet_find.html:484 +#: na_app/templates/ishtar/sheet_operation.html:179 +#: pdl_app/templates/ishtar/sheet_find.html:392 +#: pdl_app/templates/ishtar/sheet_find.html:439 +#: pdl_app/templates/ishtar/sheet_find.html:477 +#: pdl_app/templates/ishtar/sheet_operation.html:182 msgid "State" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:253 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:234 #: archaeological_files/templates/ishtar/sheet_file.html:72 #: archaeological_operations/templates/ishtar/sheet_operation.html:188 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:255 +#: na_app/templates/ishtar/sheet_operation.html:184 +#: pdl_app/templates/ishtar/sheet_operation.html:187 msgid "Active file" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:253 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:234 #: archaeological_operations/templates/ishtar/sheet_operation.html:191 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:255 +#: na_app/templates/ishtar/sheet_operation.html:187 +#: pdl_app/templates/ishtar/sheet_operation.html:190 msgid "Closed operation" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:260 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:241 #: archaeological_files/templates/ishtar/sheet_file.html:80 #: archaeological_operations/templates/ishtar/sheet_operation.html:213 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:262 +#: na_app/templates/ishtar/sheet_operation.html:210 +#: pdl_app/templates/ishtar/sheet_operation.html:213 msgid "by" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:272 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:253 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:274 msgid "No operation linked to this context record!" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:294 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:275 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:307 msgid "No associated finds." msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:298 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:279 #: archaeological_operations/templates/ishtar/sheet_operation.html:481 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:311 +#: na_app/templates/ishtar/sheet_operation.html:486 +#: pdl_app/templates/ishtar/sheet_operation.html:503 msgid "Documents from associated finds" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:311 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:292 #: archaeological_operations/templates/ishtar/sheet_operation.html:447 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:324 +#: na_app/templates/ishtar/sheet_operation.html:452 +#: pdl_app/templates/ishtar/sheet_operation.html:469 msgid "Context record relations" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:317 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:298 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:330 msgid "Diagram of stratigraphic relations - above" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:325 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:306 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:338 msgid "Diagram of stratigraphic relations - below" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:333 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:314 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:346 msgid "Diagram of stratigraphic relations - full" msgstr "" @@ -1819,77 +2078,55 @@ msgstr "" msgid "Add context record" msgstr "" -#: archaeological_files/admin.py:141 +#: archaeological_files/admin.py:146 msgid "Copy from" msgstr "" -#: archaeological_files/admin.py:145 +#: archaeological_files/admin.py:150 msgid "To" msgstr "" -#: archaeological_files/admin.py:162 archaeological_files/tests.py:312 +#: archaeological_files/admin.py:167 archaeological_files/tests.py:312 msgid "Source and destination must be different." msgstr "" -#: archaeological_files/admin.py:184 +#: archaeological_files/admin.py:189 msgid "Cannot change price agreement." msgstr "" -#: archaeological_files/admin.py:237 +#: archaeological_files/admin.py:242 msgid "{} item(s) created." msgstr "" -#: archaeological_files/admin.py:241 +#: archaeological_files/admin.py:246 msgid "{} item(s) already in database." msgstr "" -#: archaeological_files/forms.py:77 -msgid "File - 001 - Search" +#: archaeological_files/admin.py:266 +msgid "Select only one price agreement." msgstr "" -#: archaeological_files/forms.py:84 archaeological_files/forms.py:211 -#: archaeological_files/forms.py:632 archaeological_files/forms.py:1105 -#: archaeological_files/forms.py:1141 archaeological_files/models.py:458 -#: archaeological_files/models.py:644 -#: archaeological_files/templates/ishtar/sheet_file.html:224 -#: archaeological_finds/forms.py:1759 -#: archaeological_finds/forms_treatments.py:59 -#: archaeological_finds/forms_treatments.py:190 -#: archaeological_finds/forms_treatments.py:469 -#: archaeological_finds/forms_treatments.py:625 -#: archaeological_finds/forms_treatments.py:701 -#: archaeological_finds/forms_treatments.py:773 -#: archaeological_finds/forms_treatments.py:884 -#: archaeological_finds/forms_treatments.py:966 -#: archaeological_finds/forms_treatments.py:1004 -#: archaeological_finds/models_finds.py:1319 -#: archaeological_finds/models_treatments.py:360 -#: archaeological_finds/models_treatments.py:1400 -#: archaeological_finds/models_treatments.py:1690 -#: archaeological_finds/templates/ishtar/sheet_exhibition.html:51 -#: archaeological_operations/forms.py:73 archaeological_operations/forms.py:489 -#: archaeological_operations/forms.py:711 -#: archaeological_operations/forms.py:1448 -#: archaeological_operations/forms.py:1766 -#: archaeological_operations/models.py:1164 -#: archaeological_operations/models.py:1591 -#: archaeological_operations/models.py:2980 -#: archaeological_operations/models.py:3219 -#: archaeological_operations/models.py:3486 -#: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 -#: archaeological_operations/templates/ishtar/sheet_operation.html:150 -#: ishtar_common/models_imports.py:1133 -msgid "Year" +#: archaeological_files/admin.py:275 ishtar_common/admin.py:3130 +msgid "" +"Document not generated: is the LibreOffice daemon configured and running?" +msgstr "" + +#: archaeological_files/admin.py:293 +msgid "Export prices" +msgstr "" + +#: archaeological_files/forms.py:77 +msgid "File - 001 - Search" msgstr "" #: archaeological_files/forms.py:85 archaeological_files/forms.py:638 -#: archaeological_files/models.py:646 +#: archaeological_files/models.py:748 msgid "Numeric reference" msgstr "" #: archaeological_files/forms.py:86 archaeological_files/forms.py:220 #: archaeological_files/forms.py:1107 archaeological_files/forms.py:1143 -#: archaeological_files/models.py:649 +#: archaeological_files/models.py:751 #: archaeological_finds/models_treatments.py:1403 #: archaeological_operations/forms.py:1450 #: archaeological_operations/forms.py:1515 @@ -1901,11 +2138,11 @@ msgid "Internal reference" msgstr "" #: archaeological_files/forms.py:92 archaeological_files/forms.py:1113 -#: archaeological_files/forms.py:1150 archaeological_files/models.py:1709 +#: archaeological_files/forms.py:1150 archaeological_files/models.py:1811 #: archaeological_operations/forms.py:505 #: archaeological_operations/forms.py:1461 -#: archaeological_operations/models.py:2841 ishtar_common/models_common.py:2216 -#: ishtar_common/models_common.py:3632 +#: archaeological_operations/models.py:2841 ishtar_common/models_common.py:2226 +#: ishtar_common/models_common.py:3642 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" @@ -1915,14 +2152,14 @@ msgid "File name" msgstr "" #: archaeological_files/forms.py:95 archaeological_files/forms.py:288 -#: archaeological_files/forms.py:339 archaeological_files/models.py:658 +#: archaeological_files/forms.py:339 archaeological_files/models.py:760 #: archaeological_files/templates/ishtar/sheet_file.html:63 msgid "Operation name" msgstr "" #: archaeological_files/forms.py:96 archaeological_files/forms.py:209 -#: archaeological_files/models.py:459 archaeological_files/models.py:464 -#: archaeological_files/models.py:659 +#: archaeological_files/models.py:561 archaeological_files/models.py:566 +#: archaeological_files/models.py:761 msgid "File type" msgstr "" @@ -1931,7 +2168,7 @@ msgid "Is active?" msgstr "" #: archaeological_files/forms.py:98 archaeological_files/forms.py:290 -#: archaeological_files/models.py:401 archaeological_files/models.py:809 +#: archaeological_files/models.py:503 archaeological_files/models.py:911 #: archaeological_files/templates/ishtar/sheet_file.html:124 msgid "Development type" msgstr "" @@ -1941,26 +2178,28 @@ msgid "Saisine type" msgstr "" #: archaeological_files/forms.py:100 archaeological_files/forms.py:448 -#: archaeological_files/models.py:813 +#: archaeological_files/models.py:915 #: archaeological_files/templates/ishtar/sheet_file.html:125 msgid "Monitoring justification" msgstr "" #: archaeological_files/forms.py:101 archaeological_files/forms.py:265 -#: archaeological_files/models.py:352 archaeological_files/models.py:463 -#: archaeological_files/models.py:708 +#: archaeological_files/models.py:454 archaeological_files/models.py:565 +#: archaeological_files/models.py:810 msgid "Permit type" msgstr "" #: archaeological_files/forms.py:102 archaeological_files/forms.py:450 -#: archaeological_files/models.py:713 +#: archaeological_files/models.py:815 #: archaeological_files/templates/ishtar/sheet_file.html:137 #: archaeological_operations/templates/ishtar/sheet_operation.html:282 +#: na_app/templates/ishtar/sheet_operation.html:280 +#: pdl_app/templates/ishtar/sheet_operation.html:305 msgid "Permit/order reference" msgstr "" #: archaeological_files/forms.py:103 archaeological_files/forms.py:629 -#: archaeological_files/models.py:761 archaeological_finds/forms.py:831 +#: archaeological_files/models.py:863 archaeological_finds/forms.py:831 #: archaeological_finds/forms.py:1174 archaeological_finds/forms.py:1461 #: archaeological_finds/forms.py:2507 #: archaeological_finds/forms_treatments.py:241 @@ -1986,7 +2225,7 @@ msgstr "" #: ishtar_common/forms_common.py:2562 ishtar_common/forms_common.py:3189 #: ishtar_common/models.py:3114 ishtar_common/models.py:4414 #: ishtar_common/models.py:5314 ishtar_common/models_common.py:192 -#: ishtar_common/models_common.py:2461 ishtar_common/models_imports.py:897 +#: ishtar_common/models_common.py:2471 ishtar_common/models_imports.py:897 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:13 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:170 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:39 @@ -2003,7 +2242,7 @@ msgstr "" #: archaeological_files/forms.py:115 archaeological_files/forms.py:357 #: archaeological_files/forms.py:367 archaeological_files/forms.py:1157 -#: archaeological_files/models.py:671 +#: archaeological_files/models.py:773 msgid "General contractor" msgstr "" @@ -2031,7 +2270,7 @@ msgstr "" msgid "Archaeological file - 010 - General" msgstr "" -#: archaeological_files/forms.py:218 archaeological_files/models.py:728 +#: archaeological_files/forms.py:218 archaeological_files/models.py:830 #: archaeological_files/templates/ishtar/sheet_file.html:64 #: archaeological_finds/models_treatments.py:1440 #: archaeological_operations/models.py:1552 ishtar_common/forms_common.py:2222 @@ -2041,10 +2280,13 @@ msgstr "" msgid "Creation date" msgstr "" -#: archaeological_files/forms.py:219 archaeological_files/models.py:730 +#: archaeological_files/forms.py:219 archaeological_files/models.py:832 #: archaeological_finds/forms_treatments.py:813 #: archaeological_finds/models_treatments.py:1442 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:190 +#: man_app/templates/ishtar/sheet_find_treatments.html:248 +#: na_app/templates/ishtar/sheet_find.html:526 +#: pdl_app/templates/ishtar/sheet_find.html:519 msgid "Reception date" msgstr "" @@ -2073,7 +2315,7 @@ msgid "This name is used on creation for the associated operation" msgstr "" #: archaeological_files/forms.py:293 archaeological_files/forms.py:342 -#: archaeological_files/models.py:530 archaeological_files/models.py:725 +#: archaeological_files/models.py:632 archaeological_files/models.py:827 #: archaeological_operations/forms.py:710 #: archaeological_operations/forms.py:1005 #: archaeological_operations/forms.py:1021 @@ -2088,15 +2330,17 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:152 #: ishtar_common/forms_common.py:1851 ishtar_common/forms_common.py:1865 #: ishtar_common/forms_common.py:1866 ishtar_common/models.py:2531 -#: ishtar_common/models_common.py:3666 +#: ishtar_common/models_common.py:3676 #: ishtar_common/templates/ishtar/sheet_area.html:71 #: ishtar_common/templates/ishtar/sheet_document.html:133 +#: na_app/templates/ishtar/sheet_operation.html:150 +#: pdl_app/templates/ishtar/sheet_operation.html:153 msgid "Towns" msgstr "" #: archaeological_files/forms.py:297 archaeological_files/forms.py:345 -#: archaeological_files/models.py:764 archaeological_operations/models.py:3225 -#: ishtar_common/models_common.py:2217 +#: archaeological_files/models.py:866 archaeological_operations/models.py:3225 +#: ishtar_common/models_common.py:2227 msgid "Departments" msgstr "" @@ -2105,7 +2349,7 @@ msgid "Only relevant when no town is provided." msgstr "" #: archaeological_files/forms.py:301 archaeological_files/forms.py:347 -#: archaeological_files/models.py:756 +#: archaeological_files/models.py:858 msgid "Locality" msgstr "" @@ -2119,7 +2363,7 @@ msgstr "" #: archaeological_files/forms.py:307 archaeological_files/forms.py:353 #: archaeological_warehouse/forms.py:255 ishtar_common/forms_common.py:787 -#: ishtar_common/forms_common.py:1206 ishtar_common/models_common.py:4165 +#: ishtar_common/forms_common.py:1206 ishtar_common/models_common.py:4175 msgid "Postal code" msgstr "" @@ -2127,7 +2371,7 @@ msgstr "" msgid "Surfaces" msgstr "" -#: archaeological_files/forms.py:320 archaeological_files/models.py:754 +#: archaeological_files/forms.py:320 archaeological_files/models.py:856 msgid "Total developed surface (m²)" msgstr "" @@ -2138,7 +2382,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:90 #: archaeological_warehouse/forms.py:242 archaeological_warehouse/forms.py:251 #: ishtar_common/forms_common.py:783 ishtar_common/forms_common.py:1202 -#: ishtar_common/models_common.py:4160 ishtar_common/models_common.py:4367 +#: ishtar_common/models_common.py:4170 ishtar_common/models_common.py:4377 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 msgid "Address" msgstr "" @@ -2172,7 +2416,7 @@ msgstr "" msgid "Archaeological file - 040 - Planning service" msgstr "" -#: archaeological_files/forms.py:452 archaeological_files/models.py:732 +#: archaeological_files/forms.py:452 archaeological_files/models.py:834 msgid "Date of planning service file" msgstr "" @@ -2190,12 +2434,12 @@ msgstr "" msgid "Archaeological file - 045 - Research - General" msgstr "" -#: archaeological_files/forms.py:562 archaeological_files/models.py:788 +#: archaeological_files/forms.py:562 archaeological_files/models.py:890 #: archaeological_operations/forms.py:517 msgid "Scientist in charge" msgstr "" -#: archaeological_files/forms.py:566 archaeological_files/models.py:772 +#: archaeological_files/forms.py:566 archaeological_files/models.py:874 msgid "Requested operation type" msgstr "" @@ -2203,16 +2447,16 @@ msgstr "" msgid "Lead organization" msgstr "" -#: archaeological_files/forms.py:584 archaeological_files/models.py:791 +#: archaeological_files/forms.py:584 archaeological_files/models.py:893 #: archaeological_files/templates/ishtar/sheet_file.html:176 msgid "Research archaeology comment" msgstr "" -#: archaeological_files/forms.py:593 archaeological_files/models.py:794 +#: archaeological_files/forms.py:593 archaeological_files/models.py:896 msgid "Classified area" msgstr "" -#: archaeological_files/forms.py:594 archaeological_files/models.py:796 +#: archaeological_files/forms.py:594 archaeological_files/models.py:898 msgid "Protected area" msgstr "" @@ -2229,11 +2473,11 @@ msgstr "" msgid "File managed by" msgstr "" -#: archaeological_files/forms.py:622 archaeological_files/models.py:736 +#: archaeological_files/forms.py:622 archaeological_files/models.py:838 msgid "Related file" msgstr "" -#: archaeological_files/forms.py:630 archaeological_files/models.py:750 +#: archaeological_files/forms.py:630 archaeological_files/models.py:852 #: archaeological_files/templates/ishtar/sheet_file.html:66 msgid "Instruction deadline" msgstr "" @@ -2265,27 +2509,27 @@ msgstr "" msgid "Archaeological royalties" msgstr "" -#: archaeological_files/forms.py:742 archaeological_files/models.py:821 +#: archaeological_files/forms.py:742 archaeological_files/models.py:923 msgid "Intervention period" msgstr "" -#: archaeological_files/forms.py:747 archaeological_files/models.py:824 +#: archaeological_files/forms.py:747 archaeological_files/models.py:926 msgid "Study period" msgstr "" -#: archaeological_files/forms.py:752 archaeological_files/models.py:827 +#: archaeological_files/forms.py:752 archaeological_files/models.py:929 msgid "Report due period" msgstr "" -#: archaeological_files/forms.py:767 archaeological_files/models.py:831 +#: archaeological_files/forms.py:767 archaeological_files/models.py:933 msgid "Ground start date" msgstr "" -#: archaeological_files/forms.py:772 archaeological_files/models.py:832 +#: archaeological_files/forms.py:772 archaeological_files/models.py:934 msgid "Ground end date" msgstr "" -#: archaeological_files/forms.py:777 archaeological_files/models.py:834 +#: archaeological_files/forms.py:777 archaeological_files/models.py:936 msgid "Execution report date" msgstr "" @@ -2317,16 +2561,16 @@ msgstr "" msgid "Days" msgstr "" -#: archaeological_files/forms.py:864 archaeological_files/models.py:120 -#: archaeological_files/models.py:1751 archaeological_files/models.py:1770 +#: archaeological_files/forms.py:864 archaeological_files/models.py:222 +#: archaeological_files/models.py:1853 archaeological_files/models.py:1872 #: archaeological_files/templates/ishtar/sheet_file.html:298 #: archaeological_files/templates/ishtar/sheet_file.html:350 msgid "Job" msgstr "" -#: archaeological_files/forms.py:885 archaeological_files/models.py:84 -#: archaeological_files/models.py:85 archaeological_files/models.py:97 -#: archaeological_files/models.py:230 archaeological_files/models.py:817 +#: archaeological_files/forms.py:885 archaeological_files/models.py:94 +#: archaeological_files/models.py:95 archaeological_files/models.py:199 +#: archaeological_files/models.py:332 archaeological_files/models.py:919 msgid "Price agreement" msgstr "" @@ -2377,6 +2621,9 @@ msgstr "" #: archaeological_warehouse/forms.py:465 archaeological_warehouse/forms.py:527 #: archaeological_warehouse/models.py:1200 ishtar_common/admin.py:649 #: ishtar_common/models.py:5197 +#: man_app/templates/ishtar/sheet_find_treatments.html:94 +#: na_app/templates/ishtar/sheet_find.html:374 +#: pdl_app/templates/ishtar/sheet_find.html:367 msgid "Index" msgstr "" @@ -2449,7 +2696,7 @@ msgstr "" msgid "Administrative act - Archaeological file - General" msgstr "" -#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:880 +#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:982 #: archaeological_files/templates/ishtar/sheet_file.html:4 #: archaeological_files/wizards.py:226 archaeological_files/wizards.py:238 #: archaeological_operations/forms.py:663 @@ -2475,140 +2722,204 @@ msgstr "" #: archaeological_operations/models.py:1942 #: archaeological_operations/models.py:3256 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 +#: cd93_app/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "" -#: archaeological_files/models.py:92 archaeological_files/models.py:127 -#: archaeological_files/models.py:192 archaeological_files/models.py:208 -#: archaeological_files/models.py:278 archaeological_files/models.py:380 -#: archaeological_files/models.py:392 archaeological_files/models.py:404 -#: archaeological_files/models.py:424 archaeological_files/models.py:1757 -#: archaeological_files/models.py:1776 archaeological_files/models.py:1803 +#: archaeological_files/models.py:102 archaeological_files/models.py:229 +#: archaeological_files/models.py:294 archaeological_files/models.py:310 +#: archaeological_files/models.py:380 archaeological_files/models.py:482 +#: archaeological_files/models.py:494 archaeological_files/models.py:506 +#: archaeological_files/models.py:526 archaeological_files/models.py:1859 +#: archaeological_files/models.py:1878 archaeological_files/models.py:1905 #: archaeological_files/templates/ishtar/sheet_file.html:29 #: archaeological_operations/templates/ishtar/sheet_operation.html:310 #: ishtar_common/models.py:6077 +#: na_app/templates/ishtar/sheet_operation.html:316 +#: pdl_app/templates/ishtar/sheet_operation.html:333 msgid "Preventive" msgstr "" -#: archaeological_files/models.py:100 +#: archaeological_files/models.py:136 +msgid "Equipment - service costs" +msgstr "" + +#: archaeological_files/models.py:137 archaeological_files/models.py:148 +#: archaeological_finds/forms.py:2503 +#: archaeological_finds/forms_treatments.py:57 +#: archaeological_finds/forms_treatments.py:67 +#: archaeological_finds/forms_treatments.py:194 +#: archaeological_finds/models_treatments.py:356 +#: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 +#: archaeological_finds/templates/ishtar/sheet_find_treatments.html:61 +#: archaeological_finds/templates/ishtar/sheet_find_treatments.html:99 +#: ishtar_common/forms_common.py:2026 ishtar_common/models.py:1015 +#: ishtar_common/models.py:1935 ishtar_common/models.py:4413 +#: ishtar_common/models_common.py:181 ishtar_common/models_common.py:232 +#: ishtar_common/models_common.py:2198 ishtar_common/models_common.py:2214 +#: ishtar_common/models_imports.py:706 +#: man_app/templates/ishtar/sheet_find_treatments.html:119 +#: man_app/templates/ishtar/sheet_find_treatments.html:157 +#: na_app/templates/ishtar/sheet_find.html:444 +#: na_app/templates/ishtar/sheet_find.html:482 +#: pdl_app/templates/ishtar/sheet_find.html:437 +#: pdl_app/templates/ishtar/sheet_find.html:475 +msgid "Label" +msgstr "" + +#: archaeological_files/models.py:137 archaeological_files/models.py:354 +#: ishtar_common/models_imports.py:1086 +msgid "Unit" +msgstr "" + +#: archaeological_files/models.py:137 +msgid "Price" +msgstr "" + +#: archaeological_files/models.py:144 archaeological_finds/tests.py:1864 +#: archaeological_finds/tests.py:1890 archaeological_finds/tests.py:1900 +#: archaeological_operations/tests.py:3371 ishtar_common/forms.py:1353 +#: ishtar_common/forms.py:1445 +#: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 +#: ishtar_common/templatetags/window_field.py:19 +#: ishtar_common/views_item.py:798 ishtar_common/views_item.py:1071 +#: ishtar_common/views_item.py:1108 ishtar_common/wizards.py:511 +msgid "Yes" +msgstr "" + +#: archaeological_files/models.py:144 archaeological_finds/tests.py:1865 +#: archaeological_finds/tests.py:1891 archaeological_finds/tests.py:1901 +#: ishtar_common/forms.py:1354 ishtar_common/forms.py:1447 +#: ishtar_common/templatetags/window_field.py:24 ishtar_common/wizards.py:513 +msgid "No" +msgstr "" + +#: archaeological_files/models.py:148 archaeological_files/models.py:205 +#: archaeological_files/models.py:273 +msgid "Permanent contract" +msgstr "" + +#: archaeological_files/models.py:149 archaeological_files/models.py:202 msgid "Ground daily cost" msgstr "" -#: archaeological_files/models.py:101 +#: archaeological_files/models.py:149 archaeological_files/models.py:203 msgid "Daily cost" msgstr "" -#: archaeological_files/models.py:103 archaeological_files/models.py:171 -msgid "Permanent contract" +#: archaeological_files/models.py:150 +msgid "Job cost" +msgstr "" + +#: archaeological_files/models.py:155 +msgid "ishtar-price-agreement" msgstr "" -#: archaeological_files/models.py:106 +#: archaeological_files/models.py:208 msgid "Def. daily number on ground" msgstr "" -#: archaeological_files/models.py:108 +#: archaeological_files/models.py:210 msgid "Def. daily number on study" msgstr "" -#: archaeological_files/models.py:114 +#: archaeological_files/models.py:216 msgid "Child" msgstr "" -#: archaeological_files/models.py:115 +#: archaeological_files/models.py:217 msgid "Auto-add this job when a parent is added" msgstr "" -#: archaeological_files/models.py:121 +#: archaeological_files/models.py:223 msgid "Jobs" msgstr "" -#: archaeological_files/models.py:133 +#: archaeological_files/models.py:235 msgid "fixed-term contract" msgstr "" -#: archaeological_files/models.py:175 +#: archaeological_files/models.py:277 msgid "Fixed-term contract" msgstr "" -#: archaeological_files/models.py:186 +#: archaeological_files/models.py:288 msgid "Generic equipment type" msgstr "" -#: archaeological_files/models.py:187 +#: archaeological_files/models.py:289 msgid "Generic equipment types" msgstr "" -#: archaeological_files/models.py:197 +#: archaeological_files/models.py:299 msgid "Generic type" msgstr "" -#: archaeological_files/models.py:202 +#: archaeological_files/models.py:304 msgid "Equipment/service type" msgstr "" -#: archaeological_files/models.py:203 +#: archaeological_files/models.py:305 msgid "Equipment/service types" msgstr "" -#: archaeological_files/models.py:212 +#: archaeological_files/models.py:314 #: archaeological_operations/templates/ishtar/sheet_operation.html:236 +#: na_app/templates/ishtar/sheet_operation.html:233 +#: pdl_app/templates/ishtar/sheet_operation.html:236 msgid "days" msgstr "" -#: archaeological_files/models.py:213 +#: archaeological_files/models.py:315 msgid "weeks" msgstr "" -#: archaeological_files/models.py:214 +#: archaeological_files/models.py:316 msgid "months" msgstr "" -#: archaeological_files/models.py:215 +#: archaeological_files/models.py:317 msgid "linear m." msgstr "" -#: archaeological_files/models.py:234 +#: archaeological_files/models.py:336 msgid "Equipment/Service" msgstr "" -#: archaeological_files/models.py:237 archaeological_warehouse/forms.py:215 +#: archaeological_files/models.py:339 archaeological_warehouse/forms.py:215 #: archaeological_warehouse/models.py:385 ishtar_common/models.py:3398 #: ishtar_common/models_common.py:183 ishtar_common/models_common.py:232 msgid "Textual ID" msgstr "" -#: archaeological_files/models.py:241 ishtar_common/models.py:3401 +#: archaeological_files/models.py:343 ishtar_common/models.py:3401 #: ishtar_common/models_common.py:187 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:247 +#: archaeological_files/models.py:349 msgid "Service provider" msgstr "" -#: archaeological_files/models.py:249 archaeological_files/models.py:312 +#: archaeological_files/models.py:351 archaeological_files/models.py:414 msgid "Flat rate" msgstr "" -#: archaeological_files/models.py:250 +#: archaeological_files/models.py:352 msgid "Unitary cost" msgstr "" -#: archaeological_files/models.py:252 ishtar_common/models_imports.py:1086 -msgid "Unit" -msgstr "" - -#: archaeological_files/models.py:255 +#: archaeological_files/models.py:357 msgid "Specificity" msgstr "" -#: archaeological_files/models.py:258 +#: archaeological_files/models.py:360 msgid "Default quantity by day" msgstr "" -#: archaeological_files/models.py:260 ishtar_common/models.py:1728 +#: archaeological_files/models.py:362 ishtar_common/models.py:1728 #: ishtar_common/models.py:2205 ishtar_common/models.py:4425 #: ishtar_common/models_common.py:193 ishtar_common/models_imports.py:170 #: ishtar_common/models_imports.py:448 ishtar_common/models_imports.py:959 @@ -2616,86 +2927,86 @@ msgstr "" msgid "Available" msgstr "" -#: archaeological_files/models.py:266 ishtar_common/admin.py:1559 +#: archaeological_files/models.py:368 ishtar_common/admin.py:1559 #: ishtar_common/models.py:2538 ishtar_common/models_common.py:779 msgid "Parent" msgstr "" -#: archaeological_files/models.py:267 +#: archaeological_files/models.py:369 msgid "Auto-add this cost when a parent is added" msgstr "" -#: archaeological_files/models.py:272 +#: archaeological_files/models.py:374 msgid "Equipment/service cost" msgstr "" -#: archaeological_files/models.py:273 +#: archaeological_files/models.py:375 msgid "Equipment/service costs" msgstr "" -#: archaeological_files/models.py:332 +#: archaeological_files/models.py:434 msgid "Archaeological file type" msgstr "" -#: archaeological_files/models.py:333 +#: archaeological_files/models.py:435 msgid "Archaeological file types" msgstr "" -#: archaeological_files/models.py:353 +#: archaeological_files/models.py:455 msgid "Permit types" msgstr "" -#: archaeological_files/models.py:364 +#: archaeological_files/models.py:466 msgid "Delay (in days)" msgstr "" -#: archaeological_files/models.py:377 +#: archaeological_files/models.py:479 msgid "Agreement type - France" msgstr "" -#: archaeological_files/models.py:378 +#: archaeological_files/models.py:480 msgid "Agreement types - France" msgstr "" -#: archaeological_files/models.py:389 +#: archaeological_files/models.py:491 msgid "Monitoring justification type" msgstr "" -#: archaeological_files/models.py:390 +#: archaeological_files/models.py:492 msgid "Monitoring justification types" msgstr "" -#: archaeological_files/models.py:402 +#: archaeological_files/models.py:504 msgid "Development types" msgstr "" -#: archaeological_files/models.py:413 +#: archaeological_files/models.py:515 msgid "Increase coefficient" msgstr "" -#: archaeological_files/models.py:415 +#: archaeological_files/models.py:517 msgid "Increased final value" msgstr "" -#: archaeological_files/models.py:417 +#: archaeological_files/models.py:519 msgid "Category" msgstr "" -#: archaeological_files/models.py:421 +#: archaeological_files/models.py:523 msgid "Operation type for royalties - France" msgstr "" -#: archaeological_files/models.py:422 +#: archaeological_files/models.py:524 msgid "Operation types for royalties - France" msgstr "" -#: archaeological_files/models.py:461 archaeological_finds/models_finds.py:1323 +#: archaeological_files/models.py:563 archaeological_finds/models_finds.py:1323 #: archaeological_operations/models.py:388 #: archaeological_operations/models.py:1166 msgid "Extended area" msgstr "" -#: archaeological_files/models.py:470 archaeological_finds/models_finds.py:1345 +#: archaeological_files/models.py:572 archaeological_finds/models_finds.py:1345 #: archaeological_operations/templates/ishtar/sheet_operation.html:549 #: archaeological_operations/templates/ishtar/sheet_operation.html:559 #: archaeological_operations/templates/ishtar/sheet_operation.html:577 @@ -2703,23 +3014,35 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:597 #: archaeological_operations/templates/ishtar/sheet_operation.html:614 #: ishtar_common/models.py:2060 ishtar_common/models_common.py:826 -#: ishtar_common/models_common.py:2189 ishtar_common/models_common.py:2205 +#: ishtar_common/models_common.py:2199 ishtar_common/models_common.py:2215 #: ishtar_common/templates/ishtar/sheet_person.html:30 +#: na_app/templates/ishtar/sheet_operation.html:554 +#: na_app/templates/ishtar/sheet_operation.html:564 +#: na_app/templates/ishtar/sheet_operation.html:581 +#: na_app/templates/ishtar/sheet_operation.html:591 +#: na_app/templates/ishtar/sheet_operation.html:601 +#: na_app/templates/ishtar/sheet_operation.html:618 +#: pdl_app/templates/ishtar/sheet_operation.html:571 +#: pdl_app/templates/ishtar/sheet_operation.html:581 +#: pdl_app/templates/ishtar/sheet_operation.html:598 +#: pdl_app/templates/ishtar/sheet_operation.html:608 +#: pdl_app/templates/ishtar/sheet_operation.html:618 +#: pdl_app/templates/ishtar/sheet_operation.html:635 msgid "Number" msgstr "" -#: archaeological_files/models.py:471 +#: archaeological_files/models.py:573 msgid "Total surface (km²)" msgstr "" -#: archaeological_files/models.py:472 +#: archaeological_files/models.py:574 msgid "Total developed surface (km²)" msgstr "" -#: archaeological_files/models.py:541 archaeological_finds/models_finds.py:1450 +#: archaeological_files/models.py:643 archaeological_finds/models_finds.py:1450 #: archaeological_finds/models_treatments.py:265 #: archaeological_finds/models_treatments.py:1361 -#: archaeological_finds/tests.py:1659 archaeological_operations/models.py:1319 +#: archaeological_finds/tests.py:1699 archaeological_operations/models.py:1319 #: archaeological_operations/models.py:3005 #: archaeological_operations/tests.py:3292 #: archaeological_operations/tests.py:3406 @@ -2727,7 +3050,7 @@ msgctxt "key for text search" msgid "year" msgstr "" -#: archaeological_files/models.py:543 +#: archaeological_files/models.py:645 #: archaeological_finds/models_treatments.py:262 #: archaeological_finds/models_treatments.py:1358 #: archaeological_operations/models.py:456 @@ -2736,18 +3059,18 @@ msgctxt "key for text search" msgid "reference" msgstr "" -#: archaeological_files/models.py:546 archaeological_operations/models.py:3009 +#: archaeological_files/models.py:648 archaeological_operations/models.py:3009 #: ishtar_common/models.py:4925 msgctxt "key for text search" msgid "internal-reference" msgstr "" -#: archaeological_files/models.py:558 archaeological_operations/models.py:1343 +#: archaeological_files/models.py:660 archaeological_operations/models.py:1343 msgctxt "key for text search" msgid "department" msgstr "" -#: archaeological_files/models.py:562 +#: archaeological_files/models.py:664 #: archaeological_finds/models_treatments.py:1355 #: archaeological_operations/models.py:459 #: archaeological_operations/models.py:1347 @@ -2759,7 +3082,7 @@ msgctxt "key for text search" msgid "name" msgstr "" -#: archaeological_files/models.py:568 +#: archaeological_files/models.py:670 #: archaeological_finds/models_treatments.py:268 #: archaeological_finds/models_treatments.py:1364 #: archaeological_operations/models.py:466 @@ -2774,54 +3097,54 @@ msgctxt "key for text search" msgid "type" msgstr "" -#: archaeological_files/models.py:571 +#: archaeological_files/models.py:673 msgctxt "key for text search" msgid "active" msgstr "" -#: archaeological_files/models.py:574 +#: archaeological_files/models.py:676 msgctxt "key for text search" msgid "saisine-type" msgstr "" -#: archaeological_files/models.py:579 +#: archaeological_files/models.py:681 msgctxt "key for text search" msgid "development-type" msgstr "" -#: archaeological_files/models.py:583 +#: archaeological_files/models.py:685 msgctxt "key for text search" msgid "monitoring-justification" msgstr "" -#: archaeological_files/models.py:587 +#: archaeological_files/models.py:689 msgctxt "key for text search" msgid "permit-type" msgstr "" -#: archaeological_files/models.py:592 +#: archaeological_files/models.py:694 msgctxt "key for text search" msgid "permit-reference" msgstr "" -#: archaeological_files/models.py:599 archaeological_finds/models_finds.py:1771 +#: archaeological_files/models.py:701 archaeological_finds/models_finds.py:1771 #: archaeological_finds/models_treatments.py:1367 -#: archaeological_finds/tests.py:1694 +#: archaeological_finds/tests.py:1734 msgctxt "key for text search" msgid "in-charge" msgstr "" -#: archaeological_files/models.py:603 archaeological_operations/models.py:3057 +#: archaeological_files/models.py:705 archaeological_operations/models.py:3057 msgctxt "key for text search" msgid "general-contractor" msgstr "" -#: archaeological_files/models.py:608 archaeological_operations/models.py:3061 +#: archaeological_files/models.py:710 archaeological_operations/models.py:3061 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "" -#: archaeological_files/models.py:657 +#: archaeological_files/models.py:759 #: archaeological_finds/forms_treatments.py:699 #: archaeological_finds/forms_treatments.py:771 #: archaeological_finds/forms_treatments.py:964 @@ -2849,8 +3172,8 @@ msgstr "" #: ishtar_common/models.py:2793 ishtar_common/models.py:3109 #: ishtar_common/models.py:3708 ishtar_common/models.py:4023 #: ishtar_common/models.py:6113 ishtar_common/models_common.py:956 -#: ishtar_common/models_common.py:2427 ishtar_common/models_common.py:3215 -#: ishtar_common/models_common.py:3622 ishtar_common/models_common.py:3688 +#: ishtar_common/models_common.py:2437 ishtar_common/models_common.py:3225 +#: ishtar_common/models_common.py:3632 ishtar_common/models_common.py:3698 #: ishtar_common/models_imports.py:129 ishtar_common/models_imports.py:162 #: ishtar_common/models_imports.py:443 ishtar_common/models_imports.py:813 #: ishtar_common/models_imports.py:831 ishtar_common/models_imports.py:954 @@ -2869,50 +3192,58 @@ msgstr "" #: ishtar_common/templates/ishtar/sheet_organization.html:28 #: ishtar_common/templates/ishtar/sheet_organization.html:56 #: ishtar_common/templates/ishtar/sheet_town.html:63 +#: man_app/templates/ishtar/sheet_find_treatments.html:244 +#: na_app/templates/ishtar/sheet_find.html:522 +#: na_app/templates/ishtar/sheet_operation.html:157 +#: pdl_app/templates/ishtar/sheet_find.html:515 +#: pdl_app/templates/ishtar/sheet_operation.html:160 msgid "Name" msgstr "" -#: archaeological_files/models.py:663 +#: archaeological_files/models.py:765 #: archaeological_finds/models_treatments.py:1417 #: archaeological_finds/models_treatments.py:1697 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:187 #: archaeological_warehouse/forms.py:230 archaeological_warehouse/models.py:393 +#: man_app/templates/ishtar/sheet_find_treatments.html:245 +#: na_app/templates/ishtar/sheet_find.html:523 +#: pdl_app/templates/ishtar/sheet_find.html:516 msgid "Person in charge" msgstr "" -#: archaeological_files/models.py:677 +#: archaeological_files/models.py:779 msgid "General contractor (raw)" msgstr "" -#: archaeological_files/models.py:682 +#: archaeological_files/models.py:784 msgid "General contractor organization" msgstr "" -#: archaeological_files/models.py:692 +#: archaeological_files/models.py:794 msgid "Responsible for planning service" msgstr "" -#: archaeological_files/models.py:696 +#: archaeological_files/models.py:798 msgid "Planning service (raw)" msgstr "" -#: archaeological_files/models.py:703 +#: archaeological_files/models.py:805 msgid "Planning service organization" msgstr "" -#: archaeological_files/models.py:718 +#: archaeological_files/models.py:820 msgid "Main town" msgstr "" -#: archaeological_files/models.py:757 +#: archaeological_files/models.py:859 msgid "Main address" msgstr "" -#: archaeological_files/models.py:759 +#: archaeological_files/models.py:861 msgid "Main address - postal code" msgstr "" -#: archaeological_files/models.py:778 +#: archaeological_files/models.py:880 #: archaeological_finds/forms_treatments.py:91 #: archaeological_finds/forms_treatments.py:227 #: archaeological_finds/forms_treatments.py:480 @@ -2930,23 +3261,23 @@ msgstr "" msgid "Organization" msgstr "" -#: archaeological_files/models.py:836 +#: archaeological_files/models.py:938 msgid "Linear meter" msgstr "" -#: archaeological_files/models.py:840 +#: archaeological_files/models.py:942 msgid "Type of agreement" msgstr "" -#: archaeological_files/models.py:845 +#: archaeological_files/models.py:947 msgid "Operation type for royalties" msgstr "" -#: archaeological_files/models.py:861 +#: archaeological_files/models.py:963 msgid "Imported line" msgstr "" -#: archaeological_files/models.py:881 +#: archaeological_files/models.py:983 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:121 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:220 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:330 @@ -2956,108 +3287,108 @@ msgstr "" msgid "Archaeological files" msgstr "" -#: archaeological_files/models.py:907 +#: archaeological_files/models.py:1009 msgid "FILE" msgstr "" -#: archaeological_files/models.py:1370 +#: archaeological_files/models.py:1472 msgid "Multi-town" msgstr "" -#: archaeological_files/models.py:1376 +#: archaeological_files/models.py:1478 msgid "No town" msgstr "" -#: archaeological_files/models.py:1595 archaeological_operations/models.py:2213 +#: archaeological_files/models.py:1697 archaeological_operations/models.py:2213 msgid "Modify parcels" msgstr "" -#: archaeological_files/models.py:1597 archaeological_operations/models.py:2215 +#: archaeological_files/models.py:1699 archaeological_operations/models.py:2215 msgid "parcels" msgstr "" -#: archaeological_files/models.py:1607 +#: archaeological_files/models.py:1709 msgid "Edit intervention plan" msgstr "" -#: archaeological_files/models.py:1609 +#: archaeological_files/models.py:1711 msgid "plan" msgstr "" -#: archaeological_files/models.py:1618 +#: archaeological_files/models.py:1720 #: archaeological_finds/models_treatments.py:590 #: archaeological_finds/models_treatments.py:1569 #: archaeological_operations/models.py:2251 msgid "Add associated administrative act" msgstr "" -#: archaeological_files/models.py:1620 +#: archaeological_files/models.py:1722 #: archaeological_finds/models_treatments.py:592 #: archaeological_finds/models_treatments.py:1571 #: archaeological_operations/models.py:2253 msgid "admin. act" msgstr "" -#: archaeological_files/models.py:1629 +#: archaeological_files/models.py:1731 msgid "Add operation" msgstr "" -#: archaeological_files/models.py:1631 +#: archaeological_files/models.py:1733 #: archaeological_files/templates/ishtar/blocks/window_file_nav.html:6 #: ishtar_common/admin.py:1879 msgid "operation" msgstr "" -#: archaeological_files/models.py:1706 archaeological_operations/models.py:1596 +#: archaeological_files/models.py:1808 archaeological_operations/models.py:1596 #: archaeological_operations/models.py:3473 ishtar_common/forms_common.py:2664 msgid "File" msgstr "" -#: archaeological_files/models.py:1725 +#: archaeological_files/models.py:1827 msgid "Man by day - planned" msgstr "" -#: archaeological_files/models.py:1727 archaeological_files/models.py:1793 +#: archaeological_files/models.py:1829 archaeological_files/models.py:1895 msgid "Days - planned" msgstr "" -#: archaeological_files/models.py:1729 +#: archaeological_files/models.py:1831 msgid "Man by day - worked" msgstr "" -#: archaeological_files/models.py:1731 archaeological_files/models.py:1797 +#: archaeological_files/models.py:1833 archaeological_files/models.py:1899 msgid "Days - worked" msgstr "" -#: archaeological_files/models.py:1755 +#: archaeological_files/models.py:1857 msgid "Human requirement on field" msgstr "" -#: archaeological_files/models.py:1756 +#: archaeological_files/models.py:1858 msgid "Human requirements on field" msgstr "" -#: archaeological_files/models.py:1774 +#: archaeological_files/models.py:1876 msgid "Human requirement for post-excavation" msgstr "" -#: archaeological_files/models.py:1775 +#: archaeological_files/models.py:1877 msgid "Human requirements for post-excavation" msgstr "" -#: archaeological_files/models.py:1791 +#: archaeological_files/models.py:1893 msgid "Quantity by day - planned" msgstr "" -#: archaeological_files/models.py:1795 +#: archaeological_files/models.py:1897 msgid "Quantity by day - worked" msgstr "" -#: archaeological_files/models.py:1801 +#: archaeological_files/models.py:1903 msgid "Equipment requirement" msgstr "" -#: archaeological_files/models.py:1802 +#: archaeological_files/models.py:1904 msgid "Equipment requirements" msgstr "" @@ -3115,8 +3446,12 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:26 #: archaeological_warehouse/templates/ishtar/sheet_container.html:83 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:76 -#: ishtar_common/models_common.py:4904 +#: ishtar_common/models_common.py:4914 #: ishtar_common/templates/ishtar/sheet_document.html:37 +#: na_app/templates/ishtar/sheet_container.html:90 +#: na_app/templates/ishtar/sheet_find.html:162 +#: na_app/templates/ishtar/sheet_operation.html:143 +#: pdl_app/templates/ishtar/sheet_find.html:150 msgid "Complete identifier" msgstr "" @@ -3138,6 +3473,8 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:184 #: archaeological_operations/templates/ishtar/sheet_operation.html:390 +#: na_app/templates/ishtar/sheet_operation.html:393 +#: pdl_app/templates/ishtar/sheet_operation.html:410 msgid "Associated parcels" msgstr "" @@ -3154,7 +3491,10 @@ msgstr "" #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:300 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:400 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:499 -#: ishtar_common/views.py:187 +#: ishtar_common/views.py:187 na_app/templates/ishtar/sheet_operation.html:398 +#: na_app/templates/ishtar/sheet_operation.html:535 +#: pdl_app/templates/ishtar/sheet_operation.html:415 +#: pdl_app/templates/ishtar/sheet_operation.html:552 msgid "Administrative acts" msgstr "" @@ -3227,6 +3567,8 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:410 #: archaeological_files/templates/ishtar/sheet_file.html:413 #: archaeological_operations/templates/ishtar/sheet_operation.html:227 +#: na_app/templates/ishtar/sheet_operation.html:224 +#: pdl_app/templates/ishtar/sheet_operation.html:227 msgid "Cost" msgstr "" @@ -3238,6 +3580,8 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:217 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:242 #: ishtar_common/models.py:2053 ishtar_common/models.py:2085 +#: na_app/templates/ishtar/sheet_container.html:259 +#: na_app/templates/ishtar/sheet_container.html:283 msgid "Total" msgstr "" @@ -3417,6 +3761,8 @@ msgstr "" #: archaeological_finds/forms.py:405 archaeological_finds/forms.py:1023 #: archaeological_finds/templates/ishtar/sheet_find.html:146 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:146 +#: cd17_app/templates/ishtar/sheet_find.html:154 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:185 msgid "Ownership" msgstr "" @@ -3426,6 +3772,8 @@ msgstr "" #: archaeological_finds/models_finds.py:2317 #: archaeological_finds/templates/ishtar/sheet_find.html:148 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:148 +#: cd17_app/templates/ishtar/sheet_find.html:156 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:187 msgid "Ownership status" msgstr "" @@ -3433,7 +3781,9 @@ msgstr "" #: archaeological_finds/models_finds.py:2321 #: archaeological_finds/templates/ishtar/sheet_find.html:149 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:149 -#: archaeological_operations/models.py:3811 ishtar_common/models.py:4423 +#: archaeological_operations/models.py:3811 +#: cd17_app/templates/ishtar/sheet_find.html:157 ishtar_common/models.py:4423 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:188 msgid "Owner" msgstr "" @@ -3494,6 +3844,8 @@ msgstr "" #: archaeological_finds/models_finds.py:2351 #: archaeological_finds/templates/ishtar/sheet_find.html:169 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:169 +#: cd17_app/templates/ishtar/sheet_find.html:177 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:208 msgid "Donors, testators or vendors" msgstr "" @@ -3501,6 +3853,8 @@ msgstr "" #: archaeological_finds/models_finds.py:2367 #: archaeological_finds/templates/ishtar/sheet_find.html:158 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:158 +#: cd17_app/templates/ishtar/sheet_find.html:166 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:197 msgid "Collections" msgstr "" @@ -3703,6 +4057,11 @@ msgstr "" #: archaeological_finds/forms.py:2398 #: archaeological_finds/templates/ishtar/sheet_find.html:193 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:193 +#: cd17_app/templates/ishtar/sheet_find.html:201 +#: man_app/templates/ishtar/sheet_museum_find.html:195 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:232 +#: na_app/templates/ishtar/sheet_find.html:217 +#: pdl_app/templates/ishtar/sheet_find.html:210 msgid "Weight (g)" msgstr "" @@ -3749,6 +4108,7 @@ msgstr "" #: archaeological_finds/forms.py:731 archaeological_finds/models_finds.py:619 #: archaeological_finds/templates/ishtar/sheet_basefind.html:51 +#: man_app/templates/ishtar/sheet_basefind.html:47 msgid "Comment on the circumstances of discovery" msgstr "" @@ -3760,12 +4120,14 @@ msgstr "" #: archaeological_finds/forms.py:741 archaeological_finds/forms.py:1850 #: archaeological_finds/models_finds.py:630 #: archaeological_finds/templates/ishtar/sheet_basefind.html:33 +#: man_app/templates/ishtar/sheet_basefind.html:29 msgid "Discovery date (exact or beginning)" msgstr "" #: archaeological_finds/forms.py:744 archaeological_finds/forms.py:1851 #: archaeological_finds/models_finds.py:633 #: archaeological_finds/templates/ishtar/sheet_basefind.html:35 +#: man_app/templates/ishtar/sheet_basefind.html:31 msgid "Discovery date (end)" msgstr "" @@ -3837,6 +4199,9 @@ msgstr "" #: archaeological_finds/forms.py:1027 archaeological_finds/forms.py:1502 #: archaeological_finds/forms.py:1673 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:14 +#: man_app/templates/ishtar/sheet_find_treatments.html:15 +#: na_app/templates/ishtar/sheet_find.html:295 +#: pdl_app/templates/ishtar/sheet_find.html:288 msgid "Preservation" msgstr "" @@ -3860,6 +4225,9 @@ msgstr "" #: archaeological_finds/forms.py:1941 archaeological_finds/models_finds.py:1330 #: archaeological_finds/models_finds.py:2395 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:18 +#: man_app/templates/ishtar/sheet_find_treatments.html:19 +#: na_app/templates/ishtar/sheet_find.html:299 +#: pdl_app/templates/ishtar/sheet_find.html:292 msgid "Conservatory states" msgstr "" @@ -3906,6 +4274,7 @@ msgstr "" #: archaeological_finds/forms.py:1951 archaeological_finds/models_finds.py:1349 #: archaeological_finds/models_finds.py:2429 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:24 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:70 msgid "Insurance value" msgstr "" @@ -3947,7 +4316,7 @@ msgstr "" #: archaeological_finds/forms.py:1459 archaeological_finds/forms.py:2505 #: ishtar_common/models.py:1089 ishtar_common/models.py:2175 -#: ishtar_common/models.py:4415 ishtar_common/models_common.py:3216 +#: ishtar_common/models.py:4415 ishtar_common/models_common.py:3226 #: ishtar_common/models_imports.py:163 ishtar_common/models_imports.py:444 #: ishtar_common/models_imports.py:832 ishtar_common/models_imports.py:3041 msgid "Slug" @@ -4093,6 +4462,8 @@ msgstr "" #: archaeological_finds/models_finds.py:1327 #: archaeological_operations/templates/ishtar/sheet_operation.html:577 #: archaeological_warehouse/forms.py:587 +#: na_app/templates/ishtar/sheet_operation.html:581 +#: pdl_app/templates/ishtar/sheet_operation.html:598 msgid "Material type" msgstr "" @@ -4100,6 +4471,8 @@ msgstr "" #: archaeological_finds/models_finds.py:1328 #: archaeological_operations/templates/ishtar/sheet_operation.html:587 #: archaeological_warehouse/forms.py:593 ishtar_common/models_imports.py:1103 +#: na_app/templates/ishtar/sheet_operation.html:591 +#: pdl_app/templates/ishtar/sheet_operation.html:608 msgid "Object type" msgstr "" @@ -4211,6 +4584,9 @@ msgstr "" #: archaeological_finds/models_finds.py:2231 #: archaeological_finds/templates/ishtar/sheet_find_containers.html:4 #: ishtar_common/forms_common.py:2096 +#: man_app/templates/ishtar/sheet_find_treatments.html:36 +#: na_app/templates/ishtar/sheet_find.html:316 +#: pdl_app/templates/ishtar/sheet_find.html:309 msgid "Reference container" msgstr "" @@ -4221,6 +4597,10 @@ msgstr "" #: archaeological_finds/forms.py:2108 archaeological_finds/models_finds.py:1285 #: archaeological_finds/templates/ishtar/sheet_find_containers.html:29 #: ishtar_common/forms_common.py:2088 +#: man_app/templates/ishtar/sheet_find_treatments.html:61 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:41 +#: na_app/templates/ishtar/sheet_find.html:341 +#: pdl_app/templates/ishtar/sheet_find.html:334 msgid "Current container" msgstr "" @@ -4264,22 +4644,6 @@ msgstr "" msgid "Find basket" msgstr "" -#: archaeological_finds/forms.py:2503 -#: archaeological_finds/forms_treatments.py:57 -#: archaeological_finds/forms_treatments.py:67 -#: archaeological_finds/forms_treatments.py:194 -#: archaeological_finds/models_treatments.py:356 -#: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 -#: archaeological_finds/templates/ishtar/sheet_find_treatments.html:61 -#: archaeological_finds/templates/ishtar/sheet_find_treatments.html:99 -#: ishtar_common/forms_common.py:2026 ishtar_common/models.py:1015 -#: ishtar_common/models.py:1935 ishtar_common/models.py:4413 -#: ishtar_common/models_common.py:181 ishtar_common/models_common.py:232 -#: ishtar_common/models_common.py:2188 ishtar_common/models_common.py:2204 -#: ishtar_common/models_imports.py:706 -msgid "Label" -msgstr "" - #: archaeological_finds/forms.py:2545 archaeological_finds/forms.py:2600 msgid "A basket with this slug already exists." msgstr "" @@ -4312,6 +4676,9 @@ msgstr "" #: ishtar_common/forms_common.py:2515 ishtar_common/forms_common.py:2800 #: ishtar_common/models.py:2533 #: ishtar_common/templates/ishtar/sheet_document.html:40 +#: man_app/templates/ishtar/sheet_find_treatments.html:231 +#: na_app/templates/ishtar/sheet_find.html:432 +#: pdl_app/templates/ishtar/sheet_find.html:425 msgid "Reference" msgstr "" @@ -4529,6 +4896,16 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 #: ishtar_common/forms_common.py:2654 ishtar_common/forms_common.py:2866 #: ishtar_common/templates/ishtar/sheet_document.html:103 +#: man_app/templates/ishtar/sheet_find_treatments.html:124 +#: man_app/templates/ishtar/sheet_find_treatments.html:162 +#: man_app/templates/ishtar/sheet_find_treatments.html:201 +#: na_app/templates/ishtar/sheet_container.html:4 +#: na_app/templates/ishtar/sheet_find.html:402 +#: na_app/templates/ishtar/sheet_find.html:449 +#: na_app/templates/ishtar/sheet_find.html:487 +#: pdl_app/templates/ishtar/sheet_find.html:395 +#: pdl_app/templates/ishtar/sheet_find.html:442 +#: pdl_app/templates/ishtar/sheet_find.html:480 msgid "Container" msgstr "" @@ -4586,6 +4963,9 @@ msgstr "" #: archaeological_finds/models_treatments.py:1425 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:188 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:61 +#: man_app/templates/ishtar/sheet_find_treatments.html:246 +#: na_app/templates/ishtar/sheet_find.html:524 +#: pdl_app/templates/ishtar/sheet_find.html:517 msgid "Applicant" msgstr "" @@ -4594,6 +4974,9 @@ msgstr "" #: archaeological_finds/models_treatments.py:1433 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:189 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:69 +#: man_app/templates/ishtar/sheet_find_treatments.html:247 +#: na_app/templates/ishtar/sheet_find.html:525 +#: pdl_app/templates/ishtar/sheet_find.html:518 msgid "Applicant organisation" msgstr "" @@ -5190,8 +5573,8 @@ msgctxt "key for text search" msgid "denomination" msgstr "" -#: archaeological_finds/models_finds.py:1458 archaeological_finds/tests.py:1588 -#: archaeological_finds/tests.py:1801 archaeological_warehouse/models.py:966 +#: archaeological_finds/models_finds.py:1458 archaeological_finds/tests.py:1628 +#: archaeological_finds/tests.py:1841 archaeological_warehouse/models.py:966 msgctxt "key for text search" msgid "code-patriarche" msgstr "" @@ -5243,8 +5626,8 @@ msgctxt "key for text search" msgid "context-record-relation-type" msgstr "" -#: archaeological_finds/models_finds.py:1509 archaeological_finds/tests.py:1495 -#: archaeological_finds/tests.py:1799 archaeological_warehouse/models.py:1001 +#: archaeological_finds/models_finds.py:1509 archaeological_finds/tests.py:1535 +#: archaeological_finds/tests.py:1839 archaeological_warehouse/models.py:1001 msgctxt "key for text search" msgid "material" msgstr "" @@ -5261,7 +5644,7 @@ msgctxt "key for text search" msgid "recommended-treatments" msgstr "" -#: archaeological_finds/models_finds.py:1522 archaeological_finds/tests.py:1742 +#: archaeological_finds/models_finds.py:1522 archaeological_finds/tests.py:1782 #: archaeological_warehouse/models.py:1013 msgctxt "key for text search" msgid "conservatory" @@ -5324,12 +5707,12 @@ msgid "last-modified-by" msgstr "" #: archaeological_finds/models_finds.py:1572 -#: ishtar_common/models_common.py:1711 +#: ishtar_common/models_common.py:1721 msgctxt "key for text search" msgid "created-by" msgstr "" -#: archaeological_finds/models_finds.py:1575 archaeological_finds/tests.py:1821 +#: archaeological_finds/models_finds.py:1575 archaeological_finds/tests.py:1861 msgctxt "key for text search" msgid "loan" msgstr "" @@ -5582,7 +5965,7 @@ msgctxt "key for text search" msgid "technical-process" msgstr "" -#: archaeological_finds/models_finds.py:1767 archaeological_finds/tests.py:1682 +#: archaeological_finds/models_finds.py:1767 archaeological_finds/tests.py:1722 msgctxt "key for text search" msgid "operation-address" msgstr "" @@ -5593,7 +5976,7 @@ msgctxt "key for text search" msgid "scientist" msgstr "" -#: archaeological_finds/models_finds.py:1779 archaeological_finds/tests.py:1608 +#: archaeological_finds/models_finds.py:1779 archaeological_finds/tests.py:1648 #: archaeological_operations/models.py:1370 #: archaeological_operations/tests.py:3098 #: archaeological_operations/tests.py:3799 @@ -5757,11 +6140,17 @@ msgstr "" #: archaeological_finds/models_finds.py:2201 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:56 +#: man_app/templates/ishtar/sheet_find_treatments.html:114 +#: na_app/templates/ishtar/sheet_find.html:439 +#: pdl_app/templates/ishtar/sheet_find.html:432 msgid "Upstream treatment" msgstr "" #: archaeological_finds/models_finds.py:2208 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:94 +#: man_app/templates/ishtar/sheet_find_treatments.html:152 +#: na_app/templates/ishtar/sheet_find.html:477 +#: pdl_app/templates/ishtar/sheet_find.html:470 msgid "Downstream treatment" msgstr "" @@ -5797,6 +6186,8 @@ msgstr "" #: archaeological_finds/models_finds.py:2372 #: archaeological_finds/templates/ishtar/sheet_find.html:159 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:159 +#: cd17_app/templates/ishtar/sheet_find.html:167 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:198 msgid "Former collection" msgstr "" @@ -5858,11 +6249,17 @@ msgstr "" #: archaeological_finds/models_finds.py:3890 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:167 +#: man_app/templates/ishtar/sheet_find_treatments.html:225 +#: na_app/templates/ishtar/sheet_find.html:426 +#: pdl_app/templates/ishtar/sheet_find.html:419 msgid "Current" msgstr "" #: archaeological_finds/models_finds.py:3892 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:167 +#: man_app/templates/ishtar/sheet_find_treatments.html:225 +#: na_app/templates/ishtar/sheet_find.html:426 +#: pdl_app/templates/ishtar/sheet_find.html:419 msgid "Reference/current" msgstr "" @@ -6047,6 +6444,14 @@ msgstr "" #: archaeological_finds/models_treatments.py:1052 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:65 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:103 +#: man_app/templates/ishtar/sheet_find_treatments.html:123 +#: man_app/templates/ishtar/sheet_find_treatments.html:161 +#: na_app/templates/ishtar/sheet_find.html:401 +#: na_app/templates/ishtar/sheet_find.html:448 +#: na_app/templates/ishtar/sheet_find.html:486 +#: pdl_app/templates/ishtar/sheet_find.html:394 +#: pdl_app/templates/ishtar/sheet_find.html:441 +#: pdl_app/templates/ishtar/sheet_find.html:479 msgid "Doer" msgstr "" @@ -6095,6 +6500,9 @@ msgstr "" #: archaeological_finds/models_treatments.py:1491 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:180 +#: man_app/templates/ishtar/sheet_find_treatments.html:238 +#: na_app/templates/ishtar/sheet_find.html:516 +#: pdl_app/templates/ishtar/sheet_find.html:509 msgid "Treatment requests" msgstr "" @@ -6174,14 +6582,17 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:10 #: ishtar_common/templates/ishtar/blocks/sheet_external_id.html:3 +#: man_app/templates/ishtar/sheet_basefind.html:7 msgid "Internal ID" msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:27 +#: man_app/templates/ishtar/sheet_basefind.html:23 msgid "Discovery date" msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:30 +#: man_app/templates/ishtar/sheet_basefind.html:26 msgid "Discovery year" msgstr "" @@ -6192,6 +6603,11 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:14 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:14 +#: cd17_app/templates/ishtar/sheet_find.html:14 +#: man_app/templates/ishtar/sheet_museum_find.html:14 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:14 +#: na_app/templates/ishtar/sheet_find.html:14 +#: pdl_app/templates/ishtar/sheet_find.html:14 msgid "" "This sheet has a downstream treatment: it is related to an old version of " "the find." @@ -6199,38 +6615,70 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:49 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:49 +#: cd17_app/templates/ishtar/sheet_find.html:49 +#: man_app/templates/ishtar/sheet_museum_find.html:48 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:88 msgid "Archaeological context" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:56 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:56 +#: cd17_app/templates/ishtar/sheet_find.html:56 +#: man_app/templates/ishtar/sheet_museum_find.html:56 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:95 +#: na_app/templates/ishtar/sheet_find.html:55 +#: pdl_app/templates/ishtar/sheet_find.html:55 msgid "Preservation / Treatments" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:154 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:154 +#: cd17_app/templates/ishtar/sheet_find.html:162 +#: man_app/templates/ishtar/sheet_museum_find.html:147 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:193 +#: na_app/templates/ishtar/sheet_find.html:227 +#: pdl_app/templates/ishtar/sheet_find.html:220 msgid "Museum / legal status" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:166 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:166 +#: cd17_app/templates/ishtar/sheet_find.html:174 +#: man_app/templates/ishtar/sheet_museum_find.html:159 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:205 +#: na_app/templates/ishtar/sheet_find.html:239 +#: pdl_app/templates/ishtar/sheet_find.html:232 msgid "Museum entry date" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:254 +#: archaeological_finds/templates/ishtar/sheet_find.html:257 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:254 +#: cd17_app/templates/ishtar/sheet_find.html:265 +#: man_app/templates/ishtar/sheet_museum_find.html:256 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:293 +#: na_app/templates/ishtar/sheet_find.html:276 +#: pdl_app/templates/ishtar/sheet_find.html:269 msgid "Checked" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_containers.html:30 +#: man_app/templates/ishtar/sheet_find_treatments.html:62 +#: na_app/templates/ishtar/sheet_find.html:342 +#: pdl_app/templates/ishtar/sheet_find.html:335 msgid "Reference container / current container" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:31 +#: man_app/templates/ishtar/sheet_find_treatments.html:32 +#: na_app/templates/ishtar/sheet_find.html:312 +#: pdl_app/templates/ishtar/sheet_find.html:305 msgid "Warehouse - container" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:48 +#: man_app/templates/ishtar/sheet_find_treatments.html:106 +#: na_app/templates/ishtar/sheet_find.html:386 +#: pdl_app/templates/ishtar/sheet_find.html:379 msgid "Container information not available." msgstr "" @@ -6238,12 +6686,33 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:98 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:138 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:184 +#: man_app/templates/ishtar/sheet_find_treatments.html:118 +#: man_app/templates/ishtar/sheet_find_treatments.html:156 +#: man_app/templates/ishtar/sheet_find_treatments.html:196 +#: man_app/templates/ishtar/sheet_find_treatments.html:242 +#: na_app/templates/ishtar/sheet_find.html:397 +#: na_app/templates/ishtar/sheet_find.html:443 +#: na_app/templates/ishtar/sheet_find.html:481 +#: na_app/templates/ishtar/sheet_find.html:520 +#: pdl_app/templates/ishtar/sheet_find.html:390 +#: pdl_app/templates/ishtar/sheet_find.html:436 +#: pdl_app/templates/ishtar/sheet_find.html:474 +#: pdl_app/templates/ishtar/sheet_find.html:513 msgid "Year - index" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:64 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:102 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:141 +#: man_app/templates/ishtar/sheet_find_treatments.html:122 +#: man_app/templates/ishtar/sheet_find_treatments.html:160 +#: man_app/templates/ishtar/sheet_find_treatments.html:199 +#: na_app/templates/ishtar/sheet_find.html:400 +#: na_app/templates/ishtar/sheet_find.html:447 +#: na_app/templates/ishtar/sheet_find.html:485 +#: pdl_app/templates/ishtar/sheet_find.html:393 +#: pdl_app/templates/ishtar/sheet_find.html:440 +#: pdl_app/templates/ishtar/sheet_find.html:478 msgid "Related finds (max. 15 displayed)" msgstr "" @@ -6253,6 +6722,9 @@ msgstr "" #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:48 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:51 +#: man_app/templates/ishtar/sheet_find_treatments.html:148 +#: na_app/templates/ishtar/sheet_find.html:473 +#: pdl_app/templates/ishtar/sheet_find.html:466 msgid "Export as CSV" msgstr "" @@ -6262,27 +6734,49 @@ msgstr "" #: ishtar_common/templates/blocks/JQueryJqGrid.html:29 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:48 +#: man_app/templates/ishtar/sheet_find_treatments.html:148 +#: man_app/templates/ishtar/sheet_find_treatments.html:187 +#: na_app/templates/ishtar/sheet_find.html:473 +#: na_app/templates/ishtar/sheet_find.html:512 +#: pdl_app/templates/ishtar/sheet_find.html:466 +#: pdl_app/templates/ishtar/sheet_find.html:505 msgid "CSV" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:134 +#: man_app/templates/ishtar/sheet_find_treatments.html:192 +#: na_app/templates/ishtar/sheet_find.html:393 +#: pdl_app/templates/ishtar/sheet_find.html:386 msgid "Simple treatments" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:139 +#: man_app/templates/ishtar/sheet_find_treatments.html:197 +#: na_app/templates/ishtar/sheet_find.html:398 +#: pdl_app/templates/ishtar/sheet_find.html:391 msgid "Label/type" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:142 +#: man_app/templates/ishtar/sheet_find_treatments.html:200 msgid "Organization/responsible" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:144 +#: man_app/templates/ishtar/sheet_find_treatments.html:202 +#: na_app/templates/ishtar/sheet_find.html:403 +#: pdl_app/templates/ishtar/sheet_find.html:396 msgid "Date start/end" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:166 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:172 +#: man_app/templates/ishtar/sheet_find_treatments.html:224 +#: man_app/templates/ishtar/sheet_find_treatments.html:230 +#: na_app/templates/ishtar/sheet_find.html:425 +#: na_app/templates/ishtar/sheet_find.html:431 +#: pdl_app/templates/ishtar/sheet_find.html:418 +#: pdl_app/templates/ishtar/sheet_find.html:424 msgid "First packaging" msgstr "" @@ -6307,6 +6801,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:31 #: ishtar_common/forms_common.py:2285 #: ishtar_common/templates/ishtar/sheet_document.html:58 +#: na_app/templates/ishtar/sheet_container.html:35 msgid "Content" msgstr "" @@ -6381,24 +6876,6 @@ msgstr "" msgid "The division {} {} do not exist for the location {}." msgstr "" -#: archaeological_finds/tests.py:1824 archaeological_finds/tests.py:1850 -#: archaeological_finds/tests.py:1860 archaeological_operations/tests.py:3371 -#: ishtar_common/forms.py:1353 ishtar_common/forms.py:1445 -#: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 -#: ishtar_common/templatetags/window_field.py:19 -#: ishtar_common/views_item.py:788 ishtar_common/views_item.py:1061 -#: ishtar_common/views_item.py:1098 ishtar_common/wizards.py:511 -#: views_item.py:785 views_item.py:1058 views_item.py:1095 -msgid "Yes" -msgstr "" - -#: archaeological_finds/tests.py:1825 archaeological_finds/tests.py:1851 -#: archaeological_finds/tests.py:1861 ishtar_common/forms.py:1354 -#: ishtar_common/forms.py:1447 ishtar_common/templatetags/window_field.py:24 -#: ishtar_common/wizards.py:513 -msgid "No" -msgstr "" - #: archaeological_finds/views.py:335 msgid "Basket modify" msgstr "" @@ -6521,6 +6998,8 @@ msgstr "" #: archaeological_operations/models.py:3508 #: archaeological_operations/templates/ishtar/sheet_operation.html:536 #: ishtar_common/templates/ishtar/forms/modify_parcels.html:27 +#: na_app/templates/ishtar/sheet_operation.html:541 +#: pdl_app/templates/ishtar/sheet_operation.html:558 msgid "Parcels" msgstr "" @@ -6628,6 +7107,8 @@ msgstr "" #: archaeological_operations/forms.py:707 #: archaeological_operations/models.py:1675 #: archaeological_operations/templates/ishtar/sheet_operation.html:161 +#: na_app/templates/ishtar/sheet_operation.html:158 +#: pdl_app/templates/ishtar/sheet_operation.html:161 msgid "Address / Locality" msgstr "" @@ -6723,6 +7204,8 @@ msgstr "" #: archaeological_operations/forms.py:1713 #: archaeological_operations/models.py:1719 #: archaeological_operations/templates/ishtar/sheet_operation.html:256 +#: na_app/templates/ishtar/sheet_operation.html:254 +#: pdl_app/templates/ishtar/sheet_operation.html:268 msgid "Documentation deposit date" msgstr "" @@ -6743,6 +7226,8 @@ msgstr "" #: archaeological_operations/forms.py:1720 #: archaeological_operations/models.py:1726 #: archaeological_operations/templates/ishtar/sheet_operation.html:264 +#: na_app/templates/ishtar/sheet_operation.html:262 +#: pdl_app/templates/ishtar/sheet_operation.html:287 msgid "Finds deposit date" msgstr "" @@ -6768,12 +7253,6 @@ msgstr "" msgid "Actors" msgstr "" -#: archaeological_operations/forms.py:729 -#: archaeological_operations/models.py:1565 -#: archaeological_operations/models.py:3176 -msgid "Head scientist" -msgstr "" - #: archaeological_operations/forms.py:751 #: archaeological_operations/forms.py:1335 #: archaeological_operations/forms.py:1723 @@ -6839,6 +7318,8 @@ msgstr "" #: archaeological_operations/forms.py:935 #: archaeological_operations/templates/ishtar/sheet_operation.html:324 +#: na_app/templates/ishtar/sheet_operation.html:330 +#: pdl_app/templates/ishtar/sheet_operation.html:347 msgid "Court-ordered seizure" msgstr "" @@ -7352,7 +7833,8 @@ msgstr "" #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:236 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:344 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:443 -#: ishtar_common/views.py:172 +#: ishtar_common/views.py:172 na_app/templates/ishtar/sheet_operation.html:372 +#: pdl_app/templates/ishtar/sheet_operation.html:389 msgid "Archaeological sites" msgstr "" @@ -7370,8 +7852,7 @@ msgstr "" #: archaeological_operations/models.py:983 ishtar_common/forms.py:1352 #: ishtar_common/models.py:6152 ishtar_common/models.py:6313 -#: ishtar_common/models.py:6373 ishtar_common/views_item.py:2039 -#: views_item.py:2037 +#: ishtar_common/models.py:6373 ishtar_common/views_item.py:2049 msgid "Unknown" msgstr "" @@ -7540,7 +8021,7 @@ msgctxt "key for text search" msgid "file" msgstr "" -#: archaeological_operations/models.py:1607 ishtar_common/models_common.py:3623 +#: archaeological_operations/models.py:1607 ishtar_common/models_common.py:3633 msgid "Surface (m2)" msgstr "" @@ -7839,8 +8320,8 @@ msgstr "" #: archaeological_operations/models.py:3503 ishtar_common/models.py:2808 #: ishtar_common/models.py:3125 ishtar_common/models.py:4558 -#: ishtar_common/models_common.py:3649 ishtar_common/models_common.py:3688 -#: ishtar_common/models_common.py:4897 +#: ishtar_common/models_common.py:3659 ishtar_common/models_common.py:3698 +#: ishtar_common/models_common.py:4907 msgid "Cached name" msgstr "" @@ -7877,11 +8358,14 @@ msgid "No parcel" msgstr "" #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:28 +#: cd93_app/templates/ishtar/sheet_administrativeact.html:28 #: ishtar_common/templates/ishtar/sheet_document.html:28 msgid "View PDF" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:54 +#: na_app/templates/ishtar/sheet_operation.html:53 +#: pdl_app/templates/ishtar/sheet_operation.html:53 msgid "Archaeological sites/parcels/Administrativ acts" msgstr "" @@ -7895,7 +8379,12 @@ msgstr "" #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:244 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:351 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:450 -#: ishtar_common/views.py:175 +#: ishtar_common/views.py:175 na_app/templates/ishtar/sheet_operation.html:80 +#: na_app/templates/ishtar/sheet_operation.html:448 +#: na_app/templates/ishtar/sheet_operation.html:546 +#: pdl_app/templates/ishtar/sheet_operation.html:80 +#: pdl_app/templates/ishtar/sheet_operation.html:465 +#: pdl_app/templates/ishtar/sheet_operation.html:563 msgid "Context records" msgstr "" @@ -7906,35 +8395,61 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:38 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:174 #: ishtar_common/templates/blocks/DataTables-tabs.html:30 +#: na_app/templates/ishtar/sheet_container.html:42 +#: na_app/templates/ishtar/sheet_container.html:222 +#: na_app/templates/ishtar/sheet_operation.html:116 +#: na_app/templates/ishtar/sheet_operation.html:515 +#: pdl_app/templates/ishtar/sheet_operation.html:116 +#: pdl_app/templates/ishtar/sheet_operation.html:532 msgid "Statistics" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:166 +#: na_app/templates/ishtar/sheet_operation.html:163 +#: pdl_app/templates/ishtar/sheet_operation.html:166 msgid "Excavation dates (start/end)" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:235 +#: na_app/templates/ishtar/sheet_operation.html:232 +#: pdl_app/templates/ishtar/sheet_operation.html:235 msgid "Duration" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:298 +#: na_app/templates/ishtar/sheet_operation.html:304 +#: pdl_app/templates/ishtar/sheet_operation.html:321 msgid "This operation is virtual." msgstr "" +#: archaeological_operations/templates/ishtar/sheet_operation.html:305 +#: na_app/templates/ishtar/sheet_operation.html:311 +#: pdl_app/templates/ishtar/sheet_operation.html:328 +msgid "Patriarche OA code not yet recorded!" +msgstr "" + #: archaeological_operations/templates/ishtar/sheet_operation.html:432 +#: na_app/templates/ishtar/sheet_operation.html:439 +#: pdl_app/templates/ishtar/sheet_operation.html:456 msgid "No relations" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:453 +#: na_app/templates/ishtar/sheet_operation.html:458 +#: pdl_app/templates/ishtar/sheet_operation.html:475 msgid "Documents from associated context records" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:459 +#: na_app/templates/ishtar/sheet_operation.html:463 +#: pdl_app/templates/ishtar/sheet_operation.html:480 msgid "Diagram of stratigraphic relations" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:487 #: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:8 +#: na_app/templates/ishtar/sheet_operation.html:492 +#: pdl_app/templates/ishtar/sheet_operation.html:509 msgid "Associated containers" msgstr "" @@ -7948,26 +8463,39 @@ msgstr "" #: ishtar_common/templates/ishtar/blocks/window_nav.html:86 #: ishtar_common/templates/ishtar/blocks/window_nav.html:92 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:46 +#: na_app/templates/ishtar/sheet_container.html:227 +#: na_app/templates/ishtar/sheet_operation.html:520 +#: pdl_app/templates/ishtar/sheet_operation.html:537 msgid "Export" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:520 #: archaeological_warehouse/templates/ishtar/sheet_container.html:227 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:190 +#: na_app/templates/ishtar/sheet_container.html:232 +#: na_app/templates/ishtar/sheet_operation.html:525 +#: pdl_app/templates/ishtar/sheet_operation.html:542 msgid "Regenerate statistics" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:525 #: archaeological_warehouse/templates/ishtar/sheet_container.html:232 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:195 +#: na_app/templates/ishtar/sheet_container.html:237 +#: na_app/templates/ishtar/sheet_operation.html:530 +#: pdl_app/templates/ishtar/sheet_operation.html:547 msgid "Last update:" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:606 +#: na_app/templates/ishtar/sheet_operation.html:610 +#: pdl_app/templates/ishtar/sheet_operation.html:627 msgid "Sources" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:624 +#: na_app/templates/ishtar/sheet_operation.html:628 +#: pdl_app/templates/ishtar/sheet_operation.html:645 msgid "Finds by context records" msgstr "" @@ -8004,7 +8532,7 @@ msgstr "" msgid "This item has been locked. Edition is disabled." msgstr "" -#: archaeological_operations/tests.py:3376 ishtar_common/models_common.py:1719 +#: archaeological_operations/tests.py:3376 ishtar_common/models_common.py:1729 msgctxt "key for text search" msgid "created" msgstr "" @@ -8135,6 +8663,7 @@ msgstr "" #: archaeological_warehouse/forms.py:138 archaeological_warehouse/models.py:408 #: archaeological_warehouse/templates/ishtar/sheet_container.html:190 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:142 +#: na_app/templates/ishtar/sheet_container.html:195 msgid "Divisions" msgstr "" @@ -8178,27 +8707,27 @@ msgid "" msgstr "" #: archaeological_warehouse/forms.py:253 ishtar_common/forms_common.py:785 -#: ishtar_common/forms_common.py:1204 ishtar_common/models_common.py:4162 -#: ishtar_common/models_common.py:4372 +#: ishtar_common/forms_common.py:1204 ishtar_common/models_common.py:4172 +#: ishtar_common/models_common.py:4382 msgid "Address complement" msgstr "" #: archaeological_warehouse/forms.py:256 ishtar_common/forms_common.py:788 -#: ishtar_common/forms_common.py:1207 ishtar_common/models_common.py:4167 +#: ishtar_common/forms_common.py:1207 ishtar_common/models_common.py:4177 #: ishtar_common/templates/ishtar/sheet_person.html:57 #: ishtar_common/templates/ishtar/sheet_person.html:77 msgid "Town (freeform)" msgstr "" #: archaeological_warehouse/forms.py:258 ishtar_common/forms_common.py:790 -#: ishtar_common/forms_common.py:1209 ishtar_common/models_common.py:4173 +#: ishtar_common/forms_common.py:1209 ishtar_common/models_common.py:4183 msgid "Country" msgstr "" #: archaeological_warehouse/forms.py:259 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:124 #: ishtar_common/forms_common.py:792 ishtar_common/forms_common.py:1180 -#: ishtar_common/models_common.py:4187 ishtar_common/models_common.py:4384 +#: ishtar_common/models_common.py:4197 ishtar_common/models_common.py:4394 #: ishtar_common/templates/ishtar/sheet_person.html:27 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:35 msgid "Phone" @@ -8207,7 +8736,7 @@ msgstr "" #: archaeological_warehouse/forms.py:261 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:125 #: ishtar_common/forms_common.py:794 ishtar_common/forms_common.py:1190 -#: ishtar_common/models_common.py:4203 +#: ishtar_common/models_common.py:4213 #: ishtar_common/templates/ishtar/sheet_person.html:45 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:56 msgid "Mobile phone" @@ -8240,6 +8769,7 @@ msgstr "" #: archaeological_warehouse/models.py:1179 #: archaeological_warehouse/templates/ishtar/sheet_container.html:154 #: ishtar_common/models_imports.py:1095 +#: na_app/templates/ishtar/sheet_container.html:161 msgid "Container type" msgstr "" @@ -8390,7 +8920,7 @@ msgstr "" #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:284 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:386 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:485 -#: ishtar_common/views.py:183 +#: ishtar_common/views.py:183 na_app/templates/ishtar/sheet_container.html:197 msgid "Containers" msgstr "" @@ -8670,50 +9200,61 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:108 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:90 +#: na_app/templates/ishtar/sheet_container.html:115 msgid "Number of containers" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:112 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:94 +#: na_app/templates/ishtar/sheet_container.html:119 msgid "Number of divisions" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:116 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:98 +#: na_app/templates/ishtar/sheet_container.html:123 msgid "Number of owned finds" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:120 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:102 +#: na_app/templates/ishtar/sheet_container.html:127 msgid "Number of hosted finds" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:129 +#: na_app/templates/ishtar/sheet_container.html:136 msgid "Measured weight (kg)" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:130 +#: na_app/templates/ishtar/sheet_container.html:137 msgid "Calculated weight (kg)" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:134 +#: na_app/templates/ishtar/sheet_container.html:141 #, python-format msgid "Calculated weight and measured weight are too different (over 10%%)." msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:209 +#: na_app/templates/ishtar/sheet_container.html:214 msgid "Empty" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:240 +#: na_app/templates/ishtar/sheet_container.html:245 msgid "No container/division inside this container." msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:246 +#: na_app/templates/ishtar/sheet_container.html:251 msgid "Finds by location" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:270 +#: na_app/templates/ishtar/sheet_container.html:275 msgid "Containers by location" msgstr "" @@ -8879,13 +9420,12 @@ msgid "Export selected as CSV file" msgstr "" #: ishtar_common/admin.py:204 ishtar_common/models_imports.py:943 -#: ishtar_common/views_item.py:789 ishtar_common/views_item.py:1857 -#: views_item.py:786 views_item.py:1855 +#: ishtar_common/views_item.py:799 ishtar_common/views_item.py:1867 msgid "True" msgstr "" #: ishtar_common/admin.py:204 ishtar_common/models_imports.py:943 -#: ishtar_common/views_item.py:1859 views_item.py:1857 +#: ishtar_common/views_item.py:1869 msgid "False" msgstr "" @@ -9144,7 +9684,7 @@ msgstr "" msgid "No json file found in zipfile" msgstr "" -#: ishtar_common/admin.py:1402 ishtar_common/models_common.py:3747 +#: ishtar_common/admin.py:1402 ishtar_common/models_common.py:3757 msgid "Town limit" msgstr "" @@ -9378,11 +9918,6 @@ msgstr "" msgid "Update table, export format and types from source" msgstr "" -#: ishtar_common/admin.py:3130 -msgid "" -"Document not generated: is the LibreOffice daemon configured and running?" -msgstr "" - #: ishtar_common/admin.py:3150 msgid "Generate match document" msgstr "" @@ -9488,184 +10023,184 @@ msgstr "" msgid "changelog" msgstr "" -#: ishtar_common/data_importer.py:283 +#: ishtar_common/data_importer.py:290 #, python-format msgid "\"%(value)s\" is too long. The max length is %(length)d characters." msgstr "" -#: ishtar_common/data_importer.py:302 +#: ishtar_common/data_importer.py:309 #, python-format msgid "\"%(value)s\" not equal to yes or no" msgstr "" -#: ishtar_common/data_importer.py:314 +#: ishtar_common/data_importer.py:321 #, python-format msgid "\"%(value)s\" is not a float" msgstr "" -#: ishtar_common/data_importer.py:324 +#: ishtar_common/data_importer.py:331 #, python-brace-format msgid "\"{value}\" is not an appropriate INSEE code" msgstr "" -#: ishtar_common/data_importer.py:381 ishtar_common/data_importer.py:395 -#: ishtar_common/data_importer.py:619 +#: ishtar_common/data_importer.py:388 ishtar_common/data_importer.py:402 +#: ishtar_common/data_importer.py:626 #, python-format msgid "\"%(value)s\" is not a valid date" msgstr "" -#: ishtar_common/data_importer.py:408 +#: ishtar_common/data_importer.py:415 #, python-format msgid "\"%(value)s\" is not an integer" msgstr "" -#: ishtar_common/data_importer.py:477 +#: ishtar_common/data_importer.py:484 #, python-format msgid "Choice for \"%s\" is not available. Which one is relevant?\n" msgstr "" -#: ishtar_common/data_importer.py:484 +#: ishtar_common/data_importer.py:491 #, python-format msgid "%d. None of the above - create new" msgstr "" -#: ishtar_common/data_importer.py:486 +#: ishtar_common/data_importer.py:493 #, python-format msgid "%d. None of the above - skip" msgstr "" -#: ishtar_common/data_importer.py:642 +#: ishtar_common/data_importer.py:649 #, python-format msgid "\"%(full_link)s\" is not a valid path" msgstr "" -#: ishtar_common/data_importer.py:670 +#: ishtar_common/data_importer.py:677 #, python-format msgid "\"%(value)s\" is not a valid path for the given archive" msgstr "" -#: ishtar_common/data_importer.py:781 +#: ishtar_common/data_importer.py:788 msgid "" "The given file is not correct. Check the file format. If you use a CSV file: " "check that column separator and encoding are similar to the ones used by the " "reference file." msgstr "" -#: ishtar_common/data_importer.py:787 +#: ishtar_common/data_importer.py:794 #, python-format msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d" msgstr "" -#: ishtar_common/data_importer.py:789 ishtar_common/views.py:2123 +#: ishtar_common/data_importer.py:796 ishtar_common/views.py:2123 msgid "No data provided" msgstr "" -#: ishtar_common/data_importer.py:790 +#: ishtar_common/data_importer.py:797 msgid "Value is required" msgstr "" -#: ishtar_common/data_importer.py:791 +#: ishtar_common/data_importer.py:798 #, python-format msgid "At least %d columns must be filled" msgstr "" -#: ishtar_common/data_importer.py:792 +#: ishtar_common/data_importer.py:799 msgid "The regexp doesn't match." msgstr "" -#: ishtar_common/data_importer.py:794 +#: ishtar_common/data_importer.py:801 msgid "" "Forced creation is set for model {} but this model is not in the list of " "models allowed to be created." msgstr "" -#: ishtar_common/data_importer.py:798 +#: ishtar_common/data_importer.py:805 msgid "" "{} with values {} doesn't exist in the database. Create it first or fix your " "source file." msgstr "" -#: ishtar_common/data_importer.py:802 +#: ishtar_common/data_importer.py:809 msgid "" "Related object not found. Can not create the geographic item. Context: {}." msgstr "" -#: ishtar_common/data_importer.py:898 +#: ishtar_common/data_importer.py:905 msgid "" "Item {} with values: {} not identified for post-treatment - need a non " "ambiguous key" msgstr "" -#: ishtar_common/data_importer.py:1514 ishtar_common/views.py:2201 +#: ishtar_common/data_importer.py:1521 ishtar_common/views.py:2201 #: ishtar_common/views.py:2211 msgid "Not imported" msgstr "" -#: ishtar_common/data_importer.py:1811 +#: ishtar_common/data_importer.py:1818 msgid "Importer configuration error: \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1816 +#: ishtar_common/data_importer.py:1823 msgid "Import error: {} - \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1904 +#: ishtar_common/data_importer.py:1911 msgid "Importer configuration error: field \"{}\" does not exist for {}." msgstr "" -#: ishtar_common/data_importer.py:2035 +#: ishtar_common/data_importer.py:2042 msgid "* created *" msgstr "" -#: ishtar_common/data_importer.py:2105 +#: ishtar_common/data_importer.py:2112 msgid "* match not find *" msgstr "" -#: ishtar_common/data_importer.py:2113 +#: ishtar_common/data_importer.py:2120 msgid "* the query match more than 10 results*" msgstr "" -#: ishtar_common/data_importer.py:2118 +#: ishtar_common/data_importer.py:2125 msgid " or " msgstr "" -#: ishtar_common/data_importer.py:2208 +#: ishtar_common/data_importer.py:2213 msgid "unicity key(s) \"{}\" is/are missing" msgstr "" -#: ishtar_common/data_importer.py:2211 +#: ishtar_common/data_importer.py:2216 msgid "Import error {}, {}" msgstr "" -#: ishtar_common/data_importer.py:2298 +#: ishtar_common/data_importer.py:2303 msgid "Import error {}, path \"{}\", context : {}, error : {}" msgstr "" -#: ishtar_common/data_importer.py:2328 +#: ishtar_common/data_importer.py:2333 msgid "line" msgstr "" -#: ishtar_common/data_importer.py:2328 +#: ishtar_common/data_importer.py:2333 msgid "col" msgstr "" -#: ishtar_common/data_importer.py:2328 +#: ishtar_common/data_importer.py:2333 msgid "error" msgstr "" -#: ishtar_common/data_importer.py:2335 +#: ishtar_common/data_importer.py:2340 msgid "field" msgstr "" -#: ishtar_common/data_importer.py:2335 +#: ishtar_common/data_importer.py:2340 msgid "source" msgstr "" -#: ishtar_common/data_importer.py:2335 +#: ishtar_common/data_importer.py:2340 msgid "result" msgstr "" -#: ishtar_common/data_importer.py:2351 +#: ishtar_common/data_importer.py:2356 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "" @@ -9955,8 +10490,8 @@ msgstr "" #: ishtar_common/forms_common.py:791 ishtar_common/forms_common.py:1040 #: ishtar_common/forms_common.py:1176 ishtar_common/forms_common.py:1271 -#: ishtar_common/forms_common.py:1530 ishtar_common/models_common.py:4205 -#: ishtar_common/models_common.py:4394 ishtar_common/wizards.py:2050 +#: ishtar_common/forms_common.py:1530 ishtar_common/models_common.py:4215 +#: ishtar_common/models_common.py:4404 ishtar_common/wizards.py:2050 msgid "Email" msgstr "" @@ -10037,12 +10572,12 @@ msgstr "" msgid "Raw name" msgstr "" -#: ishtar_common/forms_common.py:1178 ishtar_common/models_common.py:4189 +#: ishtar_common/forms_common.py:1178 ishtar_common/models_common.py:4199 msgid "Phone description" msgstr "" -#: ishtar_common/forms_common.py:1182 ishtar_common/models_common.py:4192 -#: ishtar_common/models_common.py:4195 +#: ishtar_common/forms_common.py:1182 ishtar_common/models_common.py:4202 +#: ishtar_common/models_common.py:4205 msgid "Phone description 2" msgstr "" @@ -10050,11 +10585,11 @@ msgstr "" msgid "Phone 2" msgstr "" -#: ishtar_common/forms_common.py:1186 ishtar_common/models_common.py:4199 +#: ishtar_common/forms_common.py:1186 ishtar_common/models_common.py:4209 msgid "Phone description 3" msgstr "" -#: ishtar_common/forms_common.py:1188 ishtar_common/models_common.py:4197 +#: ishtar_common/forms_common.py:1188 ishtar_common/models_common.py:4207 msgid "Phone 3" msgstr "" @@ -10062,23 +10597,23 @@ msgstr "" msgid "Current organization" msgstr "" -#: ishtar_common/forms_common.py:1211 ishtar_common/models_common.py:4174 +#: ishtar_common/forms_common.py:1211 ishtar_common/models_common.py:4184 msgid "Other address: address" msgstr "" -#: ishtar_common/forms_common.py:1214 ishtar_common/models_common.py:4176 +#: ishtar_common/forms_common.py:1214 ishtar_common/models_common.py:4186 msgid "Other address: address complement" msgstr "" -#: ishtar_common/forms_common.py:1219 ishtar_common/models_common.py:4179 +#: ishtar_common/forms_common.py:1219 ishtar_common/models_common.py:4189 msgid "Other address: postal code" msgstr "" -#: ishtar_common/forms_common.py:1222 ishtar_common/models_common.py:4182 +#: ishtar_common/forms_common.py:1222 ishtar_common/models_common.py:4192 msgid "Other address: town" msgstr "" -#: ishtar_common/forms_common.py:1225 ishtar_common/models_common.py:4185 +#: ishtar_common/forms_common.py:1225 ishtar_common/models_common.py:4195 msgid "Other address: country" msgstr "" @@ -10134,7 +10669,7 @@ msgstr "" #: ishtar_common/ishtar_menu.py:83 ishtar_common/models.py:3620 #: ishtar_common/models.py:3704 ishtar_common/models.py:3743 #: ishtar_common/models.py:4128 ishtar_common/models_common.py:940 -#: ishtar_common/models_common.py:968 ishtar_common/models_common.py:3238 +#: ishtar_common/models_common.py:968 ishtar_common/models_common.py:3248 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:4 #: ishtar_common/templates/ishtar/sheet_person.html:21 msgid "Account" @@ -10516,7 +11051,7 @@ msgid "There are identical authors." msgstr "" #: ishtar_common/forms_common.py:3046 ishtar_common/forms_common.py:3111 -#: ishtar_common/models.py:1016 ishtar_common/models_common.py:3218 +#: ishtar_common/models.py:1016 ishtar_common/models_common.py:3228 msgid "Query" msgstr "" @@ -10544,7 +11079,7 @@ msgstr "" msgid "Geo item - 010 - General" msgstr "" -#: ishtar_common/forms_common.py:3157 ishtar_common/models_common.py:2434 +#: ishtar_common/forms_common.py:3157 ishtar_common/models_common.py:2444 msgid "Import key" msgstr "" @@ -10554,19 +11089,19 @@ msgid "" "overwrite the data." msgstr "" -#: ishtar_common/forms_common.py:3172 ishtar_common/models_common.py:2449 +#: ishtar_common/forms_common.py:3172 ishtar_common/models_common.py:2459 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:6 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:33 msgid "Data type" msgstr "" -#: ishtar_common/forms_common.py:3175 ishtar_common/models_common.py:2441 +#: ishtar_common/forms_common.py:3175 ishtar_common/models_common.py:2451 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:10 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:30 msgid "Origin" msgstr "" -#: ishtar_common/forms_common.py:3178 ishtar_common/models_common.py:2457 +#: ishtar_common/forms_common.py:3178 ishtar_common/models_common.py:2467 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:11 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:36 msgid "Provider" @@ -10578,7 +11113,7 @@ msgid "Acquisition date" msgstr "" #: ishtar_common/forms_common.py:3182 ishtar_common/forms_common.py:3233 -#: ishtar_common/models_common.py:2422 +#: ishtar_common/models_common.py:2432 msgid "Buffer" msgstr "" @@ -10586,18 +11121,18 @@ msgstr "" msgid "Buffer type" msgstr "" -#: ishtar_common/forms_common.py:3191 ishtar_common/models_common.py:2471 -#: ishtar_common/models_common.py:4731 +#: ishtar_common/forms_common.py:3191 ishtar_common/models_common.py:2481 +#: ishtar_common/models_common.py:4741 msgid "Estimated error for X" msgstr "" -#: ishtar_common/forms_common.py:3196 ishtar_common/models_common.py:2474 -#: ishtar_common/models_common.py:4734 +#: ishtar_common/forms_common.py:3196 ishtar_common/models_common.py:2484 +#: ishtar_common/models_common.py:4744 msgid "Estimated error for Y" msgstr "" -#: ishtar_common/forms_common.py:3201 ishtar_common/models_common.py:2477 -#: ishtar_common/models_common.py:4737 +#: ishtar_common/forms_common.py:3201 ishtar_common/models_common.py:2487 +#: ishtar_common/models_common.py:4747 msgid "Estimated error for Z" msgstr "" @@ -10606,10 +11141,10 @@ msgid "Metadata" msgstr "" #: ishtar_common/forms_common.py:3232 ishtar_common/models.py:2559 -#: ishtar_common/models_common.py:2219 ishtar_common/models_common.py:2277 -#: ishtar_common/models_common.py:2309 ishtar_common/models_common.py:2326 -#: ishtar_common/models_common.py:2343 ishtar_common/models_common.py:2356 -#: ishtar_common/models_common.py:2501 ishtar_common/models_common.py:3670 +#: ishtar_common/models_common.py:2229 ishtar_common/models_common.py:2287 +#: ishtar_common/models_common.py:2319 ishtar_common/models_common.py:2336 +#: ishtar_common/models_common.py:2353 ishtar_common/models_common.py:2366 +#: ishtar_common/models_common.py:2511 ishtar_common/models_common.py:3680 msgid "Geography" msgstr "" @@ -10637,8 +11172,8 @@ msgstr "" msgid "Coordinates" msgstr "" -#: ishtar_common/forms_common.py:3513 ishtar_common/models_common.py:2376 -#: ishtar_common/models_common.py:4746 +#: ishtar_common/forms_common.py:3513 ishtar_common/models_common.py:2386 +#: ishtar_common/models_common.py:4756 msgid "Point" msgstr "" @@ -12004,7 +12539,7 @@ msgstr "" msgid "Groups" msgstr "" -#: ishtar_common/models.py:3608 ishtar_common/models_common.py:3242 +#: ishtar_common/models.py:3608 ishtar_common/models_common.py:3252 msgid "Permissions queries" msgstr "" @@ -12129,7 +12664,7 @@ msgstr "" msgid "Ishtar users" msgstr "" -#: ishtar_common/models.py:4305 ishtar_common/models_common.py:1730 +#: ishtar_common/models.py:4305 ishtar_common/models_common.py:1740 msgctxt "key for text search" msgid "user-attached" msgstr "" @@ -12138,7 +12673,7 @@ msgstr "" msgid "Regenerate permissions" msgstr "" -#: ishtar_common/models.py:4373 ishtar_common/models_common.py:3605 +#: ishtar_common/models.py:4373 ishtar_common/models_common.py:3615 msgid "regen." msgstr "" @@ -12356,7 +12891,7 @@ msgctxt "key for text search" msgid "warehouse" msgstr "" -#: ishtar_common/models.py:5073 ishtar_common/models_common.py:2003 +#: ishtar_common/models.py:5073 ishtar_common/models_common.py:2013 msgctxt "key for text search" msgid "has-image" msgstr "" @@ -12684,425 +13219,425 @@ msgstr "" msgid "Auto filled at save" msgstr "" -#: ishtar_common/models_common.py:1272 +#: ishtar_common/models_common.py:1274 msgid "Created by imports" msgstr "" -#: ishtar_common/models_common.py:1274 +#: ishtar_common/models_common.py:1276 msgid "Timestamp geo" msgstr "" -#: ishtar_common/models_common.py:1275 +#: ishtar_common/models_common.py:1277 msgid "Timestamp label" msgstr "" -#: ishtar_common/models_common.py:1278 +#: ishtar_common/models_common.py:1280 msgid "Updated by imports" msgstr "" -#: ishtar_common/models_common.py:1283 +#: ishtar_common/models_common.py:1285 msgctxt "key for text search" msgid "imports" msgstr "" -#: ishtar_common/models_common.py:1667 +#: ishtar_common/models_common.py:1677 msgid "Last editor" msgstr "" -#: ishtar_common/models_common.py:1675 +#: ishtar_common/models_common.py:1685 msgid "Creator" msgstr "" -#: ishtar_common/models_common.py:1682 ishtar_common/models_common.py:2426 +#: ishtar_common/models_common.py:1692 ishtar_common/models_common.py:2436 msgid "Need update" msgstr "" -#: ishtar_common/models_common.py:1684 +#: ishtar_common/models_common.py:1694 msgid "Item locked for edition" msgstr "" -#: ishtar_common/models_common.py:1690 +#: ishtar_common/models_common.py:1700 msgid "Locked by" msgstr "" -#: ishtar_common/models_common.py:1715 +#: ishtar_common/models_common.py:1725 msgctxt "key for text search" msgid "modified-by" msgstr "" -#: ishtar_common/models_common.py:1723 +#: ishtar_common/models_common.py:1733 msgctxt "key for text search" msgid "modified" msgstr "" -#: ishtar_common/models_common.py:1727 +#: ishtar_common/models_common.py:1737 msgctxt "key for text search" msgid "locked" msgstr "" -#: ishtar_common/models_common.py:2007 +#: ishtar_common/models_common.py:2017 msgctxt "key for text search" msgid "has-url" msgstr "" -#: ishtar_common/models_common.py:2011 +#: ishtar_common/models_common.py:2021 msgctxt "key for text search" msgid "has-attached-file" msgstr "" -#: ishtar_common/models_common.py:2015 +#: ishtar_common/models_common.py:2025 msgctxt "key for text search" msgid "document-type" msgstr "" -#: ishtar_common/models_common.py:2100 +#: ishtar_common/models_common.py:2110 msgid "Add document/image" msgstr "" -#: ishtar_common/models_common.py:2102 +#: ishtar_common/models_common.py:2112 msgid "doc./image" msgstr "" -#: ishtar_common/models_common.py:2265 ishtar_common/models_common.py:2286 +#: ishtar_common/models_common.py:2275 ishtar_common/models_common.py:2296 msgid "Authority name" msgstr "" -#: ishtar_common/models_common.py:2266 ishtar_common/models_common.py:2286 +#: ishtar_common/models_common.py:2276 ishtar_common/models_common.py:2296 msgid "Authority SRID" msgstr "" -#: ishtar_common/models_common.py:2267 +#: ishtar_common/models_common.py:2277 msgid "Number of decimal places" msgstr "" -#: ishtar_common/models_common.py:2268 +#: ishtar_common/models_common.py:2278 msgid "Number of decimal places for Z" msgstr "" -#: ishtar_common/models_common.py:2271 +#: ishtar_common/models_common.py:2281 msgid "Geographic - Spatial reference system" msgstr "" -#: ishtar_common/models_common.py:2272 +#: ishtar_common/models_common.py:2282 msgid "Geographic - Spatial reference systems" msgstr "" -#: ishtar_common/models_common.py:2303 +#: ishtar_common/models_common.py:2313 msgid "Geographic - Origin type" msgstr "" -#: ishtar_common/models_common.py:2304 +#: ishtar_common/models_common.py:2314 msgid "Geographic - Origin types" msgstr "" -#: ishtar_common/models_common.py:2320 +#: ishtar_common/models_common.py:2330 msgid "Geographic - Data type" msgstr "" -#: ishtar_common/models_common.py:2321 +#: ishtar_common/models_common.py:2331 msgid "Geographic - Data types" msgstr "" -#: ishtar_common/models_common.py:2337 +#: ishtar_common/models_common.py:2347 msgid "Geographic - Provider type" msgstr "" -#: ishtar_common/models_common.py:2338 +#: ishtar_common/models_common.py:2348 msgid "Geographic - Provider types" msgstr "" -#: ishtar_common/models_common.py:2350 +#: ishtar_common/models_common.py:2360 msgid "Geographic - Buffer type" msgstr "" -#: ishtar_common/models_common.py:2351 +#: ishtar_common/models_common.py:2361 msgid "Geographic - Buffer types" msgstr "" -#: ishtar_common/models_common.py:2377 +#: ishtar_common/models_common.py:2387 msgid "Line(s)" msgstr "" -#: ishtar_common/models_common.py:2378 +#: ishtar_common/models_common.py:2388 msgid "Point(s)" msgstr "" -#: ishtar_common/models_common.py:2379 +#: ishtar_common/models_common.py:2389 msgid "Polygon(s)" msgstr "" -#: ishtar_common/models_common.py:2435 +#: ishtar_common/models_common.py:2445 msgid "Use this for update imports" msgstr "" -#: ishtar_common/models_common.py:2442 +#: ishtar_common/models_common.py:2452 msgid "For instance: topographical survey, georeferencing, ..." msgstr "" -#: ishtar_common/models_common.py:2450 +#: ishtar_common/models_common.py:2460 msgid "For instance: outline, z-sup, ..." msgstr "" -#: ishtar_common/models_common.py:2458 +#: ishtar_common/models_common.py:2468 msgid "Data provider" msgstr "" -#: ishtar_common/models_common.py:2462 ishtar_common/models_common.py:4727 +#: ishtar_common/models_common.py:2472 ishtar_common/models_common.py:4737 msgid "X" msgstr "" -#: ishtar_common/models_common.py:2462 ishtar_common/models_common.py:2463 -#: ishtar_common/models_common.py:2464 +#: ishtar_common/models_common.py:2472 ishtar_common/models_common.py:2473 +#: ishtar_common/models_common.py:2474 msgid "User input" msgstr "" -#: ishtar_common/models_common.py:2463 ishtar_common/models_common.py:4728 +#: ishtar_common/models_common.py:2473 ishtar_common/models_common.py:4738 msgid "Y" msgstr "" -#: ishtar_common/models_common.py:2464 ishtar_common/models_common.py:4729 +#: ishtar_common/models_common.py:2474 ishtar_common/models_common.py:4739 msgid "Z" msgstr "" -#: ishtar_common/models_common.py:2467 +#: ishtar_common/models_common.py:2477 msgid "X (cached)" msgstr "" -#: ishtar_common/models_common.py:2468 +#: ishtar_common/models_common.py:2478 msgid "Y (cached)" msgstr "" -#: ishtar_common/models_common.py:2469 +#: ishtar_common/models_common.py:2479 msgid "Z (cached)" msgstr "" -#: ishtar_common/models_common.py:2481 ishtar_common/models_common.py:4741 +#: ishtar_common/models_common.py:2491 ishtar_common/models_common.py:4751 msgid "Spatial Reference System" msgstr "" -#: ishtar_common/models_common.py:2486 ishtar_common/models_common.py:4747 +#: ishtar_common/models_common.py:2496 ishtar_common/models_common.py:4757 msgid "Point (2D)" msgstr "" -#: ishtar_common/models_common.py:2487 +#: ishtar_common/models_common.py:2497 msgid "Point (3D)" msgstr "" -#: ishtar_common/models_common.py:2488 +#: ishtar_common/models_common.py:2498 msgid "Multi points" msgstr "" -#: ishtar_common/models_common.py:2489 +#: ishtar_common/models_common.py:2499 msgid "Multi lines" msgstr "" -#: ishtar_common/models_common.py:2490 +#: ishtar_common/models_common.py:2500 msgid "Multi polygons" msgstr "" -#: ishtar_common/models_common.py:2493 ishtar_common/models_common.py:2494 +#: ishtar_common/models_common.py:2503 ishtar_common/models_common.py:2504 msgid "Geographic - Vector data" msgstr "" -#: ishtar_common/models_common.py:2630 +#: ishtar_common/models_common.py:2640 msgid "Only 2 or 3 dimensions" msgstr "" -#: ishtar_common/models_common.py:3103 +#: ishtar_common/models_common.py:3113 msgid "Main geodata" msgstr "" -#: ishtar_common/models_common.py:3107 +#: ishtar_common/models_common.py:3117 msgid "Geodata" msgstr "" -#: ishtar_common/models_common.py:3111 +#: ishtar_common/models_common.py:3121 msgctxt "key for text search" msgid "geo-name" msgstr "" -#: ishtar_common/models_common.py:3114 +#: ishtar_common/models_common.py:3124 msgctxt "key for text search" msgid "geo-type" msgstr "" -#: ishtar_common/models_common.py:3117 +#: ishtar_common/models_common.py:3127 msgctxt "key for text search" msgid "geo-origin" msgstr "" -#: ishtar_common/models_common.py:3120 +#: ishtar_common/models_common.py:3130 msgctxt "key for text search" msgid "geo-provider" msgstr "" -#: ishtar_common/models_common.py:3123 +#: ishtar_common/models_common.py:3133 msgctxt "key for text search" msgid "z" msgstr "" -#: ishtar_common/models_common.py:3127 +#: ishtar_common/models_common.py:3137 msgctxt "key for text search" msgid "geo-comment" msgstr "" -#: ishtar_common/models_common.py:3153 +#: ishtar_common/models_common.py:3163 msgid "Add geographic item" msgstr "" -#: ishtar_common/models_common.py:3155 +#: ishtar_common/models_common.py:3165 msgid "geo." msgstr "" -#: ishtar_common/models_common.py:3214 +#: ishtar_common/models_common.py:3224 msgid "Model" msgstr "" -#: ishtar_common/models_common.py:3219 +#: ishtar_common/models_common.py:3229 msgid "Use 'text' query used in Ishtar search input" msgstr "" -#: ishtar_common/models_common.py:3221 +#: ishtar_common/models_common.py:3231 msgid "Active" msgstr "" -#: ishtar_common/models_common.py:3223 +#: ishtar_common/models_common.py:3233 msgid "Include associated items" msgstr "" -#: ishtar_common/models_common.py:3224 +#: ishtar_common/models_common.py:3234 msgid "All items associated items match the request" msgstr "" -#: ishtar_common/models_common.py:3227 +#: ishtar_common/models_common.py:3237 msgid "Include upstream items" msgstr "" -#: ishtar_common/models_common.py:3229 +#: ishtar_common/models_common.py:3239 msgid "" "All items associated by upstream link math the request. For instance, match " "is done for all finds associated with own context records" msgstr "" -#: ishtar_common/models_common.py:3234 +#: ishtar_common/models_common.py:3244 msgid "Limit request to attached areas" msgstr "" -#: ishtar_common/models_common.py:3235 +#: ishtar_common/models_common.py:3245 msgid "Request is limited to areas attached to the ishtar user" msgstr "" -#: ishtar_common/models_common.py:3241 +#: ishtar_common/models_common.py:3251 msgid "Permission query" msgstr "" -#: ishtar_common/models_common.py:3603 +#: ishtar_common/models_common.py:3613 msgid "Regenerate ID" msgstr "" -#: ishtar_common/models_common.py:3625 +#: ishtar_common/models_common.py:3635 msgid "Localisation" msgstr "" -#: ishtar_common/models_common.py:3627 +#: ishtar_common/models_common.py:3637 msgid "Limit" msgstr "" -#: ishtar_common/models_common.py:3629 +#: ishtar_common/models_common.py:3639 #: ishtar_common/templates/ishtar/sheet_town.html:107 msgid "Notice" msgstr "" -#: ishtar_common/models_common.py:3638 +#: ishtar_common/models_common.py:3648 msgid "Year of creation" msgstr "" -#: ishtar_common/models_common.py:3642 +#: ishtar_common/models_common.py:3652 msgid "Filling this field is relevant to distinguish old towns from new towns." msgstr "" -#: ishtar_common/models_common.py:3646 +#: ishtar_common/models_common.py:3656 msgid "Town children" msgstr "" -#: ishtar_common/models_common.py:3704 ishtar_common/models_common.py:3798 -#: ishtar_common/models_common.py:3851 +#: ishtar_common/models_common.py:3714 ishtar_common/models_common.py:3808 +#: ishtar_common/models_common.py:3861 msgid "INSEE code is missing" msgstr "" -#: ishtar_common/models_common.py:3705 +#: ishtar_common/models_common.py:3715 msgid "Geo INSEE is missing" msgstr "" -#: ishtar_common/models_common.py:3984 +#: ishtar_common/models_common.py:3994 msgid ", old town of " msgstr "" -#: ishtar_common/models_common.py:4169 +#: ishtar_common/models_common.py:4179 msgid "Town (precise)" msgstr "" -#: ishtar_common/models_common.py:4201 +#: ishtar_common/models_common.py:4211 msgid "Raw phone" msgstr "" -#: ishtar_common/models_common.py:4207 +#: ishtar_common/models_common.py:4217 msgid "Alternative address is prefered" msgstr "" -#: ishtar_common/models_common.py:4210 +#: ishtar_common/models_common.py:4220 msgid "Cached town" msgstr "" -#: ishtar_common/models_common.py:4261 +#: ishtar_common/models_common.py:4271 msgid "Town with code: {} does not exists" msgstr "" -#: ishtar_common/models_common.py:4298 +#: ishtar_common/models_common.py:4308 msgid "No associated address" msgstr "" -#: ishtar_common/models_common.py:4379 +#: ishtar_common/models_common.py:4389 msgid "Postal code - Town" msgstr "" -#: ishtar_common/models_common.py:4389 +#: ishtar_common/models_common.py:4399 msgid "Mobile" msgstr "" -#: ishtar_common/models_common.py:4412 +#: ishtar_common/models_common.py:4422 msgid "Merge key" msgstr "" -#: ishtar_common/models_common.py:4725 +#: ishtar_common/models_common.py:4735 msgid "Precise" msgstr "" -#: ishtar_common/models_common.py:4725 +#: ishtar_common/models_common.py:4735 msgid "Polygon" msgstr "" -#: ishtar_common/models_common.py:4749 +#: ishtar_common/models_common.py:4759 msgid "Point source" msgstr "" -#: ishtar_common/models_common.py:4752 +#: ishtar_common/models_common.py:4762 msgid "Point source item" msgstr "" -#: ishtar_common/models_common.py:4754 +#: ishtar_common/models_common.py:4764 msgid "Multi polygon" msgstr "" -#: ishtar_common/models_common.py:4756 +#: ishtar_common/models_common.py:4766 msgid "Multi-polygon source" msgstr "" -#: ishtar_common/models_common.py:4763 +#: ishtar_common/models_common.py:4773 msgid "Multi polygon source item" msgstr "" -#: ishtar_common/models_common.py:4906 +#: ishtar_common/models_common.py:4916 msgid "Custom index" msgstr "" @@ -14262,6 +14797,7 @@ msgstr "" #: ishtar_common/templates/blocks/DataTables-stats-detail.html:48 #: ishtar_common/templates/ishtar/blocks/sheet_json.html:9 +#: man_app/templates/ishtar/blocks/sheet_json.html:10 msgid "No data" msgstr "" @@ -14490,6 +15026,9 @@ msgstr "" #: ishtar_common/templates/ishtar/blocks/sheet_document_list.html:3 #: ishtar_common/templates/ishtar/sheet_document.html:140 +#: man_app/templates/ishtar/sheet_museum_find.html:318 +#: na_app/templates/ishtar/sheet_find.html:553 +#: pdl_app/templates/ishtar/sheet_find.html:546 msgid "Associated documents" msgstr "" @@ -16003,7 +16542,6 @@ msgstr "" #: ishtar_common/views.py:1262 ishtar_common/views_item.py:270 #: ishtar_common/views_item.py:316 ishtar_common/views_item.py:335 -#: views_item.py:268 views_item.py:313 views_item.py:332 msgid "Operation not permitted." msgstr "" @@ -16139,17 +16677,17 @@ msgstr "" msgid "Delete geographic item" msgstr "" -#: ishtar_common/views_item.py:282 views_item.py:280 +#: ishtar_common/views_item.py:282 #, python-format msgid "New %s" msgstr "" -#: ishtar_common/views_item.py:349 views_item.py:346 +#: ishtar_common/views_item.py:349 #, python-format msgid "Modify a %s" msgstr "" -#: ishtar_common/views_item.py:1169 views_item.py:1166 +#: ishtar_common/views_item.py:1179 msgctxt "key for text search" msgid "today" msgstr "" @@ -16209,6 +16747,25 @@ msgid "" "If the profile has been changed, don't forget to regenerate permissions." msgstr "" +#: na_app/templates/ishtar/sheet_container.html:303 +msgid "Document for this container" +msgstr "" + +#: na_app/templates/ishtar/sheet_find.html:41 +#: pdl_app/templates/ishtar/sheet_find.html:41 +msgid "Image / Base find" +msgstr "" + +#: na_app/templates/ishtar/sheet_find.html:174 +#: pdl_app/templates/ishtar/sheet_find.html:162 +msgid "Administrative index" +msgstr "" + +#: na_app/templates/ishtar/sheet_operation.html:407 +#: pdl_app/templates/ishtar/sheet_operation.html:424 +msgid "Document from this operation" +msgstr "" + #: overload_translation/models.py:8 msgid "Translation context" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 896990bad..cb90b2f2c 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: 2026-01-14 18:22+0100\n" +"POT-Creation-Date: 2026-02-18 15:49+0100\n" "PO-Revision-Date: 2022-07-08 13:04+0000\n" "Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n" "Language-Team: French <http://translate.iggdrasil.net/projects/ishtar/wip-" @@ -24,6 +24,7 @@ msgstr "" #: archaeological_context_records/models.py:580 #: archaeological_context_records/models.py:882 #: archaeological_context_records/templates/ishtar/forms/qa_contextrecord_duplicate.html:12 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:228 #: archaeological_context_records/wizards.py:85 #: archaeological_finds/models_finds.py:1317 #: archaeological_finds/models_finds.py:2960 @@ -42,8 +43,11 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:246 #: archaeological_operations/wizards.py:258 -#: archaeological_warehouse/models.py:884 ishtar_common/forms_common.py:2593 -#: ishtar_common/models.py:6244 ishtar_common/views.py:603 +#: archaeological_warehouse/models.py:884 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:249 +#: ishtar_common/forms_common.py:2593 ishtar_common/models.py:6244 +#: ishtar_common/views.py:603 na_app/templates/ishtar/sheet_operation.html:4 +#: pdl_app/templates/ishtar/sheet_operation.html:4 msgid "Operation" msgstr "Opération" @@ -106,7 +110,7 @@ msgid "ID" msgstr "Identifiant" #: archaeological_context_records/forms.py:144 archaeological_files/forms.py:88 -#: archaeological_files/models.py:460 archaeological_finds/models_finds.py:1320 +#: archaeological_files/models.py:562 archaeological_finds/models_finds.py:1320 #: archaeological_operations/models.py:387 #: archaeological_operations/models.py:1165 #: archaeological_warehouse/forms.py:155 ishtar_common/admin.py:1736 @@ -181,13 +185,27 @@ msgstr "Rechercher parmi les opérations liées" #: ishtar_common/templates/ishtar/merge_organization.html:21 #: ishtar_common/templates/ishtar/sheet_organization.html:30 #: ishtar_common/templates/ishtar/sheet_organization.html:57 +#: man_app/templates/ishtar/sheet_find_treatments.html:120 +#: man_app/templates/ishtar/sheet_find_treatments.html:158 +#: man_app/templates/ishtar/sheet_find_treatments.html:243 +#: na_app/templates/ishtar/sheet_find.html:445 +#: na_app/templates/ishtar/sheet_find.html:483 +#: na_app/templates/ishtar/sheet_find.html:521 +#: na_app/templates/ishtar/sheet_operation.html:554 +#: na_app/templates/ishtar/sheet_operation.html:618 +#: pdl_app/templates/ishtar/sheet_find.html:438 +#: pdl_app/templates/ishtar/sheet_find.html:476 +#: pdl_app/templates/ishtar/sheet_find.html:514 +#: pdl_app/templates/ishtar/sheet_operation.html:571 +#: pdl_app/templates/ishtar/sheet_operation.html:635 msgid "Type" msgstr "Type" #: archaeological_context_records/forms.py:167 #: archaeological_context_records/forms.py:338 #: archaeological_context_records/models.py:898 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:137 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:136 msgid "Excavator" msgstr "Fouilleur" @@ -195,8 +213,10 @@ msgstr "Fouilleur" #: archaeological_context_records/forms.py:551 #: archaeological_context_records/forms.py:817 #: archaeological_context_records/models.py:583 -#: archaeological_context_records/models.py:982 ishtar_common/admin.py:1063 -#: ishtar_common/models.py:3533 +#: archaeological_context_records/models.py:982 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:174 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:182 +#: ishtar_common/admin.py:1063 ishtar_common/models.py:3533 msgid "Activity" msgstr "Activité" @@ -205,14 +225,21 @@ msgstr "Activité" #: archaeological_context_records/forms.py:818 #: archaeological_context_records/models.py:582 #: archaeological_context_records/models.py:974 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:175 #: archaeological_finds/forms.py:390 archaeological_finds/forms.py:781 #: archaeological_finds/forms.py:1021 archaeological_finds/forms.py:1022 #: archaeological_finds/templates/ishtar/sheet_find.html:99 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:99 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:183 +#: cd17_app/templates/ishtar/sheet_find.html:107 #: ishtar_common/forms_common.py:2283 #: ishtar_common/templates/ishtar/organization_person_form.html:9 #: ishtar_common/templates/ishtar/person_form.html:9 #: ishtar_common/templates/ishtar/sheet_document.html:34 +#: man_app/templates/ishtar/sheet_museum_find.html:100 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:138 +#: na_app/templates/ishtar/sheet_find.html:157 +#: pdl_app/templates/ishtar/sheet_find.html:145 msgid "Identification" msgstr "Identification" @@ -238,7 +265,7 @@ msgstr "Documentation" #: archaeological_context_records/forms.py:367 #: archaeological_context_records/models.py:895 #: archaeological_context_records/models.py:1583 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:143 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:134 #: archaeological_finds/forms.py:453 archaeological_finds/forms.py:458 #: archaeological_finds/forms.py:621 archaeological_finds/forms.py:788 #: archaeological_finds/forms.py:790 archaeological_finds/forms.py:1024 @@ -256,11 +283,17 @@ msgstr "Documentation" #: archaeological_operations/forms.py:1336 #: archaeological_operations/models.py:662 #: archaeological_operations/templates/ishtar/sheet_site.html:57 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:142 +#: cd17_app/templates/ishtar/sheet_find.html:125 #: ishtar_common/forms_common.py:2226 ishtar_common/forms_common.py:2517 #: ishtar_common/models.py:1094 ishtar_common/models.py:5305 #: ishtar_common/models_imports.py:165 ishtar_common/models_imports.py:446 #: ishtar_common/models_imports.py:714 ishtar_common/models_imports.py:814 #: ishtar_common/models_imports.py:833 +#: man_app/templates/ishtar/sheet_museum_find.html:118 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:156 +#: na_app/templates/ishtar/sheet_find.html:179 +#: pdl_app/templates/ishtar/sheet_find.html:172 msgid "Description" msgstr "Description" @@ -271,6 +304,11 @@ msgstr "Description" #: archaeological_finds/models_finds.py:2302 #: archaeological_finds/templates/ishtar/sheet_find.html:142 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:142 +#: cd17_app/templates/ishtar/sheet_find.html:150 +#: man_app/templates/ishtar/sheet_museum_find.html:143 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:181 +#: na_app/templates/ishtar/sheet_find.html:204 +#: pdl_app/templates/ishtar/sheet_find.html:197 msgid "General comment" msgstr "Commentaire général" @@ -284,8 +322,10 @@ msgstr "Remplissage" #: archaeological_context_records/forms.py:538 #: archaeological_context_records/forms.py:549 #: archaeological_context_records/models.py:937 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:49 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:205 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:172 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:176 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:180 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:184 msgid "Interpretation" msgstr "Interprétation" @@ -297,7 +337,7 @@ msgstr "Interprétation" #: archaeological_context_records/models.py:570 #: archaeological_context_records/models.py:866 #: archaeological_context_records/models.py:1582 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:119 #: archaeological_files/forms.py:89 archaeological_files/forms.py:1147 #: archaeological_finds/models_finds.py:1275 #: archaeological_operations/forms.py:502 @@ -306,6 +346,7 @@ msgstr "Interprétation" #: archaeological_operations/models.py:3507 #: archaeological_operations/models.py:3817 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:124 msgid "Parcel" msgstr "Parcelle" @@ -328,13 +369,15 @@ msgstr "Méthodes de fouille" #: archaeological_context_records/forms.py:187 #: archaeological_context_records/forms.py:370 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:149 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:140 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:148 msgid "Structure" msgstr "Structure" #: archaeological_context_records/forms.py:188 #: archaeological_context_records/forms.py:376 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:150 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:141 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:149 msgid "Texture" msgstr "Texture" @@ -347,14 +390,16 @@ msgstr "Inclusions" #: archaeological_context_records/forms.py:190 #: archaeological_context_records/forms.py:388 #: archaeological_context_records/forms.py:821 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:152 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:143 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:151 msgid "Colors" msgstr "Couleurs" #: archaeological_context_records/forms.py:191 #: archaeological_context_records/forms.py:393 #: archaeological_context_records/models.py:925 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:153 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:144 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:152 msgid "Details on color" msgstr "Précisions sur les couleurs" @@ -379,10 +424,14 @@ msgstr "Rechercher une Unité d'Enregistrement" #: archaeological_operations/templates/ishtar/sheet_site.html:40 #: archaeological_warehouse/templates/ishtar/sheet_container.html:28 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:24 +#: cd93_app/templates/ishtar/sheet_administrativeact.html:40 #: ishtar_common/templates/ishtar/sheet_area.html:30 #: ishtar_common/templates/ishtar/sheet_import_gen.html:18 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:20 #: ishtar_common/templates/ishtar/sheet_town.html:33 +#: na_app/templates/ishtar/sheet_container.html:28 +#: na_app/templates/ishtar/sheet_operation.html:45 +#: pdl_app/templates/ishtar/sheet_operation.html:45 msgid "General" msgstr "Général" @@ -405,7 +454,7 @@ msgstr "Unité d'enregistrement - 020 - Général" #: archaeological_warehouse/forms.py:154 archaeological_warehouse/models.py:299 #: ishtar_common/forms_common.py:98 ishtar_common/forms_common.py:120 #: ishtar_common/models.py:2741 ishtar_common/models.py:3006 -#: ishtar_common/models_common.py:3665 ishtar_common/models_common.py:4725 +#: ishtar_common/models_common.py:3675 ishtar_common/models_common.py:4735 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 #: ishtar_common/templates/ishtar/sheet_person.html:58 #: ishtar_common/templates/ishtar/sheet_person.html:78 @@ -435,12 +484,15 @@ msgstr "Date d'ouverture" #: archaeological_context_records/forms.py:358 #: archaeological_context_records/models.py:902 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:258 -#: archaeological_files/models.py:715 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:239 +#: archaeological_files/models.py:817 #: archaeological_files/templates/ishtar/sheet_file.html:78 #: archaeological_operations/models.py:1553 #: archaeological_operations/templates/ishtar/sheet_operation.html:211 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:260 #: ishtar_common/forms.py:1184 ishtar_common/forms.py:1185 +#: na_app/templates/ishtar/sheet_operation.html:208 +#: pdl_app/templates/ishtar/sheet_operation.html:211 msgid "Closing date" msgstr "Date de clôture" @@ -451,20 +503,27 @@ msgstr "Date de clôture" #: archaeological_finds/models_treatments.py:398 #: archaeological_finds/models_treatments.py:1050 #: archaeological_warehouse/templates/ishtar/sheet_container.html:94 +#: na_app/templates/ishtar/sheet_container.html:101 msgid "Location" msgstr "Localisation" #: archaeological_context_records/forms.py:394 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:159 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:150 #: archaeological_finds/forms.py:526 archaeological_finds/forms.py:837 #: archaeological_finds/forms.py:1656 #: archaeological_finds/templates/ishtar/sheet_find.html:184 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:184 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:158 +#: cd17_app/templates/ishtar/sheet_find.html:192 +#: man_app/templates/ishtar/sheet_museum_find.html:186 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:223 +#: na_app/templates/ishtar/sheet_find.html:208 +#: pdl_app/templates/ishtar/sheet_find.html:201 msgid "Dimensions" msgstr "Dimensions" #: archaeological_context_records/forms.py:398 -#: archaeological_files/forms.py:312 archaeological_files/models.py:752 +#: archaeological_files/forms.py:312 archaeological_files/models.py:854 msgid "Total surface (m²)" msgstr "Surface totale (m²)" @@ -475,7 +534,8 @@ msgstr "Longueur (m)" #: archaeological_context_records/forms.py:405 #: archaeological_context_records/models.py:904 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:170 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:161 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:169 msgid "Excavated length (m)" msgstr "Longueur fouillée (m)" @@ -486,7 +546,8 @@ msgstr "Largeur (m)" #: archaeological_context_records/forms.py:407 #: archaeological_context_records/models.py:906 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:172 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:163 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:171 msgid "Excavated width (m)" msgstr "Largeur fouillée (m)" @@ -523,8 +584,13 @@ msgstr "Vous devez choisir une commune ou une parcelle." #: archaeological_context_records/models.py:157 #: archaeological_finds/forms.py:1593 archaeological_finds/forms.py:1614 #: archaeological_finds/models_finds.py:2212 -#: archaeological_finds/templates/ishtar/sheet_find.html:204 +#: archaeological_finds/templates/ishtar/sheet_find.html:207 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:204 +#: cd17_app/templates/ishtar/sheet_find.html:215 +#: man_app/templates/ishtar/sheet_museum_find.html:206 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:243 +#: na_app/templates/ishtar/sheet_find.html:259 +#: pdl_app/templates/ishtar/sheet_find.html:252 msgid "Dating" msgstr "Datation" @@ -533,19 +599,26 @@ msgstr "Datation" #: archaeological_context_records/models.py:581 #: archaeological_finds/forms.py:1183 archaeological_finds/forms.py:1600 #: archaeological_finds/models_finds.py:1326 -#: archaeological_finds/templates/ishtar/sheet_find.html:213 +#: archaeological_finds/templates/ishtar/sheet_find.html:216 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:213 #: archaeological_operations/forms.py:797 #: archaeological_operations/templates/ishtar/sheet_operation.html:559 #: archaeological_operations/templates/ishtar/sheet_operation.html:597 +#: cd17_app/templates/ishtar/sheet_find.html:224 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:4 +#: man_app/templates/ishtar/sheet_museum_find.html:215 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:252 +#: na_app/templates/ishtar/sheet_operation.html:564 +#: na_app/templates/ishtar/sheet_operation.html:601 +#: pdl_app/templates/ishtar/sheet_operation.html:581 +#: pdl_app/templates/ishtar/sheet_operation.html:618 msgid "Chronological period" msgstr "Période chronologique" #: archaeological_context_records/forms.py:517 #: archaeological_context_records/models.py:111 -#: archaeological_files/forms.py:757 archaeological_files/models.py:80 -#: archaeological_files/models.py:829 +#: archaeological_files/forms.py:757 archaeological_files/models.py:90 +#: archaeological_files/models.py:931 #: archaeological_files/templates/ishtar/sheet_file.html:200 #: archaeological_finds/forms.py:1602 #: archaeological_finds/forms_treatments.py:73 @@ -554,7 +627,7 @@ msgstr "Période chronologique" #: archaeological_finds/models_finds.py:3963 #: archaeological_finds/models_treatments.py:436 #: archaeological_finds/models_treatments.py:1048 -#: archaeological_finds/templates/ishtar/sheet_find.html:214 +#: archaeological_finds/templates/ishtar/sheet_find.html:217 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:67 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:105 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:214 @@ -563,14 +636,23 @@ msgstr "Période chronologique" #: archaeological_operations/models.py:105 #: archaeological_operations/models.py:1554 #: archaeological_operations/models.py:3821 +#: cd17_app/templates/ishtar/sheet_find.html:225 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:5 +#: man_app/templates/ishtar/sheet_find_treatments.html:125 +#: man_app/templates/ishtar/sheet_find_treatments.html:163 +#: man_app/templates/ishtar/sheet_museum_find.html:216 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:253 +#: na_app/templates/ishtar/sheet_find.html:450 +#: na_app/templates/ishtar/sheet_find.html:488 +#: pdl_app/templates/ishtar/sheet_find.html:443 +#: pdl_app/templates/ishtar/sheet_find.html:481 msgid "Start date" msgstr "Date de début" #: archaeological_context_records/forms.py:518 #: archaeological_context_records/models.py:112 #: archaeological_files/forms.py:640 archaeological_files/forms.py:762 -#: archaeological_files/models.py:81 archaeological_files/models.py:830 +#: archaeological_files/models.py:91 archaeological_files/models.py:932 #: archaeological_finds/forms.py:1603 #: archaeological_finds/forms_treatments.py:74 #: archaeological_finds/forms_treatments.py:236 @@ -580,7 +662,7 @@ msgstr "Date de début" #: archaeological_finds/models_treatments.py:437 #: archaeological_finds/models_treatments.py:1049 #: archaeological_finds/models_treatments.py:1438 -#: archaeological_finds/templates/ishtar/sheet_find.html:215 +#: archaeological_finds/templates/ishtar/sheet_find.html:218 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:68 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:106 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:191 @@ -588,17 +670,32 @@ msgstr "Date de début" #: archaeological_finds/templates/ishtar/sheet_treatment.html:90 #: archaeological_operations/models.py:106 #: archaeological_operations/models.py:3822 +#: cd17_app/templates/ishtar/sheet_find.html:226 #: ishtar_common/models_imports.py:1448 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:6 +#: man_app/templates/ishtar/sheet_find_treatments.html:126 +#: man_app/templates/ishtar/sheet_find_treatments.html:164 +#: man_app/templates/ishtar/sheet_find_treatments.html:249 +#: man_app/templates/ishtar/sheet_museum_find.html:217 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:254 +#: na_app/templates/ishtar/sheet_find.html:451 +#: na_app/templates/ishtar/sheet_find.html:489 +#: na_app/templates/ishtar/sheet_find.html:527 +#: pdl_app/templates/ishtar/sheet_find.html:444 +#: pdl_app/templates/ishtar/sheet_find.html:482 +#: pdl_app/templates/ishtar/sheet_find.html:520 msgid "End date" msgstr "Date de fin" #: archaeological_context_records/forms.py:519 #: archaeological_context_records/models.py:122 #: archaeological_finds/forms.py:1604 -#: archaeological_finds/templates/ishtar/sheet_find.html:217 +#: archaeological_finds/templates/ishtar/sheet_find.html:220 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:217 +#: cd17_app/templates/ishtar/sheet_find.html:228 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:8 +#: man_app/templates/ishtar/sheet_museum_find.html:219 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:256 msgid "Quality" msgstr "Qualité" @@ -606,18 +703,24 @@ msgstr "Qualité" #: archaeological_context_records/models.py:84 #: archaeological_context_records/models.py:115 #: archaeological_finds/forms.py:1601 -#: archaeological_finds/templates/ishtar/sheet_find.html:216 +#: archaeological_finds/templates/ishtar/sheet_find.html:219 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:216 +#: cd17_app/templates/ishtar/sheet_find.html:227 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:7 +#: man_app/templates/ishtar/sheet_museum_find.html:218 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:255 msgid "Dating type" msgstr "Type de datation" #: archaeological_context_records/forms.py:521 #: archaeological_context_records/models.py:127 #: archaeological_finds/forms.py:1605 -#: archaeological_finds/templates/ishtar/sheet_find.html:218 +#: archaeological_finds/templates/ishtar/sheet_find.html:221 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:218 +#: cd17_app/templates/ishtar/sheet_find.html:229 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:9 +#: man_app/templates/ishtar/sheet_museum_find.html:220 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:257 msgid "Precise on this dating" msgstr "Précision sur cette datation" @@ -630,7 +733,8 @@ msgid "Context record - 040 - Interpretation" msgstr "Unité d'enregistrement - 040 - Interprétation" #: archaeological_context_records/forms.py:557 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:221 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:210 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:231 msgid "Dating complements" msgstr "Compléments sur la datation" @@ -861,8 +965,8 @@ msgid "Dating quality types" msgstr "Types de qualité de datation" #: archaeological_context_records/models.py:131 -#: archaeological_context_records/tests.py:938 -#: archaeological_finds/tests.py:1571 archaeological_finds/tests.py:1800 +#: archaeological_context_records/tests.py:998 +#: archaeological_finds/tests.py:1611 archaeological_finds/tests.py:1840 msgctxt "key for text search" msgid "datings-period" msgstr "datation-periode" @@ -906,16 +1010,20 @@ msgstr "Datations" #: archaeological_finds/models_treatments.py:1030 #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:4 +#: cd17_app/templates/ishtar/sheet_find.html:4 #: ishtar_common/forms_common.py:2627 ishtar_common/models.py:6247 -#: ishtar_common/views.py:611 +#: ishtar_common/views.py:611 man_app/templates/ishtar/sheet_museum_find.html:4 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:4 +#: na_app/templates/ishtar/sheet_find.html:4 +#: pdl_app/templates/ishtar/sheet_find.html:4 msgid "Find" msgstr "Mobilier" #: archaeological_context_records/models.py:299 #: archaeological_context_records/models.py:322 -#: archaeological_files/models.py:79 archaeological_files/models.py:109 -#: archaeological_files/models.py:183 archaeological_files/models.py:199 -#: archaeological_files/models.py:259 archaeological_finds/models_finds.py:105 +#: archaeological_files/models.py:89 archaeological_files/models.py:211 +#: archaeological_files/models.py:285 archaeological_files/models.py:301 +#: archaeological_files/models.py:361 archaeological_finds/models_finds.py:105 #: archaeological_finds/models_finds.py:119 #: archaeological_finds/models_finds.py:136 #: archaeological_finds/models_finds.py:260 @@ -934,9 +1042,9 @@ msgstr "Mobilier" #: ishtar_common/models.py:772 ishtar_common/models.py:823 #: ishtar_common/models.py:1936 ishtar_common/models.py:4530 #: ishtar_common/models.py:6019 ishtar_common/models_common.py:762 -#: ishtar_common/models_common.py:2264 ishtar_common/models_common.py:2300 -#: ishtar_common/models_common.py:2317 ishtar_common/models_common.py:2334 -#: ishtar_common/models_common.py:2347 ishtar_common/models_imports.py:481 +#: ishtar_common/models_common.py:2274 ishtar_common/models_common.py:2310 +#: ishtar_common/models_common.py:2327 ishtar_common/models_common.py:2344 +#: ishtar_common/models_common.py:2357 ishtar_common/models_imports.py:481 msgid "Order" msgstr "Ordre" @@ -1082,25 +1190,25 @@ msgid "id" msgstr "id" #: archaeological_context_records/models.py:638 -#: archaeological_context_records/tests.py:764 -#: archaeological_files/models.py:550 archaeological_finds/models_finds.py:1446 +#: archaeological_context_records/tests.py:824 +#: archaeological_files/models.py:652 archaeological_finds/models_finds.py:1446 #: archaeological_operations/models.py:491 #: archaeological_operations/models.py:1332 #: archaeological_operations/tests.py:3308 #: archaeological_warehouse/models.py:329 #: archaeological_warehouse/models.py:1055 ishtar_common/models.py:5064 -#: ishtar_common/models_common.py:4216 +#: ishtar_common/models_common.py:4226 msgctxt "key for text search" msgid "town" msgstr "commune" #: archaeological_context_records/models.py:641 -#: archaeological_files/models.py:613 archaeological_finds/models_finds.py:1466 +#: archaeological_files/models.py:715 archaeological_finds/models_finds.py:1466 #: archaeological_operations/models.py:494 #: archaeological_operations/models.py:1335 #: archaeological_warehouse/models.py:333 #: archaeological_warehouse/models.py:1059 ishtar_common/models.py:5069 -#: ishtar_common/models_common.py:4220 +#: ishtar_common/models_common.py:4230 msgctxt "key for text search" msgid "area" msgstr "zone" @@ -1111,8 +1219,8 @@ msgid "operation-year" msgstr "operation-annee" #: archaeological_context_records/models.py:647 -#: archaeological_files/models.py:565 archaeological_finds/models_finds.py:1783 -#: archaeological_finds/tests.py:1620 +#: archaeological_files/models.py:667 archaeological_finds/models_finds.py:1783 +#: archaeological_finds/tests.py:1660 msgctxt "key for text search" msgid "operation-name" msgstr "operation-nom" @@ -1155,7 +1263,7 @@ msgid "site" msgstr "site" #: archaeological_context_records/models.py:668 -#: archaeological_context_records/tests.py:831 +#: archaeological_context_records/tests.py:891 #: archaeological_finds/models_finds.py:1501 msgctxt "key for text search" msgid "operation-relation-type" @@ -1173,7 +1281,7 @@ msgid "period" msgstr "periode" #: archaeological_context_records/models.py:676 -#: archaeological_context_records/tests.py:890 +#: archaeological_context_records/tests.py:950 msgctxt "key for text search" msgid "unit-type" msgstr "type-unite" @@ -1184,7 +1292,7 @@ msgid "activity" msgstr "activite" #: archaeological_context_records/models.py:682 -#: archaeological_files/models.py:553 archaeological_operations/models.py:1338 +#: archaeological_files/models.py:655 archaeological_operations/models.py:1338 #: archaeological_operations/models.py:3030 msgctxt "key for text search" msgid "parcel" @@ -1197,7 +1305,7 @@ msgid "has-finds" msgstr "mobilier-rattache" #: archaeological_context_records/models.py:689 -#: archaeological_context_records/tests.py:796 +#: archaeological_context_records/tests.py:856 msgctxt "key for text search" msgid "record-relation-type" msgstr "ue-type-relation" @@ -1225,7 +1333,7 @@ msgid "documentation" msgstr "documentation" #: archaeological_context_records/models.py:709 -#: archaeological_finds/models_finds.py:1534 archaeological_finds/tests.py:1637 +#: archaeological_finds/models_finds.py:1534 archaeological_finds/tests.py:1677 #: archaeological_operations/models.py:497 ishtar_common/models.py:4929 msgctxt "key for text search" msgid "description" @@ -1242,7 +1350,7 @@ msgid "interpretation" msgstr "interprétation" #: archaeological_context_records/models.py:721 -#: archaeological_files/models.py:596 archaeological_finds/models_finds.py:1652 +#: archaeological_files/models.py:698 archaeological_finds/models_finds.py:1652 #: archaeological_operations/models.py:506 #: archaeological_operations/models.py:1391 #: archaeological_operations/models.py:3122 @@ -1291,7 +1399,7 @@ msgid "Lock/Unlock" msgstr "Verrouiller/Déverrouiller" #: archaeological_context_records/models.py:812 -#: archaeological_files/models.py:633 archaeological_finds/models_finds.py:1981 +#: archaeological_files/models.py:735 archaeological_finds/models_finds.py:1981 #: archaeological_operations/models.py:597 #: archaeological_operations/models.py:1492 #: archaeological_warehouse/models.py:369 @@ -1332,7 +1440,7 @@ msgid "Duplicate" msgstr "Dupliquer" #: archaeological_context_records/models.py:860 -#: archaeological_files/models.py:652 archaeological_finds/models_finds.py:613 +#: archaeological_files/models.py:754 archaeological_finds/models_finds.py:613 #: archaeological_finds/models_finds.py:2142 #: archaeological_finds/models_treatments.py:431 #: archaeological_operations/models.py:3496 @@ -1342,7 +1450,7 @@ msgid "External ID" msgstr "Identifiant" #: archaeological_context_records/models.py:862 -#: archaeological_files/models.py:655 archaeological_finds/models_finds.py:615 +#: archaeological_files/models.py:757 archaeological_finds/models_finds.py:615 #: archaeological_finds/models_finds.py:2144 #: archaeological_operations/models.py:3499 #: archaeological_warehouse/models.py:428 @@ -1389,8 +1497,8 @@ msgid "Estimation of a \"Terminus Post Quem\"" msgstr "Estimation d'un « Terminus Post Quem »" #: archaeological_context_records/models.py:996 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 -#: archaeological_files/models.py:850 archaeological_finds/models_finds.py:2435 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:83 +#: archaeological_files/models.py:952 archaeological_finds/models_finds.py:2435 #: archaeological_finds/models_treatments.py:451 #: archaeological_finds/models_treatments.py:1471 #: archaeological_finds/models_treatments.py:1718 @@ -1407,12 +1515,14 @@ msgstr "Estimation d'un « Terminus Post Quem »" #: archaeological_warehouse/templates/ishtar/sheet_container.html:50 #: archaeological_warehouse/templates/ishtar/sheet_container.html:202 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:46 -#: ishtar_common/models.py:1040 ishtar_common/models.py:2544 -#: ishtar_common/models.py:4634 ishtar_common/models.py:4652 -#: ishtar_common/models.py:4681 ishtar_common/models.py:4695 -#: ishtar_common/models.py:4709 ishtar_common/models.py:4721 -#: ishtar_common/models.py:5338 ishtar_common/models.py:5348 -#: ishtar_common/models_common.py:3652 ishtar_common/models_imports.py:3087 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:86 +#: cd17_app/templates/ishtar/sheet_find.html:64 ishtar_common/models.py:1040 +#: ishtar_common/models.py:2544 ishtar_common/models.py:4634 +#: ishtar_common/models.py:4652 ishtar_common/models.py:4681 +#: ishtar_common/models.py:4695 ishtar_common/models.py:4709 +#: ishtar_common/models.py:4721 ishtar_common/models.py:5338 +#: ishtar_common/models.py:5348 ishtar_common/models_common.py:3662 +#: ishtar_common/models_imports.py:3087 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:184 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:292 @@ -1420,11 +1530,19 @@ msgstr "Estimation d'un « Terminus Post Quem »" #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:492 #: ishtar_common/templates/ishtar/sheet_person.html:172 #: ishtar_common/views.py:190 +#: man_app/templates/ishtar/sheet_museum_find.html:65 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:103 +#: na_app/templates/ishtar/sheet_container.html:50 +#: na_app/templates/ishtar/sheet_container.html:207 +#: na_app/templates/ishtar/sheet_find.html:63 +#: na_app/templates/ishtar/sheet_operation.html:62 +#: pdl_app/templates/ishtar/sheet_find.html:63 +#: pdl_app/templates/ishtar/sheet_operation.html:62 msgid "Documents" msgstr "Documents" #: archaeological_context_records/models.py:1003 -#: archaeological_files/models.py:856 archaeological_finds/models_finds.py:2441 +#: archaeological_files/models.py:958 archaeological_finds/models_finds.py:2441 #: archaeological_finds/models_treatments.py:457 #: archaeological_finds/models_treatments.py:1478 #: archaeological_finds/models_treatments.py:1725 @@ -1433,7 +1551,7 @@ msgstr "Documents" #: archaeological_operations/models.py:3247 #: archaeological_warehouse/models.py:422 #: archaeological_warehouse/models.py:1226 ishtar_common/models.py:2550 -#: ishtar_common/models_common.py:3658 +#: ishtar_common/models_common.py:3668 msgid "Main image" msgstr "Image principale" @@ -1455,7 +1573,7 @@ msgstr "Nom en cache des périodes" #: archaeological_operations/models.py:1769 #: archaeological_operations/models.py:1775 #: archaeological_operations/models.py:1781 -#: archaeological_operations/models.py:1787 ishtar_common/models_common.py:4901 +#: archaeological_operations/models.py:1787 ishtar_common/models_common.py:4911 msgid "Generated automatically - do not edit" msgstr "Généré automatiquement - ne pas éditer" @@ -1467,6 +1585,7 @@ msgstr "Nom en cache des unités d'enregistrements liées" #: archaeological_context_records/models.py:1022 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:4 #: archaeological_finds/models_finds.py:626 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:4 msgid "Context Record" msgstr "Unité d'Enregistrement" @@ -1594,20 +1713,29 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:41 #: archaeological_finds/templates/ishtar/sheet_find.html:42 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:42 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:44 +#: cd17_app/templates/ishtar/sheet_find.html:42 +#: man_app/templates/ishtar/sheet_museum_find.html:41 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:81 +#: na_app/templates/ishtar/sheet_find.html:48 +#: pdl_app/templates/ishtar/sheet_find.html:48 msgid "Identification / Description" msgstr "Identification / Description" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:58 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:218 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:49 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:207 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:52 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:228 msgid "Datations" msgstr "Datations" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:66 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:57 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:60 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:289 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:65 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:270 #: archaeological_finds/forms.py:2253 archaeological_finds/models_finds.py:97 #: archaeological_finds/models_finds.py:111 #: archaeological_finds/models_finds.py:128 @@ -1643,23 +1771,37 @@ msgstr "Opération / Site" #: archaeological_warehouse/templates/ishtar/sheet_container.html:197 #: archaeological_warehouse/templates/ishtar/sheet_container.html:244 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:208 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:68 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:302 #: ishtar_common/templates/ishtar/sheet_document.html:127 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:149 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:252 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:358 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:457 -#: ishtar_common/views.py:178 +#: ishtar_common/views.py:178 na_app/templates/ishtar/sheet_container.html:202 +#: na_app/templates/ishtar/sheet_container.html:249 +#: na_app/templates/ishtar/sheet_operation.html:89 +#: na_app/templates/ishtar/sheet_operation.html:481 +#: na_app/templates/ishtar/sheet_operation.html:573 +#: pdl_app/templates/ishtar/sheet_operation.html:89 +#: pdl_app/templates/ishtar/sheet_operation.html:498 +#: pdl_app/templates/ishtar/sheet_operation.html:590 msgid "Finds" msgstr "Mobilier" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:83 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:74 #: archaeological_operations/templates/ishtar/sheet_operation.html:72 #: archaeological_operations/templates/ishtar/sheet_operation.html:415 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:77 #: ishtar_common/templates/ishtar/forms/modify_relations.html:28 +#: na_app/templates/ishtar/sheet_operation.html:71 +#: na_app/templates/ishtar/sheet_operation.html:422 +#: pdl_app/templates/ishtar/sheet_operation.html:71 +#: pdl_app/templates/ishtar/sheet_operation.html:439 msgid "Relations" msgstr "Relations" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:101 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 #: archaeological_finds/templates/ishtar/sheet_find.html:73 #: archaeological_finds/templates/ishtar/sheet_find.html:325 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:73 @@ -1668,38 +1810,68 @@ msgstr "Relations" #: archaeological_operations/templates/ishtar/sheet_site.html:121 #: archaeological_warehouse/templates/ishtar/sheet_container.html:59 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:55 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:95 +#: cd17_app/templates/ishtar/sheet_find.html:73 +#: cd17_app/templates/ishtar/sheet_find.html:333 #: ishtar_common/templates/ishtar/blocks/sheet_map.html:10 #: ishtar_common/templates/ishtar/sheet_town.html:41 +#: man_app/templates/ishtar/sheet_museum_find.html:74 +#: man_app/templates/ishtar/sheet_museum_find.html:331 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:112 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:374 +#: na_app/templates/ishtar/sheet_container.html:59 +#: na_app/templates/ishtar/sheet_find.html:72 +#: na_app/templates/ishtar/sheet_find.html:566 +#: na_app/templates/ishtar/sheet_operation.html:98 +#: pdl_app/templates/ishtar/sheet_find.html:72 +#: pdl_app/templates/ishtar/sheet_find.html:559 +#: pdl_app/templates/ishtar/sheet_operation.html:98 msgid "Geographic data" msgstr "Données géographiques" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:110 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:101 #: archaeological_finds/templates/ishtar/sheet_find.html:82 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:82 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:76 #: archaeological_operations/templates/ishtar/sheet_operation.html:108 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:106 +#: cd17_app/templates/ishtar/sheet_find.html:82 +#: cd93_app/templates/ishtar/sheet_administrativeact.html:77 +#: man_app/templates/ishtar/sheet_museum_find.html:83 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:121 +#: na_app/templates/ishtar/sheet_find.html:81 +#: na_app/templates/ishtar/sheet_operation.html:107 +#: pdl_app/templates/ishtar/sheet_find.html:81 +#: pdl_app/templates/ishtar/sheet_operation.html:107 msgid "Custom fields" msgstr "Champs personnalisés" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:126 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:117 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:122 #: ishtar_common/models.py:4876 msgid "Identifier" msgstr "Identifiant" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:145 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:136 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:144 msgid "Excavation technics" msgstr "Méthodes de fouille" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:151 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:142 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:150 msgid "Inclusion" msgstr "Inclusion" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:163 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:154 #: archaeological_files/templates/ishtar/sheet_file.html:102 #: archaeological_files/templates/ishtar/sheet_file.html:284 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:60 #: archaeological_operations/templates/ishtar/sheet_operation.html:219 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:162 +#: cd93_app/templates/ishtar/sheet_administrativeact.html:61 #: ishtar_common/templates/ishtar/sheet_town.html:71 +#: na_app/templates/ishtar/sheet_operation.html:216 +#: pdl_app/templates/ishtar/sheet_operation.html:219 msgid "Surface" msgstr "Surface" @@ -1710,7 +1882,12 @@ msgstr "Surface" #: archaeological_operations/templates/ishtar/sheet_operation.html:334 #: archaeological_operations/templates/ishtar/sheet_site.html:78 #: archaeological_warehouse/templates/ishtar/sheet_container.html:167 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:202 #: ishtar_common/templates/ishtar/sheet_town.html:110 +#: man_app/templates/ishtar/sheet_basefind.html:56 +#: na_app/templates/ishtar/sheet_container.html:174 +#: na_app/templates/ishtar/sheet_operation.html:340 +#: pdl_app/templates/ishtar/sheet_operation.html:357 msgid "Geographic localisation" msgstr "Localisation géographique" @@ -1720,7 +1897,7 @@ msgstr "Localisation géographique" #: archaeological_finds/forms.py:1025 #: archaeological_finds/templates/ishtar/sheet_basefind.html:72 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:93 -#: archaeological_finds/templates/ishtar/sheet_find.html:252 +#: archaeological_finds/templates/ishtar/sheet_find.html:255 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:252 #: archaeological_finds/templates/ishtar/sheet_treatment.html:104 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:94 @@ -1729,83 +1906,165 @@ msgstr "Localisation géographique" #: archaeological_operations/templates/ishtar/sheet_site.html:127 #: archaeological_warehouse/templates/ishtar/sheet_container.html:177 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:131 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:216 +#: cd17_app/templates/ishtar/sheet_find.html:263 +#: cd93_app/templates/ishtar/sheet_administrativeact.html:90 #: ishtar_common/templates/ishtar/blocks/window_image.html:6 #: ishtar_common/templates/ishtar/sheet_document.html:147 #: ishtar_common/templates/ishtar/sheet_organization.html:86 #: ishtar_common/templates/ishtar/sheet_person.html:178 +#: man_app/templates/ishtar/sheet_basefind.html:67 +#: man_app/templates/ishtar/sheet_museum_find.html:254 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:291 +#: na_app/templates/ishtar/sheet_container.html:183 +#: na_app/templates/ishtar/sheet_find.html:274 +#: na_app/templates/ishtar/sheet_operation.html:361 +#: pdl_app/templates/ishtar/sheet_find.html:267 +#: pdl_app/templates/ishtar/sheet_operation.html:378 msgid "Sheet" msgstr "Fiche" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:237 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:226 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:247 msgid "Operation summary" msgstr "Résumé de l'opération" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:240 -#: archaeological_operations/templates/ishtar/sheet_operation.html:305 -msgid "Patriarche OA code not yet recorded!" -msgstr "Code d'opération Patriarche non renseigné !" +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:229 +#: archaeological_files/forms.py:84 archaeological_files/forms.py:211 +#: archaeological_files/forms.py:632 archaeological_files/forms.py:1105 +#: archaeological_files/forms.py:1141 archaeological_files/models.py:560 +#: archaeological_files/models.py:746 +#: archaeological_files/templates/ishtar/sheet_file.html:224 +#: archaeological_finds/forms.py:1759 +#: archaeological_finds/forms_treatments.py:59 +#: archaeological_finds/forms_treatments.py:190 +#: archaeological_finds/forms_treatments.py:469 +#: archaeological_finds/forms_treatments.py:625 +#: archaeological_finds/forms_treatments.py:701 +#: archaeological_finds/forms_treatments.py:773 +#: archaeological_finds/forms_treatments.py:884 +#: archaeological_finds/forms_treatments.py:966 +#: archaeological_finds/forms_treatments.py:1004 +#: archaeological_finds/models_finds.py:1319 +#: archaeological_finds/models_treatments.py:360 +#: archaeological_finds/models_treatments.py:1400 +#: archaeological_finds/models_treatments.py:1690 +#: archaeological_finds/templates/ishtar/sheet_exhibition.html:51 +#: archaeological_operations/forms.py:73 archaeological_operations/forms.py:489 +#: archaeological_operations/forms.py:711 +#: archaeological_operations/forms.py:1448 +#: archaeological_operations/forms.py:1766 +#: archaeological_operations/models.py:1164 +#: archaeological_operations/models.py:1591 +#: archaeological_operations/models.py:2980 +#: archaeological_operations/models.py:3219 +#: archaeological_operations/models.py:3486 +#: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 +#: archaeological_operations/templates/ishtar/sheet_operation.html:150 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:250 +#: ishtar_common/models_imports.py:1133 +#: na_app/templates/ishtar/sheet_operation.html:149 +#: pdl_app/templates/ishtar/sheet_operation.html:152 +msgid "Year" +msgstr "Année" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:246 -msgid "Numerical reference" -msgstr "Référence numérique" +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:230 +#: archaeological_operations/forms.py:729 +#: archaeological_operations/models.py:1565 +#: archaeological_operations/models.py:3176 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:251 +msgid "Head scientist" +msgstr "Responsable d'opération" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:252 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:233 #: archaeological_finds/models_treatments.py:239 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:63 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:101 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:140 #: archaeological_operations/templates/ishtar/sheet_operation.html:183 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:254 #: ishtar_common/models.py:4029 ishtar_common/models.py:6138 #: ishtar_common/models.py:6275 ishtar_common/models.py:6354 -#: ishtar_common/models_common.py:2193 ishtar_common/models_common.py:2208 +#: ishtar_common/models_common.py:2203 ishtar_common/models_common.py:2218 #: ishtar_common/models_imports.py:1591 ishtar_common/models_imports.py:1993 +#: man_app/templates/ishtar/sheet_find_treatments.html:121 +#: man_app/templates/ishtar/sheet_find_treatments.html:159 +#: man_app/templates/ishtar/sheet_find_treatments.html:198 +#: na_app/templates/ishtar/sheet_find.html:399 +#: na_app/templates/ishtar/sheet_find.html:446 +#: na_app/templates/ishtar/sheet_find.html:484 +#: na_app/templates/ishtar/sheet_operation.html:179 +#: pdl_app/templates/ishtar/sheet_find.html:392 +#: pdl_app/templates/ishtar/sheet_find.html:439 +#: pdl_app/templates/ishtar/sheet_find.html:477 +#: pdl_app/templates/ishtar/sheet_operation.html:182 msgid "State" msgstr "État" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:253 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:234 #: archaeological_files/templates/ishtar/sheet_file.html:72 #: archaeological_operations/templates/ishtar/sheet_operation.html:188 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:255 +#: na_app/templates/ishtar/sheet_operation.html:184 +#: pdl_app/templates/ishtar/sheet_operation.html:187 msgid "Active file" msgstr "Dossier actif" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:253 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:234 #: archaeological_operations/templates/ishtar/sheet_operation.html:191 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:255 +#: na_app/templates/ishtar/sheet_operation.html:187 +#: pdl_app/templates/ishtar/sheet_operation.html:190 msgid "Closed operation" msgstr "Opération close" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:260 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:241 #: archaeological_files/templates/ishtar/sheet_file.html:80 #: archaeological_operations/templates/ishtar/sheet_operation.html:213 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:262 +#: na_app/templates/ishtar/sheet_operation.html:210 +#: pdl_app/templates/ishtar/sheet_operation.html:213 msgid "by" msgstr "par" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:272 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:253 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:274 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:294 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:275 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:307 msgid "No associated finds." msgstr "Pas de mobilier associé." -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:298 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:279 #: archaeological_operations/templates/ishtar/sheet_operation.html:481 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:311 +#: na_app/templates/ishtar/sheet_operation.html:486 +#: pdl_app/templates/ishtar/sheet_operation.html:503 msgid "Documents from associated finds" msgstr "Documents du mobilier associé" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:311 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:292 #: archaeological_operations/templates/ishtar/sheet_operation.html:447 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:324 +#: na_app/templates/ishtar/sheet_operation.html:452 +#: pdl_app/templates/ishtar/sheet_operation.html:469 msgid "Context record relations" msgstr "Relations entre Unités d'Enregistrement" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:317 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:298 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:330 msgid "Diagram of stratigraphic relations - above" msgstr "Diagramme de relations stratigraphiques - au dessus de" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:325 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:306 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:338 msgid "Diagram of stratigraphic relations - below" msgstr "Diagramme de relations stratigraphiques - au dessous de" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:333 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:314 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:346 msgid "Diagram of stratigraphic relations - full" msgstr "Diagramme de relations stratigraphiques - complet" @@ -1832,77 +2091,57 @@ msgstr "Créer" msgid "Add context record" msgstr "Ajouter une Unité d'Enregistrement" -#: archaeological_files/admin.py:141 +#: archaeological_files/admin.py:146 msgid "Copy from" msgstr "Copier depuis" -#: archaeological_files/admin.py:145 +#: archaeological_files/admin.py:150 msgid "To" msgstr "Vers" -#: archaeological_files/admin.py:162 archaeological_files/tests.py:312 +#: archaeological_files/admin.py:167 archaeological_files/tests.py:312 msgid "Source and destination must be different." msgstr "Source et destination doivent être différents." -#: archaeological_files/admin.py:184 +#: archaeological_files/admin.py:189 msgid "Cannot change price agreement." msgstr "Impossible de changer le contrat tarifaire." -#: archaeological_files/admin.py:237 +#: archaeological_files/admin.py:242 msgid "{} item(s) created." msgstr "{} élément(s) créés." -#: archaeological_files/admin.py:241 +#: archaeological_files/admin.py:246 msgid "{} item(s) already in database." msgstr "{} élément(s) existe(nt) déjà en base de données." +#: archaeological_files/admin.py:266 +msgid "Select only one price agreement." +msgstr "Sélectionner seulement un contrat tarifaire." + +#: archaeological_files/admin.py:275 ishtar_common/admin.py:3130 +msgid "" +"Document not generated: is the LibreOffice daemon configured and running?" +msgstr "" +"Document non généré: est-ce que le démon LibreOffice est configuré et " +"fonctionne ?" + +#: archaeological_files/admin.py:293 +msgid "Export prices" +msgstr "Exporter les prix" + #: archaeological_files/forms.py:77 msgid "File - 001 - Search" msgstr "Dossier - 001 - Recherche" -#: archaeological_files/forms.py:84 archaeological_files/forms.py:211 -#: archaeological_files/forms.py:632 archaeological_files/forms.py:1105 -#: archaeological_files/forms.py:1141 archaeological_files/models.py:458 -#: archaeological_files/models.py:644 -#: archaeological_files/templates/ishtar/sheet_file.html:224 -#: archaeological_finds/forms.py:1759 -#: archaeological_finds/forms_treatments.py:59 -#: archaeological_finds/forms_treatments.py:190 -#: archaeological_finds/forms_treatments.py:469 -#: archaeological_finds/forms_treatments.py:625 -#: archaeological_finds/forms_treatments.py:701 -#: archaeological_finds/forms_treatments.py:773 -#: archaeological_finds/forms_treatments.py:884 -#: archaeological_finds/forms_treatments.py:966 -#: archaeological_finds/forms_treatments.py:1004 -#: archaeological_finds/models_finds.py:1319 -#: archaeological_finds/models_treatments.py:360 -#: archaeological_finds/models_treatments.py:1400 -#: archaeological_finds/models_treatments.py:1690 -#: archaeological_finds/templates/ishtar/sheet_exhibition.html:51 -#: archaeological_operations/forms.py:73 archaeological_operations/forms.py:489 -#: archaeological_operations/forms.py:711 -#: archaeological_operations/forms.py:1448 -#: archaeological_operations/forms.py:1766 -#: archaeological_operations/models.py:1164 -#: archaeological_operations/models.py:1591 -#: archaeological_operations/models.py:2980 -#: archaeological_operations/models.py:3219 -#: archaeological_operations/models.py:3486 -#: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 -#: archaeological_operations/templates/ishtar/sheet_operation.html:150 -#: ishtar_common/models_imports.py:1133 -msgid "Year" -msgstr "Année" - #: archaeological_files/forms.py:85 archaeological_files/forms.py:638 -#: archaeological_files/models.py:646 +#: archaeological_files/models.py:748 msgid "Numeric reference" msgstr "Identifiant numérique" #: archaeological_files/forms.py:86 archaeological_files/forms.py:220 #: archaeological_files/forms.py:1107 archaeological_files/forms.py:1143 -#: archaeological_files/models.py:649 +#: archaeological_files/models.py:751 #: archaeological_finds/models_treatments.py:1403 #: archaeological_operations/forms.py:1450 #: archaeological_operations/forms.py:1515 @@ -1914,11 +2153,11 @@ msgid "Internal reference" msgstr "Référence interne" #: archaeological_files/forms.py:92 archaeological_files/forms.py:1113 -#: archaeological_files/forms.py:1150 archaeological_files/models.py:1709 +#: archaeological_files/forms.py:1150 archaeological_files/models.py:1811 #: archaeological_operations/forms.py:505 #: archaeological_operations/forms.py:1461 -#: archaeological_operations/models.py:2841 ishtar_common/models_common.py:2216 -#: ishtar_common/models_common.py:3632 +#: archaeological_operations/models.py:2841 ishtar_common/models_common.py:2226 +#: ishtar_common/models_common.py:3642 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "Département" @@ -1928,14 +2167,14 @@ msgid "File name" msgstr "Nom du dossier" #: archaeological_files/forms.py:95 archaeological_files/forms.py:288 -#: archaeological_files/forms.py:339 archaeological_files/models.py:658 +#: archaeological_files/forms.py:339 archaeological_files/models.py:760 #: archaeological_files/templates/ishtar/sheet_file.html:63 msgid "Operation name" msgstr "Nom de l'opération" #: archaeological_files/forms.py:96 archaeological_files/forms.py:209 -#: archaeological_files/models.py:459 archaeological_files/models.py:464 -#: archaeological_files/models.py:659 +#: archaeological_files/models.py:561 archaeological_files/models.py:566 +#: archaeological_files/models.py:761 msgid "File type" msgstr "Type de dossier" @@ -1944,7 +2183,7 @@ msgid "Is active?" msgstr "Est actif ?" #: archaeological_files/forms.py:98 archaeological_files/forms.py:290 -#: archaeological_files/models.py:401 archaeological_files/models.py:809 +#: archaeological_files/models.py:503 archaeological_files/models.py:911 #: archaeological_files/templates/ishtar/sheet_file.html:124 msgid "Development type" msgstr "Nature de l'aménagement" @@ -1954,26 +2193,28 @@ msgid "Saisine type" msgstr "Type de saisine" #: archaeological_files/forms.py:100 archaeological_files/forms.py:448 -#: archaeological_files/models.py:813 +#: archaeological_files/models.py:915 #: archaeological_files/templates/ishtar/sheet_file.html:125 msgid "Monitoring justification" msgstr "Motivation de la prescription" #: archaeological_files/forms.py:101 archaeological_files/forms.py:265 -#: archaeological_files/models.py:352 archaeological_files/models.py:463 -#: archaeological_files/models.py:708 +#: archaeological_files/models.py:454 archaeological_files/models.py:565 +#: archaeological_files/models.py:810 msgid "Permit type" msgstr "Type de permis" #: archaeological_files/forms.py:102 archaeological_files/forms.py:450 -#: archaeological_files/models.py:713 +#: archaeological_files/models.py:815 #: archaeological_files/templates/ishtar/sheet_file.html:137 #: archaeological_operations/templates/ishtar/sheet_operation.html:282 +#: na_app/templates/ishtar/sheet_operation.html:280 +#: pdl_app/templates/ishtar/sheet_operation.html:305 msgid "Permit/order reference" msgstr "Référence du permis / de l'arrêté" #: archaeological_files/forms.py:103 archaeological_files/forms.py:629 -#: archaeological_files/models.py:761 archaeological_finds/forms.py:831 +#: archaeological_files/models.py:863 archaeological_finds/forms.py:831 #: archaeological_finds/forms.py:1174 archaeological_finds/forms.py:1461 #: archaeological_finds/forms.py:2507 #: archaeological_finds/forms_treatments.py:241 @@ -1999,7 +2240,7 @@ msgstr "Référence du permis / de l'arrêté" #: ishtar_common/forms_common.py:2562 ishtar_common/forms_common.py:3189 #: ishtar_common/models.py:3114 ishtar_common/models.py:4414 #: ishtar_common/models.py:5314 ishtar_common/models_common.py:192 -#: ishtar_common/models_common.py:2461 ishtar_common/models_imports.py:897 +#: ishtar_common/models_common.py:2471 ishtar_common/models_imports.py:897 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:13 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:170 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:39 @@ -2016,7 +2257,7 @@ msgstr "Responsable" #: archaeological_files/forms.py:115 archaeological_files/forms.py:357 #: archaeological_files/forms.py:367 archaeological_files/forms.py:1157 -#: archaeological_files/models.py:671 +#: archaeological_files/models.py:773 msgid "General contractor" msgstr "Aménageur" @@ -2044,7 +2285,7 @@ msgstr "Rechercher un dossier archéologique" msgid "Archaeological file - 010 - General" msgstr "Dossier archéologique - 010 - Général" -#: archaeological_files/forms.py:218 archaeological_files/models.py:728 +#: archaeological_files/forms.py:218 archaeological_files/models.py:830 #: archaeological_files/templates/ishtar/sheet_file.html:64 #: archaeological_finds/models_treatments.py:1440 #: archaeological_operations/models.py:1552 ishtar_common/forms_common.py:2222 @@ -2054,10 +2295,13 @@ msgstr "Dossier archéologique - 010 - Général" msgid "Creation date" msgstr "Date de création" -#: archaeological_files/forms.py:219 archaeological_files/models.py:730 +#: archaeological_files/forms.py:219 archaeological_files/models.py:832 #: archaeological_finds/forms_treatments.py:813 #: archaeological_finds/models_treatments.py:1442 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:190 +#: man_app/templates/ishtar/sheet_find_treatments.html:248 +#: na_app/templates/ishtar/sheet_find.html:526 +#: pdl_app/templates/ishtar/sheet_find.html:519 msgid "Reception date" msgstr "Date de réception" @@ -2086,7 +2330,7 @@ msgid "This name is used on creation for the associated operation" msgstr "Ce nom est utilisé lors de la création de l'opération associée" #: archaeological_files/forms.py:293 archaeological_files/forms.py:342 -#: archaeological_files/models.py:530 archaeological_files/models.py:725 +#: archaeological_files/models.py:632 archaeological_files/models.py:827 #: archaeological_operations/forms.py:710 #: archaeological_operations/forms.py:1005 #: archaeological_operations/forms.py:1021 @@ -2101,15 +2345,17 @@ msgstr "Ce nom est utilisé lors de la création de l'opération associée" #: archaeological_operations/templates/ishtar/sheet_operation.html:152 #: ishtar_common/forms_common.py:1851 ishtar_common/forms_common.py:1865 #: ishtar_common/forms_common.py:1866 ishtar_common/models.py:2531 -#: ishtar_common/models_common.py:3666 +#: ishtar_common/models_common.py:3676 #: ishtar_common/templates/ishtar/sheet_area.html:71 #: ishtar_common/templates/ishtar/sheet_document.html:133 +#: na_app/templates/ishtar/sheet_operation.html:150 +#: pdl_app/templates/ishtar/sheet_operation.html:153 msgid "Towns" msgstr "Communes" #: archaeological_files/forms.py:297 archaeological_files/forms.py:345 -#: archaeological_files/models.py:764 archaeological_operations/models.py:3225 -#: ishtar_common/models_common.py:2217 +#: archaeological_files/models.py:866 archaeological_operations/models.py:3225 +#: ishtar_common/models_common.py:2227 msgid "Departments" msgstr "Départements" @@ -2118,7 +2364,7 @@ msgid "Only relevant when no town is provided." msgstr "Seulement pertinent quand aucune commune n'est renseignée." #: archaeological_files/forms.py:301 archaeological_files/forms.py:347 -#: archaeological_files/models.py:756 +#: archaeological_files/models.py:858 msgid "Locality" msgstr "Lieu-dit" @@ -2132,7 +2378,7 @@ msgstr "N° / voie" #: archaeological_files/forms.py:307 archaeological_files/forms.py:353 #: archaeological_warehouse/forms.py:255 ishtar_common/forms_common.py:787 -#: ishtar_common/forms_common.py:1206 ishtar_common/models_common.py:4165 +#: ishtar_common/forms_common.py:1206 ishtar_common/models_common.py:4175 msgid "Postal code" msgstr "Code postal" @@ -2140,7 +2386,7 @@ msgstr "Code postal" msgid "Surfaces" msgstr "Surfaces" -#: archaeological_files/forms.py:320 archaeological_files/models.py:754 +#: archaeological_files/forms.py:320 archaeological_files/models.py:856 msgid "Total developed surface (m²)" msgstr "Surface totale aménagée (m²)" @@ -2151,7 +2397,7 @@ msgstr "Surface totale aménagée (m²)" #: archaeological_operations/templates/ishtar/sheet_site.html:90 #: archaeological_warehouse/forms.py:242 archaeological_warehouse/forms.py:251 #: ishtar_common/forms_common.py:783 ishtar_common/forms_common.py:1202 -#: ishtar_common/models_common.py:4160 ishtar_common/models_common.py:4367 +#: ishtar_common/models_common.py:4170 ishtar_common/models_common.py:4377 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 msgid "Address" msgstr "Adresse" @@ -2186,7 +2432,7 @@ msgstr "Service instructeur" msgid "Archaeological file - 040 - Planning service" msgstr "Dossier archéologique - 040 - Service aménageur" -#: archaeological_files/forms.py:452 archaeological_files/models.py:732 +#: archaeological_files/forms.py:452 archaeological_files/models.py:834 msgid "Date of planning service file" msgstr "Date du dossier du service instructeur" @@ -2206,12 +2452,12 @@ msgstr "Archéologie programmée" msgid "Archaeological file - 045 - Research - General" msgstr "Dossier archéologique - 045 - Recherche - Général" -#: archaeological_files/forms.py:562 archaeological_files/models.py:788 +#: archaeological_files/forms.py:562 archaeological_files/models.py:890 #: archaeological_operations/forms.py:517 msgid "Scientist in charge" msgstr "Responsable d'opération" -#: archaeological_files/forms.py:566 archaeological_files/models.py:772 +#: archaeological_files/forms.py:566 archaeological_files/models.py:874 msgid "Requested operation type" msgstr "Type d'opération demandée" @@ -2219,16 +2465,16 @@ msgstr "Type d'opération demandée" msgid "Lead organization" msgstr "Organisation porteuse du projet" -#: archaeological_files/forms.py:584 archaeological_files/models.py:791 +#: archaeological_files/forms.py:584 archaeological_files/models.py:893 #: archaeological_files/templates/ishtar/sheet_file.html:176 msgid "Research archaeology comment" msgstr "Précisions sur l'archéologie programmée" -#: archaeological_files/forms.py:593 archaeological_files/models.py:794 +#: archaeological_files/forms.py:593 archaeological_files/models.py:896 msgid "Classified area" msgstr "Au sein d'un site classé" -#: archaeological_files/forms.py:594 archaeological_files/models.py:796 +#: archaeological_files/forms.py:594 archaeological_files/models.py:898 msgid "Protected area" msgstr "Au sein d'un secteur sauvegardé" @@ -2245,11 +2491,11 @@ msgstr "Dossier archéologique - 050 - Instruction" msgid "File managed by" msgstr "Dossier géré par" -#: archaeological_files/forms.py:622 archaeological_files/models.py:736 +#: archaeological_files/forms.py:622 archaeological_files/models.py:838 msgid "Related file" msgstr "Dossier associé" -#: archaeological_files/forms.py:630 archaeological_files/models.py:750 +#: archaeological_files/forms.py:630 archaeological_files/models.py:852 #: archaeological_files/templates/ishtar/sheet_file.html:66 msgid "Instruction deadline" msgstr "Date limite d'instruction" @@ -2281,27 +2527,27 @@ msgstr "Dates" msgid "Archaeological royalties" msgstr "Dotations archéologiques" -#: archaeological_files/forms.py:742 archaeological_files/models.py:821 +#: archaeological_files/forms.py:742 archaeological_files/models.py:923 msgid "Intervention period" msgstr "Période d'intervention" -#: archaeological_files/forms.py:747 archaeological_files/models.py:824 +#: archaeological_files/forms.py:747 archaeological_files/models.py:926 msgid "Study period" msgstr "Période d'étude" -#: archaeological_files/forms.py:752 archaeological_files/models.py:827 +#: archaeological_files/forms.py:752 archaeological_files/models.py:929 msgid "Report due period" msgstr "Période de remise du rapport" -#: archaeological_files/forms.py:767 archaeological_files/models.py:831 +#: archaeological_files/forms.py:767 archaeological_files/models.py:933 msgid "Ground start date" msgstr "Date de début de la fouille" -#: archaeological_files/forms.py:772 archaeological_files/models.py:832 +#: archaeological_files/forms.py:772 archaeological_files/models.py:934 msgid "Ground end date" msgstr "Date de fin de la fouille" -#: archaeological_files/forms.py:777 archaeological_files/models.py:834 +#: archaeological_files/forms.py:777 archaeological_files/models.py:936 msgid "Execution report date" msgstr "Date du rapport d'exécution" @@ -2333,16 +2579,16 @@ msgstr "Personnes par jour" msgid "Days" msgstr "Jours" -#: archaeological_files/forms.py:864 archaeological_files/models.py:120 -#: archaeological_files/models.py:1751 archaeological_files/models.py:1770 +#: archaeological_files/forms.py:864 archaeological_files/models.py:222 +#: archaeological_files/models.py:1853 archaeological_files/models.py:1872 #: archaeological_files/templates/ishtar/sheet_file.html:298 #: archaeological_files/templates/ishtar/sheet_file.html:350 msgid "Job" msgstr "Emploi" -#: archaeological_files/forms.py:885 archaeological_files/models.py:84 -#: archaeological_files/models.py:85 archaeological_files/models.py:97 -#: archaeological_files/models.py:230 archaeological_files/models.py:817 +#: archaeological_files/forms.py:885 archaeological_files/models.py:94 +#: archaeological_files/models.py:95 archaeological_files/models.py:199 +#: archaeological_files/models.py:332 archaeological_files/models.py:919 msgid "Price agreement" msgstr "Contrat tarifaire" @@ -2393,6 +2639,9 @@ msgstr "Équipement / service" #: archaeological_warehouse/forms.py:465 archaeological_warehouse/forms.py:527 #: archaeological_warehouse/models.py:1200 ishtar_common/admin.py:649 #: ishtar_common/models.py:5197 +#: man_app/templates/ishtar/sheet_find_treatments.html:94 +#: na_app/templates/ishtar/sheet_find.html:374 +#: pdl_app/templates/ishtar/sheet_find.html:367 msgid "Index" msgstr "Index" @@ -2465,7 +2714,7 @@ msgstr "Dossier : réf. du permis / de l'arrêté" msgid "Administrative act - Archaeological file - General" msgstr "Acte administratif - Dossier archéologique - Général" -#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:880 +#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:982 #: archaeological_files/templates/ishtar/sheet_file.html:4 #: archaeological_files/wizards.py:226 archaeological_files/wizards.py:238 #: archaeological_operations/forms.py:663 @@ -2491,109 +2740,177 @@ msgstr "Clôture" #: archaeological_operations/models.py:1942 #: archaeological_operations/models.py:3256 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 +#: cd93_app/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "Acte administratif" -#: archaeological_files/models.py:92 archaeological_files/models.py:127 -#: archaeological_files/models.py:192 archaeological_files/models.py:208 -#: archaeological_files/models.py:278 archaeological_files/models.py:380 -#: archaeological_files/models.py:392 archaeological_files/models.py:404 -#: archaeological_files/models.py:424 archaeological_files/models.py:1757 -#: archaeological_files/models.py:1776 archaeological_files/models.py:1803 +#: archaeological_files/models.py:102 archaeological_files/models.py:229 +#: archaeological_files/models.py:294 archaeological_files/models.py:310 +#: archaeological_files/models.py:380 archaeological_files/models.py:482 +#: archaeological_files/models.py:494 archaeological_files/models.py:506 +#: archaeological_files/models.py:526 archaeological_files/models.py:1859 +#: archaeological_files/models.py:1878 archaeological_files/models.py:1905 #: archaeological_files/templates/ishtar/sheet_file.html:29 #: archaeological_operations/templates/ishtar/sheet_operation.html:310 #: ishtar_common/models.py:6077 +#: na_app/templates/ishtar/sheet_operation.html:316 +#: pdl_app/templates/ishtar/sheet_operation.html:333 msgid "Preventive" msgstr "Préventif" -#: archaeological_files/models.py:100 +#: archaeological_files/models.py:136 +msgid "Equipment - service costs" +msgstr "Coûts équipement - service" + +#: archaeological_files/models.py:137 archaeological_files/models.py:148 +#: archaeological_finds/forms.py:2503 +#: archaeological_finds/forms_treatments.py:57 +#: archaeological_finds/forms_treatments.py:67 +#: archaeological_finds/forms_treatments.py:194 +#: archaeological_finds/models_treatments.py:356 +#: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 +#: archaeological_finds/templates/ishtar/sheet_find_treatments.html:61 +#: archaeological_finds/templates/ishtar/sheet_find_treatments.html:99 +#: ishtar_common/forms_common.py:2026 ishtar_common/models.py:1015 +#: ishtar_common/models.py:1935 ishtar_common/models.py:4413 +#: ishtar_common/models_common.py:181 ishtar_common/models_common.py:232 +#: ishtar_common/models_common.py:2198 ishtar_common/models_common.py:2214 +#: ishtar_common/models_imports.py:706 +#: man_app/templates/ishtar/sheet_find_treatments.html:119 +#: man_app/templates/ishtar/sheet_find_treatments.html:157 +#: na_app/templates/ishtar/sheet_find.html:444 +#: na_app/templates/ishtar/sheet_find.html:482 +#: pdl_app/templates/ishtar/sheet_find.html:437 +#: pdl_app/templates/ishtar/sheet_find.html:475 +msgid "Label" +msgstr "Dénomination" + +#: archaeological_files/models.py:137 archaeological_files/models.py:354 +#: ishtar_common/models_imports.py:1086 +msgid "Unit" +msgstr "Unité" + +#: archaeological_files/models.py:137 +msgid "Price" +msgstr "Prix" + +#: archaeological_files/models.py:144 archaeological_finds/tests.py:1864 +#: archaeological_finds/tests.py:1890 archaeological_finds/tests.py:1900 +#: archaeological_operations/tests.py:3371 ishtar_common/forms.py:1353 +#: ishtar_common/forms.py:1445 +#: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 +#: ishtar_common/templatetags/window_field.py:19 +#: ishtar_common/views_item.py:798 ishtar_common/views_item.py:1071 +#: ishtar_common/views_item.py:1108 ishtar_common/wizards.py:511 +msgid "Yes" +msgstr "Oui" + +#: archaeological_files/models.py:144 archaeological_finds/tests.py:1865 +#: archaeological_finds/tests.py:1891 archaeological_finds/tests.py:1901 +#: ishtar_common/forms.py:1354 ishtar_common/forms.py:1447 +#: ishtar_common/templatetags/window_field.py:24 ishtar_common/wizards.py:513 +msgid "No" +msgstr "Non" + +#: archaeological_files/models.py:148 archaeological_files/models.py:205 +#: archaeological_files/models.py:273 +msgid "Permanent contract" +msgstr "Contrat à durée indéterminée" + +#: archaeological_files/models.py:149 archaeological_files/models.py:202 msgid "Ground daily cost" msgstr "Coût journalier terrain" -#: archaeological_files/models.py:101 +#: archaeological_files/models.py:149 archaeological_files/models.py:203 msgid "Daily cost" msgstr "Coût journalier" -#: archaeological_files/models.py:103 archaeological_files/models.py:171 -msgid "Permanent contract" -msgstr "Contrat à durée indéterminée" +#: archaeological_files/models.py:150 +msgid "Job cost" +msgstr "Coût emplois" + +#: archaeological_files/models.py:155 +msgid "ishtar-price-agreement" +msgstr "ishtar-contrat-tarifaire" -#: archaeological_files/models.py:106 +#: archaeological_files/models.py:208 msgid "Def. daily number on ground" msgstr "Nb. journalier terrain par défaut" -#: archaeological_files/models.py:108 +#: archaeological_files/models.py:210 msgid "Def. daily number on study" msgstr "Nb. journalier post-fouille par défaut" -#: archaeological_files/models.py:114 +#: archaeological_files/models.py:216 msgid "Child" msgstr "Enfant" -#: archaeological_files/models.py:115 +#: archaeological_files/models.py:217 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:121 +#: archaeological_files/models.py:223 msgid "Jobs" msgstr "Emplois" -#: archaeological_files/models.py:133 +#: archaeological_files/models.py:235 msgid "fixed-term contract" msgstr "contrat à durée déterminée" -#: archaeological_files/models.py:175 +#: archaeological_files/models.py:277 msgid "Fixed-term contract" msgstr "Contrat à durée déterminée" -#: archaeological_files/models.py:186 +#: archaeological_files/models.py:288 msgid "Generic equipment type" msgstr "Type d'équipement générique" -#: archaeological_files/models.py:187 +#: archaeological_files/models.py:289 msgid "Generic equipment types" msgstr "Types d'équipement générique" -#: archaeological_files/models.py:197 +#: archaeological_files/models.py:299 msgid "Generic type" msgstr "Type générique" -#: archaeological_files/models.py:202 +#: archaeological_files/models.py:304 msgid "Equipment/service type" msgstr "Type d'équipement/de service" -#: archaeological_files/models.py:203 +#: archaeological_files/models.py:305 msgid "Equipment/service types" msgstr "Types d'équipement/de service" -#: archaeological_files/models.py:212 +#: archaeological_files/models.py:314 #: archaeological_operations/templates/ishtar/sheet_operation.html:236 +#: na_app/templates/ishtar/sheet_operation.html:233 +#: pdl_app/templates/ishtar/sheet_operation.html:236 msgid "days" msgstr "jours" -#: archaeological_files/models.py:213 +#: archaeological_files/models.py:315 msgid "weeks" msgstr "semaines" -#: archaeological_files/models.py:214 +#: archaeological_files/models.py:316 msgid "months" msgstr "mois" -#: archaeological_files/models.py:215 +#: archaeological_files/models.py:317 msgid "linear m." msgstr "m. linéaire" -#: archaeological_files/models.py:234 +#: archaeological_files/models.py:336 msgid "Equipment/Service" msgstr "Équipement/Service" -#: archaeological_files/models.py:237 archaeological_warehouse/forms.py:215 +#: archaeological_files/models.py:339 archaeological_warehouse/forms.py:215 #: archaeological_warehouse/models.py:385 ishtar_common/models.py:3398 #: ishtar_common/models_common.py:183 ishtar_common/models_common.py:232 msgid "Textual ID" msgstr "Identifiant textuel" -#: archaeological_files/models.py:241 ishtar_common/models.py:3401 +#: archaeological_files/models.py:343 ishtar_common/models.py:3401 #: ishtar_common/models_common.py:187 msgid "" "The slug is the standardized version of the name. It contains only lowercase " @@ -2603,31 +2920,27 @@ msgstr "" "lettres en minuscule, des nombres et des tirets (-). Chaque \"slug\" doit " "être unique dans la typologie." -#: archaeological_files/models.py:247 +#: archaeological_files/models.py:349 msgid "Service provider" msgstr "Fournisseur de service" -#: archaeological_files/models.py:249 archaeological_files/models.py:312 +#: archaeological_files/models.py:351 archaeological_files/models.py:414 msgid "Flat rate" msgstr "Tarif forfaitaire" -#: archaeological_files/models.py:250 +#: archaeological_files/models.py:352 msgid "Unitary cost" msgstr "Coût unitaire" -#: archaeological_files/models.py:252 ishtar_common/models_imports.py:1086 -msgid "Unit" -msgstr "Unité" - -#: archaeological_files/models.py:255 +#: archaeological_files/models.py:357 msgid "Specificity" msgstr "Spécificité" -#: archaeological_files/models.py:258 +#: archaeological_files/models.py:360 msgid "Default quantity by day" msgstr "Quantité par défaut par jour" -#: archaeological_files/models.py:260 ishtar_common/models.py:1728 +#: archaeological_files/models.py:362 ishtar_common/models.py:1728 #: ishtar_common/models.py:2205 ishtar_common/models.py:4425 #: ishtar_common/models_common.py:193 ishtar_common/models_imports.py:170 #: ishtar_common/models_imports.py:448 ishtar_common/models_imports.py:959 @@ -2635,86 +2948,86 @@ msgstr "Quantité par défaut par jour" msgid "Available" msgstr "Disponible" -#: archaeological_files/models.py:266 ishtar_common/admin.py:1559 +#: archaeological_files/models.py:368 ishtar_common/admin.py:1559 #: ishtar_common/models.py:2538 ishtar_common/models_common.py:779 msgid "Parent" msgstr "Parent" -#: archaeological_files/models.py:267 +#: archaeological_files/models.py:369 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:272 +#: archaeological_files/models.py:374 msgid "Equipment/service cost" msgstr "Coût équipement/service" -#: archaeological_files/models.py:273 +#: archaeological_files/models.py:375 msgid "Equipment/service costs" msgstr "Coûts équipement/service" -#: archaeological_files/models.py:332 +#: archaeological_files/models.py:434 msgid "Archaeological file type" msgstr "Type de dossier archéologique" -#: archaeological_files/models.py:333 +#: archaeological_files/models.py:435 msgid "Archaeological file types" msgstr "Types de dossier archéologique" -#: archaeological_files/models.py:353 +#: archaeological_files/models.py:455 msgid "Permit types" msgstr "Types de permis" -#: archaeological_files/models.py:364 +#: archaeological_files/models.py:466 msgid "Delay (in days)" msgstr "Délai (en jours)" -#: archaeological_files/models.py:377 +#: archaeological_files/models.py:479 msgid "Agreement type - France" msgstr "Type de convention - France" -#: archaeological_files/models.py:378 +#: archaeological_files/models.py:480 msgid "Agreement types - France" msgstr "Types de convention - France" -#: archaeological_files/models.py:389 +#: archaeological_files/models.py:491 msgid "Monitoring justification type" msgstr "Type de motivation de la prescription" -#: archaeological_files/models.py:390 +#: archaeological_files/models.py:492 msgid "Monitoring justification types" msgstr "Types de motivation de la prescription" -#: archaeological_files/models.py:402 +#: archaeological_files/models.py:504 msgid "Development types" msgstr "Types d'aménagement" -#: archaeological_files/models.py:413 +#: archaeological_files/models.py:515 msgid "Increase coefficient" msgstr "Coefficient majoration" -#: archaeological_files/models.py:415 +#: archaeological_files/models.py:517 msgid "Increased final value" msgstr "Valeur finale majorée" -#: archaeological_files/models.py:417 +#: archaeological_files/models.py:519 msgid "Category" msgstr "Catégorie" -#: archaeological_files/models.py:421 +#: archaeological_files/models.py:523 msgid "Operation type for royalties - France" msgstr "Type d'opération pour les dotations - France" -#: archaeological_files/models.py:422 +#: archaeological_files/models.py:524 msgid "Operation types for royalties - France" msgstr "Types d'opération pour les dotations - France" -#: archaeological_files/models.py:461 archaeological_finds/models_finds.py:1323 +#: archaeological_files/models.py:563 archaeological_finds/models_finds.py:1323 #: archaeological_operations/models.py:388 #: archaeological_operations/models.py:1166 msgid "Extended area" msgstr "Zone étendue" -#: archaeological_files/models.py:470 archaeological_finds/models_finds.py:1345 +#: archaeological_files/models.py:572 archaeological_finds/models_finds.py:1345 #: archaeological_operations/templates/ishtar/sheet_operation.html:549 #: archaeological_operations/templates/ishtar/sheet_operation.html:559 #: archaeological_operations/templates/ishtar/sheet_operation.html:577 @@ -2722,23 +3035,35 @@ msgstr "Zone étendue" #: archaeological_operations/templates/ishtar/sheet_operation.html:597 #: archaeological_operations/templates/ishtar/sheet_operation.html:614 #: ishtar_common/models.py:2060 ishtar_common/models_common.py:826 -#: ishtar_common/models_common.py:2189 ishtar_common/models_common.py:2205 +#: ishtar_common/models_common.py:2199 ishtar_common/models_common.py:2215 #: ishtar_common/templates/ishtar/sheet_person.html:30 +#: na_app/templates/ishtar/sheet_operation.html:554 +#: na_app/templates/ishtar/sheet_operation.html:564 +#: na_app/templates/ishtar/sheet_operation.html:581 +#: na_app/templates/ishtar/sheet_operation.html:591 +#: na_app/templates/ishtar/sheet_operation.html:601 +#: na_app/templates/ishtar/sheet_operation.html:618 +#: pdl_app/templates/ishtar/sheet_operation.html:571 +#: pdl_app/templates/ishtar/sheet_operation.html:581 +#: pdl_app/templates/ishtar/sheet_operation.html:598 +#: pdl_app/templates/ishtar/sheet_operation.html:608 +#: pdl_app/templates/ishtar/sheet_operation.html:618 +#: pdl_app/templates/ishtar/sheet_operation.html:635 msgid "Number" msgstr "Nombre" -#: archaeological_files/models.py:471 +#: archaeological_files/models.py:573 msgid "Total surface (km²)" msgstr "Surface totale (km²)" -#: archaeological_files/models.py:472 +#: archaeological_files/models.py:574 msgid "Total developed surface (km²)" msgstr "Surface totale aménagée (km²)" -#: archaeological_files/models.py:541 archaeological_finds/models_finds.py:1450 +#: archaeological_files/models.py:643 archaeological_finds/models_finds.py:1450 #: archaeological_finds/models_treatments.py:265 #: archaeological_finds/models_treatments.py:1361 -#: archaeological_finds/tests.py:1659 archaeological_operations/models.py:1319 +#: archaeological_finds/tests.py:1699 archaeological_operations/models.py:1319 #: archaeological_operations/models.py:3005 #: archaeological_operations/tests.py:3292 #: archaeological_operations/tests.py:3406 @@ -2746,7 +3071,7 @@ msgctxt "key for text search" msgid "year" msgstr "annee" -#: archaeological_files/models.py:543 +#: archaeological_files/models.py:645 #: archaeological_finds/models_treatments.py:262 #: archaeological_finds/models_treatments.py:1358 #: archaeological_operations/models.py:456 @@ -2755,18 +3080,18 @@ msgctxt "key for text search" msgid "reference" msgstr "reference" -#: archaeological_files/models.py:546 archaeological_operations/models.py:3009 +#: archaeological_files/models.py:648 archaeological_operations/models.py:3009 #: ishtar_common/models.py:4925 msgctxt "key for text search" msgid "internal-reference" msgstr "reference-interne" -#: archaeological_files/models.py:558 archaeological_operations/models.py:1343 +#: archaeological_files/models.py:660 archaeological_operations/models.py:1343 msgctxt "key for text search" msgid "department" msgstr "departement" -#: archaeological_files/models.py:562 +#: archaeological_files/models.py:664 #: archaeological_finds/models_treatments.py:1355 #: archaeological_operations/models.py:459 #: archaeological_operations/models.py:1347 @@ -2778,7 +3103,7 @@ msgctxt "key for text search" msgid "name" msgstr "nom" -#: archaeological_files/models.py:568 +#: archaeological_files/models.py:670 #: archaeological_finds/models_treatments.py:268 #: archaeological_finds/models_treatments.py:1364 #: archaeological_operations/models.py:466 @@ -2793,54 +3118,54 @@ msgctxt "key for text search" msgid "type" msgstr "type" -#: archaeological_files/models.py:571 +#: archaeological_files/models.py:673 msgctxt "key for text search" msgid "active" msgstr "actif" -#: archaeological_files/models.py:574 +#: archaeological_files/models.py:676 msgctxt "key for text search" msgid "saisine-type" msgstr "type-saisine" -#: archaeological_files/models.py:579 +#: archaeological_files/models.py:681 msgctxt "key for text search" msgid "development-type" msgstr "nature-amenagement" -#: archaeological_files/models.py:583 +#: archaeological_files/models.py:685 msgctxt "key for text search" msgid "monitoring-justification" msgstr "motivation-prescription" -#: archaeological_files/models.py:587 +#: archaeological_files/models.py:689 msgctxt "key for text search" msgid "permit-type" msgstr "type-permis" -#: archaeological_files/models.py:592 +#: archaeological_files/models.py:694 msgctxt "key for text search" msgid "permit-reference" msgstr "reference-permis" -#: archaeological_files/models.py:599 archaeological_finds/models_finds.py:1771 +#: archaeological_files/models.py:701 archaeological_finds/models_finds.py:1771 #: archaeological_finds/models_treatments.py:1367 -#: archaeological_finds/tests.py:1694 +#: archaeological_finds/tests.py:1734 msgctxt "key for text search" msgid "in-charge" msgstr "responsable" -#: archaeological_files/models.py:603 archaeological_operations/models.py:3057 +#: archaeological_files/models.py:705 archaeological_operations/models.py:3057 msgctxt "key for text search" msgid "general-contractor" msgstr "amenageur" -#: archaeological_files/models.py:608 archaeological_operations/models.py:3061 +#: archaeological_files/models.py:710 archaeological_operations/models.py:3061 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "amenageur-organisation" -#: archaeological_files/models.py:657 +#: archaeological_files/models.py:759 #: archaeological_finds/forms_treatments.py:699 #: archaeological_finds/forms_treatments.py:771 #: archaeological_finds/forms_treatments.py:964 @@ -2868,8 +3193,8 @@ msgstr "amenageur-organisation" #: ishtar_common/models.py:2793 ishtar_common/models.py:3109 #: ishtar_common/models.py:3708 ishtar_common/models.py:4023 #: ishtar_common/models.py:6113 ishtar_common/models_common.py:956 -#: ishtar_common/models_common.py:2427 ishtar_common/models_common.py:3215 -#: ishtar_common/models_common.py:3622 ishtar_common/models_common.py:3688 +#: ishtar_common/models_common.py:2437 ishtar_common/models_common.py:3225 +#: ishtar_common/models_common.py:3632 ishtar_common/models_common.py:3698 #: ishtar_common/models_imports.py:129 ishtar_common/models_imports.py:162 #: ishtar_common/models_imports.py:443 ishtar_common/models_imports.py:813 #: ishtar_common/models_imports.py:831 ishtar_common/models_imports.py:954 @@ -2888,50 +3213,58 @@ msgstr "amenageur-organisation" #: ishtar_common/templates/ishtar/sheet_organization.html:28 #: ishtar_common/templates/ishtar/sheet_organization.html:56 #: ishtar_common/templates/ishtar/sheet_town.html:63 +#: man_app/templates/ishtar/sheet_find_treatments.html:244 +#: na_app/templates/ishtar/sheet_find.html:522 +#: na_app/templates/ishtar/sheet_operation.html:157 +#: pdl_app/templates/ishtar/sheet_find.html:515 +#: pdl_app/templates/ishtar/sheet_operation.html:160 msgid "Name" msgstr "Nom" -#: archaeological_files/models.py:663 +#: archaeological_files/models.py:765 #: archaeological_finds/models_treatments.py:1417 #: archaeological_finds/models_treatments.py:1697 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:187 #: archaeological_warehouse/forms.py:230 archaeological_warehouse/models.py:393 +#: man_app/templates/ishtar/sheet_find_treatments.html:245 +#: na_app/templates/ishtar/sheet_find.html:523 +#: pdl_app/templates/ishtar/sheet_find.html:516 msgid "Person in charge" msgstr "Personne responsable" -#: archaeological_files/models.py:677 +#: archaeological_files/models.py:779 msgid "General contractor (raw)" msgstr "Aménageur (brut)" -#: archaeological_files/models.py:682 +#: archaeological_files/models.py:784 msgid "General contractor organization" msgstr "Organisation de l'aménageur" -#: archaeological_files/models.py:692 +#: archaeological_files/models.py:794 msgid "Responsible for planning service" msgstr "Responsable pour le service instructeur" -#: archaeological_files/models.py:696 +#: archaeological_files/models.py:798 msgid "Planning service (raw)" msgstr "Service instructeur (brut)" -#: archaeological_files/models.py:703 +#: archaeological_files/models.py:805 msgid "Planning service organization" msgstr "Service instructeur" -#: archaeological_files/models.py:718 +#: archaeological_files/models.py:820 msgid "Main town" msgstr "Commune principale" -#: archaeological_files/models.py:757 +#: archaeological_files/models.py:859 msgid "Main address" msgstr "Adresse des terrains" -#: archaeological_files/models.py:759 +#: archaeological_files/models.py:861 msgid "Main address - postal code" msgstr "Adresse des terrains - code postal" -#: archaeological_files/models.py:778 +#: archaeological_files/models.py:880 #: archaeological_finds/forms_treatments.py:91 #: archaeological_finds/forms_treatments.py:227 #: archaeological_finds/forms_treatments.py:480 @@ -2949,23 +3282,23 @@ msgstr "Adresse des terrains - code postal" msgid "Organization" msgstr "Organisation" -#: archaeological_files/models.py:836 +#: archaeological_files/models.py:938 msgid "Linear meter" msgstr "Mètre linéaire" -#: archaeological_files/models.py:840 +#: archaeological_files/models.py:942 msgid "Type of agreement" msgstr "Type de convention" -#: archaeological_files/models.py:845 +#: archaeological_files/models.py:947 msgid "Operation type for royalties" msgstr "Type d'opération pour la dotation" -#: archaeological_files/models.py:861 +#: archaeological_files/models.py:963 msgid "Imported line" msgstr "Ligne importée" -#: archaeological_files/models.py:881 +#: archaeological_files/models.py:983 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:121 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:220 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:330 @@ -2975,108 +3308,108 @@ msgstr "Ligne importée" msgid "Archaeological files" msgstr "Dossiers archéologiques" -#: archaeological_files/models.py:907 +#: archaeological_files/models.py:1009 msgid "FILE" msgstr "DOSSIER" -#: archaeological_files/models.py:1370 +#: archaeological_files/models.py:1472 msgid "Multi-town" msgstr "Intercommunal" -#: archaeological_files/models.py:1376 +#: archaeological_files/models.py:1478 msgid "No town" msgstr "Pas de commune" -#: archaeological_files/models.py:1595 archaeological_operations/models.py:2213 +#: archaeological_files/models.py:1697 archaeological_operations/models.py:2213 msgid "Modify parcels" msgstr "Modifier les parcelles" -#: archaeological_files/models.py:1597 archaeological_operations/models.py:2215 +#: archaeological_files/models.py:1699 archaeological_operations/models.py:2215 msgid "parcels" msgstr "parcelles" -#: archaeological_files/models.py:1607 +#: archaeological_files/models.py:1709 msgid "Edit intervention plan" msgstr "Modifier le plan d'intervention" -#: archaeological_files/models.py:1609 +#: archaeological_files/models.py:1711 msgid "plan" msgstr "plan d'intervention" -#: archaeological_files/models.py:1618 +#: archaeological_files/models.py:1720 #: archaeological_finds/models_treatments.py:590 #: archaeological_finds/models_treatments.py:1569 #: archaeological_operations/models.py:2251 msgid "Add associated administrative act" msgstr "Ajouter un acte administratif associé" -#: archaeological_files/models.py:1620 +#: archaeological_files/models.py:1722 #: archaeological_finds/models_treatments.py:592 #: archaeological_finds/models_treatments.py:1571 #: archaeological_operations/models.py:2253 msgid "admin. act" msgstr "acte admin." -#: archaeological_files/models.py:1629 +#: archaeological_files/models.py:1731 msgid "Add operation" msgstr "Ajouter une opération" -#: archaeological_files/models.py:1631 +#: archaeological_files/models.py:1733 #: archaeological_files/templates/ishtar/blocks/window_file_nav.html:6 #: ishtar_common/admin.py:1879 msgid "operation" msgstr "opération" -#: archaeological_files/models.py:1706 archaeological_operations/models.py:1596 +#: archaeological_files/models.py:1808 archaeological_operations/models.py:1596 #: archaeological_operations/models.py:3473 ishtar_common/forms_common.py:2664 msgid "File" msgstr "Dossier" -#: archaeological_files/models.py:1725 +#: archaeological_files/models.py:1827 msgid "Man by day - planned" msgstr "Personnes par jour - planifiés" -#: archaeological_files/models.py:1727 archaeological_files/models.py:1793 +#: archaeological_files/models.py:1829 archaeological_files/models.py:1895 msgid "Days - planned" msgstr "Jours - planifiés" -#: archaeological_files/models.py:1729 +#: archaeological_files/models.py:1831 msgid "Man by day - worked" msgstr "Personnes par jour - travaillés" -#: archaeological_files/models.py:1731 archaeological_files/models.py:1797 +#: archaeological_files/models.py:1833 archaeological_files/models.py:1899 msgid "Days - worked" msgstr "Jours - travaillés" -#: archaeological_files/models.py:1755 +#: archaeological_files/models.py:1857 msgid "Human requirement on field" msgstr "Besoin humain terrains" -#: archaeological_files/models.py:1756 +#: archaeological_files/models.py:1858 msgid "Human requirements on field" msgstr "Besoins humains terrains" -#: archaeological_files/models.py:1774 +#: archaeological_files/models.py:1876 msgid "Human requirement for post-excavation" msgstr "Besoin humain post-fouille" -#: archaeological_files/models.py:1775 +#: archaeological_files/models.py:1877 msgid "Human requirements for post-excavation" msgstr "Besoins humains post-fouille" -#: archaeological_files/models.py:1791 +#: archaeological_files/models.py:1893 msgid "Quantity by day - planned" msgstr "Quantité par jour - planifié" -#: archaeological_files/models.py:1795 +#: archaeological_files/models.py:1897 msgid "Quantity by day - worked" msgstr "Quantité par jour - travaillé" -#: archaeological_files/models.py:1801 +#: archaeological_files/models.py:1903 msgid "Equipment requirement" msgstr "Besoin en équipement" -#: archaeological_files/models.py:1802 +#: archaeological_files/models.py:1904 msgid "Equipment requirements" msgstr "Besoins en équipements" @@ -3134,8 +3467,12 @@ msgstr "Retourner au dossier" #: archaeological_operations/templates/ishtar/sheet_site.html:26 #: archaeological_warehouse/templates/ishtar/sheet_container.html:83 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:76 -#: ishtar_common/models_common.py:4904 +#: ishtar_common/models_common.py:4914 #: ishtar_common/templates/ishtar/sheet_document.html:37 +#: na_app/templates/ishtar/sheet_container.html:90 +#: na_app/templates/ishtar/sheet_find.html:162 +#: na_app/templates/ishtar/sheet_operation.html:143 +#: pdl_app/templates/ishtar/sheet_find.html:150 msgid "Complete identifier" msgstr "Identifiant complet" @@ -3157,6 +3494,8 @@ msgstr "Surface aménagée" #: archaeological_files/templates/ishtar/sheet_file.html:184 #: archaeological_operations/templates/ishtar/sheet_operation.html:390 +#: na_app/templates/ishtar/sheet_operation.html:393 +#: pdl_app/templates/ishtar/sheet_operation.html:410 msgid "Associated parcels" msgstr "Parcelles associées" @@ -3173,7 +3512,10 @@ msgstr "Parcelles associées" #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:300 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:400 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:499 -#: ishtar_common/views.py:187 +#: ishtar_common/views.py:187 na_app/templates/ishtar/sheet_operation.html:398 +#: na_app/templates/ishtar/sheet_operation.html:535 +#: pdl_app/templates/ishtar/sheet_operation.html:415 +#: pdl_app/templates/ishtar/sheet_operation.html:552 msgid "Administrative acts" msgstr "Actes administratifs" @@ -3246,6 +3588,8 @@ msgstr "Effectif" #: archaeological_files/templates/ishtar/sheet_file.html:410 #: archaeological_files/templates/ishtar/sheet_file.html:413 #: archaeological_operations/templates/ishtar/sheet_operation.html:227 +#: na_app/templates/ishtar/sheet_operation.html:224 +#: pdl_app/templates/ishtar/sheet_operation.html:227 msgid "Cost" msgstr "Coût" @@ -3257,6 +3601,8 @@ msgstr "Coût" #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:217 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:242 #: ishtar_common/models.py:2053 ishtar_common/models.py:2085 +#: na_app/templates/ishtar/sheet_container.html:259 +#: na_app/templates/ishtar/sheet_container.html:283 msgid "Total" msgstr "Total" @@ -3436,6 +3782,8 @@ msgstr "Marquage" #: archaeological_finds/forms.py:405 archaeological_finds/forms.py:1023 #: archaeological_finds/templates/ishtar/sheet_find.html:146 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:146 +#: cd17_app/templates/ishtar/sheet_find.html:154 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:185 msgid "Ownership" msgstr "Propriété" @@ -3445,6 +3793,8 @@ msgstr "Propriété" #: archaeological_finds/models_finds.py:2317 #: archaeological_finds/templates/ishtar/sheet_find.html:148 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:148 +#: cd17_app/templates/ishtar/sheet_find.html:156 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:187 msgid "Ownership status" msgstr "Statut de propriété" @@ -3452,7 +3802,9 @@ msgstr "Statut de propriété" #: archaeological_finds/models_finds.py:2321 #: archaeological_finds/templates/ishtar/sheet_find.html:149 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:149 -#: archaeological_operations/models.py:3811 ishtar_common/models.py:4423 +#: archaeological_operations/models.py:3811 +#: cd17_app/templates/ishtar/sheet_find.html:157 ishtar_common/models.py:4423 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:188 msgid "Owner" msgstr "Propriétaire" @@ -3513,6 +3865,8 @@ msgstr "Précisions sur la date d’entrée au musée" #: archaeological_finds/models_finds.py:2351 #: archaeological_finds/templates/ishtar/sheet_find.html:169 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:169 +#: cd17_app/templates/ishtar/sheet_find.html:177 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:208 msgid "Donors, testators or vendors" msgstr "Donateurs, testateurs ou vendeurs" @@ -3520,6 +3874,8 @@ msgstr "Donateurs, testateurs ou vendeurs" #: archaeological_finds/models_finds.py:2367 #: archaeological_finds/templates/ishtar/sheet_find.html:158 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:158 +#: cd17_app/templates/ishtar/sheet_find.html:166 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:197 msgid "Collections" msgstr "Collections" @@ -3722,6 +4078,11 @@ msgstr "Volume (l)" #: archaeological_finds/forms.py:2398 #: archaeological_finds/templates/ishtar/sheet_find.html:193 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:193 +#: cd17_app/templates/ishtar/sheet_find.html:201 +#: man_app/templates/ishtar/sheet_museum_find.html:195 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:232 +#: na_app/templates/ishtar/sheet_find.html:217 +#: pdl_app/templates/ishtar/sheet_find.html:210 msgid "Weight (g)" msgstr "Poids (g)" @@ -3770,6 +4131,7 @@ msgstr "Mobilier - 020 - Général" #: archaeological_finds/forms.py:731 archaeological_finds/models_finds.py:619 #: 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" @@ -3781,12 +4143,14 @@ msgstr "Identifiant fouille" #: archaeological_finds/forms.py:741 archaeological_finds/forms.py:1850 #: archaeological_finds/models_finds.py:630 #: archaeological_finds/templates/ishtar/sheet_basefind.html:33 +#: man_app/templates/ishtar/sheet_basefind.html:29 msgid "Discovery date (exact or beginning)" msgstr "Date de découverte (exacte ou début)" #: archaeological_finds/forms.py:744 archaeological_finds/forms.py:1851 #: archaeological_finds/models_finds.py:633 #: archaeological_finds/templates/ishtar/sheet_basefind.html:35 +#: man_app/templates/ishtar/sheet_basefind.html:31 msgid "Discovery date (end)" msgstr "Date de découverte (fin)" @@ -3860,6 +4224,9 @@ msgstr "Datation" #: archaeological_finds/forms.py:1027 archaeological_finds/forms.py:1502 #: archaeological_finds/forms.py:1673 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:14 +#: man_app/templates/ishtar/sheet_find_treatments.html:15 +#: na_app/templates/ishtar/sheet_find.html:295 +#: pdl_app/templates/ishtar/sheet_find.html:288 msgid "Preservation" msgstr "Conservation" @@ -3883,6 +4250,9 @@ msgstr "Cause d'altération" #: archaeological_finds/forms.py:1941 archaeological_finds/models_finds.py:1330 #: archaeological_finds/models_finds.py:2395 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:18 +#: man_app/templates/ishtar/sheet_find_treatments.html:19 +#: na_app/templates/ishtar/sheet_find.html:299 +#: pdl_app/templates/ishtar/sheet_find.html:292 msgid "Conservatory states" msgstr "États de conservation" @@ -3929,6 +4299,7 @@ msgstr "Date d'évaluation" #: archaeological_finds/forms.py:1951 archaeological_finds/models_finds.py:1349 #: archaeological_finds/models_finds.py:2429 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:24 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:70 msgid "Insurance value" msgstr "Valeur d'assurance" @@ -3970,7 +4341,7 @@ msgstr "Un libellé est obligatoire." #: archaeological_finds/forms.py:1459 archaeological_finds/forms.py:2505 #: ishtar_common/models.py:1089 ishtar_common/models.py:2175 -#: ishtar_common/models.py:4415 ishtar_common/models_common.py:3216 +#: ishtar_common/models.py:4415 ishtar_common/models_common.py:3226 #: ishtar_common/models_imports.py:163 ishtar_common/models_imports.py:444 #: ishtar_common/models_imports.py:832 ishtar_common/models_imports.py:3041 msgid "Slug" @@ -4116,6 +4487,8 @@ msgstr "Précisions sur les circonstances de découvertes" #: archaeological_finds/models_finds.py:1327 #: archaeological_operations/templates/ishtar/sheet_operation.html:577 #: archaeological_warehouse/forms.py:587 +#: na_app/templates/ishtar/sheet_operation.html:581 +#: pdl_app/templates/ishtar/sheet_operation.html:598 msgid "Material type" msgstr "Type de matériau" @@ -4123,6 +4496,8 @@ msgstr "Type de matériau" #: archaeological_finds/models_finds.py:1328 #: archaeological_operations/templates/ishtar/sheet_operation.html:587 #: archaeological_warehouse/forms.py:593 ishtar_common/models_imports.py:1103 +#: na_app/templates/ishtar/sheet_operation.html:591 +#: pdl_app/templates/ishtar/sheet_operation.html:608 msgid "Object type" msgstr "Type d'objet" @@ -4234,6 +4609,9 @@ msgstr "Musée - Prix d’achat" #: archaeological_finds/models_finds.py:2231 #: archaeological_finds/templates/ishtar/sheet_find_containers.html:4 #: ishtar_common/forms_common.py:2096 +#: man_app/templates/ishtar/sheet_find_treatments.html:36 +#: na_app/templates/ishtar/sheet_find.html:316 +#: pdl_app/templates/ishtar/sheet_find.html:309 msgid "Reference container" msgstr "Contenant de référence" @@ -4244,6 +4622,10 @@ msgstr "Lieu de conservation du contenant de référence" #: archaeological_finds/forms.py:2108 archaeological_finds/models_finds.py:1285 #: archaeological_finds/templates/ishtar/sheet_find_containers.html:29 #: ishtar_common/forms_common.py:2088 +#: man_app/templates/ishtar/sheet_find_treatments.html:61 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:41 +#: na_app/templates/ishtar/sheet_find.html:341 +#: pdl_app/templates/ishtar/sheet_find.html:334 msgid "Current container" msgstr "Contenant actuel" @@ -4287,22 +4669,6 @@ msgstr "Recherche de panier" msgid "Find basket" msgstr "Panier de mobilier" -#: archaeological_finds/forms.py:2503 -#: archaeological_finds/forms_treatments.py:57 -#: archaeological_finds/forms_treatments.py:67 -#: archaeological_finds/forms_treatments.py:194 -#: archaeological_finds/models_treatments.py:356 -#: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 -#: archaeological_finds/templates/ishtar/sheet_find_treatments.html:61 -#: archaeological_finds/templates/ishtar/sheet_find_treatments.html:99 -#: ishtar_common/forms_common.py:2026 ishtar_common/models.py:1015 -#: ishtar_common/models.py:1935 ishtar_common/models.py:4413 -#: ishtar_common/models_common.py:181 ishtar_common/models_common.py:232 -#: ishtar_common/models_common.py:2188 ishtar_common/models_common.py:2204 -#: ishtar_common/models_imports.py:706 -msgid "Label" -msgstr "Dénomination" - #: archaeological_finds/forms.py:2545 archaeological_finds/forms.py:2600 msgid "A basket with this slug already exists." msgstr "Un panier avec cet identifiant textuel existe déjà." @@ -4335,6 +4701,9 @@ msgstr "Traitement - 001 - Recherche" #: ishtar_common/forms_common.py:2515 ishtar_common/forms_common.py:2800 #: ishtar_common/models.py:2533 #: ishtar_common/templates/ishtar/sheet_document.html:40 +#: man_app/templates/ishtar/sheet_find_treatments.html:231 +#: na_app/templates/ishtar/sheet_find.html:432 +#: pdl_app/templates/ishtar/sheet_find.html:425 msgid "Reference" msgstr "Référence" @@ -4563,6 +4932,16 @@ msgstr "Type de traitement est requis." #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 #: ishtar_common/forms_common.py:2654 ishtar_common/forms_common.py:2866 #: ishtar_common/templates/ishtar/sheet_document.html:103 +#: man_app/templates/ishtar/sheet_find_treatments.html:124 +#: man_app/templates/ishtar/sheet_find_treatments.html:162 +#: man_app/templates/ishtar/sheet_find_treatments.html:201 +#: na_app/templates/ishtar/sheet_container.html:4 +#: na_app/templates/ishtar/sheet_find.html:402 +#: na_app/templates/ishtar/sheet_find.html:449 +#: na_app/templates/ishtar/sheet_find.html:487 +#: pdl_app/templates/ishtar/sheet_find.html:395 +#: pdl_app/templates/ishtar/sheet_find.html:442 +#: pdl_app/templates/ishtar/sheet_find.html:480 msgid "Container" msgstr "Contenant" @@ -4620,6 +4999,9 @@ msgstr "Réf. interne" #: archaeological_finds/models_treatments.py:1425 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:188 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:61 +#: man_app/templates/ishtar/sheet_find_treatments.html:246 +#: na_app/templates/ishtar/sheet_find.html:524 +#: pdl_app/templates/ishtar/sheet_find.html:517 msgid "Applicant" msgstr "Demandeur" @@ -4628,6 +5010,9 @@ msgstr "Demandeur" #: archaeological_finds/models_treatments.py:1433 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:189 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:69 +#: man_app/templates/ishtar/sheet_find_treatments.html:247 +#: na_app/templates/ishtar/sheet_find.html:525 +#: pdl_app/templates/ishtar/sheet_find.html:518 msgid "Applicant organisation" msgstr "Organisation demandeuse" @@ -5234,8 +5619,8 @@ msgctxt "key for text search" msgid "denomination" msgstr "denomination" -#: archaeological_finds/models_finds.py:1458 archaeological_finds/tests.py:1588 -#: archaeological_finds/tests.py:1801 archaeological_warehouse/models.py:966 +#: archaeological_finds/models_finds.py:1458 archaeological_finds/tests.py:1628 +#: archaeological_finds/tests.py:1841 archaeological_warehouse/models.py:966 msgctxt "key for text search" msgid "code-patriarche" msgstr "code-patriarche" @@ -5287,8 +5672,8 @@ msgctxt "key for text search" msgid "context-record-relation-type" msgstr "ue-type-relation" -#: archaeological_finds/models_finds.py:1509 archaeological_finds/tests.py:1495 -#: archaeological_finds/tests.py:1799 archaeological_warehouse/models.py:1001 +#: archaeological_finds/models_finds.py:1509 archaeological_finds/tests.py:1535 +#: archaeological_finds/tests.py:1839 archaeological_warehouse/models.py:1001 msgctxt "key for text search" msgid "material" msgstr "materiau" @@ -5305,7 +5690,7 @@ msgctxt "key for text search" msgid "recommended-treatments" msgstr "traitements-recommandes" -#: archaeological_finds/models_finds.py:1522 archaeological_finds/tests.py:1742 +#: archaeological_finds/models_finds.py:1522 archaeological_finds/tests.py:1782 #: archaeological_warehouse/models.py:1013 msgctxt "key for text search" msgid "conservatory" @@ -5368,12 +5753,12 @@ msgid "last-modified-by" msgstr "modifie-en-dernier-par" #: archaeological_finds/models_finds.py:1572 -#: ishtar_common/models_common.py:1711 +#: ishtar_common/models_common.py:1721 msgctxt "key for text search" msgid "created-by" msgstr "cree-par" -#: archaeological_finds/models_finds.py:1575 archaeological_finds/tests.py:1821 +#: archaeological_finds/models_finds.py:1575 archaeological_finds/tests.py:1861 msgctxt "key for text search" msgid "loan" msgstr "pret" @@ -5626,7 +6011,7 @@ msgctxt "key for text search" msgid "technical-process" msgstr "procede-technique" -#: archaeological_finds/models_finds.py:1767 archaeological_finds/tests.py:1682 +#: archaeological_finds/models_finds.py:1767 archaeological_finds/tests.py:1722 msgctxt "key for text search" msgid "operation-address" msgstr "operation-adresse" @@ -5637,7 +6022,7 @@ msgctxt "key for text search" msgid "scientist" msgstr "scientifique" -#: archaeological_finds/models_finds.py:1779 archaeological_finds/tests.py:1608 +#: archaeological_finds/models_finds.py:1779 archaeological_finds/tests.py:1648 #: archaeological_operations/models.py:1370 #: archaeological_operations/tests.py:3098 #: archaeological_operations/tests.py:3799 @@ -5801,11 +6186,17 @@ msgstr "Unité de poids" #: archaeological_finds/models_finds.py:2201 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:56 +#: man_app/templates/ishtar/sheet_find_treatments.html:114 +#: na_app/templates/ishtar/sheet_find.html:439 +#: pdl_app/templates/ishtar/sheet_find.html:432 msgid "Upstream treatment" msgstr "Traitement amont" #: archaeological_finds/models_finds.py:2208 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:94 +#: man_app/templates/ishtar/sheet_find_treatments.html:152 +#: na_app/templates/ishtar/sheet_find.html:477 +#: pdl_app/templates/ishtar/sheet_find.html:470 msgid "Downstream treatment" msgstr "Traitement aval" @@ -5841,6 +6232,8 @@ msgstr "Précisions sur les datations" #: archaeological_finds/models_finds.py:2372 #: archaeological_finds/templates/ishtar/sheet_find.html:159 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:159 +#: cd17_app/templates/ishtar/sheet_find.html:167 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:198 msgid "Former collection" msgstr "Ancienne collection" @@ -5905,11 +6298,17 @@ msgstr "Aucun contenant n'a été défini - la localisation ne peut être défin #: archaeological_finds/models_finds.py:3890 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:167 +#: man_app/templates/ishtar/sheet_find_treatments.html:225 +#: na_app/templates/ishtar/sheet_find.html:426 +#: pdl_app/templates/ishtar/sheet_find.html:419 msgid "Current" msgstr "Actuel" #: archaeological_finds/models_finds.py:3892 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:167 +#: man_app/templates/ishtar/sheet_find_treatments.html:225 +#: na_app/templates/ishtar/sheet_find.html:426 +#: pdl_app/templates/ishtar/sheet_find.html:419 msgid "Reference/current" msgstr "Référence/actuel" @@ -6096,6 +6495,14 @@ msgstr "Mobilier aval" #: archaeological_finds/models_treatments.py:1052 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:65 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:103 +#: man_app/templates/ishtar/sheet_find_treatments.html:123 +#: man_app/templates/ishtar/sheet_find_treatments.html:161 +#: na_app/templates/ishtar/sheet_find.html:401 +#: na_app/templates/ishtar/sheet_find.html:448 +#: na_app/templates/ishtar/sheet_find.html:486 +#: pdl_app/templates/ishtar/sheet_find.html:394 +#: pdl_app/templates/ishtar/sheet_find.html:441 +#: pdl_app/templates/ishtar/sheet_find.html:479 msgid "Doer" msgstr "Opérateur" @@ -6144,6 +6551,9 @@ msgstr "exposition-fin" #: archaeological_finds/models_treatments.py:1491 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:180 +#: man_app/templates/ishtar/sheet_find_treatments.html:238 +#: na_app/templates/ishtar/sheet_find.html:516 +#: pdl_app/templates/ishtar/sheet_find.html:509 msgid "Treatment requests" msgstr "Demandes de traitement" @@ -6229,14 +6639,17 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:10 #: ishtar_common/templates/ishtar/blocks/sheet_external_id.html:3 +#: man_app/templates/ishtar/sheet_basefind.html:7 msgid "Internal ID" msgstr "ID interne" #: archaeological_finds/templates/ishtar/sheet_basefind.html:27 +#: man_app/templates/ishtar/sheet_basefind.html:23 msgid "Discovery date" msgstr "Date de découverte" #: archaeological_finds/templates/ishtar/sheet_basefind.html:30 +#: man_app/templates/ishtar/sheet_basefind.html:26 msgid "Discovery year" msgstr "Date de découverte" @@ -6247,6 +6660,11 @@ msgstr "gérer les éléments de ce panier" #: archaeological_finds/templates/ishtar/sheet_find.html:14 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:14 +#: cd17_app/templates/ishtar/sheet_find.html:14 +#: man_app/templates/ishtar/sheet_museum_find.html:14 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:14 +#: na_app/templates/ishtar/sheet_find.html:14 +#: pdl_app/templates/ishtar/sheet_find.html:14 msgid "" "This sheet has a downstream treatment: it is related to an old version of " "the find." @@ -6256,38 +6674,70 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:49 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:49 +#: cd17_app/templates/ishtar/sheet_find.html:49 +#: man_app/templates/ishtar/sheet_museum_find.html:48 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:88 msgid "Archaeological context" msgstr "Contexte archéologique" #: archaeological_finds/templates/ishtar/sheet_find.html:56 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:56 +#: cd17_app/templates/ishtar/sheet_find.html:56 +#: man_app/templates/ishtar/sheet_museum_find.html:56 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:95 +#: na_app/templates/ishtar/sheet_find.html:55 +#: pdl_app/templates/ishtar/sheet_find.html:55 msgid "Preservation / Treatments" msgstr "Conservation / Traitements" #: archaeological_finds/templates/ishtar/sheet_find.html:154 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:154 +#: cd17_app/templates/ishtar/sheet_find.html:162 +#: man_app/templates/ishtar/sheet_museum_find.html:147 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:193 +#: na_app/templates/ishtar/sheet_find.html:227 +#: pdl_app/templates/ishtar/sheet_find.html:220 msgid "Museum / legal status" msgstr "Musée / statut juridique" #: archaeological_finds/templates/ishtar/sheet_find.html:166 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:166 +#: cd17_app/templates/ishtar/sheet_find.html:174 +#: man_app/templates/ishtar/sheet_museum_find.html:159 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:205 +#: na_app/templates/ishtar/sheet_find.html:239 +#: pdl_app/templates/ishtar/sheet_find.html:232 msgid "Museum entry date" msgstr "Date d’entrée au musée" -#: archaeological_finds/templates/ishtar/sheet_find.html:254 +#: archaeological_finds/templates/ishtar/sheet_find.html:257 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:254 +#: cd17_app/templates/ishtar/sheet_find.html:265 +#: man_app/templates/ishtar/sheet_museum_find.html:256 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:293 +#: na_app/templates/ishtar/sheet_find.html:276 +#: pdl_app/templates/ishtar/sheet_find.html:269 msgid "Checked" msgstr "Vérifié" #: archaeological_finds/templates/ishtar/sheet_find_containers.html:30 +#: man_app/templates/ishtar/sheet_find_treatments.html:62 +#: na_app/templates/ishtar/sheet_find.html:342 +#: pdl_app/templates/ishtar/sheet_find.html:335 msgid "Reference container / current container" msgstr "Contenant de référence / contenant actuel" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:31 +#: man_app/templates/ishtar/sheet_find_treatments.html:32 +#: na_app/templates/ishtar/sheet_find.html:312 +#: pdl_app/templates/ishtar/sheet_find.html:305 msgid "Warehouse - container" msgstr "Lieu de conservation - contenant" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:48 +#: man_app/templates/ishtar/sheet_find_treatments.html:106 +#: na_app/templates/ishtar/sheet_find.html:386 +#: pdl_app/templates/ishtar/sheet_find.html:379 msgid "Container information not available." msgstr "Information de contenant non disponible." @@ -6295,12 +6745,33 @@ msgstr "Information de contenant non disponible." #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:98 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:138 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:184 +#: man_app/templates/ishtar/sheet_find_treatments.html:118 +#: man_app/templates/ishtar/sheet_find_treatments.html:156 +#: man_app/templates/ishtar/sheet_find_treatments.html:196 +#: man_app/templates/ishtar/sheet_find_treatments.html:242 +#: na_app/templates/ishtar/sheet_find.html:397 +#: na_app/templates/ishtar/sheet_find.html:443 +#: na_app/templates/ishtar/sheet_find.html:481 +#: na_app/templates/ishtar/sheet_find.html:520 +#: pdl_app/templates/ishtar/sheet_find.html:390 +#: pdl_app/templates/ishtar/sheet_find.html:436 +#: pdl_app/templates/ishtar/sheet_find.html:474 +#: pdl_app/templates/ishtar/sheet_find.html:513 msgid "Year - index" msgstr "Année - index" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:64 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:102 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:141 +#: man_app/templates/ishtar/sheet_find_treatments.html:122 +#: man_app/templates/ishtar/sheet_find_treatments.html:160 +#: man_app/templates/ishtar/sheet_find_treatments.html:199 +#: na_app/templates/ishtar/sheet_find.html:400 +#: na_app/templates/ishtar/sheet_find.html:447 +#: na_app/templates/ishtar/sheet_find.html:485 +#: pdl_app/templates/ishtar/sheet_find.html:393 +#: pdl_app/templates/ishtar/sheet_find.html:440 +#: pdl_app/templates/ishtar/sheet_find.html:478 msgid "Related finds (max. 15 displayed)" msgstr "Mobilier associé (max. 15 affichés)" @@ -6310,6 +6781,9 @@ msgstr "Mobilier associé (max. 15 affichés)" #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:48 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:51 +#: man_app/templates/ishtar/sheet_find_treatments.html:148 +#: na_app/templates/ishtar/sheet_find.html:473 +#: pdl_app/templates/ishtar/sheet_find.html:466 msgid "Export as CSV" msgstr "Export en CSV" @@ -6319,27 +6793,49 @@ msgstr "Export en CSV" #: ishtar_common/templates/blocks/JQueryJqGrid.html:29 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:48 +#: man_app/templates/ishtar/sheet_find_treatments.html:148 +#: man_app/templates/ishtar/sheet_find_treatments.html:187 +#: na_app/templates/ishtar/sheet_find.html:473 +#: na_app/templates/ishtar/sheet_find.html:512 +#: pdl_app/templates/ishtar/sheet_find.html:466 +#: pdl_app/templates/ishtar/sheet_find.html:505 msgid "CSV" msgstr "CSV" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:134 +#: man_app/templates/ishtar/sheet_find_treatments.html:192 +#: na_app/templates/ishtar/sheet_find.html:393 +#: pdl_app/templates/ishtar/sheet_find.html:386 msgid "Simple treatments" msgstr "Traitements simples" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:139 +#: man_app/templates/ishtar/sheet_find_treatments.html:197 +#: na_app/templates/ishtar/sheet_find.html:398 +#: pdl_app/templates/ishtar/sheet_find.html:391 msgid "Label/type" msgstr "Dénomination/type" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:142 +#: man_app/templates/ishtar/sheet_find_treatments.html:200 msgid "Organization/responsible" msgstr "Organisation/responsable" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:144 +#: man_app/templates/ishtar/sheet_find_treatments.html:202 +#: na_app/templates/ishtar/sheet_find.html:403 +#: pdl_app/templates/ishtar/sheet_find.html:396 msgid "Date start/end" msgstr "Date de début/fin" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:166 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:172 +#: man_app/templates/ishtar/sheet_find_treatments.html:224 +#: man_app/templates/ishtar/sheet_find_treatments.html:230 +#: na_app/templates/ishtar/sheet_find.html:425 +#: na_app/templates/ishtar/sheet_find.html:431 +#: pdl_app/templates/ishtar/sheet_find.html:418 +#: pdl_app/templates/ishtar/sheet_find.html:424 msgid "First packaging" msgstr "Premier conditionnement" @@ -6364,6 +6860,7 @@ msgstr "Demandes de traitements associés" #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:31 #: ishtar_common/forms_common.py:2285 #: ishtar_common/templates/ishtar/sheet_document.html:58 +#: na_app/templates/ishtar/sheet_container.html:35 msgid "Content" msgstr "Contenu" @@ -6447,24 +6944,6 @@ msgstr "Cet import nécessite une archive de documents." msgid "The division {} {} do not exist for the location {}." msgstr "La division {} {} n'existe pas pour le lieu de conservation {}." -#: archaeological_finds/tests.py:1824 archaeological_finds/tests.py:1850 -#: archaeological_finds/tests.py:1860 archaeological_operations/tests.py:3371 -#: ishtar_common/forms.py:1353 ishtar_common/forms.py:1445 -#: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 -#: ishtar_common/templatetags/window_field.py:19 -#: ishtar_common/views_item.py:788 ishtar_common/views_item.py:1061 -#: ishtar_common/views_item.py:1098 ishtar_common/wizards.py:511 -#: views_item.py:785 views_item.py:1058 views_item.py:1095 -msgid "Yes" -msgstr "Oui" - -#: archaeological_finds/tests.py:1825 archaeological_finds/tests.py:1851 -#: archaeological_finds/tests.py:1861 ishtar_common/forms.py:1354 -#: ishtar_common/forms.py:1447 ishtar_common/templatetags/window_field.py:24 -#: ishtar_common/wizards.py:513 -msgid "No" -msgstr "Non" - #: archaeological_finds/views.py:335 msgid "Basket modify" msgstr "Modification de panier" @@ -6589,6 +7068,8 @@ msgstr "" #: archaeological_operations/models.py:3508 #: archaeological_operations/templates/ishtar/sheet_operation.html:536 #: ishtar_common/templates/ishtar/forms/modify_parcels.html:27 +#: na_app/templates/ishtar/sheet_operation.html:541 +#: pdl_app/templates/ishtar/sheet_operation.html:558 msgid "Parcels" msgstr "Parcelles" @@ -6698,6 +7179,8 @@ msgstr "Code DRASSM" #: archaeological_operations/forms.py:707 #: archaeological_operations/models.py:1675 #: archaeological_operations/templates/ishtar/sheet_operation.html:161 +#: na_app/templates/ishtar/sheet_operation.html:158 +#: pdl_app/templates/ishtar/sheet_operation.html:161 msgid "Address / Locality" msgstr "Adresse / Lieu-dit" @@ -6793,6 +7276,8 @@ msgstr "Documentation versée" #: archaeological_operations/forms.py:1713 #: archaeological_operations/models.py:1719 #: archaeological_operations/templates/ishtar/sheet_operation.html:256 +#: na_app/templates/ishtar/sheet_operation.html:254 +#: pdl_app/templates/ishtar/sheet_operation.html:268 msgid "Documentation deposit date" msgstr "Date de versement de la documentation" @@ -6813,6 +7298,8 @@ msgstr "Mobilier versé" #: archaeological_operations/forms.py:1720 #: archaeological_operations/models.py:1726 #: archaeological_operations/templates/ishtar/sheet_operation.html:264 +#: na_app/templates/ishtar/sheet_operation.html:262 +#: pdl_app/templates/ishtar/sheet_operation.html:287 msgid "Finds deposit date" msgstr "Date de versement du mobilier" @@ -6838,12 +7325,6 @@ msgstr "Nom générique" msgid "Actors" msgstr "Acteurs" -#: archaeological_operations/forms.py:729 -#: archaeological_operations/models.py:1565 -#: archaeological_operations/models.py:3176 -msgid "Head scientist" -msgstr "Responsable d'opération" - #: archaeological_operations/forms.py:751 #: archaeological_operations/forms.py:1335 #: archaeological_operations/forms.py:1723 @@ -6913,6 +7394,8 @@ msgstr "Mauvais index d'opération" #: archaeological_operations/forms.py:935 #: archaeological_operations/templates/ishtar/sheet_operation.html:324 +#: na_app/templates/ishtar/sheet_operation.html:330 +#: pdl_app/templates/ishtar/sheet_operation.html:347 msgid "Court-ordered seizure" msgstr "Saisie judiciaire" @@ -7428,7 +7911,8 @@ msgstr "Nom en cache des vestiges" #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:236 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:344 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:443 -#: ishtar_common/views.py:172 +#: ishtar_common/views.py:172 na_app/templates/ishtar/sheet_operation.html:372 +#: pdl_app/templates/ishtar/sheet_operation.html:389 msgid "Archaeological sites" msgstr "Entités archéologiques" @@ -7446,8 +7930,7 @@ msgstr "opérations" #: archaeological_operations/models.py:983 ishtar_common/forms.py:1352 #: ishtar_common/models.py:6152 ishtar_common/models.py:6313 -#: ishtar_common/models.py:6373 ishtar_common/views_item.py:2039 -#: views_item.py:2037 +#: ishtar_common/models.py:6373 ishtar_common/views_item.py:2049 msgid "Unknown" msgstr "Inconnu" @@ -7616,7 +8099,7 @@ msgctxt "key for text search" msgid "file" msgstr "dossier" -#: archaeological_operations/models.py:1607 ishtar_common/models_common.py:3623 +#: archaeological_operations/models.py:1607 ishtar_common/models_common.py:3633 msgid "Surface (m2)" msgstr "Surface (m2)" @@ -7918,8 +8401,8 @@ msgstr "Adresse - Lieu-dit" #: archaeological_operations/models.py:3503 ishtar_common/models.py:2808 #: ishtar_common/models.py:3125 ishtar_common/models.py:4558 -#: ishtar_common/models_common.py:3649 ishtar_common/models_common.py:3688 -#: ishtar_common/models_common.py:4897 +#: ishtar_common/models_common.py:3659 ishtar_common/models_common.py:3698 +#: ishtar_common/models_common.py:4907 msgid "Cached name" msgstr "Nom en cache" @@ -7956,11 +8439,14 @@ msgid "No parcel" msgstr "Pas de parcelle" #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:28 +#: cd93_app/templates/ishtar/sheet_administrativeact.html:28 #: ishtar_common/templates/ishtar/sheet_document.html:28 msgid "View PDF" msgstr "Voir le PDF" #: archaeological_operations/templates/ishtar/sheet_operation.html:54 +#: na_app/templates/ishtar/sheet_operation.html:53 +#: pdl_app/templates/ishtar/sheet_operation.html:53 msgid "Archaeological sites/parcels/Administrativ acts" msgstr "Sites / parcelles / actes administratifs" @@ -7974,7 +8460,12 @@ msgstr "Sites / parcelles / actes administratifs" #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:244 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:351 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:450 -#: ishtar_common/views.py:175 +#: ishtar_common/views.py:175 na_app/templates/ishtar/sheet_operation.html:80 +#: na_app/templates/ishtar/sheet_operation.html:448 +#: na_app/templates/ishtar/sheet_operation.html:546 +#: pdl_app/templates/ishtar/sheet_operation.html:80 +#: pdl_app/templates/ishtar/sheet_operation.html:465 +#: pdl_app/templates/ishtar/sheet_operation.html:563 msgid "Context records" msgstr "Unités d'Enregistrement" @@ -7985,35 +8476,61 @@ msgstr "Unités d'Enregistrement" #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:38 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:174 #: ishtar_common/templates/blocks/DataTables-tabs.html:30 +#: na_app/templates/ishtar/sheet_container.html:42 +#: na_app/templates/ishtar/sheet_container.html:222 +#: na_app/templates/ishtar/sheet_operation.html:116 +#: na_app/templates/ishtar/sheet_operation.html:515 +#: pdl_app/templates/ishtar/sheet_operation.html:116 +#: pdl_app/templates/ishtar/sheet_operation.html:532 msgid "Statistics" msgstr "Statistiques" #: archaeological_operations/templates/ishtar/sheet_operation.html:166 +#: na_app/templates/ishtar/sheet_operation.html:163 +#: pdl_app/templates/ishtar/sheet_operation.html:166 msgid "Excavation dates (start/end)" msgstr "Date de chantier (début/fin)" #: archaeological_operations/templates/ishtar/sheet_operation.html:235 +#: na_app/templates/ishtar/sheet_operation.html:232 +#: pdl_app/templates/ishtar/sheet_operation.html:235 msgid "Duration" msgstr "Durée" #: archaeological_operations/templates/ishtar/sheet_operation.html:298 +#: na_app/templates/ishtar/sheet_operation.html:304 +#: pdl_app/templates/ishtar/sheet_operation.html:321 msgid "This operation is virtual." msgstr "Cette opération est virtuelle." +#: archaeological_operations/templates/ishtar/sheet_operation.html:305 +#: na_app/templates/ishtar/sheet_operation.html:311 +#: pdl_app/templates/ishtar/sheet_operation.html:328 +msgid "Patriarche OA code not yet recorded!" +msgstr "Code d'opération Patriarche non renseigné !" + #: archaeological_operations/templates/ishtar/sheet_operation.html:432 +#: na_app/templates/ishtar/sheet_operation.html:439 +#: pdl_app/templates/ishtar/sheet_operation.html:456 msgid "No relations" msgstr "Pas de relation" #: archaeological_operations/templates/ishtar/sheet_operation.html:453 +#: na_app/templates/ishtar/sheet_operation.html:458 +#: pdl_app/templates/ishtar/sheet_operation.html:475 msgid "Documents from associated context records" msgstr "Documents des Unités d'Enregistrement associées" #: archaeological_operations/templates/ishtar/sheet_operation.html:459 +#: na_app/templates/ishtar/sheet_operation.html:463 +#: pdl_app/templates/ishtar/sheet_operation.html:480 msgid "Diagram of stratigraphic relations" msgstr "Diagramme de relations stratigraphiques" #: archaeological_operations/templates/ishtar/sheet_operation.html:487 #: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:8 +#: na_app/templates/ishtar/sheet_operation.html:492 +#: pdl_app/templates/ishtar/sheet_operation.html:509 msgid "Associated containers" msgstr "Contenants associés" @@ -8027,26 +8544,39 @@ msgstr "Contenants associés" #: ishtar_common/templates/ishtar/blocks/window_nav.html:86 #: ishtar_common/templates/ishtar/blocks/window_nav.html:92 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:46 +#: na_app/templates/ishtar/sheet_container.html:227 +#: na_app/templates/ishtar/sheet_operation.html:520 +#: pdl_app/templates/ishtar/sheet_operation.html:537 msgid "Export" msgstr "Exporter" #: archaeological_operations/templates/ishtar/sheet_operation.html:520 #: archaeological_warehouse/templates/ishtar/sheet_container.html:227 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:190 +#: na_app/templates/ishtar/sheet_container.html:232 +#: na_app/templates/ishtar/sheet_operation.html:525 +#: pdl_app/templates/ishtar/sheet_operation.html:542 msgid "Regenerate statistics" msgstr "Re-générer les statistiques" #: archaeological_operations/templates/ishtar/sheet_operation.html:525 #: archaeological_warehouse/templates/ishtar/sheet_container.html:232 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:195 +#: na_app/templates/ishtar/sheet_container.html:237 +#: na_app/templates/ishtar/sheet_operation.html:530 +#: pdl_app/templates/ishtar/sheet_operation.html:547 msgid "Last update:" msgstr "Dernière mise à jour :" #: archaeological_operations/templates/ishtar/sheet_operation.html:606 +#: na_app/templates/ishtar/sheet_operation.html:610 +#: pdl_app/templates/ishtar/sheet_operation.html:627 msgid "Sources" msgstr "Documents" #: archaeological_operations/templates/ishtar/sheet_operation.html:624 +#: na_app/templates/ishtar/sheet_operation.html:628 +#: pdl_app/templates/ishtar/sheet_operation.html:645 msgid "Finds by context records" msgstr "Mobilier par Unités d'Enregistrement" @@ -8087,7 +8617,7 @@ msgstr "Cet élément est verrouillé pour l'édition." msgid "This item has been locked. Edition is disabled." msgstr "Cet élément a été verrouillé. L'édition est désactivée." -#: archaeological_operations/tests.py:3376 ishtar_common/models_common.py:1719 +#: archaeological_operations/tests.py:3376 ishtar_common/models_common.py:1729 msgctxt "key for text search" msgid "created" msgstr "cree" @@ -8228,6 +8758,7 @@ msgstr "Les champs « ordre » doivent être différents." #: archaeological_warehouse/forms.py:138 archaeological_warehouse/models.py:408 #: archaeological_warehouse/templates/ishtar/sheet_container.html:190 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:142 +#: na_app/templates/ishtar/sheet_container.html:195 msgid "Divisions" msgstr "Divisions" @@ -8275,27 +8806,27 @@ msgstr "" "conservation, les champs suivants sont utilisés pour cette organisation." #: archaeological_warehouse/forms.py:253 ishtar_common/forms_common.py:785 -#: ishtar_common/forms_common.py:1204 ishtar_common/models_common.py:4162 -#: ishtar_common/models_common.py:4372 +#: ishtar_common/forms_common.py:1204 ishtar_common/models_common.py:4172 +#: ishtar_common/models_common.py:4382 msgid "Address complement" msgstr "Complément d'adresse" #: archaeological_warehouse/forms.py:256 ishtar_common/forms_common.py:788 -#: ishtar_common/forms_common.py:1207 ishtar_common/models_common.py:4167 +#: ishtar_common/forms_common.py:1207 ishtar_common/models_common.py:4177 #: ishtar_common/templates/ishtar/sheet_person.html:57 #: ishtar_common/templates/ishtar/sheet_person.html:77 msgid "Town (freeform)" msgstr "Commune (saisie libre)" #: archaeological_warehouse/forms.py:258 ishtar_common/forms_common.py:790 -#: ishtar_common/forms_common.py:1209 ishtar_common/models_common.py:4173 +#: ishtar_common/forms_common.py:1209 ishtar_common/models_common.py:4183 msgid "Country" msgstr "Pays" #: archaeological_warehouse/forms.py:259 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:124 #: ishtar_common/forms_common.py:792 ishtar_common/forms_common.py:1180 -#: ishtar_common/models_common.py:4187 ishtar_common/models_common.py:4384 +#: ishtar_common/models_common.py:4197 ishtar_common/models_common.py:4394 #: ishtar_common/templates/ishtar/sheet_person.html:27 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:35 msgid "Phone" @@ -8304,7 +8835,7 @@ msgstr "Téléphone" #: archaeological_warehouse/forms.py:261 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:125 #: ishtar_common/forms_common.py:794 ishtar_common/forms_common.py:1190 -#: ishtar_common/models_common.py:4203 +#: ishtar_common/models_common.py:4213 #: ishtar_common/templates/ishtar/sheet_person.html:45 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:56 msgid "Mobile phone" @@ -8339,6 +8870,7 @@ msgstr "Ancienne référence" #: archaeological_warehouse/models.py:1179 #: archaeological_warehouse/templates/ishtar/sheet_container.html:154 #: ishtar_common/models_imports.py:1095 +#: na_app/templates/ishtar/sheet_container.html:161 msgid "Container type" msgstr "Type de contenant" @@ -8492,7 +9024,7 @@ msgstr "" #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:284 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:386 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:485 -#: ishtar_common/views.py:183 +#: ishtar_common/views.py:183 na_app/templates/ishtar/sheet_container.html:197 msgid "Containers" msgstr "Contenants" @@ -8786,51 +9318,62 @@ msgstr "Localisations de contenant" #: archaeological_warehouse/templates/ishtar/sheet_container.html:108 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:90 +#: na_app/templates/ishtar/sheet_container.html:115 msgid "Number of containers" msgstr "Nombre de contenants" #: archaeological_warehouse/templates/ishtar/sheet_container.html:112 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:94 +#: na_app/templates/ishtar/sheet_container.html:119 msgid "Number of divisions" msgstr "Nombre de divisions" #: archaeological_warehouse/templates/ishtar/sheet_container.html:116 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:98 +#: na_app/templates/ishtar/sheet_container.html:123 msgid "Number of owned finds" msgstr "Nombre de mobiliers possédés" #: archaeological_warehouse/templates/ishtar/sheet_container.html:120 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:102 +#: na_app/templates/ishtar/sheet_container.html:127 msgid "Number of hosted finds" msgstr "Nombre de mobiliers accueillis" #: archaeological_warehouse/templates/ishtar/sheet_container.html:129 +#: na_app/templates/ishtar/sheet_container.html:136 msgid "Measured weight (kg)" msgstr "Poids mesuré (kg)" #: archaeological_warehouse/templates/ishtar/sheet_container.html:130 +#: na_app/templates/ishtar/sheet_container.html:137 msgid "Calculated weight (kg)" msgstr "Poids calculé (kg)" #: archaeological_warehouse/templates/ishtar/sheet_container.html:134 +#: na_app/templates/ishtar/sheet_container.html:141 #, python-format msgid "Calculated weight and measured weight are too different (over 10%%)." msgstr "" "Le poids calculé et le poids mesuré sont trop différent (au delà de 10%%)." #: archaeological_warehouse/templates/ishtar/sheet_container.html:209 +#: na_app/templates/ishtar/sheet_container.html:214 msgid "Empty" msgstr "Vide" #: archaeological_warehouse/templates/ishtar/sheet_container.html:240 +#: na_app/templates/ishtar/sheet_container.html:245 msgid "No container/division inside this container." msgstr "Pas de contenant ou de division dans ce contenant." #: archaeological_warehouse/templates/ishtar/sheet_container.html:246 +#: na_app/templates/ishtar/sheet_container.html:251 msgid "Finds by location" msgstr "Mobiliers par localisation" #: archaeological_warehouse/templates/ishtar/sheet_container.html:270 +#: na_app/templates/ishtar/sheet_container.html:275 msgid "Containers by location" msgstr "Contenants par localisation" @@ -9009,13 +9552,12 @@ msgid "Export selected as CSV file" msgstr "Exporter la sélection en fichier CSV" #: ishtar_common/admin.py:204 ishtar_common/models_imports.py:943 -#: ishtar_common/views_item.py:789 ishtar_common/views_item.py:1857 -#: views_item.py:786 views_item.py:1855 +#: ishtar_common/views_item.py:799 ishtar_common/views_item.py:1867 msgid "True" msgstr "Oui" #: ishtar_common/admin.py:204 ishtar_common/models_imports.py:943 -#: ishtar_common/views_item.py:1859 views_item.py:1857 +#: ishtar_common/views_item.py:1869 msgid "False" msgstr "Non" @@ -9288,7 +9830,7 @@ msgstr "Mauvaise valeur pour la surface : {} - entité {}" msgid "No json file found in zipfile" msgstr "Pas de fichier JSON trouvé dans le fichier ZIP" -#: ishtar_common/admin.py:1402 ishtar_common/models_common.py:3747 +#: ishtar_common/admin.py:1402 ishtar_common/models_common.py:3757 msgid "Town limit" msgstr "Limite de commune" @@ -9538,13 +10080,6 @@ msgid "Update table, export format and types from source" msgstr "" "Mettre à jour des formats de tableau, d'export et des types depuis la source" -#: ishtar_common/admin.py:3130 -msgid "" -"Document not generated: is the LibreOffice daemon configured and running?" -msgstr "" -"Document non généré: est-ce que le démon LibreOffice daemon est configuré et " -"fonctionne ?" - #: ishtar_common/admin.py:3150 msgid "Generate match document" msgstr "Générer le document de correspondance" @@ -9661,65 +10196,65 @@ msgstr "" msgid "changelog" msgstr "journal des modifications" -#: ishtar_common/data_importer.py:283 +#: ishtar_common/data_importer.py:290 #, python-format msgid "\"%(value)s\" is too long. The max length is %(length)d characters." msgstr "" "\"%(value)s\" est trop long. La longueur maximum est de %(length)d " "caractères." -#: ishtar_common/data_importer.py:302 +#: ishtar_common/data_importer.py:309 #, python-format msgid "\"%(value)s\" not equal to yes or no" msgstr "\"%(value)s\" diffère de oui ou non" -#: ishtar_common/data_importer.py:314 +#: ishtar_common/data_importer.py:321 #, python-format msgid "\"%(value)s\" is not a float" msgstr "\"%(value)s\" n'est pas un nombre à virgule" -#: ishtar_common/data_importer.py:324 +#: ishtar_common/data_importer.py:331 #, python-brace-format msgid "\"{value}\" is not an appropriate INSEE code" msgstr "\"{value}\" n'est pas un code INSEE approprié" -#: ishtar_common/data_importer.py:381 ishtar_common/data_importer.py:395 -#: ishtar_common/data_importer.py:619 +#: ishtar_common/data_importer.py:388 ishtar_common/data_importer.py:402 +#: ishtar_common/data_importer.py:626 #, python-format msgid "\"%(value)s\" is not a valid date" msgstr "\"%(value)s\" n'est pas une date valide" -#: ishtar_common/data_importer.py:408 +#: ishtar_common/data_importer.py:415 #, python-format msgid "\"%(value)s\" is not an integer" msgstr "\"%(value)s\" n'est pas un entier" -#: ishtar_common/data_importer.py:477 +#: ishtar_common/data_importer.py:484 #, python-format msgid "Choice for \"%s\" is not available. Which one is relevant?\n" msgstr "Le choix pour \"%s\" n'est pas disponible. Lequel est pertinent ?\n" -#: ishtar_common/data_importer.py:484 +#: ishtar_common/data_importer.py:491 #, python-format msgid "%d. None of the above - create new" msgstr "%d. Aucun de ceux-là - créer un nouveau" -#: ishtar_common/data_importer.py:486 +#: ishtar_common/data_importer.py:493 #, python-format msgid "%d. None of the above - skip" msgstr "%d. Aucun de ceux-là - passer" -#: ishtar_common/data_importer.py:642 +#: ishtar_common/data_importer.py:649 #, python-format msgid "\"%(full_link)s\" is not a valid path" msgstr "\"%(full_link)s\" n'est pas un chemin valide" -#: ishtar_common/data_importer.py:670 +#: ishtar_common/data_importer.py:677 #, python-format msgid "\"%(value)s\" is not a valid path for the given archive" msgstr "\"%(value)s\" n'est pas un chemin valide pour cette archive" -#: ishtar_common/data_importer.py:781 +#: ishtar_common/data_importer.py:788 msgid "" "The given file is not correct. Check the file format. If you use a CSV file: " "check that column separator and encoding are similar to the ones used by the " @@ -9729,29 +10264,29 @@ msgstr "" "utilisez un fichier CSV : vérifiez que le séparateur de colonnes et " "l'encodage sont similaires à ceux du fichier de référence." -#: ishtar_common/data_importer.py:787 +#: ishtar_common/data_importer.py:794 #, python-format msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d" msgstr "Trop de colonnes (%(user_col)d). Le maximum est %(ref_col)d" -#: ishtar_common/data_importer.py:789 ishtar_common/views.py:2123 +#: ishtar_common/data_importer.py:796 ishtar_common/views.py:2123 msgid "No data provided" msgstr "Aucune donnée fournie" -#: ishtar_common/data_importer.py:790 +#: ishtar_common/data_importer.py:797 msgid "Value is required" msgstr "Valeur requise" -#: ishtar_common/data_importer.py:791 +#: ishtar_common/data_importer.py:798 #, python-format msgid "At least %d columns must be filled" msgstr "Au moins %d colonnes doivent être remplies" -#: ishtar_common/data_importer.py:792 +#: ishtar_common/data_importer.py:799 msgid "The regexp doesn't match." msgstr "L'expression régulière ne fonctionne pas." -#: ishtar_common/data_importer.py:794 +#: ishtar_common/data_importer.py:801 msgid "" "Forced creation is set for model {} but this model is not in the list of " "models allowed to be created." @@ -9759,7 +10294,7 @@ msgstr "" "La création forcée est possible pour le modèle {} mais ce modèle ne fait pas " "partie de la liste des créations de modèle autorisées." -#: ishtar_common/data_importer.py:798 +#: ishtar_common/data_importer.py:805 msgid "" "{} with values {} doesn't exist in the database. Create it first or fix your " "source file." @@ -9767,14 +10302,14 @@ msgstr "" "L'élément {} avec les valeurs {} n'existe pas dans la base de données. Créez-" "le d'abord ou corrigez votre fichier source." -#: ishtar_common/data_importer.py:802 +#: ishtar_common/data_importer.py:809 msgid "" "Related object not found. Can not create the geographic item. Context: {}." msgstr "" "Objet lié non trouvé. Création de l'élément géographique impossible. " "Contexte {}." -#: ishtar_common/data_importer.py:898 +#: ishtar_common/data_importer.py:905 msgid "" "Item {} with values: {} not identified for post-treatment - need a non " "ambiguous key" @@ -9782,78 +10317,78 @@ msgstr "" "L'élément {} avec les valeurs : {} n'ont pas été identifiés pour le post-" "traitement - une clé non ambigue est nécessaire" -#: ishtar_common/data_importer.py:1514 ishtar_common/views.py:2201 +#: ishtar_common/data_importer.py:1521 ishtar_common/views.py:2201 #: ishtar_common/views.py:2211 msgid "Not imported" msgstr "Non importé" -#: ishtar_common/data_importer.py:1811 +#: ishtar_common/data_importer.py:1818 msgid "Importer configuration error: \"{}\"." msgstr "Erreur de configuration de l'importeur : \"{}\"." -#: ishtar_common/data_importer.py:1816 +#: ishtar_common/data_importer.py:1823 msgid "Import error: {} - \"{}\"." msgstr "Erreur d'import : {} - \"{}\"." -#: ishtar_common/data_importer.py:1904 +#: ishtar_common/data_importer.py:1911 msgid "Importer configuration error: field \"{}\" does not exist for {}." msgstr "" "Erreur de configuration de l'importeur : le champ \"{}\" n'existe pas pour " "{}." -#: ishtar_common/data_importer.py:2035 +#: ishtar_common/data_importer.py:2042 msgid "* created *" msgstr "* créé *" -#: ishtar_common/data_importer.py:2105 +#: ishtar_common/data_importer.py:2112 msgid "* match not find *" msgstr "* correspondance non trouvée *" -#: ishtar_common/data_importer.py:2113 +#: ishtar_common/data_importer.py:2120 msgid "* the query match more than 10 results*" msgstr "* la requête correspond à plus de 10 résultats *" -#: ishtar_common/data_importer.py:2118 +#: ishtar_common/data_importer.py:2125 msgid " or " msgstr " ou " -#: ishtar_common/data_importer.py:2208 +#: ishtar_common/data_importer.py:2213 msgid "unicity key(s) \"{}\" is/are missing" msgstr "clé(s) d'unicité \"{}\" manquante(s)" -#: ishtar_common/data_importer.py:2211 +#: ishtar_common/data_importer.py:2216 msgid "Import error {}, {}" msgstr "Erreur d'import {}, {}" -#: ishtar_common/data_importer.py:2298 +#: ishtar_common/data_importer.py:2303 msgid "Import error {}, path \"{}\", context : {}, error : {}" msgstr "Erreur d'import {}, chemin \"{}\", contexte : {}, erreur : {}" -#: ishtar_common/data_importer.py:2328 +#: ishtar_common/data_importer.py:2333 msgid "line" msgstr "ligne" -#: ishtar_common/data_importer.py:2328 +#: ishtar_common/data_importer.py:2333 msgid "col" msgstr "colonne" -#: ishtar_common/data_importer.py:2328 +#: ishtar_common/data_importer.py:2333 msgid "error" msgstr "erreur" -#: ishtar_common/data_importer.py:2335 +#: ishtar_common/data_importer.py:2340 msgid "field" msgstr "champ" -#: ishtar_common/data_importer.py:2335 +#: ishtar_common/data_importer.py:2340 msgid "source" msgstr "source" -#: ishtar_common/data_importer.py:2335 +#: ishtar_common/data_importer.py:2340 msgid "result" msgstr "résultat" -#: ishtar_common/data_importer.py:2351 +#: ishtar_common/data_importer.py:2356 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "\"%(value)s\" n'est pas dans %(values)s" @@ -10158,8 +10693,8 @@ msgstr "Identifiant Muséofile" #: ishtar_common/forms_common.py:791 ishtar_common/forms_common.py:1040 #: ishtar_common/forms_common.py:1176 ishtar_common/forms_common.py:1271 -#: ishtar_common/forms_common.py:1530 ishtar_common/models_common.py:4205 -#: ishtar_common/models_common.py:4394 ishtar_common/wizards.py:2050 +#: ishtar_common/forms_common.py:1530 ishtar_common/models_common.py:4215 +#: ishtar_common/models_common.py:4404 ishtar_common/wizards.py:2050 msgid "Email" msgstr "Courriel" @@ -10240,12 +10775,12 @@ msgstr "Identité" msgid "Raw name" msgstr "Nom brut" -#: ishtar_common/forms_common.py:1178 ishtar_common/models_common.py:4189 +#: ishtar_common/forms_common.py:1178 ishtar_common/models_common.py:4199 msgid "Phone description" msgstr "Type de téléphone" -#: ishtar_common/forms_common.py:1182 ishtar_common/models_common.py:4192 -#: ishtar_common/models_common.py:4195 +#: ishtar_common/forms_common.py:1182 ishtar_common/models_common.py:4202 +#: ishtar_common/models_common.py:4205 msgid "Phone description 2" msgstr "Type de téléphone 2" @@ -10253,11 +10788,11 @@ msgstr "Type de téléphone 2" msgid "Phone 2" msgstr "Téléphone 2" -#: ishtar_common/forms_common.py:1186 ishtar_common/models_common.py:4199 +#: ishtar_common/forms_common.py:1186 ishtar_common/models_common.py:4209 msgid "Phone description 3" msgstr "Type de téléphone 3" -#: ishtar_common/forms_common.py:1188 ishtar_common/models_common.py:4197 +#: ishtar_common/forms_common.py:1188 ishtar_common/models_common.py:4207 msgid "Phone 3" msgstr "Téléphone 3" @@ -10265,23 +10800,23 @@ msgstr "Téléphone 3" msgid "Current organization" msgstr "Organisation actuelle" -#: ishtar_common/forms_common.py:1211 ishtar_common/models_common.py:4174 +#: ishtar_common/forms_common.py:1211 ishtar_common/models_common.py:4184 msgid "Other address: address" msgstr "Autre adresse : adresse" -#: ishtar_common/forms_common.py:1214 ishtar_common/models_common.py:4176 +#: ishtar_common/forms_common.py:1214 ishtar_common/models_common.py:4186 msgid "Other address: address complement" msgstr "Autre adresse : complément d'adresse" -#: ishtar_common/forms_common.py:1219 ishtar_common/models_common.py:4179 +#: ishtar_common/forms_common.py:1219 ishtar_common/models_common.py:4189 msgid "Other address: postal code" msgstr "Autre adresse : code postal" -#: ishtar_common/forms_common.py:1222 ishtar_common/models_common.py:4182 +#: ishtar_common/forms_common.py:1222 ishtar_common/models_common.py:4192 msgid "Other address: town" msgstr "Autre adresse : ville" -#: ishtar_common/forms_common.py:1225 ishtar_common/models_common.py:4185 +#: ishtar_common/forms_common.py:1225 ishtar_common/models_common.py:4195 msgid "Other address: country" msgstr "Autre adresse : pays" @@ -10337,7 +10872,7 @@ msgstr "Année de décès" #: ishtar_common/ishtar_menu.py:83 ishtar_common/models.py:3620 #: ishtar_common/models.py:3704 ishtar_common/models.py:3743 #: ishtar_common/models.py:4128 ishtar_common/models_common.py:940 -#: ishtar_common/models_common.py:968 ishtar_common/models_common.py:3238 +#: ishtar_common/models_common.py:968 ishtar_common/models_common.py:3248 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:4 #: ishtar_common/templates/ishtar/sheet_person.html:21 msgid "Account" @@ -10731,7 +11266,7 @@ msgid "There are identical authors." msgstr "Il y a des auteurs identiques." #: ishtar_common/forms_common.py:3046 ishtar_common/forms_common.py:3111 -#: ishtar_common/models.py:1016 ishtar_common/models_common.py:3218 +#: ishtar_common/models.py:1016 ishtar_common/models_common.py:3228 msgid "Query" msgstr "Requête" @@ -10759,7 +11294,7 @@ msgstr "Élément géographique" msgid "Geo item - 010 - General" msgstr "Élément géographique - 010 - Général" -#: ishtar_common/forms_common.py:3157 ishtar_common/models_common.py:2434 +#: ishtar_common/forms_common.py:3157 ishtar_common/models_common.py:2444 msgid "Import key" msgstr "Clé d'import" @@ -10771,19 +11306,19 @@ msgstr "" "Une mise à jour via import correspondant à l'élément source et à cette clé " "va écraser la donnée." -#: ishtar_common/forms_common.py:3172 ishtar_common/models_common.py:2449 +#: ishtar_common/forms_common.py:3172 ishtar_common/models_common.py:2459 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:6 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:33 msgid "Data type" msgstr "Type de donnée" -#: ishtar_common/forms_common.py:3175 ishtar_common/models_common.py:2441 +#: ishtar_common/forms_common.py:3175 ishtar_common/models_common.py:2451 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:10 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:30 msgid "Origin" msgstr "Origine" -#: ishtar_common/forms_common.py:3178 ishtar_common/models_common.py:2457 +#: ishtar_common/forms_common.py:3178 ishtar_common/models_common.py:2467 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:11 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:36 msgid "Provider" @@ -10795,7 +11330,7 @@ msgid "Acquisition date" msgstr "Date d'acquisition" #: ishtar_common/forms_common.py:3182 ishtar_common/forms_common.py:3233 -#: ishtar_common/models_common.py:2422 +#: ishtar_common/models_common.py:2432 msgid "Buffer" msgstr "Tampon" @@ -10803,18 +11338,18 @@ msgstr "Tampon" msgid "Buffer type" msgstr "Type de tampon" -#: ishtar_common/forms_common.py:3191 ishtar_common/models_common.py:2471 -#: ishtar_common/models_common.py:4731 +#: ishtar_common/forms_common.py:3191 ishtar_common/models_common.py:2481 +#: ishtar_common/models_common.py:4741 msgid "Estimated error for X" msgstr "Erreur estimée pour X" -#: ishtar_common/forms_common.py:3196 ishtar_common/models_common.py:2474 -#: ishtar_common/models_common.py:4734 +#: ishtar_common/forms_common.py:3196 ishtar_common/models_common.py:2484 +#: ishtar_common/models_common.py:4744 msgid "Estimated error for Y" msgstr "Erreur estimée pour Y" -#: ishtar_common/forms_common.py:3201 ishtar_common/models_common.py:2477 -#: ishtar_common/models_common.py:4737 +#: ishtar_common/forms_common.py:3201 ishtar_common/models_common.py:2487 +#: ishtar_common/models_common.py:4747 msgid "Estimated error for Z" msgstr "Erreur estimée pour Z" @@ -10823,10 +11358,10 @@ msgid "Metadata" msgstr "Métadonnées" #: ishtar_common/forms_common.py:3232 ishtar_common/models.py:2559 -#: ishtar_common/models_common.py:2219 ishtar_common/models_common.py:2277 -#: ishtar_common/models_common.py:2309 ishtar_common/models_common.py:2326 -#: ishtar_common/models_common.py:2343 ishtar_common/models_common.py:2356 -#: ishtar_common/models_common.py:2501 ishtar_common/models_common.py:3670 +#: ishtar_common/models_common.py:2229 ishtar_common/models_common.py:2287 +#: ishtar_common/models_common.py:2319 ishtar_common/models_common.py:2336 +#: ishtar_common/models_common.py:2353 ishtar_common/models_common.py:2366 +#: ishtar_common/models_common.py:2511 ishtar_common/models_common.py:3680 msgid "Geography" msgstr "Géographie" @@ -10854,8 +11389,8 @@ msgstr "Type de géométrie" msgid "Coordinates" msgstr "Coordonnées" -#: ishtar_common/forms_common.py:3513 ishtar_common/models_common.py:2376 -#: ishtar_common/models_common.py:4746 +#: ishtar_common/forms_common.py:3513 ishtar_common/models_common.py:2386 +#: ishtar_common/models_common.py:4756 msgid "Point" msgstr "Point" @@ -12314,7 +12849,7 @@ msgstr "Activité inconnue" msgid "Groups" msgstr "Groupes" -#: ishtar_common/models.py:3608 ishtar_common/models_common.py:3242 +#: ishtar_common/models.py:3608 ishtar_common/models_common.py:3252 msgid "Permissions queries" msgstr "Requêtes pour permissions" @@ -12441,7 +12976,7 @@ msgstr "Utilisateur d'Ishtar" msgid "Ishtar users" msgstr "Utilisateurs d'Ishtar" -#: ishtar_common/models.py:4305 ishtar_common/models_common.py:1730 +#: ishtar_common/models.py:4305 ishtar_common/models_common.py:1740 msgctxt "key for text search" msgid "user-attached" msgstr "rattache-a-utilisateur" @@ -12450,7 +12985,7 @@ msgstr "rattache-a-utilisateur" msgid "Regenerate permissions" msgstr "Regénérer les permissions" -#: ishtar_common/models.py:4373 ishtar_common/models_common.py:3605 +#: ishtar_common/models.py:4373 ishtar_common/models_common.py:3615 msgid "regen." msgstr "regén." @@ -12670,7 +13205,7 @@ msgctxt "key for text search" msgid "warehouse" msgstr "lieu-conservation" -#: ishtar_common/models.py:5073 ishtar_common/models_common.py:2003 +#: ishtar_common/models.py:5073 ishtar_common/models_common.py:2013 msgctxt "key for text search" msgid "has-image" msgstr "a-une-image" @@ -13017,302 +13552,302 @@ msgstr "Vecteur de recherche" msgid "Auto filled at save" msgstr "Auto-rempli à la sauvegarde" -#: ishtar_common/models_common.py:1272 +#: ishtar_common/models_common.py:1274 msgid "Created by imports" msgstr "Créé par les imports" -#: ishtar_common/models_common.py:1274 +#: ishtar_common/models_common.py:1276 msgid "Timestamp geo" msgstr "Horodatage géographique" -#: ishtar_common/models_common.py:1275 +#: ishtar_common/models_common.py:1277 msgid "Timestamp label" msgstr "Horodatage libellé" -#: ishtar_common/models_common.py:1278 +#: ishtar_common/models_common.py:1280 msgid "Updated by imports" msgstr "Mis à jour par les imports" -#: ishtar_common/models_common.py:1283 +#: ishtar_common/models_common.py:1285 msgctxt "key for text search" msgid "imports" msgstr "imports" -#: ishtar_common/models_common.py:1667 +#: ishtar_common/models_common.py:1677 msgid "Last editor" msgstr "Dernier éditeur" -#: ishtar_common/models_common.py:1675 +#: ishtar_common/models_common.py:1685 msgid "Creator" msgstr "Créateur" -#: ishtar_common/models_common.py:1682 ishtar_common/models_common.py:2426 +#: ishtar_common/models_common.py:1692 ishtar_common/models_common.py:2436 msgid "Need update" msgstr "Nécessite une mise à jour" -#: ishtar_common/models_common.py:1684 +#: ishtar_common/models_common.py:1694 msgid "Item locked for edition" msgstr "Élément verrouillé pour l'édition" -#: ishtar_common/models_common.py:1690 +#: ishtar_common/models_common.py:1700 msgid "Locked by" msgstr "Verrouillé par" -#: ishtar_common/models_common.py:1715 +#: ishtar_common/models_common.py:1725 msgctxt "key for text search" msgid "modified-by" msgstr "modifie-par" -#: ishtar_common/models_common.py:1723 +#: ishtar_common/models_common.py:1733 msgctxt "key for text search" msgid "modified" msgstr "modifie" -#: ishtar_common/models_common.py:1727 +#: ishtar_common/models_common.py:1737 msgctxt "key for text search" msgid "locked" msgstr "verrou" -#: ishtar_common/models_common.py:2007 +#: ishtar_common/models_common.py:2017 msgctxt "key for text search" msgid "has-url" msgstr "a-une-url" -#: ishtar_common/models_common.py:2011 +#: ishtar_common/models_common.py:2021 msgctxt "key for text search" msgid "has-attached-file" msgstr "a-un-fichier" -#: ishtar_common/models_common.py:2015 +#: ishtar_common/models_common.py:2025 msgctxt "key for text search" msgid "document-type" msgstr "type-document" -#: ishtar_common/models_common.py:2100 +#: ishtar_common/models_common.py:2110 msgid "Add document/image" msgstr "Ajouter un document / une image" -#: ishtar_common/models_common.py:2102 +#: ishtar_common/models_common.py:2112 msgid "doc./image" msgstr "doc./image" -#: ishtar_common/models_common.py:2265 ishtar_common/models_common.py:2286 +#: ishtar_common/models_common.py:2275 ishtar_common/models_common.py:2296 msgid "Authority name" msgstr "Registre" -#: ishtar_common/models_common.py:2266 ishtar_common/models_common.py:2286 +#: ishtar_common/models_common.py:2276 ishtar_common/models_common.py:2296 msgid "Authority SRID" msgstr "SRID" -#: ishtar_common/models_common.py:2267 +#: ishtar_common/models_common.py:2277 msgid "Number of decimal places" msgstr "Nombre de décimales" -#: ishtar_common/models_common.py:2268 +#: ishtar_common/models_common.py:2278 msgid "Number of decimal places for Z" msgstr "Nombre de décimales pour Z" -#: ishtar_common/models_common.py:2271 +#: ishtar_common/models_common.py:2281 msgid "Geographic - Spatial reference system" msgstr "Géographie - Système de référence spatiale" -#: ishtar_common/models_common.py:2272 +#: ishtar_common/models_common.py:2282 msgid "Geographic - Spatial reference systems" msgstr "Géographie - Systèmes de référence spatiale" -#: ishtar_common/models_common.py:2303 +#: ishtar_common/models_common.py:2313 msgid "Geographic - Origin type" msgstr "Géographie - Type d'origine" -#: ishtar_common/models_common.py:2304 +#: ishtar_common/models_common.py:2314 msgid "Geographic - Origin types" msgstr "Géographie - Types d'origine" -#: ishtar_common/models_common.py:2320 +#: ishtar_common/models_common.py:2330 msgid "Geographic - Data type" msgstr "Géographie - Type de données" -#: ishtar_common/models_common.py:2321 +#: ishtar_common/models_common.py:2331 msgid "Geographic - Data types" msgstr "Géographie - Types de données" -#: ishtar_common/models_common.py:2337 +#: ishtar_common/models_common.py:2347 msgid "Geographic - Provider type" msgstr "Géographie - Type de fournisseur" -#: ishtar_common/models_common.py:2338 +#: ishtar_common/models_common.py:2348 msgid "Geographic - Provider types" msgstr "Géographie - Types de fournisseur" -#: ishtar_common/models_common.py:2350 +#: ishtar_common/models_common.py:2360 msgid "Geographic - Buffer type" msgstr "Géographie - Type de tampon" -#: ishtar_common/models_common.py:2351 +#: ishtar_common/models_common.py:2361 msgid "Geographic - Buffer types" msgstr "Géographie - Types de tampon" -#: ishtar_common/models_common.py:2377 +#: ishtar_common/models_common.py:2387 msgid "Line(s)" msgstr "Ligne(s)" -#: ishtar_common/models_common.py:2378 +#: ishtar_common/models_common.py:2388 msgid "Point(s)" msgstr "Point(s)" -#: ishtar_common/models_common.py:2379 +#: ishtar_common/models_common.py:2389 msgid "Polygon(s)" msgstr "Polygone(s)" -#: ishtar_common/models_common.py:2435 +#: ishtar_common/models_common.py:2445 msgid "Use this for update imports" msgstr "Utilisez cela pour des imports de mise à jour" -#: ishtar_common/models_common.py:2442 +#: ishtar_common/models_common.py:2452 msgid "For instance: topographical survey, georeferencing, ..." msgstr "Par exemple : levé topographiques, géoréférencement, ..." -#: ishtar_common/models_common.py:2450 +#: ishtar_common/models_common.py:2460 msgid "For instance: outline, z-sup, ..." msgstr "Par exemple : contour, Z-supérieur, ..." -#: ishtar_common/models_common.py:2458 +#: ishtar_common/models_common.py:2468 msgid "Data provider" msgstr "Fournisseur de données" -#: ishtar_common/models_common.py:2462 ishtar_common/models_common.py:4727 +#: ishtar_common/models_common.py:2472 ishtar_common/models_common.py:4737 msgid "X" msgstr "X/Long" -#: ishtar_common/models_common.py:2462 ishtar_common/models_common.py:2463 -#: ishtar_common/models_common.py:2464 +#: ishtar_common/models_common.py:2472 ishtar_common/models_common.py:2473 +#: ishtar_common/models_common.py:2474 msgid "User input" msgstr "Saisie utilisateur" -#: ishtar_common/models_common.py:2463 ishtar_common/models_common.py:4728 +#: ishtar_common/models_common.py:2473 ishtar_common/models_common.py:4738 msgid "Y" msgstr "Y/Lat" -#: ishtar_common/models_common.py:2464 ishtar_common/models_common.py:4729 +#: ishtar_common/models_common.py:2474 ishtar_common/models_common.py:4739 msgid "Z" msgstr "Z" -#: ishtar_common/models_common.py:2467 +#: ishtar_common/models_common.py:2477 msgid "X (cached)" msgstr "X (cache)" -#: ishtar_common/models_common.py:2468 +#: ishtar_common/models_common.py:2478 msgid "Y (cached)" msgstr "Y (cache)" -#: ishtar_common/models_common.py:2469 +#: ishtar_common/models_common.py:2479 msgid "Z (cached)" msgstr "Z (cache)" -#: ishtar_common/models_common.py:2481 ishtar_common/models_common.py:4741 +#: ishtar_common/models_common.py:2491 ishtar_common/models_common.py:4751 msgid "Spatial Reference System" msgstr "Système de référence spatiale" -#: ishtar_common/models_common.py:2486 ishtar_common/models_common.py:4747 +#: ishtar_common/models_common.py:2496 ishtar_common/models_common.py:4757 msgid "Point (2D)" msgstr "Point (2D)" -#: ishtar_common/models_common.py:2487 +#: ishtar_common/models_common.py:2497 msgid "Point (3D)" msgstr "Point (3D)" -#: ishtar_common/models_common.py:2488 +#: ishtar_common/models_common.py:2498 msgid "Multi points" msgstr "Points multiples" -#: ishtar_common/models_common.py:2489 +#: ishtar_common/models_common.py:2499 msgid "Multi lines" msgstr "Lignes multiples" -#: ishtar_common/models_common.py:2490 +#: ishtar_common/models_common.py:2500 msgid "Multi polygons" msgstr "Polygones multi-parties" -#: ishtar_common/models_common.py:2493 ishtar_common/models_common.py:2494 +#: ishtar_common/models_common.py:2503 ishtar_common/models_common.py:2504 msgid "Geographic - Vector data" msgstr "Géographie - Donnée vectorielle" -#: ishtar_common/models_common.py:2630 +#: ishtar_common/models_common.py:2640 msgid "Only 2 or 3 dimensions" msgstr "Seulement 2 ou 3 dimensions" -#: ishtar_common/models_common.py:3103 +#: ishtar_common/models_common.py:3113 msgid "Main geodata" msgstr "Élément géographique principal" -#: ishtar_common/models_common.py:3107 +#: ishtar_common/models_common.py:3117 msgid "Geodata" msgstr "Élément géographique" -#: ishtar_common/models_common.py:3111 +#: ishtar_common/models_common.py:3121 msgctxt "key for text search" msgid "geo-name" msgstr "geo-nom" -#: ishtar_common/models_common.py:3114 +#: ishtar_common/models_common.py:3124 msgctxt "key for text search" msgid "geo-type" msgstr "geo-type" -#: ishtar_common/models_common.py:3117 +#: ishtar_common/models_common.py:3127 msgctxt "key for text search" msgid "geo-origin" msgstr "geo-origine" -#: ishtar_common/models_common.py:3120 +#: ishtar_common/models_common.py:3130 msgctxt "key for text search" msgid "geo-provider" msgstr "geo-fournisseur" -#: ishtar_common/models_common.py:3123 +#: ishtar_common/models_common.py:3133 msgctxt "key for text search" msgid "z" msgstr "z" -#: ishtar_common/models_common.py:3127 +#: ishtar_common/models_common.py:3137 msgctxt "key for text search" msgid "geo-comment" msgstr "geo-commentaire" -#: ishtar_common/models_common.py:3153 +#: ishtar_common/models_common.py:3163 msgid "Add geographic item" msgstr "Ajouter élément géographique" -#: ishtar_common/models_common.py:3155 +#: ishtar_common/models_common.py:3165 msgid "geo." msgstr "géo." -#: ishtar_common/models_common.py:3214 +#: ishtar_common/models_common.py:3224 msgid "Model" msgstr "Modèle" -#: ishtar_common/models_common.py:3219 +#: ishtar_common/models_common.py:3229 msgid "Use 'text' query used in Ishtar search input" msgstr "" "Utiliser une requête textuelle utilisé dans le champ de recherche Ishtar" -#: ishtar_common/models_common.py:3221 +#: ishtar_common/models_common.py:3231 msgid "Active" msgstr "Actif" -#: ishtar_common/models_common.py:3223 +#: ishtar_common/models_common.py:3233 msgid "Include associated items" msgstr "Inclure les éléments rattachés à l'utilisateur" -#: ishtar_common/models_common.py:3224 +#: ishtar_common/models_common.py:3234 msgid "All items associated items match the request" msgstr "Tous les éléments rattachés valident la requête" -#: ishtar_common/models_common.py:3227 +#: ishtar_common/models_common.py:3237 msgid "Include upstream items" msgstr "Inclure les éléments liés aux permissions amonts" -#: ishtar_common/models_common.py:3229 +#: ishtar_common/models_common.py:3239 msgid "" "All items associated by upstream link math the request. For instance, match " "is done for all finds associated with own context records" @@ -13321,127 +13856,127 @@ msgstr "" "exemple, la validation de la requête est faite pour tout le mobilier " "rattaché aux unités d'enregistrement possédées." -#: ishtar_common/models_common.py:3234 +#: ishtar_common/models_common.py:3244 msgid "Limit request to attached areas" msgstr "Limiter la requête aux zones rattachées" -#: ishtar_common/models_common.py:3235 +#: ishtar_common/models_common.py:3245 msgid "Request is limited to areas attached to the ishtar user" msgstr "La requête est limitée aux zones attachées à l'utilisateur ishtar" -#: ishtar_common/models_common.py:3241 +#: ishtar_common/models_common.py:3251 msgid "Permission query" msgstr "Requête pour permission" -#: ishtar_common/models_common.py:3603 +#: ishtar_common/models_common.py:3613 msgid "Regenerate ID" msgstr "Re-générer l'identifiant" -#: ishtar_common/models_common.py:3625 +#: ishtar_common/models_common.py:3635 msgid "Localisation" msgstr "Localisation" -#: ishtar_common/models_common.py:3627 +#: ishtar_common/models_common.py:3637 msgid "Limit" msgstr "Limite" -#: ishtar_common/models_common.py:3629 +#: ishtar_common/models_common.py:3639 #: ishtar_common/templates/ishtar/sheet_town.html:107 msgid "Notice" msgstr "Notice" -#: ishtar_common/models_common.py:3638 +#: ishtar_common/models_common.py:3648 msgid "Year of creation" msgstr "Année de création" -#: ishtar_common/models_common.py:3642 +#: ishtar_common/models_common.py:3652 msgid "Filling this field is relevant to distinguish old towns from new towns." msgstr "" "Remplir ce champ est nécessaire pour distinguer les anciennes communes des " "nouvelles communes." -#: ishtar_common/models_common.py:3646 +#: ishtar_common/models_common.py:3656 msgid "Town children" msgstr "Communes enfants" -#: ishtar_common/models_common.py:3704 ishtar_common/models_common.py:3798 -#: ishtar_common/models_common.py:3851 +#: ishtar_common/models_common.py:3714 ishtar_common/models_common.py:3808 +#: ishtar_common/models_common.py:3861 msgid "INSEE code is missing" msgstr "Le code INSEE est manquant" -#: ishtar_common/models_common.py:3705 +#: ishtar_common/models_common.py:3715 msgid "Geo INSEE is missing" msgstr "La géométrie pour ce code INSEE est manquante" -#: ishtar_common/models_common.py:3984 +#: ishtar_common/models_common.py:3994 msgid ", old town of " msgstr ", commune déléguée de " -#: ishtar_common/models_common.py:4169 +#: ishtar_common/models_common.py:4179 msgid "Town (precise)" msgstr "Commune (précis)" -#: ishtar_common/models_common.py:4201 +#: ishtar_common/models_common.py:4211 msgid "Raw phone" msgstr "Téléphone brut" -#: ishtar_common/models_common.py:4207 +#: ishtar_common/models_common.py:4217 msgid "Alternative address is prefered" msgstr "L'adresse alternative est préférée" -#: ishtar_common/models_common.py:4210 +#: ishtar_common/models_common.py:4220 msgid "Cached town" msgstr "Nom en cache des communes" -#: ishtar_common/models_common.py:4261 +#: ishtar_common/models_common.py:4271 msgid "Town with code: {} does not exists" msgstr "La commune avec le code : {} n'existe pas" -#: ishtar_common/models_common.py:4298 +#: ishtar_common/models_common.py:4308 msgid "No associated address" msgstr "Pas d'adresse associée" -#: ishtar_common/models_common.py:4379 +#: ishtar_common/models_common.py:4389 msgid "Postal code - Town" msgstr "Code postal - Commune" -#: ishtar_common/models_common.py:4389 +#: ishtar_common/models_common.py:4399 msgid "Mobile" msgstr "Mobile" -#: ishtar_common/models_common.py:4412 +#: ishtar_common/models_common.py:4422 msgid "Merge key" msgstr "Clé de fusion" -#: ishtar_common/models_common.py:4725 +#: ishtar_common/models_common.py:4735 msgid "Precise" msgstr "Précis" -#: ishtar_common/models_common.py:4725 +#: ishtar_common/models_common.py:4735 msgid "Polygon" msgstr "Polygone" -#: ishtar_common/models_common.py:4749 +#: ishtar_common/models_common.py:4759 msgid "Point source" msgstr "Source du point" -#: ishtar_common/models_common.py:4752 +#: ishtar_common/models_common.py:4762 msgid "Point source item" msgstr "Élément source du point" -#: ishtar_common/models_common.py:4754 +#: ishtar_common/models_common.py:4764 msgid "Multi polygon" msgstr "Polygones multi-parties" -#: ishtar_common/models_common.py:4756 +#: ishtar_common/models_common.py:4766 msgid "Multi-polygon source" msgstr "Source du multi-polygone" -#: ishtar_common/models_common.py:4763 +#: ishtar_common/models_common.py:4773 msgid "Multi polygon source item" msgstr "Élément source du multi-polygone" -#: ishtar_common/models_common.py:4906 +#: ishtar_common/models_common.py:4916 msgid "Custom index" msgstr "Index personnalisé" @@ -14658,6 +15193,7 @@ msgstr "Clic droit sur l'image pour l'enregistrer." #: ishtar_common/templates/blocks/DataTables-stats-detail.html:48 #: ishtar_common/templates/ishtar/blocks/sheet_json.html:9 +#: man_app/templates/ishtar/blocks/sheet_json.html:10 msgid "No data" msgstr "Pas de données" @@ -14897,6 +15433,9 @@ msgstr "Imports (mis à jour)" #: ishtar_common/templates/ishtar/blocks/sheet_document_list.html:3 #: ishtar_common/templates/ishtar/sheet_document.html:140 +#: man_app/templates/ishtar/sheet_museum_find.html:318 +#: na_app/templates/ishtar/sheet_find.html:553 +#: pdl_app/templates/ishtar/sheet_find.html:546 msgid "Associated documents" msgstr "Documents associés" @@ -16515,7 +17054,6 @@ msgstr "Nouvelle notice biographique" #: ishtar_common/views.py:1262 ishtar_common/views_item.py:270 #: ishtar_common/views_item.py:316 ishtar_common/views_item.py:335 -#: views_item.py:268 views_item.py:313 views_item.py:332 msgid "Operation not permitted." msgstr "Opération non permise." @@ -16651,17 +17189,17 @@ msgstr "Élément géographique modification" msgid "Delete geographic item" msgstr "Supprimer des données géographiques" -#: ishtar_common/views_item.py:282 views_item.py:280 +#: ishtar_common/views_item.py:282 #, python-format msgid "New %s" msgstr "Nouveau %s" -#: ishtar_common/views_item.py:349 views_item.py:346 +#: ishtar_common/views_item.py:349 #, python-format msgid "Modify a %s" msgstr "Modifier un %s" -#: ishtar_common/views_item.py:1169 views_item.py:1166 +#: ishtar_common/views_item.py:1179 msgctxt "key for text search" msgid "today" msgstr "aujourdhui" @@ -16722,6 +17260,25 @@ msgid "" msgstr "" "Si le profil a été changé, ne pas oublier de régénérer les permissions." +#: na_app/templates/ishtar/sheet_container.html:303 +msgid "Document for this container" +msgstr "Document associé à ce contenant" + +#: na_app/templates/ishtar/sheet_find.html:41 +#: pdl_app/templates/ishtar/sheet_find.html:41 +msgid "Image / Base find" +msgstr "Image / Mobilier d'origine" + +#: na_app/templates/ishtar/sheet_find.html:174 +#: pdl_app/templates/ishtar/sheet_find.html:162 +msgid "Administrative index" +msgstr "Index administratif" + +#: na_app/templates/ishtar/sheet_operation.html:407 +#: pdl_app/templates/ishtar/sheet_operation.html:424 +msgid "Document from this operation" +msgstr "Documents de cette opération" + #: overload_translation/models.py:8 msgid "Translation context" msgstr "Contexte de traduction" @@ -16738,11 +17295,8 @@ msgstr "Surcharge de traduction" msgid "Translations overload" msgstr "Surcharges de traductions" -#~ msgid "Image / Base find" -#~ msgstr "Image / Mobilier d'origine" - -#~ msgid "Administrative index" -#~ msgstr "Index administratif" +#~ msgid "Numerical reference" +#~ msgstr "Référence numérique" #~ msgid "Document from this context record" #~ msgstr "Document associé à cette Unité d'Enregistrement" @@ -16750,12 +17304,6 @@ msgstr "Surcharges de traductions" #~ msgid "Precise on dating" #~ msgstr "Précision sur cette datation" -#~ msgid "Document for this container" -#~ msgstr "Document associé à ce contenant" - -#~ msgid "Document from this operation" -#~ msgstr "Documents de cette opération" - #~ msgid "Enter to add the criteria" #~ msgstr "« Entrée » pour ajouter le critère" diff --git a/locale/pt/LC_MESSAGES/django.po b/locale/pt/LC_MESSAGES/django.po index 1f3b85f0d..15535bb59 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: 2026-01-14 18:22+0100\n" +"POT-Creation-Date: 2026-02-18 15:49+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -23,6 +23,7 @@ msgstr "" #: archaeological_context_records/models.py:580 #: archaeological_context_records/models.py:882 #: archaeological_context_records/templates/ishtar/forms/qa_contextrecord_duplicate.html:12 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:228 #: archaeological_context_records/wizards.py:85 #: archaeological_finds/models_finds.py:1317 #: archaeological_finds/models_finds.py:2960 @@ -41,8 +42,11 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:246 #: archaeological_operations/wizards.py:258 -#: archaeological_warehouse/models.py:884 ishtar_common/forms_common.py:2593 -#: ishtar_common/models.py:6244 ishtar_common/views.py:603 +#: archaeological_warehouse/models.py:884 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:249 +#: ishtar_common/forms_common.py:2593 ishtar_common/models.py:6244 +#: ishtar_common/views.py:603 na_app/templates/ishtar/sheet_operation.html:4 +#: pdl_app/templates/ishtar/sheet_operation.html:4 msgid "Operation" msgstr "" @@ -105,7 +109,7 @@ msgid "ID" msgstr "" #: archaeological_context_records/forms.py:144 archaeological_files/forms.py:88 -#: archaeological_files/models.py:460 archaeological_finds/models_finds.py:1320 +#: archaeological_files/models.py:562 archaeological_finds/models_finds.py:1320 #: archaeological_operations/models.py:387 #: archaeological_operations/models.py:1165 #: archaeological_warehouse/forms.py:155 ishtar_common/admin.py:1736 @@ -180,13 +184,27 @@ msgstr "" #: ishtar_common/templates/ishtar/merge_organization.html:21 #: ishtar_common/templates/ishtar/sheet_organization.html:30 #: ishtar_common/templates/ishtar/sheet_organization.html:57 +#: man_app/templates/ishtar/sheet_find_treatments.html:120 +#: man_app/templates/ishtar/sheet_find_treatments.html:158 +#: man_app/templates/ishtar/sheet_find_treatments.html:243 +#: na_app/templates/ishtar/sheet_find.html:445 +#: na_app/templates/ishtar/sheet_find.html:483 +#: na_app/templates/ishtar/sheet_find.html:521 +#: na_app/templates/ishtar/sheet_operation.html:554 +#: na_app/templates/ishtar/sheet_operation.html:618 +#: pdl_app/templates/ishtar/sheet_find.html:438 +#: pdl_app/templates/ishtar/sheet_find.html:476 +#: pdl_app/templates/ishtar/sheet_find.html:514 +#: pdl_app/templates/ishtar/sheet_operation.html:571 +#: pdl_app/templates/ishtar/sheet_operation.html:635 msgid "Type" msgstr "" #: archaeological_context_records/forms.py:167 #: archaeological_context_records/forms.py:338 #: archaeological_context_records/models.py:898 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:137 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:136 msgid "Excavator" msgstr "" @@ -194,8 +212,10 @@ msgstr "" #: archaeological_context_records/forms.py:551 #: archaeological_context_records/forms.py:817 #: archaeological_context_records/models.py:583 -#: archaeological_context_records/models.py:982 ishtar_common/admin.py:1063 -#: ishtar_common/models.py:3533 +#: archaeological_context_records/models.py:982 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:174 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:182 +#: ishtar_common/admin.py:1063 ishtar_common/models.py:3533 msgid "Activity" msgstr "" @@ -204,14 +224,21 @@ msgstr "" #: archaeological_context_records/forms.py:818 #: archaeological_context_records/models.py:582 #: archaeological_context_records/models.py:974 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:175 #: archaeological_finds/forms.py:390 archaeological_finds/forms.py:781 #: archaeological_finds/forms.py:1021 archaeological_finds/forms.py:1022 #: archaeological_finds/templates/ishtar/sheet_find.html:99 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:99 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:183 +#: cd17_app/templates/ishtar/sheet_find.html:107 #: ishtar_common/forms_common.py:2283 #: ishtar_common/templates/ishtar/organization_person_form.html:9 #: ishtar_common/templates/ishtar/person_form.html:9 #: ishtar_common/templates/ishtar/sheet_document.html:34 +#: man_app/templates/ishtar/sheet_museum_find.html:100 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:138 +#: na_app/templates/ishtar/sheet_find.html:157 +#: pdl_app/templates/ishtar/sheet_find.html:145 msgid "Identification" msgstr "" @@ -237,7 +264,7 @@ msgstr "" #: archaeological_context_records/forms.py:367 #: archaeological_context_records/models.py:895 #: archaeological_context_records/models.py:1583 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:143 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:134 #: archaeological_finds/forms.py:453 archaeological_finds/forms.py:458 #: archaeological_finds/forms.py:621 archaeological_finds/forms.py:788 #: archaeological_finds/forms.py:790 archaeological_finds/forms.py:1024 @@ -255,11 +282,17 @@ msgstr "" #: archaeological_operations/forms.py:1336 #: archaeological_operations/models.py:662 #: archaeological_operations/templates/ishtar/sheet_site.html:57 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:142 +#: cd17_app/templates/ishtar/sheet_find.html:125 #: ishtar_common/forms_common.py:2226 ishtar_common/forms_common.py:2517 #: ishtar_common/models.py:1094 ishtar_common/models.py:5305 #: ishtar_common/models_imports.py:165 ishtar_common/models_imports.py:446 #: ishtar_common/models_imports.py:714 ishtar_common/models_imports.py:814 #: ishtar_common/models_imports.py:833 +#: man_app/templates/ishtar/sheet_museum_find.html:118 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:156 +#: na_app/templates/ishtar/sheet_find.html:179 +#: pdl_app/templates/ishtar/sheet_find.html:172 msgid "Description" msgstr "" @@ -270,6 +303,11 @@ msgstr "" #: archaeological_finds/models_finds.py:2302 #: archaeological_finds/templates/ishtar/sheet_find.html:142 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:142 +#: cd17_app/templates/ishtar/sheet_find.html:150 +#: man_app/templates/ishtar/sheet_museum_find.html:143 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:181 +#: na_app/templates/ishtar/sheet_find.html:204 +#: pdl_app/templates/ishtar/sheet_find.html:197 msgid "General comment" msgstr "" @@ -283,8 +321,10 @@ msgstr "" #: archaeological_context_records/forms.py:538 #: archaeological_context_records/forms.py:549 #: archaeological_context_records/models.py:937 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:49 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:205 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:172 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:176 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:180 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:184 msgid "Interpretation" msgstr "" @@ -296,7 +336,7 @@ msgstr "" #: archaeological_context_records/models.py:570 #: archaeological_context_records/models.py:866 #: archaeological_context_records/models.py:1582 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:119 #: archaeological_files/forms.py:89 archaeological_files/forms.py:1147 #: archaeological_finds/models_finds.py:1275 #: archaeological_operations/forms.py:502 @@ -305,6 +345,7 @@ msgstr "" #: archaeological_operations/models.py:3507 #: archaeological_operations/models.py:3817 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:124 msgid "Parcel" msgstr "" @@ -327,13 +368,15 @@ msgstr "" #: archaeological_context_records/forms.py:187 #: archaeological_context_records/forms.py:370 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:149 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:140 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:148 msgid "Structure" msgstr "" #: archaeological_context_records/forms.py:188 #: archaeological_context_records/forms.py:376 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:150 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:141 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:149 msgid "Texture" msgstr "" @@ -346,14 +389,16 @@ msgstr "" #: archaeological_context_records/forms.py:190 #: archaeological_context_records/forms.py:388 #: archaeological_context_records/forms.py:821 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:152 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:143 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:151 msgid "Colors" msgstr "" #: archaeological_context_records/forms.py:191 #: archaeological_context_records/forms.py:393 #: archaeological_context_records/models.py:925 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:153 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:144 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:152 msgid "Details on color" msgstr "" @@ -378,10 +423,14 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:40 #: archaeological_warehouse/templates/ishtar/sheet_container.html:28 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:24 +#: cd93_app/templates/ishtar/sheet_administrativeact.html:40 #: ishtar_common/templates/ishtar/sheet_area.html:30 #: ishtar_common/templates/ishtar/sheet_import_gen.html:18 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:20 #: ishtar_common/templates/ishtar/sheet_town.html:33 +#: na_app/templates/ishtar/sheet_container.html:28 +#: na_app/templates/ishtar/sheet_operation.html:45 +#: pdl_app/templates/ishtar/sheet_operation.html:45 msgid "General" msgstr "" @@ -404,7 +453,7 @@ msgstr "" #: archaeological_warehouse/forms.py:154 archaeological_warehouse/models.py:299 #: ishtar_common/forms_common.py:98 ishtar_common/forms_common.py:120 #: ishtar_common/models.py:2741 ishtar_common/models.py:3006 -#: ishtar_common/models_common.py:3665 ishtar_common/models_common.py:4725 +#: ishtar_common/models_common.py:3675 ishtar_common/models_common.py:4735 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 #: ishtar_common/templates/ishtar/sheet_person.html:58 #: ishtar_common/templates/ishtar/sheet_person.html:78 @@ -434,12 +483,15 @@ msgstr "" #: archaeological_context_records/forms.py:358 #: archaeological_context_records/models.py:902 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:258 -#: archaeological_files/models.py:715 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:239 +#: archaeological_files/models.py:817 #: archaeological_files/templates/ishtar/sheet_file.html:78 #: archaeological_operations/models.py:1553 #: archaeological_operations/templates/ishtar/sheet_operation.html:211 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:260 #: ishtar_common/forms.py:1184 ishtar_common/forms.py:1185 +#: na_app/templates/ishtar/sheet_operation.html:208 +#: pdl_app/templates/ishtar/sheet_operation.html:211 msgid "Closing date" msgstr "" @@ -450,20 +502,27 @@ msgstr "" #: archaeological_finds/models_treatments.py:398 #: archaeological_finds/models_treatments.py:1050 #: archaeological_warehouse/templates/ishtar/sheet_container.html:94 +#: na_app/templates/ishtar/sheet_container.html:101 msgid "Location" msgstr "" #: archaeological_context_records/forms.py:394 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:159 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:150 #: archaeological_finds/forms.py:526 archaeological_finds/forms.py:837 #: archaeological_finds/forms.py:1656 #: archaeological_finds/templates/ishtar/sheet_find.html:184 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:184 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:158 +#: cd17_app/templates/ishtar/sheet_find.html:192 +#: man_app/templates/ishtar/sheet_museum_find.html:186 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:223 +#: na_app/templates/ishtar/sheet_find.html:208 +#: pdl_app/templates/ishtar/sheet_find.html:201 msgid "Dimensions" msgstr "" #: archaeological_context_records/forms.py:398 -#: archaeological_files/forms.py:312 archaeological_files/models.py:752 +#: archaeological_files/forms.py:312 archaeological_files/models.py:854 msgid "Total surface (m²)" msgstr "" @@ -474,7 +533,8 @@ msgstr "" #: archaeological_context_records/forms.py:405 #: archaeological_context_records/models.py:904 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:170 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:161 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:169 msgid "Excavated length (m)" msgstr "" @@ -485,7 +545,8 @@ msgstr "" #: archaeological_context_records/forms.py:407 #: archaeological_context_records/models.py:906 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:172 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:163 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:171 msgid "Excavated width (m)" msgstr "" @@ -522,8 +583,13 @@ msgstr "" #: archaeological_context_records/models.py:157 #: archaeological_finds/forms.py:1593 archaeological_finds/forms.py:1614 #: archaeological_finds/models_finds.py:2212 -#: archaeological_finds/templates/ishtar/sheet_find.html:204 +#: archaeological_finds/templates/ishtar/sheet_find.html:207 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:204 +#: cd17_app/templates/ishtar/sheet_find.html:215 +#: man_app/templates/ishtar/sheet_museum_find.html:206 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:243 +#: na_app/templates/ishtar/sheet_find.html:259 +#: pdl_app/templates/ishtar/sheet_find.html:252 msgid "Dating" msgstr "" @@ -532,19 +598,26 @@ msgstr "" #: archaeological_context_records/models.py:581 #: archaeological_finds/forms.py:1183 archaeological_finds/forms.py:1600 #: archaeological_finds/models_finds.py:1326 -#: archaeological_finds/templates/ishtar/sheet_find.html:213 +#: archaeological_finds/templates/ishtar/sheet_find.html:216 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:213 #: archaeological_operations/forms.py:797 #: archaeological_operations/templates/ishtar/sheet_operation.html:559 #: archaeological_operations/templates/ishtar/sheet_operation.html:597 +#: cd17_app/templates/ishtar/sheet_find.html:224 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:4 +#: man_app/templates/ishtar/sheet_museum_find.html:215 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:252 +#: na_app/templates/ishtar/sheet_operation.html:564 +#: na_app/templates/ishtar/sheet_operation.html:601 +#: pdl_app/templates/ishtar/sheet_operation.html:581 +#: pdl_app/templates/ishtar/sheet_operation.html:618 msgid "Chronological period" msgstr "" #: archaeological_context_records/forms.py:517 #: archaeological_context_records/models.py:111 -#: archaeological_files/forms.py:757 archaeological_files/models.py:80 -#: archaeological_files/models.py:829 +#: archaeological_files/forms.py:757 archaeological_files/models.py:90 +#: archaeological_files/models.py:931 #: archaeological_files/templates/ishtar/sheet_file.html:200 #: archaeological_finds/forms.py:1602 #: archaeological_finds/forms_treatments.py:73 @@ -553,7 +626,7 @@ msgstr "" #: archaeological_finds/models_finds.py:3963 #: archaeological_finds/models_treatments.py:436 #: archaeological_finds/models_treatments.py:1048 -#: archaeological_finds/templates/ishtar/sheet_find.html:214 +#: archaeological_finds/templates/ishtar/sheet_find.html:217 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:67 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:105 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:214 @@ -562,14 +635,23 @@ msgstr "" #: archaeological_operations/models.py:105 #: archaeological_operations/models.py:1554 #: archaeological_operations/models.py:3821 +#: cd17_app/templates/ishtar/sheet_find.html:225 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:5 +#: man_app/templates/ishtar/sheet_find_treatments.html:125 +#: man_app/templates/ishtar/sheet_find_treatments.html:163 +#: man_app/templates/ishtar/sheet_museum_find.html:216 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:253 +#: na_app/templates/ishtar/sheet_find.html:450 +#: na_app/templates/ishtar/sheet_find.html:488 +#: pdl_app/templates/ishtar/sheet_find.html:443 +#: pdl_app/templates/ishtar/sheet_find.html:481 msgid "Start date" msgstr "" #: archaeological_context_records/forms.py:518 #: archaeological_context_records/models.py:112 #: archaeological_files/forms.py:640 archaeological_files/forms.py:762 -#: archaeological_files/models.py:81 archaeological_files/models.py:830 +#: archaeological_files/models.py:91 archaeological_files/models.py:932 #: archaeological_finds/forms.py:1603 #: archaeological_finds/forms_treatments.py:74 #: archaeological_finds/forms_treatments.py:236 @@ -579,7 +661,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:437 #: archaeological_finds/models_treatments.py:1049 #: archaeological_finds/models_treatments.py:1438 -#: archaeological_finds/templates/ishtar/sheet_find.html:215 +#: archaeological_finds/templates/ishtar/sheet_find.html:218 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:68 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:106 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:191 @@ -587,17 +669,32 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:90 #: archaeological_operations/models.py:106 #: archaeological_operations/models.py:3822 +#: cd17_app/templates/ishtar/sheet_find.html:226 #: ishtar_common/models_imports.py:1448 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:6 +#: man_app/templates/ishtar/sheet_find_treatments.html:126 +#: man_app/templates/ishtar/sheet_find_treatments.html:164 +#: man_app/templates/ishtar/sheet_find_treatments.html:249 +#: man_app/templates/ishtar/sheet_museum_find.html:217 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:254 +#: na_app/templates/ishtar/sheet_find.html:451 +#: na_app/templates/ishtar/sheet_find.html:489 +#: na_app/templates/ishtar/sheet_find.html:527 +#: pdl_app/templates/ishtar/sheet_find.html:444 +#: pdl_app/templates/ishtar/sheet_find.html:482 +#: pdl_app/templates/ishtar/sheet_find.html:520 msgid "End date" msgstr "" #: archaeological_context_records/forms.py:519 #: archaeological_context_records/models.py:122 #: archaeological_finds/forms.py:1604 -#: archaeological_finds/templates/ishtar/sheet_find.html:217 +#: archaeological_finds/templates/ishtar/sheet_find.html:220 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:217 +#: cd17_app/templates/ishtar/sheet_find.html:228 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:8 +#: man_app/templates/ishtar/sheet_museum_find.html:219 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:256 msgid "Quality" msgstr "" @@ -605,18 +702,24 @@ msgstr "" #: archaeological_context_records/models.py:84 #: archaeological_context_records/models.py:115 #: archaeological_finds/forms.py:1601 -#: archaeological_finds/templates/ishtar/sheet_find.html:216 +#: archaeological_finds/templates/ishtar/sheet_find.html:219 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:216 +#: cd17_app/templates/ishtar/sheet_find.html:227 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:7 +#: man_app/templates/ishtar/sheet_museum_find.html:218 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:255 msgid "Dating type" msgstr "" #: archaeological_context_records/forms.py:521 #: archaeological_context_records/models.py:127 #: archaeological_finds/forms.py:1605 -#: archaeological_finds/templates/ishtar/sheet_find.html:218 +#: archaeological_finds/templates/ishtar/sheet_find.html:221 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:218 +#: cd17_app/templates/ishtar/sheet_find.html:229 #: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:9 +#: man_app/templates/ishtar/sheet_museum_find.html:220 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:257 msgid "Precise on this dating" msgstr "" @@ -629,7 +732,8 @@ msgid "Context record - 040 - Interpretation" msgstr "" #: archaeological_context_records/forms.py:557 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:221 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:210 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:231 msgid "Dating complements" msgstr "" @@ -855,8 +959,8 @@ msgid "Dating quality types" msgstr "" #: archaeological_context_records/models.py:131 -#: archaeological_context_records/tests.py:938 -#: archaeological_finds/tests.py:1571 archaeological_finds/tests.py:1800 +#: archaeological_context_records/tests.py:998 +#: archaeological_finds/tests.py:1611 archaeological_finds/tests.py:1840 msgctxt "key for text search" msgid "datings-period" msgstr "" @@ -900,16 +1004,20 @@ msgstr "" #: archaeological_finds/models_treatments.py:1030 #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:4 +#: cd17_app/templates/ishtar/sheet_find.html:4 #: ishtar_common/forms_common.py:2627 ishtar_common/models.py:6247 -#: ishtar_common/views.py:611 +#: ishtar_common/views.py:611 man_app/templates/ishtar/sheet_museum_find.html:4 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:4 +#: na_app/templates/ishtar/sheet_find.html:4 +#: pdl_app/templates/ishtar/sheet_find.html:4 msgid "Find" msgstr "" #: archaeological_context_records/models.py:299 #: archaeological_context_records/models.py:322 -#: archaeological_files/models.py:79 archaeological_files/models.py:109 -#: archaeological_files/models.py:183 archaeological_files/models.py:199 -#: archaeological_files/models.py:259 archaeological_finds/models_finds.py:105 +#: archaeological_files/models.py:89 archaeological_files/models.py:211 +#: archaeological_files/models.py:285 archaeological_files/models.py:301 +#: archaeological_files/models.py:361 archaeological_finds/models_finds.py:105 #: archaeological_finds/models_finds.py:119 #: archaeological_finds/models_finds.py:136 #: archaeological_finds/models_finds.py:260 @@ -928,9 +1036,9 @@ msgstr "" #: ishtar_common/models.py:772 ishtar_common/models.py:823 #: ishtar_common/models.py:1936 ishtar_common/models.py:4530 #: ishtar_common/models.py:6019 ishtar_common/models_common.py:762 -#: ishtar_common/models_common.py:2264 ishtar_common/models_common.py:2300 -#: ishtar_common/models_common.py:2317 ishtar_common/models_common.py:2334 -#: ishtar_common/models_common.py:2347 ishtar_common/models_imports.py:481 +#: ishtar_common/models_common.py:2274 ishtar_common/models_common.py:2310 +#: ishtar_common/models_common.py:2327 ishtar_common/models_common.py:2344 +#: ishtar_common/models_common.py:2357 ishtar_common/models_imports.py:481 msgid "Order" msgstr "" @@ -1076,25 +1184,25 @@ msgid "id" msgstr "" #: archaeological_context_records/models.py:638 -#: archaeological_context_records/tests.py:764 -#: archaeological_files/models.py:550 archaeological_finds/models_finds.py:1446 +#: archaeological_context_records/tests.py:824 +#: archaeological_files/models.py:652 archaeological_finds/models_finds.py:1446 #: archaeological_operations/models.py:491 #: archaeological_operations/models.py:1332 #: archaeological_operations/tests.py:3308 #: archaeological_warehouse/models.py:329 #: archaeological_warehouse/models.py:1055 ishtar_common/models.py:5064 -#: ishtar_common/models_common.py:4216 +#: ishtar_common/models_common.py:4226 msgctxt "key for text search" msgid "town" msgstr "" #: archaeological_context_records/models.py:641 -#: archaeological_files/models.py:613 archaeological_finds/models_finds.py:1466 +#: archaeological_files/models.py:715 archaeological_finds/models_finds.py:1466 #: archaeological_operations/models.py:494 #: archaeological_operations/models.py:1335 #: archaeological_warehouse/models.py:333 #: archaeological_warehouse/models.py:1059 ishtar_common/models.py:5069 -#: ishtar_common/models_common.py:4220 +#: ishtar_common/models_common.py:4230 msgctxt "key for text search" msgid "area" msgstr "" @@ -1105,8 +1213,8 @@ msgid "operation-year" msgstr "" #: archaeological_context_records/models.py:647 -#: archaeological_files/models.py:565 archaeological_finds/models_finds.py:1783 -#: archaeological_finds/tests.py:1620 +#: archaeological_files/models.py:667 archaeological_finds/models_finds.py:1783 +#: archaeological_finds/tests.py:1660 msgctxt "key for text search" msgid "operation-name" msgstr "" @@ -1149,7 +1257,7 @@ msgid "site" msgstr "" #: archaeological_context_records/models.py:668 -#: archaeological_context_records/tests.py:831 +#: archaeological_context_records/tests.py:891 #: archaeological_finds/models_finds.py:1501 msgctxt "key for text search" msgid "operation-relation-type" @@ -1167,7 +1275,7 @@ msgid "period" msgstr "" #: archaeological_context_records/models.py:676 -#: archaeological_context_records/tests.py:890 +#: archaeological_context_records/tests.py:950 msgctxt "key for text search" msgid "unit-type" msgstr "" @@ -1178,7 +1286,7 @@ msgid "activity" msgstr "" #: archaeological_context_records/models.py:682 -#: archaeological_files/models.py:553 archaeological_operations/models.py:1338 +#: archaeological_files/models.py:655 archaeological_operations/models.py:1338 #: archaeological_operations/models.py:3030 msgctxt "key for text search" msgid "parcel" @@ -1191,7 +1299,7 @@ msgid "has-finds" msgstr "" #: archaeological_context_records/models.py:689 -#: archaeological_context_records/tests.py:796 +#: archaeological_context_records/tests.py:856 msgctxt "key for text search" msgid "record-relation-type" msgstr "" @@ -1219,7 +1327,7 @@ msgid "documentation" msgstr "" #: archaeological_context_records/models.py:709 -#: archaeological_finds/models_finds.py:1534 archaeological_finds/tests.py:1637 +#: archaeological_finds/models_finds.py:1534 archaeological_finds/tests.py:1677 #: archaeological_operations/models.py:497 ishtar_common/models.py:4929 msgctxt "key for text search" msgid "description" @@ -1236,7 +1344,7 @@ msgid "interpretation" msgstr "" #: archaeological_context_records/models.py:721 -#: archaeological_files/models.py:596 archaeological_finds/models_finds.py:1652 +#: archaeological_files/models.py:698 archaeological_finds/models_finds.py:1652 #: archaeological_operations/models.py:506 #: archaeological_operations/models.py:1391 #: archaeological_operations/models.py:3122 @@ -1285,7 +1393,7 @@ msgid "Lock/Unlock" msgstr "" #: archaeological_context_records/models.py:812 -#: archaeological_files/models.py:633 archaeological_finds/models_finds.py:1981 +#: archaeological_files/models.py:735 archaeological_finds/models_finds.py:1981 #: archaeological_operations/models.py:597 #: archaeological_operations/models.py:1492 #: archaeological_warehouse/models.py:369 @@ -1326,7 +1434,7 @@ msgid "Duplicate" msgstr "" #: archaeological_context_records/models.py:860 -#: archaeological_files/models.py:652 archaeological_finds/models_finds.py:613 +#: archaeological_files/models.py:754 archaeological_finds/models_finds.py:613 #: archaeological_finds/models_finds.py:2142 #: archaeological_finds/models_treatments.py:431 #: archaeological_operations/models.py:3496 @@ -1336,7 +1444,7 @@ msgid "External ID" msgstr "" #: archaeological_context_records/models.py:862 -#: archaeological_files/models.py:655 archaeological_finds/models_finds.py:615 +#: archaeological_files/models.py:757 archaeological_finds/models_finds.py:615 #: archaeological_finds/models_finds.py:2144 #: archaeological_operations/models.py:3499 #: archaeological_warehouse/models.py:428 @@ -1379,8 +1487,8 @@ msgid "Estimation of a \"Terminus Post Quem\"" msgstr "" #: archaeological_context_records/models.py:996 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 -#: archaeological_files/models.py:850 archaeological_finds/models_finds.py:2435 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:83 +#: archaeological_files/models.py:952 archaeological_finds/models_finds.py:2435 #: archaeological_finds/models_treatments.py:451 #: archaeological_finds/models_treatments.py:1471 #: archaeological_finds/models_treatments.py:1718 @@ -1397,12 +1505,14 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:50 #: archaeological_warehouse/templates/ishtar/sheet_container.html:202 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:46 -#: ishtar_common/models.py:1040 ishtar_common/models.py:2544 -#: ishtar_common/models.py:4634 ishtar_common/models.py:4652 -#: ishtar_common/models.py:4681 ishtar_common/models.py:4695 -#: ishtar_common/models.py:4709 ishtar_common/models.py:4721 -#: ishtar_common/models.py:5338 ishtar_common/models.py:5348 -#: ishtar_common/models_common.py:3652 ishtar_common/models_imports.py:3087 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:86 +#: cd17_app/templates/ishtar/sheet_find.html:64 ishtar_common/models.py:1040 +#: ishtar_common/models.py:2544 ishtar_common/models.py:4634 +#: ishtar_common/models.py:4652 ishtar_common/models.py:4681 +#: ishtar_common/models.py:4695 ishtar_common/models.py:4709 +#: ishtar_common/models.py:4721 ishtar_common/models.py:5338 +#: ishtar_common/models.py:5348 ishtar_common/models_common.py:3662 +#: ishtar_common/models_imports.py:3087 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:184 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:292 @@ -1410,11 +1520,19 @@ msgstr "" #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:492 #: ishtar_common/templates/ishtar/sheet_person.html:172 #: ishtar_common/views.py:190 +#: man_app/templates/ishtar/sheet_museum_find.html:65 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:103 +#: na_app/templates/ishtar/sheet_container.html:50 +#: na_app/templates/ishtar/sheet_container.html:207 +#: na_app/templates/ishtar/sheet_find.html:63 +#: na_app/templates/ishtar/sheet_operation.html:62 +#: pdl_app/templates/ishtar/sheet_find.html:63 +#: pdl_app/templates/ishtar/sheet_operation.html:62 msgid "Documents" msgstr "" #: archaeological_context_records/models.py:1003 -#: archaeological_files/models.py:856 archaeological_finds/models_finds.py:2441 +#: archaeological_files/models.py:958 archaeological_finds/models_finds.py:2441 #: archaeological_finds/models_treatments.py:457 #: archaeological_finds/models_treatments.py:1478 #: archaeological_finds/models_treatments.py:1725 @@ -1423,7 +1541,7 @@ msgstr "" #: archaeological_operations/models.py:3247 #: archaeological_warehouse/models.py:422 #: archaeological_warehouse/models.py:1226 ishtar_common/models.py:2550 -#: ishtar_common/models_common.py:3658 +#: ishtar_common/models_common.py:3668 msgid "Main image" msgstr "" @@ -1445,7 +1563,7 @@ msgstr "" #: archaeological_operations/models.py:1769 #: archaeological_operations/models.py:1775 #: archaeological_operations/models.py:1781 -#: archaeological_operations/models.py:1787 ishtar_common/models_common.py:4901 +#: archaeological_operations/models.py:1787 ishtar_common/models_common.py:4911 msgid "Generated automatically - do not edit" msgstr "" @@ -1457,6 +1575,7 @@ msgstr "" #: archaeological_context_records/models.py:1022 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:4 #: archaeological_finds/models_finds.py:626 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:4 msgid "Context Record" msgstr "" @@ -1581,20 +1700,29 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:41 #: archaeological_finds/templates/ishtar/sheet_find.html:42 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:42 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:44 +#: cd17_app/templates/ishtar/sheet_find.html:42 +#: man_app/templates/ishtar/sheet_museum_find.html:41 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:81 +#: na_app/templates/ishtar/sheet_find.html:48 +#: pdl_app/templates/ishtar/sheet_find.html:48 msgid "Identification / Description" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:58 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:218 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:49 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:207 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:52 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:228 msgid "Datations" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:66 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:57 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:60 msgid "Operation / Archaeological site" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:74 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:289 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:65 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:270 #: archaeological_finds/forms.py:2253 archaeological_finds/models_finds.py:97 #: archaeological_finds/models_finds.py:111 #: archaeological_finds/models_finds.py:128 @@ -1630,23 +1758,37 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:197 #: archaeological_warehouse/templates/ishtar/sheet_container.html:244 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:208 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:68 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:302 #: ishtar_common/templates/ishtar/sheet_document.html:127 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:149 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:252 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:358 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:457 -#: ishtar_common/views.py:178 +#: ishtar_common/views.py:178 na_app/templates/ishtar/sheet_container.html:202 +#: na_app/templates/ishtar/sheet_container.html:249 +#: na_app/templates/ishtar/sheet_operation.html:89 +#: na_app/templates/ishtar/sheet_operation.html:481 +#: na_app/templates/ishtar/sheet_operation.html:573 +#: pdl_app/templates/ishtar/sheet_operation.html:89 +#: pdl_app/templates/ishtar/sheet_operation.html:498 +#: pdl_app/templates/ishtar/sheet_operation.html:590 msgid "Finds" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:83 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:74 #: archaeological_operations/templates/ishtar/sheet_operation.html:72 #: archaeological_operations/templates/ishtar/sheet_operation.html:415 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:77 #: ishtar_common/templates/ishtar/forms/modify_relations.html:28 +#: na_app/templates/ishtar/sheet_operation.html:71 +#: na_app/templates/ishtar/sheet_operation.html:422 +#: pdl_app/templates/ishtar/sheet_operation.html:71 +#: pdl_app/templates/ishtar/sheet_operation.html:439 msgid "Relations" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:101 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 #: archaeological_finds/templates/ishtar/sheet_find.html:73 #: archaeological_finds/templates/ishtar/sheet_find.html:325 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:73 @@ -1655,38 +1797,68 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:121 #: archaeological_warehouse/templates/ishtar/sheet_container.html:59 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:55 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:95 +#: cd17_app/templates/ishtar/sheet_find.html:73 +#: cd17_app/templates/ishtar/sheet_find.html:333 #: ishtar_common/templates/ishtar/blocks/sheet_map.html:10 #: ishtar_common/templates/ishtar/sheet_town.html:41 +#: man_app/templates/ishtar/sheet_museum_find.html:74 +#: man_app/templates/ishtar/sheet_museum_find.html:331 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:112 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:374 +#: na_app/templates/ishtar/sheet_container.html:59 +#: na_app/templates/ishtar/sheet_find.html:72 +#: na_app/templates/ishtar/sheet_find.html:566 +#: na_app/templates/ishtar/sheet_operation.html:98 +#: pdl_app/templates/ishtar/sheet_find.html:72 +#: pdl_app/templates/ishtar/sheet_find.html:559 +#: pdl_app/templates/ishtar/sheet_operation.html:98 msgid "Geographic data" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:110 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:101 #: archaeological_finds/templates/ishtar/sheet_find.html:82 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:82 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:76 #: archaeological_operations/templates/ishtar/sheet_operation.html:108 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:106 +#: cd17_app/templates/ishtar/sheet_find.html:82 +#: cd93_app/templates/ishtar/sheet_administrativeact.html:77 +#: man_app/templates/ishtar/sheet_museum_find.html:83 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:121 +#: na_app/templates/ishtar/sheet_find.html:81 +#: na_app/templates/ishtar/sheet_operation.html:107 +#: pdl_app/templates/ishtar/sheet_find.html:81 +#: pdl_app/templates/ishtar/sheet_operation.html:107 msgid "Custom fields" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:126 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:117 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:122 #: ishtar_common/models.py:4876 msgid "Identifier" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:145 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:136 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:144 msgid "Excavation technics" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:151 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:142 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:150 msgid "Inclusion" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:163 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:154 #: archaeological_files/templates/ishtar/sheet_file.html:102 #: archaeological_files/templates/ishtar/sheet_file.html:284 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:60 #: archaeological_operations/templates/ishtar/sheet_operation.html:219 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:162 +#: cd93_app/templates/ishtar/sheet_administrativeact.html:61 #: ishtar_common/templates/ishtar/sheet_town.html:71 +#: na_app/templates/ishtar/sheet_operation.html:216 +#: pdl_app/templates/ishtar/sheet_operation.html:219 msgid "Surface" msgstr "" @@ -1697,7 +1869,12 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:334 #: archaeological_operations/templates/ishtar/sheet_site.html:78 #: archaeological_warehouse/templates/ishtar/sheet_container.html:167 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:202 #: ishtar_common/templates/ishtar/sheet_town.html:110 +#: man_app/templates/ishtar/sheet_basefind.html:56 +#: na_app/templates/ishtar/sheet_container.html:174 +#: na_app/templates/ishtar/sheet_operation.html:340 +#: pdl_app/templates/ishtar/sheet_operation.html:357 msgid "Geographic localisation" msgstr "" @@ -1707,7 +1884,7 @@ msgstr "" #: archaeological_finds/forms.py:1025 #: archaeological_finds/templates/ishtar/sheet_basefind.html:72 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:93 -#: archaeological_finds/templates/ishtar/sheet_find.html:252 +#: archaeological_finds/templates/ishtar/sheet_find.html:255 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:252 #: archaeological_finds/templates/ishtar/sheet_treatment.html:104 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:94 @@ -1716,83 +1893,165 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:127 #: archaeological_warehouse/templates/ishtar/sheet_container.html:177 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:131 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:216 +#: cd17_app/templates/ishtar/sheet_find.html:263 +#: cd93_app/templates/ishtar/sheet_administrativeact.html:90 #: ishtar_common/templates/ishtar/blocks/window_image.html:6 #: ishtar_common/templates/ishtar/sheet_document.html:147 #: ishtar_common/templates/ishtar/sheet_organization.html:86 #: ishtar_common/templates/ishtar/sheet_person.html:178 +#: man_app/templates/ishtar/sheet_basefind.html:67 +#: man_app/templates/ishtar/sheet_museum_find.html:254 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:291 +#: na_app/templates/ishtar/sheet_container.html:183 +#: na_app/templates/ishtar/sheet_find.html:274 +#: na_app/templates/ishtar/sheet_operation.html:361 +#: pdl_app/templates/ishtar/sheet_find.html:267 +#: pdl_app/templates/ishtar/sheet_operation.html:378 msgid "Sheet" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:237 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:226 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:247 msgid "Operation summary" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:240 -#: archaeological_operations/templates/ishtar/sheet_operation.html:305 -msgid "Patriarche OA code not yet recorded!" +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:229 +#: archaeological_files/forms.py:84 archaeological_files/forms.py:211 +#: archaeological_files/forms.py:632 archaeological_files/forms.py:1105 +#: archaeological_files/forms.py:1141 archaeological_files/models.py:560 +#: archaeological_files/models.py:746 +#: archaeological_files/templates/ishtar/sheet_file.html:224 +#: archaeological_finds/forms.py:1759 +#: archaeological_finds/forms_treatments.py:59 +#: archaeological_finds/forms_treatments.py:190 +#: archaeological_finds/forms_treatments.py:469 +#: archaeological_finds/forms_treatments.py:625 +#: archaeological_finds/forms_treatments.py:701 +#: archaeological_finds/forms_treatments.py:773 +#: archaeological_finds/forms_treatments.py:884 +#: archaeological_finds/forms_treatments.py:966 +#: archaeological_finds/forms_treatments.py:1004 +#: archaeological_finds/models_finds.py:1319 +#: archaeological_finds/models_treatments.py:360 +#: archaeological_finds/models_treatments.py:1400 +#: archaeological_finds/models_treatments.py:1690 +#: archaeological_finds/templates/ishtar/sheet_exhibition.html:51 +#: archaeological_operations/forms.py:73 archaeological_operations/forms.py:489 +#: archaeological_operations/forms.py:711 +#: archaeological_operations/forms.py:1448 +#: archaeological_operations/forms.py:1766 +#: archaeological_operations/models.py:1164 +#: archaeological_operations/models.py:1591 +#: archaeological_operations/models.py:2980 +#: archaeological_operations/models.py:3219 +#: archaeological_operations/models.py:3486 +#: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 +#: archaeological_operations/templates/ishtar/sheet_operation.html:150 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:250 +#: ishtar_common/models_imports.py:1133 +#: na_app/templates/ishtar/sheet_operation.html:149 +#: pdl_app/templates/ishtar/sheet_operation.html:152 +msgid "Year" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:246 -msgid "Numerical reference" +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:230 +#: archaeological_operations/forms.py:729 +#: archaeological_operations/models.py:1565 +#: archaeological_operations/models.py:3176 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:251 +msgid "Head scientist" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:252 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:233 #: archaeological_finds/models_treatments.py:239 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:63 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:101 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:140 #: archaeological_operations/templates/ishtar/sheet_operation.html:183 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:254 #: ishtar_common/models.py:4029 ishtar_common/models.py:6138 #: ishtar_common/models.py:6275 ishtar_common/models.py:6354 -#: ishtar_common/models_common.py:2193 ishtar_common/models_common.py:2208 +#: ishtar_common/models_common.py:2203 ishtar_common/models_common.py:2218 #: ishtar_common/models_imports.py:1591 ishtar_common/models_imports.py:1993 +#: man_app/templates/ishtar/sheet_find_treatments.html:121 +#: man_app/templates/ishtar/sheet_find_treatments.html:159 +#: man_app/templates/ishtar/sheet_find_treatments.html:198 +#: na_app/templates/ishtar/sheet_find.html:399 +#: na_app/templates/ishtar/sheet_find.html:446 +#: na_app/templates/ishtar/sheet_find.html:484 +#: na_app/templates/ishtar/sheet_operation.html:179 +#: pdl_app/templates/ishtar/sheet_find.html:392 +#: pdl_app/templates/ishtar/sheet_find.html:439 +#: pdl_app/templates/ishtar/sheet_find.html:477 +#: pdl_app/templates/ishtar/sheet_operation.html:182 msgid "State" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:253 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:234 #: archaeological_files/templates/ishtar/sheet_file.html:72 #: archaeological_operations/templates/ishtar/sheet_operation.html:188 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:255 +#: na_app/templates/ishtar/sheet_operation.html:184 +#: pdl_app/templates/ishtar/sheet_operation.html:187 msgid "Active file" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:253 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:234 #: archaeological_operations/templates/ishtar/sheet_operation.html:191 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:255 +#: na_app/templates/ishtar/sheet_operation.html:187 +#: pdl_app/templates/ishtar/sheet_operation.html:190 msgid "Closed operation" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:260 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:241 #: archaeological_files/templates/ishtar/sheet_file.html:80 #: archaeological_operations/templates/ishtar/sheet_operation.html:213 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:262 +#: na_app/templates/ishtar/sheet_operation.html:210 +#: pdl_app/templates/ishtar/sheet_operation.html:213 msgid "by" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:272 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:253 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:274 msgid "No operation linked to this context record!" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:294 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:275 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:307 msgid "No associated finds." msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:298 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:279 #: archaeological_operations/templates/ishtar/sheet_operation.html:481 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:311 +#: na_app/templates/ishtar/sheet_operation.html:486 +#: pdl_app/templates/ishtar/sheet_operation.html:503 msgid "Documents from associated finds" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:311 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:292 #: archaeological_operations/templates/ishtar/sheet_operation.html:447 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:324 +#: na_app/templates/ishtar/sheet_operation.html:452 +#: pdl_app/templates/ishtar/sheet_operation.html:469 msgid "Context record relations" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:317 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:298 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:330 msgid "Diagram of stratigraphic relations - above" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:325 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:306 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:338 msgid "Diagram of stratigraphic relations - below" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:333 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:314 +#: cd17_app/templates/ishtar/sheet_contextrecord.html:346 msgid "Diagram of stratigraphic relations - full" msgstr "" @@ -1819,77 +2078,55 @@ msgstr "" msgid "Add context record" msgstr "" -#: archaeological_files/admin.py:141 +#: archaeological_files/admin.py:146 msgid "Copy from" msgstr "" -#: archaeological_files/admin.py:145 +#: archaeological_files/admin.py:150 msgid "To" msgstr "" -#: archaeological_files/admin.py:162 archaeological_files/tests.py:312 +#: archaeological_files/admin.py:167 archaeological_files/tests.py:312 msgid "Source and destination must be different." msgstr "" -#: archaeological_files/admin.py:184 +#: archaeological_files/admin.py:189 msgid "Cannot change price agreement." msgstr "" -#: archaeological_files/admin.py:237 +#: archaeological_files/admin.py:242 msgid "{} item(s) created." msgstr "" -#: archaeological_files/admin.py:241 +#: archaeological_files/admin.py:246 msgid "{} item(s) already in database." msgstr "" -#: archaeological_files/forms.py:77 -msgid "File - 001 - Search" +#: archaeological_files/admin.py:266 +msgid "Select only one price agreement." msgstr "" -#: archaeological_files/forms.py:84 archaeological_files/forms.py:211 -#: archaeological_files/forms.py:632 archaeological_files/forms.py:1105 -#: archaeological_files/forms.py:1141 archaeological_files/models.py:458 -#: archaeological_files/models.py:644 -#: archaeological_files/templates/ishtar/sheet_file.html:224 -#: archaeological_finds/forms.py:1759 -#: archaeological_finds/forms_treatments.py:59 -#: archaeological_finds/forms_treatments.py:190 -#: archaeological_finds/forms_treatments.py:469 -#: archaeological_finds/forms_treatments.py:625 -#: archaeological_finds/forms_treatments.py:701 -#: archaeological_finds/forms_treatments.py:773 -#: archaeological_finds/forms_treatments.py:884 -#: archaeological_finds/forms_treatments.py:966 -#: archaeological_finds/forms_treatments.py:1004 -#: archaeological_finds/models_finds.py:1319 -#: archaeological_finds/models_treatments.py:360 -#: archaeological_finds/models_treatments.py:1400 -#: archaeological_finds/models_treatments.py:1690 -#: archaeological_finds/templates/ishtar/sheet_exhibition.html:51 -#: archaeological_operations/forms.py:73 archaeological_operations/forms.py:489 -#: archaeological_operations/forms.py:711 -#: archaeological_operations/forms.py:1448 -#: archaeological_operations/forms.py:1766 -#: archaeological_operations/models.py:1164 -#: archaeological_operations/models.py:1591 -#: archaeological_operations/models.py:2980 -#: archaeological_operations/models.py:3219 -#: archaeological_operations/models.py:3486 -#: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 -#: archaeological_operations/templates/ishtar/sheet_operation.html:150 -#: ishtar_common/models_imports.py:1133 -msgid "Year" +#: archaeological_files/admin.py:275 ishtar_common/admin.py:3130 +msgid "" +"Document not generated: is the LibreOffice daemon configured and running?" +msgstr "" + +#: archaeological_files/admin.py:293 +msgid "Export prices" +msgstr "" + +#: archaeological_files/forms.py:77 +msgid "File - 001 - Search" msgstr "" #: archaeological_files/forms.py:85 archaeological_files/forms.py:638 -#: archaeological_files/models.py:646 +#: archaeological_files/models.py:748 msgid "Numeric reference" msgstr "" #: archaeological_files/forms.py:86 archaeological_files/forms.py:220 #: archaeological_files/forms.py:1107 archaeological_files/forms.py:1143 -#: archaeological_files/models.py:649 +#: archaeological_files/models.py:751 #: archaeological_finds/models_treatments.py:1403 #: archaeological_operations/forms.py:1450 #: archaeological_operations/forms.py:1515 @@ -1901,11 +2138,11 @@ msgid "Internal reference" msgstr "" #: archaeological_files/forms.py:92 archaeological_files/forms.py:1113 -#: archaeological_files/forms.py:1150 archaeological_files/models.py:1709 +#: archaeological_files/forms.py:1150 archaeological_files/models.py:1811 #: archaeological_operations/forms.py:505 #: archaeological_operations/forms.py:1461 -#: archaeological_operations/models.py:2841 ishtar_common/models_common.py:2216 -#: ishtar_common/models_common.py:3632 +#: archaeological_operations/models.py:2841 ishtar_common/models_common.py:2226 +#: ishtar_common/models_common.py:3642 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" @@ -1915,14 +2152,14 @@ msgid "File name" msgstr "" #: archaeological_files/forms.py:95 archaeological_files/forms.py:288 -#: archaeological_files/forms.py:339 archaeological_files/models.py:658 +#: archaeological_files/forms.py:339 archaeological_files/models.py:760 #: archaeological_files/templates/ishtar/sheet_file.html:63 msgid "Operation name" msgstr "" #: archaeological_files/forms.py:96 archaeological_files/forms.py:209 -#: archaeological_files/models.py:459 archaeological_files/models.py:464 -#: archaeological_files/models.py:659 +#: archaeological_files/models.py:561 archaeological_files/models.py:566 +#: archaeological_files/models.py:761 msgid "File type" msgstr "" @@ -1931,7 +2168,7 @@ msgid "Is active?" msgstr "" #: archaeological_files/forms.py:98 archaeological_files/forms.py:290 -#: archaeological_files/models.py:401 archaeological_files/models.py:809 +#: archaeological_files/models.py:503 archaeological_files/models.py:911 #: archaeological_files/templates/ishtar/sheet_file.html:124 msgid "Development type" msgstr "" @@ -1941,26 +2178,28 @@ msgid "Saisine type" msgstr "" #: archaeological_files/forms.py:100 archaeological_files/forms.py:448 -#: archaeological_files/models.py:813 +#: archaeological_files/models.py:915 #: archaeological_files/templates/ishtar/sheet_file.html:125 msgid "Monitoring justification" msgstr "" #: archaeological_files/forms.py:101 archaeological_files/forms.py:265 -#: archaeological_files/models.py:352 archaeological_files/models.py:463 -#: archaeological_files/models.py:708 +#: archaeological_files/models.py:454 archaeological_files/models.py:565 +#: archaeological_files/models.py:810 msgid "Permit type" msgstr "" #: archaeological_files/forms.py:102 archaeological_files/forms.py:450 -#: archaeological_files/models.py:713 +#: archaeological_files/models.py:815 #: archaeological_files/templates/ishtar/sheet_file.html:137 #: archaeological_operations/templates/ishtar/sheet_operation.html:282 +#: na_app/templates/ishtar/sheet_operation.html:280 +#: pdl_app/templates/ishtar/sheet_operation.html:305 msgid "Permit/order reference" msgstr "" #: archaeological_files/forms.py:103 archaeological_files/forms.py:629 -#: archaeological_files/models.py:761 archaeological_finds/forms.py:831 +#: archaeological_files/models.py:863 archaeological_finds/forms.py:831 #: archaeological_finds/forms.py:1174 archaeological_finds/forms.py:1461 #: archaeological_finds/forms.py:2507 #: archaeological_finds/forms_treatments.py:241 @@ -1986,7 +2225,7 @@ msgstr "" #: ishtar_common/forms_common.py:2562 ishtar_common/forms_common.py:3189 #: ishtar_common/models.py:3114 ishtar_common/models.py:4414 #: ishtar_common/models.py:5314 ishtar_common/models_common.py:192 -#: ishtar_common/models_common.py:2461 ishtar_common/models_imports.py:897 +#: ishtar_common/models_common.py:2471 ishtar_common/models_imports.py:897 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:13 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:170 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:39 @@ -2003,7 +2242,7 @@ msgstr "" #: archaeological_files/forms.py:115 archaeological_files/forms.py:357 #: archaeological_files/forms.py:367 archaeological_files/forms.py:1157 -#: archaeological_files/models.py:671 +#: archaeological_files/models.py:773 msgid "General contractor" msgstr "" @@ -2031,7 +2270,7 @@ msgstr "" msgid "Archaeological file - 010 - General" msgstr "" -#: archaeological_files/forms.py:218 archaeological_files/models.py:728 +#: archaeological_files/forms.py:218 archaeological_files/models.py:830 #: archaeological_files/templates/ishtar/sheet_file.html:64 #: archaeological_finds/models_treatments.py:1440 #: archaeological_operations/models.py:1552 ishtar_common/forms_common.py:2222 @@ -2041,10 +2280,13 @@ msgstr "" msgid "Creation date" msgstr "" -#: archaeological_files/forms.py:219 archaeological_files/models.py:730 +#: archaeological_files/forms.py:219 archaeological_files/models.py:832 #: archaeological_finds/forms_treatments.py:813 #: archaeological_finds/models_treatments.py:1442 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:190 +#: man_app/templates/ishtar/sheet_find_treatments.html:248 +#: na_app/templates/ishtar/sheet_find.html:526 +#: pdl_app/templates/ishtar/sheet_find.html:519 msgid "Reception date" msgstr "" @@ -2073,7 +2315,7 @@ msgid "This name is used on creation for the associated operation" msgstr "" #: archaeological_files/forms.py:293 archaeological_files/forms.py:342 -#: archaeological_files/models.py:530 archaeological_files/models.py:725 +#: archaeological_files/models.py:632 archaeological_files/models.py:827 #: archaeological_operations/forms.py:710 #: archaeological_operations/forms.py:1005 #: archaeological_operations/forms.py:1021 @@ -2088,15 +2330,17 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:152 #: ishtar_common/forms_common.py:1851 ishtar_common/forms_common.py:1865 #: ishtar_common/forms_common.py:1866 ishtar_common/models.py:2531 -#: ishtar_common/models_common.py:3666 +#: ishtar_common/models_common.py:3676 #: ishtar_common/templates/ishtar/sheet_area.html:71 #: ishtar_common/templates/ishtar/sheet_document.html:133 +#: na_app/templates/ishtar/sheet_operation.html:150 +#: pdl_app/templates/ishtar/sheet_operation.html:153 msgid "Towns" msgstr "" #: archaeological_files/forms.py:297 archaeological_files/forms.py:345 -#: archaeological_files/models.py:764 archaeological_operations/models.py:3225 -#: ishtar_common/models_common.py:2217 +#: archaeological_files/models.py:866 archaeological_operations/models.py:3225 +#: ishtar_common/models_common.py:2227 msgid "Departments" msgstr "" @@ -2105,7 +2349,7 @@ msgid "Only relevant when no town is provided." msgstr "" #: archaeological_files/forms.py:301 archaeological_files/forms.py:347 -#: archaeological_files/models.py:756 +#: archaeological_files/models.py:858 msgid "Locality" msgstr "" @@ -2119,7 +2363,7 @@ msgstr "" #: archaeological_files/forms.py:307 archaeological_files/forms.py:353 #: archaeological_warehouse/forms.py:255 ishtar_common/forms_common.py:787 -#: ishtar_common/forms_common.py:1206 ishtar_common/models_common.py:4165 +#: ishtar_common/forms_common.py:1206 ishtar_common/models_common.py:4175 msgid "Postal code" msgstr "" @@ -2127,7 +2371,7 @@ msgstr "" msgid "Surfaces" msgstr "" -#: archaeological_files/forms.py:320 archaeological_files/models.py:754 +#: archaeological_files/forms.py:320 archaeological_files/models.py:856 msgid "Total developed surface (m²)" msgstr "" @@ -2138,7 +2382,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:90 #: archaeological_warehouse/forms.py:242 archaeological_warehouse/forms.py:251 #: ishtar_common/forms_common.py:783 ishtar_common/forms_common.py:1202 -#: ishtar_common/models_common.py:4160 ishtar_common/models_common.py:4367 +#: ishtar_common/models_common.py:4170 ishtar_common/models_common.py:4377 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 msgid "Address" msgstr "" @@ -2172,7 +2416,7 @@ msgstr "" msgid "Archaeological file - 040 - Planning service" msgstr "" -#: archaeological_files/forms.py:452 archaeological_files/models.py:732 +#: archaeological_files/forms.py:452 archaeological_files/models.py:834 msgid "Date of planning service file" msgstr "" @@ -2190,12 +2434,12 @@ msgstr "" msgid "Archaeological file - 045 - Research - General" msgstr "" -#: archaeological_files/forms.py:562 archaeological_files/models.py:788 +#: archaeological_files/forms.py:562 archaeological_files/models.py:890 #: archaeological_operations/forms.py:517 msgid "Scientist in charge" msgstr "" -#: archaeological_files/forms.py:566 archaeological_files/models.py:772 +#: archaeological_files/forms.py:566 archaeological_files/models.py:874 msgid "Requested operation type" msgstr "" @@ -2203,16 +2447,16 @@ msgstr "" msgid "Lead organization" msgstr "" -#: archaeological_files/forms.py:584 archaeological_files/models.py:791 +#: archaeological_files/forms.py:584 archaeological_files/models.py:893 #: archaeological_files/templates/ishtar/sheet_file.html:176 msgid "Research archaeology comment" msgstr "" -#: archaeological_files/forms.py:593 archaeological_files/models.py:794 +#: archaeological_files/forms.py:593 archaeological_files/models.py:896 msgid "Classified area" msgstr "" -#: archaeological_files/forms.py:594 archaeological_files/models.py:796 +#: archaeological_files/forms.py:594 archaeological_files/models.py:898 msgid "Protected area" msgstr "" @@ -2229,11 +2473,11 @@ msgstr "" msgid "File managed by" msgstr "" -#: archaeological_files/forms.py:622 archaeological_files/models.py:736 +#: archaeological_files/forms.py:622 archaeological_files/models.py:838 msgid "Related file" msgstr "" -#: archaeological_files/forms.py:630 archaeological_files/models.py:750 +#: archaeological_files/forms.py:630 archaeological_files/models.py:852 #: archaeological_files/templates/ishtar/sheet_file.html:66 msgid "Instruction deadline" msgstr "" @@ -2265,27 +2509,27 @@ msgstr "" msgid "Archaeological royalties" msgstr "" -#: archaeological_files/forms.py:742 archaeological_files/models.py:821 +#: archaeological_files/forms.py:742 archaeological_files/models.py:923 msgid "Intervention period" msgstr "" -#: archaeological_files/forms.py:747 archaeological_files/models.py:824 +#: archaeological_files/forms.py:747 archaeological_files/models.py:926 msgid "Study period" msgstr "" -#: archaeological_files/forms.py:752 archaeological_files/models.py:827 +#: archaeological_files/forms.py:752 archaeological_files/models.py:929 msgid "Report due period" msgstr "" -#: archaeological_files/forms.py:767 archaeological_files/models.py:831 +#: archaeological_files/forms.py:767 archaeological_files/models.py:933 msgid "Ground start date" msgstr "" -#: archaeological_files/forms.py:772 archaeological_files/models.py:832 +#: archaeological_files/forms.py:772 archaeological_files/models.py:934 msgid "Ground end date" msgstr "" -#: archaeological_files/forms.py:777 archaeological_files/models.py:834 +#: archaeological_files/forms.py:777 archaeological_files/models.py:936 msgid "Execution report date" msgstr "" @@ -2317,16 +2561,16 @@ msgstr "" msgid "Days" msgstr "" -#: archaeological_files/forms.py:864 archaeological_files/models.py:120 -#: archaeological_files/models.py:1751 archaeological_files/models.py:1770 +#: archaeological_files/forms.py:864 archaeological_files/models.py:222 +#: archaeological_files/models.py:1853 archaeological_files/models.py:1872 #: archaeological_files/templates/ishtar/sheet_file.html:298 #: archaeological_files/templates/ishtar/sheet_file.html:350 msgid "Job" msgstr "" -#: archaeological_files/forms.py:885 archaeological_files/models.py:84 -#: archaeological_files/models.py:85 archaeological_files/models.py:97 -#: archaeological_files/models.py:230 archaeological_files/models.py:817 +#: archaeological_files/forms.py:885 archaeological_files/models.py:94 +#: archaeological_files/models.py:95 archaeological_files/models.py:199 +#: archaeological_files/models.py:332 archaeological_files/models.py:919 msgid "Price agreement" msgstr "" @@ -2377,6 +2621,9 @@ msgstr "" #: archaeological_warehouse/forms.py:465 archaeological_warehouse/forms.py:527 #: archaeological_warehouse/models.py:1200 ishtar_common/admin.py:649 #: ishtar_common/models.py:5197 +#: man_app/templates/ishtar/sheet_find_treatments.html:94 +#: na_app/templates/ishtar/sheet_find.html:374 +#: pdl_app/templates/ishtar/sheet_find.html:367 msgid "Index" msgstr "" @@ -2449,7 +2696,7 @@ msgstr "" msgid "Administrative act - Archaeological file - General" msgstr "" -#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:880 +#: archaeological_files/ishtar_menu.py:35 archaeological_files/models.py:982 #: archaeological_files/templates/ishtar/sheet_file.html:4 #: archaeological_files/wizards.py:226 archaeological_files/wizards.py:238 #: archaeological_operations/forms.py:663 @@ -2475,140 +2722,204 @@ msgstr "" #: archaeological_operations/models.py:1942 #: archaeological_operations/models.py:3256 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 +#: cd93_app/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "" -#: archaeological_files/models.py:92 archaeological_files/models.py:127 -#: archaeological_files/models.py:192 archaeological_files/models.py:208 -#: archaeological_files/models.py:278 archaeological_files/models.py:380 -#: archaeological_files/models.py:392 archaeological_files/models.py:404 -#: archaeological_files/models.py:424 archaeological_files/models.py:1757 -#: archaeological_files/models.py:1776 archaeological_files/models.py:1803 +#: archaeological_files/models.py:102 archaeological_files/models.py:229 +#: archaeological_files/models.py:294 archaeological_files/models.py:310 +#: archaeological_files/models.py:380 archaeological_files/models.py:482 +#: archaeological_files/models.py:494 archaeological_files/models.py:506 +#: archaeological_files/models.py:526 archaeological_files/models.py:1859 +#: archaeological_files/models.py:1878 archaeological_files/models.py:1905 #: archaeological_files/templates/ishtar/sheet_file.html:29 #: archaeological_operations/templates/ishtar/sheet_operation.html:310 #: ishtar_common/models.py:6077 +#: na_app/templates/ishtar/sheet_operation.html:316 +#: pdl_app/templates/ishtar/sheet_operation.html:333 msgid "Preventive" msgstr "" -#: archaeological_files/models.py:100 +#: archaeological_files/models.py:136 +msgid "Equipment - service costs" +msgstr "" + +#: archaeological_files/models.py:137 archaeological_files/models.py:148 +#: archaeological_finds/forms.py:2503 +#: archaeological_finds/forms_treatments.py:57 +#: archaeological_finds/forms_treatments.py:67 +#: archaeological_finds/forms_treatments.py:194 +#: archaeological_finds/models_treatments.py:356 +#: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 +#: archaeological_finds/templates/ishtar/sheet_find_treatments.html:61 +#: archaeological_finds/templates/ishtar/sheet_find_treatments.html:99 +#: ishtar_common/forms_common.py:2026 ishtar_common/models.py:1015 +#: ishtar_common/models.py:1935 ishtar_common/models.py:4413 +#: ishtar_common/models_common.py:181 ishtar_common/models_common.py:232 +#: ishtar_common/models_common.py:2198 ishtar_common/models_common.py:2214 +#: ishtar_common/models_imports.py:706 +#: man_app/templates/ishtar/sheet_find_treatments.html:119 +#: man_app/templates/ishtar/sheet_find_treatments.html:157 +#: na_app/templates/ishtar/sheet_find.html:444 +#: na_app/templates/ishtar/sheet_find.html:482 +#: pdl_app/templates/ishtar/sheet_find.html:437 +#: pdl_app/templates/ishtar/sheet_find.html:475 +msgid "Label" +msgstr "" + +#: archaeological_files/models.py:137 archaeological_files/models.py:354 +#: ishtar_common/models_imports.py:1086 +msgid "Unit" +msgstr "" + +#: archaeological_files/models.py:137 +msgid "Price" +msgstr "" + +#: archaeological_files/models.py:144 archaeological_finds/tests.py:1864 +#: archaeological_finds/tests.py:1890 archaeological_finds/tests.py:1900 +#: archaeological_operations/tests.py:3371 ishtar_common/forms.py:1353 +#: ishtar_common/forms.py:1445 +#: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 +#: ishtar_common/templatetags/window_field.py:19 +#: ishtar_common/views_item.py:798 ishtar_common/views_item.py:1071 +#: ishtar_common/views_item.py:1108 ishtar_common/wizards.py:511 +msgid "Yes" +msgstr "" + +#: archaeological_files/models.py:144 archaeological_finds/tests.py:1865 +#: archaeological_finds/tests.py:1891 archaeological_finds/tests.py:1901 +#: ishtar_common/forms.py:1354 ishtar_common/forms.py:1447 +#: ishtar_common/templatetags/window_field.py:24 ishtar_common/wizards.py:513 +msgid "No" +msgstr "" + +#: archaeological_files/models.py:148 archaeological_files/models.py:205 +#: archaeological_files/models.py:273 +msgid "Permanent contract" +msgstr "" + +#: archaeological_files/models.py:149 archaeological_files/models.py:202 msgid "Ground daily cost" msgstr "" -#: archaeological_files/models.py:101 +#: archaeological_files/models.py:149 archaeological_files/models.py:203 msgid "Daily cost" msgstr "" -#: archaeological_files/models.py:103 archaeological_files/models.py:171 -msgid "Permanent contract" +#: archaeological_files/models.py:150 +msgid "Job cost" +msgstr "" + +#: archaeological_files/models.py:155 +msgid "ishtar-price-agreement" msgstr "" -#: archaeological_files/models.py:106 +#: archaeological_files/models.py:208 msgid "Def. daily number on ground" msgstr "" -#: archaeological_files/models.py:108 +#: archaeological_files/models.py:210 msgid "Def. daily number on study" msgstr "" -#: archaeological_files/models.py:114 +#: archaeological_files/models.py:216 msgid "Child" msgstr "" -#: archaeological_files/models.py:115 +#: archaeological_files/models.py:217 msgid "Auto-add this job when a parent is added" msgstr "" -#: archaeological_files/models.py:121 +#: archaeological_files/models.py:223 msgid "Jobs" msgstr "" -#: archaeological_files/models.py:133 +#: archaeological_files/models.py:235 msgid "fixed-term contract" msgstr "" -#: archaeological_files/models.py:175 +#: archaeological_files/models.py:277 msgid "Fixed-term contract" msgstr "" -#: archaeological_files/models.py:186 +#: archaeological_files/models.py:288 msgid "Generic equipment type" msgstr "" -#: archaeological_files/models.py:187 +#: archaeological_files/models.py:289 msgid "Generic equipment types" msgstr "" -#: archaeological_files/models.py:197 +#: archaeological_files/models.py:299 msgid "Generic type" msgstr "" -#: archaeological_files/models.py:202 +#: archaeological_files/models.py:304 msgid "Equipment/service type" msgstr "" -#: archaeological_files/models.py:203 +#: archaeological_files/models.py:305 msgid "Equipment/service types" msgstr "" -#: archaeological_files/models.py:212 +#: archaeological_files/models.py:314 #: archaeological_operations/templates/ishtar/sheet_operation.html:236 +#: na_app/templates/ishtar/sheet_operation.html:233 +#: pdl_app/templates/ishtar/sheet_operation.html:236 msgid "days" msgstr "" -#: archaeological_files/models.py:213 +#: archaeological_files/models.py:315 msgid "weeks" msgstr "" -#: archaeological_files/models.py:214 +#: archaeological_files/models.py:316 msgid "months" msgstr "" -#: archaeological_files/models.py:215 +#: archaeological_files/models.py:317 msgid "linear m." msgstr "" -#: archaeological_files/models.py:234 +#: archaeological_files/models.py:336 msgid "Equipment/Service" msgstr "" -#: archaeological_files/models.py:237 archaeological_warehouse/forms.py:215 +#: archaeological_files/models.py:339 archaeological_warehouse/forms.py:215 #: archaeological_warehouse/models.py:385 ishtar_common/models.py:3398 #: ishtar_common/models_common.py:183 ishtar_common/models_common.py:232 msgid "Textual ID" msgstr "" -#: archaeological_files/models.py:241 ishtar_common/models.py:3401 +#: archaeological_files/models.py:343 ishtar_common/models.py:3401 #: ishtar_common/models_common.py:187 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:247 +#: archaeological_files/models.py:349 msgid "Service provider" msgstr "" -#: archaeological_files/models.py:249 archaeological_files/models.py:312 +#: archaeological_files/models.py:351 archaeological_files/models.py:414 msgid "Flat rate" msgstr "" -#: archaeological_files/models.py:250 +#: archaeological_files/models.py:352 msgid "Unitary cost" msgstr "" -#: archaeological_files/models.py:252 ishtar_common/models_imports.py:1086 -msgid "Unit" -msgstr "" - -#: archaeological_files/models.py:255 +#: archaeological_files/models.py:357 msgid "Specificity" msgstr "" -#: archaeological_files/models.py:258 +#: archaeological_files/models.py:360 msgid "Default quantity by day" msgstr "" -#: archaeological_files/models.py:260 ishtar_common/models.py:1728 +#: archaeological_files/models.py:362 ishtar_common/models.py:1728 #: ishtar_common/models.py:2205 ishtar_common/models.py:4425 #: ishtar_common/models_common.py:193 ishtar_common/models_imports.py:170 #: ishtar_common/models_imports.py:448 ishtar_common/models_imports.py:959 @@ -2616,86 +2927,86 @@ msgstr "" msgid "Available" msgstr "" -#: archaeological_files/models.py:266 ishtar_common/admin.py:1559 +#: archaeological_files/models.py:368 ishtar_common/admin.py:1559 #: ishtar_common/models.py:2538 ishtar_common/models_common.py:779 msgid "Parent" msgstr "" -#: archaeological_files/models.py:267 +#: archaeological_files/models.py:369 msgid "Auto-add this cost when a parent is added" msgstr "" -#: archaeological_files/models.py:272 +#: archaeological_files/models.py:374 msgid "Equipment/service cost" msgstr "" -#: archaeological_files/models.py:273 +#: archaeological_files/models.py:375 msgid "Equipment/service costs" msgstr "" -#: archaeological_files/models.py:332 +#: archaeological_files/models.py:434 msgid "Archaeological file type" msgstr "" -#: archaeological_files/models.py:333 +#: archaeological_files/models.py:435 msgid "Archaeological file types" msgstr "" -#: archaeological_files/models.py:353 +#: archaeological_files/models.py:455 msgid "Permit types" msgstr "" -#: archaeological_files/models.py:364 +#: archaeological_files/models.py:466 msgid "Delay (in days)" msgstr "" -#: archaeological_files/models.py:377 +#: archaeological_files/models.py:479 msgid "Agreement type - France" msgstr "" -#: archaeological_files/models.py:378 +#: archaeological_files/models.py:480 msgid "Agreement types - France" msgstr "" -#: archaeological_files/models.py:389 +#: archaeological_files/models.py:491 msgid "Monitoring justification type" msgstr "" -#: archaeological_files/models.py:390 +#: archaeological_files/models.py:492 msgid "Monitoring justification types" msgstr "" -#: archaeological_files/models.py:402 +#: archaeological_files/models.py:504 msgid "Development types" msgstr "" -#: archaeological_files/models.py:413 +#: archaeological_files/models.py:515 msgid "Increase coefficient" msgstr "" -#: archaeological_files/models.py:415 +#: archaeological_files/models.py:517 msgid "Increased final value" msgstr "" -#: archaeological_files/models.py:417 +#: archaeological_files/models.py:519 msgid "Category" msgstr "" -#: archaeological_files/models.py:421 +#: archaeological_files/models.py:523 msgid "Operation type for royalties - France" msgstr "" -#: archaeological_files/models.py:422 +#: archaeological_files/models.py:524 msgid "Operation types for royalties - France" msgstr "" -#: archaeological_files/models.py:461 archaeological_finds/models_finds.py:1323 +#: archaeological_files/models.py:563 archaeological_finds/models_finds.py:1323 #: archaeological_operations/models.py:388 #: archaeological_operations/models.py:1166 msgid "Extended area" msgstr "" -#: archaeological_files/models.py:470 archaeological_finds/models_finds.py:1345 +#: archaeological_files/models.py:572 archaeological_finds/models_finds.py:1345 #: archaeological_operations/templates/ishtar/sheet_operation.html:549 #: archaeological_operations/templates/ishtar/sheet_operation.html:559 #: archaeological_operations/templates/ishtar/sheet_operation.html:577 @@ -2703,23 +3014,35 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:597 #: archaeological_operations/templates/ishtar/sheet_operation.html:614 #: ishtar_common/models.py:2060 ishtar_common/models_common.py:826 -#: ishtar_common/models_common.py:2189 ishtar_common/models_common.py:2205 +#: ishtar_common/models_common.py:2199 ishtar_common/models_common.py:2215 #: ishtar_common/templates/ishtar/sheet_person.html:30 +#: na_app/templates/ishtar/sheet_operation.html:554 +#: na_app/templates/ishtar/sheet_operation.html:564 +#: na_app/templates/ishtar/sheet_operation.html:581 +#: na_app/templates/ishtar/sheet_operation.html:591 +#: na_app/templates/ishtar/sheet_operation.html:601 +#: na_app/templates/ishtar/sheet_operation.html:618 +#: pdl_app/templates/ishtar/sheet_operation.html:571 +#: pdl_app/templates/ishtar/sheet_operation.html:581 +#: pdl_app/templates/ishtar/sheet_operation.html:598 +#: pdl_app/templates/ishtar/sheet_operation.html:608 +#: pdl_app/templates/ishtar/sheet_operation.html:618 +#: pdl_app/templates/ishtar/sheet_operation.html:635 msgid "Number" msgstr "" -#: archaeological_files/models.py:471 +#: archaeological_files/models.py:573 msgid "Total surface (km²)" msgstr "" -#: archaeological_files/models.py:472 +#: archaeological_files/models.py:574 msgid "Total developed surface (km²)" msgstr "" -#: archaeological_files/models.py:541 archaeological_finds/models_finds.py:1450 +#: archaeological_files/models.py:643 archaeological_finds/models_finds.py:1450 #: archaeological_finds/models_treatments.py:265 #: archaeological_finds/models_treatments.py:1361 -#: archaeological_finds/tests.py:1659 archaeological_operations/models.py:1319 +#: archaeological_finds/tests.py:1699 archaeological_operations/models.py:1319 #: archaeological_operations/models.py:3005 #: archaeological_operations/tests.py:3292 #: archaeological_operations/tests.py:3406 @@ -2727,7 +3050,7 @@ msgctxt "key for text search" msgid "year" msgstr "" -#: archaeological_files/models.py:543 +#: archaeological_files/models.py:645 #: archaeological_finds/models_treatments.py:262 #: archaeological_finds/models_treatments.py:1358 #: archaeological_operations/models.py:456 @@ -2736,18 +3059,18 @@ msgctxt "key for text search" msgid "reference" msgstr "" -#: archaeological_files/models.py:546 archaeological_operations/models.py:3009 +#: archaeological_files/models.py:648 archaeological_operations/models.py:3009 #: ishtar_common/models.py:4925 msgctxt "key for text search" msgid "internal-reference" msgstr "" -#: archaeological_files/models.py:558 archaeological_operations/models.py:1343 +#: archaeological_files/models.py:660 archaeological_operations/models.py:1343 msgctxt "key for text search" msgid "department" msgstr "" -#: archaeological_files/models.py:562 +#: archaeological_files/models.py:664 #: archaeological_finds/models_treatments.py:1355 #: archaeological_operations/models.py:459 #: archaeological_operations/models.py:1347 @@ -2759,7 +3082,7 @@ msgctxt "key for text search" msgid "name" msgstr "" -#: archaeological_files/models.py:568 +#: archaeological_files/models.py:670 #: archaeological_finds/models_treatments.py:268 #: archaeological_finds/models_treatments.py:1364 #: archaeological_operations/models.py:466 @@ -2774,54 +3097,54 @@ msgctxt "key for text search" msgid "type" msgstr "" -#: archaeological_files/models.py:571 +#: archaeological_files/models.py:673 msgctxt "key for text search" msgid "active" msgstr "" -#: archaeological_files/models.py:574 +#: archaeological_files/models.py:676 msgctxt "key for text search" msgid "saisine-type" msgstr "" -#: archaeological_files/models.py:579 +#: archaeological_files/models.py:681 msgctxt "key for text search" msgid "development-type" msgstr "" -#: archaeological_files/models.py:583 +#: archaeological_files/models.py:685 msgctxt "key for text search" msgid "monitoring-justification" msgstr "" -#: archaeological_files/models.py:587 +#: archaeological_files/models.py:689 msgctxt "key for text search" msgid "permit-type" msgstr "" -#: archaeological_files/models.py:592 +#: archaeological_files/models.py:694 msgctxt "key for text search" msgid "permit-reference" msgstr "" -#: archaeological_files/models.py:599 archaeological_finds/models_finds.py:1771 +#: archaeological_files/models.py:701 archaeological_finds/models_finds.py:1771 #: archaeological_finds/models_treatments.py:1367 -#: archaeological_finds/tests.py:1694 +#: archaeological_finds/tests.py:1734 msgctxt "key for text search" msgid "in-charge" msgstr "" -#: archaeological_files/models.py:603 archaeological_operations/models.py:3057 +#: archaeological_files/models.py:705 archaeological_operations/models.py:3057 msgctxt "key for text search" msgid "general-contractor" msgstr "" -#: archaeological_files/models.py:608 archaeological_operations/models.py:3061 +#: archaeological_files/models.py:710 archaeological_operations/models.py:3061 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "" -#: archaeological_files/models.py:657 +#: archaeological_files/models.py:759 #: archaeological_finds/forms_treatments.py:699 #: archaeological_finds/forms_treatments.py:771 #: archaeological_finds/forms_treatments.py:964 @@ -2849,8 +3172,8 @@ msgstr "" #: ishtar_common/models.py:2793 ishtar_common/models.py:3109 #: ishtar_common/models.py:3708 ishtar_common/models.py:4023 #: ishtar_common/models.py:6113 ishtar_common/models_common.py:956 -#: ishtar_common/models_common.py:2427 ishtar_common/models_common.py:3215 -#: ishtar_common/models_common.py:3622 ishtar_common/models_common.py:3688 +#: ishtar_common/models_common.py:2437 ishtar_common/models_common.py:3225 +#: ishtar_common/models_common.py:3632 ishtar_common/models_common.py:3698 #: ishtar_common/models_imports.py:129 ishtar_common/models_imports.py:162 #: ishtar_common/models_imports.py:443 ishtar_common/models_imports.py:813 #: ishtar_common/models_imports.py:831 ishtar_common/models_imports.py:954 @@ -2869,50 +3192,58 @@ msgstr "" #: ishtar_common/templates/ishtar/sheet_organization.html:28 #: ishtar_common/templates/ishtar/sheet_organization.html:56 #: ishtar_common/templates/ishtar/sheet_town.html:63 +#: man_app/templates/ishtar/sheet_find_treatments.html:244 +#: na_app/templates/ishtar/sheet_find.html:522 +#: na_app/templates/ishtar/sheet_operation.html:157 +#: pdl_app/templates/ishtar/sheet_find.html:515 +#: pdl_app/templates/ishtar/sheet_operation.html:160 msgid "Name" msgstr "" -#: archaeological_files/models.py:663 +#: archaeological_files/models.py:765 #: archaeological_finds/models_treatments.py:1417 #: archaeological_finds/models_treatments.py:1697 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:187 #: archaeological_warehouse/forms.py:230 archaeological_warehouse/models.py:393 +#: man_app/templates/ishtar/sheet_find_treatments.html:245 +#: na_app/templates/ishtar/sheet_find.html:523 +#: pdl_app/templates/ishtar/sheet_find.html:516 msgid "Person in charge" msgstr "" -#: archaeological_files/models.py:677 +#: archaeological_files/models.py:779 msgid "General contractor (raw)" msgstr "" -#: archaeological_files/models.py:682 +#: archaeological_files/models.py:784 msgid "General contractor organization" msgstr "" -#: archaeological_files/models.py:692 +#: archaeological_files/models.py:794 msgid "Responsible for planning service" msgstr "" -#: archaeological_files/models.py:696 +#: archaeological_files/models.py:798 msgid "Planning service (raw)" msgstr "" -#: archaeological_files/models.py:703 +#: archaeological_files/models.py:805 msgid "Planning service organization" msgstr "" -#: archaeological_files/models.py:718 +#: archaeological_files/models.py:820 msgid "Main town" msgstr "" -#: archaeological_files/models.py:757 +#: archaeological_files/models.py:859 msgid "Main address" msgstr "" -#: archaeological_files/models.py:759 +#: archaeological_files/models.py:861 msgid "Main address - postal code" msgstr "" -#: archaeological_files/models.py:778 +#: archaeological_files/models.py:880 #: archaeological_finds/forms_treatments.py:91 #: archaeological_finds/forms_treatments.py:227 #: archaeological_finds/forms_treatments.py:480 @@ -2930,23 +3261,23 @@ msgstr "" msgid "Organization" msgstr "" -#: archaeological_files/models.py:836 +#: archaeological_files/models.py:938 msgid "Linear meter" msgstr "" -#: archaeological_files/models.py:840 +#: archaeological_files/models.py:942 msgid "Type of agreement" msgstr "" -#: archaeological_files/models.py:845 +#: archaeological_files/models.py:947 msgid "Operation type for royalties" msgstr "" -#: archaeological_files/models.py:861 +#: archaeological_files/models.py:963 msgid "Imported line" msgstr "" -#: archaeological_files/models.py:881 +#: archaeological_files/models.py:983 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:121 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:220 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:330 @@ -2956,108 +3287,108 @@ msgstr "" msgid "Archaeological files" msgstr "" -#: archaeological_files/models.py:907 +#: archaeological_files/models.py:1009 msgid "FILE" msgstr "" -#: archaeological_files/models.py:1370 +#: archaeological_files/models.py:1472 msgid "Multi-town" msgstr "" -#: archaeological_files/models.py:1376 +#: archaeological_files/models.py:1478 msgid "No town" msgstr "" -#: archaeological_files/models.py:1595 archaeological_operations/models.py:2213 +#: archaeological_files/models.py:1697 archaeological_operations/models.py:2213 msgid "Modify parcels" msgstr "" -#: archaeological_files/models.py:1597 archaeological_operations/models.py:2215 +#: archaeological_files/models.py:1699 archaeological_operations/models.py:2215 msgid "parcels" msgstr "" -#: archaeological_files/models.py:1607 +#: archaeological_files/models.py:1709 msgid "Edit intervention plan" msgstr "" -#: archaeological_files/models.py:1609 +#: archaeological_files/models.py:1711 msgid "plan" msgstr "" -#: archaeological_files/models.py:1618 +#: archaeological_files/models.py:1720 #: archaeological_finds/models_treatments.py:590 #: archaeological_finds/models_treatments.py:1569 #: archaeological_operations/models.py:2251 msgid "Add associated administrative act" msgstr "" -#: archaeological_files/models.py:1620 +#: archaeological_files/models.py:1722 #: archaeological_finds/models_treatments.py:592 #: archaeological_finds/models_treatments.py:1571 #: archaeological_operations/models.py:2253 msgid "admin. act" msgstr "" -#: archaeological_files/models.py:1629 +#: archaeological_files/models.py:1731 msgid "Add operation" msgstr "" -#: archaeological_files/models.py:1631 +#: archaeological_files/models.py:1733 #: archaeological_files/templates/ishtar/blocks/window_file_nav.html:6 #: ishtar_common/admin.py:1879 msgid "operation" msgstr "" -#: archaeological_files/models.py:1706 archaeological_operations/models.py:1596 +#: archaeological_files/models.py:1808 archaeological_operations/models.py:1596 #: archaeological_operations/models.py:3473 ishtar_common/forms_common.py:2664 msgid "File" msgstr "" -#: archaeological_files/models.py:1725 +#: archaeological_files/models.py:1827 msgid "Man by day - planned" msgstr "" -#: archaeological_files/models.py:1727 archaeological_files/models.py:1793 +#: archaeological_files/models.py:1829 archaeological_files/models.py:1895 msgid "Days - planned" msgstr "" -#: archaeological_files/models.py:1729 +#: archaeological_files/models.py:1831 msgid "Man by day - worked" msgstr "" -#: archaeological_files/models.py:1731 archaeological_files/models.py:1797 +#: archaeological_files/models.py:1833 archaeological_files/models.py:1899 msgid "Days - worked" msgstr "" -#: archaeological_files/models.py:1755 +#: archaeological_files/models.py:1857 msgid "Human requirement on field" msgstr "" -#: archaeological_files/models.py:1756 +#: archaeological_files/models.py:1858 msgid "Human requirements on field" msgstr "" -#: archaeological_files/models.py:1774 +#: archaeological_files/models.py:1876 msgid "Human requirement for post-excavation" msgstr "" -#: archaeological_files/models.py:1775 +#: archaeological_files/models.py:1877 msgid "Human requirements for post-excavation" msgstr "" -#: archaeological_files/models.py:1791 +#: archaeological_files/models.py:1893 msgid "Quantity by day - planned" msgstr "" -#: archaeological_files/models.py:1795 +#: archaeological_files/models.py:1897 msgid "Quantity by day - worked" msgstr "" -#: archaeological_files/models.py:1801 +#: archaeological_files/models.py:1903 msgid "Equipment requirement" msgstr "" -#: archaeological_files/models.py:1802 +#: archaeological_files/models.py:1904 msgid "Equipment requirements" msgstr "" @@ -3115,8 +3446,12 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:26 #: archaeological_warehouse/templates/ishtar/sheet_container.html:83 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:76 -#: ishtar_common/models_common.py:4904 +#: ishtar_common/models_common.py:4914 #: ishtar_common/templates/ishtar/sheet_document.html:37 +#: na_app/templates/ishtar/sheet_container.html:90 +#: na_app/templates/ishtar/sheet_find.html:162 +#: na_app/templates/ishtar/sheet_operation.html:143 +#: pdl_app/templates/ishtar/sheet_find.html:150 msgid "Complete identifier" msgstr "" @@ -3138,6 +3473,8 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:184 #: archaeological_operations/templates/ishtar/sheet_operation.html:390 +#: na_app/templates/ishtar/sheet_operation.html:393 +#: pdl_app/templates/ishtar/sheet_operation.html:410 msgid "Associated parcels" msgstr "" @@ -3154,7 +3491,10 @@ msgstr "" #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:300 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:400 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:499 -#: ishtar_common/views.py:187 +#: ishtar_common/views.py:187 na_app/templates/ishtar/sheet_operation.html:398 +#: na_app/templates/ishtar/sheet_operation.html:535 +#: pdl_app/templates/ishtar/sheet_operation.html:415 +#: pdl_app/templates/ishtar/sheet_operation.html:552 msgid "Administrative acts" msgstr "" @@ -3227,6 +3567,8 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:410 #: archaeological_files/templates/ishtar/sheet_file.html:413 #: archaeological_operations/templates/ishtar/sheet_operation.html:227 +#: na_app/templates/ishtar/sheet_operation.html:224 +#: pdl_app/templates/ishtar/sheet_operation.html:227 msgid "Cost" msgstr "" @@ -3238,6 +3580,8 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:217 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:242 #: ishtar_common/models.py:2053 ishtar_common/models.py:2085 +#: na_app/templates/ishtar/sheet_container.html:259 +#: na_app/templates/ishtar/sheet_container.html:283 msgid "Total" msgstr "" @@ -3417,6 +3761,8 @@ msgstr "" #: archaeological_finds/forms.py:405 archaeological_finds/forms.py:1023 #: archaeological_finds/templates/ishtar/sheet_find.html:146 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:146 +#: cd17_app/templates/ishtar/sheet_find.html:154 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:185 msgid "Ownership" msgstr "" @@ -3426,6 +3772,8 @@ msgstr "" #: archaeological_finds/models_finds.py:2317 #: archaeological_finds/templates/ishtar/sheet_find.html:148 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:148 +#: cd17_app/templates/ishtar/sheet_find.html:156 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:187 msgid "Ownership status" msgstr "" @@ -3433,7 +3781,9 @@ msgstr "" #: archaeological_finds/models_finds.py:2321 #: archaeological_finds/templates/ishtar/sheet_find.html:149 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:149 -#: archaeological_operations/models.py:3811 ishtar_common/models.py:4423 +#: archaeological_operations/models.py:3811 +#: cd17_app/templates/ishtar/sheet_find.html:157 ishtar_common/models.py:4423 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:188 msgid "Owner" msgstr "" @@ -3494,6 +3844,8 @@ msgstr "" #: archaeological_finds/models_finds.py:2351 #: archaeological_finds/templates/ishtar/sheet_find.html:169 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:169 +#: cd17_app/templates/ishtar/sheet_find.html:177 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:208 msgid "Donors, testators or vendors" msgstr "" @@ -3501,6 +3853,8 @@ msgstr "" #: archaeological_finds/models_finds.py:2367 #: archaeological_finds/templates/ishtar/sheet_find.html:158 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:158 +#: cd17_app/templates/ishtar/sheet_find.html:166 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:197 msgid "Collections" msgstr "" @@ -3703,6 +4057,11 @@ msgstr "" #: archaeological_finds/forms.py:2398 #: archaeological_finds/templates/ishtar/sheet_find.html:193 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:193 +#: cd17_app/templates/ishtar/sheet_find.html:201 +#: man_app/templates/ishtar/sheet_museum_find.html:195 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:232 +#: na_app/templates/ishtar/sheet_find.html:217 +#: pdl_app/templates/ishtar/sheet_find.html:210 msgid "Weight (g)" msgstr "" @@ -3749,6 +4108,7 @@ msgstr "" #: archaeological_finds/forms.py:731 archaeological_finds/models_finds.py:619 #: archaeological_finds/templates/ishtar/sheet_basefind.html:51 +#: man_app/templates/ishtar/sheet_basefind.html:47 msgid "Comment on the circumstances of discovery" msgstr "" @@ -3760,12 +4120,14 @@ msgstr "" #: archaeological_finds/forms.py:741 archaeological_finds/forms.py:1850 #: archaeological_finds/models_finds.py:630 #: archaeological_finds/templates/ishtar/sheet_basefind.html:33 +#: man_app/templates/ishtar/sheet_basefind.html:29 msgid "Discovery date (exact or beginning)" msgstr "" #: archaeological_finds/forms.py:744 archaeological_finds/forms.py:1851 #: archaeological_finds/models_finds.py:633 #: archaeological_finds/templates/ishtar/sheet_basefind.html:35 +#: man_app/templates/ishtar/sheet_basefind.html:31 msgid "Discovery date (end)" msgstr "" @@ -3837,6 +4199,9 @@ msgstr "" #: archaeological_finds/forms.py:1027 archaeological_finds/forms.py:1502 #: archaeological_finds/forms.py:1673 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:14 +#: man_app/templates/ishtar/sheet_find_treatments.html:15 +#: na_app/templates/ishtar/sheet_find.html:295 +#: pdl_app/templates/ishtar/sheet_find.html:288 msgid "Preservation" msgstr "" @@ -3860,6 +4225,9 @@ msgstr "" #: archaeological_finds/forms.py:1941 archaeological_finds/models_finds.py:1330 #: archaeological_finds/models_finds.py:2395 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:18 +#: man_app/templates/ishtar/sheet_find_treatments.html:19 +#: na_app/templates/ishtar/sheet_find.html:299 +#: pdl_app/templates/ishtar/sheet_find.html:292 msgid "Conservatory states" msgstr "" @@ -3906,6 +4274,7 @@ msgstr "" #: archaeological_finds/forms.py:1951 archaeological_finds/models_finds.py:1349 #: archaeological_finds/models_finds.py:2429 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:24 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:70 msgid "Insurance value" msgstr "" @@ -3947,7 +4316,7 @@ msgstr "" #: archaeological_finds/forms.py:1459 archaeological_finds/forms.py:2505 #: ishtar_common/models.py:1089 ishtar_common/models.py:2175 -#: ishtar_common/models.py:4415 ishtar_common/models_common.py:3216 +#: ishtar_common/models.py:4415 ishtar_common/models_common.py:3226 #: ishtar_common/models_imports.py:163 ishtar_common/models_imports.py:444 #: ishtar_common/models_imports.py:832 ishtar_common/models_imports.py:3041 msgid "Slug" @@ -4093,6 +4462,8 @@ msgstr "" #: archaeological_finds/models_finds.py:1327 #: archaeological_operations/templates/ishtar/sheet_operation.html:577 #: archaeological_warehouse/forms.py:587 +#: na_app/templates/ishtar/sheet_operation.html:581 +#: pdl_app/templates/ishtar/sheet_operation.html:598 msgid "Material type" msgstr "" @@ -4100,6 +4471,8 @@ msgstr "" #: archaeological_finds/models_finds.py:1328 #: archaeological_operations/templates/ishtar/sheet_operation.html:587 #: archaeological_warehouse/forms.py:593 ishtar_common/models_imports.py:1103 +#: na_app/templates/ishtar/sheet_operation.html:591 +#: pdl_app/templates/ishtar/sheet_operation.html:608 msgid "Object type" msgstr "" @@ -4211,6 +4584,9 @@ msgstr "" #: archaeological_finds/models_finds.py:2231 #: archaeological_finds/templates/ishtar/sheet_find_containers.html:4 #: ishtar_common/forms_common.py:2096 +#: man_app/templates/ishtar/sheet_find_treatments.html:36 +#: na_app/templates/ishtar/sheet_find.html:316 +#: pdl_app/templates/ishtar/sheet_find.html:309 msgid "Reference container" msgstr "" @@ -4221,6 +4597,10 @@ msgstr "" #: archaeological_finds/forms.py:2108 archaeological_finds/models_finds.py:1285 #: archaeological_finds/templates/ishtar/sheet_find_containers.html:29 #: ishtar_common/forms_common.py:2088 +#: man_app/templates/ishtar/sheet_find_treatments.html:61 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:41 +#: na_app/templates/ishtar/sheet_find.html:341 +#: pdl_app/templates/ishtar/sheet_find.html:334 msgid "Current container" msgstr "" @@ -4264,22 +4644,6 @@ msgstr "" msgid "Find basket" msgstr "" -#: archaeological_finds/forms.py:2503 -#: archaeological_finds/forms_treatments.py:57 -#: archaeological_finds/forms_treatments.py:67 -#: archaeological_finds/forms_treatments.py:194 -#: archaeological_finds/models_treatments.py:356 -#: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 -#: archaeological_finds/templates/ishtar/sheet_find_treatments.html:61 -#: archaeological_finds/templates/ishtar/sheet_find_treatments.html:99 -#: ishtar_common/forms_common.py:2026 ishtar_common/models.py:1015 -#: ishtar_common/models.py:1935 ishtar_common/models.py:4413 -#: ishtar_common/models_common.py:181 ishtar_common/models_common.py:232 -#: ishtar_common/models_common.py:2188 ishtar_common/models_common.py:2204 -#: ishtar_common/models_imports.py:706 -msgid "Label" -msgstr "" - #: archaeological_finds/forms.py:2545 archaeological_finds/forms.py:2600 msgid "A basket with this slug already exists." msgstr "" @@ -4312,6 +4676,9 @@ msgstr "" #: ishtar_common/forms_common.py:2515 ishtar_common/forms_common.py:2800 #: ishtar_common/models.py:2533 #: ishtar_common/templates/ishtar/sheet_document.html:40 +#: man_app/templates/ishtar/sheet_find_treatments.html:231 +#: na_app/templates/ishtar/sheet_find.html:432 +#: pdl_app/templates/ishtar/sheet_find.html:425 msgid "Reference" msgstr "" @@ -4529,6 +4896,16 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 #: ishtar_common/forms_common.py:2654 ishtar_common/forms_common.py:2866 #: ishtar_common/templates/ishtar/sheet_document.html:103 +#: man_app/templates/ishtar/sheet_find_treatments.html:124 +#: man_app/templates/ishtar/sheet_find_treatments.html:162 +#: man_app/templates/ishtar/sheet_find_treatments.html:201 +#: na_app/templates/ishtar/sheet_container.html:4 +#: na_app/templates/ishtar/sheet_find.html:402 +#: na_app/templates/ishtar/sheet_find.html:449 +#: na_app/templates/ishtar/sheet_find.html:487 +#: pdl_app/templates/ishtar/sheet_find.html:395 +#: pdl_app/templates/ishtar/sheet_find.html:442 +#: pdl_app/templates/ishtar/sheet_find.html:480 msgid "Container" msgstr "" @@ -4586,6 +4963,9 @@ msgstr "" #: archaeological_finds/models_treatments.py:1425 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:188 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:61 +#: man_app/templates/ishtar/sheet_find_treatments.html:246 +#: na_app/templates/ishtar/sheet_find.html:524 +#: pdl_app/templates/ishtar/sheet_find.html:517 msgid "Applicant" msgstr "" @@ -4594,6 +4974,9 @@ msgstr "" #: archaeological_finds/models_treatments.py:1433 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:189 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:69 +#: man_app/templates/ishtar/sheet_find_treatments.html:247 +#: na_app/templates/ishtar/sheet_find.html:525 +#: pdl_app/templates/ishtar/sheet_find.html:518 msgid "Applicant organisation" msgstr "" @@ -5190,8 +5573,8 @@ msgctxt "key for text search" msgid "denomination" msgstr "" -#: archaeological_finds/models_finds.py:1458 archaeological_finds/tests.py:1588 -#: archaeological_finds/tests.py:1801 archaeological_warehouse/models.py:966 +#: archaeological_finds/models_finds.py:1458 archaeological_finds/tests.py:1628 +#: archaeological_finds/tests.py:1841 archaeological_warehouse/models.py:966 msgctxt "key for text search" msgid "code-patriarche" msgstr "" @@ -5243,8 +5626,8 @@ msgctxt "key for text search" msgid "context-record-relation-type" msgstr "" -#: archaeological_finds/models_finds.py:1509 archaeological_finds/tests.py:1495 -#: archaeological_finds/tests.py:1799 archaeological_warehouse/models.py:1001 +#: archaeological_finds/models_finds.py:1509 archaeological_finds/tests.py:1535 +#: archaeological_finds/tests.py:1839 archaeological_warehouse/models.py:1001 msgctxt "key for text search" msgid "material" msgstr "" @@ -5261,7 +5644,7 @@ msgctxt "key for text search" msgid "recommended-treatments" msgstr "" -#: archaeological_finds/models_finds.py:1522 archaeological_finds/tests.py:1742 +#: archaeological_finds/models_finds.py:1522 archaeological_finds/tests.py:1782 #: archaeological_warehouse/models.py:1013 msgctxt "key for text search" msgid "conservatory" @@ -5324,12 +5707,12 @@ msgid "last-modified-by" msgstr "" #: archaeological_finds/models_finds.py:1572 -#: ishtar_common/models_common.py:1711 +#: ishtar_common/models_common.py:1721 msgctxt "key for text search" msgid "created-by" msgstr "" -#: archaeological_finds/models_finds.py:1575 archaeological_finds/tests.py:1821 +#: archaeological_finds/models_finds.py:1575 archaeological_finds/tests.py:1861 msgctxt "key for text search" msgid "loan" msgstr "" @@ -5582,7 +5965,7 @@ msgctxt "key for text search" msgid "technical-process" msgstr "" -#: archaeological_finds/models_finds.py:1767 archaeological_finds/tests.py:1682 +#: archaeological_finds/models_finds.py:1767 archaeological_finds/tests.py:1722 msgctxt "key for text search" msgid "operation-address" msgstr "" @@ -5593,7 +5976,7 @@ msgctxt "key for text search" msgid "scientist" msgstr "" -#: archaeological_finds/models_finds.py:1779 archaeological_finds/tests.py:1608 +#: archaeological_finds/models_finds.py:1779 archaeological_finds/tests.py:1648 #: archaeological_operations/models.py:1370 #: archaeological_operations/tests.py:3098 #: archaeological_operations/tests.py:3799 @@ -5757,11 +6140,17 @@ msgstr "" #: archaeological_finds/models_finds.py:2201 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:56 +#: man_app/templates/ishtar/sheet_find_treatments.html:114 +#: na_app/templates/ishtar/sheet_find.html:439 +#: pdl_app/templates/ishtar/sheet_find.html:432 msgid "Upstream treatment" msgstr "" #: archaeological_finds/models_finds.py:2208 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:94 +#: man_app/templates/ishtar/sheet_find_treatments.html:152 +#: na_app/templates/ishtar/sheet_find.html:477 +#: pdl_app/templates/ishtar/sheet_find.html:470 msgid "Downstream treatment" msgstr "" @@ -5797,6 +6186,8 @@ msgstr "" #: archaeological_finds/models_finds.py:2372 #: archaeological_finds/templates/ishtar/sheet_find.html:159 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:159 +#: cd17_app/templates/ishtar/sheet_find.html:167 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:198 msgid "Former collection" msgstr "" @@ -5858,11 +6249,17 @@ msgstr "" #: archaeological_finds/models_finds.py:3890 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:167 +#: man_app/templates/ishtar/sheet_find_treatments.html:225 +#: na_app/templates/ishtar/sheet_find.html:426 +#: pdl_app/templates/ishtar/sheet_find.html:419 msgid "Current" msgstr "" #: archaeological_finds/models_finds.py:3892 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:167 +#: man_app/templates/ishtar/sheet_find_treatments.html:225 +#: na_app/templates/ishtar/sheet_find.html:426 +#: pdl_app/templates/ishtar/sheet_find.html:419 msgid "Reference/current" msgstr "" @@ -6047,6 +6444,14 @@ msgstr "" #: archaeological_finds/models_treatments.py:1052 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:65 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:103 +#: man_app/templates/ishtar/sheet_find_treatments.html:123 +#: man_app/templates/ishtar/sheet_find_treatments.html:161 +#: na_app/templates/ishtar/sheet_find.html:401 +#: na_app/templates/ishtar/sheet_find.html:448 +#: na_app/templates/ishtar/sheet_find.html:486 +#: pdl_app/templates/ishtar/sheet_find.html:394 +#: pdl_app/templates/ishtar/sheet_find.html:441 +#: pdl_app/templates/ishtar/sheet_find.html:479 msgid "Doer" msgstr "" @@ -6095,6 +6500,9 @@ msgstr "" #: archaeological_finds/models_treatments.py:1491 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:180 +#: man_app/templates/ishtar/sheet_find_treatments.html:238 +#: na_app/templates/ishtar/sheet_find.html:516 +#: pdl_app/templates/ishtar/sheet_find.html:509 msgid "Treatment requests" msgstr "" @@ -6174,14 +6582,17 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:10 #: ishtar_common/templates/ishtar/blocks/sheet_external_id.html:3 +#: man_app/templates/ishtar/sheet_basefind.html:7 msgid "Internal ID" msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:27 +#: man_app/templates/ishtar/sheet_basefind.html:23 msgid "Discovery date" msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:30 +#: man_app/templates/ishtar/sheet_basefind.html:26 msgid "Discovery year" msgstr "" @@ -6192,6 +6603,11 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:14 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:14 +#: cd17_app/templates/ishtar/sheet_find.html:14 +#: man_app/templates/ishtar/sheet_museum_find.html:14 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:14 +#: na_app/templates/ishtar/sheet_find.html:14 +#: pdl_app/templates/ishtar/sheet_find.html:14 msgid "" "This sheet has a downstream treatment: it is related to an old version of " "the find." @@ -6199,38 +6615,70 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:49 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:49 +#: cd17_app/templates/ishtar/sheet_find.html:49 +#: man_app/templates/ishtar/sheet_museum_find.html:48 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:88 msgid "Archaeological context" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:56 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:56 +#: cd17_app/templates/ishtar/sheet_find.html:56 +#: man_app/templates/ishtar/sheet_museum_find.html:56 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:95 +#: na_app/templates/ishtar/sheet_find.html:55 +#: pdl_app/templates/ishtar/sheet_find.html:55 msgid "Preservation / Treatments" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:154 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:154 +#: cd17_app/templates/ishtar/sheet_find.html:162 +#: man_app/templates/ishtar/sheet_museum_find.html:147 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:193 +#: na_app/templates/ishtar/sheet_find.html:227 +#: pdl_app/templates/ishtar/sheet_find.html:220 msgid "Museum / legal status" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:166 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:166 +#: cd17_app/templates/ishtar/sheet_find.html:174 +#: man_app/templates/ishtar/sheet_museum_find.html:159 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:205 +#: na_app/templates/ishtar/sheet_find.html:239 +#: pdl_app/templates/ishtar/sheet_find.html:232 msgid "Museum entry date" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:254 +#: archaeological_finds/templates/ishtar/sheet_find.html:257 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:254 +#: cd17_app/templates/ishtar/sheet_find.html:265 +#: man_app/templates/ishtar/sheet_museum_find.html:256 +#: museescorse_app/templates/ishtar/sheet_museum_find.html:293 +#: na_app/templates/ishtar/sheet_find.html:276 +#: pdl_app/templates/ishtar/sheet_find.html:269 msgid "Checked" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_containers.html:30 +#: man_app/templates/ishtar/sheet_find_treatments.html:62 +#: na_app/templates/ishtar/sheet_find.html:342 +#: pdl_app/templates/ishtar/sheet_find.html:335 msgid "Reference container / current container" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:31 +#: man_app/templates/ishtar/sheet_find_treatments.html:32 +#: na_app/templates/ishtar/sheet_find.html:312 +#: pdl_app/templates/ishtar/sheet_find.html:305 msgid "Warehouse - container" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:48 +#: man_app/templates/ishtar/sheet_find_treatments.html:106 +#: na_app/templates/ishtar/sheet_find.html:386 +#: pdl_app/templates/ishtar/sheet_find.html:379 msgid "Container information not available." msgstr "" @@ -6238,12 +6686,33 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:98 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:138 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:184 +#: man_app/templates/ishtar/sheet_find_treatments.html:118 +#: man_app/templates/ishtar/sheet_find_treatments.html:156 +#: man_app/templates/ishtar/sheet_find_treatments.html:196 +#: man_app/templates/ishtar/sheet_find_treatments.html:242 +#: na_app/templates/ishtar/sheet_find.html:397 +#: na_app/templates/ishtar/sheet_find.html:443 +#: na_app/templates/ishtar/sheet_find.html:481 +#: na_app/templates/ishtar/sheet_find.html:520 +#: pdl_app/templates/ishtar/sheet_find.html:390 +#: pdl_app/templates/ishtar/sheet_find.html:436 +#: pdl_app/templates/ishtar/sheet_find.html:474 +#: pdl_app/templates/ishtar/sheet_find.html:513 msgid "Year - index" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:64 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:102 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:141 +#: man_app/templates/ishtar/sheet_find_treatments.html:122 +#: man_app/templates/ishtar/sheet_find_treatments.html:160 +#: man_app/templates/ishtar/sheet_find_treatments.html:199 +#: na_app/templates/ishtar/sheet_find.html:400 +#: na_app/templates/ishtar/sheet_find.html:447 +#: na_app/templates/ishtar/sheet_find.html:485 +#: pdl_app/templates/ishtar/sheet_find.html:393 +#: pdl_app/templates/ishtar/sheet_find.html:440 +#: pdl_app/templates/ishtar/sheet_find.html:478 msgid "Related finds (max. 15 displayed)" msgstr "" @@ -6253,6 +6722,9 @@ msgstr "" #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:48 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:51 +#: man_app/templates/ishtar/sheet_find_treatments.html:148 +#: na_app/templates/ishtar/sheet_find.html:473 +#: pdl_app/templates/ishtar/sheet_find.html:466 msgid "Export as CSV" msgstr "" @@ -6262,27 +6734,49 @@ msgstr "" #: ishtar_common/templates/blocks/JQueryJqGrid.html:29 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:48 +#: man_app/templates/ishtar/sheet_find_treatments.html:148 +#: man_app/templates/ishtar/sheet_find_treatments.html:187 +#: na_app/templates/ishtar/sheet_find.html:473 +#: na_app/templates/ishtar/sheet_find.html:512 +#: pdl_app/templates/ishtar/sheet_find.html:466 +#: pdl_app/templates/ishtar/sheet_find.html:505 msgid "CSV" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:134 +#: man_app/templates/ishtar/sheet_find_treatments.html:192 +#: na_app/templates/ishtar/sheet_find.html:393 +#: pdl_app/templates/ishtar/sheet_find.html:386 msgid "Simple treatments" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:139 +#: man_app/templates/ishtar/sheet_find_treatments.html:197 +#: na_app/templates/ishtar/sheet_find.html:398 +#: pdl_app/templates/ishtar/sheet_find.html:391 msgid "Label/type" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:142 +#: man_app/templates/ishtar/sheet_find_treatments.html:200 msgid "Organization/responsible" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:144 +#: man_app/templates/ishtar/sheet_find_treatments.html:202 +#: na_app/templates/ishtar/sheet_find.html:403 +#: pdl_app/templates/ishtar/sheet_find.html:396 msgid "Date start/end" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:166 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:172 +#: man_app/templates/ishtar/sheet_find_treatments.html:224 +#: man_app/templates/ishtar/sheet_find_treatments.html:230 +#: na_app/templates/ishtar/sheet_find.html:425 +#: na_app/templates/ishtar/sheet_find.html:431 +#: pdl_app/templates/ishtar/sheet_find.html:418 +#: pdl_app/templates/ishtar/sheet_find.html:424 msgid "First packaging" msgstr "" @@ -6307,6 +6801,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:31 #: ishtar_common/forms_common.py:2285 #: ishtar_common/templates/ishtar/sheet_document.html:58 +#: na_app/templates/ishtar/sheet_container.html:35 msgid "Content" msgstr "" @@ -6381,24 +6876,6 @@ msgstr "" msgid "The division {} {} do not exist for the location {}." msgstr "" -#: archaeological_finds/tests.py:1824 archaeological_finds/tests.py:1850 -#: archaeological_finds/tests.py:1860 archaeological_operations/tests.py:3371 -#: ishtar_common/forms.py:1353 ishtar_common/forms.py:1445 -#: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 -#: ishtar_common/templatetags/window_field.py:19 -#: ishtar_common/views_item.py:788 ishtar_common/views_item.py:1061 -#: ishtar_common/views_item.py:1098 ishtar_common/wizards.py:511 -#: views_item.py:785 views_item.py:1058 views_item.py:1095 -msgid "Yes" -msgstr "" - -#: archaeological_finds/tests.py:1825 archaeological_finds/tests.py:1851 -#: archaeological_finds/tests.py:1861 ishtar_common/forms.py:1354 -#: ishtar_common/forms.py:1447 ishtar_common/templatetags/window_field.py:24 -#: ishtar_common/wizards.py:513 -msgid "No" -msgstr "" - #: archaeological_finds/views.py:335 msgid "Basket modify" msgstr "" @@ -6521,6 +6998,8 @@ msgstr "" #: archaeological_operations/models.py:3508 #: archaeological_operations/templates/ishtar/sheet_operation.html:536 #: ishtar_common/templates/ishtar/forms/modify_parcels.html:27 +#: na_app/templates/ishtar/sheet_operation.html:541 +#: pdl_app/templates/ishtar/sheet_operation.html:558 msgid "Parcels" msgstr "" @@ -6628,6 +7107,8 @@ msgstr "" #: archaeological_operations/forms.py:707 #: archaeological_operations/models.py:1675 #: archaeological_operations/templates/ishtar/sheet_operation.html:161 +#: na_app/templates/ishtar/sheet_operation.html:158 +#: pdl_app/templates/ishtar/sheet_operation.html:161 msgid "Address / Locality" msgstr "" @@ -6723,6 +7204,8 @@ msgstr "" #: archaeological_operations/forms.py:1713 #: archaeological_operations/models.py:1719 #: archaeological_operations/templates/ishtar/sheet_operation.html:256 +#: na_app/templates/ishtar/sheet_operation.html:254 +#: pdl_app/templates/ishtar/sheet_operation.html:268 msgid "Documentation deposit date" msgstr "" @@ -6743,6 +7226,8 @@ msgstr "" #: archaeological_operations/forms.py:1720 #: archaeological_operations/models.py:1726 #: archaeological_operations/templates/ishtar/sheet_operation.html:264 +#: na_app/templates/ishtar/sheet_operation.html:262 +#: pdl_app/templates/ishtar/sheet_operation.html:287 msgid "Finds deposit date" msgstr "" @@ -6768,12 +7253,6 @@ msgstr "" msgid "Actors" msgstr "" -#: archaeological_operations/forms.py:729 -#: archaeological_operations/models.py:1565 -#: archaeological_operations/models.py:3176 -msgid "Head scientist" -msgstr "" - #: archaeological_operations/forms.py:751 #: archaeological_operations/forms.py:1335 #: archaeological_operations/forms.py:1723 @@ -6839,6 +7318,8 @@ msgstr "" #: archaeological_operations/forms.py:935 #: archaeological_operations/templates/ishtar/sheet_operation.html:324 +#: na_app/templates/ishtar/sheet_operation.html:330 +#: pdl_app/templates/ishtar/sheet_operation.html:347 msgid "Court-ordered seizure" msgstr "" @@ -7352,7 +7833,8 @@ msgstr "" #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:236 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:344 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:443 -#: ishtar_common/views.py:172 +#: ishtar_common/views.py:172 na_app/templates/ishtar/sheet_operation.html:372 +#: pdl_app/templates/ishtar/sheet_operation.html:389 msgid "Archaeological sites" msgstr "" @@ -7370,8 +7852,7 @@ msgstr "" #: archaeological_operations/models.py:983 ishtar_common/forms.py:1352 #: ishtar_common/models.py:6152 ishtar_common/models.py:6313 -#: ishtar_common/models.py:6373 ishtar_common/views_item.py:2039 -#: views_item.py:2037 +#: ishtar_common/models.py:6373 ishtar_common/views_item.py:2049 msgid "Unknown" msgstr "" @@ -7540,7 +8021,7 @@ msgctxt "key for text search" msgid "file" msgstr "" -#: archaeological_operations/models.py:1607 ishtar_common/models_common.py:3623 +#: archaeological_operations/models.py:1607 ishtar_common/models_common.py:3633 msgid "Surface (m2)" msgstr "" @@ -7839,8 +8320,8 @@ msgstr "" #: archaeological_operations/models.py:3503 ishtar_common/models.py:2808 #: ishtar_common/models.py:3125 ishtar_common/models.py:4558 -#: ishtar_common/models_common.py:3649 ishtar_common/models_common.py:3688 -#: ishtar_common/models_common.py:4897 +#: ishtar_common/models_common.py:3659 ishtar_common/models_common.py:3698 +#: ishtar_common/models_common.py:4907 msgid "Cached name" msgstr "" @@ -7877,11 +8358,14 @@ msgid "No parcel" msgstr "" #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:28 +#: cd93_app/templates/ishtar/sheet_administrativeact.html:28 #: ishtar_common/templates/ishtar/sheet_document.html:28 msgid "View PDF" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:54 +#: na_app/templates/ishtar/sheet_operation.html:53 +#: pdl_app/templates/ishtar/sheet_operation.html:53 msgid "Archaeological sites/parcels/Administrativ acts" msgstr "" @@ -7895,7 +8379,12 @@ msgstr "" #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:244 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:351 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:450 -#: ishtar_common/views.py:175 +#: ishtar_common/views.py:175 na_app/templates/ishtar/sheet_operation.html:80 +#: na_app/templates/ishtar/sheet_operation.html:448 +#: na_app/templates/ishtar/sheet_operation.html:546 +#: pdl_app/templates/ishtar/sheet_operation.html:80 +#: pdl_app/templates/ishtar/sheet_operation.html:465 +#: pdl_app/templates/ishtar/sheet_operation.html:563 msgid "Context records" msgstr "" @@ -7906,35 +8395,61 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:38 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:174 #: ishtar_common/templates/blocks/DataTables-tabs.html:30 +#: na_app/templates/ishtar/sheet_container.html:42 +#: na_app/templates/ishtar/sheet_container.html:222 +#: na_app/templates/ishtar/sheet_operation.html:116 +#: na_app/templates/ishtar/sheet_operation.html:515 +#: pdl_app/templates/ishtar/sheet_operation.html:116 +#: pdl_app/templates/ishtar/sheet_operation.html:532 msgid "Statistics" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:166 +#: na_app/templates/ishtar/sheet_operation.html:163 +#: pdl_app/templates/ishtar/sheet_operation.html:166 msgid "Excavation dates (start/end)" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:235 +#: na_app/templates/ishtar/sheet_operation.html:232 +#: pdl_app/templates/ishtar/sheet_operation.html:235 msgid "Duration" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:298 +#: na_app/templates/ishtar/sheet_operation.html:304 +#: pdl_app/templates/ishtar/sheet_operation.html:321 msgid "This operation is virtual." msgstr "" +#: archaeological_operations/templates/ishtar/sheet_operation.html:305 +#: na_app/templates/ishtar/sheet_operation.html:311 +#: pdl_app/templates/ishtar/sheet_operation.html:328 +msgid "Patriarche OA code not yet recorded!" +msgstr "" + #: archaeological_operations/templates/ishtar/sheet_operation.html:432 +#: na_app/templates/ishtar/sheet_operation.html:439 +#: pdl_app/templates/ishtar/sheet_operation.html:456 msgid "No relations" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:453 +#: na_app/templates/ishtar/sheet_operation.html:458 +#: pdl_app/templates/ishtar/sheet_operation.html:475 msgid "Documents from associated context records" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:459 +#: na_app/templates/ishtar/sheet_operation.html:463 +#: pdl_app/templates/ishtar/sheet_operation.html:480 msgid "Diagram of stratigraphic relations" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:487 #: archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html:8 +#: na_app/templates/ishtar/sheet_operation.html:492 +#: pdl_app/templates/ishtar/sheet_operation.html:509 msgid "Associated containers" msgstr "" @@ -7948,26 +8463,39 @@ msgstr "" #: ishtar_common/templates/ishtar/blocks/window_nav.html:86 #: ishtar_common/templates/ishtar/blocks/window_nav.html:92 #: ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html:46 +#: na_app/templates/ishtar/sheet_container.html:227 +#: na_app/templates/ishtar/sheet_operation.html:520 +#: pdl_app/templates/ishtar/sheet_operation.html:537 msgid "Export" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:520 #: archaeological_warehouse/templates/ishtar/sheet_container.html:227 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:190 +#: na_app/templates/ishtar/sheet_container.html:232 +#: na_app/templates/ishtar/sheet_operation.html:525 +#: pdl_app/templates/ishtar/sheet_operation.html:542 msgid "Regenerate statistics" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:525 #: archaeological_warehouse/templates/ishtar/sheet_container.html:232 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:195 +#: na_app/templates/ishtar/sheet_container.html:237 +#: na_app/templates/ishtar/sheet_operation.html:530 +#: pdl_app/templates/ishtar/sheet_operation.html:547 msgid "Last update:" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:606 +#: na_app/templates/ishtar/sheet_operation.html:610 +#: pdl_app/templates/ishtar/sheet_operation.html:627 msgid "Sources" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:624 +#: na_app/templates/ishtar/sheet_operation.html:628 +#: pdl_app/templates/ishtar/sheet_operation.html:645 msgid "Finds by context records" msgstr "" @@ -8004,7 +8532,7 @@ msgstr "" msgid "This item has been locked. Edition is disabled." msgstr "" -#: archaeological_operations/tests.py:3376 ishtar_common/models_common.py:1719 +#: archaeological_operations/tests.py:3376 ishtar_common/models_common.py:1729 msgctxt "key for text search" msgid "created" msgstr "" @@ -8135,6 +8663,7 @@ msgstr "" #: archaeological_warehouse/forms.py:138 archaeological_warehouse/models.py:408 #: archaeological_warehouse/templates/ishtar/sheet_container.html:190 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:142 +#: na_app/templates/ishtar/sheet_container.html:195 msgid "Divisions" msgstr "" @@ -8178,27 +8707,27 @@ msgid "" msgstr "" #: archaeological_warehouse/forms.py:253 ishtar_common/forms_common.py:785 -#: ishtar_common/forms_common.py:1204 ishtar_common/models_common.py:4162 -#: ishtar_common/models_common.py:4372 +#: ishtar_common/forms_common.py:1204 ishtar_common/models_common.py:4172 +#: ishtar_common/models_common.py:4382 msgid "Address complement" msgstr "" #: archaeological_warehouse/forms.py:256 ishtar_common/forms_common.py:788 -#: ishtar_common/forms_common.py:1207 ishtar_common/models_common.py:4167 +#: ishtar_common/forms_common.py:1207 ishtar_common/models_common.py:4177 #: ishtar_common/templates/ishtar/sheet_person.html:57 #: ishtar_common/templates/ishtar/sheet_person.html:77 msgid "Town (freeform)" msgstr "" #: archaeological_warehouse/forms.py:258 ishtar_common/forms_common.py:790 -#: ishtar_common/forms_common.py:1209 ishtar_common/models_common.py:4173 +#: ishtar_common/forms_common.py:1209 ishtar_common/models_common.py:4183 msgid "Country" msgstr "" #: archaeological_warehouse/forms.py:259 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:124 #: ishtar_common/forms_common.py:792 ishtar_common/forms_common.py:1180 -#: ishtar_common/models_common.py:4187 ishtar_common/models_common.py:4384 +#: ishtar_common/models_common.py:4197 ishtar_common/models_common.py:4394 #: ishtar_common/templates/ishtar/sheet_person.html:27 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:35 msgid "Phone" @@ -8207,7 +8736,7 @@ msgstr "" #: archaeological_warehouse/forms.py:261 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:125 #: ishtar_common/forms_common.py:794 ishtar_common/forms_common.py:1190 -#: ishtar_common/models_common.py:4203 +#: ishtar_common/models_common.py:4213 #: ishtar_common/templates/ishtar/sheet_person.html:45 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:56 msgid "Mobile phone" @@ -8240,6 +8769,7 @@ msgstr "" #: archaeological_warehouse/models.py:1179 #: archaeological_warehouse/templates/ishtar/sheet_container.html:154 #: ishtar_common/models_imports.py:1095 +#: na_app/templates/ishtar/sheet_container.html:161 msgid "Container type" msgstr "" @@ -8390,7 +8920,7 @@ msgstr "" #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:284 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:386 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:485 -#: ishtar_common/views.py:183 +#: ishtar_common/views.py:183 na_app/templates/ishtar/sheet_container.html:197 msgid "Containers" msgstr "" @@ -8670,50 +9200,61 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:108 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:90 +#: na_app/templates/ishtar/sheet_container.html:115 msgid "Number of containers" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:112 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:94 +#: na_app/templates/ishtar/sheet_container.html:119 msgid "Number of divisions" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:116 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:98 +#: na_app/templates/ishtar/sheet_container.html:123 msgid "Number of owned finds" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:120 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:102 +#: na_app/templates/ishtar/sheet_container.html:127 msgid "Number of hosted finds" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:129 +#: na_app/templates/ishtar/sheet_container.html:136 msgid "Measured weight (kg)" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:130 +#: na_app/templates/ishtar/sheet_container.html:137 msgid "Calculated weight (kg)" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:134 +#: na_app/templates/ishtar/sheet_container.html:141 #, python-format msgid "Calculated weight and measured weight are too different (over 10%%)." msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:209 +#: na_app/templates/ishtar/sheet_container.html:214 msgid "Empty" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:240 +#: na_app/templates/ishtar/sheet_container.html:245 msgid "No container/division inside this container." msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:246 +#: na_app/templates/ishtar/sheet_container.html:251 msgid "Finds by location" msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:270 +#: na_app/templates/ishtar/sheet_container.html:275 msgid "Containers by location" msgstr "" @@ -8879,13 +9420,12 @@ msgid "Export selected as CSV file" msgstr "" #: ishtar_common/admin.py:204 ishtar_common/models_imports.py:943 -#: ishtar_common/views_item.py:789 ishtar_common/views_item.py:1857 -#: views_item.py:786 views_item.py:1855 +#: ishtar_common/views_item.py:799 ishtar_common/views_item.py:1867 msgid "True" msgstr "" #: ishtar_common/admin.py:204 ishtar_common/models_imports.py:943 -#: ishtar_common/views_item.py:1859 views_item.py:1857 +#: ishtar_common/views_item.py:1869 msgid "False" msgstr "" @@ -9144,7 +9684,7 @@ msgstr "" msgid "No json file found in zipfile" msgstr "" -#: ishtar_common/admin.py:1402 ishtar_common/models_common.py:3747 +#: ishtar_common/admin.py:1402 ishtar_common/models_common.py:3757 msgid "Town limit" msgstr "" @@ -9378,11 +9918,6 @@ msgstr "" msgid "Update table, export format and types from source" msgstr "" -#: ishtar_common/admin.py:3130 -msgid "" -"Document not generated: is the LibreOffice daemon configured and running?" -msgstr "" - #: ishtar_common/admin.py:3150 msgid "Generate match document" msgstr "" @@ -9488,184 +10023,184 @@ msgstr "" msgid "changelog" msgstr "" -#: ishtar_common/data_importer.py:283 +#: ishtar_common/data_importer.py:290 #, python-format msgid "\"%(value)s\" is too long. The max length is %(length)d characters." msgstr "" -#: ishtar_common/data_importer.py:302 +#: ishtar_common/data_importer.py:309 #, python-format msgid "\"%(value)s\" not equal to yes or no" msgstr "" -#: ishtar_common/data_importer.py:314 +#: ishtar_common/data_importer.py:321 #, python-format msgid "\"%(value)s\" is not a float" msgstr "" -#: ishtar_common/data_importer.py:324 +#: ishtar_common/data_importer.py:331 #, python-brace-format msgid "\"{value}\" is not an appropriate INSEE code" msgstr "" -#: ishtar_common/data_importer.py:381 ishtar_common/data_importer.py:395 -#: ishtar_common/data_importer.py:619 +#: ishtar_common/data_importer.py:388 ishtar_common/data_importer.py:402 +#: ishtar_common/data_importer.py:626 #, python-format msgid "\"%(value)s\" is not a valid date" msgstr "" -#: ishtar_common/data_importer.py:408 +#: ishtar_common/data_importer.py:415 #, python-format msgid "\"%(value)s\" is not an integer" msgstr "" -#: ishtar_common/data_importer.py:477 +#: ishtar_common/data_importer.py:484 #, python-format msgid "Choice for \"%s\" is not available. Which one is relevant?\n" msgstr "" -#: ishtar_common/data_importer.py:484 +#: ishtar_common/data_importer.py:491 #, python-format msgid "%d. None of the above - create new" msgstr "" -#: ishtar_common/data_importer.py:486 +#: ishtar_common/data_importer.py:493 #, python-format msgid "%d. None of the above - skip" msgstr "" -#: ishtar_common/data_importer.py:642 +#: ishtar_common/data_importer.py:649 #, python-format msgid "\"%(full_link)s\" is not a valid path" msgstr "" -#: ishtar_common/data_importer.py:670 +#: ishtar_common/data_importer.py:677 #, python-format msgid "\"%(value)s\" is not a valid path for the given archive" msgstr "" -#: ishtar_common/data_importer.py:781 +#: ishtar_common/data_importer.py:788 msgid "" "The given file is not correct. Check the file format. If you use a CSV file: " "check that column separator and encoding are similar to the ones used by the " "reference file." msgstr "" -#: ishtar_common/data_importer.py:787 +#: ishtar_common/data_importer.py:794 #, python-format msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d" msgstr "" -#: ishtar_common/data_importer.py:789 ishtar_common/views.py:2123 +#: ishtar_common/data_importer.py:796 ishtar_common/views.py:2123 msgid "No data provided" msgstr "" -#: ishtar_common/data_importer.py:790 +#: ishtar_common/data_importer.py:797 msgid "Value is required" msgstr "" -#: ishtar_common/data_importer.py:791 +#: ishtar_common/data_importer.py:798 #, python-format msgid "At least %d columns must be filled" msgstr "" -#: ishtar_common/data_importer.py:792 +#: ishtar_common/data_importer.py:799 msgid "The regexp doesn't match." msgstr "" -#: ishtar_common/data_importer.py:794 +#: ishtar_common/data_importer.py:801 msgid "" "Forced creation is set for model {} but this model is not in the list of " "models allowed to be created." msgstr "" -#: ishtar_common/data_importer.py:798 +#: ishtar_common/data_importer.py:805 msgid "" "{} with values {} doesn't exist in the database. Create it first or fix your " "source file." msgstr "" -#: ishtar_common/data_importer.py:802 +#: ishtar_common/data_importer.py:809 msgid "" "Related object not found. Can not create the geographic item. Context: {}." msgstr "" -#: ishtar_common/data_importer.py:898 +#: ishtar_common/data_importer.py:905 msgid "" "Item {} with values: {} not identified for post-treatment - need a non " "ambiguous key" msgstr "" -#: ishtar_common/data_importer.py:1514 ishtar_common/views.py:2201 +#: ishtar_common/data_importer.py:1521 ishtar_common/views.py:2201 #: ishtar_common/views.py:2211 msgid "Not imported" msgstr "" -#: ishtar_common/data_importer.py:1811 +#: ishtar_common/data_importer.py:1818 msgid "Importer configuration error: \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1816 +#: ishtar_common/data_importer.py:1823 msgid "Import error: {} - \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1904 +#: ishtar_common/data_importer.py:1911 msgid "Importer configuration error: field \"{}\" does not exist for {}." msgstr "" -#: ishtar_common/data_importer.py:2035 +#: ishtar_common/data_importer.py:2042 msgid "* created *" msgstr "" -#: ishtar_common/data_importer.py:2105 +#: ishtar_common/data_importer.py:2112 msgid "* match not find *" msgstr "" -#: ishtar_common/data_importer.py:2113 +#: ishtar_common/data_importer.py:2120 msgid "* the query match more than 10 results*" msgstr "" -#: ishtar_common/data_importer.py:2118 +#: ishtar_common/data_importer.py:2125 msgid " or " msgstr "" -#: ishtar_common/data_importer.py:2208 +#: ishtar_common/data_importer.py:2213 msgid "unicity key(s) \"{}\" is/are missing" msgstr "" -#: ishtar_common/data_importer.py:2211 +#: ishtar_common/data_importer.py:2216 msgid "Import error {}, {}" msgstr "" -#: ishtar_common/data_importer.py:2298 +#: ishtar_common/data_importer.py:2303 msgid "Import error {}, path \"{}\", context : {}, error : {}" msgstr "" -#: ishtar_common/data_importer.py:2328 +#: ishtar_common/data_importer.py:2333 msgid "line" msgstr "" -#: ishtar_common/data_importer.py:2328 +#: ishtar_common/data_importer.py:2333 msgid "col" msgstr "" -#: ishtar_common/data_importer.py:2328 +#: ishtar_common/data_importer.py:2333 msgid "error" msgstr "" -#: ishtar_common/data_importer.py:2335 +#: ishtar_common/data_importer.py:2340 msgid "field" msgstr "" -#: ishtar_common/data_importer.py:2335 +#: ishtar_common/data_importer.py:2340 msgid "source" msgstr "" -#: ishtar_common/data_importer.py:2335 +#: ishtar_common/data_importer.py:2340 msgid "result" msgstr "" -#: ishtar_common/data_importer.py:2351 +#: ishtar_common/data_importer.py:2356 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "" @@ -9955,8 +10490,8 @@ msgstr "" #: ishtar_common/forms_common.py:791 ishtar_common/forms_common.py:1040 #: ishtar_common/forms_common.py:1176 ishtar_common/forms_common.py:1271 -#: ishtar_common/forms_common.py:1530 ishtar_common/models_common.py:4205 -#: ishtar_common/models_common.py:4394 ishtar_common/wizards.py:2050 +#: ishtar_common/forms_common.py:1530 ishtar_common/models_common.py:4215 +#: ishtar_common/models_common.py:4404 ishtar_common/wizards.py:2050 msgid "Email" msgstr "" @@ -10037,12 +10572,12 @@ msgstr "" msgid "Raw name" msgstr "" -#: ishtar_common/forms_common.py:1178 ishtar_common/models_common.py:4189 +#: ishtar_common/forms_common.py:1178 ishtar_common/models_common.py:4199 msgid "Phone description" msgstr "" -#: ishtar_common/forms_common.py:1182 ishtar_common/models_common.py:4192 -#: ishtar_common/models_common.py:4195 +#: ishtar_common/forms_common.py:1182 ishtar_common/models_common.py:4202 +#: ishtar_common/models_common.py:4205 msgid "Phone description 2" msgstr "" @@ -10050,11 +10585,11 @@ msgstr "" msgid "Phone 2" msgstr "" -#: ishtar_common/forms_common.py:1186 ishtar_common/models_common.py:4199 +#: ishtar_common/forms_common.py:1186 ishtar_common/models_common.py:4209 msgid "Phone description 3" msgstr "" -#: ishtar_common/forms_common.py:1188 ishtar_common/models_common.py:4197 +#: ishtar_common/forms_common.py:1188 ishtar_common/models_common.py:4207 msgid "Phone 3" msgstr "" @@ -10062,23 +10597,23 @@ msgstr "" msgid "Current organization" msgstr "" -#: ishtar_common/forms_common.py:1211 ishtar_common/models_common.py:4174 +#: ishtar_common/forms_common.py:1211 ishtar_common/models_common.py:4184 msgid "Other address: address" msgstr "" -#: ishtar_common/forms_common.py:1214 ishtar_common/models_common.py:4176 +#: ishtar_common/forms_common.py:1214 ishtar_common/models_common.py:4186 msgid "Other address: address complement" msgstr "" -#: ishtar_common/forms_common.py:1219 ishtar_common/models_common.py:4179 +#: ishtar_common/forms_common.py:1219 ishtar_common/models_common.py:4189 msgid "Other address: postal code" msgstr "" -#: ishtar_common/forms_common.py:1222 ishtar_common/models_common.py:4182 +#: ishtar_common/forms_common.py:1222 ishtar_common/models_common.py:4192 msgid "Other address: town" msgstr "" -#: ishtar_common/forms_common.py:1225 ishtar_common/models_common.py:4185 +#: ishtar_common/forms_common.py:1225 ishtar_common/models_common.py:4195 msgid "Other address: country" msgstr "" @@ -10134,7 +10669,7 @@ msgstr "" #: ishtar_common/ishtar_menu.py:83 ishtar_common/models.py:3620 #: ishtar_common/models.py:3704 ishtar_common/models.py:3743 #: ishtar_common/models.py:4128 ishtar_common/models_common.py:940 -#: ishtar_common/models_common.py:968 ishtar_common/models_common.py:3238 +#: ishtar_common/models_common.py:968 ishtar_common/models_common.py:3248 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:4 #: ishtar_common/templates/ishtar/sheet_person.html:21 msgid "Account" @@ -10516,7 +11051,7 @@ msgid "There are identical authors." msgstr "" #: ishtar_common/forms_common.py:3046 ishtar_common/forms_common.py:3111 -#: ishtar_common/models.py:1016 ishtar_common/models_common.py:3218 +#: ishtar_common/models.py:1016 ishtar_common/models_common.py:3228 msgid "Query" msgstr "" @@ -10544,7 +11079,7 @@ msgstr "" msgid "Geo item - 010 - General" msgstr "" -#: ishtar_common/forms_common.py:3157 ishtar_common/models_common.py:2434 +#: ishtar_common/forms_common.py:3157 ishtar_common/models_common.py:2444 msgid "Import key" msgstr "" @@ -10554,19 +11089,19 @@ msgid "" "overwrite the data." msgstr "" -#: ishtar_common/forms_common.py:3172 ishtar_common/models_common.py:2449 +#: ishtar_common/forms_common.py:3172 ishtar_common/models_common.py:2459 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:6 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:33 msgid "Data type" msgstr "" -#: ishtar_common/forms_common.py:3175 ishtar_common/models_common.py:2441 +#: ishtar_common/forms_common.py:3175 ishtar_common/models_common.py:2451 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:10 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:30 msgid "Origin" msgstr "" -#: ishtar_common/forms_common.py:3178 ishtar_common/models_common.py:2457 +#: ishtar_common/forms_common.py:3178 ishtar_common/models_common.py:2467 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:11 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:36 msgid "Provider" @@ -10578,7 +11113,7 @@ msgid "Acquisition date" msgstr "" #: ishtar_common/forms_common.py:3182 ishtar_common/forms_common.py:3233 -#: ishtar_common/models_common.py:2422 +#: ishtar_common/models_common.py:2432 msgid "Buffer" msgstr "" @@ -10586,18 +11121,18 @@ msgstr "" msgid "Buffer type" msgstr "" -#: ishtar_common/forms_common.py:3191 ishtar_common/models_common.py:2471 -#: ishtar_common/models_common.py:4731 +#: ishtar_common/forms_common.py:3191 ishtar_common/models_common.py:2481 +#: ishtar_common/models_common.py:4741 msgid "Estimated error for X" msgstr "" -#: ishtar_common/forms_common.py:3196 ishtar_common/models_common.py:2474 -#: ishtar_common/models_common.py:4734 +#: ishtar_common/forms_common.py:3196 ishtar_common/models_common.py:2484 +#: ishtar_common/models_common.py:4744 msgid "Estimated error for Y" msgstr "" -#: ishtar_common/forms_common.py:3201 ishtar_common/models_common.py:2477 -#: ishtar_common/models_common.py:4737 +#: ishtar_common/forms_common.py:3201 ishtar_common/models_common.py:2487 +#: ishtar_common/models_common.py:4747 msgid "Estimated error for Z" msgstr "" @@ -10606,10 +11141,10 @@ msgid "Metadata" msgstr "" #: ishtar_common/forms_common.py:3232 ishtar_common/models.py:2559 -#: ishtar_common/models_common.py:2219 ishtar_common/models_common.py:2277 -#: ishtar_common/models_common.py:2309 ishtar_common/models_common.py:2326 -#: ishtar_common/models_common.py:2343 ishtar_common/models_common.py:2356 -#: ishtar_common/models_common.py:2501 ishtar_common/models_common.py:3670 +#: ishtar_common/models_common.py:2229 ishtar_common/models_common.py:2287 +#: ishtar_common/models_common.py:2319 ishtar_common/models_common.py:2336 +#: ishtar_common/models_common.py:2353 ishtar_common/models_common.py:2366 +#: ishtar_common/models_common.py:2511 ishtar_common/models_common.py:3680 msgid "Geography" msgstr "" @@ -10637,8 +11172,8 @@ msgstr "" msgid "Coordinates" msgstr "" -#: ishtar_common/forms_common.py:3513 ishtar_common/models_common.py:2376 -#: ishtar_common/models_common.py:4746 +#: ishtar_common/forms_common.py:3513 ishtar_common/models_common.py:2386 +#: ishtar_common/models_common.py:4756 msgid "Point" msgstr "" @@ -12004,7 +12539,7 @@ msgstr "" msgid "Groups" msgstr "" -#: ishtar_common/models.py:3608 ishtar_common/models_common.py:3242 +#: ishtar_common/models.py:3608 ishtar_common/models_common.py:3252 msgid "Permissions queries" msgstr "" @@ -12129,7 +12664,7 @@ msgstr "" msgid "Ishtar users" msgstr "" -#: ishtar_common/models.py:4305 ishtar_common/models_common.py:1730 +#: ishtar_common/models.py:4305 ishtar_common/models_common.py:1740 msgctxt "key for text search" msgid "user-attached" msgstr "" @@ -12138,7 +12673,7 @@ msgstr "" msgid "Regenerate permissions" msgstr "" -#: ishtar_common/models.py:4373 ishtar_common/models_common.py:3605 +#: ishtar_common/models.py:4373 ishtar_common/models_common.py:3615 msgid "regen." msgstr "" @@ -12356,7 +12891,7 @@ msgctxt "key for text search" msgid "warehouse" msgstr "" -#: ishtar_common/models.py:5073 ishtar_common/models_common.py:2003 +#: ishtar_common/models.py:5073 ishtar_common/models_common.py:2013 msgctxt "key for text search" msgid "has-image" msgstr "" @@ -12684,425 +13219,425 @@ msgstr "" msgid "Auto filled at save" msgstr "" -#: ishtar_common/models_common.py:1272 +#: ishtar_common/models_common.py:1274 msgid "Created by imports" msgstr "" -#: ishtar_common/models_common.py:1274 +#: ishtar_common/models_common.py:1276 msgid "Timestamp geo" msgstr "" -#: ishtar_common/models_common.py:1275 +#: ishtar_common/models_common.py:1277 msgid "Timestamp label" msgstr "" -#: ishtar_common/models_common.py:1278 +#: ishtar_common/models_common.py:1280 msgid "Updated by imports" msgstr "" -#: ishtar_common/models_common.py:1283 +#: ishtar_common/models_common.py:1285 msgctxt "key for text search" msgid "imports" msgstr "" -#: ishtar_common/models_common.py:1667 +#: ishtar_common/models_common.py:1677 msgid "Last editor" msgstr "" -#: ishtar_common/models_common.py:1675 +#: ishtar_common/models_common.py:1685 msgid "Creator" msgstr "" -#: ishtar_common/models_common.py:1682 ishtar_common/models_common.py:2426 +#: ishtar_common/models_common.py:1692 ishtar_common/models_common.py:2436 msgid "Need update" msgstr "" -#: ishtar_common/models_common.py:1684 +#: ishtar_common/models_common.py:1694 msgid "Item locked for edition" msgstr "" -#: ishtar_common/models_common.py:1690 +#: ishtar_common/models_common.py:1700 msgid "Locked by" msgstr "" -#: ishtar_common/models_common.py:1715 +#: ishtar_common/models_common.py:1725 msgctxt "key for text search" msgid "modified-by" msgstr "" -#: ishtar_common/models_common.py:1723 +#: ishtar_common/models_common.py:1733 msgctxt "key for text search" msgid "modified" msgstr "" -#: ishtar_common/models_common.py:1727 +#: ishtar_common/models_common.py:1737 msgctxt "key for text search" msgid "locked" msgstr "" -#: ishtar_common/models_common.py:2007 +#: ishtar_common/models_common.py:2017 msgctxt "key for text search" msgid "has-url" msgstr "" -#: ishtar_common/models_common.py:2011 +#: ishtar_common/models_common.py:2021 msgctxt "key for text search" msgid "has-attached-file" msgstr "" -#: ishtar_common/models_common.py:2015 +#: ishtar_common/models_common.py:2025 msgctxt "key for text search" msgid "document-type" msgstr "" -#: ishtar_common/models_common.py:2100 +#: ishtar_common/models_common.py:2110 msgid "Add document/image" msgstr "" -#: ishtar_common/models_common.py:2102 +#: ishtar_common/models_common.py:2112 msgid "doc./image" msgstr "" -#: ishtar_common/models_common.py:2265 ishtar_common/models_common.py:2286 +#: ishtar_common/models_common.py:2275 ishtar_common/models_common.py:2296 msgid "Authority name" msgstr "" -#: ishtar_common/models_common.py:2266 ishtar_common/models_common.py:2286 +#: ishtar_common/models_common.py:2276 ishtar_common/models_common.py:2296 msgid "Authority SRID" msgstr "" -#: ishtar_common/models_common.py:2267 +#: ishtar_common/models_common.py:2277 msgid "Number of decimal places" msgstr "" -#: ishtar_common/models_common.py:2268 +#: ishtar_common/models_common.py:2278 msgid "Number of decimal places for Z" msgstr "" -#: ishtar_common/models_common.py:2271 +#: ishtar_common/models_common.py:2281 msgid "Geographic - Spatial reference system" msgstr "" -#: ishtar_common/models_common.py:2272 +#: ishtar_common/models_common.py:2282 msgid "Geographic - Spatial reference systems" msgstr "" -#: ishtar_common/models_common.py:2303 +#: ishtar_common/models_common.py:2313 msgid "Geographic - Origin type" msgstr "" -#: ishtar_common/models_common.py:2304 +#: ishtar_common/models_common.py:2314 msgid "Geographic - Origin types" msgstr "" -#: ishtar_common/models_common.py:2320 +#: ishtar_common/models_common.py:2330 msgid "Geographic - Data type" msgstr "" -#: ishtar_common/models_common.py:2321 +#: ishtar_common/models_common.py:2331 msgid "Geographic - Data types" msgstr "" -#: ishtar_common/models_common.py:2337 +#: ishtar_common/models_common.py:2347 msgid "Geographic - Provider type" msgstr "" -#: ishtar_common/models_common.py:2338 +#: ishtar_common/models_common.py:2348 msgid "Geographic - Provider types" msgstr "" -#: ishtar_common/models_common.py:2350 +#: ishtar_common/models_common.py:2360 msgid "Geographic - Buffer type" msgstr "" -#: ishtar_common/models_common.py:2351 +#: ishtar_common/models_common.py:2361 msgid "Geographic - Buffer types" msgstr "" -#: ishtar_common/models_common.py:2377 +#: ishtar_common/models_common.py:2387 msgid "Line(s)" msgstr "" -#: ishtar_common/models_common.py:2378 +#: ishtar_common/models_common.py:2388 msgid "Point(s)" msgstr "" -#: ishtar_common/models_common.py:2379 +#: ishtar_common/models_common.py:2389 msgid "Polygon(s)" msgstr "" -#: ishtar_common/models_common.py:2435 +#: ishtar_common/models_common.py:2445 msgid "Use this for update imports" msgstr "" -#: ishtar_common/models_common.py:2442 +#: ishtar_common/models_common.py:2452 msgid "For instance: topographical survey, georeferencing, ..." msgstr "" -#: ishtar_common/models_common.py:2450 +#: ishtar_common/models_common.py:2460 msgid "For instance: outline, z-sup, ..." msgstr "" -#: ishtar_common/models_common.py:2458 +#: ishtar_common/models_common.py:2468 msgid "Data provider" msgstr "" -#: ishtar_common/models_common.py:2462 ishtar_common/models_common.py:4727 +#: ishtar_common/models_common.py:2472 ishtar_common/models_common.py:4737 msgid "X" msgstr "" -#: ishtar_common/models_common.py:2462 ishtar_common/models_common.py:2463 -#: ishtar_common/models_common.py:2464 +#: ishtar_common/models_common.py:2472 ishtar_common/models_common.py:2473 +#: ishtar_common/models_common.py:2474 msgid "User input" msgstr "" -#: ishtar_common/models_common.py:2463 ishtar_common/models_common.py:4728 +#: ishtar_common/models_common.py:2473 ishtar_common/models_common.py:4738 msgid "Y" msgstr "" -#: ishtar_common/models_common.py:2464 ishtar_common/models_common.py:4729 +#: ishtar_common/models_common.py:2474 ishtar_common/models_common.py:4739 msgid "Z" msgstr "" -#: ishtar_common/models_common.py:2467 +#: ishtar_common/models_common.py:2477 msgid "X (cached)" msgstr "" -#: ishtar_common/models_common.py:2468 +#: ishtar_common/models_common.py:2478 msgid "Y (cached)" msgstr "" -#: ishtar_common/models_common.py:2469 +#: ishtar_common/models_common.py:2479 msgid "Z (cached)" msgstr "" -#: ishtar_common/models_common.py:2481 ishtar_common/models_common.py:4741 +#: ishtar_common/models_common.py:2491 ishtar_common/models_common.py:4751 msgid "Spatial Reference System" msgstr "" -#: ishtar_common/models_common.py:2486 ishtar_common/models_common.py:4747 +#: ishtar_common/models_common.py:2496 ishtar_common/models_common.py:4757 msgid "Point (2D)" msgstr "" -#: ishtar_common/models_common.py:2487 +#: ishtar_common/models_common.py:2497 msgid "Point (3D)" msgstr "" -#: ishtar_common/models_common.py:2488 +#: ishtar_common/models_common.py:2498 msgid "Multi points" msgstr "" -#: ishtar_common/models_common.py:2489 +#: ishtar_common/models_common.py:2499 msgid "Multi lines" msgstr "" -#: ishtar_common/models_common.py:2490 +#: ishtar_common/models_common.py:2500 msgid "Multi polygons" msgstr "" -#: ishtar_common/models_common.py:2493 ishtar_common/models_common.py:2494 +#: ishtar_common/models_common.py:2503 ishtar_common/models_common.py:2504 msgid "Geographic - Vector data" msgstr "" -#: ishtar_common/models_common.py:2630 +#: ishtar_common/models_common.py:2640 msgid "Only 2 or 3 dimensions" msgstr "" -#: ishtar_common/models_common.py:3103 +#: ishtar_common/models_common.py:3113 msgid "Main geodata" msgstr "" -#: ishtar_common/models_common.py:3107 +#: ishtar_common/models_common.py:3117 msgid "Geodata" msgstr "" -#: ishtar_common/models_common.py:3111 +#: ishtar_common/models_common.py:3121 msgctxt "key for text search" msgid "geo-name" msgstr "" -#: ishtar_common/models_common.py:3114 +#: ishtar_common/models_common.py:3124 msgctxt "key for text search" msgid "geo-type" msgstr "" -#: ishtar_common/models_common.py:3117 +#: ishtar_common/models_common.py:3127 msgctxt "key for text search" msgid "geo-origin" msgstr "" -#: ishtar_common/models_common.py:3120 +#: ishtar_common/models_common.py:3130 msgctxt "key for text search" msgid "geo-provider" msgstr "" -#: ishtar_common/models_common.py:3123 +#: ishtar_common/models_common.py:3133 msgctxt "key for text search" msgid "z" msgstr "" -#: ishtar_common/models_common.py:3127 +#: ishtar_common/models_common.py:3137 msgctxt "key for text search" msgid "geo-comment" msgstr "" -#: ishtar_common/models_common.py:3153 +#: ishtar_common/models_common.py:3163 msgid "Add geographic item" msgstr "" -#: ishtar_common/models_common.py:3155 +#: ishtar_common/models_common.py:3165 msgid "geo." msgstr "" -#: ishtar_common/models_common.py:3214 +#: ishtar_common/models_common.py:3224 msgid "Model" msgstr "" -#: ishtar_common/models_common.py:3219 +#: ishtar_common/models_common.py:3229 msgid "Use 'text' query used in Ishtar search input" msgstr "" -#: ishtar_common/models_common.py:3221 +#: ishtar_common/models_common.py:3231 msgid "Active" msgstr "" -#: ishtar_common/models_common.py:3223 +#: ishtar_common/models_common.py:3233 msgid "Include associated items" msgstr "" -#: ishtar_common/models_common.py:3224 +#: ishtar_common/models_common.py:3234 msgid "All items associated items match the request" msgstr "" -#: ishtar_common/models_common.py:3227 +#: ishtar_common/models_common.py:3237 msgid "Include upstream items" msgstr "" -#: ishtar_common/models_common.py:3229 +#: ishtar_common/models_common.py:3239 msgid "" "All items associated by upstream link math the request. For instance, match " "is done for all finds associated with own context records" msgstr "" -#: ishtar_common/models_common.py:3234 +#: ishtar_common/models_common.py:3244 msgid "Limit request to attached areas" msgstr "" -#: ishtar_common/models_common.py:3235 +#: ishtar_common/models_common.py:3245 msgid "Request is limited to areas attached to the ishtar user" msgstr "" -#: ishtar_common/models_common.py:3241 +#: ishtar_common/models_common.py:3251 msgid "Permission query" msgstr "" -#: ishtar_common/models_common.py:3603 +#: ishtar_common/models_common.py:3613 msgid "Regenerate ID" msgstr "" -#: ishtar_common/models_common.py:3625 +#: ishtar_common/models_common.py:3635 msgid "Localisation" msgstr "" -#: ishtar_common/models_common.py:3627 +#: ishtar_common/models_common.py:3637 msgid "Limit" msgstr "" -#: ishtar_common/models_common.py:3629 +#: ishtar_common/models_common.py:3639 #: ishtar_common/templates/ishtar/sheet_town.html:107 msgid "Notice" msgstr "" -#: ishtar_common/models_common.py:3638 +#: ishtar_common/models_common.py:3648 msgid "Year of creation" msgstr "" -#: ishtar_common/models_common.py:3642 +#: ishtar_common/models_common.py:3652 msgid "Filling this field is relevant to distinguish old towns from new towns." msgstr "" -#: ishtar_common/models_common.py:3646 +#: ishtar_common/models_common.py:3656 msgid "Town children" msgstr "" -#: ishtar_common/models_common.py:3704 ishtar_common/models_common.py:3798 -#: ishtar_common/models_common.py:3851 +#: ishtar_common/models_common.py:3714 ishtar_common/models_common.py:3808 +#: ishtar_common/models_common.py:3861 msgid "INSEE code is missing" msgstr "" -#: ishtar_common/models_common.py:3705 +#: ishtar_common/models_common.py:3715 msgid "Geo INSEE is missing" msgstr "" -#: ishtar_common/models_common.py:3984 +#: ishtar_common/models_common.py:3994 msgid ", old town of " msgstr "" -#: ishtar_common/models_common.py:4169 +#: ishtar_common/models_common.py:4179 msgid "Town (precise)" msgstr "" -#: ishtar_common/models_common.py:4201 +#: ishtar_common/models_common.py:4211 msgid "Raw phone" msgstr "" -#: ishtar_common/models_common.py:4207 +#: ishtar_common/models_common.py:4217 msgid "Alternative address is prefered" msgstr "" -#: ishtar_common/models_common.py:4210 +#: ishtar_common/models_common.py:4220 msgid "Cached town" msgstr "" -#: ishtar_common/models_common.py:4261 +#: ishtar_common/models_common.py:4271 msgid "Town with code: {} does not exists" msgstr "" -#: ishtar_common/models_common.py:4298 +#: ishtar_common/models_common.py:4308 msgid "No associated address" msgstr "" -#: ishtar_common/models_common.py:4379 +#: ishtar_common/models_common.py:4389 msgid "Postal code - Town" msgstr "" -#: ishtar_common/models_common.py:4389 +#: ishtar_common/models_common.py:4399 msgid "Mobile" msgstr "" -#: ishtar_common/models_common.py:4412 +#: ishtar_common/models_common.py:4422 msgid "Merge key" msgstr "" -#: ishtar_common/models_common.py:4725 +#: ishtar_common/models_common.py:4735 msgid "Precise" msgstr "" -#: ishtar_common/models_common.py:4725 +#: ishtar_common/models_common.py:4735 msgid "Polygon" msgstr "" -#: ishtar_common/models_common.py:4749 +#: ishtar_common/models_common.py:4759 msgid "Point source" msgstr "" -#: ishtar_common/models_common.py:4752 +#: ishtar_common/models_common.py:4762 msgid "Point source item" msgstr "" -#: ishtar_common/models_common.py:4754 +#: ishtar_common/models_common.py:4764 msgid "Multi polygon" msgstr "" -#: ishtar_common/models_common.py:4756 +#: ishtar_common/models_common.py:4766 msgid "Multi-polygon source" msgstr "" -#: ishtar_common/models_common.py:4763 +#: ishtar_common/models_common.py:4773 msgid "Multi polygon source item" msgstr "" -#: ishtar_common/models_common.py:4906 +#: ishtar_common/models_common.py:4916 msgid "Custom index" msgstr "" @@ -14262,6 +14797,7 @@ msgstr "" #: ishtar_common/templates/blocks/DataTables-stats-detail.html:48 #: ishtar_common/templates/ishtar/blocks/sheet_json.html:9 +#: man_app/templates/ishtar/blocks/sheet_json.html:10 msgid "No data" msgstr "" @@ -14490,6 +15026,9 @@ msgstr "" #: ishtar_common/templates/ishtar/blocks/sheet_document_list.html:3 #: ishtar_common/templates/ishtar/sheet_document.html:140 +#: man_app/templates/ishtar/sheet_museum_find.html:318 +#: na_app/templates/ishtar/sheet_find.html:553 +#: pdl_app/templates/ishtar/sheet_find.html:546 msgid "Associated documents" msgstr "" @@ -16003,7 +16542,6 @@ msgstr "" #: ishtar_common/views.py:1262 ishtar_common/views_item.py:270 #: ishtar_common/views_item.py:316 ishtar_common/views_item.py:335 -#: views_item.py:268 views_item.py:313 views_item.py:332 msgid "Operation not permitted." msgstr "" @@ -16139,17 +16677,17 @@ msgstr "" msgid "Delete geographic item" msgstr "" -#: ishtar_common/views_item.py:282 views_item.py:280 +#: ishtar_common/views_item.py:282 #, python-format msgid "New %s" msgstr "" -#: ishtar_common/views_item.py:349 views_item.py:346 +#: ishtar_common/views_item.py:349 #, python-format msgid "Modify a %s" msgstr "" -#: ishtar_common/views_item.py:1169 views_item.py:1166 +#: ishtar_common/views_item.py:1179 msgctxt "key for text search" msgid "today" msgstr "" @@ -16209,6 +16747,25 @@ msgid "" "If the profile has been changed, don't forget to regenerate permissions." msgstr "" +#: na_app/templates/ishtar/sheet_container.html:303 +msgid "Document for this container" +msgstr "" + +#: na_app/templates/ishtar/sheet_find.html:41 +#: pdl_app/templates/ishtar/sheet_find.html:41 +msgid "Image / Base find" +msgstr "" + +#: na_app/templates/ishtar/sheet_find.html:174 +#: pdl_app/templates/ishtar/sheet_find.html:162 +msgid "Administrative index" +msgstr "" + +#: na_app/templates/ishtar/sheet_operation.html:407 +#: pdl_app/templates/ishtar/sheet_operation.html:424 +msgid "Document from this operation" +msgstr "" + #: overload_translation/models.py:8 msgid "Translation context" msgstr "" |