diff options
| -rw-r--r-- | ishtar_common/templates/ishtar/import_table.html | 2 | ||||
| -rw-r--r-- | locale/de/LC_MESSAGES/django.po | 1824 | ||||
| -rw-r--r-- | locale/es/LC_MESSAGES/django.po | 1821 | ||||
| -rw-r--r-- | locale/fr/LC_MESSAGES/django.po | 1835 | ||||
| -rw-r--r-- | locale/pt/LC_MESSAGES/django.po | 1821 |
5 files changed, 3691 insertions, 3612 deletions
diff --git a/ishtar_common/templates/ishtar/import_table.html b/ishtar_common/templates/ishtar/import_table.html index e951e28c4..62c32f657 100644 --- a/ishtar_common/templates/ishtar/import_table.html +++ b/ishtar_common/templates/ishtar/import_table.html @@ -48,7 +48,7 @@ $("#import-list").find('input').prop('disabled', true); {% if import.imported_file %} <a href='{{import.imported_file.url}}'>{% trans "Source file" %}</a> {% elif import.archive_file %} - <a href='{{import.archive_file.url}}'>{% trans "Archive" %}</a> + <a href='{{import.archive_file.url}}'>{% trans "Archive" context "name" %}</a> {% endif %} </td> <td> diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index ef9f8ef79..0c8095257 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-09-09 16:11+0200\n" +"POT-Creation-Date: 2022-09-29 11:29+0200\n" "PO-Revision-Date: 2019-11-01 18:52+0000\n" "Last-Translator: Valérie-Emma Leroux <valerie-emma.leroux@iggdrasil.net>\n" "Language-Team: German <http://translate.iggdrasil.net/projects/ishtar/wip-" @@ -19,17 +19,6 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 3.9.1\n" -#: archaeological_context_records/admin.py:51 -#: archaeological_operations/admin.py:86 ishtar_common/forms_common.py:2905 -#: ishtar_common/models_common.py:2111 ishtar_common/models_common.py:3522 -msgid "Point" -msgstr "" - -#: archaeological_context_records/admin.py:53 archaeological_finds/admin.py:40 -#: archaeological_operations/admin.py:88 ishtar_common/models_common.py:3530 -msgid "Multi polygon" -msgstr "" - #: archaeological_context_records/forms.py:78 #: archaeological_context_records/forms.py:84 #: archaeological_context_records/models.py:527 @@ -48,12 +37,12 @@ msgstr "" #: archaeological_operations/models.py:2354 #: archaeological_operations/models.py:2470 #: archaeological_operations/models.py:2669 -#: archaeological_operations/models.py:2959 +#: archaeological_operations/models.py:2958 #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:254 #: archaeological_operations/wizards.py:266 -#: archaeological_warehouse/models.py:857 ishtar_common/forms_common.py:2133 -#: ishtar_common/models.py:5063 ishtar_common/views.py:396 +#: archaeological_warehouse/models.py:857 ishtar_common/forms_common.py:2136 +#: ishtar_common/models.py:5066 ishtar_common/views.py:397 msgid "Operation" msgstr "" @@ -98,7 +87,7 @@ msgid "Context record - 001 - Search" msgstr "" #: archaeological_context_records/forms.py:142 archaeological_files/forms.py:82 -#: archaeological_files/forms.py:883 archaeological_files/forms.py:920 +#: archaeological_files/forms.py:883 archaeological_files/forms.py:919 #: archaeological_finds/forms.py:1362 archaeological_finds/forms.py:2060 #: archaeological_finds/forms_treatments.py:52 #: archaeological_finds/forms_treatments.py:605 @@ -108,8 +97,8 @@ msgstr "" #: archaeological_operations/forms.py:1312 #: archaeological_operations/forms.py:1547 #: archaeological_warehouse/forms.py:140 archaeological_warehouse/forms.py:505 -#: ishtar_common/forms_common.py:581 ishtar_common/forms_common.py:758 -#: ishtar_common/forms_common.py:975 ishtar_common/forms_common.py:2050 +#: ishtar_common/forms_common.py:583 ishtar_common/forms_common.py:761 +#: ishtar_common/forms_common.py:978 ishtar_common/forms_common.py:2053 msgid "Full text search" msgstr "" @@ -124,7 +113,7 @@ msgid "ID" msgstr "" #: archaeological_context_records/forms.py:149 -#: archaeological_finds/forms.py:1382 archaeological_operations/forms.py:1866 +#: archaeological_finds/forms.py:1382 archaeological_operations/forms.py:1862 msgid "Code PATRIARCHE" msgstr "" @@ -135,7 +124,7 @@ msgid "Operation - name" msgstr "E-Mail-Adresse" #: archaeological_context_records/forms.py:152 -#: ishtar_common/forms_common.py:2144 +#: ishtar_common/forms_common.py:2147 #, fuzzy #| msgid "email address" msgid "Operation - year" @@ -150,7 +139,7 @@ msgstr "" #: archaeological_context_records/forms.py:737 #: archaeological_context_records/models.py:727 #: archaeological_operations/forms.py:550 -#: archaeological_operations/models.py:534 ishtar_common/models.py:5064 +#: archaeological_operations/models.py:534 ishtar_common/models.py:5067 msgid "Archaeological site" msgstr "" @@ -173,13 +162,13 @@ msgstr "" #: archaeological_context_records/models.py:705 #: archaeological_context_records/models.py:1416 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 -#: archaeological_files/forms.py:89 archaeological_files/forms.py:934 +#: archaeological_files/forms.py:89 archaeological_files/forms.py:932 #: archaeological_finds/models_finds.py:1097 #: archaeological_operations/forms.py:500 #: archaeological_operations/forms.py:1140 -#: archaeological_operations/forms.py:1563 -#: archaeological_operations/models.py:2983 -#: archaeological_operations/models.py:3230 +#: archaeological_operations/forms.py:1561 +#: archaeological_operations/models.py:2982 +#: archaeological_operations/models.py:3229 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Parcel" msgstr "" @@ -214,7 +203,7 @@ msgstr "" #: archaeological_files_pdl/forms.py:61 archaeological_operations/forms.py:756 #: archaeological_operations/forms.py:782 #: archaeological_operations/forms.py:1420 -#: archaeological_operations/forms.py:1618 +#: archaeological_operations/forms.py:1616 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:46 #: archaeological_operations/templates/ishtar/sheet_site.html:41 @@ -237,15 +226,15 @@ msgstr "" #: archaeological_finds/models_finds.py:1094 #: archaeological_operations/forms.py:71 archaeological_operations/forms.py:209 #: archaeological_operations/forms.py:1112 -#: archaeological_operations/models.py:2964 +#: archaeological_operations/models.py:2963 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:432 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:446 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:687 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:701 #: archaeological_warehouse/forms.py:145 ishtar_common/forms_common.py:84 -#: ishtar_common/forms_common.py:106 ishtar_common/models_common.py:2662 -#: ishtar_common/models_common.py:3500 +#: ishtar_common/forms_common.py:106 ishtar_common/models_common.py:2663 +#: ishtar_common/models_common.py:3517 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 msgid "Town" msgstr "" @@ -278,8 +267,8 @@ msgstr "" #: archaeological_finds/models_finds.py:1810 #: archaeological_finds/models_treatments.py:255 #: archaeological_finds/templates/ishtar/sheet_find.html:180 -#: ishtar_common/forms_common.py:1799 ishtar_common/forms_common.py:2067 -#: ishtar_common/models.py:1049 ishtar_common/models.py:4178 +#: ishtar_common/forms_common.py:1802 ishtar_common/forms_common.py:2070 +#: ishtar_common/models.py:1049 ishtar_common/models.py:4181 #: ishtar_common/models_imports.py:147 ishtar_common/models_imports.py:531 #: ishtar_common/models_imports.py:629 ishtar_common/models_imports.py:647 msgid "Description" @@ -356,7 +345,7 @@ msgid "Closing date" msgstr "" #: archaeological_context_records/forms.py:334 -#: ishtar_common/forms_common.py:1639 +#: ishtar_common/forms_common.py:1642 msgid "Documentation" msgstr "" @@ -373,59 +362,59 @@ msgstr "" #: archaeological_context_records/forms.py:346 #: archaeological_finds/forms.py:522 archaeological_operations/forms.py:1209 #: archaeological_operations/forms.py:1457 -#: archaeological_warehouse/forms.py:249 ishtar_common/forms_common.py:2904 +#: archaeological_warehouse/forms.py:249 ishtar_common/forms_common.py:2929 msgid "Coordinates" msgstr "" #: archaeological_context_records/forms.py:347 #: archaeological_finds/forms.py:523 archaeological_operations/forms.py:1210 #: archaeological_operations/forms.py:1458 -#: archaeological_warehouse/forms.py:250 ishtar_common/models_common.py:2169 -#: ishtar_common/models_common.py:3503 +#: archaeological_warehouse/forms.py:250 ishtar_common/models_common.py:2170 +#: ishtar_common/models_common.py:3520 msgid "X" msgstr "" #: archaeological_context_records/forms.py:349 #: archaeological_finds/forms.py:525 archaeological_operations/forms.py:1211 -#: archaeological_operations/forms.py:1459 ishtar_common/forms_common.py:2643 -#: ishtar_common/models_common.py:2178 ishtar_common/models_common.py:3507 +#: archaeological_operations/forms.py:1459 ishtar_common/forms_common.py:2645 +#: ishtar_common/models_common.py:2179 ishtar_common/models_common.py:3524 msgid "Estimated error for X" msgstr "" #: archaeological_context_records/forms.py:351 #: archaeological_finds/forms.py:527 archaeological_operations/forms.py:1213 #: archaeological_operations/forms.py:1461 -#: archaeological_warehouse/forms.py:251 ishtar_common/models_common.py:2170 -#: ishtar_common/models_common.py:3504 +#: archaeological_warehouse/forms.py:251 ishtar_common/models_common.py:2171 +#: ishtar_common/models_common.py:3521 msgid "Y" msgstr "" #: archaeological_context_records/forms.py:353 #: archaeological_finds/forms.py:529 archaeological_operations/forms.py:1214 -#: archaeological_operations/forms.py:1462 ishtar_common/forms_common.py:2647 -#: ishtar_common/models_common.py:2181 ishtar_common/models_common.py:3510 +#: archaeological_operations/forms.py:1462 ishtar_common/forms_common.py:2649 +#: ishtar_common/models_common.py:2182 ishtar_common/models_common.py:3527 msgid "Estimated error for Y" msgstr "" #: archaeological_context_records/forms.py:355 #: archaeological_finds/forms.py:531 archaeological_operations/forms.py:1216 -#: archaeological_operations/forms.py:1464 ishtar_common/models_common.py:2171 -#: ishtar_common/models_common.py:3505 +#: archaeological_operations/forms.py:1464 ishtar_common/models_common.py:2172 +#: ishtar_common/models_common.py:3522 msgid "Z" msgstr "" #: archaeological_context_records/forms.py:357 #: archaeological_finds/forms.py:533 archaeological_operations/forms.py:1217 -#: archaeological_operations/forms.py:1465 ishtar_common/forms_common.py:2651 -#: ishtar_common/models_common.py:2184 ishtar_common/models_common.py:3513 +#: archaeological_operations/forms.py:1465 ishtar_common/forms_common.py:2653 +#: ishtar_common/models_common.py:2185 ishtar_common/models_common.py:3530 msgid "Estimated error for Z" msgstr "" #: archaeological_context_records/forms.py:360 #: archaeological_finds/forms.py:536 archaeological_operations/forms.py:1220 #: archaeological_operations/forms.py:1468 -#: archaeological_warehouse/forms.py:253 ishtar_common/models_common.py:2188 -#: ishtar_common/models_common.py:3517 +#: archaeological_warehouse/forms.py:253 ishtar_common/models_common.py:2189 +#: ishtar_common/models_common.py:3534 msgid "Spatial Reference System" msgstr "" @@ -478,7 +467,7 @@ msgstr "" #: archaeological_operations/forms.py:858 #: archaeological_operations/models.py:103 #: archaeological_operations/models.py:1243 -#: archaeological_operations/models.py:3234 +#: archaeological_operations/models.py:3233 msgid "Start date" msgstr "" @@ -494,7 +483,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:464 #: archaeological_finds/templates/ishtar/sheet_find.html:502 #: archaeological_operations/models.py:104 -#: archaeological_operations/models.py:3235 +#: archaeological_operations/models.py:3234 #: ishtar_common/models_imports.py:1217 msgid "End date" msgstr "" @@ -536,8 +525,8 @@ msgstr "" #: archaeological_finds/models_finds.py:2404 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 #: archaeological_finds/wizards.py:93 archaeological_warehouse/forms.py:562 -#: ishtar_common/forms_common.py:2146 ishtar_common/models.py:5065 -#: ishtar_common/views.py:400 +#: ishtar_common/forms_common.py:2149 ishtar_common/models.py:5068 +#: ishtar_common/views.py:401 msgid "Context record" msgstr "" @@ -577,7 +566,7 @@ msgstr "" #: archaeological_finds/forms.py:277 archaeological_finds/forms.py:641 #: archaeological_finds/forms.py:817 #: archaeological_finds/templates/ishtar/sheet_find.html:158 -#: ishtar_common/forms_common.py:1852 +#: ishtar_common/forms_common.py:1855 #: ishtar_common/templates/ishtar/organization_person_form.html:9 #: ishtar_common/templates/ishtar/person_form.html:9 #: ishtar_common/templates/ishtar/sheet_document.html:34 @@ -626,8 +615,8 @@ msgstr "" #: archaeological_context_records/forms.py:666 #: archaeological_finds/forms.py:1070 archaeological_finds/forms.py:1095 -#: archaeological_operations/forms.py:1936 ishtar_common/forms_common.py:2307 -#: ishtar_common/models.py:3157 ishtar_common/models.py:3516 +#: archaeological_operations/forms.py:1932 ishtar_common/forms_common.py:2310 +#: ishtar_common/models.py:3160 ishtar_common/models.py:3519 msgid " - duplicate" msgstr "" @@ -808,8 +797,8 @@ msgstr "" #: archaeological_finds/models_finds.py:3334 #: archaeological_finds/models_treatments.py:734 #: archaeological_finds/templates/ishtar/sheet_find.html:4 -#: ishtar_common/forms_common.py:2162 ishtar_common/models.py:5066 -#: ishtar_common/views.py:404 +#: ishtar_common/forms_common.py:2165 ishtar_common/models.py:5069 +#: ishtar_common/views.py:405 msgid "Find" msgstr "" @@ -831,14 +820,14 @@ msgstr "" #: archaeological_operations/models.py:127 #: archaeological_operations/models.py:145 #: archaeological_operations/models.py:154 -#: archaeological_operations/models.py:3792 +#: archaeological_operations/models.py:3791 #: archaeological_warehouse/forms.py:108 archaeological_warehouse/models.py:695 #: archaeological_warehouse/models.py:727 ishtar_common/models.py:691 #: ishtar_common/models.py:746 ishtar_common/models.py:788 -#: ishtar_common/models.py:1732 ishtar_common/models.py:3525 -#: ishtar_common/models.py:4843 ishtar_common/models_common.py:2006 -#: ishtar_common/models_common.py:2039 ishtar_common/models_common.py:2055 -#: ishtar_common/models_common.py:2071 ishtar_common/models_common.py:2083 +#: ishtar_common/models.py:1732 ishtar_common/models.py:3528 +#: ishtar_common/models.py:4846 ishtar_common/models_common.py:2007 +#: ishtar_common/models_common.py:2040 ishtar_common/models_common.py:2056 +#: ishtar_common/models_common.py:2072 ishtar_common/models_common.py:2084 msgid "Order" msgstr "" @@ -957,12 +946,12 @@ msgstr "" #: archaeological_operations/models.py:349 #: archaeological_operations/models.py:1057 #: archaeological_operations/tests.py:2990 -#: archaeological_warehouse/models.py:316 +#: archaeological_warehouse/models.py:316 ishtar_common/models.py:2465 msgctxt "key for text search" msgid "town" msgstr "" -#: archaeological_context_records/models.py:578 ishtar_common/models.py:3929 +#: archaeological_context_records/models.py:578 ishtar_common/models.py:3932 msgctxt "key for text search" msgid "operation-year" msgstr "" @@ -993,8 +982,8 @@ msgstr "" #: archaeological_finds/models_finds.py:1354 #: archaeological_finds/models_finds.py:1726 #: archaeological_operations/models.py:384 -#: archaeological_operations/models.py:409 ishtar_common/models.py:3921 -#: ishtar_common/models.py:4026 +#: archaeological_operations/models.py:409 ishtar_common/models.py:3924 +#: ishtar_common/models.py:4029 msgctxt "key for text search" msgid "operation" msgstr "" @@ -1004,8 +993,8 @@ msgstr "" #: archaeological_finds/models_finds.py:1269 #: archaeological_operations/models.py:1141 #: archaeological_operations/models.py:1205 -#: archaeological_warehouse/models.py:937 ishtar_common/models.py:3957 -#: ishtar_common/models.py:4035 +#: archaeological_warehouse/models.py:937 ishtar_common/models.py:3960 +#: ishtar_common/models.py:4038 msgctxt "key for text search" msgid "site" msgstr "" @@ -1070,8 +1059,8 @@ msgstr "" #: archaeological_operations/models.py:435 #: archaeological_operations/models.py:1181 #: archaeological_warehouse/models.py:327 -#: archaeological_warehouse/models.py:1049 ishtar_common/models.py:2465 -#: ishtar_common/models.py:2731 ishtar_common/models.py:4052 +#: archaeological_warehouse/models.py:1049 ishtar_common/models.py:2472 +#: ishtar_common/models.py:2734 ishtar_common/models.py:4055 msgid "Bulk update" msgstr "" @@ -1090,10 +1079,10 @@ msgstr "" #: archaeological_operations/views.py:848 #: archaeological_operations/views.py:863 #: archaeological_operations/views.py:870 -#: archaeological_operations/views.py:887 ishtar_common/admin.py:1450 -#: ishtar_common/admin.py:1570 ishtar_common/models.py:4061 -#: ishtar_common/models.py:4405 ishtar_common/views.py:2636 -#: ishtar_common/views.py:2654 +#: archaeological_operations/views.py:887 ishtar_common/admin.py:1455 +#: ishtar_common/admin.py:1575 ishtar_common/models.py:4064 +#: ishtar_common/models.py:4408 ishtar_common/views.py:2637 +#: ishtar_common/views.py:2655 msgid "Duplicate" msgstr "" @@ -1102,23 +1091,23 @@ msgstr "" #: archaeological_finds/models_finds.py:1799 #: archaeological_finds/models_treatments.py:252 #: archaeological_finds/models_treatments.py:1100 -#: archaeological_operations/models.py:2972 +#: archaeological_operations/models.py:2971 #: archaeological_warehouse/models.py:388 -#: archaeological_warehouse/models.py:1133 ishtar_common/models.py:4087 +#: archaeological_warehouse/models.py:1133 ishtar_common/models.py:4090 msgid "External ID" msgstr "" #: archaeological_context_records/models.py:701 #: archaeological_files/models.py:533 archaeological_finds/models_finds.py:406 #: archaeological_finds/models_finds.py:1801 -#: archaeological_operations/models.py:2975 +#: archaeological_operations/models.py:2974 #: archaeological_warehouse/models.py:390 #: archaeological_warehouse/models.py:1135 msgid "External ID is set automatically" msgstr "" #: archaeological_context_records/models.py:746 -#: archaeological_operations/models.py:1296 ishtar_common/models_common.py:2632 +#: archaeological_operations/models.py:1296 ishtar_common/models_common.py:2633 msgid "Surface (m2)" msgstr "" @@ -1159,7 +1148,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 #: archaeological_operations/models.py:495 #: archaeological_operations/models.py:1370 -#: archaeological_operations/models.py:2719 +#: archaeological_operations/models.py:2718 #: archaeological_operations/templates/ishtar/sheet_operation.html:63 #: archaeological_operations/templates/ishtar/sheet_site.html:97 #: archaeological_warehouse/models.py:377 @@ -1167,7 +1156,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:46 #: archaeological_warehouse/templates/ishtar/sheet_container.html:179 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:42 -#: ishtar_common/models.py:4203 +#: ishtar_common/models.py:4206 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_person.html:161 msgid "Documents" @@ -1179,7 +1168,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1157 #: archaeological_operations/models.py:501 #: archaeological_operations/models.py:1376 -#: archaeological_operations/models.py:2726 +#: archaeological_operations/models.py:2725 #: archaeological_warehouse/models.py:384 #: archaeological_warehouse/models.py:1147 msgid "Main image" @@ -1191,9 +1180,9 @@ msgstr "" #: archaeological_finds/models_treatments.py:1169 #: archaeological_operations/models.py:506 #: archaeological_operations/models.py:1381 -#: archaeological_operations/models.py:2979 ishtar_common/models.py:2489 -#: ishtar_common/models.py:2780 ishtar_common/models.py:3552 -#: ishtar_common/models_common.py:2657 ishtar_common/models_common.py:2680 +#: archaeological_operations/models.py:2978 ishtar_common/models.py:2496 +#: ishtar_common/models.py:2783 ishtar_common/models.py:3555 +#: ishtar_common/models_common.py:2658 ishtar_common/models_common.py:2681 msgid "Cached name" msgstr "" @@ -1362,7 +1351,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:174 #: archaeological_warehouse/templates/ishtar/sheet_container.html:221 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:177 -#: ishtar_common/views.py:1005 ishtar_common/views.py:1077 +#: ishtar_common/views.py:1006 ishtar_common/views.py:1078 msgid "Finds" msgstr "" @@ -1386,7 +1375,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:27 #: archaeological_warehouse/templates/ishtar/sheet_container.html:70 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:63 -#: ishtar_common/models_common.py:3708 +#: ishtar_common/models_common.py:3725 #: ishtar_common/templates/ishtar/sheet_document.html:37 msgid "Complete identifier" msgstr "" @@ -1408,7 +1397,7 @@ msgstr "" #: archaeological_warehouse/models.py:1105 #: archaeological_warehouse/templates/ishtar/sheet_container.html:152 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:102 -#: ishtar_common/models_common.py:2634 +#: ishtar_common/models_common.py:2635 msgid "Localisation" msgstr "" @@ -1419,7 +1408,6 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:219 #: archaeological_operations/templates/ishtar/sheet_operation.html:270 #: ishtar_common/templates/ishtar/blocks/window_image.html:5 -#: sra_idf_app/templates/ishtar/sheet_basefind.html:48 msgid "Sheet" msgstr "" @@ -1455,9 +1443,9 @@ 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:176 -#: ishtar_common/models.py:3232 ishtar_common/models.py:4961 -#: ishtar_common/models.py:5094 ishtar_common/models.py:5172 -#: ishtar_common/models_common.py:1936 ishtar_common/models_common.py:1951 +#: ishtar_common/models.py:3235 ishtar_common/models.py:4964 +#: ishtar_common/models.py:5097 ishtar_common/models.py:5175 +#: ishtar_common/models_common.py:1937 ishtar_common/models_common.py:1952 #: ishtar_common/models_imports.py:1206 msgid "State" msgstr "" @@ -1558,7 +1546,7 @@ msgstr "" #: archaeological_files/forms.py:85 archaeological_files/forms.py:268 #: archaeological_files/forms.py:329 archaeological_files/forms.py:890 -#: archaeological_files/forms.py:927 archaeological_files/models.py:380 +#: archaeological_files/forms.py:926 archaeological_files/models.py:380 #: archaeological_files/models.py:522 #: archaeological_files/templates/ishtar/sheet_file.html:217 #: archaeological_files_pdl/forms.py:67 archaeological_files_pdl/forms.py:457 @@ -1576,12 +1564,12 @@ msgstr "" #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:490 #: archaeological_operations/forms.py:803 #: archaeological_operations/forms.py:1551 -#: archaeological_operations/forms.py:1868 +#: archaeological_operations/forms.py:1864 #: archaeological_operations/models.py:909 #: archaeological_operations/models.py:1280 #: archaeological_operations/models.py:2468 #: archaeological_operations/models.py:2697 -#: archaeological_operations/models.py:2962 +#: archaeological_operations/models.py:2961 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 #: ishtar_common/models_imports.py:937 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:196 @@ -1596,29 +1584,33 @@ msgid "Numeric reference" msgstr "" #: archaeological_files/forms.py:87 archaeological_files/forms.py:279 +#: archaeological_files/forms.py:892 archaeological_files/forms.py:928 #: archaeological_operations/forms.py:1197 #: archaeological_operations/forms.py:1317 #: archaeological_operations/forms.py:1432 +#: archaeological_operations/forms.py:1553 +#: archaeological_operations/forms.py:1630 #: archaeological_operations/models.py:454 +#: archaeological_operations/models.py:2700 msgid "Other reference" msgstr "" -#: archaeological_files/forms.py:92 archaeological_files/forms.py:899 -#: archaeological_files/forms.py:937 archaeological_files/models.py:1330 +#: archaeological_files/forms.py:92 archaeological_files/forms.py:898 +#: archaeological_files/forms.py:935 archaeological_files/models.py:1330 #: archaeological_operations/forms.py:503 -#: archaeological_operations/forms.py:1566 +#: archaeological_operations/forms.py:1564 #: archaeological_operations/models.py:2340 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:390 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:411 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:643 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:664 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:666 -#: ishtar_common/models_common.py:1959 ishtar_common/models_common.py:2640 +#: ishtar_common/models_common.py:1960 ishtar_common/models_common.py:2641 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" -#: archaeological_files/forms.py:94 archaeological_files/forms.py:947 +#: archaeological_files/forms.py:94 archaeological_files/forms.py:945 msgid "File name" msgstr "" @@ -1665,19 +1657,19 @@ msgstr "" #: archaeological_operations/forms.py:817 #: archaeological_operations/forms.py:1325 #: archaeological_operations/forms.py:1446 -#: archaeological_operations/forms.py:1569 -#: archaeological_operations/forms.py:1631 +#: archaeological_operations/forms.py:1567 +#: archaeological_operations/forms.py:1629 #: archaeological_operations/models.py:466 #: archaeological_operations/models.py:1365 -#: archaeological_operations/models.py:2715 +#: archaeological_operations/models.py:2714 #: archaeological_warehouse/forms.py:226 archaeological_warehouse/forms.py:381 #: archaeological_warehouse/forms.py:513 archaeological_warehouse/models.py:367 -#: archaeological_warehouse/models.py:1103 ishtar_common/forms_common.py:1797 -#: ishtar_common/forms_common.py:2102 ishtar_common/forms_common.py:2641 -#: ishtar_common/models.py:2769 ishtar_common/models.py:3409 -#: ishtar_common/models.py:4187 ishtar_common/models_common.py:180 -#: ishtar_common/models_common.py:2168 ishtar_common/models_imports.py:709 -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:12 +#: archaeological_warehouse/models.py:1103 ishtar_common/forms_common.py:1800 +#: ishtar_common/forms_common.py:2105 ishtar_common/forms_common.py:2643 +#: ishtar_common/models.py:2772 ishtar_common/models.py:3412 +#: ishtar_common/models.py:4190 ishtar_common/models_common.py:181 +#: ishtar_common/models_common.py:2169 ishtar_common/models_imports.py:709 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:13 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:170 msgid "Comment" msgstr "" @@ -1690,26 +1682,26 @@ msgid "In charge" msgstr "" #: archaeological_files/forms.py:112 archaeological_files/forms.py:364 -#: archaeological_files/forms.py:949 archaeological_files/models.py:548 +#: archaeological_files/forms.py:947 archaeological_files/models.py:548 #: archaeological_files_pdl/forms.py:285 archaeological_files_pdl/forms.py:295 msgid "General contractor" msgstr "" -#: archaeological_files/forms.py:122 archaeological_files/forms.py:959 +#: archaeological_files/forms.py:122 archaeological_files/forms.py:957 msgid "Organization of general contractor" msgstr "" -#: archaeological_files/forms.py:133 archaeological_files/forms.py:990 +#: archaeological_files/forms.py:133 archaeological_files/forms.py:988 #: archaeological_operations/forms.py:556 -#: archaeological_operations/forms.py:1571 ishtar_common/forms.py:926 +#: archaeological_operations/forms.py:1569 ishtar_common/forms.py:926 msgid "Created by" msgstr "" -#: archaeological_files/forms.py:141 archaeological_files/forms.py:998 +#: archaeological_files/forms.py:141 archaeological_files/forms.py:996 #: archaeological_finds/forms_treatments.py:629 #: archaeological_finds/forms_treatments.py:954 #: archaeological_operations/forms.py:562 -#: archaeological_operations/forms.py:1577 +#: archaeological_operations/forms.py:1575 msgid "Modified by" msgstr "" @@ -1722,8 +1714,8 @@ msgstr "" #: archaeological_finds/forms_treatments.py:877 #: archaeological_finds/models_treatments.py:1134 #: archaeological_operations/forms.py:678 -#: archaeological_operations/models.py:1241 ishtar_common/forms_common.py:1792 -#: ishtar_common/forms_common.py:2268 ishtar_common/models.py:4172 +#: archaeological_operations/models.py:1241 ishtar_common/forms_common.py:1795 +#: ishtar_common/forms_common.py:2271 ishtar_common/models.py:4175 #: ishtar_common/models_imports.py:1214 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 msgid "Creation date" @@ -1786,30 +1778,34 @@ msgstr "" #: archaeological_operations/forms.py:1196 #: archaeological_operations/forms.py:1316 #: archaeological_operations/forms.py:1431 -#: archaeological_operations/forms.py:1924 +#: archaeological_operations/forms.py:1920 #: archaeological_operations/models.py:455 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:154 #: archaeological_warehouse/forms.py:143 archaeological_warehouse/forms.py:203 -#: archaeological_warehouse/models.py:347 ishtar_common/forms_common.py:525 -#: ishtar_common/forms_common.py:584 ishtar_common/forms_common.py:761 -#: ishtar_common/forms_common.py:888 ishtar_common/forms_common.py:979 -#: ishtar_common/forms_common.py:1231 ishtar_common/forms_common.py:1284 -#: ishtar_common/forms_common.py:2610 ishtar_common/models.py:690 +#: archaeological_warehouse/models.py:347 ishtar_common/forms_common.py:527 +#: ishtar_common/forms_common.py:586 ishtar_common/forms_common.py:764 +#: ishtar_common/forms_common.py:891 ishtar_common/forms_common.py:982 +#: ishtar_common/forms_common.py:1234 ishtar_common/forms_common.py:1287 +#: ishtar_common/forms_common.py:2613 ishtar_common/models.py:690 #: ishtar_common/models.py:729 ishtar_common/models.py:1043 #: ishtar_common/models.py:1552 ishtar_common/models.py:1940 -#: ishtar_common/models.py:2475 ishtar_common/models.py:2764 -#: ishtar_common/models.py:3090 ishtar_common/models.py:3226 -#: ishtar_common/models.py:4937 ishtar_common/models_common.py:2136 -#: ishtar_common/models_common.py:2631 ishtar_common/models_common.py:2680 +#: ishtar_common/models.py:2482 ishtar_common/models.py:2767 +#: ishtar_common/models.py:3093 ishtar_common/models.py:3229 +#: ishtar_common/models.py:4940 ishtar_common/models_common.py:2137 +#: ishtar_common/models_common.py:2632 ishtar_common/models_common.py:2681 #: ishtar_common/models_imports.py:110 ishtar_common/models_imports.py:144 #: ishtar_common/models_imports.py:628 ishtar_common/models_imports.py:645 #: ishtar_common/models_imports.py:765 ishtar_common/models_imports.py:1126 #: ishtar_common/models_rest.py:94 -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:9 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:10 #: ishtar_common/templates/ishtar/import_step_by_step.html:102 #: ishtar_common/templates/ishtar/import_step_by_step.html:270 #: ishtar_common/templates/ishtar/import_table.html:27 +#: ishtar_common/templates/ishtar/merge_organization.html:9 +#: ishtar_common/templates/ishtar/merge_organization.html:20 +#: ishtar_common/templates/ishtar/merge_person.html:10 +#: ishtar_common/templates/ishtar/merge_person.html:22 #: ishtar_common/templates/ishtar/sheet_organization.html:25 #: ishtar_common/templates/ishtar/sheet_organization.html:53 msgid "Name" @@ -1841,7 +1837,7 @@ msgstr "" #: archaeological_operations/forms.py:1137 #: archaeological_operations/forms.py:1153 #: archaeological_operations/forms.py:1159 -#: archaeological_operations/models.py:2984 +#: archaeological_operations/models.py:2983 #: archaeological_operations/templates/ishtar/sheet_operation.html:494 msgid "Parcels" msgstr "" @@ -1875,7 +1871,7 @@ msgstr "" #: archaeological_files/forms.py:439 archaeological_files/models.py:641 #: archaeological_files_pdl/forms.py:128 archaeological_files_pdl/forms.py:171 -#: archaeological_operations/models.py:2704 ishtar_common/models_common.py:1960 +#: archaeological_operations/models.py:2703 ishtar_common/models_common.py:1961 msgid "Departments" msgstr "" @@ -1918,7 +1914,7 @@ msgstr "" msgid "Preventive file - 020 - Edition form" msgstr "" -#: archaeological_files/forms.py:519 ishtar_common/forms_common.py:1856 +#: archaeological_files/forms.py:519 ishtar_common/forms_common.py:1859 #: ishtar_common/templates/ishtar/sheet_document.html:76 msgid "Dates" msgstr "" @@ -2016,8 +2012,8 @@ msgstr "" msgid "Equipment / service" msgstr "" -#: archaeological_files/forms.py:891 archaeological_files/forms.py:928 -#: archaeological_files/forms.py:1064 +#: archaeological_files/forms.py:891 archaeological_files/forms.py:927 +#: archaeological_files/forms.py:1062 #: archaeological_finds/forms_treatments.py:59 #: archaeological_finds/forms_treatments.py:348 #: archaeological_finds/forms_treatments.py:610 @@ -2030,79 +2026,79 @@ msgstr "" #: archaeological_finds/models_treatments.py:1095 #: archaeological_finds/templates/ishtar/sheet_find.html:364 #: archaeological_operations/forms.py:1552 -#: archaeological_operations/forms.py:1689 -#: archaeological_operations/models.py:2639 ishtar_common/models.py:4086 +#: archaeological_operations/forms.py:1685 +#: archaeological_operations/models.py:2639 ishtar_common/models.py:4089 msgid "Index" msgstr "" -#: archaeological_files/forms.py:894 archaeological_files/forms.py:931 -#: archaeological_files/forms.py:1053 +#: archaeological_files/forms.py:893 archaeological_files/forms.py:929 +#: archaeological_files/forms.py:1051 #: archaeological_finds/forms_treatments.py:611 #: archaeological_finds/forms_treatments.py:661 #: archaeological_finds/forms_treatments.py:932 #: archaeological_finds/forms_treatments.py:987 -#: archaeological_operations/forms.py:1560 -#: archaeological_operations/forms.py:1621 +#: archaeological_operations/forms.py:1558 +#: archaeological_operations/forms.py:1619 #: archaeological_operations/models.py:2370 #: archaeological_operations/models.py:2629 msgid "Act type" msgstr "" -#: archaeological_files/forms.py:895 +#: archaeological_files/forms.py:894 msgid "Object (full text search)" msgstr "" -#: archaeological_files/forms.py:932 +#: archaeological_files/forms.py:930 #: archaeological_finds/forms_treatments.py:612 #: archaeological_finds/forms_treatments.py:933 -#: archaeological_operations/forms.py:1561 -#: archaeological_operations/forms.py:1759 +#: archaeological_operations/forms.py:1559 +#: archaeological_operations/forms.py:1755 msgid "Indexed?" msgstr "" -#: archaeological_files/forms.py:939 +#: archaeological_files/forms.py:937 #: archaeological_finds/forms_treatments.py:613 #: archaeological_finds/forms_treatments.py:934 -#: archaeological_operations/forms.py:1567 -#: archaeological_operations/forms.py:1628 +#: archaeological_operations/forms.py:1565 +#: archaeological_operations/forms.py:1626 #: archaeological_operations/models.py:2698 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" -#: archaeological_files/forms.py:942 +#: archaeological_files/forms.py:940 #: archaeological_finds/forms_treatments.py:619 #: archaeological_finds/forms_treatments.py:940 msgid "Signature date before" msgstr "" -#: archaeological_files/forms.py:945 +#: archaeological_files/forms.py:943 #: archaeological_finds/forms_treatments.py:617 #: archaeological_finds/forms_treatments.py:938 msgid "Signature date after" msgstr "" -#: archaeological_files/forms.py:970 +#: archaeological_files/forms.py:968 msgid "File numeric reference" msgstr "" -#: archaeological_files/forms.py:972 +#: archaeological_files/forms.py:970 msgid "File year" msgstr "" -#: archaeological_files/forms.py:974 +#: archaeological_files/forms.py:972 msgid "File other reference" msgstr "" -#: archaeological_files/forms.py:977 +#: archaeological_files/forms.py:975 msgid "File in charge" msgstr "" -#: archaeological_files/forms.py:987 +#: archaeological_files/forms.py:985 msgid "File permit reference" msgstr "" -#: archaeological_files/forms.py:1051 +#: archaeological_files/forms.py:1049 msgid "Archaeological file - Administrative act - General" msgstr "" @@ -2115,7 +2111,7 @@ msgstr "" #: archaeological_operations/models.py:2353 #: archaeological_operations/models.py:2469 #: archaeological_operations/models.py:2677 -#: archaeological_operations/wizards.py:85 ishtar_common/views.py:395 +#: archaeological_operations/wizards.py:85 ishtar_common/views.py:396 msgid "Archaeological file" msgstr "" @@ -2129,7 +2125,7 @@ msgstr "" #: archaeological_finds/ishtar_menu.py:226 #: archaeological_finds/models_finds.py:3337 #: archaeological_operations/ishtar_menu.py:70 -#: archaeological_operations/models.py:2735 +#: archaeological_operations/models.py:2734 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "" @@ -2217,12 +2213,12 @@ msgstr "" msgid "Equipment/Service" msgstr "" -#: archaeological_files/models.py:208 ishtar_common/models_common.py:171 -#: ishtar_common/models_common.py:202 +#: archaeological_files/models.py:208 ishtar_common/models_common.py:172 +#: ishtar_common/models_common.py:203 msgid "Textual ID" msgstr "" -#: archaeological_files/models.py:212 ishtar_common/models_common.py:175 +#: archaeological_files/models.py:212 ishtar_common/models_common.py:176 msgid "" "The slug is the standardized version of the name. It contains only lowercase " "letters, numbers and hyphens. Each slug must be unique." @@ -2253,15 +2249,15 @@ msgid "Default quantity by day" msgstr "" #: archaeological_files/models.py:231 ishtar_common/models.py:1554 -#: ishtar_common/models.py:1970 ishtar_common/models.py:3420 -#: ishtar_common/models_common.py:181 ishtar_common/models_imports.py:184 +#: ishtar_common/models.py:1970 ishtar_common/models.py:3423 +#: ishtar_common/models_common.py:182 ishtar_common/models_imports.py:184 #: ishtar_common/models_imports.py:770 msgid "Available" msgstr "" #: archaeological_files/models.py:237 archaeological_warehouse/forms.py:753 -#: ishtar_common/admin.py:1020 ishtar_common/models.py:2275 -#: ishtar_common/models_common.py:713 +#: ishtar_common/admin.py:1025 ishtar_common/models.py:2275 +#: ishtar_common/models_common.py:714 msgid "Parent" msgstr "" @@ -2331,7 +2327,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:415 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:520 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:537 -#: ishtar_common/admin.py:1189 +#: ishtar_common/admin.py:1194 msgid "Area" msgstr "" @@ -2353,8 +2349,8 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:544 #: archaeological_operations/templates/ishtar/sheet_operation.html:554 #: archaeological_operations/templates/ishtar/sheet_operation.html:571 -#: ishtar_common/models.py:1854 ishtar_common/models_common.py:746 -#: ishtar_common/models_common.py:1932 ishtar_common/models_common.py:1948 +#: ishtar_common/models.py:1854 ishtar_common/models_common.py:747 +#: ishtar_common/models_common.py:1933 ishtar_common/models_common.py:1949 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:211 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail_users.html:5 #: ishtar_common/templates/ishtar/sheet_person.html:30 @@ -2381,11 +2377,11 @@ msgstr "" #: archaeological_operations/models.py:995 #: archaeological_operations/models.py:997 #: archaeological_operations/models.py:1301 -#: archaeological_operations/models.py:2710 +#: archaeological_operations/models.py:2709 #: archaeological_operations/templates/ishtar/sheet_operation.html:147 -#: ishtar_common/forms_common.py:1444 ishtar_common/forms_common.py:1457 -#: ishtar_common/forms_common.py:1458 ishtar_common/models.py:2268 -#: ishtar_common/models_common.py:2663 +#: ishtar_common/forms_common.py:1447 ishtar_common/forms_common.py:1460 +#: ishtar_common/forms_common.py:1461 ishtar_common/models.py:2268 +#: ishtar_common/models_common.py:2664 msgid "Towns" msgstr "" @@ -2403,7 +2399,7 @@ msgstr "" #: archaeological_files/models.py:457 #: archaeological_finds/models_treatments.py:1046 #: archaeological_operations/models.py:333 -#: archaeological_warehouse/models.py:913 ishtar_common/models.py:3851 +#: archaeological_warehouse/models.py:913 ishtar_common/models.py:3854 msgctxt "key for text search" msgid "reference" msgstr "" @@ -2425,8 +2421,8 @@ msgstr "" #: archaeological_operations/models.py:336 #: archaeological_operations/models.py:1071 #: archaeological_operations/tests.py:3099 -#: archaeological_warehouse/models.py:309 ishtar_common/models.py:2455 -#: ishtar_common/models.py:2707 ishtar_common/models.py:3281 +#: archaeological_warehouse/models.py:309 ishtar_common/models.py:2458 +#: ishtar_common/models.py:2710 ishtar_common/models.py:3284 msgctxt "key for text search" msgid "name" msgstr "" @@ -2438,9 +2434,9 @@ msgstr "" #: archaeological_operations/models.py:2504 #: archaeological_operations/tests.py:3112 #: archaeological_warehouse/models.py:312 -#: archaeological_warehouse/models.py:909 ishtar_common/models.py:2458 -#: ishtar_common/models.py:2716 ishtar_common/models.py:3292 -#: ishtar_common/models.py:3847 +#: archaeological_warehouse/models.py:909 ishtar_common/models.py:2461 +#: ishtar_common/models.py:2719 ishtar_common/models.py:3295 +#: ishtar_common/models.py:3850 msgctxt "key for text search" msgid "type" msgstr "" @@ -2469,7 +2465,7 @@ msgstr "" #: archaeological_operations/models.py:355 #: archaeological_operations/models.py:1119 #: archaeological_operations/models.py:2614 -#: archaeological_warehouse/models.py:920 ishtar_common/models.py:3911 +#: archaeological_warehouse/models.py:920 ishtar_common/models.py:3914 msgctxt "key for text search" msgid "comment" msgstr "" @@ -2493,7 +2489,7 @@ msgstr "" #: archaeological_files/models.py:527 #: archaeological_finds/models_treatments.py:1097 -#: ishtar_common/forms_common.py:1784 ishtar_common/forms_common.py:2066 +#: ishtar_common/forms_common.py:1787 ishtar_common/forms_common.py:2069 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" msgstr "" @@ -2543,10 +2539,12 @@ msgstr "" #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:555 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:590 #: archaeological_warehouse/forms.py:206 archaeological_warehouse/models.py:364 -#: ishtar_common/forms_common.py:520 ishtar_common/forms_common.py:766 -#: ishtar_common/forms_common.py:828 ishtar_common/forms_common.py:984 -#: ishtar_common/ishtar_menu.py:119 ishtar_common/models.py:2495 -#: ishtar_common/models.py:2702 ishtar_common/models.py:3270 +#: ishtar_common/forms_common.py:522 ishtar_common/forms_common.py:769 +#: ishtar_common/forms_common.py:831 ishtar_common/forms_common.py:987 +#: ishtar_common/ishtar_menu.py:119 ishtar_common/models.py:2502 +#: ishtar_common/models.py:2705 ishtar_common/models.py:3273 +#: ishtar_common/templates/ishtar/merge_person.html:11 +#: ishtar_common/templates/ishtar/merge_person.html:23 #: ishtar_common/templates/ishtar/sheet_organization.html:4 msgid "Organization" msgstr "" @@ -2573,7 +2571,7 @@ msgstr "" #: archaeological_files/models.py:749 #: archaeological_files/templates/ishtar/dashboards/dashboard_file.html:7 -#: ishtar_common/views.py:1000 ishtar_common/views.py:1061 +#: ishtar_common/views.py:1001 ishtar_common/views.py:1062 msgid "Archaeological files" msgstr "" @@ -2627,7 +2625,7 @@ msgid "operation" msgstr "" #: archaeological_files/models.py:1327 archaeological_operations/models.py:1285 -#: archaeological_operations/models.py:2949 +#: archaeological_operations/models.py:2948 msgid "File" msgstr "" @@ -2800,7 +2798,7 @@ msgid "Back to the file" msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:29 -#: archaeological_operations/forms.py:682 ishtar_common/models.py:4901 +#: archaeological_operations/forms.py:682 ishtar_common/models.py:4904 msgid "Preventive" msgstr "" @@ -2825,7 +2823,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 #: archaeological_finds/templates/ishtar/sheet_treatment.html:133 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:83 -#: archaeological_operations/models.py:2736 +#: archaeological_operations/models.py:2735 #: archaeological_operations/templates/ishtar/sheet_operation.html:351 #: archaeological_operations/templates/ishtar/sheet_operation.html:488 msgid "Administrative acts" @@ -2839,11 +2837,11 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_files/templates/ishtar/sheet_file.html:218 #: archaeological_operations/models.py:2467 -#: archaeological_operations/models.py:2771 +#: archaeological_operations/models.py:2770 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 #: archaeological_warehouse/forms.py:339 archaeological_warehouse/forms.py:511 -#: archaeological_warehouse/models.py:694 ishtar_common/models.py:4088 +#: archaeological_warehouse/models.py:694 ishtar_common/models.py:4091 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:34 msgid "Ref." msgstr "" @@ -2861,18 +2859,20 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:507 #: archaeological_operations/templates/ishtar/sheet_operation.html:571 #: archaeological_warehouse/models.py:298 -#: archaeological_warehouse/models.py:888 ishtar_common/forms_common.py:585 -#: ishtar_common/forms_common.py:764 ishtar_common/forms_common.py:982 -#: ishtar_common/forms_common.py:1229 ishtar_common/forms_common.py:1658 -#: ishtar_common/forms_common.py:2064 ishtar_common/forms_common.py:2291 -#: ishtar_common/forms_common.py:2913 ishtar_common/models.py:744 -#: ishtar_common/models.py:2477 ishtar_common/models.py:3810 -#: ishtar_common/models.py:4092 ishtar_common/models_imports.py:150 +#: archaeological_warehouse/models.py:888 ishtar_common/forms_common.py:587 +#: ishtar_common/forms_common.py:767 ishtar_common/forms_common.py:985 +#: ishtar_common/forms_common.py:1232 ishtar_common/forms_common.py:1661 +#: ishtar_common/forms_common.py:2067 ishtar_common/forms_common.py:2294 +#: ishtar_common/forms_common.py:2938 ishtar_common/models.py:744 +#: ishtar_common/models.py:2484 ishtar_common/models.py:3813 +#: ishtar_common/models.py:4095 ishtar_common/models_imports.py:150 #: ishtar_common/models_imports.py:936 #: 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 #: ishtar_common/templates/ishtar/import_table.html:28 +#: ishtar_common/templates/ishtar/merge_organization.html:10 +#: ishtar_common/templates/ishtar/merge_organization.html:21 #: ishtar_common/templates/ishtar/sheet_organization.html:27 #: ishtar_common/templates/ishtar/sheet_organization.html:54 msgid "Type" @@ -2918,7 +2918,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:283 #: archaeological_files/templates/ishtar/sheet_file.html:335 #: archaeological_files/templates/ishtar/sheet_file.html:387 -#: archaeological_operations/models.py:3289 +#: archaeological_operations/models.py:3288 msgid "Effective" msgstr "" @@ -3024,16 +3024,16 @@ msgid "Number/street" msgstr "" #: archaeological_files_pdl/forms.py:138 archaeological_files_pdl/forms.py:179 -#: archaeological_warehouse/forms.py:241 ishtar_common/forms_common.py:538 -#: ishtar_common/forms_common.py:920 ishtar_common/models_common.py:2847 +#: archaeological_warehouse/forms.py:241 ishtar_common/forms_common.py:540 +#: ishtar_common/forms_common.py:923 ishtar_common/models_common.py:2851 msgid "Postal code" msgstr "" #: archaeological_files_pdl/forms.py:161 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:10 #: archaeological_warehouse/forms.py:228 archaeological_warehouse/forms.py:237 -#: ishtar_common/forms_common.py:534 ishtar_common/forms_common.py:916 -#: ishtar_common/models_common.py:2842 +#: ishtar_common/forms_common.py:536 ishtar_common/forms_common.py:919 +#: ishtar_common/models_common.py:2846 ishtar_common/models_common.py:3001 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 msgid "Address" msgstr "" @@ -3126,17 +3126,6 @@ msgstr "" msgid ": delay of {} days" msgstr "" -#: archaeological_finds/admin.py:36 ishtar_common/models_common.py:2193 -#: ishtar_common/models_common.py:3523 -msgid "Point (2D)" -msgstr "" - -#: archaeological_finds/admin.py:38 archaeological_finds/models_finds.py:439 -#: ishtar_common/templates/blocks/DataTables-stats.html:25 -#: ishtar_common/templates/ishtar/import_step_by_step.html:46 -msgid "Line" -msgstr "" - #: archaeological_finds/forms.py:178 msgid "Find - 010 - Context record choice" msgstr "" @@ -3374,7 +3363,6 @@ msgstr "" #: archaeological_finds/forms.py:516 archaeological_finds/models_finds.py:424 #: archaeological_finds/templates/ishtar/sheet_basefind.html:33 -#: sra_idf_app/templates/ishtar/sheet_basefind.html:33 msgid "Discovery date (TAQ)" msgstr "" @@ -3517,11 +3505,11 @@ msgstr "" msgid "Find - Quick action - Modify single" msgstr "" -#: archaeological_finds/forms.py:995 ishtar_common/forms_common.py:2509 +#: archaeological_finds/forms.py:995 ishtar_common/forms_common.py:2512 msgid "Create" msgstr "" -#: archaeological_finds/forms.py:995 ishtar_common/forms_common.py:2509 +#: archaeological_finds/forms.py:995 ishtar_common/forms_common.py:2512 #: ishtar_common/templates/ishtar/forms/search_query.html:60 msgid "Update" msgstr "" @@ -3551,7 +3539,7 @@ msgstr "" #: archaeological_finds/forms.py:1122 archaeological_finds/forms.py:2109 #: ishtar_common/models.py:1044 ishtar_common/models.py:1941 -#: ishtar_common/models.py:3410 ishtar_common/models_imports.py:145 +#: ishtar_common/models.py:3413 ishtar_common/models_imports.py:145 #: ishtar_common/models_imports.py:646 msgid "Slug" msgstr "" @@ -3561,12 +3549,12 @@ msgid "Is public" msgstr "" #: archaeological_finds/forms.py:1128 archaeological_finds/forms.py:2115 -#: archaeological_finds/forms.py:2157 ishtar_common/models.py:3423 +#: archaeological_finds/forms.py:2157 ishtar_common/models.py:3426 msgid "Shared (read) with" msgstr "" #: archaeological_finds/forms.py:1135 archaeological_finds/forms.py:2122 -#: archaeological_finds/forms.py:2164 ishtar_common/models.py:3429 +#: archaeological_finds/forms.py:2164 ishtar_common/models.py:3432 msgid "Shared (read/edit) with" msgstr "" @@ -3611,7 +3599,6 @@ msgstr "" #: archaeological_finds/forms.py:1308 #: archaeological_finds/templates/ishtar/sheet_basefind.html:25 -#: sra_idf_app/templates/ishtar/sheet_basefind.html:25 msgid "Discovery date" msgstr "" @@ -3627,11 +3614,11 @@ msgstr "" #: archaeological_operations/forms.py:506 #: archaeological_operations/forms.py:696 #: archaeological_operations/forms.py:790 -#: archaeological_operations/forms.py:1807 -#: archaeological_operations/forms.py:1873 +#: archaeological_operations/forms.py:1803 +#: archaeological_operations/forms.py:1869 #: archaeological_operations/models.py:908 #: archaeological_operations/models.py:996 -#: archaeological_operations/models.py:1293 ishtar_common/models.py:4848 +#: archaeological_operations/models.py:1293 ishtar_common/models.py:4851 #: ishtar_common/models_imports.py:885 msgid "Operation type" msgstr "" @@ -3657,8 +3644,8 @@ msgid "Operation - Name" msgstr "" #: archaeological_finds/forms.py:1412 archaeological_operations/forms.py:499 -#: archaeological_operations/forms.py:1324 ishtar_common/forms_common.py:1230 -#: ishtar_common/models.py:3095 +#: archaeological_operations/forms.py:1324 ishtar_common/forms_common.py:1233 +#: ishtar_common/models.py:3098 msgid "Areas" msgstr "" @@ -3856,7 +3843,7 @@ msgstr "" #: archaeological_finds/forms.py:1686 archaeological_finds/models_finds.py:1108 #: archaeological_finds/models_finds.py:1868 #: archaeological_finds/templates/ishtar/sheet_find.html:306 -#: ishtar_common/forms_common.py:1676 +#: ishtar_common/forms_common.py:1679 msgid "Reference container" msgstr "" @@ -3866,7 +3853,7 @@ msgstr "" #: archaeological_finds/forms.py:1712 archaeological_finds/models_finds.py:1107 #: archaeological_finds/templates/ishtar/sheet_find.html:331 -#: ishtar_common/forms_common.py:1668 +#: ishtar_common/forms_common.py:1671 msgid "Current container" msgstr "" @@ -3918,10 +3905,10 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:381 #: archaeological_finds/templates/ishtar/sheet_find.html:419 #: archaeological_finds/templates/ishtar/sheet_find.html:457 -#: ishtar_common/forms_common.py:1610 ishtar_common/models.py:973 -#: ishtar_common/models.py:1731 ishtar_common/models.py:3408 -#: ishtar_common/models_common.py:169 ishtar_common/models_common.py:202 -#: ishtar_common/models_common.py:1931 ishtar_common/models_common.py:1947 +#: ishtar_common/forms_common.py:1613 ishtar_common/models.py:973 +#: ishtar_common/models.py:1731 ishtar_common/models.py:3411 +#: ishtar_common/models_common.py:170 ishtar_common/models_common.py:203 +#: ishtar_common/models_common.py:1932 ishtar_common/models_common.py:1948 #: ishtar_common/models_imports.py:526 msgid "Label" msgstr "" @@ -3979,7 +3966,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 #: archaeological_operations/models.py:2356 -#: archaeological_operations/models.py:2693 ishtar_common/views.py:407 +#: archaeological_operations/models.py:2693 ishtar_common/views.py:408 msgid "Treatment" msgstr "" @@ -4077,7 +4064,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1193 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 #: archaeological_finds/wizards.py:553 archaeological_operations/models.py:2355 -#: archaeological_operations/models.py:2685 ishtar_common/views.py:406 +#: archaeological_operations/models.py:2685 ishtar_common/views.py:407 msgid "Treatment request" msgstr "" @@ -4103,13 +4090,13 @@ msgstr "" #: archaeological_warehouse/models.py:1157 #: archaeological_warehouse/models.py:1984 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 -#: ishtar_common/forms_common.py:2171 ishtar_common/forms_common.py:2356 +#: ishtar_common/forms_common.py:2174 ishtar_common/forms_common.py:2359 #: ishtar_common/templates/ishtar/sheet_document.html:100 msgid "Container" msgstr "" #: archaeological_finds/forms_treatments.py:407 -#: ishtar_common/forms_common.py:2363 +#: ishtar_common/forms_common.py:2366 msgid "Change " msgstr "" @@ -4118,12 +4105,12 @@ msgid "reference and current containers" msgstr "" #: archaeological_finds/forms_treatments.py:410 -#: ishtar_common/forms_common.py:2367 +#: ishtar_common/forms_common.py:2370 msgid "the reference container" msgstr "" #: archaeological_finds/forms_treatments.py:411 -#: ishtar_common/forms_common.py:2368 +#: ishtar_common/forms_common.py:2371 msgid "the current container" msgstr "" @@ -4177,7 +4164,7 @@ msgid "Treatment file - 001 - Search" msgstr "" #: archaeological_finds/forms_treatments.py:687 -#: archaeological_finds/forms_treatments.py:775 ishtar_common/models.py:4089 +#: archaeological_finds/forms_treatments.py:775 ishtar_common/models.py:4092 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:44 msgid "Internal ref." msgstr "" @@ -4299,7 +4286,7 @@ msgid "Treatment one to many - creation" msgstr "" #: archaeological_finds/models_finds.py:84 -#: archaeological_operations/models.py:2360 ishtar_common/models.py:3622 +#: archaeological_operations/models.py:2360 ishtar_common/models.py:3625 msgid "Code" msgstr "" @@ -4473,12 +4460,18 @@ msgstr "" msgid "Material index" msgstr "" +#: archaeological_finds/models_finds.py:439 +#: ishtar_common/templates/blocks/DataTables-stats.html:25 +#: ishtar_common/templates/ishtar/import_step_by_step.html:46 +msgid "Line" +msgstr "" + #: archaeological_finds/models_finds.py:441 msgid "Short ID" msgstr "" #: archaeological_finds/models_finds.py:445 -#: archaeological_finds/models_finds.py:452 ishtar_common/models.py:4198 +#: archaeological_finds/models_finds.py:452 ishtar_common/models.py:4201 msgid "Cached value - do not edit" msgstr "" @@ -4594,7 +4587,7 @@ msgctxt "key for text search" msgid "code-patriarche" msgstr "" -#: archaeological_finds/models_finds.py:1261 ishtar_common/models.py:3925 +#: archaeological_finds/models_finds.py:1261 ishtar_common/models.py:3928 msgctxt "key for text search" msgid "operation-type" msgstr "" @@ -4627,8 +4620,8 @@ msgstr "" #: archaeological_finds/models_finds.py:1288 #: archaeological_finds/models_finds.py:1730 -#: archaeological_warehouse/models.py:956 ishtar_common/models.py:3933 -#: ishtar_common/models.py:4030 +#: archaeological_warehouse/models.py:956 ishtar_common/models.py:3936 +#: ishtar_common/models.py:4033 msgctxt "key for text search" msgid "context-record" msgstr "" @@ -4673,7 +4666,7 @@ msgctxt "key for text search" msgid "remarkability" msgstr "" -#: archaeological_finds/models_finds.py:1324 ishtar_common/models.py:3859 +#: archaeological_finds/models_finds.py:1324 ishtar_common/models.py:3862 msgctxt "key for text search" msgid "description" msgstr "" @@ -4688,7 +4681,7 @@ msgctxt "key for text search" msgid "checked" msgstr "" -#: archaeological_finds/models_finds.py:1335 ishtar_common/models.py:3953 +#: archaeological_finds/models_finds.py:1335 ishtar_common/models.py:3956 msgctxt "key for text search" msgid "container" msgstr "" @@ -4722,7 +4715,7 @@ msgid "last-modified-by" msgstr "" #: archaeological_finds/models_finds.py:1362 -#: ishtar_common/models_common.py:1435 +#: ishtar_common/models_common.py:1436 msgctxt "key for text search" msgid "created-by" msgstr "" @@ -5076,10 +5069,10 @@ msgstr "" #: archaeological_finds/models_finds.py:2345 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 #: archaeological_finds/views.py:1272 archaeological_warehouse/forms.py:685 -#: archaeological_warehouse/views.py:297 ishtar_common/models.py:4068 -#: ishtar_common/models.py:4416 +#: archaeological_warehouse/views.py:297 ishtar_common/models.py:4071 +#: ishtar_common/models.py:4419 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 -#: ishtar_common/views.py:2662 +#: ishtar_common/views.py:2663 msgid "Packaging" msgstr "" @@ -5128,7 +5121,7 @@ msgstr "" #: archaeological_finds/models_finds.py:2006 #: archaeological_finds/models_treatments.py:289 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:71 -#: ishtar_common/views.py:1008 ishtar_common/views.py:1087 +#: ishtar_common/views.py:1009 ishtar_common/views.py:1088 msgid "Treatments" msgstr "" @@ -5193,9 +5186,9 @@ msgid "No container have been set - the localisation cannot be set." msgstr "" #: archaeological_finds/models_finds.py:3342 ishtar_common/forms_common.py:118 -#: ishtar_common/forms_common.py:2441 ishtar_common/ishtar_menu.py:77 -#: ishtar_common/models.py:2785 ishtar_common/models.py:3114 -#: ishtar_common/models.py:3307 ishtar_common/models.py:3544 +#: ishtar_common/forms_common.py:2444 ishtar_common/ishtar_menu.py:77 +#: ishtar_common/models.py:2788 ishtar_common/models.py:3117 +#: ishtar_common/models.py:3310 ishtar_common/models.py:3547 #: ishtar_common/templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "" @@ -5331,7 +5324,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1175 #: archaeological_finds/templates/ishtar/sheet_find.html:491 -#: ishtar_common/views.py:1007 ishtar_common/views.py:1080 +#: ishtar_common/views.py:1008 ishtar_common/views.py:1081 msgid "Treatment requests" msgstr "" @@ -5380,23 +5373,19 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:10 #: ishtar_common/templates/ishtar/blocks/sheet_external_id.html:3 -#: sra_idf_app/templates/ishtar/sheet_basefind.html:10 msgid "Internal ID" msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:28 -#: sra_idf_app/templates/ishtar/sheet_basefind.html:28 msgid "Discovery year" msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:31 -#: sra_idf_app/templates/ishtar/sheet_basefind.html:31 msgid "Discovery date (TPQ)" msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:61 #: ishtar_common/forms.py:933 -#: sra_idf_app/templates/ishtar/sheet_basefind.html:57 msgid "Last modified by" msgstr "" @@ -5486,7 +5475,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_findbasket.html:24 #: archaeological_warehouse/templates/ishtar/sheet_container.html:31 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:27 -#: ishtar_common/forms_common.py:1854 +#: ishtar_common/forms_common.py:1857 #: ishtar_common/templates/ishtar/sheet_document.html:57 msgid "Content" msgstr "" @@ -5673,20 +5662,20 @@ msgid "" msgstr "" #: archaeological_operations/forms.py:76 -#: archaeological_operations/models.py:2966 +#: archaeological_operations/models.py:2965 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Section" msgstr "" #: archaeological_operations/forms.py:79 -#: archaeological_operations/models.py:2968 +#: archaeological_operations/models.py:2967 msgid "Parcel number" msgstr "" #: archaeological_operations/forms.py:81 -#: archaeological_operations/models.py:2970 -#: archaeological_operations/models.py:2998 -#: archaeological_operations/models.py:3063 +#: archaeological_operations/models.py:2969 +#: archaeological_operations/models.py:2997 +#: archaeological_operations/models.py:3062 msgid "Public domain" msgstr "" @@ -5767,7 +5756,7 @@ msgstr "" #: archaeological_operations/forms.py:524 #: archaeological_operations/forms.py:698 #: archaeological_operations/forms.py:834 -#: archaeological_operations/forms.py:1811 +#: archaeological_operations/forms.py:1807 #: archaeological_operations/models.py:1263 msgid "Operator" msgstr "" @@ -5833,7 +5822,7 @@ msgstr "" #: archaeological_operations/forms.py:569 #: archaeological_operations/forms.py:886 -#: archaeological_operations/forms.py:1819 +#: archaeological_operations/forms.py:1815 #: archaeological_operations/models.py:915 #: archaeological_operations/models.py:1420 msgid "Documentation received" @@ -5849,7 +5838,7 @@ msgstr "" #: archaeological_operations/forms.py:576 #: archaeological_operations/forms.py:891 -#: archaeological_operations/forms.py:1823 +#: archaeological_operations/forms.py:1819 #: archaeological_operations/models.py:916 #: archaeological_operations/models.py:1425 msgid "Finds received" @@ -5863,7 +5852,7 @@ msgstr "" msgid "Finds deadline after" msgstr "" -#: archaeological_operations/forms.py:666 ishtar_common/models.py:4079 +#: archaeological_operations/forms.py:666 ishtar_common/models.py:4082 msgid "Associated file" msgstr "" @@ -5875,7 +5864,7 @@ msgstr "" msgid "All" msgstr "" -#: archaeological_operations/forms.py:683 ishtar_common/models.py:4903 +#: archaeological_operations/forms.py:683 ishtar_common/models.py:4906 msgid "Research" msgstr "" @@ -5896,7 +5885,7 @@ msgid "Operation - 010 - General" msgstr "" #: archaeological_operations/forms.py:792 -#: archaeological_operations/forms.py:1871 +#: archaeological_operations/forms.py:1867 #: archaeological_operations/models.py:1363 msgid "Generic name" msgstr "" @@ -5921,8 +5910,8 @@ msgstr "" #: archaeological_operations/forms.py:856 #: archaeological_operations/forms.py:1445 -#: archaeological_operations/forms.py:1827 -#: archaeological_operations/forms.py:1964 +#: archaeological_operations/forms.py:1823 +#: archaeological_operations/forms.py:1960 #: archaeological_operations/models.py:476 #: archaeological_operations/models.py:1277 msgid "Collaborators" @@ -6090,10 +6079,10 @@ msgstr "" #: archaeological_operations/forms.py:1195 #: archaeological_operations/forms.py:1314 #: archaeological_operations/forms.py:1430 -#: archaeological_operations/forms.py:1923 +#: archaeological_operations/forms.py:1919 #: archaeological_operations/models.py:453 -#: archaeological_warehouse/models.py:1991 ishtar_common/forms_common.py:1779 -#: ishtar_common/forms_common.py:2065 ishtar_common/forms_common.py:2290 +#: archaeological_warehouse/models.py:1991 ishtar_common/forms_common.py:1782 +#: ishtar_common/forms_common.py:2068 ishtar_common/forms_common.py:2293 #: ishtar_common/models.py:2270 #: ishtar_common/templates/ishtar/sheet_document.html:40 msgid "Reference" @@ -6101,13 +6090,13 @@ msgstr "" #: archaeological_operations/forms.py:1206 #: archaeological_operations/forms.py:1441 -#: archaeological_operations/forms.py:1970 +#: archaeological_operations/forms.py:1966 msgid "Cultural attributions" msgstr "" #: archaeological_operations/forms.py:1251 #: archaeological_operations/forms.py:1500 -#: archaeological_operations/forms.py:1943 +#: archaeological_operations/forms.py:1939 msgid "This reference already exists." msgstr "" @@ -6198,80 +6187,80 @@ msgstr "" msgid "Archaeological site - 030 - Underwater" msgstr "" -#: archaeological_operations/forms.py:1598 +#: archaeological_operations/forms.py:1596 #: archaeological_operations/views.py:599 msgid "Administrative act search" msgstr "" -#: archaeological_operations/forms.py:1613 -#: archaeological_operations/forms.py:1717 -#: archaeological_operations/forms.py:1784 +#: archaeological_operations/forms.py:1611 +#: archaeological_operations/forms.py:1713 +#: archaeological_operations/forms.py:1780 msgid "You should select an administrative act." msgstr "" -#: archaeological_operations/forms.py:1623 +#: archaeological_operations/forms.py:1621 #: archaeological_operations/models.py:2661 msgid "Signatory" msgstr "" -#: archaeological_operations/forms.py:1630 +#: archaeological_operations/forms.py:1628 #: archaeological_operations/models.py:2696 msgid "Signature date" msgstr "" -#: archaeological_operations/forms.py:1643 +#: archaeological_operations/forms.py:1639 msgid "Operation - Administrative act - General" msgstr "" -#: archaeological_operations/forms.py:1677 +#: archaeological_operations/forms.py:1673 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: archaeological_operations/forms.py:1681 +#: archaeological_operations/forms.py:1677 msgid "Bad index" msgstr "" -#: archaeological_operations/forms.py:1694 +#: archaeological_operations/forms.py:1690 msgid "Would you like to delete this administrative act?" msgstr "" -#: archaeological_operations/forms.py:1699 ishtar_common/forms.py:1275 +#: archaeological_operations/forms.py:1695 ishtar_common/forms.py:1275 #: ishtar_common/models.py:1944 msgid "Template" msgstr "" +#: archaeological_operations/forms.py:1719 #: archaeological_operations/forms.py:1723 -#: archaeological_operations/forms.py:1727 msgid "This document is not intended for this type of act." msgstr "" -#: archaeological_operations/forms.py:1745 +#: archaeological_operations/forms.py:1741 msgid "Doc generation" msgstr "" -#: archaeological_operations/forms.py:1747 +#: archaeological_operations/forms.py:1743 msgid "Generate the associated doc?" msgstr "" -#: archaeological_operations/forms.py:1768 +#: archaeological_operations/forms.py:1764 #: archaeological_operations/ishtar_menu.py:112 #: archaeological_operations/views.py:692 msgctxt "admin act register" msgid "Register" msgstr "" -#: archaeological_operations/forms.py:1789 +#: archaeological_operations/forms.py:1785 msgid "Operation - Quick action - Modify" msgstr "" -#: archaeological_operations/forms.py:1898 +#: archaeological_operations/forms.py:1894 msgid "This code already exists." msgstr "" -#: archaeological_operations/forms.py:1954 +#: archaeological_operations/forms.py:1950 msgid "Archaeological files - Quick action - Modify" msgstr "" @@ -6397,8 +6386,8 @@ msgid "SITE" msgstr "" #: archaeological_operations/models.py:739 ishtar_common/forms.py:1158 -#: ishtar_common/models.py:4974 ishtar_common/models.py:5131 -#: ishtar_common/models.py:5190 ishtar_common/views_item.py:1516 +#: ishtar_common/models.py:4977 ishtar_common/models.py:5134 +#: ishtar_common/models.py:5193 ishtar_common/views_item.py:1515 msgid "Unknown" msgstr "" @@ -6560,8 +6549,8 @@ msgctxt "key for text search" msgid "code-drassm" msgstr "" -#: archaeological_operations/models.py:1206 ishtar_common/models.py:3949 -#: ishtar_common/models.py:4033 +#: archaeological_operations/models.py:1206 ishtar_common/models.py:3952 +#: ishtar_common/models.py:4036 msgctxt "key for text search" msgid "file" msgstr "" @@ -6590,8 +6579,8 @@ msgstr "" #: archaeological_operations/models.py:1483 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:8 #: archaeological_operations/templates/ishtar/sheet_site.html:87 -#: ishtar_common/models.py:1001 ishtar_common/views.py:1001 -#: ishtar_common/views.py:1068 +#: ishtar_common/models.py:1001 ishtar_common/views.py:1002 +#: ishtar_common/views.py:1069 msgid "Operations" msgstr "" @@ -6825,67 +6814,67 @@ msgstr "" msgid "Archaeological preventive operator" msgstr "" -#: archaeological_operations/models.py:2707 +#: archaeological_operations/models.py:2706 msgid "Cached values get from associated departments" msgstr "" -#: archaeological_operations/models.py:2713 +#: archaeological_operations/models.py:2712 msgid "Cached values get from associated towns" msgstr "" -#: archaeological_operations/models.py:2887 +#: archaeological_operations/models.py:2886 msgid "This index already exists for this year" msgstr "" -#: archaeological_operations/models.py:2977 +#: archaeological_operations/models.py:2976 msgid "Address - Locality" msgstr "" -#: archaeological_operations/models.py:3224 ishtar_common/models.py:3418 +#: archaeological_operations/models.py:3223 ishtar_common/models.py:3421 msgid "Owner" msgstr "" -#: archaeological_operations/models.py:3239 +#: archaeological_operations/models.py:3238 msgid "Parcel owner" msgstr "" -#: archaeological_operations/models.py:3240 +#: archaeological_operations/models.py:3239 msgid "Parcel owners" msgstr "" -#: archaeological_operations/models.py:3288 +#: archaeological_operations/models.py:3287 msgid "Recorded" msgstr "" -#: archaeological_operations/models.py:3290 +#: archaeological_operations/models.py:3289 msgid "Active" msgstr "" -#: archaeological_operations/models.py:3291 +#: archaeological_operations/models.py:3290 msgid "Field completed" msgstr "" -#: archaeological_operations/models.py:3292 +#: archaeological_operations/models.py:3291 msgid "Associated report" msgstr "" -#: archaeological_operations/models.py:3293 +#: archaeological_operations/models.py:3292 msgid "Closed" msgstr "" -#: archaeological_operations/models.py:3294 +#: archaeological_operations/models.py:3293 msgid "Documented and closed" msgstr "" -#: archaeological_operations/models.py:3793 ishtar_common/models.py:4844 +#: archaeological_operations/models.py:3792 ishtar_common/models.py:4847 msgid "Is preventive" msgstr "" -#: archaeological_operations/models.py:3796 +#: archaeological_operations/models.py:3795 msgid "Operation type old" msgstr "" -#: archaeological_operations/models.py:3797 +#: archaeological_operations/models.py:3796 msgid "Operation types old" msgstr "" @@ -7071,8 +7060,8 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:81 #: archaeological_operations/templates/ishtar/sheet_operation.html:401 #: archaeological_operations/templates/ishtar/sheet_operation.html:499 -#: ishtar_common/models.py:1001 ishtar_common/views.py:1003 -#: ishtar_common/views.py:1073 +#: ishtar_common/models.py:1001 ishtar_common/views.py:1004 +#: ishtar_common/views.py:1074 msgid "Context records" msgstr "" @@ -7199,7 +7188,7 @@ msgid "" "same Ishtar version?" msgstr "" -#: archaeological_operations/tests.py:4724 ishtar_common/admin.py:2271 +#: archaeological_operations/tests.py:4724 ishtar_common/admin.py:2276 #, python-brace-format msgid "" "Theses types have not been found: {missing_types}. Not the same Ishtar " @@ -7210,7 +7199,7 @@ msgstr "" msgid "{result['deleted']} matches deleted" msgstr "" -#: archaeological_operations/tests.py:4803 ishtar_common/admin.py:2349 +#: archaeological_operations/tests.py:4803 ishtar_common/admin.py:2354 msgid "{result['updated']} match key(s) updated." msgstr "" @@ -7284,8 +7273,8 @@ msgstr "" #: archaeological_warehouse/models.py:400 #: archaeological_warehouse/models.py:889 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:4 -#: ishtar_common/forms_common.py:1859 ishtar_common/models.py:5067 -#: ishtar_common/views.py:402 +#: ishtar_common/forms_common.py:1862 ishtar_common/models.py:5070 +#: ishtar_common/views.py:403 msgid "Warehouse" msgstr "" @@ -7346,30 +7335,32 @@ msgid "" "used for the organization." msgstr "" -#: archaeological_warehouse/forms.py:239 ishtar_common/forms_common.py:536 -#: ishtar_common/forms_common.py:918 ishtar_common/models_common.py:2844 +#: archaeological_warehouse/forms.py:239 ishtar_common/forms_common.py:538 +#: ishtar_common/forms_common.py:921 ishtar_common/models_common.py:2848 +#: ishtar_common/models_common.py:3006 msgid "Address complement" msgstr "" -#: archaeological_warehouse/forms.py:242 ishtar_common/forms_common.py:539 -#: ishtar_common/forms_common.py:921 ishtar_common/models_common.py:2849 +#: archaeological_warehouse/forms.py:242 ishtar_common/forms_common.py:541 +#: ishtar_common/forms_common.py:924 ishtar_common/models_common.py:2853 msgid "Town (freeform)" msgstr "" -#: archaeological_warehouse/forms.py:244 ishtar_common/forms_common.py:541 -#: ishtar_common/forms_common.py:923 ishtar_common/models_common.py:2857 +#: archaeological_warehouse/forms.py:244 ishtar_common/forms_common.py:543 +#: ishtar_common/forms_common.py:926 ishtar_common/models_common.py:2861 msgid "Country" msgstr "" -#: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:543 -#: ishtar_common/forms_common.py:894 ishtar_common/models_common.py:2871 +#: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:545 +#: ishtar_common/forms_common.py:897 ishtar_common/models_common.py:2875 +#: ishtar_common/models_common.py:3018 #: ishtar_common/templates/ishtar/sheet_person.html:27 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:34 msgid "Phone" msgstr "" -#: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:545 -#: ishtar_common/forms_common.py:904 ishtar_common/models_common.py:2887 +#: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:547 +#: ishtar_common/forms_common.py:907 ishtar_common/models_common.py:2891 #: ishtar_common/templates/ishtar/sheet_person.html:45 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:55 msgid "Mobile phone" @@ -7669,7 +7660,7 @@ msgctxt "key for text search" msgid "find-label" msgstr "" -#: archaeological_warehouse/models.py:964 ishtar_common/models.py:3945 +#: archaeological_warehouse/models.py:964 ishtar_common/models.py:3948 msgctxt "key for text search" msgid "find-denomination" msgstr "" @@ -7733,8 +7724,8 @@ msgstr "" msgid "Cached division" msgstr "" -#: archaeological_warehouse/models.py:1121 ishtar_common/models.py:4180 -#: ishtar_common/models.py:4184 +#: archaeological_warehouse/models.py:1121 ishtar_common/models.py:4183 +#: ishtar_common/models.py:4187 msgid "Container ID" msgstr "" @@ -7971,17 +7962,17 @@ msgstr "E-Mail-Adresse" msgid "warehouse" msgstr "" -#: example_project/__init__.py:13 ishtar_common/views.py:245 -#: ishtar_common/views.py:957 +#: example_project/__init__.py:13 ishtar_common/views.py:246 +#: ishtar_common/views.py:958 msgid "New organization" msgstr "" -#: example_project/__init__.py:14 ishtar_common/views.py:187 -#: ishtar_common/views.py:950 ishtar_common/views.py:954 +#: example_project/__init__.py:14 ishtar_common/views.py:188 +#: ishtar_common/views.py:951 ishtar_common/views.py:955 msgid "New person" msgstr "" -#: example_project/__init__.py:15 ishtar_common/views.py:963 +#: example_project/__init__.py:15 ishtar_common/views.py:964 msgid "New author" msgstr "" @@ -8017,7 +8008,7 @@ msgstr "" msgid "Merge selected items" msgstr "" -#: ishtar_common/admin.py:334 ishtar_common/forms_common.py:663 +#: ishtar_common/admin.py:334 ishtar_common/forms_common.py:666 msgid "At least two items have to be selected." msgstr "" @@ -8038,335 +8029,335 @@ msgstr "" msgid "{} parent(s) were changed to {}." msgstr "" -#: ishtar_common/admin.py:485 ishtar_common/models.py:1417 +#: ishtar_common/admin.py:490 ishtar_common/models.py:1417 msgid "Maps - default center" msgstr "" -#: ishtar_common/admin.py:536 ishtar_common/models.py:979 +#: ishtar_common/admin.py:541 ishtar_common/models.py:979 #: ishtar_common/templates/navbar.html:31 msgid "Profile" msgstr "" -#: ishtar_common/admin.py:537 ishtar_common/forms_common.py:1226 -#: ishtar_common/forms_common.py:1261 ishtar_common/forms_common.py:1262 -#: ishtar_common/models.py:2895 +#: ishtar_common/admin.py:542 ishtar_common/forms_common.py:1229 +#: ishtar_common/forms_common.py:1264 ishtar_common/forms_common.py:1265 +#: ishtar_common/models.py:2898 msgid "Profiles" msgstr "" -#: ishtar_common/admin.py:632 +#: ishtar_common/admin.py:637 msgid "The CSV file should at least have a {} column" msgstr "" -#: ishtar_common/admin.py:699 ishtar_common/admin.py:929 +#: ishtar_common/admin.py:704 ishtar_common/admin.py:934 #, python-format msgid "%d item(s) created." msgstr "" -#: ishtar_common/admin.py:701 ishtar_common/admin.py:933 +#: ishtar_common/admin.py:706 ishtar_common/admin.py:938 #, python-format msgid "%d item(s) updated." msgstr "" -#: ishtar_common/admin.py:705 +#: ishtar_common/admin.py:710 msgid "These parents are missing: {}" msgstr "" -#: ishtar_common/admin.py:725 +#: ishtar_common/admin.py:730 msgid "Geojson file" msgstr "" -#: ishtar_common/admin.py:727 +#: ishtar_common/admin.py:732 msgid "" "Only unicode encoding is managed - convert your file first. The file must be " "a geojson file or a zip containing a geojson file." msgstr "" -#: ishtar_common/admin.py:733 +#: ishtar_common/admin.py:738 msgid "Prefix for numero INSEE" msgstr "" -#: ishtar_common/admin.py:736 +#: ishtar_common/admin.py:741 msgid "Field name for numero INSEE" msgstr "" -#: ishtar_common/admin.py:739 +#: ishtar_common/admin.py:744 msgid "Field name for name" msgstr "" -#: ishtar_common/admin.py:741 +#: ishtar_common/admin.py:746 msgid "m2" msgstr "" -#: ishtar_common/admin.py:741 +#: ishtar_common/admin.py:746 msgid "km2" msgstr "" -#: ishtar_common/admin.py:742 +#: ishtar_common/admin.py:747 msgid "Surface unit" msgstr "" -#: ishtar_common/admin.py:744 +#: ishtar_common/admin.py:749 msgid "Field name for surface" msgstr "" -#: ishtar_common/admin.py:747 +#: ishtar_common/admin.py:752 msgid "Field name for year" msgstr "" -#: ishtar_common/admin.py:751 +#: ishtar_common/admin.py:756 msgid "Not required for new town. Leave it empty when not available." msgstr "" -#: ishtar_common/admin.py:754 +#: ishtar_common/admin.py:759 msgid "Update only geometry of existing towns" msgstr "" -#: ishtar_common/admin.py:773 +#: ishtar_common/admin.py:778 msgid "\"{}\" not found in feature {}" msgstr "" -#: ishtar_common/admin.py:786 +#: ishtar_common/admin.py:791 msgid "\"{}\" not found in properties of feature {}" msgstr "" -#: ishtar_common/admin.py:799 +#: ishtar_common/admin.py:804 msgid "Bad geometry for feature {}" msgstr "" -#: ishtar_common/admin.py:810 +#: ishtar_common/admin.py:815 msgid "Geometry {} not managed for towns - feature {}" msgstr "" -#: ishtar_common/admin.py:820 +#: ishtar_common/admin.py:825 msgid "Bad value for surface: {} - feature {}" msgstr "" -#: ishtar_common/admin.py:864 +#: ishtar_common/admin.py:869 msgid "No json file found in zipfile" msgstr "" -#: ishtar_common/admin.py:887 +#: ishtar_common/admin.py:892 msgid "Bad geojson file" msgstr "" -#: ishtar_common/admin.py:899 +#: ishtar_common/admin.py:904 msgid "Too many errors..." msgstr "" -#: ishtar_common/admin.py:952 +#: ishtar_common/admin.py:957 msgid "Zipped JSON file" msgstr "" -#: ishtar_common/admin.py:953 +#: ishtar_common/admin.py:958 msgid "Import from a zipped JSON file generated by Ishtar" msgstr "" -#: ishtar_common/admin.py:989 +#: ishtar_common/admin.py:994 msgid "{} {}(s) created/updated." msgstr "" -#: ishtar_common/admin.py:1012 +#: ishtar_common/admin.py:1017 msgid "Center" msgstr "" -#: ishtar_common/admin.py:1013 ishtar_common/models_common.py:2636 +#: ishtar_common/admin.py:1018 ishtar_common/models_common.py:2637 msgid "Limit" msgstr "" -#: ishtar_common/admin.py:1021 +#: ishtar_common/admin.py:1026 msgid "Parents" msgstr "" -#: ishtar_common/admin.py:1062 ishtar_common/admin.py:1503 +#: ishtar_common/admin.py:1067 ishtar_common/admin.py:1508 msgid "Make available" msgstr "" -#: ishtar_common/admin.py:1063 ishtar_common/admin.py:1504 +#: ishtar_common/admin.py:1068 ishtar_common/admin.py:1509 msgid "Make unavailable" msgstr "" -#: ishtar_common/admin.py:1187 +#: ishtar_common/admin.py:1192 msgid "Department number" msgstr "" -#: ishtar_common/admin.py:1188 +#: ishtar_common/admin.py:1193 msgid "Area name" msgstr "" -#: ishtar_common/admin.py:1202 +#: ishtar_common/admin.py:1207 msgid "Choose an area or set an area reference." msgstr "" -#: ishtar_common/admin.py:1209 +#: ishtar_common/admin.py:1214 msgid "Invalid department number." msgstr "" -#: ishtar_common/admin.py:1218 +#: ishtar_common/admin.py:1223 msgid "This name is already used by another area." msgstr "" -#: ishtar_common/admin.py:1246 +#: ishtar_common/admin.py:1251 msgid "Area \"{}\" created." msgstr "" -#: ishtar_common/admin.py:1263 +#: ishtar_common/admin.py:1268 msgid "{} town(s) added to \"{}\"." msgstr "" -#: ishtar_common/admin.py:1435 +#: ishtar_common/admin.py:1440 msgid "{} importer type(s) duplicated: {}." msgstr "" -#: ishtar_common/admin.py:1456 +#: ishtar_common/admin.py:1461 msgid "Select only one importer." msgstr "" -#: ishtar_common/admin.py:1486 +#: ishtar_common/admin.py:1491 msgid "Export as libreoffice template" msgstr "" -#: ishtar_common/admin.py:1555 +#: ishtar_common/admin.py:1560 msgid "{} importer column(s) duplicated: {}." msgstr "" -#: ishtar_common/admin.py:1586 +#: ishtar_common/admin.py:1591 msgid "{} importer column(s) right-shifted." msgstr "" -#: ishtar_common/admin.py:1599 +#: ishtar_common/admin.py:1604 msgid "Shift right" msgstr "" -#: ishtar_common/admin.py:1626 +#: ishtar_common/admin.py:1631 msgid "{} importer column(s) left-shifted." msgstr "" -#: ishtar_common/admin.py:1633 +#: ishtar_common/admin.py:1638 msgid "{} importer column(s) not left-shifted: no place available." msgstr "" -#: ishtar_common/admin.py:1647 +#: ishtar_common/admin.py:1652 msgid "Shift left" msgstr "" -#: ishtar_common/admin.py:1682 +#: ishtar_common/admin.py:1687 msgid "Importer available" msgstr "" -#: ishtar_common/admin.py:1827 +#: ishtar_common/admin.py:1832 msgid "Display selected" msgstr "" -#: ishtar_common/admin.py:1828 +#: ishtar_common/admin.py:1833 msgid "Hide selected" msgstr "" -#: ishtar_common/admin.py:1858 ishtar_common/models.py:1553 +#: ishtar_common/admin.py:1863 ishtar_common/models.py:1553 msgid "Form" msgstr "" -#: ishtar_common/admin.py:1879 ishtar_common/models.py:1694 +#: ishtar_common/admin.py:1884 ishtar_common/models.py:1694 msgid "Field" msgstr "" -#: ishtar_common/admin.py:2009 ishtar_common/admin.py:2061 +#: ishtar_common/admin.py:2014 ishtar_common/admin.py:2066 msgid "Select only one task." msgstr "" -#: ishtar_common/admin.py:2016 +#: ishtar_common/admin.py:2021 msgid "Export already exported/scheduled." msgstr "" -#: ishtar_common/admin.py:2028 +#: ishtar_common/admin.py:2033 msgid "Launch export" msgstr "" -#: ishtar_common/admin.py:2068 +#: ishtar_common/admin.py:2073 msgid "Import already imported/scheduled." msgstr "" -#: ishtar_common/admin.py:2080 ishtar_common/models_imports.py:1353 +#: ishtar_common/admin.py:2085 ishtar_common/models_imports.py:1353 msgid "Launch import" msgstr "" -#: ishtar_common/admin.py:2150 ishtar_common/models.py:976 +#: ishtar_common/admin.py:2155 ishtar_common/models.py:976 msgid "Content type" msgstr "" -#: ishtar_common/admin.py:2182 ishtar_common/admin.py:2292 -#: ishtar_common/admin.py:2328 +#: ishtar_common/admin.py:2187 ishtar_common/admin.py:2297 +#: ishtar_common/admin.py:2333 msgid "Select only one source." msgstr "" -#: ishtar_common/admin.py:2203 +#: ishtar_common/admin.py:2208 msgid "Timeout: failed to join {}." msgstr "" -#: ishtar_common/admin.py:2211 +#: ishtar_common/admin.py:2216 msgid "" "Bad response for {} - {}. Response status code {} != 200. Check your key?" msgstr "" -#: ishtar_common/admin.py:2221 +#: ishtar_common/admin.py:2226 msgid "Response of {} is not a valid JSON message." msgstr "" -#: ishtar_common/admin.py:2239 +#: ishtar_common/admin.py:2244 #, python-brace-format msgid "{created} matches created" msgstr "" -#: ishtar_common/admin.py:2245 +#: ishtar_common/admin.py:2250 #, python-brace-format msgid "{updated} matches updated" msgstr "" -#: ishtar_common/admin.py:2251 +#: ishtar_common/admin.py:2256 #, python-brace-format msgid "{deleted} matches deleted" msgstr "" -#: ishtar_common/admin.py:2260 +#: ishtar_common/admin.py:2265 #, python-brace-format msgid "" "Theses search models have not been found: {missing_models}. Not the same " "Ishtar version?" msgstr "" -#: ishtar_common/admin.py:2278 +#: ishtar_common/admin.py:2283 msgid "Update types from source" msgstr "" -#: ishtar_common/admin.py:2313 +#: ishtar_common/admin.py:2318 msgid "Generate match document" msgstr "" -#: ishtar_common/admin.py:2337 +#: ishtar_common/admin.py:2342 msgid "Error on update. Cannot open match document." msgstr "" -#: ishtar_common/admin.py:2342 +#: ishtar_common/admin.py:2347 msgid "Error on type update from match document:" msgstr "" -#: ishtar_common/admin.py:2355 +#: ishtar_common/admin.py:2360 msgid "Update association from match document" msgstr "" -#: ishtar_common/admin.py:2388 +#: ishtar_common/admin.py:2393 msgid "Enable match" msgstr "" -#: ishtar_common/admin.py:2389 +#: ishtar_common/admin.py:2394 msgid "Disable match" msgstr "" -#: ishtar_common/admin.py:2399 ishtar_common/models_rest.py:70 +#: ishtar_common/admin.py:2404 ishtar_common/models_rest.py:70 msgid "API - Remote access - Search model" msgstr "" -#: ishtar_common/admin.py:2402 ishtar_common/models.py:449 -#: ishtar_common/models.py:732 ishtar_common/models_common.py:806 +#: ishtar_common/admin.py:2407 ishtar_common/models.py:449 +#: ishtar_common/models.py:732 ishtar_common/models_common.py:807 #: ishtar_common/models_imports.py:794 ishtar_common/models_rest.py:95 #: ishtar_common/templates/ishtar/formset_import_match.html:44 #: ishtar_common/templates/ishtar/import_step_by_step.html:171 @@ -8376,21 +8367,21 @@ msgstr "" msgid "Key" msgstr "" -#: ishtar_common/admin.py:2404 +#: ishtar_common/admin.py:2409 msgid "Save first to choose a key" msgstr "" -#: ishtar_common/admin.py:2434 +#: ishtar_common/admin.py:2439 msgid "Available keys: " msgstr "" -#: ishtar_common/admin.py:2467 +#: ishtar_common/admin.py:2472 msgid "" "Only one type of geographic data is accepted. Create different objects if " "you have many." msgstr "" -#: ishtar_common/admin.py:2475 +#: ishtar_common/admin.py:2480 msgid "You cannot set only x or only y coordinate." msgstr "" @@ -8489,7 +8480,7 @@ msgstr "" msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d" msgstr "" -#: ishtar_common/data_importer.py:854 ishtar_common/views.py:1618 +#: ishtar_common/data_importer.py:854 ishtar_common/views.py:1619 msgid "No data provided" msgstr "" @@ -8523,8 +8514,8 @@ msgid "" "Related object not found. Can not create the geographic item. Context: {}." msgstr "" -#: ishtar_common/data_importer.py:1551 ishtar_common/views.py:1696 -#: ishtar_common/views.py:1706 +#: ishtar_common/data_importer.py:1551 ishtar_common/views.py:1697 +#: ishtar_common/views.py:1707 msgid "Not imported" msgstr "" @@ -8605,8 +8596,8 @@ msgstr "" msgid "File too large. Size should not exceed {} Mo." msgstr "" -#: ishtar_common/forms.py:112 ishtar_common/forms_common.py:1268 -#: ishtar_common/views.py:2585 +#: ishtar_common/forms.py:112 ishtar_common/forms_common.py:1271 +#: ishtar_common/views.py:2586 msgid "Confirm" msgstr "" @@ -8638,7 +8629,7 @@ msgstr "" msgid "Is locked?" msgstr "" -#: ishtar_common/forms.py:971 ishtar_common/forms_common.py:2106 +#: ishtar_common/forms.py:971 ishtar_common/forms_common.py:2109 msgid "Has an image?" msgstr "" @@ -8678,49 +8669,49 @@ msgid "" "french town Saint-Denis in the Seine-Saint-Denis department.</p>" msgstr "" -#: ishtar_common/forms_common.py:169 ishtar_common/forms_common.py:257 +#: ishtar_common/forms_common.py:169 ishtar_common/forms_common.py:255 msgid "Associated images (web link to a zip file)" msgstr "" -#: ishtar_common/forms_common.py:192 ishtar_common/forms_common.py:276 +#: ishtar_common/forms_common.py:191 ishtar_common/forms_common.py:273 msgid "Import (table)" msgstr "" -#: ishtar_common/forms_common.py:236 +#: ishtar_common/forms_common.py:234 msgid "This is not a valid CSV file. Check file format and encoding." msgstr "" -#: ishtar_common/forms_common.py:248 +#: ishtar_common/forms_common.py:246 msgid "" "This import type have no unicity type defined. Conservative import is not " "possible." msgstr "" -#: ishtar_common/forms_common.py:284 +#: ishtar_common/forms_common.py:281 msgid "You put either a file or a download link for images but not both." msgstr "" -#: ishtar_common/forms_common.py:295 ishtar_common/tests.py:2524 +#: ishtar_common/forms_common.py:292 ishtar_common/tests.py:2533 msgid "\"Associated images\" field must be a valid zip file." msgstr "" -#: ishtar_common/forms_common.py:307 +#: ishtar_common/forms_common.py:304 msgid "Invalid link or no file is available for this link." msgstr "" -#: ishtar_common/forms_common.py:349 +#: ishtar_common/forms_common.py:347 msgid "Import (GIS)" msgstr "" -#: ishtar_common/forms_common.py:370 +#: ishtar_common/forms_common.py:372 msgid "GIS file must be a zip containing a ShapeFile or GeoPackage file." msgstr "" -#: ishtar_common/forms_common.py:393 +#: ishtar_common/forms_common.py:395 msgid "Target" msgstr "" -#: ishtar_common/forms_common.py:394 ishtar_common/models.py:1756 +#: ishtar_common/forms_common.py:396 ishtar_common/models.py:1756 #: ishtar_common/models_imports.py:795 #: ishtar_common/templates/ishtar/formset_import_match.html:45 #: ishtar_common/templates/ishtar/import_step_by_step.html:172 @@ -8729,660 +8720,675 @@ msgstr "" msgid "Value" msgstr "" -#: ishtar_common/forms_common.py:395 +#: ishtar_common/forms_common.py:397 msgid "Remember" msgstr "" -#: ishtar_common/forms_common.py:420 +#: ishtar_common/forms_common.py:422 msgid "Set to NULL" msgstr "" -#: ishtar_common/forms_common.py:427 +#: ishtar_common/forms_common.py:429 msgid "this import only" msgstr "" -#: ishtar_common/forms_common.py:428 +#: ishtar_common/forms_common.py:430 msgid "me" msgstr "" -#: ishtar_common/forms_common.py:441 +#: ishtar_common/forms_common.py:443 msgid "the current group: {}" msgstr "" -#: ishtar_common/forms_common.py:447 +#: ishtar_common/forms_common.py:449 msgid "all users" msgstr "" -#: ishtar_common/forms_common.py:526 ishtar_common/forms_common.py:637 +#: ishtar_common/forms_common.py:528 ishtar_common/forms_common.py:640 #: ishtar_common/models.py:2411 ishtar_common/models_imports.py:871 #: ishtar_common/models_imports.py:872 msgid "Organization type" msgstr "" -#: ishtar_common/forms_common.py:527 ishtar_common/forms_common.py:2071 -#: ishtar_common/models.py:2479 +#: ishtar_common/forms_common.py:529 ishtar_common/forms_common.py:2074 +#: ishtar_common/models.py:2486 #, fuzzy #| msgid "email address" msgid "Web address" msgstr "E-Mail-Adresse" -#: ishtar_common/forms_common.py:529 ishtar_common/forms_common.py:640 +#: ishtar_common/forms_common.py:531 ishtar_common/forms_common.py:643 #: ishtar_common/models.py:2387 ishtar_common/models.py:2404 -#: ishtar_common/models.py:2481 +#: ishtar_common/models.py:2488 msgid "Grammatical gender" msgstr "" -#: ishtar_common/forms_common.py:532 ishtar_common/forms_common.py:643 +#: ishtar_common/forms_common.py:534 ishtar_common/forms_common.py:646 msgid "Can be used by templates" msgstr "" -#: ishtar_common/forms_common.py:542 ishtar_common/forms_common.py:763 -#: ishtar_common/forms_common.py:890 ishtar_common/forms_common.py:981 -#: ishtar_common/forms_common.py:1148 ishtar_common/models_common.py:2889 -#: ishtar_common/wizards.py:1931 +#: ishtar_common/forms_common.py:544 ishtar_common/forms_common.py:766 +#: ishtar_common/forms_common.py:893 ishtar_common/forms_common.py:984 +#: ishtar_common/forms_common.py:1151 ishtar_common/models_common.py:2893 +#: ishtar_common/models_common.py:3028 ishtar_common/wizards.py:1931 msgid "Email" msgstr "E-Mail-Adresse" -#: ishtar_common/forms_common.py:594 ishtar_common/forms_common.py:610 -#: ishtar_common/views.py:236 +#: ishtar_common/forms_common.py:597 ishtar_common/forms_common.py:613 +#: ishtar_common/views.py:237 msgid "Organization search" msgstr "" -#: ishtar_common/forms_common.py:627 +#: ishtar_common/forms_common.py:630 msgid "Organization - Quick action - Modify" msgstr "" -#: ishtar_common/forms_common.py:680 +#: ishtar_common/forms_common.py:683 msgid "Merge all items into" msgstr "" -#: ishtar_common/forms_common.py:718 +#: ishtar_common/forms_common.py:721 msgid "Organization to merge" msgstr "" -#: ishtar_common/forms_common.py:762 ishtar_common/forms_common.py:886 -#: ishtar_common/forms_common.py:980 ishtar_common/models.py:2755 +#: ishtar_common/forms_common.py:765 ishtar_common/forms_common.py:889 +#: ishtar_common/forms_common.py:983 ishtar_common/models.py:2758 #: ishtar_common/templates/ishtar/sheet_organization.html:26 msgid "Surname" msgstr "" -#: ishtar_common/forms_common.py:781 ishtar_common/forms_common.py:797 -#: ishtar_common/forms_common.py:956 ishtar_common/views.py:177 +#: ishtar_common/forms_common.py:784 ishtar_common/forms_common.py:800 +#: ishtar_common/forms_common.py:959 ishtar_common/views.py:178 msgid "Person search" msgstr "" -#: ishtar_common/forms_common.py:815 +#: ishtar_common/forms_common.py:818 msgid "Person - Quick action - Modify" msgstr "" -#: ishtar_common/forms_common.py:826 ishtar_common/forms_common.py:883 -#: ishtar_common/forms_common.py:1653 ishtar_common/forms_common.py:2063 -#: ishtar_common/forms_common.py:2289 ishtar_common/models.py:2742 -#: ishtar_common/models.py:2746 ishtar_common/models.py:4077 +#: ishtar_common/forms_common.py:829 ishtar_common/forms_common.py:886 +#: ishtar_common/forms_common.py:1656 ishtar_common/forms_common.py:2066 +#: ishtar_common/forms_common.py:2292 ishtar_common/models.py:2745 +#: ishtar_common/models.py:2749 ishtar_common/models.py:4080 #: ishtar_common/models_imports.py:874 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:7 +#: ishtar_common/templates/ishtar/merge_person.html:10 +#: ishtar_common/templates/ishtar/merge_person.html:22 msgid "Title" msgstr "" -#: ishtar_common/forms_common.py:837 ishtar_common/models.py:2561 +#: ishtar_common/forms_common.py:840 ishtar_common/models.py:2564 msgid "Person types" msgstr "" -#: ishtar_common/forms_common.py:855 +#: ishtar_common/forms_common.py:858 msgid "Person to merge" msgstr "" -#: ishtar_common/forms_common.py:877 +#: ishtar_common/forms_common.py:880 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:19 msgid "Identity" msgstr "" -#: ishtar_common/forms_common.py:884 ishtar_common/models.py:2752 +#: ishtar_common/forms_common.py:887 ishtar_common/models.py:2755 +#: ishtar_common/templates/ishtar/merge_person.html:12 +#: ishtar_common/templates/ishtar/merge_person.html:24 msgid "Salutation" msgstr "" -#: ishtar_common/forms_common.py:889 ishtar_common/models.py:2765 +#: ishtar_common/forms_common.py:892 ishtar_common/models.py:2768 +#: ishtar_common/templates/ishtar/merge_person.html:9 +#: ishtar_common/templates/ishtar/merge_person.html:21 msgid "Raw name" msgstr "" -#: ishtar_common/forms_common.py:892 ishtar_common/models_common.py:2873 +#: ishtar_common/forms_common.py:895 ishtar_common/models_common.py:2877 msgid "Phone description" msgstr "" -#: ishtar_common/forms_common.py:896 ishtar_common/models_common.py:2876 -#: ishtar_common/models_common.py:2879 +#: ishtar_common/forms_common.py:899 ishtar_common/models_common.py:2880 +#: ishtar_common/models_common.py:2883 msgid "Phone description 2" msgstr "" -#: ishtar_common/forms_common.py:898 +#: ishtar_common/forms_common.py:901 msgid "Phone 2" msgstr "" -#: ishtar_common/forms_common.py:900 ishtar_common/models_common.py:2883 +#: ishtar_common/forms_common.py:903 ishtar_common/models_common.py:2887 msgid "Phone description 3" msgstr "" -#: ishtar_common/forms_common.py:902 ishtar_common/models_common.py:2881 +#: ishtar_common/forms_common.py:905 ishtar_common/models_common.py:2885 msgid "Phone 3" msgstr "" -#: ishtar_common/forms_common.py:907 +#: ishtar_common/forms_common.py:910 msgid "Current organization" msgstr "" -#: ishtar_common/forms_common.py:925 ishtar_common/models_common.py:2858 +#: ishtar_common/forms_common.py:928 ishtar_common/models_common.py:2862 msgid "Other address: address" msgstr "" -#: ishtar_common/forms_common.py:928 ishtar_common/models_common.py:2860 +#: ishtar_common/forms_common.py:931 ishtar_common/models_common.py:2864 msgid "Other address: address complement" msgstr "" -#: ishtar_common/forms_common.py:933 ishtar_common/models_common.py:2863 +#: ishtar_common/forms_common.py:936 ishtar_common/models_common.py:2867 msgid "Other address: postal code" msgstr "" -#: ishtar_common/forms_common.py:936 ishtar_common/models_common.py:2866 +#: ishtar_common/forms_common.py:939 ishtar_common/models_common.py:2870 msgid "Other address: town" msgstr "" -#: ishtar_common/forms_common.py:939 ishtar_common/models_common.py:2869 +#: ishtar_common/forms_common.py:942 ishtar_common/models_common.py:2873 msgid "Other address: country" msgstr "" -#: ishtar_common/forms_common.py:951 +#: ishtar_common/forms_common.py:954 msgid "Already has an account" msgstr "" -#: ishtar_common/forms_common.py:978 ishtar_common/models.py:3271 +#: ishtar_common/forms_common.py:981 ishtar_common/models.py:3274 #: ishtar_common/wizards.py:1930 msgid "Username" msgstr "Benutzername" -#: ishtar_common/forms_common.py:1000 ishtar_common/forms_common.py:1013 +#: ishtar_common/forms_common.py:1003 ishtar_common/forms_common.py:1016 msgid "Account search" msgstr "" -#: ishtar_common/forms_common.py:1075 ishtar_common/forms_common.py:1123 -#: ishtar_common/forms_common.py:1127 ishtar_common/models.py:2560 +#: ishtar_common/forms_common.py:1078 ishtar_common/forms_common.py:1126 +#: ishtar_common/forms_common.py:1130 ishtar_common/models.py:2563 #: ishtar_common/models_imports.py:873 msgid "Person type" msgstr "" -#: ishtar_common/forms_common.py:1142 ishtar_common/forms_common.py:1146 +#: ishtar_common/forms_common.py:1145 ishtar_common/forms_common.py:1149 #: ishtar_common/ishtar_menu.py:38 msgid "Account" msgstr "" -#: ishtar_common/forms_common.py:1151 ishtar_common/forms_common.py:1166 +#: ishtar_common/forms_common.py:1154 ishtar_common/forms_common.py:1169 #: ishtar_common/wizards.py:1966 msgid "New password" msgstr "" -#: ishtar_common/forms_common.py:1158 +#: ishtar_common/forms_common.py:1161 msgid "New password (confirmation)" msgstr "" -#: ishtar_common/forms_common.py:1168 +#: ishtar_common/forms_common.py:1171 msgid "" "Keep these fields empty if you do not want to change password. On creation, " "if you leave these fields empty, the user will not be able to connect." msgstr "" -#: ishtar_common/forms_common.py:1206 +#: ishtar_common/forms_common.py:1209 msgid "Your password and confirmation password do not match." msgstr "" -#: ishtar_common/forms_common.py:1212 +#: ishtar_common/forms_common.py:1215 msgid "You must provide a correct password." msgstr "" -#: ishtar_common/forms_common.py:1221 +#: ishtar_common/forms_common.py:1224 msgid "This username already exists." msgstr "" -#: ishtar_common/forms_common.py:1253 +#: ishtar_common/forms_common.py:1256 msgid "Choose different name for profiles." msgstr "" -#: ishtar_common/forms_common.py:1270 +#: ishtar_common/forms_common.py:1273 msgid "Send the new password by email?" msgstr "" -#: ishtar_common/forms_common.py:1283 ishtar_common/models.py:3100 -#: ishtar_common/views.py:1263 +#: ishtar_common/forms_common.py:1286 ishtar_common/models.py:3103 +#: ishtar_common/views.py:1264 msgid "Current profile" msgstr "" -#: ishtar_common/forms_common.py:1286 ishtar_common/models.py:3073 -#: ishtar_common/models.py:3092 ishtar_common/models_imports.py:879 +#: ishtar_common/forms_common.py:1289 ishtar_common/models.py:3076 +#: ishtar_common/models.py:3095 ishtar_common/models_imports.py:879 msgid "Profile type" msgstr "" -#: ishtar_common/forms_common.py:1289 +#: ishtar_common/forms_common.py:1292 msgid "Pin automatically items on creation and modification" msgstr "" -#: ishtar_common/forms_common.py:1294 +#: ishtar_common/forms_common.py:1297 msgid "Duplicate this profile" msgstr "" -#: ishtar_common/forms_common.py:1297 +#: ishtar_common/forms_common.py:1300 msgid "Delete this profile" msgstr "" -#: ishtar_common/forms_common.py:1334 ishtar_common/forms_common.py:1342 +#: ishtar_common/forms_common.py:1337 ishtar_common/forms_common.py:1345 #, python-brace-format msgid "External source - {src.name}" msgstr "" -#: ishtar_common/forms_common.py:1391 +#: ishtar_common/forms_common.py:1394 msgid "A profile with the same name exists." msgstr "" -#: ishtar_common/forms_common.py:1424 +#: ishtar_common/forms_common.py:1427 msgid " (duplicate)" msgstr "" -#: ishtar_common/forms_common.py:1453 +#: ishtar_common/forms_common.py:1456 msgid "There are identical towns." msgstr "" -#: ishtar_common/forms_common.py:1540 +#: ishtar_common/forms_common.py:1543 msgid "Only one choice can be checked." msgstr "" -#: ishtar_common/forms_common.py:1590 +#: ishtar_common/forms_common.py:1593 #, python-format msgid "Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)." msgstr "" -#: ishtar_common/forms_common.py:1615 +#: ishtar_common/forms_common.py:1618 msgid "This value already exist" msgstr "" -#: ishtar_common/forms_common.py:1631 ishtar_common/models.py:3692 +#: ishtar_common/forms_common.py:1634 ishtar_common/models.py:3695 #: ishtar_common/models_imports.py:882 msgid "Document tag" msgstr "" -#: ishtar_common/forms_common.py:1640 +#: ishtar_common/forms_common.py:1643 msgid "Document - General" msgstr "" -#: ishtar_common/forms_common.py:1661 ishtar_common/forms_common.py:2069 -#: ishtar_common/forms_common.py:2271 ishtar_common/models.py:4143 +#: ishtar_common/forms_common.py:1664 ishtar_common/forms_common.py:2072 +#: ishtar_common/forms_common.py:2274 ishtar_common/models.py:4146 msgid "Medium" msgstr "" -#: ishtar_common/forms_common.py:1664 ishtar_common/forms_common.py:1853 -#: ishtar_common/forms_common.py:2068 ishtar_common/forms_common.py:2270 -#: ishtar_common/models.py:4150 ishtar_common/models_imports.py:878 +#: ishtar_common/forms_common.py:1667 ishtar_common/forms_common.py:1856 +#: ishtar_common/forms_common.py:2071 ishtar_common/forms_common.py:2273 +#: ishtar_common/models.py:4153 ishtar_common/models_imports.py:878 #: ishtar_common/models_imports.py:880 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:88 #: ishtar_common/templates/ishtar/sheet_document.html:50 msgid "Format" msgstr "" -#: ishtar_common/forms_common.py:1666 ishtar_common/forms_common.py:2070 -#: ishtar_common/forms_common.py:2272 ishtar_common/models.py:4155 +#: ishtar_common/forms_common.py:1669 ishtar_common/forms_common.py:2073 +#: ishtar_common/forms_common.py:2275 ishtar_common/models.py:4158 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:98 msgid "Scale" msgstr "" -#: ishtar_common/forms_common.py:1684 ishtar_common/forms_common.py:1855 -#: ishtar_common/forms_common.py:2496 ishtar_common/forms_common.py:2497 -#: ishtar_common/models.py:3558 ishtar_common/models.py:3808 -#: ishtar_common/models.py:4157 +#: ishtar_common/forms_common.py:1687 ishtar_common/forms_common.py:1858 +#: ishtar_common/forms_common.py:2499 ishtar_common/forms_common.py:2500 +#: ishtar_common/models.py:3561 ishtar_common/models.py:3811 +#: ishtar_common/models.py:4160 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:9 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:9 #: ishtar_common/templates/ishtar/sheet_document.html:66 msgid "Authors" msgstr "" -#: ishtar_common/forms_common.py:1690 ishtar_common/forms_common.py:2074 -#: ishtar_common/models.py:4099 +#: ishtar_common/forms_common.py:1693 ishtar_common/forms_common.py:2077 +#: ishtar_common/models.py:4102 msgid "Publisher" msgstr "" -#: ishtar_common/forms_common.py:1714 ishtar_common/forms_common.py:2096 -#: ishtar_common/models.py:4106 +#: ishtar_common/forms_common.py:1717 ishtar_common/forms_common.py:2099 +#: ishtar_common/models.py:4109 msgid "Year of publication" msgstr "" -#: ishtar_common/forms_common.py:1719 +#: ishtar_common/forms_common.py:1722 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:64 msgid "Licenses" msgstr "" -#: ishtar_common/forms_common.py:1722 ishtar_common/models.py:4111 +#: ishtar_common/forms_common.py:1725 ishtar_common/models.py:4114 msgid "Tags" msgstr "" -#: ishtar_common/forms_common.py:1728 ishtar_common/forms_common.py:2097 -#: ishtar_common/models.py:996 ishtar_common/models.py:4114 +#: ishtar_common/forms_common.py:1731 ishtar_common/forms_common.py:2100 +#: ishtar_common/models.py:996 ishtar_common/models.py:4117 #: ishtar_common/models_imports.py:883 overload_translation/models.py:11 msgid "Language" msgstr "" -#: ishtar_common/forms_common.py:1731 ishtar_common/forms_common.py:2099 -#: ishtar_common/models.py:4119 +#: ishtar_common/forms_common.py:1734 ishtar_common/forms_common.py:2102 +#: ishtar_common/models.py:4122 msgid "ISSN" msgstr "" -#: ishtar_common/forms_common.py:1737 ishtar_common/forms_common.py:2098 -#: ishtar_common/models.py:4120 +#: ishtar_common/forms_common.py:1740 ishtar_common/forms_common.py:2101 +#: ishtar_common/models.py:4123 msgid "ISBN" msgstr "" -#: ishtar_common/forms_common.py:1743 ishtar_common/forms_common.py:1858 -#: ishtar_common/forms_common.py:2108 ishtar_common/models.py:4123 -#: ishtar_common/models.py:5182 -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:7 +#: ishtar_common/forms_common.py:1746 ishtar_common/forms_common.py:1861 +#: ishtar_common/forms_common.py:2111 ishtar_common/models.py:4126 +#: ishtar_common/models.py:5185 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:8 #: ishtar_common/templates/ishtar/sheet_document.html:93 msgid "Source" msgstr "" -#: ishtar_common/forms_common.py:1746 ishtar_common/forms_common.py:2114 -#: ishtar_common/models.py:4130 +#: ishtar_common/forms_common.py:1749 ishtar_common/forms_common.py:2117 +#: ishtar_common/models.py:4133 msgid "Source - free input" msgstr "" -#: ishtar_common/forms_common.py:1751 ishtar_common/models.py:4136 +#: ishtar_common/forms_common.py:1754 ishtar_common/models.py:4139 msgid "Source - page range" msgstr "" -#: ishtar_common/forms_common.py:1755 +#: ishtar_common/forms_common.py:1758 msgid "" "Unique page: \"242\", page range: \"242-245\", multiple pages: " "\"242;245;249\", multiples pages and multiple pages ranges: " "\"242-245;249;262-265\"." msgstr "" -#: ishtar_common/forms_common.py:1761 ishtar_common/models.py:4166 +#: ishtar_common/forms_common.py:1764 ishtar_common/models.py:4169 msgid "Numerical ressource (web address)" msgstr "" -#: ishtar_common/forms_common.py:1764 +#: ishtar_common/forms_common.py:1767 msgid "Image" msgstr "" -#: ishtar_common/forms_common.py:1772 +#: ishtar_common/forms_common.py:1775 #: ishtar_common/templates/ishtar/sheet_document.html:58 msgctxt "Not directory" msgid "File" msgstr "" -#: ishtar_common/forms_common.py:1789 ishtar_common/models.py:4169 +#: ishtar_common/forms_common.py:1792 ishtar_common/models.py:4172 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:150 msgid "Receipt date" msgstr "" -#: ishtar_common/forms_common.py:1795 ishtar_common/models.py:4175 +#: ishtar_common/forms_common.py:1798 ishtar_common/models.py:4178 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:160 msgid "Receipt date in documentation" msgstr "" -#: ishtar_common/forms_common.py:1802 ishtar_common/models.py:4189 +#: ishtar_common/forms_common.py:1805 ishtar_common/models.py:4192 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:182 msgid "Additional information" msgstr "" -#: ishtar_common/forms_common.py:1804 ishtar_common/forms_common.py:2104 -#: ishtar_common/models.py:4191 +#: ishtar_common/forms_common.py:1807 ishtar_common/forms_common.py:2107 +#: ishtar_common/models.py:4194 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:108 msgid "Has a duplicate" msgstr "" -#: ishtar_common/forms_common.py:1851 ishtar_common/forms_common.py:2669 +#: ishtar_common/forms_common.py:1854 ishtar_common/forms_common.py:2671 #: ishtar_common/templates/ishtar/forms/base_related_items.html:5 #: ishtar_common/templates/ishtar/sheet_document.html:120 msgid "Related items" msgstr "" -#: ishtar_common/forms_common.py:1857 +#: ishtar_common/forms_common.py:1860 #: ishtar_common/templates/ishtar/sheet_document.html:83 msgid "Publishing" msgstr "" -#: ishtar_common/forms_common.py:1860 +#: ishtar_common/forms_common.py:1863 msgid "Advanced" msgstr "" -#: ishtar_common/forms_common.py:1907 +#: ishtar_common/forms_common.py:1910 msgid "Incorrect page range." msgstr "" -#: ishtar_common/forms_common.py:1994 +#: ishtar_common/forms_common.py:1997 msgid "" "You should at least fill one of this field: title, url, image or file. If " "you have provided an image check that it is not corrupted." msgstr "" -#: ishtar_common/forms_common.py:2003 +#: ishtar_common/forms_common.py:2006 msgid "A document has to be attached at least to one item" msgstr "" -#: ishtar_common/forms_common.py:2046 +#: ishtar_common/forms_common.py:2049 msgid "Document - 001 - Search" msgstr "" -#: ishtar_common/forms_common.py:2059 ishtar_common/forms_common.py:2265 -#: ishtar_common/forms_common.py:2432 ishtar_common/forms_common.py:2483 -#: ishtar_common/models.py:3557 +#: ishtar_common/forms_common.py:2062 ishtar_common/forms_common.py:2268 +#: ishtar_common/forms_common.py:2435 ishtar_common/forms_common.py:2486 +#: ishtar_common/models.py:3560 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:139 msgid "Author" msgstr "" -#: ishtar_common/forms_common.py:2072 +#: ishtar_common/forms_common.py:2075 msgid "Tag" msgstr "" -#: ishtar_common/forms_common.py:2100 ishtar_common/models.py:4109 +#: ishtar_common/forms_common.py:2103 ishtar_common/models.py:4112 msgid "License" msgstr "" -#: ishtar_common/forms_common.py:2103 +#: ishtar_common/forms_common.py:2106 msgid "Additional informations" msgstr "" -#: ishtar_common/forms_common.py:2105 +#: ishtar_common/forms_common.py:2108 msgid "Has a file?" msgstr "" -#: ishtar_common/forms_common.py:2116 +#: ishtar_common/forms_common.py:2119 msgid "Warehouse - Container" msgstr "" -#: ishtar_common/forms_common.py:2124 +#: ishtar_common/forms_common.py:2127 msgid "Warehouse - Reference container" msgstr "" -#: ishtar_common/forms_common.py:2141 +#: ishtar_common/forms_common.py:2144 #, fuzzy #| msgid "email address" msgid "Operation - type" msgstr "E-Mail-Adresse" -#: ishtar_common/forms_common.py:2154 +#: ishtar_common/forms_common.py:2157 msgid "Basket - Finds" msgstr "" -#: ishtar_common/forms_common.py:2169 +#: ishtar_common/forms_common.py:2172 msgid "Find - denomination" msgstr "" -#: ishtar_common/forms_common.py:2179 ishtar_common/forms_common.py:2191 +#: ishtar_common/forms_common.py:2182 ishtar_common/forms_common.py:2194 msgid "Receipt date before" msgstr "" -#: ishtar_common/forms_common.py:2182 ishtar_common/forms_common.py:2194 +#: ishtar_common/forms_common.py:2185 ishtar_common/forms_common.py:2197 msgid "Receipt date after" msgstr "" -#: ishtar_common/forms_common.py:2185 +#: ishtar_common/forms_common.py:2188 msgid "Creation date before" msgstr "" -#: ishtar_common/forms_common.py:2188 +#: ishtar_common/forms_common.py:2191 msgid "Creation date after" msgstr "" -#: ishtar_common/forms_common.py:2216 ishtar_common/forms_common.py:2231 +#: ishtar_common/forms_common.py:2219 ishtar_common/forms_common.py:2234 msgid "Document search" msgstr "" -#: ishtar_common/forms_common.py:2250 +#: ishtar_common/forms_common.py:2253 msgid "Document - Quick action - Modify" msgstr "" -#: ishtar_common/forms_common.py:2263 ishtar_common/models_imports.py:875 +#: ishtar_common/forms_common.py:2266 ishtar_common/models_imports.py:875 #: ishtar_common/models_imports.py:876 msgid "Source type" msgstr "" -#: ishtar_common/forms_common.py:2292 +#: ishtar_common/forms_common.py:2295 msgid "Edit duplicated item" msgstr "" -#: ishtar_common/forms_common.py:2366 +#: ishtar_common/forms_common.py:2369 msgid "current and reference containers" msgstr "" -#: ishtar_common/forms_common.py:2405 +#: ishtar_common/forms_common.py:2408 #: ishtar_common/templates/ishtar/import_table.html:33 msgid "Action" msgstr "" -#: ishtar_common/forms_common.py:2405 +#: ishtar_common/forms_common.py:2408 msgid "Lock" msgstr "" -#: ishtar_common/forms_common.py:2405 +#: ishtar_common/forms_common.py:2408 msgid "Unlock" msgstr "" -#: ishtar_common/forms_common.py:2423 +#: ishtar_common/forms_common.py:2426 msgid "Would you like to delete this documentation?" msgstr "" -#: ishtar_common/forms_common.py:2443 ishtar_common/models.py:3528 -#: ishtar_common/models.py:3549 ishtar_common/models_imports.py:877 +#: ishtar_common/forms_common.py:2446 ishtar_common/models.py:3531 +#: ishtar_common/models.py:3552 ishtar_common/models_imports.py:877 msgid "Author type" msgstr "" -#: ishtar_common/forms_common.py:2460 +#: ishtar_common/forms_common.py:2463 msgid "This author already exist." msgstr "" -#: ishtar_common/forms_common.py:2472 +#: ishtar_common/forms_common.py:2475 msgid "Author selection" msgstr "" -#: ishtar_common/forms_common.py:2490 +#: ishtar_common/forms_common.py:2493 msgid "There are identical authors." msgstr "" -#: ishtar_common/forms_common.py:2503 ishtar_common/forms_common.py:2568 +#: ishtar_common/forms_common.py:2506 ishtar_common/forms_common.py:2571 #: ishtar_common/models.py:974 msgid "Query" msgstr "" -#: ishtar_common/forms_common.py:2507 ishtar_common/models.py:981 +#: ishtar_common/forms_common.py:2510 ishtar_common/models.py:981 msgid "Is an alert" msgstr "" -#: ishtar_common/forms_common.py:2529 +#: ishtar_common/forms_common.py:2532 msgid "A label is required for a new search query." msgstr "" -#: ishtar_common/forms_common.py:2533 +#: ishtar_common/forms_common.py:2536 msgid "Select the search query to update" msgstr "" -#: ishtar_common/forms_common.py:2540 ishtar_common/forms_common.py:2561 +#: ishtar_common/forms_common.py:2543 ishtar_common/forms_common.py:2564 msgid "Query does not exist." msgstr "" -#: ishtar_common/forms_common.py:2596 +#: ishtar_common/forms_common.py:2599 msgid "Geo item" msgstr "" -#: ishtar_common/forms_common.py:2597 +#: ishtar_common/forms_common.py:2600 msgid "Geo item - General" msgstr "" -#: ishtar_common/forms_common.py:2615 ishtar_common/models_common.py:2142 +#: ishtar_common/forms_common.py:2617 ishtar_common/models_common.py:2143 msgid "Import key" msgstr "" -#: ishtar_common/forms_common.py:2618 +#: ishtar_common/forms_common.py:2620 msgid "" "An update via import corresponding to the source element and this key will " "overwrite the data." msgstr "" -#: ishtar_common/forms_common.py:2626 ishtar_common/models_common.py:2157 -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:6 +#: ishtar_common/forms_common.py:2628 ishtar_common/models_common.py:2158 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:7 msgid "Data type" msgstr "" -#: ishtar_common/forms_common.py:2629 ishtar_common/models_common.py:2149 -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:10 +#: ishtar_common/forms_common.py:2631 ishtar_common/models_common.py:2150 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:11 msgid "Origin" msgstr "" -#: ishtar_common/forms_common.py:2632 ishtar_common/models_common.py:2165 -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:11 +#: ishtar_common/forms_common.py:2634 ishtar_common/models_common.py:2166 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:12 msgid "Provider" msgstr "" -#: ishtar_common/forms_common.py:2635 ishtar_common/forms_common.py:2672 -#: ishtar_common/models_common.py:2131 +#: ishtar_common/forms_common.py:2637 ishtar_common/forms_common.py:2674 +#: ishtar_common/models_common.py:2132 msgid "Buffer" msgstr "" -#: ishtar_common/forms_common.py:2639 +#: ishtar_common/forms_common.py:2641 msgid "Buffer type" msgstr "" -#: ishtar_common/forms_common.py:2670 +#: ishtar_common/forms_common.py:2672 msgid "Meta-data" msgstr "" -#: ishtar_common/forms_common.py:2671 +#: ishtar_common/forms_common.py:2673 msgid "Geography" msgstr "" -#: ishtar_common/forms_common.py:2842 +#: ishtar_common/forms_common.py:2859 msgid "If you set a buffer set a buffer type." msgstr "" -#: ishtar_common/forms_common.py:2847 +#: ishtar_common/forms_common.py:2864 msgid "If you set a buffer type set a buffer." msgstr "" -#: ishtar_common/forms_common.py:2863 +#: ishtar_common/forms_common.py:2869 +msgid "A value is expected for Z." +msgstr "" + +#: ishtar_common/forms_common.py:2888 msgid "A geo item has to be attached at least to one item" msgstr "" -#: ishtar_common/forms_common.py:2902 +#: ishtar_common/forms_common.py:2927 msgid "Geometry type" msgstr "" -#: ishtar_common/forms_common.py:2906 +#: ishtar_common/forms_common.py:2930 ishtar_common/models_common.py:2112 +#: ishtar_common/models_common.py:3539 +msgid "Point" +msgstr "" + +#: ishtar_common/forms_common.py:2931 msgid "Point 3D" msgstr "" -#: ishtar_common/forms_common.py:2907 +#: ishtar_common/forms_common.py:2932 msgid "Multi-points" msgstr "" -#: ishtar_common/forms_common.py:2908 +#: ishtar_common/forms_common.py:2933 msgid "Multi-lines" msgstr "" -#: ishtar_common/forms_common.py:2909 +#: ishtar_common/forms_common.py:2934 msgid "Multi-polygons" msgstr "" @@ -9400,7 +9406,7 @@ msgid "Addition/modification" msgstr "" #: ishtar_common/ishtar_menu.py:60 ishtar_common/models.py:1761 -#: ishtar_common/views.py:1379 +#: ishtar_common/views.py:1380 msgid "Global variables" msgstr "" @@ -9412,11 +9418,11 @@ msgstr "" msgid "Imports" msgstr "" -#: ishtar_common/ishtar_menu.py:182 ishtar_common/views.py:1435 +#: ishtar_common/ishtar_menu.py:182 ishtar_common/views.py:1436 msgid "Current imports" msgstr "" -#: ishtar_common/ishtar_menu.py:188 ishtar_common/views.py:1915 +#: ishtar_common/ishtar_menu.py:188 ishtar_common/views.py:1916 msgid "Old imports" msgstr "" @@ -10334,955 +10340,961 @@ msgstr "" msgid "Error: planning_service type is missing" msgstr "" -#: ishtar_common/models.py:2429 ishtar_common/models.py:2598 +#: ishtar_common/models.py:2429 ishtar_common/models.py:2601 msgid "Error: general_contractor type is missing" msgstr "" -#: ishtar_common/models.py:2496 +#: ishtar_common/models.py:2503 msgid "Organizations" msgstr "" -#: ishtar_common/models.py:2524 +#: ishtar_common/models.py:2531 msgid "unknown organization" msgstr "" -#: ishtar_common/models.py:2576 +#: ishtar_common/models.py:2579 msgid "/" msgstr "" -#: ishtar_common/models.py:2582 +#: ishtar_common/models.py:2585 msgid "Error: sra_agent and head_scientist types are missing" msgstr "" -#: ishtar_common/models.py:2590 +#: ishtar_common/models.py:2593 msgid "Error: sra_agent type is missing" msgstr "" -#: ishtar_common/models.py:2606 +#: ishtar_common/models.py:2609 msgid "Error: responsible_planning_service type is missing" msgstr "" -#: ishtar_common/models.py:2618 +#: ishtar_common/models.py:2621 msgid "Error: publisher type is missing" msgstr "" -#: ishtar_common/models.py:2626 +#: ishtar_common/models.py:2629 msgid "Error: operator type is missing" msgstr "" -#: ishtar_common/models.py:2630 ishtar_common/models.py:2643 +#: ishtar_common/models.py:2633 ishtar_common/models.py:2646 msgid "Long title" msgstr "" -#: ishtar_common/models.py:2633 ishtar_common/models_imports.py:926 +#: ishtar_common/models.py:2636 ishtar_common/models_imports.py:926 msgid "Title type" msgstr "" -#: ishtar_common/models.py:2634 +#: ishtar_common/models.py:2637 msgid "Title types" msgstr "" -#: ishtar_common/models.py:2660 +#: ishtar_common/models.py:2663 msgid "Mr" msgstr "" -#: ishtar_common/models.py:2661 +#: ishtar_common/models.py:2664 msgid "Miss" msgstr "" -#: ishtar_common/models.py:2662 +#: ishtar_common/models.py:2665 msgid "Mr and Mrs" msgstr "" -#: ishtar_common/models.py:2663 +#: ishtar_common/models.py:2666 msgid "Mrs" msgstr "" -#: ishtar_common/models.py:2664 +#: ishtar_common/models.py:2667 msgid "Doctor" msgstr "" -#: ishtar_common/models.py:2710 ishtar_common/models.py:3284 +#: ishtar_common/models.py:2713 ishtar_common/models.py:3287 msgctxt "key for text search" msgid "surname" msgstr "" -#: ishtar_common/models.py:2713 ishtar_common/models.py:3288 +#: ishtar_common/models.py:2716 ishtar_common/models.py:3291 msgctxt "key for text search" msgid "email" msgstr "e-mail-adresse" -#: ishtar_common/models.py:2720 ishtar_common/models.py:3296 +#: ishtar_common/models.py:2723 ishtar_common/models.py:3299 msgctxt "key for text search" msgid "organization" msgstr "" -#: ishtar_common/models.py:2724 +#: ishtar_common/models.py:2727 msgctxt "key for text search" msgid "has-account" msgstr "" -#: ishtar_common/models.py:2760 +#: ishtar_common/models.py:2763 msgid "" "Attention, historical and unfortunate residue in the code of an initial " "translation error." msgstr "" -#: ishtar_common/models.py:2767 +#: ishtar_common/models.py:2770 msgid "Contact type" msgstr "" -#: ishtar_common/models.py:2770 ishtar_common/models.py:2889 +#: ishtar_common/models.py:2773 ishtar_common/models.py:2892 msgid "Types" msgstr "" -#: ishtar_common/models.py:2775 +#: ishtar_common/models.py:2778 msgid "Is attached to" msgstr "" -#: ishtar_common/models.py:2786 +#: ishtar_common/models.py:2789 msgid "Persons" msgstr "" -#: ishtar_common/models.py:3046 +#: ishtar_common/models.py:3049 msgid "Manage account" msgstr "" -#: ishtar_common/models.py:3070 +#: ishtar_common/models.py:3073 msgid "Groups" msgstr "" -#: ishtar_common/models.py:3074 +#: ishtar_common/models.py:3077 msgid "Profile types" msgstr "" -#: ishtar_common/models.py:3085 +#: ishtar_common/models.py:3088 msgid "Profile type summary" msgstr "" -#: ishtar_common/models.py:3086 +#: ishtar_common/models.py:3089 msgid "Profile types summary" msgstr "" -#: ishtar_common/models.py:3101 +#: ishtar_common/models.py:3104 msgid "Show field number" msgstr "" -#: ishtar_common/models.py:3102 +#: ishtar_common/models.py:3105 msgid "Automatically pin" msgstr "" -#: ishtar_common/models.py:3103 +#: ishtar_common/models.py:3106 msgid "Display pin menu" msgstr "" -#: ishtar_common/models.py:3105 +#: ishtar_common/models.py:3108 msgid "Use background tasks" msgstr "" -#: ishtar_common/models.py:3106 +#: ishtar_common/models.py:3109 msgid "" "If set to true, each import, export, document generation is set as a " "background task." msgstr "" -#: ishtar_common/models.py:3110 +#: ishtar_common/models.py:3113 msgid "Send email when the task is finished" msgstr "" -#: ishtar_common/models.py:3120 +#: ishtar_common/models.py:3123 msgid "User profile" msgstr "" -#: ishtar_common/models.py:3121 +#: ishtar_common/models.py:3124 msgid "User profiles" msgstr "" -#: ishtar_common/models.py:3207 ishtar_common/models.py:4949 +#: ishtar_common/models.py:3210 ishtar_common/models.py:4952 msgid "Scheduled" msgstr "" -#: ishtar_common/models.py:3208 ishtar_common/models.py:4950 +#: ishtar_common/models.py:3211 ishtar_common/models.py:4953 msgid "In progress" msgstr "" -#: ishtar_common/models.py:3209 ishtar_common/models.py:4952 +#: ishtar_common/models.py:3212 ishtar_common/models.py:4955 #: ishtar_common/models_imports.py:1058 msgid "Finished" msgstr "" -#: ishtar_common/models.py:3215 +#: ishtar_common/models.py:3218 msgid "Generate label" msgstr "" -#: ishtar_common/models.py:3227 +#: ishtar_common/models.py:3230 msgid "View" msgstr "" -#: ishtar_common/models.py:3229 +#: ishtar_common/models.py:3232 msgid "Arguments" msgstr "" -#: ishtar_common/models.py:3237 ishtar_common/models.py:4966 -#: ishtar_common/models.py:5121 +#: ishtar_common/models.py:3240 ishtar_common/models.py:4969 +#: ishtar_common/models.py:5124 msgid "Result" msgstr "" -#: ishtar_common/models.py:3240 +#: ishtar_common/models.py:3243 msgid "Background task" msgstr "" -#: ishtar_common/models.py:3241 +#: ishtar_common/models.py:3244 msgid "Background tasks" msgstr "" -#: ishtar_common/models.py:3277 +#: ishtar_common/models.py:3280 msgctxt "key for text search" msgid "username" msgstr "" -#: ishtar_common/models.py:3312 +#: ishtar_common/models.py:3315 msgid "Advanced shortcut menu" msgstr "" -#: ishtar_common/models.py:3316 +#: ishtar_common/models.py:3319 msgid "Ishtar user" msgstr "" -#: ishtar_common/models.py:3317 +#: ishtar_common/models.py:3320 msgid "Ishtar users" msgstr "" -#: ishtar_common/models.py:3411 +#: ishtar_common/models.py:3414 msgid "Public" msgstr "" -#: ishtar_common/models.py:3529 +#: ishtar_common/models.py:3532 msgid "Author types" msgstr "" -#: ishtar_common/models.py:3612 +#: ishtar_common/models.py:3615 msgid "COInS export - type" msgstr "" -#: ishtar_common/models.py:3615 +#: ishtar_common/models.py:3618 msgid "COInS export - genre" msgstr "" -#: ishtar_common/models.py:3618 +#: ishtar_common/models.py:3621 msgid "Is localized" msgstr "" -#: ishtar_common/models.py:3620 +#: ishtar_common/models.py:3623 msgid "Setting a language for this type of document is relevant" msgstr "" -#: ishtar_common/models.py:3625 +#: ishtar_common/models.py:3628 msgid "Document type" msgstr "" -#: ishtar_common/models.py:3626 +#: ishtar_common/models.py:3629 msgid "Document types" msgstr "" -#: ishtar_common/models.py:3639 ishtar_common/models.py:3666 +#: ishtar_common/models.py:3642 ishtar_common/models.py:3669 msgid "Only available for these document types" msgstr "" -#: ishtar_common/models.py:3643 ishtar_common/models_imports.py:884 +#: ishtar_common/models.py:3646 ishtar_common/models_imports.py:884 #: ishtar_common/models_imports.py:925 msgid "Support type" msgstr "" -#: ishtar_common/models.py:3644 +#: ishtar_common/models.py:3647 msgid "Support types" msgstr "" -#: ishtar_common/models.py:3653 +#: ishtar_common/models.py:3656 msgid "Iframe template" msgstr "" -#: ishtar_common/models.py:3657 +#: ishtar_common/models.py:3660 msgid "" "Template to insert an iframe for this format. Use django template with a " "{{document}} variable matching the current document." msgstr "" -#: ishtar_common/models.py:3670 +#: ishtar_common/models.py:3673 msgid "Format type" msgstr "" -#: ishtar_common/models.py:3671 +#: ishtar_common/models.py:3674 msgid "Format types" msgstr "" -#: ishtar_common/models.py:3680 ishtar_common/models_rest.py:93 +#: ishtar_common/models.py:3683 ishtar_common/models_rest.py:93 +#: ishtar_common/templates/ishtar/merge_organization.html:11 +#: ishtar_common/templates/ishtar/merge_organization.html:22 msgid "URL" msgstr "" -#: ishtar_common/models.py:3683 ishtar_common/models_imports.py:881 +#: ishtar_common/models.py:3686 ishtar_common/models_imports.py:881 msgid "License type" msgstr "" -#: ishtar_common/models.py:3684 +#: ishtar_common/models.py:3687 msgid "License types" msgstr "" -#: ishtar_common/models.py:3693 +#: ishtar_common/models.py:3696 msgid "Document tags" msgstr "" -#: ishtar_common/models.py:3809 +#: ishtar_common/models.py:3812 msgid "Identifier" msgstr "" -#: ishtar_common/models.py:3832 +#: ishtar_common/models.py:3835 msgctxt "key for text search" msgid "author" msgstr "" -#: ishtar_common/models.py:3836 +#: ishtar_common/models.py:3839 msgctxt "key for text search" msgid "publisher" msgstr "" -#: ishtar_common/models.py:3840 +#: ishtar_common/models.py:3843 msgctxt "key for text search" msgid "publishing-year" msgstr "" -#: ishtar_common/models.py:3844 +#: ishtar_common/models.py:3847 msgctxt "key for text search" msgid "title" msgstr "" -#: ishtar_common/models.py:3855 +#: ishtar_common/models.py:3858 msgctxt "key for text search" msgid "internal-reference" msgstr "" -#: ishtar_common/models.py:3863 +#: ishtar_common/models.py:3866 msgctxt "key for text search" msgid "tag" msgstr "" -#: ishtar_common/models.py:3866 +#: ishtar_common/models.py:3869 msgctxt "key for text search" msgid "format" msgstr "" -#: ishtar_common/models.py:3870 +#: ishtar_common/models.py:3873 msgctxt "key for text search" msgid "medium" msgstr "" -#: ishtar_common/models.py:3874 +#: ishtar_common/models.py:3877 msgctxt "key for text search" msgid "language" msgstr "" -#: ishtar_common/models.py:3878 +#: ishtar_common/models.py:3881 msgctxt "key for text search" msgid "license" msgstr "" -#: ishtar_common/models.py:3882 +#: ishtar_common/models.py:3885 msgctxt "key for text search" msgid "scale" msgstr "" -#: ishtar_common/models.py:3885 +#: ishtar_common/models.py:3888 msgctxt "key for text search" msgid "url" msgstr "" -#: ishtar_common/models.py:3889 +#: ishtar_common/models.py:3892 msgctxt "key for text search" msgid "isbn" msgstr "" -#: ishtar_common/models.py:3892 +#: ishtar_common/models.py:3895 msgctxt "key for text search" msgid "issn" msgstr "" -#: ishtar_common/models.py:3895 +#: ishtar_common/models.py:3898 msgctxt "key for text search" msgid "source" msgstr "" -#: ishtar_common/models.py:3899 +#: ishtar_common/models.py:3902 msgctxt "key for text search" msgid "source-free-input" msgstr "" -#: ishtar_common/models.py:3903 +#: ishtar_common/models.py:3906 msgctxt "key for text search" msgid "warehouse-container" msgstr "" -#: ishtar_common/models.py:3907 +#: ishtar_common/models.py:3910 msgctxt "key for text search" msgid "warehouse-container-reference" msgstr "" -#: ishtar_common/models.py:3914 +#: ishtar_common/models.py:3917 msgctxt "key for text search" msgid "additional-information" msgstr "" -#: ishtar_common/models.py:3918 +#: ishtar_common/models.py:3921 msgctxt "key for text search" msgid "has-duplicate" msgstr "" -#: ishtar_common/models.py:3937 +#: ishtar_common/models.py:3940 msgctxt "key for text search" msgid "basket-finds" msgstr "" -#: ishtar_common/models.py:3941 ishtar_common/models.py:4034 +#: ishtar_common/models.py:3944 ishtar_common/models.py:4037 msgctxt "key for text search" msgid "find" msgstr "" -#: ishtar_common/models.py:3961 ishtar_common/models.py:4037 +#: ishtar_common/models.py:3964 ishtar_common/models.py:4040 msgctxt "key for text search" msgid "warehouse" msgstr "" -#: ishtar_common/models.py:3965 ishtar_common/models_common.py:3231 +#: ishtar_common/models.py:3968 ishtar_common/models_common.py:3248 msgctxt "key for text search" msgid "has-image" msgstr "" -#: ishtar_common/models.py:3968 +#: ishtar_common/models.py:3971 msgctxt "key for text search" msgid "has-file" msgstr "" -#: ishtar_common/models.py:3972 +#: ishtar_common/models.py:3975 msgctxt "key for text search" msgid "receipt-date-before" msgstr "" -#: ishtar_common/models.py:3976 +#: ishtar_common/models.py:3979 msgctxt "key for text search" msgid "receipt-date-after" msgstr "" -#: ishtar_common/models.py:3981 +#: ishtar_common/models.py:3984 msgctxt "key for text search" msgid "receipt-in-documentation-date-before" msgstr "" -#: ishtar_common/models.py:3986 +#: ishtar_common/models.py:3989 msgctxt "key for text search" msgid "receipt-in-documentation-date-after" msgstr "" -#: ishtar_common/models.py:3990 +#: ishtar_common/models.py:3993 msgctxt "key for text search" msgid "creation-date-before" msgstr "" -#: ishtar_common/models.py:3994 +#: ishtar_common/models.py:3997 msgctxt "key for text search" msgid "creation-date-after" msgstr "" -#: ishtar_common/models.py:4041 +#: ishtar_common/models.py:4044 msgctxt "key for text search" msgid "treatment" msgstr "" -#: ishtar_common/models.py:4045 +#: ishtar_common/models.py:4048 msgctxt "key for text search" msgid "treatment-file" msgstr "" -#: ishtar_common/models.py:4160 +#: ishtar_common/models.py:4163 msgid "Authors (raw)" msgstr "" -#: ishtar_common/models.py:4177 +#: ishtar_common/models.py:4180 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:118 msgid "Number of items" msgstr "" -#: ishtar_common/models.py:4192 +#: ishtar_common/models.py:4195 msgid "Symbolic links" msgstr "" -#: ishtar_common/models.py:4194 +#: ishtar_common/models.py:4197 msgid "Related" msgstr "" -#: ishtar_common/models.py:4202 +#: ishtar_common/models.py:4205 #: ishtar_common/templates/ishtar/sheet_document.html:4 msgid "Document" msgstr "" -#: ishtar_common/models.py:4206 +#: ishtar_common/models.py:4209 msgid "Can view own Document" msgstr "" -#: ishtar_common/models.py:4207 +#: ishtar_common/models.py:4210 msgid "Can add own Document" msgstr "" -#: ishtar_common/models.py:4208 +#: ishtar_common/models.py:4211 msgid "Can change own Document" msgstr "" -#: ishtar_common/models.py:4209 +#: ishtar_common/models.py:4212 msgid "Can delete own Document" msgstr "" -#: ishtar_common/models.py:4428 +#: ishtar_common/models.py:4431 msgid "Add sub-document" msgstr "" -#: ishtar_common/models.py:4430 +#: ishtar_common/models.py:4433 msgid "sub-document" msgstr "" -#: ishtar_common/models.py:4845 +#: ishtar_common/models.py:4848 msgid "Is judiciary" msgstr "" -#: ishtar_common/models.py:4849 +#: ishtar_common/models.py:4852 msgid "Operation types" msgstr "" -#: ishtar_common/models.py:4899 +#: ishtar_common/models.py:4902 msgid "Judiciary" msgstr "" -#: ishtar_common/models.py:4936 +#: ishtar_common/models.py:4939 msgid "Filename" msgstr "" -#: ishtar_common/models.py:4940 +#: ishtar_common/models.py:4943 msgid "Administration script" msgstr "" -#: ishtar_common/models.py:4941 +#: ishtar_common/models.py:4944 msgid "Administration scripts" msgstr "" -#: ishtar_common/models.py:4951 ishtar_common/models_imports.py:1057 +#: ishtar_common/models.py:4954 ishtar_common/models_imports.py:1057 msgid "Finished with errors" msgstr "" -#: ishtar_common/models.py:4969 +#: ishtar_common/models.py:4972 msgid "Administration task" msgstr "" -#: ishtar_common/models.py:4970 +#: ishtar_common/models.py:4973 msgid "Administration tasks" msgstr "" -#: ishtar_common/models.py:4989 +#: ishtar_common/models.py:4992 msgid "" "ISHTAR_SCRIPT_DIR is not set in your local_settings. Contact your " "administrator." msgstr "" -#: ishtar_common/models.py:5001 +#: ishtar_common/models.py:5004 msgid "" "Your ISHTAR_SCRIPT_DIR is containing dots \"..\". As it can refer to " "relative paths, it can be a security issue and this is not allowed. Only put " "a full path." msgstr "" -#: ishtar_common/models.py:5014 +#: ishtar_common/models.py:5017 msgid "Your ISHTAR_SCRIPT_DIR: \"{}\" is not a valid directory." msgstr "" -#: ishtar_common/models.py:5031 +#: ishtar_common/models.py:5034 msgid "" "Script \"{}\" is not available in your script directory. Check your " "configuration." msgstr "" -#: ishtar_common/models.py:5071 ishtar_common/models_imports.py:1049 +#: ishtar_common/models.py:5074 ishtar_common/models_imports.py:1049 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:132 msgid "Created" msgstr "" -#: ishtar_common/models.py:5076 +#: ishtar_common/models.py:5079 msgid "Filter on" msgstr "" -#: ishtar_common/models.py:5079 ishtar_common/models_rest.py:63 +#: ishtar_common/models.py:5082 ishtar_common/models_rest.py:63 msgid "Filter query" msgstr "" -#: ishtar_common/models.py:5082 +#: ishtar_common/models.py:5085 msgid "Textual query on this item (try it on the main interface)" msgstr "" -#: ishtar_common/models.py:5085 +#: ishtar_common/models.py:5088 msgid "Export geographic data" msgstr "" -#: ishtar_common/models.py:5088 +#: ishtar_common/models.py:5091 msgid "" "Geographic data can represent large volume of information. Geographic data " "can be excluded from the export" msgstr "" -#: ishtar_common/models.py:5096 +#: ishtar_common/models.py:5099 msgid "Put locks on associated items" msgstr "" -#: ishtar_common/models.py:5101 +#: ishtar_common/models.py:5104 msgid "Lock user" msgstr "" -#: ishtar_common/models.py:5105 +#: ishtar_common/models.py:5108 msgid "" "Owner of the lock if item are locked. Warning: if no user is provided the " "locks can be remove by any user with the permission to edit." msgstr "" -#: ishtar_common/models.py:5110 +#: ishtar_common/models.py:5113 msgid "Export types" msgstr "" -#: ishtar_common/models.py:5111 +#: ishtar_common/models.py:5114 msgid "Export configuration" msgstr "" -#: ishtar_common/models.py:5112 +#: ishtar_common/models.py:5115 msgid "Export importers" msgstr "" -#: ishtar_common/models.py:5113 +#: ishtar_common/models.py:5116 msgid "Export towns, areas..." msgstr "" -#: ishtar_common/models.py:5114 +#: ishtar_common/models.py:5117 msgid "Export directory" msgstr "" -#: ishtar_common/models.py:5115 +#: ishtar_common/models.py:5118 msgid "Export documents" msgstr "" -#: ishtar_common/models.py:5116 +#: ishtar_common/models.py:5119 msgid "Export main items" msgstr "" -#: ishtar_common/models.py:5123 +#: ishtar_common/models.py:5126 msgid "Result information" msgstr "" -#: ishtar_common/models.py:5126 +#: ishtar_common/models.py:5129 msgid "Archive - Export" msgstr "" -#: ishtar_common/models.py:5127 +#: ishtar_common/models.py:5130 msgid "Archive - Exports" msgstr "" -#: ishtar_common/models.py:5138 +#: ishtar_common/models.py:5141 msgid "Whole database" msgstr "" -#: ishtar_common/models.py:5150 +#: ishtar_common/models.py:5153 msgid "To filter filter type and filter text must be filled." msgstr "" -#: ishtar_common/models.py:5162 +#: ishtar_common/models.py:5165 msgid "Import user" msgstr "" -#: ishtar_common/models.py:5166 +#: ishtar_common/models.py:5169 msgid "" "If set the \"Import user\" will be the editor for last version. If the field " "is left empty no history will be recorded." msgstr "" -#: ishtar_common/models.py:5175 +#: ishtar_common/models.py:5178 msgid "Delete before adding" msgstr "" -#: ishtar_common/models.py:5177 +#: ishtar_common/models.py:5180 msgid "Delete existing items before adding" msgstr "" -#: ishtar_common/models.py:5180 +#: ishtar_common/models.py:5183 msgid "Releasing locks on associated items" msgstr "" -#: ishtar_common/models.py:5185 +#: ishtar_common/models.py:5188 msgid "Archive - Import" msgstr "" -#: ishtar_common/models.py:5186 +#: ishtar_common/models.py:5189 msgid "Archive - Imports" msgstr "" -#: ishtar_common/models_common.py:836 +#: ishtar_common/models_common.py:837 msgid "Search vector" msgstr "" -#: ishtar_common/models_common.py:836 +#: ishtar_common/models_common.py:837 msgid "Auto filled at save" msgstr "" -#: ishtar_common/models_common.py:1399 +#: ishtar_common/models_common.py:1400 msgid "Last editor" msgstr "" -#: ishtar_common/models_common.py:1407 +#: ishtar_common/models_common.py:1408 msgid "Creator" msgstr "" -#: ishtar_common/models_common.py:1413 ishtar_common/models_common.py:2135 +#: ishtar_common/models_common.py:1414 ishtar_common/models_common.py:2136 msgid "Need update" msgstr "" -#: ishtar_common/models_common.py:1415 +#: ishtar_common/models_common.py:1416 msgid "Item locked for edition" msgstr "" -#: ishtar_common/models_common.py:1421 +#: ishtar_common/models_common.py:1422 msgid "Locked by" msgstr "" -#: ishtar_common/models_common.py:1439 +#: ishtar_common/models_common.py:1440 msgctxt "key for text search" msgid "modified-by" msgstr "" -#: ishtar_common/models_common.py:1443 +#: ishtar_common/models_common.py:1444 msgctxt "key for text search" msgid "modified-before" msgstr "" -#: ishtar_common/models_common.py:1447 +#: ishtar_common/models_common.py:1448 msgctxt "key for text search" msgid "modified-after" msgstr "" -#: ishtar_common/models_common.py:1450 +#: ishtar_common/models_common.py:1451 msgctxt "key for text search" msgid "locked" msgstr "" -#: ishtar_common/models_common.py:2007 ishtar_common/models_common.py:2025 +#: ishtar_common/models_common.py:2008 ishtar_common/models_common.py:2026 msgid "Authority name" msgstr "" -#: ishtar_common/models_common.py:2008 ishtar_common/models_common.py:2025 +#: ishtar_common/models_common.py:2009 ishtar_common/models_common.py:2026 msgid "Authority SRID" msgstr "" -#: ishtar_common/models_common.py:2011 +#: ishtar_common/models_common.py:2012 msgid "Geographic - Spatial reference system" msgstr "" -#: ishtar_common/models_common.py:2012 +#: ishtar_common/models_common.py:2013 msgid "Geographic - Spatial reference systems" msgstr "" -#: ishtar_common/models_common.py:2042 +#: ishtar_common/models_common.py:2043 msgid "Geographic - Origin type" msgstr "" -#: ishtar_common/models_common.py:2043 +#: ishtar_common/models_common.py:2044 msgid "Geographic - Origin types" msgstr "" -#: ishtar_common/models_common.py:2058 +#: ishtar_common/models_common.py:2059 msgid "Geographic - Data type" msgstr "" -#: ishtar_common/models_common.py:2059 +#: ishtar_common/models_common.py:2060 msgid "Geographic - Data types" msgstr "" -#: ishtar_common/models_common.py:2074 +#: ishtar_common/models_common.py:2075 msgid "Geographic - Provider type" msgstr "" -#: ishtar_common/models_common.py:2075 +#: ishtar_common/models_common.py:2076 msgid "Geographic - Provider types" msgstr "" -#: ishtar_common/models_common.py:2086 +#: ishtar_common/models_common.py:2087 msgid "Geographic - Buffer type" msgstr "" -#: ishtar_common/models_common.py:2087 +#: ishtar_common/models_common.py:2088 msgid "Geographic - Buffer types" msgstr "" -#: ishtar_common/models_common.py:2112 +#: ishtar_common/models_common.py:2113 msgid "Line(s)" msgstr "" -#: ishtar_common/models_common.py:2113 +#: ishtar_common/models_common.py:2114 msgid "Point(s)" msgstr "" -#: ishtar_common/models_common.py:2114 +#: ishtar_common/models_common.py:2115 msgid "Polygon(s)" msgstr "" -#: ishtar_common/models_common.py:2143 +#: ishtar_common/models_common.py:2144 msgid "Use this for update imports" msgstr "" -#: ishtar_common/models_common.py:2150 +#: ishtar_common/models_common.py:2151 msgid "For instance: topographical survey, georeferencing, ..." msgstr "" -#: ishtar_common/models_common.py:2158 +#: ishtar_common/models_common.py:2159 msgid "For instance: outline, z-sup, ..." msgstr "" -#: ishtar_common/models_common.py:2166 +#: ishtar_common/models_common.py:2167 msgid "Data provider" msgstr "" -#: ishtar_common/models_common.py:2169 ishtar_common/models_common.py:2170 -#: ishtar_common/models_common.py:2171 +#: ishtar_common/models_common.py:2170 ishtar_common/models_common.py:2171 +#: ishtar_common/models_common.py:2172 msgid "User input" msgstr "" -#: ishtar_common/models_common.py:2174 +#: ishtar_common/models_common.py:2175 msgid "X (cached)" msgstr "" -#: ishtar_common/models_common.py:2175 +#: ishtar_common/models_common.py:2176 msgid "Y (cached)" msgstr "" -#: ishtar_common/models_common.py:2176 +#: ishtar_common/models_common.py:2177 msgid "Z (cached)" msgstr "" -#: ishtar_common/models_common.py:2194 -msgid "Point (3D)" +#: ishtar_common/models_common.py:2194 ishtar_common/models_common.py:3540 +msgid "Point (2D)" msgstr "" #: ishtar_common/models_common.py:2195 -msgid "Multi points" +msgid "Point (3D)" msgstr "" #: ishtar_common/models_common.py:2196 -msgid "Multi lines" +msgid "Multi points" msgstr "" #: ishtar_common/models_common.py:2197 +msgid "Multi lines" +msgstr "" + +#: ishtar_common/models_common.py:2198 msgid "Multi polygons" msgstr "" -#: ishtar_common/models_common.py:2200 ishtar_common/models_common.py:2201 +#: ishtar_common/models_common.py:2201 ishtar_common/models_common.py:2202 msgid "Geographic - Vector data" msgstr "" -#: ishtar_common/models_common.py:2273 +#: ishtar_common/models_common.py:2274 msgid "Only 2 or 3 dimensions" msgstr "" -#: ishtar_common/models_common.py:2646 +#: ishtar_common/models_common.py:2647 msgid "Year of creation" msgstr "" -#: ishtar_common/models_common.py:2650 +#: ishtar_common/models_common.py:2651 msgid "Filling this field is relevant to distinguish old towns from new towns." msgstr "" -#: ishtar_common/models_common.py:2654 +#: ishtar_common/models_common.py:2655 msgid "Town children" msgstr "" -#: ishtar_common/models_common.py:2852 +#: ishtar_common/models_common.py:2856 msgid "Town (precise)" msgstr "" -#: ishtar_common/models_common.py:2885 +#: ishtar_common/models_common.py:2889 msgid "Raw phone" msgstr "" -#: ishtar_common/models_common.py:2891 +#: ishtar_common/models_common.py:2895 msgid "Alternative address is prefered" msgstr "" -#: ishtar_common/models_common.py:2928 +#: ishtar_common/models_common.py:2932 #, fuzzy #| msgid "email address" msgid "No associated address" msgstr "E-Mail-Adresse" -#: ishtar_common/models_common.py:3011 -msgid "Tel: " +#: ishtar_common/models_common.py:3013 +msgid "Postal code - Town" msgstr "" -#: ishtar_common/models_common.py:3015 -msgid "Mobile: " +#: ishtar_common/models_common.py:3023 +msgid "Mobile" msgstr "" -#: ishtar_common/models_common.py:3019 -msgid "Email: " -msgstr "E-Mail-Adresse: " - -#: ishtar_common/models_common.py:3024 +#: ishtar_common/models_common.py:3041 msgid "Merge key" msgstr "" -#: ishtar_common/models_common.py:3235 +#: ishtar_common/models_common.py:3252 msgctxt "key for text search" msgid "has-url" msgstr "" -#: ishtar_common/models_common.py:3239 +#: ishtar_common/models_common.py:3256 msgctxt "key for text search" msgid "has-attached-file" msgstr "" -#: ishtar_common/models_common.py:3315 +#: ishtar_common/models_common.py:3332 msgid "Add document/image" msgstr "" -#: ishtar_common/models_common.py:3317 +#: ishtar_common/models_common.py:3334 msgid "doc./image" msgstr "" -#: ishtar_common/models_common.py:3500 +#: ishtar_common/models_common.py:3517 msgid "Precise" msgstr "" -#: ishtar_common/models_common.py:3500 +#: ishtar_common/models_common.py:3517 msgid "Polygon" msgstr "" -#: ishtar_common/models_common.py:3525 +#: ishtar_common/models_common.py:3542 msgid "Point source" msgstr "" -#: ishtar_common/models_common.py:3528 +#: ishtar_common/models_common.py:3545 msgid "Point source item" msgstr "" -#: ishtar_common/models_common.py:3532 +#: ishtar_common/models_common.py:3547 +msgid "Multi polygon" +msgstr "" + +#: ishtar_common/models_common.py:3549 msgid "Multi-polygon source" msgstr "" -#: ishtar_common/models_common.py:3539 +#: ishtar_common/models_common.py:3556 msgid "Multi polygon source item" msgstr "" -#: ishtar_common/models_common.py:4086 +#: ishtar_common/models_common.py:4107 msgid "Regenerate ID" msgstr "" -#: ishtar_common/models_common.py:4088 +#: ishtar_common/models_common.py:4109 msgid "regen." msgstr "" @@ -11676,7 +11688,9 @@ msgid "Skip lines" msgstr "" #: ishtar_common/models_imports.py:1171 -msgid "Number of header lines in your file (can be 0)." +msgid "" +"Number of header lines in your file (can be 0 and should be 0 for geopackage " +"or Shapefile)." msgstr "" #: ishtar_common/models_imports.py:1174 @@ -11764,7 +11778,6 @@ msgid "Step by step re-import" msgstr "" #: ishtar_common/models_imports.py:1369 -#: ishtar_common/templates/ishtar/import_table.html:51 msgid "Archive" msgstr "" @@ -11779,7 +11792,7 @@ msgstr "" #: ishtar_common/models_imports.py:1375 #: ishtar_common/templates/ishtar/blocks/window_nav.html:66 #: ishtar_common/templates/ishtar/form_delete.html:11 -#: ishtar_common/views.py:2434 ishtar_common/widgets.py:452 +#: ishtar_common/views.py:2435 ishtar_common/widgets.py:452 #: ishtar_common/widgets.py:488 msgid "Delete" msgstr "" @@ -12009,13 +12022,13 @@ msgstr "" #: ishtar_common/templates/admin/change_form.html:24 #: ishtar_common/templates/admin/change_form.html:27 -#: ishtar_common/views.py:1673 ishtar_common/views.py:1677 +#: ishtar_common/views.py:1674 ishtar_common/views.py:1678 msgid "Previous" msgstr "" #: ishtar_common/templates/admin/change_form.html:32 #: ishtar_common/templates/admin/change_form.html:35 -#: ishtar_common/views.py:1680 ishtar_common/views.py:1682 +#: ishtar_common/views.py:1681 ishtar_common/views.py:1683 msgid "Next" msgstr "" @@ -12464,15 +12477,15 @@ msgctxt "Sheet" msgid "Modification" msgstr "" -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:5 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:6 msgid "Main" msgstr "" -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:8 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:9 msgid "Geometry" msgstr "" -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:32 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:33 msgid "geo item" msgstr "" @@ -12628,7 +12641,6 @@ msgstr "" #: ishtar_common/templates/ishtar/formset.html:8 #: ishtar_common/templates/ishtar/formset_import_match.html:113 #: ishtar_common/templates/ishtar/import_list.html:38 -#: ishtar_common/templates/ishtar/merge.html:42 #: 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 @@ -12792,7 +12804,7 @@ msgid "Go" msgstr "" #: ishtar_common/templates/ishtar/import_step_by_step.html:63 -#: ishtar_common/views.py:1516 +#: ishtar_common/views.py:1517 msgid "Import step by step" msgstr "" @@ -12915,6 +12927,11 @@ msgstr "" msgid "Match" msgstr "" +#: ishtar_common/templates/ishtar/import_table.html:51 +msgctxt "name" +msgid "Archive" +msgstr "" + #: ishtar_common/templates/ishtar/import_table.html:56 msgid "Media file" msgstr "" @@ -13395,7 +13412,7 @@ msgstr "" msgid "Loading..." msgstr "" -#: ishtar_common/utils.py:192 ishtar_common/views.py:121 +#: ishtar_common/utils.py:192 ishtar_common/views.py:122 msgid "You don't have sufficient permissions to do this action." msgstr "" @@ -13415,160 +13432,160 @@ msgstr "" msgid "The maximum supported file size is {} Mo." msgstr "" -#: ishtar_common/views.py:148 +#: ishtar_common/views.py:149 msgid "" "PROJECT_SLUG is set to \"default\". Change it in your local_settings (or ask " "your admin to do it)." msgstr "" -#: ishtar_common/views.py:156 +#: ishtar_common/views.py:157 msgid "" "The slug of your current profile is set to \"default\". Change it on the " "administration page (or ask your admin to do it)." msgstr "" -#: ishtar_common/views.py:198 +#: ishtar_common/views.py:199 msgid "Person modification" msgstr "" -#: ishtar_common/views.py:218 +#: ishtar_common/views.py:219 msgid "Person deletion" msgstr "" -#: ishtar_common/views.py:255 +#: ishtar_common/views.py:256 msgid "Organization modification" msgstr "" -#: ishtar_common/views.py:281 +#: ishtar_common/views.py:282 msgid "Organization deletion" msgstr "" -#: ishtar_common/views.py:307 +#: ishtar_common/views.py:308 msgid "Account management" msgstr "" -#: ishtar_common/views.py:316 +#: ishtar_common/views.py:317 msgid "Account deletion" msgstr "" -#: ishtar_common/views.py:983 ishtar_common/views_item.py:176 +#: ishtar_common/views.py:984 ishtar_common/views_item.py:176 #: ishtar_common/views_item.py:217 ishtar_common/views_item.py:234 msgid "Operation not permitted." msgstr "" -#: ishtar_common/views.py:1387 +#: ishtar_common/views.py:1388 msgid "Import: create (table)" msgstr "" -#: ishtar_common/views.py:1407 +#: ishtar_common/views.py:1408 msgid "Edit import" msgstr "" -#: ishtar_common/views.py:1429 +#: ishtar_common/views.py:1430 msgid "Import: create (GIS)" msgstr "" -#: ishtar_common/views.py:1865 +#: ishtar_common/views.py:1866 msgid "Col. " msgstr "" -#: ishtar_common/views.py:1872 ishtar_common/views.py:1887 +#: ishtar_common/views.py:1873 ishtar_common/views.py:1888 msgid "* empty *" msgstr "" -#: ishtar_common/views.py:1929 +#: ishtar_common/views.py:1930 msgid "Link unmatched items" msgstr "" -#: ishtar_common/views.py:1965 +#: ishtar_common/views.py:1966 msgid "Delete import" msgstr "" -#: ishtar_common/views.py:2003 +#: ishtar_common/views.py:2004 msgid "Merge persons" msgstr "" -#: ishtar_common/views.py:2027 +#: ishtar_common/views.py:2028 msgid "Select the main person" msgstr "" -#: ishtar_common/views.py:2035 +#: ishtar_common/views.py:2036 msgid "Merge organization" msgstr "" -#: ishtar_common/views.py:2045 +#: ishtar_common/views.py:2046 msgid "Select the main organization" msgstr "" -#: ishtar_common/views.py:2085 ishtar_common/views.py:2100 +#: ishtar_common/views.py:2086 ishtar_common/views.py:2101 msgid "Corporation manager" msgstr "" -#: ishtar_common/views.py:2114 +#: ishtar_common/views.py:2115 msgid "New tag" msgstr "" -#: ishtar_common/views.py:2127 +#: ishtar_common/views.py:2128 msgid "Document: search" msgstr "" -#: ishtar_common/views.py:2147 +#: ishtar_common/views.py:2148 msgid "Document creation" msgstr "" -#: ishtar_common/views.py:2215 +#: ishtar_common/views.py:2216 msgid "Document modification" msgstr "" -#: ishtar_common/views.py:2242 +#: ishtar_common/views.py:2243 msgid "Main image for" msgstr "" -#: ishtar_common/views.py:2267 +#: ishtar_common/views.py:2268 msgid "Document deletion" msgstr "" -#: ishtar_common/views.py:2304 +#: ishtar_common/views.py:2305 msgid "Error on your template" msgstr "" -#: ishtar_common/views.py:2410 +#: ishtar_common/views.py:2411 msgid "Delete bookmark" msgstr "" -#: ishtar_common/views.py:2433 +#: ishtar_common/views.py:2434 msgid "Bookmark - Delete" msgstr "" -#: ishtar_common/views.py:2476 +#: ishtar_common/views.py:2477 msgid "Some items have been locked by other users." msgstr "" -#: ishtar_common/views.py:2477 +#: ishtar_common/views.py:2478 msgid "Some items are locked." msgstr "" -#: ishtar_common/views.py:2482 +#: ishtar_common/views.py:2483 msgid "Not available" msgstr "" -#: ishtar_common/views.py:2483 +#: ishtar_common/views.py:2484 msgid "Action not available for these items." msgstr "" -#: ishtar_common/views.py:2601 +#: ishtar_common/views.py:2602 msgid "lock/unlock" msgstr "" -#: ishtar_common/views.py:2717 ishtar_common/views.py:2811 +#: ishtar_common/views.py:2718 ishtar_common/views.py:2852 msgid "Geo item creation" msgstr "" -#: ishtar_common/views.py:2762 +#: ishtar_common/views.py:2803 msgid "Geo item modification" msgstr "" -#: ishtar_common/views.py:2800 ishtar_common/views.py:2846 +#: ishtar_common/views.py:2841 ishtar_common/views.py:2887 msgid "Main geo item for" msgstr "" @@ -13653,6 +13670,9 @@ msgstr "" msgid "Translations overload" msgstr "" +#~ msgid "Email: " +#~ msgstr "E-Mail-Adresse: " + #, fuzzy #~| msgid "email address" #~ msgid "Display context records" diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index fa033835c..1d9afe7be 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-09-09 16:11+0200\n" +"POT-Creation-Date: 2022-09-29 11:29+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -18,17 +18,6 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: archaeological_context_records/admin.py:51 -#: archaeological_operations/admin.py:86 ishtar_common/forms_common.py:2905 -#: ishtar_common/models_common.py:2111 ishtar_common/models_common.py:3522 -msgid "Point" -msgstr "" - -#: archaeological_context_records/admin.py:53 archaeological_finds/admin.py:40 -#: archaeological_operations/admin.py:88 ishtar_common/models_common.py:3530 -msgid "Multi polygon" -msgstr "" - #: archaeological_context_records/forms.py:78 #: archaeological_context_records/forms.py:84 #: archaeological_context_records/models.py:527 @@ -47,12 +36,12 @@ msgstr "" #: archaeological_operations/models.py:2354 #: archaeological_operations/models.py:2470 #: archaeological_operations/models.py:2669 -#: archaeological_operations/models.py:2959 +#: archaeological_operations/models.py:2958 #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:254 #: archaeological_operations/wizards.py:266 -#: archaeological_warehouse/models.py:857 ishtar_common/forms_common.py:2133 -#: ishtar_common/models.py:5063 ishtar_common/views.py:396 +#: archaeological_warehouse/models.py:857 ishtar_common/forms_common.py:2136 +#: ishtar_common/models.py:5066 ishtar_common/views.py:397 msgid "Operation" msgstr "" @@ -97,7 +86,7 @@ msgid "Context record - 001 - Search" msgstr "" #: archaeological_context_records/forms.py:142 archaeological_files/forms.py:82 -#: archaeological_files/forms.py:883 archaeological_files/forms.py:920 +#: archaeological_files/forms.py:883 archaeological_files/forms.py:919 #: archaeological_finds/forms.py:1362 archaeological_finds/forms.py:2060 #: archaeological_finds/forms_treatments.py:52 #: archaeological_finds/forms_treatments.py:605 @@ -107,8 +96,8 @@ msgstr "" #: archaeological_operations/forms.py:1312 #: archaeological_operations/forms.py:1547 #: archaeological_warehouse/forms.py:140 archaeological_warehouse/forms.py:505 -#: ishtar_common/forms_common.py:581 ishtar_common/forms_common.py:758 -#: ishtar_common/forms_common.py:975 ishtar_common/forms_common.py:2050 +#: ishtar_common/forms_common.py:583 ishtar_common/forms_common.py:761 +#: ishtar_common/forms_common.py:978 ishtar_common/forms_common.py:2053 msgid "Full text search" msgstr "" @@ -123,7 +112,7 @@ msgid "ID" msgstr "" #: archaeological_context_records/forms.py:149 -#: archaeological_finds/forms.py:1382 archaeological_operations/forms.py:1866 +#: archaeological_finds/forms.py:1382 archaeological_operations/forms.py:1862 msgid "Code PATRIARCHE" msgstr "" @@ -132,7 +121,7 @@ msgid "Operation - name" msgstr "" #: archaeological_context_records/forms.py:152 -#: ishtar_common/forms_common.py:2144 +#: ishtar_common/forms_common.py:2147 msgid "Operation - year" msgstr "" @@ -145,7 +134,7 @@ msgstr "" #: archaeological_context_records/forms.py:737 #: archaeological_context_records/models.py:727 #: archaeological_operations/forms.py:550 -#: archaeological_operations/models.py:534 ishtar_common/models.py:5064 +#: archaeological_operations/models.py:534 ishtar_common/models.py:5067 msgid "Archaeological site" msgstr "" @@ -168,13 +157,13 @@ msgstr "" #: archaeological_context_records/models.py:705 #: archaeological_context_records/models.py:1416 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 -#: archaeological_files/forms.py:89 archaeological_files/forms.py:934 +#: archaeological_files/forms.py:89 archaeological_files/forms.py:932 #: archaeological_finds/models_finds.py:1097 #: archaeological_operations/forms.py:500 #: archaeological_operations/forms.py:1140 -#: archaeological_operations/forms.py:1563 -#: archaeological_operations/models.py:2983 -#: archaeological_operations/models.py:3230 +#: archaeological_operations/forms.py:1561 +#: archaeological_operations/models.py:2982 +#: archaeological_operations/models.py:3229 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Parcel" msgstr "" @@ -209,7 +198,7 @@ msgstr "" #: archaeological_files_pdl/forms.py:61 archaeological_operations/forms.py:756 #: archaeological_operations/forms.py:782 #: archaeological_operations/forms.py:1420 -#: archaeological_operations/forms.py:1618 +#: archaeological_operations/forms.py:1616 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:46 #: archaeological_operations/templates/ishtar/sheet_site.html:41 @@ -232,15 +221,15 @@ msgstr "" #: archaeological_finds/models_finds.py:1094 #: archaeological_operations/forms.py:71 archaeological_operations/forms.py:209 #: archaeological_operations/forms.py:1112 -#: archaeological_operations/models.py:2964 +#: archaeological_operations/models.py:2963 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:432 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:446 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:687 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:701 #: archaeological_warehouse/forms.py:145 ishtar_common/forms_common.py:84 -#: ishtar_common/forms_common.py:106 ishtar_common/models_common.py:2662 -#: ishtar_common/models_common.py:3500 +#: ishtar_common/forms_common.py:106 ishtar_common/models_common.py:2663 +#: ishtar_common/models_common.py:3517 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 msgid "Town" msgstr "" @@ -273,8 +262,8 @@ msgstr "" #: archaeological_finds/models_finds.py:1810 #: archaeological_finds/models_treatments.py:255 #: archaeological_finds/templates/ishtar/sheet_find.html:180 -#: ishtar_common/forms_common.py:1799 ishtar_common/forms_common.py:2067 -#: ishtar_common/models.py:1049 ishtar_common/models.py:4178 +#: ishtar_common/forms_common.py:1802 ishtar_common/forms_common.py:2070 +#: ishtar_common/models.py:1049 ishtar_common/models.py:4181 #: ishtar_common/models_imports.py:147 ishtar_common/models_imports.py:531 #: ishtar_common/models_imports.py:629 ishtar_common/models_imports.py:647 msgid "Description" @@ -351,7 +340,7 @@ msgid "Closing date" msgstr "" #: archaeological_context_records/forms.py:334 -#: ishtar_common/forms_common.py:1639 +#: ishtar_common/forms_common.py:1642 msgid "Documentation" msgstr "" @@ -368,59 +357,59 @@ msgstr "" #: archaeological_context_records/forms.py:346 #: archaeological_finds/forms.py:522 archaeological_operations/forms.py:1209 #: archaeological_operations/forms.py:1457 -#: archaeological_warehouse/forms.py:249 ishtar_common/forms_common.py:2904 +#: archaeological_warehouse/forms.py:249 ishtar_common/forms_common.py:2929 msgid "Coordinates" msgstr "" #: archaeological_context_records/forms.py:347 #: archaeological_finds/forms.py:523 archaeological_operations/forms.py:1210 #: archaeological_operations/forms.py:1458 -#: archaeological_warehouse/forms.py:250 ishtar_common/models_common.py:2169 -#: ishtar_common/models_common.py:3503 +#: archaeological_warehouse/forms.py:250 ishtar_common/models_common.py:2170 +#: ishtar_common/models_common.py:3520 msgid "X" msgstr "" #: archaeological_context_records/forms.py:349 #: archaeological_finds/forms.py:525 archaeological_operations/forms.py:1211 -#: archaeological_operations/forms.py:1459 ishtar_common/forms_common.py:2643 -#: ishtar_common/models_common.py:2178 ishtar_common/models_common.py:3507 +#: archaeological_operations/forms.py:1459 ishtar_common/forms_common.py:2645 +#: ishtar_common/models_common.py:2179 ishtar_common/models_common.py:3524 msgid "Estimated error for X" msgstr "" #: archaeological_context_records/forms.py:351 #: archaeological_finds/forms.py:527 archaeological_operations/forms.py:1213 #: archaeological_operations/forms.py:1461 -#: archaeological_warehouse/forms.py:251 ishtar_common/models_common.py:2170 -#: ishtar_common/models_common.py:3504 +#: archaeological_warehouse/forms.py:251 ishtar_common/models_common.py:2171 +#: ishtar_common/models_common.py:3521 msgid "Y" msgstr "" #: archaeological_context_records/forms.py:353 #: archaeological_finds/forms.py:529 archaeological_operations/forms.py:1214 -#: archaeological_operations/forms.py:1462 ishtar_common/forms_common.py:2647 -#: ishtar_common/models_common.py:2181 ishtar_common/models_common.py:3510 +#: archaeological_operations/forms.py:1462 ishtar_common/forms_common.py:2649 +#: ishtar_common/models_common.py:2182 ishtar_common/models_common.py:3527 msgid "Estimated error for Y" msgstr "" #: archaeological_context_records/forms.py:355 #: archaeological_finds/forms.py:531 archaeological_operations/forms.py:1216 -#: archaeological_operations/forms.py:1464 ishtar_common/models_common.py:2171 -#: ishtar_common/models_common.py:3505 +#: archaeological_operations/forms.py:1464 ishtar_common/models_common.py:2172 +#: ishtar_common/models_common.py:3522 msgid "Z" msgstr "" #: archaeological_context_records/forms.py:357 #: archaeological_finds/forms.py:533 archaeological_operations/forms.py:1217 -#: archaeological_operations/forms.py:1465 ishtar_common/forms_common.py:2651 -#: ishtar_common/models_common.py:2184 ishtar_common/models_common.py:3513 +#: archaeological_operations/forms.py:1465 ishtar_common/forms_common.py:2653 +#: ishtar_common/models_common.py:2185 ishtar_common/models_common.py:3530 msgid "Estimated error for Z" msgstr "" #: archaeological_context_records/forms.py:360 #: archaeological_finds/forms.py:536 archaeological_operations/forms.py:1220 #: archaeological_operations/forms.py:1468 -#: archaeological_warehouse/forms.py:253 ishtar_common/models_common.py:2188 -#: ishtar_common/models_common.py:3517 +#: archaeological_warehouse/forms.py:253 ishtar_common/models_common.py:2189 +#: ishtar_common/models_common.py:3534 msgid "Spatial Reference System" msgstr "" @@ -473,7 +462,7 @@ msgstr "" #: archaeological_operations/forms.py:858 #: archaeological_operations/models.py:103 #: archaeological_operations/models.py:1243 -#: archaeological_operations/models.py:3234 +#: archaeological_operations/models.py:3233 msgid "Start date" msgstr "" @@ -489,7 +478,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:464 #: archaeological_finds/templates/ishtar/sheet_find.html:502 #: archaeological_operations/models.py:104 -#: archaeological_operations/models.py:3235 +#: archaeological_operations/models.py:3234 #: ishtar_common/models_imports.py:1217 msgid "End date" msgstr "" @@ -531,8 +520,8 @@ msgstr "" #: archaeological_finds/models_finds.py:2404 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 #: archaeological_finds/wizards.py:93 archaeological_warehouse/forms.py:562 -#: ishtar_common/forms_common.py:2146 ishtar_common/models.py:5065 -#: ishtar_common/views.py:400 +#: ishtar_common/forms_common.py:2149 ishtar_common/models.py:5068 +#: ishtar_common/views.py:401 msgid "Context record" msgstr "" @@ -572,7 +561,7 @@ msgstr "" #: archaeological_finds/forms.py:277 archaeological_finds/forms.py:641 #: archaeological_finds/forms.py:817 #: archaeological_finds/templates/ishtar/sheet_find.html:158 -#: ishtar_common/forms_common.py:1852 +#: ishtar_common/forms_common.py:1855 #: ishtar_common/templates/ishtar/organization_person_form.html:9 #: ishtar_common/templates/ishtar/person_form.html:9 #: ishtar_common/templates/ishtar/sheet_document.html:34 @@ -621,8 +610,8 @@ msgstr "" #: archaeological_context_records/forms.py:666 #: archaeological_finds/forms.py:1070 archaeological_finds/forms.py:1095 -#: archaeological_operations/forms.py:1936 ishtar_common/forms_common.py:2307 -#: ishtar_common/models.py:3157 ishtar_common/models.py:3516 +#: archaeological_operations/forms.py:1932 ishtar_common/forms_common.py:2310 +#: ishtar_common/models.py:3160 ishtar_common/models.py:3519 msgid " - duplicate" msgstr "" @@ -801,8 +790,8 @@ msgstr "" #: archaeological_finds/models_finds.py:3334 #: archaeological_finds/models_treatments.py:734 #: archaeological_finds/templates/ishtar/sheet_find.html:4 -#: ishtar_common/forms_common.py:2162 ishtar_common/models.py:5066 -#: ishtar_common/views.py:404 +#: ishtar_common/forms_common.py:2165 ishtar_common/models.py:5069 +#: ishtar_common/views.py:405 msgid "Find" msgstr "" @@ -824,14 +813,14 @@ msgstr "" #: archaeological_operations/models.py:127 #: archaeological_operations/models.py:145 #: archaeological_operations/models.py:154 -#: archaeological_operations/models.py:3792 +#: archaeological_operations/models.py:3791 #: archaeological_warehouse/forms.py:108 archaeological_warehouse/models.py:695 #: archaeological_warehouse/models.py:727 ishtar_common/models.py:691 #: ishtar_common/models.py:746 ishtar_common/models.py:788 -#: ishtar_common/models.py:1732 ishtar_common/models.py:3525 -#: ishtar_common/models.py:4843 ishtar_common/models_common.py:2006 -#: ishtar_common/models_common.py:2039 ishtar_common/models_common.py:2055 -#: ishtar_common/models_common.py:2071 ishtar_common/models_common.py:2083 +#: ishtar_common/models.py:1732 ishtar_common/models.py:3528 +#: ishtar_common/models.py:4846 ishtar_common/models_common.py:2007 +#: ishtar_common/models_common.py:2040 ishtar_common/models_common.py:2056 +#: ishtar_common/models_common.py:2072 ishtar_common/models_common.py:2084 msgid "Order" msgstr "" @@ -950,12 +939,12 @@ msgstr "" #: archaeological_operations/models.py:349 #: archaeological_operations/models.py:1057 #: archaeological_operations/tests.py:2990 -#: archaeological_warehouse/models.py:316 +#: archaeological_warehouse/models.py:316 ishtar_common/models.py:2465 msgctxt "key for text search" msgid "town" msgstr "" -#: archaeological_context_records/models.py:578 ishtar_common/models.py:3929 +#: archaeological_context_records/models.py:578 ishtar_common/models.py:3932 msgctxt "key for text search" msgid "operation-year" msgstr "" @@ -986,8 +975,8 @@ msgstr "" #: archaeological_finds/models_finds.py:1354 #: archaeological_finds/models_finds.py:1726 #: archaeological_operations/models.py:384 -#: archaeological_operations/models.py:409 ishtar_common/models.py:3921 -#: ishtar_common/models.py:4026 +#: archaeological_operations/models.py:409 ishtar_common/models.py:3924 +#: ishtar_common/models.py:4029 msgctxt "key for text search" msgid "operation" msgstr "" @@ -997,8 +986,8 @@ msgstr "" #: archaeological_finds/models_finds.py:1269 #: archaeological_operations/models.py:1141 #: archaeological_operations/models.py:1205 -#: archaeological_warehouse/models.py:937 ishtar_common/models.py:3957 -#: ishtar_common/models.py:4035 +#: archaeological_warehouse/models.py:937 ishtar_common/models.py:3960 +#: ishtar_common/models.py:4038 msgctxt "key for text search" msgid "site" msgstr "" @@ -1063,8 +1052,8 @@ msgstr "" #: archaeological_operations/models.py:435 #: archaeological_operations/models.py:1181 #: archaeological_warehouse/models.py:327 -#: archaeological_warehouse/models.py:1049 ishtar_common/models.py:2465 -#: ishtar_common/models.py:2731 ishtar_common/models.py:4052 +#: archaeological_warehouse/models.py:1049 ishtar_common/models.py:2472 +#: ishtar_common/models.py:2734 ishtar_common/models.py:4055 msgid "Bulk update" msgstr "" @@ -1083,10 +1072,10 @@ msgstr "" #: archaeological_operations/views.py:848 #: archaeological_operations/views.py:863 #: archaeological_operations/views.py:870 -#: archaeological_operations/views.py:887 ishtar_common/admin.py:1450 -#: ishtar_common/admin.py:1570 ishtar_common/models.py:4061 -#: ishtar_common/models.py:4405 ishtar_common/views.py:2636 -#: ishtar_common/views.py:2654 +#: archaeological_operations/views.py:887 ishtar_common/admin.py:1455 +#: ishtar_common/admin.py:1575 ishtar_common/models.py:4064 +#: ishtar_common/models.py:4408 ishtar_common/views.py:2637 +#: ishtar_common/views.py:2655 msgid "Duplicate" msgstr "" @@ -1095,23 +1084,23 @@ msgstr "" #: archaeological_finds/models_finds.py:1799 #: archaeological_finds/models_treatments.py:252 #: archaeological_finds/models_treatments.py:1100 -#: archaeological_operations/models.py:2972 +#: archaeological_operations/models.py:2971 #: archaeological_warehouse/models.py:388 -#: archaeological_warehouse/models.py:1133 ishtar_common/models.py:4087 +#: archaeological_warehouse/models.py:1133 ishtar_common/models.py:4090 msgid "External ID" msgstr "" #: archaeological_context_records/models.py:701 #: archaeological_files/models.py:533 archaeological_finds/models_finds.py:406 #: archaeological_finds/models_finds.py:1801 -#: archaeological_operations/models.py:2975 +#: archaeological_operations/models.py:2974 #: archaeological_warehouse/models.py:390 #: archaeological_warehouse/models.py:1135 msgid "External ID is set automatically" msgstr "" #: archaeological_context_records/models.py:746 -#: archaeological_operations/models.py:1296 ishtar_common/models_common.py:2632 +#: archaeological_operations/models.py:1296 ishtar_common/models_common.py:2633 msgid "Surface (m2)" msgstr "" @@ -1152,7 +1141,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 #: archaeological_operations/models.py:495 #: archaeological_operations/models.py:1370 -#: archaeological_operations/models.py:2719 +#: archaeological_operations/models.py:2718 #: archaeological_operations/templates/ishtar/sheet_operation.html:63 #: archaeological_operations/templates/ishtar/sheet_site.html:97 #: archaeological_warehouse/models.py:377 @@ -1160,7 +1149,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:46 #: archaeological_warehouse/templates/ishtar/sheet_container.html:179 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:42 -#: ishtar_common/models.py:4203 +#: ishtar_common/models.py:4206 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_person.html:161 msgid "Documents" @@ -1172,7 +1161,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1157 #: archaeological_operations/models.py:501 #: archaeological_operations/models.py:1376 -#: archaeological_operations/models.py:2726 +#: archaeological_operations/models.py:2725 #: archaeological_warehouse/models.py:384 #: archaeological_warehouse/models.py:1147 msgid "Main image" @@ -1184,9 +1173,9 @@ msgstr "" #: archaeological_finds/models_treatments.py:1169 #: archaeological_operations/models.py:506 #: archaeological_operations/models.py:1381 -#: archaeological_operations/models.py:2979 ishtar_common/models.py:2489 -#: ishtar_common/models.py:2780 ishtar_common/models.py:3552 -#: ishtar_common/models_common.py:2657 ishtar_common/models_common.py:2680 +#: archaeological_operations/models.py:2978 ishtar_common/models.py:2496 +#: ishtar_common/models.py:2783 ishtar_common/models.py:3555 +#: ishtar_common/models_common.py:2658 ishtar_common/models_common.py:2681 msgid "Cached name" msgstr "" @@ -1353,7 +1342,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:174 #: archaeological_warehouse/templates/ishtar/sheet_container.html:221 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:177 -#: ishtar_common/views.py:1005 ishtar_common/views.py:1077 +#: ishtar_common/views.py:1006 ishtar_common/views.py:1078 msgid "Finds" msgstr "" @@ -1377,7 +1366,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:27 #: archaeological_warehouse/templates/ishtar/sheet_container.html:70 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:63 -#: ishtar_common/models_common.py:3708 +#: ishtar_common/models_common.py:3725 #: ishtar_common/templates/ishtar/sheet_document.html:37 msgid "Complete identifier" msgstr "" @@ -1399,7 +1388,7 @@ msgstr "" #: archaeological_warehouse/models.py:1105 #: archaeological_warehouse/templates/ishtar/sheet_container.html:152 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:102 -#: ishtar_common/models_common.py:2634 +#: ishtar_common/models_common.py:2635 msgid "Localisation" msgstr "" @@ -1410,7 +1399,6 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:219 #: archaeological_operations/templates/ishtar/sheet_operation.html:270 #: ishtar_common/templates/ishtar/blocks/window_image.html:5 -#: sra_idf_app/templates/ishtar/sheet_basefind.html:48 msgid "Sheet" msgstr "" @@ -1446,9 +1434,9 @@ 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:176 -#: ishtar_common/models.py:3232 ishtar_common/models.py:4961 -#: ishtar_common/models.py:5094 ishtar_common/models.py:5172 -#: ishtar_common/models_common.py:1936 ishtar_common/models_common.py:1951 +#: ishtar_common/models.py:3235 ishtar_common/models.py:4964 +#: ishtar_common/models.py:5097 ishtar_common/models.py:5175 +#: ishtar_common/models_common.py:1937 ishtar_common/models_common.py:1952 #: ishtar_common/models_imports.py:1206 msgid "State" msgstr "" @@ -1547,7 +1535,7 @@ msgstr "" #: archaeological_files/forms.py:85 archaeological_files/forms.py:268 #: archaeological_files/forms.py:329 archaeological_files/forms.py:890 -#: archaeological_files/forms.py:927 archaeological_files/models.py:380 +#: archaeological_files/forms.py:926 archaeological_files/models.py:380 #: archaeological_files/models.py:522 #: archaeological_files/templates/ishtar/sheet_file.html:217 #: archaeological_files_pdl/forms.py:67 archaeological_files_pdl/forms.py:457 @@ -1565,12 +1553,12 @@ msgstr "" #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:490 #: archaeological_operations/forms.py:803 #: archaeological_operations/forms.py:1551 -#: archaeological_operations/forms.py:1868 +#: archaeological_operations/forms.py:1864 #: archaeological_operations/models.py:909 #: archaeological_operations/models.py:1280 #: archaeological_operations/models.py:2468 #: archaeological_operations/models.py:2697 -#: archaeological_operations/models.py:2962 +#: archaeological_operations/models.py:2961 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 #: ishtar_common/models_imports.py:937 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:196 @@ -1585,29 +1573,33 @@ msgid "Numeric reference" msgstr "" #: archaeological_files/forms.py:87 archaeological_files/forms.py:279 +#: archaeological_files/forms.py:892 archaeological_files/forms.py:928 #: archaeological_operations/forms.py:1197 #: archaeological_operations/forms.py:1317 #: archaeological_operations/forms.py:1432 +#: archaeological_operations/forms.py:1553 +#: archaeological_operations/forms.py:1630 #: archaeological_operations/models.py:454 +#: archaeological_operations/models.py:2700 msgid "Other reference" msgstr "" -#: archaeological_files/forms.py:92 archaeological_files/forms.py:899 -#: archaeological_files/forms.py:937 archaeological_files/models.py:1330 +#: archaeological_files/forms.py:92 archaeological_files/forms.py:898 +#: archaeological_files/forms.py:935 archaeological_files/models.py:1330 #: archaeological_operations/forms.py:503 -#: archaeological_operations/forms.py:1566 +#: archaeological_operations/forms.py:1564 #: archaeological_operations/models.py:2340 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:390 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:411 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:643 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:664 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:666 -#: ishtar_common/models_common.py:1959 ishtar_common/models_common.py:2640 +#: ishtar_common/models_common.py:1960 ishtar_common/models_common.py:2641 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" -#: archaeological_files/forms.py:94 archaeological_files/forms.py:947 +#: archaeological_files/forms.py:94 archaeological_files/forms.py:945 msgid "File name" msgstr "" @@ -1654,19 +1646,19 @@ msgstr "" #: archaeological_operations/forms.py:817 #: archaeological_operations/forms.py:1325 #: archaeological_operations/forms.py:1446 -#: archaeological_operations/forms.py:1569 -#: archaeological_operations/forms.py:1631 +#: archaeological_operations/forms.py:1567 +#: archaeological_operations/forms.py:1629 #: archaeological_operations/models.py:466 #: archaeological_operations/models.py:1365 -#: archaeological_operations/models.py:2715 +#: archaeological_operations/models.py:2714 #: archaeological_warehouse/forms.py:226 archaeological_warehouse/forms.py:381 #: archaeological_warehouse/forms.py:513 archaeological_warehouse/models.py:367 -#: archaeological_warehouse/models.py:1103 ishtar_common/forms_common.py:1797 -#: ishtar_common/forms_common.py:2102 ishtar_common/forms_common.py:2641 -#: ishtar_common/models.py:2769 ishtar_common/models.py:3409 -#: ishtar_common/models.py:4187 ishtar_common/models_common.py:180 -#: ishtar_common/models_common.py:2168 ishtar_common/models_imports.py:709 -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:12 +#: archaeological_warehouse/models.py:1103 ishtar_common/forms_common.py:1800 +#: ishtar_common/forms_common.py:2105 ishtar_common/forms_common.py:2643 +#: ishtar_common/models.py:2772 ishtar_common/models.py:3412 +#: ishtar_common/models.py:4190 ishtar_common/models_common.py:181 +#: ishtar_common/models_common.py:2169 ishtar_common/models_imports.py:709 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:13 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:170 msgid "Comment" msgstr "" @@ -1679,26 +1671,26 @@ msgid "In charge" msgstr "" #: archaeological_files/forms.py:112 archaeological_files/forms.py:364 -#: archaeological_files/forms.py:949 archaeological_files/models.py:548 +#: archaeological_files/forms.py:947 archaeological_files/models.py:548 #: archaeological_files_pdl/forms.py:285 archaeological_files_pdl/forms.py:295 msgid "General contractor" msgstr "" -#: archaeological_files/forms.py:122 archaeological_files/forms.py:959 +#: archaeological_files/forms.py:122 archaeological_files/forms.py:957 msgid "Organization of general contractor" msgstr "" -#: archaeological_files/forms.py:133 archaeological_files/forms.py:990 +#: archaeological_files/forms.py:133 archaeological_files/forms.py:988 #: archaeological_operations/forms.py:556 -#: archaeological_operations/forms.py:1571 ishtar_common/forms.py:926 +#: archaeological_operations/forms.py:1569 ishtar_common/forms.py:926 msgid "Created by" msgstr "" -#: archaeological_files/forms.py:141 archaeological_files/forms.py:998 +#: archaeological_files/forms.py:141 archaeological_files/forms.py:996 #: archaeological_finds/forms_treatments.py:629 #: archaeological_finds/forms_treatments.py:954 #: archaeological_operations/forms.py:562 -#: archaeological_operations/forms.py:1577 +#: archaeological_operations/forms.py:1575 msgid "Modified by" msgstr "" @@ -1711,8 +1703,8 @@ msgstr "" #: archaeological_finds/forms_treatments.py:877 #: archaeological_finds/models_treatments.py:1134 #: archaeological_operations/forms.py:678 -#: archaeological_operations/models.py:1241 ishtar_common/forms_common.py:1792 -#: ishtar_common/forms_common.py:2268 ishtar_common/models.py:4172 +#: archaeological_operations/models.py:1241 ishtar_common/forms_common.py:1795 +#: ishtar_common/forms_common.py:2271 ishtar_common/models.py:4175 #: ishtar_common/models_imports.py:1214 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 msgid "Creation date" @@ -1775,30 +1767,34 @@ msgstr "" #: archaeological_operations/forms.py:1196 #: archaeological_operations/forms.py:1316 #: archaeological_operations/forms.py:1431 -#: archaeological_operations/forms.py:1924 +#: archaeological_operations/forms.py:1920 #: archaeological_operations/models.py:455 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:154 #: archaeological_warehouse/forms.py:143 archaeological_warehouse/forms.py:203 -#: archaeological_warehouse/models.py:347 ishtar_common/forms_common.py:525 -#: ishtar_common/forms_common.py:584 ishtar_common/forms_common.py:761 -#: ishtar_common/forms_common.py:888 ishtar_common/forms_common.py:979 -#: ishtar_common/forms_common.py:1231 ishtar_common/forms_common.py:1284 -#: ishtar_common/forms_common.py:2610 ishtar_common/models.py:690 +#: archaeological_warehouse/models.py:347 ishtar_common/forms_common.py:527 +#: ishtar_common/forms_common.py:586 ishtar_common/forms_common.py:764 +#: ishtar_common/forms_common.py:891 ishtar_common/forms_common.py:982 +#: ishtar_common/forms_common.py:1234 ishtar_common/forms_common.py:1287 +#: ishtar_common/forms_common.py:2613 ishtar_common/models.py:690 #: ishtar_common/models.py:729 ishtar_common/models.py:1043 #: ishtar_common/models.py:1552 ishtar_common/models.py:1940 -#: ishtar_common/models.py:2475 ishtar_common/models.py:2764 -#: ishtar_common/models.py:3090 ishtar_common/models.py:3226 -#: ishtar_common/models.py:4937 ishtar_common/models_common.py:2136 -#: ishtar_common/models_common.py:2631 ishtar_common/models_common.py:2680 +#: ishtar_common/models.py:2482 ishtar_common/models.py:2767 +#: ishtar_common/models.py:3093 ishtar_common/models.py:3229 +#: ishtar_common/models.py:4940 ishtar_common/models_common.py:2137 +#: ishtar_common/models_common.py:2632 ishtar_common/models_common.py:2681 #: ishtar_common/models_imports.py:110 ishtar_common/models_imports.py:144 #: ishtar_common/models_imports.py:628 ishtar_common/models_imports.py:645 #: ishtar_common/models_imports.py:765 ishtar_common/models_imports.py:1126 #: ishtar_common/models_rest.py:94 -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:9 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:10 #: ishtar_common/templates/ishtar/import_step_by_step.html:102 #: ishtar_common/templates/ishtar/import_step_by_step.html:270 #: ishtar_common/templates/ishtar/import_table.html:27 +#: ishtar_common/templates/ishtar/merge_organization.html:9 +#: ishtar_common/templates/ishtar/merge_organization.html:20 +#: ishtar_common/templates/ishtar/merge_person.html:10 +#: ishtar_common/templates/ishtar/merge_person.html:22 #: ishtar_common/templates/ishtar/sheet_organization.html:25 #: ishtar_common/templates/ishtar/sheet_organization.html:53 msgid "Name" @@ -1830,7 +1826,7 @@ msgstr "" #: archaeological_operations/forms.py:1137 #: archaeological_operations/forms.py:1153 #: archaeological_operations/forms.py:1159 -#: archaeological_operations/models.py:2984 +#: archaeological_operations/models.py:2983 #: archaeological_operations/templates/ishtar/sheet_operation.html:494 msgid "Parcels" msgstr "" @@ -1864,7 +1860,7 @@ msgstr "" #: archaeological_files/forms.py:439 archaeological_files/models.py:641 #: archaeological_files_pdl/forms.py:128 archaeological_files_pdl/forms.py:171 -#: archaeological_operations/models.py:2704 ishtar_common/models_common.py:1960 +#: archaeological_operations/models.py:2703 ishtar_common/models_common.py:1961 msgid "Departments" msgstr "" @@ -1907,7 +1903,7 @@ msgstr "" msgid "Preventive file - 020 - Edition form" msgstr "" -#: archaeological_files/forms.py:519 ishtar_common/forms_common.py:1856 +#: archaeological_files/forms.py:519 ishtar_common/forms_common.py:1859 #: ishtar_common/templates/ishtar/sheet_document.html:76 msgid "Dates" msgstr "" @@ -2005,8 +2001,8 @@ msgstr "" msgid "Equipment / service" msgstr "" -#: archaeological_files/forms.py:891 archaeological_files/forms.py:928 -#: archaeological_files/forms.py:1064 +#: archaeological_files/forms.py:891 archaeological_files/forms.py:927 +#: archaeological_files/forms.py:1062 #: archaeological_finds/forms_treatments.py:59 #: archaeological_finds/forms_treatments.py:348 #: archaeological_finds/forms_treatments.py:610 @@ -2019,79 +2015,79 @@ msgstr "" #: archaeological_finds/models_treatments.py:1095 #: archaeological_finds/templates/ishtar/sheet_find.html:364 #: archaeological_operations/forms.py:1552 -#: archaeological_operations/forms.py:1689 -#: archaeological_operations/models.py:2639 ishtar_common/models.py:4086 +#: archaeological_operations/forms.py:1685 +#: archaeological_operations/models.py:2639 ishtar_common/models.py:4089 msgid "Index" msgstr "" -#: archaeological_files/forms.py:894 archaeological_files/forms.py:931 -#: archaeological_files/forms.py:1053 +#: archaeological_files/forms.py:893 archaeological_files/forms.py:929 +#: archaeological_files/forms.py:1051 #: archaeological_finds/forms_treatments.py:611 #: archaeological_finds/forms_treatments.py:661 #: archaeological_finds/forms_treatments.py:932 #: archaeological_finds/forms_treatments.py:987 -#: archaeological_operations/forms.py:1560 -#: archaeological_operations/forms.py:1621 +#: archaeological_operations/forms.py:1558 +#: archaeological_operations/forms.py:1619 #: archaeological_operations/models.py:2370 #: archaeological_operations/models.py:2629 msgid "Act type" msgstr "" -#: archaeological_files/forms.py:895 +#: archaeological_files/forms.py:894 msgid "Object (full text search)" msgstr "" -#: archaeological_files/forms.py:932 +#: archaeological_files/forms.py:930 #: archaeological_finds/forms_treatments.py:612 #: archaeological_finds/forms_treatments.py:933 -#: archaeological_operations/forms.py:1561 -#: archaeological_operations/forms.py:1759 +#: archaeological_operations/forms.py:1559 +#: archaeological_operations/forms.py:1755 msgid "Indexed?" msgstr "" -#: archaeological_files/forms.py:939 +#: archaeological_files/forms.py:937 #: archaeological_finds/forms_treatments.py:613 #: archaeological_finds/forms_treatments.py:934 -#: archaeological_operations/forms.py:1567 -#: archaeological_operations/forms.py:1628 +#: archaeological_operations/forms.py:1565 +#: archaeological_operations/forms.py:1626 #: archaeological_operations/models.py:2698 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" -#: archaeological_files/forms.py:942 +#: archaeological_files/forms.py:940 #: archaeological_finds/forms_treatments.py:619 #: archaeological_finds/forms_treatments.py:940 msgid "Signature date before" msgstr "" -#: archaeological_files/forms.py:945 +#: archaeological_files/forms.py:943 #: archaeological_finds/forms_treatments.py:617 #: archaeological_finds/forms_treatments.py:938 msgid "Signature date after" msgstr "" -#: archaeological_files/forms.py:970 +#: archaeological_files/forms.py:968 msgid "File numeric reference" msgstr "" -#: archaeological_files/forms.py:972 +#: archaeological_files/forms.py:970 msgid "File year" msgstr "" -#: archaeological_files/forms.py:974 +#: archaeological_files/forms.py:972 msgid "File other reference" msgstr "" -#: archaeological_files/forms.py:977 +#: archaeological_files/forms.py:975 msgid "File in charge" msgstr "" -#: archaeological_files/forms.py:987 +#: archaeological_files/forms.py:985 msgid "File permit reference" msgstr "" -#: archaeological_files/forms.py:1051 +#: archaeological_files/forms.py:1049 msgid "Archaeological file - Administrative act - General" msgstr "" @@ -2104,7 +2100,7 @@ msgstr "" #: archaeological_operations/models.py:2353 #: archaeological_operations/models.py:2469 #: archaeological_operations/models.py:2677 -#: archaeological_operations/wizards.py:85 ishtar_common/views.py:395 +#: archaeological_operations/wizards.py:85 ishtar_common/views.py:396 msgid "Archaeological file" msgstr "" @@ -2118,7 +2114,7 @@ msgstr "" #: archaeological_finds/ishtar_menu.py:226 #: archaeological_finds/models_finds.py:3337 #: archaeological_operations/ishtar_menu.py:70 -#: archaeological_operations/models.py:2735 +#: archaeological_operations/models.py:2734 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "" @@ -2206,12 +2202,12 @@ msgstr "" msgid "Equipment/Service" msgstr "" -#: archaeological_files/models.py:208 ishtar_common/models_common.py:171 -#: ishtar_common/models_common.py:202 +#: archaeological_files/models.py:208 ishtar_common/models_common.py:172 +#: ishtar_common/models_common.py:203 msgid "Textual ID" msgstr "" -#: archaeological_files/models.py:212 ishtar_common/models_common.py:175 +#: archaeological_files/models.py:212 ishtar_common/models_common.py:176 msgid "" "The slug is the standardized version of the name. It contains only lowercase " "letters, numbers and hyphens. Each slug must be unique." @@ -2242,15 +2238,15 @@ msgid "Default quantity by day" msgstr "" #: archaeological_files/models.py:231 ishtar_common/models.py:1554 -#: ishtar_common/models.py:1970 ishtar_common/models.py:3420 -#: ishtar_common/models_common.py:181 ishtar_common/models_imports.py:184 +#: ishtar_common/models.py:1970 ishtar_common/models.py:3423 +#: ishtar_common/models_common.py:182 ishtar_common/models_imports.py:184 #: ishtar_common/models_imports.py:770 msgid "Available" msgstr "" #: archaeological_files/models.py:237 archaeological_warehouse/forms.py:753 -#: ishtar_common/admin.py:1020 ishtar_common/models.py:2275 -#: ishtar_common/models_common.py:713 +#: ishtar_common/admin.py:1025 ishtar_common/models.py:2275 +#: ishtar_common/models_common.py:714 msgid "Parent" msgstr "" @@ -2320,7 +2316,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:415 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:520 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:537 -#: ishtar_common/admin.py:1189 +#: ishtar_common/admin.py:1194 msgid "Area" msgstr "" @@ -2342,8 +2338,8 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:544 #: archaeological_operations/templates/ishtar/sheet_operation.html:554 #: archaeological_operations/templates/ishtar/sheet_operation.html:571 -#: ishtar_common/models.py:1854 ishtar_common/models_common.py:746 -#: ishtar_common/models_common.py:1932 ishtar_common/models_common.py:1948 +#: ishtar_common/models.py:1854 ishtar_common/models_common.py:747 +#: ishtar_common/models_common.py:1933 ishtar_common/models_common.py:1949 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:211 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail_users.html:5 #: ishtar_common/templates/ishtar/sheet_person.html:30 @@ -2370,11 +2366,11 @@ msgstr "" #: archaeological_operations/models.py:995 #: archaeological_operations/models.py:997 #: archaeological_operations/models.py:1301 -#: archaeological_operations/models.py:2710 +#: archaeological_operations/models.py:2709 #: archaeological_operations/templates/ishtar/sheet_operation.html:147 -#: ishtar_common/forms_common.py:1444 ishtar_common/forms_common.py:1457 -#: ishtar_common/forms_common.py:1458 ishtar_common/models.py:2268 -#: ishtar_common/models_common.py:2663 +#: ishtar_common/forms_common.py:1447 ishtar_common/forms_common.py:1460 +#: ishtar_common/forms_common.py:1461 ishtar_common/models.py:2268 +#: ishtar_common/models_common.py:2664 msgid "Towns" msgstr "" @@ -2392,7 +2388,7 @@ msgstr "" #: archaeological_files/models.py:457 #: archaeological_finds/models_treatments.py:1046 #: archaeological_operations/models.py:333 -#: archaeological_warehouse/models.py:913 ishtar_common/models.py:3851 +#: archaeological_warehouse/models.py:913 ishtar_common/models.py:3854 msgctxt "key for text search" msgid "reference" msgstr "" @@ -2414,8 +2410,8 @@ msgstr "" #: archaeological_operations/models.py:336 #: archaeological_operations/models.py:1071 #: archaeological_operations/tests.py:3099 -#: archaeological_warehouse/models.py:309 ishtar_common/models.py:2455 -#: ishtar_common/models.py:2707 ishtar_common/models.py:3281 +#: archaeological_warehouse/models.py:309 ishtar_common/models.py:2458 +#: ishtar_common/models.py:2710 ishtar_common/models.py:3284 msgctxt "key for text search" msgid "name" msgstr "" @@ -2427,9 +2423,9 @@ msgstr "" #: archaeological_operations/models.py:2504 #: archaeological_operations/tests.py:3112 #: archaeological_warehouse/models.py:312 -#: archaeological_warehouse/models.py:909 ishtar_common/models.py:2458 -#: ishtar_common/models.py:2716 ishtar_common/models.py:3292 -#: ishtar_common/models.py:3847 +#: archaeological_warehouse/models.py:909 ishtar_common/models.py:2461 +#: ishtar_common/models.py:2719 ishtar_common/models.py:3295 +#: ishtar_common/models.py:3850 msgctxt "key for text search" msgid "type" msgstr "" @@ -2458,7 +2454,7 @@ msgstr "" #: archaeological_operations/models.py:355 #: archaeological_operations/models.py:1119 #: archaeological_operations/models.py:2614 -#: archaeological_warehouse/models.py:920 ishtar_common/models.py:3911 +#: archaeological_warehouse/models.py:920 ishtar_common/models.py:3914 msgctxt "key for text search" msgid "comment" msgstr "" @@ -2482,7 +2478,7 @@ msgstr "" #: archaeological_files/models.py:527 #: archaeological_finds/models_treatments.py:1097 -#: ishtar_common/forms_common.py:1784 ishtar_common/forms_common.py:2066 +#: ishtar_common/forms_common.py:1787 ishtar_common/forms_common.py:2069 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" msgstr "" @@ -2532,10 +2528,12 @@ msgstr "" #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:555 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:590 #: archaeological_warehouse/forms.py:206 archaeological_warehouse/models.py:364 -#: ishtar_common/forms_common.py:520 ishtar_common/forms_common.py:766 -#: ishtar_common/forms_common.py:828 ishtar_common/forms_common.py:984 -#: ishtar_common/ishtar_menu.py:119 ishtar_common/models.py:2495 -#: ishtar_common/models.py:2702 ishtar_common/models.py:3270 +#: ishtar_common/forms_common.py:522 ishtar_common/forms_common.py:769 +#: ishtar_common/forms_common.py:831 ishtar_common/forms_common.py:987 +#: ishtar_common/ishtar_menu.py:119 ishtar_common/models.py:2502 +#: ishtar_common/models.py:2705 ishtar_common/models.py:3273 +#: ishtar_common/templates/ishtar/merge_person.html:11 +#: ishtar_common/templates/ishtar/merge_person.html:23 #: ishtar_common/templates/ishtar/sheet_organization.html:4 msgid "Organization" msgstr "" @@ -2562,7 +2560,7 @@ msgstr "" #: archaeological_files/models.py:749 #: archaeological_files/templates/ishtar/dashboards/dashboard_file.html:7 -#: ishtar_common/views.py:1000 ishtar_common/views.py:1061 +#: ishtar_common/views.py:1001 ishtar_common/views.py:1062 msgid "Archaeological files" msgstr "" @@ -2616,7 +2614,7 @@ msgid "operation" msgstr "" #: archaeological_files/models.py:1327 archaeological_operations/models.py:1285 -#: archaeological_operations/models.py:2949 +#: archaeological_operations/models.py:2948 msgid "File" msgstr "" @@ -2789,7 +2787,7 @@ msgid "Back to the file" msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:29 -#: archaeological_operations/forms.py:682 ishtar_common/models.py:4901 +#: archaeological_operations/forms.py:682 ishtar_common/models.py:4904 msgid "Preventive" msgstr "" @@ -2814,7 +2812,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 #: archaeological_finds/templates/ishtar/sheet_treatment.html:133 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:83 -#: archaeological_operations/models.py:2736 +#: archaeological_operations/models.py:2735 #: archaeological_operations/templates/ishtar/sheet_operation.html:351 #: archaeological_operations/templates/ishtar/sheet_operation.html:488 msgid "Administrative acts" @@ -2828,11 +2826,11 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_files/templates/ishtar/sheet_file.html:218 #: archaeological_operations/models.py:2467 -#: archaeological_operations/models.py:2771 +#: archaeological_operations/models.py:2770 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 #: archaeological_warehouse/forms.py:339 archaeological_warehouse/forms.py:511 -#: archaeological_warehouse/models.py:694 ishtar_common/models.py:4088 +#: archaeological_warehouse/models.py:694 ishtar_common/models.py:4091 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:34 msgid "Ref." msgstr "" @@ -2850,18 +2848,20 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:507 #: archaeological_operations/templates/ishtar/sheet_operation.html:571 #: archaeological_warehouse/models.py:298 -#: archaeological_warehouse/models.py:888 ishtar_common/forms_common.py:585 -#: ishtar_common/forms_common.py:764 ishtar_common/forms_common.py:982 -#: ishtar_common/forms_common.py:1229 ishtar_common/forms_common.py:1658 -#: ishtar_common/forms_common.py:2064 ishtar_common/forms_common.py:2291 -#: ishtar_common/forms_common.py:2913 ishtar_common/models.py:744 -#: ishtar_common/models.py:2477 ishtar_common/models.py:3810 -#: ishtar_common/models.py:4092 ishtar_common/models_imports.py:150 +#: archaeological_warehouse/models.py:888 ishtar_common/forms_common.py:587 +#: ishtar_common/forms_common.py:767 ishtar_common/forms_common.py:985 +#: ishtar_common/forms_common.py:1232 ishtar_common/forms_common.py:1661 +#: ishtar_common/forms_common.py:2067 ishtar_common/forms_common.py:2294 +#: ishtar_common/forms_common.py:2938 ishtar_common/models.py:744 +#: ishtar_common/models.py:2484 ishtar_common/models.py:3813 +#: ishtar_common/models.py:4095 ishtar_common/models_imports.py:150 #: ishtar_common/models_imports.py:936 #: 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 #: ishtar_common/templates/ishtar/import_table.html:28 +#: ishtar_common/templates/ishtar/merge_organization.html:10 +#: ishtar_common/templates/ishtar/merge_organization.html:21 #: ishtar_common/templates/ishtar/sheet_organization.html:27 #: ishtar_common/templates/ishtar/sheet_organization.html:54 msgid "Type" @@ -2907,7 +2907,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:283 #: archaeological_files/templates/ishtar/sheet_file.html:335 #: archaeological_files/templates/ishtar/sheet_file.html:387 -#: archaeological_operations/models.py:3289 +#: archaeological_operations/models.py:3288 msgid "Effective" msgstr "" @@ -3013,16 +3013,16 @@ msgid "Number/street" msgstr "" #: archaeological_files_pdl/forms.py:138 archaeological_files_pdl/forms.py:179 -#: archaeological_warehouse/forms.py:241 ishtar_common/forms_common.py:538 -#: ishtar_common/forms_common.py:920 ishtar_common/models_common.py:2847 +#: archaeological_warehouse/forms.py:241 ishtar_common/forms_common.py:540 +#: ishtar_common/forms_common.py:923 ishtar_common/models_common.py:2851 msgid "Postal code" msgstr "" #: archaeological_files_pdl/forms.py:161 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:10 #: archaeological_warehouse/forms.py:228 archaeological_warehouse/forms.py:237 -#: ishtar_common/forms_common.py:534 ishtar_common/forms_common.py:916 -#: ishtar_common/models_common.py:2842 +#: ishtar_common/forms_common.py:536 ishtar_common/forms_common.py:919 +#: ishtar_common/models_common.py:2846 ishtar_common/models_common.py:3001 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 msgid "Address" msgstr "" @@ -3115,17 +3115,6 @@ msgstr "" msgid ": delay of {} days" msgstr "" -#: archaeological_finds/admin.py:36 ishtar_common/models_common.py:2193 -#: ishtar_common/models_common.py:3523 -msgid "Point (2D)" -msgstr "" - -#: archaeological_finds/admin.py:38 archaeological_finds/models_finds.py:439 -#: ishtar_common/templates/blocks/DataTables-stats.html:25 -#: ishtar_common/templates/ishtar/import_step_by_step.html:46 -msgid "Line" -msgstr "" - #: archaeological_finds/forms.py:178 msgid "Find - 010 - Context record choice" msgstr "" @@ -3363,7 +3352,6 @@ msgstr "" #: archaeological_finds/forms.py:516 archaeological_finds/models_finds.py:424 #: archaeological_finds/templates/ishtar/sheet_basefind.html:33 -#: sra_idf_app/templates/ishtar/sheet_basefind.html:33 msgid "Discovery date (TAQ)" msgstr "" @@ -3506,11 +3494,11 @@ msgstr "" msgid "Find - Quick action - Modify single" msgstr "" -#: archaeological_finds/forms.py:995 ishtar_common/forms_common.py:2509 +#: archaeological_finds/forms.py:995 ishtar_common/forms_common.py:2512 msgid "Create" msgstr "" -#: archaeological_finds/forms.py:995 ishtar_common/forms_common.py:2509 +#: archaeological_finds/forms.py:995 ishtar_common/forms_common.py:2512 #: ishtar_common/templates/ishtar/forms/search_query.html:60 msgid "Update" msgstr "" @@ -3540,7 +3528,7 @@ msgstr "" #: archaeological_finds/forms.py:1122 archaeological_finds/forms.py:2109 #: ishtar_common/models.py:1044 ishtar_common/models.py:1941 -#: ishtar_common/models.py:3410 ishtar_common/models_imports.py:145 +#: ishtar_common/models.py:3413 ishtar_common/models_imports.py:145 #: ishtar_common/models_imports.py:646 msgid "Slug" msgstr "" @@ -3550,12 +3538,12 @@ msgid "Is public" msgstr "" #: archaeological_finds/forms.py:1128 archaeological_finds/forms.py:2115 -#: archaeological_finds/forms.py:2157 ishtar_common/models.py:3423 +#: archaeological_finds/forms.py:2157 ishtar_common/models.py:3426 msgid "Shared (read) with" msgstr "" #: archaeological_finds/forms.py:1135 archaeological_finds/forms.py:2122 -#: archaeological_finds/forms.py:2164 ishtar_common/models.py:3429 +#: archaeological_finds/forms.py:2164 ishtar_common/models.py:3432 msgid "Shared (read/edit) with" msgstr "" @@ -3600,7 +3588,6 @@ msgstr "" #: archaeological_finds/forms.py:1308 #: archaeological_finds/templates/ishtar/sheet_basefind.html:25 -#: sra_idf_app/templates/ishtar/sheet_basefind.html:25 msgid "Discovery date" msgstr "" @@ -3616,11 +3603,11 @@ msgstr "" #: archaeological_operations/forms.py:506 #: archaeological_operations/forms.py:696 #: archaeological_operations/forms.py:790 -#: archaeological_operations/forms.py:1807 -#: archaeological_operations/forms.py:1873 +#: archaeological_operations/forms.py:1803 +#: archaeological_operations/forms.py:1869 #: archaeological_operations/models.py:908 #: archaeological_operations/models.py:996 -#: archaeological_operations/models.py:1293 ishtar_common/models.py:4848 +#: archaeological_operations/models.py:1293 ishtar_common/models.py:4851 #: ishtar_common/models_imports.py:885 msgid "Operation type" msgstr "" @@ -3646,8 +3633,8 @@ msgid "Operation - Name" msgstr "" #: archaeological_finds/forms.py:1412 archaeological_operations/forms.py:499 -#: archaeological_operations/forms.py:1324 ishtar_common/forms_common.py:1230 -#: ishtar_common/models.py:3095 +#: archaeological_operations/forms.py:1324 ishtar_common/forms_common.py:1233 +#: ishtar_common/models.py:3098 msgid "Areas" msgstr "" @@ -3845,7 +3832,7 @@ msgstr "" #: archaeological_finds/forms.py:1686 archaeological_finds/models_finds.py:1108 #: archaeological_finds/models_finds.py:1868 #: archaeological_finds/templates/ishtar/sheet_find.html:306 -#: ishtar_common/forms_common.py:1676 +#: ishtar_common/forms_common.py:1679 msgid "Reference container" msgstr "" @@ -3855,7 +3842,7 @@ msgstr "" #: archaeological_finds/forms.py:1712 archaeological_finds/models_finds.py:1107 #: archaeological_finds/templates/ishtar/sheet_find.html:331 -#: ishtar_common/forms_common.py:1668 +#: ishtar_common/forms_common.py:1671 msgid "Current container" msgstr "" @@ -3907,10 +3894,10 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:381 #: archaeological_finds/templates/ishtar/sheet_find.html:419 #: archaeological_finds/templates/ishtar/sheet_find.html:457 -#: ishtar_common/forms_common.py:1610 ishtar_common/models.py:973 -#: ishtar_common/models.py:1731 ishtar_common/models.py:3408 -#: ishtar_common/models_common.py:169 ishtar_common/models_common.py:202 -#: ishtar_common/models_common.py:1931 ishtar_common/models_common.py:1947 +#: ishtar_common/forms_common.py:1613 ishtar_common/models.py:973 +#: ishtar_common/models.py:1731 ishtar_common/models.py:3411 +#: ishtar_common/models_common.py:170 ishtar_common/models_common.py:203 +#: ishtar_common/models_common.py:1932 ishtar_common/models_common.py:1948 #: ishtar_common/models_imports.py:526 msgid "Label" msgstr "" @@ -3968,7 +3955,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 #: archaeological_operations/models.py:2356 -#: archaeological_operations/models.py:2693 ishtar_common/views.py:407 +#: archaeological_operations/models.py:2693 ishtar_common/views.py:408 msgid "Treatment" msgstr "" @@ -4066,7 +4053,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1193 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 #: archaeological_finds/wizards.py:553 archaeological_operations/models.py:2355 -#: archaeological_operations/models.py:2685 ishtar_common/views.py:406 +#: archaeological_operations/models.py:2685 ishtar_common/views.py:407 msgid "Treatment request" msgstr "" @@ -4092,13 +4079,13 @@ msgstr "" #: archaeological_warehouse/models.py:1157 #: archaeological_warehouse/models.py:1984 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 -#: ishtar_common/forms_common.py:2171 ishtar_common/forms_common.py:2356 +#: ishtar_common/forms_common.py:2174 ishtar_common/forms_common.py:2359 #: ishtar_common/templates/ishtar/sheet_document.html:100 msgid "Container" msgstr "" #: archaeological_finds/forms_treatments.py:407 -#: ishtar_common/forms_common.py:2363 +#: ishtar_common/forms_common.py:2366 msgid "Change " msgstr "" @@ -4107,12 +4094,12 @@ msgid "reference and current containers" msgstr "" #: archaeological_finds/forms_treatments.py:410 -#: ishtar_common/forms_common.py:2367 +#: ishtar_common/forms_common.py:2370 msgid "the reference container" msgstr "" #: archaeological_finds/forms_treatments.py:411 -#: ishtar_common/forms_common.py:2368 +#: ishtar_common/forms_common.py:2371 msgid "the current container" msgstr "" @@ -4166,7 +4153,7 @@ msgid "Treatment file - 001 - Search" msgstr "" #: archaeological_finds/forms_treatments.py:687 -#: archaeological_finds/forms_treatments.py:775 ishtar_common/models.py:4089 +#: archaeological_finds/forms_treatments.py:775 ishtar_common/models.py:4092 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:44 msgid "Internal ref." msgstr "" @@ -4288,7 +4275,7 @@ msgid "Treatment one to many - creation" msgstr "" #: archaeological_finds/models_finds.py:84 -#: archaeological_operations/models.py:2360 ishtar_common/models.py:3622 +#: archaeological_operations/models.py:2360 ishtar_common/models.py:3625 msgid "Code" msgstr "" @@ -4462,12 +4449,18 @@ msgstr "" msgid "Material index" msgstr "" +#: archaeological_finds/models_finds.py:439 +#: ishtar_common/templates/blocks/DataTables-stats.html:25 +#: ishtar_common/templates/ishtar/import_step_by_step.html:46 +msgid "Line" +msgstr "" + #: archaeological_finds/models_finds.py:441 msgid "Short ID" msgstr "" #: archaeological_finds/models_finds.py:445 -#: archaeological_finds/models_finds.py:452 ishtar_common/models.py:4198 +#: archaeological_finds/models_finds.py:452 ishtar_common/models.py:4201 msgid "Cached value - do not edit" msgstr "" @@ -4583,7 +4576,7 @@ msgctxt "key for text search" msgid "code-patriarche" msgstr "" -#: archaeological_finds/models_finds.py:1261 ishtar_common/models.py:3925 +#: archaeological_finds/models_finds.py:1261 ishtar_common/models.py:3928 msgctxt "key for text search" msgid "operation-type" msgstr "" @@ -4616,8 +4609,8 @@ msgstr "" #: archaeological_finds/models_finds.py:1288 #: archaeological_finds/models_finds.py:1730 -#: archaeological_warehouse/models.py:956 ishtar_common/models.py:3933 -#: ishtar_common/models.py:4030 +#: archaeological_warehouse/models.py:956 ishtar_common/models.py:3936 +#: ishtar_common/models.py:4033 msgctxt "key for text search" msgid "context-record" msgstr "" @@ -4662,7 +4655,7 @@ msgctxt "key for text search" msgid "remarkability" msgstr "" -#: archaeological_finds/models_finds.py:1324 ishtar_common/models.py:3859 +#: archaeological_finds/models_finds.py:1324 ishtar_common/models.py:3862 msgctxt "key for text search" msgid "description" msgstr "" @@ -4677,7 +4670,7 @@ msgctxt "key for text search" msgid "checked" msgstr "" -#: archaeological_finds/models_finds.py:1335 ishtar_common/models.py:3953 +#: archaeological_finds/models_finds.py:1335 ishtar_common/models.py:3956 msgctxt "key for text search" msgid "container" msgstr "" @@ -4711,7 +4704,7 @@ msgid "last-modified-by" msgstr "" #: archaeological_finds/models_finds.py:1362 -#: ishtar_common/models_common.py:1435 +#: ishtar_common/models_common.py:1436 msgctxt "key for text search" msgid "created-by" msgstr "" @@ -5063,10 +5056,10 @@ msgstr "" #: archaeological_finds/models_finds.py:2345 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 #: archaeological_finds/views.py:1272 archaeological_warehouse/forms.py:685 -#: archaeological_warehouse/views.py:297 ishtar_common/models.py:4068 -#: ishtar_common/models.py:4416 +#: archaeological_warehouse/views.py:297 ishtar_common/models.py:4071 +#: ishtar_common/models.py:4419 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 -#: ishtar_common/views.py:2662 +#: ishtar_common/views.py:2663 msgid "Packaging" msgstr "" @@ -5115,7 +5108,7 @@ msgstr "" #: archaeological_finds/models_finds.py:2006 #: archaeological_finds/models_treatments.py:289 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:71 -#: ishtar_common/views.py:1008 ishtar_common/views.py:1087 +#: ishtar_common/views.py:1009 ishtar_common/views.py:1088 msgid "Treatments" msgstr "" @@ -5176,9 +5169,9 @@ msgid "No container have been set - the localisation cannot be set." msgstr "" #: archaeological_finds/models_finds.py:3342 ishtar_common/forms_common.py:118 -#: ishtar_common/forms_common.py:2441 ishtar_common/ishtar_menu.py:77 -#: ishtar_common/models.py:2785 ishtar_common/models.py:3114 -#: ishtar_common/models.py:3307 ishtar_common/models.py:3544 +#: ishtar_common/forms_common.py:2444 ishtar_common/ishtar_menu.py:77 +#: ishtar_common/models.py:2788 ishtar_common/models.py:3117 +#: ishtar_common/models.py:3310 ishtar_common/models.py:3547 #: ishtar_common/templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "" @@ -5314,7 +5307,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1175 #: archaeological_finds/templates/ishtar/sheet_find.html:491 -#: ishtar_common/views.py:1007 ishtar_common/views.py:1080 +#: ishtar_common/views.py:1008 ishtar_common/views.py:1081 msgid "Treatment requests" msgstr "" @@ -5363,23 +5356,19 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:10 #: ishtar_common/templates/ishtar/blocks/sheet_external_id.html:3 -#: sra_idf_app/templates/ishtar/sheet_basefind.html:10 msgid "Internal ID" msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:28 -#: sra_idf_app/templates/ishtar/sheet_basefind.html:28 msgid "Discovery year" msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:31 -#: sra_idf_app/templates/ishtar/sheet_basefind.html:31 msgid "Discovery date (TPQ)" msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:61 #: ishtar_common/forms.py:933 -#: sra_idf_app/templates/ishtar/sheet_basefind.html:57 msgid "Last modified by" msgstr "" @@ -5469,7 +5458,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_findbasket.html:24 #: archaeological_warehouse/templates/ishtar/sheet_container.html:31 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:27 -#: ishtar_common/forms_common.py:1854 +#: ishtar_common/forms_common.py:1857 #: ishtar_common/templates/ishtar/sheet_document.html:57 msgid "Content" msgstr "" @@ -5656,20 +5645,20 @@ msgid "" msgstr "" #: archaeological_operations/forms.py:76 -#: archaeological_operations/models.py:2966 +#: archaeological_operations/models.py:2965 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Section" msgstr "" #: archaeological_operations/forms.py:79 -#: archaeological_operations/models.py:2968 +#: archaeological_operations/models.py:2967 msgid "Parcel number" msgstr "" #: archaeological_operations/forms.py:81 -#: archaeological_operations/models.py:2970 -#: archaeological_operations/models.py:2998 -#: archaeological_operations/models.py:3063 +#: archaeological_operations/models.py:2969 +#: archaeological_operations/models.py:2997 +#: archaeological_operations/models.py:3062 msgid "Public domain" msgstr "" @@ -5750,7 +5739,7 @@ msgstr "" #: archaeological_operations/forms.py:524 #: archaeological_operations/forms.py:698 #: archaeological_operations/forms.py:834 -#: archaeological_operations/forms.py:1811 +#: archaeological_operations/forms.py:1807 #: archaeological_operations/models.py:1263 msgid "Operator" msgstr "" @@ -5816,7 +5805,7 @@ msgstr "" #: archaeological_operations/forms.py:569 #: archaeological_operations/forms.py:886 -#: archaeological_operations/forms.py:1819 +#: archaeological_operations/forms.py:1815 #: archaeological_operations/models.py:915 #: archaeological_operations/models.py:1420 msgid "Documentation received" @@ -5832,7 +5821,7 @@ msgstr "" #: archaeological_operations/forms.py:576 #: archaeological_operations/forms.py:891 -#: archaeological_operations/forms.py:1823 +#: archaeological_operations/forms.py:1819 #: archaeological_operations/models.py:916 #: archaeological_operations/models.py:1425 msgid "Finds received" @@ -5846,7 +5835,7 @@ msgstr "" msgid "Finds deadline after" msgstr "" -#: archaeological_operations/forms.py:666 ishtar_common/models.py:4079 +#: archaeological_operations/forms.py:666 ishtar_common/models.py:4082 msgid "Associated file" msgstr "" @@ -5858,7 +5847,7 @@ msgstr "" msgid "All" msgstr "" -#: archaeological_operations/forms.py:683 ishtar_common/models.py:4903 +#: archaeological_operations/forms.py:683 ishtar_common/models.py:4906 msgid "Research" msgstr "" @@ -5879,7 +5868,7 @@ msgid "Operation - 010 - General" msgstr "" #: archaeological_operations/forms.py:792 -#: archaeological_operations/forms.py:1871 +#: archaeological_operations/forms.py:1867 #: archaeological_operations/models.py:1363 msgid "Generic name" msgstr "" @@ -5904,8 +5893,8 @@ msgstr "" #: archaeological_operations/forms.py:856 #: archaeological_operations/forms.py:1445 -#: archaeological_operations/forms.py:1827 -#: archaeological_operations/forms.py:1964 +#: archaeological_operations/forms.py:1823 +#: archaeological_operations/forms.py:1960 #: archaeological_operations/models.py:476 #: archaeological_operations/models.py:1277 msgid "Collaborators" @@ -6073,10 +6062,10 @@ msgstr "" #: archaeological_operations/forms.py:1195 #: archaeological_operations/forms.py:1314 #: archaeological_operations/forms.py:1430 -#: archaeological_operations/forms.py:1923 +#: archaeological_operations/forms.py:1919 #: archaeological_operations/models.py:453 -#: archaeological_warehouse/models.py:1991 ishtar_common/forms_common.py:1779 -#: ishtar_common/forms_common.py:2065 ishtar_common/forms_common.py:2290 +#: archaeological_warehouse/models.py:1991 ishtar_common/forms_common.py:1782 +#: ishtar_common/forms_common.py:2068 ishtar_common/forms_common.py:2293 #: ishtar_common/models.py:2270 #: ishtar_common/templates/ishtar/sheet_document.html:40 msgid "Reference" @@ -6084,13 +6073,13 @@ msgstr "" #: archaeological_operations/forms.py:1206 #: archaeological_operations/forms.py:1441 -#: archaeological_operations/forms.py:1970 +#: archaeological_operations/forms.py:1966 msgid "Cultural attributions" msgstr "" #: archaeological_operations/forms.py:1251 #: archaeological_operations/forms.py:1500 -#: archaeological_operations/forms.py:1943 +#: archaeological_operations/forms.py:1939 msgid "This reference already exists." msgstr "" @@ -6181,80 +6170,80 @@ msgstr "" msgid "Archaeological site - 030 - Underwater" msgstr "" -#: archaeological_operations/forms.py:1598 +#: archaeological_operations/forms.py:1596 #: archaeological_operations/views.py:599 msgid "Administrative act search" msgstr "" -#: archaeological_operations/forms.py:1613 -#: archaeological_operations/forms.py:1717 -#: archaeological_operations/forms.py:1784 +#: archaeological_operations/forms.py:1611 +#: archaeological_operations/forms.py:1713 +#: archaeological_operations/forms.py:1780 msgid "You should select an administrative act." msgstr "" -#: archaeological_operations/forms.py:1623 +#: archaeological_operations/forms.py:1621 #: archaeological_operations/models.py:2661 msgid "Signatory" msgstr "" -#: archaeological_operations/forms.py:1630 +#: archaeological_operations/forms.py:1628 #: archaeological_operations/models.py:2696 msgid "Signature date" msgstr "" -#: archaeological_operations/forms.py:1643 +#: archaeological_operations/forms.py:1639 msgid "Operation - Administrative act - General" msgstr "" -#: archaeological_operations/forms.py:1677 +#: archaeological_operations/forms.py:1673 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: archaeological_operations/forms.py:1681 +#: archaeological_operations/forms.py:1677 msgid "Bad index" msgstr "" -#: archaeological_operations/forms.py:1694 +#: archaeological_operations/forms.py:1690 msgid "Would you like to delete this administrative act?" msgstr "" -#: archaeological_operations/forms.py:1699 ishtar_common/forms.py:1275 +#: archaeological_operations/forms.py:1695 ishtar_common/forms.py:1275 #: ishtar_common/models.py:1944 msgid "Template" msgstr "" +#: archaeological_operations/forms.py:1719 #: archaeological_operations/forms.py:1723 -#: archaeological_operations/forms.py:1727 msgid "This document is not intended for this type of act." msgstr "" -#: archaeological_operations/forms.py:1745 +#: archaeological_operations/forms.py:1741 msgid "Doc generation" msgstr "" -#: archaeological_operations/forms.py:1747 +#: archaeological_operations/forms.py:1743 msgid "Generate the associated doc?" msgstr "" -#: archaeological_operations/forms.py:1768 +#: archaeological_operations/forms.py:1764 #: archaeological_operations/ishtar_menu.py:112 #: archaeological_operations/views.py:692 msgctxt "admin act register" msgid "Register" msgstr "" -#: archaeological_operations/forms.py:1789 +#: archaeological_operations/forms.py:1785 msgid "Operation - Quick action - Modify" msgstr "" -#: archaeological_operations/forms.py:1898 +#: archaeological_operations/forms.py:1894 msgid "This code already exists." msgstr "" -#: archaeological_operations/forms.py:1954 +#: archaeological_operations/forms.py:1950 msgid "Archaeological files - Quick action - Modify" msgstr "" @@ -6380,8 +6369,8 @@ msgid "SITE" msgstr "" #: archaeological_operations/models.py:739 ishtar_common/forms.py:1158 -#: ishtar_common/models.py:4974 ishtar_common/models.py:5131 -#: ishtar_common/models.py:5190 ishtar_common/views_item.py:1516 +#: ishtar_common/models.py:4977 ishtar_common/models.py:5134 +#: ishtar_common/models.py:5193 ishtar_common/views_item.py:1515 msgid "Unknown" msgstr "" @@ -6543,8 +6532,8 @@ msgctxt "key for text search" msgid "code-drassm" msgstr "" -#: archaeological_operations/models.py:1206 ishtar_common/models.py:3949 -#: ishtar_common/models.py:4033 +#: archaeological_operations/models.py:1206 ishtar_common/models.py:3952 +#: ishtar_common/models.py:4036 msgctxt "key for text search" msgid "file" msgstr "" @@ -6573,8 +6562,8 @@ msgstr "" #: archaeological_operations/models.py:1483 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:8 #: archaeological_operations/templates/ishtar/sheet_site.html:87 -#: ishtar_common/models.py:1001 ishtar_common/views.py:1001 -#: ishtar_common/views.py:1068 +#: ishtar_common/models.py:1001 ishtar_common/views.py:1002 +#: ishtar_common/views.py:1069 msgid "Operations" msgstr "" @@ -6806,67 +6795,67 @@ msgstr "" msgid "Archaeological preventive operator" msgstr "" -#: archaeological_operations/models.py:2707 +#: archaeological_operations/models.py:2706 msgid "Cached values get from associated departments" msgstr "" -#: archaeological_operations/models.py:2713 +#: archaeological_operations/models.py:2712 msgid "Cached values get from associated towns" msgstr "" -#: archaeological_operations/models.py:2887 +#: archaeological_operations/models.py:2886 msgid "This index already exists for this year" msgstr "" -#: archaeological_operations/models.py:2977 +#: archaeological_operations/models.py:2976 msgid "Address - Locality" msgstr "" -#: archaeological_operations/models.py:3224 ishtar_common/models.py:3418 +#: archaeological_operations/models.py:3223 ishtar_common/models.py:3421 msgid "Owner" msgstr "" -#: archaeological_operations/models.py:3239 +#: archaeological_operations/models.py:3238 msgid "Parcel owner" msgstr "" -#: archaeological_operations/models.py:3240 +#: archaeological_operations/models.py:3239 msgid "Parcel owners" msgstr "" -#: archaeological_operations/models.py:3288 +#: archaeological_operations/models.py:3287 msgid "Recorded" msgstr "" -#: archaeological_operations/models.py:3290 +#: archaeological_operations/models.py:3289 msgid "Active" msgstr "" -#: archaeological_operations/models.py:3291 +#: archaeological_operations/models.py:3290 msgid "Field completed" msgstr "" -#: archaeological_operations/models.py:3292 +#: archaeological_operations/models.py:3291 msgid "Associated report" msgstr "" -#: archaeological_operations/models.py:3293 +#: archaeological_operations/models.py:3292 msgid "Closed" msgstr "" -#: archaeological_operations/models.py:3294 +#: archaeological_operations/models.py:3293 msgid "Documented and closed" msgstr "" -#: archaeological_operations/models.py:3793 ishtar_common/models.py:4844 +#: archaeological_operations/models.py:3792 ishtar_common/models.py:4847 msgid "Is preventive" msgstr "" -#: archaeological_operations/models.py:3796 +#: archaeological_operations/models.py:3795 msgid "Operation type old" msgstr "" -#: archaeological_operations/models.py:3797 +#: archaeological_operations/models.py:3796 msgid "Operation types old" msgstr "" @@ -7052,8 +7041,8 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:81 #: archaeological_operations/templates/ishtar/sheet_operation.html:401 #: archaeological_operations/templates/ishtar/sheet_operation.html:499 -#: ishtar_common/models.py:1001 ishtar_common/views.py:1003 -#: ishtar_common/views.py:1073 +#: ishtar_common/models.py:1001 ishtar_common/views.py:1004 +#: ishtar_common/views.py:1074 msgid "Context records" msgstr "" @@ -7180,7 +7169,7 @@ msgid "" "same Ishtar version?" msgstr "" -#: archaeological_operations/tests.py:4724 ishtar_common/admin.py:2271 +#: archaeological_operations/tests.py:4724 ishtar_common/admin.py:2276 #, python-brace-format msgid "" "Theses types have not been found: {missing_types}. Not the same Ishtar " @@ -7191,7 +7180,7 @@ msgstr "" msgid "{result['deleted']} matches deleted" msgstr "" -#: archaeological_operations/tests.py:4803 ishtar_common/admin.py:2349 +#: archaeological_operations/tests.py:4803 ishtar_common/admin.py:2354 msgid "{result['updated']} match key(s) updated." msgstr "" @@ -7265,8 +7254,8 @@ msgstr "" #: archaeological_warehouse/models.py:400 #: archaeological_warehouse/models.py:889 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:4 -#: ishtar_common/forms_common.py:1859 ishtar_common/models.py:5067 -#: ishtar_common/views.py:402 +#: ishtar_common/forms_common.py:1862 ishtar_common/models.py:5070 +#: ishtar_common/views.py:403 msgid "Warehouse" msgstr "" @@ -7327,30 +7316,32 @@ msgid "" "used for the organization." msgstr "" -#: archaeological_warehouse/forms.py:239 ishtar_common/forms_common.py:536 -#: ishtar_common/forms_common.py:918 ishtar_common/models_common.py:2844 +#: archaeological_warehouse/forms.py:239 ishtar_common/forms_common.py:538 +#: ishtar_common/forms_common.py:921 ishtar_common/models_common.py:2848 +#: ishtar_common/models_common.py:3006 msgid "Address complement" msgstr "" -#: archaeological_warehouse/forms.py:242 ishtar_common/forms_common.py:539 -#: ishtar_common/forms_common.py:921 ishtar_common/models_common.py:2849 +#: archaeological_warehouse/forms.py:242 ishtar_common/forms_common.py:541 +#: ishtar_common/forms_common.py:924 ishtar_common/models_common.py:2853 msgid "Town (freeform)" msgstr "" -#: archaeological_warehouse/forms.py:244 ishtar_common/forms_common.py:541 -#: ishtar_common/forms_common.py:923 ishtar_common/models_common.py:2857 +#: archaeological_warehouse/forms.py:244 ishtar_common/forms_common.py:543 +#: ishtar_common/forms_common.py:926 ishtar_common/models_common.py:2861 msgid "Country" msgstr "" -#: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:543 -#: ishtar_common/forms_common.py:894 ishtar_common/models_common.py:2871 +#: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:545 +#: ishtar_common/forms_common.py:897 ishtar_common/models_common.py:2875 +#: ishtar_common/models_common.py:3018 #: ishtar_common/templates/ishtar/sheet_person.html:27 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:34 msgid "Phone" msgstr "" -#: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:545 -#: ishtar_common/forms_common.py:904 ishtar_common/models_common.py:2887 +#: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:547 +#: ishtar_common/forms_common.py:907 ishtar_common/models_common.py:2891 #: ishtar_common/templates/ishtar/sheet_person.html:45 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:55 msgid "Mobile phone" @@ -7650,7 +7641,7 @@ msgctxt "key for text search" msgid "find-label" msgstr "" -#: archaeological_warehouse/models.py:964 ishtar_common/models.py:3945 +#: archaeological_warehouse/models.py:964 ishtar_common/models.py:3948 msgctxt "key for text search" msgid "find-denomination" msgstr "" @@ -7714,8 +7705,8 @@ msgstr "" msgid "Cached division" msgstr "" -#: archaeological_warehouse/models.py:1121 ishtar_common/models.py:4180 -#: ishtar_common/models.py:4184 +#: archaeological_warehouse/models.py:1121 ishtar_common/models.py:4183 +#: ishtar_common/models.py:4187 msgid "Container ID" msgstr "" @@ -7948,17 +7939,17 @@ msgstr "" msgid "warehouse" msgstr "" -#: example_project/__init__.py:13 ishtar_common/views.py:245 -#: ishtar_common/views.py:957 +#: example_project/__init__.py:13 ishtar_common/views.py:246 +#: ishtar_common/views.py:958 msgid "New organization" msgstr "" -#: example_project/__init__.py:14 ishtar_common/views.py:187 -#: ishtar_common/views.py:950 ishtar_common/views.py:954 +#: example_project/__init__.py:14 ishtar_common/views.py:188 +#: ishtar_common/views.py:951 ishtar_common/views.py:955 msgid "New person" msgstr "" -#: example_project/__init__.py:15 ishtar_common/views.py:963 +#: example_project/__init__.py:15 ishtar_common/views.py:964 msgid "New author" msgstr "" @@ -7994,7 +7985,7 @@ msgstr "" msgid "Merge selected items" msgstr "" -#: ishtar_common/admin.py:334 ishtar_common/forms_common.py:663 +#: ishtar_common/admin.py:334 ishtar_common/forms_common.py:666 msgid "At least two items have to be selected." msgstr "" @@ -8015,335 +8006,335 @@ msgstr "" msgid "{} parent(s) were changed to {}." msgstr "" -#: ishtar_common/admin.py:485 ishtar_common/models.py:1417 +#: ishtar_common/admin.py:490 ishtar_common/models.py:1417 msgid "Maps - default center" msgstr "" -#: ishtar_common/admin.py:536 ishtar_common/models.py:979 +#: ishtar_common/admin.py:541 ishtar_common/models.py:979 #: ishtar_common/templates/navbar.html:31 msgid "Profile" msgstr "" -#: ishtar_common/admin.py:537 ishtar_common/forms_common.py:1226 -#: ishtar_common/forms_common.py:1261 ishtar_common/forms_common.py:1262 -#: ishtar_common/models.py:2895 +#: ishtar_common/admin.py:542 ishtar_common/forms_common.py:1229 +#: ishtar_common/forms_common.py:1264 ishtar_common/forms_common.py:1265 +#: ishtar_common/models.py:2898 msgid "Profiles" msgstr "" -#: ishtar_common/admin.py:632 +#: ishtar_common/admin.py:637 msgid "The CSV file should at least have a {} column" msgstr "" -#: ishtar_common/admin.py:699 ishtar_common/admin.py:929 +#: ishtar_common/admin.py:704 ishtar_common/admin.py:934 #, python-format msgid "%d item(s) created." msgstr "" -#: ishtar_common/admin.py:701 ishtar_common/admin.py:933 +#: ishtar_common/admin.py:706 ishtar_common/admin.py:938 #, python-format msgid "%d item(s) updated." msgstr "" -#: ishtar_common/admin.py:705 +#: ishtar_common/admin.py:710 msgid "These parents are missing: {}" msgstr "" -#: ishtar_common/admin.py:725 +#: ishtar_common/admin.py:730 msgid "Geojson file" msgstr "" -#: ishtar_common/admin.py:727 +#: ishtar_common/admin.py:732 msgid "" "Only unicode encoding is managed - convert your file first. The file must be " "a geojson file or a zip containing a geojson file." msgstr "" -#: ishtar_common/admin.py:733 +#: ishtar_common/admin.py:738 msgid "Prefix for numero INSEE" msgstr "" -#: ishtar_common/admin.py:736 +#: ishtar_common/admin.py:741 msgid "Field name for numero INSEE" msgstr "" -#: ishtar_common/admin.py:739 +#: ishtar_common/admin.py:744 msgid "Field name for name" msgstr "" -#: ishtar_common/admin.py:741 +#: ishtar_common/admin.py:746 msgid "m2" msgstr "" -#: ishtar_common/admin.py:741 +#: ishtar_common/admin.py:746 msgid "km2" msgstr "" -#: ishtar_common/admin.py:742 +#: ishtar_common/admin.py:747 msgid "Surface unit" msgstr "" -#: ishtar_common/admin.py:744 +#: ishtar_common/admin.py:749 msgid "Field name for surface" msgstr "" -#: ishtar_common/admin.py:747 +#: ishtar_common/admin.py:752 msgid "Field name for year" msgstr "" -#: ishtar_common/admin.py:751 +#: ishtar_common/admin.py:756 msgid "Not required for new town. Leave it empty when not available." msgstr "" -#: ishtar_common/admin.py:754 +#: ishtar_common/admin.py:759 msgid "Update only geometry of existing towns" msgstr "" -#: ishtar_common/admin.py:773 +#: ishtar_common/admin.py:778 msgid "\"{}\" not found in feature {}" msgstr "" -#: ishtar_common/admin.py:786 +#: ishtar_common/admin.py:791 msgid "\"{}\" not found in properties of feature {}" msgstr "" -#: ishtar_common/admin.py:799 +#: ishtar_common/admin.py:804 msgid "Bad geometry for feature {}" msgstr "" -#: ishtar_common/admin.py:810 +#: ishtar_common/admin.py:815 msgid "Geometry {} not managed for towns - feature {}" msgstr "" -#: ishtar_common/admin.py:820 +#: ishtar_common/admin.py:825 msgid "Bad value for surface: {} - feature {}" msgstr "" -#: ishtar_common/admin.py:864 +#: ishtar_common/admin.py:869 msgid "No json file found in zipfile" msgstr "" -#: ishtar_common/admin.py:887 +#: ishtar_common/admin.py:892 msgid "Bad geojson file" msgstr "" -#: ishtar_common/admin.py:899 +#: ishtar_common/admin.py:904 msgid "Too many errors..." msgstr "" -#: ishtar_common/admin.py:952 +#: ishtar_common/admin.py:957 msgid "Zipped JSON file" msgstr "" -#: ishtar_common/admin.py:953 +#: ishtar_common/admin.py:958 msgid "Import from a zipped JSON file generated by Ishtar" msgstr "" -#: ishtar_common/admin.py:989 +#: ishtar_common/admin.py:994 msgid "{} {}(s) created/updated." msgstr "" -#: ishtar_common/admin.py:1012 +#: ishtar_common/admin.py:1017 msgid "Center" msgstr "" -#: ishtar_common/admin.py:1013 ishtar_common/models_common.py:2636 +#: ishtar_common/admin.py:1018 ishtar_common/models_common.py:2637 msgid "Limit" msgstr "" -#: ishtar_common/admin.py:1021 +#: ishtar_common/admin.py:1026 msgid "Parents" msgstr "" -#: ishtar_common/admin.py:1062 ishtar_common/admin.py:1503 +#: ishtar_common/admin.py:1067 ishtar_common/admin.py:1508 msgid "Make available" msgstr "" -#: ishtar_common/admin.py:1063 ishtar_common/admin.py:1504 +#: ishtar_common/admin.py:1068 ishtar_common/admin.py:1509 msgid "Make unavailable" msgstr "" -#: ishtar_common/admin.py:1187 +#: ishtar_common/admin.py:1192 msgid "Department number" msgstr "" -#: ishtar_common/admin.py:1188 +#: ishtar_common/admin.py:1193 msgid "Area name" msgstr "" -#: ishtar_common/admin.py:1202 +#: ishtar_common/admin.py:1207 msgid "Choose an area or set an area reference." msgstr "" -#: ishtar_common/admin.py:1209 +#: ishtar_common/admin.py:1214 msgid "Invalid department number." msgstr "" -#: ishtar_common/admin.py:1218 +#: ishtar_common/admin.py:1223 msgid "This name is already used by another area." msgstr "" -#: ishtar_common/admin.py:1246 +#: ishtar_common/admin.py:1251 msgid "Area \"{}\" created." msgstr "" -#: ishtar_common/admin.py:1263 +#: ishtar_common/admin.py:1268 msgid "{} town(s) added to \"{}\"." msgstr "" -#: ishtar_common/admin.py:1435 +#: ishtar_common/admin.py:1440 msgid "{} importer type(s) duplicated: {}." msgstr "" -#: ishtar_common/admin.py:1456 +#: ishtar_common/admin.py:1461 msgid "Select only one importer." msgstr "" -#: ishtar_common/admin.py:1486 +#: ishtar_common/admin.py:1491 msgid "Export as libreoffice template" msgstr "" -#: ishtar_common/admin.py:1555 +#: ishtar_common/admin.py:1560 msgid "{} importer column(s) duplicated: {}." msgstr "" -#: ishtar_common/admin.py:1586 +#: ishtar_common/admin.py:1591 msgid "{} importer column(s) right-shifted." msgstr "" -#: ishtar_common/admin.py:1599 +#: ishtar_common/admin.py:1604 msgid "Shift right" msgstr "" -#: ishtar_common/admin.py:1626 +#: ishtar_common/admin.py:1631 msgid "{} importer column(s) left-shifted." msgstr "" -#: ishtar_common/admin.py:1633 +#: ishtar_common/admin.py:1638 msgid "{} importer column(s) not left-shifted: no place available." msgstr "" -#: ishtar_common/admin.py:1647 +#: ishtar_common/admin.py:1652 msgid "Shift left" msgstr "" -#: ishtar_common/admin.py:1682 +#: ishtar_common/admin.py:1687 msgid "Importer available" msgstr "" -#: ishtar_common/admin.py:1827 +#: ishtar_common/admin.py:1832 msgid "Display selected" msgstr "" -#: ishtar_common/admin.py:1828 +#: ishtar_common/admin.py:1833 msgid "Hide selected" msgstr "" -#: ishtar_common/admin.py:1858 ishtar_common/models.py:1553 +#: ishtar_common/admin.py:1863 ishtar_common/models.py:1553 msgid "Form" msgstr "" -#: ishtar_common/admin.py:1879 ishtar_common/models.py:1694 +#: ishtar_common/admin.py:1884 ishtar_common/models.py:1694 msgid "Field" msgstr "" -#: ishtar_common/admin.py:2009 ishtar_common/admin.py:2061 +#: ishtar_common/admin.py:2014 ishtar_common/admin.py:2066 msgid "Select only one task." msgstr "" -#: ishtar_common/admin.py:2016 +#: ishtar_common/admin.py:2021 msgid "Export already exported/scheduled." msgstr "" -#: ishtar_common/admin.py:2028 +#: ishtar_common/admin.py:2033 msgid "Launch export" msgstr "" -#: ishtar_common/admin.py:2068 +#: ishtar_common/admin.py:2073 msgid "Import already imported/scheduled." msgstr "" -#: ishtar_common/admin.py:2080 ishtar_common/models_imports.py:1353 +#: ishtar_common/admin.py:2085 ishtar_common/models_imports.py:1353 msgid "Launch import" msgstr "" -#: ishtar_common/admin.py:2150 ishtar_common/models.py:976 +#: ishtar_common/admin.py:2155 ishtar_common/models.py:976 msgid "Content type" msgstr "" -#: ishtar_common/admin.py:2182 ishtar_common/admin.py:2292 -#: ishtar_common/admin.py:2328 +#: ishtar_common/admin.py:2187 ishtar_common/admin.py:2297 +#: ishtar_common/admin.py:2333 msgid "Select only one source." msgstr "" -#: ishtar_common/admin.py:2203 +#: ishtar_common/admin.py:2208 msgid "Timeout: failed to join {}." msgstr "" -#: ishtar_common/admin.py:2211 +#: ishtar_common/admin.py:2216 msgid "" "Bad response for {} - {}. Response status code {} != 200. Check your key?" msgstr "" -#: ishtar_common/admin.py:2221 +#: ishtar_common/admin.py:2226 msgid "Response of {} is not a valid JSON message." msgstr "" -#: ishtar_common/admin.py:2239 +#: ishtar_common/admin.py:2244 #, python-brace-format msgid "{created} matches created" msgstr "" -#: ishtar_common/admin.py:2245 +#: ishtar_common/admin.py:2250 #, python-brace-format msgid "{updated} matches updated" msgstr "" -#: ishtar_common/admin.py:2251 +#: ishtar_common/admin.py:2256 #, python-brace-format msgid "{deleted} matches deleted" msgstr "" -#: ishtar_common/admin.py:2260 +#: ishtar_common/admin.py:2265 #, python-brace-format msgid "" "Theses search models have not been found: {missing_models}. Not the same " "Ishtar version?" msgstr "" -#: ishtar_common/admin.py:2278 +#: ishtar_common/admin.py:2283 msgid "Update types from source" msgstr "" -#: ishtar_common/admin.py:2313 +#: ishtar_common/admin.py:2318 msgid "Generate match document" msgstr "" -#: ishtar_common/admin.py:2337 +#: ishtar_common/admin.py:2342 msgid "Error on update. Cannot open match document." msgstr "" -#: ishtar_common/admin.py:2342 +#: ishtar_common/admin.py:2347 msgid "Error on type update from match document:" msgstr "" -#: ishtar_common/admin.py:2355 +#: ishtar_common/admin.py:2360 msgid "Update association from match document" msgstr "" -#: ishtar_common/admin.py:2388 +#: ishtar_common/admin.py:2393 msgid "Enable match" msgstr "" -#: ishtar_common/admin.py:2389 +#: ishtar_common/admin.py:2394 msgid "Disable match" msgstr "" -#: ishtar_common/admin.py:2399 ishtar_common/models_rest.py:70 +#: ishtar_common/admin.py:2404 ishtar_common/models_rest.py:70 msgid "API - Remote access - Search model" msgstr "" -#: ishtar_common/admin.py:2402 ishtar_common/models.py:449 -#: ishtar_common/models.py:732 ishtar_common/models_common.py:806 +#: ishtar_common/admin.py:2407 ishtar_common/models.py:449 +#: ishtar_common/models.py:732 ishtar_common/models_common.py:807 #: ishtar_common/models_imports.py:794 ishtar_common/models_rest.py:95 #: ishtar_common/templates/ishtar/formset_import_match.html:44 #: ishtar_common/templates/ishtar/import_step_by_step.html:171 @@ -8353,21 +8344,21 @@ msgstr "" msgid "Key" msgstr "" -#: ishtar_common/admin.py:2404 +#: ishtar_common/admin.py:2409 msgid "Save first to choose a key" msgstr "" -#: ishtar_common/admin.py:2434 +#: ishtar_common/admin.py:2439 msgid "Available keys: " msgstr "" -#: ishtar_common/admin.py:2467 +#: ishtar_common/admin.py:2472 msgid "" "Only one type of geographic data is accepted. Create different objects if " "you have many." msgstr "" -#: ishtar_common/admin.py:2475 +#: ishtar_common/admin.py:2480 msgid "You cannot set only x or only y coordinate." msgstr "" @@ -8466,7 +8457,7 @@ msgstr "" msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d" msgstr "" -#: ishtar_common/data_importer.py:854 ishtar_common/views.py:1618 +#: ishtar_common/data_importer.py:854 ishtar_common/views.py:1619 msgid "No data provided" msgstr "" @@ -8500,8 +8491,8 @@ msgid "" "Related object not found. Can not create the geographic item. Context: {}." msgstr "" -#: ishtar_common/data_importer.py:1551 ishtar_common/views.py:1696 -#: ishtar_common/views.py:1706 +#: ishtar_common/data_importer.py:1551 ishtar_common/views.py:1697 +#: ishtar_common/views.py:1707 msgid "Not imported" msgstr "" @@ -8582,8 +8573,8 @@ msgstr "" msgid "File too large. Size should not exceed {} Mo." msgstr "" -#: ishtar_common/forms.py:112 ishtar_common/forms_common.py:1268 -#: ishtar_common/views.py:2585 +#: ishtar_common/forms.py:112 ishtar_common/forms_common.py:1271 +#: ishtar_common/views.py:2586 msgid "Confirm" msgstr "" @@ -8615,7 +8606,7 @@ msgstr "" msgid "Is locked?" msgstr "" -#: ishtar_common/forms.py:971 ishtar_common/forms_common.py:2106 +#: ishtar_common/forms.py:971 ishtar_common/forms_common.py:2109 msgid "Has an image?" msgstr "" @@ -8653,49 +8644,49 @@ msgid "" "french town Saint-Denis in the Seine-Saint-Denis department.</p>" msgstr "" -#: ishtar_common/forms_common.py:169 ishtar_common/forms_common.py:257 +#: ishtar_common/forms_common.py:169 ishtar_common/forms_common.py:255 msgid "Associated images (web link to a zip file)" msgstr "" -#: ishtar_common/forms_common.py:192 ishtar_common/forms_common.py:276 +#: ishtar_common/forms_common.py:191 ishtar_common/forms_common.py:273 msgid "Import (table)" msgstr "" -#: ishtar_common/forms_common.py:236 +#: ishtar_common/forms_common.py:234 msgid "This is not a valid CSV file. Check file format and encoding." msgstr "" -#: ishtar_common/forms_common.py:248 +#: ishtar_common/forms_common.py:246 msgid "" "This import type have no unicity type defined. Conservative import is not " "possible." msgstr "" -#: ishtar_common/forms_common.py:284 +#: ishtar_common/forms_common.py:281 msgid "You put either a file or a download link for images but not both." msgstr "" -#: ishtar_common/forms_common.py:295 ishtar_common/tests.py:2524 +#: ishtar_common/forms_common.py:292 ishtar_common/tests.py:2533 msgid "\"Associated images\" field must be a valid zip file." msgstr "" -#: ishtar_common/forms_common.py:307 +#: ishtar_common/forms_common.py:304 msgid "Invalid link or no file is available for this link." msgstr "" -#: ishtar_common/forms_common.py:349 +#: ishtar_common/forms_common.py:347 msgid "Import (GIS)" msgstr "" -#: ishtar_common/forms_common.py:370 +#: ishtar_common/forms_common.py:372 msgid "GIS file must be a zip containing a ShapeFile or GeoPackage file." msgstr "" -#: ishtar_common/forms_common.py:393 +#: ishtar_common/forms_common.py:395 msgid "Target" msgstr "" -#: ishtar_common/forms_common.py:394 ishtar_common/models.py:1756 +#: ishtar_common/forms_common.py:396 ishtar_common/models.py:1756 #: ishtar_common/models_imports.py:795 #: ishtar_common/templates/ishtar/formset_import_match.html:45 #: ishtar_common/templates/ishtar/import_step_by_step.html:172 @@ -8704,656 +8695,671 @@ msgstr "" msgid "Value" msgstr "" -#: ishtar_common/forms_common.py:395 +#: ishtar_common/forms_common.py:397 msgid "Remember" msgstr "" -#: ishtar_common/forms_common.py:420 +#: ishtar_common/forms_common.py:422 msgid "Set to NULL" msgstr "" -#: ishtar_common/forms_common.py:427 +#: ishtar_common/forms_common.py:429 msgid "this import only" msgstr "" -#: ishtar_common/forms_common.py:428 +#: ishtar_common/forms_common.py:430 msgid "me" msgstr "" -#: ishtar_common/forms_common.py:441 +#: ishtar_common/forms_common.py:443 msgid "the current group: {}" msgstr "" -#: ishtar_common/forms_common.py:447 +#: ishtar_common/forms_common.py:449 msgid "all users" msgstr "" -#: ishtar_common/forms_common.py:526 ishtar_common/forms_common.py:637 +#: ishtar_common/forms_common.py:528 ishtar_common/forms_common.py:640 #: ishtar_common/models.py:2411 ishtar_common/models_imports.py:871 #: ishtar_common/models_imports.py:872 msgid "Organization type" msgstr "" -#: ishtar_common/forms_common.py:527 ishtar_common/forms_common.py:2071 -#: ishtar_common/models.py:2479 +#: ishtar_common/forms_common.py:529 ishtar_common/forms_common.py:2074 +#: ishtar_common/models.py:2486 msgid "Web address" msgstr "" -#: ishtar_common/forms_common.py:529 ishtar_common/forms_common.py:640 +#: ishtar_common/forms_common.py:531 ishtar_common/forms_common.py:643 #: ishtar_common/models.py:2387 ishtar_common/models.py:2404 -#: ishtar_common/models.py:2481 +#: ishtar_common/models.py:2488 msgid "Grammatical gender" msgstr "" -#: ishtar_common/forms_common.py:532 ishtar_common/forms_common.py:643 +#: ishtar_common/forms_common.py:534 ishtar_common/forms_common.py:646 msgid "Can be used by templates" msgstr "" -#: ishtar_common/forms_common.py:542 ishtar_common/forms_common.py:763 -#: ishtar_common/forms_common.py:890 ishtar_common/forms_common.py:981 -#: ishtar_common/forms_common.py:1148 ishtar_common/models_common.py:2889 -#: ishtar_common/wizards.py:1931 +#: ishtar_common/forms_common.py:544 ishtar_common/forms_common.py:766 +#: ishtar_common/forms_common.py:893 ishtar_common/forms_common.py:984 +#: ishtar_common/forms_common.py:1151 ishtar_common/models_common.py:2893 +#: ishtar_common/models_common.py:3028 ishtar_common/wizards.py:1931 msgid "Email" msgstr "" -#: ishtar_common/forms_common.py:594 ishtar_common/forms_common.py:610 -#: ishtar_common/views.py:236 +#: ishtar_common/forms_common.py:597 ishtar_common/forms_common.py:613 +#: ishtar_common/views.py:237 msgid "Organization search" msgstr "" -#: ishtar_common/forms_common.py:627 +#: ishtar_common/forms_common.py:630 msgid "Organization - Quick action - Modify" msgstr "" -#: ishtar_common/forms_common.py:680 +#: ishtar_common/forms_common.py:683 msgid "Merge all items into" msgstr "" -#: ishtar_common/forms_common.py:718 +#: ishtar_common/forms_common.py:721 msgid "Organization to merge" msgstr "" -#: ishtar_common/forms_common.py:762 ishtar_common/forms_common.py:886 -#: ishtar_common/forms_common.py:980 ishtar_common/models.py:2755 +#: ishtar_common/forms_common.py:765 ishtar_common/forms_common.py:889 +#: ishtar_common/forms_common.py:983 ishtar_common/models.py:2758 #: ishtar_common/templates/ishtar/sheet_organization.html:26 msgid "Surname" msgstr "" -#: ishtar_common/forms_common.py:781 ishtar_common/forms_common.py:797 -#: ishtar_common/forms_common.py:956 ishtar_common/views.py:177 +#: ishtar_common/forms_common.py:784 ishtar_common/forms_common.py:800 +#: ishtar_common/forms_common.py:959 ishtar_common/views.py:178 msgid "Person search" msgstr "" -#: ishtar_common/forms_common.py:815 +#: ishtar_common/forms_common.py:818 msgid "Person - Quick action - Modify" msgstr "" -#: ishtar_common/forms_common.py:826 ishtar_common/forms_common.py:883 -#: ishtar_common/forms_common.py:1653 ishtar_common/forms_common.py:2063 -#: ishtar_common/forms_common.py:2289 ishtar_common/models.py:2742 -#: ishtar_common/models.py:2746 ishtar_common/models.py:4077 +#: ishtar_common/forms_common.py:829 ishtar_common/forms_common.py:886 +#: ishtar_common/forms_common.py:1656 ishtar_common/forms_common.py:2066 +#: ishtar_common/forms_common.py:2292 ishtar_common/models.py:2745 +#: ishtar_common/models.py:2749 ishtar_common/models.py:4080 #: ishtar_common/models_imports.py:874 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:7 +#: ishtar_common/templates/ishtar/merge_person.html:10 +#: ishtar_common/templates/ishtar/merge_person.html:22 msgid "Title" msgstr "" -#: ishtar_common/forms_common.py:837 ishtar_common/models.py:2561 +#: ishtar_common/forms_common.py:840 ishtar_common/models.py:2564 msgid "Person types" msgstr "" -#: ishtar_common/forms_common.py:855 +#: ishtar_common/forms_common.py:858 msgid "Person to merge" msgstr "" -#: ishtar_common/forms_common.py:877 +#: ishtar_common/forms_common.py:880 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:19 msgid "Identity" msgstr "" -#: ishtar_common/forms_common.py:884 ishtar_common/models.py:2752 +#: ishtar_common/forms_common.py:887 ishtar_common/models.py:2755 +#: ishtar_common/templates/ishtar/merge_person.html:12 +#: ishtar_common/templates/ishtar/merge_person.html:24 msgid "Salutation" msgstr "" -#: ishtar_common/forms_common.py:889 ishtar_common/models.py:2765 +#: ishtar_common/forms_common.py:892 ishtar_common/models.py:2768 +#: ishtar_common/templates/ishtar/merge_person.html:9 +#: ishtar_common/templates/ishtar/merge_person.html:21 msgid "Raw name" msgstr "" -#: ishtar_common/forms_common.py:892 ishtar_common/models_common.py:2873 +#: ishtar_common/forms_common.py:895 ishtar_common/models_common.py:2877 msgid "Phone description" msgstr "" -#: ishtar_common/forms_common.py:896 ishtar_common/models_common.py:2876 -#: ishtar_common/models_common.py:2879 +#: ishtar_common/forms_common.py:899 ishtar_common/models_common.py:2880 +#: ishtar_common/models_common.py:2883 msgid "Phone description 2" msgstr "" -#: ishtar_common/forms_common.py:898 +#: ishtar_common/forms_common.py:901 msgid "Phone 2" msgstr "" -#: ishtar_common/forms_common.py:900 ishtar_common/models_common.py:2883 +#: ishtar_common/forms_common.py:903 ishtar_common/models_common.py:2887 msgid "Phone description 3" msgstr "" -#: ishtar_common/forms_common.py:902 ishtar_common/models_common.py:2881 +#: ishtar_common/forms_common.py:905 ishtar_common/models_common.py:2885 msgid "Phone 3" msgstr "" -#: ishtar_common/forms_common.py:907 +#: ishtar_common/forms_common.py:910 msgid "Current organization" msgstr "" -#: ishtar_common/forms_common.py:925 ishtar_common/models_common.py:2858 +#: ishtar_common/forms_common.py:928 ishtar_common/models_common.py:2862 msgid "Other address: address" msgstr "" -#: ishtar_common/forms_common.py:928 ishtar_common/models_common.py:2860 +#: ishtar_common/forms_common.py:931 ishtar_common/models_common.py:2864 msgid "Other address: address complement" msgstr "" -#: ishtar_common/forms_common.py:933 ishtar_common/models_common.py:2863 +#: ishtar_common/forms_common.py:936 ishtar_common/models_common.py:2867 msgid "Other address: postal code" msgstr "" -#: ishtar_common/forms_common.py:936 ishtar_common/models_common.py:2866 +#: ishtar_common/forms_common.py:939 ishtar_common/models_common.py:2870 msgid "Other address: town" msgstr "" -#: ishtar_common/forms_common.py:939 ishtar_common/models_common.py:2869 +#: ishtar_common/forms_common.py:942 ishtar_common/models_common.py:2873 msgid "Other address: country" msgstr "" -#: ishtar_common/forms_common.py:951 +#: ishtar_common/forms_common.py:954 msgid "Already has an account" msgstr "" -#: ishtar_common/forms_common.py:978 ishtar_common/models.py:3271 +#: ishtar_common/forms_common.py:981 ishtar_common/models.py:3274 #: ishtar_common/wizards.py:1930 msgid "Username" msgstr "" -#: ishtar_common/forms_common.py:1000 ishtar_common/forms_common.py:1013 +#: ishtar_common/forms_common.py:1003 ishtar_common/forms_common.py:1016 msgid "Account search" msgstr "" -#: ishtar_common/forms_common.py:1075 ishtar_common/forms_common.py:1123 -#: ishtar_common/forms_common.py:1127 ishtar_common/models.py:2560 +#: ishtar_common/forms_common.py:1078 ishtar_common/forms_common.py:1126 +#: ishtar_common/forms_common.py:1130 ishtar_common/models.py:2563 #: ishtar_common/models_imports.py:873 msgid "Person type" msgstr "" -#: ishtar_common/forms_common.py:1142 ishtar_common/forms_common.py:1146 +#: ishtar_common/forms_common.py:1145 ishtar_common/forms_common.py:1149 #: ishtar_common/ishtar_menu.py:38 msgid "Account" msgstr "" -#: ishtar_common/forms_common.py:1151 ishtar_common/forms_common.py:1166 +#: ishtar_common/forms_common.py:1154 ishtar_common/forms_common.py:1169 #: ishtar_common/wizards.py:1966 msgid "New password" msgstr "" -#: ishtar_common/forms_common.py:1158 +#: ishtar_common/forms_common.py:1161 msgid "New password (confirmation)" msgstr "" -#: ishtar_common/forms_common.py:1168 +#: ishtar_common/forms_common.py:1171 msgid "" "Keep these fields empty if you do not want to change password. On creation, " "if you leave these fields empty, the user will not be able to connect." msgstr "" -#: ishtar_common/forms_common.py:1206 +#: ishtar_common/forms_common.py:1209 msgid "Your password and confirmation password do not match." msgstr "" -#: ishtar_common/forms_common.py:1212 +#: ishtar_common/forms_common.py:1215 msgid "You must provide a correct password." msgstr "" -#: ishtar_common/forms_common.py:1221 +#: ishtar_common/forms_common.py:1224 msgid "This username already exists." msgstr "" -#: ishtar_common/forms_common.py:1253 +#: ishtar_common/forms_common.py:1256 msgid "Choose different name for profiles." msgstr "" -#: ishtar_common/forms_common.py:1270 +#: ishtar_common/forms_common.py:1273 msgid "Send the new password by email?" msgstr "" -#: ishtar_common/forms_common.py:1283 ishtar_common/models.py:3100 -#: ishtar_common/views.py:1263 +#: ishtar_common/forms_common.py:1286 ishtar_common/models.py:3103 +#: ishtar_common/views.py:1264 msgid "Current profile" msgstr "" -#: ishtar_common/forms_common.py:1286 ishtar_common/models.py:3073 -#: ishtar_common/models.py:3092 ishtar_common/models_imports.py:879 +#: ishtar_common/forms_common.py:1289 ishtar_common/models.py:3076 +#: ishtar_common/models.py:3095 ishtar_common/models_imports.py:879 msgid "Profile type" msgstr "" -#: ishtar_common/forms_common.py:1289 +#: ishtar_common/forms_common.py:1292 msgid "Pin automatically items on creation and modification" msgstr "" -#: ishtar_common/forms_common.py:1294 +#: ishtar_common/forms_common.py:1297 msgid "Duplicate this profile" msgstr "" -#: ishtar_common/forms_common.py:1297 +#: ishtar_common/forms_common.py:1300 msgid "Delete this profile" msgstr "" -#: ishtar_common/forms_common.py:1334 ishtar_common/forms_common.py:1342 +#: ishtar_common/forms_common.py:1337 ishtar_common/forms_common.py:1345 #, python-brace-format msgid "External source - {src.name}" msgstr "" -#: ishtar_common/forms_common.py:1391 +#: ishtar_common/forms_common.py:1394 msgid "A profile with the same name exists." msgstr "" -#: ishtar_common/forms_common.py:1424 +#: ishtar_common/forms_common.py:1427 msgid " (duplicate)" msgstr "" -#: ishtar_common/forms_common.py:1453 +#: ishtar_common/forms_common.py:1456 msgid "There are identical towns." msgstr "" -#: ishtar_common/forms_common.py:1540 +#: ishtar_common/forms_common.py:1543 msgid "Only one choice can be checked." msgstr "" -#: ishtar_common/forms_common.py:1590 +#: ishtar_common/forms_common.py:1593 #, python-format msgid "Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)." msgstr "" -#: ishtar_common/forms_common.py:1615 +#: ishtar_common/forms_common.py:1618 msgid "This value already exist" msgstr "" -#: ishtar_common/forms_common.py:1631 ishtar_common/models.py:3692 +#: ishtar_common/forms_common.py:1634 ishtar_common/models.py:3695 #: ishtar_common/models_imports.py:882 msgid "Document tag" msgstr "" -#: ishtar_common/forms_common.py:1640 +#: ishtar_common/forms_common.py:1643 msgid "Document - General" msgstr "" -#: ishtar_common/forms_common.py:1661 ishtar_common/forms_common.py:2069 -#: ishtar_common/forms_common.py:2271 ishtar_common/models.py:4143 +#: ishtar_common/forms_common.py:1664 ishtar_common/forms_common.py:2072 +#: ishtar_common/forms_common.py:2274 ishtar_common/models.py:4146 msgid "Medium" msgstr "" -#: ishtar_common/forms_common.py:1664 ishtar_common/forms_common.py:1853 -#: ishtar_common/forms_common.py:2068 ishtar_common/forms_common.py:2270 -#: ishtar_common/models.py:4150 ishtar_common/models_imports.py:878 +#: ishtar_common/forms_common.py:1667 ishtar_common/forms_common.py:1856 +#: ishtar_common/forms_common.py:2071 ishtar_common/forms_common.py:2273 +#: ishtar_common/models.py:4153 ishtar_common/models_imports.py:878 #: ishtar_common/models_imports.py:880 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:88 #: ishtar_common/templates/ishtar/sheet_document.html:50 msgid "Format" msgstr "" -#: ishtar_common/forms_common.py:1666 ishtar_common/forms_common.py:2070 -#: ishtar_common/forms_common.py:2272 ishtar_common/models.py:4155 +#: ishtar_common/forms_common.py:1669 ishtar_common/forms_common.py:2073 +#: ishtar_common/forms_common.py:2275 ishtar_common/models.py:4158 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:98 msgid "Scale" msgstr "" -#: ishtar_common/forms_common.py:1684 ishtar_common/forms_common.py:1855 -#: ishtar_common/forms_common.py:2496 ishtar_common/forms_common.py:2497 -#: ishtar_common/models.py:3558 ishtar_common/models.py:3808 -#: ishtar_common/models.py:4157 +#: ishtar_common/forms_common.py:1687 ishtar_common/forms_common.py:1858 +#: ishtar_common/forms_common.py:2499 ishtar_common/forms_common.py:2500 +#: ishtar_common/models.py:3561 ishtar_common/models.py:3811 +#: ishtar_common/models.py:4160 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:9 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:9 #: ishtar_common/templates/ishtar/sheet_document.html:66 msgid "Authors" msgstr "" -#: ishtar_common/forms_common.py:1690 ishtar_common/forms_common.py:2074 -#: ishtar_common/models.py:4099 +#: ishtar_common/forms_common.py:1693 ishtar_common/forms_common.py:2077 +#: ishtar_common/models.py:4102 msgid "Publisher" msgstr "" -#: ishtar_common/forms_common.py:1714 ishtar_common/forms_common.py:2096 -#: ishtar_common/models.py:4106 +#: ishtar_common/forms_common.py:1717 ishtar_common/forms_common.py:2099 +#: ishtar_common/models.py:4109 msgid "Year of publication" msgstr "" -#: ishtar_common/forms_common.py:1719 +#: ishtar_common/forms_common.py:1722 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:64 msgid "Licenses" msgstr "" -#: ishtar_common/forms_common.py:1722 ishtar_common/models.py:4111 +#: ishtar_common/forms_common.py:1725 ishtar_common/models.py:4114 msgid "Tags" msgstr "" -#: ishtar_common/forms_common.py:1728 ishtar_common/forms_common.py:2097 -#: ishtar_common/models.py:996 ishtar_common/models.py:4114 +#: ishtar_common/forms_common.py:1731 ishtar_common/forms_common.py:2100 +#: ishtar_common/models.py:996 ishtar_common/models.py:4117 #: ishtar_common/models_imports.py:883 overload_translation/models.py:11 msgid "Language" msgstr "" -#: ishtar_common/forms_common.py:1731 ishtar_common/forms_common.py:2099 -#: ishtar_common/models.py:4119 +#: ishtar_common/forms_common.py:1734 ishtar_common/forms_common.py:2102 +#: ishtar_common/models.py:4122 msgid "ISSN" msgstr "" -#: ishtar_common/forms_common.py:1737 ishtar_common/forms_common.py:2098 -#: ishtar_common/models.py:4120 +#: ishtar_common/forms_common.py:1740 ishtar_common/forms_common.py:2101 +#: ishtar_common/models.py:4123 msgid "ISBN" msgstr "" -#: ishtar_common/forms_common.py:1743 ishtar_common/forms_common.py:1858 -#: ishtar_common/forms_common.py:2108 ishtar_common/models.py:4123 -#: ishtar_common/models.py:5182 -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:7 +#: ishtar_common/forms_common.py:1746 ishtar_common/forms_common.py:1861 +#: ishtar_common/forms_common.py:2111 ishtar_common/models.py:4126 +#: ishtar_common/models.py:5185 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:8 #: ishtar_common/templates/ishtar/sheet_document.html:93 msgid "Source" msgstr "" -#: ishtar_common/forms_common.py:1746 ishtar_common/forms_common.py:2114 -#: ishtar_common/models.py:4130 +#: ishtar_common/forms_common.py:1749 ishtar_common/forms_common.py:2117 +#: ishtar_common/models.py:4133 msgid "Source - free input" msgstr "" -#: ishtar_common/forms_common.py:1751 ishtar_common/models.py:4136 +#: ishtar_common/forms_common.py:1754 ishtar_common/models.py:4139 msgid "Source - page range" msgstr "" -#: ishtar_common/forms_common.py:1755 +#: ishtar_common/forms_common.py:1758 msgid "" "Unique page: \"242\", page range: \"242-245\", multiple pages: " "\"242;245;249\", multiples pages and multiple pages ranges: " "\"242-245;249;262-265\"." msgstr "" -#: ishtar_common/forms_common.py:1761 ishtar_common/models.py:4166 +#: ishtar_common/forms_common.py:1764 ishtar_common/models.py:4169 msgid "Numerical ressource (web address)" msgstr "" -#: ishtar_common/forms_common.py:1764 +#: ishtar_common/forms_common.py:1767 msgid "Image" msgstr "" -#: ishtar_common/forms_common.py:1772 +#: ishtar_common/forms_common.py:1775 #: ishtar_common/templates/ishtar/sheet_document.html:58 msgctxt "Not directory" msgid "File" msgstr "" -#: ishtar_common/forms_common.py:1789 ishtar_common/models.py:4169 +#: ishtar_common/forms_common.py:1792 ishtar_common/models.py:4172 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:150 msgid "Receipt date" msgstr "" -#: ishtar_common/forms_common.py:1795 ishtar_common/models.py:4175 +#: ishtar_common/forms_common.py:1798 ishtar_common/models.py:4178 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:160 msgid "Receipt date in documentation" msgstr "" -#: ishtar_common/forms_common.py:1802 ishtar_common/models.py:4189 +#: ishtar_common/forms_common.py:1805 ishtar_common/models.py:4192 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:182 msgid "Additional information" msgstr "" -#: ishtar_common/forms_common.py:1804 ishtar_common/forms_common.py:2104 -#: ishtar_common/models.py:4191 +#: ishtar_common/forms_common.py:1807 ishtar_common/forms_common.py:2107 +#: ishtar_common/models.py:4194 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:108 msgid "Has a duplicate" msgstr "" -#: ishtar_common/forms_common.py:1851 ishtar_common/forms_common.py:2669 +#: ishtar_common/forms_common.py:1854 ishtar_common/forms_common.py:2671 #: ishtar_common/templates/ishtar/forms/base_related_items.html:5 #: ishtar_common/templates/ishtar/sheet_document.html:120 msgid "Related items" msgstr "" -#: ishtar_common/forms_common.py:1857 +#: ishtar_common/forms_common.py:1860 #: ishtar_common/templates/ishtar/sheet_document.html:83 msgid "Publishing" msgstr "" -#: ishtar_common/forms_common.py:1860 +#: ishtar_common/forms_common.py:1863 msgid "Advanced" msgstr "" -#: ishtar_common/forms_common.py:1907 +#: ishtar_common/forms_common.py:1910 msgid "Incorrect page range." msgstr "" -#: ishtar_common/forms_common.py:1994 +#: ishtar_common/forms_common.py:1997 msgid "" "You should at least fill one of this field: title, url, image or file. If " "you have provided an image check that it is not corrupted." msgstr "" -#: ishtar_common/forms_common.py:2003 +#: ishtar_common/forms_common.py:2006 msgid "A document has to be attached at least to one item" msgstr "" -#: ishtar_common/forms_common.py:2046 +#: ishtar_common/forms_common.py:2049 msgid "Document - 001 - Search" msgstr "" -#: ishtar_common/forms_common.py:2059 ishtar_common/forms_common.py:2265 -#: ishtar_common/forms_common.py:2432 ishtar_common/forms_common.py:2483 -#: ishtar_common/models.py:3557 +#: ishtar_common/forms_common.py:2062 ishtar_common/forms_common.py:2268 +#: ishtar_common/forms_common.py:2435 ishtar_common/forms_common.py:2486 +#: ishtar_common/models.py:3560 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:139 msgid "Author" msgstr "" -#: ishtar_common/forms_common.py:2072 +#: ishtar_common/forms_common.py:2075 msgid "Tag" msgstr "" -#: ishtar_common/forms_common.py:2100 ishtar_common/models.py:4109 +#: ishtar_common/forms_common.py:2103 ishtar_common/models.py:4112 msgid "License" msgstr "" -#: ishtar_common/forms_common.py:2103 +#: ishtar_common/forms_common.py:2106 msgid "Additional informations" msgstr "" -#: ishtar_common/forms_common.py:2105 +#: ishtar_common/forms_common.py:2108 msgid "Has a file?" msgstr "" -#: ishtar_common/forms_common.py:2116 +#: ishtar_common/forms_common.py:2119 msgid "Warehouse - Container" msgstr "" -#: ishtar_common/forms_common.py:2124 +#: ishtar_common/forms_common.py:2127 msgid "Warehouse - Reference container" msgstr "" -#: ishtar_common/forms_common.py:2141 +#: ishtar_common/forms_common.py:2144 msgid "Operation - type" msgstr "" -#: ishtar_common/forms_common.py:2154 +#: ishtar_common/forms_common.py:2157 msgid "Basket - Finds" msgstr "" -#: ishtar_common/forms_common.py:2169 +#: ishtar_common/forms_common.py:2172 msgid "Find - denomination" msgstr "" -#: ishtar_common/forms_common.py:2179 ishtar_common/forms_common.py:2191 +#: ishtar_common/forms_common.py:2182 ishtar_common/forms_common.py:2194 msgid "Receipt date before" msgstr "" -#: ishtar_common/forms_common.py:2182 ishtar_common/forms_common.py:2194 +#: ishtar_common/forms_common.py:2185 ishtar_common/forms_common.py:2197 msgid "Receipt date after" msgstr "" -#: ishtar_common/forms_common.py:2185 +#: ishtar_common/forms_common.py:2188 msgid "Creation date before" msgstr "" -#: ishtar_common/forms_common.py:2188 +#: ishtar_common/forms_common.py:2191 msgid "Creation date after" msgstr "" -#: ishtar_common/forms_common.py:2216 ishtar_common/forms_common.py:2231 +#: ishtar_common/forms_common.py:2219 ishtar_common/forms_common.py:2234 msgid "Document search" msgstr "" -#: ishtar_common/forms_common.py:2250 +#: ishtar_common/forms_common.py:2253 msgid "Document - Quick action - Modify" msgstr "" -#: ishtar_common/forms_common.py:2263 ishtar_common/models_imports.py:875 +#: ishtar_common/forms_common.py:2266 ishtar_common/models_imports.py:875 #: ishtar_common/models_imports.py:876 msgid "Source type" msgstr "" -#: ishtar_common/forms_common.py:2292 +#: ishtar_common/forms_common.py:2295 msgid "Edit duplicated item" msgstr "" -#: ishtar_common/forms_common.py:2366 +#: ishtar_common/forms_common.py:2369 msgid "current and reference containers" msgstr "" -#: ishtar_common/forms_common.py:2405 +#: ishtar_common/forms_common.py:2408 #: ishtar_common/templates/ishtar/import_table.html:33 msgid "Action" msgstr "" -#: ishtar_common/forms_common.py:2405 +#: ishtar_common/forms_common.py:2408 msgid "Lock" msgstr "" -#: ishtar_common/forms_common.py:2405 +#: ishtar_common/forms_common.py:2408 msgid "Unlock" msgstr "" -#: ishtar_common/forms_common.py:2423 +#: ishtar_common/forms_common.py:2426 msgid "Would you like to delete this documentation?" msgstr "" -#: ishtar_common/forms_common.py:2443 ishtar_common/models.py:3528 -#: ishtar_common/models.py:3549 ishtar_common/models_imports.py:877 +#: ishtar_common/forms_common.py:2446 ishtar_common/models.py:3531 +#: ishtar_common/models.py:3552 ishtar_common/models_imports.py:877 msgid "Author type" msgstr "" -#: ishtar_common/forms_common.py:2460 +#: ishtar_common/forms_common.py:2463 msgid "This author already exist." msgstr "" -#: ishtar_common/forms_common.py:2472 +#: ishtar_common/forms_common.py:2475 msgid "Author selection" msgstr "" -#: ishtar_common/forms_common.py:2490 +#: ishtar_common/forms_common.py:2493 msgid "There are identical authors." msgstr "" -#: ishtar_common/forms_common.py:2503 ishtar_common/forms_common.py:2568 +#: ishtar_common/forms_common.py:2506 ishtar_common/forms_common.py:2571 #: ishtar_common/models.py:974 msgid "Query" msgstr "" -#: ishtar_common/forms_common.py:2507 ishtar_common/models.py:981 +#: ishtar_common/forms_common.py:2510 ishtar_common/models.py:981 msgid "Is an alert" msgstr "" -#: ishtar_common/forms_common.py:2529 +#: ishtar_common/forms_common.py:2532 msgid "A label is required for a new search query." msgstr "" -#: ishtar_common/forms_common.py:2533 +#: ishtar_common/forms_common.py:2536 msgid "Select the search query to update" msgstr "" -#: ishtar_common/forms_common.py:2540 ishtar_common/forms_common.py:2561 +#: ishtar_common/forms_common.py:2543 ishtar_common/forms_common.py:2564 msgid "Query does not exist." msgstr "" -#: ishtar_common/forms_common.py:2596 +#: ishtar_common/forms_common.py:2599 msgid "Geo item" msgstr "" -#: ishtar_common/forms_common.py:2597 +#: ishtar_common/forms_common.py:2600 msgid "Geo item - General" msgstr "" -#: ishtar_common/forms_common.py:2615 ishtar_common/models_common.py:2142 +#: ishtar_common/forms_common.py:2617 ishtar_common/models_common.py:2143 msgid "Import key" msgstr "" -#: ishtar_common/forms_common.py:2618 +#: ishtar_common/forms_common.py:2620 msgid "" "An update via import corresponding to the source element and this key will " "overwrite the data." msgstr "" -#: ishtar_common/forms_common.py:2626 ishtar_common/models_common.py:2157 -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:6 +#: ishtar_common/forms_common.py:2628 ishtar_common/models_common.py:2158 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:7 msgid "Data type" msgstr "" -#: ishtar_common/forms_common.py:2629 ishtar_common/models_common.py:2149 -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:10 +#: ishtar_common/forms_common.py:2631 ishtar_common/models_common.py:2150 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:11 msgid "Origin" msgstr "" -#: ishtar_common/forms_common.py:2632 ishtar_common/models_common.py:2165 -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:11 +#: ishtar_common/forms_common.py:2634 ishtar_common/models_common.py:2166 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:12 msgid "Provider" msgstr "" -#: ishtar_common/forms_common.py:2635 ishtar_common/forms_common.py:2672 -#: ishtar_common/models_common.py:2131 +#: ishtar_common/forms_common.py:2637 ishtar_common/forms_common.py:2674 +#: ishtar_common/models_common.py:2132 msgid "Buffer" msgstr "" -#: ishtar_common/forms_common.py:2639 +#: ishtar_common/forms_common.py:2641 msgid "Buffer type" msgstr "" -#: ishtar_common/forms_common.py:2670 +#: ishtar_common/forms_common.py:2672 msgid "Meta-data" msgstr "" -#: ishtar_common/forms_common.py:2671 +#: ishtar_common/forms_common.py:2673 msgid "Geography" msgstr "" -#: ishtar_common/forms_common.py:2842 +#: ishtar_common/forms_common.py:2859 msgid "If you set a buffer set a buffer type." msgstr "" -#: ishtar_common/forms_common.py:2847 +#: ishtar_common/forms_common.py:2864 msgid "If you set a buffer type set a buffer." msgstr "" -#: ishtar_common/forms_common.py:2863 +#: ishtar_common/forms_common.py:2869 +msgid "A value is expected for Z." +msgstr "" + +#: ishtar_common/forms_common.py:2888 msgid "A geo item has to be attached at least to one item" msgstr "" -#: ishtar_common/forms_common.py:2902 +#: ishtar_common/forms_common.py:2927 msgid "Geometry type" msgstr "" -#: ishtar_common/forms_common.py:2906 +#: ishtar_common/forms_common.py:2930 ishtar_common/models_common.py:2112 +#: ishtar_common/models_common.py:3539 +msgid "Point" +msgstr "" + +#: ishtar_common/forms_common.py:2931 msgid "Point 3D" msgstr "" -#: ishtar_common/forms_common.py:2907 +#: ishtar_common/forms_common.py:2932 msgid "Multi-points" msgstr "" -#: ishtar_common/forms_common.py:2908 +#: ishtar_common/forms_common.py:2933 msgid "Multi-lines" msgstr "" -#: ishtar_common/forms_common.py:2909 +#: ishtar_common/forms_common.py:2934 msgid "Multi-polygons" msgstr "" @@ -9371,7 +9377,7 @@ msgid "Addition/modification" msgstr "" #: ishtar_common/ishtar_menu.py:60 ishtar_common/models.py:1761 -#: ishtar_common/views.py:1379 +#: ishtar_common/views.py:1380 msgid "Global variables" msgstr "" @@ -9383,11 +9389,11 @@ msgstr "" msgid "Imports" msgstr "" -#: ishtar_common/ishtar_menu.py:182 ishtar_common/views.py:1435 +#: ishtar_common/ishtar_menu.py:182 ishtar_common/views.py:1436 msgid "Current imports" msgstr "" -#: ishtar_common/ishtar_menu.py:188 ishtar_common/views.py:1915 +#: ishtar_common/ishtar_menu.py:188 ishtar_common/views.py:1916 msgid "Old imports" msgstr "" @@ -10305,953 +10311,959 @@ msgstr "" msgid "Error: planning_service type is missing" msgstr "" -#: ishtar_common/models.py:2429 ishtar_common/models.py:2598 +#: ishtar_common/models.py:2429 ishtar_common/models.py:2601 msgid "Error: general_contractor type is missing" msgstr "" -#: ishtar_common/models.py:2496 +#: ishtar_common/models.py:2503 msgid "Organizations" msgstr "" -#: ishtar_common/models.py:2524 +#: ishtar_common/models.py:2531 msgid "unknown organization" msgstr "" -#: ishtar_common/models.py:2576 +#: ishtar_common/models.py:2579 msgid "/" msgstr "" -#: ishtar_common/models.py:2582 +#: ishtar_common/models.py:2585 msgid "Error: sra_agent and head_scientist types are missing" msgstr "" -#: ishtar_common/models.py:2590 +#: ishtar_common/models.py:2593 msgid "Error: sra_agent type is missing" msgstr "" -#: ishtar_common/models.py:2606 +#: ishtar_common/models.py:2609 msgid "Error: responsible_planning_service type is missing" msgstr "" -#: ishtar_common/models.py:2618 +#: ishtar_common/models.py:2621 msgid "Error: publisher type is missing" msgstr "" -#: ishtar_common/models.py:2626 +#: ishtar_common/models.py:2629 msgid "Error: operator type is missing" msgstr "" -#: ishtar_common/models.py:2630 ishtar_common/models.py:2643 +#: ishtar_common/models.py:2633 ishtar_common/models.py:2646 msgid "Long title" msgstr "" -#: ishtar_common/models.py:2633 ishtar_common/models_imports.py:926 +#: ishtar_common/models.py:2636 ishtar_common/models_imports.py:926 msgid "Title type" msgstr "" -#: ishtar_common/models.py:2634 +#: ishtar_common/models.py:2637 msgid "Title types" msgstr "" -#: ishtar_common/models.py:2660 +#: ishtar_common/models.py:2663 msgid "Mr" msgstr "" -#: ishtar_common/models.py:2661 +#: ishtar_common/models.py:2664 msgid "Miss" msgstr "" -#: ishtar_common/models.py:2662 +#: ishtar_common/models.py:2665 msgid "Mr and Mrs" msgstr "" -#: ishtar_common/models.py:2663 +#: ishtar_common/models.py:2666 msgid "Mrs" msgstr "" -#: ishtar_common/models.py:2664 +#: ishtar_common/models.py:2667 msgid "Doctor" msgstr "" -#: ishtar_common/models.py:2710 ishtar_common/models.py:3284 +#: ishtar_common/models.py:2713 ishtar_common/models.py:3287 msgctxt "key for text search" msgid "surname" msgstr "" -#: ishtar_common/models.py:2713 ishtar_common/models.py:3288 +#: ishtar_common/models.py:2716 ishtar_common/models.py:3291 msgctxt "key for text search" msgid "email" msgstr "" -#: ishtar_common/models.py:2720 ishtar_common/models.py:3296 +#: ishtar_common/models.py:2723 ishtar_common/models.py:3299 msgctxt "key for text search" msgid "organization" msgstr "" -#: ishtar_common/models.py:2724 +#: ishtar_common/models.py:2727 msgctxt "key for text search" msgid "has-account" msgstr "" -#: ishtar_common/models.py:2760 +#: ishtar_common/models.py:2763 msgid "" "Attention, historical and unfortunate residue in the code of an initial " "translation error." msgstr "" -#: ishtar_common/models.py:2767 +#: ishtar_common/models.py:2770 msgid "Contact type" msgstr "" -#: ishtar_common/models.py:2770 ishtar_common/models.py:2889 +#: ishtar_common/models.py:2773 ishtar_common/models.py:2892 msgid "Types" msgstr "" -#: ishtar_common/models.py:2775 +#: ishtar_common/models.py:2778 msgid "Is attached to" msgstr "" -#: ishtar_common/models.py:2786 +#: ishtar_common/models.py:2789 msgid "Persons" msgstr "" -#: ishtar_common/models.py:3046 +#: ishtar_common/models.py:3049 msgid "Manage account" msgstr "" -#: ishtar_common/models.py:3070 +#: ishtar_common/models.py:3073 msgid "Groups" msgstr "" -#: ishtar_common/models.py:3074 +#: ishtar_common/models.py:3077 msgid "Profile types" msgstr "" -#: ishtar_common/models.py:3085 +#: ishtar_common/models.py:3088 msgid "Profile type summary" msgstr "" -#: ishtar_common/models.py:3086 +#: ishtar_common/models.py:3089 msgid "Profile types summary" msgstr "" -#: ishtar_common/models.py:3101 +#: ishtar_common/models.py:3104 msgid "Show field number" msgstr "" -#: ishtar_common/models.py:3102 +#: ishtar_common/models.py:3105 msgid "Automatically pin" msgstr "" -#: ishtar_common/models.py:3103 +#: ishtar_common/models.py:3106 msgid "Display pin menu" msgstr "" -#: ishtar_common/models.py:3105 +#: ishtar_common/models.py:3108 msgid "Use background tasks" msgstr "" -#: ishtar_common/models.py:3106 +#: ishtar_common/models.py:3109 msgid "" "If set to true, each import, export, document generation is set as a " "background task." msgstr "" -#: ishtar_common/models.py:3110 +#: ishtar_common/models.py:3113 msgid "Send email when the task is finished" msgstr "" -#: ishtar_common/models.py:3120 +#: ishtar_common/models.py:3123 msgid "User profile" msgstr "" -#: ishtar_common/models.py:3121 +#: ishtar_common/models.py:3124 msgid "User profiles" msgstr "" -#: ishtar_common/models.py:3207 ishtar_common/models.py:4949 +#: ishtar_common/models.py:3210 ishtar_common/models.py:4952 msgid "Scheduled" msgstr "" -#: ishtar_common/models.py:3208 ishtar_common/models.py:4950 +#: ishtar_common/models.py:3211 ishtar_common/models.py:4953 msgid "In progress" msgstr "" -#: ishtar_common/models.py:3209 ishtar_common/models.py:4952 +#: ishtar_common/models.py:3212 ishtar_common/models.py:4955 #: ishtar_common/models_imports.py:1058 msgid "Finished" msgstr "" -#: ishtar_common/models.py:3215 +#: ishtar_common/models.py:3218 msgid "Generate label" msgstr "" -#: ishtar_common/models.py:3227 +#: ishtar_common/models.py:3230 msgid "View" msgstr "" -#: ishtar_common/models.py:3229 +#: ishtar_common/models.py:3232 msgid "Arguments" msgstr "" -#: ishtar_common/models.py:3237 ishtar_common/models.py:4966 -#: ishtar_common/models.py:5121 +#: ishtar_common/models.py:3240 ishtar_common/models.py:4969 +#: ishtar_common/models.py:5124 msgid "Result" msgstr "" -#: ishtar_common/models.py:3240 +#: ishtar_common/models.py:3243 msgid "Background task" msgstr "" -#: ishtar_common/models.py:3241 +#: ishtar_common/models.py:3244 msgid "Background tasks" msgstr "" -#: ishtar_common/models.py:3277 +#: ishtar_common/models.py:3280 msgctxt "key for text search" msgid "username" msgstr "" -#: ishtar_common/models.py:3312 +#: ishtar_common/models.py:3315 msgid "Advanced shortcut menu" msgstr "" -#: ishtar_common/models.py:3316 +#: ishtar_common/models.py:3319 msgid "Ishtar user" msgstr "" -#: ishtar_common/models.py:3317 +#: ishtar_common/models.py:3320 msgid "Ishtar users" msgstr "" -#: ishtar_common/models.py:3411 +#: ishtar_common/models.py:3414 msgid "Public" msgstr "" -#: ishtar_common/models.py:3529 +#: ishtar_common/models.py:3532 msgid "Author types" msgstr "" -#: ishtar_common/models.py:3612 +#: ishtar_common/models.py:3615 msgid "COInS export - type" msgstr "" -#: ishtar_common/models.py:3615 +#: ishtar_common/models.py:3618 msgid "COInS export - genre" msgstr "" -#: ishtar_common/models.py:3618 +#: ishtar_common/models.py:3621 msgid "Is localized" msgstr "" -#: ishtar_common/models.py:3620 +#: ishtar_common/models.py:3623 msgid "Setting a language for this type of document is relevant" msgstr "" -#: ishtar_common/models.py:3625 +#: ishtar_common/models.py:3628 msgid "Document type" msgstr "" -#: ishtar_common/models.py:3626 +#: ishtar_common/models.py:3629 msgid "Document types" msgstr "" -#: ishtar_common/models.py:3639 ishtar_common/models.py:3666 +#: ishtar_common/models.py:3642 ishtar_common/models.py:3669 msgid "Only available for these document types" msgstr "" -#: ishtar_common/models.py:3643 ishtar_common/models_imports.py:884 +#: ishtar_common/models.py:3646 ishtar_common/models_imports.py:884 #: ishtar_common/models_imports.py:925 msgid "Support type" msgstr "" -#: ishtar_common/models.py:3644 +#: ishtar_common/models.py:3647 msgid "Support types" msgstr "" -#: ishtar_common/models.py:3653 +#: ishtar_common/models.py:3656 msgid "Iframe template" msgstr "" -#: ishtar_common/models.py:3657 +#: ishtar_common/models.py:3660 msgid "" "Template to insert an iframe for this format. Use django template with a " "{{document}} variable matching the current document." msgstr "" -#: ishtar_common/models.py:3670 +#: ishtar_common/models.py:3673 msgid "Format type" msgstr "" -#: ishtar_common/models.py:3671 +#: ishtar_common/models.py:3674 msgid "Format types" msgstr "" -#: ishtar_common/models.py:3680 ishtar_common/models_rest.py:93 +#: ishtar_common/models.py:3683 ishtar_common/models_rest.py:93 +#: ishtar_common/templates/ishtar/merge_organization.html:11 +#: ishtar_common/templates/ishtar/merge_organization.html:22 msgid "URL" msgstr "" -#: ishtar_common/models.py:3683 ishtar_common/models_imports.py:881 +#: ishtar_common/models.py:3686 ishtar_common/models_imports.py:881 msgid "License type" msgstr "" -#: ishtar_common/models.py:3684 +#: ishtar_common/models.py:3687 msgid "License types" msgstr "" -#: ishtar_common/models.py:3693 +#: ishtar_common/models.py:3696 msgid "Document tags" msgstr "" -#: ishtar_common/models.py:3809 +#: ishtar_common/models.py:3812 msgid "Identifier" msgstr "" -#: ishtar_common/models.py:3832 +#: ishtar_common/models.py:3835 msgctxt "key for text search" msgid "author" msgstr "" -#: ishtar_common/models.py:3836 +#: ishtar_common/models.py:3839 msgctxt "key for text search" msgid "publisher" msgstr "" -#: ishtar_common/models.py:3840 +#: ishtar_common/models.py:3843 msgctxt "key for text search" msgid "publishing-year" msgstr "" -#: ishtar_common/models.py:3844 +#: ishtar_common/models.py:3847 msgctxt "key for text search" msgid "title" msgstr "" -#: ishtar_common/models.py:3855 +#: ishtar_common/models.py:3858 msgctxt "key for text search" msgid "internal-reference" msgstr "" -#: ishtar_common/models.py:3863 +#: ishtar_common/models.py:3866 msgctxt "key for text search" msgid "tag" msgstr "" -#: ishtar_common/models.py:3866 +#: ishtar_common/models.py:3869 msgctxt "key for text search" msgid "format" msgstr "" -#: ishtar_common/models.py:3870 +#: ishtar_common/models.py:3873 msgctxt "key for text search" msgid "medium" msgstr "" -#: ishtar_common/models.py:3874 +#: ishtar_common/models.py:3877 msgctxt "key for text search" msgid "language" msgstr "" -#: ishtar_common/models.py:3878 +#: ishtar_common/models.py:3881 msgctxt "key for text search" msgid "license" msgstr "" -#: ishtar_common/models.py:3882 +#: ishtar_common/models.py:3885 msgctxt "key for text search" msgid "scale" msgstr "" -#: ishtar_common/models.py:3885 +#: ishtar_common/models.py:3888 msgctxt "key for text search" msgid "url" msgstr "" -#: ishtar_common/models.py:3889 +#: ishtar_common/models.py:3892 msgctxt "key for text search" msgid "isbn" msgstr "" -#: ishtar_common/models.py:3892 +#: ishtar_common/models.py:3895 msgctxt "key for text search" msgid "issn" msgstr "" -#: ishtar_common/models.py:3895 +#: ishtar_common/models.py:3898 msgctxt "key for text search" msgid "source" msgstr "" -#: ishtar_common/models.py:3899 +#: ishtar_common/models.py:3902 msgctxt "key for text search" msgid "source-free-input" msgstr "" -#: ishtar_common/models.py:3903 +#: ishtar_common/models.py:3906 msgctxt "key for text search" msgid "warehouse-container" msgstr "" -#: ishtar_common/models.py:3907 +#: ishtar_common/models.py:3910 msgctxt "key for text search" msgid "warehouse-container-reference" msgstr "" -#: ishtar_common/models.py:3914 +#: ishtar_common/models.py:3917 msgctxt "key for text search" msgid "additional-information" msgstr "" -#: ishtar_common/models.py:3918 +#: ishtar_common/models.py:3921 msgctxt "key for text search" msgid "has-duplicate" msgstr "" -#: ishtar_common/models.py:3937 +#: ishtar_common/models.py:3940 msgctxt "key for text search" msgid "basket-finds" msgstr "" -#: ishtar_common/models.py:3941 ishtar_common/models.py:4034 +#: ishtar_common/models.py:3944 ishtar_common/models.py:4037 msgctxt "key for text search" msgid "find" msgstr "" -#: ishtar_common/models.py:3961 ishtar_common/models.py:4037 +#: ishtar_common/models.py:3964 ishtar_common/models.py:4040 msgctxt "key for text search" msgid "warehouse" msgstr "" -#: ishtar_common/models.py:3965 ishtar_common/models_common.py:3231 +#: ishtar_common/models.py:3968 ishtar_common/models_common.py:3248 msgctxt "key for text search" msgid "has-image" msgstr "" -#: ishtar_common/models.py:3968 +#: ishtar_common/models.py:3971 msgctxt "key for text search" msgid "has-file" msgstr "" -#: ishtar_common/models.py:3972 +#: ishtar_common/models.py:3975 msgctxt "key for text search" msgid "receipt-date-before" msgstr "" -#: ishtar_common/models.py:3976 +#: ishtar_common/models.py:3979 msgctxt "key for text search" msgid "receipt-date-after" msgstr "" -#: ishtar_common/models.py:3981 +#: ishtar_common/models.py:3984 msgctxt "key for text search" msgid "receipt-in-documentation-date-before" msgstr "" -#: ishtar_common/models.py:3986 +#: ishtar_common/models.py:3989 msgctxt "key for text search" msgid "receipt-in-documentation-date-after" msgstr "" -#: ishtar_common/models.py:3990 +#: ishtar_common/models.py:3993 msgctxt "key for text search" msgid "creation-date-before" msgstr "" -#: ishtar_common/models.py:3994 +#: ishtar_common/models.py:3997 msgctxt "key for text search" msgid "creation-date-after" msgstr "" -#: ishtar_common/models.py:4041 +#: ishtar_common/models.py:4044 msgctxt "key for text search" msgid "treatment" msgstr "" -#: ishtar_common/models.py:4045 +#: ishtar_common/models.py:4048 msgctxt "key for text search" msgid "treatment-file" msgstr "" -#: ishtar_common/models.py:4160 +#: ishtar_common/models.py:4163 msgid "Authors (raw)" msgstr "" -#: ishtar_common/models.py:4177 +#: ishtar_common/models.py:4180 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:118 msgid "Number of items" msgstr "" -#: ishtar_common/models.py:4192 +#: ishtar_common/models.py:4195 msgid "Symbolic links" msgstr "" -#: ishtar_common/models.py:4194 +#: ishtar_common/models.py:4197 msgid "Related" msgstr "" -#: ishtar_common/models.py:4202 +#: ishtar_common/models.py:4205 #: ishtar_common/templates/ishtar/sheet_document.html:4 msgid "Document" msgstr "" -#: ishtar_common/models.py:4206 +#: ishtar_common/models.py:4209 msgid "Can view own Document" msgstr "" -#: ishtar_common/models.py:4207 +#: ishtar_common/models.py:4210 msgid "Can add own Document" msgstr "" -#: ishtar_common/models.py:4208 +#: ishtar_common/models.py:4211 msgid "Can change own Document" msgstr "" -#: ishtar_common/models.py:4209 +#: ishtar_common/models.py:4212 msgid "Can delete own Document" msgstr "" -#: ishtar_common/models.py:4428 +#: ishtar_common/models.py:4431 msgid "Add sub-document" msgstr "" -#: ishtar_common/models.py:4430 +#: ishtar_common/models.py:4433 msgid "sub-document" msgstr "" -#: ishtar_common/models.py:4845 +#: ishtar_common/models.py:4848 msgid "Is judiciary" msgstr "" -#: ishtar_common/models.py:4849 +#: ishtar_common/models.py:4852 msgid "Operation types" msgstr "" -#: ishtar_common/models.py:4899 +#: ishtar_common/models.py:4902 msgid "Judiciary" msgstr "" -#: ishtar_common/models.py:4936 +#: ishtar_common/models.py:4939 msgid "Filename" msgstr "" -#: ishtar_common/models.py:4940 +#: ishtar_common/models.py:4943 msgid "Administration script" msgstr "" -#: ishtar_common/models.py:4941 +#: ishtar_common/models.py:4944 msgid "Administration scripts" msgstr "" -#: ishtar_common/models.py:4951 ishtar_common/models_imports.py:1057 +#: ishtar_common/models.py:4954 ishtar_common/models_imports.py:1057 msgid "Finished with errors" msgstr "" -#: ishtar_common/models.py:4969 +#: ishtar_common/models.py:4972 msgid "Administration task" msgstr "" -#: ishtar_common/models.py:4970 +#: ishtar_common/models.py:4973 msgid "Administration tasks" msgstr "" -#: ishtar_common/models.py:4989 +#: ishtar_common/models.py:4992 msgid "" "ISHTAR_SCRIPT_DIR is not set in your local_settings. Contact your " "administrator." msgstr "" -#: ishtar_common/models.py:5001 +#: ishtar_common/models.py:5004 msgid "" "Your ISHTAR_SCRIPT_DIR is containing dots \"..\". As it can refer to " "relative paths, it can be a security issue and this is not allowed. Only put " "a full path." msgstr "" -#: ishtar_common/models.py:5014 +#: ishtar_common/models.py:5017 msgid "Your ISHTAR_SCRIPT_DIR: \"{}\" is not a valid directory." msgstr "" -#: ishtar_common/models.py:5031 +#: ishtar_common/models.py:5034 msgid "" "Script \"{}\" is not available in your script directory. Check your " "configuration." msgstr "" -#: ishtar_common/models.py:5071 ishtar_common/models_imports.py:1049 +#: ishtar_common/models.py:5074 ishtar_common/models_imports.py:1049 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:132 msgid "Created" msgstr "" -#: ishtar_common/models.py:5076 +#: ishtar_common/models.py:5079 msgid "Filter on" msgstr "" -#: ishtar_common/models.py:5079 ishtar_common/models_rest.py:63 +#: ishtar_common/models.py:5082 ishtar_common/models_rest.py:63 msgid "Filter query" msgstr "" -#: ishtar_common/models.py:5082 +#: ishtar_common/models.py:5085 msgid "Textual query on this item (try it on the main interface)" msgstr "" -#: ishtar_common/models.py:5085 +#: ishtar_common/models.py:5088 msgid "Export geographic data" msgstr "" -#: ishtar_common/models.py:5088 +#: ishtar_common/models.py:5091 msgid "" "Geographic data can represent large volume of information. Geographic data " "can be excluded from the export" msgstr "" -#: ishtar_common/models.py:5096 +#: ishtar_common/models.py:5099 msgid "Put locks on associated items" msgstr "" -#: ishtar_common/models.py:5101 +#: ishtar_common/models.py:5104 msgid "Lock user" msgstr "" -#: ishtar_common/models.py:5105 +#: ishtar_common/models.py:5108 msgid "" "Owner of the lock if item are locked. Warning: if no user is provided the " "locks can be remove by any user with the permission to edit." msgstr "" -#: ishtar_common/models.py:5110 +#: ishtar_common/models.py:5113 msgid "Export types" msgstr "" -#: ishtar_common/models.py:5111 +#: ishtar_common/models.py:5114 msgid "Export configuration" msgstr "" -#: ishtar_common/models.py:5112 +#: ishtar_common/models.py:5115 msgid "Export importers" msgstr "" -#: ishtar_common/models.py:5113 +#: ishtar_common/models.py:5116 msgid "Export towns, areas..." msgstr "" -#: ishtar_common/models.py:5114 +#: ishtar_common/models.py:5117 msgid "Export directory" msgstr "" -#: ishtar_common/models.py:5115 +#: ishtar_common/models.py:5118 msgid "Export documents" msgstr "" -#: ishtar_common/models.py:5116 +#: ishtar_common/models.py:5119 msgid "Export main items" msgstr "" -#: ishtar_common/models.py:5123 +#: ishtar_common/models.py:5126 msgid "Result information" msgstr "" -#: ishtar_common/models.py:5126 +#: ishtar_common/models.py:5129 msgid "Archive - Export" msgstr "" -#: ishtar_common/models.py:5127 +#: ishtar_common/models.py:5130 msgid "Archive - Exports" msgstr "" -#: ishtar_common/models.py:5138 +#: ishtar_common/models.py:5141 msgid "Whole database" msgstr "" -#: ishtar_common/models.py:5150 +#: ishtar_common/models.py:5153 msgid "To filter filter type and filter text must be filled." msgstr "" -#: ishtar_common/models.py:5162 +#: ishtar_common/models.py:5165 msgid "Import user" msgstr "" -#: ishtar_common/models.py:5166 +#: ishtar_common/models.py:5169 msgid "" "If set the \"Import user\" will be the editor for last version. If the field " "is left empty no history will be recorded." msgstr "" -#: ishtar_common/models.py:5175 +#: ishtar_common/models.py:5178 msgid "Delete before adding" msgstr "" -#: ishtar_common/models.py:5177 +#: ishtar_common/models.py:5180 msgid "Delete existing items before adding" msgstr "" -#: ishtar_common/models.py:5180 +#: ishtar_common/models.py:5183 msgid "Releasing locks on associated items" msgstr "" -#: ishtar_common/models.py:5185 +#: ishtar_common/models.py:5188 msgid "Archive - Import" msgstr "" -#: ishtar_common/models.py:5186 +#: ishtar_common/models.py:5189 msgid "Archive - Imports" msgstr "" -#: ishtar_common/models_common.py:836 +#: ishtar_common/models_common.py:837 msgid "Search vector" msgstr "" -#: ishtar_common/models_common.py:836 +#: ishtar_common/models_common.py:837 msgid "Auto filled at save" msgstr "" -#: ishtar_common/models_common.py:1399 +#: ishtar_common/models_common.py:1400 msgid "Last editor" msgstr "" -#: ishtar_common/models_common.py:1407 +#: ishtar_common/models_common.py:1408 msgid "Creator" msgstr "" -#: ishtar_common/models_common.py:1413 ishtar_common/models_common.py:2135 +#: ishtar_common/models_common.py:1414 ishtar_common/models_common.py:2136 msgid "Need update" msgstr "" -#: ishtar_common/models_common.py:1415 +#: ishtar_common/models_common.py:1416 msgid "Item locked for edition" msgstr "" -#: ishtar_common/models_common.py:1421 +#: ishtar_common/models_common.py:1422 msgid "Locked by" msgstr "" -#: ishtar_common/models_common.py:1439 +#: ishtar_common/models_common.py:1440 msgctxt "key for text search" msgid "modified-by" msgstr "" -#: ishtar_common/models_common.py:1443 +#: ishtar_common/models_common.py:1444 msgctxt "key for text search" msgid "modified-before" msgstr "" -#: ishtar_common/models_common.py:1447 +#: ishtar_common/models_common.py:1448 msgctxt "key for text search" msgid "modified-after" msgstr "" -#: ishtar_common/models_common.py:1450 +#: ishtar_common/models_common.py:1451 msgctxt "key for text search" msgid "locked" msgstr "" -#: ishtar_common/models_common.py:2007 ishtar_common/models_common.py:2025 +#: ishtar_common/models_common.py:2008 ishtar_common/models_common.py:2026 msgid "Authority name" msgstr "" -#: ishtar_common/models_common.py:2008 ishtar_common/models_common.py:2025 +#: ishtar_common/models_common.py:2009 ishtar_common/models_common.py:2026 msgid "Authority SRID" msgstr "" -#: ishtar_common/models_common.py:2011 +#: ishtar_common/models_common.py:2012 msgid "Geographic - Spatial reference system" msgstr "" -#: ishtar_common/models_common.py:2012 +#: ishtar_common/models_common.py:2013 msgid "Geographic - Spatial reference systems" msgstr "" -#: ishtar_common/models_common.py:2042 +#: ishtar_common/models_common.py:2043 msgid "Geographic - Origin type" msgstr "" -#: ishtar_common/models_common.py:2043 +#: ishtar_common/models_common.py:2044 msgid "Geographic - Origin types" msgstr "" -#: ishtar_common/models_common.py:2058 +#: ishtar_common/models_common.py:2059 msgid "Geographic - Data type" msgstr "" -#: ishtar_common/models_common.py:2059 +#: ishtar_common/models_common.py:2060 msgid "Geographic - Data types" msgstr "" -#: ishtar_common/models_common.py:2074 +#: ishtar_common/models_common.py:2075 msgid "Geographic - Provider type" msgstr "" -#: ishtar_common/models_common.py:2075 +#: ishtar_common/models_common.py:2076 msgid "Geographic - Provider types" msgstr "" -#: ishtar_common/models_common.py:2086 +#: ishtar_common/models_common.py:2087 msgid "Geographic - Buffer type" msgstr "" -#: ishtar_common/models_common.py:2087 +#: ishtar_common/models_common.py:2088 msgid "Geographic - Buffer types" msgstr "" -#: ishtar_common/models_common.py:2112 +#: ishtar_common/models_common.py:2113 msgid "Line(s)" msgstr "" -#: ishtar_common/models_common.py:2113 +#: ishtar_common/models_common.py:2114 msgid "Point(s)" msgstr "" -#: ishtar_common/models_common.py:2114 +#: ishtar_common/models_common.py:2115 msgid "Polygon(s)" msgstr "" -#: ishtar_common/models_common.py:2143 +#: ishtar_common/models_common.py:2144 msgid "Use this for update imports" msgstr "" -#: ishtar_common/models_common.py:2150 +#: ishtar_common/models_common.py:2151 msgid "For instance: topographical survey, georeferencing, ..." msgstr "" -#: ishtar_common/models_common.py:2158 +#: ishtar_common/models_common.py:2159 msgid "For instance: outline, z-sup, ..." msgstr "" -#: ishtar_common/models_common.py:2166 +#: ishtar_common/models_common.py:2167 msgid "Data provider" msgstr "" -#: ishtar_common/models_common.py:2169 ishtar_common/models_common.py:2170 -#: ishtar_common/models_common.py:2171 +#: ishtar_common/models_common.py:2170 ishtar_common/models_common.py:2171 +#: ishtar_common/models_common.py:2172 msgid "User input" msgstr "" -#: ishtar_common/models_common.py:2174 +#: ishtar_common/models_common.py:2175 msgid "X (cached)" msgstr "" -#: ishtar_common/models_common.py:2175 +#: ishtar_common/models_common.py:2176 msgid "Y (cached)" msgstr "" -#: ishtar_common/models_common.py:2176 +#: ishtar_common/models_common.py:2177 msgid "Z (cached)" msgstr "" -#: ishtar_common/models_common.py:2194 -msgid "Point (3D)" +#: ishtar_common/models_common.py:2194 ishtar_common/models_common.py:3540 +msgid "Point (2D)" msgstr "" #: ishtar_common/models_common.py:2195 -msgid "Multi points" +msgid "Point (3D)" msgstr "" #: ishtar_common/models_common.py:2196 -msgid "Multi lines" +msgid "Multi points" msgstr "" #: ishtar_common/models_common.py:2197 +msgid "Multi lines" +msgstr "" + +#: ishtar_common/models_common.py:2198 msgid "Multi polygons" msgstr "" -#: ishtar_common/models_common.py:2200 ishtar_common/models_common.py:2201 +#: ishtar_common/models_common.py:2201 ishtar_common/models_common.py:2202 msgid "Geographic - Vector data" msgstr "" -#: ishtar_common/models_common.py:2273 +#: ishtar_common/models_common.py:2274 msgid "Only 2 or 3 dimensions" msgstr "" -#: ishtar_common/models_common.py:2646 +#: ishtar_common/models_common.py:2647 msgid "Year of creation" msgstr "" -#: ishtar_common/models_common.py:2650 +#: ishtar_common/models_common.py:2651 msgid "Filling this field is relevant to distinguish old towns from new towns." msgstr "" -#: ishtar_common/models_common.py:2654 +#: ishtar_common/models_common.py:2655 msgid "Town children" msgstr "" -#: ishtar_common/models_common.py:2852 +#: ishtar_common/models_common.py:2856 msgid "Town (precise)" msgstr "" -#: ishtar_common/models_common.py:2885 +#: ishtar_common/models_common.py:2889 msgid "Raw phone" msgstr "" -#: ishtar_common/models_common.py:2891 +#: ishtar_common/models_common.py:2895 msgid "Alternative address is prefered" msgstr "" -#: ishtar_common/models_common.py:2928 +#: ishtar_common/models_common.py:2932 msgid "No associated address" msgstr "" -#: ishtar_common/models_common.py:3011 -msgid "Tel: " -msgstr "" - -#: ishtar_common/models_common.py:3015 -msgid "Mobile: " +#: ishtar_common/models_common.py:3013 +msgid "Postal code - Town" msgstr "" -#: ishtar_common/models_common.py:3019 -msgid "Email: " +#: ishtar_common/models_common.py:3023 +msgid "Mobile" msgstr "" -#: ishtar_common/models_common.py:3024 +#: ishtar_common/models_common.py:3041 msgid "Merge key" msgstr "" -#: ishtar_common/models_common.py:3235 +#: ishtar_common/models_common.py:3252 msgctxt "key for text search" msgid "has-url" msgstr "" -#: ishtar_common/models_common.py:3239 +#: ishtar_common/models_common.py:3256 msgctxt "key for text search" msgid "has-attached-file" msgstr "" -#: ishtar_common/models_common.py:3315 +#: ishtar_common/models_common.py:3332 msgid "Add document/image" msgstr "" -#: ishtar_common/models_common.py:3317 +#: ishtar_common/models_common.py:3334 msgid "doc./image" msgstr "" -#: ishtar_common/models_common.py:3500 +#: ishtar_common/models_common.py:3517 msgid "Precise" msgstr "" -#: ishtar_common/models_common.py:3500 +#: ishtar_common/models_common.py:3517 msgid "Polygon" msgstr "" -#: ishtar_common/models_common.py:3525 +#: ishtar_common/models_common.py:3542 msgid "Point source" msgstr "" -#: ishtar_common/models_common.py:3528 +#: ishtar_common/models_common.py:3545 msgid "Point source item" msgstr "" -#: ishtar_common/models_common.py:3532 +#: ishtar_common/models_common.py:3547 +msgid "Multi polygon" +msgstr "" + +#: ishtar_common/models_common.py:3549 msgid "Multi-polygon source" msgstr "" -#: ishtar_common/models_common.py:3539 +#: ishtar_common/models_common.py:3556 msgid "Multi polygon source item" msgstr "" -#: ishtar_common/models_common.py:4086 +#: ishtar_common/models_common.py:4107 msgid "Regenerate ID" msgstr "" -#: ishtar_common/models_common.py:4088 +#: ishtar_common/models_common.py:4109 msgid "regen." msgstr "" @@ -11643,7 +11655,9 @@ msgid "Skip lines" msgstr "" #: ishtar_common/models_imports.py:1171 -msgid "Number of header lines in your file (can be 0)." +msgid "" +"Number of header lines in your file (can be 0 and should be 0 for geopackage " +"or Shapefile)." msgstr "" #: ishtar_common/models_imports.py:1174 @@ -11731,7 +11745,6 @@ msgid "Step by step re-import" msgstr "" #: ishtar_common/models_imports.py:1369 -#: ishtar_common/templates/ishtar/import_table.html:51 msgid "Archive" msgstr "" @@ -11746,7 +11759,7 @@ msgstr "" #: ishtar_common/models_imports.py:1375 #: ishtar_common/templates/ishtar/blocks/window_nav.html:66 #: ishtar_common/templates/ishtar/form_delete.html:11 -#: ishtar_common/views.py:2434 ishtar_common/widgets.py:452 +#: ishtar_common/views.py:2435 ishtar_common/widgets.py:452 #: ishtar_common/widgets.py:488 msgid "Delete" msgstr "" @@ -11974,13 +11987,13 @@ msgstr "" #: ishtar_common/templates/admin/change_form.html:24 #: ishtar_common/templates/admin/change_form.html:27 -#: ishtar_common/views.py:1673 ishtar_common/views.py:1677 +#: ishtar_common/views.py:1674 ishtar_common/views.py:1678 msgid "Previous" msgstr "" #: ishtar_common/templates/admin/change_form.html:32 #: ishtar_common/templates/admin/change_form.html:35 -#: ishtar_common/views.py:1680 ishtar_common/views.py:1682 +#: ishtar_common/views.py:1681 ishtar_common/views.py:1683 msgid "Next" msgstr "" @@ -12427,15 +12440,15 @@ msgctxt "Sheet" msgid "Modification" msgstr "" -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:5 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:6 msgid "Main" msgstr "" -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:8 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:9 msgid "Geometry" msgstr "" -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:32 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:33 msgid "geo item" msgstr "" @@ -12589,7 +12602,6 @@ msgstr "" #: ishtar_common/templates/ishtar/formset.html:8 #: ishtar_common/templates/ishtar/formset_import_match.html:113 #: ishtar_common/templates/ishtar/import_list.html:38 -#: ishtar_common/templates/ishtar/merge.html:42 #: 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 @@ -12753,7 +12765,7 @@ msgid "Go" msgstr "" #: ishtar_common/templates/ishtar/import_step_by_step.html:63 -#: ishtar_common/views.py:1516 +#: ishtar_common/views.py:1517 msgid "Import step by step" msgstr "" @@ -12876,6 +12888,11 @@ msgstr "" msgid "Match" msgstr "" +#: ishtar_common/templates/ishtar/import_table.html:51 +msgctxt "name" +msgid "Archive" +msgstr "" + #: ishtar_common/templates/ishtar/import_table.html:56 msgid "Media file" msgstr "" @@ -13356,7 +13373,7 @@ msgstr "" msgid "Loading..." msgstr "" -#: ishtar_common/utils.py:192 ishtar_common/views.py:121 +#: ishtar_common/utils.py:192 ishtar_common/views.py:122 msgid "You don't have sufficient permissions to do this action." msgstr "" @@ -13376,160 +13393,160 @@ msgstr "" msgid "The maximum supported file size is {} Mo." msgstr "" -#: ishtar_common/views.py:148 +#: ishtar_common/views.py:149 msgid "" "PROJECT_SLUG is set to \"default\". Change it in your local_settings (or ask " "your admin to do it)." msgstr "" -#: ishtar_common/views.py:156 +#: ishtar_common/views.py:157 msgid "" "The slug of your current profile is set to \"default\". Change it on the " "administration page (or ask your admin to do it)." msgstr "" -#: ishtar_common/views.py:198 +#: ishtar_common/views.py:199 msgid "Person modification" msgstr "" -#: ishtar_common/views.py:218 +#: ishtar_common/views.py:219 msgid "Person deletion" msgstr "" -#: ishtar_common/views.py:255 +#: ishtar_common/views.py:256 msgid "Organization modification" msgstr "" -#: ishtar_common/views.py:281 +#: ishtar_common/views.py:282 msgid "Organization deletion" msgstr "" -#: ishtar_common/views.py:307 +#: ishtar_common/views.py:308 msgid "Account management" msgstr "" -#: ishtar_common/views.py:316 +#: ishtar_common/views.py:317 msgid "Account deletion" msgstr "" -#: ishtar_common/views.py:983 ishtar_common/views_item.py:176 +#: ishtar_common/views.py:984 ishtar_common/views_item.py:176 #: ishtar_common/views_item.py:217 ishtar_common/views_item.py:234 msgid "Operation not permitted." msgstr "" -#: ishtar_common/views.py:1387 +#: ishtar_common/views.py:1388 msgid "Import: create (table)" msgstr "" -#: ishtar_common/views.py:1407 +#: ishtar_common/views.py:1408 msgid "Edit import" msgstr "" -#: ishtar_common/views.py:1429 +#: ishtar_common/views.py:1430 msgid "Import: create (GIS)" msgstr "" -#: ishtar_common/views.py:1865 +#: ishtar_common/views.py:1866 msgid "Col. " msgstr "" -#: ishtar_common/views.py:1872 ishtar_common/views.py:1887 +#: ishtar_common/views.py:1873 ishtar_common/views.py:1888 msgid "* empty *" msgstr "" -#: ishtar_common/views.py:1929 +#: ishtar_common/views.py:1930 msgid "Link unmatched items" msgstr "" -#: ishtar_common/views.py:1965 +#: ishtar_common/views.py:1966 msgid "Delete import" msgstr "" -#: ishtar_common/views.py:2003 +#: ishtar_common/views.py:2004 msgid "Merge persons" msgstr "" -#: ishtar_common/views.py:2027 +#: ishtar_common/views.py:2028 msgid "Select the main person" msgstr "" -#: ishtar_common/views.py:2035 +#: ishtar_common/views.py:2036 msgid "Merge organization" msgstr "" -#: ishtar_common/views.py:2045 +#: ishtar_common/views.py:2046 msgid "Select the main organization" msgstr "" -#: ishtar_common/views.py:2085 ishtar_common/views.py:2100 +#: ishtar_common/views.py:2086 ishtar_common/views.py:2101 msgid "Corporation manager" msgstr "" -#: ishtar_common/views.py:2114 +#: ishtar_common/views.py:2115 msgid "New tag" msgstr "" -#: ishtar_common/views.py:2127 +#: ishtar_common/views.py:2128 msgid "Document: search" msgstr "" -#: ishtar_common/views.py:2147 +#: ishtar_common/views.py:2148 msgid "Document creation" msgstr "" -#: ishtar_common/views.py:2215 +#: ishtar_common/views.py:2216 msgid "Document modification" msgstr "" -#: ishtar_common/views.py:2242 +#: ishtar_common/views.py:2243 msgid "Main image for" msgstr "" -#: ishtar_common/views.py:2267 +#: ishtar_common/views.py:2268 msgid "Document deletion" msgstr "" -#: ishtar_common/views.py:2304 +#: ishtar_common/views.py:2305 msgid "Error on your template" msgstr "" -#: ishtar_common/views.py:2410 +#: ishtar_common/views.py:2411 msgid "Delete bookmark" msgstr "" -#: ishtar_common/views.py:2433 +#: ishtar_common/views.py:2434 msgid "Bookmark - Delete" msgstr "" -#: ishtar_common/views.py:2476 +#: ishtar_common/views.py:2477 msgid "Some items have been locked by other users." msgstr "" -#: ishtar_common/views.py:2477 +#: ishtar_common/views.py:2478 msgid "Some items are locked." msgstr "" -#: ishtar_common/views.py:2482 +#: ishtar_common/views.py:2483 msgid "Not available" msgstr "" -#: ishtar_common/views.py:2483 +#: ishtar_common/views.py:2484 msgid "Action not available for these items." msgstr "" -#: ishtar_common/views.py:2601 +#: ishtar_common/views.py:2602 msgid "lock/unlock" msgstr "" -#: ishtar_common/views.py:2717 ishtar_common/views.py:2811 +#: ishtar_common/views.py:2718 ishtar_common/views.py:2852 msgid "Geo item creation" msgstr "" -#: ishtar_common/views.py:2762 +#: ishtar_common/views.py:2803 msgid "Geo item modification" msgstr "" -#: ishtar_common/views.py:2800 ishtar_common/views.py:2846 +#: ishtar_common/views.py:2841 ishtar_common/views.py:2887 msgid "Main geo item for" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 9cacc3e3c..6cc6254c5 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-09-09 16:11+0200\n" +"POT-Creation-Date: 2022-09-29 11:29+0200\n" "PO-Revision-Date: 2022-07-08 13:04+0000\n" "Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n" "Language-Team: French <http://translate.iggdrasil.net/projects/ishtar/wip-" @@ -19,17 +19,6 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Weblate 4.5.3\n" -#: archaeological_context_records/admin.py:51 -#: archaeological_operations/admin.py:86 ishtar_common/forms_common.py:2905 -#: ishtar_common/models_common.py:2111 ishtar_common/models_common.py:3522 -msgid "Point" -msgstr "Point" - -#: archaeological_context_records/admin.py:53 archaeological_finds/admin.py:40 -#: archaeological_operations/admin.py:88 ishtar_common/models_common.py:3530 -msgid "Multi polygon" -msgstr "Polygones multi-parties" - #: archaeological_context_records/forms.py:78 #: archaeological_context_records/forms.py:84 #: archaeological_context_records/models.py:527 @@ -48,12 +37,12 @@ msgstr "Polygones multi-parties" #: archaeological_operations/models.py:2354 #: archaeological_operations/models.py:2470 #: archaeological_operations/models.py:2669 -#: archaeological_operations/models.py:2959 +#: archaeological_operations/models.py:2958 #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:254 #: archaeological_operations/wizards.py:266 -#: archaeological_warehouse/models.py:857 ishtar_common/forms_common.py:2133 -#: ishtar_common/models.py:5063 ishtar_common/views.py:396 +#: archaeological_warehouse/models.py:857 ishtar_common/forms_common.py:2136 +#: ishtar_common/models.py:5066 ishtar_common/views.py:397 msgid "Operation" msgstr "Opération" @@ -98,7 +87,7 @@ msgid "Context record - 001 - Search" msgstr "Unité d'enregistrement - 001 - Recherche" #: archaeological_context_records/forms.py:142 archaeological_files/forms.py:82 -#: archaeological_files/forms.py:883 archaeological_files/forms.py:920 +#: archaeological_files/forms.py:883 archaeological_files/forms.py:919 #: archaeological_finds/forms.py:1362 archaeological_finds/forms.py:2060 #: archaeological_finds/forms_treatments.py:52 #: archaeological_finds/forms_treatments.py:605 @@ -108,8 +97,8 @@ msgstr "Unité d'enregistrement - 001 - Recherche" #: archaeological_operations/forms.py:1312 #: archaeological_operations/forms.py:1547 #: archaeological_warehouse/forms.py:140 archaeological_warehouse/forms.py:505 -#: ishtar_common/forms_common.py:581 ishtar_common/forms_common.py:758 -#: ishtar_common/forms_common.py:975 ishtar_common/forms_common.py:2050 +#: ishtar_common/forms_common.py:583 ishtar_common/forms_common.py:761 +#: ishtar_common/forms_common.py:978 ishtar_common/forms_common.py:2053 msgid "Full text search" msgstr "Recherche en texte intégral" @@ -124,7 +113,7 @@ msgid "ID" msgstr "Identifiant" #: archaeological_context_records/forms.py:149 -#: archaeological_finds/forms.py:1382 archaeological_operations/forms.py:1866 +#: archaeological_finds/forms.py:1382 archaeological_operations/forms.py:1862 msgid "Code PATRIARCHE" msgstr "Code PATRIARCHE" @@ -133,7 +122,7 @@ msgid "Operation - name" msgstr "Opération - nom" #: archaeological_context_records/forms.py:152 -#: ishtar_common/forms_common.py:2144 +#: ishtar_common/forms_common.py:2147 msgid "Operation - year" msgstr "Opération - année" @@ -146,7 +135,7 @@ msgstr "Numéro de l'opération (index par année)" #: archaeological_context_records/forms.py:737 #: archaeological_context_records/models.py:727 #: archaeological_operations/forms.py:550 -#: archaeological_operations/models.py:534 ishtar_common/models.py:5064 +#: archaeological_operations/models.py:534 ishtar_common/models.py:5067 msgid "Archaeological site" msgstr "Entité archéologique" @@ -169,13 +158,13 @@ msgstr "Type d'unité" #: archaeological_context_records/models.py:705 #: archaeological_context_records/models.py:1416 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 -#: archaeological_files/forms.py:89 archaeological_files/forms.py:934 +#: archaeological_files/forms.py:89 archaeological_files/forms.py:932 #: archaeological_finds/models_finds.py:1097 #: archaeological_operations/forms.py:500 #: archaeological_operations/forms.py:1140 -#: archaeological_operations/forms.py:1563 -#: archaeological_operations/models.py:2983 -#: archaeological_operations/models.py:3230 +#: archaeological_operations/forms.py:1561 +#: archaeological_operations/models.py:2982 +#: archaeological_operations/models.py:3229 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Parcel" msgstr "Parcelle" @@ -210,7 +199,7 @@ msgstr "Rechercher une Unité d'Enregistrement" #: archaeological_files_pdl/forms.py:61 archaeological_operations/forms.py:756 #: archaeological_operations/forms.py:782 #: archaeological_operations/forms.py:1420 -#: archaeological_operations/forms.py:1618 +#: archaeological_operations/forms.py:1616 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:46 #: archaeological_operations/templates/ishtar/sheet_site.html:41 @@ -233,15 +222,15 @@ msgstr "Unité d'enregistrement - 020 - Général" #: archaeological_finds/models_finds.py:1094 #: archaeological_operations/forms.py:71 archaeological_operations/forms.py:209 #: archaeological_operations/forms.py:1112 -#: archaeological_operations/models.py:2964 +#: archaeological_operations/models.py:2963 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:432 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:446 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:687 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:701 #: archaeological_warehouse/forms.py:145 ishtar_common/forms_common.py:84 -#: ishtar_common/forms_common.py:106 ishtar_common/models_common.py:2662 -#: ishtar_common/models_common.py:3500 +#: ishtar_common/forms_common.py:106 ishtar_common/models_common.py:2663 +#: ishtar_common/models_common.py:3517 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 msgid "Town" msgstr "Commune" @@ -274,8 +263,8 @@ msgstr "Type d'Unité d'Enregistrement" #: archaeological_finds/models_finds.py:1810 #: archaeological_finds/models_treatments.py:255 #: archaeological_finds/templates/ishtar/sheet_find.html:180 -#: ishtar_common/forms_common.py:1799 ishtar_common/forms_common.py:2067 -#: ishtar_common/models.py:1049 ishtar_common/models.py:4178 +#: ishtar_common/forms_common.py:1802 ishtar_common/forms_common.py:2070 +#: ishtar_common/models.py:1049 ishtar_common/models.py:4181 #: ishtar_common/models_imports.py:147 ishtar_common/models_imports.py:531 #: ishtar_common/models_imports.py:629 ishtar_common/models_imports.py:647 msgid "Description" @@ -352,7 +341,7 @@ msgid "Closing date" msgstr "Date de clôture" #: archaeological_context_records/forms.py:334 -#: ishtar_common/forms_common.py:1639 +#: ishtar_common/forms_common.py:1642 msgid "Documentation" msgstr "Documentation" @@ -369,59 +358,59 @@ msgstr "Localisation" #: archaeological_context_records/forms.py:346 #: archaeological_finds/forms.py:522 archaeological_operations/forms.py:1209 #: archaeological_operations/forms.py:1457 -#: archaeological_warehouse/forms.py:249 ishtar_common/forms_common.py:2904 +#: archaeological_warehouse/forms.py:249 ishtar_common/forms_common.py:2929 msgid "Coordinates" msgstr "Coordonnées" #: archaeological_context_records/forms.py:347 #: archaeological_finds/forms.py:523 archaeological_operations/forms.py:1210 #: archaeological_operations/forms.py:1458 -#: archaeological_warehouse/forms.py:250 ishtar_common/models_common.py:2169 -#: ishtar_common/models_common.py:3503 +#: archaeological_warehouse/forms.py:250 ishtar_common/models_common.py:2170 +#: ishtar_common/models_common.py:3520 msgid "X" msgstr "X/Long" #: archaeological_context_records/forms.py:349 #: archaeological_finds/forms.py:525 archaeological_operations/forms.py:1211 -#: archaeological_operations/forms.py:1459 ishtar_common/forms_common.py:2643 -#: ishtar_common/models_common.py:2178 ishtar_common/models_common.py:3507 +#: archaeological_operations/forms.py:1459 ishtar_common/forms_common.py:2645 +#: ishtar_common/models_common.py:2179 ishtar_common/models_common.py:3524 msgid "Estimated error for X" msgstr "Erreur estimée pour X" #: archaeological_context_records/forms.py:351 #: archaeological_finds/forms.py:527 archaeological_operations/forms.py:1213 #: archaeological_operations/forms.py:1461 -#: archaeological_warehouse/forms.py:251 ishtar_common/models_common.py:2170 -#: ishtar_common/models_common.py:3504 +#: archaeological_warehouse/forms.py:251 ishtar_common/models_common.py:2171 +#: ishtar_common/models_common.py:3521 msgid "Y" msgstr "Y/Lat" #: archaeological_context_records/forms.py:353 #: archaeological_finds/forms.py:529 archaeological_operations/forms.py:1214 -#: archaeological_operations/forms.py:1462 ishtar_common/forms_common.py:2647 -#: ishtar_common/models_common.py:2181 ishtar_common/models_common.py:3510 +#: archaeological_operations/forms.py:1462 ishtar_common/forms_common.py:2649 +#: ishtar_common/models_common.py:2182 ishtar_common/models_common.py:3527 msgid "Estimated error for Y" msgstr "Erreur estimée pour Y" #: archaeological_context_records/forms.py:355 #: archaeological_finds/forms.py:531 archaeological_operations/forms.py:1216 -#: archaeological_operations/forms.py:1464 ishtar_common/models_common.py:2171 -#: ishtar_common/models_common.py:3505 +#: archaeological_operations/forms.py:1464 ishtar_common/models_common.py:2172 +#: ishtar_common/models_common.py:3522 msgid "Z" msgstr "Z" #: archaeological_context_records/forms.py:357 #: archaeological_finds/forms.py:533 archaeological_operations/forms.py:1217 -#: archaeological_operations/forms.py:1465 ishtar_common/forms_common.py:2651 -#: ishtar_common/models_common.py:2184 ishtar_common/models_common.py:3513 +#: archaeological_operations/forms.py:1465 ishtar_common/forms_common.py:2653 +#: ishtar_common/models_common.py:2185 ishtar_common/models_common.py:3530 msgid "Estimated error for Z" msgstr "Erreur estimée pour Z" #: archaeological_context_records/forms.py:360 #: archaeological_finds/forms.py:536 archaeological_operations/forms.py:1220 #: archaeological_operations/forms.py:1468 -#: archaeological_warehouse/forms.py:253 ishtar_common/models_common.py:2188 -#: ishtar_common/models_common.py:3517 +#: archaeological_warehouse/forms.py:253 ishtar_common/models_common.py:2189 +#: ishtar_common/models_common.py:3534 msgid "Spatial Reference System" msgstr "Système de référence spatiale" @@ -474,7 +463,7 @@ msgstr "Période" #: archaeological_operations/forms.py:858 #: archaeological_operations/models.py:103 #: archaeological_operations/models.py:1243 -#: archaeological_operations/models.py:3234 +#: archaeological_operations/models.py:3233 msgid "Start date" msgstr "Date de début" @@ -490,7 +479,7 @@ msgstr "Date de début" #: archaeological_finds/templates/ishtar/sheet_find.html:464 #: archaeological_finds/templates/ishtar/sheet_find.html:502 #: archaeological_operations/models.py:104 -#: archaeological_operations/models.py:3235 +#: archaeological_operations/models.py:3234 #: ishtar_common/models_imports.py:1217 msgid "End date" msgstr "Date de fin" @@ -532,8 +521,8 @@ msgstr "Unité d'enregistrement - 030 - Datation" #: archaeological_finds/models_finds.py:2404 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 #: archaeological_finds/wizards.py:93 archaeological_warehouse/forms.py:562 -#: ishtar_common/forms_common.py:2146 ishtar_common/models.py:5065 -#: ishtar_common/views.py:400 +#: ishtar_common/forms_common.py:2149 ishtar_common/models.py:5068 +#: ishtar_common/views.py:401 msgid "Context record" msgstr "Unité d'Enregistrement" @@ -573,7 +562,7 @@ msgstr "Activité" #: archaeological_finds/forms.py:277 archaeological_finds/forms.py:641 #: archaeological_finds/forms.py:817 #: archaeological_finds/templates/ishtar/sheet_find.html:158 -#: ishtar_common/forms_common.py:1852 +#: ishtar_common/forms_common.py:1855 #: ishtar_common/templates/ishtar/organization_person_form.html:9 #: ishtar_common/templates/ishtar/person_form.html:9 #: ishtar_common/templates/ishtar/sheet_document.html:34 @@ -622,8 +611,8 @@ msgstr "Voulez-vous supprimer cette Unité d'Enregistrement ?" #: archaeological_context_records/forms.py:666 #: archaeological_finds/forms.py:1070 archaeological_finds/forms.py:1095 -#: archaeological_operations/forms.py:1936 ishtar_common/forms_common.py:2307 -#: ishtar_common/models.py:3157 ishtar_common/models.py:3516 +#: archaeological_operations/forms.py:1932 ishtar_common/forms_common.py:2310 +#: ishtar_common/models.py:3160 ishtar_common/models.py:3519 msgid " - duplicate" msgstr " - copie" @@ -806,8 +795,8 @@ msgstr "Datations" #: archaeological_finds/models_finds.py:3334 #: archaeological_finds/models_treatments.py:734 #: archaeological_finds/templates/ishtar/sheet_find.html:4 -#: ishtar_common/forms_common.py:2162 ishtar_common/models.py:5066 -#: ishtar_common/views.py:404 +#: ishtar_common/forms_common.py:2165 ishtar_common/models.py:5069 +#: ishtar_common/views.py:405 msgid "Find" msgstr "Mobilier" @@ -829,14 +818,14 @@ msgstr "Mobilier" #: archaeological_operations/models.py:127 #: archaeological_operations/models.py:145 #: archaeological_operations/models.py:154 -#: archaeological_operations/models.py:3792 +#: archaeological_operations/models.py:3791 #: archaeological_warehouse/forms.py:108 archaeological_warehouse/models.py:695 #: archaeological_warehouse/models.py:727 ishtar_common/models.py:691 #: ishtar_common/models.py:746 ishtar_common/models.py:788 -#: ishtar_common/models.py:1732 ishtar_common/models.py:3525 -#: ishtar_common/models.py:4843 ishtar_common/models_common.py:2006 -#: ishtar_common/models_common.py:2039 ishtar_common/models_common.py:2055 -#: ishtar_common/models_common.py:2071 ishtar_common/models_common.py:2083 +#: ishtar_common/models.py:1732 ishtar_common/models.py:3528 +#: ishtar_common/models.py:4846 ishtar_common/models_common.py:2007 +#: ishtar_common/models_common.py:2040 ishtar_common/models_common.py:2056 +#: ishtar_common/models_common.py:2072 ishtar_common/models_common.py:2084 msgid "Order" msgstr "Ordre" @@ -955,12 +944,12 @@ msgstr "id" #: archaeological_operations/models.py:349 #: archaeological_operations/models.py:1057 #: archaeological_operations/tests.py:2990 -#: archaeological_warehouse/models.py:316 +#: archaeological_warehouse/models.py:316 ishtar_common/models.py:2465 msgctxt "key for text search" msgid "town" msgstr "commune" -#: archaeological_context_records/models.py:578 ishtar_common/models.py:3929 +#: archaeological_context_records/models.py:578 ishtar_common/models.py:3932 msgctxt "key for text search" msgid "operation-year" msgstr "operation-annee" @@ -991,8 +980,8 @@ msgstr "operation-code" #: archaeological_finds/models_finds.py:1354 #: archaeological_finds/models_finds.py:1726 #: archaeological_operations/models.py:384 -#: archaeological_operations/models.py:409 ishtar_common/models.py:3921 -#: ishtar_common/models.py:4026 +#: archaeological_operations/models.py:409 ishtar_common/models.py:3924 +#: ishtar_common/models.py:4029 msgctxt "key for text search" msgid "operation" msgstr "operation" @@ -1002,8 +991,8 @@ msgstr "operation" #: archaeological_finds/models_finds.py:1269 #: archaeological_operations/models.py:1141 #: archaeological_operations/models.py:1205 -#: archaeological_warehouse/models.py:937 ishtar_common/models.py:3957 -#: ishtar_common/models.py:4035 +#: archaeological_warehouse/models.py:937 ishtar_common/models.py:3960 +#: ishtar_common/models.py:4038 msgctxt "key for text search" msgid "site" msgstr "site" @@ -1068,8 +1057,8 @@ msgstr "Verrouiller/Déverrouiller" #: archaeological_operations/models.py:435 #: archaeological_operations/models.py:1181 #: archaeological_warehouse/models.py:327 -#: archaeological_warehouse/models.py:1049 ishtar_common/models.py:2465 -#: ishtar_common/models.py:2731 ishtar_common/models.py:4052 +#: archaeological_warehouse/models.py:1049 ishtar_common/models.py:2472 +#: ishtar_common/models.py:2734 ishtar_common/models.py:4055 msgid "Bulk update" msgstr "Modification par lot" @@ -1088,10 +1077,10 @@ msgstr "Modification par lot" #: archaeological_operations/views.py:848 #: archaeological_operations/views.py:863 #: archaeological_operations/views.py:870 -#: archaeological_operations/views.py:887 ishtar_common/admin.py:1450 -#: ishtar_common/admin.py:1570 ishtar_common/models.py:4061 -#: ishtar_common/models.py:4405 ishtar_common/views.py:2636 -#: ishtar_common/views.py:2654 +#: archaeological_operations/views.py:887 ishtar_common/admin.py:1455 +#: ishtar_common/admin.py:1575 ishtar_common/models.py:4064 +#: ishtar_common/models.py:4408 ishtar_common/views.py:2637 +#: ishtar_common/views.py:2655 msgid "Duplicate" msgstr "Dupliquer" @@ -1100,23 +1089,23 @@ msgstr "Dupliquer" #: archaeological_finds/models_finds.py:1799 #: archaeological_finds/models_treatments.py:252 #: archaeological_finds/models_treatments.py:1100 -#: archaeological_operations/models.py:2972 +#: archaeological_operations/models.py:2971 #: archaeological_warehouse/models.py:388 -#: archaeological_warehouse/models.py:1133 ishtar_common/models.py:4087 +#: archaeological_warehouse/models.py:1133 ishtar_common/models.py:4090 msgid "External ID" msgstr "Identifiant" #: archaeological_context_records/models.py:701 #: archaeological_files/models.py:533 archaeological_finds/models_finds.py:406 #: archaeological_finds/models_finds.py:1801 -#: archaeological_operations/models.py:2975 +#: archaeological_operations/models.py:2974 #: archaeological_warehouse/models.py:390 #: archaeological_warehouse/models.py:1135 msgid "External ID is set automatically" msgstr "L'identifiant est attribué automatiquement" #: archaeological_context_records/models.py:746 -#: archaeological_operations/models.py:1296 ishtar_common/models_common.py:2632 +#: archaeological_operations/models.py:1296 ishtar_common/models_common.py:2633 msgid "Surface (m2)" msgstr "Surface (m2)" @@ -1161,7 +1150,7 @@ msgstr "Estimation d'un « Terminus Post Quem »" #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 #: archaeological_operations/models.py:495 #: archaeological_operations/models.py:1370 -#: archaeological_operations/models.py:2719 +#: archaeological_operations/models.py:2718 #: archaeological_operations/templates/ishtar/sheet_operation.html:63 #: archaeological_operations/templates/ishtar/sheet_site.html:97 #: archaeological_warehouse/models.py:377 @@ -1169,7 +1158,7 @@ msgstr "Estimation d'un « Terminus Post Quem »" #: archaeological_warehouse/templates/ishtar/sheet_container.html:46 #: archaeological_warehouse/templates/ishtar/sheet_container.html:179 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:42 -#: ishtar_common/models.py:4203 +#: ishtar_common/models.py:4206 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_person.html:161 msgid "Documents" @@ -1181,7 +1170,7 @@ msgstr "Documents" #: archaeological_finds/models_treatments.py:1157 #: archaeological_operations/models.py:501 #: archaeological_operations/models.py:1376 -#: archaeological_operations/models.py:2726 +#: archaeological_operations/models.py:2725 #: archaeological_warehouse/models.py:384 #: archaeological_warehouse/models.py:1147 msgid "Main image" @@ -1193,9 +1182,9 @@ msgstr "Image principale" #: archaeological_finds/models_treatments.py:1169 #: archaeological_operations/models.py:506 #: archaeological_operations/models.py:1381 -#: archaeological_operations/models.py:2979 ishtar_common/models.py:2489 -#: ishtar_common/models.py:2780 ishtar_common/models.py:3552 -#: ishtar_common/models_common.py:2657 ishtar_common/models_common.py:2680 +#: archaeological_operations/models.py:2978 ishtar_common/models.py:2496 +#: ishtar_common/models.py:2783 ishtar_common/models.py:3555 +#: ishtar_common/models_common.py:2658 ishtar_common/models_common.py:2681 msgid "Cached name" msgstr "Nom en cache" @@ -1364,7 +1353,7 @@ msgstr "Opération / Site" #: archaeological_warehouse/templates/ishtar/sheet_container.html:174 #: archaeological_warehouse/templates/ishtar/sheet_container.html:221 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:177 -#: ishtar_common/views.py:1005 ishtar_common/views.py:1077 +#: ishtar_common/views.py:1006 ishtar_common/views.py:1078 msgid "Finds" msgstr "Mobilier" @@ -1388,7 +1377,7 @@ msgstr "Champs personnalisés" #: archaeological_operations/templates/ishtar/sheet_site.html:27 #: archaeological_warehouse/templates/ishtar/sheet_container.html:70 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:63 -#: ishtar_common/models_common.py:3708 +#: ishtar_common/models_common.py:3725 #: ishtar_common/templates/ishtar/sheet_document.html:37 msgid "Complete identifier" msgstr "Identifiant complet" @@ -1410,7 +1399,7 @@ msgstr "Surface" #: archaeological_warehouse/models.py:1105 #: archaeological_warehouse/templates/ishtar/sheet_container.html:152 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:102 -#: ishtar_common/models_common.py:2634 +#: ishtar_common/models_common.py:2635 msgid "Localisation" msgstr "Localisation" @@ -1421,7 +1410,6 @@ msgstr "Localisation" #: archaeological_finds/templates/ishtar/sheet_find.html:219 #: archaeological_operations/templates/ishtar/sheet_operation.html:270 #: ishtar_common/templates/ishtar/blocks/window_image.html:5 -#: sra_idf_app/templates/ishtar/sheet_basefind.html:48 msgid "Sheet" msgstr "Fiche" @@ -1457,9 +1445,9 @@ 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:176 -#: ishtar_common/models.py:3232 ishtar_common/models.py:4961 -#: ishtar_common/models.py:5094 ishtar_common/models.py:5172 -#: ishtar_common/models_common.py:1936 ishtar_common/models_common.py:1951 +#: ishtar_common/models.py:3235 ishtar_common/models.py:4964 +#: ishtar_common/models.py:5097 ishtar_common/models.py:5175 +#: ishtar_common/models_common.py:1937 ishtar_common/models_common.py:1952 #: ishtar_common/models_imports.py:1206 msgid "State" msgstr "État" @@ -1558,7 +1546,7 @@ msgstr "Dossier - 001 - Recherche" #: archaeological_files/forms.py:85 archaeological_files/forms.py:268 #: archaeological_files/forms.py:329 archaeological_files/forms.py:890 -#: archaeological_files/forms.py:927 archaeological_files/models.py:380 +#: archaeological_files/forms.py:926 archaeological_files/models.py:380 #: archaeological_files/models.py:522 #: archaeological_files/templates/ishtar/sheet_file.html:217 #: archaeological_files_pdl/forms.py:67 archaeological_files_pdl/forms.py:457 @@ -1576,12 +1564,12 @@ msgstr "Dossier - 001 - Recherche" #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:490 #: archaeological_operations/forms.py:803 #: archaeological_operations/forms.py:1551 -#: archaeological_operations/forms.py:1868 +#: archaeological_operations/forms.py:1864 #: archaeological_operations/models.py:909 #: archaeological_operations/models.py:1280 #: archaeological_operations/models.py:2468 #: archaeological_operations/models.py:2697 -#: archaeological_operations/models.py:2962 +#: archaeological_operations/models.py:2961 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 #: ishtar_common/models_imports.py:937 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:196 @@ -1596,29 +1584,33 @@ msgid "Numeric reference" msgstr "Identifiant numérique" #: archaeological_files/forms.py:87 archaeological_files/forms.py:279 +#: archaeological_files/forms.py:892 archaeological_files/forms.py:928 #: archaeological_operations/forms.py:1197 #: archaeological_operations/forms.py:1317 #: archaeological_operations/forms.py:1432 +#: archaeological_operations/forms.py:1553 +#: archaeological_operations/forms.py:1630 #: archaeological_operations/models.py:454 +#: archaeological_operations/models.py:2700 msgid "Other reference" msgstr "Autre référence" -#: archaeological_files/forms.py:92 archaeological_files/forms.py:899 -#: archaeological_files/forms.py:937 archaeological_files/models.py:1330 +#: archaeological_files/forms.py:92 archaeological_files/forms.py:898 +#: archaeological_files/forms.py:935 archaeological_files/models.py:1330 #: archaeological_operations/forms.py:503 -#: archaeological_operations/forms.py:1566 +#: archaeological_operations/forms.py:1564 #: archaeological_operations/models.py:2340 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:390 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:411 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:643 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:664 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:666 -#: ishtar_common/models_common.py:1959 ishtar_common/models_common.py:2640 +#: ishtar_common/models_common.py:1960 ishtar_common/models_common.py:2641 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "Département" -#: archaeological_files/forms.py:94 archaeological_files/forms.py:947 +#: archaeological_files/forms.py:94 archaeological_files/forms.py:945 msgid "File name" msgstr "Nom du dossier" @@ -1665,19 +1657,19 @@ msgstr "Référence du permis / de l'arrêté" #: archaeological_operations/forms.py:817 #: archaeological_operations/forms.py:1325 #: archaeological_operations/forms.py:1446 -#: archaeological_operations/forms.py:1569 -#: archaeological_operations/forms.py:1631 +#: archaeological_operations/forms.py:1567 +#: archaeological_operations/forms.py:1629 #: archaeological_operations/models.py:466 #: archaeological_operations/models.py:1365 -#: archaeological_operations/models.py:2715 +#: archaeological_operations/models.py:2714 #: archaeological_warehouse/forms.py:226 archaeological_warehouse/forms.py:381 #: archaeological_warehouse/forms.py:513 archaeological_warehouse/models.py:367 -#: archaeological_warehouse/models.py:1103 ishtar_common/forms_common.py:1797 -#: ishtar_common/forms_common.py:2102 ishtar_common/forms_common.py:2641 -#: ishtar_common/models.py:2769 ishtar_common/models.py:3409 -#: ishtar_common/models.py:4187 ishtar_common/models_common.py:180 -#: ishtar_common/models_common.py:2168 ishtar_common/models_imports.py:709 -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:12 +#: archaeological_warehouse/models.py:1103 ishtar_common/forms_common.py:1800 +#: ishtar_common/forms_common.py:2105 ishtar_common/forms_common.py:2643 +#: ishtar_common/models.py:2772 ishtar_common/models.py:3412 +#: ishtar_common/models.py:4190 ishtar_common/models_common.py:181 +#: ishtar_common/models_common.py:2169 ishtar_common/models_imports.py:709 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:13 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:170 msgid "Comment" msgstr "Commentaire" @@ -1690,26 +1682,26 @@ msgid "In charge" msgstr "Responsable" #: archaeological_files/forms.py:112 archaeological_files/forms.py:364 -#: archaeological_files/forms.py:949 archaeological_files/models.py:548 +#: archaeological_files/forms.py:947 archaeological_files/models.py:548 #: archaeological_files_pdl/forms.py:285 archaeological_files_pdl/forms.py:295 msgid "General contractor" msgstr "Aménageur" -#: archaeological_files/forms.py:122 archaeological_files/forms.py:959 +#: archaeological_files/forms.py:122 archaeological_files/forms.py:957 msgid "Organization of general contractor" msgstr "Organisation de l'aménageur" -#: archaeological_files/forms.py:133 archaeological_files/forms.py:990 +#: archaeological_files/forms.py:133 archaeological_files/forms.py:988 #: archaeological_operations/forms.py:556 -#: archaeological_operations/forms.py:1571 ishtar_common/forms.py:926 +#: archaeological_operations/forms.py:1569 ishtar_common/forms.py:926 msgid "Created by" msgstr "Créé par" -#: archaeological_files/forms.py:141 archaeological_files/forms.py:998 +#: archaeological_files/forms.py:141 archaeological_files/forms.py:996 #: archaeological_finds/forms_treatments.py:629 #: archaeological_finds/forms_treatments.py:954 #: archaeological_operations/forms.py:562 -#: archaeological_operations/forms.py:1577 +#: archaeological_operations/forms.py:1575 msgid "Modified by" msgstr "Modifié par" @@ -1722,8 +1714,8 @@ msgstr "Rechercher un dossier archéologique" #: archaeological_finds/forms_treatments.py:877 #: archaeological_finds/models_treatments.py:1134 #: archaeological_operations/forms.py:678 -#: archaeological_operations/models.py:1241 ishtar_common/forms_common.py:1792 -#: ishtar_common/forms_common.py:2268 ishtar_common/models.py:4172 +#: archaeological_operations/models.py:1241 ishtar_common/forms_common.py:1795 +#: ishtar_common/forms_common.py:2271 ishtar_common/models.py:4175 #: ishtar_common/models_imports.py:1214 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 msgid "Creation date" @@ -1786,30 +1778,34 @@ msgstr "Personne responsable" #: archaeological_operations/forms.py:1196 #: archaeological_operations/forms.py:1316 #: archaeological_operations/forms.py:1431 -#: archaeological_operations/forms.py:1924 +#: archaeological_operations/forms.py:1920 #: archaeological_operations/models.py:455 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:154 #: archaeological_warehouse/forms.py:143 archaeological_warehouse/forms.py:203 -#: archaeological_warehouse/models.py:347 ishtar_common/forms_common.py:525 -#: ishtar_common/forms_common.py:584 ishtar_common/forms_common.py:761 -#: ishtar_common/forms_common.py:888 ishtar_common/forms_common.py:979 -#: ishtar_common/forms_common.py:1231 ishtar_common/forms_common.py:1284 -#: ishtar_common/forms_common.py:2610 ishtar_common/models.py:690 +#: archaeological_warehouse/models.py:347 ishtar_common/forms_common.py:527 +#: ishtar_common/forms_common.py:586 ishtar_common/forms_common.py:764 +#: ishtar_common/forms_common.py:891 ishtar_common/forms_common.py:982 +#: ishtar_common/forms_common.py:1234 ishtar_common/forms_common.py:1287 +#: ishtar_common/forms_common.py:2613 ishtar_common/models.py:690 #: ishtar_common/models.py:729 ishtar_common/models.py:1043 #: ishtar_common/models.py:1552 ishtar_common/models.py:1940 -#: ishtar_common/models.py:2475 ishtar_common/models.py:2764 -#: ishtar_common/models.py:3090 ishtar_common/models.py:3226 -#: ishtar_common/models.py:4937 ishtar_common/models_common.py:2136 -#: ishtar_common/models_common.py:2631 ishtar_common/models_common.py:2680 +#: ishtar_common/models.py:2482 ishtar_common/models.py:2767 +#: ishtar_common/models.py:3093 ishtar_common/models.py:3229 +#: ishtar_common/models.py:4940 ishtar_common/models_common.py:2137 +#: ishtar_common/models_common.py:2632 ishtar_common/models_common.py:2681 #: ishtar_common/models_imports.py:110 ishtar_common/models_imports.py:144 #: ishtar_common/models_imports.py:628 ishtar_common/models_imports.py:645 #: ishtar_common/models_imports.py:765 ishtar_common/models_imports.py:1126 #: ishtar_common/models_rest.py:94 -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:9 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:10 #: ishtar_common/templates/ishtar/import_step_by_step.html:102 #: ishtar_common/templates/ishtar/import_step_by_step.html:270 #: ishtar_common/templates/ishtar/import_table.html:27 +#: ishtar_common/templates/ishtar/merge_organization.html:9 +#: ishtar_common/templates/ishtar/merge_organization.html:20 +#: ishtar_common/templates/ishtar/merge_person.html:10 +#: ishtar_common/templates/ishtar/merge_person.html:22 #: ishtar_common/templates/ishtar/sheet_organization.html:25 #: ishtar_common/templates/ishtar/sheet_organization.html:53 msgid "Name" @@ -1841,7 +1837,7 @@ msgstr "Un autre dossier avec cet identifiant numérique existe." #: archaeological_operations/forms.py:1137 #: archaeological_operations/forms.py:1153 #: archaeological_operations/forms.py:1159 -#: archaeological_operations/models.py:2984 +#: archaeological_operations/models.py:2983 #: archaeological_operations/templates/ishtar/sheet_operation.html:494 msgid "Parcels" msgstr "Parcelles" @@ -1875,7 +1871,7 @@ msgstr "Dossier archéologique - 045 - Recherche - Général" #: archaeological_files/forms.py:439 archaeological_files/models.py:641 #: archaeological_files_pdl/forms.py:128 archaeological_files_pdl/forms.py:171 -#: archaeological_operations/models.py:2704 ishtar_common/models_common.py:1960 +#: archaeological_operations/models.py:2703 ishtar_common/models_common.py:1961 msgid "Departments" msgstr "Départements" @@ -1918,7 +1914,7 @@ msgstr "Dossier préventif" msgid "Preventive file - 020 - Edition form" msgstr "Dossier préventif - 020 - Formulaire d'édition" -#: archaeological_files/forms.py:519 ishtar_common/forms_common.py:1856 +#: archaeological_files/forms.py:519 ishtar_common/forms_common.py:1859 #: ishtar_common/templates/ishtar/sheet_document.html:76 msgid "Dates" msgstr "Dates" @@ -2016,8 +2012,8 @@ msgstr "Quantité" msgid "Equipment / service" msgstr "Équipement / service" -#: archaeological_files/forms.py:891 archaeological_files/forms.py:928 -#: archaeological_files/forms.py:1064 +#: archaeological_files/forms.py:891 archaeological_files/forms.py:927 +#: archaeological_files/forms.py:1062 #: archaeological_finds/forms_treatments.py:59 #: archaeological_finds/forms_treatments.py:348 #: archaeological_finds/forms_treatments.py:610 @@ -2030,79 +2026,79 @@ msgstr "Équipement / service" #: archaeological_finds/models_treatments.py:1095 #: archaeological_finds/templates/ishtar/sheet_find.html:364 #: archaeological_operations/forms.py:1552 -#: archaeological_operations/forms.py:1689 -#: archaeological_operations/models.py:2639 ishtar_common/models.py:4086 +#: archaeological_operations/forms.py:1685 +#: archaeological_operations/models.py:2639 ishtar_common/models.py:4089 msgid "Index" msgstr "Index" -#: archaeological_files/forms.py:894 archaeological_files/forms.py:931 -#: archaeological_files/forms.py:1053 +#: archaeological_files/forms.py:893 archaeological_files/forms.py:929 +#: archaeological_files/forms.py:1051 #: archaeological_finds/forms_treatments.py:611 #: archaeological_finds/forms_treatments.py:661 #: archaeological_finds/forms_treatments.py:932 #: archaeological_finds/forms_treatments.py:987 -#: archaeological_operations/forms.py:1560 -#: archaeological_operations/forms.py:1621 +#: archaeological_operations/forms.py:1558 +#: archaeological_operations/forms.py:1619 #: archaeological_operations/models.py:2370 #: archaeological_operations/models.py:2629 msgid "Act type" msgstr "Type d'acte" -#: archaeological_files/forms.py:895 +#: archaeological_files/forms.py:894 msgid "Object (full text search)" msgstr "Objet (recherche en texte intégral)" -#: archaeological_files/forms.py:932 +#: archaeological_files/forms.py:930 #: archaeological_finds/forms_treatments.py:612 #: archaeological_finds/forms_treatments.py:933 -#: archaeological_operations/forms.py:1561 -#: archaeological_operations/forms.py:1759 +#: archaeological_operations/forms.py:1559 +#: archaeological_operations/forms.py:1755 msgid "Indexed?" msgstr "Indexé ?" -#: archaeological_files/forms.py:939 +#: archaeological_files/forms.py:937 #: archaeological_finds/forms_treatments.py:613 #: archaeological_finds/forms_treatments.py:934 -#: archaeological_operations/forms.py:1567 -#: archaeological_operations/forms.py:1628 +#: archaeological_operations/forms.py:1565 +#: archaeological_operations/forms.py:1626 #: archaeological_operations/models.py:2698 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "Objet" -#: archaeological_files/forms.py:942 +#: archaeological_files/forms.py:940 #: archaeological_finds/forms_treatments.py:619 #: archaeological_finds/forms_treatments.py:940 msgid "Signature date before" msgstr "Date de signature avant" -#: archaeological_files/forms.py:945 +#: archaeological_files/forms.py:943 #: archaeological_finds/forms_treatments.py:617 #: archaeological_finds/forms_treatments.py:938 msgid "Signature date after" msgstr "Date de signature après" -#: archaeological_files/forms.py:970 +#: archaeological_files/forms.py:968 msgid "File numeric reference" msgstr "Dossier : réf. numérique" -#: archaeological_files/forms.py:972 +#: archaeological_files/forms.py:970 msgid "File year" msgstr "Dossier : année" -#: archaeological_files/forms.py:974 +#: archaeological_files/forms.py:972 msgid "File other reference" msgstr "Dossier : autre référence" -#: archaeological_files/forms.py:977 +#: archaeological_files/forms.py:975 msgid "File in charge" msgstr "Dossier : responsable" -#: archaeological_files/forms.py:987 +#: archaeological_files/forms.py:985 msgid "File permit reference" msgstr "Dossier : réf. du permis" -#: archaeological_files/forms.py:1051 +#: archaeological_files/forms.py:1049 msgid "Archaeological file - Administrative act - General" msgstr "Dossier archéologique - Acte administratif - Général" @@ -2115,7 +2111,7 @@ msgstr "Dossier archéologique - Acte administratif - Général" #: archaeological_operations/models.py:2353 #: archaeological_operations/models.py:2469 #: archaeological_operations/models.py:2677 -#: archaeological_operations/wizards.py:85 ishtar_common/views.py:395 +#: archaeological_operations/wizards.py:85 ishtar_common/views.py:396 msgid "Archaeological file" msgstr "Dossier archéologique" @@ -2129,7 +2125,7 @@ msgstr "Clôture" #: archaeological_finds/ishtar_menu.py:226 #: archaeological_finds/models_finds.py:3337 #: archaeological_operations/ishtar_menu.py:70 -#: archaeological_operations/models.py:2735 +#: archaeological_operations/models.py:2734 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "Acte administratif" @@ -2217,12 +2213,12 @@ msgstr "m. linéaire" msgid "Equipment/Service" msgstr "Équipement/Service" -#: archaeological_files/models.py:208 ishtar_common/models_common.py:171 -#: ishtar_common/models_common.py:202 +#: archaeological_files/models.py:208 ishtar_common/models_common.py:172 +#: ishtar_common/models_common.py:203 msgid "Textual ID" msgstr "Identifiant textuel" -#: archaeological_files/models.py:212 ishtar_common/models_common.py:175 +#: archaeological_files/models.py:212 ishtar_common/models_common.py:176 msgid "" "The slug is the standardized version of the name. It contains only lowercase " "letters, numbers and hyphens. Each slug must be unique." @@ -2256,15 +2252,15 @@ msgid "Default quantity by day" msgstr "Quantité par défaut par jour" #: archaeological_files/models.py:231 ishtar_common/models.py:1554 -#: ishtar_common/models.py:1970 ishtar_common/models.py:3420 -#: ishtar_common/models_common.py:181 ishtar_common/models_imports.py:184 +#: ishtar_common/models.py:1970 ishtar_common/models.py:3423 +#: ishtar_common/models_common.py:182 ishtar_common/models_imports.py:184 #: ishtar_common/models_imports.py:770 msgid "Available" msgstr "Disponible" #: archaeological_files/models.py:237 archaeological_warehouse/forms.py:753 -#: ishtar_common/admin.py:1020 ishtar_common/models.py:2275 -#: ishtar_common/models_common.py:713 +#: ishtar_common/admin.py:1025 ishtar_common/models.py:2275 +#: ishtar_common/models_common.py:714 msgid "Parent" msgstr "Parent" @@ -2334,7 +2330,7 @@ msgstr "Types d'opération pour les redevances - France" #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:415 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:520 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:537 -#: ishtar_common/admin.py:1189 +#: ishtar_common/admin.py:1194 msgid "Area" msgstr "Zone" @@ -2356,8 +2352,8 @@ msgstr "Zone étendue" #: archaeological_operations/templates/ishtar/sheet_operation.html:544 #: archaeological_operations/templates/ishtar/sheet_operation.html:554 #: archaeological_operations/templates/ishtar/sheet_operation.html:571 -#: ishtar_common/models.py:1854 ishtar_common/models_common.py:746 -#: ishtar_common/models_common.py:1932 ishtar_common/models_common.py:1948 +#: ishtar_common/models.py:1854 ishtar_common/models_common.py:747 +#: ishtar_common/models_common.py:1933 ishtar_common/models_common.py:1949 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:211 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail_users.html:5 #: ishtar_common/templates/ishtar/sheet_person.html:30 @@ -2384,11 +2380,11 @@ msgstr "Surface totale aménagée (km²)" #: archaeological_operations/models.py:995 #: archaeological_operations/models.py:997 #: archaeological_operations/models.py:1301 -#: archaeological_operations/models.py:2710 +#: archaeological_operations/models.py:2709 #: archaeological_operations/templates/ishtar/sheet_operation.html:147 -#: ishtar_common/forms_common.py:1444 ishtar_common/forms_common.py:1457 -#: ishtar_common/forms_common.py:1458 ishtar_common/models.py:2268 -#: ishtar_common/models_common.py:2663 +#: ishtar_common/forms_common.py:1447 ishtar_common/forms_common.py:1460 +#: ishtar_common/forms_common.py:1461 ishtar_common/models.py:2268 +#: ishtar_common/models_common.py:2664 msgid "Towns" msgstr "Communes" @@ -2406,7 +2402,7 @@ msgstr "annee" #: archaeological_files/models.py:457 #: archaeological_finds/models_treatments.py:1046 #: archaeological_operations/models.py:333 -#: archaeological_warehouse/models.py:913 ishtar_common/models.py:3851 +#: archaeological_warehouse/models.py:913 ishtar_common/models.py:3854 msgctxt "key for text search" msgid "reference" msgstr "reference" @@ -2428,8 +2424,8 @@ msgstr "departement" #: archaeological_operations/models.py:336 #: archaeological_operations/models.py:1071 #: archaeological_operations/tests.py:3099 -#: archaeological_warehouse/models.py:309 ishtar_common/models.py:2455 -#: ishtar_common/models.py:2707 ishtar_common/models.py:3281 +#: archaeological_warehouse/models.py:309 ishtar_common/models.py:2458 +#: ishtar_common/models.py:2710 ishtar_common/models.py:3284 msgctxt "key for text search" msgid "name" msgstr "nom" @@ -2441,9 +2437,9 @@ msgstr "nom" #: archaeological_operations/models.py:2504 #: archaeological_operations/tests.py:3112 #: archaeological_warehouse/models.py:312 -#: archaeological_warehouse/models.py:909 ishtar_common/models.py:2458 -#: ishtar_common/models.py:2716 ishtar_common/models.py:3292 -#: ishtar_common/models.py:3847 +#: archaeological_warehouse/models.py:909 ishtar_common/models.py:2461 +#: ishtar_common/models.py:2719 ishtar_common/models.py:3295 +#: ishtar_common/models.py:3850 msgctxt "key for text search" msgid "type" msgstr "type" @@ -2472,7 +2468,7 @@ msgstr "reference-permis" #: archaeological_operations/models.py:355 #: archaeological_operations/models.py:1119 #: archaeological_operations/models.py:2614 -#: archaeological_warehouse/models.py:920 ishtar_common/models.py:3911 +#: archaeological_warehouse/models.py:920 ishtar_common/models.py:3914 msgctxt "key for text search" msgid "comment" msgstr "commentaire" @@ -2496,7 +2492,7 @@ msgstr "amenageur-organisation" #: archaeological_files/models.py:527 #: archaeological_finds/models_treatments.py:1097 -#: ishtar_common/forms_common.py:1784 ishtar_common/forms_common.py:2066 +#: ishtar_common/forms_common.py:1787 ishtar_common/forms_common.py:2069 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" msgstr "Référence interne" @@ -2546,10 +2542,12 @@ msgstr "Adresse des terrains - code postal" #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:555 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:590 #: archaeological_warehouse/forms.py:206 archaeological_warehouse/models.py:364 -#: ishtar_common/forms_common.py:520 ishtar_common/forms_common.py:766 -#: ishtar_common/forms_common.py:828 ishtar_common/forms_common.py:984 -#: ishtar_common/ishtar_menu.py:119 ishtar_common/models.py:2495 -#: ishtar_common/models.py:2702 ishtar_common/models.py:3270 +#: ishtar_common/forms_common.py:522 ishtar_common/forms_common.py:769 +#: ishtar_common/forms_common.py:831 ishtar_common/forms_common.py:987 +#: ishtar_common/ishtar_menu.py:119 ishtar_common/models.py:2502 +#: ishtar_common/models.py:2705 ishtar_common/models.py:3273 +#: ishtar_common/templates/ishtar/merge_person.html:11 +#: ishtar_common/templates/ishtar/merge_person.html:23 #: ishtar_common/templates/ishtar/sheet_organization.html:4 msgid "Organization" msgstr "Organisation" @@ -2576,7 +2574,7 @@ msgstr "Ligne importée" #: archaeological_files/models.py:749 #: archaeological_files/templates/ishtar/dashboards/dashboard_file.html:7 -#: ishtar_common/views.py:1000 ishtar_common/views.py:1061 +#: ishtar_common/views.py:1001 ishtar_common/views.py:1062 msgid "Archaeological files" msgstr "Dossiers archéologiques" @@ -2630,7 +2628,7 @@ msgid "operation" msgstr "opération" #: archaeological_files/models.py:1327 archaeological_operations/models.py:1285 -#: archaeological_operations/models.py:2949 +#: archaeological_operations/models.py:2948 msgid "File" msgstr "Dossier" @@ -2803,7 +2801,7 @@ msgid "Back to the file" msgstr "Retourner au dossier" #: archaeological_files/templates/ishtar/sheet_file.html:29 -#: archaeological_operations/forms.py:682 ishtar_common/models.py:4901 +#: archaeological_operations/forms.py:682 ishtar_common/models.py:4904 msgid "Preventive" msgstr "Préventif" @@ -2828,7 +2826,7 @@ msgstr "Parcelles associées" #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 #: archaeological_finds/templates/ishtar/sheet_treatment.html:133 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:83 -#: archaeological_operations/models.py:2736 +#: archaeological_operations/models.py:2735 #: archaeological_operations/templates/ishtar/sheet_operation.html:351 #: archaeological_operations/templates/ishtar/sheet_operation.html:488 msgid "Administrative acts" @@ -2842,11 +2840,11 @@ msgstr "Opérations associées" #: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_files/templates/ishtar/sheet_file.html:218 #: archaeological_operations/models.py:2467 -#: archaeological_operations/models.py:2771 +#: archaeological_operations/models.py:2770 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 #: archaeological_warehouse/forms.py:339 archaeological_warehouse/forms.py:511 -#: archaeological_warehouse/models.py:694 ishtar_common/models.py:4088 +#: archaeological_warehouse/models.py:694 ishtar_common/models.py:4091 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:34 msgid "Ref." msgstr "Réf." @@ -2864,18 +2862,20 @@ msgstr "Réf." #: archaeological_operations/templates/ishtar/sheet_operation.html:507 #: archaeological_operations/templates/ishtar/sheet_operation.html:571 #: archaeological_warehouse/models.py:298 -#: archaeological_warehouse/models.py:888 ishtar_common/forms_common.py:585 -#: ishtar_common/forms_common.py:764 ishtar_common/forms_common.py:982 -#: ishtar_common/forms_common.py:1229 ishtar_common/forms_common.py:1658 -#: ishtar_common/forms_common.py:2064 ishtar_common/forms_common.py:2291 -#: ishtar_common/forms_common.py:2913 ishtar_common/models.py:744 -#: ishtar_common/models.py:2477 ishtar_common/models.py:3810 -#: ishtar_common/models.py:4092 ishtar_common/models_imports.py:150 +#: archaeological_warehouse/models.py:888 ishtar_common/forms_common.py:587 +#: ishtar_common/forms_common.py:767 ishtar_common/forms_common.py:985 +#: ishtar_common/forms_common.py:1232 ishtar_common/forms_common.py:1661 +#: ishtar_common/forms_common.py:2067 ishtar_common/forms_common.py:2294 +#: ishtar_common/forms_common.py:2938 ishtar_common/models.py:744 +#: ishtar_common/models.py:2484 ishtar_common/models.py:3813 +#: ishtar_common/models.py:4095 ishtar_common/models_imports.py:150 #: ishtar_common/models_imports.py:936 #: 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 #: ishtar_common/templates/ishtar/import_table.html:28 +#: ishtar_common/templates/ishtar/merge_organization.html:10 +#: ishtar_common/templates/ishtar/merge_organization.html:21 #: ishtar_common/templates/ishtar/sheet_organization.html:27 #: ishtar_common/templates/ishtar/sheet_organization.html:54 msgid "Type" @@ -2921,7 +2921,7 @@ msgstr "Besoins humains et techniques" #: archaeological_files/templates/ishtar/sheet_file.html:283 #: archaeological_files/templates/ishtar/sheet_file.html:335 #: archaeological_files/templates/ishtar/sheet_file.html:387 -#: archaeological_operations/models.py:3289 +#: archaeological_operations/models.py:3288 msgid "Effective" msgstr "Effectif" @@ -3027,16 +3027,16 @@ msgid "Number/street" msgstr "N° / voie" #: archaeological_files_pdl/forms.py:138 archaeological_files_pdl/forms.py:179 -#: archaeological_warehouse/forms.py:241 ishtar_common/forms_common.py:538 -#: ishtar_common/forms_common.py:920 ishtar_common/models_common.py:2847 +#: archaeological_warehouse/forms.py:241 ishtar_common/forms_common.py:540 +#: ishtar_common/forms_common.py:923 ishtar_common/models_common.py:2851 msgid "Postal code" msgstr "Code postal" #: archaeological_files_pdl/forms.py:161 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:10 #: archaeological_warehouse/forms.py:228 archaeological_warehouse/forms.py:237 -#: ishtar_common/forms_common.py:534 ishtar_common/forms_common.py:916 -#: ishtar_common/models_common.py:2842 +#: ishtar_common/forms_common.py:536 ishtar_common/forms_common.py:919 +#: ishtar_common/models_common.py:2846 ishtar_common/models_common.py:3001 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 msgid "Address" msgstr "Adresse" @@ -3132,17 +3132,6 @@ msgstr "Dossier suivi par" msgid ": delay of {} days" msgstr " : délai de {} jours" -#: archaeological_finds/admin.py:36 ishtar_common/models_common.py:2193 -#: ishtar_common/models_common.py:3523 -msgid "Point (2D)" -msgstr "Point (2D)" - -#: archaeological_finds/admin.py:38 archaeological_finds/models_finds.py:439 -#: ishtar_common/templates/blocks/DataTables-stats.html:25 -#: ishtar_common/templates/ishtar/import_step_by_step.html:46 -msgid "Line" -msgstr "Ligne" - #: archaeological_finds/forms.py:178 msgid "Find - 010 - Context record choice" msgstr "Mobilier - 010 - Choix de l'unité d'enregistrement" @@ -3382,7 +3371,6 @@ msgstr "Date de découverte (exacte ou TPQ)" #: archaeological_finds/forms.py:516 archaeological_finds/models_finds.py:424 #: archaeological_finds/templates/ishtar/sheet_basefind.html:33 -#: sra_idf_app/templates/ishtar/sheet_basefind.html:33 msgid "Discovery date (TAQ)" msgstr "Date de découverte (TAQ)" @@ -3534,11 +3522,11 @@ msgstr "Commentaire de conservation" msgid "Find - Quick action - Modify single" msgstr "Mobilier - Action rapide - Modification simple" -#: archaeological_finds/forms.py:995 ishtar_common/forms_common.py:2509 +#: archaeological_finds/forms.py:995 ishtar_common/forms_common.py:2512 msgid "Create" msgstr "Créer" -#: archaeological_finds/forms.py:995 ishtar_common/forms_common.py:2509 +#: archaeological_finds/forms.py:995 ishtar_common/forms_common.py:2512 #: ishtar_common/templates/ishtar/forms/search_query.html:60 msgid "Update" msgstr "Mettre à jour" @@ -3568,7 +3556,7 @@ msgstr "Un libellé est obligatoire." #: archaeological_finds/forms.py:1122 archaeological_finds/forms.py:2109 #: ishtar_common/models.py:1044 ishtar_common/models.py:1941 -#: ishtar_common/models.py:3410 ishtar_common/models_imports.py:145 +#: ishtar_common/models.py:3413 ishtar_common/models_imports.py:145 #: ishtar_common/models_imports.py:646 msgid "Slug" msgstr "Identifiant textuel" @@ -3578,12 +3566,12 @@ msgid "Is public" msgstr "Est public" #: archaeological_finds/forms.py:1128 archaeological_finds/forms.py:2115 -#: archaeological_finds/forms.py:2157 ishtar_common/models.py:3423 +#: archaeological_finds/forms.py:2157 ishtar_common/models.py:3426 msgid "Shared (read) with" msgstr "Partagé (lecture) avec" #: archaeological_finds/forms.py:1135 archaeological_finds/forms.py:2122 -#: archaeological_finds/forms.py:2164 ishtar_common/models.py:3429 +#: archaeological_finds/forms.py:2164 ishtar_common/models.py:3432 msgid "Shared (read/edit) with" msgstr "Partagé (lecture/édition) avec" @@ -3628,7 +3616,6 @@ msgstr "Origine du mobilier" #: archaeological_finds/forms.py:1308 #: archaeological_finds/templates/ishtar/sheet_basefind.html:25 -#: sra_idf_app/templates/ishtar/sheet_basefind.html:25 msgid "Discovery date" msgstr "Date de découverte" @@ -3644,11 +3631,11 @@ msgstr "Mobilier d'origine - ID complet" #: archaeological_operations/forms.py:506 #: archaeological_operations/forms.py:696 #: archaeological_operations/forms.py:790 -#: archaeological_operations/forms.py:1807 -#: archaeological_operations/forms.py:1873 +#: archaeological_operations/forms.py:1803 +#: archaeological_operations/forms.py:1869 #: archaeological_operations/models.py:908 #: archaeological_operations/models.py:996 -#: archaeological_operations/models.py:1293 ishtar_common/models.py:4848 +#: archaeological_operations/models.py:1293 ishtar_common/models.py:4851 #: ishtar_common/models_imports.py:885 msgid "Operation type" msgstr "Type d'opération" @@ -3674,8 +3661,8 @@ msgid "Operation - Name" msgstr "Opération - Nom" #: archaeological_finds/forms.py:1412 archaeological_operations/forms.py:499 -#: archaeological_operations/forms.py:1324 ishtar_common/forms_common.py:1230 -#: ishtar_common/models.py:3095 +#: archaeological_operations/forms.py:1324 ishtar_common/forms_common.py:1233 +#: ishtar_common/models.py:3098 msgid "Areas" msgstr "Zones" @@ -3873,7 +3860,7 @@ msgstr "Traitement - date de clôture avant" #: archaeological_finds/forms.py:1686 archaeological_finds/models_finds.py:1108 #: archaeological_finds/models_finds.py:1868 #: archaeological_finds/templates/ishtar/sheet_find.html:306 -#: ishtar_common/forms_common.py:1676 +#: ishtar_common/forms_common.py:1679 msgid "Reference container" msgstr "Contenant de référence" @@ -3883,7 +3870,7 @@ msgstr "Lieu de conservation du contenant de référence" #: archaeological_finds/forms.py:1712 archaeological_finds/models_finds.py:1107 #: archaeological_finds/templates/ishtar/sheet_find.html:331 -#: ishtar_common/forms_common.py:1668 +#: ishtar_common/forms_common.py:1671 msgid "Current container" msgstr "Contenant actuel" @@ -3935,10 +3922,10 @@ msgstr "Panier de mobilier" #: archaeological_finds/templates/ishtar/sheet_find.html:381 #: archaeological_finds/templates/ishtar/sheet_find.html:419 #: archaeological_finds/templates/ishtar/sheet_find.html:457 -#: ishtar_common/forms_common.py:1610 ishtar_common/models.py:973 -#: ishtar_common/models.py:1731 ishtar_common/models.py:3408 -#: ishtar_common/models_common.py:169 ishtar_common/models_common.py:202 -#: ishtar_common/models_common.py:1931 ishtar_common/models_common.py:1947 +#: ishtar_common/forms_common.py:1613 ishtar_common/models.py:973 +#: ishtar_common/models.py:1731 ishtar_common/models.py:3411 +#: ishtar_common/models_common.py:170 ishtar_common/models_common.py:203 +#: ishtar_common/models_common.py:1932 ishtar_common/models_common.py:1948 #: ishtar_common/models_imports.py:526 msgid "Label" msgstr "Dénomination" @@ -3996,7 +3983,7 @@ msgstr "Une fois validé, cet état n'est pas réversible." #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 #: archaeological_operations/models.py:2356 -#: archaeological_operations/models.py:2693 ishtar_common/views.py:407 +#: archaeological_operations/models.py:2693 ishtar_common/views.py:408 msgid "Treatment" msgstr "Traitement" @@ -4100,7 +4087,7 @@ msgstr "Traitement - 010 - Choix de la demande de traitement" #: archaeological_finds/models_treatments.py:1193 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 #: archaeological_finds/wizards.py:553 archaeological_operations/models.py:2355 -#: archaeological_operations/models.py:2685 ishtar_common/views.py:406 +#: archaeological_operations/models.py:2685 ishtar_common/views.py:407 msgid "Treatment request" msgstr "Demande de traitement" @@ -4129,13 +4116,13 @@ msgstr "Voulez-vous supprimer ce traitement ?" #: archaeological_warehouse/models.py:1157 #: archaeological_warehouse/models.py:1984 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 -#: ishtar_common/forms_common.py:2171 ishtar_common/forms_common.py:2356 +#: ishtar_common/forms_common.py:2174 ishtar_common/forms_common.py:2359 #: ishtar_common/templates/ishtar/sheet_document.html:100 msgid "Container" msgstr "Contenant" #: archaeological_finds/forms_treatments.py:407 -#: ishtar_common/forms_common.py:2363 +#: ishtar_common/forms_common.py:2366 msgid "Change " msgstr "Changer " @@ -4144,12 +4131,12 @@ msgid "reference and current containers" msgstr "le contenant de référence et le contenant actuel" #: archaeological_finds/forms_treatments.py:410 -#: ishtar_common/forms_common.py:2367 +#: ishtar_common/forms_common.py:2370 msgid "the reference container" msgstr "le contenant de référence" #: archaeological_finds/forms_treatments.py:411 -#: ishtar_common/forms_common.py:2368 +#: ishtar_common/forms_common.py:2371 msgid "the current container" msgstr "le contenant actuel" @@ -4203,7 +4190,7 @@ msgid "Treatment file - 001 - Search" msgstr "Dossier de traitement - 001 - Recherche" #: archaeological_finds/forms_treatments.py:687 -#: archaeological_finds/forms_treatments.py:775 ishtar_common/models.py:4089 +#: archaeological_finds/forms_treatments.py:775 ishtar_common/models.py:4092 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:44 msgid "Internal ref." msgstr "Réf. interne" @@ -4325,7 +4312,7 @@ msgid "Treatment one to many - creation" msgstr "Traitement de un à plusieurs - création" #: archaeological_finds/models_finds.py:84 -#: archaeological_operations/models.py:2360 ishtar_common/models.py:3622 +#: archaeological_operations/models.py:2360 ishtar_common/models.py:3625 msgid "Code" msgstr "Code" @@ -4507,12 +4494,18 @@ msgstr "Intérêt spécifique" msgid "Material index" msgstr "Index matériel" +#: archaeological_finds/models_finds.py:439 +#: ishtar_common/templates/blocks/DataTables-stats.html:25 +#: ishtar_common/templates/ishtar/import_step_by_step.html:46 +msgid "Line" +msgstr "Ligne" + #: archaeological_finds/models_finds.py:441 msgid "Short ID" msgstr "Identifiant court" #: archaeological_finds/models_finds.py:445 -#: archaeological_finds/models_finds.py:452 ishtar_common/models.py:4198 +#: archaeological_finds/models_finds.py:452 ishtar_common/models.py:4201 msgid "Cached value - do not edit" msgstr "Valeur en cache - ne pas éditer" @@ -4628,7 +4621,7 @@ msgctxt "key for text search" msgid "code-patriarche" msgstr "code-patriarche" -#: archaeological_finds/models_finds.py:1261 ishtar_common/models.py:3925 +#: archaeological_finds/models_finds.py:1261 ishtar_common/models.py:3928 msgctxt "key for text search" msgid "operation-type" msgstr "type-operation" @@ -4661,8 +4654,8 @@ msgstr "ue-site-nom" #: archaeological_finds/models_finds.py:1288 #: archaeological_finds/models_finds.py:1730 -#: archaeological_warehouse/models.py:956 ishtar_common/models.py:3933 -#: ishtar_common/models.py:4030 +#: archaeological_warehouse/models.py:956 ishtar_common/models.py:3936 +#: ishtar_common/models.py:4033 msgctxt "key for text search" msgid "context-record" msgstr "ue" @@ -4707,7 +4700,7 @@ msgctxt "key for text search" msgid "remarkability" msgstr "remarquabilite" -#: archaeological_finds/models_finds.py:1324 ishtar_common/models.py:3859 +#: archaeological_finds/models_finds.py:1324 ishtar_common/models.py:3862 msgctxt "key for text search" msgid "description" msgstr "description" @@ -4722,7 +4715,7 @@ msgctxt "key for text search" msgid "checked" msgstr "verifie" -#: archaeological_finds/models_finds.py:1335 ishtar_common/models.py:3953 +#: archaeological_finds/models_finds.py:1335 ishtar_common/models.py:3956 msgctxt "key for text search" msgid "container" msgstr "contenant" @@ -4756,7 +4749,7 @@ msgid "last-modified-by" msgstr "modifie-en-dernier-par" #: archaeological_finds/models_finds.py:1362 -#: ishtar_common/models_common.py:1435 +#: ishtar_common/models_common.py:1436 msgctxt "key for text search" msgid "created-by" msgstr "cree-par" @@ -5108,10 +5101,10 @@ msgstr "operateur" #: archaeological_finds/models_finds.py:2345 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 #: archaeological_finds/views.py:1272 archaeological_warehouse/forms.py:685 -#: archaeological_warehouse/views.py:297 ishtar_common/models.py:4068 -#: ishtar_common/models.py:4416 +#: archaeological_warehouse/views.py:297 ishtar_common/models.py:4071 +#: ishtar_common/models.py:4419 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 -#: ishtar_common/views.py:2662 +#: ishtar_common/views.py:2663 msgid "Packaging" msgstr "Conditionnement" @@ -5160,7 +5153,7 @@ msgstr "Ne pas utiliser - Nécessite des évolutions" #: archaeological_finds/models_finds.py:2006 #: archaeological_finds/models_treatments.py:289 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:71 -#: ishtar_common/views.py:1008 ishtar_common/views.py:1087 +#: ishtar_common/views.py:1009 ishtar_common/views.py:1088 msgid "Treatments" msgstr "Traitements" @@ -5224,9 +5217,9 @@ msgid "No container have been set - the localisation cannot be set." msgstr "Aucun contenant n'a été défini - la localisation ne peut être définie." #: archaeological_finds/models_finds.py:3342 ishtar_common/forms_common.py:118 -#: ishtar_common/forms_common.py:2441 ishtar_common/ishtar_menu.py:77 -#: ishtar_common/models.py:2785 ishtar_common/models.py:3114 -#: ishtar_common/models.py:3307 ishtar_common/models.py:3544 +#: ishtar_common/forms_common.py:2444 ishtar_common/ishtar_menu.py:77 +#: ishtar_common/models.py:2788 ishtar_common/models.py:3117 +#: ishtar_common/models.py:3310 ishtar_common/models.py:3547 #: ishtar_common/templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "Personne" @@ -5364,7 +5357,7 @@ msgstr "exposition-termine-apres" #: archaeological_finds/models_treatments.py:1175 #: archaeological_finds/templates/ishtar/sheet_find.html:491 -#: ishtar_common/views.py:1007 ishtar_common/views.py:1080 +#: ishtar_common/views.py:1008 ishtar_common/views.py:1081 msgid "Treatment requests" msgstr "Demandes de traitement" @@ -5419,23 +5412,19 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:10 #: ishtar_common/templates/ishtar/blocks/sheet_external_id.html:3 -#: sra_idf_app/templates/ishtar/sheet_basefind.html:10 msgid "Internal ID" msgstr "ID interne" #: archaeological_finds/templates/ishtar/sheet_basefind.html:28 -#: sra_idf_app/templates/ishtar/sheet_basefind.html:28 msgid "Discovery year" msgstr "Date de découverte" #: archaeological_finds/templates/ishtar/sheet_basefind.html:31 -#: sra_idf_app/templates/ishtar/sheet_basefind.html:31 msgid "Discovery date (TPQ)" msgstr "Date de découverte (TPQ)" #: archaeological_finds/templates/ishtar/sheet_basefind.html:61 #: ishtar_common/forms.py:933 -#: sra_idf_app/templates/ishtar/sheet_basefind.html:57 msgid "Last modified by" msgstr "Modifié en dernier par" @@ -5527,7 +5516,7 @@ msgstr "Demandes de traitements associés" #: archaeological_finds/templates/ishtar/sheet_findbasket.html:24 #: archaeological_warehouse/templates/ishtar/sheet_container.html:31 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:27 -#: ishtar_common/forms_common.py:1854 +#: ishtar_common/forms_common.py:1857 #: ishtar_common/templates/ishtar/sheet_document.html:57 msgid "Content" msgstr "Contenu" @@ -5725,20 +5714,20 @@ msgstr "" "recherche a été épinglée." #: archaeological_operations/forms.py:76 -#: archaeological_operations/models.py:2966 +#: archaeological_operations/models.py:2965 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Section" msgstr "Section" #: archaeological_operations/forms.py:79 -#: archaeological_operations/models.py:2968 +#: archaeological_operations/models.py:2967 msgid "Parcel number" msgstr "Numéro de parcelle" #: archaeological_operations/forms.py:81 -#: archaeological_operations/models.py:2970 -#: archaeological_operations/models.py:2998 -#: archaeological_operations/models.py:3063 +#: archaeological_operations/models.py:2969 +#: archaeological_operations/models.py:2997 +#: archaeological_operations/models.py:3062 msgid "Public domain" msgstr "Domaine public" @@ -5819,7 +5808,7 @@ msgstr "Responsable de suivi scientifique" #: archaeological_operations/forms.py:524 #: archaeological_operations/forms.py:698 #: archaeological_operations/forms.py:834 -#: archaeological_operations/forms.py:1811 +#: archaeological_operations/forms.py:1807 #: archaeological_operations/models.py:1263 msgid "Operator" msgstr "Opérateur" @@ -5885,7 +5874,7 @@ msgstr "Opération virtuelle" #: archaeological_operations/forms.py:569 #: archaeological_operations/forms.py:886 -#: archaeological_operations/forms.py:1819 +#: archaeological_operations/forms.py:1815 #: archaeological_operations/models.py:915 #: archaeological_operations/models.py:1420 msgid "Documentation received" @@ -5901,7 +5890,7 @@ msgstr "Date limite de versement de la documentation après" #: archaeological_operations/forms.py:576 #: archaeological_operations/forms.py:891 -#: archaeological_operations/forms.py:1823 +#: archaeological_operations/forms.py:1819 #: archaeological_operations/models.py:916 #: archaeological_operations/models.py:1425 msgid "Finds received" @@ -5915,7 +5904,7 @@ msgstr "Date limite de versement du mobilier avant" msgid "Finds deadline after" msgstr "Date limite de versement du mobilier après" -#: archaeological_operations/forms.py:666 ishtar_common/models.py:4079 +#: archaeological_operations/forms.py:666 ishtar_common/models.py:4082 msgid "Associated file" msgstr "Dossier associé" @@ -5927,7 +5916,7 @@ msgstr "Début du travail de terrain" msgid "All" msgstr "Tout" -#: archaeological_operations/forms.py:683 ishtar_common/models.py:4903 +#: archaeological_operations/forms.py:683 ishtar_common/models.py:4906 msgid "Research" msgstr "Programmé" @@ -5948,7 +5937,7 @@ msgid "Operation - 010 - General" msgstr "Opération - 010 - Général" #: archaeological_operations/forms.py:792 -#: archaeological_operations/forms.py:1871 +#: archaeological_operations/forms.py:1867 #: archaeological_operations/models.py:1363 msgid "Generic name" msgstr "Nom générique" @@ -5973,8 +5962,8 @@ msgstr "Référence de l'opérateur" #: archaeological_operations/forms.py:856 #: archaeological_operations/forms.py:1445 -#: archaeological_operations/forms.py:1827 -#: archaeological_operations/forms.py:1964 +#: archaeological_operations/forms.py:1823 +#: archaeological_operations/forms.py:1960 #: archaeological_operations/models.py:476 #: archaeological_operations/models.py:1277 msgid "Collaborators" @@ -6146,10 +6135,10 @@ msgstr "Opération - 050 - Parcelles (2)" #: archaeological_operations/forms.py:1195 #: archaeological_operations/forms.py:1314 #: archaeological_operations/forms.py:1430 -#: archaeological_operations/forms.py:1923 +#: archaeological_operations/forms.py:1919 #: archaeological_operations/models.py:453 -#: archaeological_warehouse/models.py:1991 ishtar_common/forms_common.py:1779 -#: ishtar_common/forms_common.py:2065 ishtar_common/forms_common.py:2290 +#: archaeological_warehouse/models.py:1991 ishtar_common/forms_common.py:1782 +#: ishtar_common/forms_common.py:2068 ishtar_common/forms_common.py:2293 #: ishtar_common/models.py:2270 #: ishtar_common/templates/ishtar/sheet_document.html:40 msgid "Reference" @@ -6157,13 +6146,13 @@ msgstr "Référence" #: archaeological_operations/forms.py:1206 #: archaeological_operations/forms.py:1441 -#: archaeological_operations/forms.py:1970 +#: archaeological_operations/forms.py:1966 msgid "Cultural attributions" msgstr "Attributions culturelles" #: archaeological_operations/forms.py:1251 #: archaeological_operations/forms.py:1500 -#: archaeological_operations/forms.py:1943 +#: archaeological_operations/forms.py:1939 msgid "This reference already exists." msgstr "Cette référence existe déjà." @@ -6254,32 +6243,32 @@ msgstr "Sous-marin / subaquatique" msgid "Archaeological site - 030 - Underwater" msgstr "Site archéologique - 030 - Sous-marin / subaquatique" -#: archaeological_operations/forms.py:1598 +#: archaeological_operations/forms.py:1596 #: archaeological_operations/views.py:599 msgid "Administrative act search" msgstr "Rechercher un acte administratif" -#: archaeological_operations/forms.py:1613 -#: archaeological_operations/forms.py:1717 -#: archaeological_operations/forms.py:1784 +#: archaeological_operations/forms.py:1611 +#: archaeological_operations/forms.py:1713 +#: archaeological_operations/forms.py:1780 msgid "You should select an administrative act." msgstr "Vous devez sélectionner un acte administratif." -#: archaeological_operations/forms.py:1623 +#: archaeological_operations/forms.py:1621 #: archaeological_operations/models.py:2661 msgid "Signatory" msgstr "Signataire" -#: archaeological_operations/forms.py:1630 +#: archaeological_operations/forms.py:1628 #: archaeological_operations/models.py:2696 msgid "Signature date" msgstr "Date de signature" -#: archaeological_operations/forms.py:1643 +#: archaeological_operations/forms.py:1639 msgid "Operation - Administrative act - General" msgstr "Opération - Acte administratif - Général" -#: archaeological_operations/forms.py:1677 +#: archaeological_operations/forms.py:1673 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " @@ -6288,48 +6277,48 @@ msgstr "" "Cet index existe déjà pour l'année : %(year)d, utilisez une valeur plus " "grande que %(last_val)d" -#: archaeological_operations/forms.py:1681 +#: archaeological_operations/forms.py:1677 msgid "Bad index" msgstr "Mauvais index" -#: archaeological_operations/forms.py:1694 +#: archaeological_operations/forms.py:1690 msgid "Would you like to delete this administrative act?" msgstr "Voulez-vous supprimer cet acte administratif ?" -#: archaeological_operations/forms.py:1699 ishtar_common/forms.py:1275 +#: archaeological_operations/forms.py:1695 ishtar_common/forms.py:1275 #: ishtar_common/models.py:1944 msgid "Template" msgstr "Patron" +#: archaeological_operations/forms.py:1719 #: archaeological_operations/forms.py:1723 -#: archaeological_operations/forms.py:1727 msgid "This document is not intended for this type of act." msgstr "Ce document n'est pas destiné à ce type d'acte." -#: archaeological_operations/forms.py:1745 +#: archaeological_operations/forms.py:1741 msgid "Doc generation" msgstr "Génération de document" -#: archaeological_operations/forms.py:1747 +#: archaeological_operations/forms.py:1743 msgid "Generate the associated doc?" msgstr "Générer le document associé ?" -#: archaeological_operations/forms.py:1768 +#: archaeological_operations/forms.py:1764 #: archaeological_operations/ishtar_menu.py:112 #: archaeological_operations/views.py:692 msgctxt "admin act register" msgid "Register" msgstr "Registre" -#: archaeological_operations/forms.py:1789 +#: archaeological_operations/forms.py:1785 msgid "Operation - Quick action - Modify" msgstr "Opération - Action rapide - Modification" -#: archaeological_operations/forms.py:1898 +#: archaeological_operations/forms.py:1894 msgid "This code already exists." msgstr "Ce code existe déjà." -#: archaeological_operations/forms.py:1954 +#: archaeological_operations/forms.py:1950 msgid "Archaeological files - Quick action - Modify" msgstr "Dossiers - Action rapide - Modification" @@ -6455,8 +6444,8 @@ msgid "SITE" msgstr "SITE" #: archaeological_operations/models.py:739 ishtar_common/forms.py:1158 -#: ishtar_common/models.py:4974 ishtar_common/models.py:5131 -#: ishtar_common/models.py:5190 ishtar_common/views_item.py:1516 +#: ishtar_common/models.py:4977 ishtar_common/models.py:5134 +#: ishtar_common/models.py:5193 ishtar_common/views_item.py:1515 msgid "Unknown" msgstr "Inconnu" @@ -6618,8 +6607,8 @@ msgctxt "key for text search" msgid "code-drassm" msgstr "code-drassm" -#: archaeological_operations/models.py:1206 ishtar_common/models.py:3949 -#: ishtar_common/models.py:4033 +#: archaeological_operations/models.py:1206 ishtar_common/models.py:3952 +#: ishtar_common/models.py:4036 msgctxt "key for text search" msgid "file" msgstr "dossier" @@ -6650,8 +6639,8 @@ msgstr "Nom du protagoniste" #: archaeological_operations/models.py:1483 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:8 #: archaeological_operations/templates/ishtar/sheet_site.html:87 -#: ishtar_common/models.py:1001 ishtar_common/views.py:1001 -#: ishtar_common/views.py:1068 +#: ishtar_common/models.py:1001 ishtar_common/views.py:1002 +#: ishtar_common/views.py:1069 msgid "Operations" msgstr "Opérations" @@ -6883,67 +6872,67 @@ msgstr "dossier-traitement-type" msgid "Archaeological preventive operator" msgstr "Opérateur d'archéologie préventive" -#: archaeological_operations/models.py:2707 +#: archaeological_operations/models.py:2706 msgid "Cached values get from associated departments" msgstr "Valeur en cache des départements associés" -#: archaeological_operations/models.py:2713 +#: archaeological_operations/models.py:2712 msgid "Cached values get from associated towns" msgstr "Valeur en cache des communes associées" -#: archaeological_operations/models.py:2887 +#: archaeological_operations/models.py:2886 msgid "This index already exists for this year" msgstr "Cet index existe déjà pour cette année" -#: archaeological_operations/models.py:2977 +#: archaeological_operations/models.py:2976 msgid "Address - Locality" msgstr "Adresse - Lieu-dit" -#: archaeological_operations/models.py:3224 ishtar_common/models.py:3418 +#: archaeological_operations/models.py:3223 ishtar_common/models.py:3421 msgid "Owner" msgstr "Propriétaire" -#: archaeological_operations/models.py:3239 +#: archaeological_operations/models.py:3238 msgid "Parcel owner" msgstr "Propriétaire de parcelle" -#: archaeological_operations/models.py:3240 +#: archaeological_operations/models.py:3239 msgid "Parcel owners" msgstr "Propriétaires de parcelle" -#: archaeological_operations/models.py:3288 +#: archaeological_operations/models.py:3287 msgid "Recorded" msgstr "Enregistré" -#: archaeological_operations/models.py:3290 +#: archaeological_operations/models.py:3289 msgid "Active" msgstr "Actif" -#: archaeological_operations/models.py:3291 +#: archaeological_operations/models.py:3290 msgid "Field completed" msgstr "Terrain achevé" -#: archaeological_operations/models.py:3292 +#: archaeological_operations/models.py:3291 msgid "Associated report" msgstr "Rapport associé" -#: archaeological_operations/models.py:3293 +#: archaeological_operations/models.py:3292 msgid "Closed" msgstr "Clos" -#: archaeological_operations/models.py:3294 +#: archaeological_operations/models.py:3293 msgid "Documented and closed" msgstr "Documenté et clos" -#: archaeological_operations/models.py:3793 ishtar_common/models.py:4844 +#: archaeological_operations/models.py:3792 ishtar_common/models.py:4847 msgid "Is preventive" msgstr "Est du préventif" -#: archaeological_operations/models.py:3796 +#: archaeological_operations/models.py:3795 msgid "Operation type old" msgstr "Type d'opération - ancien" -#: archaeological_operations/models.py:3797 +#: archaeological_operations/models.py:3796 msgid "Operation types old" msgstr "Types d'opération - ancien" @@ -7131,8 +7120,8 @@ msgstr "Sites / parcelles / actes administratifs" #: archaeological_operations/templates/ishtar/sheet_operation.html:81 #: archaeological_operations/templates/ishtar/sheet_operation.html:401 #: archaeological_operations/templates/ishtar/sheet_operation.html:499 -#: ishtar_common/models.py:1001 ishtar_common/views.py:1003 -#: ishtar_common/views.py:1073 +#: ishtar_common/models.py:1001 ishtar_common/views.py:1004 +#: ishtar_common/views.py:1074 msgid "Context records" msgstr "Unités d'Enregistrement" @@ -7265,7 +7254,7 @@ msgstr "" "Ces modèles de recherche n'ont pas été touvées : {missing_search_models}. " "Pas la même version d'Ishtar ?" -#: archaeological_operations/tests.py:4724 ishtar_common/admin.py:2271 +#: archaeological_operations/tests.py:4724 ishtar_common/admin.py:2276 #, python-brace-format msgid "" "Theses types have not been found: {missing_types}. Not the same Ishtar " @@ -7278,7 +7267,7 @@ msgstr "" msgid "{result['deleted']} matches deleted" msgstr "{result['deleted']} correspondances supprimées" -#: archaeological_operations/tests.py:4803 ishtar_common/admin.py:2349 +#: archaeological_operations/tests.py:4803 ishtar_common/admin.py:2354 msgid "{result['updated']} match key(s) updated." msgstr "{result['updated']} clé(s) de correspondance mises à jour." @@ -7360,8 +7349,8 @@ msgstr "" #: archaeological_warehouse/models.py:400 #: archaeological_warehouse/models.py:889 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:4 -#: ishtar_common/forms_common.py:1859 ishtar_common/models.py:5067 -#: ishtar_common/views.py:402 +#: ishtar_common/forms_common.py:1862 ishtar_common/models.py:5070 +#: ishtar_common/views.py:403 msgid "Warehouse" msgstr "Lieu de conservation" @@ -7426,30 +7415,32 @@ msgstr "" "l'organisation. Si une nouvelle organisation est créée depuis ce lieu de " "conservation, les champs suivants sont utilisés pour cette organisation." -#: archaeological_warehouse/forms.py:239 ishtar_common/forms_common.py:536 -#: ishtar_common/forms_common.py:918 ishtar_common/models_common.py:2844 +#: archaeological_warehouse/forms.py:239 ishtar_common/forms_common.py:538 +#: ishtar_common/forms_common.py:921 ishtar_common/models_common.py:2848 +#: ishtar_common/models_common.py:3006 msgid "Address complement" msgstr "Complément d'adresse" -#: archaeological_warehouse/forms.py:242 ishtar_common/forms_common.py:539 -#: ishtar_common/forms_common.py:921 ishtar_common/models_common.py:2849 +#: archaeological_warehouse/forms.py:242 ishtar_common/forms_common.py:541 +#: ishtar_common/forms_common.py:924 ishtar_common/models_common.py:2853 msgid "Town (freeform)" msgstr "Commune (saisie libre)" -#: archaeological_warehouse/forms.py:244 ishtar_common/forms_common.py:541 -#: ishtar_common/forms_common.py:923 ishtar_common/models_common.py:2857 +#: archaeological_warehouse/forms.py:244 ishtar_common/forms_common.py:543 +#: ishtar_common/forms_common.py:926 ishtar_common/models_common.py:2861 msgid "Country" msgstr "Pays" -#: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:543 -#: ishtar_common/forms_common.py:894 ishtar_common/models_common.py:2871 +#: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:545 +#: ishtar_common/forms_common.py:897 ishtar_common/models_common.py:2875 +#: ishtar_common/models_common.py:3018 #: ishtar_common/templates/ishtar/sheet_person.html:27 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:34 msgid "Phone" msgstr "Téléphone" -#: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:545 -#: ishtar_common/forms_common.py:904 ishtar_common/models_common.py:2887 +#: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:547 +#: ishtar_common/forms_common.py:907 ishtar_common/models_common.py:2891 #: ishtar_common/templates/ishtar/sheet_person.html:45 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:55 msgid "Mobile phone" @@ -7760,7 +7751,7 @@ msgctxt "key for text search" msgid "find-label" msgstr "mobilier-ID-libre" -#: archaeological_warehouse/models.py:964 ishtar_common/models.py:3945 +#: archaeological_warehouse/models.py:964 ishtar_common/models.py:3948 msgctxt "key for text search" msgid "find-denomination" msgstr "mobilier-denomination" @@ -7824,8 +7815,8 @@ msgstr "Localisation - en cache" msgid "Cached division" msgstr "Division mise en cache" -#: archaeological_warehouse/models.py:1121 ishtar_common/models.py:4180 -#: ishtar_common/models.py:4184 +#: archaeological_warehouse/models.py:1121 ishtar_common/models.py:4183 +#: ishtar_common/models.py:4187 msgid "Container ID" msgstr "ID contenant" @@ -8073,17 +8064,17 @@ msgstr "courriel" msgid "warehouse" msgstr "depot" -#: example_project/__init__.py:13 ishtar_common/views.py:245 -#: ishtar_common/views.py:957 +#: example_project/__init__.py:13 ishtar_common/views.py:246 +#: ishtar_common/views.py:958 msgid "New organization" msgstr "Ajouter une organisation" -#: example_project/__init__.py:14 ishtar_common/views.py:187 -#: ishtar_common/views.py:950 ishtar_common/views.py:954 +#: example_project/__init__.py:14 ishtar_common/views.py:188 +#: ishtar_common/views.py:951 ishtar_common/views.py:955 msgid "New person" msgstr "Ajouter une personne" -#: example_project/__init__.py:15 ishtar_common/views.py:963 +#: example_project/__init__.py:15 ishtar_common/views.py:964 msgid "New author" msgstr "Nouvel auteur" @@ -8119,7 +8110,7 @@ msgstr "Fusionner dans" msgid "Merge selected items" msgstr "Fusionner les éléments sélectionnés" -#: ishtar_common/admin.py:334 ishtar_common/forms_common.py:663 +#: ishtar_common/admin.py:334 ishtar_common/forms_common.py:666 msgid "At least two items have to be selected." msgstr "Au moins deux éléments doivent être sélectionnés." @@ -8140,44 +8131,44 @@ msgstr "Modifier le parent des éléments sélectionnés" msgid "{} parent(s) were changed to {}." msgstr "{} parent(s) a/ont été changé(s) en {}." -#: ishtar_common/admin.py:485 ishtar_common/models.py:1417 +#: ishtar_common/admin.py:490 ishtar_common/models.py:1417 msgid "Maps - default center" msgstr "Cartes - centre par défaut" -#: ishtar_common/admin.py:536 ishtar_common/models.py:979 +#: ishtar_common/admin.py:541 ishtar_common/models.py:979 #: ishtar_common/templates/navbar.html:31 msgid "Profile" msgstr "Profil" -#: ishtar_common/admin.py:537 ishtar_common/forms_common.py:1226 -#: ishtar_common/forms_common.py:1261 ishtar_common/forms_common.py:1262 -#: ishtar_common/models.py:2895 +#: ishtar_common/admin.py:542 ishtar_common/forms_common.py:1229 +#: ishtar_common/forms_common.py:1264 ishtar_common/forms_common.py:1265 +#: ishtar_common/models.py:2898 msgid "Profiles" msgstr "Profils" -#: ishtar_common/admin.py:632 +#: ishtar_common/admin.py:637 msgid "The CSV file should at least have a {} column" msgstr "Le fichier CSV doit avoir au minimum une colonne {}" -#: ishtar_common/admin.py:699 ishtar_common/admin.py:929 +#: ishtar_common/admin.py:704 ishtar_common/admin.py:934 #, python-format msgid "%d item(s) created." msgstr "%d élément(s) créés." -#: ishtar_common/admin.py:701 ishtar_common/admin.py:933 +#: ishtar_common/admin.py:706 ishtar_common/admin.py:938 #, python-format msgid "%d item(s) updated." msgstr "%d élément(s) mis à jour." -#: ishtar_common/admin.py:705 +#: ishtar_common/admin.py:710 msgid "These parents are missing: {}" msgstr "Ces parents sont manquants : {}" -#: ishtar_common/admin.py:725 +#: ishtar_common/admin.py:730 msgid "Geojson file" msgstr "Fichier GeoJSON" -#: ishtar_common/admin.py:727 +#: ishtar_common/admin.py:732 msgid "" "Only unicode encoding is managed - convert your file first. The file must be " "a geojson file or a zip containing a geojson file." @@ -8185,257 +8176,257 @@ msgstr "" "Seul l'unicode est géré - convertissez votre fichier d'abord. Le fichier " "doit être un fichier GeoJSON ou une archive ZIP contenant un fichier GeoJSON." -#: ishtar_common/admin.py:733 +#: ishtar_common/admin.py:738 msgid "Prefix for numero INSEE" msgstr "Préfixe pour le numéro INSEE" -#: ishtar_common/admin.py:736 +#: ishtar_common/admin.py:741 msgid "Field name for numero INSEE" msgstr "Nom du champ pour le numéro INSEE" -#: ishtar_common/admin.py:739 +#: ishtar_common/admin.py:744 msgid "Field name for name" msgstr "Nom du champ pour le nom" -#: ishtar_common/admin.py:741 +#: ishtar_common/admin.py:746 msgid "m2" msgstr "m2" -#: ishtar_common/admin.py:741 +#: ishtar_common/admin.py:746 msgid "km2" msgstr "km2" -#: ishtar_common/admin.py:742 +#: ishtar_common/admin.py:747 msgid "Surface unit" msgstr "Unité de surface" -#: ishtar_common/admin.py:744 +#: ishtar_common/admin.py:749 msgid "Field name for surface" msgstr "Nom du champ pour la surface" -#: ishtar_common/admin.py:747 +#: ishtar_common/admin.py:752 msgid "Field name for year" msgstr "Nom du champ pour l'année" -#: ishtar_common/admin.py:751 +#: ishtar_common/admin.py:756 msgid "Not required for new town. Leave it empty when not available." msgstr "" "Non requis pour les nouvelles communes. À laisser vide quand cela n'est pas " "disponible." -#: ishtar_common/admin.py:754 +#: ishtar_common/admin.py:759 msgid "Update only geometry of existing towns" msgstr "Mettre à jour seulement la géométrie pour les communes existantes" -#: ishtar_common/admin.py:773 +#: ishtar_common/admin.py:778 msgid "\"{}\" not found in feature {}" msgstr "\"{}\" non trouvé sur l'entité {}" -#: ishtar_common/admin.py:786 +#: ishtar_common/admin.py:791 msgid "\"{}\" not found in properties of feature {}" msgstr "\"{}\" non trouvé dans les propriétés de l'entité {}" -#: ishtar_common/admin.py:799 +#: ishtar_common/admin.py:804 msgid "Bad geometry for feature {}" msgstr "Mauvaise géométrie pour l'entité {}" -#: ishtar_common/admin.py:810 +#: ishtar_common/admin.py:815 msgid "Geometry {} not managed for towns - feature {}" msgstr "Géométrie {} non gérée pour les communes - entité {}" -#: ishtar_common/admin.py:820 +#: ishtar_common/admin.py:825 msgid "Bad value for surface: {} - feature {}" msgstr "Mauvaise valeur pour la surface : {} - entité {}" -#: ishtar_common/admin.py:864 +#: ishtar_common/admin.py:869 msgid "No json file found in zipfile" msgstr "Pas de fichier JSON trouvé dans le fichier ZIP" -#: ishtar_common/admin.py:887 +#: ishtar_common/admin.py:892 msgid "Bad geojson file" msgstr "Mauvais fichier GeoJSON" -#: ishtar_common/admin.py:899 +#: ishtar_common/admin.py:904 msgid "Too many errors..." msgstr "Trop d'erreurs..." -#: ishtar_common/admin.py:952 +#: ishtar_common/admin.py:957 msgid "Zipped JSON file" msgstr "Fichier JSON zippé" -#: ishtar_common/admin.py:953 +#: ishtar_common/admin.py:958 msgid "Import from a zipped JSON file generated by Ishtar" msgstr "Import depuis un fichier JSON zippé généré par Ishtar" -#: ishtar_common/admin.py:989 +#: ishtar_common/admin.py:994 msgid "{} {}(s) created/updated." msgstr "{} {}(s) crées/mis à jour." -#: ishtar_common/admin.py:1012 +#: ishtar_common/admin.py:1017 msgid "Center" msgstr "Centre" -#: ishtar_common/admin.py:1013 ishtar_common/models_common.py:2636 +#: ishtar_common/admin.py:1018 ishtar_common/models_common.py:2637 msgid "Limit" msgstr "Limite" -#: ishtar_common/admin.py:1021 +#: ishtar_common/admin.py:1026 msgid "Parents" msgstr "Parents" -#: ishtar_common/admin.py:1062 ishtar_common/admin.py:1503 +#: ishtar_common/admin.py:1067 ishtar_common/admin.py:1508 msgid "Make available" msgstr "Rendre disponible" -#: ishtar_common/admin.py:1063 ishtar_common/admin.py:1504 +#: ishtar_common/admin.py:1068 ishtar_common/admin.py:1509 msgid "Make unavailable" msgstr "Rendre indisponible" -#: ishtar_common/admin.py:1187 +#: ishtar_common/admin.py:1192 msgid "Department number" msgstr "Numéro de département" -#: ishtar_common/admin.py:1188 +#: ishtar_common/admin.py:1193 msgid "Area name" msgstr "Nom de zone" -#: ishtar_common/admin.py:1202 +#: ishtar_common/admin.py:1207 msgid "Choose an area or set an area reference." msgstr "Choisissez une zone ou définissez une zone de référence." -#: ishtar_common/admin.py:1209 +#: ishtar_common/admin.py:1214 msgid "Invalid department number." msgstr "Numéro de département non valide." -#: ishtar_common/admin.py:1218 +#: ishtar_common/admin.py:1223 msgid "This name is already used by another area." msgstr "Ce nom est déjà utilisé par une autre zone." -#: ishtar_common/admin.py:1246 +#: ishtar_common/admin.py:1251 msgid "Area \"{}\" created." msgstr "Zone \"{}\" créée." -#: ishtar_common/admin.py:1263 +#: ishtar_common/admin.py:1268 msgid "{} town(s) added to \"{}\"." msgstr "{} commune(s) ajoutée(s) à \"{}\"." -#: ishtar_common/admin.py:1435 +#: ishtar_common/admin.py:1440 msgid "{} importer type(s) duplicated: {}." msgstr "{} type(s) d''importeur dupliqué(s) : {}." -#: ishtar_common/admin.py:1456 +#: ishtar_common/admin.py:1461 msgid "Select only one importer." msgstr "Sélectionner seulement un importeur." -#: ishtar_common/admin.py:1486 +#: ishtar_common/admin.py:1491 msgid "Export as libreoffice template" msgstr "Exporter comme un patron libreoffice" -#: ishtar_common/admin.py:1555 +#: ishtar_common/admin.py:1560 msgid "{} importer column(s) duplicated: {}." msgstr "{} colonne(s) dupliquée(s) : {}." -#: ishtar_common/admin.py:1586 +#: ishtar_common/admin.py:1591 msgid "{} importer column(s) right-shifted." msgstr "{} colonne(s) décalée(s) à droite." -#: ishtar_common/admin.py:1599 +#: ishtar_common/admin.py:1604 msgid "Shift right" msgstr "Décaler à droite" -#: ishtar_common/admin.py:1626 +#: ishtar_common/admin.py:1631 msgid "{} importer column(s) left-shifted." msgstr "{} colonne(s) décalée(s) à gauche." -#: ishtar_common/admin.py:1633 +#: ishtar_common/admin.py:1638 msgid "{} importer column(s) not left-shifted: no place available." msgstr "" "{} colonne(s) n''ont pas été décalée(s) à gauche : pas de place disponible." -#: ishtar_common/admin.py:1647 +#: ishtar_common/admin.py:1652 msgid "Shift left" msgstr "Décaler à gauche" -#: ishtar_common/admin.py:1682 +#: ishtar_common/admin.py:1687 msgid "Importer available" msgstr "Importeur disponible" -#: ishtar_common/admin.py:1827 +#: ishtar_common/admin.py:1832 msgid "Display selected" msgstr "Afficher les éléments sélectionnés" -#: ishtar_common/admin.py:1828 +#: ishtar_common/admin.py:1833 msgid "Hide selected" msgstr "Cacher les éléments sélectionnés" -#: ishtar_common/admin.py:1858 ishtar_common/models.py:1553 +#: ishtar_common/admin.py:1863 ishtar_common/models.py:1553 msgid "Form" msgstr "Formulaire" -#: ishtar_common/admin.py:1879 ishtar_common/models.py:1694 +#: ishtar_common/admin.py:1884 ishtar_common/models.py:1694 msgid "Field" msgstr "Champ" -#: ishtar_common/admin.py:2009 ishtar_common/admin.py:2061 +#: ishtar_common/admin.py:2014 ishtar_common/admin.py:2066 msgid "Select only one task." msgstr "Sélectionner seulement une seule tâche." -#: ishtar_common/admin.py:2016 +#: ishtar_common/admin.py:2021 msgid "Export already exported/scheduled." msgstr "Export déjà réalisé/planifié." -#: ishtar_common/admin.py:2028 +#: ishtar_common/admin.py:2033 msgid "Launch export" msgstr "Lancer l'export" -#: ishtar_common/admin.py:2068 +#: ishtar_common/admin.py:2073 msgid "Import already imported/scheduled." msgstr "Import déjà réalisé/planifié." -#: ishtar_common/admin.py:2080 ishtar_common/models_imports.py:1353 +#: ishtar_common/admin.py:2085 ishtar_common/models_imports.py:1353 msgid "Launch import" msgstr "Lancer l'import" -#: ishtar_common/admin.py:2150 ishtar_common/models.py:976 +#: ishtar_common/admin.py:2155 ishtar_common/models.py:976 msgid "Content type" msgstr "Type de contenu" -#: ishtar_common/admin.py:2182 ishtar_common/admin.py:2292 -#: ishtar_common/admin.py:2328 +#: ishtar_common/admin.py:2187 ishtar_common/admin.py:2297 +#: ishtar_common/admin.py:2333 msgid "Select only one source." msgstr "Sélectionner une seule source." -#: ishtar_common/admin.py:2203 +#: ishtar_common/admin.py:2208 msgid "Timeout: failed to join {}." msgstr "Temps expiré : échec pour joindre {}" -#: ishtar_common/admin.py:2211 +#: ishtar_common/admin.py:2216 msgid "" "Bad response for {} - {}. Response status code {} != 200. Check your key?" msgstr "" "Mauvaise réponse pour {} - {}. Code de réponse {} != 200. Vérifiez votre " "clé ?" -#: ishtar_common/admin.py:2221 +#: ishtar_common/admin.py:2226 msgid "Response of {} is not a valid JSON message." msgstr "La réponse de {} n'est pas un message JSON valide." -#: ishtar_common/admin.py:2239 +#: ishtar_common/admin.py:2244 #, python-brace-format msgid "{created} matches created" msgstr "{created} correspondances créées" -#: ishtar_common/admin.py:2245 +#: ishtar_common/admin.py:2250 #, python-brace-format msgid "{updated} matches updated" msgstr "{updated} correspondances mises à jour" -#: ishtar_common/admin.py:2251 +#: ishtar_common/admin.py:2256 #, python-brace-format msgid "{deleted} matches deleted" msgstr "{deleted} correspondances supprimés" -#: ishtar_common/admin.py:2260 +#: ishtar_common/admin.py:2265 #, python-brace-format msgid "" "Theses search models have not been found: {missing_models}. Not the same " @@ -8444,43 +8435,43 @@ msgstr "" "Ces modèles de recherche n'ont pas été trouvés : {missing_models}. Pas la " "même version d'Ishtar ?" -#: ishtar_common/admin.py:2278 +#: ishtar_common/admin.py:2283 msgid "Update types from source" msgstr "Mettre à jour les types depuis la source" -#: ishtar_common/admin.py:2313 +#: ishtar_common/admin.py:2318 msgid "Generate match document" msgstr "Générer le document de correspondance" -#: ishtar_common/admin.py:2337 +#: ishtar_common/admin.py:2342 msgid "Error on update. Cannot open match document." msgstr "" "Erreur lors de la mise à jour. Le document de correspondance ne peut être " "ouvert." -#: ishtar_common/admin.py:2342 +#: ishtar_common/admin.py:2347 msgid "Error on type update from match document:" msgstr "" "Erreur lors de la mise à jour des types depuis le document de correspondance." -#: ishtar_common/admin.py:2355 +#: ishtar_common/admin.py:2360 msgid "Update association from match document" msgstr "Mettre à jour les associations depuis un document de correspondance" -#: ishtar_common/admin.py:2388 +#: ishtar_common/admin.py:2393 msgid "Enable match" msgstr "Activer la correspondance" -#: ishtar_common/admin.py:2389 +#: ishtar_common/admin.py:2394 msgid "Disable match" msgstr "Désactiver la correspondance" -#: ishtar_common/admin.py:2399 ishtar_common/models_rest.py:70 +#: ishtar_common/admin.py:2404 ishtar_common/models_rest.py:70 msgid "API - Remote access - Search model" msgstr "API - Accès distant - Modèle de recherche" -#: ishtar_common/admin.py:2402 ishtar_common/models.py:449 -#: ishtar_common/models.py:732 ishtar_common/models_common.py:806 +#: ishtar_common/admin.py:2407 ishtar_common/models.py:449 +#: ishtar_common/models.py:732 ishtar_common/models_common.py:807 #: ishtar_common/models_imports.py:794 ishtar_common/models_rest.py:95 #: ishtar_common/templates/ishtar/formset_import_match.html:44 #: ishtar_common/templates/ishtar/import_step_by_step.html:171 @@ -8490,15 +8481,15 @@ msgstr "API - Accès distant - Modèle de recherche" msgid "Key" msgstr "Clé" -#: ishtar_common/admin.py:2404 +#: ishtar_common/admin.py:2409 msgid "Save first to choose a key" msgstr "Enregistrer d'abord pour choisir une clé" -#: ishtar_common/admin.py:2434 +#: ishtar_common/admin.py:2439 msgid "Available keys: " msgstr "Clés disponibles : " -#: ishtar_common/admin.py:2467 +#: ishtar_common/admin.py:2472 msgid "" "Only one type of geographic data is accepted. Create different objects if " "you have many." @@ -8506,7 +8497,7 @@ msgstr "" "Seul un type de données géographique est accepté. Créez différents objets si " "vous en avez plusieurs." -#: ishtar_common/admin.py:2475 +#: ishtar_common/admin.py:2480 msgid "You cannot set only x or only y coordinate." msgstr "Vous ne pouvez pas seulement renseigner une coordonnée x ou y." @@ -8610,7 +8601,7 @@ msgstr "" msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d" msgstr "Trop de colonnes (%(user_col)d). Le maximum est %(ref_col)d" -#: ishtar_common/data_importer.py:854 ishtar_common/views.py:1618 +#: ishtar_common/data_importer.py:854 ishtar_common/views.py:1619 msgid "No data provided" msgstr "Aucune donnée fournie" @@ -8650,8 +8641,8 @@ msgstr "" "Objet lié non trouvé. Création de l'élément géographique impossible. " "Contexte {}." -#: ishtar_common/data_importer.py:1551 ishtar_common/views.py:1696 -#: ishtar_common/views.py:1706 +#: ishtar_common/data_importer.py:1551 ishtar_common/views.py:1697 +#: ishtar_common/views.py:1707 msgid "Not imported" msgstr "Non importé" @@ -8734,8 +8725,8 @@ msgstr "Entrez un nom correct composé de lettres, espaces et tirets." msgid "File too large. Size should not exceed {} Mo." msgstr "Fichier trop gros. La taille ne doit pas excéder {} Mo." -#: ishtar_common/forms.py:112 ishtar_common/forms_common.py:1268 -#: ishtar_common/views.py:2585 +#: ishtar_common/forms.py:112 ishtar_common/forms_common.py:1271 +#: ishtar_common/views.py:2586 msgid "Confirm" msgstr "Confirmer" @@ -8767,7 +8758,7 @@ msgstr "Modifié après" msgid "Is locked?" msgstr "Est verrouillé ?" -#: ishtar_common/forms.py:971 ishtar_common/forms_common.py:2106 +#: ishtar_common/forms.py:971 ishtar_common/forms_common.py:2109 msgid "Has an image?" msgstr "A une image ?" @@ -8812,20 +8803,20 @@ msgstr "" "<p class='example'>Par exemple tapez « saint denis 93 » pour obtenir la " "commune Saint-Denis dans le département français de Seine-Saint-Denis.</p>" -#: ishtar_common/forms_common.py:169 ishtar_common/forms_common.py:257 +#: ishtar_common/forms_common.py:169 ishtar_common/forms_common.py:255 msgid "Associated images (web link to a zip file)" msgstr "Images associées (lien web vers un fichier zip)" -#: ishtar_common/forms_common.py:192 ishtar_common/forms_common.py:276 +#: ishtar_common/forms_common.py:191 ishtar_common/forms_common.py:273 msgid "Import (table)" msgstr "Import (table)" -#: ishtar_common/forms_common.py:236 +#: ishtar_common/forms_common.py:234 msgid "This is not a valid CSV file. Check file format and encoding." msgstr "" "Cela n’est pas un CSV valide. Vérifiez le format de fichier et le codage." -#: ishtar_common/forms_common.py:248 +#: ishtar_common/forms_common.py:246 msgid "" "This import type have no unicity type defined. Conservative import is not " "possible." @@ -8833,35 +8824,35 @@ msgstr "" "Cet import n'a pas de clé d'unicité paramétrée. L'import conservateur n'est " "pas possible." -#: ishtar_common/forms_common.py:284 +#: ishtar_common/forms_common.py:281 msgid "You put either a file or a download link for images but not both." msgstr "" "Vous devez soit déposer un fichier soit renseigner un lien pour les images " "mais pas les deux." -#: ishtar_common/forms_common.py:295 ishtar_common/tests.py:2524 +#: ishtar_common/forms_common.py:292 ishtar_common/tests.py:2533 msgid "\"Associated images\" field must be a valid zip file." msgstr "Le champ « images associées » doit être un fichier zip valide." -#: ishtar_common/forms_common.py:307 +#: ishtar_common/forms_common.py:304 msgid "Invalid link or no file is available for this link." msgstr "Lien invalide ou aucun fichier n'est disponible sur ce lien." -#: ishtar_common/forms_common.py:349 +#: ishtar_common/forms_common.py:347 msgid "Import (GIS)" msgstr "Import (GIS)" -#: ishtar_common/forms_common.py:370 +#: ishtar_common/forms_common.py:372 msgid "GIS file must be a zip containing a ShapeFile or GeoPackage file." msgstr "" "Le fichier SIG doit être un fichier zip contenant un Shapefile ou un fichier " "Geopackage." -#: ishtar_common/forms_common.py:393 +#: ishtar_common/forms_common.py:395 msgid "Target" msgstr "Cible" -#: ishtar_common/forms_common.py:394 ishtar_common/models.py:1756 +#: ishtar_common/forms_common.py:396 ishtar_common/models.py:1756 #: ishtar_common/models_imports.py:795 #: ishtar_common/templates/ishtar/formset_import_match.html:45 #: ishtar_common/templates/ishtar/import_step_by_step.html:172 @@ -8870,199 +8861,205 @@ msgstr "Cible" msgid "Value" msgstr "Valeur" -#: ishtar_common/forms_common.py:395 +#: ishtar_common/forms_common.py:397 msgid "Remember" msgstr "Enregistrer" -#: ishtar_common/forms_common.py:420 +#: ishtar_common/forms_common.py:422 msgid "Set to NULL" msgstr "Mettre à la valeur NULL" -#: ishtar_common/forms_common.py:427 +#: ishtar_common/forms_common.py:429 msgid "this import only" msgstr "cet import seulement" -#: ishtar_common/forms_common.py:428 +#: ishtar_common/forms_common.py:430 msgid "me" msgstr "moi" -#: ishtar_common/forms_common.py:441 +#: ishtar_common/forms_common.py:443 msgid "the current group: {}" msgstr "le groupe actuel {}" -#: ishtar_common/forms_common.py:447 +#: ishtar_common/forms_common.py:449 msgid "all users" msgstr "tous les utilisateurs" -#: ishtar_common/forms_common.py:526 ishtar_common/forms_common.py:637 +#: ishtar_common/forms_common.py:528 ishtar_common/forms_common.py:640 #: ishtar_common/models.py:2411 ishtar_common/models_imports.py:871 #: ishtar_common/models_imports.py:872 msgid "Organization type" msgstr "Type d'organisation" -#: ishtar_common/forms_common.py:527 ishtar_common/forms_common.py:2071 -#: ishtar_common/models.py:2479 +#: ishtar_common/forms_common.py:529 ishtar_common/forms_common.py:2074 +#: ishtar_common/models.py:2486 msgid "Web address" msgstr "Adresse web" -#: ishtar_common/forms_common.py:529 ishtar_common/forms_common.py:640 +#: ishtar_common/forms_common.py:531 ishtar_common/forms_common.py:643 #: ishtar_common/models.py:2387 ishtar_common/models.py:2404 -#: ishtar_common/models.py:2481 +#: ishtar_common/models.py:2488 msgid "Grammatical gender" msgstr "Genre grammatical" -#: ishtar_common/forms_common.py:532 ishtar_common/forms_common.py:643 +#: ishtar_common/forms_common.py:534 ishtar_common/forms_common.py:646 msgid "Can be used by templates" msgstr "Peut être utilisé par les patrons" -#: ishtar_common/forms_common.py:542 ishtar_common/forms_common.py:763 -#: ishtar_common/forms_common.py:890 ishtar_common/forms_common.py:981 -#: ishtar_common/forms_common.py:1148 ishtar_common/models_common.py:2889 -#: ishtar_common/wizards.py:1931 +#: ishtar_common/forms_common.py:544 ishtar_common/forms_common.py:766 +#: ishtar_common/forms_common.py:893 ishtar_common/forms_common.py:984 +#: ishtar_common/forms_common.py:1151 ishtar_common/models_common.py:2893 +#: ishtar_common/models_common.py:3028 ishtar_common/wizards.py:1931 msgid "Email" msgstr "Courriel" -#: ishtar_common/forms_common.py:594 ishtar_common/forms_common.py:610 -#: ishtar_common/views.py:236 +#: ishtar_common/forms_common.py:597 ishtar_common/forms_common.py:613 +#: ishtar_common/views.py:237 msgid "Organization search" msgstr "Rechercher une organisation" -#: ishtar_common/forms_common.py:627 +#: ishtar_common/forms_common.py:630 msgid "Organization - Quick action - Modify" msgstr "Organisation - Action rapide - Modification" -#: ishtar_common/forms_common.py:680 +#: ishtar_common/forms_common.py:683 msgid "Merge all items into" msgstr "Fusionner tous les éléments dans" -#: ishtar_common/forms_common.py:718 +#: ishtar_common/forms_common.py:721 msgid "Organization to merge" msgstr "Organisation à fusionner" -#: ishtar_common/forms_common.py:762 ishtar_common/forms_common.py:886 -#: ishtar_common/forms_common.py:980 ishtar_common/models.py:2755 +#: ishtar_common/forms_common.py:765 ishtar_common/forms_common.py:889 +#: ishtar_common/forms_common.py:983 ishtar_common/models.py:2758 #: ishtar_common/templates/ishtar/sheet_organization.html:26 msgid "Surname" msgstr "Prénom" -#: ishtar_common/forms_common.py:781 ishtar_common/forms_common.py:797 -#: ishtar_common/forms_common.py:956 ishtar_common/views.py:177 +#: ishtar_common/forms_common.py:784 ishtar_common/forms_common.py:800 +#: ishtar_common/forms_common.py:959 ishtar_common/views.py:178 msgid "Person search" msgstr "Rechercher une personne" -#: ishtar_common/forms_common.py:815 +#: ishtar_common/forms_common.py:818 msgid "Person - Quick action - Modify" msgstr "Personne - Action rapide - Modification" -#: ishtar_common/forms_common.py:826 ishtar_common/forms_common.py:883 -#: ishtar_common/forms_common.py:1653 ishtar_common/forms_common.py:2063 -#: ishtar_common/forms_common.py:2289 ishtar_common/models.py:2742 -#: ishtar_common/models.py:2746 ishtar_common/models.py:4077 +#: ishtar_common/forms_common.py:829 ishtar_common/forms_common.py:886 +#: ishtar_common/forms_common.py:1656 ishtar_common/forms_common.py:2066 +#: ishtar_common/forms_common.py:2292 ishtar_common/models.py:2745 +#: ishtar_common/models.py:2749 ishtar_common/models.py:4080 #: ishtar_common/models_imports.py:874 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:7 +#: ishtar_common/templates/ishtar/merge_person.html:10 +#: ishtar_common/templates/ishtar/merge_person.html:22 msgid "Title" msgstr "Titre" -#: ishtar_common/forms_common.py:837 ishtar_common/models.py:2561 +#: ishtar_common/forms_common.py:840 ishtar_common/models.py:2564 msgid "Person types" msgstr "Types de personne" -#: ishtar_common/forms_common.py:855 +#: ishtar_common/forms_common.py:858 msgid "Person to merge" msgstr "Personne à fusionner" -#: ishtar_common/forms_common.py:877 +#: ishtar_common/forms_common.py:880 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:19 msgid "Identity" msgstr "Identité" -#: ishtar_common/forms_common.py:884 ishtar_common/models.py:2752 +#: ishtar_common/forms_common.py:887 ishtar_common/models.py:2755 +#: ishtar_common/templates/ishtar/merge_person.html:12 +#: ishtar_common/templates/ishtar/merge_person.html:24 msgid "Salutation" msgstr "Formule d'appel" -#: ishtar_common/forms_common.py:889 ishtar_common/models.py:2765 +#: ishtar_common/forms_common.py:892 ishtar_common/models.py:2768 +#: ishtar_common/templates/ishtar/merge_person.html:9 +#: ishtar_common/templates/ishtar/merge_person.html:21 msgid "Raw name" msgstr "Nom brut" -#: ishtar_common/forms_common.py:892 ishtar_common/models_common.py:2873 +#: ishtar_common/forms_common.py:895 ishtar_common/models_common.py:2877 msgid "Phone description" msgstr "Type de téléphone" -#: ishtar_common/forms_common.py:896 ishtar_common/models_common.py:2876 -#: ishtar_common/models_common.py:2879 +#: ishtar_common/forms_common.py:899 ishtar_common/models_common.py:2880 +#: ishtar_common/models_common.py:2883 msgid "Phone description 2" msgstr "Type de téléphone 2" -#: ishtar_common/forms_common.py:898 +#: ishtar_common/forms_common.py:901 msgid "Phone 2" msgstr "Téléphone 2" -#: ishtar_common/forms_common.py:900 ishtar_common/models_common.py:2883 +#: ishtar_common/forms_common.py:903 ishtar_common/models_common.py:2887 msgid "Phone description 3" msgstr "Type de téléphone 3" -#: ishtar_common/forms_common.py:902 ishtar_common/models_common.py:2881 +#: ishtar_common/forms_common.py:905 ishtar_common/models_common.py:2885 msgid "Phone 3" msgstr "Téléphone 3" -#: ishtar_common/forms_common.py:907 +#: ishtar_common/forms_common.py:910 msgid "Current organization" msgstr "Organisation actuelle" -#: ishtar_common/forms_common.py:925 ishtar_common/models_common.py:2858 +#: ishtar_common/forms_common.py:928 ishtar_common/models_common.py:2862 msgid "Other address: address" msgstr "Autre adresse : adresse" -#: ishtar_common/forms_common.py:928 ishtar_common/models_common.py:2860 +#: ishtar_common/forms_common.py:931 ishtar_common/models_common.py:2864 msgid "Other address: address complement" msgstr "Autre adresse : complément d'adresse" -#: ishtar_common/forms_common.py:933 ishtar_common/models_common.py:2863 +#: ishtar_common/forms_common.py:936 ishtar_common/models_common.py:2867 msgid "Other address: postal code" msgstr "Autre adresse : code postal" -#: ishtar_common/forms_common.py:936 ishtar_common/models_common.py:2866 +#: ishtar_common/forms_common.py:939 ishtar_common/models_common.py:2870 msgid "Other address: town" msgstr "Autre adresse : ville" -#: ishtar_common/forms_common.py:939 ishtar_common/models_common.py:2869 +#: ishtar_common/forms_common.py:942 ishtar_common/models_common.py:2873 msgid "Other address: country" msgstr "Autre adresse : pays" -#: ishtar_common/forms_common.py:951 +#: ishtar_common/forms_common.py:954 msgid "Already has an account" msgstr "A déjà un compte" -#: ishtar_common/forms_common.py:978 ishtar_common/models.py:3271 +#: ishtar_common/forms_common.py:981 ishtar_common/models.py:3274 #: ishtar_common/wizards.py:1930 msgid "Username" msgstr "Nom d'utilisateur" -#: ishtar_common/forms_common.py:1000 ishtar_common/forms_common.py:1013 +#: ishtar_common/forms_common.py:1003 ishtar_common/forms_common.py:1016 msgid "Account search" msgstr "Rechercher un compte" -#: ishtar_common/forms_common.py:1075 ishtar_common/forms_common.py:1123 -#: ishtar_common/forms_common.py:1127 ishtar_common/models.py:2560 +#: ishtar_common/forms_common.py:1078 ishtar_common/forms_common.py:1126 +#: ishtar_common/forms_common.py:1130 ishtar_common/models.py:2563 #: ishtar_common/models_imports.py:873 msgid "Person type" msgstr "Type de personne" -#: ishtar_common/forms_common.py:1142 ishtar_common/forms_common.py:1146 +#: ishtar_common/forms_common.py:1145 ishtar_common/forms_common.py:1149 #: ishtar_common/ishtar_menu.py:38 msgid "Account" msgstr "Compte" -#: ishtar_common/forms_common.py:1151 ishtar_common/forms_common.py:1166 +#: ishtar_common/forms_common.py:1154 ishtar_common/forms_common.py:1169 #: ishtar_common/wizards.py:1966 msgid "New password" msgstr "Nouveau mot de passe" -#: ishtar_common/forms_common.py:1158 +#: ishtar_common/forms_common.py:1161 msgid "New password (confirmation)" msgstr "Nouveau mot de passe (confirmation)" -#: ishtar_common/forms_common.py:1168 +#: ishtar_common/forms_common.py:1171 msgid "" "Keep these fields empty if you do not want to change password. On creation, " "if you leave these fields empty, the user will not be able to connect." @@ -9071,173 +9068,173 @@ msgstr "" "le mot de passe. À la création, si vous laissez ces champs vides, " "l'utilisateur ne sera pas à même de se connecter." -#: ishtar_common/forms_common.py:1206 +#: ishtar_common/forms_common.py:1209 msgid "Your password and confirmation password do not match." msgstr "La vérification du mot de passe a échoué." -#: ishtar_common/forms_common.py:1212 +#: ishtar_common/forms_common.py:1215 msgid "You must provide a correct password." msgstr "Vous devez fournir un mot de passe correct." -#: ishtar_common/forms_common.py:1221 +#: ishtar_common/forms_common.py:1224 msgid "This username already exists." msgstr "Ce nom d'utilisateur existe déjà." -#: ishtar_common/forms_common.py:1253 +#: ishtar_common/forms_common.py:1256 msgid "Choose different name for profiles." msgstr "Choisissez un nom différent pour les profils." -#: ishtar_common/forms_common.py:1270 +#: ishtar_common/forms_common.py:1273 msgid "Send the new password by email?" msgstr "Envoyer le nouveau mot de passe par courriel ?" -#: ishtar_common/forms_common.py:1283 ishtar_common/models.py:3100 -#: ishtar_common/views.py:1263 +#: ishtar_common/forms_common.py:1286 ishtar_common/models.py:3103 +#: ishtar_common/views.py:1264 msgid "Current profile" msgstr "Profil actuel" -#: ishtar_common/forms_common.py:1286 ishtar_common/models.py:3073 -#: ishtar_common/models.py:3092 ishtar_common/models_imports.py:879 +#: ishtar_common/forms_common.py:1289 ishtar_common/models.py:3076 +#: ishtar_common/models.py:3095 ishtar_common/models_imports.py:879 msgid "Profile type" msgstr "Type de profil" -#: ishtar_common/forms_common.py:1289 +#: ishtar_common/forms_common.py:1292 msgid "Pin automatically items on creation and modification" msgstr "" "Épingler automatiquement les éléments à la création et à la modification" -#: ishtar_common/forms_common.py:1294 +#: ishtar_common/forms_common.py:1297 msgid "Duplicate this profile" msgstr "Dupliquer ce profil" -#: ishtar_common/forms_common.py:1297 +#: ishtar_common/forms_common.py:1300 msgid "Delete this profile" msgstr "Supprimer ce profil" -#: ishtar_common/forms_common.py:1334 ishtar_common/forms_common.py:1342 +#: ishtar_common/forms_common.py:1337 ishtar_common/forms_common.py:1345 #, python-brace-format msgid "External source - {src.name}" msgstr "Source externe - {src.name}" -#: ishtar_common/forms_common.py:1391 +#: ishtar_common/forms_common.py:1394 msgid "A profile with the same name exists." msgstr "Un profil avec un nom identique existe." -#: ishtar_common/forms_common.py:1424 +#: ishtar_common/forms_common.py:1427 msgid " (duplicate)" msgstr " (copie)" -#: ishtar_common/forms_common.py:1453 +#: ishtar_common/forms_common.py:1456 msgid "There are identical towns." msgstr "Il y a des communes identiques." -#: ishtar_common/forms_common.py:1540 +#: ishtar_common/forms_common.py:1543 msgid "Only one choice can be checked." msgstr "Seul un choix peut être coché." -#: ishtar_common/forms_common.py:1590 +#: ishtar_common/forms_common.py:1593 #, python-format msgid "Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)." msgstr "" "Les images trop grandes sont retaillées en : %(width)dx%(height)d (le ratio " "est conservé)." -#: ishtar_common/forms_common.py:1615 +#: ishtar_common/forms_common.py:1618 msgid "This value already exist" msgstr "Cette valeur existe déjà" -#: ishtar_common/forms_common.py:1631 ishtar_common/models.py:3692 +#: ishtar_common/forms_common.py:1634 ishtar_common/models.py:3695 #: ishtar_common/models_imports.py:882 msgid "Document tag" msgstr "Mot-clé du document" -#: ishtar_common/forms_common.py:1640 +#: ishtar_common/forms_common.py:1643 msgid "Document - General" msgstr "Document - Général" -#: ishtar_common/forms_common.py:1661 ishtar_common/forms_common.py:2069 -#: ishtar_common/forms_common.py:2271 ishtar_common/models.py:4143 +#: ishtar_common/forms_common.py:1664 ishtar_common/forms_common.py:2072 +#: ishtar_common/forms_common.py:2274 ishtar_common/models.py:4146 msgid "Medium" msgstr "Support" -#: ishtar_common/forms_common.py:1664 ishtar_common/forms_common.py:1853 -#: ishtar_common/forms_common.py:2068 ishtar_common/forms_common.py:2270 -#: ishtar_common/models.py:4150 ishtar_common/models_imports.py:878 +#: ishtar_common/forms_common.py:1667 ishtar_common/forms_common.py:1856 +#: ishtar_common/forms_common.py:2071 ishtar_common/forms_common.py:2273 +#: ishtar_common/models.py:4153 ishtar_common/models_imports.py:878 #: ishtar_common/models_imports.py:880 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:88 #: ishtar_common/templates/ishtar/sheet_document.html:50 msgid "Format" msgstr "Format" -#: ishtar_common/forms_common.py:1666 ishtar_common/forms_common.py:2070 -#: ishtar_common/forms_common.py:2272 ishtar_common/models.py:4155 +#: ishtar_common/forms_common.py:1669 ishtar_common/forms_common.py:2073 +#: ishtar_common/forms_common.py:2275 ishtar_common/models.py:4158 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:98 msgid "Scale" msgstr "Échelle" -#: ishtar_common/forms_common.py:1684 ishtar_common/forms_common.py:1855 -#: ishtar_common/forms_common.py:2496 ishtar_common/forms_common.py:2497 -#: ishtar_common/models.py:3558 ishtar_common/models.py:3808 -#: ishtar_common/models.py:4157 +#: ishtar_common/forms_common.py:1687 ishtar_common/forms_common.py:1858 +#: ishtar_common/forms_common.py:2499 ishtar_common/forms_common.py:2500 +#: ishtar_common/models.py:3561 ishtar_common/models.py:3811 +#: ishtar_common/models.py:4160 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:9 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:9 #: ishtar_common/templates/ishtar/sheet_document.html:66 msgid "Authors" msgstr "Auteurs" -#: ishtar_common/forms_common.py:1690 ishtar_common/forms_common.py:2074 -#: ishtar_common/models.py:4099 +#: ishtar_common/forms_common.py:1693 ishtar_common/forms_common.py:2077 +#: ishtar_common/models.py:4102 msgid "Publisher" msgstr "Éditions" -#: ishtar_common/forms_common.py:1714 ishtar_common/forms_common.py:2096 -#: ishtar_common/models.py:4106 +#: ishtar_common/forms_common.py:1717 ishtar_common/forms_common.py:2099 +#: ishtar_common/models.py:4109 msgid "Year of publication" msgstr "Année de publication" -#: ishtar_common/forms_common.py:1719 +#: ishtar_common/forms_common.py:1722 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:64 msgid "Licenses" msgstr "Licences" -#: ishtar_common/forms_common.py:1722 ishtar_common/models.py:4111 +#: ishtar_common/forms_common.py:1725 ishtar_common/models.py:4114 msgid "Tags" msgstr "Mots-clés" -#: ishtar_common/forms_common.py:1728 ishtar_common/forms_common.py:2097 -#: ishtar_common/models.py:996 ishtar_common/models.py:4114 +#: ishtar_common/forms_common.py:1731 ishtar_common/forms_common.py:2100 +#: ishtar_common/models.py:996 ishtar_common/models.py:4117 #: ishtar_common/models_imports.py:883 overload_translation/models.py:11 msgid "Language" msgstr "Langue" -#: ishtar_common/forms_common.py:1731 ishtar_common/forms_common.py:2099 -#: ishtar_common/models.py:4119 +#: ishtar_common/forms_common.py:1734 ishtar_common/forms_common.py:2102 +#: ishtar_common/models.py:4122 msgid "ISSN" msgstr "ISSN" -#: ishtar_common/forms_common.py:1737 ishtar_common/forms_common.py:2098 -#: ishtar_common/models.py:4120 +#: ishtar_common/forms_common.py:1740 ishtar_common/forms_common.py:2101 +#: ishtar_common/models.py:4123 msgid "ISBN" msgstr "ISBN" -#: ishtar_common/forms_common.py:1743 ishtar_common/forms_common.py:1858 -#: ishtar_common/forms_common.py:2108 ishtar_common/models.py:4123 -#: ishtar_common/models.py:5182 -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:7 +#: ishtar_common/forms_common.py:1746 ishtar_common/forms_common.py:1861 +#: ishtar_common/forms_common.py:2111 ishtar_common/models.py:4126 +#: ishtar_common/models.py:5185 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:8 #: ishtar_common/templates/ishtar/sheet_document.html:93 msgid "Source" msgstr "Source" -#: ishtar_common/forms_common.py:1746 ishtar_common/forms_common.py:2114 -#: ishtar_common/models.py:4130 +#: ishtar_common/forms_common.py:1749 ishtar_common/forms_common.py:2117 +#: ishtar_common/models.py:4133 msgid "Source - free input" msgstr "Source - saisie libre" -#: ishtar_common/forms_common.py:1751 ishtar_common/models.py:4136 +#: ishtar_common/forms_common.py:1754 ishtar_common/models.py:4139 msgid "Source - page range" msgstr "Source - intervalle de pages" -#: ishtar_common/forms_common.py:1755 +#: ishtar_common/forms_common.py:1758 msgid "" "Unique page: \"242\", page range: \"242-245\", multiple pages: " "\"242;245;249\", multiples pages and multiple pages ranges: " @@ -9247,61 +9244,61 @@ msgstr "" "\"242;245;249\", pages et intervalles de pages multiples : " "\"242-245;249;262-265\"." -#: ishtar_common/forms_common.py:1761 ishtar_common/models.py:4166 +#: ishtar_common/forms_common.py:1764 ishtar_common/models.py:4169 msgid "Numerical ressource (web address)" msgstr "Ressource numérique (adresse web)" -#: ishtar_common/forms_common.py:1764 +#: ishtar_common/forms_common.py:1767 msgid "Image" msgstr "Image" -#: ishtar_common/forms_common.py:1772 +#: ishtar_common/forms_common.py:1775 #: ishtar_common/templates/ishtar/sheet_document.html:58 msgctxt "Not directory" msgid "File" msgstr "Fichier" -#: ishtar_common/forms_common.py:1789 ishtar_common/models.py:4169 +#: ishtar_common/forms_common.py:1792 ishtar_common/models.py:4172 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:150 msgid "Receipt date" msgstr "Date de réception" -#: ishtar_common/forms_common.py:1795 ishtar_common/models.py:4175 +#: ishtar_common/forms_common.py:1798 ishtar_common/models.py:4178 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:160 msgid "Receipt date in documentation" msgstr "Date de réception en documentation" -#: ishtar_common/forms_common.py:1802 ishtar_common/models.py:4189 +#: ishtar_common/forms_common.py:1805 ishtar_common/models.py:4192 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:182 msgid "Additional information" msgstr "Information supplémentaire" -#: ishtar_common/forms_common.py:1804 ishtar_common/forms_common.py:2104 -#: ishtar_common/models.py:4191 +#: ishtar_common/forms_common.py:1807 ishtar_common/forms_common.py:2107 +#: ishtar_common/models.py:4194 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:108 msgid "Has a duplicate" msgstr "Existe en doublon" -#: ishtar_common/forms_common.py:1851 ishtar_common/forms_common.py:2669 +#: ishtar_common/forms_common.py:1854 ishtar_common/forms_common.py:2671 #: ishtar_common/templates/ishtar/forms/base_related_items.html:5 #: ishtar_common/templates/ishtar/sheet_document.html:120 msgid "Related items" msgstr "Éléments reliés" -#: ishtar_common/forms_common.py:1857 +#: ishtar_common/forms_common.py:1860 #: ishtar_common/templates/ishtar/sheet_document.html:83 msgid "Publishing" msgstr "Éditions" -#: ishtar_common/forms_common.py:1860 +#: ishtar_common/forms_common.py:1863 msgid "Advanced" msgstr "Avancé" -#: ishtar_common/forms_common.py:1907 +#: ishtar_common/forms_common.py:1910 msgid "Incorrect page range." msgstr "Intervalle de pages incorrect." -#: ishtar_common/forms_common.py:1994 +#: ishtar_common/forms_common.py:1997 msgid "" "You should at least fill one of this field: title, url, image or file. If " "you have provided an image check that it is not corrupted." @@ -9310,162 +9307,162 @@ msgstr "" "fichier. Si vous avez fourni une image, vérifiez que celle-ci n'est pas " "corrompue." -#: ishtar_common/forms_common.py:2003 +#: ishtar_common/forms_common.py:2006 msgid "A document has to be attached at least to one item" msgstr "Un document doit être rattaché à au moins un élément" -#: ishtar_common/forms_common.py:2046 +#: ishtar_common/forms_common.py:2049 msgid "Document - 001 - Search" msgstr "Document - 001 - Recherche" -#: ishtar_common/forms_common.py:2059 ishtar_common/forms_common.py:2265 -#: ishtar_common/forms_common.py:2432 ishtar_common/forms_common.py:2483 -#: ishtar_common/models.py:3557 +#: ishtar_common/forms_common.py:2062 ishtar_common/forms_common.py:2268 +#: ishtar_common/forms_common.py:2435 ishtar_common/forms_common.py:2486 +#: ishtar_common/models.py:3560 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:139 msgid "Author" msgstr "Auteur" -#: ishtar_common/forms_common.py:2072 +#: ishtar_common/forms_common.py:2075 msgid "Tag" msgstr "Mot-clé" -#: ishtar_common/forms_common.py:2100 ishtar_common/models.py:4109 +#: ishtar_common/forms_common.py:2103 ishtar_common/models.py:4112 msgid "License" msgstr "Licence" -#: ishtar_common/forms_common.py:2103 +#: ishtar_common/forms_common.py:2106 msgid "Additional informations" msgstr "Informations supplémentaires" -#: ishtar_common/forms_common.py:2105 +#: ishtar_common/forms_common.py:2108 msgid "Has a file?" msgstr "A un fichier ?" -#: ishtar_common/forms_common.py:2116 +#: ishtar_common/forms_common.py:2119 msgid "Warehouse - Container" msgstr "Lieu de conservation - Contenant" -#: ishtar_common/forms_common.py:2124 +#: ishtar_common/forms_common.py:2127 msgid "Warehouse - Reference container" msgstr "Lieu de conservation - Contenant de référence" -#: ishtar_common/forms_common.py:2141 +#: ishtar_common/forms_common.py:2144 msgid "Operation - type" msgstr "Opération - type" -#: ishtar_common/forms_common.py:2154 +#: ishtar_common/forms_common.py:2157 msgid "Basket - Finds" msgstr "Panier - mobilier" -#: ishtar_common/forms_common.py:2169 +#: ishtar_common/forms_common.py:2172 msgid "Find - denomination" msgstr "Mobilier - dénomination" -#: ishtar_common/forms_common.py:2179 ishtar_common/forms_common.py:2191 +#: ishtar_common/forms_common.py:2182 ishtar_common/forms_common.py:2194 msgid "Receipt date before" msgstr "Date de réception avant" -#: ishtar_common/forms_common.py:2182 ishtar_common/forms_common.py:2194 +#: ishtar_common/forms_common.py:2185 ishtar_common/forms_common.py:2197 msgid "Receipt date after" msgstr "Date de réception après" -#: ishtar_common/forms_common.py:2185 +#: ishtar_common/forms_common.py:2188 msgid "Creation date before" msgstr "Date de création avant" -#: ishtar_common/forms_common.py:2188 +#: ishtar_common/forms_common.py:2191 msgid "Creation date after" msgstr "Date de création après" -#: ishtar_common/forms_common.py:2216 ishtar_common/forms_common.py:2231 +#: ishtar_common/forms_common.py:2219 ishtar_common/forms_common.py:2234 msgid "Document search" msgstr "Recherche document" -#: ishtar_common/forms_common.py:2250 +#: ishtar_common/forms_common.py:2253 msgid "Document - Quick action - Modify" msgstr "Document - Action rapide - Modification" -#: ishtar_common/forms_common.py:2263 ishtar_common/models_imports.py:875 +#: ishtar_common/forms_common.py:2266 ishtar_common/models_imports.py:875 #: ishtar_common/models_imports.py:876 msgid "Source type" msgstr "Type de document" -#: ishtar_common/forms_common.py:2292 +#: ishtar_common/forms_common.py:2295 msgid "Edit duplicated item" msgstr "Éditer l'élément dupliqué" -#: ishtar_common/forms_common.py:2366 +#: ishtar_common/forms_common.py:2369 msgid "current and reference containers" msgstr "le contenant actuel et le contenant de référence" -#: ishtar_common/forms_common.py:2405 +#: ishtar_common/forms_common.py:2408 #: ishtar_common/templates/ishtar/import_table.html:33 msgid "Action" msgstr "Action" -#: ishtar_common/forms_common.py:2405 +#: ishtar_common/forms_common.py:2408 msgid "Lock" msgstr "Verrouiller" -#: ishtar_common/forms_common.py:2405 +#: ishtar_common/forms_common.py:2408 msgid "Unlock" msgstr "Déverrouiller" -#: ishtar_common/forms_common.py:2423 +#: ishtar_common/forms_common.py:2426 msgid "Would you like to delete this documentation?" msgstr "Voulez-vous supprimer ce document ?" -#: ishtar_common/forms_common.py:2443 ishtar_common/models.py:3528 -#: ishtar_common/models.py:3549 ishtar_common/models_imports.py:877 +#: ishtar_common/forms_common.py:2446 ishtar_common/models.py:3531 +#: ishtar_common/models.py:3552 ishtar_common/models_imports.py:877 msgid "Author type" msgstr "Type d'auteur" -#: ishtar_common/forms_common.py:2460 +#: ishtar_common/forms_common.py:2463 msgid "This author already exist." msgstr "Cet auteur existe déjà." -#: ishtar_common/forms_common.py:2472 +#: ishtar_common/forms_common.py:2475 msgid "Author selection" msgstr "Sélection d'auteur" -#: ishtar_common/forms_common.py:2490 +#: ishtar_common/forms_common.py:2493 msgid "There are identical authors." msgstr "Il y a des auteurs identiques." -#: ishtar_common/forms_common.py:2503 ishtar_common/forms_common.py:2568 +#: ishtar_common/forms_common.py:2506 ishtar_common/forms_common.py:2571 #: ishtar_common/models.py:974 msgid "Query" msgstr "Requête" -#: ishtar_common/forms_common.py:2507 ishtar_common/models.py:981 +#: ishtar_common/forms_common.py:2510 ishtar_common/models.py:981 msgid "Is an alert" msgstr "Est une alerte" -#: ishtar_common/forms_common.py:2529 +#: ishtar_common/forms_common.py:2532 msgid "A label is required for a new search query." msgstr "Un libellé est nécessaire pour une nouvelle requête de recherche." -#: ishtar_common/forms_common.py:2533 +#: ishtar_common/forms_common.py:2536 msgid "Select the search query to update" msgstr "Sélectionner la requête de recherche à mettre à jour" -#: ishtar_common/forms_common.py:2540 ishtar_common/forms_common.py:2561 +#: ishtar_common/forms_common.py:2543 ishtar_common/forms_common.py:2564 msgid "Query does not exist." msgstr "Cette requête n'existe pas." -#: ishtar_common/forms_common.py:2596 +#: ishtar_common/forms_common.py:2599 msgid "Geo item" msgstr "Élément géographique" -#: ishtar_common/forms_common.py:2597 +#: ishtar_common/forms_common.py:2600 msgid "Geo item - General" msgstr "Élément géographique - Général" -#: ishtar_common/forms_common.py:2615 ishtar_common/models_common.py:2142 +#: ishtar_common/forms_common.py:2617 ishtar_common/models_common.py:2143 msgid "Import key" msgstr "Clé d'import" -#: ishtar_common/forms_common.py:2618 +#: ishtar_common/forms_common.py:2620 msgid "" "An update via import corresponding to the source element and this key will " "overwrite the data." @@ -9473,67 +9470,76 @@ msgstr "" "Une mise à jour via import correspondant à l'élément source et à cette clé " "va écraser la donnée." -#: ishtar_common/forms_common.py:2626 ishtar_common/models_common.py:2157 -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:6 +#: ishtar_common/forms_common.py:2628 ishtar_common/models_common.py:2158 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:7 msgid "Data type" msgstr "Type de donnée" -#: ishtar_common/forms_common.py:2629 ishtar_common/models_common.py:2149 -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:10 +#: ishtar_common/forms_common.py:2631 ishtar_common/models_common.py:2150 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:11 msgid "Origin" msgstr "Origine" -#: ishtar_common/forms_common.py:2632 ishtar_common/models_common.py:2165 -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:11 +#: ishtar_common/forms_common.py:2634 ishtar_common/models_common.py:2166 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:12 msgid "Provider" msgstr "Fournisseur" -#: ishtar_common/forms_common.py:2635 ishtar_common/forms_common.py:2672 -#: ishtar_common/models_common.py:2131 +#: ishtar_common/forms_common.py:2637 ishtar_common/forms_common.py:2674 +#: ishtar_common/models_common.py:2132 msgid "Buffer" msgstr "Tampon" -#: ishtar_common/forms_common.py:2639 +#: ishtar_common/forms_common.py:2641 msgid "Buffer type" msgstr "Type de tampon" -#: ishtar_common/forms_common.py:2670 +#: ishtar_common/forms_common.py:2672 msgid "Meta-data" msgstr "Méta-donnée" -#: ishtar_common/forms_common.py:2671 +#: ishtar_common/forms_common.py:2673 msgid "Geography" msgstr "Géographie" -#: ishtar_common/forms_common.py:2842 +#: ishtar_common/forms_common.py:2859 msgid "If you set a buffer set a buffer type." msgstr "Si vous definissez un tampon, designez son type." -#: ishtar_common/forms_common.py:2847 +#: ishtar_common/forms_common.py:2864 msgid "If you set a buffer type set a buffer." msgstr "Si vous definissez un type de tampon, definissez un tampon." -#: ishtar_common/forms_common.py:2863 +#: ishtar_common/forms_common.py:2869 +msgid "A value is expected for Z." +msgstr "Une valeur est attendue pour Z." + +#: ishtar_common/forms_common.py:2888 msgid "A geo item has to be attached at least to one item" msgstr "Un élément géographique doit être rattaché à au moins un élément" -#: ishtar_common/forms_common.py:2902 +#: ishtar_common/forms_common.py:2927 msgid "Geometry type" msgstr "Type de géométrie" -#: ishtar_common/forms_common.py:2906 +#: ishtar_common/forms_common.py:2930 ishtar_common/models_common.py:2112 +#: ishtar_common/models_common.py:3539 +msgid "Point" +msgstr "Point" + +#: ishtar_common/forms_common.py:2931 msgid "Point 3D" msgstr "Point 3D" -#: ishtar_common/forms_common.py:2907 +#: ishtar_common/forms_common.py:2932 msgid "Multi-points" msgstr "Points multiples" -#: ishtar_common/forms_common.py:2908 +#: ishtar_common/forms_common.py:2933 msgid "Multi-lines" msgstr "Lignes multiples" -#: ishtar_common/forms_common.py:2909 +#: ishtar_common/forms_common.py:2934 msgid "Multi-polygons" msgstr "Polygones multi-parties" @@ -9551,7 +9557,7 @@ msgid "Addition/modification" msgstr "Ajout/modification" #: ishtar_common/ishtar_menu.py:60 ishtar_common/models.py:1761 -#: ishtar_common/views.py:1379 +#: ishtar_common/views.py:1380 msgid "Global variables" msgstr "Variables globales" @@ -9563,11 +9569,11 @@ msgstr "Annuaire" msgid "Imports" msgstr "Imports" -#: ishtar_common/ishtar_menu.py:182 ishtar_common/views.py:1435 +#: ishtar_common/ishtar_menu.py:182 ishtar_common/views.py:1436 msgid "Current imports" msgstr "Imports en cours" -#: ishtar_common/ishtar_menu.py:188 ishtar_common/views.py:1915 +#: ishtar_common/ishtar_menu.py:188 ishtar_common/views.py:1916 msgid "Old imports" msgstr "Anciens imports" @@ -10568,95 +10574,95 @@ msgstr "Types d'organisation" msgid "Error: planning_service type is missing" msgstr "Erreur : le type planning_service est manquant" -#: ishtar_common/models.py:2429 ishtar_common/models.py:2598 +#: ishtar_common/models.py:2429 ishtar_common/models.py:2601 msgid "Error: general_contractor type is missing" msgstr "Erreur : le type general_contractor est manquant" -#: ishtar_common/models.py:2496 +#: ishtar_common/models.py:2503 msgid "Organizations" msgstr "Organisations" -#: ishtar_common/models.py:2524 +#: ishtar_common/models.py:2531 msgid "unknown organization" msgstr "organisation inconnue" -#: ishtar_common/models.py:2576 +#: ishtar_common/models.py:2579 msgid "/" msgstr "/" -#: ishtar_common/models.py:2582 +#: ishtar_common/models.py:2585 msgid "Error: sra_agent and head_scientist types are missing" msgstr "Erreur : les types sra_agent et head_scientist sont manquants" -#: ishtar_common/models.py:2590 +#: ishtar_common/models.py:2593 msgid "Error: sra_agent type is missing" msgstr "Erreur : le type sra_agent est manquant" -#: ishtar_common/models.py:2606 +#: ishtar_common/models.py:2609 msgid "Error: responsible_planning_service type is missing" msgstr "Erreur : le type responsible_planning_service est manquant" -#: ishtar_common/models.py:2618 +#: ishtar_common/models.py:2621 msgid "Error: publisher type is missing" msgstr "Erreur : le type publisher est manquant" -#: ishtar_common/models.py:2626 +#: ishtar_common/models.py:2629 msgid "Error: operator type is missing" msgstr "Erreur : le type opérateur est manquant" -#: ishtar_common/models.py:2630 ishtar_common/models.py:2643 +#: ishtar_common/models.py:2633 ishtar_common/models.py:2646 msgid "Long title" msgstr "Titre long" -#: ishtar_common/models.py:2633 ishtar_common/models_imports.py:926 +#: ishtar_common/models.py:2636 ishtar_common/models_imports.py:926 msgid "Title type" msgstr "Type de titre" -#: ishtar_common/models.py:2634 +#: ishtar_common/models.py:2637 msgid "Title types" msgstr "Types de titre" -#: ishtar_common/models.py:2660 +#: ishtar_common/models.py:2663 msgid "Mr" msgstr "M." -#: ishtar_common/models.py:2661 +#: ishtar_common/models.py:2664 msgid "Miss" msgstr "Mlle" -#: ishtar_common/models.py:2662 +#: ishtar_common/models.py:2665 msgid "Mr and Mrs" msgstr "M. et Mme" -#: ishtar_common/models.py:2663 +#: ishtar_common/models.py:2666 msgid "Mrs" msgstr "Mme" -#: ishtar_common/models.py:2664 +#: ishtar_common/models.py:2667 msgid "Doctor" msgstr "Dr." -#: ishtar_common/models.py:2710 ishtar_common/models.py:3284 +#: ishtar_common/models.py:2713 ishtar_common/models.py:3287 msgctxt "key for text search" msgid "surname" msgstr "prenom" -#: ishtar_common/models.py:2713 ishtar_common/models.py:3288 +#: ishtar_common/models.py:2716 ishtar_common/models.py:3291 msgctxt "key for text search" msgid "email" msgstr "courriel" -#: ishtar_common/models.py:2720 ishtar_common/models.py:3296 +#: ishtar_common/models.py:2723 ishtar_common/models.py:3299 msgctxt "key for text search" msgid "organization" msgstr "organisation" -#: ishtar_common/models.py:2724 +#: ishtar_common/models.py:2727 msgctxt "key for text search" msgid "has-account" msgstr "a-un-compte" -#: ishtar_common/models.py:2760 +#: ishtar_common/models.py:2763 msgid "" "Attention, historical and unfortunate residue in the code of an initial " "translation error." @@ -10665,59 +10671,59 @@ msgstr "" "traduction initiale (surname correspond en anglais au nom de famille, pas au " "prénom)." -#: ishtar_common/models.py:2767 +#: ishtar_common/models.py:2770 msgid "Contact type" msgstr "Type de contact" -#: ishtar_common/models.py:2770 ishtar_common/models.py:2889 +#: ishtar_common/models.py:2773 ishtar_common/models.py:2892 msgid "Types" msgstr "Types" -#: ishtar_common/models.py:2775 +#: ishtar_common/models.py:2778 msgid "Is attached to" msgstr "Est rattaché à" -#: ishtar_common/models.py:2786 +#: ishtar_common/models.py:2789 msgid "Persons" msgstr "Personnes" -#: ishtar_common/models.py:3046 +#: ishtar_common/models.py:3049 msgid "Manage account" msgstr "Gérer le compte" -#: ishtar_common/models.py:3070 +#: ishtar_common/models.py:3073 msgid "Groups" msgstr "Groupes" -#: ishtar_common/models.py:3074 +#: ishtar_common/models.py:3077 msgid "Profile types" msgstr "Types de profil" -#: ishtar_common/models.py:3085 +#: ishtar_common/models.py:3088 msgid "Profile type summary" msgstr "Résumé du type de profil" -#: ishtar_common/models.py:3086 +#: ishtar_common/models.py:3089 msgid "Profile types summary" msgstr "Résumés des types de profil" -#: ishtar_common/models.py:3101 +#: ishtar_common/models.py:3104 msgid "Show field number" msgstr "Afficher les numéros des champs" -#: ishtar_common/models.py:3102 +#: ishtar_common/models.py:3105 msgid "Automatically pin" msgstr "Épingler automatiquement" -#: ishtar_common/models.py:3103 +#: ishtar_common/models.py:3106 msgid "Display pin menu" msgstr "Montrer le menu d'épinglage" -#: ishtar_common/models.py:3105 +#: ishtar_common/models.py:3108 msgid "Use background tasks" msgstr "Utiliser les tâches de fond" -#: ishtar_common/models.py:3106 +#: ishtar_common/models.py:3109 msgid "" "If set to true, each import, export, document generation is set as a " "background task." @@ -10725,123 +10731,123 @@ msgstr "" "Si mis à vrai, chaque import, export, génération de document est définie " "comme une tâche de fond." -#: ishtar_common/models.py:3110 +#: ishtar_common/models.py:3113 msgid "Send email when the task is finished" msgstr "Envoyer un courriel quand la tâche de fond est finie." -#: ishtar_common/models.py:3120 +#: ishtar_common/models.py:3123 msgid "User profile" msgstr "Profil d'utilisateur" -#: ishtar_common/models.py:3121 +#: ishtar_common/models.py:3124 msgid "User profiles" msgstr "Profils d'utilisateurs" -#: ishtar_common/models.py:3207 ishtar_common/models.py:4949 +#: ishtar_common/models.py:3210 ishtar_common/models.py:4952 msgid "Scheduled" msgstr "Planifié" -#: ishtar_common/models.py:3208 ishtar_common/models.py:4950 +#: ishtar_common/models.py:3211 ishtar_common/models.py:4953 msgid "In progress" msgstr "En cours" -#: ishtar_common/models.py:3209 ishtar_common/models.py:4952 +#: ishtar_common/models.py:3212 ishtar_common/models.py:4955 #: ishtar_common/models_imports.py:1058 msgid "Finished" msgstr "Terminé" -#: ishtar_common/models.py:3215 +#: ishtar_common/models.py:3218 msgid "Generate label" msgstr "Générer l'étiquette" -#: ishtar_common/models.py:3227 +#: ishtar_common/models.py:3230 msgid "View" msgstr "Voir" -#: ishtar_common/models.py:3229 +#: ishtar_common/models.py:3232 msgid "Arguments" msgstr "Arguments" -#: ishtar_common/models.py:3237 ishtar_common/models.py:4966 -#: ishtar_common/models.py:5121 +#: ishtar_common/models.py:3240 ishtar_common/models.py:4969 +#: ishtar_common/models.py:5124 msgid "Result" msgstr "Résultat" -#: ishtar_common/models.py:3240 +#: ishtar_common/models.py:3243 msgid "Background task" msgstr "Tâche de fond" -#: ishtar_common/models.py:3241 +#: ishtar_common/models.py:3244 msgid "Background tasks" msgstr "Tâches de fond" -#: ishtar_common/models.py:3277 +#: ishtar_common/models.py:3280 msgctxt "key for text search" msgid "username" msgstr "nom-utilisateur" -#: ishtar_common/models.py:3312 +#: ishtar_common/models.py:3315 msgid "Advanced shortcut menu" msgstr "Menu de raccourci (avancé)" -#: ishtar_common/models.py:3316 +#: ishtar_common/models.py:3319 msgid "Ishtar user" msgstr "Utilisateur d'Ishtar" -#: ishtar_common/models.py:3317 +#: ishtar_common/models.py:3320 msgid "Ishtar users" msgstr "Utilisateurs d'Ishtar" -#: ishtar_common/models.py:3411 +#: ishtar_common/models.py:3414 msgid "Public" msgstr "Public" -#: ishtar_common/models.py:3529 +#: ishtar_common/models.py:3532 msgid "Author types" msgstr "Types d'auteur" -#: ishtar_common/models.py:3612 +#: ishtar_common/models.py:3615 msgid "COInS export - type" msgstr "Export COInS - type" -#: ishtar_common/models.py:3615 +#: ishtar_common/models.py:3618 msgid "COInS export - genre" msgstr "Export COInS - genre" -#: ishtar_common/models.py:3618 +#: ishtar_common/models.py:3621 msgid "Is localized" msgstr "Est localisé" -#: ishtar_common/models.py:3620 +#: ishtar_common/models.py:3623 msgid "Setting a language for this type of document is relevant" msgstr "Indiquer une langue pour ce type de document est pertinent" -#: ishtar_common/models.py:3625 +#: ishtar_common/models.py:3628 msgid "Document type" msgstr "Type de document" -#: ishtar_common/models.py:3626 +#: ishtar_common/models.py:3629 msgid "Document types" msgstr "Types de document" -#: ishtar_common/models.py:3639 ishtar_common/models.py:3666 +#: ishtar_common/models.py:3642 ishtar_common/models.py:3669 msgid "Only available for these document types" msgstr "Seulement disponible pour ces types de document" -#: ishtar_common/models.py:3643 ishtar_common/models_imports.py:884 +#: ishtar_common/models.py:3646 ishtar_common/models_imports.py:884 #: ishtar_common/models_imports.py:925 msgid "Support type" msgstr "Type de support" -#: ishtar_common/models.py:3644 +#: ishtar_common/models.py:3647 msgid "Support types" msgstr "Types de support" -#: ishtar_common/models.py:3653 +#: ishtar_common/models.py:3656 msgid "Iframe template" msgstr "Patron d'iframe" -#: ishtar_common/models.py:3657 +#: ishtar_common/models.py:3660 msgid "" "Template to insert an iframe for this format. Use django template with a " "{{document}} variable matching the current document." @@ -10849,282 +10855,284 @@ msgstr "" "Patron pour insérer une iframe pour ce format. Utilisez les patrons django " "avec une variable {{document}} correspondant au document actuel." -#: ishtar_common/models.py:3670 +#: ishtar_common/models.py:3673 msgid "Format type" msgstr "Type de format" -#: ishtar_common/models.py:3671 +#: ishtar_common/models.py:3674 msgid "Format types" msgstr "Types de format" -#: ishtar_common/models.py:3680 ishtar_common/models_rest.py:93 +#: ishtar_common/models.py:3683 ishtar_common/models_rest.py:93 +#: ishtar_common/templates/ishtar/merge_organization.html:11 +#: ishtar_common/templates/ishtar/merge_organization.html:22 msgid "URL" msgstr "URL" -#: ishtar_common/models.py:3683 ishtar_common/models_imports.py:881 +#: ishtar_common/models.py:3686 ishtar_common/models_imports.py:881 msgid "License type" msgstr "Type de licence" -#: ishtar_common/models.py:3684 +#: ishtar_common/models.py:3687 msgid "License types" msgstr "Types de licence" -#: ishtar_common/models.py:3693 +#: ishtar_common/models.py:3696 msgid "Document tags" msgstr "Mots-clés du document" -#: ishtar_common/models.py:3809 +#: ishtar_common/models.py:3812 msgid "Identifier" msgstr "Identifiant" -#: ishtar_common/models.py:3832 +#: ishtar_common/models.py:3835 msgctxt "key for text search" msgid "author" msgstr "auteur" -#: ishtar_common/models.py:3836 +#: ishtar_common/models.py:3839 msgctxt "key for text search" msgid "publisher" msgstr "editeur" -#: ishtar_common/models.py:3840 +#: ishtar_common/models.py:3843 msgctxt "key for text search" msgid "publishing-year" msgstr "annee-publication" -#: ishtar_common/models.py:3844 +#: ishtar_common/models.py:3847 msgctxt "key for text search" msgid "title" msgstr "titre" -#: ishtar_common/models.py:3855 +#: ishtar_common/models.py:3858 msgctxt "key for text search" msgid "internal-reference" msgstr "reference-interne" -#: ishtar_common/models.py:3863 +#: ishtar_common/models.py:3866 msgctxt "key for text search" msgid "tag" msgstr "mot-cle" -#: ishtar_common/models.py:3866 +#: ishtar_common/models.py:3869 msgctxt "key for text search" msgid "format" msgstr "format" -#: ishtar_common/models.py:3870 +#: ishtar_common/models.py:3873 msgctxt "key for text search" msgid "medium" msgstr "support" -#: ishtar_common/models.py:3874 +#: ishtar_common/models.py:3877 msgctxt "key for text search" msgid "language" msgstr "langue" -#: ishtar_common/models.py:3878 +#: ishtar_common/models.py:3881 msgctxt "key for text search" msgid "license" msgstr "licence" -#: ishtar_common/models.py:3882 +#: ishtar_common/models.py:3885 msgctxt "key for text search" msgid "scale" msgstr "echelle" -#: ishtar_common/models.py:3885 +#: ishtar_common/models.py:3888 msgctxt "key for text search" msgid "url" msgstr "url" -#: ishtar_common/models.py:3889 +#: ishtar_common/models.py:3892 msgctxt "key for text search" msgid "isbn" msgstr "isbn" -#: ishtar_common/models.py:3892 +#: ishtar_common/models.py:3895 msgctxt "key for text search" msgid "issn" msgstr "issn" -#: ishtar_common/models.py:3895 +#: ishtar_common/models.py:3898 msgctxt "key for text search" msgid "source" msgstr "source" -#: ishtar_common/models.py:3899 +#: ishtar_common/models.py:3902 msgctxt "key for text search" msgid "source-free-input" msgstr "source-saisie-libre" -#: ishtar_common/models.py:3903 +#: ishtar_common/models.py:3906 msgctxt "key for text search" msgid "warehouse-container" msgstr "depot-contenant" -#: ishtar_common/models.py:3907 +#: ishtar_common/models.py:3910 msgctxt "key for text search" msgid "warehouse-container-reference" msgstr "depot-reference-contenant" -#: ishtar_common/models.py:3914 +#: ishtar_common/models.py:3917 msgctxt "key for text search" msgid "additional-information" msgstr "informations-supplementaires" -#: ishtar_common/models.py:3918 +#: ishtar_common/models.py:3921 msgctxt "key for text search" msgid "has-duplicate" msgstr "existe-en-doublon" -#: ishtar_common/models.py:3937 +#: ishtar_common/models.py:3940 msgctxt "key for text search" msgid "basket-finds" msgstr "panier-mobilier" -#: ishtar_common/models.py:3941 ishtar_common/models.py:4034 +#: ishtar_common/models.py:3944 ishtar_common/models.py:4037 msgctxt "key for text search" msgid "find" msgstr "mobilier" -#: ishtar_common/models.py:3961 ishtar_common/models.py:4037 +#: ishtar_common/models.py:3964 ishtar_common/models.py:4040 msgctxt "key for text search" msgid "warehouse" msgstr "depot" -#: ishtar_common/models.py:3965 ishtar_common/models_common.py:3231 +#: ishtar_common/models.py:3968 ishtar_common/models_common.py:3248 msgctxt "key for text search" msgid "has-image" msgstr "a-une-image" -#: ishtar_common/models.py:3968 +#: ishtar_common/models.py:3971 msgctxt "key for text search" msgid "has-file" msgstr "a-un-fichier" -#: ishtar_common/models.py:3972 +#: ishtar_common/models.py:3975 msgctxt "key for text search" msgid "receipt-date-before" msgstr "date-reception-avant" -#: ishtar_common/models.py:3976 +#: ishtar_common/models.py:3979 msgctxt "key for text search" msgid "receipt-date-after" msgstr "date-reception-apres" -#: ishtar_common/models.py:3981 +#: ishtar_common/models.py:3984 msgctxt "key for text search" msgid "receipt-in-documentation-date-before" msgstr "reception-documentation-date-avant" -#: ishtar_common/models.py:3986 +#: ishtar_common/models.py:3989 msgctxt "key for text search" msgid "receipt-in-documentation-date-after" msgstr "reception-documentation-date-apres" -#: ishtar_common/models.py:3990 +#: ishtar_common/models.py:3993 msgctxt "key for text search" msgid "creation-date-before" msgstr "date-creation-avant" -#: ishtar_common/models.py:3994 +#: ishtar_common/models.py:3997 msgctxt "key for text search" msgid "creation-date-after" msgstr "date-creation-apres" -#: ishtar_common/models.py:4041 +#: ishtar_common/models.py:4044 msgctxt "key for text search" msgid "treatment" msgstr "traitement" -#: ishtar_common/models.py:4045 +#: ishtar_common/models.py:4048 msgctxt "key for text search" msgid "treatment-file" msgstr "dossier-traitement" -#: ishtar_common/models.py:4160 +#: ishtar_common/models.py:4163 msgid "Authors (raw)" msgstr "Auteurs (brut)" -#: ishtar_common/models.py:4177 +#: ishtar_common/models.py:4180 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:118 msgid "Number of items" msgstr "Nombre d'éléments" -#: ishtar_common/models.py:4192 +#: ishtar_common/models.py:4195 msgid "Symbolic links" msgstr "Liens symboliques" -#: ishtar_common/models.py:4194 +#: ishtar_common/models.py:4197 msgid "Related" msgstr "Lié" -#: ishtar_common/models.py:4202 +#: ishtar_common/models.py:4205 #: ishtar_common/templates/ishtar/sheet_document.html:4 msgid "Document" msgstr "Document" -#: ishtar_common/models.py:4206 +#: ishtar_common/models.py:4209 msgid "Can view own Document" msgstr "Peut voir ses propres Documents" -#: ishtar_common/models.py:4207 +#: ishtar_common/models.py:4210 msgid "Can add own Document" msgstr "Peut ajouter son propre Document" -#: ishtar_common/models.py:4208 +#: ishtar_common/models.py:4211 msgid "Can change own Document" msgstr "Peut modifier ses propres Documents" -#: ishtar_common/models.py:4209 +#: ishtar_common/models.py:4212 msgid "Can delete own Document" msgstr "Peut supprimer ses propres Documents" -#: ishtar_common/models.py:4428 +#: ishtar_common/models.py:4431 msgid "Add sub-document" msgstr "Ajouter un sous-document" -#: ishtar_common/models.py:4430 +#: ishtar_common/models.py:4433 msgid "sub-document" msgstr "sous-document" -#: ishtar_common/models.py:4845 +#: ishtar_common/models.py:4848 msgid "Is judiciary" msgstr "Est judiciaire" -#: ishtar_common/models.py:4849 +#: ishtar_common/models.py:4852 msgid "Operation types" msgstr "Types d'opération" -#: ishtar_common/models.py:4899 +#: ishtar_common/models.py:4902 msgid "Judiciary" msgstr "Judiciaire" -#: ishtar_common/models.py:4936 +#: ishtar_common/models.py:4939 msgid "Filename" msgstr "Nom de fichier" -#: ishtar_common/models.py:4940 +#: ishtar_common/models.py:4943 msgid "Administration script" msgstr "Script d'administration" -#: ishtar_common/models.py:4941 +#: ishtar_common/models.py:4944 msgid "Administration scripts" msgstr "Scripts d'administration" -#: ishtar_common/models.py:4951 ishtar_common/models_imports.py:1057 +#: ishtar_common/models.py:4954 ishtar_common/models_imports.py:1057 msgid "Finished with errors" msgstr "Terminé avec des erreurs" -#: ishtar_common/models.py:4969 +#: ishtar_common/models.py:4972 msgid "Administration task" msgstr "Tâche d'administration" -#: ishtar_common/models.py:4970 +#: ishtar_common/models.py:4973 msgid "Administration tasks" msgstr "Tâches d'administration" -#: ishtar_common/models.py:4989 +#: ishtar_common/models.py:4992 msgid "" "ISHTAR_SCRIPT_DIR is not set in your local_settings. Contact your " "administrator." @@ -11132,7 +11140,7 @@ msgstr "" "ISHTAR_SCRIPT_DIR n'est pas défini dans votre fichier local_settings. " "Contactez l'administrateur." -#: ishtar_common/models.py:5001 +#: ishtar_common/models.py:5004 msgid "" "Your ISHTAR_SCRIPT_DIR is containing dots \"..\". As it can refer to " "relative paths, it can be a security issue and this is not allowed. Only put " @@ -11143,11 +11151,11 @@ msgstr "" "problème de sécurité et cela n'est pas permis. Seul un chemin complet est " "permis." -#: ishtar_common/models.py:5014 +#: ishtar_common/models.py:5017 msgid "Your ISHTAR_SCRIPT_DIR: \"{}\" is not a valid directory." msgstr "ISHTAR_SCRIPT_DIR : « {} » n'est pas un répertoire valable." -#: ishtar_common/models.py:5031 +#: ishtar_common/models.py:5034 msgid "" "Script \"{}\" is not available in your script directory. Check your " "configuration." @@ -11155,29 +11163,29 @@ msgstr "" "Le script « {} »n'est pas un fichier valable de votre répertoire de script. " "Vérifiez la configuration." -#: ishtar_common/models.py:5071 ishtar_common/models_imports.py:1049 +#: ishtar_common/models.py:5074 ishtar_common/models_imports.py:1049 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:132 msgid "Created" msgstr "Créé" -#: ishtar_common/models.py:5076 +#: ishtar_common/models.py:5079 msgid "Filter on" msgstr "Filtrer sur" -#: ishtar_common/models.py:5079 ishtar_common/models_rest.py:63 +#: ishtar_common/models.py:5082 ishtar_common/models_rest.py:63 msgid "Filter query" msgstr "Requête filtrante" -#: ishtar_common/models.py:5082 +#: ishtar_common/models.py:5085 msgid "Textual query on this item (try it on the main interface)" msgstr "" "Requête textuelle sur cet élément (testez-la sur l'interface principale)" -#: ishtar_common/models.py:5085 +#: ishtar_common/models.py:5088 msgid "Export geographic data" msgstr "Exporter les données géographiques" -#: ishtar_common/models.py:5088 +#: ishtar_common/models.py:5091 msgid "" "Geographic data can represent large volume of information. Geographic data " "can be excluded from the export" @@ -11185,15 +11193,15 @@ msgstr "" "Les données géographiques peuvent représenter un volume important " "d'information. Celles-ci peuvent être exclues de l'export." -#: ishtar_common/models.py:5096 +#: ishtar_common/models.py:5099 msgid "Put locks on associated items" msgstr "Mettre un verrou sur les éléments associés" -#: ishtar_common/models.py:5101 +#: ishtar_common/models.py:5104 msgid "Lock user" msgstr "Utilisateur pour le verrou" -#: ishtar_common/models.py:5105 +#: ishtar_common/models.py:5108 msgid "" "Owner of the lock if item are locked. Warning: if no user is provided the " "locks can be remove by any user with the permission to edit." @@ -11202,61 +11210,61 @@ msgstr "" "aucun utilisateur n'est désigné les verrous pourront être supprimés par " "n'importe quel utilisateur avec les permissions d'édition." -#: ishtar_common/models.py:5110 +#: ishtar_common/models.py:5113 msgid "Export types" msgstr "Exporter les types" -#: ishtar_common/models.py:5111 +#: ishtar_common/models.py:5114 msgid "Export configuration" msgstr "Exporter la configuration" -#: ishtar_common/models.py:5112 +#: ishtar_common/models.py:5115 msgid "Export importers" msgstr "Exporter les importeurs" -#: ishtar_common/models.py:5113 +#: ishtar_common/models.py:5116 msgid "Export towns, areas..." msgstr "Exporter les villes, les zones, ..." -#: ishtar_common/models.py:5114 +#: ishtar_common/models.py:5117 msgid "Export directory" msgstr "Exporter l'annuaire" -#: ishtar_common/models.py:5115 +#: ishtar_common/models.py:5118 msgid "Export documents" msgstr "Exporter les documents" -#: ishtar_common/models.py:5116 +#: ishtar_common/models.py:5119 msgid "Export main items" msgstr "Exporter les éléments principaux" -#: ishtar_common/models.py:5123 +#: ishtar_common/models.py:5126 msgid "Result information" msgstr "Informations" -#: ishtar_common/models.py:5126 +#: ishtar_common/models.py:5129 msgid "Archive - Export" msgstr "Archive - Export" -#: ishtar_common/models.py:5127 +#: ishtar_common/models.py:5130 msgid "Archive - Exports" msgstr "Archive - Exports" -#: ishtar_common/models.py:5138 +#: ishtar_common/models.py:5141 msgid "Whole database" msgstr "Base de données complète" -#: ishtar_common/models.py:5150 +#: ishtar_common/models.py:5153 msgid "To filter filter type and filter text must be filled." msgstr "" "Pour filtrer, à la fois le type de filtre et la requête filtrante doivent " "être remplis." -#: ishtar_common/models.py:5162 +#: ishtar_common/models.py:5165 msgid "Import user" msgstr "Utilisateur pour l'import" -#: ishtar_common/models.py:5166 +#: ishtar_common/models.py:5169 msgid "" "If set the \"Import user\" will be the editor for last version. If the field " "is left empty no history will be recorded." @@ -11265,284 +11273,288 @@ msgstr "" "version des éléments. Si ce champ est laissé vide aucun historique ne sera " "renseigné." -#: ishtar_common/models.py:5175 +#: ishtar_common/models.py:5178 msgid "Delete before adding" msgstr "Supprimer avant ajout" -#: ishtar_common/models.py:5177 +#: ishtar_common/models.py:5180 msgid "Delete existing items before adding" msgstr "Supprime les éléments existants avant d'ajouter de nouveaux éléments" -#: ishtar_common/models.py:5180 +#: ishtar_common/models.py:5183 msgid "Releasing locks on associated items" msgstr "Relâcher les verrous sur les éléments associés" -#: ishtar_common/models.py:5185 +#: ishtar_common/models.py:5188 msgid "Archive - Import" msgstr "Archive - Import" -#: ishtar_common/models.py:5186 +#: ishtar_common/models.py:5189 msgid "Archive - Imports" msgstr "Archive - Imports" -#: ishtar_common/models_common.py:836 +#: ishtar_common/models_common.py:837 msgid "Search vector" msgstr "Vecteur de recherche" -#: ishtar_common/models_common.py:836 +#: ishtar_common/models_common.py:837 msgid "Auto filled at save" msgstr "Auto-rempli à la sauvegarde" -#: ishtar_common/models_common.py:1399 +#: ishtar_common/models_common.py:1400 msgid "Last editor" msgstr "Dernier éditeur" -#: ishtar_common/models_common.py:1407 +#: ishtar_common/models_common.py:1408 msgid "Creator" msgstr "Créateur" -#: ishtar_common/models_common.py:1413 ishtar_common/models_common.py:2135 +#: ishtar_common/models_common.py:1414 ishtar_common/models_common.py:2136 msgid "Need update" msgstr "Nécessite une mise à jour" -#: ishtar_common/models_common.py:1415 +#: ishtar_common/models_common.py:1416 msgid "Item locked for edition" msgstr "Élément verrouillé pour l'édition" -#: ishtar_common/models_common.py:1421 +#: ishtar_common/models_common.py:1422 msgid "Locked by" msgstr "Verrouillé par" -#: ishtar_common/models_common.py:1439 +#: ishtar_common/models_common.py:1440 msgctxt "key for text search" msgid "modified-by" msgstr "modifie-par" -#: ishtar_common/models_common.py:1443 +#: ishtar_common/models_common.py:1444 msgctxt "key for text search" msgid "modified-before" msgstr "modifie-avant" -#: ishtar_common/models_common.py:1447 +#: ishtar_common/models_common.py:1448 msgctxt "key for text search" msgid "modified-after" msgstr "modifie-apres" -#: ishtar_common/models_common.py:1450 +#: ishtar_common/models_common.py:1451 msgctxt "key for text search" msgid "locked" msgstr "verrou" -#: ishtar_common/models_common.py:2007 ishtar_common/models_common.py:2025 +#: ishtar_common/models_common.py:2008 ishtar_common/models_common.py:2026 msgid "Authority name" msgstr "Registre" -#: ishtar_common/models_common.py:2008 ishtar_common/models_common.py:2025 +#: ishtar_common/models_common.py:2009 ishtar_common/models_common.py:2026 msgid "Authority SRID" msgstr "SRID" -#: ishtar_common/models_common.py:2011 +#: ishtar_common/models_common.py:2012 msgid "Geographic - Spatial reference system" msgstr "Géographie - Système de référence spatiale" -#: ishtar_common/models_common.py:2012 +#: ishtar_common/models_common.py:2013 msgid "Geographic - Spatial reference systems" msgstr "Géographie - Systèmes de référence spatiale" -#: ishtar_common/models_common.py:2042 +#: ishtar_common/models_common.py:2043 msgid "Geographic - Origin type" msgstr "Géographie - Type d'origine" -#: ishtar_common/models_common.py:2043 +#: ishtar_common/models_common.py:2044 msgid "Geographic - Origin types" msgstr "Géographie - Types d'origine" -#: ishtar_common/models_common.py:2058 +#: ishtar_common/models_common.py:2059 msgid "Geographic - Data type" msgstr "Géographie - Type de données" -#: ishtar_common/models_common.py:2059 +#: ishtar_common/models_common.py:2060 msgid "Geographic - Data types" msgstr "Géographie - Types de données" -#: ishtar_common/models_common.py:2074 +#: ishtar_common/models_common.py:2075 msgid "Geographic - Provider type" msgstr "Géographie - Type de fournisseur" -#: ishtar_common/models_common.py:2075 +#: ishtar_common/models_common.py:2076 msgid "Geographic - Provider types" msgstr "Géographie - Types de fournisseur" -#: ishtar_common/models_common.py:2086 +#: ishtar_common/models_common.py:2087 msgid "Geographic - Buffer type" msgstr "Géographie - Type de tampon" -#: ishtar_common/models_common.py:2087 +#: ishtar_common/models_common.py:2088 msgid "Geographic - Buffer types" msgstr "Géographie - Types de tampon" -#: ishtar_common/models_common.py:2112 +#: ishtar_common/models_common.py:2113 msgid "Line(s)" msgstr "Ligne(s)" -#: ishtar_common/models_common.py:2113 +#: ishtar_common/models_common.py:2114 msgid "Point(s)" msgstr "Point(s)" -#: ishtar_common/models_common.py:2114 +#: ishtar_common/models_common.py:2115 msgid "Polygon(s)" msgstr "Polygone(s)" -#: ishtar_common/models_common.py:2143 +#: ishtar_common/models_common.py:2144 msgid "Use this for update imports" msgstr "Utilisez cela pour des imports de mise à jour" -#: ishtar_common/models_common.py:2150 +#: ishtar_common/models_common.py:2151 msgid "For instance: topographical survey, georeferencing, ..." msgstr "Par exemple : levé topographiques, géoréférencement, ..." -#: ishtar_common/models_common.py:2158 +#: ishtar_common/models_common.py:2159 msgid "For instance: outline, z-sup, ..." msgstr "Par exemple : contour, Z-supérieur, ..." -#: ishtar_common/models_common.py:2166 +#: ishtar_common/models_common.py:2167 msgid "Data provider" msgstr "Fournisseur de données" -#: ishtar_common/models_common.py:2169 ishtar_common/models_common.py:2170 -#: ishtar_common/models_common.py:2171 +#: ishtar_common/models_common.py:2170 ishtar_common/models_common.py:2171 +#: ishtar_common/models_common.py:2172 msgid "User input" msgstr "Saisie utilisateur" -#: ishtar_common/models_common.py:2174 +#: ishtar_common/models_common.py:2175 msgid "X (cached)" msgstr "X (cache)" -#: ishtar_common/models_common.py:2175 +#: ishtar_common/models_common.py:2176 msgid "Y (cached)" msgstr "Y (cache)" -#: ishtar_common/models_common.py:2176 +#: ishtar_common/models_common.py:2177 msgid "Z (cached)" msgstr "Z (cache)" -#: ishtar_common/models_common.py:2194 +#: ishtar_common/models_common.py:2194 ishtar_common/models_common.py:3540 +msgid "Point (2D)" +msgstr "Point (2D)" + +#: ishtar_common/models_common.py:2195 msgid "Point (3D)" msgstr "Point (3D)" -#: ishtar_common/models_common.py:2195 +#: ishtar_common/models_common.py:2196 msgid "Multi points" msgstr "Points multiples" -#: ishtar_common/models_common.py:2196 +#: ishtar_common/models_common.py:2197 msgid "Multi lines" msgstr "Lignes multiples" -#: ishtar_common/models_common.py:2197 +#: ishtar_common/models_common.py:2198 msgid "Multi polygons" msgstr "Polygones multi-parties" -#: ishtar_common/models_common.py:2200 ishtar_common/models_common.py:2201 +#: ishtar_common/models_common.py:2201 ishtar_common/models_common.py:2202 msgid "Geographic - Vector data" msgstr "Géographie - Donnée vectorielle" -#: ishtar_common/models_common.py:2273 +#: ishtar_common/models_common.py:2274 msgid "Only 2 or 3 dimensions" msgstr "Seulement 2 ou 3 dimensions" -#: ishtar_common/models_common.py:2646 +#: ishtar_common/models_common.py:2647 msgid "Year of creation" msgstr "Année de création" -#: ishtar_common/models_common.py:2650 +#: ishtar_common/models_common.py:2651 msgid "Filling this field is relevant to distinguish old towns from new towns." msgstr "" "Remplir ce champ est nécessaire pour distinguer les anciennes communes des " "nouvelles communes." -#: ishtar_common/models_common.py:2654 +#: ishtar_common/models_common.py:2655 msgid "Town children" msgstr "Communes enfants" -#: ishtar_common/models_common.py:2852 +#: ishtar_common/models_common.py:2856 msgid "Town (precise)" msgstr "Commune (précis)" -#: ishtar_common/models_common.py:2885 +#: ishtar_common/models_common.py:2889 msgid "Raw phone" msgstr "Téléphone brut" -#: ishtar_common/models_common.py:2891 +#: ishtar_common/models_common.py:2895 msgid "Alternative address is prefered" msgstr "L'adresse alternative est préférée" -#: ishtar_common/models_common.py:2928 +#: ishtar_common/models_common.py:2932 msgid "No associated address" msgstr "Pas d'adresse associée" -#: ishtar_common/models_common.py:3011 -msgid "Tel: " -msgstr "Tél : " +#: ishtar_common/models_common.py:3013 +msgid "Postal code - Town" +msgstr "Code postal - Commune" -#: ishtar_common/models_common.py:3015 -msgid "Mobile: " -msgstr "Mobile : " +#: ishtar_common/models_common.py:3023 +msgid "Mobile" +msgstr "Mobile" -#: ishtar_common/models_common.py:3019 -msgid "Email: " -msgstr "Courriel : " - -#: ishtar_common/models_common.py:3024 +#: ishtar_common/models_common.py:3041 msgid "Merge key" msgstr "Clé de fusion" -#: ishtar_common/models_common.py:3235 +#: ishtar_common/models_common.py:3252 msgctxt "key for text search" msgid "has-url" msgstr "a-une-url" -#: ishtar_common/models_common.py:3239 +#: ishtar_common/models_common.py:3256 msgctxt "key for text search" msgid "has-attached-file" msgstr "a-un-fichier" -#: ishtar_common/models_common.py:3315 +#: ishtar_common/models_common.py:3332 msgid "Add document/image" msgstr "Ajouter un document / une image" -#: ishtar_common/models_common.py:3317 +#: ishtar_common/models_common.py:3334 msgid "doc./image" msgstr "doc./image" -#: ishtar_common/models_common.py:3500 +#: ishtar_common/models_common.py:3517 msgid "Precise" msgstr "Précis" -#: ishtar_common/models_common.py:3500 +#: ishtar_common/models_common.py:3517 msgid "Polygon" msgstr "Polygone" -#: ishtar_common/models_common.py:3525 +#: ishtar_common/models_common.py:3542 msgid "Point source" msgstr "Source du point" -#: ishtar_common/models_common.py:3528 +#: ishtar_common/models_common.py:3545 msgid "Point source item" msgstr "Élément source du point" -#: ishtar_common/models_common.py:3532 +#: ishtar_common/models_common.py:3547 +msgid "Multi polygon" +msgstr "Polygones multi-parties" + +#: ishtar_common/models_common.py:3549 msgid "Multi-polygon source" msgstr "Source du multi-polygone" -#: ishtar_common/models_common.py:3539 +#: ishtar_common/models_common.py:3556 msgid "Multi polygon source item" msgstr "Élément source du multi-polygone" -#: ishtar_common/models_common.py:4086 +#: ishtar_common/models_common.py:4107 msgid "Regenerate ID" msgstr "Re-générer l'identifiant" -#: ishtar_common/models_common.py:4088 +#: ishtar_common/models_common.py:4109 msgid "regen." msgstr "regén." @@ -11946,8 +11958,12 @@ msgid "Skip lines" msgstr "Nombre de lignes d'entête" #: ishtar_common/models_imports.py:1171 -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)." +msgid "" +"Number of header lines in your file (can be 0 and should be 0 for geopackage " +"or Shapefile)." +msgstr "" +"Nombre de lignes d'entête dans votre fichier (peut être égal à zéro et doit être " +"égal à zéro pour geopackage et Shapefile)." #: ishtar_common/models_imports.py:1174 msgid "Error file" @@ -12034,7 +12050,6 @@ msgid "Step by step re-import" msgstr "Ré-import pas à pas" #: ishtar_common/models_imports.py:1369 -#: ishtar_common/templates/ishtar/import_table.html:51 msgid "Archive" msgstr "Archiver" @@ -12049,7 +12064,7 @@ msgstr "Modifier" #: ishtar_common/models_imports.py:1375 #: ishtar_common/templates/ishtar/blocks/window_nav.html:66 #: ishtar_common/templates/ishtar/form_delete.html:11 -#: ishtar_common/views.py:2434 ishtar_common/widgets.py:452 +#: ishtar_common/views.py:2435 ishtar_common/widgets.py:452 #: ishtar_common/widgets.py:488 msgid "Delete" msgstr "Supprimer" @@ -12282,13 +12297,13 @@ msgstr "Voir sur le site" #: ishtar_common/templates/admin/change_form.html:24 #: ishtar_common/templates/admin/change_form.html:27 -#: ishtar_common/views.py:1673 ishtar_common/views.py:1677 +#: ishtar_common/views.py:1674 ishtar_common/views.py:1678 msgid "Previous" msgstr "Précédent" #: ishtar_common/templates/admin/change_form.html:32 #: ishtar_common/templates/admin/change_form.html:35 -#: ishtar_common/views.py:1680 ishtar_common/views.py:1682 +#: ishtar_common/views.py:1681 ishtar_common/views.py:1683 msgid "Next" msgstr "Suivant" @@ -12757,15 +12772,15 @@ msgctxt "Sheet" msgid "Modification" msgstr "Modification" -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:5 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:6 msgid "Main" msgstr "Principal" -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:8 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:9 msgid "Geometry" msgstr "Géométrie" -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:32 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:33 msgid "geo item" msgstr "élément géographique" @@ -12921,7 +12936,6 @@ msgstr "Rechercher et sélectionner un élément dans le tableau" #: ishtar_common/templates/ishtar/formset.html:8 #: ishtar_common/templates/ishtar/formset_import_match.html:113 #: ishtar_common/templates/ishtar/import_list.html:38 -#: ishtar_common/templates/ishtar/merge.html:42 #: 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 @@ -13099,7 +13113,7 @@ msgid "Go" msgstr "Aller" #: ishtar_common/templates/ishtar/import_step_by_step.html:63 -#: ishtar_common/views.py:1516 +#: ishtar_common/views.py:1517 msgid "Import step by step" msgstr "Import pas à pas" @@ -13224,6 +13238,11 @@ msgstr "Contrôle" msgid "Match" msgstr "Correspondance" +#: ishtar_common/templates/ishtar/import_table.html:51 +msgctxt "name" +msgid "Archive" +msgstr "Archive" + #: ishtar_common/templates/ishtar/import_table.html:56 msgid "Media file" msgstr "Fichier média" @@ -13722,7 +13741,7 @@ msgstr "Pas de résultats" msgid "Loading..." msgstr "Chargement..." -#: ishtar_common/utils.py:192 ishtar_common/views.py:121 +#: ishtar_common/utils.py:192 ishtar_common/views.py:122 msgid "You don't have sufficient permissions to do this action." msgstr "" "Vous n'avez pas les permissions suffisantes pour effectuer cette action." @@ -13743,7 +13762,7 @@ msgstr "Charger une autre image au hasard ?" msgid "The maximum supported file size is {} Mo." msgstr "La taille maximale supportée pour le fichier est de {} Mo." -#: ishtar_common/views.py:148 +#: ishtar_common/views.py:149 msgid "" "PROJECT_SLUG is set to \"default\". Change it in your local_settings (or ask " "your admin to do it)." @@ -13752,7 +13771,7 @@ msgstr "" "default ». Changez-le sur la page d'administration (ou demandez à un " "administrateur de le faire)." -#: ishtar_common/views.py:156 +#: ishtar_common/views.py:157 msgid "" "The slug of your current profile is set to \"default\". Change it on the " "administration page (or ask your admin to do it)." @@ -13760,148 +13779,148 @@ msgstr "" "PROJECT_SLUG a été laissé à la valeur « default ». Changez-le dans le " "fichier local_settings (ou demandez à un administrateur de le faire)." -#: ishtar_common/views.py:198 +#: ishtar_common/views.py:199 msgid "Person modification" msgstr "Modifier une personne" -#: ishtar_common/views.py:218 +#: ishtar_common/views.py:219 msgid "Person deletion" msgstr "Supprimer une personne" -#: ishtar_common/views.py:255 +#: ishtar_common/views.py:256 msgid "Organization modification" msgstr "Modifier une organisation" -#: ishtar_common/views.py:281 +#: ishtar_common/views.py:282 msgid "Organization deletion" msgstr "Supprimer une organisation" -#: ishtar_common/views.py:307 +#: ishtar_common/views.py:308 msgid "Account management" msgstr "Gérer les comptes" -#: ishtar_common/views.py:316 +#: ishtar_common/views.py:317 msgid "Account deletion" msgstr "Supprimer un compte" -#: ishtar_common/views.py:983 ishtar_common/views_item.py:176 +#: ishtar_common/views.py:984 ishtar_common/views_item.py:176 #: ishtar_common/views_item.py:217 ishtar_common/views_item.py:234 msgid "Operation not permitted." msgstr "Opération non permise." -#: ishtar_common/views.py:1387 +#: ishtar_common/views.py:1388 msgid "Import: create (table)" msgstr "Import : créer (table)" -#: ishtar_common/views.py:1407 +#: ishtar_common/views.py:1408 msgid "Edit import" msgstr "Modifier l'import" -#: ishtar_common/views.py:1429 +#: ishtar_common/views.py:1430 msgid "Import: create (GIS)" msgstr "Import : créer (SIG)" -#: ishtar_common/views.py:1865 +#: ishtar_common/views.py:1866 msgid "Col. " msgstr "Col. " -#: ishtar_common/views.py:1872 ishtar_common/views.py:1887 +#: ishtar_common/views.py:1873 ishtar_common/views.py:1888 msgid "* empty *" msgstr "* vide *" -#: ishtar_common/views.py:1929 +#: ishtar_common/views.py:1930 msgid "Link unmatched items" msgstr "Associer les éléments non rapprochés" -#: ishtar_common/views.py:1965 +#: ishtar_common/views.py:1966 msgid "Delete import" msgstr "Supprimer un import" -#: ishtar_common/views.py:2003 +#: ishtar_common/views.py:2004 msgid "Merge persons" msgstr "Fusionner des personnes" -#: ishtar_common/views.py:2027 +#: ishtar_common/views.py:2028 msgid "Select the main person" msgstr "Choisir la personne principale" -#: ishtar_common/views.py:2035 +#: ishtar_common/views.py:2036 msgid "Merge organization" msgstr "Fusionner des organisations" -#: ishtar_common/views.py:2045 +#: ishtar_common/views.py:2046 msgid "Select the main organization" msgstr "Sélectionner l'organisation principale" -#: ishtar_common/views.py:2085 ishtar_common/views.py:2100 +#: ishtar_common/views.py:2086 ishtar_common/views.py:2101 msgid "Corporation manager" msgstr "Représentant de la personne morale" -#: ishtar_common/views.py:2114 +#: ishtar_common/views.py:2115 msgid "New tag" msgstr "Nouvelle étiquette" -#: ishtar_common/views.py:2127 +#: ishtar_common/views.py:2128 msgid "Document: search" msgstr "Document : recherche" -#: ishtar_common/views.py:2147 +#: ishtar_common/views.py:2148 msgid "Document creation" msgstr "Document : création" -#: ishtar_common/views.py:2215 +#: ishtar_common/views.py:2216 msgid "Document modification" msgstr "Document : modification" -#: ishtar_common/views.py:2242 +#: ishtar_common/views.py:2243 msgid "Main image for" msgstr "Image principale pour" -#: ishtar_common/views.py:2267 +#: ishtar_common/views.py:2268 msgid "Document deletion" msgstr "Document : suppression" -#: ishtar_common/views.py:2304 +#: ishtar_common/views.py:2305 msgid "Error on your template" msgstr "Erreur sur votre patron" -#: ishtar_common/views.py:2410 +#: ishtar_common/views.py:2411 msgid "Delete bookmark" msgstr "Supprimer le marque page" -#: ishtar_common/views.py:2433 +#: ishtar_common/views.py:2434 msgid "Bookmark - Delete" msgstr "Marque page - Suppression" -#: ishtar_common/views.py:2476 +#: ishtar_common/views.py:2477 msgid "Some items have been locked by other users." msgstr "Des éléments ont été verrouillés par d'autres utilisateurs." -#: ishtar_common/views.py:2477 +#: ishtar_common/views.py:2478 msgid "Some items are locked." msgstr "Des éléments sont verrouillés." -#: ishtar_common/views.py:2482 +#: ishtar_common/views.py:2483 msgid "Not available" msgstr "Non disponible" -#: ishtar_common/views.py:2483 +#: ishtar_common/views.py:2484 msgid "Action not available for these items." msgstr "Action non disponible pour ces éléments." -#: ishtar_common/views.py:2601 +#: ishtar_common/views.py:2602 msgid "lock/unlock" msgstr "verrouiller/déverrouiller" -#: ishtar_common/views.py:2717 ishtar_common/views.py:2811 +#: ishtar_common/views.py:2718 ishtar_common/views.py:2852 msgid "Geo item creation" msgstr "Élément géographique création" -#: ishtar_common/views.py:2762 +#: ishtar_common/views.py:2803 msgid "Geo item modification" msgstr "Élément géographique modification" -#: ishtar_common/views.py:2800 ishtar_common/views.py:2846 +#: ishtar_common/views.py:2841 ishtar_common/views.py:2887 msgid "Main geo item for" msgstr "Élément géo. principal pour" @@ -13986,6 +14005,12 @@ msgstr "Surcharge de traduction" msgid "Translations overload" msgstr "Surcharges de traductions" +#~ msgid "Tel: " +#~ msgstr "Tél : " + +#~ msgid "Email: " +#~ msgstr "Courriel : " + #~ msgid "Currently empty" #~ msgstr "Actuellement vide" diff --git a/locale/pt/LC_MESSAGES/django.po b/locale/pt/LC_MESSAGES/django.po index fa033835c..1d9afe7be 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-09-09 16:11+0200\n" +"POT-Creation-Date: 2022-09-29 11:29+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -18,17 +18,6 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: archaeological_context_records/admin.py:51 -#: archaeological_operations/admin.py:86 ishtar_common/forms_common.py:2905 -#: ishtar_common/models_common.py:2111 ishtar_common/models_common.py:3522 -msgid "Point" -msgstr "" - -#: archaeological_context_records/admin.py:53 archaeological_finds/admin.py:40 -#: archaeological_operations/admin.py:88 ishtar_common/models_common.py:3530 -msgid "Multi polygon" -msgstr "" - #: archaeological_context_records/forms.py:78 #: archaeological_context_records/forms.py:84 #: archaeological_context_records/models.py:527 @@ -47,12 +36,12 @@ msgstr "" #: archaeological_operations/models.py:2354 #: archaeological_operations/models.py:2470 #: archaeological_operations/models.py:2669 -#: archaeological_operations/models.py:2959 +#: archaeological_operations/models.py:2958 #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:254 #: archaeological_operations/wizards.py:266 -#: archaeological_warehouse/models.py:857 ishtar_common/forms_common.py:2133 -#: ishtar_common/models.py:5063 ishtar_common/views.py:396 +#: archaeological_warehouse/models.py:857 ishtar_common/forms_common.py:2136 +#: ishtar_common/models.py:5066 ishtar_common/views.py:397 msgid "Operation" msgstr "" @@ -97,7 +86,7 @@ msgid "Context record - 001 - Search" msgstr "" #: archaeological_context_records/forms.py:142 archaeological_files/forms.py:82 -#: archaeological_files/forms.py:883 archaeological_files/forms.py:920 +#: archaeological_files/forms.py:883 archaeological_files/forms.py:919 #: archaeological_finds/forms.py:1362 archaeological_finds/forms.py:2060 #: archaeological_finds/forms_treatments.py:52 #: archaeological_finds/forms_treatments.py:605 @@ -107,8 +96,8 @@ msgstr "" #: archaeological_operations/forms.py:1312 #: archaeological_operations/forms.py:1547 #: archaeological_warehouse/forms.py:140 archaeological_warehouse/forms.py:505 -#: ishtar_common/forms_common.py:581 ishtar_common/forms_common.py:758 -#: ishtar_common/forms_common.py:975 ishtar_common/forms_common.py:2050 +#: ishtar_common/forms_common.py:583 ishtar_common/forms_common.py:761 +#: ishtar_common/forms_common.py:978 ishtar_common/forms_common.py:2053 msgid "Full text search" msgstr "" @@ -123,7 +112,7 @@ msgid "ID" msgstr "" #: archaeological_context_records/forms.py:149 -#: archaeological_finds/forms.py:1382 archaeological_operations/forms.py:1866 +#: archaeological_finds/forms.py:1382 archaeological_operations/forms.py:1862 msgid "Code PATRIARCHE" msgstr "" @@ -132,7 +121,7 @@ msgid "Operation - name" msgstr "" #: archaeological_context_records/forms.py:152 -#: ishtar_common/forms_common.py:2144 +#: ishtar_common/forms_common.py:2147 msgid "Operation - year" msgstr "" @@ -145,7 +134,7 @@ msgstr "" #: archaeological_context_records/forms.py:737 #: archaeological_context_records/models.py:727 #: archaeological_operations/forms.py:550 -#: archaeological_operations/models.py:534 ishtar_common/models.py:5064 +#: archaeological_operations/models.py:534 ishtar_common/models.py:5067 msgid "Archaeological site" msgstr "" @@ -168,13 +157,13 @@ msgstr "" #: archaeological_context_records/models.py:705 #: archaeological_context_records/models.py:1416 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:128 -#: archaeological_files/forms.py:89 archaeological_files/forms.py:934 +#: archaeological_files/forms.py:89 archaeological_files/forms.py:932 #: archaeological_finds/models_finds.py:1097 #: archaeological_operations/forms.py:500 #: archaeological_operations/forms.py:1140 -#: archaeological_operations/forms.py:1563 -#: archaeological_operations/models.py:2983 -#: archaeological_operations/models.py:3230 +#: archaeological_operations/forms.py:1561 +#: archaeological_operations/models.py:2982 +#: archaeological_operations/models.py:3229 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Parcel" msgstr "" @@ -209,7 +198,7 @@ msgstr "" #: archaeological_files_pdl/forms.py:61 archaeological_operations/forms.py:756 #: archaeological_operations/forms.py:782 #: archaeological_operations/forms.py:1420 -#: archaeological_operations/forms.py:1618 +#: archaeological_operations/forms.py:1616 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:46 #: archaeological_operations/templates/ishtar/sheet_site.html:41 @@ -232,15 +221,15 @@ msgstr "" #: archaeological_finds/models_finds.py:1094 #: archaeological_operations/forms.py:71 archaeological_operations/forms.py:209 #: archaeological_operations/forms.py:1112 -#: archaeological_operations/models.py:2964 +#: archaeological_operations/models.py:2963 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:432 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:446 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:687 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:701 #: archaeological_warehouse/forms.py:145 ishtar_common/forms_common.py:84 -#: ishtar_common/forms_common.py:106 ishtar_common/models_common.py:2662 -#: ishtar_common/models_common.py:3500 +#: ishtar_common/forms_common.py:106 ishtar_common/models_common.py:2663 +#: ishtar_common/models_common.py:3517 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 msgid "Town" msgstr "" @@ -273,8 +262,8 @@ msgstr "" #: archaeological_finds/models_finds.py:1810 #: archaeological_finds/models_treatments.py:255 #: archaeological_finds/templates/ishtar/sheet_find.html:180 -#: ishtar_common/forms_common.py:1799 ishtar_common/forms_common.py:2067 -#: ishtar_common/models.py:1049 ishtar_common/models.py:4178 +#: ishtar_common/forms_common.py:1802 ishtar_common/forms_common.py:2070 +#: ishtar_common/models.py:1049 ishtar_common/models.py:4181 #: ishtar_common/models_imports.py:147 ishtar_common/models_imports.py:531 #: ishtar_common/models_imports.py:629 ishtar_common/models_imports.py:647 msgid "Description" @@ -351,7 +340,7 @@ msgid "Closing date" msgstr "" #: archaeological_context_records/forms.py:334 -#: ishtar_common/forms_common.py:1639 +#: ishtar_common/forms_common.py:1642 msgid "Documentation" msgstr "" @@ -368,59 +357,59 @@ msgstr "" #: archaeological_context_records/forms.py:346 #: archaeological_finds/forms.py:522 archaeological_operations/forms.py:1209 #: archaeological_operations/forms.py:1457 -#: archaeological_warehouse/forms.py:249 ishtar_common/forms_common.py:2904 +#: archaeological_warehouse/forms.py:249 ishtar_common/forms_common.py:2929 msgid "Coordinates" msgstr "" #: archaeological_context_records/forms.py:347 #: archaeological_finds/forms.py:523 archaeological_operations/forms.py:1210 #: archaeological_operations/forms.py:1458 -#: archaeological_warehouse/forms.py:250 ishtar_common/models_common.py:2169 -#: ishtar_common/models_common.py:3503 +#: archaeological_warehouse/forms.py:250 ishtar_common/models_common.py:2170 +#: ishtar_common/models_common.py:3520 msgid "X" msgstr "" #: archaeological_context_records/forms.py:349 #: archaeological_finds/forms.py:525 archaeological_operations/forms.py:1211 -#: archaeological_operations/forms.py:1459 ishtar_common/forms_common.py:2643 -#: ishtar_common/models_common.py:2178 ishtar_common/models_common.py:3507 +#: archaeological_operations/forms.py:1459 ishtar_common/forms_common.py:2645 +#: ishtar_common/models_common.py:2179 ishtar_common/models_common.py:3524 msgid "Estimated error for X" msgstr "" #: archaeological_context_records/forms.py:351 #: archaeological_finds/forms.py:527 archaeological_operations/forms.py:1213 #: archaeological_operations/forms.py:1461 -#: archaeological_warehouse/forms.py:251 ishtar_common/models_common.py:2170 -#: ishtar_common/models_common.py:3504 +#: archaeological_warehouse/forms.py:251 ishtar_common/models_common.py:2171 +#: ishtar_common/models_common.py:3521 msgid "Y" msgstr "" #: archaeological_context_records/forms.py:353 #: archaeological_finds/forms.py:529 archaeological_operations/forms.py:1214 -#: archaeological_operations/forms.py:1462 ishtar_common/forms_common.py:2647 -#: ishtar_common/models_common.py:2181 ishtar_common/models_common.py:3510 +#: archaeological_operations/forms.py:1462 ishtar_common/forms_common.py:2649 +#: ishtar_common/models_common.py:2182 ishtar_common/models_common.py:3527 msgid "Estimated error for Y" msgstr "" #: archaeological_context_records/forms.py:355 #: archaeological_finds/forms.py:531 archaeological_operations/forms.py:1216 -#: archaeological_operations/forms.py:1464 ishtar_common/models_common.py:2171 -#: ishtar_common/models_common.py:3505 +#: archaeological_operations/forms.py:1464 ishtar_common/models_common.py:2172 +#: ishtar_common/models_common.py:3522 msgid "Z" msgstr "" #: archaeological_context_records/forms.py:357 #: archaeological_finds/forms.py:533 archaeological_operations/forms.py:1217 -#: archaeological_operations/forms.py:1465 ishtar_common/forms_common.py:2651 -#: ishtar_common/models_common.py:2184 ishtar_common/models_common.py:3513 +#: archaeological_operations/forms.py:1465 ishtar_common/forms_common.py:2653 +#: ishtar_common/models_common.py:2185 ishtar_common/models_common.py:3530 msgid "Estimated error for Z" msgstr "" #: archaeological_context_records/forms.py:360 #: archaeological_finds/forms.py:536 archaeological_operations/forms.py:1220 #: archaeological_operations/forms.py:1468 -#: archaeological_warehouse/forms.py:253 ishtar_common/models_common.py:2188 -#: ishtar_common/models_common.py:3517 +#: archaeological_warehouse/forms.py:253 ishtar_common/models_common.py:2189 +#: ishtar_common/models_common.py:3534 msgid "Spatial Reference System" msgstr "" @@ -473,7 +462,7 @@ msgstr "" #: archaeological_operations/forms.py:858 #: archaeological_operations/models.py:103 #: archaeological_operations/models.py:1243 -#: archaeological_operations/models.py:3234 +#: archaeological_operations/models.py:3233 msgid "Start date" msgstr "" @@ -489,7 +478,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:464 #: archaeological_finds/templates/ishtar/sheet_find.html:502 #: archaeological_operations/models.py:104 -#: archaeological_operations/models.py:3235 +#: archaeological_operations/models.py:3234 #: ishtar_common/models_imports.py:1217 msgid "End date" msgstr "" @@ -531,8 +520,8 @@ msgstr "" #: archaeological_finds/models_finds.py:2404 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 #: archaeological_finds/wizards.py:93 archaeological_warehouse/forms.py:562 -#: ishtar_common/forms_common.py:2146 ishtar_common/models.py:5065 -#: ishtar_common/views.py:400 +#: ishtar_common/forms_common.py:2149 ishtar_common/models.py:5068 +#: ishtar_common/views.py:401 msgid "Context record" msgstr "" @@ -572,7 +561,7 @@ msgstr "" #: archaeological_finds/forms.py:277 archaeological_finds/forms.py:641 #: archaeological_finds/forms.py:817 #: archaeological_finds/templates/ishtar/sheet_find.html:158 -#: ishtar_common/forms_common.py:1852 +#: ishtar_common/forms_common.py:1855 #: ishtar_common/templates/ishtar/organization_person_form.html:9 #: ishtar_common/templates/ishtar/person_form.html:9 #: ishtar_common/templates/ishtar/sheet_document.html:34 @@ -621,8 +610,8 @@ msgstr "" #: archaeological_context_records/forms.py:666 #: archaeological_finds/forms.py:1070 archaeological_finds/forms.py:1095 -#: archaeological_operations/forms.py:1936 ishtar_common/forms_common.py:2307 -#: ishtar_common/models.py:3157 ishtar_common/models.py:3516 +#: archaeological_operations/forms.py:1932 ishtar_common/forms_common.py:2310 +#: ishtar_common/models.py:3160 ishtar_common/models.py:3519 msgid " - duplicate" msgstr "" @@ -801,8 +790,8 @@ msgstr "" #: archaeological_finds/models_finds.py:3334 #: archaeological_finds/models_treatments.py:734 #: archaeological_finds/templates/ishtar/sheet_find.html:4 -#: ishtar_common/forms_common.py:2162 ishtar_common/models.py:5066 -#: ishtar_common/views.py:404 +#: ishtar_common/forms_common.py:2165 ishtar_common/models.py:5069 +#: ishtar_common/views.py:405 msgid "Find" msgstr "" @@ -824,14 +813,14 @@ msgstr "" #: archaeological_operations/models.py:127 #: archaeological_operations/models.py:145 #: archaeological_operations/models.py:154 -#: archaeological_operations/models.py:3792 +#: archaeological_operations/models.py:3791 #: archaeological_warehouse/forms.py:108 archaeological_warehouse/models.py:695 #: archaeological_warehouse/models.py:727 ishtar_common/models.py:691 #: ishtar_common/models.py:746 ishtar_common/models.py:788 -#: ishtar_common/models.py:1732 ishtar_common/models.py:3525 -#: ishtar_common/models.py:4843 ishtar_common/models_common.py:2006 -#: ishtar_common/models_common.py:2039 ishtar_common/models_common.py:2055 -#: ishtar_common/models_common.py:2071 ishtar_common/models_common.py:2083 +#: ishtar_common/models.py:1732 ishtar_common/models.py:3528 +#: ishtar_common/models.py:4846 ishtar_common/models_common.py:2007 +#: ishtar_common/models_common.py:2040 ishtar_common/models_common.py:2056 +#: ishtar_common/models_common.py:2072 ishtar_common/models_common.py:2084 msgid "Order" msgstr "" @@ -950,12 +939,12 @@ msgstr "" #: archaeological_operations/models.py:349 #: archaeological_operations/models.py:1057 #: archaeological_operations/tests.py:2990 -#: archaeological_warehouse/models.py:316 +#: archaeological_warehouse/models.py:316 ishtar_common/models.py:2465 msgctxt "key for text search" msgid "town" msgstr "" -#: archaeological_context_records/models.py:578 ishtar_common/models.py:3929 +#: archaeological_context_records/models.py:578 ishtar_common/models.py:3932 msgctxt "key for text search" msgid "operation-year" msgstr "" @@ -986,8 +975,8 @@ msgstr "" #: archaeological_finds/models_finds.py:1354 #: archaeological_finds/models_finds.py:1726 #: archaeological_operations/models.py:384 -#: archaeological_operations/models.py:409 ishtar_common/models.py:3921 -#: ishtar_common/models.py:4026 +#: archaeological_operations/models.py:409 ishtar_common/models.py:3924 +#: ishtar_common/models.py:4029 msgctxt "key for text search" msgid "operation" msgstr "" @@ -997,8 +986,8 @@ msgstr "" #: archaeological_finds/models_finds.py:1269 #: archaeological_operations/models.py:1141 #: archaeological_operations/models.py:1205 -#: archaeological_warehouse/models.py:937 ishtar_common/models.py:3957 -#: ishtar_common/models.py:4035 +#: archaeological_warehouse/models.py:937 ishtar_common/models.py:3960 +#: ishtar_common/models.py:4038 msgctxt "key for text search" msgid "site" msgstr "" @@ -1063,8 +1052,8 @@ msgstr "" #: archaeological_operations/models.py:435 #: archaeological_operations/models.py:1181 #: archaeological_warehouse/models.py:327 -#: archaeological_warehouse/models.py:1049 ishtar_common/models.py:2465 -#: ishtar_common/models.py:2731 ishtar_common/models.py:4052 +#: archaeological_warehouse/models.py:1049 ishtar_common/models.py:2472 +#: ishtar_common/models.py:2734 ishtar_common/models.py:4055 msgid "Bulk update" msgstr "" @@ -1083,10 +1072,10 @@ msgstr "" #: archaeological_operations/views.py:848 #: archaeological_operations/views.py:863 #: archaeological_operations/views.py:870 -#: archaeological_operations/views.py:887 ishtar_common/admin.py:1450 -#: ishtar_common/admin.py:1570 ishtar_common/models.py:4061 -#: ishtar_common/models.py:4405 ishtar_common/views.py:2636 -#: ishtar_common/views.py:2654 +#: archaeological_operations/views.py:887 ishtar_common/admin.py:1455 +#: ishtar_common/admin.py:1575 ishtar_common/models.py:4064 +#: ishtar_common/models.py:4408 ishtar_common/views.py:2637 +#: ishtar_common/views.py:2655 msgid "Duplicate" msgstr "" @@ -1095,23 +1084,23 @@ msgstr "" #: archaeological_finds/models_finds.py:1799 #: archaeological_finds/models_treatments.py:252 #: archaeological_finds/models_treatments.py:1100 -#: archaeological_operations/models.py:2972 +#: archaeological_operations/models.py:2971 #: archaeological_warehouse/models.py:388 -#: archaeological_warehouse/models.py:1133 ishtar_common/models.py:4087 +#: archaeological_warehouse/models.py:1133 ishtar_common/models.py:4090 msgid "External ID" msgstr "" #: archaeological_context_records/models.py:701 #: archaeological_files/models.py:533 archaeological_finds/models_finds.py:406 #: archaeological_finds/models_finds.py:1801 -#: archaeological_operations/models.py:2975 +#: archaeological_operations/models.py:2974 #: archaeological_warehouse/models.py:390 #: archaeological_warehouse/models.py:1135 msgid "External ID is set automatically" msgstr "" #: archaeological_context_records/models.py:746 -#: archaeological_operations/models.py:1296 ishtar_common/models_common.py:2632 +#: archaeological_operations/models.py:1296 ishtar_common/models_common.py:2633 msgid "Surface (m2)" msgstr "" @@ -1152,7 +1141,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 #: archaeological_operations/models.py:495 #: archaeological_operations/models.py:1370 -#: archaeological_operations/models.py:2719 +#: archaeological_operations/models.py:2718 #: archaeological_operations/templates/ishtar/sheet_operation.html:63 #: archaeological_operations/templates/ishtar/sheet_site.html:97 #: archaeological_warehouse/models.py:377 @@ -1160,7 +1149,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:46 #: archaeological_warehouse/templates/ishtar/sheet_container.html:179 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:42 -#: ishtar_common/models.py:4203 +#: ishtar_common/models.py:4206 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_person.html:161 msgid "Documents" @@ -1172,7 +1161,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1157 #: archaeological_operations/models.py:501 #: archaeological_operations/models.py:1376 -#: archaeological_operations/models.py:2726 +#: archaeological_operations/models.py:2725 #: archaeological_warehouse/models.py:384 #: archaeological_warehouse/models.py:1147 msgid "Main image" @@ -1184,9 +1173,9 @@ msgstr "" #: archaeological_finds/models_treatments.py:1169 #: archaeological_operations/models.py:506 #: archaeological_operations/models.py:1381 -#: archaeological_operations/models.py:2979 ishtar_common/models.py:2489 -#: ishtar_common/models.py:2780 ishtar_common/models.py:3552 -#: ishtar_common/models_common.py:2657 ishtar_common/models_common.py:2680 +#: archaeological_operations/models.py:2978 ishtar_common/models.py:2496 +#: ishtar_common/models.py:2783 ishtar_common/models.py:3555 +#: ishtar_common/models_common.py:2658 ishtar_common/models_common.py:2681 msgid "Cached name" msgstr "" @@ -1353,7 +1342,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:174 #: archaeological_warehouse/templates/ishtar/sheet_container.html:221 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:177 -#: ishtar_common/views.py:1005 ishtar_common/views.py:1077 +#: ishtar_common/views.py:1006 ishtar_common/views.py:1078 msgid "Finds" msgstr "" @@ -1377,7 +1366,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:27 #: archaeological_warehouse/templates/ishtar/sheet_container.html:70 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:63 -#: ishtar_common/models_common.py:3708 +#: ishtar_common/models_common.py:3725 #: ishtar_common/templates/ishtar/sheet_document.html:37 msgid "Complete identifier" msgstr "" @@ -1399,7 +1388,7 @@ msgstr "" #: archaeological_warehouse/models.py:1105 #: archaeological_warehouse/templates/ishtar/sheet_container.html:152 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:102 -#: ishtar_common/models_common.py:2634 +#: ishtar_common/models_common.py:2635 msgid "Localisation" msgstr "" @@ -1410,7 +1399,6 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:219 #: archaeological_operations/templates/ishtar/sheet_operation.html:270 #: ishtar_common/templates/ishtar/blocks/window_image.html:5 -#: sra_idf_app/templates/ishtar/sheet_basefind.html:48 msgid "Sheet" msgstr "" @@ -1446,9 +1434,9 @@ 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:176 -#: ishtar_common/models.py:3232 ishtar_common/models.py:4961 -#: ishtar_common/models.py:5094 ishtar_common/models.py:5172 -#: ishtar_common/models_common.py:1936 ishtar_common/models_common.py:1951 +#: ishtar_common/models.py:3235 ishtar_common/models.py:4964 +#: ishtar_common/models.py:5097 ishtar_common/models.py:5175 +#: ishtar_common/models_common.py:1937 ishtar_common/models_common.py:1952 #: ishtar_common/models_imports.py:1206 msgid "State" msgstr "" @@ -1547,7 +1535,7 @@ msgstr "" #: archaeological_files/forms.py:85 archaeological_files/forms.py:268 #: archaeological_files/forms.py:329 archaeological_files/forms.py:890 -#: archaeological_files/forms.py:927 archaeological_files/models.py:380 +#: archaeological_files/forms.py:926 archaeological_files/models.py:380 #: archaeological_files/models.py:522 #: archaeological_files/templates/ishtar/sheet_file.html:217 #: archaeological_files_pdl/forms.py:67 archaeological_files_pdl/forms.py:457 @@ -1565,12 +1553,12 @@ msgstr "" #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:490 #: archaeological_operations/forms.py:803 #: archaeological_operations/forms.py:1551 -#: archaeological_operations/forms.py:1868 +#: archaeological_operations/forms.py:1864 #: archaeological_operations/models.py:909 #: archaeological_operations/models.py:1280 #: archaeological_operations/models.py:2468 #: archaeological_operations/models.py:2697 -#: archaeological_operations/models.py:2962 +#: archaeological_operations/models.py:2961 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 #: ishtar_common/models_imports.py:937 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:196 @@ -1585,29 +1573,33 @@ msgid "Numeric reference" msgstr "" #: archaeological_files/forms.py:87 archaeological_files/forms.py:279 +#: archaeological_files/forms.py:892 archaeological_files/forms.py:928 #: archaeological_operations/forms.py:1197 #: archaeological_operations/forms.py:1317 #: archaeological_operations/forms.py:1432 +#: archaeological_operations/forms.py:1553 +#: archaeological_operations/forms.py:1630 #: archaeological_operations/models.py:454 +#: archaeological_operations/models.py:2700 msgid "Other reference" msgstr "" -#: archaeological_files/forms.py:92 archaeological_files/forms.py:899 -#: archaeological_files/forms.py:937 archaeological_files/models.py:1330 +#: archaeological_files/forms.py:92 archaeological_files/forms.py:898 +#: archaeological_files/forms.py:935 archaeological_files/models.py:1330 #: archaeological_operations/forms.py:503 -#: archaeological_operations/forms.py:1566 +#: archaeological_operations/forms.py:1564 #: archaeological_operations/models.py:2340 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:390 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:411 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:643 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:664 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:666 -#: ishtar_common/models_common.py:1959 ishtar_common/models_common.py:2640 +#: ishtar_common/models_common.py:1960 ishtar_common/models_common.py:2641 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" -#: archaeological_files/forms.py:94 archaeological_files/forms.py:947 +#: archaeological_files/forms.py:94 archaeological_files/forms.py:945 msgid "File name" msgstr "" @@ -1654,19 +1646,19 @@ msgstr "" #: archaeological_operations/forms.py:817 #: archaeological_operations/forms.py:1325 #: archaeological_operations/forms.py:1446 -#: archaeological_operations/forms.py:1569 -#: archaeological_operations/forms.py:1631 +#: archaeological_operations/forms.py:1567 +#: archaeological_operations/forms.py:1629 #: archaeological_operations/models.py:466 #: archaeological_operations/models.py:1365 -#: archaeological_operations/models.py:2715 +#: archaeological_operations/models.py:2714 #: archaeological_warehouse/forms.py:226 archaeological_warehouse/forms.py:381 #: archaeological_warehouse/forms.py:513 archaeological_warehouse/models.py:367 -#: archaeological_warehouse/models.py:1103 ishtar_common/forms_common.py:1797 -#: ishtar_common/forms_common.py:2102 ishtar_common/forms_common.py:2641 -#: ishtar_common/models.py:2769 ishtar_common/models.py:3409 -#: ishtar_common/models.py:4187 ishtar_common/models_common.py:180 -#: ishtar_common/models_common.py:2168 ishtar_common/models_imports.py:709 -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:12 +#: archaeological_warehouse/models.py:1103 ishtar_common/forms_common.py:1800 +#: ishtar_common/forms_common.py:2105 ishtar_common/forms_common.py:2643 +#: ishtar_common/models.py:2772 ishtar_common/models.py:3412 +#: ishtar_common/models.py:4190 ishtar_common/models_common.py:181 +#: ishtar_common/models_common.py:2169 ishtar_common/models_imports.py:709 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:13 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:170 msgid "Comment" msgstr "" @@ -1679,26 +1671,26 @@ msgid "In charge" msgstr "" #: archaeological_files/forms.py:112 archaeological_files/forms.py:364 -#: archaeological_files/forms.py:949 archaeological_files/models.py:548 +#: archaeological_files/forms.py:947 archaeological_files/models.py:548 #: archaeological_files_pdl/forms.py:285 archaeological_files_pdl/forms.py:295 msgid "General contractor" msgstr "" -#: archaeological_files/forms.py:122 archaeological_files/forms.py:959 +#: archaeological_files/forms.py:122 archaeological_files/forms.py:957 msgid "Organization of general contractor" msgstr "" -#: archaeological_files/forms.py:133 archaeological_files/forms.py:990 +#: archaeological_files/forms.py:133 archaeological_files/forms.py:988 #: archaeological_operations/forms.py:556 -#: archaeological_operations/forms.py:1571 ishtar_common/forms.py:926 +#: archaeological_operations/forms.py:1569 ishtar_common/forms.py:926 msgid "Created by" msgstr "" -#: archaeological_files/forms.py:141 archaeological_files/forms.py:998 +#: archaeological_files/forms.py:141 archaeological_files/forms.py:996 #: archaeological_finds/forms_treatments.py:629 #: archaeological_finds/forms_treatments.py:954 #: archaeological_operations/forms.py:562 -#: archaeological_operations/forms.py:1577 +#: archaeological_operations/forms.py:1575 msgid "Modified by" msgstr "" @@ -1711,8 +1703,8 @@ msgstr "" #: archaeological_finds/forms_treatments.py:877 #: archaeological_finds/models_treatments.py:1134 #: archaeological_operations/forms.py:678 -#: archaeological_operations/models.py:1241 ishtar_common/forms_common.py:1792 -#: ishtar_common/forms_common.py:2268 ishtar_common/models.py:4172 +#: archaeological_operations/models.py:1241 ishtar_common/forms_common.py:1795 +#: ishtar_common/forms_common.py:2271 ishtar_common/models.py:4175 #: ishtar_common/models_imports.py:1214 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 msgid "Creation date" @@ -1775,30 +1767,34 @@ msgstr "" #: archaeological_operations/forms.py:1196 #: archaeological_operations/forms.py:1316 #: archaeological_operations/forms.py:1431 -#: archaeological_operations/forms.py:1924 +#: archaeological_operations/forms.py:1920 #: archaeological_operations/models.py:455 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:154 #: archaeological_warehouse/forms.py:143 archaeological_warehouse/forms.py:203 -#: archaeological_warehouse/models.py:347 ishtar_common/forms_common.py:525 -#: ishtar_common/forms_common.py:584 ishtar_common/forms_common.py:761 -#: ishtar_common/forms_common.py:888 ishtar_common/forms_common.py:979 -#: ishtar_common/forms_common.py:1231 ishtar_common/forms_common.py:1284 -#: ishtar_common/forms_common.py:2610 ishtar_common/models.py:690 +#: archaeological_warehouse/models.py:347 ishtar_common/forms_common.py:527 +#: ishtar_common/forms_common.py:586 ishtar_common/forms_common.py:764 +#: ishtar_common/forms_common.py:891 ishtar_common/forms_common.py:982 +#: ishtar_common/forms_common.py:1234 ishtar_common/forms_common.py:1287 +#: ishtar_common/forms_common.py:2613 ishtar_common/models.py:690 #: ishtar_common/models.py:729 ishtar_common/models.py:1043 #: ishtar_common/models.py:1552 ishtar_common/models.py:1940 -#: ishtar_common/models.py:2475 ishtar_common/models.py:2764 -#: ishtar_common/models.py:3090 ishtar_common/models.py:3226 -#: ishtar_common/models.py:4937 ishtar_common/models_common.py:2136 -#: ishtar_common/models_common.py:2631 ishtar_common/models_common.py:2680 +#: ishtar_common/models.py:2482 ishtar_common/models.py:2767 +#: ishtar_common/models.py:3093 ishtar_common/models.py:3229 +#: ishtar_common/models.py:4940 ishtar_common/models_common.py:2137 +#: ishtar_common/models_common.py:2632 ishtar_common/models_common.py:2681 #: ishtar_common/models_imports.py:110 ishtar_common/models_imports.py:144 #: ishtar_common/models_imports.py:628 ishtar_common/models_imports.py:645 #: ishtar_common/models_imports.py:765 ishtar_common/models_imports.py:1126 #: ishtar_common/models_rest.py:94 -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:9 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:10 #: ishtar_common/templates/ishtar/import_step_by_step.html:102 #: ishtar_common/templates/ishtar/import_step_by_step.html:270 #: ishtar_common/templates/ishtar/import_table.html:27 +#: ishtar_common/templates/ishtar/merge_organization.html:9 +#: ishtar_common/templates/ishtar/merge_organization.html:20 +#: ishtar_common/templates/ishtar/merge_person.html:10 +#: ishtar_common/templates/ishtar/merge_person.html:22 #: ishtar_common/templates/ishtar/sheet_organization.html:25 #: ishtar_common/templates/ishtar/sheet_organization.html:53 msgid "Name" @@ -1830,7 +1826,7 @@ msgstr "" #: archaeological_operations/forms.py:1137 #: archaeological_operations/forms.py:1153 #: archaeological_operations/forms.py:1159 -#: archaeological_operations/models.py:2984 +#: archaeological_operations/models.py:2983 #: archaeological_operations/templates/ishtar/sheet_operation.html:494 msgid "Parcels" msgstr "" @@ -1864,7 +1860,7 @@ msgstr "" #: archaeological_files/forms.py:439 archaeological_files/models.py:641 #: archaeological_files_pdl/forms.py:128 archaeological_files_pdl/forms.py:171 -#: archaeological_operations/models.py:2704 ishtar_common/models_common.py:1960 +#: archaeological_operations/models.py:2703 ishtar_common/models_common.py:1961 msgid "Departments" msgstr "" @@ -1907,7 +1903,7 @@ msgstr "" msgid "Preventive file - 020 - Edition form" msgstr "" -#: archaeological_files/forms.py:519 ishtar_common/forms_common.py:1856 +#: archaeological_files/forms.py:519 ishtar_common/forms_common.py:1859 #: ishtar_common/templates/ishtar/sheet_document.html:76 msgid "Dates" msgstr "" @@ -2005,8 +2001,8 @@ msgstr "" msgid "Equipment / service" msgstr "" -#: archaeological_files/forms.py:891 archaeological_files/forms.py:928 -#: archaeological_files/forms.py:1064 +#: archaeological_files/forms.py:891 archaeological_files/forms.py:927 +#: archaeological_files/forms.py:1062 #: archaeological_finds/forms_treatments.py:59 #: archaeological_finds/forms_treatments.py:348 #: archaeological_finds/forms_treatments.py:610 @@ -2019,79 +2015,79 @@ msgstr "" #: archaeological_finds/models_treatments.py:1095 #: archaeological_finds/templates/ishtar/sheet_find.html:364 #: archaeological_operations/forms.py:1552 -#: archaeological_operations/forms.py:1689 -#: archaeological_operations/models.py:2639 ishtar_common/models.py:4086 +#: archaeological_operations/forms.py:1685 +#: archaeological_operations/models.py:2639 ishtar_common/models.py:4089 msgid "Index" msgstr "" -#: archaeological_files/forms.py:894 archaeological_files/forms.py:931 -#: archaeological_files/forms.py:1053 +#: archaeological_files/forms.py:893 archaeological_files/forms.py:929 +#: archaeological_files/forms.py:1051 #: archaeological_finds/forms_treatments.py:611 #: archaeological_finds/forms_treatments.py:661 #: archaeological_finds/forms_treatments.py:932 #: archaeological_finds/forms_treatments.py:987 -#: archaeological_operations/forms.py:1560 -#: archaeological_operations/forms.py:1621 +#: archaeological_operations/forms.py:1558 +#: archaeological_operations/forms.py:1619 #: archaeological_operations/models.py:2370 #: archaeological_operations/models.py:2629 msgid "Act type" msgstr "" -#: archaeological_files/forms.py:895 +#: archaeological_files/forms.py:894 msgid "Object (full text search)" msgstr "" -#: archaeological_files/forms.py:932 +#: archaeological_files/forms.py:930 #: archaeological_finds/forms_treatments.py:612 #: archaeological_finds/forms_treatments.py:933 -#: archaeological_operations/forms.py:1561 -#: archaeological_operations/forms.py:1759 +#: archaeological_operations/forms.py:1559 +#: archaeological_operations/forms.py:1755 msgid "Indexed?" msgstr "" -#: archaeological_files/forms.py:939 +#: archaeological_files/forms.py:937 #: archaeological_finds/forms_treatments.py:613 #: archaeological_finds/forms_treatments.py:934 -#: archaeological_operations/forms.py:1567 -#: archaeological_operations/forms.py:1628 +#: archaeological_operations/forms.py:1565 +#: archaeological_operations/forms.py:1626 #: archaeological_operations/models.py:2698 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" -#: archaeological_files/forms.py:942 +#: archaeological_files/forms.py:940 #: archaeological_finds/forms_treatments.py:619 #: archaeological_finds/forms_treatments.py:940 msgid "Signature date before" msgstr "" -#: archaeological_files/forms.py:945 +#: archaeological_files/forms.py:943 #: archaeological_finds/forms_treatments.py:617 #: archaeological_finds/forms_treatments.py:938 msgid "Signature date after" msgstr "" -#: archaeological_files/forms.py:970 +#: archaeological_files/forms.py:968 msgid "File numeric reference" msgstr "" -#: archaeological_files/forms.py:972 +#: archaeological_files/forms.py:970 msgid "File year" msgstr "" -#: archaeological_files/forms.py:974 +#: archaeological_files/forms.py:972 msgid "File other reference" msgstr "" -#: archaeological_files/forms.py:977 +#: archaeological_files/forms.py:975 msgid "File in charge" msgstr "" -#: archaeological_files/forms.py:987 +#: archaeological_files/forms.py:985 msgid "File permit reference" msgstr "" -#: archaeological_files/forms.py:1051 +#: archaeological_files/forms.py:1049 msgid "Archaeological file - Administrative act - General" msgstr "" @@ -2104,7 +2100,7 @@ msgstr "" #: archaeological_operations/models.py:2353 #: archaeological_operations/models.py:2469 #: archaeological_operations/models.py:2677 -#: archaeological_operations/wizards.py:85 ishtar_common/views.py:395 +#: archaeological_operations/wizards.py:85 ishtar_common/views.py:396 msgid "Archaeological file" msgstr "" @@ -2118,7 +2114,7 @@ msgstr "" #: archaeological_finds/ishtar_menu.py:226 #: archaeological_finds/models_finds.py:3337 #: archaeological_operations/ishtar_menu.py:70 -#: archaeological_operations/models.py:2735 +#: archaeological_operations/models.py:2734 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "" @@ -2206,12 +2202,12 @@ msgstr "" msgid "Equipment/Service" msgstr "" -#: archaeological_files/models.py:208 ishtar_common/models_common.py:171 -#: ishtar_common/models_common.py:202 +#: archaeological_files/models.py:208 ishtar_common/models_common.py:172 +#: ishtar_common/models_common.py:203 msgid "Textual ID" msgstr "" -#: archaeological_files/models.py:212 ishtar_common/models_common.py:175 +#: archaeological_files/models.py:212 ishtar_common/models_common.py:176 msgid "" "The slug is the standardized version of the name. It contains only lowercase " "letters, numbers and hyphens. Each slug must be unique." @@ -2242,15 +2238,15 @@ msgid "Default quantity by day" msgstr "" #: archaeological_files/models.py:231 ishtar_common/models.py:1554 -#: ishtar_common/models.py:1970 ishtar_common/models.py:3420 -#: ishtar_common/models_common.py:181 ishtar_common/models_imports.py:184 +#: ishtar_common/models.py:1970 ishtar_common/models.py:3423 +#: ishtar_common/models_common.py:182 ishtar_common/models_imports.py:184 #: ishtar_common/models_imports.py:770 msgid "Available" msgstr "" #: archaeological_files/models.py:237 archaeological_warehouse/forms.py:753 -#: ishtar_common/admin.py:1020 ishtar_common/models.py:2275 -#: ishtar_common/models_common.py:713 +#: ishtar_common/admin.py:1025 ishtar_common/models.py:2275 +#: ishtar_common/models_common.py:714 msgid "Parent" msgstr "" @@ -2320,7 +2316,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:415 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:520 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:537 -#: ishtar_common/admin.py:1189 +#: ishtar_common/admin.py:1194 msgid "Area" msgstr "" @@ -2342,8 +2338,8 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:544 #: archaeological_operations/templates/ishtar/sheet_operation.html:554 #: archaeological_operations/templates/ishtar/sheet_operation.html:571 -#: ishtar_common/models.py:1854 ishtar_common/models_common.py:746 -#: ishtar_common/models_common.py:1932 ishtar_common/models_common.py:1948 +#: ishtar_common/models.py:1854 ishtar_common/models_common.py:747 +#: ishtar_common/models_common.py:1933 ishtar_common/models_common.py:1949 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:211 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail_users.html:5 #: ishtar_common/templates/ishtar/sheet_person.html:30 @@ -2370,11 +2366,11 @@ msgstr "" #: archaeological_operations/models.py:995 #: archaeological_operations/models.py:997 #: archaeological_operations/models.py:1301 -#: archaeological_operations/models.py:2710 +#: archaeological_operations/models.py:2709 #: archaeological_operations/templates/ishtar/sheet_operation.html:147 -#: ishtar_common/forms_common.py:1444 ishtar_common/forms_common.py:1457 -#: ishtar_common/forms_common.py:1458 ishtar_common/models.py:2268 -#: ishtar_common/models_common.py:2663 +#: ishtar_common/forms_common.py:1447 ishtar_common/forms_common.py:1460 +#: ishtar_common/forms_common.py:1461 ishtar_common/models.py:2268 +#: ishtar_common/models_common.py:2664 msgid "Towns" msgstr "" @@ -2392,7 +2388,7 @@ msgstr "" #: archaeological_files/models.py:457 #: archaeological_finds/models_treatments.py:1046 #: archaeological_operations/models.py:333 -#: archaeological_warehouse/models.py:913 ishtar_common/models.py:3851 +#: archaeological_warehouse/models.py:913 ishtar_common/models.py:3854 msgctxt "key for text search" msgid "reference" msgstr "" @@ -2414,8 +2410,8 @@ msgstr "" #: archaeological_operations/models.py:336 #: archaeological_operations/models.py:1071 #: archaeological_operations/tests.py:3099 -#: archaeological_warehouse/models.py:309 ishtar_common/models.py:2455 -#: ishtar_common/models.py:2707 ishtar_common/models.py:3281 +#: archaeological_warehouse/models.py:309 ishtar_common/models.py:2458 +#: ishtar_common/models.py:2710 ishtar_common/models.py:3284 msgctxt "key for text search" msgid "name" msgstr "" @@ -2427,9 +2423,9 @@ msgstr "" #: archaeological_operations/models.py:2504 #: archaeological_operations/tests.py:3112 #: archaeological_warehouse/models.py:312 -#: archaeological_warehouse/models.py:909 ishtar_common/models.py:2458 -#: ishtar_common/models.py:2716 ishtar_common/models.py:3292 -#: ishtar_common/models.py:3847 +#: archaeological_warehouse/models.py:909 ishtar_common/models.py:2461 +#: ishtar_common/models.py:2719 ishtar_common/models.py:3295 +#: ishtar_common/models.py:3850 msgctxt "key for text search" msgid "type" msgstr "" @@ -2458,7 +2454,7 @@ msgstr "" #: archaeological_operations/models.py:355 #: archaeological_operations/models.py:1119 #: archaeological_operations/models.py:2614 -#: archaeological_warehouse/models.py:920 ishtar_common/models.py:3911 +#: archaeological_warehouse/models.py:920 ishtar_common/models.py:3914 msgctxt "key for text search" msgid "comment" msgstr "" @@ -2482,7 +2478,7 @@ msgstr "" #: archaeological_files/models.py:527 #: archaeological_finds/models_treatments.py:1097 -#: ishtar_common/forms_common.py:1784 ishtar_common/forms_common.py:2066 +#: ishtar_common/forms_common.py:1787 ishtar_common/forms_common.py:2069 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" msgstr "" @@ -2532,10 +2528,12 @@ msgstr "" #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:555 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:590 #: archaeological_warehouse/forms.py:206 archaeological_warehouse/models.py:364 -#: ishtar_common/forms_common.py:520 ishtar_common/forms_common.py:766 -#: ishtar_common/forms_common.py:828 ishtar_common/forms_common.py:984 -#: ishtar_common/ishtar_menu.py:119 ishtar_common/models.py:2495 -#: ishtar_common/models.py:2702 ishtar_common/models.py:3270 +#: ishtar_common/forms_common.py:522 ishtar_common/forms_common.py:769 +#: ishtar_common/forms_common.py:831 ishtar_common/forms_common.py:987 +#: ishtar_common/ishtar_menu.py:119 ishtar_common/models.py:2502 +#: ishtar_common/models.py:2705 ishtar_common/models.py:3273 +#: ishtar_common/templates/ishtar/merge_person.html:11 +#: ishtar_common/templates/ishtar/merge_person.html:23 #: ishtar_common/templates/ishtar/sheet_organization.html:4 msgid "Organization" msgstr "" @@ -2562,7 +2560,7 @@ msgstr "" #: archaeological_files/models.py:749 #: archaeological_files/templates/ishtar/dashboards/dashboard_file.html:7 -#: ishtar_common/views.py:1000 ishtar_common/views.py:1061 +#: ishtar_common/views.py:1001 ishtar_common/views.py:1062 msgid "Archaeological files" msgstr "" @@ -2616,7 +2614,7 @@ msgid "operation" msgstr "" #: archaeological_files/models.py:1327 archaeological_operations/models.py:1285 -#: archaeological_operations/models.py:2949 +#: archaeological_operations/models.py:2948 msgid "File" msgstr "" @@ -2789,7 +2787,7 @@ msgid "Back to the file" msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:29 -#: archaeological_operations/forms.py:682 ishtar_common/models.py:4901 +#: archaeological_operations/forms.py:682 ishtar_common/models.py:4904 msgid "Preventive" msgstr "" @@ -2814,7 +2812,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 #: archaeological_finds/templates/ishtar/sheet_treatment.html:133 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:83 -#: archaeological_operations/models.py:2736 +#: archaeological_operations/models.py:2735 #: archaeological_operations/templates/ishtar/sheet_operation.html:351 #: archaeological_operations/templates/ishtar/sheet_operation.html:488 msgid "Administrative acts" @@ -2828,11 +2826,11 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_files/templates/ishtar/sheet_file.html:218 #: archaeological_operations/models.py:2467 -#: archaeological_operations/models.py:2771 +#: archaeological_operations/models.py:2770 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 #: archaeological_warehouse/forms.py:339 archaeological_warehouse/forms.py:511 -#: archaeological_warehouse/models.py:694 ishtar_common/models.py:4088 +#: archaeological_warehouse/models.py:694 ishtar_common/models.py:4091 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:34 msgid "Ref." msgstr "" @@ -2850,18 +2848,20 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:507 #: archaeological_operations/templates/ishtar/sheet_operation.html:571 #: archaeological_warehouse/models.py:298 -#: archaeological_warehouse/models.py:888 ishtar_common/forms_common.py:585 -#: ishtar_common/forms_common.py:764 ishtar_common/forms_common.py:982 -#: ishtar_common/forms_common.py:1229 ishtar_common/forms_common.py:1658 -#: ishtar_common/forms_common.py:2064 ishtar_common/forms_common.py:2291 -#: ishtar_common/forms_common.py:2913 ishtar_common/models.py:744 -#: ishtar_common/models.py:2477 ishtar_common/models.py:3810 -#: ishtar_common/models.py:4092 ishtar_common/models_imports.py:150 +#: archaeological_warehouse/models.py:888 ishtar_common/forms_common.py:587 +#: ishtar_common/forms_common.py:767 ishtar_common/forms_common.py:985 +#: ishtar_common/forms_common.py:1232 ishtar_common/forms_common.py:1661 +#: ishtar_common/forms_common.py:2067 ishtar_common/forms_common.py:2294 +#: ishtar_common/forms_common.py:2938 ishtar_common/models.py:744 +#: ishtar_common/models.py:2484 ishtar_common/models.py:3813 +#: ishtar_common/models.py:4095 ishtar_common/models_imports.py:150 #: ishtar_common/models_imports.py:936 #: 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 #: ishtar_common/templates/ishtar/import_table.html:28 +#: ishtar_common/templates/ishtar/merge_organization.html:10 +#: ishtar_common/templates/ishtar/merge_organization.html:21 #: ishtar_common/templates/ishtar/sheet_organization.html:27 #: ishtar_common/templates/ishtar/sheet_organization.html:54 msgid "Type" @@ -2907,7 +2907,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:283 #: archaeological_files/templates/ishtar/sheet_file.html:335 #: archaeological_files/templates/ishtar/sheet_file.html:387 -#: archaeological_operations/models.py:3289 +#: archaeological_operations/models.py:3288 msgid "Effective" msgstr "" @@ -3013,16 +3013,16 @@ msgid "Number/street" msgstr "" #: archaeological_files_pdl/forms.py:138 archaeological_files_pdl/forms.py:179 -#: archaeological_warehouse/forms.py:241 ishtar_common/forms_common.py:538 -#: ishtar_common/forms_common.py:920 ishtar_common/models_common.py:2847 +#: archaeological_warehouse/forms.py:241 ishtar_common/forms_common.py:540 +#: ishtar_common/forms_common.py:923 ishtar_common/models_common.py:2851 msgid "Postal code" msgstr "" #: archaeological_files_pdl/forms.py:161 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:10 #: archaeological_warehouse/forms.py:228 archaeological_warehouse/forms.py:237 -#: ishtar_common/forms_common.py:534 ishtar_common/forms_common.py:916 -#: ishtar_common/models_common.py:2842 +#: ishtar_common/forms_common.py:536 ishtar_common/forms_common.py:919 +#: ishtar_common/models_common.py:2846 ishtar_common/models_common.py:3001 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 msgid "Address" msgstr "" @@ -3115,17 +3115,6 @@ msgstr "" msgid ": delay of {} days" msgstr "" -#: archaeological_finds/admin.py:36 ishtar_common/models_common.py:2193 -#: ishtar_common/models_common.py:3523 -msgid "Point (2D)" -msgstr "" - -#: archaeological_finds/admin.py:38 archaeological_finds/models_finds.py:439 -#: ishtar_common/templates/blocks/DataTables-stats.html:25 -#: ishtar_common/templates/ishtar/import_step_by_step.html:46 -msgid "Line" -msgstr "" - #: archaeological_finds/forms.py:178 msgid "Find - 010 - Context record choice" msgstr "" @@ -3363,7 +3352,6 @@ msgstr "" #: archaeological_finds/forms.py:516 archaeological_finds/models_finds.py:424 #: archaeological_finds/templates/ishtar/sheet_basefind.html:33 -#: sra_idf_app/templates/ishtar/sheet_basefind.html:33 msgid "Discovery date (TAQ)" msgstr "" @@ -3506,11 +3494,11 @@ msgstr "" msgid "Find - Quick action - Modify single" msgstr "" -#: archaeological_finds/forms.py:995 ishtar_common/forms_common.py:2509 +#: archaeological_finds/forms.py:995 ishtar_common/forms_common.py:2512 msgid "Create" msgstr "" -#: archaeological_finds/forms.py:995 ishtar_common/forms_common.py:2509 +#: archaeological_finds/forms.py:995 ishtar_common/forms_common.py:2512 #: ishtar_common/templates/ishtar/forms/search_query.html:60 msgid "Update" msgstr "" @@ -3540,7 +3528,7 @@ msgstr "" #: archaeological_finds/forms.py:1122 archaeological_finds/forms.py:2109 #: ishtar_common/models.py:1044 ishtar_common/models.py:1941 -#: ishtar_common/models.py:3410 ishtar_common/models_imports.py:145 +#: ishtar_common/models.py:3413 ishtar_common/models_imports.py:145 #: ishtar_common/models_imports.py:646 msgid "Slug" msgstr "" @@ -3550,12 +3538,12 @@ msgid "Is public" msgstr "" #: archaeological_finds/forms.py:1128 archaeological_finds/forms.py:2115 -#: archaeological_finds/forms.py:2157 ishtar_common/models.py:3423 +#: archaeological_finds/forms.py:2157 ishtar_common/models.py:3426 msgid "Shared (read) with" msgstr "" #: archaeological_finds/forms.py:1135 archaeological_finds/forms.py:2122 -#: archaeological_finds/forms.py:2164 ishtar_common/models.py:3429 +#: archaeological_finds/forms.py:2164 ishtar_common/models.py:3432 msgid "Shared (read/edit) with" msgstr "" @@ -3600,7 +3588,6 @@ msgstr "" #: archaeological_finds/forms.py:1308 #: archaeological_finds/templates/ishtar/sheet_basefind.html:25 -#: sra_idf_app/templates/ishtar/sheet_basefind.html:25 msgid "Discovery date" msgstr "" @@ -3616,11 +3603,11 @@ msgstr "" #: archaeological_operations/forms.py:506 #: archaeological_operations/forms.py:696 #: archaeological_operations/forms.py:790 -#: archaeological_operations/forms.py:1807 -#: archaeological_operations/forms.py:1873 +#: archaeological_operations/forms.py:1803 +#: archaeological_operations/forms.py:1869 #: archaeological_operations/models.py:908 #: archaeological_operations/models.py:996 -#: archaeological_operations/models.py:1293 ishtar_common/models.py:4848 +#: archaeological_operations/models.py:1293 ishtar_common/models.py:4851 #: ishtar_common/models_imports.py:885 msgid "Operation type" msgstr "" @@ -3646,8 +3633,8 @@ msgid "Operation - Name" msgstr "" #: archaeological_finds/forms.py:1412 archaeological_operations/forms.py:499 -#: archaeological_operations/forms.py:1324 ishtar_common/forms_common.py:1230 -#: ishtar_common/models.py:3095 +#: archaeological_operations/forms.py:1324 ishtar_common/forms_common.py:1233 +#: ishtar_common/models.py:3098 msgid "Areas" msgstr "" @@ -3845,7 +3832,7 @@ msgstr "" #: archaeological_finds/forms.py:1686 archaeological_finds/models_finds.py:1108 #: archaeological_finds/models_finds.py:1868 #: archaeological_finds/templates/ishtar/sheet_find.html:306 -#: ishtar_common/forms_common.py:1676 +#: ishtar_common/forms_common.py:1679 msgid "Reference container" msgstr "" @@ -3855,7 +3842,7 @@ msgstr "" #: archaeological_finds/forms.py:1712 archaeological_finds/models_finds.py:1107 #: archaeological_finds/templates/ishtar/sheet_find.html:331 -#: ishtar_common/forms_common.py:1668 +#: ishtar_common/forms_common.py:1671 msgid "Current container" msgstr "" @@ -3907,10 +3894,10 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:381 #: archaeological_finds/templates/ishtar/sheet_find.html:419 #: archaeological_finds/templates/ishtar/sheet_find.html:457 -#: ishtar_common/forms_common.py:1610 ishtar_common/models.py:973 -#: ishtar_common/models.py:1731 ishtar_common/models.py:3408 -#: ishtar_common/models_common.py:169 ishtar_common/models_common.py:202 -#: ishtar_common/models_common.py:1931 ishtar_common/models_common.py:1947 +#: ishtar_common/forms_common.py:1613 ishtar_common/models.py:973 +#: ishtar_common/models.py:1731 ishtar_common/models.py:3411 +#: ishtar_common/models_common.py:170 ishtar_common/models_common.py:203 +#: ishtar_common/models_common.py:1932 ishtar_common/models_common.py:1948 #: ishtar_common/models_imports.py:526 msgid "Label" msgstr "" @@ -3968,7 +3955,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 #: archaeological_operations/models.py:2356 -#: archaeological_operations/models.py:2693 ishtar_common/views.py:407 +#: archaeological_operations/models.py:2693 ishtar_common/views.py:408 msgid "Treatment" msgstr "" @@ -4066,7 +4053,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1193 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 #: archaeological_finds/wizards.py:553 archaeological_operations/models.py:2355 -#: archaeological_operations/models.py:2685 ishtar_common/views.py:406 +#: archaeological_operations/models.py:2685 ishtar_common/views.py:407 msgid "Treatment request" msgstr "" @@ -4092,13 +4079,13 @@ msgstr "" #: archaeological_warehouse/models.py:1157 #: archaeological_warehouse/models.py:1984 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 -#: ishtar_common/forms_common.py:2171 ishtar_common/forms_common.py:2356 +#: ishtar_common/forms_common.py:2174 ishtar_common/forms_common.py:2359 #: ishtar_common/templates/ishtar/sheet_document.html:100 msgid "Container" msgstr "" #: archaeological_finds/forms_treatments.py:407 -#: ishtar_common/forms_common.py:2363 +#: ishtar_common/forms_common.py:2366 msgid "Change " msgstr "" @@ -4107,12 +4094,12 @@ msgid "reference and current containers" msgstr "" #: archaeological_finds/forms_treatments.py:410 -#: ishtar_common/forms_common.py:2367 +#: ishtar_common/forms_common.py:2370 msgid "the reference container" msgstr "" #: archaeological_finds/forms_treatments.py:411 -#: ishtar_common/forms_common.py:2368 +#: ishtar_common/forms_common.py:2371 msgid "the current container" msgstr "" @@ -4166,7 +4153,7 @@ msgid "Treatment file - 001 - Search" msgstr "" #: archaeological_finds/forms_treatments.py:687 -#: archaeological_finds/forms_treatments.py:775 ishtar_common/models.py:4089 +#: archaeological_finds/forms_treatments.py:775 ishtar_common/models.py:4092 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:44 msgid "Internal ref." msgstr "" @@ -4288,7 +4275,7 @@ msgid "Treatment one to many - creation" msgstr "" #: archaeological_finds/models_finds.py:84 -#: archaeological_operations/models.py:2360 ishtar_common/models.py:3622 +#: archaeological_operations/models.py:2360 ishtar_common/models.py:3625 msgid "Code" msgstr "" @@ -4462,12 +4449,18 @@ msgstr "" msgid "Material index" msgstr "" +#: archaeological_finds/models_finds.py:439 +#: ishtar_common/templates/blocks/DataTables-stats.html:25 +#: ishtar_common/templates/ishtar/import_step_by_step.html:46 +msgid "Line" +msgstr "" + #: archaeological_finds/models_finds.py:441 msgid "Short ID" msgstr "" #: archaeological_finds/models_finds.py:445 -#: archaeological_finds/models_finds.py:452 ishtar_common/models.py:4198 +#: archaeological_finds/models_finds.py:452 ishtar_common/models.py:4201 msgid "Cached value - do not edit" msgstr "" @@ -4583,7 +4576,7 @@ msgctxt "key for text search" msgid "code-patriarche" msgstr "" -#: archaeological_finds/models_finds.py:1261 ishtar_common/models.py:3925 +#: archaeological_finds/models_finds.py:1261 ishtar_common/models.py:3928 msgctxt "key for text search" msgid "operation-type" msgstr "" @@ -4616,8 +4609,8 @@ msgstr "" #: archaeological_finds/models_finds.py:1288 #: archaeological_finds/models_finds.py:1730 -#: archaeological_warehouse/models.py:956 ishtar_common/models.py:3933 -#: ishtar_common/models.py:4030 +#: archaeological_warehouse/models.py:956 ishtar_common/models.py:3936 +#: ishtar_common/models.py:4033 msgctxt "key for text search" msgid "context-record" msgstr "" @@ -4662,7 +4655,7 @@ msgctxt "key for text search" msgid "remarkability" msgstr "" -#: archaeological_finds/models_finds.py:1324 ishtar_common/models.py:3859 +#: archaeological_finds/models_finds.py:1324 ishtar_common/models.py:3862 msgctxt "key for text search" msgid "description" msgstr "" @@ -4677,7 +4670,7 @@ msgctxt "key for text search" msgid "checked" msgstr "" -#: archaeological_finds/models_finds.py:1335 ishtar_common/models.py:3953 +#: archaeological_finds/models_finds.py:1335 ishtar_common/models.py:3956 msgctxt "key for text search" msgid "container" msgstr "" @@ -4711,7 +4704,7 @@ msgid "last-modified-by" msgstr "" #: archaeological_finds/models_finds.py:1362 -#: ishtar_common/models_common.py:1435 +#: ishtar_common/models_common.py:1436 msgctxt "key for text search" msgid "created-by" msgstr "" @@ -5063,10 +5056,10 @@ msgstr "" #: archaeological_finds/models_finds.py:2345 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 #: archaeological_finds/views.py:1272 archaeological_warehouse/forms.py:685 -#: archaeological_warehouse/views.py:297 ishtar_common/models.py:4068 -#: ishtar_common/models.py:4416 +#: archaeological_warehouse/views.py:297 ishtar_common/models.py:4071 +#: ishtar_common/models.py:4419 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 -#: ishtar_common/views.py:2662 +#: ishtar_common/views.py:2663 msgid "Packaging" msgstr "" @@ -5115,7 +5108,7 @@ msgstr "" #: archaeological_finds/models_finds.py:2006 #: archaeological_finds/models_treatments.py:289 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:71 -#: ishtar_common/views.py:1008 ishtar_common/views.py:1087 +#: ishtar_common/views.py:1009 ishtar_common/views.py:1088 msgid "Treatments" msgstr "" @@ -5176,9 +5169,9 @@ msgid "No container have been set - the localisation cannot be set." msgstr "" #: archaeological_finds/models_finds.py:3342 ishtar_common/forms_common.py:118 -#: ishtar_common/forms_common.py:2441 ishtar_common/ishtar_menu.py:77 -#: ishtar_common/models.py:2785 ishtar_common/models.py:3114 -#: ishtar_common/models.py:3307 ishtar_common/models.py:3544 +#: ishtar_common/forms_common.py:2444 ishtar_common/ishtar_menu.py:77 +#: ishtar_common/models.py:2788 ishtar_common/models.py:3117 +#: ishtar_common/models.py:3310 ishtar_common/models.py:3547 #: ishtar_common/templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "" @@ -5314,7 +5307,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1175 #: archaeological_finds/templates/ishtar/sheet_find.html:491 -#: ishtar_common/views.py:1007 ishtar_common/views.py:1080 +#: ishtar_common/views.py:1008 ishtar_common/views.py:1081 msgid "Treatment requests" msgstr "" @@ -5363,23 +5356,19 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:10 #: ishtar_common/templates/ishtar/blocks/sheet_external_id.html:3 -#: sra_idf_app/templates/ishtar/sheet_basefind.html:10 msgid "Internal ID" msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:28 -#: sra_idf_app/templates/ishtar/sheet_basefind.html:28 msgid "Discovery year" msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:31 -#: sra_idf_app/templates/ishtar/sheet_basefind.html:31 msgid "Discovery date (TPQ)" msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:61 #: ishtar_common/forms.py:933 -#: sra_idf_app/templates/ishtar/sheet_basefind.html:57 msgid "Last modified by" msgstr "" @@ -5469,7 +5458,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_findbasket.html:24 #: archaeological_warehouse/templates/ishtar/sheet_container.html:31 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:27 -#: ishtar_common/forms_common.py:1854 +#: ishtar_common/forms_common.py:1857 #: ishtar_common/templates/ishtar/sheet_document.html:57 msgid "Content" msgstr "" @@ -5656,20 +5645,20 @@ msgid "" msgstr "" #: archaeological_operations/forms.py:76 -#: archaeological_operations/models.py:2966 +#: archaeological_operations/models.py:2965 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Section" msgstr "" #: archaeological_operations/forms.py:79 -#: archaeological_operations/models.py:2968 +#: archaeological_operations/models.py:2967 msgid "Parcel number" msgstr "" #: archaeological_operations/forms.py:81 -#: archaeological_operations/models.py:2970 -#: archaeological_operations/models.py:2998 -#: archaeological_operations/models.py:3063 +#: archaeological_operations/models.py:2969 +#: archaeological_operations/models.py:2997 +#: archaeological_operations/models.py:3062 msgid "Public domain" msgstr "" @@ -5750,7 +5739,7 @@ msgstr "" #: archaeological_operations/forms.py:524 #: archaeological_operations/forms.py:698 #: archaeological_operations/forms.py:834 -#: archaeological_operations/forms.py:1811 +#: archaeological_operations/forms.py:1807 #: archaeological_operations/models.py:1263 msgid "Operator" msgstr "" @@ -5816,7 +5805,7 @@ msgstr "" #: archaeological_operations/forms.py:569 #: archaeological_operations/forms.py:886 -#: archaeological_operations/forms.py:1819 +#: archaeological_operations/forms.py:1815 #: archaeological_operations/models.py:915 #: archaeological_operations/models.py:1420 msgid "Documentation received" @@ -5832,7 +5821,7 @@ msgstr "" #: archaeological_operations/forms.py:576 #: archaeological_operations/forms.py:891 -#: archaeological_operations/forms.py:1823 +#: archaeological_operations/forms.py:1819 #: archaeological_operations/models.py:916 #: archaeological_operations/models.py:1425 msgid "Finds received" @@ -5846,7 +5835,7 @@ msgstr "" msgid "Finds deadline after" msgstr "" -#: archaeological_operations/forms.py:666 ishtar_common/models.py:4079 +#: archaeological_operations/forms.py:666 ishtar_common/models.py:4082 msgid "Associated file" msgstr "" @@ -5858,7 +5847,7 @@ msgstr "" msgid "All" msgstr "" -#: archaeological_operations/forms.py:683 ishtar_common/models.py:4903 +#: archaeological_operations/forms.py:683 ishtar_common/models.py:4906 msgid "Research" msgstr "" @@ -5879,7 +5868,7 @@ msgid "Operation - 010 - General" msgstr "" #: archaeological_operations/forms.py:792 -#: archaeological_operations/forms.py:1871 +#: archaeological_operations/forms.py:1867 #: archaeological_operations/models.py:1363 msgid "Generic name" msgstr "" @@ -5904,8 +5893,8 @@ msgstr "" #: archaeological_operations/forms.py:856 #: archaeological_operations/forms.py:1445 -#: archaeological_operations/forms.py:1827 -#: archaeological_operations/forms.py:1964 +#: archaeological_operations/forms.py:1823 +#: archaeological_operations/forms.py:1960 #: archaeological_operations/models.py:476 #: archaeological_operations/models.py:1277 msgid "Collaborators" @@ -6073,10 +6062,10 @@ msgstr "" #: archaeological_operations/forms.py:1195 #: archaeological_operations/forms.py:1314 #: archaeological_operations/forms.py:1430 -#: archaeological_operations/forms.py:1923 +#: archaeological_operations/forms.py:1919 #: archaeological_operations/models.py:453 -#: archaeological_warehouse/models.py:1991 ishtar_common/forms_common.py:1779 -#: ishtar_common/forms_common.py:2065 ishtar_common/forms_common.py:2290 +#: archaeological_warehouse/models.py:1991 ishtar_common/forms_common.py:1782 +#: ishtar_common/forms_common.py:2068 ishtar_common/forms_common.py:2293 #: ishtar_common/models.py:2270 #: ishtar_common/templates/ishtar/sheet_document.html:40 msgid "Reference" @@ -6084,13 +6073,13 @@ msgstr "" #: archaeological_operations/forms.py:1206 #: archaeological_operations/forms.py:1441 -#: archaeological_operations/forms.py:1970 +#: archaeological_operations/forms.py:1966 msgid "Cultural attributions" msgstr "" #: archaeological_operations/forms.py:1251 #: archaeological_operations/forms.py:1500 -#: archaeological_operations/forms.py:1943 +#: archaeological_operations/forms.py:1939 msgid "This reference already exists." msgstr "" @@ -6181,80 +6170,80 @@ msgstr "" msgid "Archaeological site - 030 - Underwater" msgstr "" -#: archaeological_operations/forms.py:1598 +#: archaeological_operations/forms.py:1596 #: archaeological_operations/views.py:599 msgid "Administrative act search" msgstr "" -#: archaeological_operations/forms.py:1613 -#: archaeological_operations/forms.py:1717 -#: archaeological_operations/forms.py:1784 +#: archaeological_operations/forms.py:1611 +#: archaeological_operations/forms.py:1713 +#: archaeological_operations/forms.py:1780 msgid "You should select an administrative act." msgstr "" -#: archaeological_operations/forms.py:1623 +#: archaeological_operations/forms.py:1621 #: archaeological_operations/models.py:2661 msgid "Signatory" msgstr "" -#: archaeological_operations/forms.py:1630 +#: archaeological_operations/forms.py:1628 #: archaeological_operations/models.py:2696 msgid "Signature date" msgstr "" -#: archaeological_operations/forms.py:1643 +#: archaeological_operations/forms.py:1639 msgid "Operation - Administrative act - General" msgstr "" -#: archaeological_operations/forms.py:1677 +#: archaeological_operations/forms.py:1673 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: archaeological_operations/forms.py:1681 +#: archaeological_operations/forms.py:1677 msgid "Bad index" msgstr "" -#: archaeological_operations/forms.py:1694 +#: archaeological_operations/forms.py:1690 msgid "Would you like to delete this administrative act?" msgstr "" -#: archaeological_operations/forms.py:1699 ishtar_common/forms.py:1275 +#: archaeological_operations/forms.py:1695 ishtar_common/forms.py:1275 #: ishtar_common/models.py:1944 msgid "Template" msgstr "" +#: archaeological_operations/forms.py:1719 #: archaeological_operations/forms.py:1723 -#: archaeological_operations/forms.py:1727 msgid "This document is not intended for this type of act." msgstr "" -#: archaeological_operations/forms.py:1745 +#: archaeological_operations/forms.py:1741 msgid "Doc generation" msgstr "" -#: archaeological_operations/forms.py:1747 +#: archaeological_operations/forms.py:1743 msgid "Generate the associated doc?" msgstr "" -#: archaeological_operations/forms.py:1768 +#: archaeological_operations/forms.py:1764 #: archaeological_operations/ishtar_menu.py:112 #: archaeological_operations/views.py:692 msgctxt "admin act register" msgid "Register" msgstr "" -#: archaeological_operations/forms.py:1789 +#: archaeological_operations/forms.py:1785 msgid "Operation - Quick action - Modify" msgstr "" -#: archaeological_operations/forms.py:1898 +#: archaeological_operations/forms.py:1894 msgid "This code already exists." msgstr "" -#: archaeological_operations/forms.py:1954 +#: archaeological_operations/forms.py:1950 msgid "Archaeological files - Quick action - Modify" msgstr "" @@ -6380,8 +6369,8 @@ msgid "SITE" msgstr "" #: archaeological_operations/models.py:739 ishtar_common/forms.py:1158 -#: ishtar_common/models.py:4974 ishtar_common/models.py:5131 -#: ishtar_common/models.py:5190 ishtar_common/views_item.py:1516 +#: ishtar_common/models.py:4977 ishtar_common/models.py:5134 +#: ishtar_common/models.py:5193 ishtar_common/views_item.py:1515 msgid "Unknown" msgstr "" @@ -6543,8 +6532,8 @@ msgctxt "key for text search" msgid "code-drassm" msgstr "" -#: archaeological_operations/models.py:1206 ishtar_common/models.py:3949 -#: ishtar_common/models.py:4033 +#: archaeological_operations/models.py:1206 ishtar_common/models.py:3952 +#: ishtar_common/models.py:4036 msgctxt "key for text search" msgid "file" msgstr "" @@ -6573,8 +6562,8 @@ msgstr "" #: archaeological_operations/models.py:1483 #: archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html:8 #: archaeological_operations/templates/ishtar/sheet_site.html:87 -#: ishtar_common/models.py:1001 ishtar_common/views.py:1001 -#: ishtar_common/views.py:1068 +#: ishtar_common/models.py:1001 ishtar_common/views.py:1002 +#: ishtar_common/views.py:1069 msgid "Operations" msgstr "" @@ -6806,67 +6795,67 @@ msgstr "" msgid "Archaeological preventive operator" msgstr "" -#: archaeological_operations/models.py:2707 +#: archaeological_operations/models.py:2706 msgid "Cached values get from associated departments" msgstr "" -#: archaeological_operations/models.py:2713 +#: archaeological_operations/models.py:2712 msgid "Cached values get from associated towns" msgstr "" -#: archaeological_operations/models.py:2887 +#: archaeological_operations/models.py:2886 msgid "This index already exists for this year" msgstr "" -#: archaeological_operations/models.py:2977 +#: archaeological_operations/models.py:2976 msgid "Address - Locality" msgstr "" -#: archaeological_operations/models.py:3224 ishtar_common/models.py:3418 +#: archaeological_operations/models.py:3223 ishtar_common/models.py:3421 msgid "Owner" msgstr "" -#: archaeological_operations/models.py:3239 +#: archaeological_operations/models.py:3238 msgid "Parcel owner" msgstr "" -#: archaeological_operations/models.py:3240 +#: archaeological_operations/models.py:3239 msgid "Parcel owners" msgstr "" -#: archaeological_operations/models.py:3288 +#: archaeological_operations/models.py:3287 msgid "Recorded" msgstr "" -#: archaeological_operations/models.py:3290 +#: archaeological_operations/models.py:3289 msgid "Active" msgstr "" -#: archaeological_operations/models.py:3291 +#: archaeological_operations/models.py:3290 msgid "Field completed" msgstr "" -#: archaeological_operations/models.py:3292 +#: archaeological_operations/models.py:3291 msgid "Associated report" msgstr "" -#: archaeological_operations/models.py:3293 +#: archaeological_operations/models.py:3292 msgid "Closed" msgstr "" -#: archaeological_operations/models.py:3294 +#: archaeological_operations/models.py:3293 msgid "Documented and closed" msgstr "" -#: archaeological_operations/models.py:3793 ishtar_common/models.py:4844 +#: archaeological_operations/models.py:3792 ishtar_common/models.py:4847 msgid "Is preventive" msgstr "" -#: archaeological_operations/models.py:3796 +#: archaeological_operations/models.py:3795 msgid "Operation type old" msgstr "" -#: archaeological_operations/models.py:3797 +#: archaeological_operations/models.py:3796 msgid "Operation types old" msgstr "" @@ -7052,8 +7041,8 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:81 #: archaeological_operations/templates/ishtar/sheet_operation.html:401 #: archaeological_operations/templates/ishtar/sheet_operation.html:499 -#: ishtar_common/models.py:1001 ishtar_common/views.py:1003 -#: ishtar_common/views.py:1073 +#: ishtar_common/models.py:1001 ishtar_common/views.py:1004 +#: ishtar_common/views.py:1074 msgid "Context records" msgstr "" @@ -7180,7 +7169,7 @@ msgid "" "same Ishtar version?" msgstr "" -#: archaeological_operations/tests.py:4724 ishtar_common/admin.py:2271 +#: archaeological_operations/tests.py:4724 ishtar_common/admin.py:2276 #, python-brace-format msgid "" "Theses types have not been found: {missing_types}. Not the same Ishtar " @@ -7191,7 +7180,7 @@ msgstr "" msgid "{result['deleted']} matches deleted" msgstr "" -#: archaeological_operations/tests.py:4803 ishtar_common/admin.py:2349 +#: archaeological_operations/tests.py:4803 ishtar_common/admin.py:2354 msgid "{result['updated']} match key(s) updated." msgstr "" @@ -7265,8 +7254,8 @@ msgstr "" #: archaeological_warehouse/models.py:400 #: archaeological_warehouse/models.py:889 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:4 -#: ishtar_common/forms_common.py:1859 ishtar_common/models.py:5067 -#: ishtar_common/views.py:402 +#: ishtar_common/forms_common.py:1862 ishtar_common/models.py:5070 +#: ishtar_common/views.py:403 msgid "Warehouse" msgstr "" @@ -7327,30 +7316,32 @@ msgid "" "used for the organization." msgstr "" -#: archaeological_warehouse/forms.py:239 ishtar_common/forms_common.py:536 -#: ishtar_common/forms_common.py:918 ishtar_common/models_common.py:2844 +#: archaeological_warehouse/forms.py:239 ishtar_common/forms_common.py:538 +#: ishtar_common/forms_common.py:921 ishtar_common/models_common.py:2848 +#: ishtar_common/models_common.py:3006 msgid "Address complement" msgstr "" -#: archaeological_warehouse/forms.py:242 ishtar_common/forms_common.py:539 -#: ishtar_common/forms_common.py:921 ishtar_common/models_common.py:2849 +#: archaeological_warehouse/forms.py:242 ishtar_common/forms_common.py:541 +#: ishtar_common/forms_common.py:924 ishtar_common/models_common.py:2853 msgid "Town (freeform)" msgstr "" -#: archaeological_warehouse/forms.py:244 ishtar_common/forms_common.py:541 -#: ishtar_common/forms_common.py:923 ishtar_common/models_common.py:2857 +#: archaeological_warehouse/forms.py:244 ishtar_common/forms_common.py:543 +#: ishtar_common/forms_common.py:926 ishtar_common/models_common.py:2861 msgid "Country" msgstr "" -#: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:543 -#: ishtar_common/forms_common.py:894 ishtar_common/models_common.py:2871 +#: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:545 +#: ishtar_common/forms_common.py:897 ishtar_common/models_common.py:2875 +#: ishtar_common/models_common.py:3018 #: ishtar_common/templates/ishtar/sheet_person.html:27 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:34 msgid "Phone" msgstr "" -#: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:545 -#: ishtar_common/forms_common.py:904 ishtar_common/models_common.py:2887 +#: archaeological_warehouse/forms.py:247 ishtar_common/forms_common.py:547 +#: ishtar_common/forms_common.py:907 ishtar_common/models_common.py:2891 #: ishtar_common/templates/ishtar/sheet_person.html:45 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:55 msgid "Mobile phone" @@ -7650,7 +7641,7 @@ msgctxt "key for text search" msgid "find-label" msgstr "" -#: archaeological_warehouse/models.py:964 ishtar_common/models.py:3945 +#: archaeological_warehouse/models.py:964 ishtar_common/models.py:3948 msgctxt "key for text search" msgid "find-denomination" msgstr "" @@ -7714,8 +7705,8 @@ msgstr "" msgid "Cached division" msgstr "" -#: archaeological_warehouse/models.py:1121 ishtar_common/models.py:4180 -#: ishtar_common/models.py:4184 +#: archaeological_warehouse/models.py:1121 ishtar_common/models.py:4183 +#: ishtar_common/models.py:4187 msgid "Container ID" msgstr "" @@ -7948,17 +7939,17 @@ msgstr "" msgid "warehouse" msgstr "" -#: example_project/__init__.py:13 ishtar_common/views.py:245 -#: ishtar_common/views.py:957 +#: example_project/__init__.py:13 ishtar_common/views.py:246 +#: ishtar_common/views.py:958 msgid "New organization" msgstr "" -#: example_project/__init__.py:14 ishtar_common/views.py:187 -#: ishtar_common/views.py:950 ishtar_common/views.py:954 +#: example_project/__init__.py:14 ishtar_common/views.py:188 +#: ishtar_common/views.py:951 ishtar_common/views.py:955 msgid "New person" msgstr "" -#: example_project/__init__.py:15 ishtar_common/views.py:963 +#: example_project/__init__.py:15 ishtar_common/views.py:964 msgid "New author" msgstr "" @@ -7994,7 +7985,7 @@ msgstr "" msgid "Merge selected items" msgstr "" -#: ishtar_common/admin.py:334 ishtar_common/forms_common.py:663 +#: ishtar_common/admin.py:334 ishtar_common/forms_common.py:666 msgid "At least two items have to be selected." msgstr "" @@ -8015,335 +8006,335 @@ msgstr "" msgid "{} parent(s) were changed to {}." msgstr "" -#: ishtar_common/admin.py:485 ishtar_common/models.py:1417 +#: ishtar_common/admin.py:490 ishtar_common/models.py:1417 msgid "Maps - default center" msgstr "" -#: ishtar_common/admin.py:536 ishtar_common/models.py:979 +#: ishtar_common/admin.py:541 ishtar_common/models.py:979 #: ishtar_common/templates/navbar.html:31 msgid "Profile" msgstr "" -#: ishtar_common/admin.py:537 ishtar_common/forms_common.py:1226 -#: ishtar_common/forms_common.py:1261 ishtar_common/forms_common.py:1262 -#: ishtar_common/models.py:2895 +#: ishtar_common/admin.py:542 ishtar_common/forms_common.py:1229 +#: ishtar_common/forms_common.py:1264 ishtar_common/forms_common.py:1265 +#: ishtar_common/models.py:2898 msgid "Profiles" msgstr "" -#: ishtar_common/admin.py:632 +#: ishtar_common/admin.py:637 msgid "The CSV file should at least have a {} column" msgstr "" -#: ishtar_common/admin.py:699 ishtar_common/admin.py:929 +#: ishtar_common/admin.py:704 ishtar_common/admin.py:934 #, python-format msgid "%d item(s) created." msgstr "" -#: ishtar_common/admin.py:701 ishtar_common/admin.py:933 +#: ishtar_common/admin.py:706 ishtar_common/admin.py:938 #, python-format msgid "%d item(s) updated." msgstr "" -#: ishtar_common/admin.py:705 +#: ishtar_common/admin.py:710 msgid "These parents are missing: {}" msgstr "" -#: ishtar_common/admin.py:725 +#: ishtar_common/admin.py:730 msgid "Geojson file" msgstr "" -#: ishtar_common/admin.py:727 +#: ishtar_common/admin.py:732 msgid "" "Only unicode encoding is managed - convert your file first. The file must be " "a geojson file or a zip containing a geojson file." msgstr "" -#: ishtar_common/admin.py:733 +#: ishtar_common/admin.py:738 msgid "Prefix for numero INSEE" msgstr "" -#: ishtar_common/admin.py:736 +#: ishtar_common/admin.py:741 msgid "Field name for numero INSEE" msgstr "" -#: ishtar_common/admin.py:739 +#: ishtar_common/admin.py:744 msgid "Field name for name" msgstr "" -#: ishtar_common/admin.py:741 +#: ishtar_common/admin.py:746 msgid "m2" msgstr "" -#: ishtar_common/admin.py:741 +#: ishtar_common/admin.py:746 msgid "km2" msgstr "" -#: ishtar_common/admin.py:742 +#: ishtar_common/admin.py:747 msgid "Surface unit" msgstr "" -#: ishtar_common/admin.py:744 +#: ishtar_common/admin.py:749 msgid "Field name for surface" msgstr "" -#: ishtar_common/admin.py:747 +#: ishtar_common/admin.py:752 msgid "Field name for year" msgstr "" -#: ishtar_common/admin.py:751 +#: ishtar_common/admin.py:756 msgid "Not required for new town. Leave it empty when not available." msgstr "" -#: ishtar_common/admin.py:754 +#: ishtar_common/admin.py:759 msgid "Update only geometry of existing towns" msgstr "" -#: ishtar_common/admin.py:773 +#: ishtar_common/admin.py:778 msgid "\"{}\" not found in feature {}" msgstr "" -#: ishtar_common/admin.py:786 +#: ishtar_common/admin.py:791 msgid "\"{}\" not found in properties of feature {}" msgstr "" -#: ishtar_common/admin.py:799 +#: ishtar_common/admin.py:804 msgid "Bad geometry for feature {}" msgstr "" -#: ishtar_common/admin.py:810 +#: ishtar_common/admin.py:815 msgid "Geometry {} not managed for towns - feature {}" msgstr "" -#: ishtar_common/admin.py:820 +#: ishtar_common/admin.py:825 msgid "Bad value for surface: {} - feature {}" msgstr "" -#: ishtar_common/admin.py:864 +#: ishtar_common/admin.py:869 msgid "No json file found in zipfile" msgstr "" -#: ishtar_common/admin.py:887 +#: ishtar_common/admin.py:892 msgid "Bad geojson file" msgstr "" -#: ishtar_common/admin.py:899 +#: ishtar_common/admin.py:904 msgid "Too many errors..." msgstr "" -#: ishtar_common/admin.py:952 +#: ishtar_common/admin.py:957 msgid "Zipped JSON file" msgstr "" -#: ishtar_common/admin.py:953 +#: ishtar_common/admin.py:958 msgid "Import from a zipped JSON file generated by Ishtar" msgstr "" -#: ishtar_common/admin.py:989 +#: ishtar_common/admin.py:994 msgid "{} {}(s) created/updated." msgstr "" -#: ishtar_common/admin.py:1012 +#: ishtar_common/admin.py:1017 msgid "Center" msgstr "" -#: ishtar_common/admin.py:1013 ishtar_common/models_common.py:2636 +#: ishtar_common/admin.py:1018 ishtar_common/models_common.py:2637 msgid "Limit" msgstr "" -#: ishtar_common/admin.py:1021 +#: ishtar_common/admin.py:1026 msgid "Parents" msgstr "" -#: ishtar_common/admin.py:1062 ishtar_common/admin.py:1503 +#: ishtar_common/admin.py:1067 ishtar_common/admin.py:1508 msgid "Make available" msgstr "" -#: ishtar_common/admin.py:1063 ishtar_common/admin.py:1504 +#: ishtar_common/admin.py:1068 ishtar_common/admin.py:1509 msgid "Make unavailable" msgstr "" -#: ishtar_common/admin.py:1187 +#: ishtar_common/admin.py:1192 msgid "Department number" msgstr "" -#: ishtar_common/admin.py:1188 +#: ishtar_common/admin.py:1193 msgid "Area name" msgstr "" -#: ishtar_common/admin.py:1202 +#: ishtar_common/admin.py:1207 msgid "Choose an area or set an area reference." msgstr "" -#: ishtar_common/admin.py:1209 +#: ishtar_common/admin.py:1214 msgid "Invalid department number." msgstr "" -#: ishtar_common/admin.py:1218 +#: ishtar_common/admin.py:1223 msgid "This name is already used by another area." msgstr "" -#: ishtar_common/admin.py:1246 +#: ishtar_common/admin.py:1251 msgid "Area \"{}\" created." msgstr "" -#: ishtar_common/admin.py:1263 +#: ishtar_common/admin.py:1268 msgid "{} town(s) added to \"{}\"." msgstr "" -#: ishtar_common/admin.py:1435 +#: ishtar_common/admin.py:1440 msgid "{} importer type(s) duplicated: {}." msgstr "" -#: ishtar_common/admin.py:1456 +#: ishtar_common/admin.py:1461 msgid "Select only one importer." msgstr "" -#: ishtar_common/admin.py:1486 +#: ishtar_common/admin.py:1491 msgid "Export as libreoffice template" msgstr "" -#: ishtar_common/admin.py:1555 +#: ishtar_common/admin.py:1560 msgid "{} importer column(s) duplicated: {}." msgstr "" -#: ishtar_common/admin.py:1586 +#: ishtar_common/admin.py:1591 msgid "{} importer column(s) right-shifted." msgstr "" -#: ishtar_common/admin.py:1599 +#: ishtar_common/admin.py:1604 msgid "Shift right" msgstr "" -#: ishtar_common/admin.py:1626 +#: ishtar_common/admin.py:1631 msgid "{} importer column(s) left-shifted." msgstr "" -#: ishtar_common/admin.py:1633 +#: ishtar_common/admin.py:1638 msgid "{} importer column(s) not left-shifted: no place available." msgstr "" -#: ishtar_common/admin.py:1647 +#: ishtar_common/admin.py:1652 msgid "Shift left" msgstr "" -#: ishtar_common/admin.py:1682 +#: ishtar_common/admin.py:1687 msgid "Importer available" msgstr "" -#: ishtar_common/admin.py:1827 +#: ishtar_common/admin.py:1832 msgid "Display selected" msgstr "" -#: ishtar_common/admin.py:1828 +#: ishtar_common/admin.py:1833 msgid "Hide selected" msgstr "" -#: ishtar_common/admin.py:1858 ishtar_common/models.py:1553 +#: ishtar_common/admin.py:1863 ishtar_common/models.py:1553 msgid "Form" msgstr "" -#: ishtar_common/admin.py:1879 ishtar_common/models.py:1694 +#: ishtar_common/admin.py:1884 ishtar_common/models.py:1694 msgid "Field" msgstr "" -#: ishtar_common/admin.py:2009 ishtar_common/admin.py:2061 +#: ishtar_common/admin.py:2014 ishtar_common/admin.py:2066 msgid "Select only one task." msgstr "" -#: ishtar_common/admin.py:2016 +#: ishtar_common/admin.py:2021 msgid "Export already exported/scheduled." msgstr "" -#: ishtar_common/admin.py:2028 +#: ishtar_common/admin.py:2033 msgid "Launch export" msgstr "" -#: ishtar_common/admin.py:2068 +#: ishtar_common/admin.py:2073 msgid "Import already imported/scheduled." msgstr "" -#: ishtar_common/admin.py:2080 ishtar_common/models_imports.py:1353 +#: ishtar_common/admin.py:2085 ishtar_common/models_imports.py:1353 msgid "Launch import" msgstr "" -#: ishtar_common/admin.py:2150 ishtar_common/models.py:976 +#: ishtar_common/admin.py:2155 ishtar_common/models.py:976 msgid "Content type" msgstr "" -#: ishtar_common/admin.py:2182 ishtar_common/admin.py:2292 -#: ishtar_common/admin.py:2328 +#: ishtar_common/admin.py:2187 ishtar_common/admin.py:2297 +#: ishtar_common/admin.py:2333 msgid "Select only one source." msgstr "" -#: ishtar_common/admin.py:2203 +#: ishtar_common/admin.py:2208 msgid "Timeout: failed to join {}." msgstr "" -#: ishtar_common/admin.py:2211 +#: ishtar_common/admin.py:2216 msgid "" "Bad response for {} - {}. Response status code {} != 200. Check your key?" msgstr "" -#: ishtar_common/admin.py:2221 +#: ishtar_common/admin.py:2226 msgid "Response of {} is not a valid JSON message." msgstr "" -#: ishtar_common/admin.py:2239 +#: ishtar_common/admin.py:2244 #, python-brace-format msgid "{created} matches created" msgstr "" -#: ishtar_common/admin.py:2245 +#: ishtar_common/admin.py:2250 #, python-brace-format msgid "{updated} matches updated" msgstr "" -#: ishtar_common/admin.py:2251 +#: ishtar_common/admin.py:2256 #, python-brace-format msgid "{deleted} matches deleted" msgstr "" -#: ishtar_common/admin.py:2260 +#: ishtar_common/admin.py:2265 #, python-brace-format msgid "" "Theses search models have not been found: {missing_models}. Not the same " "Ishtar version?" msgstr "" -#: ishtar_common/admin.py:2278 +#: ishtar_common/admin.py:2283 msgid "Update types from source" msgstr "" -#: ishtar_common/admin.py:2313 +#: ishtar_common/admin.py:2318 msgid "Generate match document" msgstr "" -#: ishtar_common/admin.py:2337 +#: ishtar_common/admin.py:2342 msgid "Error on update. Cannot open match document." msgstr "" -#: ishtar_common/admin.py:2342 +#: ishtar_common/admin.py:2347 msgid "Error on type update from match document:" msgstr "" -#: ishtar_common/admin.py:2355 +#: ishtar_common/admin.py:2360 msgid "Update association from match document" msgstr "" -#: ishtar_common/admin.py:2388 +#: ishtar_common/admin.py:2393 msgid "Enable match" msgstr "" -#: ishtar_common/admin.py:2389 +#: ishtar_common/admin.py:2394 msgid "Disable match" msgstr "" -#: ishtar_common/admin.py:2399 ishtar_common/models_rest.py:70 +#: ishtar_common/admin.py:2404 ishtar_common/models_rest.py:70 msgid "API - Remote access - Search model" msgstr "" -#: ishtar_common/admin.py:2402 ishtar_common/models.py:449 -#: ishtar_common/models.py:732 ishtar_common/models_common.py:806 +#: ishtar_common/admin.py:2407 ishtar_common/models.py:449 +#: ishtar_common/models.py:732 ishtar_common/models_common.py:807 #: ishtar_common/models_imports.py:794 ishtar_common/models_rest.py:95 #: ishtar_common/templates/ishtar/formset_import_match.html:44 #: ishtar_common/templates/ishtar/import_step_by_step.html:171 @@ -8353,21 +8344,21 @@ msgstr "" msgid "Key" msgstr "" -#: ishtar_common/admin.py:2404 +#: ishtar_common/admin.py:2409 msgid "Save first to choose a key" msgstr "" -#: ishtar_common/admin.py:2434 +#: ishtar_common/admin.py:2439 msgid "Available keys: " msgstr "" -#: ishtar_common/admin.py:2467 +#: ishtar_common/admin.py:2472 msgid "" "Only one type of geographic data is accepted. Create different objects if " "you have many." msgstr "" -#: ishtar_common/admin.py:2475 +#: ishtar_common/admin.py:2480 msgid "You cannot set only x or only y coordinate." msgstr "" @@ -8466,7 +8457,7 @@ msgstr "" msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d" msgstr "" -#: ishtar_common/data_importer.py:854 ishtar_common/views.py:1618 +#: ishtar_common/data_importer.py:854 ishtar_common/views.py:1619 msgid "No data provided" msgstr "" @@ -8500,8 +8491,8 @@ msgid "" "Related object not found. Can not create the geographic item. Context: {}." msgstr "" -#: ishtar_common/data_importer.py:1551 ishtar_common/views.py:1696 -#: ishtar_common/views.py:1706 +#: ishtar_common/data_importer.py:1551 ishtar_common/views.py:1697 +#: ishtar_common/views.py:1707 msgid "Not imported" msgstr "" @@ -8582,8 +8573,8 @@ msgstr "" msgid "File too large. Size should not exceed {} Mo." msgstr "" -#: ishtar_common/forms.py:112 ishtar_common/forms_common.py:1268 -#: ishtar_common/views.py:2585 +#: ishtar_common/forms.py:112 ishtar_common/forms_common.py:1271 +#: ishtar_common/views.py:2586 msgid "Confirm" msgstr "" @@ -8615,7 +8606,7 @@ msgstr "" msgid "Is locked?" msgstr "" -#: ishtar_common/forms.py:971 ishtar_common/forms_common.py:2106 +#: ishtar_common/forms.py:971 ishtar_common/forms_common.py:2109 msgid "Has an image?" msgstr "" @@ -8653,49 +8644,49 @@ msgid "" "french town Saint-Denis in the Seine-Saint-Denis department.</p>" msgstr "" -#: ishtar_common/forms_common.py:169 ishtar_common/forms_common.py:257 +#: ishtar_common/forms_common.py:169 ishtar_common/forms_common.py:255 msgid "Associated images (web link to a zip file)" msgstr "" -#: ishtar_common/forms_common.py:192 ishtar_common/forms_common.py:276 +#: ishtar_common/forms_common.py:191 ishtar_common/forms_common.py:273 msgid "Import (table)" msgstr "" -#: ishtar_common/forms_common.py:236 +#: ishtar_common/forms_common.py:234 msgid "This is not a valid CSV file. Check file format and encoding." msgstr "" -#: ishtar_common/forms_common.py:248 +#: ishtar_common/forms_common.py:246 msgid "" "This import type have no unicity type defined. Conservative import is not " "possible." msgstr "" -#: ishtar_common/forms_common.py:284 +#: ishtar_common/forms_common.py:281 msgid "You put either a file or a download link for images but not both." msgstr "" -#: ishtar_common/forms_common.py:295 ishtar_common/tests.py:2524 +#: ishtar_common/forms_common.py:292 ishtar_common/tests.py:2533 msgid "\"Associated images\" field must be a valid zip file." msgstr "" -#: ishtar_common/forms_common.py:307 +#: ishtar_common/forms_common.py:304 msgid "Invalid link or no file is available for this link." msgstr "" -#: ishtar_common/forms_common.py:349 +#: ishtar_common/forms_common.py:347 msgid "Import (GIS)" msgstr "" -#: ishtar_common/forms_common.py:370 +#: ishtar_common/forms_common.py:372 msgid "GIS file must be a zip containing a ShapeFile or GeoPackage file." msgstr "" -#: ishtar_common/forms_common.py:393 +#: ishtar_common/forms_common.py:395 msgid "Target" msgstr "" -#: ishtar_common/forms_common.py:394 ishtar_common/models.py:1756 +#: ishtar_common/forms_common.py:396 ishtar_common/models.py:1756 #: ishtar_common/models_imports.py:795 #: ishtar_common/templates/ishtar/formset_import_match.html:45 #: ishtar_common/templates/ishtar/import_step_by_step.html:172 @@ -8704,656 +8695,671 @@ msgstr "" msgid "Value" msgstr "" -#: ishtar_common/forms_common.py:395 +#: ishtar_common/forms_common.py:397 msgid "Remember" msgstr "" -#: ishtar_common/forms_common.py:420 +#: ishtar_common/forms_common.py:422 msgid "Set to NULL" msgstr "" -#: ishtar_common/forms_common.py:427 +#: ishtar_common/forms_common.py:429 msgid "this import only" msgstr "" -#: ishtar_common/forms_common.py:428 +#: ishtar_common/forms_common.py:430 msgid "me" msgstr "" -#: ishtar_common/forms_common.py:441 +#: ishtar_common/forms_common.py:443 msgid "the current group: {}" msgstr "" -#: ishtar_common/forms_common.py:447 +#: ishtar_common/forms_common.py:449 msgid "all users" msgstr "" -#: ishtar_common/forms_common.py:526 ishtar_common/forms_common.py:637 +#: ishtar_common/forms_common.py:528 ishtar_common/forms_common.py:640 #: ishtar_common/models.py:2411 ishtar_common/models_imports.py:871 #: ishtar_common/models_imports.py:872 msgid "Organization type" msgstr "" -#: ishtar_common/forms_common.py:527 ishtar_common/forms_common.py:2071 -#: ishtar_common/models.py:2479 +#: ishtar_common/forms_common.py:529 ishtar_common/forms_common.py:2074 +#: ishtar_common/models.py:2486 msgid "Web address" msgstr "" -#: ishtar_common/forms_common.py:529 ishtar_common/forms_common.py:640 +#: ishtar_common/forms_common.py:531 ishtar_common/forms_common.py:643 #: ishtar_common/models.py:2387 ishtar_common/models.py:2404 -#: ishtar_common/models.py:2481 +#: ishtar_common/models.py:2488 msgid "Grammatical gender" msgstr "" -#: ishtar_common/forms_common.py:532 ishtar_common/forms_common.py:643 +#: ishtar_common/forms_common.py:534 ishtar_common/forms_common.py:646 msgid "Can be used by templates" msgstr "" -#: ishtar_common/forms_common.py:542 ishtar_common/forms_common.py:763 -#: ishtar_common/forms_common.py:890 ishtar_common/forms_common.py:981 -#: ishtar_common/forms_common.py:1148 ishtar_common/models_common.py:2889 -#: ishtar_common/wizards.py:1931 +#: ishtar_common/forms_common.py:544 ishtar_common/forms_common.py:766 +#: ishtar_common/forms_common.py:893 ishtar_common/forms_common.py:984 +#: ishtar_common/forms_common.py:1151 ishtar_common/models_common.py:2893 +#: ishtar_common/models_common.py:3028 ishtar_common/wizards.py:1931 msgid "Email" msgstr "" -#: ishtar_common/forms_common.py:594 ishtar_common/forms_common.py:610 -#: ishtar_common/views.py:236 +#: ishtar_common/forms_common.py:597 ishtar_common/forms_common.py:613 +#: ishtar_common/views.py:237 msgid "Organization search" msgstr "" -#: ishtar_common/forms_common.py:627 +#: ishtar_common/forms_common.py:630 msgid "Organization - Quick action - Modify" msgstr "" -#: ishtar_common/forms_common.py:680 +#: ishtar_common/forms_common.py:683 msgid "Merge all items into" msgstr "" -#: ishtar_common/forms_common.py:718 +#: ishtar_common/forms_common.py:721 msgid "Organization to merge" msgstr "" -#: ishtar_common/forms_common.py:762 ishtar_common/forms_common.py:886 -#: ishtar_common/forms_common.py:980 ishtar_common/models.py:2755 +#: ishtar_common/forms_common.py:765 ishtar_common/forms_common.py:889 +#: ishtar_common/forms_common.py:983 ishtar_common/models.py:2758 #: ishtar_common/templates/ishtar/sheet_organization.html:26 msgid "Surname" msgstr "" -#: ishtar_common/forms_common.py:781 ishtar_common/forms_common.py:797 -#: ishtar_common/forms_common.py:956 ishtar_common/views.py:177 +#: ishtar_common/forms_common.py:784 ishtar_common/forms_common.py:800 +#: ishtar_common/forms_common.py:959 ishtar_common/views.py:178 msgid "Person search" msgstr "" -#: ishtar_common/forms_common.py:815 +#: ishtar_common/forms_common.py:818 msgid "Person - Quick action - Modify" msgstr "" -#: ishtar_common/forms_common.py:826 ishtar_common/forms_common.py:883 -#: ishtar_common/forms_common.py:1653 ishtar_common/forms_common.py:2063 -#: ishtar_common/forms_common.py:2289 ishtar_common/models.py:2742 -#: ishtar_common/models.py:2746 ishtar_common/models.py:4077 +#: ishtar_common/forms_common.py:829 ishtar_common/forms_common.py:886 +#: ishtar_common/forms_common.py:1656 ishtar_common/forms_common.py:2066 +#: ishtar_common/forms_common.py:2292 ishtar_common/models.py:2745 +#: ishtar_common/models.py:2749 ishtar_common/models.py:4080 #: ishtar_common/models_imports.py:874 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:7 +#: ishtar_common/templates/ishtar/merge_person.html:10 +#: ishtar_common/templates/ishtar/merge_person.html:22 msgid "Title" msgstr "" -#: ishtar_common/forms_common.py:837 ishtar_common/models.py:2561 +#: ishtar_common/forms_common.py:840 ishtar_common/models.py:2564 msgid "Person types" msgstr "" -#: ishtar_common/forms_common.py:855 +#: ishtar_common/forms_common.py:858 msgid "Person to merge" msgstr "" -#: ishtar_common/forms_common.py:877 +#: ishtar_common/forms_common.py:880 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:19 msgid "Identity" msgstr "" -#: ishtar_common/forms_common.py:884 ishtar_common/models.py:2752 +#: ishtar_common/forms_common.py:887 ishtar_common/models.py:2755 +#: ishtar_common/templates/ishtar/merge_person.html:12 +#: ishtar_common/templates/ishtar/merge_person.html:24 msgid "Salutation" msgstr "" -#: ishtar_common/forms_common.py:889 ishtar_common/models.py:2765 +#: ishtar_common/forms_common.py:892 ishtar_common/models.py:2768 +#: ishtar_common/templates/ishtar/merge_person.html:9 +#: ishtar_common/templates/ishtar/merge_person.html:21 msgid "Raw name" msgstr "" -#: ishtar_common/forms_common.py:892 ishtar_common/models_common.py:2873 +#: ishtar_common/forms_common.py:895 ishtar_common/models_common.py:2877 msgid "Phone description" msgstr "" -#: ishtar_common/forms_common.py:896 ishtar_common/models_common.py:2876 -#: ishtar_common/models_common.py:2879 +#: ishtar_common/forms_common.py:899 ishtar_common/models_common.py:2880 +#: ishtar_common/models_common.py:2883 msgid "Phone description 2" msgstr "" -#: ishtar_common/forms_common.py:898 +#: ishtar_common/forms_common.py:901 msgid "Phone 2" msgstr "" -#: ishtar_common/forms_common.py:900 ishtar_common/models_common.py:2883 +#: ishtar_common/forms_common.py:903 ishtar_common/models_common.py:2887 msgid "Phone description 3" msgstr "" -#: ishtar_common/forms_common.py:902 ishtar_common/models_common.py:2881 +#: ishtar_common/forms_common.py:905 ishtar_common/models_common.py:2885 msgid "Phone 3" msgstr "" -#: ishtar_common/forms_common.py:907 +#: ishtar_common/forms_common.py:910 msgid "Current organization" msgstr "" -#: ishtar_common/forms_common.py:925 ishtar_common/models_common.py:2858 +#: ishtar_common/forms_common.py:928 ishtar_common/models_common.py:2862 msgid "Other address: address" msgstr "" -#: ishtar_common/forms_common.py:928 ishtar_common/models_common.py:2860 +#: ishtar_common/forms_common.py:931 ishtar_common/models_common.py:2864 msgid "Other address: address complement" msgstr "" -#: ishtar_common/forms_common.py:933 ishtar_common/models_common.py:2863 +#: ishtar_common/forms_common.py:936 ishtar_common/models_common.py:2867 msgid "Other address: postal code" msgstr "" -#: ishtar_common/forms_common.py:936 ishtar_common/models_common.py:2866 +#: ishtar_common/forms_common.py:939 ishtar_common/models_common.py:2870 msgid "Other address: town" msgstr "" -#: ishtar_common/forms_common.py:939 ishtar_common/models_common.py:2869 +#: ishtar_common/forms_common.py:942 ishtar_common/models_common.py:2873 msgid "Other address: country" msgstr "" -#: ishtar_common/forms_common.py:951 +#: ishtar_common/forms_common.py:954 msgid "Already has an account" msgstr "" -#: ishtar_common/forms_common.py:978 ishtar_common/models.py:3271 +#: ishtar_common/forms_common.py:981 ishtar_common/models.py:3274 #: ishtar_common/wizards.py:1930 msgid "Username" msgstr "" -#: ishtar_common/forms_common.py:1000 ishtar_common/forms_common.py:1013 +#: ishtar_common/forms_common.py:1003 ishtar_common/forms_common.py:1016 msgid "Account search" msgstr "" -#: ishtar_common/forms_common.py:1075 ishtar_common/forms_common.py:1123 -#: ishtar_common/forms_common.py:1127 ishtar_common/models.py:2560 +#: ishtar_common/forms_common.py:1078 ishtar_common/forms_common.py:1126 +#: ishtar_common/forms_common.py:1130 ishtar_common/models.py:2563 #: ishtar_common/models_imports.py:873 msgid "Person type" msgstr "" -#: ishtar_common/forms_common.py:1142 ishtar_common/forms_common.py:1146 +#: ishtar_common/forms_common.py:1145 ishtar_common/forms_common.py:1149 #: ishtar_common/ishtar_menu.py:38 msgid "Account" msgstr "" -#: ishtar_common/forms_common.py:1151 ishtar_common/forms_common.py:1166 +#: ishtar_common/forms_common.py:1154 ishtar_common/forms_common.py:1169 #: ishtar_common/wizards.py:1966 msgid "New password" msgstr "" -#: ishtar_common/forms_common.py:1158 +#: ishtar_common/forms_common.py:1161 msgid "New password (confirmation)" msgstr "" -#: ishtar_common/forms_common.py:1168 +#: ishtar_common/forms_common.py:1171 msgid "" "Keep these fields empty if you do not want to change password. On creation, " "if you leave these fields empty, the user will not be able to connect." msgstr "" -#: ishtar_common/forms_common.py:1206 +#: ishtar_common/forms_common.py:1209 msgid "Your password and confirmation password do not match." msgstr "" -#: ishtar_common/forms_common.py:1212 +#: ishtar_common/forms_common.py:1215 msgid "You must provide a correct password." msgstr "" -#: ishtar_common/forms_common.py:1221 +#: ishtar_common/forms_common.py:1224 msgid "This username already exists." msgstr "" -#: ishtar_common/forms_common.py:1253 +#: ishtar_common/forms_common.py:1256 msgid "Choose different name for profiles." msgstr "" -#: ishtar_common/forms_common.py:1270 +#: ishtar_common/forms_common.py:1273 msgid "Send the new password by email?" msgstr "" -#: ishtar_common/forms_common.py:1283 ishtar_common/models.py:3100 -#: ishtar_common/views.py:1263 +#: ishtar_common/forms_common.py:1286 ishtar_common/models.py:3103 +#: ishtar_common/views.py:1264 msgid "Current profile" msgstr "" -#: ishtar_common/forms_common.py:1286 ishtar_common/models.py:3073 -#: ishtar_common/models.py:3092 ishtar_common/models_imports.py:879 +#: ishtar_common/forms_common.py:1289 ishtar_common/models.py:3076 +#: ishtar_common/models.py:3095 ishtar_common/models_imports.py:879 msgid "Profile type" msgstr "" -#: ishtar_common/forms_common.py:1289 +#: ishtar_common/forms_common.py:1292 msgid "Pin automatically items on creation and modification" msgstr "" -#: ishtar_common/forms_common.py:1294 +#: ishtar_common/forms_common.py:1297 msgid "Duplicate this profile" msgstr "" -#: ishtar_common/forms_common.py:1297 +#: ishtar_common/forms_common.py:1300 msgid "Delete this profile" msgstr "" -#: ishtar_common/forms_common.py:1334 ishtar_common/forms_common.py:1342 +#: ishtar_common/forms_common.py:1337 ishtar_common/forms_common.py:1345 #, python-brace-format msgid "External source - {src.name}" msgstr "" -#: ishtar_common/forms_common.py:1391 +#: ishtar_common/forms_common.py:1394 msgid "A profile with the same name exists." msgstr "" -#: ishtar_common/forms_common.py:1424 +#: ishtar_common/forms_common.py:1427 msgid " (duplicate)" msgstr "" -#: ishtar_common/forms_common.py:1453 +#: ishtar_common/forms_common.py:1456 msgid "There are identical towns." msgstr "" -#: ishtar_common/forms_common.py:1540 +#: ishtar_common/forms_common.py:1543 msgid "Only one choice can be checked." msgstr "" -#: ishtar_common/forms_common.py:1590 +#: ishtar_common/forms_common.py:1593 #, python-format msgid "Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)." msgstr "" -#: ishtar_common/forms_common.py:1615 +#: ishtar_common/forms_common.py:1618 msgid "This value already exist" msgstr "" -#: ishtar_common/forms_common.py:1631 ishtar_common/models.py:3692 +#: ishtar_common/forms_common.py:1634 ishtar_common/models.py:3695 #: ishtar_common/models_imports.py:882 msgid "Document tag" msgstr "" -#: ishtar_common/forms_common.py:1640 +#: ishtar_common/forms_common.py:1643 msgid "Document - General" msgstr "" -#: ishtar_common/forms_common.py:1661 ishtar_common/forms_common.py:2069 -#: ishtar_common/forms_common.py:2271 ishtar_common/models.py:4143 +#: ishtar_common/forms_common.py:1664 ishtar_common/forms_common.py:2072 +#: ishtar_common/forms_common.py:2274 ishtar_common/models.py:4146 msgid "Medium" msgstr "" -#: ishtar_common/forms_common.py:1664 ishtar_common/forms_common.py:1853 -#: ishtar_common/forms_common.py:2068 ishtar_common/forms_common.py:2270 -#: ishtar_common/models.py:4150 ishtar_common/models_imports.py:878 +#: ishtar_common/forms_common.py:1667 ishtar_common/forms_common.py:1856 +#: ishtar_common/forms_common.py:2071 ishtar_common/forms_common.py:2273 +#: ishtar_common/models.py:4153 ishtar_common/models_imports.py:878 #: ishtar_common/models_imports.py:880 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:88 #: ishtar_common/templates/ishtar/sheet_document.html:50 msgid "Format" msgstr "" -#: ishtar_common/forms_common.py:1666 ishtar_common/forms_common.py:2070 -#: ishtar_common/forms_common.py:2272 ishtar_common/models.py:4155 +#: ishtar_common/forms_common.py:1669 ishtar_common/forms_common.py:2073 +#: ishtar_common/forms_common.py:2275 ishtar_common/models.py:4158 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:98 msgid "Scale" msgstr "" -#: ishtar_common/forms_common.py:1684 ishtar_common/forms_common.py:1855 -#: ishtar_common/forms_common.py:2496 ishtar_common/forms_common.py:2497 -#: ishtar_common/models.py:3558 ishtar_common/models.py:3808 -#: ishtar_common/models.py:4157 +#: ishtar_common/forms_common.py:1687 ishtar_common/forms_common.py:1858 +#: ishtar_common/forms_common.py:2499 ishtar_common/forms_common.py:2500 +#: ishtar_common/models.py:3561 ishtar_common/models.py:3811 +#: ishtar_common/models.py:4160 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:9 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:9 #: ishtar_common/templates/ishtar/sheet_document.html:66 msgid "Authors" msgstr "" -#: ishtar_common/forms_common.py:1690 ishtar_common/forms_common.py:2074 -#: ishtar_common/models.py:4099 +#: ishtar_common/forms_common.py:1693 ishtar_common/forms_common.py:2077 +#: ishtar_common/models.py:4102 msgid "Publisher" msgstr "" -#: ishtar_common/forms_common.py:1714 ishtar_common/forms_common.py:2096 -#: ishtar_common/models.py:4106 +#: ishtar_common/forms_common.py:1717 ishtar_common/forms_common.py:2099 +#: ishtar_common/models.py:4109 msgid "Year of publication" msgstr "" -#: ishtar_common/forms_common.py:1719 +#: ishtar_common/forms_common.py:1722 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:64 msgid "Licenses" msgstr "" -#: ishtar_common/forms_common.py:1722 ishtar_common/models.py:4111 +#: ishtar_common/forms_common.py:1725 ishtar_common/models.py:4114 msgid "Tags" msgstr "" -#: ishtar_common/forms_common.py:1728 ishtar_common/forms_common.py:2097 -#: ishtar_common/models.py:996 ishtar_common/models.py:4114 +#: ishtar_common/forms_common.py:1731 ishtar_common/forms_common.py:2100 +#: ishtar_common/models.py:996 ishtar_common/models.py:4117 #: ishtar_common/models_imports.py:883 overload_translation/models.py:11 msgid "Language" msgstr "" -#: ishtar_common/forms_common.py:1731 ishtar_common/forms_common.py:2099 -#: ishtar_common/models.py:4119 +#: ishtar_common/forms_common.py:1734 ishtar_common/forms_common.py:2102 +#: ishtar_common/models.py:4122 msgid "ISSN" msgstr "" -#: ishtar_common/forms_common.py:1737 ishtar_common/forms_common.py:2098 -#: ishtar_common/models.py:4120 +#: ishtar_common/forms_common.py:1740 ishtar_common/forms_common.py:2101 +#: ishtar_common/models.py:4123 msgid "ISBN" msgstr "" -#: ishtar_common/forms_common.py:1743 ishtar_common/forms_common.py:1858 -#: ishtar_common/forms_common.py:2108 ishtar_common/models.py:4123 -#: ishtar_common/models.py:5182 -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:7 +#: ishtar_common/forms_common.py:1746 ishtar_common/forms_common.py:1861 +#: ishtar_common/forms_common.py:2111 ishtar_common/models.py:4126 +#: ishtar_common/models.py:5185 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:8 #: ishtar_common/templates/ishtar/sheet_document.html:93 msgid "Source" msgstr "" -#: ishtar_common/forms_common.py:1746 ishtar_common/forms_common.py:2114 -#: ishtar_common/models.py:4130 +#: ishtar_common/forms_common.py:1749 ishtar_common/forms_common.py:2117 +#: ishtar_common/models.py:4133 msgid "Source - free input" msgstr "" -#: ishtar_common/forms_common.py:1751 ishtar_common/models.py:4136 +#: ishtar_common/forms_common.py:1754 ishtar_common/models.py:4139 msgid "Source - page range" msgstr "" -#: ishtar_common/forms_common.py:1755 +#: ishtar_common/forms_common.py:1758 msgid "" "Unique page: \"242\", page range: \"242-245\", multiple pages: " "\"242;245;249\", multiples pages and multiple pages ranges: " "\"242-245;249;262-265\"." msgstr "" -#: ishtar_common/forms_common.py:1761 ishtar_common/models.py:4166 +#: ishtar_common/forms_common.py:1764 ishtar_common/models.py:4169 msgid "Numerical ressource (web address)" msgstr "" -#: ishtar_common/forms_common.py:1764 +#: ishtar_common/forms_common.py:1767 msgid "Image" msgstr "" -#: ishtar_common/forms_common.py:1772 +#: ishtar_common/forms_common.py:1775 #: ishtar_common/templates/ishtar/sheet_document.html:58 msgctxt "Not directory" msgid "File" msgstr "" -#: ishtar_common/forms_common.py:1789 ishtar_common/models.py:4169 +#: ishtar_common/forms_common.py:1792 ishtar_common/models.py:4172 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:150 msgid "Receipt date" msgstr "" -#: ishtar_common/forms_common.py:1795 ishtar_common/models.py:4175 +#: ishtar_common/forms_common.py:1798 ishtar_common/models.py:4178 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:160 msgid "Receipt date in documentation" msgstr "" -#: ishtar_common/forms_common.py:1802 ishtar_common/models.py:4189 +#: ishtar_common/forms_common.py:1805 ishtar_common/models.py:4192 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:182 msgid "Additional information" msgstr "" -#: ishtar_common/forms_common.py:1804 ishtar_common/forms_common.py:2104 -#: ishtar_common/models.py:4191 +#: ishtar_common/forms_common.py:1807 ishtar_common/forms_common.py:2107 +#: ishtar_common/models.py:4194 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:108 msgid "Has a duplicate" msgstr "" -#: ishtar_common/forms_common.py:1851 ishtar_common/forms_common.py:2669 +#: ishtar_common/forms_common.py:1854 ishtar_common/forms_common.py:2671 #: ishtar_common/templates/ishtar/forms/base_related_items.html:5 #: ishtar_common/templates/ishtar/sheet_document.html:120 msgid "Related items" msgstr "" -#: ishtar_common/forms_common.py:1857 +#: ishtar_common/forms_common.py:1860 #: ishtar_common/templates/ishtar/sheet_document.html:83 msgid "Publishing" msgstr "" -#: ishtar_common/forms_common.py:1860 +#: ishtar_common/forms_common.py:1863 msgid "Advanced" msgstr "" -#: ishtar_common/forms_common.py:1907 +#: ishtar_common/forms_common.py:1910 msgid "Incorrect page range." msgstr "" -#: ishtar_common/forms_common.py:1994 +#: ishtar_common/forms_common.py:1997 msgid "" "You should at least fill one of this field: title, url, image or file. If " "you have provided an image check that it is not corrupted." msgstr "" -#: ishtar_common/forms_common.py:2003 +#: ishtar_common/forms_common.py:2006 msgid "A document has to be attached at least to one item" msgstr "" -#: ishtar_common/forms_common.py:2046 +#: ishtar_common/forms_common.py:2049 msgid "Document - 001 - Search" msgstr "" -#: ishtar_common/forms_common.py:2059 ishtar_common/forms_common.py:2265 -#: ishtar_common/forms_common.py:2432 ishtar_common/forms_common.py:2483 -#: ishtar_common/models.py:3557 +#: ishtar_common/forms_common.py:2062 ishtar_common/forms_common.py:2268 +#: ishtar_common/forms_common.py:2435 ishtar_common/forms_common.py:2486 +#: ishtar_common/models.py:3560 #: ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html:139 msgid "Author" msgstr "" -#: ishtar_common/forms_common.py:2072 +#: ishtar_common/forms_common.py:2075 msgid "Tag" msgstr "" -#: ishtar_common/forms_common.py:2100 ishtar_common/models.py:4109 +#: ishtar_common/forms_common.py:2103 ishtar_common/models.py:4112 msgid "License" msgstr "" -#: ishtar_common/forms_common.py:2103 +#: ishtar_common/forms_common.py:2106 msgid "Additional informations" msgstr "" -#: ishtar_common/forms_common.py:2105 +#: ishtar_common/forms_common.py:2108 msgid "Has a file?" msgstr "" -#: ishtar_common/forms_common.py:2116 +#: ishtar_common/forms_common.py:2119 msgid "Warehouse - Container" msgstr "" -#: ishtar_common/forms_common.py:2124 +#: ishtar_common/forms_common.py:2127 msgid "Warehouse - Reference container" msgstr "" -#: ishtar_common/forms_common.py:2141 +#: ishtar_common/forms_common.py:2144 msgid "Operation - type" msgstr "" -#: ishtar_common/forms_common.py:2154 +#: ishtar_common/forms_common.py:2157 msgid "Basket - Finds" msgstr "" -#: ishtar_common/forms_common.py:2169 +#: ishtar_common/forms_common.py:2172 msgid "Find - denomination" msgstr "" -#: ishtar_common/forms_common.py:2179 ishtar_common/forms_common.py:2191 +#: ishtar_common/forms_common.py:2182 ishtar_common/forms_common.py:2194 msgid "Receipt date before" msgstr "" -#: ishtar_common/forms_common.py:2182 ishtar_common/forms_common.py:2194 +#: ishtar_common/forms_common.py:2185 ishtar_common/forms_common.py:2197 msgid "Receipt date after" msgstr "" -#: ishtar_common/forms_common.py:2185 +#: ishtar_common/forms_common.py:2188 msgid "Creation date before" msgstr "" -#: ishtar_common/forms_common.py:2188 +#: ishtar_common/forms_common.py:2191 msgid "Creation date after" msgstr "" -#: ishtar_common/forms_common.py:2216 ishtar_common/forms_common.py:2231 +#: ishtar_common/forms_common.py:2219 ishtar_common/forms_common.py:2234 msgid "Document search" msgstr "" -#: ishtar_common/forms_common.py:2250 +#: ishtar_common/forms_common.py:2253 msgid "Document - Quick action - Modify" msgstr "" -#: ishtar_common/forms_common.py:2263 ishtar_common/models_imports.py:875 +#: ishtar_common/forms_common.py:2266 ishtar_common/models_imports.py:875 #: ishtar_common/models_imports.py:876 msgid "Source type" msgstr "" -#: ishtar_common/forms_common.py:2292 +#: ishtar_common/forms_common.py:2295 msgid "Edit duplicated item" msgstr "" -#: ishtar_common/forms_common.py:2366 +#: ishtar_common/forms_common.py:2369 msgid "current and reference containers" msgstr "" -#: ishtar_common/forms_common.py:2405 +#: ishtar_common/forms_common.py:2408 #: ishtar_common/templates/ishtar/import_table.html:33 msgid "Action" msgstr "" -#: ishtar_common/forms_common.py:2405 +#: ishtar_common/forms_common.py:2408 msgid "Lock" msgstr "" -#: ishtar_common/forms_common.py:2405 +#: ishtar_common/forms_common.py:2408 msgid "Unlock" msgstr "" -#: ishtar_common/forms_common.py:2423 +#: ishtar_common/forms_common.py:2426 msgid "Would you like to delete this documentation?" msgstr "" -#: ishtar_common/forms_common.py:2443 ishtar_common/models.py:3528 -#: ishtar_common/models.py:3549 ishtar_common/models_imports.py:877 +#: ishtar_common/forms_common.py:2446 ishtar_common/models.py:3531 +#: ishtar_common/models.py:3552 ishtar_common/models_imports.py:877 msgid "Author type" msgstr "" -#: ishtar_common/forms_common.py:2460 +#: ishtar_common/forms_common.py:2463 msgid "This author already exist." msgstr "" -#: ishtar_common/forms_common.py:2472 +#: ishtar_common/forms_common.py:2475 msgid "Author selection" msgstr "" -#: ishtar_common/forms_common.py:2490 +#: ishtar_common/forms_common.py:2493 msgid "There are identical authors." msgstr "" -#: ishtar_common/forms_common.py:2503 ishtar_common/forms_common.py:2568 +#: ishtar_common/forms_common.py:2506 ishtar_common/forms_common.py:2571 #: ishtar_common/models.py:974 msgid "Query" msgstr "" -#: ishtar_common/forms_common.py:2507 ishtar_common/models.py:981 +#: ishtar_common/forms_common.py:2510 ishtar_common/models.py:981 msgid "Is an alert" msgstr "" -#: ishtar_common/forms_common.py:2529 +#: ishtar_common/forms_common.py:2532 msgid "A label is required for a new search query." msgstr "" -#: ishtar_common/forms_common.py:2533 +#: ishtar_common/forms_common.py:2536 msgid "Select the search query to update" msgstr "" -#: ishtar_common/forms_common.py:2540 ishtar_common/forms_common.py:2561 +#: ishtar_common/forms_common.py:2543 ishtar_common/forms_common.py:2564 msgid "Query does not exist." msgstr "" -#: ishtar_common/forms_common.py:2596 +#: ishtar_common/forms_common.py:2599 msgid "Geo item" msgstr "" -#: ishtar_common/forms_common.py:2597 +#: ishtar_common/forms_common.py:2600 msgid "Geo item - General" msgstr "" -#: ishtar_common/forms_common.py:2615 ishtar_common/models_common.py:2142 +#: ishtar_common/forms_common.py:2617 ishtar_common/models_common.py:2143 msgid "Import key" msgstr "" -#: ishtar_common/forms_common.py:2618 +#: ishtar_common/forms_common.py:2620 msgid "" "An update via import corresponding to the source element and this key will " "overwrite the data." msgstr "" -#: ishtar_common/forms_common.py:2626 ishtar_common/models_common.py:2157 -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:6 +#: ishtar_common/forms_common.py:2628 ishtar_common/models_common.py:2158 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:7 msgid "Data type" msgstr "" -#: ishtar_common/forms_common.py:2629 ishtar_common/models_common.py:2149 -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:10 +#: ishtar_common/forms_common.py:2631 ishtar_common/models_common.py:2150 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:11 msgid "Origin" msgstr "" -#: ishtar_common/forms_common.py:2632 ishtar_common/models_common.py:2165 -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:11 +#: ishtar_common/forms_common.py:2634 ishtar_common/models_common.py:2166 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:12 msgid "Provider" msgstr "" -#: ishtar_common/forms_common.py:2635 ishtar_common/forms_common.py:2672 -#: ishtar_common/models_common.py:2131 +#: ishtar_common/forms_common.py:2637 ishtar_common/forms_common.py:2674 +#: ishtar_common/models_common.py:2132 msgid "Buffer" msgstr "" -#: ishtar_common/forms_common.py:2639 +#: ishtar_common/forms_common.py:2641 msgid "Buffer type" msgstr "" -#: ishtar_common/forms_common.py:2670 +#: ishtar_common/forms_common.py:2672 msgid "Meta-data" msgstr "" -#: ishtar_common/forms_common.py:2671 +#: ishtar_common/forms_common.py:2673 msgid "Geography" msgstr "" -#: ishtar_common/forms_common.py:2842 +#: ishtar_common/forms_common.py:2859 msgid "If you set a buffer set a buffer type." msgstr "" -#: ishtar_common/forms_common.py:2847 +#: ishtar_common/forms_common.py:2864 msgid "If you set a buffer type set a buffer." msgstr "" -#: ishtar_common/forms_common.py:2863 +#: ishtar_common/forms_common.py:2869 +msgid "A value is expected for Z." +msgstr "" + +#: ishtar_common/forms_common.py:2888 msgid "A geo item has to be attached at least to one item" msgstr "" -#: ishtar_common/forms_common.py:2902 +#: ishtar_common/forms_common.py:2927 msgid "Geometry type" msgstr "" -#: ishtar_common/forms_common.py:2906 +#: ishtar_common/forms_common.py:2930 ishtar_common/models_common.py:2112 +#: ishtar_common/models_common.py:3539 +msgid "Point" +msgstr "" + +#: ishtar_common/forms_common.py:2931 msgid "Point 3D" msgstr "" -#: ishtar_common/forms_common.py:2907 +#: ishtar_common/forms_common.py:2932 msgid "Multi-points" msgstr "" -#: ishtar_common/forms_common.py:2908 +#: ishtar_common/forms_common.py:2933 msgid "Multi-lines" msgstr "" -#: ishtar_common/forms_common.py:2909 +#: ishtar_common/forms_common.py:2934 msgid "Multi-polygons" msgstr "" @@ -9371,7 +9377,7 @@ msgid "Addition/modification" msgstr "" #: ishtar_common/ishtar_menu.py:60 ishtar_common/models.py:1761 -#: ishtar_common/views.py:1379 +#: ishtar_common/views.py:1380 msgid "Global variables" msgstr "" @@ -9383,11 +9389,11 @@ msgstr "" msgid "Imports" msgstr "" -#: ishtar_common/ishtar_menu.py:182 ishtar_common/views.py:1435 +#: ishtar_common/ishtar_menu.py:182 ishtar_common/views.py:1436 msgid "Current imports" msgstr "" -#: ishtar_common/ishtar_menu.py:188 ishtar_common/views.py:1915 +#: ishtar_common/ishtar_menu.py:188 ishtar_common/views.py:1916 msgid "Old imports" msgstr "" @@ -10305,953 +10311,959 @@ msgstr "" msgid "Error: planning_service type is missing" msgstr "" -#: ishtar_common/models.py:2429 ishtar_common/models.py:2598 +#: ishtar_common/models.py:2429 ishtar_common/models.py:2601 msgid "Error: general_contractor type is missing" msgstr "" -#: ishtar_common/models.py:2496 +#: ishtar_common/models.py:2503 msgid "Organizations" msgstr "" -#: ishtar_common/models.py:2524 +#: ishtar_common/models.py:2531 msgid "unknown organization" msgstr "" -#: ishtar_common/models.py:2576 +#: ishtar_common/models.py:2579 msgid "/" msgstr "" -#: ishtar_common/models.py:2582 +#: ishtar_common/models.py:2585 msgid "Error: sra_agent and head_scientist types are missing" msgstr "" -#: ishtar_common/models.py:2590 +#: ishtar_common/models.py:2593 msgid "Error: sra_agent type is missing" msgstr "" -#: ishtar_common/models.py:2606 +#: ishtar_common/models.py:2609 msgid "Error: responsible_planning_service type is missing" msgstr "" -#: ishtar_common/models.py:2618 +#: ishtar_common/models.py:2621 msgid "Error: publisher type is missing" msgstr "" -#: ishtar_common/models.py:2626 +#: ishtar_common/models.py:2629 msgid "Error: operator type is missing" msgstr "" -#: ishtar_common/models.py:2630 ishtar_common/models.py:2643 +#: ishtar_common/models.py:2633 ishtar_common/models.py:2646 msgid "Long title" msgstr "" -#: ishtar_common/models.py:2633 ishtar_common/models_imports.py:926 +#: ishtar_common/models.py:2636 ishtar_common/models_imports.py:926 msgid "Title type" msgstr "" -#: ishtar_common/models.py:2634 +#: ishtar_common/models.py:2637 msgid "Title types" msgstr "" -#: ishtar_common/models.py:2660 +#: ishtar_common/models.py:2663 msgid "Mr" msgstr "" -#: ishtar_common/models.py:2661 +#: ishtar_common/models.py:2664 msgid "Miss" msgstr "" -#: ishtar_common/models.py:2662 +#: ishtar_common/models.py:2665 msgid "Mr and Mrs" msgstr "" -#: ishtar_common/models.py:2663 +#: ishtar_common/models.py:2666 msgid "Mrs" msgstr "" -#: ishtar_common/models.py:2664 +#: ishtar_common/models.py:2667 msgid "Doctor" msgstr "" -#: ishtar_common/models.py:2710 ishtar_common/models.py:3284 +#: ishtar_common/models.py:2713 ishtar_common/models.py:3287 msgctxt "key for text search" msgid "surname" msgstr "" -#: ishtar_common/models.py:2713 ishtar_common/models.py:3288 +#: ishtar_common/models.py:2716 ishtar_common/models.py:3291 msgctxt "key for text search" msgid "email" msgstr "" -#: ishtar_common/models.py:2720 ishtar_common/models.py:3296 +#: ishtar_common/models.py:2723 ishtar_common/models.py:3299 msgctxt "key for text search" msgid "organization" msgstr "" -#: ishtar_common/models.py:2724 +#: ishtar_common/models.py:2727 msgctxt "key for text search" msgid "has-account" msgstr "" -#: ishtar_common/models.py:2760 +#: ishtar_common/models.py:2763 msgid "" "Attention, historical and unfortunate residue in the code of an initial " "translation error." msgstr "" -#: ishtar_common/models.py:2767 +#: ishtar_common/models.py:2770 msgid "Contact type" msgstr "" -#: ishtar_common/models.py:2770 ishtar_common/models.py:2889 +#: ishtar_common/models.py:2773 ishtar_common/models.py:2892 msgid "Types" msgstr "" -#: ishtar_common/models.py:2775 +#: ishtar_common/models.py:2778 msgid "Is attached to" msgstr "" -#: ishtar_common/models.py:2786 +#: ishtar_common/models.py:2789 msgid "Persons" msgstr "" -#: ishtar_common/models.py:3046 +#: ishtar_common/models.py:3049 msgid "Manage account" msgstr "" -#: ishtar_common/models.py:3070 +#: ishtar_common/models.py:3073 msgid "Groups" msgstr "" -#: ishtar_common/models.py:3074 +#: ishtar_common/models.py:3077 msgid "Profile types" msgstr "" -#: ishtar_common/models.py:3085 +#: ishtar_common/models.py:3088 msgid "Profile type summary" msgstr "" -#: ishtar_common/models.py:3086 +#: ishtar_common/models.py:3089 msgid "Profile types summary" msgstr "" -#: ishtar_common/models.py:3101 +#: ishtar_common/models.py:3104 msgid "Show field number" msgstr "" -#: ishtar_common/models.py:3102 +#: ishtar_common/models.py:3105 msgid "Automatically pin" msgstr "" -#: ishtar_common/models.py:3103 +#: ishtar_common/models.py:3106 msgid "Display pin menu" msgstr "" -#: ishtar_common/models.py:3105 +#: ishtar_common/models.py:3108 msgid "Use background tasks" msgstr "" -#: ishtar_common/models.py:3106 +#: ishtar_common/models.py:3109 msgid "" "If set to true, each import, export, document generation is set as a " "background task." msgstr "" -#: ishtar_common/models.py:3110 +#: ishtar_common/models.py:3113 msgid "Send email when the task is finished" msgstr "" -#: ishtar_common/models.py:3120 +#: ishtar_common/models.py:3123 msgid "User profile" msgstr "" -#: ishtar_common/models.py:3121 +#: ishtar_common/models.py:3124 msgid "User profiles" msgstr "" -#: ishtar_common/models.py:3207 ishtar_common/models.py:4949 +#: ishtar_common/models.py:3210 ishtar_common/models.py:4952 msgid "Scheduled" msgstr "" -#: ishtar_common/models.py:3208 ishtar_common/models.py:4950 +#: ishtar_common/models.py:3211 ishtar_common/models.py:4953 msgid "In progress" msgstr "" -#: ishtar_common/models.py:3209 ishtar_common/models.py:4952 +#: ishtar_common/models.py:3212 ishtar_common/models.py:4955 #: ishtar_common/models_imports.py:1058 msgid "Finished" msgstr "" -#: ishtar_common/models.py:3215 +#: ishtar_common/models.py:3218 msgid "Generate label" msgstr "" -#: ishtar_common/models.py:3227 +#: ishtar_common/models.py:3230 msgid "View" msgstr "" -#: ishtar_common/models.py:3229 +#: ishtar_common/models.py:3232 msgid "Arguments" msgstr "" -#: ishtar_common/models.py:3237 ishtar_common/models.py:4966 -#: ishtar_common/models.py:5121 +#: ishtar_common/models.py:3240 ishtar_common/models.py:4969 +#: ishtar_common/models.py:5124 msgid "Result" msgstr "" -#: ishtar_common/models.py:3240 +#: ishtar_common/models.py:3243 msgid "Background task" msgstr "" -#: ishtar_common/models.py:3241 +#: ishtar_common/models.py:3244 msgid "Background tasks" msgstr "" -#: ishtar_common/models.py:3277 +#: ishtar_common/models.py:3280 msgctxt "key for text search" msgid "username" msgstr "" -#: ishtar_common/models.py:3312 +#: ishtar_common/models.py:3315 msgid "Advanced shortcut menu" msgstr "" -#: ishtar_common/models.py:3316 +#: ishtar_common/models.py:3319 msgid "Ishtar user" msgstr "" -#: ishtar_common/models.py:3317 +#: ishtar_common/models.py:3320 msgid "Ishtar users" msgstr "" -#: ishtar_common/models.py:3411 +#: ishtar_common/models.py:3414 msgid "Public" msgstr "" -#: ishtar_common/models.py:3529 +#: ishtar_common/models.py:3532 msgid "Author types" msgstr "" -#: ishtar_common/models.py:3612 +#: ishtar_common/models.py:3615 msgid "COInS export - type" msgstr "" -#: ishtar_common/models.py:3615 +#: ishtar_common/models.py:3618 msgid "COInS export - genre" msgstr "" -#: ishtar_common/models.py:3618 +#: ishtar_common/models.py:3621 msgid "Is localized" msgstr "" -#: ishtar_common/models.py:3620 +#: ishtar_common/models.py:3623 msgid "Setting a language for this type of document is relevant" msgstr "" -#: ishtar_common/models.py:3625 +#: ishtar_common/models.py:3628 msgid "Document type" msgstr "" -#: ishtar_common/models.py:3626 +#: ishtar_common/models.py:3629 msgid "Document types" msgstr "" -#: ishtar_common/models.py:3639 ishtar_common/models.py:3666 +#: ishtar_common/models.py:3642 ishtar_common/models.py:3669 msgid "Only available for these document types" msgstr "" -#: ishtar_common/models.py:3643 ishtar_common/models_imports.py:884 +#: ishtar_common/models.py:3646 ishtar_common/models_imports.py:884 #: ishtar_common/models_imports.py:925 msgid "Support type" msgstr "" -#: ishtar_common/models.py:3644 +#: ishtar_common/models.py:3647 msgid "Support types" msgstr "" -#: ishtar_common/models.py:3653 +#: ishtar_common/models.py:3656 msgid "Iframe template" msgstr "" -#: ishtar_common/models.py:3657 +#: ishtar_common/models.py:3660 msgid "" "Template to insert an iframe for this format. Use django template with a " "{{document}} variable matching the current document." msgstr "" -#: ishtar_common/models.py:3670 +#: ishtar_common/models.py:3673 msgid "Format type" msgstr "" -#: ishtar_common/models.py:3671 +#: ishtar_common/models.py:3674 msgid "Format types" msgstr "" -#: ishtar_common/models.py:3680 ishtar_common/models_rest.py:93 +#: ishtar_common/models.py:3683 ishtar_common/models_rest.py:93 +#: ishtar_common/templates/ishtar/merge_organization.html:11 +#: ishtar_common/templates/ishtar/merge_organization.html:22 msgid "URL" msgstr "" -#: ishtar_common/models.py:3683 ishtar_common/models_imports.py:881 +#: ishtar_common/models.py:3686 ishtar_common/models_imports.py:881 msgid "License type" msgstr "" -#: ishtar_common/models.py:3684 +#: ishtar_common/models.py:3687 msgid "License types" msgstr "" -#: ishtar_common/models.py:3693 +#: ishtar_common/models.py:3696 msgid "Document tags" msgstr "" -#: ishtar_common/models.py:3809 +#: ishtar_common/models.py:3812 msgid "Identifier" msgstr "" -#: ishtar_common/models.py:3832 +#: ishtar_common/models.py:3835 msgctxt "key for text search" msgid "author" msgstr "" -#: ishtar_common/models.py:3836 +#: ishtar_common/models.py:3839 msgctxt "key for text search" msgid "publisher" msgstr "" -#: ishtar_common/models.py:3840 +#: ishtar_common/models.py:3843 msgctxt "key for text search" msgid "publishing-year" msgstr "" -#: ishtar_common/models.py:3844 +#: ishtar_common/models.py:3847 msgctxt "key for text search" msgid "title" msgstr "" -#: ishtar_common/models.py:3855 +#: ishtar_common/models.py:3858 msgctxt "key for text search" msgid "internal-reference" msgstr "" -#: ishtar_common/models.py:3863 +#: ishtar_common/models.py:3866 msgctxt "key for text search" msgid "tag" msgstr "" -#: ishtar_common/models.py:3866 +#: ishtar_common/models.py:3869 msgctxt "key for text search" msgid "format" msgstr "" -#: ishtar_common/models.py:3870 +#: ishtar_common/models.py:3873 msgctxt "key for text search" msgid "medium" msgstr "" -#: ishtar_common/models.py:3874 +#: ishtar_common/models.py:3877 msgctxt "key for text search" msgid "language" msgstr "" -#: ishtar_common/models.py:3878 +#: ishtar_common/models.py:3881 msgctxt "key for text search" msgid "license" msgstr "" -#: ishtar_common/models.py:3882 +#: ishtar_common/models.py:3885 msgctxt "key for text search" msgid "scale" msgstr "" -#: ishtar_common/models.py:3885 +#: ishtar_common/models.py:3888 msgctxt "key for text search" msgid "url" msgstr "" -#: ishtar_common/models.py:3889 +#: ishtar_common/models.py:3892 msgctxt "key for text search" msgid "isbn" msgstr "" -#: ishtar_common/models.py:3892 +#: ishtar_common/models.py:3895 msgctxt "key for text search" msgid "issn" msgstr "" -#: ishtar_common/models.py:3895 +#: ishtar_common/models.py:3898 msgctxt "key for text search" msgid "source" msgstr "" -#: ishtar_common/models.py:3899 +#: ishtar_common/models.py:3902 msgctxt "key for text search" msgid "source-free-input" msgstr "" -#: ishtar_common/models.py:3903 +#: ishtar_common/models.py:3906 msgctxt "key for text search" msgid "warehouse-container" msgstr "" -#: ishtar_common/models.py:3907 +#: ishtar_common/models.py:3910 msgctxt "key for text search" msgid "warehouse-container-reference" msgstr "" -#: ishtar_common/models.py:3914 +#: ishtar_common/models.py:3917 msgctxt "key for text search" msgid "additional-information" msgstr "" -#: ishtar_common/models.py:3918 +#: ishtar_common/models.py:3921 msgctxt "key for text search" msgid "has-duplicate" msgstr "" -#: ishtar_common/models.py:3937 +#: ishtar_common/models.py:3940 msgctxt "key for text search" msgid "basket-finds" msgstr "" -#: ishtar_common/models.py:3941 ishtar_common/models.py:4034 +#: ishtar_common/models.py:3944 ishtar_common/models.py:4037 msgctxt "key for text search" msgid "find" msgstr "" -#: ishtar_common/models.py:3961 ishtar_common/models.py:4037 +#: ishtar_common/models.py:3964 ishtar_common/models.py:4040 msgctxt "key for text search" msgid "warehouse" msgstr "" -#: ishtar_common/models.py:3965 ishtar_common/models_common.py:3231 +#: ishtar_common/models.py:3968 ishtar_common/models_common.py:3248 msgctxt "key for text search" msgid "has-image" msgstr "" -#: ishtar_common/models.py:3968 +#: ishtar_common/models.py:3971 msgctxt "key for text search" msgid "has-file" msgstr "" -#: ishtar_common/models.py:3972 +#: ishtar_common/models.py:3975 msgctxt "key for text search" msgid "receipt-date-before" msgstr "" -#: ishtar_common/models.py:3976 +#: ishtar_common/models.py:3979 msgctxt "key for text search" msgid "receipt-date-after" msgstr "" -#: ishtar_common/models.py:3981 +#: ishtar_common/models.py:3984 msgctxt "key for text search" msgid "receipt-in-documentation-date-before" msgstr "" -#: ishtar_common/models.py:3986 +#: ishtar_common/models.py:3989 msgctxt "key for text search" msgid "receipt-in-documentation-date-after" msgstr "" -#: ishtar_common/models.py:3990 +#: ishtar_common/models.py:3993 msgctxt "key for text search" msgid "creation-date-before" msgstr "" -#: ishtar_common/models.py:3994 +#: ishtar_common/models.py:3997 msgctxt "key for text search" msgid "creation-date-after" msgstr "" -#: ishtar_common/models.py:4041 +#: ishtar_common/models.py:4044 msgctxt "key for text search" msgid "treatment" msgstr "" -#: ishtar_common/models.py:4045 +#: ishtar_common/models.py:4048 msgctxt "key for text search" msgid "treatment-file" msgstr "" -#: ishtar_common/models.py:4160 +#: ishtar_common/models.py:4163 msgid "Authors (raw)" msgstr "" -#: ishtar_common/models.py:4177 +#: ishtar_common/models.py:4180 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:118 msgid "Number of items" msgstr "" -#: ishtar_common/models.py:4192 +#: ishtar_common/models.py:4195 msgid "Symbolic links" msgstr "" -#: ishtar_common/models.py:4194 +#: ishtar_common/models.py:4197 msgid "Related" msgstr "" -#: ishtar_common/models.py:4202 +#: ishtar_common/models.py:4205 #: ishtar_common/templates/ishtar/sheet_document.html:4 msgid "Document" msgstr "" -#: ishtar_common/models.py:4206 +#: ishtar_common/models.py:4209 msgid "Can view own Document" msgstr "" -#: ishtar_common/models.py:4207 +#: ishtar_common/models.py:4210 msgid "Can add own Document" msgstr "" -#: ishtar_common/models.py:4208 +#: ishtar_common/models.py:4211 msgid "Can change own Document" msgstr "" -#: ishtar_common/models.py:4209 +#: ishtar_common/models.py:4212 msgid "Can delete own Document" msgstr "" -#: ishtar_common/models.py:4428 +#: ishtar_common/models.py:4431 msgid "Add sub-document" msgstr "" -#: ishtar_common/models.py:4430 +#: ishtar_common/models.py:4433 msgid "sub-document" msgstr "" -#: ishtar_common/models.py:4845 +#: ishtar_common/models.py:4848 msgid "Is judiciary" msgstr "" -#: ishtar_common/models.py:4849 +#: ishtar_common/models.py:4852 msgid "Operation types" msgstr "" -#: ishtar_common/models.py:4899 +#: ishtar_common/models.py:4902 msgid "Judiciary" msgstr "" -#: ishtar_common/models.py:4936 +#: ishtar_common/models.py:4939 msgid "Filename" msgstr "" -#: ishtar_common/models.py:4940 +#: ishtar_common/models.py:4943 msgid "Administration script" msgstr "" -#: ishtar_common/models.py:4941 +#: ishtar_common/models.py:4944 msgid "Administration scripts" msgstr "" -#: ishtar_common/models.py:4951 ishtar_common/models_imports.py:1057 +#: ishtar_common/models.py:4954 ishtar_common/models_imports.py:1057 msgid "Finished with errors" msgstr "" -#: ishtar_common/models.py:4969 +#: ishtar_common/models.py:4972 msgid "Administration task" msgstr "" -#: ishtar_common/models.py:4970 +#: ishtar_common/models.py:4973 msgid "Administration tasks" msgstr "" -#: ishtar_common/models.py:4989 +#: ishtar_common/models.py:4992 msgid "" "ISHTAR_SCRIPT_DIR is not set in your local_settings. Contact your " "administrator." msgstr "" -#: ishtar_common/models.py:5001 +#: ishtar_common/models.py:5004 msgid "" "Your ISHTAR_SCRIPT_DIR is containing dots \"..\". As it can refer to " "relative paths, it can be a security issue and this is not allowed. Only put " "a full path." msgstr "" -#: ishtar_common/models.py:5014 +#: ishtar_common/models.py:5017 msgid "Your ISHTAR_SCRIPT_DIR: \"{}\" is not a valid directory." msgstr "" -#: ishtar_common/models.py:5031 +#: ishtar_common/models.py:5034 msgid "" "Script \"{}\" is not available in your script directory. Check your " "configuration." msgstr "" -#: ishtar_common/models.py:5071 ishtar_common/models_imports.py:1049 +#: ishtar_common/models.py:5074 ishtar_common/models_imports.py:1049 #: ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html:132 msgid "Created" msgstr "" -#: ishtar_common/models.py:5076 +#: ishtar_common/models.py:5079 msgid "Filter on" msgstr "" -#: ishtar_common/models.py:5079 ishtar_common/models_rest.py:63 +#: ishtar_common/models.py:5082 ishtar_common/models_rest.py:63 msgid "Filter query" msgstr "" -#: ishtar_common/models.py:5082 +#: ishtar_common/models.py:5085 msgid "Textual query on this item (try it on the main interface)" msgstr "" -#: ishtar_common/models.py:5085 +#: ishtar_common/models.py:5088 msgid "Export geographic data" msgstr "" -#: ishtar_common/models.py:5088 +#: ishtar_common/models.py:5091 msgid "" "Geographic data can represent large volume of information. Geographic data " "can be excluded from the export" msgstr "" -#: ishtar_common/models.py:5096 +#: ishtar_common/models.py:5099 msgid "Put locks on associated items" msgstr "" -#: ishtar_common/models.py:5101 +#: ishtar_common/models.py:5104 msgid "Lock user" msgstr "" -#: ishtar_common/models.py:5105 +#: ishtar_common/models.py:5108 msgid "" "Owner of the lock if item are locked. Warning: if no user is provided the " "locks can be remove by any user with the permission to edit." msgstr "" -#: ishtar_common/models.py:5110 +#: ishtar_common/models.py:5113 msgid "Export types" msgstr "" -#: ishtar_common/models.py:5111 +#: ishtar_common/models.py:5114 msgid "Export configuration" msgstr "" -#: ishtar_common/models.py:5112 +#: ishtar_common/models.py:5115 msgid "Export importers" msgstr "" -#: ishtar_common/models.py:5113 +#: ishtar_common/models.py:5116 msgid "Export towns, areas..." msgstr "" -#: ishtar_common/models.py:5114 +#: ishtar_common/models.py:5117 msgid "Export directory" msgstr "" -#: ishtar_common/models.py:5115 +#: ishtar_common/models.py:5118 msgid "Export documents" msgstr "" -#: ishtar_common/models.py:5116 +#: ishtar_common/models.py:5119 msgid "Export main items" msgstr "" -#: ishtar_common/models.py:5123 +#: ishtar_common/models.py:5126 msgid "Result information" msgstr "" -#: ishtar_common/models.py:5126 +#: ishtar_common/models.py:5129 msgid "Archive - Export" msgstr "" -#: ishtar_common/models.py:5127 +#: ishtar_common/models.py:5130 msgid "Archive - Exports" msgstr "" -#: ishtar_common/models.py:5138 +#: ishtar_common/models.py:5141 msgid "Whole database" msgstr "" -#: ishtar_common/models.py:5150 +#: ishtar_common/models.py:5153 msgid "To filter filter type and filter text must be filled." msgstr "" -#: ishtar_common/models.py:5162 +#: ishtar_common/models.py:5165 msgid "Import user" msgstr "" -#: ishtar_common/models.py:5166 +#: ishtar_common/models.py:5169 msgid "" "If set the \"Import user\" will be the editor for last version. If the field " "is left empty no history will be recorded." msgstr "" -#: ishtar_common/models.py:5175 +#: ishtar_common/models.py:5178 msgid "Delete before adding" msgstr "" -#: ishtar_common/models.py:5177 +#: ishtar_common/models.py:5180 msgid "Delete existing items before adding" msgstr "" -#: ishtar_common/models.py:5180 +#: ishtar_common/models.py:5183 msgid "Releasing locks on associated items" msgstr "" -#: ishtar_common/models.py:5185 +#: ishtar_common/models.py:5188 msgid "Archive - Import" msgstr "" -#: ishtar_common/models.py:5186 +#: ishtar_common/models.py:5189 msgid "Archive - Imports" msgstr "" -#: ishtar_common/models_common.py:836 +#: ishtar_common/models_common.py:837 msgid "Search vector" msgstr "" -#: ishtar_common/models_common.py:836 +#: ishtar_common/models_common.py:837 msgid "Auto filled at save" msgstr "" -#: ishtar_common/models_common.py:1399 +#: ishtar_common/models_common.py:1400 msgid "Last editor" msgstr "" -#: ishtar_common/models_common.py:1407 +#: ishtar_common/models_common.py:1408 msgid "Creator" msgstr "" -#: ishtar_common/models_common.py:1413 ishtar_common/models_common.py:2135 +#: ishtar_common/models_common.py:1414 ishtar_common/models_common.py:2136 msgid "Need update" msgstr "" -#: ishtar_common/models_common.py:1415 +#: ishtar_common/models_common.py:1416 msgid "Item locked for edition" msgstr "" -#: ishtar_common/models_common.py:1421 +#: ishtar_common/models_common.py:1422 msgid "Locked by" msgstr "" -#: ishtar_common/models_common.py:1439 +#: ishtar_common/models_common.py:1440 msgctxt "key for text search" msgid "modified-by" msgstr "" -#: ishtar_common/models_common.py:1443 +#: ishtar_common/models_common.py:1444 msgctxt "key for text search" msgid "modified-before" msgstr "" -#: ishtar_common/models_common.py:1447 +#: ishtar_common/models_common.py:1448 msgctxt "key for text search" msgid "modified-after" msgstr "" -#: ishtar_common/models_common.py:1450 +#: ishtar_common/models_common.py:1451 msgctxt "key for text search" msgid "locked" msgstr "" -#: ishtar_common/models_common.py:2007 ishtar_common/models_common.py:2025 +#: ishtar_common/models_common.py:2008 ishtar_common/models_common.py:2026 msgid "Authority name" msgstr "" -#: ishtar_common/models_common.py:2008 ishtar_common/models_common.py:2025 +#: ishtar_common/models_common.py:2009 ishtar_common/models_common.py:2026 msgid "Authority SRID" msgstr "" -#: ishtar_common/models_common.py:2011 +#: ishtar_common/models_common.py:2012 msgid "Geographic - Spatial reference system" msgstr "" -#: ishtar_common/models_common.py:2012 +#: ishtar_common/models_common.py:2013 msgid "Geographic - Spatial reference systems" msgstr "" -#: ishtar_common/models_common.py:2042 +#: ishtar_common/models_common.py:2043 msgid "Geographic - Origin type" msgstr "" -#: ishtar_common/models_common.py:2043 +#: ishtar_common/models_common.py:2044 msgid "Geographic - Origin types" msgstr "" -#: ishtar_common/models_common.py:2058 +#: ishtar_common/models_common.py:2059 msgid "Geographic - Data type" msgstr "" -#: ishtar_common/models_common.py:2059 +#: ishtar_common/models_common.py:2060 msgid "Geographic - Data types" msgstr "" -#: ishtar_common/models_common.py:2074 +#: ishtar_common/models_common.py:2075 msgid "Geographic - Provider type" msgstr "" -#: ishtar_common/models_common.py:2075 +#: ishtar_common/models_common.py:2076 msgid "Geographic - Provider types" msgstr "" -#: ishtar_common/models_common.py:2086 +#: ishtar_common/models_common.py:2087 msgid "Geographic - Buffer type" msgstr "" -#: ishtar_common/models_common.py:2087 +#: ishtar_common/models_common.py:2088 msgid "Geographic - Buffer types" msgstr "" -#: ishtar_common/models_common.py:2112 +#: ishtar_common/models_common.py:2113 msgid "Line(s)" msgstr "" -#: ishtar_common/models_common.py:2113 +#: ishtar_common/models_common.py:2114 msgid "Point(s)" msgstr "" -#: ishtar_common/models_common.py:2114 +#: ishtar_common/models_common.py:2115 msgid "Polygon(s)" msgstr "" -#: ishtar_common/models_common.py:2143 +#: ishtar_common/models_common.py:2144 msgid "Use this for update imports" msgstr "" -#: ishtar_common/models_common.py:2150 +#: ishtar_common/models_common.py:2151 msgid "For instance: topographical survey, georeferencing, ..." msgstr "" -#: ishtar_common/models_common.py:2158 +#: ishtar_common/models_common.py:2159 msgid "For instance: outline, z-sup, ..." msgstr "" -#: ishtar_common/models_common.py:2166 +#: ishtar_common/models_common.py:2167 msgid "Data provider" msgstr "" -#: ishtar_common/models_common.py:2169 ishtar_common/models_common.py:2170 -#: ishtar_common/models_common.py:2171 +#: ishtar_common/models_common.py:2170 ishtar_common/models_common.py:2171 +#: ishtar_common/models_common.py:2172 msgid "User input" msgstr "" -#: ishtar_common/models_common.py:2174 +#: ishtar_common/models_common.py:2175 msgid "X (cached)" msgstr "" -#: ishtar_common/models_common.py:2175 +#: ishtar_common/models_common.py:2176 msgid "Y (cached)" msgstr "" -#: ishtar_common/models_common.py:2176 +#: ishtar_common/models_common.py:2177 msgid "Z (cached)" msgstr "" -#: ishtar_common/models_common.py:2194 -msgid "Point (3D)" +#: ishtar_common/models_common.py:2194 ishtar_common/models_common.py:3540 +msgid "Point (2D)" msgstr "" #: ishtar_common/models_common.py:2195 -msgid "Multi points" +msgid "Point (3D)" msgstr "" #: ishtar_common/models_common.py:2196 -msgid "Multi lines" +msgid "Multi points" msgstr "" #: ishtar_common/models_common.py:2197 +msgid "Multi lines" +msgstr "" + +#: ishtar_common/models_common.py:2198 msgid "Multi polygons" msgstr "" -#: ishtar_common/models_common.py:2200 ishtar_common/models_common.py:2201 +#: ishtar_common/models_common.py:2201 ishtar_common/models_common.py:2202 msgid "Geographic - Vector data" msgstr "" -#: ishtar_common/models_common.py:2273 +#: ishtar_common/models_common.py:2274 msgid "Only 2 or 3 dimensions" msgstr "" -#: ishtar_common/models_common.py:2646 +#: ishtar_common/models_common.py:2647 msgid "Year of creation" msgstr "" -#: ishtar_common/models_common.py:2650 +#: ishtar_common/models_common.py:2651 msgid "Filling this field is relevant to distinguish old towns from new towns." msgstr "" -#: ishtar_common/models_common.py:2654 +#: ishtar_common/models_common.py:2655 msgid "Town children" msgstr "" -#: ishtar_common/models_common.py:2852 +#: ishtar_common/models_common.py:2856 msgid "Town (precise)" msgstr "" -#: ishtar_common/models_common.py:2885 +#: ishtar_common/models_common.py:2889 msgid "Raw phone" msgstr "" -#: ishtar_common/models_common.py:2891 +#: ishtar_common/models_common.py:2895 msgid "Alternative address is prefered" msgstr "" -#: ishtar_common/models_common.py:2928 +#: ishtar_common/models_common.py:2932 msgid "No associated address" msgstr "" -#: ishtar_common/models_common.py:3011 -msgid "Tel: " -msgstr "" - -#: ishtar_common/models_common.py:3015 -msgid "Mobile: " +#: ishtar_common/models_common.py:3013 +msgid "Postal code - Town" msgstr "" -#: ishtar_common/models_common.py:3019 -msgid "Email: " +#: ishtar_common/models_common.py:3023 +msgid "Mobile" msgstr "" -#: ishtar_common/models_common.py:3024 +#: ishtar_common/models_common.py:3041 msgid "Merge key" msgstr "" -#: ishtar_common/models_common.py:3235 +#: ishtar_common/models_common.py:3252 msgctxt "key for text search" msgid "has-url" msgstr "" -#: ishtar_common/models_common.py:3239 +#: ishtar_common/models_common.py:3256 msgctxt "key for text search" msgid "has-attached-file" msgstr "" -#: ishtar_common/models_common.py:3315 +#: ishtar_common/models_common.py:3332 msgid "Add document/image" msgstr "" -#: ishtar_common/models_common.py:3317 +#: ishtar_common/models_common.py:3334 msgid "doc./image" msgstr "" -#: ishtar_common/models_common.py:3500 +#: ishtar_common/models_common.py:3517 msgid "Precise" msgstr "" -#: ishtar_common/models_common.py:3500 +#: ishtar_common/models_common.py:3517 msgid "Polygon" msgstr "" -#: ishtar_common/models_common.py:3525 +#: ishtar_common/models_common.py:3542 msgid "Point source" msgstr "" -#: ishtar_common/models_common.py:3528 +#: ishtar_common/models_common.py:3545 msgid "Point source item" msgstr "" -#: ishtar_common/models_common.py:3532 +#: ishtar_common/models_common.py:3547 +msgid "Multi polygon" +msgstr "" + +#: ishtar_common/models_common.py:3549 msgid "Multi-polygon source" msgstr "" -#: ishtar_common/models_common.py:3539 +#: ishtar_common/models_common.py:3556 msgid "Multi polygon source item" msgstr "" -#: ishtar_common/models_common.py:4086 +#: ishtar_common/models_common.py:4107 msgid "Regenerate ID" msgstr "" -#: ishtar_common/models_common.py:4088 +#: ishtar_common/models_common.py:4109 msgid "regen." msgstr "" @@ -11643,7 +11655,9 @@ msgid "Skip lines" msgstr "" #: ishtar_common/models_imports.py:1171 -msgid "Number of header lines in your file (can be 0)." +msgid "" +"Number of header lines in your file (can be 0 and should be 0 for geopackage " +"or Shapefile)." msgstr "" #: ishtar_common/models_imports.py:1174 @@ -11731,7 +11745,6 @@ msgid "Step by step re-import" msgstr "" #: ishtar_common/models_imports.py:1369 -#: ishtar_common/templates/ishtar/import_table.html:51 msgid "Archive" msgstr "" @@ -11746,7 +11759,7 @@ msgstr "" #: ishtar_common/models_imports.py:1375 #: ishtar_common/templates/ishtar/blocks/window_nav.html:66 #: ishtar_common/templates/ishtar/form_delete.html:11 -#: ishtar_common/views.py:2434 ishtar_common/widgets.py:452 +#: ishtar_common/views.py:2435 ishtar_common/widgets.py:452 #: ishtar_common/widgets.py:488 msgid "Delete" msgstr "" @@ -11974,13 +11987,13 @@ msgstr "" #: ishtar_common/templates/admin/change_form.html:24 #: ishtar_common/templates/admin/change_form.html:27 -#: ishtar_common/views.py:1673 ishtar_common/views.py:1677 +#: ishtar_common/views.py:1674 ishtar_common/views.py:1678 msgid "Previous" msgstr "" #: ishtar_common/templates/admin/change_form.html:32 #: ishtar_common/templates/admin/change_form.html:35 -#: ishtar_common/views.py:1680 ishtar_common/views.py:1682 +#: ishtar_common/views.py:1681 ishtar_common/views.py:1683 msgid "Next" msgstr "" @@ -12427,15 +12440,15 @@ msgctxt "Sheet" msgid "Modification" msgstr "" -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:5 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:6 msgid "Main" msgstr "" -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:8 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:9 msgid "Geometry" msgstr "" -#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:32 +#: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:33 msgid "geo item" msgstr "" @@ -12589,7 +12602,6 @@ msgstr "" #: ishtar_common/templates/ishtar/formset.html:8 #: ishtar_common/templates/ishtar/formset_import_match.html:113 #: ishtar_common/templates/ishtar/import_list.html:38 -#: ishtar_common/templates/ishtar/merge.html:42 #: 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 @@ -12753,7 +12765,7 @@ msgid "Go" msgstr "" #: ishtar_common/templates/ishtar/import_step_by_step.html:63 -#: ishtar_common/views.py:1516 +#: ishtar_common/views.py:1517 msgid "Import step by step" msgstr "" @@ -12876,6 +12888,11 @@ msgstr "" msgid "Match" msgstr "" +#: ishtar_common/templates/ishtar/import_table.html:51 +msgctxt "name" +msgid "Archive" +msgstr "" + #: ishtar_common/templates/ishtar/import_table.html:56 msgid "Media file" msgstr "" @@ -13356,7 +13373,7 @@ msgstr "" msgid "Loading..." msgstr "" -#: ishtar_common/utils.py:192 ishtar_common/views.py:121 +#: ishtar_common/utils.py:192 ishtar_common/views.py:122 msgid "You don't have sufficient permissions to do this action." msgstr "" @@ -13376,160 +13393,160 @@ msgstr "" msgid "The maximum supported file size is {} Mo." msgstr "" -#: ishtar_common/views.py:148 +#: ishtar_common/views.py:149 msgid "" "PROJECT_SLUG is set to \"default\". Change it in your local_settings (or ask " "your admin to do it)." msgstr "" -#: ishtar_common/views.py:156 +#: ishtar_common/views.py:157 msgid "" "The slug of your current profile is set to \"default\". Change it on the " "administration page (or ask your admin to do it)." msgstr "" -#: ishtar_common/views.py:198 +#: ishtar_common/views.py:199 msgid "Person modification" msgstr "" -#: ishtar_common/views.py:218 +#: ishtar_common/views.py:219 msgid "Person deletion" msgstr "" -#: ishtar_common/views.py:255 +#: ishtar_common/views.py:256 msgid "Organization modification" msgstr "" -#: ishtar_common/views.py:281 +#: ishtar_common/views.py:282 msgid "Organization deletion" msgstr "" -#: ishtar_common/views.py:307 +#: ishtar_common/views.py:308 msgid "Account management" msgstr "" -#: ishtar_common/views.py:316 +#: ishtar_common/views.py:317 msgid "Account deletion" msgstr "" -#: ishtar_common/views.py:983 ishtar_common/views_item.py:176 +#: ishtar_common/views.py:984 ishtar_common/views_item.py:176 #: ishtar_common/views_item.py:217 ishtar_common/views_item.py:234 msgid "Operation not permitted." msgstr "" -#: ishtar_common/views.py:1387 +#: ishtar_common/views.py:1388 msgid "Import: create (table)" msgstr "" -#: ishtar_common/views.py:1407 +#: ishtar_common/views.py:1408 msgid "Edit import" msgstr "" -#: ishtar_common/views.py:1429 +#: ishtar_common/views.py:1430 msgid "Import: create (GIS)" msgstr "" -#: ishtar_common/views.py:1865 +#: ishtar_common/views.py:1866 msgid "Col. " msgstr "" -#: ishtar_common/views.py:1872 ishtar_common/views.py:1887 +#: ishtar_common/views.py:1873 ishtar_common/views.py:1888 msgid "* empty *" msgstr "" -#: ishtar_common/views.py:1929 +#: ishtar_common/views.py:1930 msgid "Link unmatched items" msgstr "" -#: ishtar_common/views.py:1965 +#: ishtar_common/views.py:1966 msgid "Delete import" msgstr "" -#: ishtar_common/views.py:2003 +#: ishtar_common/views.py:2004 msgid "Merge persons" msgstr "" -#: ishtar_common/views.py:2027 +#: ishtar_common/views.py:2028 msgid "Select the main person" msgstr "" -#: ishtar_common/views.py:2035 +#: ishtar_common/views.py:2036 msgid "Merge organization" msgstr "" -#: ishtar_common/views.py:2045 +#: ishtar_common/views.py:2046 msgid "Select the main organization" msgstr "" -#: ishtar_common/views.py:2085 ishtar_common/views.py:2100 +#: ishtar_common/views.py:2086 ishtar_common/views.py:2101 msgid "Corporation manager" msgstr "" -#: ishtar_common/views.py:2114 +#: ishtar_common/views.py:2115 msgid "New tag" msgstr "" -#: ishtar_common/views.py:2127 +#: ishtar_common/views.py:2128 msgid "Document: search" msgstr "" -#: ishtar_common/views.py:2147 +#: ishtar_common/views.py:2148 msgid "Document creation" msgstr "" -#: ishtar_common/views.py:2215 +#: ishtar_common/views.py:2216 msgid "Document modification" msgstr "" -#: ishtar_common/views.py:2242 +#: ishtar_common/views.py:2243 msgid "Main image for" msgstr "" -#: ishtar_common/views.py:2267 +#: ishtar_common/views.py:2268 msgid "Document deletion" msgstr "" -#: ishtar_common/views.py:2304 +#: ishtar_common/views.py:2305 msgid "Error on your template" msgstr "" -#: ishtar_common/views.py:2410 +#: ishtar_common/views.py:2411 msgid "Delete bookmark" msgstr "" -#: ishtar_common/views.py:2433 +#: ishtar_common/views.py:2434 msgid "Bookmark - Delete" msgstr "" -#: ishtar_common/views.py:2476 +#: ishtar_common/views.py:2477 msgid "Some items have been locked by other users." msgstr "" -#: ishtar_common/views.py:2477 +#: ishtar_common/views.py:2478 msgid "Some items are locked." msgstr "" -#: ishtar_common/views.py:2482 +#: ishtar_common/views.py:2483 msgid "Not available" msgstr "" -#: ishtar_common/views.py:2483 +#: ishtar_common/views.py:2484 msgid "Action not available for these items." msgstr "" -#: ishtar_common/views.py:2601 +#: ishtar_common/views.py:2602 msgid "lock/unlock" msgstr "" -#: ishtar_common/views.py:2717 ishtar_common/views.py:2811 +#: ishtar_common/views.py:2718 ishtar_common/views.py:2852 msgid "Geo item creation" msgstr "" -#: ishtar_common/views.py:2762 +#: ishtar_common/views.py:2803 msgid "Geo item modification" msgstr "" -#: ishtar_common/views.py:2800 ishtar_common/views.py:2846 +#: ishtar_common/views.py:2841 ishtar_common/views.py:2887 msgid "Main geo item for" msgstr "" |