diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-06-07 12:30:37 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-06-07 12:30:37 +0200 |
commit | 580a1137158c71fbc2274cc0e12f9cffcf9c1a9c (patch) | |
tree | 3564a8b34473a2d98563f6e4bba77f313949c68b /locale | |
parent | b111b112bde1f2a8ef30e249911765180d557a73 (diff) | |
download | Ishtar-580a1137158c71fbc2274cc0e12f9cffcf9c1a9c.tar.bz2 Ishtar-580a1137158c71fbc2274cc0e12f9cffcf9c1a9c.zip |
Update translations
Diffstat (limited to 'locale')
-rw-r--r-- | locale/de/LC_MESSAGES/django.po | 644 | ||||
-rw-r--r-- | locale/es/LC_MESSAGES/django.po | 644 | ||||
-rw-r--r-- | locale/fr/LC_MESSAGES/django.po | 656 | ||||
-rw-r--r-- | locale/pt/LC_MESSAGES/django.po | 644 |
4 files changed, 1486 insertions, 1102 deletions
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index a638f25ae..2e5905f08 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-05-18 13:45+0200\n" +"POT-Creation-Date: 2022-06-07 12:30+0200\n" "PO-Revision-Date: 2019-11-01 18:52+0000\n" "Last-Translator: Valérie-Emma Leroux <valerie-emma.leroux@iggdrasil.net>\n" "Language-Team: German <http://translate.iggdrasil.net/projects/ishtar/wip-" @@ -119,7 +119,7 @@ msgstr "" #: archaeological_context_records/forms.py:572 #: archaeological_context_records/forms.py:626 #: archaeological_context_records/models.py:633 -#: archaeological_context_records/models.py:1265 +#: archaeological_context_records/models.py:1277 #: archaeological_warehouse/forms.py:437 msgid "ID" msgstr "" @@ -163,7 +163,7 @@ msgstr "" #: archaeological_context_records/models.py:441 #: archaeological_context_records/models.py:442 #: archaeological_context_records/models.py:608 -#: archaeological_context_records/models.py:1267 +#: archaeological_context_records/models.py:1279 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:114 #: archaeological_files/forms.py:87 archaeological_files/forms.py:564 #: archaeological_finds/models_finds.py:1079 @@ -245,13 +245,13 @@ msgstr "" #: archaeological_context_records/models.py:443 #: archaeological_context_records/models.py:451 #: archaeological_context_records/models.py:658 -#: archaeological_context_records/models.py:1266 +#: archaeological_context_records/models.py:1278 msgid "Context record type" msgstr "" #: archaeological_context_records/forms.py:297 #: archaeological_context_records/models.py:634 -#: archaeological_context_records/models.py:1268 +#: archaeological_context_records/models.py:1280 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:125 #: archaeological_finds/forms.py:187 archaeological_finds/forms.py:188 #: archaeological_finds/forms.py:457 archaeological_finds/forms.py:459 @@ -262,10 +262,11 @@ msgstr "" #: archaeological_finds/models_finds.py:1749 #: archaeological_finds/models_treatments.py:252 #: archaeological_finds/templates/ishtar/sheet_find.html:147 +#: cd17_app/templates/ishtar/sheet_find.html:155 #: ishtar_common/forms_common.py:1608 ishtar_common/forms_common.py:1876 #: ishtar_common/models.py:1010 ishtar_common/models.py:3933 -#: ishtar_common/models_imports.py:109 ishtar_common/models_imports.py:428 -#: ishtar_common/models_imports.py:509 ishtar_common/models_imports.py:527 +#: ishtar_common/models_imports.py:109 ishtar_common/models_imports.py:430 +#: ishtar_common/models_imports.py:511 ishtar_common/models_imports.py:529 #: sra_idf_app/templates/ishtar/sheet_find.html:154 msgid "Description" msgstr "" @@ -432,6 +433,7 @@ msgstr "" #: archaeological_finds/forms.py:935 archaeological_finds/forms.py:959 #: archaeological_finds/models_finds.py:1792 #: archaeological_finds/templates/ishtar/sheet_find.html:215 +#: cd17_app/templates/ishtar/sheet_find.html:223 #: sra_idf_app/templates/ishtar/sheet_find.html:222 msgid "Dating" msgstr "" @@ -445,7 +447,8 @@ msgstr "" #: archaeological_operations/forms.py:1215 #: archaeological_operations/templates/ishtar/sheet_operation.html:464 #: archaeological_operations/templates/ishtar/sheet_operation.html:501 -#: ishtar_common/models_imports.py:741 +#: cd17_app/templates/ishtar/sheet_find.html:231 +#: ishtar_common/models_imports.py:743 #: na_app/templates/ishtar/sheet_operation.html:470 #: na_app/templates/ishtar/sheet_operation.html:507 #: sra_idf_app/templates/ishtar/sheet_find.html:230 @@ -472,6 +475,10 @@ msgstr "" #: archaeological_operations/models.py:97 #: archaeological_operations/models.py:1126 #: archaeological_operations/models.py:3028 +#: cd17_app/templates/ishtar/sheet_find.html:232 +#: cd17_app/templates/ishtar/sheet_find.html:347 +#: cd17_app/templates/ishtar/sheet_find.html:385 +#: cd17_app/templates/ishtar/sheet_find.html:423 #: sra_idf_app/templates/ishtar/sheet_find.html:231 #: sra_idf_app/templates/ishtar/sheet_find.html:346 #: sra_idf_app/templates/ishtar/sheet_find.html:384 @@ -489,7 +496,13 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:416 #: archaeological_finds/templates/ishtar/sheet_find.html:454 #: archaeological_operations/models.py:98 -#: archaeological_operations/models.py:3029 ishtar_common/models_imports.py:986 +#: archaeological_operations/models.py:3029 +#: cd17_app/templates/ishtar/sheet_find.html:233 +#: cd17_app/templates/ishtar/sheet_find.html:348 +#: cd17_app/templates/ishtar/sheet_find.html:386 +#: cd17_app/templates/ishtar/sheet_find.html:424 +#: cd17_app/templates/ishtar/sheet_find.html:462 +#: ishtar_common/models_imports.py:988 #: sra_idf_app/templates/ishtar/sheet_find.html:232 #: sra_idf_app/templates/ishtar/sheet_find.html:347 #: sra_idf_app/templates/ishtar/sheet_find.html:385 @@ -502,6 +515,7 @@ msgstr "" #: archaeological_context_records/models.py:113 #: archaeological_finds/forms.py:944 #: archaeological_finds/templates/ishtar/sheet_find.html:227 +#: cd17_app/templates/ishtar/sheet_find.html:235 #: sra_idf_app/templates/ishtar/sheet_find.html:234 msgid "Quality" msgstr "" @@ -511,6 +525,7 @@ msgstr "" #: archaeological_context_records/models.py:106 #: archaeological_finds/forms.py:946 #: archaeological_finds/templates/ishtar/sheet_find.html:226 +#: cd17_app/templates/ishtar/sheet_find.html:234 #: sra_idf_app/templates/ishtar/sheet_find.html:233 msgid "Dating type" msgstr "" @@ -519,6 +534,7 @@ msgstr "" #: archaeological_context_records/models.py:118 #: archaeological_finds/forms.py:948 #: archaeological_finds/templates/ishtar/sheet_find.html:228 +#: cd17_app/templates/ishtar/sheet_find.html:236 #: sra_idf_app/templates/ishtar/sheet_find.html:235 msgid "Precise dating" msgstr "" @@ -530,7 +546,7 @@ msgstr "" #: archaeological_context_records/forms.py:493 #: archaeological_context_records/ishtar_menu.py:33 #: archaeological_context_records/models.py:267 -#: archaeological_context_records/models.py:1394 +#: archaeological_context_records/models.py:1406 #: archaeological_context_records/views.py:247 #: archaeological_finds/forms.py:101 archaeological_finds/forms.py:107 #: archaeological_finds/forms.py:604 archaeological_finds/forms.py:617 @@ -592,6 +608,7 @@ msgstr "" #: archaeological_finds/forms.py:169 archaeological_finds/forms.py:449 #: archaeological_finds/forms.py:605 #: archaeological_finds/templates/ishtar/sheet_find.html:125 +#: cd17_app/templates/ishtar/sheet_find.html:133 #: ishtar_common/forms_common.py:1661 #: ishtar_common/templates/ishtar/organization_person_form.html:9 #: ishtar_common/templates/ishtar/person_form.html:9 @@ -788,6 +805,7 @@ msgstr "" #: archaeological_finds/models_finds.py:3235 #: archaeological_finds/models_treatments.py:731 #: archaeological_finds/templates/ishtar/sheet_find.html:4 +#: cd17_app/templates/ishtar/sheet_find.html:4 #: ishtar_common/forms_common.py:1966 ishtar_common/models.py:4802 #: ishtar_common/views.py:392 sra_idf_app/templates/ishtar/sheet_find.html:4 msgid "Find" @@ -855,7 +873,7 @@ msgid "Excavation technique types" msgstr "" #: archaeological_context_records/models.py:365 -#: ishtar_common/models_imports.py:750 +#: ishtar_common/models_imports.py:752 msgid "Documentation type" msgstr "" @@ -865,7 +883,7 @@ msgstr "" #: archaeological_context_records/models.py:430 #: archaeological_context_records/models.py:431 -#: archaeological_context_records/models.py:1269 +#: archaeological_context_records/models.py:1281 #: archaeological_finds/models_finds.py:1091 #: archaeological_finds/models_finds.py:1092 #: archaeological_operations/forms.py:530 @@ -933,7 +951,7 @@ msgstr "" #: archaeological_files/models.py:227 archaeological_finds/models_finds.py:1226 #: archaeological_operations/models.py:256 #: archaeological_operations/models.py:954 -#: archaeological_operations/tests.py:2731 +#: archaeological_operations/tests.py:2754 #: archaeological_warehouse/models.py:315 msgctxt "key for text search" msgid "town" @@ -990,8 +1008,8 @@ msgstr "" #: archaeological_context_records/models.py:526 #: archaeological_operations/models.py:250 #: archaeological_operations/models.py:996 -#: archaeological_operations/tests.py:2714 -#: archaeological_operations/tests.py:2896 +#: archaeological_operations/tests.py:2737 +#: archaeological_operations/tests.py:2919 msgctxt "key for text search" msgid "period" msgstr "" @@ -1031,14 +1049,14 @@ msgid "Lock/Unlock" msgstr "" #: archaeological_context_records/models.py:591 -#: archaeological_context_records/models.py:963 +#: archaeological_context_records/models.py:975 #: archaeological_context_records/views.py:271 #: archaeological_context_records/views.py:286 #: archaeological_finds/models_finds.py:856 #: archaeological_finds/models_finds.py:1656 -#: archaeological_finds/models_finds.py:2232 archaeological_finds/views.py:1216 -#: archaeological_finds/views.py:1231 archaeological_finds/views.py:1269 -#: archaeological_finds/views.py:1285 archaeological_operations/models.py:352 +#: archaeological_finds/models_finds.py:2232 archaeological_finds/views.py:1236 +#: archaeological_finds/views.py:1251 archaeological_finds/views.py:1289 +#: archaeological_finds/views.py:1305 archaeological_operations/models.py:352 #: archaeological_operations/models.py:508 #: archaeological_operations/models.py:1095 #: archaeological_operations/models.py:1641 @@ -1122,7 +1140,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:46 #: archaeological_warehouse/templates/ishtar/sheet_container.html:182 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:42 -#: ishtar_common/models.py:3958 +#: cd17_app/templates/ishtar/sheet_find.html:70 ishtar_common/models.py:3958 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_person.html:161 #: na_app/templates/ishtar/sheet_operation.html:57 @@ -1202,66 +1220,74 @@ msgstr "" msgid "List of associated base finds" msgstr "E-Mail-Adresse" -#: archaeological_context_records/models.py:1163 -#: archaeological_context_records/models.py:1198 -#: archaeological_context_records/models.py:1264 +#: archaeological_context_records/models.py:963 +msgid "Add find" +msgstr "" + +#: archaeological_context_records/models.py:965 +msgid "find" +msgstr "" + +#: archaeological_context_records/models.py:1175 +#: archaeological_context_records/models.py:1210 +#: archaeological_context_records/models.py:1276 #: archaeological_operations/forms.py:374 msgid "Relation type" msgstr "" -#: archaeological_context_records/models.py:1164 +#: archaeological_context_records/models.py:1176 msgid "Relation types" msgstr "" -#: archaeological_context_records/models.py:1193 +#: archaeological_context_records/models.py:1205 msgid "ID (left)" msgstr "" -#: archaeological_context_records/models.py:1194 +#: archaeological_context_records/models.py:1206 msgid "Context record type (left)" msgstr "" -#: archaeological_context_records/models.py:1195 +#: archaeological_context_records/models.py:1207 msgid "Parcel (left)" msgstr "" -#: archaeological_context_records/models.py:1196 +#: archaeological_context_records/models.py:1208 msgid "Description (left)" msgstr "" -#: archaeological_context_records/models.py:1197 +#: archaeological_context_records/models.py:1209 msgid "Periods (left)" msgstr "" -#: archaeological_context_records/models.py:1199 +#: archaeological_context_records/models.py:1211 msgid "ID (right)" msgstr "" -#: archaeological_context_records/models.py:1200 +#: archaeological_context_records/models.py:1212 msgid "Context record type (right)" msgstr "" -#: archaeological_context_records/models.py:1201 +#: archaeological_context_records/models.py:1213 msgid "Parcel (right)" msgstr "" -#: archaeological_context_records/models.py:1202 +#: archaeological_context_records/models.py:1214 msgid "Description (right)" msgstr "" -#: archaeological_context_records/models.py:1203 +#: archaeological_context_records/models.py:1215 msgid "Periods (right)" msgstr "" -#: archaeological_context_records/models.py:1210 +#: archaeological_context_records/models.py:1222 msgid "Record relation" msgstr "" -#: archaeological_context_records/models.py:1211 +#: archaeological_context_records/models.py:1223 msgid "Record relations" msgstr "" -#: archaeological_context_records/models.py:1400 +#: archaeological_context_records/models.py:1412 msgid "Context record parent" msgstr "" @@ -1329,6 +1355,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:96 #: archaeological_finds/templates/ishtar/sheet_find.html:79 #: archaeological_operations/templates/ishtar/sheet_operation.html:93 +#: cd17_app/templates/ishtar/sheet_find.html:79 #: na_app/templates/ishtar/sheet_operation.html:93 #: sra_idf_app/templates/ishtar/sheet_find.html:79 #: sra_idf_app/templates/ishtar/sheet_operation.html:93 @@ -1342,6 +1369,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:22 #: archaeological_warehouse/templates/ishtar/sheet_container.html:70 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:63 +#: cd17_app/templates/ishtar/sheet_find.html:138 #: ishtar_common/models_common.py:2952 #: ishtar_common/templates/ishtar/sheet_document.html:37 #: na_app/templates/ishtar/sheet_operation.html:122 @@ -1380,6 +1408,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:51 #: archaeological_finds/templates/ishtar/sheet_find.html:186 #: archaeological_operations/templates/ishtar/sheet_operation.html:246 +#: cd17_app/templates/ishtar/sheet_find.html:194 #: ishtar_common/templates/ishtar/blocks/window_image.html:5 #: na_app/templates/ishtar/sheet_operation.html:253 #: sra_idf_app/templates/ishtar/sheet_find.html:193 @@ -1421,9 +1450,12 @@ msgstr "" #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:499 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:623 #: archaeological_operations/templates/ishtar/sheet_operation.html:153 -#: ishtar_common/models.py:4697 ishtar_common/models.py:4830 -#: ishtar_common/models.py:4908 ishtar_common/models_common.py:1814 -#: ishtar_common/models_common.py:1829 ishtar_common/models_imports.py:979 +#: cd17_app/templates/ishtar/sheet_find.html:343 +#: cd17_app/templates/ishtar/sheet_find.html:381 +#: cd17_app/templates/ishtar/sheet_find.html:419 ishtar_common/models.py:4697 +#: ishtar_common/models.py:4830 ishtar_common/models.py:4908 +#: ishtar_common/models_common.py:1814 ishtar_common/models_common.py:1829 +#: ishtar_common/models_imports.py:981 #: na_app/templates/ishtar/sheet_operation.html:153 #: sra_idf_app/templates/ishtar/sheet_find.html:342 #: sra_idf_app/templates/ishtar/sheet_find.html:380 @@ -1543,7 +1575,7 @@ msgstr "" #: archaeological_operations/models.py:2504 #: archaeological_operations/models.py:2769 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 -#: ishtar_common/models_imports.py:792 +#: ishtar_common/models_imports.py:794 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:196 msgid "Year" msgstr "" @@ -1631,7 +1663,7 @@ msgstr "" #: archaeological_warehouse/models.py:1020 ishtar_common/forms_common.py:1606 #: ishtar_common/forms_common.py:1911 ishtar_common/models.py:2642 #: ishtar_common/models.py:3186 ishtar_common/models.py:3942 -#: ishtar_common/models_common.py:168 ishtar_common/models_imports.py:577 +#: ishtar_common/models_common.py:168 ishtar_common/models_imports.py:579 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:170 msgid "Comment" msgstr "" @@ -1640,7 +1672,6 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:169 #: archaeological_files_pdl/forms.py:315 archaeological_files_pdl/forms.py:384 #: archaeological_finds/forms_treatments.py:693 -#: archaeological_operations/forms.py:821 #: archaeological_operations/models.py:1153 msgid "In charge" msgstr "" @@ -1680,7 +1711,7 @@ msgstr "" #: archaeological_operations/forms.py:683 #: archaeological_operations/models.py:1124 ishtar_common/forms_common.py:1601 #: ishtar_common/forms_common.py:2071 ishtar_common/models.py:3927 -#: ishtar_common/models_imports.py:985 +#: ishtar_common/models_imports.py:987 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 msgid "Creation date" msgstr "" @@ -1691,6 +1722,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:878 #: archaeological_finds/models_treatments.py:1124 #: archaeological_finds/templates/ishtar/sheet_find.html:453 +#: cd17_app/templates/ishtar/sheet_find.html:461 #: sra_idf_app/templates/ishtar/sheet_find.html:460 msgid "Reception date" msgstr "" @@ -1731,6 +1763,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1099 #: archaeological_finds/templates/ishtar/sheet_find.html:450 #: archaeological_warehouse/forms.py:216 archaeological_warehouse/models.py:341 +#: cd17_app/templates/ishtar/sheet_find.html:458 #: sra_idf_app/templates/ishtar/sheet_find.html:457 msgid "Person in charge" msgstr "" @@ -1749,19 +1782,20 @@ msgstr "" #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:137 #: archaeological_warehouse/forms.py:143 archaeological_warehouse/forms.py:203 -#: archaeological_warehouse/models.py:335 ishtar_common/forms_common.py:394 -#: ishtar_common/forms_common.py:453 ishtar_common/forms_common.py:630 -#: ishtar_common/forms_common.py:757 ishtar_common/forms_common.py:848 -#: ishtar_common/forms_common.py:1084 ishtar_common/forms_common.py:1135 -#: ishtar_common/models.py:661 ishtar_common/models.py:699 -#: ishtar_common/models.py:1004 ishtar_common/models.py:1493 -#: ishtar_common/models.py:1875 ishtar_common/models.py:2349 -#: ishtar_common/models.py:2637 ishtar_common/models.py:2944 -#: ishtar_common/models.py:4673 ishtar_common/models_common.py:1885 -#: ishtar_common/models_common.py:1934 ishtar_common/models_imports.py:82 -#: ishtar_common/models_imports.py:107 ishtar_common/models_imports.py:508 -#: ishtar_common/models_imports.py:525 ishtar_common/models_imports.py:633 -#: ishtar_common/models_imports.py:943 +#: archaeological_warehouse/models.py:335 +#: cd17_app/templates/ishtar/sheet_find.html:457 +#: ishtar_common/forms_common.py:394 ishtar_common/forms_common.py:453 +#: ishtar_common/forms_common.py:630 ishtar_common/forms_common.py:757 +#: ishtar_common/forms_common.py:848 ishtar_common/forms_common.py:1084 +#: ishtar_common/forms_common.py:1135 ishtar_common/models.py:661 +#: ishtar_common/models.py:699 ishtar_common/models.py:1004 +#: ishtar_common/models.py:1493 ishtar_common/models.py:1875 +#: ishtar_common/models.py:2349 ishtar_common/models.py:2637 +#: ishtar_common/models.py:2944 ishtar_common/models.py:4673 +#: ishtar_common/models_common.py:1885 ishtar_common/models_common.py:1934 +#: ishtar_common/models_imports.py:82 ishtar_common/models_imports.py:107 +#: ishtar_common/models_imports.py:510 ishtar_common/models_imports.py:527 +#: ishtar_common/models_imports.py:635 ishtar_common/models_imports.py:945 #: ishtar_common/templates/ishtar/import_step_by_step.html:102 #: ishtar_common/templates/ishtar/import_step_by_step.html:270 #: ishtar_common/templates/ishtar/import_table.html:27 @@ -1884,7 +1918,8 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:316 #: archaeological_operations/forms.py:1620 #: archaeological_operations/forms.py:1755 -#: archaeological_operations/models.py:2450 ishtar_common/models.py:3847 +#: archaeological_operations/models.py:2450 +#: cd17_app/templates/ishtar/sheet_find.html:324 ishtar_common/models.py:3847 #: sra_idf_app/templates/ishtar/sheet_find.html:323 msgid "Index" msgstr "" @@ -2090,8 +2125,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1039 #: archaeological_operations/models.py:945 #: archaeological_operations/models.py:2309 -#: archaeological_operations/tests.py:2720 -#: archaeological_operations/tests.py:2796 +#: archaeological_operations/tests.py:2743 +#: archaeological_operations/tests.py:2819 msgctxt "key for text search" msgid "year" msgstr "" @@ -2120,7 +2155,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1033 #: archaeological_operations/models.py:243 #: archaeological_operations/models.py:968 -#: archaeological_operations/tests.py:2840 +#: archaeological_operations/tests.py:2863 #: archaeological_warehouse/models.py:308 ishtar_common/models.py:2329 #: ishtar_common/models.py:2580 ishtar_common/models.py:3077 msgctxt "key for text search" @@ -2132,7 +2167,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1042 #: archaeological_operations/models.py:974 #: archaeological_operations/models.py:2320 -#: archaeological_operations/tests.py:2853 +#: archaeological_operations/tests.py:2876 #: archaeological_warehouse/models.py:311 #: archaeological_warehouse/models.py:839 ishtar_common/models.py:2332 #: ishtar_common/models.py:2589 ishtar_common/models.py:3088 @@ -2465,12 +2500,17 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:454 #: archaeological_operations/templates/ishtar/sheet_operation.html:518 #: archaeological_warehouse/models.py:297 -#: archaeological_warehouse/models.py:818 ishtar_common/forms_common.py:454 -#: ishtar_common/forms_common.py:633 ishtar_common/forms_common.py:851 -#: ishtar_common/forms_common.py:1082 ishtar_common/forms_common.py:1467 -#: ishtar_common/forms_common.py:1873 ishtar_common/forms_common.py:2089 -#: ishtar_common/models.py:714 ishtar_common/models.py:2350 -#: ishtar_common/models.py:3853 ishtar_common/models_imports.py:791 +#: archaeological_warehouse/models.py:818 +#: cd17_app/templates/ishtar/sheet_find.html:342 +#: cd17_app/templates/ishtar/sheet_find.html:380 +#: cd17_app/templates/ishtar/sheet_find.html:418 +#: cd17_app/templates/ishtar/sheet_find.html:456 +#: ishtar_common/forms_common.py:454 ishtar_common/forms_common.py:633 +#: ishtar_common/forms_common.py:851 ishtar_common/forms_common.py:1082 +#: ishtar_common/forms_common.py:1467 ishtar_common/forms_common.py:1873 +#: ishtar_common/forms_common.py:2089 ishtar_common/models.py:714 +#: ishtar_common/models.py:2350 ishtar_common/models.py:3853 +#: ishtar_common/models_imports.py:793 #: ishtar_common/templates/blocks/DataTables-stats.html:22 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:24 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:8 @@ -2505,7 +2545,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:196 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:9 #: archaeological_warehouse/forms.py:682 ishtar_common/models.py:684 -#: ishtar_common/models_imports.py:790 +#: ishtar_common/models_imports.py:792 msgid "Date" msgstr "" @@ -2773,7 +2813,7 @@ msgstr "" #: archaeological_finds/forms.py:198 archaeological_finds/forms.py:466 #: archaeological_finds/forms.py:1107 archaeological_finds/models_finds.py:1760 -#: ishtar_common/models_imports.py:773 +#: ishtar_common/models_imports.py:775 msgid "Material type quality" msgstr "" @@ -2850,6 +2890,7 @@ msgstr "" #: archaeological_finds/forms.py:231 archaeological_finds/forms.py:491 #: archaeological_finds/forms.py:992 #: archaeological_finds/templates/ishtar/sheet_find.html:168 +#: cd17_app/templates/ishtar/sheet_find.html:176 #: sra_idf_app/templates/ishtar/sheet_find.html:175 msgid "Dimensions" msgstr "" @@ -2893,6 +2934,7 @@ msgstr "" #: archaeological_finds/forms.py:246 archaeological_finds/forms.py:500 #: archaeological_finds/forms.py:1569 #: archaeological_finds/templates/ishtar/sheet_find.html:177 +#: cd17_app/templates/ishtar/sheet_find.html:185 #: sra_idf_app/templates/ishtar/sheet_find.html:184 msgid "Weight (g)" msgstr "" @@ -3045,7 +3087,7 @@ msgstr "" #: archaeological_finds/forms.py:664 archaeological_finds/forms.py:891 #: archaeological_finds/forms.py:1217 archaeological_finds/models_finds.py:1133 #: archaeological_finds/models_finds.py:1895 -#: archaeological_warehouse/forms.py:567 ishtar_common/models_imports.py:755 +#: archaeological_warehouse/forms.py:567 ishtar_common/models_imports.py:757 msgid "Conservatory state" msgstr "" @@ -3094,7 +3136,7 @@ msgstr "" #: archaeological_finds/models_finds.py:863 #: archaeological_finds/models_finds.py:1663 #: archaeological_finds/templates/ishtar/sheet_findbasket.html:4 -#: archaeological_finds/views.py:1199 archaeological_finds/wizards.py:401 +#: archaeological_finds/views.py:1219 archaeological_finds/wizards.py:401 msgid "Basket" msgstr "" @@ -3112,6 +3154,7 @@ msgstr "" #: archaeological_finds/forms.py:871 archaeological_finds/forms.py:1003 #: archaeological_finds/templates/ishtar/sheet_find.html:198 +#: cd17_app/templates/ishtar/sheet_find.html:206 #: sra_idf_app/templates/ishtar/sheet_find.html:205 msgid "Preservation" msgstr "" @@ -3178,7 +3221,7 @@ msgstr "" #: archaeological_operations/models.py:807 #: archaeological_operations/models.py:893 #: archaeological_operations/models.py:1174 ishtar_common/models.py:4584 -#: ishtar_common/models_imports.py:740 +#: ishtar_common/models_imports.py:742 msgid "Operation type" msgstr "" @@ -3245,7 +3288,7 @@ msgstr "" #: archaeological_finds/forms.py:1111 archaeological_finds/models_finds.py:261 #: archaeological_finds/models_finds.py:1131 #: archaeological_operations/templates/ishtar/sheet_operation.html:491 -#: archaeological_warehouse/forms.py:560 ishtar_common/models_imports.py:763 +#: archaeological_warehouse/forms.py:560 ishtar_common/models_imports.py:765 #: na_app/templates/ishtar/sheet_operation.html:497 #: sra_idf_app/templates/ishtar/sheet_operation.html:488 msgid "Object type" @@ -3386,6 +3429,7 @@ msgstr "" #: archaeological_finds/forms.py:1307 archaeological_finds/models_finds.py:1090 #: archaeological_finds/models_finds.py:1807 #: archaeological_finds/templates/ishtar/sheet_find.html:273 +#: cd17_app/templates/ishtar/sheet_find.html:281 #: ishtar_common/forms_common.py:1485 #: sra_idf_app/templates/ishtar/sheet_find.html:280 msgid "Reference container" @@ -3397,6 +3441,7 @@ msgstr "" #: archaeological_finds/forms.py:1331 archaeological_finds/models_finds.py:1089 #: archaeological_finds/templates/ishtar/sheet_find.html:294 +#: cd17_app/templates/ishtar/sheet_find.html:302 #: ishtar_common/forms_common.py:1477 #: sra_idf_app/templates/ishtar/sheet_find.html:301 msgid "Current container" @@ -3407,7 +3452,7 @@ msgid "Current container - Warehouse (location)" msgstr "" #: archaeological_finds/forms.py:1356 archaeological_finds/forms.py:1372 -#: archaeological_finds/forms.py:1413 archaeological_finds/views.py:368 +#: archaeological_finds/forms.py:1413 archaeological_finds/views.py:388 msgid "Find search" msgstr "" @@ -3434,7 +3479,7 @@ msgid "Find basket - 001 - Search" msgstr "" #: archaeological_finds/forms.py:1631 archaeological_finds/forms.py:1646 -#: archaeological_finds/views.py:286 +#: archaeological_finds/views.py:287 msgid "Basket search" msgstr "" @@ -3450,11 +3495,14 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:333 #: archaeological_finds/templates/ishtar/sheet_find.html:371 #: archaeological_finds/templates/ishtar/sheet_find.html:409 +#: cd17_app/templates/ishtar/sheet_find.html:341 +#: cd17_app/templates/ishtar/sheet_find.html:379 +#: cd17_app/templates/ishtar/sheet_find.html:417 #: ishtar_common/forms_common.py:1419 ishtar_common/models.py:938 #: ishtar_common/models.py:1666 ishtar_common/models.py:3185 #: ishtar_common/models_common.py:157 ishtar_common/models_common.py:190 #: ishtar_common/models_common.py:1809 ishtar_common/models_common.py:1825 -#: ishtar_common/models_imports.py:424 +#: ishtar_common/models_imports.py:426 #: sra_idf_app/templates/ishtar/sheet_find.html:340 #: sra_idf_app/templates/ishtar/sheet_find.html:378 #: sra_idf_app/templates/ishtar/sheet_find.html:416 @@ -3463,7 +3511,7 @@ msgstr "" #: archaeological_finds/forms.py:1666 ishtar_common/models.py:1005 #: ishtar_common/models.py:1876 ishtar_common/models.py:3187 -#: ishtar_common/models_imports.py:108 ishtar_common/models_imports.py:526 +#: ishtar_common/models_imports.py:108 ishtar_common/models_imports.py:528 msgid "Slug" msgstr "" @@ -3514,12 +3562,12 @@ msgstr "" #: archaeological_finds/models_finds.py:172 #: archaeological_finds/models_treatments.py:208 #: archaeological_finds/models_treatments.py:743 -#: ishtar_common/models_imports.py:760 +#: ishtar_common/models_imports.py:762 msgid "Treatment type" msgstr "" #: archaeological_finds/forms_treatments.py:77 -#: archaeological_finds/views.py:620 +#: archaeological_finds/views.py:640 msgid "Treatment search" msgstr "" @@ -3658,6 +3706,9 @@ msgstr "" #: archaeological_warehouse/models.py:1074 #: archaeological_warehouse/models.py:1864 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 +#: cd17_app/templates/ishtar/sheet_find.html:346 +#: cd17_app/templates/ishtar/sheet_find.html:384 +#: cd17_app/templates/ishtar/sheet_find.html:422 #: ishtar_common/forms_common.py:1975 ishtar_common/forms_common.py:2154 #: ishtar_common/templates/ishtar/sheet_document.html:100 #: sra_idf_app/templates/ishtar/sheet_find.html:345 @@ -3750,6 +3801,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1107 #: archaeological_finds/templates/ishtar/sheet_find.html:451 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:55 +#: cd17_app/templates/ishtar/sheet_find.html:459 #: sra_idf_app/templates/ishtar/sheet_find.html:458 msgid "Applicant" msgstr "" @@ -3759,6 +3811,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1115 #: archaeological_finds/templates/ishtar/sheet_find.html:452 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:63 +#: cd17_app/templates/ishtar/sheet_find.html:460 #: sra_idf_app/templates/ishtar/sheet_find.html:459 msgid "Applicant organisation" msgstr "" @@ -3781,7 +3834,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:734 #: archaeological_finds/forms_treatments.py:746 -#: archaeological_finds/views.py:957 +#: archaeological_finds/views.py:977 msgid "Treatment request search" msgstr "" @@ -3960,7 +4013,7 @@ msgstr "" msgid "Integrity / interest types" msgstr "" -#: archaeological_finds/models_finds.py:237 ishtar_common/models_imports.py:766 +#: archaeological_finds/models_finds.py:237 ishtar_common/models_imports.py:768 msgid "Remarkability type" msgstr "" @@ -3968,7 +4021,7 @@ msgstr "" msgid "Remarkability types" msgstr "" -#: archaeological_finds/models_finds.py:250 ishtar_common/models_imports.py:770 +#: archaeological_finds/models_finds.py:250 ishtar_common/models_imports.py:772 msgid "Batch type" msgstr "" @@ -3978,7 +4031,7 @@ msgstr "" #: archaeological_finds/models_finds.py:275 #: archaeological_finds/models_finds.py:1826 -#: ishtar_common/models_imports.py:774 +#: ishtar_common/models_imports.py:776 msgid "Functional area" msgstr "" @@ -3990,7 +4043,7 @@ msgstr "" msgid "Object type quality types" msgstr "" -#: archaeological_finds/models_finds.py:302 ishtar_common/models_imports.py:767 +#: archaeological_finds/models_finds.py:302 ishtar_common/models_imports.py:769 msgid "Alteration type" msgstr "" @@ -3998,7 +4051,7 @@ msgstr "" msgid "Alteration types" msgstr "" -#: archaeological_finds/models_finds.py:316 ishtar_common/models_imports.py:769 +#: archaeological_finds/models_finds.py:316 ishtar_common/models_imports.py:771 msgid "Alteration cause type" msgstr "" @@ -4006,7 +4059,7 @@ msgstr "" msgid "Alteration cause types" msgstr "" -#: archaeological_finds/models_finds.py:330 ishtar_common/models_imports.py:762 +#: archaeological_finds/models_finds.py:330 ishtar_common/models_imports.py:764 msgid "Treatment emergency type" msgstr "" @@ -4022,7 +4075,7 @@ msgstr "" msgid "Communicability types" msgstr "" -#: archaeological_finds/models_finds.py:357 ishtar_common/models_imports.py:771 +#: archaeological_finds/models_finds.py:357 ishtar_common/models_imports.py:773 msgid "Checked type" msgstr "" @@ -4072,7 +4125,7 @@ msgstr "" msgid "kg" msgstr "" -#: archaeological_finds/models_finds.py:902 archaeological_finds/views.py:523 +#: archaeological_finds/models_finds.py:902 archaeological_finds/views.py:543 msgid "Manage basket" msgstr "" @@ -4615,7 +4668,7 @@ msgstr "" #: archaeological_finds/models_finds.py:1670 #: archaeological_finds/models_finds.py:2267 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 -#: archaeological_finds/views.py:1243 archaeological_warehouse/forms.py:667 +#: archaeological_finds/views.py:1263 archaeological_warehouse/forms.py:667 #: archaeological_warehouse/views.py:297 ishtar_common/models.py:3830 #: ishtar_common/models.py:4175 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 @@ -4633,12 +4686,14 @@ msgstr "" #: archaeological_finds/models_finds.py:1781 #: archaeological_finds/templates/ishtar/sheet_find.html:366 +#: cd17_app/templates/ishtar/sheet_find.html:374 #: sra_idf_app/templates/ishtar/sheet_find.html:373 msgid "Upstream treatment" msgstr "" #: archaeological_finds/models_finds.py:1788 #: archaeological_finds/templates/ishtar/sheet_find.html:404 +#: cd17_app/templates/ishtar/sheet_find.html:412 #: sra_idf_app/templates/ishtar/sheet_find.html:411 msgid "Downstream treatment" msgstr "" @@ -4820,6 +4875,9 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:337 #: archaeological_finds/templates/ishtar/sheet_find.html:375 #: archaeological_finds/templates/ishtar/sheet_find.html:413 +#: cd17_app/templates/ishtar/sheet_find.html:345 +#: cd17_app/templates/ishtar/sheet_find.html:383 +#: cd17_app/templates/ishtar/sheet_find.html:421 #: sra_idf_app/templates/ishtar/sheet_find.html:344 #: sra_idf_app/templates/ishtar/sheet_find.html:382 #: sra_idf_app/templates/ishtar/sheet_find.html:420 @@ -4872,8 +4930,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1163 #: archaeological_finds/templates/ishtar/sheet_find.html:443 -#: ishtar_common/views.py:995 ishtar_common/views.py:1068 -#: sra_idf_app/templates/ishtar/sheet_find.html:450 +#: cd17_app/templates/ishtar/sheet_find.html:451 ishtar_common/views.py:995 +#: ishtar_common/views.py:1068 sra_idf_app/templates/ishtar/sheet_find.html:450 msgid "Treatment requests" msgstr "" @@ -4941,6 +4999,7 @@ msgid "Last modified by" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:14 +#: cd17_app/templates/ishtar/sheet_find.html:14 #: sra_idf_app/templates/ishtar/sheet_find.html:14 msgid "" "This sheet has a downstream treatment: it is related to an old version of " @@ -4948,46 +5007,55 @@ msgid "" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:37 +#: cd17_app/templates/ishtar/sheet_find.html:37 #: sra_idf_app/templates/ishtar/sheet_find.html:37 msgid "Image / Base find" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:44 +#: cd17_app/templates/ishtar/sheet_find.html:44 #: sra_idf_app/templates/ishtar/sheet_find.html:44 msgid "Identification / Description / Dimensions" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:52 +#: cd17_app/templates/ishtar/sheet_find.html:52 #: sra_idf_app/templates/ishtar/sheet_find.html:52 msgid "Datings / Preservation" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:61 +#: cd17_app/templates/ishtar/sheet_find.html:61 #: sra_idf_app/templates/ishtar/sheet_find.html:61 msgid "Warehouse / Treatments" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:142 +#: cd17_app/templates/ishtar/sheet_find.html:150 #: sra_idf_app/templates/ishtar/sheet_find.html:149 msgid "Administrative index" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:188 +#: cd17_app/templates/ishtar/sheet_find.html:196 #: sra_idf_app/templates/ishtar/sheet_find.html:195 msgid "Checked" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:269 +#: cd17_app/templates/ishtar/sheet_find.html:277 #: sra_idf_app/templates/ishtar/sheet_find.html:276 msgid "Warehouse - container" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:295 +#: cd17_app/templates/ishtar/sheet_find.html:303 #: sra_idf_app/templates/ishtar/sheet_find.html:302 msgid "Reference container / current container" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:328 +#: cd17_app/templates/ishtar/sheet_find.html:336 #: sra_idf_app/templates/ishtar/sheet_find.html:335 msgid "Simple treatments" msgstr "" @@ -4996,6 +5064,10 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:370 #: archaeological_finds/templates/ishtar/sheet_find.html:408 #: archaeological_finds/templates/ishtar/sheet_find.html:447 +#: cd17_app/templates/ishtar/sheet_find.html:340 +#: cd17_app/templates/ishtar/sheet_find.html:378 +#: cd17_app/templates/ishtar/sheet_find.html:416 +#: cd17_app/templates/ishtar/sheet_find.html:455 #: sra_idf_app/templates/ishtar/sheet_find.html:339 #: sra_idf_app/templates/ishtar/sheet_find.html:377 #: sra_idf_app/templates/ishtar/sheet_find.html:415 @@ -5006,6 +5078,9 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:336 #: archaeological_finds/templates/ishtar/sheet_find.html:374 #: archaeological_finds/templates/ishtar/sheet_find.html:412 +#: cd17_app/templates/ishtar/sheet_find.html:344 +#: cd17_app/templates/ishtar/sheet_find.html:382 +#: cd17_app/templates/ishtar/sheet_find.html:420 #: sra_idf_app/templates/ishtar/sheet_find.html:343 #: sra_idf_app/templates/ishtar/sheet_find.html:381 #: sra_idf_app/templates/ishtar/sheet_find.html:419 @@ -5013,6 +5088,7 @@ msgid "Related finds (max. 15 displayed)" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:400 +#: cd17_app/templates/ishtar/sheet_find.html:408 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/DataTables-stats.html:77 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -5024,6 +5100,8 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:400 #: archaeological_finds/templates/ishtar/sheet_find.html:439 +#: cd17_app/templates/ishtar/sheet_find.html:408 +#: cd17_app/templates/ishtar/sheet_find.html:447 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/JQueryJqGrid.html:29 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -5035,6 +5113,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:481 #: archaeological_finds/templates/ishtar/sheet_treatment.html:125 +#: cd17_app/templates/ishtar/sheet_find.html:489 #: ishtar_common/templates/ishtar/sheet_document.html:136 #: sra_idf_app/templates/ishtar/sheet_find.html:488 msgid "Associated documents" @@ -5126,7 +5205,7 @@ msgid "The division {} {} do not exist for the location {}." msgstr "" #: archaeological_finds/tests.py:1367 archaeological_finds/tests.py:1393 -#: archaeological_finds/tests.py:1403 archaeological_operations/tests.py:2783 +#: archaeological_finds/tests.py:1403 archaeological_operations/tests.py:2806 #: ishtar_common/forms.py:1152 ishtar_common/forms.py:1230 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 #: ishtar_common/templates/ishtar/import_delete.html:20 @@ -5143,88 +5222,88 @@ msgstr "" msgid "No" msgstr "" -#: archaeological_finds/views.py:296 +#: archaeological_finds/views.py:297 msgid "Basket modify" msgstr "" -#: archaeological_finds/views.py:322 +#: archaeological_finds/views.py:323 msgid "Basket deletion" msgstr "" -#: archaeological_finds/views.py:353 +#: archaeological_finds/views.py:354 msgid "New find" msgstr "" -#: archaeological_finds/views.py:408 +#: archaeological_finds/views.py:428 msgid "Find modification" msgstr "" -#: archaeological_finds/views.py:444 +#: archaeological_finds/views.py:464 msgid "Find deletion" msgstr "" -#: archaeological_finds/views.py:473 +#: archaeological_finds/views.py:493 msgid "New basket" msgstr "" -#: archaeological_finds/views.py:505 +#: archaeological_finds/views.py:525 msgid "Manage items in basket" msgstr "" -#: archaeological_finds/views.py:626 archaeological_finds/views.py:640 -#: archaeological_finds/views.py:654 +#: archaeological_finds/views.py:646 archaeological_finds/views.py:660 +#: archaeological_finds/views.py:674 msgid "New treatment" msgstr "" -#: archaeological_finds/views.py:665 +#: archaeological_finds/views.py:685 msgid "Treatment modification" msgstr "" -#: archaeological_finds/views.py:833 +#: archaeological_finds/views.py:853 msgid "Treatment deletion" msgstr "" -#: archaeological_finds/views.py:858 +#: archaeological_finds/views.py:878 msgid "Treatment: search administrative act" msgstr "" -#: archaeological_finds/views.py:871 +#: archaeological_finds/views.py:891 msgid "Treatment: new administrative act" msgstr "" -#: archaeological_finds/views.py:888 +#: archaeological_finds/views.py:908 msgid "Treatment: administrative act modification" msgstr "" -#: archaeological_finds/views.py:918 +#: archaeological_finds/views.py:938 msgid "Treatment: administrative act deletion" msgstr "" -#: archaeological_finds/views.py:969 +#: archaeological_finds/views.py:989 msgid "New treatment request" msgstr "" -#: archaeological_finds/views.py:979 +#: archaeological_finds/views.py:999 msgid "Treatment request modification" msgstr "" -#: archaeological_finds/views.py:1022 +#: archaeological_finds/views.py:1042 msgid "Treatment request deletion" msgstr "" -#: archaeological_finds/views.py:1046 +#: archaeological_finds/views.py:1066 msgid "Treatment request: search administrative act" msgstr "" -#: archaeological_finds/views.py:1061 +#: archaeological_finds/views.py:1081 msgid "Treatment request: new administrative act" msgstr "" -#: archaeological_finds/views.py:1079 +#: archaeological_finds/views.py:1099 msgid "Treatment request: administrative act modification" msgstr "" -#: archaeological_finds/views.py:1138 +#: archaeological_finds/views.py:1158 msgid "Treatment request: administrative act deletion" msgstr "" @@ -5321,6 +5400,7 @@ msgid "Is open?" msgstr "" #: archaeological_operations/forms.py:511 +#: archaeological_operations/forms.py:821 #: archaeological_operations/models.py:2447 msgid "Scientific monitor" msgstr "" @@ -5655,7 +5735,7 @@ msgid "Operation - 060 - Remains" msgstr "" #: archaeological_operations/forms.py:1199 -#: archaeological_operations/models.py:86 ishtar_common/models_imports.py:743 +#: archaeological_operations/models.py:86 ishtar_common/models_imports.py:745 msgid "Remain type" msgstr "" @@ -5909,7 +5989,7 @@ msgstr "" #: archaeological_operations/models.py:253 #: archaeological_operations/models.py:993 -#: archaeological_operations/tests.py:2774 +#: archaeological_operations/tests.py:2797 msgctxt "key for text search" msgid "remain" msgstr "" @@ -5980,7 +6060,7 @@ msgstr "" #: archaeological_operations/models.py:647 ishtar_common/forms.py:1151 #: ishtar_common/models.py:4710 ishtar_common/models.py:4867 -#: ishtar_common/models.py:4926 ishtar_common/views_item.py:1431 +#: ishtar_common/models.py:4926 ishtar_common/views_item.py:1448 msgid "Unknown" msgstr "" @@ -6046,7 +6126,7 @@ msgid "address" msgstr "" #: archaeological_operations/models.py:978 -#: archaeological_operations/tests.py:2781 +#: archaeological_operations/tests.py:2804 msgctxt "key for text search" msgid "is-open" msgstr "" @@ -6062,8 +6142,8 @@ msgid "scientist" msgstr "" #: archaeological_operations/models.py:989 -#: archaeological_operations/tests.py:2597 -#: archaeological_operations/tests.py:3015 +#: archaeological_operations/tests.py:2620 +#: archaeological_operations/tests.py:3038 msgctxt "key for text search" msgid "operator" msgstr "" @@ -6089,7 +6169,7 @@ msgid "end-after" msgstr "" #: archaeological_operations/models.py:1013 -#: archaeological_operations/tests.py:2824 +#: archaeological_operations/tests.py:2847 msgctxt "key for text search" msgid "relation-types" msgstr "" @@ -6253,7 +6333,7 @@ msgstr "" msgid "Mean" msgstr "" -#: archaeological_operations/models.py:2088 ishtar_common/models_imports.py:745 +#: archaeological_operations/models.py:2088 ishtar_common/models_imports.py:747 msgid "Operation relation type" msgstr "" @@ -6798,27 +6878,27 @@ msgstr "" msgid "This act is indexed!" msgstr "" -#: archaeological_operations/tests.py:784 +#: archaeological_operations/tests.py:807 #: ishtar_common/templates/ishtar/import_step_by_step.html:156 msgid "New objects will be created." msgstr "" -#: archaeological_operations/tests.py:814 +#: archaeological_operations/tests.py:837 #: ishtar_common/templates/ishtar/import_step_by_step.html:67 msgid "This line have been already imported." msgstr "" -#: archaeological_operations/tests.py:852 +#: archaeological_operations/tests.py:875 #: ishtar_common/templates/ishtar/import_step_by_step.html:73 msgid "" "The following error(s) has been encountered while parsing the source file:" msgstr "" -#: archaeological_operations/tests.py:2274 ishtar_common/forms.py:439 +#: archaeological_operations/tests.py:2297 ishtar_common/forms.py:439 msgid "This item is locked for edition." msgstr "" -#: archaeological_operations/tests.py:2287 +#: archaeological_operations/tests.py:2310 #: ishtar_common/templates/ishtar/sheet.html:132 msgid "This item has been locked. Edition is disabled." msgstr "" @@ -6914,7 +6994,7 @@ msgstr "" #: archaeological_warehouse/forms.py:144 archaeological_warehouse/forms.py:204 #: archaeological_warehouse/models.py:259 -#: archaeological_warehouse/models.py:336 ishtar_common/models_imports.py:759 +#: archaeological_warehouse/models.py:336 ishtar_common/models_imports.py:761 msgid "Warehouse type" msgstr "" @@ -6990,7 +7070,7 @@ msgstr "" #: archaeological_warehouse/models.py:789 #: archaeological_warehouse/models.py:1017 #: archaeological_warehouse/templates/ishtar/sheet_container.html:138 -#: ishtar_common/models_imports.py:756 +#: ishtar_common/models_imports.py:758 msgid "Container type" msgstr "" @@ -7868,7 +7948,7 @@ msgstr "" msgid "Import already imported/scheduled." msgstr "" -#: ishtar_common/admin.py:1937 ishtar_common/models_imports.py:1117 +#: ishtar_common/admin.py:1937 ishtar_common/models_imports.py:1119 msgid "Launch import" msgstr "" @@ -7996,64 +8076,76 @@ msgid "" "source file." msgstr "" -#: ishtar_common/data_importer.py:1428 ishtar_common/views.py:1636 +#: ishtar_common/data_importer.py:1418 ishtar_common/views.py:1636 #: ishtar_common/views.py:1646 msgid "Not imported" msgstr "" -#: ishtar_common/data_importer.py:1717 +#: ishtar_common/data_importer.py:1707 msgid "Importer configuration error: \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1722 +#: ishtar_common/data_importer.py:1712 msgid "Import error: {} - \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1803 +#: ishtar_common/data_importer.py:1794 msgid "Importer configuration error: field \"{}\" does not exist for {}." msgstr "" -#: ishtar_common/data_importer.py:1916 +#: ishtar_common/data_importer.py:1907 msgid "* created *" msgstr "" -#: ishtar_common/data_importer.py:1989 +#: ishtar_common/data_importer.py:1982 msgid "* match not find *" msgstr "" -#: ishtar_common/data_importer.py:1997 +#: ishtar_common/data_importer.py:1990 msgid "* the query match more than 10 results*" msgstr "" -#: ishtar_common/data_importer.py:2002 +#: ishtar_common/data_importer.py:1995 msgid " or " msgstr "" -#: ishtar_common/data_importer.py:2178 +#: ishtar_common/data_importer.py:2068 +msgid "unicity key(s) \"{}\" is/are missing" +msgstr "" + +#: ishtar_common/data_importer.py:2071 +msgid "Import error {}, {}" +msgstr "" + +#: ishtar_common/data_importer.py:2156 +msgid "Import error {}, path \"{}\", context : {}, error : {}" +msgstr "" + +#: ishtar_common/data_importer.py:2184 msgid "line" msgstr "" -#: ishtar_common/data_importer.py:2178 +#: ishtar_common/data_importer.py:2184 msgid "col" msgstr "" -#: ishtar_common/data_importer.py:2178 +#: ishtar_common/data_importer.py:2184 msgid "error" msgstr "" -#: ishtar_common/data_importer.py:2184 +#: ishtar_common/data_importer.py:2190 msgid "field" msgstr "" -#: ishtar_common/data_importer.py:2184 +#: ishtar_common/data_importer.py:2190 msgid "source" msgstr "" -#: ishtar_common/data_importer.py:2184 +#: ishtar_common/data_importer.py:2190 msgid "result" msgstr "" -#: ishtar_common/data_importer.py:2200 +#: ishtar_common/data_importer.py:2206 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "" @@ -8158,7 +8250,7 @@ msgid "Target" msgstr "" #: ishtar_common/forms_common.py:263 ishtar_common/models.py:1691 -#: ishtar_common/models_imports.py:660 +#: ishtar_common/models_imports.py:662 #: ishtar_common/templates/ishtar/formset_import_match.html:45 #: ishtar_common/templates/ishtar/import_step_by_step.html:172 #: ishtar_common/templates/ishtar/import_step_by_step.html:200 @@ -8191,8 +8283,8 @@ msgid "all users" msgstr "" #: ishtar_common/forms_common.py:395 ishtar_common/forms_common.py:506 -#: ishtar_common/models.py:2285 ishtar_common/models_imports.py:727 -#: ishtar_common/models_imports.py:728 +#: ishtar_common/models.py:2285 ishtar_common/models_imports.py:729 +#: ishtar_common/models_imports.py:730 msgid "Organization type" msgstr "" @@ -8255,7 +8347,7 @@ msgstr "" #: ishtar_common/forms_common.py:1462 ishtar_common/forms_common.py:1872 #: ishtar_common/forms_common.py:2087 ishtar_common/models.py:2615 #: ishtar_common/models.py:2619 ishtar_common/models.py:3838 -#: ishtar_common/models_imports.py:730 +#: ishtar_common/models_imports.py:732 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:7 msgid "Title" msgstr "" @@ -8340,7 +8432,7 @@ msgstr "" #: ishtar_common/forms_common.py:928 ishtar_common/forms_common.py:976 #: ishtar_common/forms_common.py:980 ishtar_common/models.py:2433 -#: ishtar_common/models_imports.py:729 +#: ishtar_common/models_imports.py:731 msgid "Person type" msgstr "" @@ -8436,7 +8528,7 @@ msgid "This value already exist" msgstr "" #: ishtar_common/forms_common.py:1440 ishtar_common/models.py:3463 -#: ishtar_common/models_imports.py:737 +#: ishtar_common/models_imports.py:739 msgid "Document tag" msgstr "" @@ -8451,7 +8543,7 @@ msgstr "" #: ishtar_common/forms_common.py:1473 ishtar_common/forms_common.py:1662 #: ishtar_common/forms_common.py:1877 ishtar_common/models.py:3905 -#: ishtar_common/models_imports.py:734 ishtar_common/models_imports.py:735 +#: ishtar_common/models_imports.py:736 ishtar_common/models_imports.py:737 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:88 #: ishtar_common/templates/ishtar/sheet_document.html:50 msgid "Format" @@ -8494,7 +8586,7 @@ msgstr "" #: ishtar_common/forms_common.py:1537 ishtar_common/forms_common.py:1906 #: ishtar_common/models.py:957 ishtar_common/models.py:3873 -#: ishtar_common/models_imports.py:738 overload_translation/models.py:11 +#: ishtar_common/models_imports.py:740 overload_translation/models.py:11 msgid "Language" msgstr "" @@ -8667,8 +8759,8 @@ msgstr "" msgid "Document - Quick action - Modify" msgstr "" -#: ishtar_common/forms_common.py:2066 ishtar_common/models_imports.py:731 -#: ishtar_common/models_imports.py:732 +#: ishtar_common/forms_common.py:2066 ishtar_common/models_imports.py:733 +#: ishtar_common/models_imports.py:734 msgid "Source type" msgstr "" @@ -8698,7 +8790,7 @@ msgid "Would you like to delete this documentation?" msgstr "" #: ishtar_common/forms_common.py:2241 ishtar_common/models.py:3305 -#: ishtar_common/models.py:3320 ishtar_common/models_imports.py:733 +#: ishtar_common/models.py:3320 ishtar_common/models_imports.py:735 msgid "Author type" msgstr "" @@ -8757,7 +8849,7 @@ msgstr "" msgid "Directory" msgstr "" -#: ishtar_common/ishtar_menu.py:178 ishtar_common/models_imports.py:1007 +#: ishtar_common/ishtar_menu.py:178 ishtar_common/models_imports.py:1009 msgid "Imports" msgstr "" @@ -8790,7 +8882,7 @@ msgid "This item already exists." msgstr "" #: ishtar_common/models.py:428 ishtar_common/models.py:702 -#: ishtar_common/models_imports.py:659 +#: ishtar_common/models_imports.py:661 #: ishtar_common/templates/ishtar/formset_import_match.html:44 #: ishtar_common/templates/ishtar/import_step_by_step.html:171 #: ishtar_common/templates/ishtar/import_step_by_step.html:199 @@ -8855,7 +8947,7 @@ msgstr "" msgid "Long text" msgstr "" -#: ishtar_common/models.py:681 ishtar_common/models_imports.py:787 +#: ishtar_common/models.py:681 ishtar_common/models_imports.py:789 msgid "Integer" msgstr "" @@ -8863,7 +8955,7 @@ msgstr "" msgid "Boolean" msgstr "" -#: ishtar_common/models.py:683 ishtar_common/models_imports.py:788 +#: ishtar_common/models.py:683 ishtar_common/models_imports.py:790 msgid "Float" msgstr "" @@ -9518,7 +9610,7 @@ msgstr "" #: ishtar_common/models.py:1495 ishtar_common/models.py:1905 #: ishtar_common/models.py:3197 ishtar_common/models_common.py:169 -#: ishtar_common/models_imports.py:124 ishtar_common/models_imports.py:638 +#: ishtar_common/models_imports.py:124 ishtar_common/models_imports.py:640 msgid "Available" msgstr "" @@ -9712,7 +9804,7 @@ msgstr "" msgid "Long title" msgstr "" -#: ishtar_common/models.py:2506 ishtar_common/models_imports.py:781 +#: ishtar_common/models.py:2506 ishtar_common/models_imports.py:783 msgid "Title type" msgstr "" @@ -9871,8 +9963,8 @@ msgstr "" msgid "Only available for these document types" msgstr "" -#: ishtar_common/models.py:3414 ishtar_common/models_imports.py:739 -#: ishtar_common/models_imports.py:780 +#: ishtar_common/models.py:3414 ishtar_common/models_imports.py:741 +#: ishtar_common/models_imports.py:782 msgid "Support type" msgstr "" @@ -9902,7 +9994,7 @@ msgstr "" msgid "URL" msgstr "" -#: ishtar_common/models.py:3454 ishtar_common/models_imports.py:736 +#: ishtar_common/models.py:3454 ishtar_common/models_imports.py:738 msgid "License type" msgstr "" @@ -10157,11 +10249,11 @@ msgstr "" msgid "In progress" msgstr "" -#: ishtar_common/models.py:4687 ishtar_common/models_imports.py:907 +#: ishtar_common/models.py:4687 ishtar_common/models_imports.py:909 msgid "Finished with errors" msgstr "" -#: ishtar_common/models.py:4688 ishtar_common/models_imports.py:908 +#: ishtar_common/models.py:4688 ishtar_common/models_imports.py:910 msgid "Finished" msgstr "" @@ -10200,7 +10292,7 @@ msgid "" "configuration." msgstr "" -#: ishtar_common/models.py:4807 ishtar_common/models_imports.py:899 +#: ishtar_common/models.py:4807 ishtar_common/models_imports.py:901 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:132 msgid "Created" msgstr "" @@ -10440,7 +10532,7 @@ msgstr "" msgid "Authority SRID" msgstr "" -#: ishtar_common/models_common.py:2732 ishtar_common/models_imports.py:779 +#: ishtar_common/models_common.py:2732 ishtar_common/models_imports.py:781 msgid "Spatial reference system" msgstr "" @@ -10539,399 +10631,399 @@ msgstr "" msgid "Importer - Defaults" msgstr "" -#: ishtar_common/models_imports.py:377 +#: ishtar_common/models_imports.py:379 msgid "Importer - Default value" msgstr "" -#: ishtar_common/models_imports.py:378 +#: ishtar_common/models_imports.py:380 msgid "Importer - Default values" msgstr "" -#: ishtar_common/models_imports.py:427 +#: ishtar_common/models_imports.py:429 #: ishtar_common/templates/ishtar/import_step_by_step.html:101 #: ishtar_common/templates/ishtar/import_step_by_step.html:269 msgid "Column number" msgstr "" -#: ishtar_common/models_imports.py:437 +#: ishtar_common/models_imports.py:439 msgid "Required" msgstr "" -#: ishtar_common/models_imports.py:439 +#: ishtar_common/models_imports.py:441 msgid "Export field name" msgstr "" -#: ishtar_common/models_imports.py:440 +#: ishtar_common/models_imports.py:442 msgid "" "Fill this field if the field name is ambiguous for export. For instance: " "concatenated fields." msgstr "" -#: ishtar_common/models_imports.py:446 +#: ishtar_common/models_imports.py:448 msgid "Importer - Column" msgstr "" -#: ishtar_common/models_imports.py:447 +#: ishtar_common/models_imports.py:449 msgid "Importer - Columns" msgstr "" -#: ishtar_common/models_imports.py:481 +#: ishtar_common/models_imports.py:483 msgid "Field name" msgstr "" -#: ishtar_common/models_imports.py:483 ishtar_common/models_imports.py:571 +#: ishtar_common/models_imports.py:485 ishtar_common/models_imports.py:573 msgid "Force creation of new items" msgstr "" -#: ishtar_common/models_imports.py:485 ishtar_common/models_imports.py:573 +#: ishtar_common/models_imports.py:487 ishtar_common/models_imports.py:575 msgid "Concatenate with existing" msgstr "" -#: ishtar_common/models_imports.py:487 ishtar_common/models_imports.py:575 +#: ishtar_common/models_imports.py:489 ishtar_common/models_imports.py:577 msgid "Concatenate character" msgstr "" -#: ishtar_common/models_imports.py:492 +#: ishtar_common/models_imports.py:494 msgid "Importer - Duplicate field" msgstr "" -#: ishtar_common/models_imports.py:493 +#: ishtar_common/models_imports.py:495 msgid "Importer - Duplicate fields" msgstr "" -#: ishtar_common/models_imports.py:510 +#: ishtar_common/models_imports.py:512 msgid "Regular expression" msgstr "" -#: ishtar_common/models_imports.py:514 +#: ishtar_common/models_imports.py:516 msgid "Importer - Regular expression" msgstr "" -#: ishtar_common/models_imports.py:515 +#: ishtar_common/models_imports.py:517 msgid "Importer - Regular expressions" msgstr "" -#: ishtar_common/models_imports.py:529 +#: ishtar_common/models_imports.py:531 msgid "Format string" msgstr "" -#: ishtar_common/models_imports.py:530 +#: ishtar_common/models_imports.py:532 msgid "" "A string used to format a value using the Python \"format()\" method. The " "site https://pyformat.info/ provide good examples of usage. Only one \"{}\" " "entry is managed. The input is assumed to be a string." msgstr "" -#: ishtar_common/models_imports.py:538 +#: ishtar_common/models_imports.py:540 msgid "Importer - Value format" msgstr "" -#: ishtar_common/models_imports.py:539 +#: ishtar_common/models_imports.py:541 msgid "Importer - Value formats" msgstr "" -#: ishtar_common/models_imports.py:549 +#: ishtar_common/models_imports.py:551 msgid "The string provided generate an error. Fix it." msgstr "" -#: ishtar_common/models_imports.py:581 +#: ishtar_common/models_imports.py:583 msgid "Importer - Target" msgstr "" -#: ishtar_common/models_imports.py:582 +#: ishtar_common/models_imports.py:584 msgid "Importer - Targets" msgstr "" -#: ishtar_common/models_imports.py:621 ishtar_common/views_item.py:532 -#: ishtar_common/views_item.py:1269 +#: ishtar_common/models_imports.py:623 ishtar_common/views_item.py:532 +#: ishtar_common/views_item.py:1286 msgid "True" msgstr "" -#: ishtar_common/models_imports.py:622 ishtar_common/views_item.py:1271 +#: ishtar_common/models_imports.py:624 ishtar_common/views_item.py:1288 msgid "False" msgstr "" -#: ishtar_common/models_imports.py:634 +#: ishtar_common/models_imports.py:636 msgid "All users can use it" msgstr "" -#: ishtar_common/models_imports.py:636 +#: ishtar_common/models_imports.py:638 msgid "All users can modify it" msgstr "" -#: ishtar_common/models_imports.py:641 +#: ishtar_common/models_imports.py:643 msgid "Importer - Target key group" msgstr "" -#: ishtar_common/models_imports.py:642 +#: ishtar_common/models_imports.py:644 msgid "Importer - Target key groups" msgstr "" -#: ishtar_common/models_imports.py:661 +#: ishtar_common/models_imports.py:663 msgid "Is set" msgstr "" -#: ishtar_common/models_imports.py:669 +#: ishtar_common/models_imports.py:671 msgid "Importer - Target key" msgstr "" -#: ishtar_common/models_imports.py:670 +#: ishtar_common/models_imports.py:672 msgid "Importer - Targets keys" msgstr "" -#: ishtar_common/models_imports.py:742 +#: ishtar_common/models_imports.py:744 msgid "Report state" msgstr "" -#: ishtar_common/models_imports.py:746 +#: ishtar_common/models_imports.py:748 msgid "Unit" msgstr "" -#: ishtar_common/models_imports.py:748 +#: ishtar_common/models_imports.py:750 msgid "Activity type" msgstr "" -#: ishtar_common/models_imports.py:752 +#: ishtar_common/models_imports.py:754 msgid "Dating quality" msgstr "" -#: ishtar_common/models_imports.py:753 +#: ishtar_common/models_imports.py:755 msgid "Material" msgstr "" -#: ishtar_common/models_imports.py:758 +#: ishtar_common/models_imports.py:760 msgid "Warehouse division" msgstr "" -#: ishtar_common/models_imports.py:764 +#: ishtar_common/models_imports.py:766 msgid "Integrity type" msgstr "" -#: ishtar_common/models_imports.py:776 +#: ishtar_common/models_imports.py:778 msgid "Identification type" msgstr "" -#: ishtar_common/models_imports.py:778 +#: ishtar_common/models_imports.py:780 msgid "Context record relation type" msgstr "" -#: ishtar_common/models_imports.py:789 overload_translation/models.py:7 +#: ishtar_common/models_imports.py:791 overload_translation/models.py:7 msgid "String" msgstr "" -#: ishtar_common/models_imports.py:793 +#: ishtar_common/models_imports.py:795 msgid "INSEE code" msgstr "" -#: ishtar_common/models_imports.py:794 +#: ishtar_common/models_imports.py:796 msgid "Upper case" msgstr "" -#: ishtar_common/models_imports.py:795 +#: ishtar_common/models_imports.py:797 msgid "Lower case" msgstr "" -#: ishtar_common/models_imports.py:796 +#: ishtar_common/models_imports.py:798 msgid "String to boolean" msgstr "" -#: ishtar_common/models_imports.py:797 +#: ishtar_common/models_imports.py:799 msgctxt "filesystem" msgid "File" msgstr "" -#: ishtar_common/models_imports.py:798 +#: ishtar_common/models_imports.py:800 msgid "Unknow type" msgstr "" -#: ishtar_common/models_imports.py:817 +#: ishtar_common/models_imports.py:819 msgid "4 digit year. e.g.: \"2015\"" msgstr "" -#: ishtar_common/models_imports.py:818 +#: ishtar_common/models_imports.py:820 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "" -#: ishtar_common/models_imports.py:819 +#: ishtar_common/models_imports.py:821 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "" -#: ishtar_common/models_imports.py:835 +#: ishtar_common/models_imports.py:837 msgid "Options" msgstr "" -#: ishtar_common/models_imports.py:837 +#: ishtar_common/models_imports.py:839 msgid "Split character(s)" msgstr "" -#: ishtar_common/models_imports.py:842 +#: ishtar_common/models_imports.py:844 msgid "Importer - Formater type" msgstr "" -#: ishtar_common/models_imports.py:843 +#: ishtar_common/models_imports.py:845 msgid "Importer - Formater types" msgstr "" -#: ishtar_common/models_imports.py:900 +#: ishtar_common/models_imports.py:902 msgid "Analyse in progress" msgstr "" -#: ishtar_common/models_imports.py:901 +#: ishtar_common/models_imports.py:903 msgid "Analysed" msgstr "" -#: ishtar_common/models_imports.py:902 +#: ishtar_common/models_imports.py:904 msgid "Check modified in queue" msgstr "" -#: ishtar_common/models_imports.py:903 +#: ishtar_common/models_imports.py:905 msgid "Import in queue" msgstr "" -#: ishtar_common/models_imports.py:904 +#: ishtar_common/models_imports.py:906 msgid "Check modified in progress" msgstr "" -#: ishtar_common/models_imports.py:905 +#: ishtar_common/models_imports.py:907 msgid "Import in progress" msgstr "" -#: ishtar_common/models_imports.py:906 +#: ishtar_common/models_imports.py:908 msgid "Partially imported" msgstr "" -#: ishtar_common/models_imports.py:909 +#: ishtar_common/models_imports.py:911 msgid "Archived" msgstr "" -#: ishtar_common/models_imports.py:946 +#: ishtar_common/models_imports.py:948 msgid "Imported file" msgstr "" -#: ishtar_common/models_imports.py:949 +#: ishtar_common/models_imports.py:951 msgid "Associated images (zip file)" msgstr "" -#: ishtar_common/models_imports.py:954 +#: ishtar_common/models_imports.py:956 msgid "If a group is selected, target key saved in this group will be used." msgstr "" -#: ishtar_common/models_imports.py:957 +#: ishtar_common/models_imports.py:959 msgid "Encoding" msgstr "" -#: ishtar_common/models_imports.py:960 +#: ishtar_common/models_imports.py:962 msgid "CSV separator" msgstr "" -#: ishtar_common/models_imports.py:961 +#: ishtar_common/models_imports.py:963 msgid "" "Separator for CSV file. Standard is comma but Microsoft Excel do not follow " "this standard and use semi-colon." msgstr "" -#: ishtar_common/models_imports.py:965 +#: ishtar_common/models_imports.py:967 msgid "Skip lines" msgstr "" -#: ishtar_common/models_imports.py:966 +#: ishtar_common/models_imports.py:968 msgid "Number of header lines in your file (can be 0)." msgstr "" -#: ishtar_common/models_imports.py:968 +#: ishtar_common/models_imports.py:970 msgid "Error file" msgstr "" -#: ishtar_common/models_imports.py:971 +#: ishtar_common/models_imports.py:973 msgid "Result file" msgstr "" -#: ishtar_common/models_imports.py:974 +#: ishtar_common/models_imports.py:976 msgid "Match file" msgstr "" -#: ishtar_common/models_imports.py:977 +#: ishtar_common/models_imports.py:979 msgid "Archive file" msgstr "" -#: ishtar_common/models_imports.py:982 +#: ishtar_common/models_imports.py:984 msgid "Conservative import" msgstr "" -#: ishtar_common/models_imports.py:983 +#: ishtar_common/models_imports.py:985 msgid "If set to true, do not overload existing values." msgstr "" -#: ishtar_common/models_imports.py:989 +#: ishtar_common/models_imports.py:991 msgid "Remaining seconds" msgstr "" -#: ishtar_common/models_imports.py:990 +#: ishtar_common/models_imports.py:992 msgid "Current line" msgstr "" -#: ishtar_common/models_imports.py:992 +#: ishtar_common/models_imports.py:994 msgid "Number of line" msgstr "" -#: ishtar_common/models_imports.py:995 +#: ishtar_common/models_imports.py:997 msgid "Imported line numbers" msgstr "" -#: ishtar_common/models_imports.py:998 +#: ishtar_common/models_imports.py:1000 msgid "Changed have been checked" msgstr "" -#: ishtar_common/models_imports.py:1001 +#: ishtar_common/models_imports.py:1003 msgid "Changed line numbers" msgstr "" -#: ishtar_common/models_imports.py:1006 +#: ishtar_common/models_imports.py:1008 msgid "Import" msgstr "" -#: ishtar_common/models_imports.py:1047 ishtar_common/models_imports.py:1188 +#: ishtar_common/models_imports.py:1049 ishtar_common/models_imports.py:1190 msgid "Error in the CSV file." msgstr "" -#: ishtar_common/models_imports.py:1114 +#: ishtar_common/models_imports.py:1116 msgid "Analyse" msgstr "" -#: ishtar_common/models_imports.py:1116 ishtar_common/models_imports.py:1125 +#: ishtar_common/models_imports.py:1118 ishtar_common/models_imports.py:1127 msgid "Re-analyse" msgstr "" -#: ishtar_common/models_imports.py:1120 +#: ishtar_common/models_imports.py:1122 msgid "Step by step import" msgstr "" -#: ishtar_common/models_imports.py:1121 ishtar_common/models_imports.py:1130 +#: ishtar_common/models_imports.py:1123 ishtar_common/models_imports.py:1132 msgid "Re-check for changes" msgstr "" -#: ishtar_common/models_imports.py:1123 ishtar_common/models_imports.py:1132 +#: ishtar_common/models_imports.py:1125 ishtar_common/models_imports.py:1134 msgid "Check for changes" msgstr "" -#: ishtar_common/models_imports.py:1126 +#: ishtar_common/models_imports.py:1128 msgid "Re-import" msgstr "" -#: ishtar_common/models_imports.py:1129 +#: ishtar_common/models_imports.py:1131 msgid "Step by step re-import" msgstr "" -#: ishtar_common/models_imports.py:1133 +#: ishtar_common/models_imports.py:1135 #: ishtar_common/templates/ishtar/import_table.html:50 msgid "Archive" msgstr "" -#: ishtar_common/models_imports.py:1136 +#: ishtar_common/models_imports.py:1138 msgid "Unarchive" msgstr "" -#: ishtar_common/models_imports.py:1137 +#: ishtar_common/models_imports.py:1139 #: ishtar_common/templates/ishtar/blocks/window_nav.html:65 #: ishtar_common/templates/ishtar/form_delete.html:11 #: ishtar_common/views.py:2352 ishtar_common/widgets.py:408 @@ -10939,23 +11031,23 @@ msgstr "" msgid "Delete" msgstr "" -#: ishtar_common/models_imports.py:1216 +#: ishtar_common/models_imports.py:1218 msgid "Modification check {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:1286 +#: ishtar_common/models_imports.py:1288 msgid "Import {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:1308 +#: ishtar_common/models_imports.py:1310 msgid "Error on imported file: {}" msgstr "" -#: ishtar_common/models_imports.py:1343 +#: ishtar_common/models_imports.py:1345 msgid "Import {} finished with errors" msgstr "" -#: ishtar_common/models_imports.py:1352 +#: ishtar_common/models_imports.py:1354 msgid "Import {} finished with no errors" msgstr "" @@ -11671,6 +11763,7 @@ msgstr "" #: ishtar_common/templates/ishtar/simple_form.html:7 #: ishtar_common/templates/ishtar/wizard/search.html:32 #: ishtar_common/templates/ishtar/wizard/validation_bar.html:6 +#: sra_idf_app/templates/ishtar/wizard/search.html:44 msgid "Validate" msgstr "" @@ -12100,6 +12193,7 @@ msgstr "" #: ishtar_common/templates/ishtar/wizard/relations_wizard.html:25 #: ishtar_common/templates/ishtar/wizard/search.html:39 #: ishtar_common/templates/ishtar/wizard/towns_wizard.html:19 +#: sra_idf_app/templates/ishtar/wizard/search.html:51 msgid "Add/Modify" msgstr "" @@ -12407,12 +12501,12 @@ msgid "Generate a QR Code" msgstr "" #: ishtar_common/templatetags/window_tables.py:105 -#: ishtar_common/widgets.py:1267 +#: ishtar_common/widgets.py:1266 msgid "No results" msgstr "" #: ishtar_common/templatetags/window_tables.py:106 -#: ishtar_common/widgets.py:1268 +#: ishtar_common/widgets.py:1267 msgid "Loading..." msgstr "" @@ -12605,7 +12699,7 @@ msgstr "" msgid "Restore previous" msgstr "" -#: ishtar_common/widgets.py:1269 +#: ishtar_common/widgets.py:1268 msgid "Remove" msgstr "" diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 420a71b53..5b858e604 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-05-18 13:45+0200\n" +"POT-Creation-Date: 2022-06-07 12:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -118,7 +118,7 @@ msgstr "" #: archaeological_context_records/forms.py:572 #: archaeological_context_records/forms.py:626 #: archaeological_context_records/models.py:633 -#: archaeological_context_records/models.py:1265 +#: archaeological_context_records/models.py:1277 #: archaeological_warehouse/forms.py:437 msgid "ID" msgstr "" @@ -162,7 +162,7 @@ msgstr "" #: archaeological_context_records/models.py:441 #: archaeological_context_records/models.py:442 #: archaeological_context_records/models.py:608 -#: archaeological_context_records/models.py:1267 +#: archaeological_context_records/models.py:1279 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:114 #: archaeological_files/forms.py:87 archaeological_files/forms.py:564 #: archaeological_finds/models_finds.py:1079 @@ -244,13 +244,13 @@ msgstr "" #: archaeological_context_records/models.py:443 #: archaeological_context_records/models.py:451 #: archaeological_context_records/models.py:658 -#: archaeological_context_records/models.py:1266 +#: archaeological_context_records/models.py:1278 msgid "Context record type" msgstr "" #: archaeological_context_records/forms.py:297 #: archaeological_context_records/models.py:634 -#: archaeological_context_records/models.py:1268 +#: archaeological_context_records/models.py:1280 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:125 #: archaeological_finds/forms.py:187 archaeological_finds/forms.py:188 #: archaeological_finds/forms.py:457 archaeological_finds/forms.py:459 @@ -261,10 +261,11 @@ msgstr "" #: archaeological_finds/models_finds.py:1749 #: archaeological_finds/models_treatments.py:252 #: archaeological_finds/templates/ishtar/sheet_find.html:147 +#: cd17_app/templates/ishtar/sheet_find.html:155 #: ishtar_common/forms_common.py:1608 ishtar_common/forms_common.py:1876 #: ishtar_common/models.py:1010 ishtar_common/models.py:3933 -#: ishtar_common/models_imports.py:109 ishtar_common/models_imports.py:428 -#: ishtar_common/models_imports.py:509 ishtar_common/models_imports.py:527 +#: ishtar_common/models_imports.py:109 ishtar_common/models_imports.py:430 +#: ishtar_common/models_imports.py:511 ishtar_common/models_imports.py:529 #: sra_idf_app/templates/ishtar/sheet_find.html:154 msgid "Description" msgstr "" @@ -431,6 +432,7 @@ msgstr "" #: archaeological_finds/forms.py:935 archaeological_finds/forms.py:959 #: archaeological_finds/models_finds.py:1792 #: archaeological_finds/templates/ishtar/sheet_find.html:215 +#: cd17_app/templates/ishtar/sheet_find.html:223 #: sra_idf_app/templates/ishtar/sheet_find.html:222 msgid "Dating" msgstr "" @@ -444,7 +446,8 @@ msgstr "" #: archaeological_operations/forms.py:1215 #: archaeological_operations/templates/ishtar/sheet_operation.html:464 #: archaeological_operations/templates/ishtar/sheet_operation.html:501 -#: ishtar_common/models_imports.py:741 +#: cd17_app/templates/ishtar/sheet_find.html:231 +#: ishtar_common/models_imports.py:743 #: na_app/templates/ishtar/sheet_operation.html:470 #: na_app/templates/ishtar/sheet_operation.html:507 #: sra_idf_app/templates/ishtar/sheet_find.html:230 @@ -471,6 +474,10 @@ msgstr "" #: archaeological_operations/models.py:97 #: archaeological_operations/models.py:1126 #: archaeological_operations/models.py:3028 +#: cd17_app/templates/ishtar/sheet_find.html:232 +#: cd17_app/templates/ishtar/sheet_find.html:347 +#: cd17_app/templates/ishtar/sheet_find.html:385 +#: cd17_app/templates/ishtar/sheet_find.html:423 #: sra_idf_app/templates/ishtar/sheet_find.html:231 #: sra_idf_app/templates/ishtar/sheet_find.html:346 #: sra_idf_app/templates/ishtar/sheet_find.html:384 @@ -488,7 +495,13 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:416 #: archaeological_finds/templates/ishtar/sheet_find.html:454 #: archaeological_operations/models.py:98 -#: archaeological_operations/models.py:3029 ishtar_common/models_imports.py:986 +#: archaeological_operations/models.py:3029 +#: cd17_app/templates/ishtar/sheet_find.html:233 +#: cd17_app/templates/ishtar/sheet_find.html:348 +#: cd17_app/templates/ishtar/sheet_find.html:386 +#: cd17_app/templates/ishtar/sheet_find.html:424 +#: cd17_app/templates/ishtar/sheet_find.html:462 +#: ishtar_common/models_imports.py:988 #: sra_idf_app/templates/ishtar/sheet_find.html:232 #: sra_idf_app/templates/ishtar/sheet_find.html:347 #: sra_idf_app/templates/ishtar/sheet_find.html:385 @@ -501,6 +514,7 @@ msgstr "" #: archaeological_context_records/models.py:113 #: archaeological_finds/forms.py:944 #: archaeological_finds/templates/ishtar/sheet_find.html:227 +#: cd17_app/templates/ishtar/sheet_find.html:235 #: sra_idf_app/templates/ishtar/sheet_find.html:234 msgid "Quality" msgstr "" @@ -510,6 +524,7 @@ msgstr "" #: archaeological_context_records/models.py:106 #: archaeological_finds/forms.py:946 #: archaeological_finds/templates/ishtar/sheet_find.html:226 +#: cd17_app/templates/ishtar/sheet_find.html:234 #: sra_idf_app/templates/ishtar/sheet_find.html:233 msgid "Dating type" msgstr "" @@ -518,6 +533,7 @@ msgstr "" #: archaeological_context_records/models.py:118 #: archaeological_finds/forms.py:948 #: archaeological_finds/templates/ishtar/sheet_find.html:228 +#: cd17_app/templates/ishtar/sheet_find.html:236 #: sra_idf_app/templates/ishtar/sheet_find.html:235 msgid "Precise dating" msgstr "" @@ -529,7 +545,7 @@ msgstr "" #: archaeological_context_records/forms.py:493 #: archaeological_context_records/ishtar_menu.py:33 #: archaeological_context_records/models.py:267 -#: archaeological_context_records/models.py:1394 +#: archaeological_context_records/models.py:1406 #: archaeological_context_records/views.py:247 #: archaeological_finds/forms.py:101 archaeological_finds/forms.py:107 #: archaeological_finds/forms.py:604 archaeological_finds/forms.py:617 @@ -591,6 +607,7 @@ msgstr "" #: archaeological_finds/forms.py:169 archaeological_finds/forms.py:449 #: archaeological_finds/forms.py:605 #: archaeological_finds/templates/ishtar/sheet_find.html:125 +#: cd17_app/templates/ishtar/sheet_find.html:133 #: ishtar_common/forms_common.py:1661 #: ishtar_common/templates/ishtar/organization_person_form.html:9 #: ishtar_common/templates/ishtar/person_form.html:9 @@ -787,6 +804,7 @@ msgstr "" #: archaeological_finds/models_finds.py:3235 #: archaeological_finds/models_treatments.py:731 #: archaeological_finds/templates/ishtar/sheet_find.html:4 +#: cd17_app/templates/ishtar/sheet_find.html:4 #: ishtar_common/forms_common.py:1966 ishtar_common/models.py:4802 #: ishtar_common/views.py:392 sra_idf_app/templates/ishtar/sheet_find.html:4 msgid "Find" @@ -854,7 +872,7 @@ msgid "Excavation technique types" msgstr "" #: archaeological_context_records/models.py:365 -#: ishtar_common/models_imports.py:750 +#: ishtar_common/models_imports.py:752 msgid "Documentation type" msgstr "" @@ -864,7 +882,7 @@ msgstr "" #: archaeological_context_records/models.py:430 #: archaeological_context_records/models.py:431 -#: archaeological_context_records/models.py:1269 +#: archaeological_context_records/models.py:1281 #: archaeological_finds/models_finds.py:1091 #: archaeological_finds/models_finds.py:1092 #: archaeological_operations/forms.py:530 @@ -932,7 +950,7 @@ msgstr "" #: archaeological_files/models.py:227 archaeological_finds/models_finds.py:1226 #: archaeological_operations/models.py:256 #: archaeological_operations/models.py:954 -#: archaeological_operations/tests.py:2731 +#: archaeological_operations/tests.py:2754 #: archaeological_warehouse/models.py:315 msgctxt "key for text search" msgid "town" @@ -989,8 +1007,8 @@ msgstr "" #: archaeological_context_records/models.py:526 #: archaeological_operations/models.py:250 #: archaeological_operations/models.py:996 -#: archaeological_operations/tests.py:2714 -#: archaeological_operations/tests.py:2896 +#: archaeological_operations/tests.py:2737 +#: archaeological_operations/tests.py:2919 msgctxt "key for text search" msgid "period" msgstr "" @@ -1030,14 +1048,14 @@ msgid "Lock/Unlock" msgstr "" #: archaeological_context_records/models.py:591 -#: archaeological_context_records/models.py:963 +#: archaeological_context_records/models.py:975 #: archaeological_context_records/views.py:271 #: archaeological_context_records/views.py:286 #: archaeological_finds/models_finds.py:856 #: archaeological_finds/models_finds.py:1656 -#: archaeological_finds/models_finds.py:2232 archaeological_finds/views.py:1216 -#: archaeological_finds/views.py:1231 archaeological_finds/views.py:1269 -#: archaeological_finds/views.py:1285 archaeological_operations/models.py:352 +#: archaeological_finds/models_finds.py:2232 archaeological_finds/views.py:1236 +#: archaeological_finds/views.py:1251 archaeological_finds/views.py:1289 +#: archaeological_finds/views.py:1305 archaeological_operations/models.py:352 #: archaeological_operations/models.py:508 #: archaeological_operations/models.py:1095 #: archaeological_operations/models.py:1641 @@ -1121,7 +1139,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:46 #: archaeological_warehouse/templates/ishtar/sheet_container.html:182 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:42 -#: ishtar_common/models.py:3958 +#: cd17_app/templates/ishtar/sheet_find.html:70 ishtar_common/models.py:3958 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_person.html:161 #: na_app/templates/ishtar/sheet_operation.html:57 @@ -1199,66 +1217,74 @@ msgstr "" msgid "List of associated base finds" msgstr "" -#: archaeological_context_records/models.py:1163 -#: archaeological_context_records/models.py:1198 -#: archaeological_context_records/models.py:1264 +#: archaeological_context_records/models.py:963 +msgid "Add find" +msgstr "" + +#: archaeological_context_records/models.py:965 +msgid "find" +msgstr "" + +#: archaeological_context_records/models.py:1175 +#: archaeological_context_records/models.py:1210 +#: archaeological_context_records/models.py:1276 #: archaeological_operations/forms.py:374 msgid "Relation type" msgstr "" -#: archaeological_context_records/models.py:1164 +#: archaeological_context_records/models.py:1176 msgid "Relation types" msgstr "" -#: archaeological_context_records/models.py:1193 +#: archaeological_context_records/models.py:1205 msgid "ID (left)" msgstr "" -#: archaeological_context_records/models.py:1194 +#: archaeological_context_records/models.py:1206 msgid "Context record type (left)" msgstr "" -#: archaeological_context_records/models.py:1195 +#: archaeological_context_records/models.py:1207 msgid "Parcel (left)" msgstr "" -#: archaeological_context_records/models.py:1196 +#: archaeological_context_records/models.py:1208 msgid "Description (left)" msgstr "" -#: archaeological_context_records/models.py:1197 +#: archaeological_context_records/models.py:1209 msgid "Periods (left)" msgstr "" -#: archaeological_context_records/models.py:1199 +#: archaeological_context_records/models.py:1211 msgid "ID (right)" msgstr "" -#: archaeological_context_records/models.py:1200 +#: archaeological_context_records/models.py:1212 msgid "Context record type (right)" msgstr "" -#: archaeological_context_records/models.py:1201 +#: archaeological_context_records/models.py:1213 msgid "Parcel (right)" msgstr "" -#: archaeological_context_records/models.py:1202 +#: archaeological_context_records/models.py:1214 msgid "Description (right)" msgstr "" -#: archaeological_context_records/models.py:1203 +#: archaeological_context_records/models.py:1215 msgid "Periods (right)" msgstr "" -#: archaeological_context_records/models.py:1210 +#: archaeological_context_records/models.py:1222 msgid "Record relation" msgstr "" -#: archaeological_context_records/models.py:1211 +#: archaeological_context_records/models.py:1223 msgid "Record relations" msgstr "" -#: archaeological_context_records/models.py:1400 +#: archaeological_context_records/models.py:1412 msgid "Context record parent" msgstr "" @@ -1326,6 +1352,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:96 #: archaeological_finds/templates/ishtar/sheet_find.html:79 #: archaeological_operations/templates/ishtar/sheet_operation.html:93 +#: cd17_app/templates/ishtar/sheet_find.html:79 #: na_app/templates/ishtar/sheet_operation.html:93 #: sra_idf_app/templates/ishtar/sheet_find.html:79 #: sra_idf_app/templates/ishtar/sheet_operation.html:93 @@ -1339,6 +1366,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:22 #: archaeological_warehouse/templates/ishtar/sheet_container.html:70 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:63 +#: cd17_app/templates/ishtar/sheet_find.html:138 #: ishtar_common/models_common.py:2952 #: ishtar_common/templates/ishtar/sheet_document.html:37 #: na_app/templates/ishtar/sheet_operation.html:122 @@ -1377,6 +1405,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:51 #: archaeological_finds/templates/ishtar/sheet_find.html:186 #: archaeological_operations/templates/ishtar/sheet_operation.html:246 +#: cd17_app/templates/ishtar/sheet_find.html:194 #: ishtar_common/templates/ishtar/blocks/window_image.html:5 #: na_app/templates/ishtar/sheet_operation.html:253 #: sra_idf_app/templates/ishtar/sheet_find.html:193 @@ -1418,9 +1447,12 @@ msgstr "" #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:499 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:623 #: archaeological_operations/templates/ishtar/sheet_operation.html:153 -#: ishtar_common/models.py:4697 ishtar_common/models.py:4830 -#: ishtar_common/models.py:4908 ishtar_common/models_common.py:1814 -#: ishtar_common/models_common.py:1829 ishtar_common/models_imports.py:979 +#: cd17_app/templates/ishtar/sheet_find.html:343 +#: cd17_app/templates/ishtar/sheet_find.html:381 +#: cd17_app/templates/ishtar/sheet_find.html:419 ishtar_common/models.py:4697 +#: ishtar_common/models.py:4830 ishtar_common/models.py:4908 +#: ishtar_common/models_common.py:1814 ishtar_common/models_common.py:1829 +#: ishtar_common/models_imports.py:981 #: na_app/templates/ishtar/sheet_operation.html:153 #: sra_idf_app/templates/ishtar/sheet_find.html:342 #: sra_idf_app/templates/ishtar/sheet_find.html:380 @@ -1538,7 +1570,7 @@ msgstr "" #: archaeological_operations/models.py:2504 #: archaeological_operations/models.py:2769 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 -#: ishtar_common/models_imports.py:792 +#: ishtar_common/models_imports.py:794 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:196 msgid "Year" msgstr "" @@ -1626,7 +1658,7 @@ msgstr "" #: archaeological_warehouse/models.py:1020 ishtar_common/forms_common.py:1606 #: ishtar_common/forms_common.py:1911 ishtar_common/models.py:2642 #: ishtar_common/models.py:3186 ishtar_common/models.py:3942 -#: ishtar_common/models_common.py:168 ishtar_common/models_imports.py:577 +#: ishtar_common/models_common.py:168 ishtar_common/models_imports.py:579 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:170 msgid "Comment" msgstr "" @@ -1635,7 +1667,6 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:169 #: archaeological_files_pdl/forms.py:315 archaeological_files_pdl/forms.py:384 #: archaeological_finds/forms_treatments.py:693 -#: archaeological_operations/forms.py:821 #: archaeological_operations/models.py:1153 msgid "In charge" msgstr "" @@ -1675,7 +1706,7 @@ msgstr "" #: archaeological_operations/forms.py:683 #: archaeological_operations/models.py:1124 ishtar_common/forms_common.py:1601 #: ishtar_common/forms_common.py:2071 ishtar_common/models.py:3927 -#: ishtar_common/models_imports.py:985 +#: ishtar_common/models_imports.py:987 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 msgid "Creation date" msgstr "" @@ -1686,6 +1717,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:878 #: archaeological_finds/models_treatments.py:1124 #: archaeological_finds/templates/ishtar/sheet_find.html:453 +#: cd17_app/templates/ishtar/sheet_find.html:461 #: sra_idf_app/templates/ishtar/sheet_find.html:460 msgid "Reception date" msgstr "" @@ -1726,6 +1758,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1099 #: archaeological_finds/templates/ishtar/sheet_find.html:450 #: archaeological_warehouse/forms.py:216 archaeological_warehouse/models.py:341 +#: cd17_app/templates/ishtar/sheet_find.html:458 #: sra_idf_app/templates/ishtar/sheet_find.html:457 msgid "Person in charge" msgstr "" @@ -1744,19 +1777,20 @@ msgstr "" #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:137 #: archaeological_warehouse/forms.py:143 archaeological_warehouse/forms.py:203 -#: archaeological_warehouse/models.py:335 ishtar_common/forms_common.py:394 -#: ishtar_common/forms_common.py:453 ishtar_common/forms_common.py:630 -#: ishtar_common/forms_common.py:757 ishtar_common/forms_common.py:848 -#: ishtar_common/forms_common.py:1084 ishtar_common/forms_common.py:1135 -#: ishtar_common/models.py:661 ishtar_common/models.py:699 -#: ishtar_common/models.py:1004 ishtar_common/models.py:1493 -#: ishtar_common/models.py:1875 ishtar_common/models.py:2349 -#: ishtar_common/models.py:2637 ishtar_common/models.py:2944 -#: ishtar_common/models.py:4673 ishtar_common/models_common.py:1885 -#: ishtar_common/models_common.py:1934 ishtar_common/models_imports.py:82 -#: ishtar_common/models_imports.py:107 ishtar_common/models_imports.py:508 -#: ishtar_common/models_imports.py:525 ishtar_common/models_imports.py:633 -#: ishtar_common/models_imports.py:943 +#: archaeological_warehouse/models.py:335 +#: cd17_app/templates/ishtar/sheet_find.html:457 +#: ishtar_common/forms_common.py:394 ishtar_common/forms_common.py:453 +#: ishtar_common/forms_common.py:630 ishtar_common/forms_common.py:757 +#: ishtar_common/forms_common.py:848 ishtar_common/forms_common.py:1084 +#: ishtar_common/forms_common.py:1135 ishtar_common/models.py:661 +#: ishtar_common/models.py:699 ishtar_common/models.py:1004 +#: ishtar_common/models.py:1493 ishtar_common/models.py:1875 +#: ishtar_common/models.py:2349 ishtar_common/models.py:2637 +#: ishtar_common/models.py:2944 ishtar_common/models.py:4673 +#: ishtar_common/models_common.py:1885 ishtar_common/models_common.py:1934 +#: ishtar_common/models_imports.py:82 ishtar_common/models_imports.py:107 +#: ishtar_common/models_imports.py:510 ishtar_common/models_imports.py:527 +#: ishtar_common/models_imports.py:635 ishtar_common/models_imports.py:945 #: ishtar_common/templates/ishtar/import_step_by_step.html:102 #: ishtar_common/templates/ishtar/import_step_by_step.html:270 #: ishtar_common/templates/ishtar/import_table.html:27 @@ -1879,7 +1913,8 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:316 #: archaeological_operations/forms.py:1620 #: archaeological_operations/forms.py:1755 -#: archaeological_operations/models.py:2450 ishtar_common/models.py:3847 +#: archaeological_operations/models.py:2450 +#: cd17_app/templates/ishtar/sheet_find.html:324 ishtar_common/models.py:3847 #: sra_idf_app/templates/ishtar/sheet_find.html:323 msgid "Index" msgstr "" @@ -2085,8 +2120,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1039 #: archaeological_operations/models.py:945 #: archaeological_operations/models.py:2309 -#: archaeological_operations/tests.py:2720 -#: archaeological_operations/tests.py:2796 +#: archaeological_operations/tests.py:2743 +#: archaeological_operations/tests.py:2819 msgctxt "key for text search" msgid "year" msgstr "" @@ -2115,7 +2150,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1033 #: archaeological_operations/models.py:243 #: archaeological_operations/models.py:968 -#: archaeological_operations/tests.py:2840 +#: archaeological_operations/tests.py:2863 #: archaeological_warehouse/models.py:308 ishtar_common/models.py:2329 #: ishtar_common/models.py:2580 ishtar_common/models.py:3077 msgctxt "key for text search" @@ -2127,7 +2162,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1042 #: archaeological_operations/models.py:974 #: archaeological_operations/models.py:2320 -#: archaeological_operations/tests.py:2853 +#: archaeological_operations/tests.py:2876 #: archaeological_warehouse/models.py:311 #: archaeological_warehouse/models.py:839 ishtar_common/models.py:2332 #: ishtar_common/models.py:2589 ishtar_common/models.py:3088 @@ -2460,12 +2495,17 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:454 #: archaeological_operations/templates/ishtar/sheet_operation.html:518 #: archaeological_warehouse/models.py:297 -#: archaeological_warehouse/models.py:818 ishtar_common/forms_common.py:454 -#: ishtar_common/forms_common.py:633 ishtar_common/forms_common.py:851 -#: ishtar_common/forms_common.py:1082 ishtar_common/forms_common.py:1467 -#: ishtar_common/forms_common.py:1873 ishtar_common/forms_common.py:2089 -#: ishtar_common/models.py:714 ishtar_common/models.py:2350 -#: ishtar_common/models.py:3853 ishtar_common/models_imports.py:791 +#: archaeological_warehouse/models.py:818 +#: cd17_app/templates/ishtar/sheet_find.html:342 +#: cd17_app/templates/ishtar/sheet_find.html:380 +#: cd17_app/templates/ishtar/sheet_find.html:418 +#: cd17_app/templates/ishtar/sheet_find.html:456 +#: ishtar_common/forms_common.py:454 ishtar_common/forms_common.py:633 +#: ishtar_common/forms_common.py:851 ishtar_common/forms_common.py:1082 +#: ishtar_common/forms_common.py:1467 ishtar_common/forms_common.py:1873 +#: ishtar_common/forms_common.py:2089 ishtar_common/models.py:714 +#: ishtar_common/models.py:2350 ishtar_common/models.py:3853 +#: ishtar_common/models_imports.py:793 #: ishtar_common/templates/blocks/DataTables-stats.html:22 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:24 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:8 @@ -2500,7 +2540,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:196 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:9 #: archaeological_warehouse/forms.py:682 ishtar_common/models.py:684 -#: ishtar_common/models_imports.py:790 +#: ishtar_common/models_imports.py:792 msgid "Date" msgstr "" @@ -2768,7 +2808,7 @@ msgstr "" #: archaeological_finds/forms.py:198 archaeological_finds/forms.py:466 #: archaeological_finds/forms.py:1107 archaeological_finds/models_finds.py:1760 -#: ishtar_common/models_imports.py:773 +#: ishtar_common/models_imports.py:775 msgid "Material type quality" msgstr "" @@ -2845,6 +2885,7 @@ msgstr "" #: archaeological_finds/forms.py:231 archaeological_finds/forms.py:491 #: archaeological_finds/forms.py:992 #: archaeological_finds/templates/ishtar/sheet_find.html:168 +#: cd17_app/templates/ishtar/sheet_find.html:176 #: sra_idf_app/templates/ishtar/sheet_find.html:175 msgid "Dimensions" msgstr "" @@ -2888,6 +2929,7 @@ msgstr "" #: archaeological_finds/forms.py:246 archaeological_finds/forms.py:500 #: archaeological_finds/forms.py:1569 #: archaeological_finds/templates/ishtar/sheet_find.html:177 +#: cd17_app/templates/ishtar/sheet_find.html:185 #: sra_idf_app/templates/ishtar/sheet_find.html:184 msgid "Weight (g)" msgstr "" @@ -3040,7 +3082,7 @@ msgstr "" #: archaeological_finds/forms.py:664 archaeological_finds/forms.py:891 #: archaeological_finds/forms.py:1217 archaeological_finds/models_finds.py:1133 #: archaeological_finds/models_finds.py:1895 -#: archaeological_warehouse/forms.py:567 ishtar_common/models_imports.py:755 +#: archaeological_warehouse/forms.py:567 ishtar_common/models_imports.py:757 msgid "Conservatory state" msgstr "" @@ -3089,7 +3131,7 @@ msgstr "" #: archaeological_finds/models_finds.py:863 #: archaeological_finds/models_finds.py:1663 #: archaeological_finds/templates/ishtar/sheet_findbasket.html:4 -#: archaeological_finds/views.py:1199 archaeological_finds/wizards.py:401 +#: archaeological_finds/views.py:1219 archaeological_finds/wizards.py:401 msgid "Basket" msgstr "" @@ -3107,6 +3149,7 @@ msgstr "" #: archaeological_finds/forms.py:871 archaeological_finds/forms.py:1003 #: archaeological_finds/templates/ishtar/sheet_find.html:198 +#: cd17_app/templates/ishtar/sheet_find.html:206 #: sra_idf_app/templates/ishtar/sheet_find.html:205 msgid "Preservation" msgstr "" @@ -3173,7 +3216,7 @@ msgstr "" #: archaeological_operations/models.py:807 #: archaeological_operations/models.py:893 #: archaeological_operations/models.py:1174 ishtar_common/models.py:4584 -#: ishtar_common/models_imports.py:740 +#: ishtar_common/models_imports.py:742 msgid "Operation type" msgstr "" @@ -3240,7 +3283,7 @@ msgstr "" #: archaeological_finds/forms.py:1111 archaeological_finds/models_finds.py:261 #: archaeological_finds/models_finds.py:1131 #: archaeological_operations/templates/ishtar/sheet_operation.html:491 -#: archaeological_warehouse/forms.py:560 ishtar_common/models_imports.py:763 +#: archaeological_warehouse/forms.py:560 ishtar_common/models_imports.py:765 #: na_app/templates/ishtar/sheet_operation.html:497 #: sra_idf_app/templates/ishtar/sheet_operation.html:488 msgid "Object type" @@ -3381,6 +3424,7 @@ msgstr "" #: archaeological_finds/forms.py:1307 archaeological_finds/models_finds.py:1090 #: archaeological_finds/models_finds.py:1807 #: archaeological_finds/templates/ishtar/sheet_find.html:273 +#: cd17_app/templates/ishtar/sheet_find.html:281 #: ishtar_common/forms_common.py:1485 #: sra_idf_app/templates/ishtar/sheet_find.html:280 msgid "Reference container" @@ -3392,6 +3436,7 @@ msgstr "" #: archaeological_finds/forms.py:1331 archaeological_finds/models_finds.py:1089 #: archaeological_finds/templates/ishtar/sheet_find.html:294 +#: cd17_app/templates/ishtar/sheet_find.html:302 #: ishtar_common/forms_common.py:1477 #: sra_idf_app/templates/ishtar/sheet_find.html:301 msgid "Current container" @@ -3402,7 +3447,7 @@ msgid "Current container - Warehouse (location)" msgstr "" #: archaeological_finds/forms.py:1356 archaeological_finds/forms.py:1372 -#: archaeological_finds/forms.py:1413 archaeological_finds/views.py:368 +#: archaeological_finds/forms.py:1413 archaeological_finds/views.py:388 msgid "Find search" msgstr "" @@ -3429,7 +3474,7 @@ msgid "Find basket - 001 - Search" msgstr "" #: archaeological_finds/forms.py:1631 archaeological_finds/forms.py:1646 -#: archaeological_finds/views.py:286 +#: archaeological_finds/views.py:287 msgid "Basket search" msgstr "" @@ -3445,11 +3490,14 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:333 #: archaeological_finds/templates/ishtar/sheet_find.html:371 #: archaeological_finds/templates/ishtar/sheet_find.html:409 +#: cd17_app/templates/ishtar/sheet_find.html:341 +#: cd17_app/templates/ishtar/sheet_find.html:379 +#: cd17_app/templates/ishtar/sheet_find.html:417 #: ishtar_common/forms_common.py:1419 ishtar_common/models.py:938 #: ishtar_common/models.py:1666 ishtar_common/models.py:3185 #: ishtar_common/models_common.py:157 ishtar_common/models_common.py:190 #: ishtar_common/models_common.py:1809 ishtar_common/models_common.py:1825 -#: ishtar_common/models_imports.py:424 +#: ishtar_common/models_imports.py:426 #: sra_idf_app/templates/ishtar/sheet_find.html:340 #: sra_idf_app/templates/ishtar/sheet_find.html:378 #: sra_idf_app/templates/ishtar/sheet_find.html:416 @@ -3458,7 +3506,7 @@ msgstr "" #: archaeological_finds/forms.py:1666 ishtar_common/models.py:1005 #: ishtar_common/models.py:1876 ishtar_common/models.py:3187 -#: ishtar_common/models_imports.py:108 ishtar_common/models_imports.py:526 +#: ishtar_common/models_imports.py:108 ishtar_common/models_imports.py:528 msgid "Slug" msgstr "" @@ -3509,12 +3557,12 @@ msgstr "" #: archaeological_finds/models_finds.py:172 #: archaeological_finds/models_treatments.py:208 #: archaeological_finds/models_treatments.py:743 -#: ishtar_common/models_imports.py:760 +#: ishtar_common/models_imports.py:762 msgid "Treatment type" msgstr "" #: archaeological_finds/forms_treatments.py:77 -#: archaeological_finds/views.py:620 +#: archaeological_finds/views.py:640 msgid "Treatment search" msgstr "" @@ -3653,6 +3701,9 @@ msgstr "" #: archaeological_warehouse/models.py:1074 #: archaeological_warehouse/models.py:1864 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 +#: cd17_app/templates/ishtar/sheet_find.html:346 +#: cd17_app/templates/ishtar/sheet_find.html:384 +#: cd17_app/templates/ishtar/sheet_find.html:422 #: ishtar_common/forms_common.py:1975 ishtar_common/forms_common.py:2154 #: ishtar_common/templates/ishtar/sheet_document.html:100 #: sra_idf_app/templates/ishtar/sheet_find.html:345 @@ -3745,6 +3796,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1107 #: archaeological_finds/templates/ishtar/sheet_find.html:451 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:55 +#: cd17_app/templates/ishtar/sheet_find.html:459 #: sra_idf_app/templates/ishtar/sheet_find.html:458 msgid "Applicant" msgstr "" @@ -3754,6 +3806,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1115 #: archaeological_finds/templates/ishtar/sheet_find.html:452 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:63 +#: cd17_app/templates/ishtar/sheet_find.html:460 #: sra_idf_app/templates/ishtar/sheet_find.html:459 msgid "Applicant organisation" msgstr "" @@ -3776,7 +3829,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:734 #: archaeological_finds/forms_treatments.py:746 -#: archaeological_finds/views.py:957 +#: archaeological_finds/views.py:977 msgid "Treatment request search" msgstr "" @@ -3955,7 +4008,7 @@ msgstr "" msgid "Integrity / interest types" msgstr "" -#: archaeological_finds/models_finds.py:237 ishtar_common/models_imports.py:766 +#: archaeological_finds/models_finds.py:237 ishtar_common/models_imports.py:768 msgid "Remarkability type" msgstr "" @@ -3963,7 +4016,7 @@ msgstr "" msgid "Remarkability types" msgstr "" -#: archaeological_finds/models_finds.py:250 ishtar_common/models_imports.py:770 +#: archaeological_finds/models_finds.py:250 ishtar_common/models_imports.py:772 msgid "Batch type" msgstr "" @@ -3973,7 +4026,7 @@ msgstr "" #: archaeological_finds/models_finds.py:275 #: archaeological_finds/models_finds.py:1826 -#: ishtar_common/models_imports.py:774 +#: ishtar_common/models_imports.py:776 msgid "Functional area" msgstr "" @@ -3985,7 +4038,7 @@ msgstr "" msgid "Object type quality types" msgstr "" -#: archaeological_finds/models_finds.py:302 ishtar_common/models_imports.py:767 +#: archaeological_finds/models_finds.py:302 ishtar_common/models_imports.py:769 msgid "Alteration type" msgstr "" @@ -3993,7 +4046,7 @@ msgstr "" msgid "Alteration types" msgstr "" -#: archaeological_finds/models_finds.py:316 ishtar_common/models_imports.py:769 +#: archaeological_finds/models_finds.py:316 ishtar_common/models_imports.py:771 msgid "Alteration cause type" msgstr "" @@ -4001,7 +4054,7 @@ msgstr "" msgid "Alteration cause types" msgstr "" -#: archaeological_finds/models_finds.py:330 ishtar_common/models_imports.py:762 +#: archaeological_finds/models_finds.py:330 ishtar_common/models_imports.py:764 msgid "Treatment emergency type" msgstr "" @@ -4017,7 +4070,7 @@ msgstr "" msgid "Communicability types" msgstr "" -#: archaeological_finds/models_finds.py:357 ishtar_common/models_imports.py:771 +#: archaeological_finds/models_finds.py:357 ishtar_common/models_imports.py:773 msgid "Checked type" msgstr "" @@ -4067,7 +4120,7 @@ msgstr "" msgid "kg" msgstr "" -#: archaeological_finds/models_finds.py:902 archaeological_finds/views.py:523 +#: archaeological_finds/models_finds.py:902 archaeological_finds/views.py:543 msgid "Manage basket" msgstr "" @@ -4610,7 +4663,7 @@ msgstr "" #: archaeological_finds/models_finds.py:1670 #: archaeological_finds/models_finds.py:2267 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 -#: archaeological_finds/views.py:1243 archaeological_warehouse/forms.py:667 +#: archaeological_finds/views.py:1263 archaeological_warehouse/forms.py:667 #: archaeological_warehouse/views.py:297 ishtar_common/models.py:3830 #: ishtar_common/models.py:4175 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 @@ -4628,12 +4681,14 @@ msgstr "" #: archaeological_finds/models_finds.py:1781 #: archaeological_finds/templates/ishtar/sheet_find.html:366 +#: cd17_app/templates/ishtar/sheet_find.html:374 #: sra_idf_app/templates/ishtar/sheet_find.html:373 msgid "Upstream treatment" msgstr "" #: archaeological_finds/models_finds.py:1788 #: archaeological_finds/templates/ishtar/sheet_find.html:404 +#: cd17_app/templates/ishtar/sheet_find.html:412 #: sra_idf_app/templates/ishtar/sheet_find.html:411 msgid "Downstream treatment" msgstr "" @@ -4811,6 +4866,9 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:337 #: archaeological_finds/templates/ishtar/sheet_find.html:375 #: archaeological_finds/templates/ishtar/sheet_find.html:413 +#: cd17_app/templates/ishtar/sheet_find.html:345 +#: cd17_app/templates/ishtar/sheet_find.html:383 +#: cd17_app/templates/ishtar/sheet_find.html:421 #: sra_idf_app/templates/ishtar/sheet_find.html:344 #: sra_idf_app/templates/ishtar/sheet_find.html:382 #: sra_idf_app/templates/ishtar/sheet_find.html:420 @@ -4863,8 +4921,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1163 #: archaeological_finds/templates/ishtar/sheet_find.html:443 -#: ishtar_common/views.py:995 ishtar_common/views.py:1068 -#: sra_idf_app/templates/ishtar/sheet_find.html:450 +#: cd17_app/templates/ishtar/sheet_find.html:451 ishtar_common/views.py:995 +#: ishtar_common/views.py:1068 sra_idf_app/templates/ishtar/sheet_find.html:450 msgid "Treatment requests" msgstr "" @@ -4932,6 +4990,7 @@ msgid "Last modified by" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:14 +#: cd17_app/templates/ishtar/sheet_find.html:14 #: sra_idf_app/templates/ishtar/sheet_find.html:14 msgid "" "This sheet has a downstream treatment: it is related to an old version of " @@ -4939,46 +4998,55 @@ msgid "" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:37 +#: cd17_app/templates/ishtar/sheet_find.html:37 #: sra_idf_app/templates/ishtar/sheet_find.html:37 msgid "Image / Base find" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:44 +#: cd17_app/templates/ishtar/sheet_find.html:44 #: sra_idf_app/templates/ishtar/sheet_find.html:44 msgid "Identification / Description / Dimensions" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:52 +#: cd17_app/templates/ishtar/sheet_find.html:52 #: sra_idf_app/templates/ishtar/sheet_find.html:52 msgid "Datings / Preservation" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:61 +#: cd17_app/templates/ishtar/sheet_find.html:61 #: sra_idf_app/templates/ishtar/sheet_find.html:61 msgid "Warehouse / Treatments" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:142 +#: cd17_app/templates/ishtar/sheet_find.html:150 #: sra_idf_app/templates/ishtar/sheet_find.html:149 msgid "Administrative index" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:188 +#: cd17_app/templates/ishtar/sheet_find.html:196 #: sra_idf_app/templates/ishtar/sheet_find.html:195 msgid "Checked" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:269 +#: cd17_app/templates/ishtar/sheet_find.html:277 #: sra_idf_app/templates/ishtar/sheet_find.html:276 msgid "Warehouse - container" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:295 +#: cd17_app/templates/ishtar/sheet_find.html:303 #: sra_idf_app/templates/ishtar/sheet_find.html:302 msgid "Reference container / current container" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:328 +#: cd17_app/templates/ishtar/sheet_find.html:336 #: sra_idf_app/templates/ishtar/sheet_find.html:335 msgid "Simple treatments" msgstr "" @@ -4987,6 +5055,10 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:370 #: archaeological_finds/templates/ishtar/sheet_find.html:408 #: archaeological_finds/templates/ishtar/sheet_find.html:447 +#: cd17_app/templates/ishtar/sheet_find.html:340 +#: cd17_app/templates/ishtar/sheet_find.html:378 +#: cd17_app/templates/ishtar/sheet_find.html:416 +#: cd17_app/templates/ishtar/sheet_find.html:455 #: sra_idf_app/templates/ishtar/sheet_find.html:339 #: sra_idf_app/templates/ishtar/sheet_find.html:377 #: sra_idf_app/templates/ishtar/sheet_find.html:415 @@ -4997,6 +5069,9 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:336 #: archaeological_finds/templates/ishtar/sheet_find.html:374 #: archaeological_finds/templates/ishtar/sheet_find.html:412 +#: cd17_app/templates/ishtar/sheet_find.html:344 +#: cd17_app/templates/ishtar/sheet_find.html:382 +#: cd17_app/templates/ishtar/sheet_find.html:420 #: sra_idf_app/templates/ishtar/sheet_find.html:343 #: sra_idf_app/templates/ishtar/sheet_find.html:381 #: sra_idf_app/templates/ishtar/sheet_find.html:419 @@ -5004,6 +5079,7 @@ msgid "Related finds (max. 15 displayed)" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:400 +#: cd17_app/templates/ishtar/sheet_find.html:408 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/DataTables-stats.html:77 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -5015,6 +5091,8 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:400 #: archaeological_finds/templates/ishtar/sheet_find.html:439 +#: cd17_app/templates/ishtar/sheet_find.html:408 +#: cd17_app/templates/ishtar/sheet_find.html:447 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/JQueryJqGrid.html:29 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -5026,6 +5104,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:481 #: archaeological_finds/templates/ishtar/sheet_treatment.html:125 +#: cd17_app/templates/ishtar/sheet_find.html:489 #: ishtar_common/templates/ishtar/sheet_document.html:136 #: sra_idf_app/templates/ishtar/sheet_find.html:488 msgid "Associated documents" @@ -5117,7 +5196,7 @@ msgid "The division {} {} do not exist for the location {}." msgstr "" #: archaeological_finds/tests.py:1367 archaeological_finds/tests.py:1393 -#: archaeological_finds/tests.py:1403 archaeological_operations/tests.py:2783 +#: archaeological_finds/tests.py:1403 archaeological_operations/tests.py:2806 #: ishtar_common/forms.py:1152 ishtar_common/forms.py:1230 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 #: ishtar_common/templates/ishtar/import_delete.html:20 @@ -5134,88 +5213,88 @@ msgstr "" msgid "No" msgstr "" -#: archaeological_finds/views.py:296 +#: archaeological_finds/views.py:297 msgid "Basket modify" msgstr "" -#: archaeological_finds/views.py:322 +#: archaeological_finds/views.py:323 msgid "Basket deletion" msgstr "" -#: archaeological_finds/views.py:353 +#: archaeological_finds/views.py:354 msgid "New find" msgstr "" -#: archaeological_finds/views.py:408 +#: archaeological_finds/views.py:428 msgid "Find modification" msgstr "" -#: archaeological_finds/views.py:444 +#: archaeological_finds/views.py:464 msgid "Find deletion" msgstr "" -#: archaeological_finds/views.py:473 +#: archaeological_finds/views.py:493 msgid "New basket" msgstr "" -#: archaeological_finds/views.py:505 +#: archaeological_finds/views.py:525 msgid "Manage items in basket" msgstr "" -#: archaeological_finds/views.py:626 archaeological_finds/views.py:640 -#: archaeological_finds/views.py:654 +#: archaeological_finds/views.py:646 archaeological_finds/views.py:660 +#: archaeological_finds/views.py:674 msgid "New treatment" msgstr "" -#: archaeological_finds/views.py:665 +#: archaeological_finds/views.py:685 msgid "Treatment modification" msgstr "" -#: archaeological_finds/views.py:833 +#: archaeological_finds/views.py:853 msgid "Treatment deletion" msgstr "" -#: archaeological_finds/views.py:858 +#: archaeological_finds/views.py:878 msgid "Treatment: search administrative act" msgstr "" -#: archaeological_finds/views.py:871 +#: archaeological_finds/views.py:891 msgid "Treatment: new administrative act" msgstr "" -#: archaeological_finds/views.py:888 +#: archaeological_finds/views.py:908 msgid "Treatment: administrative act modification" msgstr "" -#: archaeological_finds/views.py:918 +#: archaeological_finds/views.py:938 msgid "Treatment: administrative act deletion" msgstr "" -#: archaeological_finds/views.py:969 +#: archaeological_finds/views.py:989 msgid "New treatment request" msgstr "" -#: archaeological_finds/views.py:979 +#: archaeological_finds/views.py:999 msgid "Treatment request modification" msgstr "" -#: archaeological_finds/views.py:1022 +#: archaeological_finds/views.py:1042 msgid "Treatment request deletion" msgstr "" -#: archaeological_finds/views.py:1046 +#: archaeological_finds/views.py:1066 msgid "Treatment request: search administrative act" msgstr "" -#: archaeological_finds/views.py:1061 +#: archaeological_finds/views.py:1081 msgid "Treatment request: new administrative act" msgstr "" -#: archaeological_finds/views.py:1079 +#: archaeological_finds/views.py:1099 msgid "Treatment request: administrative act modification" msgstr "" -#: archaeological_finds/views.py:1138 +#: archaeological_finds/views.py:1158 msgid "Treatment request: administrative act deletion" msgstr "" @@ -5312,6 +5391,7 @@ msgid "Is open?" msgstr "" #: archaeological_operations/forms.py:511 +#: archaeological_operations/forms.py:821 #: archaeological_operations/models.py:2447 msgid "Scientific monitor" msgstr "" @@ -5646,7 +5726,7 @@ msgid "Operation - 060 - Remains" msgstr "" #: archaeological_operations/forms.py:1199 -#: archaeological_operations/models.py:86 ishtar_common/models_imports.py:743 +#: archaeological_operations/models.py:86 ishtar_common/models_imports.py:745 msgid "Remain type" msgstr "" @@ -5900,7 +5980,7 @@ msgstr "" #: archaeological_operations/models.py:253 #: archaeological_operations/models.py:993 -#: archaeological_operations/tests.py:2774 +#: archaeological_operations/tests.py:2797 msgctxt "key for text search" msgid "remain" msgstr "" @@ -5971,7 +6051,7 @@ msgstr "" #: archaeological_operations/models.py:647 ishtar_common/forms.py:1151 #: ishtar_common/models.py:4710 ishtar_common/models.py:4867 -#: ishtar_common/models.py:4926 ishtar_common/views_item.py:1431 +#: ishtar_common/models.py:4926 ishtar_common/views_item.py:1448 msgid "Unknown" msgstr "" @@ -6037,7 +6117,7 @@ msgid "address" msgstr "" #: archaeological_operations/models.py:978 -#: archaeological_operations/tests.py:2781 +#: archaeological_operations/tests.py:2804 msgctxt "key for text search" msgid "is-open" msgstr "" @@ -6053,8 +6133,8 @@ msgid "scientist" msgstr "" #: archaeological_operations/models.py:989 -#: archaeological_operations/tests.py:2597 -#: archaeological_operations/tests.py:3015 +#: archaeological_operations/tests.py:2620 +#: archaeological_operations/tests.py:3038 msgctxt "key for text search" msgid "operator" msgstr "" @@ -6080,7 +6160,7 @@ msgid "end-after" msgstr "" #: archaeological_operations/models.py:1013 -#: archaeological_operations/tests.py:2824 +#: archaeological_operations/tests.py:2847 msgctxt "key for text search" msgid "relation-types" msgstr "" @@ -6242,7 +6322,7 @@ msgstr "" msgid "Mean" msgstr "" -#: archaeological_operations/models.py:2088 ishtar_common/models_imports.py:745 +#: archaeological_operations/models.py:2088 ishtar_common/models_imports.py:747 msgid "Operation relation type" msgstr "" @@ -6787,27 +6867,27 @@ msgstr "" msgid "This act is indexed!" msgstr "" -#: archaeological_operations/tests.py:784 +#: archaeological_operations/tests.py:807 #: ishtar_common/templates/ishtar/import_step_by_step.html:156 msgid "New objects will be created." msgstr "" -#: archaeological_operations/tests.py:814 +#: archaeological_operations/tests.py:837 #: ishtar_common/templates/ishtar/import_step_by_step.html:67 msgid "This line have been already imported." msgstr "" -#: archaeological_operations/tests.py:852 +#: archaeological_operations/tests.py:875 #: ishtar_common/templates/ishtar/import_step_by_step.html:73 msgid "" "The following error(s) has been encountered while parsing the source file:" msgstr "" -#: archaeological_operations/tests.py:2274 ishtar_common/forms.py:439 +#: archaeological_operations/tests.py:2297 ishtar_common/forms.py:439 msgid "This item is locked for edition." msgstr "" -#: archaeological_operations/tests.py:2287 +#: archaeological_operations/tests.py:2310 #: ishtar_common/templates/ishtar/sheet.html:132 msgid "This item has been locked. Edition is disabled." msgstr "" @@ -6903,7 +6983,7 @@ msgstr "" #: archaeological_warehouse/forms.py:144 archaeological_warehouse/forms.py:204 #: archaeological_warehouse/models.py:259 -#: archaeological_warehouse/models.py:336 ishtar_common/models_imports.py:759 +#: archaeological_warehouse/models.py:336 ishtar_common/models_imports.py:761 msgid "Warehouse type" msgstr "" @@ -6979,7 +7059,7 @@ msgstr "" #: archaeological_warehouse/models.py:789 #: archaeological_warehouse/models.py:1017 #: archaeological_warehouse/templates/ishtar/sheet_container.html:138 -#: ishtar_common/models_imports.py:756 +#: ishtar_common/models_imports.py:758 msgid "Container type" msgstr "" @@ -7853,7 +7933,7 @@ msgstr "" msgid "Import already imported/scheduled." msgstr "" -#: ishtar_common/admin.py:1937 ishtar_common/models_imports.py:1117 +#: ishtar_common/admin.py:1937 ishtar_common/models_imports.py:1119 msgid "Launch import" msgstr "" @@ -7981,64 +8061,76 @@ msgid "" "source file." msgstr "" -#: ishtar_common/data_importer.py:1428 ishtar_common/views.py:1636 +#: ishtar_common/data_importer.py:1418 ishtar_common/views.py:1636 #: ishtar_common/views.py:1646 msgid "Not imported" msgstr "" -#: ishtar_common/data_importer.py:1717 +#: ishtar_common/data_importer.py:1707 msgid "Importer configuration error: \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1722 +#: ishtar_common/data_importer.py:1712 msgid "Import error: {} - \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1803 +#: ishtar_common/data_importer.py:1794 msgid "Importer configuration error: field \"{}\" does not exist for {}." msgstr "" -#: ishtar_common/data_importer.py:1916 +#: ishtar_common/data_importer.py:1907 msgid "* created *" msgstr "" -#: ishtar_common/data_importer.py:1989 +#: ishtar_common/data_importer.py:1982 msgid "* match not find *" msgstr "" -#: ishtar_common/data_importer.py:1997 +#: ishtar_common/data_importer.py:1990 msgid "* the query match more than 10 results*" msgstr "" -#: ishtar_common/data_importer.py:2002 +#: ishtar_common/data_importer.py:1995 msgid " or " msgstr "" -#: ishtar_common/data_importer.py:2178 +#: ishtar_common/data_importer.py:2068 +msgid "unicity key(s) \"{}\" is/are missing" +msgstr "" + +#: ishtar_common/data_importer.py:2071 +msgid "Import error {}, {}" +msgstr "" + +#: ishtar_common/data_importer.py:2156 +msgid "Import error {}, path \"{}\", context : {}, error : {}" +msgstr "" + +#: ishtar_common/data_importer.py:2184 msgid "line" msgstr "" -#: ishtar_common/data_importer.py:2178 +#: ishtar_common/data_importer.py:2184 msgid "col" msgstr "" -#: ishtar_common/data_importer.py:2178 +#: ishtar_common/data_importer.py:2184 msgid "error" msgstr "" -#: ishtar_common/data_importer.py:2184 +#: ishtar_common/data_importer.py:2190 msgid "field" msgstr "" -#: ishtar_common/data_importer.py:2184 +#: ishtar_common/data_importer.py:2190 msgid "source" msgstr "" -#: ishtar_common/data_importer.py:2184 +#: ishtar_common/data_importer.py:2190 msgid "result" msgstr "" -#: ishtar_common/data_importer.py:2200 +#: ishtar_common/data_importer.py:2206 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "" @@ -8141,7 +8233,7 @@ msgid "Target" msgstr "" #: ishtar_common/forms_common.py:263 ishtar_common/models.py:1691 -#: ishtar_common/models_imports.py:660 +#: ishtar_common/models_imports.py:662 #: ishtar_common/templates/ishtar/formset_import_match.html:45 #: ishtar_common/templates/ishtar/import_step_by_step.html:172 #: ishtar_common/templates/ishtar/import_step_by_step.html:200 @@ -8174,8 +8266,8 @@ msgid "all users" msgstr "" #: ishtar_common/forms_common.py:395 ishtar_common/forms_common.py:506 -#: ishtar_common/models.py:2285 ishtar_common/models_imports.py:727 -#: ishtar_common/models_imports.py:728 +#: ishtar_common/models.py:2285 ishtar_common/models_imports.py:729 +#: ishtar_common/models_imports.py:730 msgid "Organization type" msgstr "" @@ -8236,7 +8328,7 @@ msgstr "" #: ishtar_common/forms_common.py:1462 ishtar_common/forms_common.py:1872 #: ishtar_common/forms_common.py:2087 ishtar_common/models.py:2615 #: ishtar_common/models.py:2619 ishtar_common/models.py:3838 -#: ishtar_common/models_imports.py:730 +#: ishtar_common/models_imports.py:732 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:7 msgid "Title" msgstr "" @@ -8321,7 +8413,7 @@ msgstr "" #: ishtar_common/forms_common.py:928 ishtar_common/forms_common.py:976 #: ishtar_common/forms_common.py:980 ishtar_common/models.py:2433 -#: ishtar_common/models_imports.py:729 +#: ishtar_common/models_imports.py:731 msgid "Person type" msgstr "" @@ -8417,7 +8509,7 @@ msgid "This value already exist" msgstr "" #: ishtar_common/forms_common.py:1440 ishtar_common/models.py:3463 -#: ishtar_common/models_imports.py:737 +#: ishtar_common/models_imports.py:739 msgid "Document tag" msgstr "" @@ -8432,7 +8524,7 @@ msgstr "" #: ishtar_common/forms_common.py:1473 ishtar_common/forms_common.py:1662 #: ishtar_common/forms_common.py:1877 ishtar_common/models.py:3905 -#: ishtar_common/models_imports.py:734 ishtar_common/models_imports.py:735 +#: ishtar_common/models_imports.py:736 ishtar_common/models_imports.py:737 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:88 #: ishtar_common/templates/ishtar/sheet_document.html:50 msgid "Format" @@ -8475,7 +8567,7 @@ msgstr "" #: ishtar_common/forms_common.py:1537 ishtar_common/forms_common.py:1906 #: ishtar_common/models.py:957 ishtar_common/models.py:3873 -#: ishtar_common/models_imports.py:738 overload_translation/models.py:11 +#: ishtar_common/models_imports.py:740 overload_translation/models.py:11 msgid "Language" msgstr "" @@ -8648,8 +8740,8 @@ msgstr "" msgid "Document - Quick action - Modify" msgstr "" -#: ishtar_common/forms_common.py:2066 ishtar_common/models_imports.py:731 -#: ishtar_common/models_imports.py:732 +#: ishtar_common/forms_common.py:2066 ishtar_common/models_imports.py:733 +#: ishtar_common/models_imports.py:734 msgid "Source type" msgstr "" @@ -8679,7 +8771,7 @@ msgid "Would you like to delete this documentation?" msgstr "" #: ishtar_common/forms_common.py:2241 ishtar_common/models.py:3305 -#: ishtar_common/models.py:3320 ishtar_common/models_imports.py:733 +#: ishtar_common/models.py:3320 ishtar_common/models_imports.py:735 msgid "Author type" msgstr "" @@ -8738,7 +8830,7 @@ msgstr "" msgid "Directory" msgstr "" -#: ishtar_common/ishtar_menu.py:178 ishtar_common/models_imports.py:1007 +#: ishtar_common/ishtar_menu.py:178 ishtar_common/models_imports.py:1009 msgid "Imports" msgstr "" @@ -8771,7 +8863,7 @@ msgid "This item already exists." msgstr "" #: ishtar_common/models.py:428 ishtar_common/models.py:702 -#: ishtar_common/models_imports.py:659 +#: ishtar_common/models_imports.py:661 #: ishtar_common/templates/ishtar/formset_import_match.html:44 #: ishtar_common/templates/ishtar/import_step_by_step.html:171 #: ishtar_common/templates/ishtar/import_step_by_step.html:199 @@ -8836,7 +8928,7 @@ msgstr "" msgid "Long text" msgstr "" -#: ishtar_common/models.py:681 ishtar_common/models_imports.py:787 +#: ishtar_common/models.py:681 ishtar_common/models_imports.py:789 msgid "Integer" msgstr "" @@ -8844,7 +8936,7 @@ msgstr "" msgid "Boolean" msgstr "" -#: ishtar_common/models.py:683 ishtar_common/models_imports.py:788 +#: ishtar_common/models.py:683 ishtar_common/models_imports.py:790 msgid "Float" msgstr "" @@ -9499,7 +9591,7 @@ msgstr "" #: ishtar_common/models.py:1495 ishtar_common/models.py:1905 #: ishtar_common/models.py:3197 ishtar_common/models_common.py:169 -#: ishtar_common/models_imports.py:124 ishtar_common/models_imports.py:638 +#: ishtar_common/models_imports.py:124 ishtar_common/models_imports.py:640 msgid "Available" msgstr "" @@ -9693,7 +9785,7 @@ msgstr "" msgid "Long title" msgstr "" -#: ishtar_common/models.py:2506 ishtar_common/models_imports.py:781 +#: ishtar_common/models.py:2506 ishtar_common/models_imports.py:783 msgid "Title type" msgstr "" @@ -9852,8 +9944,8 @@ msgstr "" msgid "Only available for these document types" msgstr "" -#: ishtar_common/models.py:3414 ishtar_common/models_imports.py:739 -#: ishtar_common/models_imports.py:780 +#: ishtar_common/models.py:3414 ishtar_common/models_imports.py:741 +#: ishtar_common/models_imports.py:782 msgid "Support type" msgstr "" @@ -9883,7 +9975,7 @@ msgstr "" msgid "URL" msgstr "" -#: ishtar_common/models.py:3454 ishtar_common/models_imports.py:736 +#: ishtar_common/models.py:3454 ishtar_common/models_imports.py:738 msgid "License type" msgstr "" @@ -10138,11 +10230,11 @@ msgstr "" msgid "In progress" msgstr "" -#: ishtar_common/models.py:4687 ishtar_common/models_imports.py:907 +#: ishtar_common/models.py:4687 ishtar_common/models_imports.py:909 msgid "Finished with errors" msgstr "" -#: ishtar_common/models.py:4688 ishtar_common/models_imports.py:908 +#: ishtar_common/models.py:4688 ishtar_common/models_imports.py:910 msgid "Finished" msgstr "" @@ -10181,7 +10273,7 @@ msgid "" "configuration." msgstr "" -#: ishtar_common/models.py:4807 ishtar_common/models_imports.py:899 +#: ishtar_common/models.py:4807 ishtar_common/models_imports.py:901 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:132 msgid "Created" msgstr "" @@ -10419,7 +10511,7 @@ msgstr "" msgid "Authority SRID" msgstr "" -#: ishtar_common/models_common.py:2732 ishtar_common/models_imports.py:779 +#: ishtar_common/models_common.py:2732 ishtar_common/models_imports.py:781 msgid "Spatial reference system" msgstr "" @@ -10518,399 +10610,399 @@ msgstr "" msgid "Importer - Defaults" msgstr "" -#: ishtar_common/models_imports.py:377 +#: ishtar_common/models_imports.py:379 msgid "Importer - Default value" msgstr "" -#: ishtar_common/models_imports.py:378 +#: ishtar_common/models_imports.py:380 msgid "Importer - Default values" msgstr "" -#: ishtar_common/models_imports.py:427 +#: ishtar_common/models_imports.py:429 #: ishtar_common/templates/ishtar/import_step_by_step.html:101 #: ishtar_common/templates/ishtar/import_step_by_step.html:269 msgid "Column number" msgstr "" -#: ishtar_common/models_imports.py:437 +#: ishtar_common/models_imports.py:439 msgid "Required" msgstr "" -#: ishtar_common/models_imports.py:439 +#: ishtar_common/models_imports.py:441 msgid "Export field name" msgstr "" -#: ishtar_common/models_imports.py:440 +#: ishtar_common/models_imports.py:442 msgid "" "Fill this field if the field name is ambiguous for export. For instance: " "concatenated fields." msgstr "" -#: ishtar_common/models_imports.py:446 +#: ishtar_common/models_imports.py:448 msgid "Importer - Column" msgstr "" -#: ishtar_common/models_imports.py:447 +#: ishtar_common/models_imports.py:449 msgid "Importer - Columns" msgstr "" -#: ishtar_common/models_imports.py:481 +#: ishtar_common/models_imports.py:483 msgid "Field name" msgstr "" -#: ishtar_common/models_imports.py:483 ishtar_common/models_imports.py:571 +#: ishtar_common/models_imports.py:485 ishtar_common/models_imports.py:573 msgid "Force creation of new items" msgstr "" -#: ishtar_common/models_imports.py:485 ishtar_common/models_imports.py:573 +#: ishtar_common/models_imports.py:487 ishtar_common/models_imports.py:575 msgid "Concatenate with existing" msgstr "" -#: ishtar_common/models_imports.py:487 ishtar_common/models_imports.py:575 +#: ishtar_common/models_imports.py:489 ishtar_common/models_imports.py:577 msgid "Concatenate character" msgstr "" -#: ishtar_common/models_imports.py:492 +#: ishtar_common/models_imports.py:494 msgid "Importer - Duplicate field" msgstr "" -#: ishtar_common/models_imports.py:493 +#: ishtar_common/models_imports.py:495 msgid "Importer - Duplicate fields" msgstr "" -#: ishtar_common/models_imports.py:510 +#: ishtar_common/models_imports.py:512 msgid "Regular expression" msgstr "" -#: ishtar_common/models_imports.py:514 +#: ishtar_common/models_imports.py:516 msgid "Importer - Regular expression" msgstr "" -#: ishtar_common/models_imports.py:515 +#: ishtar_common/models_imports.py:517 msgid "Importer - Regular expressions" msgstr "" -#: ishtar_common/models_imports.py:529 +#: ishtar_common/models_imports.py:531 msgid "Format string" msgstr "" -#: ishtar_common/models_imports.py:530 +#: ishtar_common/models_imports.py:532 msgid "" "A string used to format a value using the Python \"format()\" method. The " "site https://pyformat.info/ provide good examples of usage. Only one \"{}\" " "entry is managed. The input is assumed to be a string." msgstr "" -#: ishtar_common/models_imports.py:538 +#: ishtar_common/models_imports.py:540 msgid "Importer - Value format" msgstr "" -#: ishtar_common/models_imports.py:539 +#: ishtar_common/models_imports.py:541 msgid "Importer - Value formats" msgstr "" -#: ishtar_common/models_imports.py:549 +#: ishtar_common/models_imports.py:551 msgid "The string provided generate an error. Fix it." msgstr "" -#: ishtar_common/models_imports.py:581 +#: ishtar_common/models_imports.py:583 msgid "Importer - Target" msgstr "" -#: ishtar_common/models_imports.py:582 +#: ishtar_common/models_imports.py:584 msgid "Importer - Targets" msgstr "" -#: ishtar_common/models_imports.py:621 ishtar_common/views_item.py:532 -#: ishtar_common/views_item.py:1269 +#: ishtar_common/models_imports.py:623 ishtar_common/views_item.py:532 +#: ishtar_common/views_item.py:1286 msgid "True" msgstr "" -#: ishtar_common/models_imports.py:622 ishtar_common/views_item.py:1271 +#: ishtar_common/models_imports.py:624 ishtar_common/views_item.py:1288 msgid "False" msgstr "" -#: ishtar_common/models_imports.py:634 +#: ishtar_common/models_imports.py:636 msgid "All users can use it" msgstr "" -#: ishtar_common/models_imports.py:636 +#: ishtar_common/models_imports.py:638 msgid "All users can modify it" msgstr "" -#: ishtar_common/models_imports.py:641 +#: ishtar_common/models_imports.py:643 msgid "Importer - Target key group" msgstr "" -#: ishtar_common/models_imports.py:642 +#: ishtar_common/models_imports.py:644 msgid "Importer - Target key groups" msgstr "" -#: ishtar_common/models_imports.py:661 +#: ishtar_common/models_imports.py:663 msgid "Is set" msgstr "" -#: ishtar_common/models_imports.py:669 +#: ishtar_common/models_imports.py:671 msgid "Importer - Target key" msgstr "" -#: ishtar_common/models_imports.py:670 +#: ishtar_common/models_imports.py:672 msgid "Importer - Targets keys" msgstr "" -#: ishtar_common/models_imports.py:742 +#: ishtar_common/models_imports.py:744 msgid "Report state" msgstr "" -#: ishtar_common/models_imports.py:746 +#: ishtar_common/models_imports.py:748 msgid "Unit" msgstr "" -#: ishtar_common/models_imports.py:748 +#: ishtar_common/models_imports.py:750 msgid "Activity type" msgstr "" -#: ishtar_common/models_imports.py:752 +#: ishtar_common/models_imports.py:754 msgid "Dating quality" msgstr "" -#: ishtar_common/models_imports.py:753 +#: ishtar_common/models_imports.py:755 msgid "Material" msgstr "" -#: ishtar_common/models_imports.py:758 +#: ishtar_common/models_imports.py:760 msgid "Warehouse division" msgstr "" -#: ishtar_common/models_imports.py:764 +#: ishtar_common/models_imports.py:766 msgid "Integrity type" msgstr "" -#: ishtar_common/models_imports.py:776 +#: ishtar_common/models_imports.py:778 msgid "Identification type" msgstr "" -#: ishtar_common/models_imports.py:778 +#: ishtar_common/models_imports.py:780 msgid "Context record relation type" msgstr "" -#: ishtar_common/models_imports.py:789 overload_translation/models.py:7 +#: ishtar_common/models_imports.py:791 overload_translation/models.py:7 msgid "String" msgstr "" -#: ishtar_common/models_imports.py:793 +#: ishtar_common/models_imports.py:795 msgid "INSEE code" msgstr "" -#: ishtar_common/models_imports.py:794 +#: ishtar_common/models_imports.py:796 msgid "Upper case" msgstr "" -#: ishtar_common/models_imports.py:795 +#: ishtar_common/models_imports.py:797 msgid "Lower case" msgstr "" -#: ishtar_common/models_imports.py:796 +#: ishtar_common/models_imports.py:798 msgid "String to boolean" msgstr "" -#: ishtar_common/models_imports.py:797 +#: ishtar_common/models_imports.py:799 msgctxt "filesystem" msgid "File" msgstr "" -#: ishtar_common/models_imports.py:798 +#: ishtar_common/models_imports.py:800 msgid "Unknow type" msgstr "" -#: ishtar_common/models_imports.py:817 +#: ishtar_common/models_imports.py:819 msgid "4 digit year. e.g.: \"2015\"" msgstr "" -#: ishtar_common/models_imports.py:818 +#: ishtar_common/models_imports.py:820 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "" -#: ishtar_common/models_imports.py:819 +#: ishtar_common/models_imports.py:821 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "" -#: ishtar_common/models_imports.py:835 +#: ishtar_common/models_imports.py:837 msgid "Options" msgstr "" -#: ishtar_common/models_imports.py:837 +#: ishtar_common/models_imports.py:839 msgid "Split character(s)" msgstr "" -#: ishtar_common/models_imports.py:842 +#: ishtar_common/models_imports.py:844 msgid "Importer - Formater type" msgstr "" -#: ishtar_common/models_imports.py:843 +#: ishtar_common/models_imports.py:845 msgid "Importer - Formater types" msgstr "" -#: ishtar_common/models_imports.py:900 +#: ishtar_common/models_imports.py:902 msgid "Analyse in progress" msgstr "" -#: ishtar_common/models_imports.py:901 +#: ishtar_common/models_imports.py:903 msgid "Analysed" msgstr "" -#: ishtar_common/models_imports.py:902 +#: ishtar_common/models_imports.py:904 msgid "Check modified in queue" msgstr "" -#: ishtar_common/models_imports.py:903 +#: ishtar_common/models_imports.py:905 msgid "Import in queue" msgstr "" -#: ishtar_common/models_imports.py:904 +#: ishtar_common/models_imports.py:906 msgid "Check modified in progress" msgstr "" -#: ishtar_common/models_imports.py:905 +#: ishtar_common/models_imports.py:907 msgid "Import in progress" msgstr "" -#: ishtar_common/models_imports.py:906 +#: ishtar_common/models_imports.py:908 msgid "Partially imported" msgstr "" -#: ishtar_common/models_imports.py:909 +#: ishtar_common/models_imports.py:911 msgid "Archived" msgstr "" -#: ishtar_common/models_imports.py:946 +#: ishtar_common/models_imports.py:948 msgid "Imported file" msgstr "" -#: ishtar_common/models_imports.py:949 +#: ishtar_common/models_imports.py:951 msgid "Associated images (zip file)" msgstr "" -#: ishtar_common/models_imports.py:954 +#: ishtar_common/models_imports.py:956 msgid "If a group is selected, target key saved in this group will be used." msgstr "" -#: ishtar_common/models_imports.py:957 +#: ishtar_common/models_imports.py:959 msgid "Encoding" msgstr "" -#: ishtar_common/models_imports.py:960 +#: ishtar_common/models_imports.py:962 msgid "CSV separator" msgstr "" -#: ishtar_common/models_imports.py:961 +#: ishtar_common/models_imports.py:963 msgid "" "Separator for CSV file. Standard is comma but Microsoft Excel do not follow " "this standard and use semi-colon." msgstr "" -#: ishtar_common/models_imports.py:965 +#: ishtar_common/models_imports.py:967 msgid "Skip lines" msgstr "" -#: ishtar_common/models_imports.py:966 +#: ishtar_common/models_imports.py:968 msgid "Number of header lines in your file (can be 0)." msgstr "" -#: ishtar_common/models_imports.py:968 +#: ishtar_common/models_imports.py:970 msgid "Error file" msgstr "" -#: ishtar_common/models_imports.py:971 +#: ishtar_common/models_imports.py:973 msgid "Result file" msgstr "" -#: ishtar_common/models_imports.py:974 +#: ishtar_common/models_imports.py:976 msgid "Match file" msgstr "" -#: ishtar_common/models_imports.py:977 +#: ishtar_common/models_imports.py:979 msgid "Archive file" msgstr "" -#: ishtar_common/models_imports.py:982 +#: ishtar_common/models_imports.py:984 msgid "Conservative import" msgstr "" -#: ishtar_common/models_imports.py:983 +#: ishtar_common/models_imports.py:985 msgid "If set to true, do not overload existing values." msgstr "" -#: ishtar_common/models_imports.py:989 +#: ishtar_common/models_imports.py:991 msgid "Remaining seconds" msgstr "" -#: ishtar_common/models_imports.py:990 +#: ishtar_common/models_imports.py:992 msgid "Current line" msgstr "" -#: ishtar_common/models_imports.py:992 +#: ishtar_common/models_imports.py:994 msgid "Number of line" msgstr "" -#: ishtar_common/models_imports.py:995 +#: ishtar_common/models_imports.py:997 msgid "Imported line numbers" msgstr "" -#: ishtar_common/models_imports.py:998 +#: ishtar_common/models_imports.py:1000 msgid "Changed have been checked" msgstr "" -#: ishtar_common/models_imports.py:1001 +#: ishtar_common/models_imports.py:1003 msgid "Changed line numbers" msgstr "" -#: ishtar_common/models_imports.py:1006 +#: ishtar_common/models_imports.py:1008 msgid "Import" msgstr "" -#: ishtar_common/models_imports.py:1047 ishtar_common/models_imports.py:1188 +#: ishtar_common/models_imports.py:1049 ishtar_common/models_imports.py:1190 msgid "Error in the CSV file." msgstr "" -#: ishtar_common/models_imports.py:1114 +#: ishtar_common/models_imports.py:1116 msgid "Analyse" msgstr "" -#: ishtar_common/models_imports.py:1116 ishtar_common/models_imports.py:1125 +#: ishtar_common/models_imports.py:1118 ishtar_common/models_imports.py:1127 msgid "Re-analyse" msgstr "" -#: ishtar_common/models_imports.py:1120 +#: ishtar_common/models_imports.py:1122 msgid "Step by step import" msgstr "" -#: ishtar_common/models_imports.py:1121 ishtar_common/models_imports.py:1130 +#: ishtar_common/models_imports.py:1123 ishtar_common/models_imports.py:1132 msgid "Re-check for changes" msgstr "" -#: ishtar_common/models_imports.py:1123 ishtar_common/models_imports.py:1132 +#: ishtar_common/models_imports.py:1125 ishtar_common/models_imports.py:1134 msgid "Check for changes" msgstr "" -#: ishtar_common/models_imports.py:1126 +#: ishtar_common/models_imports.py:1128 msgid "Re-import" msgstr "" -#: ishtar_common/models_imports.py:1129 +#: ishtar_common/models_imports.py:1131 msgid "Step by step re-import" msgstr "" -#: ishtar_common/models_imports.py:1133 +#: ishtar_common/models_imports.py:1135 #: ishtar_common/templates/ishtar/import_table.html:50 msgid "Archive" msgstr "" -#: ishtar_common/models_imports.py:1136 +#: ishtar_common/models_imports.py:1138 msgid "Unarchive" msgstr "" -#: ishtar_common/models_imports.py:1137 +#: ishtar_common/models_imports.py:1139 #: ishtar_common/templates/ishtar/blocks/window_nav.html:65 #: ishtar_common/templates/ishtar/form_delete.html:11 #: ishtar_common/views.py:2352 ishtar_common/widgets.py:408 @@ -10918,23 +11010,23 @@ msgstr "" msgid "Delete" msgstr "" -#: ishtar_common/models_imports.py:1216 +#: ishtar_common/models_imports.py:1218 msgid "Modification check {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:1286 +#: ishtar_common/models_imports.py:1288 msgid "Import {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:1308 +#: ishtar_common/models_imports.py:1310 msgid "Error on imported file: {}" msgstr "" -#: ishtar_common/models_imports.py:1343 +#: ishtar_common/models_imports.py:1345 msgid "Import {} finished with errors" msgstr "" -#: ishtar_common/models_imports.py:1352 +#: ishtar_common/models_imports.py:1354 msgid "Import {} finished with no errors" msgstr "" @@ -11650,6 +11742,7 @@ msgstr "" #: ishtar_common/templates/ishtar/simple_form.html:7 #: ishtar_common/templates/ishtar/wizard/search.html:32 #: ishtar_common/templates/ishtar/wizard/validation_bar.html:6 +#: sra_idf_app/templates/ishtar/wizard/search.html:44 msgid "Validate" msgstr "" @@ -12079,6 +12172,7 @@ msgstr "" #: ishtar_common/templates/ishtar/wizard/relations_wizard.html:25 #: ishtar_common/templates/ishtar/wizard/search.html:39 #: ishtar_common/templates/ishtar/wizard/towns_wizard.html:19 +#: sra_idf_app/templates/ishtar/wizard/search.html:51 msgid "Add/Modify" msgstr "" @@ -12386,12 +12480,12 @@ msgid "Generate a QR Code" msgstr "" #: ishtar_common/templatetags/window_tables.py:105 -#: ishtar_common/widgets.py:1267 +#: ishtar_common/widgets.py:1266 msgid "No results" msgstr "" #: ishtar_common/templatetags/window_tables.py:106 -#: ishtar_common/widgets.py:1268 +#: ishtar_common/widgets.py:1267 msgid "Loading..." msgstr "" @@ -12584,7 +12678,7 @@ msgstr "" msgid "Restore previous" msgstr "" -#: ishtar_common/widgets.py:1269 +#: ishtar_common/widgets.py:1268 msgid "Remove" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 457a455e5..090ae96be 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-05-18 13:45+0200\n" +"POT-Creation-Date: 2022-06-07 12:30+0200\n" "PO-Revision-Date: 2022-05-18 12:18+0000\n" "Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n" -"Language-Team: French <http://translate.iggdrasil.net/projects/ishtar/" -"wip-i18n/fr/>\n" +"Language-Team: French <http://translate.iggdrasil.net/projects/ishtar/wip-" +"i18n/fr/>\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -119,7 +119,7 @@ msgstr "Recherche en texte intégral" #: archaeological_context_records/forms.py:572 #: archaeological_context_records/forms.py:626 #: archaeological_context_records/models.py:633 -#: archaeological_context_records/models.py:1265 +#: archaeological_context_records/models.py:1277 #: archaeological_warehouse/forms.py:437 msgid "ID" msgstr "Identifiant" @@ -163,7 +163,7 @@ msgstr "Type d'unité" #: archaeological_context_records/models.py:441 #: archaeological_context_records/models.py:442 #: archaeological_context_records/models.py:608 -#: archaeological_context_records/models.py:1267 +#: archaeological_context_records/models.py:1279 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:114 #: archaeological_files/forms.py:87 archaeological_files/forms.py:564 #: archaeological_finds/models_finds.py:1079 @@ -245,13 +245,13 @@ msgstr "Seuls les éléments associés à l'opération peuvent être sélectionn #: archaeological_context_records/models.py:443 #: archaeological_context_records/models.py:451 #: archaeological_context_records/models.py:658 -#: archaeological_context_records/models.py:1266 +#: archaeological_context_records/models.py:1278 msgid "Context record type" msgstr "Type d'Unité d'Enregistrement" #: archaeological_context_records/forms.py:297 #: archaeological_context_records/models.py:634 -#: archaeological_context_records/models.py:1268 +#: archaeological_context_records/models.py:1280 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:125 #: archaeological_finds/forms.py:187 archaeological_finds/forms.py:188 #: archaeological_finds/forms.py:457 archaeological_finds/forms.py:459 @@ -262,10 +262,11 @@ msgstr "Type d'Unité d'Enregistrement" #: archaeological_finds/models_finds.py:1749 #: archaeological_finds/models_treatments.py:252 #: archaeological_finds/templates/ishtar/sheet_find.html:147 +#: cd17_app/templates/ishtar/sheet_find.html:155 #: ishtar_common/forms_common.py:1608 ishtar_common/forms_common.py:1876 #: ishtar_common/models.py:1010 ishtar_common/models.py:3933 -#: ishtar_common/models_imports.py:109 ishtar_common/models_imports.py:428 -#: ishtar_common/models_imports.py:509 ishtar_common/models_imports.py:527 +#: ishtar_common/models_imports.py:109 ishtar_common/models_imports.py:430 +#: ishtar_common/models_imports.py:511 ishtar_common/models_imports.py:529 #: sra_idf_app/templates/ishtar/sheet_find.html:154 msgid "Description" msgstr "Description" @@ -432,6 +433,7 @@ msgstr "Vous devez choisir une commune ou une parcelle." #: archaeological_finds/forms.py:935 archaeological_finds/forms.py:959 #: archaeological_finds/models_finds.py:1792 #: archaeological_finds/templates/ishtar/sheet_find.html:215 +#: cd17_app/templates/ishtar/sheet_find.html:223 #: sra_idf_app/templates/ishtar/sheet_find.html:222 msgid "Dating" msgstr "Datation" @@ -445,7 +447,8 @@ msgstr "Datation" #: archaeological_operations/forms.py:1215 #: archaeological_operations/templates/ishtar/sheet_operation.html:464 #: archaeological_operations/templates/ishtar/sheet_operation.html:501 -#: ishtar_common/models_imports.py:741 +#: cd17_app/templates/ishtar/sheet_find.html:231 +#: ishtar_common/models_imports.py:743 #: na_app/templates/ishtar/sheet_operation.html:470 #: na_app/templates/ishtar/sheet_operation.html:507 #: sra_idf_app/templates/ishtar/sheet_find.html:230 @@ -472,6 +475,10 @@ msgstr "Période" #: archaeological_operations/models.py:97 #: archaeological_operations/models.py:1126 #: archaeological_operations/models.py:3028 +#: cd17_app/templates/ishtar/sheet_find.html:232 +#: cd17_app/templates/ishtar/sheet_find.html:347 +#: cd17_app/templates/ishtar/sheet_find.html:385 +#: cd17_app/templates/ishtar/sheet_find.html:423 #: sra_idf_app/templates/ishtar/sheet_find.html:231 #: sra_idf_app/templates/ishtar/sheet_find.html:346 #: sra_idf_app/templates/ishtar/sheet_find.html:384 @@ -489,7 +496,13 @@ msgstr "Date de début" #: archaeological_finds/templates/ishtar/sheet_find.html:416 #: archaeological_finds/templates/ishtar/sheet_find.html:454 #: archaeological_operations/models.py:98 -#: archaeological_operations/models.py:3029 ishtar_common/models_imports.py:986 +#: archaeological_operations/models.py:3029 +#: cd17_app/templates/ishtar/sheet_find.html:233 +#: cd17_app/templates/ishtar/sheet_find.html:348 +#: cd17_app/templates/ishtar/sheet_find.html:386 +#: cd17_app/templates/ishtar/sheet_find.html:424 +#: cd17_app/templates/ishtar/sheet_find.html:462 +#: ishtar_common/models_imports.py:988 #: sra_idf_app/templates/ishtar/sheet_find.html:232 #: sra_idf_app/templates/ishtar/sheet_find.html:347 #: sra_idf_app/templates/ishtar/sheet_find.html:385 @@ -502,6 +515,7 @@ msgstr "Date de fin" #: archaeological_context_records/models.py:113 #: archaeological_finds/forms.py:944 #: archaeological_finds/templates/ishtar/sheet_find.html:227 +#: cd17_app/templates/ishtar/sheet_find.html:235 #: sra_idf_app/templates/ishtar/sheet_find.html:234 msgid "Quality" msgstr "Qualité" @@ -511,6 +525,7 @@ msgstr "Qualité" #: archaeological_context_records/models.py:106 #: archaeological_finds/forms.py:946 #: archaeological_finds/templates/ishtar/sheet_find.html:226 +#: cd17_app/templates/ishtar/sheet_find.html:234 #: sra_idf_app/templates/ishtar/sheet_find.html:233 msgid "Dating type" msgstr "Type de datation" @@ -519,6 +534,7 @@ msgstr "Type de datation" #: archaeological_context_records/models.py:118 #: archaeological_finds/forms.py:948 #: archaeological_finds/templates/ishtar/sheet_find.html:228 +#: cd17_app/templates/ishtar/sheet_find.html:236 #: sra_idf_app/templates/ishtar/sheet_find.html:235 msgid "Precise dating" msgstr "Datation précise" @@ -530,7 +546,7 @@ msgstr "Unité d'enregistrement - 030 - Datation" #: archaeological_context_records/forms.py:493 #: archaeological_context_records/ishtar_menu.py:33 #: archaeological_context_records/models.py:267 -#: archaeological_context_records/models.py:1394 +#: archaeological_context_records/models.py:1406 #: archaeological_context_records/views.py:247 #: archaeological_finds/forms.py:101 archaeological_finds/forms.py:107 #: archaeological_finds/forms.py:604 archaeological_finds/forms.py:617 @@ -592,6 +608,7 @@ msgstr "Activité" #: archaeological_finds/forms.py:169 archaeological_finds/forms.py:449 #: archaeological_finds/forms.py:605 #: archaeological_finds/templates/ishtar/sheet_find.html:125 +#: cd17_app/templates/ishtar/sheet_find.html:133 #: ishtar_common/forms_common.py:1661 #: ishtar_common/templates/ishtar/organization_person_form.html:9 #: ishtar_common/templates/ishtar/person_form.html:9 @@ -788,6 +805,7 @@ msgstr "Datations" #: archaeological_finds/models_finds.py:3235 #: archaeological_finds/models_treatments.py:731 #: archaeological_finds/templates/ishtar/sheet_find.html:4 +#: cd17_app/templates/ishtar/sheet_find.html:4 #: ishtar_common/forms_common.py:1966 ishtar_common/models.py:4802 #: ishtar_common/views.py:392 sra_idf_app/templates/ishtar/sheet_find.html:4 msgid "Find" @@ -855,7 +873,7 @@ msgid "Excavation technique types" msgstr "Types de méthode de fouille" #: archaeological_context_records/models.py:365 -#: ishtar_common/models_imports.py:750 +#: ishtar_common/models_imports.py:752 msgid "Documentation type" msgstr "Type de documentation" @@ -865,7 +883,7 @@ msgstr "Types de documentation" #: archaeological_context_records/models.py:430 #: archaeological_context_records/models.py:431 -#: archaeological_context_records/models.py:1269 +#: archaeological_context_records/models.py:1281 #: archaeological_finds/models_finds.py:1091 #: archaeological_finds/models_finds.py:1092 #: archaeological_operations/forms.py:530 @@ -933,7 +951,7 @@ msgstr "id" #: archaeological_files/models.py:227 archaeological_finds/models_finds.py:1226 #: archaeological_operations/models.py:256 #: archaeological_operations/models.py:954 -#: archaeological_operations/tests.py:2731 +#: archaeological_operations/tests.py:2754 #: archaeological_warehouse/models.py:315 msgctxt "key for text search" msgid "town" @@ -990,8 +1008,8 @@ msgstr "operation-type-relation" #: archaeological_context_records/models.py:526 #: archaeological_operations/models.py:250 #: archaeological_operations/models.py:996 -#: archaeological_operations/tests.py:2714 -#: archaeological_operations/tests.py:2896 +#: archaeological_operations/tests.py:2737 +#: archaeological_operations/tests.py:2919 msgctxt "key for text search" msgid "period" msgstr "periode" @@ -1031,14 +1049,14 @@ msgid "Lock/Unlock" msgstr "Verrouiller/Déverrouiller" #: archaeological_context_records/models.py:591 -#: archaeological_context_records/models.py:963 +#: archaeological_context_records/models.py:975 #: archaeological_context_records/views.py:271 #: archaeological_context_records/views.py:286 #: archaeological_finds/models_finds.py:856 #: archaeological_finds/models_finds.py:1656 -#: archaeological_finds/models_finds.py:2232 archaeological_finds/views.py:1216 -#: archaeological_finds/views.py:1231 archaeological_finds/views.py:1269 -#: archaeological_finds/views.py:1285 archaeological_operations/models.py:352 +#: archaeological_finds/models_finds.py:2232 archaeological_finds/views.py:1236 +#: archaeological_finds/views.py:1251 archaeological_finds/views.py:1289 +#: archaeological_finds/views.py:1305 archaeological_operations/models.py:352 #: archaeological_operations/models.py:508 #: archaeological_operations/models.py:1095 #: archaeological_operations/models.py:1641 @@ -1126,7 +1144,7 @@ msgstr "Estimation d'un « Terminus Post Quem »" #: archaeological_warehouse/templates/ishtar/sheet_container.html:46 #: archaeological_warehouse/templates/ishtar/sheet_container.html:182 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:42 -#: ishtar_common/models.py:3958 +#: cd17_app/templates/ishtar/sheet_find.html:70 ishtar_common/models.py:3958 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_person.html:161 #: na_app/templates/ishtar/sheet_operation.html:57 @@ -1204,66 +1222,80 @@ msgstr "UE" msgid "List of associated base finds" msgstr "Liste du mobilier de base associé" -#: archaeological_context_records/models.py:1163 -#: archaeological_context_records/models.py:1198 -#: archaeological_context_records/models.py:1264 +#: archaeological_context_records/models.py:963 +#, fuzzy +#| msgctxt "key for text search" +#| msgid "find" +msgid "Add find" +msgstr "mobilier" + +#: archaeological_context_records/models.py:965 +#, fuzzy +#| msgctxt "key for text search" +#| msgid "find" +msgid "find" +msgstr "mobilier" + +#: archaeological_context_records/models.py:1175 +#: archaeological_context_records/models.py:1210 +#: archaeological_context_records/models.py:1276 #: archaeological_operations/forms.py:374 msgid "Relation type" msgstr "Type de relation" -#: archaeological_context_records/models.py:1164 +#: archaeological_context_records/models.py:1176 msgid "Relation types" msgstr "Types de relation" -#: archaeological_context_records/models.py:1193 +#: archaeological_context_records/models.py:1205 msgid "ID (left)" msgstr "Identifiant (gauche)" -#: archaeological_context_records/models.py:1194 +#: archaeological_context_records/models.py:1206 msgid "Context record type (left)" msgstr "Type d'UE (gauche)" -#: archaeological_context_records/models.py:1195 +#: archaeological_context_records/models.py:1207 msgid "Parcel (left)" msgstr "Parcelle (gauche)" -#: archaeological_context_records/models.py:1196 +#: archaeological_context_records/models.py:1208 msgid "Description (left)" msgstr "Description (gauche)" -#: archaeological_context_records/models.py:1197 +#: archaeological_context_records/models.py:1209 msgid "Periods (left)" msgstr "Périodes (gauche)" -#: archaeological_context_records/models.py:1199 +#: archaeological_context_records/models.py:1211 msgid "ID (right)" msgstr "Identifiant (droit)" -#: archaeological_context_records/models.py:1200 +#: archaeological_context_records/models.py:1212 msgid "Context record type (right)" msgstr "Type d'UE (droite)" -#: archaeological_context_records/models.py:1201 +#: archaeological_context_records/models.py:1213 msgid "Parcel (right)" msgstr "Parcelle (droite)" -#: archaeological_context_records/models.py:1202 +#: archaeological_context_records/models.py:1214 msgid "Description (right)" msgstr "Description (droite)" -#: archaeological_context_records/models.py:1203 +#: archaeological_context_records/models.py:1215 msgid "Periods (right)" msgstr "Périodes (droite)" -#: archaeological_context_records/models.py:1210 +#: archaeological_context_records/models.py:1222 msgid "Record relation" msgstr "Relation entre Unités d'Enregistrement" -#: archaeological_context_records/models.py:1211 +#: archaeological_context_records/models.py:1223 msgid "Record relations" msgstr "Relations entre Unités d'Enregistrement" -#: archaeological_context_records/models.py:1400 +#: archaeological_context_records/models.py:1412 msgid "Context record parent" msgstr "Unité d'Enregistrement parente" @@ -1333,6 +1365,7 @@ msgstr "Mobilier" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:96 #: archaeological_finds/templates/ishtar/sheet_find.html:79 #: archaeological_operations/templates/ishtar/sheet_operation.html:93 +#: cd17_app/templates/ishtar/sheet_find.html:79 #: na_app/templates/ishtar/sheet_operation.html:93 #: sra_idf_app/templates/ishtar/sheet_find.html:79 #: sra_idf_app/templates/ishtar/sheet_operation.html:93 @@ -1346,6 +1379,7 @@ msgstr "Champs personnalisés" #: archaeological_operations/templates/ishtar/sheet_site.html:22 #: archaeological_warehouse/templates/ishtar/sheet_container.html:70 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:63 +#: cd17_app/templates/ishtar/sheet_find.html:138 #: ishtar_common/models_common.py:2952 #: ishtar_common/templates/ishtar/sheet_document.html:37 #: na_app/templates/ishtar/sheet_operation.html:122 @@ -1384,6 +1418,7 @@ msgstr "Localisation" #: archaeological_finds/templates/ishtar/sheet_basefind.html:51 #: archaeological_finds/templates/ishtar/sheet_find.html:186 #: archaeological_operations/templates/ishtar/sheet_operation.html:246 +#: cd17_app/templates/ishtar/sheet_find.html:194 #: ishtar_common/templates/ishtar/blocks/window_image.html:5 #: na_app/templates/ishtar/sheet_operation.html:253 #: sra_idf_app/templates/ishtar/sheet_find.html:193 @@ -1425,9 +1460,12 @@ msgstr "Référence numérique" #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:499 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:623 #: archaeological_operations/templates/ishtar/sheet_operation.html:153 -#: ishtar_common/models.py:4697 ishtar_common/models.py:4830 -#: ishtar_common/models.py:4908 ishtar_common/models_common.py:1814 -#: ishtar_common/models_common.py:1829 ishtar_common/models_imports.py:979 +#: cd17_app/templates/ishtar/sheet_find.html:343 +#: cd17_app/templates/ishtar/sheet_find.html:381 +#: cd17_app/templates/ishtar/sheet_find.html:419 ishtar_common/models.py:4697 +#: ishtar_common/models.py:4830 ishtar_common/models.py:4908 +#: ishtar_common/models_common.py:1814 ishtar_common/models_common.py:1829 +#: ishtar_common/models_imports.py:981 #: na_app/templates/ishtar/sheet_operation.html:153 #: sra_idf_app/templates/ishtar/sheet_find.html:342 #: sra_idf_app/templates/ishtar/sheet_find.html:380 @@ -1545,7 +1583,7 @@ msgstr "Dossier - 001 - Recherche" #: archaeological_operations/models.py:2504 #: archaeological_operations/models.py:2769 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 -#: ishtar_common/models_imports.py:792 +#: ishtar_common/models_imports.py:794 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:196 msgid "Year" msgstr "Année" @@ -1633,7 +1671,7 @@ msgstr "Référence du permis" #: archaeological_warehouse/models.py:1020 ishtar_common/forms_common.py:1606 #: ishtar_common/forms_common.py:1911 ishtar_common/models.py:2642 #: ishtar_common/models.py:3186 ishtar_common/models.py:3942 -#: ishtar_common/models_common.py:168 ishtar_common/models_imports.py:577 +#: ishtar_common/models_common.py:168 ishtar_common/models_imports.py:579 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:170 msgid "Comment" msgstr "Commentaire" @@ -1642,7 +1680,6 @@ msgstr "Commentaire" #: archaeological_files/templates/ishtar/sheet_file.html:169 #: archaeological_files_pdl/forms.py:315 archaeological_files_pdl/forms.py:384 #: archaeological_finds/forms_treatments.py:693 -#: archaeological_operations/forms.py:821 #: archaeological_operations/models.py:1153 msgid "In charge" msgstr "Responsable" @@ -1682,7 +1719,7 @@ msgstr "Rechercher un dossier archéologique" #: archaeological_operations/forms.py:683 #: archaeological_operations/models.py:1124 ishtar_common/forms_common.py:1601 #: ishtar_common/forms_common.py:2071 ishtar_common/models.py:3927 -#: ishtar_common/models_imports.py:985 +#: ishtar_common/models_imports.py:987 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 msgid "Creation date" msgstr "Date de création" @@ -1693,6 +1730,7 @@ msgstr "Date de création" #: archaeological_finds/forms_treatments.py:878 #: archaeological_finds/models_treatments.py:1124 #: archaeological_finds/templates/ishtar/sheet_find.html:453 +#: cd17_app/templates/ishtar/sheet_find.html:461 #: sra_idf_app/templates/ishtar/sheet_find.html:460 msgid "Reception date" msgstr "Date de réception" @@ -1733,6 +1771,7 @@ msgstr "Date avant" #: archaeological_finds/models_treatments.py:1099 #: archaeological_finds/templates/ishtar/sheet_find.html:450 #: archaeological_warehouse/forms.py:216 archaeological_warehouse/models.py:341 +#: cd17_app/templates/ishtar/sheet_find.html:458 #: sra_idf_app/templates/ishtar/sheet_find.html:457 msgid "Person in charge" msgstr "Personne responsable" @@ -1751,19 +1790,20 @@ msgstr "Personne responsable" #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:137 #: archaeological_warehouse/forms.py:143 archaeological_warehouse/forms.py:203 -#: archaeological_warehouse/models.py:335 ishtar_common/forms_common.py:394 -#: ishtar_common/forms_common.py:453 ishtar_common/forms_common.py:630 -#: ishtar_common/forms_common.py:757 ishtar_common/forms_common.py:848 -#: ishtar_common/forms_common.py:1084 ishtar_common/forms_common.py:1135 -#: ishtar_common/models.py:661 ishtar_common/models.py:699 -#: ishtar_common/models.py:1004 ishtar_common/models.py:1493 -#: ishtar_common/models.py:1875 ishtar_common/models.py:2349 -#: ishtar_common/models.py:2637 ishtar_common/models.py:2944 -#: ishtar_common/models.py:4673 ishtar_common/models_common.py:1885 -#: ishtar_common/models_common.py:1934 ishtar_common/models_imports.py:82 -#: ishtar_common/models_imports.py:107 ishtar_common/models_imports.py:508 -#: ishtar_common/models_imports.py:525 ishtar_common/models_imports.py:633 -#: ishtar_common/models_imports.py:943 +#: archaeological_warehouse/models.py:335 +#: cd17_app/templates/ishtar/sheet_find.html:457 +#: ishtar_common/forms_common.py:394 ishtar_common/forms_common.py:453 +#: ishtar_common/forms_common.py:630 ishtar_common/forms_common.py:757 +#: ishtar_common/forms_common.py:848 ishtar_common/forms_common.py:1084 +#: ishtar_common/forms_common.py:1135 ishtar_common/models.py:661 +#: ishtar_common/models.py:699 ishtar_common/models.py:1004 +#: ishtar_common/models.py:1493 ishtar_common/models.py:1875 +#: ishtar_common/models.py:2349 ishtar_common/models.py:2637 +#: ishtar_common/models.py:2944 ishtar_common/models.py:4673 +#: ishtar_common/models_common.py:1885 ishtar_common/models_common.py:1934 +#: ishtar_common/models_imports.py:82 ishtar_common/models_imports.py:107 +#: ishtar_common/models_imports.py:510 ishtar_common/models_imports.py:527 +#: ishtar_common/models_imports.py:635 ishtar_common/models_imports.py:945 #: ishtar_common/templates/ishtar/import_step_by_step.html:102 #: ishtar_common/templates/ishtar/import_step_by_step.html:270 #: ishtar_common/templates/ishtar/import_table.html:27 @@ -1886,7 +1926,8 @@ msgstr "Voulez-vous supprimer ce dossier archéologique ?" #: archaeological_finds/templates/ishtar/sheet_find.html:316 #: archaeological_operations/forms.py:1620 #: archaeological_operations/forms.py:1755 -#: archaeological_operations/models.py:2450 ishtar_common/models.py:3847 +#: archaeological_operations/models.py:2450 +#: cd17_app/templates/ishtar/sheet_find.html:324 ishtar_common/models.py:3847 #: sra_idf_app/templates/ishtar/sheet_find.html:323 msgid "Index" msgstr "Index" @@ -2092,8 +2133,8 @@ msgstr "Communes" #: archaeological_finds/models_treatments.py:1039 #: archaeological_operations/models.py:945 #: archaeological_operations/models.py:2309 -#: archaeological_operations/tests.py:2720 -#: archaeological_operations/tests.py:2796 +#: archaeological_operations/tests.py:2743 +#: archaeological_operations/tests.py:2819 msgctxt "key for text search" msgid "year" msgstr "annee" @@ -2122,7 +2163,7 @@ msgstr "departement" #: archaeological_finds/models_treatments.py:1033 #: archaeological_operations/models.py:243 #: archaeological_operations/models.py:968 -#: archaeological_operations/tests.py:2840 +#: archaeological_operations/tests.py:2863 #: archaeological_warehouse/models.py:308 ishtar_common/models.py:2329 #: ishtar_common/models.py:2580 ishtar_common/models.py:3077 msgctxt "key for text search" @@ -2134,7 +2175,7 @@ msgstr "nom" #: archaeological_finds/models_treatments.py:1042 #: archaeological_operations/models.py:974 #: archaeological_operations/models.py:2320 -#: archaeological_operations/tests.py:2853 +#: archaeological_operations/tests.py:2876 #: archaeological_warehouse/models.py:311 #: archaeological_warehouse/models.py:839 ishtar_common/models.py:2332 #: ishtar_common/models.py:2589 ishtar_common/models.py:3088 @@ -2467,12 +2508,17 @@ msgstr "Réf." #: archaeological_operations/templates/ishtar/sheet_operation.html:454 #: archaeological_operations/templates/ishtar/sheet_operation.html:518 #: archaeological_warehouse/models.py:297 -#: archaeological_warehouse/models.py:818 ishtar_common/forms_common.py:454 -#: ishtar_common/forms_common.py:633 ishtar_common/forms_common.py:851 -#: ishtar_common/forms_common.py:1082 ishtar_common/forms_common.py:1467 -#: ishtar_common/forms_common.py:1873 ishtar_common/forms_common.py:2089 -#: ishtar_common/models.py:714 ishtar_common/models.py:2350 -#: ishtar_common/models.py:3853 ishtar_common/models_imports.py:791 +#: archaeological_warehouse/models.py:818 +#: cd17_app/templates/ishtar/sheet_find.html:342 +#: cd17_app/templates/ishtar/sheet_find.html:380 +#: cd17_app/templates/ishtar/sheet_find.html:418 +#: cd17_app/templates/ishtar/sheet_find.html:456 +#: ishtar_common/forms_common.py:454 ishtar_common/forms_common.py:633 +#: ishtar_common/forms_common.py:851 ishtar_common/forms_common.py:1082 +#: ishtar_common/forms_common.py:1467 ishtar_common/forms_common.py:1873 +#: ishtar_common/forms_common.py:2089 ishtar_common/models.py:714 +#: ishtar_common/models.py:2350 ishtar_common/models.py:3853 +#: ishtar_common/models_imports.py:793 #: ishtar_common/templates/blocks/DataTables-stats.html:22 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:24 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:8 @@ -2507,7 +2553,7 @@ msgstr "Actes administratifs associés à ces opérations" #: archaeological_files/templates/ishtar/sheet_file.html:196 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:9 #: archaeological_warehouse/forms.py:682 ishtar_common/models.py:684 -#: ishtar_common/models_imports.py:790 +#: ishtar_common/models_imports.py:792 msgid "Date" msgstr "Date" @@ -2778,7 +2824,7 @@ msgstr "Types de matériau" #: archaeological_finds/forms.py:198 archaeological_finds/forms.py:466 #: archaeological_finds/forms.py:1107 archaeological_finds/models_finds.py:1760 -#: ishtar_common/models_imports.py:773 +#: ishtar_common/models_imports.py:775 msgid "Material type quality" msgstr "Qualité du type de matériaux" @@ -2855,6 +2901,7 @@ msgstr "Commentaire relatif aux datations" #: archaeological_finds/forms.py:231 archaeological_finds/forms.py:491 #: archaeological_finds/forms.py:992 #: archaeological_finds/templates/ishtar/sheet_find.html:168 +#: cd17_app/templates/ishtar/sheet_find.html:176 #: sra_idf_app/templates/ishtar/sheet_find.html:175 msgid "Dimensions" msgstr "Dimensions" @@ -2898,6 +2945,7 @@ msgstr "Volume (l)" #: archaeological_finds/forms.py:246 archaeological_finds/forms.py:500 #: archaeological_finds/forms.py:1569 #: archaeological_finds/templates/ishtar/sheet_find.html:177 +#: cd17_app/templates/ishtar/sheet_find.html:185 #: sra_idf_app/templates/ishtar/sheet_find.html:184 msgid "Weight (g)" msgstr "Poids (g)" @@ -3061,7 +3109,7 @@ msgstr "Cause d'altération" #: archaeological_finds/forms.py:664 archaeological_finds/forms.py:891 #: archaeological_finds/forms.py:1217 archaeological_finds/models_finds.py:1133 #: archaeological_finds/models_finds.py:1895 -#: archaeological_warehouse/forms.py:567 ishtar_common/models_imports.py:755 +#: archaeological_warehouse/forms.py:567 ishtar_common/models_imports.py:757 msgid "Conservatory state" msgstr "État de conservation" @@ -3110,7 +3158,7 @@ msgstr "Mettre à jour" #: archaeological_finds/models_finds.py:863 #: archaeological_finds/models_finds.py:1663 #: archaeological_finds/templates/ishtar/sheet_findbasket.html:4 -#: archaeological_finds/views.py:1199 archaeological_finds/wizards.py:401 +#: archaeological_finds/views.py:1219 archaeological_finds/wizards.py:401 msgid "Basket" msgstr "Panier" @@ -3128,6 +3176,7 @@ msgstr "Un libellé est obligatoire." #: archaeological_finds/forms.py:871 archaeological_finds/forms.py:1003 #: archaeological_finds/templates/ishtar/sheet_find.html:198 +#: cd17_app/templates/ishtar/sheet_find.html:206 #: sra_idf_app/templates/ishtar/sheet_find.html:205 msgid "Preservation" msgstr "Conservation" @@ -3194,7 +3243,7 @@ msgstr "Mobilier d'origine - ID complet" #: archaeological_operations/models.py:807 #: archaeological_operations/models.py:893 #: archaeological_operations/models.py:1174 ishtar_common/models.py:4584 -#: ishtar_common/models_imports.py:740 +#: ishtar_common/models_imports.py:742 msgid "Operation type" msgstr "Type d'opération" @@ -3261,7 +3310,7 @@ msgstr "Type de matériau" #: archaeological_finds/forms.py:1111 archaeological_finds/models_finds.py:261 #: archaeological_finds/models_finds.py:1131 #: archaeological_operations/templates/ishtar/sheet_operation.html:491 -#: archaeological_warehouse/forms.py:560 ishtar_common/models_imports.py:763 +#: archaeological_warehouse/forms.py:560 ishtar_common/models_imports.py:765 #: na_app/templates/ishtar/sheet_operation.html:497 #: sra_idf_app/templates/ishtar/sheet_operation.html:488 msgid "Object type" @@ -3402,6 +3451,7 @@ msgstr "Traitement - date de clôture avant" #: archaeological_finds/forms.py:1307 archaeological_finds/models_finds.py:1090 #: archaeological_finds/models_finds.py:1807 #: archaeological_finds/templates/ishtar/sheet_find.html:273 +#: cd17_app/templates/ishtar/sheet_find.html:281 #: ishtar_common/forms_common.py:1485 #: sra_idf_app/templates/ishtar/sheet_find.html:280 msgid "Reference container" @@ -3413,6 +3463,7 @@ msgstr "Lieu de conservation du contenant de référence" #: archaeological_finds/forms.py:1331 archaeological_finds/models_finds.py:1089 #: archaeological_finds/templates/ishtar/sheet_find.html:294 +#: cd17_app/templates/ishtar/sheet_find.html:302 #: ishtar_common/forms_common.py:1477 #: sra_idf_app/templates/ishtar/sheet_find.html:301 msgid "Current container" @@ -3423,7 +3474,7 @@ msgid "Current container - Warehouse (location)" msgstr "Lieu de conservation du contenant actuel" #: archaeological_finds/forms.py:1356 archaeological_finds/forms.py:1372 -#: archaeological_finds/forms.py:1413 archaeological_finds/views.py:368 +#: archaeological_finds/forms.py:1413 archaeological_finds/views.py:388 msgid "Find search" msgstr "Rechercher un mobilier" @@ -3450,7 +3501,7 @@ msgid "Find basket - 001 - Search" msgstr "Panier mobilier - 001 - Recherche" #: archaeological_finds/forms.py:1631 archaeological_finds/forms.py:1646 -#: archaeological_finds/views.py:286 +#: archaeological_finds/views.py:287 msgid "Basket search" msgstr "Recherche de panier" @@ -3466,11 +3517,14 @@ msgstr "Panier de mobilier" #: archaeological_finds/templates/ishtar/sheet_find.html:333 #: archaeological_finds/templates/ishtar/sheet_find.html:371 #: archaeological_finds/templates/ishtar/sheet_find.html:409 +#: cd17_app/templates/ishtar/sheet_find.html:341 +#: cd17_app/templates/ishtar/sheet_find.html:379 +#: cd17_app/templates/ishtar/sheet_find.html:417 #: ishtar_common/forms_common.py:1419 ishtar_common/models.py:938 #: ishtar_common/models.py:1666 ishtar_common/models.py:3185 #: ishtar_common/models_common.py:157 ishtar_common/models_common.py:190 #: ishtar_common/models_common.py:1809 ishtar_common/models_common.py:1825 -#: ishtar_common/models_imports.py:424 +#: ishtar_common/models_imports.py:426 #: sra_idf_app/templates/ishtar/sheet_find.html:340 #: sra_idf_app/templates/ishtar/sheet_find.html:378 #: sra_idf_app/templates/ishtar/sheet_find.html:416 @@ -3479,7 +3533,7 @@ msgstr "Dénomination" #: archaeological_finds/forms.py:1666 ishtar_common/models.py:1005 #: ishtar_common/models.py:1876 ishtar_common/models.py:3187 -#: ishtar_common/models_imports.py:108 ishtar_common/models_imports.py:526 +#: ishtar_common/models_imports.py:108 ishtar_common/models_imports.py:528 msgid "Slug" msgstr "Identifiant textuel" @@ -3530,12 +3584,12 @@ msgstr "Responsable de suivi scientifique" #: archaeological_finds/models_finds.py:172 #: archaeological_finds/models_treatments.py:208 #: archaeological_finds/models_treatments.py:743 -#: ishtar_common/models_imports.py:760 +#: ishtar_common/models_imports.py:762 msgid "Treatment type" msgstr "Type de traitement" #: archaeological_finds/forms_treatments.py:77 -#: archaeological_finds/views.py:620 +#: archaeological_finds/views.py:640 msgid "Treatment search" msgstr "Rechercher un traitement" @@ -3683,6 +3737,9 @@ msgstr "Voulez-vous supprimer ce traitement ?" #: archaeological_warehouse/models.py:1074 #: archaeological_warehouse/models.py:1864 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 +#: cd17_app/templates/ishtar/sheet_find.html:346 +#: cd17_app/templates/ishtar/sheet_find.html:384 +#: cd17_app/templates/ishtar/sheet_find.html:422 #: ishtar_common/forms_common.py:1975 ishtar_common/forms_common.py:2154 #: ishtar_common/templates/ishtar/sheet_document.html:100 #: sra_idf_app/templates/ishtar/sheet_find.html:345 @@ -3775,6 +3832,7 @@ msgstr "Réf. interne" #: archaeological_finds/models_treatments.py:1107 #: archaeological_finds/templates/ishtar/sheet_find.html:451 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:55 +#: cd17_app/templates/ishtar/sheet_find.html:459 #: sra_idf_app/templates/ishtar/sheet_find.html:458 msgid "Applicant" msgstr "Demandeur" @@ -3784,6 +3842,7 @@ msgstr "Demandeur" #: archaeological_finds/models_treatments.py:1115 #: archaeological_finds/templates/ishtar/sheet_find.html:452 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:63 +#: cd17_app/templates/ishtar/sheet_find.html:460 #: sra_idf_app/templates/ishtar/sheet_find.html:459 msgid "Applicant organisation" msgstr "Organisation demandeuse" @@ -3806,7 +3865,7 @@ msgstr "Exposition commencée après" #: archaeological_finds/forms_treatments.py:734 #: archaeological_finds/forms_treatments.py:746 -#: archaeological_finds/views.py:957 +#: archaeological_finds/views.py:977 msgid "Treatment request search" msgstr "Rechercher une demande de traitement" @@ -3993,7 +4052,7 @@ msgstr "Type d'intégrité / intérêt" msgid "Integrity / interest types" msgstr "Types d'intégrité / intérêt" -#: archaeological_finds/models_finds.py:237 ishtar_common/models_imports.py:766 +#: archaeological_finds/models_finds.py:237 ishtar_common/models_imports.py:768 msgid "Remarkability type" msgstr "Type de remarquabilité" @@ -4001,7 +4060,7 @@ msgstr "Type de remarquabilité" msgid "Remarkability types" msgstr "Types de remarquabilité" -#: archaeological_finds/models_finds.py:250 ishtar_common/models_imports.py:770 +#: archaeological_finds/models_finds.py:250 ishtar_common/models_imports.py:772 msgid "Batch type" msgstr "Type de lot" @@ -4011,7 +4070,7 @@ msgstr "Types de lot" #: archaeological_finds/models_finds.py:275 #: archaeological_finds/models_finds.py:1826 -#: ishtar_common/models_imports.py:774 +#: ishtar_common/models_imports.py:776 msgid "Functional area" msgstr "Domaine fonctionnel" @@ -4023,7 +4082,7 @@ msgstr "Type de qualité du type d'objet" msgid "Object type quality types" msgstr "Types de qualité du type d'objet" -#: archaeological_finds/models_finds.py:302 ishtar_common/models_imports.py:767 +#: archaeological_finds/models_finds.py:302 ishtar_common/models_imports.py:769 msgid "Alteration type" msgstr "Type d'altération" @@ -4031,7 +4090,7 @@ msgstr "Type d'altération" msgid "Alteration types" msgstr "Types d'altération" -#: archaeological_finds/models_finds.py:316 ishtar_common/models_imports.py:769 +#: archaeological_finds/models_finds.py:316 ishtar_common/models_imports.py:771 msgid "Alteration cause type" msgstr "Type de cause d'altération" @@ -4039,7 +4098,7 @@ msgstr "Type de cause d'altération" msgid "Alteration cause types" msgstr "Types de cause d'altération" -#: archaeological_finds/models_finds.py:330 ishtar_common/models_imports.py:762 +#: archaeological_finds/models_finds.py:330 ishtar_common/models_imports.py:764 msgid "Treatment emergency type" msgstr "Type d'urgence de traitement" @@ -4055,7 +4114,7 @@ msgstr "Type de communicabilité" msgid "Communicability types" msgstr "Types de communicabilité" -#: archaeological_finds/models_finds.py:357 ishtar_common/models_imports.py:771 +#: archaeological_finds/models_finds.py:357 ishtar_common/models_imports.py:773 msgid "Checked type" msgstr "Type de vérification" @@ -4105,7 +4164,7 @@ msgstr "g" msgid "kg" msgstr "kg" -#: archaeological_finds/models_finds.py:902 archaeological_finds/views.py:523 +#: archaeological_finds/models_finds.py:902 archaeological_finds/views.py:543 msgid "Manage basket" msgstr "Gérer un panier" @@ -4648,7 +4707,7 @@ msgstr "Modification par lot" #: archaeological_finds/models_finds.py:1670 #: archaeological_finds/models_finds.py:2267 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 -#: archaeological_finds/views.py:1243 archaeological_warehouse/forms.py:667 +#: archaeological_finds/views.py:1263 archaeological_warehouse/forms.py:667 #: archaeological_warehouse/views.py:297 ishtar_common/models.py:3830 #: ishtar_common/models.py:4175 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 @@ -4666,12 +4725,14 @@ msgstr "Unité de poids" #: archaeological_finds/models_finds.py:1781 #: archaeological_finds/templates/ishtar/sheet_find.html:366 +#: cd17_app/templates/ishtar/sheet_find.html:374 #: sra_idf_app/templates/ishtar/sheet_find.html:373 msgid "Upstream treatment" msgstr "Traitement amont" #: archaeological_finds/models_finds.py:1788 #: archaeological_finds/templates/ishtar/sheet_find.html:404 +#: cd17_app/templates/ishtar/sheet_find.html:412 #: sra_idf_app/templates/ishtar/sheet_find.html:411 msgid "Downstream treatment" msgstr "Traitement aval" @@ -4854,6 +4915,9 @@ msgstr "Mobilier aval" #: archaeological_finds/templates/ishtar/sheet_find.html:337 #: archaeological_finds/templates/ishtar/sheet_find.html:375 #: archaeological_finds/templates/ishtar/sheet_find.html:413 +#: cd17_app/templates/ishtar/sheet_find.html:345 +#: cd17_app/templates/ishtar/sheet_find.html:383 +#: cd17_app/templates/ishtar/sheet_find.html:421 #: sra_idf_app/templates/ishtar/sheet_find.html:344 #: sra_idf_app/templates/ishtar/sheet_find.html:382 #: sra_idf_app/templates/ishtar/sheet_find.html:420 @@ -4906,8 +4970,8 @@ msgstr "exposition-termine-apres" #: archaeological_finds/models_treatments.py:1163 #: archaeological_finds/templates/ishtar/sheet_find.html:443 -#: ishtar_common/views.py:995 ishtar_common/views.py:1068 -#: sra_idf_app/templates/ishtar/sheet_find.html:450 +#: cd17_app/templates/ishtar/sheet_find.html:451 ishtar_common/views.py:995 +#: ishtar_common/views.py:1068 sra_idf_app/templates/ishtar/sheet_find.html:450 msgid "Treatment requests" msgstr "Demandes de traitement" @@ -4981,6 +5045,7 @@ msgid "Last modified by" msgstr "Modifié en dernier par" #: archaeological_finds/templates/ishtar/sheet_find.html:14 +#: cd17_app/templates/ishtar/sheet_find.html:14 #: sra_idf_app/templates/ishtar/sheet_find.html:14 msgid "" "This sheet has a downstream treatment: it is related to an old version of " @@ -4990,46 +5055,55 @@ msgstr "" "de ce mobilier." #: archaeological_finds/templates/ishtar/sheet_find.html:37 +#: cd17_app/templates/ishtar/sheet_find.html:37 #: sra_idf_app/templates/ishtar/sheet_find.html:37 msgid "Image / Base find" msgstr "Image / Mobilier d'origine" #: archaeological_finds/templates/ishtar/sheet_find.html:44 +#: cd17_app/templates/ishtar/sheet_find.html:44 #: sra_idf_app/templates/ishtar/sheet_find.html:44 msgid "Identification / Description / Dimensions" msgstr "Identification / Description / Dimensions" #: archaeological_finds/templates/ishtar/sheet_find.html:52 +#: cd17_app/templates/ishtar/sheet_find.html:52 #: sra_idf_app/templates/ishtar/sheet_find.html:52 msgid "Datings / Preservation" msgstr "Datations / Conservation" #: archaeological_finds/templates/ishtar/sheet_find.html:61 +#: cd17_app/templates/ishtar/sheet_find.html:61 #: sra_idf_app/templates/ishtar/sheet_find.html:61 msgid "Warehouse / Treatments" msgstr "Lieu de conservation / Traitements" #: archaeological_finds/templates/ishtar/sheet_find.html:142 +#: cd17_app/templates/ishtar/sheet_find.html:150 #: sra_idf_app/templates/ishtar/sheet_find.html:149 msgid "Administrative index" msgstr "Index administratif" #: archaeological_finds/templates/ishtar/sheet_find.html:188 +#: cd17_app/templates/ishtar/sheet_find.html:196 #: sra_idf_app/templates/ishtar/sheet_find.html:195 msgid "Checked" msgstr "Vérifié" #: archaeological_finds/templates/ishtar/sheet_find.html:269 +#: cd17_app/templates/ishtar/sheet_find.html:277 #: sra_idf_app/templates/ishtar/sheet_find.html:276 msgid "Warehouse - container" msgstr "Lieu de conservation - contenant" #: archaeological_finds/templates/ishtar/sheet_find.html:295 +#: cd17_app/templates/ishtar/sheet_find.html:303 #: sra_idf_app/templates/ishtar/sheet_find.html:302 msgid "Reference container / current container" msgstr "Contenant de référence / contenant actuel" #: archaeological_finds/templates/ishtar/sheet_find.html:328 +#: cd17_app/templates/ishtar/sheet_find.html:336 #: sra_idf_app/templates/ishtar/sheet_find.html:335 msgid "Simple treatments" msgstr "Traitements simples" @@ -5038,6 +5112,10 @@ msgstr "Traitements simples" #: archaeological_finds/templates/ishtar/sheet_find.html:370 #: archaeological_finds/templates/ishtar/sheet_find.html:408 #: archaeological_finds/templates/ishtar/sheet_find.html:447 +#: cd17_app/templates/ishtar/sheet_find.html:340 +#: cd17_app/templates/ishtar/sheet_find.html:378 +#: cd17_app/templates/ishtar/sheet_find.html:416 +#: cd17_app/templates/ishtar/sheet_find.html:455 #: sra_idf_app/templates/ishtar/sheet_find.html:339 #: sra_idf_app/templates/ishtar/sheet_find.html:377 #: sra_idf_app/templates/ishtar/sheet_find.html:415 @@ -5048,6 +5126,9 @@ msgstr "Année - index" #: archaeological_finds/templates/ishtar/sheet_find.html:336 #: archaeological_finds/templates/ishtar/sheet_find.html:374 #: archaeological_finds/templates/ishtar/sheet_find.html:412 +#: cd17_app/templates/ishtar/sheet_find.html:344 +#: cd17_app/templates/ishtar/sheet_find.html:382 +#: cd17_app/templates/ishtar/sheet_find.html:420 #: sra_idf_app/templates/ishtar/sheet_find.html:343 #: sra_idf_app/templates/ishtar/sheet_find.html:381 #: sra_idf_app/templates/ishtar/sheet_find.html:419 @@ -5055,6 +5136,7 @@ msgid "Related finds (max. 15 displayed)" msgstr "Mobilier associé (max. 15 affichés)" #: archaeological_finds/templates/ishtar/sheet_find.html:400 +#: cd17_app/templates/ishtar/sheet_find.html:408 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/DataTables-stats.html:77 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -5066,6 +5148,8 @@ msgstr "Export en CSV" #: archaeological_finds/templates/ishtar/sheet_find.html:400 #: archaeological_finds/templates/ishtar/sheet_find.html:439 +#: cd17_app/templates/ishtar/sheet_find.html:408 +#: cd17_app/templates/ishtar/sheet_find.html:447 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/JQueryJqGrid.html:29 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -5077,6 +5161,7 @@ msgstr "CSV" #: archaeological_finds/templates/ishtar/sheet_find.html:481 #: archaeological_finds/templates/ishtar/sheet_treatment.html:125 +#: cd17_app/templates/ishtar/sheet_find.html:489 #: ishtar_common/templates/ishtar/sheet_document.html:136 #: sra_idf_app/templates/ishtar/sheet_find.html:488 msgid "Associated documents" @@ -5177,7 +5262,7 @@ msgid "The division {} {} do not exist for the location {}." msgstr "La division {} {} n'existe pas pour le lieu de conservation {}." #: archaeological_finds/tests.py:1367 archaeological_finds/tests.py:1393 -#: archaeological_finds/tests.py:1403 archaeological_operations/tests.py:2783 +#: archaeological_finds/tests.py:1403 archaeological_operations/tests.py:2806 #: ishtar_common/forms.py:1152 ishtar_common/forms.py:1230 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 #: ishtar_common/templates/ishtar/import_delete.html:20 @@ -5194,88 +5279,88 @@ msgstr "Oui" msgid "No" msgstr "Non" -#: archaeological_finds/views.py:296 +#: archaeological_finds/views.py:297 msgid "Basket modify" msgstr "Modification de panier" -#: archaeological_finds/views.py:322 +#: archaeological_finds/views.py:323 msgid "Basket deletion" msgstr "Suppression du panier" -#: archaeological_finds/views.py:353 +#: archaeological_finds/views.py:354 msgid "New find" msgstr "Ajouter un mobilier" -#: archaeological_finds/views.py:408 +#: archaeological_finds/views.py:428 msgid "Find modification" msgstr "Modifier un mobilier" -#: archaeological_finds/views.py:444 +#: archaeological_finds/views.py:464 msgid "Find deletion" msgstr "Supprimer un mobilier" -#: archaeological_finds/views.py:473 +#: archaeological_finds/views.py:493 msgid "New basket" msgstr "Ajouter un panier" -#: archaeological_finds/views.py:505 +#: archaeological_finds/views.py:525 msgid "Manage items in basket" msgstr "Gérer les éléments dans un panier" -#: archaeological_finds/views.py:626 archaeological_finds/views.py:640 -#: archaeological_finds/views.py:654 +#: archaeological_finds/views.py:646 archaeological_finds/views.py:660 +#: archaeological_finds/views.py:674 msgid "New treatment" msgstr "Ajouter un traitement" -#: archaeological_finds/views.py:665 +#: archaeological_finds/views.py:685 msgid "Treatment modification" msgstr "Modifier un traitement" -#: archaeological_finds/views.py:833 +#: archaeological_finds/views.py:853 msgid "Treatment deletion" msgstr "Supprimer un traitement" -#: archaeological_finds/views.py:858 +#: archaeological_finds/views.py:878 msgid "Treatment: search administrative act" msgstr "Traitement : rechercher un acte administratif" -#: archaeological_finds/views.py:871 +#: archaeological_finds/views.py:891 msgid "Treatment: new administrative act" msgstr "Traitement : ajouter un acte administratif" -#: archaeological_finds/views.py:888 +#: archaeological_finds/views.py:908 msgid "Treatment: administrative act modification" msgstr "Traitement : modifier un acte administratif" -#: archaeological_finds/views.py:918 +#: archaeological_finds/views.py:938 msgid "Treatment: administrative act deletion" msgstr "Traitement : supprimer un acte administratif" -#: archaeological_finds/views.py:969 +#: archaeological_finds/views.py:989 msgid "New treatment request" msgstr "Ajouter une demande de traitement" -#: archaeological_finds/views.py:979 +#: archaeological_finds/views.py:999 msgid "Treatment request modification" msgstr "Modifier une demande de traitement" -#: archaeological_finds/views.py:1022 +#: archaeological_finds/views.py:1042 msgid "Treatment request deletion" msgstr "Supprimer une demande de traitement" -#: archaeological_finds/views.py:1046 +#: archaeological_finds/views.py:1066 msgid "Treatment request: search administrative act" msgstr "Demande de traitement : rechercher un acte administratif" -#: archaeological_finds/views.py:1061 +#: archaeological_finds/views.py:1081 msgid "Treatment request: new administrative act" msgstr "Demande de traitement : ajouter un acte administratif" -#: archaeological_finds/views.py:1079 +#: archaeological_finds/views.py:1099 msgid "Treatment request: administrative act modification" msgstr "Demande de traitement : modifier un acte administratif" -#: archaeological_finds/views.py:1138 +#: archaeological_finds/views.py:1158 msgid "Treatment request: administrative act deletion" msgstr "Demande de traitement : supprimer un acte administratif" @@ -5374,6 +5459,7 @@ msgid "Is open?" msgstr "Est ouvert ?" #: archaeological_operations/forms.py:511 +#: archaeological_operations/forms.py:821 #: archaeological_operations/models.py:2447 msgid "Scientific monitor" msgstr "Responsable de suivi scientifique" @@ -5712,7 +5798,7 @@ msgid "Operation - 060 - Remains" msgstr "Opération - 060 - Vestiges" #: archaeological_operations/forms.py:1199 -#: archaeological_operations/models.py:86 ishtar_common/models_imports.py:743 +#: archaeological_operations/models.py:86 ishtar_common/models_imports.py:745 msgid "Remain type" msgstr "Type de vestige" @@ -5968,7 +6054,7 @@ msgstr "Types d'attribution culturelle" #: archaeological_operations/models.py:253 #: archaeological_operations/models.py:993 -#: archaeological_operations/tests.py:2774 +#: archaeological_operations/tests.py:2797 msgctxt "key for text search" msgid "remain" msgstr "vestige" @@ -6039,7 +6125,7 @@ msgstr "SITE" #: archaeological_operations/models.py:647 ishtar_common/forms.py:1151 #: ishtar_common/models.py:4710 ishtar_common/models.py:4867 -#: ishtar_common/models.py:4926 ishtar_common/views_item.py:1431 +#: ishtar_common/models.py:4926 ishtar_common/views_item.py:1448 msgid "Unknown" msgstr "Inconnu" @@ -6105,7 +6191,7 @@ msgid "address" msgstr "adresse" #: archaeological_operations/models.py:978 -#: archaeological_operations/tests.py:2781 +#: archaeological_operations/tests.py:2804 msgctxt "key for text search" msgid "is-open" msgstr "est-ouvert" @@ -6121,8 +6207,8 @@ msgid "scientist" msgstr "scientifique" #: archaeological_operations/models.py:989 -#: archaeological_operations/tests.py:2597 -#: archaeological_operations/tests.py:3015 +#: archaeological_operations/tests.py:2620 +#: archaeological_operations/tests.py:3038 msgctxt "key for text search" msgid "operator" msgstr "operateur" @@ -6148,7 +6234,7 @@ msgid "end-after" msgstr "fini-apres" #: archaeological_operations/models.py:1013 -#: archaeological_operations/tests.py:2824 +#: archaeological_operations/tests.py:2847 msgctxt "key for text search" msgid "relation-types" msgstr "type-relation" @@ -6312,7 +6398,7 @@ msgstr "Nombre de documents" msgid "Mean" msgstr "Moyenne" -#: archaeological_operations/models.py:2088 ishtar_common/models_imports.py:745 +#: archaeological_operations/models.py:2088 ishtar_common/models_imports.py:747 msgid "Operation relation type" msgstr "Type de relation entre opérations" @@ -6859,17 +6945,17 @@ msgstr "Mobilier par Unités d'Enregistrement" msgid "This act is indexed!" msgstr "Cet acte est indexé !" -#: archaeological_operations/tests.py:784 +#: archaeological_operations/tests.py:807 #: ishtar_common/templates/ishtar/import_step_by_step.html:156 msgid "New objects will be created." msgstr "De nouveaux objets vont être créés." -#: archaeological_operations/tests.py:814 +#: archaeological_operations/tests.py:837 #: ishtar_common/templates/ishtar/import_step_by_step.html:67 msgid "This line have been already imported." msgstr "Cette ligne a déjà été importée." -#: archaeological_operations/tests.py:852 +#: archaeological_operations/tests.py:875 #: ishtar_common/templates/ishtar/import_step_by_step.html:73 msgid "" "The following error(s) has been encountered while parsing the source file:" @@ -6877,11 +6963,11 @@ msgstr "" "Le(s) erreur(s) suivante(s) ont été rencontrées lors de l'analyse du fichier " "source :" -#: archaeological_operations/tests.py:2274 ishtar_common/forms.py:439 +#: archaeological_operations/tests.py:2297 ishtar_common/forms.py:439 msgid "This item is locked for edition." msgstr "Cet élément est verrouillé pour l'édition." -#: archaeological_operations/tests.py:2287 +#: archaeological_operations/tests.py:2310 #: ishtar_common/templates/ishtar/sheet.html:132 msgid "This item has been locked. Edition is disabled." msgstr "Cet élément a été verrouillé. L'édition est désactivée." @@ -6981,7 +7067,7 @@ msgstr "Lieu de conservation - 001 - Recherche" #: archaeological_warehouse/forms.py:144 archaeological_warehouse/forms.py:204 #: archaeological_warehouse/models.py:259 -#: archaeological_warehouse/models.py:336 ishtar_common/models_imports.py:759 +#: archaeological_warehouse/models.py:336 ishtar_common/models_imports.py:761 msgid "Warehouse type" msgstr "Type de lieu de conservation" @@ -7063,7 +7149,7 @@ msgstr "Ancienne référence" #: archaeological_warehouse/models.py:789 #: archaeological_warehouse/models.py:1017 #: archaeological_warehouse/templates/ishtar/sheet_container.html:138 -#: ishtar_common/models_imports.py:756 +#: ishtar_common/models_imports.py:758 msgid "Container type" msgstr "Type de contenant" @@ -7966,7 +8052,7 @@ msgstr "Lancer l'export" msgid "Import already imported/scheduled." msgstr "Import déjà réalisé/planifié." -#: ishtar_common/admin.py:1937 ishtar_common/models_imports.py:1117 +#: ishtar_common/admin.py:1937 ishtar_common/models_imports.py:1119 msgid "Launch import" msgstr "Lancer l'import" @@ -8103,66 +8189,80 @@ 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:1428 ishtar_common/views.py:1636 +#: ishtar_common/data_importer.py:1418 ishtar_common/views.py:1636 #: ishtar_common/views.py:1646 msgid "Not imported" msgstr "Non importé" -#: ishtar_common/data_importer.py:1717 +#: ishtar_common/data_importer.py:1707 msgid "Importer configuration error: \"{}\"." msgstr "Erreur de configuration de l'importeur : \"{}\"." -#: ishtar_common/data_importer.py:1722 +#: ishtar_common/data_importer.py:1712 msgid "Import error: {} - \"{}\"." msgstr "Erreur d'import : {} - \"{}\"." -#: ishtar_common/data_importer.py:1803 +#: ishtar_common/data_importer.py:1794 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:1916 +#: ishtar_common/data_importer.py:1907 msgid "* created *" msgstr "* créé *" -#: ishtar_common/data_importer.py:1989 +#: ishtar_common/data_importer.py:1982 msgid "* match not find *" msgstr "* correspondance non trouvée *" -#: ishtar_common/data_importer.py:1997 +#: ishtar_common/data_importer.py:1990 msgid "* the query match more than 10 results*" msgstr "* la requête correspond à plus de 10 résultats *" -#: ishtar_common/data_importer.py:2002 +#: ishtar_common/data_importer.py:1995 msgid " or " msgstr " ou " -#: ishtar_common/data_importer.py:2178 +#: ishtar_common/data_importer.py:2068 +msgid "unicity key(s) \"{}\" is/are missing" +msgstr "" + +#: ishtar_common/data_importer.py:2071 +#, fuzzy +#| msgid "Import error: {} - \"{}\"." +msgid "Import error {}, {}" +msgstr "Erreur d'import : {} - \"{}\"." + +#: ishtar_common/data_importer.py:2156 +msgid "Import error {}, path \"{}\", context : {}, error : {}" +msgstr "" + +#: ishtar_common/data_importer.py:2184 msgid "line" msgstr "ligne" -#: ishtar_common/data_importer.py:2178 +#: ishtar_common/data_importer.py:2184 msgid "col" msgstr "colonne" -#: ishtar_common/data_importer.py:2178 +#: ishtar_common/data_importer.py:2184 msgid "error" msgstr "erreur" -#: ishtar_common/data_importer.py:2184 +#: ishtar_common/data_importer.py:2190 msgid "field" msgstr "champ" -#: ishtar_common/data_importer.py:2184 +#: ishtar_common/data_importer.py:2190 msgid "source" msgstr "source" -#: ishtar_common/data_importer.py:2184 +#: ishtar_common/data_importer.py:2190 msgid "result" msgstr "résultat" -#: ishtar_common/data_importer.py:2200 +#: ishtar_common/data_importer.py:2206 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "\"%(value)s\" n'est pas dans %(values)s" @@ -8276,7 +8376,7 @@ msgid "Target" msgstr "Cible" #: ishtar_common/forms_common.py:263 ishtar_common/models.py:1691 -#: ishtar_common/models_imports.py:660 +#: ishtar_common/models_imports.py:662 #: ishtar_common/templates/ishtar/formset_import_match.html:45 #: ishtar_common/templates/ishtar/import_step_by_step.html:172 #: ishtar_common/templates/ishtar/import_step_by_step.html:200 @@ -8309,8 +8409,8 @@ msgid "all users" msgstr "tous les utilisateurs" #: ishtar_common/forms_common.py:395 ishtar_common/forms_common.py:506 -#: ishtar_common/models.py:2285 ishtar_common/models_imports.py:727 -#: ishtar_common/models_imports.py:728 +#: ishtar_common/models.py:2285 ishtar_common/models_imports.py:729 +#: ishtar_common/models_imports.py:730 msgid "Organization type" msgstr "Type d'organisation" @@ -8371,7 +8471,7 @@ msgstr "Personne - Action rapide - Modification" #: ishtar_common/forms_common.py:1462 ishtar_common/forms_common.py:1872 #: ishtar_common/forms_common.py:2087 ishtar_common/models.py:2615 #: ishtar_common/models.py:2619 ishtar_common/models.py:3838 -#: ishtar_common/models_imports.py:730 +#: ishtar_common/models_imports.py:732 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:7 msgid "Title" msgstr "Titre" @@ -8456,7 +8556,7 @@ msgstr "Rechercher un compte" #: ishtar_common/forms_common.py:928 ishtar_common/forms_common.py:976 #: ishtar_common/forms_common.py:980 ishtar_common/models.py:2433 -#: ishtar_common/models_imports.py:729 +#: ishtar_common/models_imports.py:731 msgid "Person type" msgstr "Type de personne" @@ -8558,7 +8658,7 @@ msgid "This value already exist" msgstr "Cette valeur existe déjà" #: ishtar_common/forms_common.py:1440 ishtar_common/models.py:3463 -#: ishtar_common/models_imports.py:737 +#: ishtar_common/models_imports.py:739 msgid "Document tag" msgstr "Mot-clé du document" @@ -8573,7 +8673,7 @@ msgstr "Support" #: ishtar_common/forms_common.py:1473 ishtar_common/forms_common.py:1662 #: ishtar_common/forms_common.py:1877 ishtar_common/models.py:3905 -#: ishtar_common/models_imports.py:734 ishtar_common/models_imports.py:735 +#: ishtar_common/models_imports.py:736 ishtar_common/models_imports.py:737 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:88 #: ishtar_common/templates/ishtar/sheet_document.html:50 msgid "Format" @@ -8616,7 +8716,7 @@ msgstr "Mots-clés" #: ishtar_common/forms_common.py:1537 ishtar_common/forms_common.py:1906 #: ishtar_common/models.py:957 ishtar_common/models.py:3873 -#: ishtar_common/models_imports.py:738 overload_translation/models.py:11 +#: ishtar_common/models_imports.py:740 overload_translation/models.py:11 msgid "Language" msgstr "Langue" @@ -8795,8 +8895,8 @@ msgstr "Recherche document" msgid "Document - Quick action - Modify" msgstr "Document - Action rapide - Modification" -#: ishtar_common/forms_common.py:2066 ishtar_common/models_imports.py:731 -#: ishtar_common/models_imports.py:732 +#: ishtar_common/forms_common.py:2066 ishtar_common/models_imports.py:733 +#: ishtar_common/models_imports.py:734 msgid "Source type" msgstr "Type de document" @@ -8826,7 +8926,7 @@ msgid "Would you like to delete this documentation?" msgstr "Voulez-vous supprimer ce document ?" #: ishtar_common/forms_common.py:2241 ishtar_common/models.py:3305 -#: ishtar_common/models.py:3320 ishtar_common/models_imports.py:733 +#: ishtar_common/models.py:3320 ishtar_common/models_imports.py:735 msgid "Author type" msgstr "Type d'auteur" @@ -8885,7 +8985,7 @@ msgstr "Variables globales" msgid "Directory" msgstr "Annuaire" -#: ishtar_common/ishtar_menu.py:178 ishtar_common/models_imports.py:1007 +#: ishtar_common/ishtar_menu.py:178 ishtar_common/models_imports.py:1009 msgid "Imports" msgstr "Imports" @@ -8918,7 +9018,7 @@ msgid "This item already exists." msgstr "Cet élément existe déjà." #: ishtar_common/models.py:428 ishtar_common/models.py:702 -#: ishtar_common/models_imports.py:659 +#: ishtar_common/models_imports.py:661 #: ishtar_common/templates/ishtar/formset_import_match.html:44 #: ishtar_common/templates/ishtar/import_step_by_step.html:171 #: ishtar_common/templates/ishtar/import_step_by_step.html:199 @@ -8983,7 +9083,7 @@ msgstr "Texte" msgid "Long text" msgstr "Texte long" -#: ishtar_common/models.py:681 ishtar_common/models_imports.py:787 +#: ishtar_common/models.py:681 ishtar_common/models_imports.py:789 msgid "Integer" msgstr "Entier" @@ -8991,7 +9091,7 @@ msgstr "Entier" msgid "Boolean" msgstr "Booléen" -#: ishtar_common/models.py:683 ishtar_common/models_imports.py:788 +#: ishtar_common/models.py:683 ishtar_common/models_imports.py:790 msgid "Float" msgstr "Nombre à virgule" @@ -9717,7 +9817,7 @@ msgstr "Profils d'instance Ishtar" #: ishtar_common/models.py:1495 ishtar_common/models.py:1905 #: ishtar_common/models.py:3197 ishtar_common/models_common.py:169 -#: ishtar_common/models_imports.py:124 ishtar_common/models_imports.py:638 +#: ishtar_common/models_imports.py:124 ishtar_common/models_imports.py:640 msgid "Available" msgstr "Disponible" @@ -9921,7 +10021,7 @@ msgstr "Erreur : le type opérateur est manquant" msgid "Long title" msgstr "Titre long" -#: ishtar_common/models.py:2506 ishtar_common/models_imports.py:781 +#: ishtar_common/models.py:2506 ishtar_common/models_imports.py:783 msgid "Title type" msgstr "Type de titre" @@ -10083,8 +10183,8 @@ msgstr "Types de document" msgid "Only available for these document types" msgstr "Seulement disponible pour ces types de document" -#: ishtar_common/models.py:3414 ishtar_common/models_imports.py:739 -#: ishtar_common/models_imports.py:780 +#: ishtar_common/models.py:3414 ishtar_common/models_imports.py:741 +#: ishtar_common/models_imports.py:782 msgid "Support type" msgstr "Type de support" @@ -10116,7 +10216,7 @@ msgstr "Types de format" msgid "URL" msgstr "URL" -#: ishtar_common/models.py:3454 ishtar_common/models_imports.py:736 +#: ishtar_common/models.py:3454 ishtar_common/models_imports.py:738 msgid "License type" msgstr "Type de licence" @@ -10371,11 +10471,11 @@ msgstr "Planifié" msgid "In progress" msgstr "En cours" -#: ishtar_common/models.py:4687 ishtar_common/models_imports.py:907 +#: ishtar_common/models.py:4687 ishtar_common/models_imports.py:909 msgid "Finished with errors" msgstr "Terminé avec des erreurs" -#: ishtar_common/models.py:4688 ishtar_common/models_imports.py:908 +#: ishtar_common/models.py:4688 ishtar_common/models_imports.py:910 msgid "Finished" msgstr "Terminé" @@ -10422,7 +10522,7 @@ msgstr "" "Le script « {} »n'est pas un fichier valable de votre répertoire de script. " "Vérifiez la configuration." -#: ishtar_common/models.py:4807 ishtar_common/models_imports.py:899 +#: ishtar_common/models.py:4807 ishtar_common/models_imports.py:901 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:132 msgid "Created" msgstr "Créé" @@ -10676,7 +10776,7 @@ msgstr "Registre" msgid "Authority SRID" msgstr "SRID" -#: ishtar_common/models_common.py:2732 ishtar_common/models_imports.py:779 +#: ishtar_common/models_common.py:2732 ishtar_common/models_imports.py:781 msgid "Spatial reference system" msgstr "Système de référence spatiale" @@ -10777,29 +10877,29 @@ msgstr "Importeur - Par défaut" msgid "Importer - Defaults" msgstr "Importeur - Par défaut" -#: ishtar_common/models_imports.py:377 +#: ishtar_common/models_imports.py:379 msgid "Importer - Default value" msgstr "Importeur - Valeur par défaut" -#: ishtar_common/models_imports.py:378 +#: ishtar_common/models_imports.py:380 msgid "Importer - Default values" msgstr "Importeur - Valeurs par défaut" -#: ishtar_common/models_imports.py:427 +#: ishtar_common/models_imports.py:429 #: ishtar_common/templates/ishtar/import_step_by_step.html:101 #: ishtar_common/templates/ishtar/import_step_by_step.html:269 msgid "Column number" msgstr "Numéro de colonne" -#: ishtar_common/models_imports.py:437 +#: ishtar_common/models_imports.py:439 msgid "Required" msgstr "Requis" -#: ishtar_common/models_imports.py:439 +#: ishtar_common/models_imports.py:441 msgid "Export field name" msgstr "Nom du champ à exporter" -#: ishtar_common/models_imports.py:440 +#: ishtar_common/models_imports.py:442 msgid "" "Fill this field if the field name is ambiguous for export. For instance: " "concatenated fields." @@ -10807,55 +10907,55 @@ msgstr "" "Remplir ce champ si le nom du champ est ambigu pour l'export, par exemple " "dans le cas de champs concaténés." -#: ishtar_common/models_imports.py:446 +#: ishtar_common/models_imports.py:448 msgid "Importer - Column" msgstr "Importeur - Colonne" -#: ishtar_common/models_imports.py:447 +#: ishtar_common/models_imports.py:449 msgid "Importer - Columns" msgstr "Importeur - Colonnes" -#: ishtar_common/models_imports.py:481 +#: ishtar_common/models_imports.py:483 msgid "Field name" msgstr "Nom du champ" -#: ishtar_common/models_imports.py:483 ishtar_common/models_imports.py:571 +#: ishtar_common/models_imports.py:485 ishtar_common/models_imports.py:573 msgid "Force creation of new items" msgstr "Forcer la création de nouveaux éléments" -#: ishtar_common/models_imports.py:485 ishtar_common/models_imports.py:573 +#: ishtar_common/models_imports.py:487 ishtar_common/models_imports.py:575 msgid "Concatenate with existing" msgstr "Concaténer avec l'existant" -#: ishtar_common/models_imports.py:487 ishtar_common/models_imports.py:575 +#: ishtar_common/models_imports.py:489 ishtar_common/models_imports.py:577 msgid "Concatenate character" msgstr "Caractère de concaténation" -#: ishtar_common/models_imports.py:492 +#: ishtar_common/models_imports.py:494 msgid "Importer - Duplicate field" msgstr "Importeur - Champ dupliqué" -#: ishtar_common/models_imports.py:493 +#: ishtar_common/models_imports.py:495 msgid "Importer - Duplicate fields" msgstr "Importeur - Champs dupliqués" -#: ishtar_common/models_imports.py:510 +#: ishtar_common/models_imports.py:512 msgid "Regular expression" msgstr "Expression régulière" -#: ishtar_common/models_imports.py:514 +#: ishtar_common/models_imports.py:516 msgid "Importer - Regular expression" msgstr "Importeur - Expression régulière" -#: ishtar_common/models_imports.py:515 +#: ishtar_common/models_imports.py:517 msgid "Importer - Regular expressions" msgstr "Importeur - Expressions régulières" -#: ishtar_common/models_imports.py:529 +#: ishtar_common/models_imports.py:531 msgid "Format string" msgstr "Chaîne pour le formatage" -#: ishtar_common/models_imports.py:530 +#: ishtar_common/models_imports.py:532 msgid "" "A string used to format a value using the Python \"format()\" method. The " "site https://pyformat.info/ provide good examples of usage. Only one \"{}\" " @@ -10866,211 +10966,211 @@ msgstr "" "bons exemples d'utilisation. Seulement une entrée \"{}\" est gérée. L'entrée " "est considérée comme une chaîne de caractères." -#: ishtar_common/models_imports.py:538 +#: ishtar_common/models_imports.py:540 msgid "Importer - Value format" msgstr "Importeur - Format de valeur" -#: ishtar_common/models_imports.py:539 +#: ishtar_common/models_imports.py:541 msgid "Importer - Value formats" msgstr "Importeur - Formats de valeur" -#: ishtar_common/models_imports.py:549 +#: ishtar_common/models_imports.py:551 msgid "The string provided generate an error. Fix it." msgstr "La chaîne de caractère saisie génère une erreur. Corrigez-là." -#: ishtar_common/models_imports.py:581 +#: ishtar_common/models_imports.py:583 msgid "Importer - Target" msgstr "Importeur - Cible" -#: ishtar_common/models_imports.py:582 +#: ishtar_common/models_imports.py:584 msgid "Importer - Targets" msgstr "Importeur - Cibles" -#: ishtar_common/models_imports.py:621 ishtar_common/views_item.py:532 -#: ishtar_common/views_item.py:1269 +#: ishtar_common/models_imports.py:623 ishtar_common/views_item.py:532 +#: ishtar_common/views_item.py:1286 msgid "True" msgstr "Oui" -#: ishtar_common/models_imports.py:622 ishtar_common/views_item.py:1271 +#: ishtar_common/models_imports.py:624 ishtar_common/views_item.py:1288 msgid "False" msgstr "Non" -#: ishtar_common/models_imports.py:634 +#: ishtar_common/models_imports.py:636 msgid "All users can use it" msgstr "Tous les utilisateurs peuvent l'utiliser" -#: ishtar_common/models_imports.py:636 +#: ishtar_common/models_imports.py:638 msgid "All users can modify it" msgstr "Tous les utilisateurs peuvent le modifier" -#: ishtar_common/models_imports.py:641 +#: ishtar_common/models_imports.py:643 msgid "Importer - Target key group" msgstr "Importeur - Groupe de clé de rapprochement" -#: ishtar_common/models_imports.py:642 +#: ishtar_common/models_imports.py:644 msgid "Importer - Target key groups" msgstr "Importeur - Groupes de clé de rapprochement" -#: ishtar_common/models_imports.py:661 +#: ishtar_common/models_imports.py:663 msgid "Is set" msgstr "Est défini" -#: ishtar_common/models_imports.py:669 +#: ishtar_common/models_imports.py:671 msgid "Importer - Target key" msgstr "Importeur - Clé de rapprochement" -#: ishtar_common/models_imports.py:670 +#: ishtar_common/models_imports.py:672 msgid "Importer - Targets keys" msgstr "Importeur - Clés de rapprochement" -#: ishtar_common/models_imports.py:742 +#: ishtar_common/models_imports.py:744 msgid "Report state" msgstr "État de rapport" -#: ishtar_common/models_imports.py:746 +#: ishtar_common/models_imports.py:748 msgid "Unit" msgstr "Unité" -#: ishtar_common/models_imports.py:748 +#: ishtar_common/models_imports.py:750 msgid "Activity type" msgstr "Type d'activité" -#: ishtar_common/models_imports.py:752 +#: ishtar_common/models_imports.py:754 msgid "Dating quality" msgstr "Qualité de datation" -#: ishtar_common/models_imports.py:753 +#: ishtar_common/models_imports.py:755 msgid "Material" msgstr "Matériau" -#: ishtar_common/models_imports.py:758 +#: ishtar_common/models_imports.py:760 msgid "Warehouse division" msgstr "Division de lieu de conservation" -#: ishtar_common/models_imports.py:764 +#: ishtar_common/models_imports.py:766 msgid "Integrity type" msgstr "Type d'intégrité" -#: ishtar_common/models_imports.py:776 +#: ishtar_common/models_imports.py:778 msgid "Identification type" msgstr "Type d'identification" -#: ishtar_common/models_imports.py:778 +#: ishtar_common/models_imports.py:780 msgid "Context record relation type" msgstr "Type de relation entre Unités d'Enregistrement" -#: ishtar_common/models_imports.py:789 overload_translation/models.py:7 +#: ishtar_common/models_imports.py:791 overload_translation/models.py:7 msgid "String" msgstr "Chaîne de caractères" -#: ishtar_common/models_imports.py:793 +#: ishtar_common/models_imports.py:795 msgid "INSEE code" msgstr "Code INSEE" -#: ishtar_common/models_imports.py:794 +#: ishtar_common/models_imports.py:796 msgid "Upper case" msgstr "Majuscule" -#: ishtar_common/models_imports.py:795 +#: ishtar_common/models_imports.py:797 msgid "Lower case" msgstr "Minuscule" -#: ishtar_common/models_imports.py:796 +#: ishtar_common/models_imports.py:798 msgid "String to boolean" msgstr "Chaîne de caractères vers booléen" -#: ishtar_common/models_imports.py:797 +#: ishtar_common/models_imports.py:799 msgctxt "filesystem" msgid "File" msgstr "Fichier" -#: ishtar_common/models_imports.py:798 +#: ishtar_common/models_imports.py:800 msgid "Unknow type" msgstr "Type inconnu" -#: ishtar_common/models_imports.py:817 +#: ishtar_common/models_imports.py:819 msgid "4 digit year. e.g.: \"2015\"" msgstr "Année sur 4 chiffres. Exemple : « 2015 »" -#: ishtar_common/models_imports.py:818 +#: ishtar_common/models_imports.py:820 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "Année sur 4 chiffres/mois/jour. Exemple : « 2015/02/04 »" -#: ishtar_common/models_imports.py:819 +#: ishtar_common/models_imports.py:821 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "Jour/mois/année sur 4 chiffres. Exemple : « 04/02/2015 »" -#: ishtar_common/models_imports.py:835 +#: ishtar_common/models_imports.py:837 msgid "Options" msgstr "Options" -#: ishtar_common/models_imports.py:837 +#: ishtar_common/models_imports.py:839 msgid "Split character(s)" msgstr "Caractère(s) de séparation" -#: ishtar_common/models_imports.py:842 +#: ishtar_common/models_imports.py:844 msgid "Importer - Formater type" msgstr "Importeur - Type de mise en forme" -#: ishtar_common/models_imports.py:843 +#: ishtar_common/models_imports.py:845 msgid "Importer - Formater types" msgstr "Importeur - Types de mise en forme" -#: ishtar_common/models_imports.py:900 +#: ishtar_common/models_imports.py:902 msgid "Analyse in progress" msgstr "Analyse en cours" -#: ishtar_common/models_imports.py:901 +#: ishtar_common/models_imports.py:903 msgid "Analysed" msgstr "Analysé" -#: ishtar_common/models_imports.py:902 +#: ishtar_common/models_imports.py:904 msgid "Check modified in queue" msgstr "Vérification des modifications dans la file" -#: ishtar_common/models_imports.py:903 +#: ishtar_common/models_imports.py:905 msgid "Import in queue" msgstr "Import en file d'attente" -#: ishtar_common/models_imports.py:904 +#: ishtar_common/models_imports.py:906 msgid "Check modified in progress" msgstr "Vérification des modifications en cours" -#: ishtar_common/models_imports.py:905 +#: ishtar_common/models_imports.py:907 msgid "Import in progress" msgstr "Import en cours" -#: ishtar_common/models_imports.py:906 +#: ishtar_common/models_imports.py:908 msgid "Partially imported" msgstr "Importé partiellement" -#: ishtar_common/models_imports.py:909 +#: ishtar_common/models_imports.py:911 msgid "Archived" msgstr "Archivé" -#: ishtar_common/models_imports.py:946 +#: ishtar_common/models_imports.py:948 msgid "Imported file" msgstr "Fichier importé" -#: ishtar_common/models_imports.py:949 +#: ishtar_common/models_imports.py:951 msgid "Associated images (zip file)" msgstr "Images associées (fichier zip)" -#: ishtar_common/models_imports.py:954 +#: ishtar_common/models_imports.py:956 msgid "If a group is selected, target key saved in this group will be used." msgstr "" "Si un groupe est sélectionné, les clés de rapprochement enregistrées dans ce " "groupe sont utilisées." -#: ishtar_common/models_imports.py:957 +#: ishtar_common/models_imports.py:959 msgid "Encoding" msgstr "Codage" -#: ishtar_common/models_imports.py:960 +#: ishtar_common/models_imports.py:962 msgid "CSV separator" msgstr "Séparateur CSV" -#: ishtar_common/models_imports.py:961 +#: ishtar_common/models_imports.py:963 msgid "" "Separator for CSV file. Standard is comma but Microsoft Excel do not follow " "this standard and use semi-colon." @@ -11078,108 +11178,108 @@ msgstr "" "Séparateur pour les CSV. Le standard est la virgule mais Microsoft Excel ne " "suit pas cette norme et utilise le point-virgule." -#: ishtar_common/models_imports.py:965 +#: ishtar_common/models_imports.py:967 msgid "Skip lines" msgstr "Nombre de lignes d'entête" -#: ishtar_common/models_imports.py:966 +#: ishtar_common/models_imports.py:968 msgid "Number of header lines in your file (can be 0)." msgstr "Nombre de lignes d'entête dans votre fichier (peut être égal à zéro)." -#: ishtar_common/models_imports.py:968 +#: ishtar_common/models_imports.py:970 msgid "Error file" msgstr "Fichier erreur" -#: ishtar_common/models_imports.py:971 +#: ishtar_common/models_imports.py:973 msgid "Result file" msgstr "Fichier résultant" -#: ishtar_common/models_imports.py:974 +#: ishtar_common/models_imports.py:976 msgid "Match file" msgstr "Fichier de correspondance" -#: ishtar_common/models_imports.py:977 +#: ishtar_common/models_imports.py:979 msgid "Archive file" msgstr "Fichier d'archive" -#: ishtar_common/models_imports.py:982 +#: ishtar_common/models_imports.py:984 msgid "Conservative import" msgstr "Import conservateur" -#: ishtar_common/models_imports.py:983 +#: ishtar_common/models_imports.py:985 msgid "If set to true, do not overload existing values." msgstr "Si coché, ne surchargera pas les valeurs existantes." -#: ishtar_common/models_imports.py:989 +#: ishtar_common/models_imports.py:991 msgid "Remaining seconds" msgstr "Secondes restantes" -#: ishtar_common/models_imports.py:990 +#: ishtar_common/models_imports.py:992 msgid "Current line" msgstr "Ligne actuelle" -#: ishtar_common/models_imports.py:992 +#: ishtar_common/models_imports.py:994 msgid "Number of line" msgstr "Nombre de lignes" -#: ishtar_common/models_imports.py:995 +#: ishtar_common/models_imports.py:997 msgid "Imported line numbers" msgstr "Numéros des lignes importées" -#: ishtar_common/models_imports.py:998 +#: ishtar_common/models_imports.py:1000 msgid "Changed have been checked" msgstr "Les changements ont été vérifiés" -#: ishtar_common/models_imports.py:1001 +#: ishtar_common/models_imports.py:1003 msgid "Changed line numbers" msgstr "Numéro des lignes modifiées" -#: ishtar_common/models_imports.py:1006 +#: ishtar_common/models_imports.py:1008 msgid "Import" msgstr "Import" -#: ishtar_common/models_imports.py:1047 ishtar_common/models_imports.py:1188 +#: ishtar_common/models_imports.py:1049 ishtar_common/models_imports.py:1190 msgid "Error in the CSV file." msgstr "Erreur dans le fichier CSV." -#: ishtar_common/models_imports.py:1114 +#: ishtar_common/models_imports.py:1116 msgid "Analyse" msgstr "Analyser" -#: ishtar_common/models_imports.py:1116 ishtar_common/models_imports.py:1125 +#: ishtar_common/models_imports.py:1118 ishtar_common/models_imports.py:1127 msgid "Re-analyse" msgstr "Analyser de nouveau" -#: ishtar_common/models_imports.py:1120 +#: ishtar_common/models_imports.py:1122 msgid "Step by step import" msgstr "Import pas à pas" -#: ishtar_common/models_imports.py:1121 ishtar_common/models_imports.py:1130 +#: ishtar_common/models_imports.py:1123 ishtar_common/models_imports.py:1132 msgid "Re-check for changes" msgstr "Re-vérifier les changements" -#: ishtar_common/models_imports.py:1123 ishtar_common/models_imports.py:1132 +#: ishtar_common/models_imports.py:1125 ishtar_common/models_imports.py:1134 msgid "Check for changes" msgstr "Vérifier les changements" -#: ishtar_common/models_imports.py:1126 +#: ishtar_common/models_imports.py:1128 msgid "Re-import" msgstr "Ré-importer" -#: ishtar_common/models_imports.py:1129 +#: ishtar_common/models_imports.py:1131 msgid "Step by step re-import" msgstr "Ré-import pas à pas" -#: ishtar_common/models_imports.py:1133 +#: ishtar_common/models_imports.py:1135 #: ishtar_common/templates/ishtar/import_table.html:50 msgid "Archive" msgstr "Archiver" -#: ishtar_common/models_imports.py:1136 +#: ishtar_common/models_imports.py:1138 msgid "Unarchive" msgstr "Désarchiver" -#: ishtar_common/models_imports.py:1137 +#: ishtar_common/models_imports.py:1139 #: ishtar_common/templates/ishtar/blocks/window_nav.html:65 #: ishtar_common/templates/ishtar/form_delete.html:11 #: ishtar_common/views.py:2352 ishtar_common/widgets.py:408 @@ -11187,23 +11287,23 @@ msgstr "Désarchiver" msgid "Delete" msgstr "Supprimer" -#: ishtar_common/models_imports.py:1216 +#: ishtar_common/models_imports.py:1218 msgid "Modification check {} added to the queue" msgstr "Vérification des changements {} ajoutée à la file d'attente" -#: ishtar_common/models_imports.py:1286 +#: ishtar_common/models_imports.py:1288 msgid "Import {} added to the queue" msgstr "Import {} ajouté à la file d'attente" -#: ishtar_common/models_imports.py:1308 +#: ishtar_common/models_imports.py:1310 msgid "Error on imported file: {}" msgstr "Erreur sur le fichier d'import : {}" -#: ishtar_common/models_imports.py:1343 +#: ishtar_common/models_imports.py:1345 msgid "Import {} finished with errors" msgstr "Import {} fini avec des erreurs" -#: ishtar_common/models_imports.py:1352 +#: ishtar_common/models_imports.py:1354 msgid "Import {} finished with no errors" msgstr "Import {} fini avec aucune erreur" @@ -11943,6 +12043,7 @@ msgstr "Rechercher et sélectionner un élément dans le tableau" #: ishtar_common/templates/ishtar/simple_form.html:7 #: ishtar_common/templates/ishtar/wizard/search.html:32 #: ishtar_common/templates/ishtar/wizard/validation_bar.html:6 +#: sra_idf_app/templates/ishtar/wizard/search.html:44 msgid "Validate" msgstr "Valider" @@ -12388,6 +12489,7 @@ msgstr "Voulez-vous sauvegarder ces informations ?" #: ishtar_common/templates/ishtar/wizard/relations_wizard.html:25 #: ishtar_common/templates/ishtar/wizard/search.html:39 #: ishtar_common/templates/ishtar/wizard/towns_wizard.html:19 +#: sra_idf_app/templates/ishtar/wizard/search.html:51 msgid "Add/Modify" msgstr "Ajouter/Modifier" @@ -12711,12 +12813,12 @@ msgid "Generate a QR Code" msgstr "Générer un QR Code" #: ishtar_common/templatetags/window_tables.py:105 -#: ishtar_common/widgets.py:1267 +#: ishtar_common/widgets.py:1266 msgid "No results" msgstr "Pas de résultats" #: ishtar_common/templatetags/window_tables.py:106 -#: ishtar_common/widgets.py:1268 +#: ishtar_common/widgets.py:1267 msgid "Loading..." msgstr "Chargement..." @@ -12915,7 +13017,7 @@ msgstr "Préc. :" msgid "Restore previous" msgstr "Restaurer précédent" -#: ishtar_common/widgets.py:1269 +#: ishtar_common/widgets.py:1268 msgid "Remove" msgstr "Enlever" diff --git a/locale/pt/LC_MESSAGES/django.po b/locale/pt/LC_MESSAGES/django.po index 420a71b53..5b858e604 100644 --- a/locale/pt/LC_MESSAGES/django.po +++ b/locale/pt/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-05-18 13:45+0200\n" +"POT-Creation-Date: 2022-06-07 12:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -118,7 +118,7 @@ msgstr "" #: archaeological_context_records/forms.py:572 #: archaeological_context_records/forms.py:626 #: archaeological_context_records/models.py:633 -#: archaeological_context_records/models.py:1265 +#: archaeological_context_records/models.py:1277 #: archaeological_warehouse/forms.py:437 msgid "ID" msgstr "" @@ -162,7 +162,7 @@ msgstr "" #: archaeological_context_records/models.py:441 #: archaeological_context_records/models.py:442 #: archaeological_context_records/models.py:608 -#: archaeological_context_records/models.py:1267 +#: archaeological_context_records/models.py:1279 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:114 #: archaeological_files/forms.py:87 archaeological_files/forms.py:564 #: archaeological_finds/models_finds.py:1079 @@ -244,13 +244,13 @@ msgstr "" #: archaeological_context_records/models.py:443 #: archaeological_context_records/models.py:451 #: archaeological_context_records/models.py:658 -#: archaeological_context_records/models.py:1266 +#: archaeological_context_records/models.py:1278 msgid "Context record type" msgstr "" #: archaeological_context_records/forms.py:297 #: archaeological_context_records/models.py:634 -#: archaeological_context_records/models.py:1268 +#: archaeological_context_records/models.py:1280 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:125 #: archaeological_finds/forms.py:187 archaeological_finds/forms.py:188 #: archaeological_finds/forms.py:457 archaeological_finds/forms.py:459 @@ -261,10 +261,11 @@ msgstr "" #: archaeological_finds/models_finds.py:1749 #: archaeological_finds/models_treatments.py:252 #: archaeological_finds/templates/ishtar/sheet_find.html:147 +#: cd17_app/templates/ishtar/sheet_find.html:155 #: ishtar_common/forms_common.py:1608 ishtar_common/forms_common.py:1876 #: ishtar_common/models.py:1010 ishtar_common/models.py:3933 -#: ishtar_common/models_imports.py:109 ishtar_common/models_imports.py:428 -#: ishtar_common/models_imports.py:509 ishtar_common/models_imports.py:527 +#: ishtar_common/models_imports.py:109 ishtar_common/models_imports.py:430 +#: ishtar_common/models_imports.py:511 ishtar_common/models_imports.py:529 #: sra_idf_app/templates/ishtar/sheet_find.html:154 msgid "Description" msgstr "" @@ -431,6 +432,7 @@ msgstr "" #: archaeological_finds/forms.py:935 archaeological_finds/forms.py:959 #: archaeological_finds/models_finds.py:1792 #: archaeological_finds/templates/ishtar/sheet_find.html:215 +#: cd17_app/templates/ishtar/sheet_find.html:223 #: sra_idf_app/templates/ishtar/sheet_find.html:222 msgid "Dating" msgstr "" @@ -444,7 +446,8 @@ msgstr "" #: archaeological_operations/forms.py:1215 #: archaeological_operations/templates/ishtar/sheet_operation.html:464 #: archaeological_operations/templates/ishtar/sheet_operation.html:501 -#: ishtar_common/models_imports.py:741 +#: cd17_app/templates/ishtar/sheet_find.html:231 +#: ishtar_common/models_imports.py:743 #: na_app/templates/ishtar/sheet_operation.html:470 #: na_app/templates/ishtar/sheet_operation.html:507 #: sra_idf_app/templates/ishtar/sheet_find.html:230 @@ -471,6 +474,10 @@ msgstr "" #: archaeological_operations/models.py:97 #: archaeological_operations/models.py:1126 #: archaeological_operations/models.py:3028 +#: cd17_app/templates/ishtar/sheet_find.html:232 +#: cd17_app/templates/ishtar/sheet_find.html:347 +#: cd17_app/templates/ishtar/sheet_find.html:385 +#: cd17_app/templates/ishtar/sheet_find.html:423 #: sra_idf_app/templates/ishtar/sheet_find.html:231 #: sra_idf_app/templates/ishtar/sheet_find.html:346 #: sra_idf_app/templates/ishtar/sheet_find.html:384 @@ -488,7 +495,13 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:416 #: archaeological_finds/templates/ishtar/sheet_find.html:454 #: archaeological_operations/models.py:98 -#: archaeological_operations/models.py:3029 ishtar_common/models_imports.py:986 +#: archaeological_operations/models.py:3029 +#: cd17_app/templates/ishtar/sheet_find.html:233 +#: cd17_app/templates/ishtar/sheet_find.html:348 +#: cd17_app/templates/ishtar/sheet_find.html:386 +#: cd17_app/templates/ishtar/sheet_find.html:424 +#: cd17_app/templates/ishtar/sheet_find.html:462 +#: ishtar_common/models_imports.py:988 #: sra_idf_app/templates/ishtar/sheet_find.html:232 #: sra_idf_app/templates/ishtar/sheet_find.html:347 #: sra_idf_app/templates/ishtar/sheet_find.html:385 @@ -501,6 +514,7 @@ msgstr "" #: archaeological_context_records/models.py:113 #: archaeological_finds/forms.py:944 #: archaeological_finds/templates/ishtar/sheet_find.html:227 +#: cd17_app/templates/ishtar/sheet_find.html:235 #: sra_idf_app/templates/ishtar/sheet_find.html:234 msgid "Quality" msgstr "" @@ -510,6 +524,7 @@ msgstr "" #: archaeological_context_records/models.py:106 #: archaeological_finds/forms.py:946 #: archaeological_finds/templates/ishtar/sheet_find.html:226 +#: cd17_app/templates/ishtar/sheet_find.html:234 #: sra_idf_app/templates/ishtar/sheet_find.html:233 msgid "Dating type" msgstr "" @@ -518,6 +533,7 @@ msgstr "" #: archaeological_context_records/models.py:118 #: archaeological_finds/forms.py:948 #: archaeological_finds/templates/ishtar/sheet_find.html:228 +#: cd17_app/templates/ishtar/sheet_find.html:236 #: sra_idf_app/templates/ishtar/sheet_find.html:235 msgid "Precise dating" msgstr "" @@ -529,7 +545,7 @@ msgstr "" #: archaeological_context_records/forms.py:493 #: archaeological_context_records/ishtar_menu.py:33 #: archaeological_context_records/models.py:267 -#: archaeological_context_records/models.py:1394 +#: archaeological_context_records/models.py:1406 #: archaeological_context_records/views.py:247 #: archaeological_finds/forms.py:101 archaeological_finds/forms.py:107 #: archaeological_finds/forms.py:604 archaeological_finds/forms.py:617 @@ -591,6 +607,7 @@ msgstr "" #: archaeological_finds/forms.py:169 archaeological_finds/forms.py:449 #: archaeological_finds/forms.py:605 #: archaeological_finds/templates/ishtar/sheet_find.html:125 +#: cd17_app/templates/ishtar/sheet_find.html:133 #: ishtar_common/forms_common.py:1661 #: ishtar_common/templates/ishtar/organization_person_form.html:9 #: ishtar_common/templates/ishtar/person_form.html:9 @@ -787,6 +804,7 @@ msgstr "" #: archaeological_finds/models_finds.py:3235 #: archaeological_finds/models_treatments.py:731 #: archaeological_finds/templates/ishtar/sheet_find.html:4 +#: cd17_app/templates/ishtar/sheet_find.html:4 #: ishtar_common/forms_common.py:1966 ishtar_common/models.py:4802 #: ishtar_common/views.py:392 sra_idf_app/templates/ishtar/sheet_find.html:4 msgid "Find" @@ -854,7 +872,7 @@ msgid "Excavation technique types" msgstr "" #: archaeological_context_records/models.py:365 -#: ishtar_common/models_imports.py:750 +#: ishtar_common/models_imports.py:752 msgid "Documentation type" msgstr "" @@ -864,7 +882,7 @@ msgstr "" #: archaeological_context_records/models.py:430 #: archaeological_context_records/models.py:431 -#: archaeological_context_records/models.py:1269 +#: archaeological_context_records/models.py:1281 #: archaeological_finds/models_finds.py:1091 #: archaeological_finds/models_finds.py:1092 #: archaeological_operations/forms.py:530 @@ -932,7 +950,7 @@ msgstr "" #: archaeological_files/models.py:227 archaeological_finds/models_finds.py:1226 #: archaeological_operations/models.py:256 #: archaeological_operations/models.py:954 -#: archaeological_operations/tests.py:2731 +#: archaeological_operations/tests.py:2754 #: archaeological_warehouse/models.py:315 msgctxt "key for text search" msgid "town" @@ -989,8 +1007,8 @@ msgstr "" #: archaeological_context_records/models.py:526 #: archaeological_operations/models.py:250 #: archaeological_operations/models.py:996 -#: archaeological_operations/tests.py:2714 -#: archaeological_operations/tests.py:2896 +#: archaeological_operations/tests.py:2737 +#: archaeological_operations/tests.py:2919 msgctxt "key for text search" msgid "period" msgstr "" @@ -1030,14 +1048,14 @@ msgid "Lock/Unlock" msgstr "" #: archaeological_context_records/models.py:591 -#: archaeological_context_records/models.py:963 +#: archaeological_context_records/models.py:975 #: archaeological_context_records/views.py:271 #: archaeological_context_records/views.py:286 #: archaeological_finds/models_finds.py:856 #: archaeological_finds/models_finds.py:1656 -#: archaeological_finds/models_finds.py:2232 archaeological_finds/views.py:1216 -#: archaeological_finds/views.py:1231 archaeological_finds/views.py:1269 -#: archaeological_finds/views.py:1285 archaeological_operations/models.py:352 +#: archaeological_finds/models_finds.py:2232 archaeological_finds/views.py:1236 +#: archaeological_finds/views.py:1251 archaeological_finds/views.py:1289 +#: archaeological_finds/views.py:1305 archaeological_operations/models.py:352 #: archaeological_operations/models.py:508 #: archaeological_operations/models.py:1095 #: archaeological_operations/models.py:1641 @@ -1121,7 +1139,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:46 #: archaeological_warehouse/templates/ishtar/sheet_container.html:182 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:42 -#: ishtar_common/models.py:3958 +#: cd17_app/templates/ishtar/sheet_find.html:70 ishtar_common/models.py:3958 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_person.html:161 #: na_app/templates/ishtar/sheet_operation.html:57 @@ -1199,66 +1217,74 @@ msgstr "" msgid "List of associated base finds" msgstr "" -#: archaeological_context_records/models.py:1163 -#: archaeological_context_records/models.py:1198 -#: archaeological_context_records/models.py:1264 +#: archaeological_context_records/models.py:963 +msgid "Add find" +msgstr "" + +#: archaeological_context_records/models.py:965 +msgid "find" +msgstr "" + +#: archaeological_context_records/models.py:1175 +#: archaeological_context_records/models.py:1210 +#: archaeological_context_records/models.py:1276 #: archaeological_operations/forms.py:374 msgid "Relation type" msgstr "" -#: archaeological_context_records/models.py:1164 +#: archaeological_context_records/models.py:1176 msgid "Relation types" msgstr "" -#: archaeological_context_records/models.py:1193 +#: archaeological_context_records/models.py:1205 msgid "ID (left)" msgstr "" -#: archaeological_context_records/models.py:1194 +#: archaeological_context_records/models.py:1206 msgid "Context record type (left)" msgstr "" -#: archaeological_context_records/models.py:1195 +#: archaeological_context_records/models.py:1207 msgid "Parcel (left)" msgstr "" -#: archaeological_context_records/models.py:1196 +#: archaeological_context_records/models.py:1208 msgid "Description (left)" msgstr "" -#: archaeological_context_records/models.py:1197 +#: archaeological_context_records/models.py:1209 msgid "Periods (left)" msgstr "" -#: archaeological_context_records/models.py:1199 +#: archaeological_context_records/models.py:1211 msgid "ID (right)" msgstr "" -#: archaeological_context_records/models.py:1200 +#: archaeological_context_records/models.py:1212 msgid "Context record type (right)" msgstr "" -#: archaeological_context_records/models.py:1201 +#: archaeological_context_records/models.py:1213 msgid "Parcel (right)" msgstr "" -#: archaeological_context_records/models.py:1202 +#: archaeological_context_records/models.py:1214 msgid "Description (right)" msgstr "" -#: archaeological_context_records/models.py:1203 +#: archaeological_context_records/models.py:1215 msgid "Periods (right)" msgstr "" -#: archaeological_context_records/models.py:1210 +#: archaeological_context_records/models.py:1222 msgid "Record relation" msgstr "" -#: archaeological_context_records/models.py:1211 +#: archaeological_context_records/models.py:1223 msgid "Record relations" msgstr "" -#: archaeological_context_records/models.py:1400 +#: archaeological_context_records/models.py:1412 msgid "Context record parent" msgstr "" @@ -1326,6 +1352,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:96 #: archaeological_finds/templates/ishtar/sheet_find.html:79 #: archaeological_operations/templates/ishtar/sheet_operation.html:93 +#: cd17_app/templates/ishtar/sheet_find.html:79 #: na_app/templates/ishtar/sheet_operation.html:93 #: sra_idf_app/templates/ishtar/sheet_find.html:79 #: sra_idf_app/templates/ishtar/sheet_operation.html:93 @@ -1339,6 +1366,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:22 #: archaeological_warehouse/templates/ishtar/sheet_container.html:70 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:63 +#: cd17_app/templates/ishtar/sheet_find.html:138 #: ishtar_common/models_common.py:2952 #: ishtar_common/templates/ishtar/sheet_document.html:37 #: na_app/templates/ishtar/sheet_operation.html:122 @@ -1377,6 +1405,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:51 #: archaeological_finds/templates/ishtar/sheet_find.html:186 #: archaeological_operations/templates/ishtar/sheet_operation.html:246 +#: cd17_app/templates/ishtar/sheet_find.html:194 #: ishtar_common/templates/ishtar/blocks/window_image.html:5 #: na_app/templates/ishtar/sheet_operation.html:253 #: sra_idf_app/templates/ishtar/sheet_find.html:193 @@ -1418,9 +1447,12 @@ msgstr "" #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:499 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:623 #: archaeological_operations/templates/ishtar/sheet_operation.html:153 -#: ishtar_common/models.py:4697 ishtar_common/models.py:4830 -#: ishtar_common/models.py:4908 ishtar_common/models_common.py:1814 -#: ishtar_common/models_common.py:1829 ishtar_common/models_imports.py:979 +#: cd17_app/templates/ishtar/sheet_find.html:343 +#: cd17_app/templates/ishtar/sheet_find.html:381 +#: cd17_app/templates/ishtar/sheet_find.html:419 ishtar_common/models.py:4697 +#: ishtar_common/models.py:4830 ishtar_common/models.py:4908 +#: ishtar_common/models_common.py:1814 ishtar_common/models_common.py:1829 +#: ishtar_common/models_imports.py:981 #: na_app/templates/ishtar/sheet_operation.html:153 #: sra_idf_app/templates/ishtar/sheet_find.html:342 #: sra_idf_app/templates/ishtar/sheet_find.html:380 @@ -1538,7 +1570,7 @@ msgstr "" #: archaeological_operations/models.py:2504 #: archaeological_operations/models.py:2769 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 -#: ishtar_common/models_imports.py:792 +#: ishtar_common/models_imports.py:794 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:196 msgid "Year" msgstr "" @@ -1626,7 +1658,7 @@ msgstr "" #: archaeological_warehouse/models.py:1020 ishtar_common/forms_common.py:1606 #: ishtar_common/forms_common.py:1911 ishtar_common/models.py:2642 #: ishtar_common/models.py:3186 ishtar_common/models.py:3942 -#: ishtar_common/models_common.py:168 ishtar_common/models_imports.py:577 +#: ishtar_common/models_common.py:168 ishtar_common/models_imports.py:579 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:170 msgid "Comment" msgstr "" @@ -1635,7 +1667,6 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:169 #: archaeological_files_pdl/forms.py:315 archaeological_files_pdl/forms.py:384 #: archaeological_finds/forms_treatments.py:693 -#: archaeological_operations/forms.py:821 #: archaeological_operations/models.py:1153 msgid "In charge" msgstr "" @@ -1675,7 +1706,7 @@ msgstr "" #: archaeological_operations/forms.py:683 #: archaeological_operations/models.py:1124 ishtar_common/forms_common.py:1601 #: ishtar_common/forms_common.py:2071 ishtar_common/models.py:3927 -#: ishtar_common/models_imports.py:985 +#: ishtar_common/models_imports.py:987 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 msgid "Creation date" msgstr "" @@ -1686,6 +1717,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:878 #: archaeological_finds/models_treatments.py:1124 #: archaeological_finds/templates/ishtar/sheet_find.html:453 +#: cd17_app/templates/ishtar/sheet_find.html:461 #: sra_idf_app/templates/ishtar/sheet_find.html:460 msgid "Reception date" msgstr "" @@ -1726,6 +1758,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1099 #: archaeological_finds/templates/ishtar/sheet_find.html:450 #: archaeological_warehouse/forms.py:216 archaeological_warehouse/models.py:341 +#: cd17_app/templates/ishtar/sheet_find.html:458 #: sra_idf_app/templates/ishtar/sheet_find.html:457 msgid "Person in charge" msgstr "" @@ -1744,19 +1777,20 @@ msgstr "" #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:137 #: archaeological_warehouse/forms.py:143 archaeological_warehouse/forms.py:203 -#: archaeological_warehouse/models.py:335 ishtar_common/forms_common.py:394 -#: ishtar_common/forms_common.py:453 ishtar_common/forms_common.py:630 -#: ishtar_common/forms_common.py:757 ishtar_common/forms_common.py:848 -#: ishtar_common/forms_common.py:1084 ishtar_common/forms_common.py:1135 -#: ishtar_common/models.py:661 ishtar_common/models.py:699 -#: ishtar_common/models.py:1004 ishtar_common/models.py:1493 -#: ishtar_common/models.py:1875 ishtar_common/models.py:2349 -#: ishtar_common/models.py:2637 ishtar_common/models.py:2944 -#: ishtar_common/models.py:4673 ishtar_common/models_common.py:1885 -#: ishtar_common/models_common.py:1934 ishtar_common/models_imports.py:82 -#: ishtar_common/models_imports.py:107 ishtar_common/models_imports.py:508 -#: ishtar_common/models_imports.py:525 ishtar_common/models_imports.py:633 -#: ishtar_common/models_imports.py:943 +#: archaeological_warehouse/models.py:335 +#: cd17_app/templates/ishtar/sheet_find.html:457 +#: ishtar_common/forms_common.py:394 ishtar_common/forms_common.py:453 +#: ishtar_common/forms_common.py:630 ishtar_common/forms_common.py:757 +#: ishtar_common/forms_common.py:848 ishtar_common/forms_common.py:1084 +#: ishtar_common/forms_common.py:1135 ishtar_common/models.py:661 +#: ishtar_common/models.py:699 ishtar_common/models.py:1004 +#: ishtar_common/models.py:1493 ishtar_common/models.py:1875 +#: ishtar_common/models.py:2349 ishtar_common/models.py:2637 +#: ishtar_common/models.py:2944 ishtar_common/models.py:4673 +#: ishtar_common/models_common.py:1885 ishtar_common/models_common.py:1934 +#: ishtar_common/models_imports.py:82 ishtar_common/models_imports.py:107 +#: ishtar_common/models_imports.py:510 ishtar_common/models_imports.py:527 +#: ishtar_common/models_imports.py:635 ishtar_common/models_imports.py:945 #: ishtar_common/templates/ishtar/import_step_by_step.html:102 #: ishtar_common/templates/ishtar/import_step_by_step.html:270 #: ishtar_common/templates/ishtar/import_table.html:27 @@ -1879,7 +1913,8 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:316 #: archaeological_operations/forms.py:1620 #: archaeological_operations/forms.py:1755 -#: archaeological_operations/models.py:2450 ishtar_common/models.py:3847 +#: archaeological_operations/models.py:2450 +#: cd17_app/templates/ishtar/sheet_find.html:324 ishtar_common/models.py:3847 #: sra_idf_app/templates/ishtar/sheet_find.html:323 msgid "Index" msgstr "" @@ -2085,8 +2120,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1039 #: archaeological_operations/models.py:945 #: archaeological_operations/models.py:2309 -#: archaeological_operations/tests.py:2720 -#: archaeological_operations/tests.py:2796 +#: archaeological_operations/tests.py:2743 +#: archaeological_operations/tests.py:2819 msgctxt "key for text search" msgid "year" msgstr "" @@ -2115,7 +2150,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1033 #: archaeological_operations/models.py:243 #: archaeological_operations/models.py:968 -#: archaeological_operations/tests.py:2840 +#: archaeological_operations/tests.py:2863 #: archaeological_warehouse/models.py:308 ishtar_common/models.py:2329 #: ishtar_common/models.py:2580 ishtar_common/models.py:3077 msgctxt "key for text search" @@ -2127,7 +2162,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1042 #: archaeological_operations/models.py:974 #: archaeological_operations/models.py:2320 -#: archaeological_operations/tests.py:2853 +#: archaeological_operations/tests.py:2876 #: archaeological_warehouse/models.py:311 #: archaeological_warehouse/models.py:839 ishtar_common/models.py:2332 #: ishtar_common/models.py:2589 ishtar_common/models.py:3088 @@ -2460,12 +2495,17 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:454 #: archaeological_operations/templates/ishtar/sheet_operation.html:518 #: archaeological_warehouse/models.py:297 -#: archaeological_warehouse/models.py:818 ishtar_common/forms_common.py:454 -#: ishtar_common/forms_common.py:633 ishtar_common/forms_common.py:851 -#: ishtar_common/forms_common.py:1082 ishtar_common/forms_common.py:1467 -#: ishtar_common/forms_common.py:1873 ishtar_common/forms_common.py:2089 -#: ishtar_common/models.py:714 ishtar_common/models.py:2350 -#: ishtar_common/models.py:3853 ishtar_common/models_imports.py:791 +#: archaeological_warehouse/models.py:818 +#: cd17_app/templates/ishtar/sheet_find.html:342 +#: cd17_app/templates/ishtar/sheet_find.html:380 +#: cd17_app/templates/ishtar/sheet_find.html:418 +#: cd17_app/templates/ishtar/sheet_find.html:456 +#: ishtar_common/forms_common.py:454 ishtar_common/forms_common.py:633 +#: ishtar_common/forms_common.py:851 ishtar_common/forms_common.py:1082 +#: ishtar_common/forms_common.py:1467 ishtar_common/forms_common.py:1873 +#: ishtar_common/forms_common.py:2089 ishtar_common/models.py:714 +#: ishtar_common/models.py:2350 ishtar_common/models.py:3853 +#: ishtar_common/models_imports.py:793 #: ishtar_common/templates/blocks/DataTables-stats.html:22 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:24 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:8 @@ -2500,7 +2540,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:196 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:9 #: archaeological_warehouse/forms.py:682 ishtar_common/models.py:684 -#: ishtar_common/models_imports.py:790 +#: ishtar_common/models_imports.py:792 msgid "Date" msgstr "" @@ -2768,7 +2808,7 @@ msgstr "" #: archaeological_finds/forms.py:198 archaeological_finds/forms.py:466 #: archaeological_finds/forms.py:1107 archaeological_finds/models_finds.py:1760 -#: ishtar_common/models_imports.py:773 +#: ishtar_common/models_imports.py:775 msgid "Material type quality" msgstr "" @@ -2845,6 +2885,7 @@ msgstr "" #: archaeological_finds/forms.py:231 archaeological_finds/forms.py:491 #: archaeological_finds/forms.py:992 #: archaeological_finds/templates/ishtar/sheet_find.html:168 +#: cd17_app/templates/ishtar/sheet_find.html:176 #: sra_idf_app/templates/ishtar/sheet_find.html:175 msgid "Dimensions" msgstr "" @@ -2888,6 +2929,7 @@ msgstr "" #: archaeological_finds/forms.py:246 archaeological_finds/forms.py:500 #: archaeological_finds/forms.py:1569 #: archaeological_finds/templates/ishtar/sheet_find.html:177 +#: cd17_app/templates/ishtar/sheet_find.html:185 #: sra_idf_app/templates/ishtar/sheet_find.html:184 msgid "Weight (g)" msgstr "" @@ -3040,7 +3082,7 @@ msgstr "" #: archaeological_finds/forms.py:664 archaeological_finds/forms.py:891 #: archaeological_finds/forms.py:1217 archaeological_finds/models_finds.py:1133 #: archaeological_finds/models_finds.py:1895 -#: archaeological_warehouse/forms.py:567 ishtar_common/models_imports.py:755 +#: archaeological_warehouse/forms.py:567 ishtar_common/models_imports.py:757 msgid "Conservatory state" msgstr "" @@ -3089,7 +3131,7 @@ msgstr "" #: archaeological_finds/models_finds.py:863 #: archaeological_finds/models_finds.py:1663 #: archaeological_finds/templates/ishtar/sheet_findbasket.html:4 -#: archaeological_finds/views.py:1199 archaeological_finds/wizards.py:401 +#: archaeological_finds/views.py:1219 archaeological_finds/wizards.py:401 msgid "Basket" msgstr "" @@ -3107,6 +3149,7 @@ msgstr "" #: archaeological_finds/forms.py:871 archaeological_finds/forms.py:1003 #: archaeological_finds/templates/ishtar/sheet_find.html:198 +#: cd17_app/templates/ishtar/sheet_find.html:206 #: sra_idf_app/templates/ishtar/sheet_find.html:205 msgid "Preservation" msgstr "" @@ -3173,7 +3216,7 @@ msgstr "" #: archaeological_operations/models.py:807 #: archaeological_operations/models.py:893 #: archaeological_operations/models.py:1174 ishtar_common/models.py:4584 -#: ishtar_common/models_imports.py:740 +#: ishtar_common/models_imports.py:742 msgid "Operation type" msgstr "" @@ -3240,7 +3283,7 @@ msgstr "" #: archaeological_finds/forms.py:1111 archaeological_finds/models_finds.py:261 #: archaeological_finds/models_finds.py:1131 #: archaeological_operations/templates/ishtar/sheet_operation.html:491 -#: archaeological_warehouse/forms.py:560 ishtar_common/models_imports.py:763 +#: archaeological_warehouse/forms.py:560 ishtar_common/models_imports.py:765 #: na_app/templates/ishtar/sheet_operation.html:497 #: sra_idf_app/templates/ishtar/sheet_operation.html:488 msgid "Object type" @@ -3381,6 +3424,7 @@ msgstr "" #: archaeological_finds/forms.py:1307 archaeological_finds/models_finds.py:1090 #: archaeological_finds/models_finds.py:1807 #: archaeological_finds/templates/ishtar/sheet_find.html:273 +#: cd17_app/templates/ishtar/sheet_find.html:281 #: ishtar_common/forms_common.py:1485 #: sra_idf_app/templates/ishtar/sheet_find.html:280 msgid "Reference container" @@ -3392,6 +3436,7 @@ msgstr "" #: archaeological_finds/forms.py:1331 archaeological_finds/models_finds.py:1089 #: archaeological_finds/templates/ishtar/sheet_find.html:294 +#: cd17_app/templates/ishtar/sheet_find.html:302 #: ishtar_common/forms_common.py:1477 #: sra_idf_app/templates/ishtar/sheet_find.html:301 msgid "Current container" @@ -3402,7 +3447,7 @@ msgid "Current container - Warehouse (location)" msgstr "" #: archaeological_finds/forms.py:1356 archaeological_finds/forms.py:1372 -#: archaeological_finds/forms.py:1413 archaeological_finds/views.py:368 +#: archaeological_finds/forms.py:1413 archaeological_finds/views.py:388 msgid "Find search" msgstr "" @@ -3429,7 +3474,7 @@ msgid "Find basket - 001 - Search" msgstr "" #: archaeological_finds/forms.py:1631 archaeological_finds/forms.py:1646 -#: archaeological_finds/views.py:286 +#: archaeological_finds/views.py:287 msgid "Basket search" msgstr "" @@ -3445,11 +3490,14 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:333 #: archaeological_finds/templates/ishtar/sheet_find.html:371 #: archaeological_finds/templates/ishtar/sheet_find.html:409 +#: cd17_app/templates/ishtar/sheet_find.html:341 +#: cd17_app/templates/ishtar/sheet_find.html:379 +#: cd17_app/templates/ishtar/sheet_find.html:417 #: ishtar_common/forms_common.py:1419 ishtar_common/models.py:938 #: ishtar_common/models.py:1666 ishtar_common/models.py:3185 #: ishtar_common/models_common.py:157 ishtar_common/models_common.py:190 #: ishtar_common/models_common.py:1809 ishtar_common/models_common.py:1825 -#: ishtar_common/models_imports.py:424 +#: ishtar_common/models_imports.py:426 #: sra_idf_app/templates/ishtar/sheet_find.html:340 #: sra_idf_app/templates/ishtar/sheet_find.html:378 #: sra_idf_app/templates/ishtar/sheet_find.html:416 @@ -3458,7 +3506,7 @@ msgstr "" #: archaeological_finds/forms.py:1666 ishtar_common/models.py:1005 #: ishtar_common/models.py:1876 ishtar_common/models.py:3187 -#: ishtar_common/models_imports.py:108 ishtar_common/models_imports.py:526 +#: ishtar_common/models_imports.py:108 ishtar_common/models_imports.py:528 msgid "Slug" msgstr "" @@ -3509,12 +3557,12 @@ msgstr "" #: archaeological_finds/models_finds.py:172 #: archaeological_finds/models_treatments.py:208 #: archaeological_finds/models_treatments.py:743 -#: ishtar_common/models_imports.py:760 +#: ishtar_common/models_imports.py:762 msgid "Treatment type" msgstr "" #: archaeological_finds/forms_treatments.py:77 -#: archaeological_finds/views.py:620 +#: archaeological_finds/views.py:640 msgid "Treatment search" msgstr "" @@ -3653,6 +3701,9 @@ msgstr "" #: archaeological_warehouse/models.py:1074 #: archaeological_warehouse/models.py:1864 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 +#: cd17_app/templates/ishtar/sheet_find.html:346 +#: cd17_app/templates/ishtar/sheet_find.html:384 +#: cd17_app/templates/ishtar/sheet_find.html:422 #: ishtar_common/forms_common.py:1975 ishtar_common/forms_common.py:2154 #: ishtar_common/templates/ishtar/sheet_document.html:100 #: sra_idf_app/templates/ishtar/sheet_find.html:345 @@ -3745,6 +3796,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1107 #: archaeological_finds/templates/ishtar/sheet_find.html:451 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:55 +#: cd17_app/templates/ishtar/sheet_find.html:459 #: sra_idf_app/templates/ishtar/sheet_find.html:458 msgid "Applicant" msgstr "" @@ -3754,6 +3806,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1115 #: archaeological_finds/templates/ishtar/sheet_find.html:452 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:63 +#: cd17_app/templates/ishtar/sheet_find.html:460 #: sra_idf_app/templates/ishtar/sheet_find.html:459 msgid "Applicant organisation" msgstr "" @@ -3776,7 +3829,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:734 #: archaeological_finds/forms_treatments.py:746 -#: archaeological_finds/views.py:957 +#: archaeological_finds/views.py:977 msgid "Treatment request search" msgstr "" @@ -3955,7 +4008,7 @@ msgstr "" msgid "Integrity / interest types" msgstr "" -#: archaeological_finds/models_finds.py:237 ishtar_common/models_imports.py:766 +#: archaeological_finds/models_finds.py:237 ishtar_common/models_imports.py:768 msgid "Remarkability type" msgstr "" @@ -3963,7 +4016,7 @@ msgstr "" msgid "Remarkability types" msgstr "" -#: archaeological_finds/models_finds.py:250 ishtar_common/models_imports.py:770 +#: archaeological_finds/models_finds.py:250 ishtar_common/models_imports.py:772 msgid "Batch type" msgstr "" @@ -3973,7 +4026,7 @@ msgstr "" #: archaeological_finds/models_finds.py:275 #: archaeological_finds/models_finds.py:1826 -#: ishtar_common/models_imports.py:774 +#: ishtar_common/models_imports.py:776 msgid "Functional area" msgstr "" @@ -3985,7 +4038,7 @@ msgstr "" msgid "Object type quality types" msgstr "" -#: archaeological_finds/models_finds.py:302 ishtar_common/models_imports.py:767 +#: archaeological_finds/models_finds.py:302 ishtar_common/models_imports.py:769 msgid "Alteration type" msgstr "" @@ -3993,7 +4046,7 @@ msgstr "" msgid "Alteration types" msgstr "" -#: archaeological_finds/models_finds.py:316 ishtar_common/models_imports.py:769 +#: archaeological_finds/models_finds.py:316 ishtar_common/models_imports.py:771 msgid "Alteration cause type" msgstr "" @@ -4001,7 +4054,7 @@ msgstr "" msgid "Alteration cause types" msgstr "" -#: archaeological_finds/models_finds.py:330 ishtar_common/models_imports.py:762 +#: archaeological_finds/models_finds.py:330 ishtar_common/models_imports.py:764 msgid "Treatment emergency type" msgstr "" @@ -4017,7 +4070,7 @@ msgstr "" msgid "Communicability types" msgstr "" -#: archaeological_finds/models_finds.py:357 ishtar_common/models_imports.py:771 +#: archaeological_finds/models_finds.py:357 ishtar_common/models_imports.py:773 msgid "Checked type" msgstr "" @@ -4067,7 +4120,7 @@ msgstr "" msgid "kg" msgstr "" -#: archaeological_finds/models_finds.py:902 archaeological_finds/views.py:523 +#: archaeological_finds/models_finds.py:902 archaeological_finds/views.py:543 msgid "Manage basket" msgstr "" @@ -4610,7 +4663,7 @@ msgstr "" #: archaeological_finds/models_finds.py:1670 #: archaeological_finds/models_finds.py:2267 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 -#: archaeological_finds/views.py:1243 archaeological_warehouse/forms.py:667 +#: archaeological_finds/views.py:1263 archaeological_warehouse/forms.py:667 #: archaeological_warehouse/views.py:297 ishtar_common/models.py:3830 #: ishtar_common/models.py:4175 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 @@ -4628,12 +4681,14 @@ msgstr "" #: archaeological_finds/models_finds.py:1781 #: archaeological_finds/templates/ishtar/sheet_find.html:366 +#: cd17_app/templates/ishtar/sheet_find.html:374 #: sra_idf_app/templates/ishtar/sheet_find.html:373 msgid "Upstream treatment" msgstr "" #: archaeological_finds/models_finds.py:1788 #: archaeological_finds/templates/ishtar/sheet_find.html:404 +#: cd17_app/templates/ishtar/sheet_find.html:412 #: sra_idf_app/templates/ishtar/sheet_find.html:411 msgid "Downstream treatment" msgstr "" @@ -4811,6 +4866,9 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:337 #: archaeological_finds/templates/ishtar/sheet_find.html:375 #: archaeological_finds/templates/ishtar/sheet_find.html:413 +#: cd17_app/templates/ishtar/sheet_find.html:345 +#: cd17_app/templates/ishtar/sheet_find.html:383 +#: cd17_app/templates/ishtar/sheet_find.html:421 #: sra_idf_app/templates/ishtar/sheet_find.html:344 #: sra_idf_app/templates/ishtar/sheet_find.html:382 #: sra_idf_app/templates/ishtar/sheet_find.html:420 @@ -4863,8 +4921,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1163 #: archaeological_finds/templates/ishtar/sheet_find.html:443 -#: ishtar_common/views.py:995 ishtar_common/views.py:1068 -#: sra_idf_app/templates/ishtar/sheet_find.html:450 +#: cd17_app/templates/ishtar/sheet_find.html:451 ishtar_common/views.py:995 +#: ishtar_common/views.py:1068 sra_idf_app/templates/ishtar/sheet_find.html:450 msgid "Treatment requests" msgstr "" @@ -4932,6 +4990,7 @@ msgid "Last modified by" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:14 +#: cd17_app/templates/ishtar/sheet_find.html:14 #: sra_idf_app/templates/ishtar/sheet_find.html:14 msgid "" "This sheet has a downstream treatment: it is related to an old version of " @@ -4939,46 +4998,55 @@ msgid "" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:37 +#: cd17_app/templates/ishtar/sheet_find.html:37 #: sra_idf_app/templates/ishtar/sheet_find.html:37 msgid "Image / Base find" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:44 +#: cd17_app/templates/ishtar/sheet_find.html:44 #: sra_idf_app/templates/ishtar/sheet_find.html:44 msgid "Identification / Description / Dimensions" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:52 +#: cd17_app/templates/ishtar/sheet_find.html:52 #: sra_idf_app/templates/ishtar/sheet_find.html:52 msgid "Datings / Preservation" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:61 +#: cd17_app/templates/ishtar/sheet_find.html:61 #: sra_idf_app/templates/ishtar/sheet_find.html:61 msgid "Warehouse / Treatments" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:142 +#: cd17_app/templates/ishtar/sheet_find.html:150 #: sra_idf_app/templates/ishtar/sheet_find.html:149 msgid "Administrative index" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:188 +#: cd17_app/templates/ishtar/sheet_find.html:196 #: sra_idf_app/templates/ishtar/sheet_find.html:195 msgid "Checked" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:269 +#: cd17_app/templates/ishtar/sheet_find.html:277 #: sra_idf_app/templates/ishtar/sheet_find.html:276 msgid "Warehouse - container" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:295 +#: cd17_app/templates/ishtar/sheet_find.html:303 #: sra_idf_app/templates/ishtar/sheet_find.html:302 msgid "Reference container / current container" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:328 +#: cd17_app/templates/ishtar/sheet_find.html:336 #: sra_idf_app/templates/ishtar/sheet_find.html:335 msgid "Simple treatments" msgstr "" @@ -4987,6 +5055,10 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:370 #: archaeological_finds/templates/ishtar/sheet_find.html:408 #: archaeological_finds/templates/ishtar/sheet_find.html:447 +#: cd17_app/templates/ishtar/sheet_find.html:340 +#: cd17_app/templates/ishtar/sheet_find.html:378 +#: cd17_app/templates/ishtar/sheet_find.html:416 +#: cd17_app/templates/ishtar/sheet_find.html:455 #: sra_idf_app/templates/ishtar/sheet_find.html:339 #: sra_idf_app/templates/ishtar/sheet_find.html:377 #: sra_idf_app/templates/ishtar/sheet_find.html:415 @@ -4997,6 +5069,9 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:336 #: archaeological_finds/templates/ishtar/sheet_find.html:374 #: archaeological_finds/templates/ishtar/sheet_find.html:412 +#: cd17_app/templates/ishtar/sheet_find.html:344 +#: cd17_app/templates/ishtar/sheet_find.html:382 +#: cd17_app/templates/ishtar/sheet_find.html:420 #: sra_idf_app/templates/ishtar/sheet_find.html:343 #: sra_idf_app/templates/ishtar/sheet_find.html:381 #: sra_idf_app/templates/ishtar/sheet_find.html:419 @@ -5004,6 +5079,7 @@ msgid "Related finds (max. 15 displayed)" msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:400 +#: cd17_app/templates/ishtar/sheet_find.html:408 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/DataTables-stats.html:77 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -5015,6 +5091,8 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:400 #: archaeological_finds/templates/ishtar/sheet_find.html:439 +#: cd17_app/templates/ishtar/sheet_find.html:408 +#: cd17_app/templates/ishtar/sheet_find.html:447 #: ishtar_common/templates/blocks/DataTables-content.html:39 #: ishtar_common/templates/blocks/JQueryJqGrid.html:29 #: ishtar_common/templates/blocks/JQueryJqGrid.html:35 @@ -5026,6 +5104,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:481 #: archaeological_finds/templates/ishtar/sheet_treatment.html:125 +#: cd17_app/templates/ishtar/sheet_find.html:489 #: ishtar_common/templates/ishtar/sheet_document.html:136 #: sra_idf_app/templates/ishtar/sheet_find.html:488 msgid "Associated documents" @@ -5117,7 +5196,7 @@ msgid "The division {} {} do not exist for the location {}." msgstr "" #: archaeological_finds/tests.py:1367 archaeological_finds/tests.py:1393 -#: archaeological_finds/tests.py:1403 archaeological_operations/tests.py:2783 +#: archaeological_finds/tests.py:1403 archaeological_operations/tests.py:2806 #: ishtar_common/forms.py:1152 ishtar_common/forms.py:1230 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 #: ishtar_common/templates/ishtar/import_delete.html:20 @@ -5134,88 +5213,88 @@ msgstr "" msgid "No" msgstr "" -#: archaeological_finds/views.py:296 +#: archaeological_finds/views.py:297 msgid "Basket modify" msgstr "" -#: archaeological_finds/views.py:322 +#: archaeological_finds/views.py:323 msgid "Basket deletion" msgstr "" -#: archaeological_finds/views.py:353 +#: archaeological_finds/views.py:354 msgid "New find" msgstr "" -#: archaeological_finds/views.py:408 +#: archaeological_finds/views.py:428 msgid "Find modification" msgstr "" -#: archaeological_finds/views.py:444 +#: archaeological_finds/views.py:464 msgid "Find deletion" msgstr "" -#: archaeological_finds/views.py:473 +#: archaeological_finds/views.py:493 msgid "New basket" msgstr "" -#: archaeological_finds/views.py:505 +#: archaeological_finds/views.py:525 msgid "Manage items in basket" msgstr "" -#: archaeological_finds/views.py:626 archaeological_finds/views.py:640 -#: archaeological_finds/views.py:654 +#: archaeological_finds/views.py:646 archaeological_finds/views.py:660 +#: archaeological_finds/views.py:674 msgid "New treatment" msgstr "" -#: archaeological_finds/views.py:665 +#: archaeological_finds/views.py:685 msgid "Treatment modification" msgstr "" -#: archaeological_finds/views.py:833 +#: archaeological_finds/views.py:853 msgid "Treatment deletion" msgstr "" -#: archaeological_finds/views.py:858 +#: archaeological_finds/views.py:878 msgid "Treatment: search administrative act" msgstr "" -#: archaeological_finds/views.py:871 +#: archaeological_finds/views.py:891 msgid "Treatment: new administrative act" msgstr "" -#: archaeological_finds/views.py:888 +#: archaeological_finds/views.py:908 msgid "Treatment: administrative act modification" msgstr "" -#: archaeological_finds/views.py:918 +#: archaeological_finds/views.py:938 msgid "Treatment: administrative act deletion" msgstr "" -#: archaeological_finds/views.py:969 +#: archaeological_finds/views.py:989 msgid "New treatment request" msgstr "" -#: archaeological_finds/views.py:979 +#: archaeological_finds/views.py:999 msgid "Treatment request modification" msgstr "" -#: archaeological_finds/views.py:1022 +#: archaeological_finds/views.py:1042 msgid "Treatment request deletion" msgstr "" -#: archaeological_finds/views.py:1046 +#: archaeological_finds/views.py:1066 msgid "Treatment request: search administrative act" msgstr "" -#: archaeological_finds/views.py:1061 +#: archaeological_finds/views.py:1081 msgid "Treatment request: new administrative act" msgstr "" -#: archaeological_finds/views.py:1079 +#: archaeological_finds/views.py:1099 msgid "Treatment request: administrative act modification" msgstr "" -#: archaeological_finds/views.py:1138 +#: archaeological_finds/views.py:1158 msgid "Treatment request: administrative act deletion" msgstr "" @@ -5312,6 +5391,7 @@ msgid "Is open?" msgstr "" #: archaeological_operations/forms.py:511 +#: archaeological_operations/forms.py:821 #: archaeological_operations/models.py:2447 msgid "Scientific monitor" msgstr "" @@ -5646,7 +5726,7 @@ msgid "Operation - 060 - Remains" msgstr "" #: archaeological_operations/forms.py:1199 -#: archaeological_operations/models.py:86 ishtar_common/models_imports.py:743 +#: archaeological_operations/models.py:86 ishtar_common/models_imports.py:745 msgid "Remain type" msgstr "" @@ -5900,7 +5980,7 @@ msgstr "" #: archaeological_operations/models.py:253 #: archaeological_operations/models.py:993 -#: archaeological_operations/tests.py:2774 +#: archaeological_operations/tests.py:2797 msgctxt "key for text search" msgid "remain" msgstr "" @@ -5971,7 +6051,7 @@ msgstr "" #: archaeological_operations/models.py:647 ishtar_common/forms.py:1151 #: ishtar_common/models.py:4710 ishtar_common/models.py:4867 -#: ishtar_common/models.py:4926 ishtar_common/views_item.py:1431 +#: ishtar_common/models.py:4926 ishtar_common/views_item.py:1448 msgid "Unknown" msgstr "" @@ -6037,7 +6117,7 @@ msgid "address" msgstr "" #: archaeological_operations/models.py:978 -#: archaeological_operations/tests.py:2781 +#: archaeological_operations/tests.py:2804 msgctxt "key for text search" msgid "is-open" msgstr "" @@ -6053,8 +6133,8 @@ msgid "scientist" msgstr "" #: archaeological_operations/models.py:989 -#: archaeological_operations/tests.py:2597 -#: archaeological_operations/tests.py:3015 +#: archaeological_operations/tests.py:2620 +#: archaeological_operations/tests.py:3038 msgctxt "key for text search" msgid "operator" msgstr "" @@ -6080,7 +6160,7 @@ msgid "end-after" msgstr "" #: archaeological_operations/models.py:1013 -#: archaeological_operations/tests.py:2824 +#: archaeological_operations/tests.py:2847 msgctxt "key for text search" msgid "relation-types" msgstr "" @@ -6242,7 +6322,7 @@ msgstr "" msgid "Mean" msgstr "" -#: archaeological_operations/models.py:2088 ishtar_common/models_imports.py:745 +#: archaeological_operations/models.py:2088 ishtar_common/models_imports.py:747 msgid "Operation relation type" msgstr "" @@ -6787,27 +6867,27 @@ msgstr "" msgid "This act is indexed!" msgstr "" -#: archaeological_operations/tests.py:784 +#: archaeological_operations/tests.py:807 #: ishtar_common/templates/ishtar/import_step_by_step.html:156 msgid "New objects will be created." msgstr "" -#: archaeological_operations/tests.py:814 +#: archaeological_operations/tests.py:837 #: ishtar_common/templates/ishtar/import_step_by_step.html:67 msgid "This line have been already imported." msgstr "" -#: archaeological_operations/tests.py:852 +#: archaeological_operations/tests.py:875 #: ishtar_common/templates/ishtar/import_step_by_step.html:73 msgid "" "The following error(s) has been encountered while parsing the source file:" msgstr "" -#: archaeological_operations/tests.py:2274 ishtar_common/forms.py:439 +#: archaeological_operations/tests.py:2297 ishtar_common/forms.py:439 msgid "This item is locked for edition." msgstr "" -#: archaeological_operations/tests.py:2287 +#: archaeological_operations/tests.py:2310 #: ishtar_common/templates/ishtar/sheet.html:132 msgid "This item has been locked. Edition is disabled." msgstr "" @@ -6903,7 +6983,7 @@ msgstr "" #: archaeological_warehouse/forms.py:144 archaeological_warehouse/forms.py:204 #: archaeological_warehouse/models.py:259 -#: archaeological_warehouse/models.py:336 ishtar_common/models_imports.py:759 +#: archaeological_warehouse/models.py:336 ishtar_common/models_imports.py:761 msgid "Warehouse type" msgstr "" @@ -6979,7 +7059,7 @@ msgstr "" #: archaeological_warehouse/models.py:789 #: archaeological_warehouse/models.py:1017 #: archaeological_warehouse/templates/ishtar/sheet_container.html:138 -#: ishtar_common/models_imports.py:756 +#: ishtar_common/models_imports.py:758 msgid "Container type" msgstr "" @@ -7853,7 +7933,7 @@ msgstr "" msgid "Import already imported/scheduled." msgstr "" -#: ishtar_common/admin.py:1937 ishtar_common/models_imports.py:1117 +#: ishtar_common/admin.py:1937 ishtar_common/models_imports.py:1119 msgid "Launch import" msgstr "" @@ -7981,64 +8061,76 @@ msgid "" "source file." msgstr "" -#: ishtar_common/data_importer.py:1428 ishtar_common/views.py:1636 +#: ishtar_common/data_importer.py:1418 ishtar_common/views.py:1636 #: ishtar_common/views.py:1646 msgid "Not imported" msgstr "" -#: ishtar_common/data_importer.py:1717 +#: ishtar_common/data_importer.py:1707 msgid "Importer configuration error: \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1722 +#: ishtar_common/data_importer.py:1712 msgid "Import error: {} - \"{}\"." msgstr "" -#: ishtar_common/data_importer.py:1803 +#: ishtar_common/data_importer.py:1794 msgid "Importer configuration error: field \"{}\" does not exist for {}." msgstr "" -#: ishtar_common/data_importer.py:1916 +#: ishtar_common/data_importer.py:1907 msgid "* created *" msgstr "" -#: ishtar_common/data_importer.py:1989 +#: ishtar_common/data_importer.py:1982 msgid "* match not find *" msgstr "" -#: ishtar_common/data_importer.py:1997 +#: ishtar_common/data_importer.py:1990 msgid "* the query match more than 10 results*" msgstr "" -#: ishtar_common/data_importer.py:2002 +#: ishtar_common/data_importer.py:1995 msgid " or " msgstr "" -#: ishtar_common/data_importer.py:2178 +#: ishtar_common/data_importer.py:2068 +msgid "unicity key(s) \"{}\" is/are missing" +msgstr "" + +#: ishtar_common/data_importer.py:2071 +msgid "Import error {}, {}" +msgstr "" + +#: ishtar_common/data_importer.py:2156 +msgid "Import error {}, path \"{}\", context : {}, error : {}" +msgstr "" + +#: ishtar_common/data_importer.py:2184 msgid "line" msgstr "" -#: ishtar_common/data_importer.py:2178 +#: ishtar_common/data_importer.py:2184 msgid "col" msgstr "" -#: ishtar_common/data_importer.py:2178 +#: ishtar_common/data_importer.py:2184 msgid "error" msgstr "" -#: ishtar_common/data_importer.py:2184 +#: ishtar_common/data_importer.py:2190 msgid "field" msgstr "" -#: ishtar_common/data_importer.py:2184 +#: ishtar_common/data_importer.py:2190 msgid "source" msgstr "" -#: ishtar_common/data_importer.py:2184 +#: ishtar_common/data_importer.py:2190 msgid "result" msgstr "" -#: ishtar_common/data_importer.py:2200 +#: ishtar_common/data_importer.py:2206 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "" @@ -8141,7 +8233,7 @@ msgid "Target" msgstr "" #: ishtar_common/forms_common.py:263 ishtar_common/models.py:1691 -#: ishtar_common/models_imports.py:660 +#: ishtar_common/models_imports.py:662 #: ishtar_common/templates/ishtar/formset_import_match.html:45 #: ishtar_common/templates/ishtar/import_step_by_step.html:172 #: ishtar_common/templates/ishtar/import_step_by_step.html:200 @@ -8174,8 +8266,8 @@ msgid "all users" msgstr "" #: ishtar_common/forms_common.py:395 ishtar_common/forms_common.py:506 -#: ishtar_common/models.py:2285 ishtar_common/models_imports.py:727 -#: ishtar_common/models_imports.py:728 +#: ishtar_common/models.py:2285 ishtar_common/models_imports.py:729 +#: ishtar_common/models_imports.py:730 msgid "Organization type" msgstr "" @@ -8236,7 +8328,7 @@ msgstr "" #: ishtar_common/forms_common.py:1462 ishtar_common/forms_common.py:1872 #: ishtar_common/forms_common.py:2087 ishtar_common/models.py:2615 #: ishtar_common/models.py:2619 ishtar_common/models.py:3838 -#: ishtar_common/models_imports.py:730 +#: ishtar_common/models_imports.py:732 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:7 msgid "Title" msgstr "" @@ -8321,7 +8413,7 @@ msgstr "" #: ishtar_common/forms_common.py:928 ishtar_common/forms_common.py:976 #: ishtar_common/forms_common.py:980 ishtar_common/models.py:2433 -#: ishtar_common/models_imports.py:729 +#: ishtar_common/models_imports.py:731 msgid "Person type" msgstr "" @@ -8417,7 +8509,7 @@ msgid "This value already exist" msgstr "" #: ishtar_common/forms_common.py:1440 ishtar_common/models.py:3463 -#: ishtar_common/models_imports.py:737 +#: ishtar_common/models_imports.py:739 msgid "Document tag" msgstr "" @@ -8432,7 +8524,7 @@ msgstr "" #: ishtar_common/forms_common.py:1473 ishtar_common/forms_common.py:1662 #: ishtar_common/forms_common.py:1877 ishtar_common/models.py:3905 -#: ishtar_common/models_imports.py:734 ishtar_common/models_imports.py:735 +#: ishtar_common/models_imports.py:736 ishtar_common/models_imports.py:737 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:88 #: ishtar_common/templates/ishtar/sheet_document.html:50 msgid "Format" @@ -8475,7 +8567,7 @@ msgstr "" #: ishtar_common/forms_common.py:1537 ishtar_common/forms_common.py:1906 #: ishtar_common/models.py:957 ishtar_common/models.py:3873 -#: ishtar_common/models_imports.py:738 overload_translation/models.py:11 +#: ishtar_common/models_imports.py:740 overload_translation/models.py:11 msgid "Language" msgstr "" @@ -8648,8 +8740,8 @@ msgstr "" msgid "Document - Quick action - Modify" msgstr "" -#: ishtar_common/forms_common.py:2066 ishtar_common/models_imports.py:731 -#: ishtar_common/models_imports.py:732 +#: ishtar_common/forms_common.py:2066 ishtar_common/models_imports.py:733 +#: ishtar_common/models_imports.py:734 msgid "Source type" msgstr "" @@ -8679,7 +8771,7 @@ msgid "Would you like to delete this documentation?" msgstr "" #: ishtar_common/forms_common.py:2241 ishtar_common/models.py:3305 -#: ishtar_common/models.py:3320 ishtar_common/models_imports.py:733 +#: ishtar_common/models.py:3320 ishtar_common/models_imports.py:735 msgid "Author type" msgstr "" @@ -8738,7 +8830,7 @@ msgstr "" msgid "Directory" msgstr "" -#: ishtar_common/ishtar_menu.py:178 ishtar_common/models_imports.py:1007 +#: ishtar_common/ishtar_menu.py:178 ishtar_common/models_imports.py:1009 msgid "Imports" msgstr "" @@ -8771,7 +8863,7 @@ msgid "This item already exists." msgstr "" #: ishtar_common/models.py:428 ishtar_common/models.py:702 -#: ishtar_common/models_imports.py:659 +#: ishtar_common/models_imports.py:661 #: ishtar_common/templates/ishtar/formset_import_match.html:44 #: ishtar_common/templates/ishtar/import_step_by_step.html:171 #: ishtar_common/templates/ishtar/import_step_by_step.html:199 @@ -8836,7 +8928,7 @@ msgstr "" msgid "Long text" msgstr "" -#: ishtar_common/models.py:681 ishtar_common/models_imports.py:787 +#: ishtar_common/models.py:681 ishtar_common/models_imports.py:789 msgid "Integer" msgstr "" @@ -8844,7 +8936,7 @@ msgstr "" msgid "Boolean" msgstr "" -#: ishtar_common/models.py:683 ishtar_common/models_imports.py:788 +#: ishtar_common/models.py:683 ishtar_common/models_imports.py:790 msgid "Float" msgstr "" @@ -9499,7 +9591,7 @@ msgstr "" #: ishtar_common/models.py:1495 ishtar_common/models.py:1905 #: ishtar_common/models.py:3197 ishtar_common/models_common.py:169 -#: ishtar_common/models_imports.py:124 ishtar_common/models_imports.py:638 +#: ishtar_common/models_imports.py:124 ishtar_common/models_imports.py:640 msgid "Available" msgstr "" @@ -9693,7 +9785,7 @@ msgstr "" msgid "Long title" msgstr "" -#: ishtar_common/models.py:2506 ishtar_common/models_imports.py:781 +#: ishtar_common/models.py:2506 ishtar_common/models_imports.py:783 msgid "Title type" msgstr "" @@ -9852,8 +9944,8 @@ msgstr "" msgid "Only available for these document types" msgstr "" -#: ishtar_common/models.py:3414 ishtar_common/models_imports.py:739 -#: ishtar_common/models_imports.py:780 +#: ishtar_common/models.py:3414 ishtar_common/models_imports.py:741 +#: ishtar_common/models_imports.py:782 msgid "Support type" msgstr "" @@ -9883,7 +9975,7 @@ msgstr "" msgid "URL" msgstr "" -#: ishtar_common/models.py:3454 ishtar_common/models_imports.py:736 +#: ishtar_common/models.py:3454 ishtar_common/models_imports.py:738 msgid "License type" msgstr "" @@ -10138,11 +10230,11 @@ msgstr "" msgid "In progress" msgstr "" -#: ishtar_common/models.py:4687 ishtar_common/models_imports.py:907 +#: ishtar_common/models.py:4687 ishtar_common/models_imports.py:909 msgid "Finished with errors" msgstr "" -#: ishtar_common/models.py:4688 ishtar_common/models_imports.py:908 +#: ishtar_common/models.py:4688 ishtar_common/models_imports.py:910 msgid "Finished" msgstr "" @@ -10181,7 +10273,7 @@ msgid "" "configuration." msgstr "" -#: ishtar_common/models.py:4807 ishtar_common/models_imports.py:899 +#: ishtar_common/models.py:4807 ishtar_common/models_imports.py:901 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:132 msgid "Created" msgstr "" @@ -10419,7 +10511,7 @@ msgstr "" msgid "Authority SRID" msgstr "" -#: ishtar_common/models_common.py:2732 ishtar_common/models_imports.py:779 +#: ishtar_common/models_common.py:2732 ishtar_common/models_imports.py:781 msgid "Spatial reference system" msgstr "" @@ -10518,399 +10610,399 @@ msgstr "" msgid "Importer - Defaults" msgstr "" -#: ishtar_common/models_imports.py:377 +#: ishtar_common/models_imports.py:379 msgid "Importer - Default value" msgstr "" -#: ishtar_common/models_imports.py:378 +#: ishtar_common/models_imports.py:380 msgid "Importer - Default values" msgstr "" -#: ishtar_common/models_imports.py:427 +#: ishtar_common/models_imports.py:429 #: ishtar_common/templates/ishtar/import_step_by_step.html:101 #: ishtar_common/templates/ishtar/import_step_by_step.html:269 msgid "Column number" msgstr "" -#: ishtar_common/models_imports.py:437 +#: ishtar_common/models_imports.py:439 msgid "Required" msgstr "" -#: ishtar_common/models_imports.py:439 +#: ishtar_common/models_imports.py:441 msgid "Export field name" msgstr "" -#: ishtar_common/models_imports.py:440 +#: ishtar_common/models_imports.py:442 msgid "" "Fill this field if the field name is ambiguous for export. For instance: " "concatenated fields." msgstr "" -#: ishtar_common/models_imports.py:446 +#: ishtar_common/models_imports.py:448 msgid "Importer - Column" msgstr "" -#: ishtar_common/models_imports.py:447 +#: ishtar_common/models_imports.py:449 msgid "Importer - Columns" msgstr "" -#: ishtar_common/models_imports.py:481 +#: ishtar_common/models_imports.py:483 msgid "Field name" msgstr "" -#: ishtar_common/models_imports.py:483 ishtar_common/models_imports.py:571 +#: ishtar_common/models_imports.py:485 ishtar_common/models_imports.py:573 msgid "Force creation of new items" msgstr "" -#: ishtar_common/models_imports.py:485 ishtar_common/models_imports.py:573 +#: ishtar_common/models_imports.py:487 ishtar_common/models_imports.py:575 msgid "Concatenate with existing" msgstr "" -#: ishtar_common/models_imports.py:487 ishtar_common/models_imports.py:575 +#: ishtar_common/models_imports.py:489 ishtar_common/models_imports.py:577 msgid "Concatenate character" msgstr "" -#: ishtar_common/models_imports.py:492 +#: ishtar_common/models_imports.py:494 msgid "Importer - Duplicate field" msgstr "" -#: ishtar_common/models_imports.py:493 +#: ishtar_common/models_imports.py:495 msgid "Importer - Duplicate fields" msgstr "" -#: ishtar_common/models_imports.py:510 +#: ishtar_common/models_imports.py:512 msgid "Regular expression" msgstr "" -#: ishtar_common/models_imports.py:514 +#: ishtar_common/models_imports.py:516 msgid "Importer - Regular expression" msgstr "" -#: ishtar_common/models_imports.py:515 +#: ishtar_common/models_imports.py:517 msgid "Importer - Regular expressions" msgstr "" -#: ishtar_common/models_imports.py:529 +#: ishtar_common/models_imports.py:531 msgid "Format string" msgstr "" -#: ishtar_common/models_imports.py:530 +#: ishtar_common/models_imports.py:532 msgid "" "A string used to format a value using the Python \"format()\" method. The " "site https://pyformat.info/ provide good examples of usage. Only one \"{}\" " "entry is managed. The input is assumed to be a string." msgstr "" -#: ishtar_common/models_imports.py:538 +#: ishtar_common/models_imports.py:540 msgid "Importer - Value format" msgstr "" -#: ishtar_common/models_imports.py:539 +#: ishtar_common/models_imports.py:541 msgid "Importer - Value formats" msgstr "" -#: ishtar_common/models_imports.py:549 +#: ishtar_common/models_imports.py:551 msgid "The string provided generate an error. Fix it." msgstr "" -#: ishtar_common/models_imports.py:581 +#: ishtar_common/models_imports.py:583 msgid "Importer - Target" msgstr "" -#: ishtar_common/models_imports.py:582 +#: ishtar_common/models_imports.py:584 msgid "Importer - Targets" msgstr "" -#: ishtar_common/models_imports.py:621 ishtar_common/views_item.py:532 -#: ishtar_common/views_item.py:1269 +#: ishtar_common/models_imports.py:623 ishtar_common/views_item.py:532 +#: ishtar_common/views_item.py:1286 msgid "True" msgstr "" -#: ishtar_common/models_imports.py:622 ishtar_common/views_item.py:1271 +#: ishtar_common/models_imports.py:624 ishtar_common/views_item.py:1288 msgid "False" msgstr "" -#: ishtar_common/models_imports.py:634 +#: ishtar_common/models_imports.py:636 msgid "All users can use it" msgstr "" -#: ishtar_common/models_imports.py:636 +#: ishtar_common/models_imports.py:638 msgid "All users can modify it" msgstr "" -#: ishtar_common/models_imports.py:641 +#: ishtar_common/models_imports.py:643 msgid "Importer - Target key group" msgstr "" -#: ishtar_common/models_imports.py:642 +#: ishtar_common/models_imports.py:644 msgid "Importer - Target key groups" msgstr "" -#: ishtar_common/models_imports.py:661 +#: ishtar_common/models_imports.py:663 msgid "Is set" msgstr "" -#: ishtar_common/models_imports.py:669 +#: ishtar_common/models_imports.py:671 msgid "Importer - Target key" msgstr "" -#: ishtar_common/models_imports.py:670 +#: ishtar_common/models_imports.py:672 msgid "Importer - Targets keys" msgstr "" -#: ishtar_common/models_imports.py:742 +#: ishtar_common/models_imports.py:744 msgid "Report state" msgstr "" -#: ishtar_common/models_imports.py:746 +#: ishtar_common/models_imports.py:748 msgid "Unit" msgstr "" -#: ishtar_common/models_imports.py:748 +#: ishtar_common/models_imports.py:750 msgid "Activity type" msgstr "" -#: ishtar_common/models_imports.py:752 +#: ishtar_common/models_imports.py:754 msgid "Dating quality" msgstr "" -#: ishtar_common/models_imports.py:753 +#: ishtar_common/models_imports.py:755 msgid "Material" msgstr "" -#: ishtar_common/models_imports.py:758 +#: ishtar_common/models_imports.py:760 msgid "Warehouse division" msgstr "" -#: ishtar_common/models_imports.py:764 +#: ishtar_common/models_imports.py:766 msgid "Integrity type" msgstr "" -#: ishtar_common/models_imports.py:776 +#: ishtar_common/models_imports.py:778 msgid "Identification type" msgstr "" -#: ishtar_common/models_imports.py:778 +#: ishtar_common/models_imports.py:780 msgid "Context record relation type" msgstr "" -#: ishtar_common/models_imports.py:789 overload_translation/models.py:7 +#: ishtar_common/models_imports.py:791 overload_translation/models.py:7 msgid "String" msgstr "" -#: ishtar_common/models_imports.py:793 +#: ishtar_common/models_imports.py:795 msgid "INSEE code" msgstr "" -#: ishtar_common/models_imports.py:794 +#: ishtar_common/models_imports.py:796 msgid "Upper case" msgstr "" -#: ishtar_common/models_imports.py:795 +#: ishtar_common/models_imports.py:797 msgid "Lower case" msgstr "" -#: ishtar_common/models_imports.py:796 +#: ishtar_common/models_imports.py:798 msgid "String to boolean" msgstr "" -#: ishtar_common/models_imports.py:797 +#: ishtar_common/models_imports.py:799 msgctxt "filesystem" msgid "File" msgstr "" -#: ishtar_common/models_imports.py:798 +#: ishtar_common/models_imports.py:800 msgid "Unknow type" msgstr "" -#: ishtar_common/models_imports.py:817 +#: ishtar_common/models_imports.py:819 msgid "4 digit year. e.g.: \"2015\"" msgstr "" -#: ishtar_common/models_imports.py:818 +#: ishtar_common/models_imports.py:820 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "" -#: ishtar_common/models_imports.py:819 +#: ishtar_common/models_imports.py:821 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "" -#: ishtar_common/models_imports.py:835 +#: ishtar_common/models_imports.py:837 msgid "Options" msgstr "" -#: ishtar_common/models_imports.py:837 +#: ishtar_common/models_imports.py:839 msgid "Split character(s)" msgstr "" -#: ishtar_common/models_imports.py:842 +#: ishtar_common/models_imports.py:844 msgid "Importer - Formater type" msgstr "" -#: ishtar_common/models_imports.py:843 +#: ishtar_common/models_imports.py:845 msgid "Importer - Formater types" msgstr "" -#: ishtar_common/models_imports.py:900 +#: ishtar_common/models_imports.py:902 msgid "Analyse in progress" msgstr "" -#: ishtar_common/models_imports.py:901 +#: ishtar_common/models_imports.py:903 msgid "Analysed" msgstr "" -#: ishtar_common/models_imports.py:902 +#: ishtar_common/models_imports.py:904 msgid "Check modified in queue" msgstr "" -#: ishtar_common/models_imports.py:903 +#: ishtar_common/models_imports.py:905 msgid "Import in queue" msgstr "" -#: ishtar_common/models_imports.py:904 +#: ishtar_common/models_imports.py:906 msgid "Check modified in progress" msgstr "" -#: ishtar_common/models_imports.py:905 +#: ishtar_common/models_imports.py:907 msgid "Import in progress" msgstr "" -#: ishtar_common/models_imports.py:906 +#: ishtar_common/models_imports.py:908 msgid "Partially imported" msgstr "" -#: ishtar_common/models_imports.py:909 +#: ishtar_common/models_imports.py:911 msgid "Archived" msgstr "" -#: ishtar_common/models_imports.py:946 +#: ishtar_common/models_imports.py:948 msgid "Imported file" msgstr "" -#: ishtar_common/models_imports.py:949 +#: ishtar_common/models_imports.py:951 msgid "Associated images (zip file)" msgstr "" -#: ishtar_common/models_imports.py:954 +#: ishtar_common/models_imports.py:956 msgid "If a group is selected, target key saved in this group will be used." msgstr "" -#: ishtar_common/models_imports.py:957 +#: ishtar_common/models_imports.py:959 msgid "Encoding" msgstr "" -#: ishtar_common/models_imports.py:960 +#: ishtar_common/models_imports.py:962 msgid "CSV separator" msgstr "" -#: ishtar_common/models_imports.py:961 +#: ishtar_common/models_imports.py:963 msgid "" "Separator for CSV file. Standard is comma but Microsoft Excel do not follow " "this standard and use semi-colon." msgstr "" -#: ishtar_common/models_imports.py:965 +#: ishtar_common/models_imports.py:967 msgid "Skip lines" msgstr "" -#: ishtar_common/models_imports.py:966 +#: ishtar_common/models_imports.py:968 msgid "Number of header lines in your file (can be 0)." msgstr "" -#: ishtar_common/models_imports.py:968 +#: ishtar_common/models_imports.py:970 msgid "Error file" msgstr "" -#: ishtar_common/models_imports.py:971 +#: ishtar_common/models_imports.py:973 msgid "Result file" msgstr "" -#: ishtar_common/models_imports.py:974 +#: ishtar_common/models_imports.py:976 msgid "Match file" msgstr "" -#: ishtar_common/models_imports.py:977 +#: ishtar_common/models_imports.py:979 msgid "Archive file" msgstr "" -#: ishtar_common/models_imports.py:982 +#: ishtar_common/models_imports.py:984 msgid "Conservative import" msgstr "" -#: ishtar_common/models_imports.py:983 +#: ishtar_common/models_imports.py:985 msgid "If set to true, do not overload existing values." msgstr "" -#: ishtar_common/models_imports.py:989 +#: ishtar_common/models_imports.py:991 msgid "Remaining seconds" msgstr "" -#: ishtar_common/models_imports.py:990 +#: ishtar_common/models_imports.py:992 msgid "Current line" msgstr "" -#: ishtar_common/models_imports.py:992 +#: ishtar_common/models_imports.py:994 msgid "Number of line" msgstr "" -#: ishtar_common/models_imports.py:995 +#: ishtar_common/models_imports.py:997 msgid "Imported line numbers" msgstr "" -#: ishtar_common/models_imports.py:998 +#: ishtar_common/models_imports.py:1000 msgid "Changed have been checked" msgstr "" -#: ishtar_common/models_imports.py:1001 +#: ishtar_common/models_imports.py:1003 msgid "Changed line numbers" msgstr "" -#: ishtar_common/models_imports.py:1006 +#: ishtar_common/models_imports.py:1008 msgid "Import" msgstr "" -#: ishtar_common/models_imports.py:1047 ishtar_common/models_imports.py:1188 +#: ishtar_common/models_imports.py:1049 ishtar_common/models_imports.py:1190 msgid "Error in the CSV file." msgstr "" -#: ishtar_common/models_imports.py:1114 +#: ishtar_common/models_imports.py:1116 msgid "Analyse" msgstr "" -#: ishtar_common/models_imports.py:1116 ishtar_common/models_imports.py:1125 +#: ishtar_common/models_imports.py:1118 ishtar_common/models_imports.py:1127 msgid "Re-analyse" msgstr "" -#: ishtar_common/models_imports.py:1120 +#: ishtar_common/models_imports.py:1122 msgid "Step by step import" msgstr "" -#: ishtar_common/models_imports.py:1121 ishtar_common/models_imports.py:1130 +#: ishtar_common/models_imports.py:1123 ishtar_common/models_imports.py:1132 msgid "Re-check for changes" msgstr "" -#: ishtar_common/models_imports.py:1123 ishtar_common/models_imports.py:1132 +#: ishtar_common/models_imports.py:1125 ishtar_common/models_imports.py:1134 msgid "Check for changes" msgstr "" -#: ishtar_common/models_imports.py:1126 +#: ishtar_common/models_imports.py:1128 msgid "Re-import" msgstr "" -#: ishtar_common/models_imports.py:1129 +#: ishtar_common/models_imports.py:1131 msgid "Step by step re-import" msgstr "" -#: ishtar_common/models_imports.py:1133 +#: ishtar_common/models_imports.py:1135 #: ishtar_common/templates/ishtar/import_table.html:50 msgid "Archive" msgstr "" -#: ishtar_common/models_imports.py:1136 +#: ishtar_common/models_imports.py:1138 msgid "Unarchive" msgstr "" -#: ishtar_common/models_imports.py:1137 +#: ishtar_common/models_imports.py:1139 #: ishtar_common/templates/ishtar/blocks/window_nav.html:65 #: ishtar_common/templates/ishtar/form_delete.html:11 #: ishtar_common/views.py:2352 ishtar_common/widgets.py:408 @@ -10918,23 +11010,23 @@ msgstr "" msgid "Delete" msgstr "" -#: ishtar_common/models_imports.py:1216 +#: ishtar_common/models_imports.py:1218 msgid "Modification check {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:1286 +#: ishtar_common/models_imports.py:1288 msgid "Import {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:1308 +#: ishtar_common/models_imports.py:1310 msgid "Error on imported file: {}" msgstr "" -#: ishtar_common/models_imports.py:1343 +#: ishtar_common/models_imports.py:1345 msgid "Import {} finished with errors" msgstr "" -#: ishtar_common/models_imports.py:1352 +#: ishtar_common/models_imports.py:1354 msgid "Import {} finished with no errors" msgstr "" @@ -11650,6 +11742,7 @@ msgstr "" #: ishtar_common/templates/ishtar/simple_form.html:7 #: ishtar_common/templates/ishtar/wizard/search.html:32 #: ishtar_common/templates/ishtar/wizard/validation_bar.html:6 +#: sra_idf_app/templates/ishtar/wizard/search.html:44 msgid "Validate" msgstr "" @@ -12079,6 +12172,7 @@ msgstr "" #: ishtar_common/templates/ishtar/wizard/relations_wizard.html:25 #: ishtar_common/templates/ishtar/wizard/search.html:39 #: ishtar_common/templates/ishtar/wizard/towns_wizard.html:19 +#: sra_idf_app/templates/ishtar/wizard/search.html:51 msgid "Add/Modify" msgstr "" @@ -12386,12 +12480,12 @@ msgid "Generate a QR Code" msgstr "" #: ishtar_common/templatetags/window_tables.py:105 -#: ishtar_common/widgets.py:1267 +#: ishtar_common/widgets.py:1266 msgid "No results" msgstr "" #: ishtar_common/templatetags/window_tables.py:106 -#: ishtar_common/widgets.py:1268 +#: ishtar_common/widgets.py:1267 msgid "Loading..." msgstr "" @@ -12584,7 +12678,7 @@ msgstr "" msgid "Restore previous" msgstr "" -#: ishtar_common/widgets.py:1269 +#: ishtar_common/widgets.py:1268 msgid "Remove" msgstr "" |