diff options
-rw-r--r-- | archaeological_context_records/templates/ishtar/sheet_contextrecord.html | 2 | ||||
-rw-r--r-- | archaeological_files/forms.py | 2 | ||||
-rw-r--r-- | archaeological_files/templates/ishtar/sheet_file.html | 2 | ||||
-rw-r--r-- | archaeological_finds/forms.py | 18 | ||||
-rw-r--r-- | archaeological_finds/models_finds.py | 10 | ||||
-rw-r--r-- | archaeological_finds/templates/ishtar/sheet_basefind.html | 6 | ||||
-rw-r--r-- | archaeological_finds/templates/ishtar/sheet_find.html | 2 | ||||
-rw-r--r-- | archaeological_operations/templates/ishtar/sheet_operation.html | 2 | ||||
-rw-r--r-- | archaeological_operations/templates/ishtar/sheet_site.html | 2 | ||||
-rw-r--r-- | archaeological_warehouse/templates/ishtar/sheet_container.html | 2 | ||||
-rw-r--r-- | archaeological_warehouse/templates/ishtar/sheet_warehouse.html | 2 | ||||
-rw-r--r-- | locale/de/LC_MESSAGES/django.po | 1689 | ||||
-rw-r--r-- | locale/es/LC_MESSAGES/django.po | 1689 | ||||
-rw-r--r-- | locale/fr/LC_MESSAGES/django.po | 1718 | ||||
-rw-r--r-- | locale/pt/LC_MESSAGES/django.po | 1689 |
15 files changed, 3421 insertions, 3414 deletions
diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html index 57e41f983..d82766305 100644 --- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html +++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html @@ -164,7 +164,7 @@ </div> {% if item.main_geodata %} - <h3>{% trans "Localisation"%}</h3> + <h3>{% trans "Geographic localisation" %}</h3> <div class='row'> {% with geo_item=item %} {% include "ishtar/blocks/sheet_map.html"%} diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py index 10e1d6722..221004a66 100644 --- a/archaeological_files/forms.py +++ b/archaeological_files/forms.py @@ -283,7 +283,7 @@ class FileFormPlanning(CustomForm, ManageOldType): base_models = ["town", "department"] associated_models = {"town": Town, "department": Department} HEADERS = {} - HEADERS["town"] = FormHeader(_("Localisation")) + HEADERS["town"] = FormHeader(_("Geographic localisation")) name = forms.CharField(label=_("Planning name"), required=False, max_length=100) town = widgets.Select2MultipleField( model=Town, label=_("Towns"), required=False, remote=True diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html index 417977a11..7b6de41a1 100644 --- a/archaeological_files/templates/ishtar/sheet_file.html +++ b/archaeological_files/templates/ishtar/sheet_file.html @@ -89,7 +89,7 @@ {% include "ishtar/blocks/sheet_json.html" %} - <h3>{% trans "Localisation"%}</h3> + <h3>{% trans "Geographic localisation" %}</h3> <div class="row"> {% field_flex_multiple_obj "Towns" item 'towns' %} {% field_flex_multiple_obj "Departments" item 'departments' %} diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index f1b1a11d9..e4248aeac 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -277,7 +277,7 @@ class BasicFindForm(CustomForm, ManageOldType): ) denomination = forms.CharField(label=_("Denomination"), required=False) previous_id = forms.CharField(label=_("Previous ID"), required=False) - museum_id = forms.CharField(label=_("Museum ID"), required=False) + museum_id = forms.CharField(label=_("Museum inventory number"), required=False) laboratory_id = forms.CharField(label=_("Laboratory ID"), required=False) seal_number = forms.CharField(label=_("Seal number"), required=False) mark = forms.CharField(label=_("Mark"), required=False) @@ -507,10 +507,10 @@ class FindForm(BasicFindForm): ) get_first_base_find__discovery_date = forms.DateField( - label=_("Discovery date (exact or TPQ)"), widget=DatePicker, required=False + label=_("Discovery date (exact or beginning)"), widget=DatePicker, required=False ) get_first_base_find__discovery_date_taq = forms.DateField( - label=_("Discovery date (TAQ)"), widget=DatePicker, required=False + label=_("Discovery date (end)"), widget=DatePicker, required=False ) get_first_base_find__batch = forms.ChoiceField( label=_("Batch/object"), choices=[], required=False @@ -817,7 +817,7 @@ class QAFindFormMulti(QAForm): qa_get_first_base_find__excavation_id = forms.CharField( label=_("Excavation ID"), required=False ) - qa_museum_id = forms.CharField(label=_("Museum ID"), required=False) + qa_museum_id = forms.CharField(label=_("Museum inventory number"), required=False) qa_laboratory_id = forms.CharField(label=_("Laboratory ID"), required=False) qa_seal_number = forms.CharField(label=_("Seal number"), required=False) qa_mark = forms.CharField(label=_("Mark"), required=False) @@ -1335,7 +1335,7 @@ class FindSelect(GeoItemSelect, PeriodSelect): previous_id = forms.CharField(label=_("Previous ID")) base_finds__excavation_id = forms.CharField(label=_("Excavation ID")) seal_number = forms.CharField(label=_("Seal number")) - museum_id = forms.CharField(label=_("Museum ID")) + museum_id = forms.CharField(label=_("Museum inventory number")) laboratory_id = forms.CharField(label=_("Laboratory ID")) mark = forms.CharField(label=_("Mark")) @@ -1431,16 +1431,16 @@ class FindSelect(GeoItemSelect, PeriodSelect): label=_("Discovery date before"), widget=DatePicker ) base_finds__discovery_date_tpq__after = forms.DateField( - label=_("Discovery date (exact or TPQ) after"), widget=DatePicker + label=_("Discovery date (exact or beginning) after"), widget=DatePicker ) base_finds__discovery_date_tpq__before = forms.DateField( - label=_("Discovery date (exact or TPQ) before"), widget=DatePicker + label=_("Discovery date (exact or beginning) before"), widget=DatePicker ) base_finds__discovery_date_taq__after = forms.DateField( - label=_("Discovery date (TAQ) after"), widget=DatePicker + label=_("Discovery date (end) after"), widget=DatePicker ) base_finds__discovery_date_taq__before = forms.DateField( - label=_("Discovery date (TAQ) before"), widget=DatePicker + label=_("Discovery date (end) before"), widget=DatePicker ) base_finds__batch = forms.ChoiceField(label=_("Batch/object"), choices=[]) is_complete = forms.NullBooleanField(label=_("Is complete?")) diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 6be609056..11c611eea 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -420,10 +420,10 @@ class BaseFind( on_delete=models.CASCADE, ) discovery_date = models.DateField( - _("Discovery date (exact or TPQ)"), blank=True, null=True + _("Discovery date (exact or beginning)"), blank=True, null=True ) discovery_date_taq = models.DateField( - _("Discovery date (TAQ)"), blank=True, null=True + _("Discovery date (end)"), blank=True, null=True ) batch = models.ForeignKey( BatchType, @@ -1105,8 +1105,8 @@ class Find( "Base find - " "Topographic localisation" ), "base_finds__special_interest": _("Base find - Special interest"), - "base_finds__discovery_date": _("Base find - Discovery date (exact or TPQ)"), - "base_finds__discovery_date_taq": _("Base find - Discovery date (TAQ)"), + "base_finds__discovery_date": _("Base find - Discovery date (exact or beginning)"), + "base_finds__discovery_date_taq": _("Base find - Discovery date (end)"), "container__cached_label": _("Current container"), "container_ref__cached_label": _("Reference container"), "datings__period__label": _("Periods"), @@ -1808,7 +1808,7 @@ class Find( order = models.IntegerField(_("Order"), default=1) label = models.TextField(_("Free ID")) denomination = models.TextField(_("Denomination"), blank=True, default="") - museum_id = models.TextField(_("Museum ID"), blank=True, default="") + museum_id = models.TextField(_("Museum inventory number"), blank=True, default="") laboratory_id = models.TextField(_("Laboratory ID"), blank=True, default="") description = models.TextField(_("Description"), blank=True, default="") decoration = models.TextField(_("Decoration"), blank=True, default="") diff --git a/archaeological_finds/templates/ishtar/sheet_basefind.html b/archaeological_finds/templates/ishtar/sheet_basefind.html index e8111b54a..fb67e3cd8 100644 --- a/archaeological_finds/templates/ishtar/sheet_basefind.html +++ b/archaeological_finds/templates/ishtar/sheet_basefind.html @@ -28,9 +28,9 @@ {% trans "Discovery year" as discovery_year_label %} {% field_flex discovery_year_label base_find.discovery_date.year '' '' first %} {% else %} - {% trans "Discovery date (TPQ)" as discovery_tpq_label %} + {% trans "Discovery date (exact or beginning)" as discovery_tpq_label %} {% field_flex discovery_tpq_label base_find.discovery_date '' '' first %} - {% trans "Discovery date (TAQ)" as discovery_taq_label %} + {% trans "Discovery date (end)" as discovery_taq_label %} {% field_flex discovery_taq_label base_find.discovery_date_taq '' '' first %} {% endif %} {# END discovery dates #} @@ -67,7 +67,7 @@ <div class="clearfix"> </div> - <h3>{% trans "Localisation"%}</h3> + <h3>{% trans "Geographic localisation" %}</h3> <div class='row'> {% with geo_item=base_find %} {% include "ishtar/blocks/sheet_map.html"%} diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 34d1ec978..20cb4a5c1 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -167,7 +167,7 @@ {% field_flex "Free ID" item.label %} {% field_flex "Previous ID" item.previous_id %} {% field_flex "Excavation ID" item.excavation_ids %} - {% field_flex "Museum ID" item.museum_id %} + {% field_flex "Museum inventory number" item.museum_id %} {% field_flex "Laboratory ID" item.laboratory_id %} {% field_flex "Seal number" item.seal_number %} {% trans "Administrative index" as admin_index_label %} diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 4c1317aaf..4a71ebc08 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -297,7 +297,7 @@ </div> {% endif %} - <h3>{% trans "Localisation"%}</h3> + <h3>{% trans "Geographic localisation" %}</h3> <div class="row"> {% with geo_item=item %} diff --git a/archaeological_operations/templates/ishtar/sheet_site.html b/archaeological_operations/templates/ishtar/sheet_site.html index a3ddb38bf..9c78a7ffb 100644 --- a/archaeological_operations/templates/ishtar/sheet_site.html +++ b/archaeological_operations/templates/ishtar/sheet_site.html @@ -65,7 +65,7 @@ {% endif %} {% if item.x or item.towns.count or item|m2m_listing:'towns' or item.locality_ngi or item.locality_cadastral %} -<h3>{% trans "Localisation"%}</h3> +<h3>{% trans "Geographic localisation" %}</h3> <div class="row"> {% with geo_item=item %} {% include "ishtar/blocks/sheet_map.html"%} diff --git a/archaeological_warehouse/templates/ishtar/sheet_container.html b/archaeological_warehouse/templates/ishtar/sheet_container.html index 061a3c788..6c0edc3dc 100644 --- a/archaeological_warehouse/templates/ishtar/sheet_container.html +++ b/archaeological_warehouse/templates/ishtar/sheet_container.html @@ -162,7 +162,7 @@ {% endif %} {% endwith %} {% if PROFILE.locate_warehouses and display_geo %} - <h3>{% trans "Localisation" %}</h3> + <h3>{% trans "Geographic localisation" %}</h3> <div class='row'> {% with geo_item=item %} {% include "ishtar/blocks/sheet_map.html"%} diff --git a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html index 287bf8683..b719f8e60 100644 --- a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html +++ b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html @@ -113,7 +113,7 @@ {% include "ishtar/blocks/sheet_json.html" %} {% if display_geo or item.get_address or item.get_address_complement or item.get_postal_code or item.get_town %} - <h3>{% trans "Localisation"%}</h3> + <h3>{% trans "Geographic localisation" %}</h3> {% if PROFILE.locate_warehouses and display_geo %} <div class='row'> {% with geo_item=item %} diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index aa0c01eb7..77ed979e1 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: 2023-01-16 11:42+0100\n" +"POT-Creation-Date: 2023-01-19 18:47+0100\n" "PO-Revision-Date: 2019-11-01 18:52+0000\n" "Last-Translator: Valérie-Emma Leroux <valerie-emma.leroux@iggdrasil.net>\n" "Language-Team: German <http://translate.iggdrasil.net/projects/ishtar/wip-" @@ -26,22 +26,22 @@ msgstr "" #: archaeological_context_records/templates/ishtar/forms/qa_contextrecord_duplicate.html:12 #: archaeological_context_records/wizards.py:85 #: archaeological_finds/models_finds.py:1142 -#: archaeological_finds/models_finds.py:2420 +#: archaeological_finds/models_finds.py:2419 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:16 #: archaeological_finds/wizards.py:92 archaeological_finds/wizards.py:565 #: archaeological_operations/forms.py:381 #: archaeological_operations/forms.py:1233 #: archaeological_operations/ishtar_menu.py:35 -#: archaeological_operations/models.py:1518 -#: archaeological_operations/models.py:2386 -#: archaeological_operations/models.py:2404 -#: archaeological_operations/models.py:2520 -#: archaeological_operations/models.py:2719 -#: archaeological_operations/models.py:3008 +#: archaeological_operations/models.py:1529 +#: archaeological_operations/models.py:2397 +#: archaeological_operations/models.py:2415 +#: archaeological_operations/models.py:2531 +#: archaeological_operations/models.py:2730 +#: archaeological_operations/models.py:3019 #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:246 #: archaeological_operations/wizards.py:258 -#: archaeological_warehouse/models.py:857 ishtar_common/forms_common.py:2136 +#: archaeological_warehouse/models.py:858 ishtar_common/forms_common.py:2136 #: ishtar_common/models.py:5066 ishtar_common/views.py:391 msgid "Operation" msgstr "" @@ -139,7 +139,7 @@ msgstr "" #: archaeological_context_records/forms.py:711 #: archaeological_context_records/models.py:735 #: archaeological_operations/forms.py:550 -#: archaeological_operations/models.py:563 ishtar_common/models.py:5067 +#: archaeological_operations/models.py:564 ishtar_common/models.py:5067 msgid "Archaeological site" msgstr "" @@ -167,8 +167,8 @@ msgstr "" #: archaeological_operations/forms.py:500 #: archaeological_operations/forms.py:1062 #: archaeological_operations/forms.py:1436 -#: archaeological_operations/models.py:3032 -#: archaeological_operations/models.py:3304 +#: archaeological_operations/models.py:3043 +#: archaeological_operations/models.py:3315 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Parcel" msgstr "" @@ -207,8 +207,8 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:46 #: archaeological_operations/templates/ishtar/sheet_site.html:41 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:24 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:20 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:29 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:25 msgid "General" msgstr "" @@ -226,11 +226,11 @@ msgstr "" #: archaeological_finds/models_finds.py:1097 #: archaeological_operations/forms.py:71 archaeological_operations/forms.py:209 #: archaeological_operations/forms.py:1034 -#: archaeological_operations/models.py:3013 +#: archaeological_operations/models.py:3024 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_warehouse/forms.py:145 ishtar_common/forms_common.py:84 -#: ishtar_common/forms_common.py:106 ishtar_common/models_common.py:2855 -#: ishtar_common/models_common.py:3731 +#: ishtar_common/forms_common.py:106 ishtar_common/models_common.py:2936 +#: ishtar_common/models_common.py:3812 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 msgid "Town" msgstr "" @@ -260,7 +260,7 @@ msgstr "" #: archaeological_finds/forms.py:1426 #: archaeological_finds/forms_treatments.py:193 #: archaeological_finds/models_finds.py:411 -#: archaeological_finds/models_finds.py:1814 +#: archaeological_finds/models_finds.py:1813 #: archaeological_finds/models_treatments.py:255 #: archaeological_finds/templates/ishtar/sheet_find.html:178 #: ishtar_common/forms_common.py:1802 ishtar_common/forms_common.py:2070 @@ -331,7 +331,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:773 #: archaeological_finds/models_treatments.py:258 #: archaeological_finds/models_treatments.py:1132 -#: archaeological_operations/models.py:1278 +#: archaeological_operations/models.py:1289 #: archaeological_operations/templates/ishtar/sheet_operation.html:205 #: ishtar_common/forms.py:990 ishtar_common/forms.py:991 msgid "Closing date" @@ -348,7 +348,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:219 #: archaeological_finds/models_treatments.py:754 #: archaeological_warehouse/forms.py:731 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:81 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:95 msgid "Location" msgstr "" @@ -364,7 +364,7 @@ msgstr "" #: archaeological_context_records/forms.py:459 #: archaeological_context_records/models.py:163 #: archaeological_finds/forms.py:1222 archaeological_finds/forms.py:1243 -#: archaeological_finds/models_finds.py:1857 +#: archaeological_finds/models_finds.py:1856 #: archaeological_finds/templates/ishtar/sheet_find.html:249 msgid "Dating" msgstr "" @@ -389,7 +389,7 @@ msgstr "" #: archaeological_finds/forms.py:1231 #: archaeological_finds/forms_treatments.py:180 #: archaeological_finds/forms_treatments.py:770 -#: archaeological_finds/models_finds.py:3354 +#: archaeological_finds/models_finds.py:3353 #: archaeological_finds/models_treatments.py:257 #: archaeological_finds/models_treatments.py:752 #: archaeological_finds/templates/ishtar/sheet_find.html:258 @@ -398,8 +398,8 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:476 #: archaeological_operations/forms.py:780 #: archaeological_operations/models.py:104 -#: archaeological_operations/models.py:1279 -#: archaeological_operations/models.py:3308 +#: archaeological_operations/models.py:1290 +#: archaeological_operations/models.py:3319 msgid "Start date" msgstr "" @@ -407,7 +407,7 @@ msgstr "" #: archaeological_context_records/models.py:110 #: archaeological_files/forms.py:791 archaeological_files/models.py:76 #: archaeological_files/models.py:699 archaeological_finds/forms.py:1232 -#: archaeological_finds/models_finds.py:3355 +#: archaeological_finds/models_finds.py:3354 #: archaeological_finds/models_treatments.py:753 #: archaeological_finds/templates/ishtar/sheet_find.html:259 #: archaeological_finds/templates/ishtar/sheet_find.html:401 @@ -415,8 +415,8 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:477 #: archaeological_finds/templates/ishtar/sheet_find.html:515 #: archaeological_operations/models.py:105 -#: archaeological_operations/models.py:3309 -#: ishtar_common/models_imports.py:1261 +#: archaeological_operations/models.py:3320 +#: ishtar_common/models_imports.py:1263 msgid "End date" msgstr "" @@ -454,7 +454,7 @@ msgstr "" #: archaeological_finds/forms.py:173 archaeological_finds/forms.py:179 #: archaeological_finds/forms.py:784 archaeological_finds/forms.py:802 #: archaeological_finds/forms.py:1405 archaeological_finds/models_finds.py:1093 -#: archaeological_finds/models_finds.py:2412 +#: archaeological_finds/models_finds.py:2411 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 #: archaeological_finds/wizards.py:93 archaeological_warehouse/forms.py:556 #: ishtar_common/forms_common.py:2149 ishtar_common/models.py:5068 @@ -676,7 +676,7 @@ msgid "Dating quality types" msgstr "" #: archaeological_context_records/models.py:129 -#: archaeological_context_records/tests.py:911 +#: archaeological_context_records/tests.py:912 #: archaeological_finds/tests.py:1335 msgctxt "key for text search" msgid "datings-period" @@ -724,9 +724,9 @@ msgstr "" #: archaeological_context_records/models.py:280 #: archaeological_finds/forms.py:210 archaeological_finds/forms.py:439 #: archaeological_finds/ishtar_menu.py:34 -#: archaeological_finds/models_finds.py:2044 -#: archaeological_finds/models_finds.py:3320 -#: archaeological_finds/models_finds.py:3342 +#: archaeological_finds/models_finds.py:2043 +#: archaeological_finds/models_finds.py:3319 +#: archaeological_finds/models_finds.py:3341 #: archaeological_finds/models_treatments.py:734 #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: ishtar_common/forms_common.py:2165 ishtar_common/models.py:5069 @@ -745,21 +745,21 @@ msgstr "" #: archaeological_finds/models_finds.py:249 #: archaeological_finds/models_finds.py:290 #: archaeological_finds/models_finds.py:356 -#: archaeological_finds/models_finds.py:1809 +#: archaeological_finds/models_finds.py:1808 #: archaeological_finds/models_treatments.py:65 #: archaeological_finds/models_treatments.py:746 #: archaeological_operations/models.py:103 #: archaeological_operations/models.py:128 #: archaeological_operations/models.py:146 #: archaeological_operations/models.py:155 -#: archaeological_operations/models.py:3335 +#: archaeological_operations/models.py:3346 #: archaeological_warehouse/forms.py:108 archaeological_warehouse/models.py:695 #: archaeological_warehouse/models.py:727 ishtar_common/models.py:692 #: ishtar_common/models.py:747 ishtar_common/models.py:789 #: ishtar_common/models.py:1732 ishtar_common/models.py:3528 -#: ishtar_common/models.py:4846 ishtar_common/models_common.py:2008 -#: ishtar_common/models_common.py:2041 ishtar_common/models_common.py:2057 -#: ishtar_common/models_common.py:2073 ishtar_common/models_common.py:2085 +#: ishtar_common/models.py:4846 ishtar_common/models_common.py:2043 +#: ishtar_common/models_common.py:2076 ishtar_common/models_common.py:2092 +#: ishtar_common/models_common.py:2108 ishtar_common/models_common.py:2120 msgid "Order" msgstr "" @@ -800,7 +800,7 @@ msgid "Excavation technique types" msgstr "" #: archaeological_context_records/models.py:372 -#: ishtar_common/models_imports.py:937 +#: ishtar_common/models_imports.py:939 msgid "Documentation type" msgstr "" @@ -819,10 +819,10 @@ msgstr "" #: archaeological_operations/forms.py:1334 #: archaeological_operations/models.py:305 #: archaeological_operations/models.py:314 -#: archaeological_operations/models.py:485 -#: archaeological_operations/models.py:948 -#: archaeological_operations/models.py:1032 -#: archaeological_operations/models.py:1340 +#: archaeological_operations/models.py:486 +#: archaeological_operations/models.py:958 +#: archaeological_operations/models.py:1042 +#: archaeological_operations/models.py:1351 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:8 msgid "Periods" msgstr "" @@ -856,14 +856,14 @@ msgstr "" #: archaeological_context_records/models.py:536 #: archaeological_finds/models_finds.py:1162 #: archaeological_operations/models.py:316 -#: archaeological_operations/models.py:952 +#: archaeological_operations/models.py:962 msgid "Associated document type" msgstr "" #: archaeological_context_records/models.py:537 #: archaeological_finds/models_finds.py:1163 #: archaeological_operations/models.py:317 -#: archaeological_operations/models.py:953 +#: archaeological_operations/models.py:963 msgid "Modification (year)" msgstr "" @@ -873,10 +873,10 @@ msgid "id" msgstr "" #: archaeological_context_records/models.py:579 -#: archaeological_context_records/tests.py:737 +#: archaeological_context_records/tests.py:738 #: archaeological_files/models.py:464 archaeological_finds/models_finds.py:1248 -#: archaeological_operations/models.py:377 -#: archaeological_operations/models.py:1091 +#: archaeological_operations/models.py:378 +#: archaeological_operations/models.py:1102 #: archaeological_operations/tests.py:3031 #: archaeological_warehouse/models.py:316 msgctxt "key for text search" @@ -895,8 +895,8 @@ msgid "operation-name" msgstr "" #: archaeological_context_records/models.py:589 -#: archaeological_operations/models.py:1087 -#: archaeological_operations/models.py:2550 +#: archaeological_operations/models.py:1098 +#: archaeological_operations/models.py:2561 #: archaeological_operations/tests.py:4507 msgctxt "key for text search" msgid "patriarche" @@ -904,7 +904,7 @@ msgstr "" #: archaeological_context_records/models.py:593 #: archaeological_finds/models_finds.py:1256 -#: archaeological_operations/models.py:1084 +#: archaeological_operations/models.py:1095 msgctxt "key for text search" msgid "operation-code" msgstr "" @@ -912,9 +912,9 @@ msgstr "" #: archaeological_context_records/models.py:597 #: archaeological_context_records/models.py:655 #: archaeological_finds/models_finds.py:1357 -#: archaeological_finds/models_finds.py:1730 -#: archaeological_operations/models.py:412 -#: archaeological_operations/models.py:438 ishtar_common/models.py:3924 +#: archaeological_finds/models_finds.py:1729 +#: archaeological_operations/models.py:413 +#: archaeological_operations/models.py:439 ishtar_common/models.py:3924 #: ishtar_common/models.py:4029 msgctxt "key for text search" msgid "operation" @@ -923,24 +923,24 @@ msgstr "" #: archaeological_context_records/models.py:601 #: archaeological_context_records/models.py:658 #: archaeological_finds/models_finds.py:1272 -#: archaeological_operations/models.py:1175 -#: archaeological_operations/models.py:1240 -#: archaeological_warehouse/models.py:937 ishtar_common/models.py:3960 +#: archaeological_operations/models.py:1186 +#: archaeological_operations/models.py:1251 +#: archaeological_warehouse/models.py:938 ishtar_common/models.py:3960 #: ishtar_common/models.py:4038 msgctxt "key for text search" msgid "site" msgstr "" #: archaeological_context_records/models.py:605 -#: archaeological_context_records/tests.py:804 +#: archaeological_context_records/tests.py:805 #: archaeological_finds/models_finds.py:1295 msgctxt "key for text search" msgid "operation-relation-type" msgstr "" #: archaeological_context_records/models.py:609 -#: archaeological_operations/models.py:371 -#: archaeological_operations/models.py:1133 +#: archaeological_operations/models.py:372 +#: archaeological_operations/models.py:1144 #: archaeological_operations/tests.py:3014 #: archaeological_operations/tests.py:3196 msgctxt "key for text search" @@ -948,26 +948,26 @@ msgid "period" msgstr "" #: archaeological_context_records/models.py:613 -#: archaeological_context_records/tests.py:863 +#: archaeological_context_records/tests.py:864 msgctxt "key for text search" msgid "unit-type" msgstr "" #: archaeological_context_records/models.py:616 -#: archaeological_files/models.py:467 archaeological_operations/models.py:1097 -#: archaeological_operations/models.py:2568 +#: archaeological_files/models.py:467 archaeological_operations/models.py:1108 +#: archaeological_operations/models.py:2579 msgctxt "key for text search" msgid "parcel" msgstr "" #: archaeological_context_records/models.py:620 -#: archaeological_operations/models.py:1194 +#: archaeological_operations/models.py:1205 msgctxt "key for text search" msgid "has-finds" msgstr "" #: archaeological_context_records/models.py:623 -#: archaeological_context_records/tests.py:769 +#: archaeological_context_records/tests.py:770 msgctxt "key for text search" msgid "record-relation-type" msgstr "" @@ -978,20 +978,20 @@ msgid "excavation-technique" msgstr "" #: archaeological_context_records/models.py:673 -#: archaeological_finds/models_finds.py:1689 -#: archaeological_operations/models.py:457 -#: archaeological_operations/models.py:1223 +#: archaeological_finds/models_finds.py:1688 +#: archaeological_operations/models.py:458 +#: archaeological_operations/models.py:1234 #: archaeological_warehouse/models.py:335 -#: archaeological_warehouse/models.py:1056 +#: archaeological_warehouse/models.py:1057 msgid "Lock/Unlock" msgstr "" #: archaeological_context_records/models.py:680 -#: archaeological_finds/models_finds.py:1682 -#: archaeological_operations/models.py:464 -#: archaeological_operations/models.py:1216 +#: archaeological_finds/models_finds.py:1681 +#: archaeological_operations/models.py:465 +#: archaeological_operations/models.py:1227 #: archaeological_warehouse/models.py:327 -#: archaeological_warehouse/models.py:1049 ishtar_common/models.py:2472 +#: archaeological_warehouse/models.py:1050 ishtar_common/models.py:2472 #: ishtar_common/models.py:2734 ishtar_common/models.py:4055 msgid "Bulk update" msgstr "" @@ -1001,13 +1001,13 @@ msgstr "" #: archaeological_context_records/views.py:272 #: archaeological_context_records/views.py:287 #: archaeological_finds/models_finds.py:877 -#: archaeological_finds/models_finds.py:1699 -#: archaeological_finds/models_finds.py:2318 archaeological_finds/views.py:1247 +#: archaeological_finds/models_finds.py:1698 +#: archaeological_finds/models_finds.py:2317 archaeological_finds/views.py:1247 #: archaeological_finds/views.py:1262 archaeological_finds/views.py:1300 -#: archaeological_finds/views.py:1316 archaeological_operations/models.py:474 -#: archaeological_operations/models.py:632 -#: archaeological_operations/models.py:1233 -#: archaeological_operations/models.py:1874 +#: archaeological_finds/views.py:1316 archaeological_operations/models.py:475 +#: archaeological_operations/models.py:633 +#: archaeological_operations/models.py:1244 +#: archaeological_operations/models.py:1885 #: archaeological_operations/views.py:843 #: archaeological_operations/views.py:858 #: archaeological_operations/views.py:865 @@ -1020,26 +1020,26 @@ msgstr "" #: archaeological_context_records/models.py:707 #: archaeological_files/models.py:530 archaeological_finds/models_finds.py:406 -#: archaeological_finds/models_finds.py:1803 +#: archaeological_finds/models_finds.py:1802 #: archaeological_finds/models_treatments.py:252 #: archaeological_finds/models_treatments.py:1100 -#: archaeological_operations/models.py:3021 +#: archaeological_operations/models.py:3032 #: archaeological_warehouse/models.py:388 -#: archaeological_warehouse/models.py:1133 ishtar_common/models.py:4090 +#: archaeological_warehouse/models.py:1134 ishtar_common/models.py:4090 msgid "External ID" msgstr "" #: archaeological_context_records/models.py:709 #: archaeological_files/models.py:533 archaeological_finds/models_finds.py:408 -#: archaeological_finds/models_finds.py:1805 -#: archaeological_operations/models.py:3024 +#: archaeological_finds/models_finds.py:1804 +#: archaeological_operations/models.py:3035 #: archaeological_warehouse/models.py:390 -#: archaeological_warehouse/models.py:1135 +#: archaeological_warehouse/models.py:1136 msgid "External ID is set automatically" msgstr "" #: archaeological_context_records/models.py:754 -#: archaeological_operations/models.py:1332 ishtar_common/models_common.py:2825 +#: archaeological_operations/models.py:1343 ishtar_common/models_common.py:2906 msgid "Surface (m2)" msgstr "" @@ -1073,21 +1073,21 @@ msgstr "" #: archaeological_context_records/models.py:830 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 -#: archaeological_files/models.py:719 archaeological_finds/models_finds.py:1998 +#: archaeological_files/models.py:719 archaeological_finds/models_finds.py:1997 #: archaeological_finds/models_treatments.py:272 #: archaeological_finds/models_treatments.py:1150 #: archaeological_finds/templates/ishtar/sheet_find.html:72 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 -#: archaeological_operations/models.py:524 -#: archaeological_operations/models.py:1406 -#: archaeological_operations/models.py:2768 +#: archaeological_operations/models.py:525 +#: archaeological_operations/models.py:1417 +#: archaeological_operations/models.py:2779 #: archaeological_operations/templates/ishtar/sheet_operation.html:63 #: archaeological_operations/templates/ishtar/sheet_site.html:97 #: archaeological_warehouse/models.py:377 -#: archaeological_warehouse/models.py:1140 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:46 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:179 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:42 +#: archaeological_warehouse/models.py:1141 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:51 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:191 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:47 #: ishtar_common/models.py:4206 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_person.html:161 @@ -1095,50 +1095,50 @@ msgid "Documents" msgstr "" #: archaeological_context_records/models.py:837 -#: archaeological_finds/models_finds.py:2004 +#: archaeological_finds/models_finds.py:2003 #: archaeological_finds/models_treatments.py:278 #: archaeological_finds/models_treatments.py:1157 -#: archaeological_operations/models.py:530 -#: archaeological_operations/models.py:1412 -#: archaeological_operations/models.py:2775 +#: archaeological_operations/models.py:531 +#: archaeological_operations/models.py:1423 +#: archaeological_operations/models.py:2786 #: archaeological_warehouse/models.py:384 -#: archaeological_warehouse/models.py:1147 +#: archaeological_warehouse/models.py:1148 msgid "Main image" msgstr "" #: archaeological_context_records/models.py:842 -#: archaeological_files/models.py:723 archaeological_finds/models_finds.py:2016 +#: archaeological_files/models.py:723 archaeological_finds/models_finds.py:2015 #: archaeological_finds/models_treatments.py:283 #: archaeological_finds/models_treatments.py:1169 -#: archaeological_operations/models.py:535 -#: archaeological_operations/models.py:1417 -#: archaeological_operations/models.py:3028 ishtar_common/models.py:2496 +#: archaeological_operations/models.py:536 +#: archaeological_operations/models.py:1428 +#: archaeological_operations/models.py:3039 ishtar_common/models.py:2496 #: ishtar_common/models.py:2783 ishtar_common/models.py:3555 -#: ishtar_common/models_common.py:2850 ishtar_common/models_common.py:2873 +#: ishtar_common/models_common.py:2931 ishtar_common/models_common.py:2954 msgid "Cached name" msgstr "" #: archaeological_context_records/models.py:845 -#: archaeological_finds/models_finds.py:2023 -#: archaeological_operations/models.py:548 -#: archaeological_operations/models.py:1503 +#: archaeological_finds/models_finds.py:2022 +#: archaeological_operations/models.py:549 +#: archaeological_operations/models.py:1514 msgid "Cached periods label" msgstr "" #: archaeological_context_records/models.py:848 #: archaeological_context_records/models.py:854 -#: archaeological_files/models.py:727 archaeological_finds/models_finds.py:2020 -#: archaeological_finds/models_finds.py:2026 -#: archaeological_finds/models_finds.py:2032 -#: archaeological_finds/models_finds.py:2038 -#: archaeological_operations/models.py:539 -#: archaeological_operations/models.py:545 -#: archaeological_operations/models.py:551 -#: archaeological_operations/models.py:557 -#: archaeological_operations/models.py:1419 -#: archaeological_operations/models.py:1500 -#: archaeological_operations/models.py:1506 -#: archaeological_operations/models.py:1512 +#: archaeological_files/models.py:727 archaeological_finds/models_finds.py:2019 +#: archaeological_finds/models_finds.py:2025 +#: archaeological_finds/models_finds.py:2031 +#: archaeological_finds/models_finds.py:2037 +#: archaeological_operations/models.py:540 +#: archaeological_operations/models.py:546 +#: archaeological_operations/models.py:552 +#: archaeological_operations/models.py:558 +#: archaeological_operations/models.py:1430 +#: archaeological_operations/models.py:1511 +#: archaeological_operations/models.py:1517 +#: archaeological_operations/models.py:1523 msgid "Generated automatically - do not edit" msgstr "" @@ -1159,7 +1159,7 @@ msgid "Context record" msgstr "" #: archaeological_context_records/models.py:915 -#: archaeological_finds/models_finds.py:2204 +#: archaeological_finds/models_finds.py:2203 #, fuzzy #| msgid "email address" msgid "List of associated base finds" @@ -1273,22 +1273,24 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:74 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:266 -#: archaeological_finds/forms.py:1825 archaeological_finds/models_finds.py:2045 +#: archaeological_finds/forms.py:1825 archaeological_finds/models_finds.py:2044 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:11 #: archaeological_finds/templates/ishtar/sheet_treatment.html:24 #: archaeological_operations/templates/ishtar/sheet_operation.html:90 #: archaeological_operations/templates/ishtar/sheet_operation.html:434 #: archaeological_operations/templates/ishtar/sheet_operation.html:526 #: archaeological_operations/templates/ishtar/sheet_site.html:93 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:174 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:221 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:177 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:186 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:233 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:193 msgid "Finds" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:101 #: archaeological_finds/templates/ishtar/sheet_find.html:81 #: archaeological_operations/templates/ishtar/sheet_operation.html:99 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:60 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:56 #: ishtar_common/templates/ishtar/blocks/sheet_map.html:9 msgid "Geographic data" msgstr "" @@ -1304,9 +1306,9 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:161 #: archaeological_operations/templates/ishtar/sheet_operation.html:139 #: 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:3903 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:84 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:77 +#: ishtar_common/models_common.py:3984 #: ishtar_common/templates/ishtar/sheet_document.html:37 msgid "Complete identifier" msgstr "" @@ -1325,11 +1327,9 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:70 #: archaeological_operations/templates/ishtar/sheet_operation.html:300 #: archaeological_operations/templates/ishtar/sheet_site.html:68 -#: 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:2827 -msgid "Localisation" +#: archaeological_warehouse/templates/ishtar/sheet_container.html:165 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:116 +msgid "Geographic localisation" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:178 @@ -1366,8 +1366,8 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:176 #: 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:1938 ishtar_common/models_common.py:1953 -#: ishtar_common/models_imports.py:1250 +#: ishtar_common/models_common.py:1973 ishtar_common/models_common.py:1988 +#: ishtar_common/models_imports.py:1252 msgid "State" msgstr "" @@ -1437,7 +1437,7 @@ msgid "Context record deletion" msgstr "" #: archaeological_context_records/views.py:254 -#: archaeological_operations/models.py:1863 +#: archaeological_operations/models.py:1874 msgid "Add context record" msgstr "" @@ -1489,20 +1489,20 @@ msgstr "" #: archaeological_operations/forms.py:725 #: archaeological_operations/forms.py:1426 #: archaeological_operations/forms.py:1739 -#: archaeological_operations/models.py:944 -#: archaeological_operations/models.py:1316 -#: archaeological_operations/models.py:2518 -#: archaeological_operations/models.py:2747 -#: archaeological_operations/models.py:3011 +#: archaeological_operations/models.py:954 +#: archaeological_operations/models.py:1327 +#: archaeological_operations/models.py:2529 +#: archaeological_operations/models.py:2758 +#: archaeological_operations/models.py:3022 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 -#: ishtar_common/models_imports.py:980 +#: ishtar_common/models_imports.py:982 msgid "Year" msgstr "" #: archaeological_files/forms.py:91 archaeological_files/forms.py:240 #: archaeological_files/forms.py:673 archaeological_files/models.py:524 #: archaeological_operations/forms.py:491 -#: archaeological_operations/models.py:1317 +#: archaeological_operations/models.py:1328 msgid "Numeric reference" msgstr "" @@ -1512,8 +1512,8 @@ msgstr "" #: archaeological_operations/forms.py:1331 #: archaeological_operations/forms.py:1428 #: archaeological_operations/forms.py:1505 -#: archaeological_operations/models.py:483 -#: archaeological_operations/models.py:2750 +#: archaeological_operations/models.py:484 +#: archaeological_operations/models.py:2761 msgid "Other reference" msgstr "" @@ -1521,8 +1521,8 @@ msgstr "" #: archaeological_files/forms.py:1167 archaeological_files/models.py:1343 #: archaeological_operations/forms.py:503 #: archaeological_operations/forms.py:1439 -#: archaeological_operations/models.py:2390 ishtar_common/models_common.py:1961 -#: ishtar_common/models_common.py:2833 +#: archaeological_operations/models.py:2401 ishtar_common/models_common.py:1996 +#: ishtar_common/models_common.py:2914 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" @@ -1565,7 +1565,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:195 #: archaeological_finds/forms_treatments.py:765 #: archaeological_finds/models_finds.py:412 -#: archaeological_finds/models_finds.py:1936 +#: archaeological_finds/models_finds.py:1935 #: archaeological_finds/models_treatments.py:254 #: archaeological_finds/models_treatments.py:1146 #: archaeological_operations/forms.py:541 @@ -1574,16 +1574,16 @@ msgstr "" #: archaeological_operations/forms.py:1345 #: archaeological_operations/forms.py:1442 #: archaeological_operations/forms.py:1504 -#: archaeological_operations/models.py:495 -#: archaeological_operations/models.py:1401 -#: archaeological_operations/models.py:2764 +#: archaeological_operations/models.py:496 +#: archaeological_operations/models.py:1412 +#: archaeological_operations/models.py:2775 #: archaeological_warehouse/forms.py:226 archaeological_warehouse/forms.py:375 #: archaeological_warehouse/forms.py:507 archaeological_warehouse/models.py:367 -#: archaeological_warehouse/models.py:1103 ishtar_common/forms_common.py:1800 +#: archaeological_warehouse/models.py:1104 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:182 -#: ishtar_common/models_common.py:2170 ishtar_common/models_imports.py:751 +#: ishtar_common/models.py:4190 ishtar_common/models_common.py:183 +#: ishtar_common/models_common.py:2216 ishtar_common/models_imports.py:751 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:13 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:170 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:39 @@ -1631,9 +1631,9 @@ msgstr "" #: archaeological_files/forms.py:218 archaeological_files/models.py:605 #: archaeological_finds/models_treatments.py:1134 -#: archaeological_operations/models.py:1277 ishtar_common/forms_common.py:1795 +#: archaeological_operations/models.py:1288 ishtar_common/forms_common.py:1795 #: ishtar_common/forms_common.py:2271 ishtar_common/models.py:4175 -#: ishtar_common/models_imports.py:1258 +#: ishtar_common/models_imports.py:1260 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 msgid "Creation date" msgstr "" @@ -1678,21 +1678,21 @@ msgstr "" #: archaeological_operations/forms.py:1053 #: archaeological_operations/forms.py:1381 #: archaeological_operations/models.py:304 -#: archaeological_operations/models.py:493 -#: archaeological_operations/models.py:1029 -#: archaeological_operations/models.py:1031 -#: archaeological_operations/models.py:1337 -#: archaeological_operations/models.py:2759 +#: archaeological_operations/models.py:494 +#: archaeological_operations/models.py:1039 +#: archaeological_operations/models.py:1041 +#: archaeological_operations/models.py:1348 +#: archaeological_operations/models.py:2770 #: archaeological_operations/templates/ishtar/sheet_operation.html:147 #: 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:2856 +#: ishtar_common/models_common.py:2937 msgid "Towns" msgstr "" #: archaeological_files/forms.py:293 archaeological_files/forms.py:336 #: archaeological_files/forms.py:576 archaeological_files/models.py:641 -#: archaeological_operations/models.py:2753 ishtar_common/models_common.py:1962 +#: archaeological_operations/models.py:2764 ishtar_common/models_common.py:1997 msgid "Departments" msgstr "" @@ -1715,7 +1715,7 @@ msgstr "" #: archaeological_files/forms.py:303 archaeological_files/forms.py:344 #: archaeological_warehouse/forms.py:241 ishtar_common/forms_common.py:540 -#: ishtar_common/forms_common.py:923 ishtar_common/models_common.py:3064 +#: ishtar_common/forms_common.py:923 ishtar_common/models_common.py:3145 msgid "Postal code" msgstr "" @@ -1732,7 +1732,7 @@ msgstr "" #: 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:536 ishtar_common/forms_common.py:919 -#: ishtar_common/models_common.py:3059 ishtar_common/models_common.py:3214 +#: ishtar_common/models_common.py:3140 ishtar_common/models_common.py:3295 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 msgid "Address" msgstr "" @@ -1798,7 +1798,7 @@ msgstr "" #: archaeological_files/forms.py:596 archaeological_files/models.py:665 #: archaeological_operations/forms.py:522 -#: archaeological_operations/models.py:2704 +#: archaeological_operations/models.py:2715 msgid "Scientist in charge" msgstr "" @@ -1959,7 +1959,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:368 #: archaeological_operations/forms.py:1427 #: archaeological_operations/forms.py:1560 -#: archaeological_operations/models.py:2689 ishtar_common/admin.py:564 +#: archaeological_operations/models.py:2700 ishtar_common/admin.py:564 #: ishtar_common/models.py:4089 msgid "Index" msgstr "" @@ -1972,8 +1972,8 @@ msgstr "" #: archaeological_finds/forms_treatments.py:897 #: archaeological_operations/forms.py:1433 #: archaeological_operations/forms.py:1494 -#: archaeological_operations/models.py:2420 -#: archaeological_operations/models.py:2679 ishtar_common/models_imports.py:932 +#: archaeological_operations/models.py:2431 +#: archaeological_operations/models.py:2690 ishtar_common/models_imports.py:934 msgid "Act type" msgstr "" @@ -1994,7 +1994,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:844 #: archaeological_operations/forms.py:1440 #: archaeological_operations/forms.py:1501 -#: archaeological_operations/models.py:2748 +#: archaeological_operations/models.py:2759 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" @@ -2040,10 +2040,10 @@ msgstr "" #: archaeological_files/wizards.py:219 archaeological_files/wizards.py:231 #: archaeological_operations/forms.py:670 #: archaeological_operations/forms.py:931 -#: archaeological_operations/models.py:1883 -#: archaeological_operations/models.py:2403 -#: archaeological_operations/models.py:2519 -#: archaeological_operations/models.py:2727 +#: archaeological_operations/models.py:1894 +#: archaeological_operations/models.py:2414 +#: archaeological_operations/models.py:2530 +#: archaeological_operations/models.py:2738 #: archaeological_operations/wizards.py:85 ishtar_common/views.py:390 msgid "Archaeological file" msgstr "" @@ -2056,9 +2056,9 @@ msgstr "" #: archaeological_files/ishtar_menu.py:71 #: archaeological_finds/ishtar_menu.py:149 #: archaeological_finds/ishtar_menu.py:226 -#: archaeological_finds/models_finds.py:3345 +#: archaeological_finds/models_finds.py:3344 #: archaeological_operations/ishtar_menu.py:70 -#: archaeological_operations/models.py:2784 +#: archaeological_operations/models.py:2795 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "" @@ -2144,12 +2144,12 @@ msgstr "" msgid "Equipment/Service" msgstr "" -#: archaeological_files/models.py:208 ishtar_common/models_common.py:173 -#: ishtar_common/models_common.py:204 +#: archaeological_files/models.py:208 ishtar_common/models_common.py:174 +#: ishtar_common/models_common.py:205 msgid "Textual ID" msgstr "" -#: archaeological_files/models.py:212 ishtar_common/models_common.py:177 +#: archaeological_files/models.py:212 ishtar_common/models_common.py:178 msgid "" "The slug is the standardized version of the name. It contains only lowercase " "letters, numbers and hyphens. Each slug must be unique." @@ -2167,7 +2167,7 @@ msgstr "" msgid "Unitary cost" msgstr "" -#: archaeological_files/models.py:223 ishtar_common/models_imports.py:933 +#: archaeological_files/models.py:223 ishtar_common/models_imports.py:935 msgid "Unit" msgstr "" @@ -2181,14 +2181,14 @@ msgstr "" #: archaeological_files/models.py:231 ishtar_common/models.py:1558 #: ishtar_common/models.py:1970 ishtar_common/models.py:3423 -#: ishtar_common/models_common.py:183 ishtar_common/models_imports.py:187 +#: ishtar_common/models_common.py:184 ishtar_common/models_imports.py:187 #: ishtar_common/models_imports.py:812 msgid "Available" msgstr "" #: archaeological_files/models.py:237 archaeological_warehouse/forms.py:747 #: ishtar_common/admin.py:1126 ishtar_common/models.py:2275 -#: ishtar_common/models_common.py:715 +#: ishtar_common/models_common.py:716 msgid "Parent" msgstr "" @@ -2250,13 +2250,13 @@ msgstr "" #: archaeological_files/models.py:382 archaeological_finds/models_finds.py:1145 #: archaeological_operations/models.py:312 -#: archaeological_operations/models.py:945 ishtar_common/admin.py:1295 +#: archaeological_operations/models.py:955 ishtar_common/admin.py:1295 msgid "Area" msgstr "" #: archaeological_files/models.py:383 archaeological_finds/models_finds.py:1148 #: archaeological_operations/models.py:313 -#: archaeological_operations/models.py:946 +#: archaeological_operations/models.py:956 msgid "Extended area" msgstr "" @@ -2267,8 +2267,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:748 -#: ishtar_common/models_common.py:1934 ishtar_common/models_common.py:1950 +#: ishtar_common/models.py:1854 ishtar_common/models_common.py:749 +#: ishtar_common/models_common.py:1969 ishtar_common/models_common.py:1985 #: ishtar_common/templates/ishtar/sheet_person.html:30 msgid "Number" msgstr "" @@ -2284,8 +2284,8 @@ msgstr "" #: archaeological_files/models.py:455 archaeological_finds/models_finds.py:1252 #: archaeological_finds/models_treatments.py:152 #: archaeological_finds/models_treatments.py:1049 -#: archaeological_operations/models.py:1082 -#: archaeological_operations/models.py:2543 +#: archaeological_operations/models.py:1093 +#: archaeological_operations/models.py:2554 #: archaeological_operations/tests.py:3020 #: archaeological_operations/tests.py:3096 msgctxt "key for text search" @@ -2294,28 +2294,28 @@ msgstr "" #: archaeological_files/models.py:457 #: archaeological_finds/models_treatments.py:1046 -#: archaeological_operations/models.py:361 -#: archaeological_warehouse/models.py:913 ishtar_common/models.py:3854 +#: archaeological_operations/models.py:362 +#: archaeological_warehouse/models.py:914 ishtar_common/models.py:3854 msgctxt "key for text search" msgid "reference" msgstr "" #: archaeological_files/models.py:460 #: archaeological_finds/models_treatments.py:149 -#: archaeological_operations/models.py:367 +#: archaeological_operations/models.py:368 msgctxt "key for text search" msgid "other-reference" msgstr "" -#: archaeological_files/models.py:471 archaeological_operations/models.py:1101 +#: archaeological_files/models.py:471 archaeological_operations/models.py:1112 msgctxt "key for text search" msgid "department" msgstr "" #: archaeological_files/models.py:475 #: archaeological_finds/models_treatments.py:1043 -#: archaeological_operations/models.py:364 -#: archaeological_operations/models.py:1105 +#: archaeological_operations/models.py:365 +#: archaeological_operations/models.py:1116 #: archaeological_operations/tests.py:3140 #: archaeological_warehouse/models.py:309 ishtar_common/models.py:2458 #: ishtar_common/models.py:2710 ishtar_common/models.py:3284 @@ -2326,11 +2326,11 @@ msgstr "" #: archaeological_files/models.py:478 #: archaeological_finds/models_treatments.py:155 #: archaeological_finds/models_treatments.py:1052 -#: archaeological_operations/models.py:1111 -#: archaeological_operations/models.py:2554 +#: archaeological_operations/models.py:1122 +#: archaeological_operations/models.py:2565 #: archaeological_operations/tests.py:3153 #: archaeological_warehouse/models.py:312 -#: archaeological_warehouse/models.py:909 ishtar_common/models.py:2461 +#: archaeological_warehouse/models.py:910 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" @@ -2358,10 +2358,10 @@ msgid "permit-reference" msgstr "" #: archaeological_files/models.py:496 archaeological_finds/models_finds.py:1458 -#: archaeological_operations/models.py:383 -#: archaeological_operations/models.py:1153 -#: archaeological_operations/models.py:2664 -#: archaeological_warehouse/models.py:920 ishtar_common/models.py:3914 +#: archaeological_operations/models.py:384 +#: archaeological_operations/models.py:1164 +#: archaeological_operations/models.py:2675 +#: archaeological_warehouse/models.py:921 ishtar_common/models.py:3914 msgctxt "key for text search" msgid "comment" msgstr "" @@ -2373,12 +2373,12 @@ msgctxt "key for text search" msgid "in-charge" msgstr "" -#: archaeological_files/models.py:503 archaeological_operations/models.py:2599 +#: archaeological_files/models.py:503 archaeological_operations/models.py:2610 msgctxt "key for text search" msgid "general-contractor" msgstr "" -#: archaeological_files/models.py:507 archaeological_operations/models.py:2603 +#: archaeological_files/models.py:507 archaeological_operations/models.py:2614 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "" @@ -2400,7 +2400,7 @@ msgstr "" #: archaeological_operations/forms.py:1215 #: archaeological_operations/forms.py:1330 #: archaeological_operations/forms.py:1795 -#: archaeological_operations/models.py:484 +#: archaeological_operations/models.py:485 #: 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 @@ -2413,11 +2413,11 @@ msgstr "" #: ishtar_common/models.py:1556 ishtar_common/models.py:1940 #: 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:2138 -#: ishtar_common/models_common.py:2824 ishtar_common/models_common.py:2873 +#: ishtar_common/models.py:4940 ishtar_common/models_common.py:2184 +#: ishtar_common/models_common.py:2905 ishtar_common/models_common.py:2954 #: ishtar_common/models_imports.py:110 ishtar_common/models_imports.py:144 #: ishtar_common/models_imports.py:669 ishtar_common/models_imports.py:686 -#: ishtar_common/models_imports.py:807 ishtar_common/models_imports.py:1170 +#: ishtar_common/models_imports.py:807 ishtar_common/models_imports.py:1172 #: ishtar_common/models_rest.py:105 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:10 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:24 @@ -2523,11 +2523,11 @@ msgstr "" msgid "No town" msgstr "" -#: archaeological_files/models.py:1241 archaeological_operations/models.py:1842 +#: archaeological_files/models.py:1241 archaeological_operations/models.py:1853 msgid "Modify parcels" msgstr "" -#: archaeological_files/models.py:1243 archaeological_operations/models.py:1844 +#: archaeological_files/models.py:1243 archaeological_operations/models.py:1855 msgid "parcels" msgstr "" @@ -2560,8 +2560,8 @@ msgstr "" msgid "operation" msgstr "" -#: archaeological_files/models.py:1340 archaeological_operations/models.py:1321 -#: archaeological_operations/models.py:2998 +#: archaeological_files/models.py:1340 archaeological_operations/models.py:1332 +#: archaeological_operations/models.py:3009 msgid "File" msgstr "" @@ -2664,7 +2664,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:2785 +#: archaeological_operations/models.py:2796 #: archaeological_operations/templates/ishtar/sheet_operation.html:351 #: archaeological_operations/templates/ishtar/sheet_operation.html:488 msgid "Administrative acts" @@ -2677,8 +2677,8 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_files/templates/ishtar/sheet_file.html:218 -#: archaeological_operations/models.py:2517 -#: archaeological_operations/models.py:2820 +#: archaeological_operations/models.py:2528 +#: archaeological_operations/models.py:2831 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 #: archaeological_warehouse/forms.py:333 archaeological_warehouse/forms.py:505 @@ -2700,14 +2700,14 @@ 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:587 +#: archaeological_warehouse/models.py:889 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:2935 ishtar_common/models.py:745 #: 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:979 +#: ishtar_common/models_imports.py:981 #: ishtar_common/templates/blocks/DataTables-stats.html:27 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:24 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:8 @@ -2721,7 +2721,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:195 #: archaeological_operations/forms.py:781 -#: archaeological_operations/models.py:1281 +#: archaeological_operations/models.py:1292 msgid "Excavation end date" msgstr "" @@ -2736,7 +2736,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:220 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:9 #: archaeological_warehouse/forms.py:694 ishtar_common/models.py:714 -#: ishtar_common/models_imports.py:978 +#: ishtar_common/models_imports.py:980 msgid "Date" msgstr "" @@ -2775,10 +2775,10 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:307 #: archaeological_files/templates/ishtar/sheet_file.html:359 #: archaeological_files/templates/ishtar/sheet_file.html:415 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:231 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:255 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:186 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:211 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:243 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:267 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:202 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:227 #: ishtar_common/models.py:1847 ishtar_common/models.py:1879 msgid "Total" msgstr "" @@ -2887,48 +2887,48 @@ msgstr "" #: archaeological_finds/forms.py:811 archaeological_finds/forms.py:1024 #: archaeological_finds/forms.py:1333 archaeological_finds/forms.py:1965 #: archaeological_finds/models_finds.py:405 -#: archaeological_finds/models_finds.py:1810 +#: archaeological_finds/models_finds.py:1809 msgid "Free ID" msgstr "" #: archaeological_finds/forms.py:278 archaeological_finds/forms.py:614 #: archaeological_finds/forms.py:815 archaeological_finds/forms.py:1026 #: archaeological_finds/forms.py:1334 archaeological_finds/forms.py:2032 -#: archaeological_finds/models_finds.py:1811 +#: archaeological_finds/models_finds.py:1810 msgid "Denomination" msgstr "" #: archaeological_finds/forms.py:279 archaeological_finds/forms.py:816 -#: archaeological_finds/forms.py:1335 archaeological_finds/models_finds.py:1938 +#: archaeological_finds/forms.py:1335 archaeological_finds/models_finds.py:1937 msgid "Previous ID" msgstr "" #: archaeological_finds/forms.py:280 archaeological_finds/forms.py:820 -#: archaeological_finds/forms.py:1338 archaeological_finds/models_finds.py:1812 -msgid "Museum ID" +#: archaeological_finds/forms.py:1338 archaeological_finds/models_finds.py:1811 +msgid "Museum inventory number" msgstr "" #: archaeological_finds/forms.py:281 archaeological_finds/forms.py:821 -#: archaeological_finds/forms.py:1339 archaeological_finds/models_finds.py:1813 +#: archaeological_finds/forms.py:1339 archaeological_finds/models_finds.py:1812 msgid "Laboratory ID" msgstr "" #: archaeological_finds/forms.py:282 archaeological_finds/forms.py:822 -#: archaeological_finds/forms.py:1337 archaeological_finds/models_finds.py:1808 +#: archaeological_finds/forms.py:1337 archaeological_finds/models_finds.py:1807 msgid "Seal number" msgstr "" #: archaeological_finds/forms.py:283 archaeological_finds/forms.py:823 -#: archaeological_finds/forms.py:1340 archaeological_finds/models_finds.py:1935 +#: archaeological_finds/forms.py:1340 archaeological_finds/models_finds.py:1934 msgid "Mark" msgstr "" -#: archaeological_finds/forms.py:296 archaeological_finds/models_finds.py:1995 +#: archaeological_finds/forms.py:296 archaeological_finds/models_finds.py:1994 msgid "Public description" msgstr "" #: archaeological_finds/forms.py:298 archaeological_finds/forms.py:621 -#: archaeological_finds/forms.py:1446 archaeological_finds/models_finds.py:1878 +#: archaeological_finds/forms.py:1446 archaeological_finds/models_finds.py:1877 msgid "Is complete?" msgstr "" @@ -2936,18 +2936,18 @@ msgstr "" #: archaeological_finds/forms.py:835 archaeological_finds/models_finds.py:91 #: archaeological_finds/models_finds.py:1114 #: archaeological_finds/models_finds.py:1115 -#: archaeological_finds/models_finds.py:1821 +#: archaeological_finds/models_finds.py:1820 msgid "Material types" msgstr "" #: archaeological_finds/forms.py:303 archaeological_finds/forms.py:627 -#: archaeological_finds/forms.py:1455 archaeological_finds/models_finds.py:1825 -#: ishtar_common/models_imports.py:957 +#: archaeological_finds/forms.py:1455 archaeological_finds/models_finds.py:1824 +#: ishtar_common/models_imports.py:959 msgid "Material type quality" msgstr "" #: archaeological_finds/forms.py:306 archaeological_finds/forms.py:1457 -#: archaeological_finds/models_finds.py:1832 +#: archaeological_finds/models_finds.py:1831 msgid "Comment on the material" msgstr "" @@ -2955,12 +2955,12 @@ msgstr "" #: archaeological_finds/forms.py:838 archaeological_finds/models_finds.py:264 #: archaeological_finds/models_finds.py:1116 #: archaeological_finds/models_finds.py:1117 -#: archaeological_finds/models_finds.py:1880 +#: archaeological_finds/models_finds.py:1879 msgid "Object types" msgstr "" #: archaeological_finds/forms.py:313 archaeological_finds/forms.py:634 -#: archaeological_finds/forms.py:1464 archaeological_finds/models_finds.py:1884 +#: archaeological_finds/forms.py:1464 archaeological_finds/models_finds.py:1883 msgid "Object type quality" msgstr "" @@ -2971,48 +2971,48 @@ msgstr "" #: archaeological_finds/forms.py:319 archaeological_finds/forms.py:636 #: archaeological_finds/forms.py:1473 archaeological_finds/forms.py:1971 -#: archaeological_finds/models_finds.py:1839 +#: archaeological_finds/models_finds.py:1838 msgid "Number of remains" msgstr "" #: archaeological_finds/forms.py:321 archaeological_finds/forms.py:638 -#: archaeological_finds/forms.py:1475 archaeological_finds/models_finds.py:1915 +#: archaeological_finds/forms.py:1475 archaeological_finds/models_finds.py:1914 msgid "Minimum number of individuals (MNI)" msgstr "" #: archaeological_finds/forms.py:325 archaeological_finds/forms.py:642 -#: archaeological_finds/forms.py:1479 archaeological_finds/models_finds.py:1815 +#: archaeological_finds/forms.py:1479 archaeological_finds/models_finds.py:1814 msgid "Decoration" msgstr "" #: archaeological_finds/forms.py:328 archaeological_finds/forms.py:645 -#: archaeological_finds/forms.py:1480 archaeological_finds/models_finds.py:1816 +#: archaeological_finds/forms.py:1480 archaeological_finds/models_finds.py:1815 msgid "Inscription" msgstr "" #: archaeological_finds/forms.py:331 archaeological_finds/forms.py:648 #: archaeological_finds/forms.py:846 archaeological_finds/forms.py:1478 -#: archaeological_finds/models_finds.py:1818 +#: archaeological_finds/models_finds.py:1817 msgid "Manufacturing place" msgstr "" #: archaeological_finds/forms.py:334 archaeological_finds/forms.py:651 #: archaeological_finds/forms.py:849 archaeological_finds/forms.py:1482 #: archaeological_finds/models_finds.py:1157 -#: archaeological_finds/models_finds.py:1910 +#: archaeological_finds/models_finds.py:1909 msgid "Communicability" msgstr "" #: archaeological_finds/forms.py:338 archaeological_finds/forms.py:1486 -#: archaeological_finds/models_finds.py:1860 +#: archaeological_finds/models_finds.py:1859 #: archaeological_operations/forms.py:1221 -#: archaeological_operations/models.py:490 +#: archaeological_operations/models.py:491 msgid "Cultural attribution" msgstr "" #: archaeological_finds/forms.py:342 archaeological_finds/forms.py:657 #: archaeological_finds/forms.py:881 archaeological_finds/forms.py:1488 -#: archaeological_finds/models_finds.py:1937 +#: archaeological_finds/models_finds.py:1936 msgid "Comment on dating" msgstr "" @@ -3023,37 +3023,37 @@ msgid "Dimensions" msgstr "" #: archaeological_finds/forms.py:347 archaeological_finds/forms.py:661 -#: archaeological_finds/models_finds.py:1917 +#: archaeological_finds/models_finds.py:1916 msgid "Length (cm)" msgstr "" #: archaeological_finds/forms.py:350 archaeological_finds/forms.py:662 -#: archaeological_finds/models_finds.py:1918 +#: archaeological_finds/models_finds.py:1917 msgid "Width (cm)" msgstr "" #: archaeological_finds/forms.py:353 archaeological_finds/forms.py:663 -#: archaeological_finds/models_finds.py:1919 +#: archaeological_finds/models_finds.py:1918 msgid "Height (cm)" msgstr "" #: archaeological_finds/forms.py:356 archaeological_finds/forms.py:666 -#: archaeological_finds/models_finds.py:1922 +#: archaeological_finds/models_finds.py:1921 msgid "Thickness (cm)" msgstr "" #: archaeological_finds/forms.py:359 archaeological_finds/forms.py:664 -#: archaeological_finds/models_finds.py:1920 +#: archaeological_finds/models_finds.py:1919 msgid "Diameter (cm)" msgstr "" #: archaeological_finds/forms.py:362 archaeological_finds/forms.py:665 -#: archaeological_finds/models_finds.py:1921 +#: archaeological_finds/models_finds.py:1920 msgid "Circumference (cm)" msgstr "" #: archaeological_finds/forms.py:366 archaeological_finds/forms.py:667 -#: archaeological_finds/forms.py:1969 archaeological_finds/models_finds.py:1834 +#: archaeological_finds/forms.py:1969 archaeological_finds/models_finds.py:1833 #: archaeological_warehouse/models.py:692 msgid "Volume (l)" msgstr "" @@ -3077,19 +3077,19 @@ msgid "Clutter height (cm)" msgstr "" #: archaeological_finds/forms.py:386 archaeological_finds/forms.py:679 -#: archaeological_finds/forms.py:1559 archaeological_finds/models_finds.py:1933 +#: archaeological_finds/forms.py:1559 archaeological_finds/models_finds.py:1932 msgid "Dimensions comment" msgstr "" #: archaeological_finds/forms.py:390 archaeological_finds/forms.py:683 #: archaeological_finds/forms.py:868 archaeological_finds/forms.py:1564 #: archaeological_finds/models_finds.py:1158 -#: archaeological_finds/models_finds.py:1942 +#: archaeological_finds/models_finds.py:1941 msgid "Check" msgstr "" #: archaeological_finds/forms.py:392 archaeological_finds/forms.py:685 -#: archaeological_finds/forms.py:870 archaeological_finds/models_finds.py:1947 +#: archaeological_finds/forms.py:870 archaeological_finds/models_finds.py:1946 msgid "Check date" msgstr "" @@ -3107,12 +3107,13 @@ msgid "Excavation ID" msgstr "" #: archaeological_finds/forms.py:510 archaeological_finds/models_finds.py:423 -msgid "Discovery date (exact or TPQ)" +#: archaeological_finds/templates/ishtar/sheet_basefind.html:31 +msgid "Discovery date (exact or beginning)" msgstr "" #: archaeological_finds/forms.py:513 archaeological_finds/models_finds.py:426 #: archaeological_finds/templates/ishtar/sheet_basefind.html:33 -msgid "Discovery date (TAQ)" +msgid "Discovery date (end)" msgstr "" #: archaeological_finds/forms.py:516 archaeological_finds/forms.py:1445 @@ -3206,47 +3207,47 @@ msgstr "" #: archaeological_finds/forms.py:851 archaeological_finds/forms.py:1168 #: archaeological_finds/forms.py:1573 archaeological_finds/models_finds.py:1159 -#: archaeological_finds/models_finds.py:1977 +#: archaeological_finds/models_finds.py:1976 #: archaeological_warehouse/forms.py:580 msgid "Alteration" msgstr "" #: archaeological_finds/forms.py:853 archaeological_finds/forms.py:1174 #: archaeological_finds/forms.py:1574 archaeological_finds/models_finds.py:1160 -#: archaeological_finds/models_finds.py:1981 +#: archaeological_finds/models_finds.py:1980 #: archaeological_warehouse/forms.py:581 msgid "Alteration cause" msgstr "" #: archaeological_finds/forms.py:856 archaeological_finds/forms.py:1165 #: archaeological_finds/forms.py:1571 archaeological_finds/models_finds.py:1154 -#: archaeological_finds/models_finds.py:1962 -#: archaeological_warehouse/forms.py:579 ishtar_common/models_imports.py:941 +#: archaeological_finds/models_finds.py:1961 +#: archaeological_warehouse/forms.py:579 ishtar_common/models_imports.py:943 msgid "Conservatory state" msgstr "" #: archaeological_finds/forms.py:859 archaeological_finds/forms.py:1186 #: archaeological_finds/forms.py:1578 archaeological_finds/models_finds.py:1161 -#: archaeological_finds/models_finds.py:1987 +#: archaeological_finds/models_finds.py:1986 #: archaeological_warehouse/forms.py:585 msgid "Treatment emergency" msgstr "" #: archaeological_finds/forms.py:862 archaeological_finds/forms.py:1159 #: archaeological_finds/forms.py:1570 archaeological_finds/models_finds.py:1156 -#: archaeological_finds/models_finds.py:1904 +#: archaeological_finds/models_finds.py:1903 #: archaeological_warehouse/forms.py:578 msgid "Remarkability" msgstr "" #: archaeological_finds/forms.py:873 archaeological_finds/forms.py:1191 -#: archaeological_finds/models_finds.py:1993 +#: archaeological_finds/models_finds.py:1992 msgid "Appraisal date" msgstr "" #: archaeological_finds/forms.py:875 archaeological_finds/forms.py:1189 #: archaeological_finds/models_finds.py:1172 -#: archaeological_finds/models_finds.py:1992 +#: archaeological_finds/models_finds.py:1991 msgid "Insurance value" msgstr "" @@ -3272,7 +3273,7 @@ msgstr "" #: archaeological_finds/forms.py:2203 archaeological_finds/forms.py:2208 #: archaeological_finds/ishtar_menu.py:64 #: archaeological_finds/models_finds.py:884 -#: archaeological_finds/models_finds.py:1706 +#: archaeological_finds/models_finds.py:1705 #: archaeological_finds/templates/ishtar/sheet_findbasket.html:4 #: archaeological_finds/views.py:1230 archaeological_finds/wizards.py:416 msgid "Basket" @@ -3317,24 +3318,24 @@ msgstr "" #: archaeological_finds/forms.py:1153 archaeological_finds/forms.py:1569 #: archaeological_finds/models_finds.py:1155 -#: archaeological_finds/models_finds.py:1898 +#: archaeological_finds/models_finds.py:1897 #: archaeological_warehouse/forms.py:577 msgid "Integrity / interest" msgstr "" #: archaeological_finds/forms.py:1180 archaeological_finds/forms.py:1576 #: archaeological_finds/models_finds.py:1153 -#: archaeological_finds/models_finds.py:1972 +#: archaeological_finds/models_finds.py:1971 msgid "Recommended treatments" msgstr "" #: archaeological_finds/forms.py:1188 archaeological_finds/models_finds.py:1171 -#: archaeological_finds/models_finds.py:1948 +#: archaeological_finds/models_finds.py:1947 msgid "Estimated value" msgstr "" #: archaeological_finds/forms.py:1194 archaeological_finds/forms.py:1572 -#: archaeological_finds/models_finds.py:1968 +#: archaeological_finds/models_finds.py:1967 msgid "Conservatory comment" msgstr "" @@ -3368,10 +3369,10 @@ msgstr "" #: archaeological_operations/forms.py:712 #: archaeological_operations/forms.py:1678 #: archaeological_operations/forms.py:1744 -#: archaeological_operations/models.py:943 -#: archaeological_operations/models.py:1030 -#: archaeological_operations/models.py:1329 ishtar_common/models.py:4851 -#: ishtar_common/models_imports.py:927 +#: archaeological_operations/models.py:953 +#: archaeological_operations/models.py:1040 +#: archaeological_operations/models.py:1340 ishtar_common/models.py:4851 +#: ishtar_common/models_imports.py:929 msgid "Operation type" msgstr "" @@ -3430,19 +3431,19 @@ msgid "Discovery date before" msgstr "" #: archaeological_finds/forms.py:1434 -msgid "Discovery date (exact or TPQ) after" +msgid "Discovery date (exact or beginning) after" msgstr "" #: archaeological_finds/forms.py:1437 -msgid "Discovery date (exact or TPQ) before" +msgid "Discovery date (exact or beginning) before" msgstr "" #: archaeological_finds/forms.py:1440 -msgid "Discovery date (TAQ) after" +msgid "Discovery date (end) after" msgstr "" #: archaeological_finds/forms.py:1443 -msgid "Discovery date (TAQ) before" +msgid "Discovery date (end) before" msgstr "" #: archaeological_finds/forms.py:1448 archaeological_finds/forms.py:1968 @@ -3456,7 +3457,7 @@ msgstr "" #: archaeological_finds/forms.py:1459 archaeological_finds/models_finds.py:263 #: archaeological_finds/models_finds.py:1152 #: archaeological_operations/templates/ishtar/sheet_operation.html:544 -#: archaeological_warehouse/forms.py:572 ishtar_common/models_imports.py:950 +#: archaeological_warehouse/forms.py:572 ishtar_common/models_imports.py:952 msgid "Object type" msgstr "" @@ -3593,7 +3594,7 @@ msgid "Treatment end date before" msgstr "" #: archaeological_finds/forms.py:1654 archaeological_finds/models_finds.py:1111 -#: archaeological_finds/models_finds.py:1872 +#: archaeological_finds/models_finds.py:1871 #: archaeological_finds/templates/ishtar/sheet_find.html:310 #: ishtar_common/forms_common.py:1679 msgid "Reference container" @@ -3659,8 +3660,8 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:470 #: ishtar_common/forms_common.py:1613 ishtar_common/models.py:977 #: ishtar_common/models.py:1731 ishtar_common/models.py:3411 -#: ishtar_common/models_common.py:171 ishtar_common/models_common.py:204 -#: ishtar_common/models_common.py:1933 ishtar_common/models_common.py:1949 +#: ishtar_common/models_common.py:172 ishtar_common/models_common.py:205 +#: ishtar_common/models_common.py:1968 ishtar_common/models_common.py:1984 #: ishtar_common/models_imports.py:567 msgid "Label" msgstr "" @@ -3697,7 +3698,7 @@ msgstr "" #: archaeological_finds/models_finds.py:174 #: archaeological_finds/models_treatments.py:208 #: archaeological_finds/models_treatments.py:751 -#: ishtar_common/models_imports.py:945 +#: ishtar_common/models_imports.py:947 msgid "Treatment type" msgstr "" @@ -3716,8 +3717,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:740 #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 -#: archaeological_operations/models.py:2406 -#: archaeological_operations/models.py:2743 ishtar_common/views.py:402 +#: archaeological_operations/models.py:2417 +#: archaeological_operations/models.py:2754 ishtar_common/views.py:402 msgid "Treatment" msgstr "" @@ -3814,8 +3815,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1174 #: archaeological_finds/models_treatments.py:1193 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 -#: archaeological_finds/wizards.py:553 archaeological_operations/models.py:2405 -#: archaeological_operations/models.py:2735 ishtar_common/views.py:401 +#: archaeological_finds/wizards.py:553 archaeological_operations/models.py:2416 +#: archaeological_operations/models.py:2746 ishtar_common/views.py:401 msgid "Treatment request" msgstr "" @@ -3830,16 +3831,16 @@ msgid "Would you like to delete this treatment?" msgstr "" #: archaeological_finds/forms_treatments.py:401 -#: archaeological_finds/models_finds.py:1864 -#: archaeological_finds/models_finds.py:3327 +#: archaeological_finds/models_finds.py:1863 +#: archaeological_finds/models_finds.py:3326 #: archaeological_finds/models_treatments.py:262 #: archaeological_finds/models_treatments.py:755 #: archaeological_finds/templates/ishtar/sheet_find.html:399 #: archaeological_finds/templates/ishtar/sheet_find.html:437 #: archaeological_finds/templates/ishtar/sheet_find.html:475 #: archaeological_warehouse/forms.py:323 archaeological_warehouse/models.py:796 -#: archaeological_warehouse/models.py:1157 -#: archaeological_warehouse/models.py:1984 +#: archaeological_warehouse/models.py:1158 +#: archaeological_warehouse/models.py:1985 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 #: ishtar_common/forms_common.py:2174 ishtar_common/forms_common.py:2359 #: ishtar_common/templates/ishtar/sheet_document.html:100 @@ -4031,7 +4032,7 @@ msgid "Treatment one to many - creation" msgstr "" #: archaeological_finds/models_finds.py:86 -#: archaeological_operations/models.py:2410 ishtar_common/models.py:3625 +#: archaeological_operations/models.py:2421 ishtar_common/models.py:3625 msgid "Code" msgstr "" @@ -4127,7 +4128,7 @@ msgstr "" msgid "Integrity / interest types" msgstr "" -#: archaeological_finds/models_finds.py:239 ishtar_common/models_imports.py:952 +#: archaeological_finds/models_finds.py:239 ishtar_common/models_imports.py:954 msgid "Remarkability type" msgstr "" @@ -4135,7 +4136,7 @@ msgstr "" msgid "Remarkability types" msgstr "" -#: archaeological_finds/models_finds.py:252 ishtar_common/models_imports.py:955 +#: archaeological_finds/models_finds.py:252 ishtar_common/models_imports.py:957 msgid "Batch type" msgstr "" @@ -4144,8 +4145,8 @@ msgid "Batch types" msgstr "" #: archaeological_finds/models_finds.py:277 -#: archaeological_finds/models_finds.py:1892 -#: ishtar_common/models_imports.py:958 +#: archaeological_finds/models_finds.py:1891 +#: ishtar_common/models_imports.py:960 msgid "Functional area" msgstr "" @@ -4157,7 +4158,7 @@ msgstr "" msgid "Object type quality types" msgstr "" -#: archaeological_finds/models_finds.py:304 ishtar_common/models_imports.py:953 +#: archaeological_finds/models_finds.py:304 ishtar_common/models_imports.py:955 msgid "Alteration type" msgstr "" @@ -4165,7 +4166,7 @@ msgstr "" msgid "Alteration types" msgstr "" -#: archaeological_finds/models_finds.py:318 ishtar_common/models_imports.py:954 +#: archaeological_finds/models_finds.py:318 ishtar_common/models_imports.py:956 msgid "Alteration cause type" msgstr "" @@ -4173,7 +4174,7 @@ msgstr "" msgid "Alteration cause types" msgstr "" -#: archaeological_finds/models_finds.py:332 ishtar_common/models_imports.py:948 +#: archaeological_finds/models_finds.py:332 ishtar_common/models_imports.py:950 msgid "Treatment emergency type" msgstr "" @@ -4189,7 +4190,7 @@ msgstr "" msgid "Communicability types" msgstr "" -#: archaeological_finds/models_finds.py:359 ishtar_common/models_imports.py:956 +#: archaeological_finds/models_finds.py:359 ishtar_common/models_imports.py:958 msgid "Checked type" msgstr "" @@ -4229,7 +4230,7 @@ msgid "Concatenation of associated material types codes" msgstr "" #: archaeological_finds/models_finds.py:477 -#: archaeological_finds/models_finds.py:1801 +#: archaeological_finds/models_finds.py:1800 msgid "Base find" msgstr "" @@ -4262,7 +4263,7 @@ msgid "Manage basket" msgstr "" #: archaeological_finds/models_finds.py:935 -#: archaeological_warehouse/models.py:1853 +#: archaeological_warehouse/models.py:1854 msgid "Add treatment" msgstr "" @@ -4295,11 +4296,11 @@ msgid "Base find - Special interest" msgstr "" #: archaeological_finds/models_finds.py:1108 -msgid "Base find - Discovery date (exact or TPQ)" +msgid "Base find - Discovery date (exact or beginning)" msgstr "" #: archaeological_finds/models_finds.py:1109 -msgid "Base find - Discovery date (TAQ)" +msgid "Base find - Discovery date (end)" msgstr "" #: archaeological_finds/models_finds.py:1170 @@ -4327,7 +4328,7 @@ msgid "denomination" msgstr "" #: archaeological_finds/models_finds.py:1260 -#: archaeological_warehouse/models.py:933 +#: archaeological_warehouse/models.py:934 msgctxt "key for text search" msgid "code-patriarche" msgstr "" @@ -4338,34 +4339,34 @@ msgid "operation-type" msgstr "" #: archaeological_finds/models_finds.py:1268 -#: archaeological_operations/models.py:380 -#: archaeological_operations/models.py:1094 +#: archaeological_operations/models.py:381 +#: archaeological_operations/models.py:1105 msgctxt "key for text search" msgid "area" msgstr "" #: archaeological_finds/models_finds.py:1277 -#: archaeological_warehouse/models.py:942 +#: archaeological_warehouse/models.py:943 msgctxt "key for text search" msgid "site-name" msgstr "" #: archaeological_finds/models_finds.py:1282 -#: archaeological_finds/models_finds.py:1739 -#: archaeological_warehouse/models.py:947 +#: archaeological_finds/models_finds.py:1738 +#: archaeological_warehouse/models.py:948 msgctxt "key for text search" msgid "context-record-site" msgstr "" #: archaeological_finds/models_finds.py:1287 -#: archaeological_warehouse/models.py:952 +#: archaeological_warehouse/models.py:953 msgctxt "key for text search" msgid "context-record-site-name" msgstr "" #: archaeological_finds/models_finds.py:1291 -#: archaeological_finds/models_finds.py:1734 -#: archaeological_warehouse/models.py:956 ishtar_common/models.py:3936 +#: archaeological_finds/models_finds.py:1733 +#: archaeological_warehouse/models.py:957 ishtar_common/models.py:3936 #: ishtar_common/models.py:4033 msgctxt "key for text search" msgid "context-record" @@ -4377,13 +4378,13 @@ msgid "context-record-relation-type" msgstr "" #: archaeological_finds/models_finds.py:1303 archaeological_finds/tests.py:1260 -#: archaeological_warehouse/models.py:968 +#: archaeological_warehouse/models.py:969 msgctxt "key for text search" msgid "material" msgstr "" #: archaeological_finds/models_finds.py:1307 -#: archaeological_warehouse/models.py:972 +#: archaeological_warehouse/models.py:973 msgctxt "key for text search" msgid "object-type" msgstr "" @@ -4394,19 +4395,19 @@ msgid "recommended-treatments" msgstr "" #: archaeological_finds/models_finds.py:1315 archaeological_finds/tests.py:1438 -#: archaeological_warehouse/models.py:980 +#: archaeological_warehouse/models.py:981 msgctxt "key for text search" msgid "conservatory" msgstr "" #: archaeological_finds/models_finds.py:1319 -#: archaeological_warehouse/models.py:984 +#: archaeological_warehouse/models.py:985 msgctxt "key for text search" msgid "integrity" msgstr "" #: archaeological_finds/models_finds.py:1323 -#: archaeological_warehouse/models.py:988 +#: archaeological_warehouse/models.py:989 msgctxt "key for text search" msgid "remarkability" msgstr "" @@ -4432,8 +4433,8 @@ msgid "container" msgstr "" #: archaeological_finds/models_finds.py:1342 -#: archaeological_finds/models_finds.py:1737 -#: archaeological_warehouse/models.py:902 +#: archaeological_finds/models_finds.py:1736 +#: archaeological_warehouse/models.py:903 msgctxt "key for text search" msgid "location" msgstr "" @@ -4460,7 +4461,7 @@ msgid "last-modified-by" msgstr "" #: archaeological_finds/models_finds.py:1365 -#: ishtar_common/models_common.py:1437 +#: ishtar_common/models_common.py:1472 msgctxt "key for text search" msgid "created-by" msgstr "" @@ -4731,19 +4732,19 @@ msgid "check-date-after" msgstr "" #: archaeological_finds/models_finds.py:1561 -#: archaeological_warehouse/models.py:992 +#: archaeological_warehouse/models.py:993 msgctxt "key for text search" msgid "alterations" msgstr "" #: archaeological_finds/models_finds.py:1565 -#: archaeological_warehouse/models.py:996 +#: archaeological_warehouse/models.py:997 msgctxt "key for text search" msgid "alteration-causes" msgstr "" #: archaeological_finds/models_finds.py:1569 -#: archaeological_warehouse/models.py:1000 +#: archaeological_warehouse/models.py:1001 msgctxt "key for text search" msgid "treatment-emergency" msgstr "" @@ -4779,7 +4780,7 @@ msgid "appraisal-date-after" msgstr "" #: archaeological_finds/models_finds.py:1597 -#: archaeological_operations/models.py:428 +#: archaeological_operations/models.py:429 msgctxt "key for text search" msgid "cultural-attribution" msgstr "" @@ -4797,21 +4798,21 @@ msgid "operation-address" msgstr "E-Mail-Adresse" #: archaeological_finds/models_finds.py:1613 -#: archaeological_operations/models.py:1122 +#: archaeological_operations/models.py:1133 msgctxt "key for text search" msgid "scientist" msgstr "" #: archaeological_finds/models_finds.py:1617 archaeological_finds/tests.py:1354 -#: archaeological_operations/models.py:1126 +#: archaeological_operations/models.py:1137 #: archaeological_operations/tests.py:2873 #: archaeological_operations/tests.py:3324 msgctxt "key for text search" msgid "operator" msgstr "" -#: archaeological_finds/models_finds.py:1713 -#: archaeological_finds/models_finds.py:2353 +#: archaeological_finds/models_finds.py:1712 +#: archaeological_finds/models_finds.py:2352 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 #: archaeological_finds/views.py:1274 archaeological_warehouse/forms.py:679 #: archaeological_warehouse/views.py:297 ishtar_common/models.py:4071 @@ -4821,115 +4822,115 @@ msgstr "" msgid "Packaging" msgstr "" -#: archaeological_finds/models_finds.py:1721 +#: archaeological_finds/models_finds.py:1720 msgid "Treatment many to one" msgstr "" -#: archaeological_finds/models_finds.py:1835 +#: archaeological_finds/models_finds.py:1834 msgid "Weight" msgstr "" -#: archaeological_finds/models_finds.py:1837 +#: archaeological_finds/models_finds.py:1836 msgid "Weight unit" msgstr "" -#: archaeological_finds/models_finds.py:1846 +#: archaeological_finds/models_finds.py:1845 #: archaeological_finds/templates/ishtar/sheet_find.html:427 msgid "Upstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:1853 +#: archaeological_finds/models_finds.py:1852 #: archaeological_finds/templates/ishtar/sheet_find.html:465 msgid "Downstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:1924 +#: archaeological_finds/models_finds.py:1923 msgid "Clutter - long side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:1927 +#: archaeological_finds/models_finds.py:1926 msgid "Clutter - short side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:1930 +#: archaeological_finds/models_finds.py:1929 msgid "Clutter - height (cm)" msgstr "" -#: archaeological_finds/models_finds.py:1951 +#: archaeological_finds/models_finds.py:1950 msgid "Collection" msgstr "" -#: archaeological_finds/models_finds.py:1956 +#: archaeological_finds/models_finds.py:1955 msgid "Do not use - need evolutions" msgstr "" -#: archaeological_finds/models_finds.py:2010 +#: archaeological_finds/models_finds.py:2009 #: archaeological_finds/models_treatments.py:289 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:71 msgid "Treatments" msgstr "" -#: archaeological_finds/models_finds.py:2013 +#: archaeological_finds/models_finds.py:2012 msgid "Related treatments when no new find is created" msgstr "" -#: archaeological_finds/models_finds.py:2029 +#: archaeological_finds/models_finds.py:2028 msgid "Cached object types label" msgstr "" -#: archaeological_finds/models_finds.py:2035 +#: archaeological_finds/models_finds.py:2034 msgid "Cached material types label" msgstr "" -#: archaeological_finds/models_finds.py:2067 +#: archaeological_finds/models_finds.py:2066 msgid "FIND" msgstr "" -#: archaeological_finds/models_finds.py:2205 +#: archaeological_finds/models_finds.py:2204 msgid "Material types string" msgstr "" -#: archaeological_finds/models_finds.py:2206 +#: archaeological_finds/models_finds.py:2205 msgid "Material types code string" msgstr "" -#: archaeological_finds/models_finds.py:2207 +#: archaeological_finds/models_finds.py:2206 msgid "Recommendations string from material" msgstr "" -#: archaeological_finds/models_finds.py:2208 +#: archaeological_finds/models_finds.py:2207 #, fuzzy #| msgid "email address" msgid "Complete ID of associated base finds" msgstr "E-Mail-Adresse" -#: archaeological_finds/models_finds.py:2209 +#: archaeological_finds/models_finds.py:2208 #, fuzzy #| msgid "email address" msgid "Label of associated context records" msgstr "E-Mail-Adresse" -#: archaeological_finds/models_finds.py:2326 +#: archaeological_finds/models_finds.py:2325 msgid "Add to basket" msgstr "" -#: archaeological_finds/models_finds.py:2334 +#: archaeological_finds/models_finds.py:2333 msgid "Simple treatment" msgstr "" -#: archaeological_finds/models_finds.py:2342 +#: archaeological_finds/models_finds.py:2341 msgid "Divide treatment" msgstr "" -#: archaeological_finds/models_finds.py:2907 +#: archaeological_finds/models_finds.py:2906 msgid "No reference container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:2913 +#: archaeological_finds/models_finds.py:2912 msgid "No container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:3350 ishtar_common/forms_common.py:118 +#: archaeological_finds/models_finds.py:3349 ishtar_common/forms_common.py:118 #: 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 @@ -4937,11 +4938,11 @@ msgstr "" msgid "Person" msgstr "" -#: archaeological_finds/models_finds.py:3358 +#: archaeological_finds/models_finds.py:3357 msgid "Property" msgstr "" -#: archaeological_finds/models_finds.py:3359 +#: archaeological_finds/models_finds.py:3358 msgid "Properties" msgstr "" @@ -4972,7 +4973,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:153 #: archaeological_finds/models_treatments.py:1050 -#: archaeological_operations/models.py:2545 +#: archaeological_operations/models.py:2556 msgctxt "key for text search" msgid "index" msgstr "" @@ -5123,10 +5124,6 @@ msgstr "" msgid "Discovery year" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_basefind.html:31 -msgid "Discovery date (TPQ)" -msgstr "" - #: archaeological_finds/templates/ishtar/sheet_basefind.html:61 #: ishtar_common/forms.py:931 msgid "Last modified by" @@ -5224,8 +5221,8 @@ msgid "Associated treatment files" 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 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:36 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:32 #: ishtar_common/forms_common.py:1857 #: ishtar_common/templates/ishtar/sheet_document.html:57 msgid "Content" @@ -5300,7 +5297,7 @@ msgstr "" msgid "Treatment informations:" msgstr "" -#: archaeological_finds/tests.py:944 archaeological_warehouse/models.py:1623 +#: archaeological_finds/tests.py:944 archaeological_warehouse/models.py:1624 msgid "The division {} {} do not exist for the location {}." msgstr "" @@ -5309,8 +5306,8 @@ msgstr "" #: ishtar_common/forms.py:1157 ishtar_common/forms.py:1236 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 #: ishtar_common/templatetags/window_field.py:19 -#: ishtar_common/views_item.py:589 ishtar_common/views_item.py:855 -#: ishtar_common/views_item.py:892 ishtar_common/wizards.py:501 +#: ishtar_common/views_item.py:589 ishtar_common/views_item.py:857 +#: ishtar_common/views_item.py:894 ishtar_common/wizards.py:501 msgid "Yes" msgstr "" @@ -5416,26 +5413,26 @@ msgstr "" #: archaeological_operations/forms.py:1059 #: archaeological_operations/forms.py:1075 #: archaeological_operations/forms.py:1081 -#: archaeological_operations/models.py:3033 +#: archaeological_operations/models.py:3044 #: archaeological_operations/templates/ishtar/sheet_operation.html:494 msgid "Parcels" msgstr "" #: archaeological_operations/forms.py:76 -#: archaeological_operations/models.py:3015 +#: archaeological_operations/models.py:3026 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Section" msgstr "" #: archaeological_operations/forms.py:79 -#: archaeological_operations/models.py:3017 +#: archaeological_operations/models.py:3028 msgid "Parcel number" msgstr "" #: archaeological_operations/forms.py:81 -#: archaeological_operations/models.py:3019 -#: archaeological_operations/models.py:3047 -#: archaeological_operations/models.py:3112 +#: archaeological_operations/models.py:3030 +#: archaeological_operations/models.py:3058 +#: archaeological_operations/models.py:3123 msgid "Public domain" msgstr "" @@ -5493,13 +5490,13 @@ msgstr "" #: archaeological_operations/forms.py:497 #: archaeological_operations/forms.py:711 -#: archaeological_operations/models.py:1465 +#: archaeological_operations/models.py:1476 msgid "DRASSM code" msgstr "" #: archaeological_operations/forms.py:505 #: archaeological_operations/forms.py:716 -#: archaeological_operations/models.py:1400 +#: archaeological_operations/models.py:1411 msgid "Address / Locality" msgstr "" @@ -5509,14 +5506,14 @@ msgstr "" #: archaeological_operations/forms.py:515 #: archaeological_operations/forms.py:767 -#: archaeological_operations/models.py:2686 +#: archaeological_operations/models.py:2697 msgid "Scientific monitor" msgstr "" #: archaeological_operations/forms.py:524 #: archaeological_operations/forms.py:756 #: archaeological_operations/forms.py:1682 -#: archaeological_operations/models.py:1299 +#: archaeological_operations/models.py:1310 msgid "Operator" msgstr "" @@ -5527,10 +5524,10 @@ msgstr "" #: archaeological_operations/forms.py:1846 #: archaeological_operations/models.py:306 #: archaeological_operations/models.py:315 -#: archaeological_operations/models.py:487 -#: archaeological_operations/models.py:947 -#: archaeological_operations/models.py:1033 -#: archaeological_operations/models.py:1334 +#: archaeological_operations/models.py:488 +#: archaeological_operations/models.py:957 +#: archaeological_operations/models.py:1043 +#: archaeological_operations/models.py:1345 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:9 msgid "Remains" msgstr "" @@ -5557,34 +5554,34 @@ msgstr "" #: archaeological_operations/forms.py:544 #: archaeological_operations/forms.py:817 -#: archaeological_operations/models.py:1403 +#: archaeological_operations/models.py:1414 msgid "Comment about scientific documentation" msgstr "" #: archaeological_operations/forms.py:545 #: archaeological_operations/forms.py:819 -#: archaeological_operations/models.py:949 -#: archaeological_operations/models.py:1446 +#: archaeological_operations/models.py:959 +#: archaeological_operations/models.py:1457 msgid "Record quality" msgstr "" #: archaeological_operations/forms.py:546 #: archaeological_operations/forms.py:785 -#: archaeological_operations/models.py:1355 +#: archaeological_operations/models.py:1366 msgid "Report processing" msgstr "" #: archaeological_operations/forms.py:548 #: archaeological_operations/forms.py:738 -#: archaeological_operations/models.py:1437 +#: archaeological_operations/models.py:1448 msgid "Virtual operation" msgstr "" #: archaeological_operations/forms.py:569 #: archaeological_operations/forms.py:808 #: archaeological_operations/forms.py:1690 -#: archaeological_operations/models.py:950 -#: archaeological_operations/models.py:1456 +#: archaeological_operations/models.py:960 +#: archaeological_operations/models.py:1467 msgid "Documentation received" msgstr "" @@ -5599,8 +5596,8 @@ msgstr "" #: archaeological_operations/forms.py:576 #: archaeological_operations/forms.py:813 #: archaeological_operations/forms.py:1694 -#: archaeological_operations/models.py:951 -#: archaeological_operations/models.py:1461 +#: archaeological_operations/models.py:961 +#: archaeological_operations/models.py:1472 msgid "Finds received" msgstr "" @@ -5622,12 +5619,12 @@ msgstr "" #: archaeological_operations/forms.py:714 #: archaeological_operations/forms.py:1742 -#: archaeological_operations/models.py:1399 +#: archaeological_operations/models.py:1410 msgid "Generic name" msgstr "" #: archaeological_operations/forms.py:730 -#: archaeological_operations/models.py:1360 +#: archaeological_operations/models.py:1371 msgid "Old code" msgstr "" @@ -5640,7 +5637,7 @@ msgid "Head scientist" msgstr "" #: archaeological_operations/forms.py:764 -#: archaeological_operations/models.py:1397 +#: archaeological_operations/models.py:1408 msgid "Operator reference" msgstr "" @@ -5648,8 +5645,8 @@ msgstr "" #: archaeological_operations/forms.py:1344 #: archaeological_operations/forms.py:1698 #: archaeological_operations/forms.py:1835 -#: archaeological_operations/models.py:505 -#: archaeological_operations/models.py:1313 +#: archaeological_operations/models.py:506 +#: archaeological_operations/models.py:1324 msgid "Collaborators" msgstr "" @@ -5658,17 +5655,17 @@ msgid "Dates / Administrative" msgstr "" #: archaeological_operations/forms.py:783 -#: archaeological_operations/models.py:1284 +#: archaeological_operations/models.py:1295 msgid "Report delivery date" msgstr "" #: archaeological_operations/forms.py:805 -#: archaeological_operations/models.py:1453 +#: archaeological_operations/models.py:1464 msgid "Deadline for submission of the documentation" msgstr "" #: archaeological_operations/forms.py:810 -#: archaeological_operations/models.py:1459 +#: archaeological_operations/models.py:1470 msgid "Deadline for submission of the finds" msgstr "" @@ -5677,12 +5674,12 @@ msgid "Scientific" msgstr "" #: archaeological_operations/forms.py:822 -#: archaeological_operations/models.py:93 ishtar_common/models_imports.py:930 +#: archaeological_operations/models.py:93 ishtar_common/models_imports.py:932 msgid "Remain type" msgstr "" #: archaeological_operations/forms.py:828 -#: archaeological_operations/models.py:1451 +#: archaeological_operations/models.py:1462 msgid "Abstract" msgstr "" @@ -5707,7 +5704,7 @@ msgid "Bad operation code" msgstr "" #: archaeological_operations/forms.py:927 -#: archaeological_operations/models.py:1899 +#: archaeological_operations/models.py:1910 msgid "Operation code" msgstr "" @@ -5721,12 +5718,12 @@ msgid "Operation - 015 - Court-ordered seizure" msgstr "" #: archaeological_operations/forms.py:972 -#: archaeological_operations/models.py:1468 +#: archaeological_operations/models.py:1479 msgid "Seizure name" msgstr "" #: archaeological_operations/forms.py:975 -#: archaeological_operations/models.py:1470 +#: archaeological_operations/models.py:1481 msgid "Official report number" msgstr "" @@ -5735,12 +5732,12 @@ msgid "Protagonist" msgstr "" #: archaeological_operations/forms.py:987 -#: archaeological_operations/models.py:1482 +#: archaeological_operations/models.py:1493 msgid "Applicant authority" msgstr "" #: archaeological_operations/forms.py:993 -#: archaeological_operations/models.py:1490 +#: archaeological_operations/models.py:1501 msgid "Writer of the minutes" msgstr "" @@ -5753,22 +5750,22 @@ msgid "Operation - 033 - Preventive - Excavation" msgstr "" #: archaeological_operations/forms.py:1002 -#: archaeological_operations/models.py:1339 +#: archaeological_operations/models.py:1350 msgid "Cost (euros)" msgstr "" #: archaeological_operations/forms.py:1003 -#: archaeological_operations/models.py:1343 +#: archaeological_operations/models.py:1354 msgid "Scheduled man-days" msgstr "" #: archaeological_operations/forms.py:1005 -#: archaeological_operations/models.py:1347 +#: archaeological_operations/models.py:1358 msgid "Optional man-days" msgstr "" #: archaeological_operations/forms.py:1007 -#: archaeological_operations/models.py:1351 +#: archaeological_operations/models.py:1362 msgid "Effective man-days" msgstr "" @@ -5781,17 +5778,17 @@ msgid "Operation - 037 - Preventive - Diagnostic" msgstr "" #: archaeological_operations/forms.py:1023 -#: archaeological_operations/models.py:1371 +#: archaeological_operations/models.py:1382 msgid "Prescription on zoning" msgstr "" #: archaeological_operations/forms.py:1025 -#: archaeological_operations/models.py:1375 +#: archaeological_operations/models.py:1386 msgid "Prescription on large area" msgstr "" #: archaeological_operations/forms.py:1028 -#: archaeological_operations/models.py:1378 +#: archaeological_operations/models.py:1389 msgid "Prescription on geoarchaeological context" msgstr "" @@ -5815,8 +5812,8 @@ msgstr "" #: archaeological_operations/forms.py:1213 #: archaeological_operations/forms.py:1329 #: archaeological_operations/forms.py:1794 -#: archaeological_operations/models.py:482 -#: archaeological_warehouse/models.py:1991 ishtar_common/forms_common.py:1782 +#: archaeological_operations/models.py:483 +#: archaeological_warehouse/models.py:1992 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 @@ -5853,55 +5850,55 @@ msgstr "" #: archaeological_operations/forms.py:1239 #: archaeological_operations/forms.py:1348 -#: archaeological_operations/models.py:497 +#: archaeological_operations/models.py:498 msgid "National Geographic Institute locality" msgstr "" #: archaeological_operations/forms.py:1242 #: archaeological_operations/forms.py:1352 -#: archaeological_operations/models.py:500 +#: archaeological_operations/models.py:501 msgid "Cadastral locality" msgstr "" #: archaeological_operations/forms.py:1246 #: archaeological_operations/forms.py:1396 -#: archaeological_operations/models.py:517 +#: archaeological_operations/models.py:518 msgid "AffMar number" msgstr "" #: archaeological_operations/forms.py:1248 #: archaeological_operations/forms.py:1398 -#: archaeological_operations/models.py:520 +#: archaeological_operations/models.py:521 msgid "DRASSM number" msgstr "" #: archaeological_operations/forms.py:1250 #: archaeological_operations/forms.py:1400 -#: archaeological_operations/models.py:509 +#: archaeological_operations/models.py:510 msgid "Shipwreck name" msgstr "" #: archaeological_operations/forms.py:1253 #: archaeological_operations/forms.py:1408 -#: archaeological_operations/models.py:511 +#: archaeological_operations/models.py:512 msgid "Oceanographic service localisation" msgstr "" #: archaeological_operations/forms.py:1256 #: archaeological_operations/forms.py:1402 -#: archaeological_operations/models.py:513 +#: archaeological_operations/models.py:514 msgid "Shipwreck code" msgstr "" #: archaeological_operations/forms.py:1258 #: archaeological_operations/forms.py:1404 -#: archaeological_operations/models.py:514 +#: archaeological_operations/models.py:515 msgid "Sinking date" msgstr "" #: archaeological_operations/forms.py:1260 #: archaeological_operations/forms.py:1406 -#: archaeological_operations/models.py:515 +#: archaeological_operations/models.py:516 msgid "Discovery area" msgstr "" @@ -5934,12 +5931,12 @@ msgid "You should select an administrative act." msgstr "" #: archaeological_operations/forms.py:1496 -#: archaeological_operations/models.py:2711 +#: archaeological_operations/models.py:2722 msgid "Signatory" msgstr "" #: archaeological_operations/forms.py:1503 -#: archaeological_operations/models.py:2746 +#: archaeological_operations/models.py:2757 msgid "Signature date" msgstr "" @@ -6035,7 +6032,7 @@ msgstr "" msgid "Types of record quality" msgstr "" -#: archaeological_operations/models.py:158 +#: archaeological_operations/models.py:158 ishtar_common/models_imports.py:928 msgid "Cultural attribution type" msgstr "" @@ -6043,544 +6040,544 @@ msgstr "" msgid "Cultural attribution types" msgstr "" -#: archaeological_operations/models.py:374 -#: archaeological_operations/models.py:1130 +#: archaeological_operations/models.py:375 +#: archaeological_operations/models.py:1141 #: archaeological_operations/tests.py:3074 msgctxt "key for text search" msgid "remain" msgstr "" -#: archaeological_operations/models.py:386 +#: archaeological_operations/models.py:387 msgctxt "key for text search" msgid "locality-ngi" msgstr "" -#: archaeological_operations/models.py:389 +#: archaeological_operations/models.py:390 msgctxt "key for text search" msgid "locality-cadastral" msgstr "" -#: archaeological_operations/models.py:393 +#: archaeological_operations/models.py:394 msgctxt "key for text search" msgid "shipwreck-name" msgstr "" -#: archaeological_operations/models.py:397 +#: archaeological_operations/models.py:398 msgctxt "key for text search" msgid "oceanographic-service-localisation" msgstr "" -#: archaeological_operations/models.py:401 +#: archaeological_operations/models.py:402 msgctxt "key for text search" msgid "shipwreck-code" msgstr "" -#: archaeological_operations/models.py:405 +#: archaeological_operations/models.py:406 msgctxt "key for text search" msgid "sinking-date" msgstr "" -#: archaeological_operations/models.py:408 +#: archaeological_operations/models.py:409 msgctxt "key for text search" msgid "discovery-area" msgstr "" -#: archaeological_operations/models.py:416 +#: archaeological_operations/models.py:417 msgctxt "key for text search" msgid "top-operation" msgstr "" -#: archaeological_operations/models.py:420 +#: archaeological_operations/models.py:421 msgctxt "key for text search" msgid "numero-drassm" msgstr "" -#: archaeological_operations/models.py:424 +#: archaeological_operations/models.py:425 msgctxt "key for text search" msgid "numero-affmar" msgstr "" -#: archaeological_operations/models.py:542 -#: archaeological_operations/models.py:1497 +#: archaeological_operations/models.py:543 +#: archaeological_operations/models.py:1508 msgid "Cached town label" msgstr "" -#: archaeological_operations/models.py:554 -#: archaeological_operations/models.py:1509 +#: archaeological_operations/models.py:555 +#: archaeological_operations/models.py:1520 msgid "Cached remains label" msgstr "" -#: archaeological_operations/models.py:564 -#: archaeological_operations/models.py:1426 +#: archaeological_operations/models.py:565 +#: archaeological_operations/models.py:1437 #: archaeological_operations/templates/ishtar/sheet_operation.html:325 msgid "Archaeological sites" msgstr "" -#: archaeological_operations/models.py:580 +#: archaeological_operations/models.py:581 msgid "SITE" msgstr "" -#: archaeological_operations/models.py:771 ishtar_common/forms.py:1156 +#: archaeological_operations/models.py:772 ishtar_common/forms.py:1156 #: ishtar_common/models.py:4977 ishtar_common/models.py:5134 -#: ishtar_common/models.py:5193 ishtar_common/views_item.py:1524 +#: ishtar_common/models.py:5193 ishtar_common/views_item.py:1532 msgid "Unknown" msgstr "" -#: archaeological_operations/models.py:773 +#: archaeological_operations/models.py:774 msgid "Virtual operation of site: {}" msgstr "" -#: archaeological_operations/models.py:1012 +#: archaeological_operations/models.py:1022 msgid "Associated file (label)" msgstr "" -#: archaeological_operations/models.py:1013 +#: archaeological_operations/models.py:1023 msgid "Operator name" msgstr "" -#: archaeological_operations/models.py:1014 +#: archaeological_operations/models.py:1024 msgid "Associated file (external ID)" msgstr "" -#: archaeological_operations/models.py:1015 +#: archaeological_operations/models.py:1025 msgid "Scientist (title)" msgstr "" -#: archaeological_operations/models.py:1016 +#: archaeological_operations/models.py:1026 msgid "Scientist (surname)" msgstr "" -#: archaeological_operations/models.py:1017 +#: archaeological_operations/models.py:1027 msgid "Scientist (name)" msgstr "" -#: archaeological_operations/models.py:1018 +#: archaeological_operations/models.py:1028 msgid "Scientist (full name)" msgstr "" -#: archaeological_operations/models.py:1019 +#: archaeological_operations/models.py:1029 msgid "Scientist - Organization (name)" msgstr "" -#: archaeological_operations/models.py:1020 +#: archaeological_operations/models.py:1030 msgid "Scientific monitor (title)" msgstr "" -#: archaeological_operations/models.py:1021 +#: archaeological_operations/models.py:1031 msgid "Scientific monitor (surname)" msgstr "" -#: archaeological_operations/models.py:1022 +#: archaeological_operations/models.py:1032 msgid "Scientific monitor (name)" msgstr "" -#: archaeological_operations/models.py:1023 +#: archaeological_operations/models.py:1033 msgid "Scientific monitor - Organization (name)" msgstr "" -#: archaeological_operations/models.py:1028 +#: archaeological_operations/models.py:1038 msgid "Archaeological sites (reference)" msgstr "" -#: archaeological_operations/models.py:1108 +#: archaeological_operations/models.py:1119 msgctxt "key for text search" msgid "address" msgstr "" -#: archaeological_operations/models.py:1115 +#: archaeological_operations/models.py:1126 #: archaeological_operations/tests.py:3081 msgctxt "key for text search" msgid "is-open" msgstr "" -#: archaeological_operations/models.py:1118 +#: archaeological_operations/models.py:1129 msgctxt "key for text search" msgid "scientific-monitor" msgstr "" -#: archaeological_operations/models.py:1136 +#: archaeological_operations/models.py:1147 msgctxt "key for text search" msgid "start-before" msgstr "" -#: archaeological_operations/models.py:1139 +#: archaeological_operations/models.py:1150 msgctxt "key for text search" msgid "start-after" msgstr "" -#: archaeological_operations/models.py:1142 +#: archaeological_operations/models.py:1153 msgctxt "key for text search" msgid "end-before" msgstr "" -#: archaeological_operations/models.py:1146 +#: archaeological_operations/models.py:1157 msgctxt "key for text search" msgid "end-after" msgstr "" -#: archaeological_operations/models.py:1150 +#: archaeological_operations/models.py:1161 #: archaeological_operations/tests.py:3124 msgctxt "key for text search" msgid "relation-types" msgstr "" -#: archaeological_operations/models.py:1156 +#: archaeological_operations/models.py:1167 msgctxt "key for text search" msgid "abstract" msgstr "" -#: archaeological_operations/models.py:1159 +#: archaeological_operations/models.py:1170 msgctxt "key for text search" msgid "scientific-documentation-comment" msgstr "" -#: archaeological_operations/models.py:1163 +#: archaeological_operations/models.py:1174 msgctxt "key for text search" msgid "record-quality" msgstr "" -#: archaeological_operations/models.py:1167 +#: archaeological_operations/models.py:1178 msgctxt "key for text search" msgid "report-processing" msgstr "" -#: archaeological_operations/models.py:1171 +#: archaeological_operations/models.py:1182 msgctxt "key for text search" msgid "virtual-operation" msgstr "" -#: archaeological_operations/models.py:1179 +#: archaeological_operations/models.py:1190 msgctxt "key for text search" msgid "documentation-received" msgstr "" -#: archaeological_operations/models.py:1183 +#: archaeological_operations/models.py:1194 msgctxt "key for text search" msgid "documentation-deadline-before" msgstr "" -#: archaeological_operations/models.py:1187 +#: archaeological_operations/models.py:1198 msgctxt "key for text search" msgid "documentation-deadline-after" msgstr "" -#: archaeological_operations/models.py:1191 +#: archaeological_operations/models.py:1202 msgctxt "key for text search" msgid "finds-received" msgstr "" -#: archaeological_operations/models.py:1198 +#: archaeological_operations/models.py:1209 msgctxt "key for text search" msgid "finds-deadline-before" msgstr "" -#: archaeological_operations/models.py:1202 +#: archaeological_operations/models.py:1213 msgctxt "key for text search" msgid "finds-deadline-after" msgstr "" -#: archaeological_operations/models.py:1206 +#: archaeological_operations/models.py:1217 msgctxt "key for text search" msgid "code-drassm" msgstr "" -#: archaeological_operations/models.py:1241 ishtar_common/models.py:3952 +#: archaeological_operations/models.py:1252 ishtar_common/models.py:3952 #: ishtar_common/models.py:4036 msgctxt "key for text search" msgid "file" msgstr "" -#: archaeological_operations/models.py:1290 +#: archaeological_operations/models.py:1301 msgid "Scientific manager" msgstr "" -#: archaeological_operations/models.py:1306 +#: archaeological_operations/models.py:1317 msgid "Operation monitor" msgstr "" -#: archaeological_operations/models.py:1432 +#: archaeological_operations/models.py:1443 msgid "Sites for which this operation is top operation" msgstr "" -#: archaeological_operations/models.py:1440 +#: archaeological_operations/models.py:1451 msgid "" "If checked, it means that this operation have not been officialy registered." msgstr "" -#: archaeological_operations/models.py:1474 +#: archaeological_operations/models.py:1485 msgid "Name of the protagonist" msgstr "" -#: archaeological_operations/models.py:1519 +#: archaeological_operations/models.py:1530 #: archaeological_operations/templates/ishtar/sheet_site.html:87 #: ishtar_common/models.py:1005 msgid "Operations" msgstr "" -#: archaeological_operations/models.py:1559 +#: archaeological_operations/models.py:1570 msgid "List of associated context records" msgstr "" -#: archaeological_operations/models.py:1560 +#: archaeological_operations/models.py:1571 #, fuzzy #| msgid "email address" msgid "List of associated containers" msgstr "E-Mail-Adresse" -#: archaeological_operations/models.py:1633 +#: archaeological_operations/models.py:1644 msgid "OPE" msgstr "" -#: archaeological_operations/models.py:1742 +#: archaeological_operations/models.py:1753 msgid "Intercommunal" msgstr "" -#: archaeological_operations/models.py:1865 +#: archaeological_operations/models.py:1876 msgid "context record" msgstr "" -#: archaeological_operations/models.py:1884 +#: archaeological_operations/models.py:1895 msgid "Code patriarche" msgstr "" -#: archaeological_operations/models.py:1932 +#: archaeological_operations/models.py:1943 msgid "This operation code already exists for this year" msgstr "" -#: archaeological_operations/models.py:1993 +#: archaeological_operations/models.py:2004 msgid "Number of parcels" msgstr "" -#: archaeological_operations/models.py:2003 +#: archaeological_operations/models.py:2014 msgid "Number of administrative acts" msgstr "" -#: archaeological_operations/models.py:2011 +#: archaeological_operations/models.py:2022 msgid "Number of indexed administrative acts" msgstr "" -#: archaeological_operations/models.py:2019 +#: archaeological_operations/models.py:2030 msgid "Number of context records" msgstr "" -#: archaeological_operations/models.py:2073 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:103 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:85 +#: archaeological_operations/models.py:2084 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:117 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:99 msgid "Number of finds" msgstr "" -#: archaeological_operations/models.py:2135 -#: archaeological_operations/models.py:2214 +#: archaeological_operations/models.py:2146 +#: archaeological_operations/models.py:2225 msgid "No type" msgstr "" -#: archaeological_operations/models.py:2179 +#: archaeological_operations/models.py:2190 msgid "Number of sources" msgstr "" -#: archaeological_operations/models.py:2224 +#: archaeological_operations/models.py:2235 msgid "Mean" msgstr "" -#: archaeological_operations/models.py:2316 ishtar_common/models_imports.py:931 +#: archaeological_operations/models.py:2327 ishtar_common/models_imports.py:933 msgid "Operation relation type" msgstr "" -#: archaeological_operations/models.py:2317 +#: archaeological_operations/models.py:2328 msgid "Operation relation types" msgstr "" -#: archaeological_operations/models.py:2342 +#: archaeological_operations/models.py:2353 msgid "Operation record relation" msgstr "" -#: archaeological_operations/models.py:2343 +#: archaeological_operations/models.py:2354 msgid "Operation record relations" msgstr "" -#: archaeological_operations/models.py:2409 +#: archaeological_operations/models.py:2420 msgid "Intended to" msgstr "" -#: archaeological_operations/models.py:2414 +#: archaeological_operations/models.py:2425 msgid "Associated template" msgstr "" -#: archaeological_operations/models.py:2417 +#: archaeological_operations/models.py:2428 msgid "Indexed" msgstr "" -#: archaeological_operations/models.py:2421 +#: archaeological_operations/models.py:2432 msgid "Act types" msgstr "" -#: archaeological_operations/models.py:2547 +#: archaeological_operations/models.py:2558 msgctxt "key for text search" msgid "other-ref" msgstr "" -#: archaeological_operations/models.py:2557 +#: archaeological_operations/models.py:2568 msgctxt "key for text search" msgid "indexed" msgstr "" -#: archaeological_operations/models.py:2560 -#: archaeological_warehouse/models.py:923 +#: archaeological_operations/models.py:2571 +#: archaeological_warehouse/models.py:924 msgctxt "key for text search" msgid "operation-town" msgstr "" -#: archaeological_operations/models.py:2564 +#: archaeological_operations/models.py:2575 msgctxt "key for text search" msgid "file-town" msgstr "" -#: archaeological_operations/models.py:2576 +#: archaeological_operations/models.py:2587 msgctxt "key for text search" msgid "operation-department" msgstr "" -#: archaeological_operations/models.py:2580 +#: archaeological_operations/models.py:2591 msgctxt "key for text search" msgid "file-department" msgstr "" -#: archaeological_operations/models.py:2584 +#: archaeological_operations/models.py:2595 msgctxt "key for text search" msgid "object" msgstr "" -#: archaeological_operations/models.py:2587 +#: archaeological_operations/models.py:2598 msgctxt "key for text search" msgid "signature-before" msgstr "" -#: archaeological_operations/models.py:2591 +#: archaeological_operations/models.py:2602 msgctxt "key for text search" msgid "signature-after" msgstr "" -#: archaeological_operations/models.py:2595 +#: archaeological_operations/models.py:2606 msgctxt "key for text search" msgid "file-name" msgstr "" -#: archaeological_operations/models.py:2607 +#: archaeological_operations/models.py:2618 msgctxt "key for text search" msgid "file-reference" msgstr "" -#: archaeological_operations/models.py:2611 +#: archaeological_operations/models.py:2622 msgctxt "key for text search" msgid "file-year" msgstr "" -#: archaeological_operations/models.py:2614 +#: archaeological_operations/models.py:2625 msgctxt "key for text search" msgid "file-other-reference" msgstr "" -#: archaeological_operations/models.py:2618 +#: archaeological_operations/models.py:2629 msgctxt "key for text search" msgid "file-in-charge" msgstr "" -#: archaeological_operations/models.py:2622 +#: archaeological_operations/models.py:2633 msgctxt "key for text search" msgid "file-permit-reference" msgstr "" -#: archaeological_operations/models.py:2626 +#: archaeological_operations/models.py:2637 msgctxt "key for text search" msgid "treatment-name" msgstr "" -#: archaeological_operations/models.py:2630 +#: archaeological_operations/models.py:2641 msgctxt "key for text search" msgid "treatment-reference" msgstr "" -#: archaeological_operations/models.py:2634 +#: archaeological_operations/models.py:2645 msgctxt "key for text search" msgid "treatment-year" msgstr "" -#: archaeological_operations/models.py:2637 +#: archaeological_operations/models.py:2648 msgctxt "key for text search" msgid "treatment-index" msgstr "" -#: archaeological_operations/models.py:2640 +#: archaeological_operations/models.py:2651 msgctxt "key for text search" msgid "treatment-type" msgstr "" -#: archaeological_operations/models.py:2644 +#: archaeological_operations/models.py:2655 msgctxt "key for text search" msgid "treatment-file-name" msgstr "" -#: archaeological_operations/models.py:2648 +#: archaeological_operations/models.py:2659 msgctxt "key for text search" msgid "treatment-file-reference" msgstr "" -#: archaeological_operations/models.py:2652 +#: archaeological_operations/models.py:2663 msgctxt "key for text search" msgid "treatment-file-year" msgstr "" -#: archaeological_operations/models.py:2656 +#: archaeological_operations/models.py:2667 msgctxt "key for text search" msgid "treatment-file-index" msgstr "" -#: archaeological_operations/models.py:2660 +#: archaeological_operations/models.py:2671 msgctxt "key for text search" msgid "treatment-file-type" msgstr "" -#: archaeological_operations/models.py:2694 +#: archaeological_operations/models.py:2705 msgid "Archaeological preventive operator" msgstr "" -#: archaeological_operations/models.py:2756 +#: archaeological_operations/models.py:2767 msgid "Cached values get from associated departments" msgstr "" -#: archaeological_operations/models.py:2762 +#: archaeological_operations/models.py:2773 msgid "Cached values get from associated towns" msgstr "" -#: archaeological_operations/models.py:2936 +#: archaeological_operations/models.py:2947 msgid "This index already exists for this year" msgstr "" -#: archaeological_operations/models.py:3026 +#: archaeological_operations/models.py:3037 msgid "Address - Locality" msgstr "" -#: archaeological_operations/models.py:3298 ishtar_common/models.py:3421 +#: archaeological_operations/models.py:3309 ishtar_common/models.py:3421 msgid "Owner" msgstr "" -#: archaeological_operations/models.py:3313 +#: archaeological_operations/models.py:3324 msgid "Parcel owner" msgstr "" -#: archaeological_operations/models.py:3314 +#: archaeological_operations/models.py:3325 msgid "Parcel owners" msgstr "" -#: archaeological_operations/models.py:3336 ishtar_common/models.py:4847 +#: archaeological_operations/models.py:3347 ishtar_common/models.py:4847 msgid "Is preventive" msgstr "" -#: archaeological_operations/models.py:3339 +#: archaeological_operations/models.py:3350 msgid "Operation type old" msgstr "" -#: archaeological_operations/models.py:3340 +#: archaeological_operations/models.py:3351 msgid "Operation types old" msgstr "" @@ -6614,10 +6611,10 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:117 #: archaeological_operations/templates/ishtar/sheet_operation.html:468 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:38 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:194 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:34 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:149 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:43 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:206 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:39 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:165 #: ishtar_common/templates/blocks/DataTables-tabs.html:30 msgid "Statistics" msgstr "" @@ -6656,8 +6653,8 @@ msgid "Associated containers" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:473 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:199 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:154 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:211 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:170 #: ishtar_common/models_rest.py:74 #: ishtar_common/templates/blocks/DataTables-content.html:28 #: ishtar_common/templates/blocks/DataTables-content.html:101 @@ -6669,14 +6666,14 @@ msgid "Export" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:478 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:204 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:159 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:216 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:175 msgid "Regenerate statistics" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:483 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:209 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:164 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:221 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:180 msgid "Last update:" msgstr "" @@ -6816,7 +6813,7 @@ msgstr "" #: archaeological_warehouse/forms.py:502 archaeological_warehouse/forms.py:723 #: archaeological_warehouse/ishtar_menu.py:34 #: archaeological_warehouse/models.py:400 -#: archaeological_warehouse/models.py:889 +#: archaeological_warehouse/models.py:890 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:4 #: ishtar_common/forms_common.py:1862 ishtar_common/models.py:5070 #: ishtar_common/views.py:397 @@ -6840,8 +6837,8 @@ msgid "Order fields must be different." msgstr "" #: archaeological_warehouse/forms.py:129 archaeological_warehouse/models.py:370 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:167 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:117 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:179 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:133 msgid "Divisions" msgstr "" @@ -6855,7 +6852,7 @@ msgstr "" #: archaeological_warehouse/forms.py:144 archaeological_warehouse/forms.py:204 #: archaeological_warehouse/forms.py:313 archaeological_warehouse/models.py:260 -#: archaeological_warehouse/models.py:349 ishtar_common/models_imports.py:944 +#: archaeological_warehouse/models.py:349 ishtar_common/models_imports.py:946 msgid "Warehouse type" msgstr "" @@ -6881,31 +6878,31 @@ msgid "" msgstr "" #: archaeological_warehouse/forms.py:239 ishtar_common/forms_common.py:538 -#: ishtar_common/forms_common.py:921 ishtar_common/models_common.py:3061 -#: ishtar_common/models_common.py:3219 +#: ishtar_common/forms_common.py:921 ishtar_common/models_common.py:3142 +#: ishtar_common/models_common.py:3300 msgid "Address complement" msgstr "" #: archaeological_warehouse/forms.py:242 ishtar_common/forms_common.py:541 -#: ishtar_common/forms_common.py:924 ishtar_common/models_common.py:3066 +#: ishtar_common/forms_common.py:924 ishtar_common/models_common.py:3147 msgid "Town (freeform)" msgstr "" #: archaeological_warehouse/forms.py:244 ishtar_common/forms_common.py:543 -#: ishtar_common/forms_common.py:926 ishtar_common/models_common.py:3074 +#: ishtar_common/forms_common.py:926 ishtar_common/models_common.py:3155 msgid "Country" msgstr "" #: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:545 -#: ishtar_common/forms_common.py:897 ishtar_common/models_common.py:3088 -#: ishtar_common/models_common.py:3231 +#: ishtar_common/forms_common.py:897 ishtar_common/models_common.py:3169 +#: ishtar_common/models_common.py:3312 #: 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:547 -#: ishtar_common/forms_common.py:907 ishtar_common/models_common.py:3104 +#: ishtar_common/forms_common.py:907 ishtar_common/models_common.py:3185 #: ishtar_common/templates/ishtar/sheet_person.html:45 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:55 msgid "Mobile phone" @@ -6928,16 +6925,16 @@ msgid "Container - 010 - General" msgstr "" #: archaeological_warehouse/forms.py:335 archaeological_warehouse/forms.py:506 -#: archaeological_warehouse/models.py:1132 +#: archaeological_warehouse/models.py:1133 msgid "Old reference" msgstr "" #: archaeological_warehouse/forms.py:337 archaeological_warehouse/forms.py:504 #: archaeological_warehouse/forms.py:728 archaeological_warehouse/models.py:698 -#: archaeological_warehouse/models.py:859 -#: archaeological_warehouse/models.py:1098 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:138 -#: ishtar_common/models_imports.py:942 +#: archaeological_warehouse/models.py:860 +#: archaeological_warehouse/models.py:1099 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:152 +#: ishtar_common/models_imports.py:944 msgid "Container type" msgstr "" @@ -6946,12 +6943,12 @@ msgid "Current location (warehouse)" msgstr "" #: archaeological_warehouse/forms.py:348 archaeological_warehouse/forms.py:513 -#: archaeological_warehouse/models.py:1115 +#: archaeological_warehouse/models.py:1116 msgid "Parent container" msgstr "" #: archaeological_warehouse/forms.py:358 archaeological_warehouse/forms.py:739 -#: archaeological_warehouse/models.py:1089 +#: archaeological_warehouse/models.py:1090 msgid "Responsibility" msgstr "" @@ -6960,7 +6957,7 @@ msgid "Automatically attached to the current warehouse if not filled." msgstr "" #: archaeological_warehouse/forms.py:371 -#: archaeological_warehouse/models.py:1122 +#: archaeological_warehouse/models.py:1123 msgid "Measured weight (g)" msgstr "" @@ -7066,10 +7063,10 @@ msgid "" msgstr "" #: archaeological_warehouse/ishtar_menu.py:70 -#: archaeological_warehouse/models.py:1158 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:169 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:119 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:201 +#: archaeological_warehouse/models.py:1159 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:181 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:135 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:217 msgid "Containers" msgstr "" @@ -7109,7 +7106,7 @@ msgid "Warehouses" msgstr "" #: archaeological_warehouse/models.py:495 -#: archaeological_warehouse/models.py:1582 +#: archaeological_warehouse/models.py:1583 msgid "No value" msgstr "" @@ -7160,7 +7157,7 @@ msgid "Container types" msgstr "" #: archaeological_warehouse/models.py:722 -#: archaeological_warehouse/models.py:1084 +#: archaeological_warehouse/models.py:1085 msgid "Deprecated - do not use" msgstr "" @@ -7168,255 +7165,259 @@ msgstr "" msgid "Container parent" msgstr "" -#: archaeological_warehouse/models.py:853 -#: archaeological_warehouse/models.py:1074 +#: archaeological_warehouse/models.py:854 +#: archaeological_warehouse/models.py:1075 msgid "Location (warehouse)" msgstr "" -#: archaeological_warehouse/models.py:854 +#: archaeological_warehouse/models.py:855 msgid "Responsibility (warehouse)" msgstr "" -#: archaeological_warehouse/models.py:886 +#: archaeological_warehouse/models.py:887 msgid "Location - index" msgstr "" -#: archaeological_warehouse/models.py:887 +#: archaeological_warehouse/models.py:888 msgid "Precise localisation" msgstr "" -#: archaeological_warehouse/models.py:905 +#: archaeological_warehouse/models.py:906 msgctxt "key for text search" msgid "responsibility" msgstr "" -#: archaeological_warehouse/models.py:916 +#: archaeological_warehouse/models.py:917 msgctxt "key for text search" msgid "old-reference" msgstr "" -#: archaeological_warehouse/models.py:928 +#: archaeological_warehouse/models.py:929 msgctxt "key for text search" msgid "operation-scientist" msgstr "" -#: archaeological_warehouse/models.py:960 +#: archaeological_warehouse/models.py:961 msgctxt "key for text search" msgid "find-label" msgstr "" -#: archaeological_warehouse/models.py:964 ishtar_common/models.py:3948 +#: archaeological_warehouse/models.py:965 ishtar_common/models.py:3948 msgctxt "key for text search" msgid "find-denomination" msgstr "" -#: archaeological_warehouse/models.py:976 +#: archaeological_warehouse/models.py:977 msgctxt "key for text search" msgid "preservation" msgstr "" -#: archaeological_warehouse/models.py:1004 +#: archaeological_warehouse/models.py:1005 msgctxt "key for text search" msgid "find-description" msgstr "" -#: archaeological_warehouse/models.py:1007 +#: archaeological_warehouse/models.py:1008 msgctxt "key for text search" msgid "empty" msgstr "" -#: archaeological_warehouse/models.py:1010 +#: archaeological_warehouse/models.py:1011 msgctxt "key for text search" msgid "parent-container" msgstr "" -#: archaeological_warehouse/models.py:1014 +#: archaeological_warehouse/models.py:1015 msgctxt "key for text search" msgid "contain-containers" msgstr "" -#: archaeological_warehouse/models.py:1018 +#: archaeological_warehouse/models.py:1019 msgctxt "key for text search" msgid "is-stationary" msgstr "" -#: archaeological_warehouse/models.py:1036 +#: archaeological_warehouse/models.py:1037 msgid "Division -" msgstr "" -#: archaeological_warehouse/models.py:1040 +#: archaeological_warehouse/models.py:1041 msgctxt "key for text search" msgid "division" msgstr "" -#: archaeological_warehouse/models.py:1080 +#: archaeological_warehouse/models.py:1081 msgid "Responsible warehouse" msgstr "" -#: archaeological_warehouse/models.py:1093 +#: archaeological_warehouse/models.py:1094 msgid "Warehouse that owns the container" msgstr "" -#: archaeological_warehouse/models.py:1102 +#: archaeological_warehouse/models.py:1103 msgid "Container ref." msgstr "" -#: archaeological_warehouse/models.py:1108 +#: archaeological_warehouse/models.py:1106 ishtar_common/models_common.py:2908 +msgid "Localisation" +msgstr "" + +#: archaeological_warehouse/models.py:1109 msgid "Cached location" msgstr "" -#: archaeological_warehouse/models.py:1111 +#: archaeological_warehouse/models.py:1112 msgid "Cached division" msgstr "" -#: archaeological_warehouse/models.py:1121 ishtar_common/models.py:4183 +#: archaeological_warehouse/models.py:1122 ishtar_common/models.py:4183 #: ishtar_common/models.py:4187 msgid "Container ID" msgstr "" -#: archaeological_warehouse/models.py:1124 +#: archaeological_warehouse/models.py:1125 msgid "Calculated weight (g)" msgstr "" -#: archaeological_warehouse/models.py:1127 +#: archaeological_warehouse/models.py:1128 msgid "Cached weight (g)" msgstr "" -#: archaeological_warehouse/models.py:1130 +#: archaeological_warehouse/models.py:1131 msgid "Entered weight if available otherwise calculated weight." msgstr "" -#: archaeological_warehouse/models.py:1354 +#: archaeological_warehouse/models.py:1355 msgid "Document with {}: {} does not exists" msgstr "" -#: archaeological_warehouse/models.py:1358 +#: archaeological_warehouse/models.py:1359 msgid "Multiple document with {}: {}" msgstr "" -#: archaeological_warehouse/models.py:1749 +#: archaeological_warehouse/models.py:1750 msgid "" "Associated operation - use it with caution, only return the first found " "operation" msgstr "" -#: archaeological_warehouse/models.py:1756 +#: archaeological_warehouse/models.py:1757 msgid "" "Associated context record - use it with caution, only return the first found " "context_record" msgstr "" -#: archaeological_warehouse/models.py:1760 +#: archaeological_warehouse/models.py:1761 msgid "Material types inside the container - string" msgstr "" -#: archaeological_warehouse/models.py:1761 +#: archaeological_warehouse/models.py:1762 msgid "Material types code - string" msgstr "" -#: archaeological_warehouse/models.py:1762 +#: archaeological_warehouse/models.py:1763 #, fuzzy #| msgid "email address" msgid "List of associated finds" msgstr "E-Mail-Adresse" -#: archaeological_warehouse/models.py:1989 +#: archaeological_warehouse/models.py:1990 msgid "Division" msgstr "" -#: archaeological_warehouse/models.py:1996 +#: archaeological_warehouse/models.py:1997 msgid "Container localisation" msgstr "" -#: archaeological_warehouse/models.py:1997 +#: archaeological_warehouse/models.py:1998 msgid "Container localisations" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:95 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:77 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:109 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:91 msgid "Number of containers" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:99 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:81 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:113 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:95 msgid "Number of divisions" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:107 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:89 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:121 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:103 msgid "Number of owned finds" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:115 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:129 msgid "Measured weight (kg)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:116 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:130 msgid "Calculated weight (kg)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:120 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:134 #, python-format msgid "Calculated weight and measured weight are too different (over 10%%)." msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:186 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:198 msgid "Empty" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:217 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:229 msgid "No container/division inside this container." msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:223 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:235 msgid "Finds by location" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:247 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:259 msgid "Containers by location" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:275 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:287 msgid "Document for this container" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:94 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:108 msgid "Default divisions (imports)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:124 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:140 msgid "No container inside this warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:128 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:144 msgid "Finds (hosted)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:133 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:149 msgid "No find inside this warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:137 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:153 msgid "Finds (owned)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:142 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:158 msgid "No find owned by this warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:172 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:188 msgid "No container/division inside this container" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:178 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:194 msgid "Finds by location in the warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:203 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:219 msgid "Containers by location in the warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:231 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:247 msgid "Document for this warehouse" msgstr "" @@ -7728,7 +7729,7 @@ msgstr "" msgid "Center" msgstr "" -#: ishtar_common/admin.py:1119 ishtar_common/models_common.py:2829 +#: ishtar_common/admin.py:1119 ishtar_common/models_common.py:2910 msgid "Limit" msgstr "" @@ -7844,7 +7845,7 @@ msgstr "" msgid "Import already imported/scheduled." msgstr "" -#: ishtar_common/admin.py:2196 ishtar_common/models_imports.py:1397 +#: ishtar_common/admin.py:2196 ishtar_common/models_imports.py:1399 msgid "Launch import" msgstr "" @@ -7935,7 +7936,7 @@ msgid "API - Remote access - Search model" msgstr "" #: ishtar_common/admin.py:2584 ishtar_common/models.py:450 -#: ishtar_common/models.py:733 ishtar_common/models_common.py:808 +#: ishtar_common/models.py:733 ishtar_common/models_common.py:809 #: ishtar_common/models_imports.py:836 ishtar_common/models_rest.py:106 #: ishtar_common/templates/ishtar/formset_import_match.html:44 #: ishtar_common/templates/ishtar/import_step_by_step.html:171 @@ -8367,8 +8368,8 @@ msgstr "" #: 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:3106 -#: ishtar_common/models_common.py:3241 ishtar_common/wizards.py:1951 +#: ishtar_common/forms_common.py:1151 ishtar_common/models_common.py:3187 +#: ishtar_common/models_common.py:3322 ishtar_common/wizards.py:1951 msgid "Email" msgstr "E-Mail-Adresse" @@ -8440,12 +8441,12 @@ msgstr "" msgid "Raw name" msgstr "" -#: ishtar_common/forms_common.py:895 ishtar_common/models_common.py:3090 +#: ishtar_common/forms_common.py:895 ishtar_common/models_common.py:3171 msgid "Phone description" msgstr "" -#: ishtar_common/forms_common.py:899 ishtar_common/models_common.py:3093 -#: ishtar_common/models_common.py:3096 +#: ishtar_common/forms_common.py:899 ishtar_common/models_common.py:3174 +#: ishtar_common/models_common.py:3177 msgid "Phone description 2" msgstr "" @@ -8453,11 +8454,11 @@ msgstr "" msgid "Phone 2" msgstr "" -#: ishtar_common/forms_common.py:903 ishtar_common/models_common.py:3100 +#: ishtar_common/forms_common.py:903 ishtar_common/models_common.py:3181 msgid "Phone description 3" msgstr "" -#: ishtar_common/forms_common.py:905 ishtar_common/models_common.py:3098 +#: ishtar_common/forms_common.py:905 ishtar_common/models_common.py:3179 msgid "Phone 3" msgstr "" @@ -8465,23 +8466,23 @@ msgstr "" msgid "Current organization" msgstr "" -#: ishtar_common/forms_common.py:928 ishtar_common/models_common.py:3075 +#: ishtar_common/forms_common.py:928 ishtar_common/models_common.py:3156 msgid "Other address: address" msgstr "" -#: ishtar_common/forms_common.py:931 ishtar_common/models_common.py:3077 +#: ishtar_common/forms_common.py:931 ishtar_common/models_common.py:3158 msgid "Other address: address complement" msgstr "" -#: ishtar_common/forms_common.py:936 ishtar_common/models_common.py:3080 +#: ishtar_common/forms_common.py:936 ishtar_common/models_common.py:3161 msgid "Other address: postal code" msgstr "" -#: ishtar_common/forms_common.py:939 ishtar_common/models_common.py:3083 +#: ishtar_common/forms_common.py:939 ishtar_common/models_common.py:3164 msgid "Other address: town" msgstr "" -#: ishtar_common/forms_common.py:942 ishtar_common/models_common.py:3086 +#: ishtar_common/forms_common.py:942 ishtar_common/models_common.py:3167 msgid "Other address: country" msgstr "" @@ -8907,7 +8908,7 @@ msgstr "" msgid "Geo item - General" msgstr "" -#: ishtar_common/forms_common.py:2617 ishtar_common/models_common.py:2144 +#: ishtar_common/forms_common.py:2617 ishtar_common/models_common.py:2190 msgid "Import key" msgstr "" @@ -8917,26 +8918,26 @@ msgid "" "overwrite the data." msgstr "" -#: ishtar_common/forms_common.py:2628 ishtar_common/models_common.py:2159 +#: ishtar_common/forms_common.py:2628 ishtar_common/models_common.py:2205 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:7 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:33 msgid "Data type" msgstr "" -#: ishtar_common/forms_common.py:2631 ishtar_common/models_common.py:2151 +#: ishtar_common/forms_common.py:2631 ishtar_common/models_common.py:2197 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:11 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:30 msgid "Origin" msgstr "" -#: ishtar_common/forms_common.py:2634 ishtar_common/models_common.py:2167 +#: ishtar_common/forms_common.py:2634 ishtar_common/models_common.py:2213 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:12 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:36 msgid "Provider" msgstr "" #: ishtar_common/forms_common.py:2637 ishtar_common/forms_common.py:2674 -#: ishtar_common/models_common.py:2133 +#: ishtar_common/models_common.py:2179 msgid "Buffer" msgstr "" @@ -8944,18 +8945,18 @@ msgstr "" msgid "Buffer type" msgstr "" -#: ishtar_common/forms_common.py:2645 ishtar_common/models_common.py:2180 -#: ishtar_common/models_common.py:3737 +#: ishtar_common/forms_common.py:2645 ishtar_common/models_common.py:2226 +#: ishtar_common/models_common.py:3818 msgid "Estimated error for X" msgstr "" -#: ishtar_common/forms_common.py:2649 ishtar_common/models_common.py:2183 -#: ishtar_common/models_common.py:3740 +#: ishtar_common/forms_common.py:2649 ishtar_common/models_common.py:2229 +#: ishtar_common/models_common.py:3821 msgid "Estimated error for Y" msgstr "" -#: ishtar_common/forms_common.py:2653 ishtar_common/models_common.py:2186 -#: ishtar_common/models_common.py:3743 +#: ishtar_common/forms_common.py:2653 ishtar_common/models_common.py:2232 +#: ishtar_common/models_common.py:3824 msgid "Estimated error for Z" msgstr "" @@ -8991,8 +8992,8 @@ msgstr "" msgid "Coordinates" msgstr "" -#: ishtar_common/forms_common.py:2927 ishtar_common/models_common.py:2113 -#: ishtar_common/models_common.py:3752 +#: ishtar_common/forms_common.py:2927 ishtar_common/models_common.py:2148 +#: ishtar_common/models_common.py:3833 msgid "Point" msgstr "" @@ -9034,7 +9035,7 @@ msgstr "" msgid "Directory" msgstr "" -#: ishtar_common/ishtar_menu.py:178 ishtar_common/models_imports.py:1284 +#: ishtar_common/ishtar_menu.py:178 ishtar_common/models_imports.py:1286 msgid "Imports" msgstr "" @@ -9118,7 +9119,7 @@ msgstr "" msgid "Long text" msgstr "" -#: ishtar_common/models.py:711 ishtar_common/models_imports.py:975 +#: ishtar_common/models.py:711 ishtar_common/models_imports.py:977 msgid "Integer" msgstr "" @@ -9126,7 +9127,7 @@ msgstr "" msgid "Boolean" msgstr "" -#: ishtar_common/models.py:713 ishtar_common/models_imports.py:976 +#: ishtar_common/models.py:713 ishtar_common/models_imports.py:978 msgid "Float" msgstr "" @@ -10005,7 +10006,7 @@ msgstr "" msgid "Long title" msgstr "" -#: ishtar_common/models.py:2636 ishtar_common/models_imports.py:969 +#: ishtar_common/models.py:2636 ishtar_common/models_imports.py:971 msgid "Title type" msgstr "" @@ -10138,7 +10139,7 @@ msgid "In progress" msgstr "" #: ishtar_common/models.py:3212 ishtar_common/models.py:4955 -#: ishtar_common/models_imports.py:1102 +#: ishtar_common/models_imports.py:1104 msgid "Finished" msgstr "" @@ -10221,7 +10222,7 @@ msgid "Only available for these document types" msgstr "" #: ishtar_common/models.py:3646 ishtar_common/models_imports.py:926 -#: ishtar_common/models_imports.py:968 +#: ishtar_common/models_imports.py:970 msgid "Support type" msgstr "" @@ -10384,7 +10385,7 @@ msgctxt "key for text search" msgid "warehouse" msgstr "" -#: ishtar_common/models.py:3968 ishtar_common/models_common.py:3461 +#: ishtar_common/models.py:3968 ishtar_common/models_common.py:3542 msgctxt "key for text search" msgid "has-image" msgstr "" @@ -10508,7 +10509,7 @@ msgstr "" msgid "Administration scripts" msgstr "" -#: ishtar_common/models.py:4954 ishtar_common/models_imports.py:1101 +#: ishtar_common/models.py:4954 ishtar_common/models_imports.py:1103 msgid "Finished with errors" msgstr "" @@ -10543,7 +10544,7 @@ msgid "" "configuration." msgstr "" -#: ishtar_common/models.py:5074 ishtar_common/models_imports.py:1092 +#: ishtar_common/models.py:5074 ishtar_common/models_imports.py:1094 msgid "Created" msgstr "" @@ -10661,327 +10662,327 @@ msgstr "" msgid "Archive - Imports" msgstr "" -#: ishtar_common/models_common.py:838 +#: ishtar_common/models_common.py:839 msgid "Search vector" msgstr "" -#: ishtar_common/models_common.py:838 +#: ishtar_common/models_common.py:839 msgid "Auto filled at save" msgstr "" -#: ishtar_common/models_common.py:1401 +#: ishtar_common/models_common.py:1436 msgid "Last editor" msgstr "" -#: ishtar_common/models_common.py:1409 +#: ishtar_common/models_common.py:1444 msgid "Creator" msgstr "" -#: ishtar_common/models_common.py:1415 ishtar_common/models_common.py:2137 +#: ishtar_common/models_common.py:1450 ishtar_common/models_common.py:2183 msgid "Need update" msgstr "" -#: ishtar_common/models_common.py:1417 +#: ishtar_common/models_common.py:1452 msgid "Item locked for edition" msgstr "" -#: ishtar_common/models_common.py:1423 +#: ishtar_common/models_common.py:1458 msgid "Locked by" msgstr "" -#: ishtar_common/models_common.py:1441 +#: ishtar_common/models_common.py:1476 msgctxt "key for text search" msgid "modified-by" msgstr "" -#: ishtar_common/models_common.py:1445 +#: ishtar_common/models_common.py:1480 msgctxt "key for text search" msgid "modified-before" msgstr "" -#: ishtar_common/models_common.py:1449 +#: ishtar_common/models_common.py:1484 msgctxt "key for text search" msgid "modified-after" msgstr "" -#: ishtar_common/models_common.py:1452 +#: ishtar_common/models_common.py:1487 msgctxt "key for text search" msgid "locked" msgstr "" -#: ishtar_common/models_common.py:2009 ishtar_common/models_common.py:2027 +#: ishtar_common/models_common.py:2044 ishtar_common/models_common.py:2062 msgid "Authority name" msgstr "" -#: ishtar_common/models_common.py:2010 ishtar_common/models_common.py:2027 +#: ishtar_common/models_common.py:2045 ishtar_common/models_common.py:2062 msgid "Authority SRID" msgstr "" -#: ishtar_common/models_common.py:2013 +#: ishtar_common/models_common.py:2048 msgid "Geographic - Spatial reference system" msgstr "" -#: ishtar_common/models_common.py:2014 +#: ishtar_common/models_common.py:2049 msgid "Geographic - Spatial reference systems" msgstr "" -#: ishtar_common/models_common.py:2044 +#: ishtar_common/models_common.py:2079 msgid "Geographic - Origin type" msgstr "" -#: ishtar_common/models_common.py:2045 +#: ishtar_common/models_common.py:2080 msgid "Geographic - Origin types" msgstr "" -#: ishtar_common/models_common.py:2060 +#: ishtar_common/models_common.py:2095 msgid "Geographic - Data type" msgstr "" -#: ishtar_common/models_common.py:2061 +#: ishtar_common/models_common.py:2096 msgid "Geographic - Data types" msgstr "" -#: ishtar_common/models_common.py:2076 +#: ishtar_common/models_common.py:2111 msgid "Geographic - Provider type" msgstr "" -#: ishtar_common/models_common.py:2077 +#: ishtar_common/models_common.py:2112 msgid "Geographic - Provider types" msgstr "" -#: ishtar_common/models_common.py:2088 +#: ishtar_common/models_common.py:2123 msgid "Geographic - Buffer type" msgstr "" -#: ishtar_common/models_common.py:2089 +#: ishtar_common/models_common.py:2124 msgid "Geographic - Buffer types" msgstr "" -#: ishtar_common/models_common.py:2114 +#: ishtar_common/models_common.py:2149 msgid "Line(s)" msgstr "" -#: ishtar_common/models_common.py:2115 +#: ishtar_common/models_common.py:2150 msgid "Point(s)" msgstr "" -#: ishtar_common/models_common.py:2116 +#: ishtar_common/models_common.py:2151 msgid "Polygon(s)" msgstr "" -#: ishtar_common/models_common.py:2145 +#: ishtar_common/models_common.py:2191 msgid "Use this for update imports" msgstr "" -#: ishtar_common/models_common.py:2152 +#: ishtar_common/models_common.py:2198 msgid "For instance: topographical survey, georeferencing, ..." msgstr "" -#: ishtar_common/models_common.py:2160 +#: ishtar_common/models_common.py:2206 msgid "For instance: outline, z-sup, ..." msgstr "" -#: ishtar_common/models_common.py:2168 +#: ishtar_common/models_common.py:2214 msgid "Data provider" msgstr "" -#: ishtar_common/models_common.py:2171 ishtar_common/models_common.py:3733 +#: ishtar_common/models_common.py:2217 ishtar_common/models_common.py:3814 msgid "X" msgstr "" -#: ishtar_common/models_common.py:2171 ishtar_common/models_common.py:2172 -#: ishtar_common/models_common.py:2173 +#: ishtar_common/models_common.py:2217 ishtar_common/models_common.py:2218 +#: ishtar_common/models_common.py:2219 msgid "User input" msgstr "" -#: ishtar_common/models_common.py:2172 ishtar_common/models_common.py:3734 +#: ishtar_common/models_common.py:2218 ishtar_common/models_common.py:3815 msgid "Y" msgstr "" -#: ishtar_common/models_common.py:2173 ishtar_common/models_common.py:3735 +#: ishtar_common/models_common.py:2219 ishtar_common/models_common.py:3816 msgid "Z" msgstr "" -#: ishtar_common/models_common.py:2176 +#: ishtar_common/models_common.py:2222 msgid "X (cached)" msgstr "" -#: ishtar_common/models_common.py:2177 +#: ishtar_common/models_common.py:2223 msgid "Y (cached)" msgstr "" -#: ishtar_common/models_common.py:2178 +#: ishtar_common/models_common.py:2224 msgid "Z (cached)" msgstr "" -#: ishtar_common/models_common.py:2190 ishtar_common/models_common.py:3747 +#: ishtar_common/models_common.py:2236 ishtar_common/models_common.py:3828 msgid "Spatial Reference System" msgstr "" -#: ishtar_common/models_common.py:2195 ishtar_common/models_common.py:3753 +#: ishtar_common/models_common.py:2241 ishtar_common/models_common.py:3834 msgid "Point (2D)" msgstr "" -#: ishtar_common/models_common.py:2196 +#: ishtar_common/models_common.py:2242 msgid "Point (3D)" msgstr "" -#: ishtar_common/models_common.py:2197 +#: ishtar_common/models_common.py:2243 msgid "Multi points" msgstr "" -#: ishtar_common/models_common.py:2198 +#: ishtar_common/models_common.py:2244 msgid "Multi lines" msgstr "" -#: ishtar_common/models_common.py:2199 +#: ishtar_common/models_common.py:2245 msgid "Multi polygons" msgstr "" -#: ishtar_common/models_common.py:2202 ishtar_common/models_common.py:2203 +#: ishtar_common/models_common.py:2248 ishtar_common/models_common.py:2249 msgid "Geographic - Vector data" msgstr "" -#: ishtar_common/models_common.py:2310 +#: ishtar_common/models_common.py:2356 msgid "Only 2 or 3 dimensions" msgstr "" -#: ishtar_common/models_common.py:2725 +#: ishtar_common/models_common.py:2806 msgid "Main geodata" msgstr "" -#: ishtar_common/models_common.py:2729 +#: ishtar_common/models_common.py:2810 msgid "Geodata" msgstr "" -#: ishtar_common/models_common.py:2733 +#: ishtar_common/models_common.py:2814 #, fuzzy #| msgid "username" msgctxt "key for text search" msgid "geo-name" msgstr "Benutzername" -#: ishtar_common/models_common.py:2736 +#: ishtar_common/models_common.py:2817 msgctxt "key for text search" msgid "geo-type" msgstr "" -#: ishtar_common/models_common.py:2739 +#: ishtar_common/models_common.py:2820 msgctxt "key for text search" msgid "geo-origin" msgstr "" -#: ishtar_common/models_common.py:2742 +#: ishtar_common/models_common.py:2823 msgctxt "key for text search" msgid "geo-provider" msgstr "" -#: ishtar_common/models_common.py:2745 +#: ishtar_common/models_common.py:2826 msgctxt "key for text search" msgid "geo-comment" msgstr "" -#: ishtar_common/models_common.py:2767 +#: ishtar_common/models_common.py:2848 msgid "Add geographic item" msgstr "" -#: ishtar_common/models_common.py:2769 +#: ishtar_common/models_common.py:2850 msgid "geo." msgstr "" -#: ishtar_common/models_common.py:2839 +#: ishtar_common/models_common.py:2920 msgid "Year of creation" msgstr "" -#: ishtar_common/models_common.py:2843 +#: ishtar_common/models_common.py:2924 msgid "Filling this field is relevant to distinguish old towns from new towns." msgstr "" -#: ishtar_common/models_common.py:2847 +#: ishtar_common/models_common.py:2928 msgid "Town children" msgstr "" -#: ishtar_common/models_common.py:3069 +#: ishtar_common/models_common.py:3150 msgid "Town (precise)" msgstr "" -#: ishtar_common/models_common.py:3102 +#: ishtar_common/models_common.py:3183 msgid "Raw phone" msgstr "" -#: ishtar_common/models_common.py:3108 +#: ishtar_common/models_common.py:3189 msgid "Alternative address is prefered" msgstr "" -#: ishtar_common/models_common.py:3145 +#: ishtar_common/models_common.py:3226 #, fuzzy #| msgid "email address" msgid "No associated address" msgstr "E-Mail-Adresse" -#: ishtar_common/models_common.py:3226 +#: ishtar_common/models_common.py:3307 msgid "Postal code - Town" msgstr "" -#: ishtar_common/models_common.py:3236 +#: ishtar_common/models_common.py:3317 msgid "Mobile" msgstr "" -#: ishtar_common/models_common.py:3254 +#: ishtar_common/models_common.py:3335 msgid "Merge key" msgstr "" -#: ishtar_common/models_common.py:3465 +#: ishtar_common/models_common.py:3546 msgctxt "key for text search" msgid "has-url" msgstr "" -#: ishtar_common/models_common.py:3469 +#: ishtar_common/models_common.py:3550 msgctxt "key for text search" msgid "has-attached-file" msgstr "" -#: ishtar_common/models_common.py:3545 +#: ishtar_common/models_common.py:3626 msgid "Add document/image" msgstr "" -#: ishtar_common/models_common.py:3547 +#: ishtar_common/models_common.py:3628 msgid "doc./image" msgstr "" -#: ishtar_common/models_common.py:3731 +#: ishtar_common/models_common.py:3812 msgid "Precise" msgstr "" -#: ishtar_common/models_common.py:3731 +#: ishtar_common/models_common.py:3812 msgid "Polygon" msgstr "" -#: ishtar_common/models_common.py:3755 +#: ishtar_common/models_common.py:3836 msgid "Point source" msgstr "" -#: ishtar_common/models_common.py:3758 +#: ishtar_common/models_common.py:3839 msgid "Point source item" msgstr "" -#: ishtar_common/models_common.py:3760 +#: ishtar_common/models_common.py:3841 msgid "Multi polygon" msgstr "" -#: ishtar_common/models_common.py:3762 +#: ishtar_common/models_common.py:3843 msgid "Multi-polygon source" msgstr "" -#: ishtar_common/models_common.py:3769 +#: ishtar_common/models_common.py:3850 msgid "Multi polygon source item" msgstr "" -#: ishtar_common/models_common.py:4313 +#: ishtar_common/models_common.py:4397 msgid "Regenerate ID" msgstr "" -#: ishtar_common/models_common.py:4315 +#: ishtar_common/models_common.py:4399 msgid "regen." msgstr "" @@ -11182,11 +11183,11 @@ msgid "Importer - Targets" msgstr "" #: ishtar_common/models_imports.py:796 ishtar_common/views_item.py:590 -#: ishtar_common/views_item.py:1342 +#: ishtar_common/views_item.py:1350 msgid "True" msgstr "" -#: ishtar_common/models_imports.py:796 ishtar_common/views_item.py:1344 +#: ishtar_common/models_imports.py:796 ishtar_common/views_item.py:1352 msgid "False" msgstr "" @@ -11218,281 +11219,281 @@ msgstr "" msgid "Importer - Targets keys" msgstr "" -#: ishtar_common/models_imports.py:928 +#: ishtar_common/models_imports.py:930 msgid "Period" msgstr "" -#: ishtar_common/models_imports.py:929 +#: ishtar_common/models_imports.py:931 msgid "Report state" msgstr "" -#: ishtar_common/models_imports.py:934 +#: ishtar_common/models_imports.py:936 msgid "Activity type" msgstr "" -#: ishtar_common/models_imports.py:939 +#: ishtar_common/models_imports.py:941 msgid "Dating quality" msgstr "" -#: ishtar_common/models_imports.py:940 +#: ishtar_common/models_imports.py:942 msgid "Material" msgstr "" -#: ishtar_common/models_imports.py:943 +#: ishtar_common/models_imports.py:945 msgid "Warehouse division" msgstr "" -#: ishtar_common/models_imports.py:951 +#: ishtar_common/models_imports.py:953 msgid "Integrity type" msgstr "" -#: ishtar_common/models_imports.py:961 +#: ishtar_common/models_imports.py:963 msgid "Identification type" msgstr "" -#: ishtar_common/models_imports.py:965 +#: ishtar_common/models_imports.py:967 msgid "Context record relation type" msgstr "" -#: ishtar_common/models_imports.py:967 +#: ishtar_common/models_imports.py:969 msgid "Spatial reference system" msgstr "" -#: ishtar_common/models_imports.py:977 overload_translation/models.py:7 +#: ishtar_common/models_imports.py:979 overload_translation/models.py:7 msgid "String" msgstr "" -#: ishtar_common/models_imports.py:981 +#: ishtar_common/models_imports.py:983 msgid "INSEE code" msgstr "" -#: ishtar_common/models_imports.py:982 +#: ishtar_common/models_imports.py:984 msgid "Upper case" msgstr "" -#: ishtar_common/models_imports.py:983 +#: ishtar_common/models_imports.py:985 msgid "Lower case" msgstr "" -#: ishtar_common/models_imports.py:984 +#: ishtar_common/models_imports.py:986 msgid "String to boolean" msgstr "" -#: ishtar_common/models_imports.py:985 +#: ishtar_common/models_imports.py:987 msgctxt "filesystem" msgid "File" msgstr "" -#: ishtar_common/models_imports.py:986 +#: ishtar_common/models_imports.py:988 msgid "Unknow type" msgstr "" -#: ishtar_common/models_imports.py:1005 +#: ishtar_common/models_imports.py:1007 msgid "4 digit year. e.g.: \"2015\"" msgstr "" -#: ishtar_common/models_imports.py:1006 +#: ishtar_common/models_imports.py:1008 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "" -#: ishtar_common/models_imports.py:1007 +#: ishtar_common/models_imports.py:1009 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "" -#: ishtar_common/models_imports.py:1024 +#: ishtar_common/models_imports.py:1026 msgid "Options" msgstr "" -#: ishtar_common/models_imports.py:1026 +#: ishtar_common/models_imports.py:1028 msgid "Split character(s)" msgstr "" -#: ishtar_common/models_imports.py:1031 +#: ishtar_common/models_imports.py:1033 msgid "Importer - Formater type" msgstr "" -#: ishtar_common/models_imports.py:1032 +#: ishtar_common/models_imports.py:1034 msgid "Importer - Formater types" msgstr "" -#: ishtar_common/models_imports.py:1093 +#: ishtar_common/models_imports.py:1095 msgid "Analyse in progress" msgstr "" -#: ishtar_common/models_imports.py:1094 +#: ishtar_common/models_imports.py:1096 msgid "Analysed" msgstr "" -#: ishtar_common/models_imports.py:1095 +#: ishtar_common/models_imports.py:1097 msgid "Check modified in queue" msgstr "" -#: ishtar_common/models_imports.py:1096 +#: ishtar_common/models_imports.py:1098 msgid "Import in queue" msgstr "" -#: ishtar_common/models_imports.py:1097 +#: ishtar_common/models_imports.py:1099 msgid "Check modified in progress" msgstr "" -#: ishtar_common/models_imports.py:1098 +#: ishtar_common/models_imports.py:1100 msgid "Import in progress" msgstr "" -#: ishtar_common/models_imports.py:1099 +#: ishtar_common/models_imports.py:1101 msgid "Post-processing in progress" msgstr "" -#: ishtar_common/models_imports.py:1100 +#: ishtar_common/models_imports.py:1102 msgid "Partially imported" msgstr "" -#: ishtar_common/models_imports.py:1103 +#: ishtar_common/models_imports.py:1105 msgid "Archived" msgstr "" -#: ishtar_common/models_imports.py:1172 +#: ishtar_common/models_imports.py:1174 msgid "Importer type" msgstr "" -#: ishtar_common/models_imports.py:1174 +#: ishtar_common/models_imports.py:1176 msgid "Imported file" msgstr "" -#: ishtar_common/models_imports.py:1182 +#: ishtar_common/models_imports.py:1184 msgid "Associated images (zip file)" msgstr "" -#: ishtar_common/models_imports.py:1195 +#: ishtar_common/models_imports.py:1197 msgid "If a group is selected, target key saved in this group will be used." msgstr "" -#: ishtar_common/models_imports.py:1199 +#: ishtar_common/models_imports.py:1201 msgid "Encoding" msgstr "" -#: ishtar_common/models_imports.py:1200 +#: ishtar_common/models_imports.py:1202 msgid "Only required for CSV file" msgstr "" -#: ishtar_common/models_imports.py:1203 +#: ishtar_common/models_imports.py:1205 msgid "CSV separator" msgstr "" -#: ishtar_common/models_imports.py:1208 +#: ishtar_common/models_imports.py:1210 msgid "" "Separator for CSV file. Standard is comma but Microsoft Excel do not follow " "this standard and use semi-colon." msgstr "" -#: ishtar_common/models_imports.py:1213 +#: ishtar_common/models_imports.py:1215 msgid "Skip lines" msgstr "" -#: ishtar_common/models_imports.py:1215 +#: ishtar_common/models_imports.py:1217 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:1218 +#: ishtar_common/models_imports.py:1220 msgid "Error file" msgstr "" -#: ishtar_common/models_imports.py:1226 +#: ishtar_common/models_imports.py:1228 msgid "Result file" msgstr "" -#: ishtar_common/models_imports.py:1234 +#: ishtar_common/models_imports.py:1236 msgid "Match file" msgstr "" -#: ishtar_common/models_imports.py:1242 +#: ishtar_common/models_imports.py:1244 msgid "Archive file" msgstr "" -#: ishtar_common/models_imports.py:1253 +#: ishtar_common/models_imports.py:1255 msgid "Conservative import" msgstr "" -#: ishtar_common/models_imports.py:1255 +#: ishtar_common/models_imports.py:1257 msgid "If set to true, do not overload existing values." msgstr "" -#: ishtar_common/models_imports.py:1264 +#: ishtar_common/models_imports.py:1266 msgid "Remaining seconds" msgstr "" -#: ishtar_common/models_imports.py:1266 +#: ishtar_common/models_imports.py:1268 msgid "Current line" msgstr "" -#: ishtar_common/models_imports.py:1267 +#: ishtar_common/models_imports.py:1269 msgid "Number of line" msgstr "" -#: ishtar_common/models_imports.py:1269 +#: ishtar_common/models_imports.py:1271 msgid "Imported line numbers" msgstr "" -#: ishtar_common/models_imports.py:1274 +#: ishtar_common/models_imports.py:1276 msgid "Changed have been checked" msgstr "" -#: ishtar_common/models_imports.py:1276 +#: ishtar_common/models_imports.py:1278 msgid "Changed line numbers" msgstr "" -#: ishtar_common/models_imports.py:1283 +#: ishtar_common/models_imports.py:1285 msgid "Import" msgstr "" -#: ishtar_common/models_imports.py:1325 ishtar_common/models_imports.py:1469 +#: ishtar_common/models_imports.py:1327 ishtar_common/models_imports.py:1471 msgid "Error in the CSV file." msgstr "" -#: ishtar_common/models_imports.py:1394 +#: ishtar_common/models_imports.py:1396 msgid "Analyse" msgstr "" -#: ishtar_common/models_imports.py:1396 ishtar_common/models_imports.py:1405 +#: ishtar_common/models_imports.py:1398 ishtar_common/models_imports.py:1407 msgid "Re-analyse" msgstr "" -#: ishtar_common/models_imports.py:1400 +#: ishtar_common/models_imports.py:1402 msgid "Step by step import" msgstr "" -#: ishtar_common/models_imports.py:1401 ishtar_common/models_imports.py:1410 +#: ishtar_common/models_imports.py:1403 ishtar_common/models_imports.py:1412 msgid "Re-check for changes" msgstr "" -#: ishtar_common/models_imports.py:1403 ishtar_common/models_imports.py:1412 +#: ishtar_common/models_imports.py:1405 ishtar_common/models_imports.py:1414 msgid "Check for changes" msgstr "" -#: ishtar_common/models_imports.py:1406 +#: ishtar_common/models_imports.py:1408 msgid "Re-import" msgstr "" -#: ishtar_common/models_imports.py:1409 +#: ishtar_common/models_imports.py:1411 msgid "Step by step re-import" msgstr "" -#: ishtar_common/models_imports.py:1413 +#: ishtar_common/models_imports.py:1415 msgid "Archive" msgstr "" -#: ishtar_common/models_imports.py:1416 +#: ishtar_common/models_imports.py:1418 msgid "Unarchive" msgstr "" -#: ishtar_common/models_imports.py:1418 +#: ishtar_common/models_imports.py:1420 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:19 msgid "Edit" msgstr "" -#: ishtar_common/models_imports.py:1419 +#: ishtar_common/models_imports.py:1421 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:30 #: ishtar_common/templates/ishtar/blocks/window_nav.html:66 #: ishtar_common/templates/ishtar/form_delete.html:11 @@ -11501,41 +11502,41 @@ msgstr "" msgid "Delete" msgstr "" -#: ishtar_common/models_imports.py:1513 ishtar_common/models_imports.py:1516 -#: ishtar_common/models_imports.py:1578 +#: ishtar_common/models_imports.py:1515 ishtar_common/models_imports.py:1518 +#: ishtar_common/models_imports.py:1580 msgid "Invalid GIS file." msgstr "" -#: ishtar_common/models_imports.py:1526 +#: ishtar_common/models_imports.py:1528 #, python-brace-format msgid "Geometry \"{geometry}\" not managed." msgstr "" -#: ishtar_common/models_imports.py:1548 +#: ishtar_common/models_imports.py:1550 msgid "CRS not managed." msgstr "" -#: ishtar_common/models_imports.py:1575 +#: ishtar_common/models_imports.py:1577 msgid "Error reading feature {idx + 1} - {e}" msgstr "" -#: ishtar_common/models_imports.py:1614 +#: ishtar_common/models_imports.py:1616 msgid "Modification check {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:1682 +#: ishtar_common/models_imports.py:1684 msgid "Import {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:1713 +#: ishtar_common/models_imports.py:1715 msgid "Error on imported file: {}" msgstr "" -#: ishtar_common/models_imports.py:1749 +#: ishtar_common/models_imports.py:1751 msgid "Import {} finished with errors" msgstr "" -#: ishtar_common/models_imports.py:1757 +#: ishtar_common/models_imports.py:1759 msgid "Import {} finished with no errors" msgstr "" @@ -13152,7 +13153,7 @@ msgstr "" msgid "Load another random image?" msgstr "" -#: ishtar_common/utils.py:1568 +#: ishtar_common/utils.py:1575 msgid "The maximum supported file size is {} Mo." msgstr "" @@ -13327,7 +13328,7 @@ msgstr "" msgid "Modify a %s" msgstr "" -#: ishtar_common/views_item.py:902 +#: ishtar_common/views_item.py:904 msgctxt "key for text search" msgid "today" msgstr "" diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index ad6171311..8a328114c 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: 2023-01-16 11:42+0100\n" +"POT-Creation-Date: 2023-01-19 18:47+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -25,22 +25,22 @@ msgstr "" #: archaeological_context_records/templates/ishtar/forms/qa_contextrecord_duplicate.html:12 #: archaeological_context_records/wizards.py:85 #: archaeological_finds/models_finds.py:1142 -#: archaeological_finds/models_finds.py:2420 +#: archaeological_finds/models_finds.py:2419 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:16 #: archaeological_finds/wizards.py:92 archaeological_finds/wizards.py:565 #: archaeological_operations/forms.py:381 #: archaeological_operations/forms.py:1233 #: archaeological_operations/ishtar_menu.py:35 -#: archaeological_operations/models.py:1518 -#: archaeological_operations/models.py:2386 -#: archaeological_operations/models.py:2404 -#: archaeological_operations/models.py:2520 -#: archaeological_operations/models.py:2719 -#: archaeological_operations/models.py:3008 +#: archaeological_operations/models.py:1529 +#: archaeological_operations/models.py:2397 +#: archaeological_operations/models.py:2415 +#: archaeological_operations/models.py:2531 +#: archaeological_operations/models.py:2730 +#: archaeological_operations/models.py:3019 #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:246 #: archaeological_operations/wizards.py:258 -#: archaeological_warehouse/models.py:857 ishtar_common/forms_common.py:2136 +#: archaeological_warehouse/models.py:858 ishtar_common/forms_common.py:2136 #: ishtar_common/models.py:5066 ishtar_common/views.py:391 msgid "Operation" msgstr "" @@ -134,7 +134,7 @@ msgstr "" #: archaeological_context_records/forms.py:711 #: archaeological_context_records/models.py:735 #: archaeological_operations/forms.py:550 -#: archaeological_operations/models.py:563 ishtar_common/models.py:5067 +#: archaeological_operations/models.py:564 ishtar_common/models.py:5067 msgid "Archaeological site" msgstr "" @@ -162,8 +162,8 @@ msgstr "" #: archaeological_operations/forms.py:500 #: archaeological_operations/forms.py:1062 #: archaeological_operations/forms.py:1436 -#: archaeological_operations/models.py:3032 -#: archaeological_operations/models.py:3304 +#: archaeological_operations/models.py:3043 +#: archaeological_operations/models.py:3315 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Parcel" msgstr "" @@ -202,8 +202,8 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:46 #: archaeological_operations/templates/ishtar/sheet_site.html:41 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:24 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:20 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:29 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:25 msgid "General" msgstr "" @@ -221,11 +221,11 @@ msgstr "" #: archaeological_finds/models_finds.py:1097 #: archaeological_operations/forms.py:71 archaeological_operations/forms.py:209 #: archaeological_operations/forms.py:1034 -#: archaeological_operations/models.py:3013 +#: archaeological_operations/models.py:3024 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_warehouse/forms.py:145 ishtar_common/forms_common.py:84 -#: ishtar_common/forms_common.py:106 ishtar_common/models_common.py:2855 -#: ishtar_common/models_common.py:3731 +#: ishtar_common/forms_common.py:106 ishtar_common/models_common.py:2936 +#: ishtar_common/models_common.py:3812 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 msgid "Town" msgstr "" @@ -255,7 +255,7 @@ msgstr "" #: archaeological_finds/forms.py:1426 #: archaeological_finds/forms_treatments.py:193 #: archaeological_finds/models_finds.py:411 -#: archaeological_finds/models_finds.py:1814 +#: archaeological_finds/models_finds.py:1813 #: archaeological_finds/models_treatments.py:255 #: archaeological_finds/templates/ishtar/sheet_find.html:178 #: ishtar_common/forms_common.py:1802 ishtar_common/forms_common.py:2070 @@ -326,7 +326,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:773 #: archaeological_finds/models_treatments.py:258 #: archaeological_finds/models_treatments.py:1132 -#: archaeological_operations/models.py:1278 +#: archaeological_operations/models.py:1289 #: archaeological_operations/templates/ishtar/sheet_operation.html:205 #: ishtar_common/forms.py:990 ishtar_common/forms.py:991 msgid "Closing date" @@ -343,7 +343,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:219 #: archaeological_finds/models_treatments.py:754 #: archaeological_warehouse/forms.py:731 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:81 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:95 msgid "Location" msgstr "" @@ -359,7 +359,7 @@ msgstr "" #: archaeological_context_records/forms.py:459 #: archaeological_context_records/models.py:163 #: archaeological_finds/forms.py:1222 archaeological_finds/forms.py:1243 -#: archaeological_finds/models_finds.py:1857 +#: archaeological_finds/models_finds.py:1856 #: archaeological_finds/templates/ishtar/sheet_find.html:249 msgid "Dating" msgstr "" @@ -384,7 +384,7 @@ msgstr "" #: archaeological_finds/forms.py:1231 #: archaeological_finds/forms_treatments.py:180 #: archaeological_finds/forms_treatments.py:770 -#: archaeological_finds/models_finds.py:3354 +#: archaeological_finds/models_finds.py:3353 #: archaeological_finds/models_treatments.py:257 #: archaeological_finds/models_treatments.py:752 #: archaeological_finds/templates/ishtar/sheet_find.html:258 @@ -393,8 +393,8 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:476 #: archaeological_operations/forms.py:780 #: archaeological_operations/models.py:104 -#: archaeological_operations/models.py:1279 -#: archaeological_operations/models.py:3308 +#: archaeological_operations/models.py:1290 +#: archaeological_operations/models.py:3319 msgid "Start date" msgstr "" @@ -402,7 +402,7 @@ msgstr "" #: archaeological_context_records/models.py:110 #: archaeological_files/forms.py:791 archaeological_files/models.py:76 #: archaeological_files/models.py:699 archaeological_finds/forms.py:1232 -#: archaeological_finds/models_finds.py:3355 +#: archaeological_finds/models_finds.py:3354 #: archaeological_finds/models_treatments.py:753 #: archaeological_finds/templates/ishtar/sheet_find.html:259 #: archaeological_finds/templates/ishtar/sheet_find.html:401 @@ -410,8 +410,8 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:477 #: archaeological_finds/templates/ishtar/sheet_find.html:515 #: archaeological_operations/models.py:105 -#: archaeological_operations/models.py:3309 -#: ishtar_common/models_imports.py:1261 +#: archaeological_operations/models.py:3320 +#: ishtar_common/models_imports.py:1263 msgid "End date" msgstr "" @@ -449,7 +449,7 @@ msgstr "" #: archaeological_finds/forms.py:173 archaeological_finds/forms.py:179 #: archaeological_finds/forms.py:784 archaeological_finds/forms.py:802 #: archaeological_finds/forms.py:1405 archaeological_finds/models_finds.py:1093 -#: archaeological_finds/models_finds.py:2412 +#: archaeological_finds/models_finds.py:2411 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 #: archaeological_finds/wizards.py:93 archaeological_warehouse/forms.py:556 #: ishtar_common/forms_common.py:2149 ishtar_common/models.py:5068 @@ -669,7 +669,7 @@ msgid "Dating quality types" msgstr "" #: archaeological_context_records/models.py:129 -#: archaeological_context_records/tests.py:911 +#: archaeological_context_records/tests.py:912 #: archaeological_finds/tests.py:1335 msgctxt "key for text search" msgid "datings-period" @@ -717,9 +717,9 @@ msgstr "" #: archaeological_context_records/models.py:280 #: archaeological_finds/forms.py:210 archaeological_finds/forms.py:439 #: archaeological_finds/ishtar_menu.py:34 -#: archaeological_finds/models_finds.py:2044 -#: archaeological_finds/models_finds.py:3320 -#: archaeological_finds/models_finds.py:3342 +#: archaeological_finds/models_finds.py:2043 +#: archaeological_finds/models_finds.py:3319 +#: archaeological_finds/models_finds.py:3341 #: archaeological_finds/models_treatments.py:734 #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: ishtar_common/forms_common.py:2165 ishtar_common/models.py:5069 @@ -738,21 +738,21 @@ msgstr "" #: archaeological_finds/models_finds.py:249 #: archaeological_finds/models_finds.py:290 #: archaeological_finds/models_finds.py:356 -#: archaeological_finds/models_finds.py:1809 +#: archaeological_finds/models_finds.py:1808 #: archaeological_finds/models_treatments.py:65 #: archaeological_finds/models_treatments.py:746 #: archaeological_operations/models.py:103 #: archaeological_operations/models.py:128 #: archaeological_operations/models.py:146 #: archaeological_operations/models.py:155 -#: archaeological_operations/models.py:3335 +#: archaeological_operations/models.py:3346 #: archaeological_warehouse/forms.py:108 archaeological_warehouse/models.py:695 #: archaeological_warehouse/models.py:727 ishtar_common/models.py:692 #: ishtar_common/models.py:747 ishtar_common/models.py:789 #: ishtar_common/models.py:1732 ishtar_common/models.py:3528 -#: ishtar_common/models.py:4846 ishtar_common/models_common.py:2008 -#: ishtar_common/models_common.py:2041 ishtar_common/models_common.py:2057 -#: ishtar_common/models_common.py:2073 ishtar_common/models_common.py:2085 +#: ishtar_common/models.py:4846 ishtar_common/models_common.py:2043 +#: ishtar_common/models_common.py:2076 ishtar_common/models_common.py:2092 +#: ishtar_common/models_common.py:2108 ishtar_common/models_common.py:2120 msgid "Order" msgstr "" @@ -793,7 +793,7 @@ msgid "Excavation technique types" msgstr "" #: archaeological_context_records/models.py:372 -#: ishtar_common/models_imports.py:937 +#: ishtar_common/models_imports.py:939 msgid "Documentation type" msgstr "" @@ -812,10 +812,10 @@ msgstr "" #: archaeological_operations/forms.py:1334 #: archaeological_operations/models.py:305 #: archaeological_operations/models.py:314 -#: archaeological_operations/models.py:485 -#: archaeological_operations/models.py:948 -#: archaeological_operations/models.py:1032 -#: archaeological_operations/models.py:1340 +#: archaeological_operations/models.py:486 +#: archaeological_operations/models.py:958 +#: archaeological_operations/models.py:1042 +#: archaeological_operations/models.py:1351 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:8 msgid "Periods" msgstr "" @@ -849,14 +849,14 @@ msgstr "" #: archaeological_context_records/models.py:536 #: archaeological_finds/models_finds.py:1162 #: archaeological_operations/models.py:316 -#: archaeological_operations/models.py:952 +#: archaeological_operations/models.py:962 msgid "Associated document type" msgstr "" #: archaeological_context_records/models.py:537 #: archaeological_finds/models_finds.py:1163 #: archaeological_operations/models.py:317 -#: archaeological_operations/models.py:953 +#: archaeological_operations/models.py:963 msgid "Modification (year)" msgstr "" @@ -866,10 +866,10 @@ msgid "id" msgstr "" #: archaeological_context_records/models.py:579 -#: archaeological_context_records/tests.py:737 +#: archaeological_context_records/tests.py:738 #: archaeological_files/models.py:464 archaeological_finds/models_finds.py:1248 -#: archaeological_operations/models.py:377 -#: archaeological_operations/models.py:1091 +#: archaeological_operations/models.py:378 +#: archaeological_operations/models.py:1102 #: archaeological_operations/tests.py:3031 #: archaeological_warehouse/models.py:316 msgctxt "key for text search" @@ -888,8 +888,8 @@ msgid "operation-name" msgstr "" #: archaeological_context_records/models.py:589 -#: archaeological_operations/models.py:1087 -#: archaeological_operations/models.py:2550 +#: archaeological_operations/models.py:1098 +#: archaeological_operations/models.py:2561 #: archaeological_operations/tests.py:4507 msgctxt "key for text search" msgid "patriarche" @@ -897,7 +897,7 @@ msgstr "" #: archaeological_context_records/models.py:593 #: archaeological_finds/models_finds.py:1256 -#: archaeological_operations/models.py:1084 +#: archaeological_operations/models.py:1095 msgctxt "key for text search" msgid "operation-code" msgstr "" @@ -905,9 +905,9 @@ msgstr "" #: archaeological_context_records/models.py:597 #: archaeological_context_records/models.py:655 #: archaeological_finds/models_finds.py:1357 -#: archaeological_finds/models_finds.py:1730 -#: archaeological_operations/models.py:412 -#: archaeological_operations/models.py:438 ishtar_common/models.py:3924 +#: archaeological_finds/models_finds.py:1729 +#: archaeological_operations/models.py:413 +#: archaeological_operations/models.py:439 ishtar_common/models.py:3924 #: ishtar_common/models.py:4029 msgctxt "key for text search" msgid "operation" @@ -916,24 +916,24 @@ msgstr "" #: archaeological_context_records/models.py:601 #: archaeological_context_records/models.py:658 #: archaeological_finds/models_finds.py:1272 -#: archaeological_operations/models.py:1175 -#: archaeological_operations/models.py:1240 -#: archaeological_warehouse/models.py:937 ishtar_common/models.py:3960 +#: archaeological_operations/models.py:1186 +#: archaeological_operations/models.py:1251 +#: archaeological_warehouse/models.py:938 ishtar_common/models.py:3960 #: ishtar_common/models.py:4038 msgctxt "key for text search" msgid "site" msgstr "" #: archaeological_context_records/models.py:605 -#: archaeological_context_records/tests.py:804 +#: archaeological_context_records/tests.py:805 #: archaeological_finds/models_finds.py:1295 msgctxt "key for text search" msgid "operation-relation-type" msgstr "" #: archaeological_context_records/models.py:609 -#: archaeological_operations/models.py:371 -#: archaeological_operations/models.py:1133 +#: archaeological_operations/models.py:372 +#: archaeological_operations/models.py:1144 #: archaeological_operations/tests.py:3014 #: archaeological_operations/tests.py:3196 msgctxt "key for text search" @@ -941,26 +941,26 @@ msgid "period" msgstr "" #: archaeological_context_records/models.py:613 -#: archaeological_context_records/tests.py:863 +#: archaeological_context_records/tests.py:864 msgctxt "key for text search" msgid "unit-type" msgstr "" #: archaeological_context_records/models.py:616 -#: archaeological_files/models.py:467 archaeological_operations/models.py:1097 -#: archaeological_operations/models.py:2568 +#: archaeological_files/models.py:467 archaeological_operations/models.py:1108 +#: archaeological_operations/models.py:2579 msgctxt "key for text search" msgid "parcel" msgstr "" #: archaeological_context_records/models.py:620 -#: archaeological_operations/models.py:1194 +#: archaeological_operations/models.py:1205 msgctxt "key for text search" msgid "has-finds" msgstr "" #: archaeological_context_records/models.py:623 -#: archaeological_context_records/tests.py:769 +#: archaeological_context_records/tests.py:770 msgctxt "key for text search" msgid "record-relation-type" msgstr "" @@ -971,20 +971,20 @@ msgid "excavation-technique" msgstr "" #: archaeological_context_records/models.py:673 -#: archaeological_finds/models_finds.py:1689 -#: archaeological_operations/models.py:457 -#: archaeological_operations/models.py:1223 +#: archaeological_finds/models_finds.py:1688 +#: archaeological_operations/models.py:458 +#: archaeological_operations/models.py:1234 #: archaeological_warehouse/models.py:335 -#: archaeological_warehouse/models.py:1056 +#: archaeological_warehouse/models.py:1057 msgid "Lock/Unlock" msgstr "" #: archaeological_context_records/models.py:680 -#: archaeological_finds/models_finds.py:1682 -#: archaeological_operations/models.py:464 -#: archaeological_operations/models.py:1216 +#: archaeological_finds/models_finds.py:1681 +#: archaeological_operations/models.py:465 +#: archaeological_operations/models.py:1227 #: archaeological_warehouse/models.py:327 -#: archaeological_warehouse/models.py:1049 ishtar_common/models.py:2472 +#: archaeological_warehouse/models.py:1050 ishtar_common/models.py:2472 #: ishtar_common/models.py:2734 ishtar_common/models.py:4055 msgid "Bulk update" msgstr "" @@ -994,13 +994,13 @@ msgstr "" #: archaeological_context_records/views.py:272 #: archaeological_context_records/views.py:287 #: archaeological_finds/models_finds.py:877 -#: archaeological_finds/models_finds.py:1699 -#: archaeological_finds/models_finds.py:2318 archaeological_finds/views.py:1247 +#: archaeological_finds/models_finds.py:1698 +#: archaeological_finds/models_finds.py:2317 archaeological_finds/views.py:1247 #: archaeological_finds/views.py:1262 archaeological_finds/views.py:1300 -#: archaeological_finds/views.py:1316 archaeological_operations/models.py:474 -#: archaeological_operations/models.py:632 -#: archaeological_operations/models.py:1233 -#: archaeological_operations/models.py:1874 +#: archaeological_finds/views.py:1316 archaeological_operations/models.py:475 +#: archaeological_operations/models.py:633 +#: archaeological_operations/models.py:1244 +#: archaeological_operations/models.py:1885 #: archaeological_operations/views.py:843 #: archaeological_operations/views.py:858 #: archaeological_operations/views.py:865 @@ -1013,26 +1013,26 @@ msgstr "" #: archaeological_context_records/models.py:707 #: archaeological_files/models.py:530 archaeological_finds/models_finds.py:406 -#: archaeological_finds/models_finds.py:1803 +#: archaeological_finds/models_finds.py:1802 #: archaeological_finds/models_treatments.py:252 #: archaeological_finds/models_treatments.py:1100 -#: archaeological_operations/models.py:3021 +#: archaeological_operations/models.py:3032 #: archaeological_warehouse/models.py:388 -#: archaeological_warehouse/models.py:1133 ishtar_common/models.py:4090 +#: archaeological_warehouse/models.py:1134 ishtar_common/models.py:4090 msgid "External ID" msgstr "" #: archaeological_context_records/models.py:709 #: archaeological_files/models.py:533 archaeological_finds/models_finds.py:408 -#: archaeological_finds/models_finds.py:1805 -#: archaeological_operations/models.py:3024 +#: archaeological_finds/models_finds.py:1804 +#: archaeological_operations/models.py:3035 #: archaeological_warehouse/models.py:390 -#: archaeological_warehouse/models.py:1135 +#: archaeological_warehouse/models.py:1136 msgid "External ID is set automatically" msgstr "" #: archaeological_context_records/models.py:754 -#: archaeological_operations/models.py:1332 ishtar_common/models_common.py:2825 +#: archaeological_operations/models.py:1343 ishtar_common/models_common.py:2906 msgid "Surface (m2)" msgstr "" @@ -1066,21 +1066,21 @@ msgstr "" #: archaeological_context_records/models.py:830 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 -#: archaeological_files/models.py:719 archaeological_finds/models_finds.py:1998 +#: archaeological_files/models.py:719 archaeological_finds/models_finds.py:1997 #: archaeological_finds/models_treatments.py:272 #: archaeological_finds/models_treatments.py:1150 #: archaeological_finds/templates/ishtar/sheet_find.html:72 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 -#: archaeological_operations/models.py:524 -#: archaeological_operations/models.py:1406 -#: archaeological_operations/models.py:2768 +#: archaeological_operations/models.py:525 +#: archaeological_operations/models.py:1417 +#: archaeological_operations/models.py:2779 #: archaeological_operations/templates/ishtar/sheet_operation.html:63 #: archaeological_operations/templates/ishtar/sheet_site.html:97 #: archaeological_warehouse/models.py:377 -#: archaeological_warehouse/models.py:1140 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:46 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:179 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:42 +#: archaeological_warehouse/models.py:1141 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:51 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:191 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:47 #: ishtar_common/models.py:4206 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_person.html:161 @@ -1088,50 +1088,50 @@ msgid "Documents" msgstr "" #: archaeological_context_records/models.py:837 -#: archaeological_finds/models_finds.py:2004 +#: archaeological_finds/models_finds.py:2003 #: archaeological_finds/models_treatments.py:278 #: archaeological_finds/models_treatments.py:1157 -#: archaeological_operations/models.py:530 -#: archaeological_operations/models.py:1412 -#: archaeological_operations/models.py:2775 +#: archaeological_operations/models.py:531 +#: archaeological_operations/models.py:1423 +#: archaeological_operations/models.py:2786 #: archaeological_warehouse/models.py:384 -#: archaeological_warehouse/models.py:1147 +#: archaeological_warehouse/models.py:1148 msgid "Main image" msgstr "" #: archaeological_context_records/models.py:842 -#: archaeological_files/models.py:723 archaeological_finds/models_finds.py:2016 +#: archaeological_files/models.py:723 archaeological_finds/models_finds.py:2015 #: archaeological_finds/models_treatments.py:283 #: archaeological_finds/models_treatments.py:1169 -#: archaeological_operations/models.py:535 -#: archaeological_operations/models.py:1417 -#: archaeological_operations/models.py:3028 ishtar_common/models.py:2496 +#: archaeological_operations/models.py:536 +#: archaeological_operations/models.py:1428 +#: archaeological_operations/models.py:3039 ishtar_common/models.py:2496 #: ishtar_common/models.py:2783 ishtar_common/models.py:3555 -#: ishtar_common/models_common.py:2850 ishtar_common/models_common.py:2873 +#: ishtar_common/models_common.py:2931 ishtar_common/models_common.py:2954 msgid "Cached name" msgstr "" #: archaeological_context_records/models.py:845 -#: archaeological_finds/models_finds.py:2023 -#: archaeological_operations/models.py:548 -#: archaeological_operations/models.py:1503 +#: archaeological_finds/models_finds.py:2022 +#: archaeological_operations/models.py:549 +#: archaeological_operations/models.py:1514 msgid "Cached periods label" msgstr "" #: archaeological_context_records/models.py:848 #: archaeological_context_records/models.py:854 -#: archaeological_files/models.py:727 archaeological_finds/models_finds.py:2020 -#: archaeological_finds/models_finds.py:2026 -#: archaeological_finds/models_finds.py:2032 -#: archaeological_finds/models_finds.py:2038 -#: archaeological_operations/models.py:539 -#: archaeological_operations/models.py:545 -#: archaeological_operations/models.py:551 -#: archaeological_operations/models.py:557 -#: archaeological_operations/models.py:1419 -#: archaeological_operations/models.py:1500 -#: archaeological_operations/models.py:1506 -#: archaeological_operations/models.py:1512 +#: archaeological_files/models.py:727 archaeological_finds/models_finds.py:2019 +#: archaeological_finds/models_finds.py:2025 +#: archaeological_finds/models_finds.py:2031 +#: archaeological_finds/models_finds.py:2037 +#: archaeological_operations/models.py:540 +#: archaeological_operations/models.py:546 +#: archaeological_operations/models.py:552 +#: archaeological_operations/models.py:558 +#: archaeological_operations/models.py:1430 +#: archaeological_operations/models.py:1511 +#: archaeological_operations/models.py:1517 +#: archaeological_operations/models.py:1523 msgid "Generated automatically - do not edit" msgstr "" @@ -1152,7 +1152,7 @@ msgid "Context record" msgstr "" #: archaeological_context_records/models.py:915 -#: archaeological_finds/models_finds.py:2204 +#: archaeological_finds/models_finds.py:2203 msgid "List of associated base finds" msgstr "" @@ -1264,22 +1264,24 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:74 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:266 -#: archaeological_finds/forms.py:1825 archaeological_finds/models_finds.py:2045 +#: archaeological_finds/forms.py:1825 archaeological_finds/models_finds.py:2044 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:11 #: archaeological_finds/templates/ishtar/sheet_treatment.html:24 #: archaeological_operations/templates/ishtar/sheet_operation.html:90 #: archaeological_operations/templates/ishtar/sheet_operation.html:434 #: archaeological_operations/templates/ishtar/sheet_operation.html:526 #: archaeological_operations/templates/ishtar/sheet_site.html:93 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:174 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:221 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:177 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:186 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:233 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:193 msgid "Finds" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:101 #: archaeological_finds/templates/ishtar/sheet_find.html:81 #: archaeological_operations/templates/ishtar/sheet_operation.html:99 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:60 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:56 #: ishtar_common/templates/ishtar/blocks/sheet_map.html:9 msgid "Geographic data" msgstr "" @@ -1295,9 +1297,9 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:161 #: archaeological_operations/templates/ishtar/sheet_operation.html:139 #: 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:3903 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:84 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:77 +#: ishtar_common/models_common.py:3984 #: ishtar_common/templates/ishtar/sheet_document.html:37 msgid "Complete identifier" msgstr "" @@ -1316,11 +1318,9 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:70 #: archaeological_operations/templates/ishtar/sheet_operation.html:300 #: archaeological_operations/templates/ishtar/sheet_site.html:68 -#: 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:2827 -msgid "Localisation" +#: archaeological_warehouse/templates/ishtar/sheet_container.html:165 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:116 +msgid "Geographic localisation" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:178 @@ -1357,8 +1357,8 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:176 #: 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:1938 ishtar_common/models_common.py:1953 -#: ishtar_common/models_imports.py:1250 +#: ishtar_common/models_common.py:1973 ishtar_common/models_common.py:1988 +#: ishtar_common/models_imports.py:1252 msgid "State" msgstr "" @@ -1426,7 +1426,7 @@ msgid "Context record deletion" msgstr "" #: archaeological_context_records/views.py:254 -#: archaeological_operations/models.py:1863 +#: archaeological_operations/models.py:1874 msgid "Add context record" msgstr "" @@ -1478,20 +1478,20 @@ msgstr "" #: archaeological_operations/forms.py:725 #: archaeological_operations/forms.py:1426 #: archaeological_operations/forms.py:1739 -#: archaeological_operations/models.py:944 -#: archaeological_operations/models.py:1316 -#: archaeological_operations/models.py:2518 -#: archaeological_operations/models.py:2747 -#: archaeological_operations/models.py:3011 +#: archaeological_operations/models.py:954 +#: archaeological_operations/models.py:1327 +#: archaeological_operations/models.py:2529 +#: archaeological_operations/models.py:2758 +#: archaeological_operations/models.py:3022 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 -#: ishtar_common/models_imports.py:980 +#: ishtar_common/models_imports.py:982 msgid "Year" msgstr "" #: archaeological_files/forms.py:91 archaeological_files/forms.py:240 #: archaeological_files/forms.py:673 archaeological_files/models.py:524 #: archaeological_operations/forms.py:491 -#: archaeological_operations/models.py:1317 +#: archaeological_operations/models.py:1328 msgid "Numeric reference" msgstr "" @@ -1501,8 +1501,8 @@ msgstr "" #: archaeological_operations/forms.py:1331 #: archaeological_operations/forms.py:1428 #: archaeological_operations/forms.py:1505 -#: archaeological_operations/models.py:483 -#: archaeological_operations/models.py:2750 +#: archaeological_operations/models.py:484 +#: archaeological_operations/models.py:2761 msgid "Other reference" msgstr "" @@ -1510,8 +1510,8 @@ msgstr "" #: archaeological_files/forms.py:1167 archaeological_files/models.py:1343 #: archaeological_operations/forms.py:503 #: archaeological_operations/forms.py:1439 -#: archaeological_operations/models.py:2390 ishtar_common/models_common.py:1961 -#: ishtar_common/models_common.py:2833 +#: archaeological_operations/models.py:2401 ishtar_common/models_common.py:1996 +#: ishtar_common/models_common.py:2914 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" @@ -1554,7 +1554,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:195 #: archaeological_finds/forms_treatments.py:765 #: archaeological_finds/models_finds.py:412 -#: archaeological_finds/models_finds.py:1936 +#: archaeological_finds/models_finds.py:1935 #: archaeological_finds/models_treatments.py:254 #: archaeological_finds/models_treatments.py:1146 #: archaeological_operations/forms.py:541 @@ -1563,16 +1563,16 @@ msgstr "" #: archaeological_operations/forms.py:1345 #: archaeological_operations/forms.py:1442 #: archaeological_operations/forms.py:1504 -#: archaeological_operations/models.py:495 -#: archaeological_operations/models.py:1401 -#: archaeological_operations/models.py:2764 +#: archaeological_operations/models.py:496 +#: archaeological_operations/models.py:1412 +#: archaeological_operations/models.py:2775 #: archaeological_warehouse/forms.py:226 archaeological_warehouse/forms.py:375 #: archaeological_warehouse/forms.py:507 archaeological_warehouse/models.py:367 -#: archaeological_warehouse/models.py:1103 ishtar_common/forms_common.py:1800 +#: archaeological_warehouse/models.py:1104 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:182 -#: ishtar_common/models_common.py:2170 ishtar_common/models_imports.py:751 +#: ishtar_common/models.py:4190 ishtar_common/models_common.py:183 +#: ishtar_common/models_common.py:2216 ishtar_common/models_imports.py:751 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:13 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:170 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:39 @@ -1620,9 +1620,9 @@ msgstr "" #: archaeological_files/forms.py:218 archaeological_files/models.py:605 #: archaeological_finds/models_treatments.py:1134 -#: archaeological_operations/models.py:1277 ishtar_common/forms_common.py:1795 +#: archaeological_operations/models.py:1288 ishtar_common/forms_common.py:1795 #: ishtar_common/forms_common.py:2271 ishtar_common/models.py:4175 -#: ishtar_common/models_imports.py:1258 +#: ishtar_common/models_imports.py:1260 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 msgid "Creation date" msgstr "" @@ -1667,21 +1667,21 @@ msgstr "" #: archaeological_operations/forms.py:1053 #: archaeological_operations/forms.py:1381 #: archaeological_operations/models.py:304 -#: archaeological_operations/models.py:493 -#: archaeological_operations/models.py:1029 -#: archaeological_operations/models.py:1031 -#: archaeological_operations/models.py:1337 -#: archaeological_operations/models.py:2759 +#: archaeological_operations/models.py:494 +#: archaeological_operations/models.py:1039 +#: archaeological_operations/models.py:1041 +#: archaeological_operations/models.py:1348 +#: archaeological_operations/models.py:2770 #: archaeological_operations/templates/ishtar/sheet_operation.html:147 #: 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:2856 +#: ishtar_common/models_common.py:2937 msgid "Towns" msgstr "" #: archaeological_files/forms.py:293 archaeological_files/forms.py:336 #: archaeological_files/forms.py:576 archaeological_files/models.py:641 -#: archaeological_operations/models.py:2753 ishtar_common/models_common.py:1962 +#: archaeological_operations/models.py:2764 ishtar_common/models_common.py:1997 msgid "Departments" msgstr "" @@ -1704,7 +1704,7 @@ msgstr "" #: archaeological_files/forms.py:303 archaeological_files/forms.py:344 #: archaeological_warehouse/forms.py:241 ishtar_common/forms_common.py:540 -#: ishtar_common/forms_common.py:923 ishtar_common/models_common.py:3064 +#: ishtar_common/forms_common.py:923 ishtar_common/models_common.py:3145 msgid "Postal code" msgstr "" @@ -1721,7 +1721,7 @@ msgstr "" #: 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:536 ishtar_common/forms_common.py:919 -#: ishtar_common/models_common.py:3059 ishtar_common/models_common.py:3214 +#: ishtar_common/models_common.py:3140 ishtar_common/models_common.py:3295 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 msgid "Address" msgstr "" @@ -1787,7 +1787,7 @@ msgstr "" #: archaeological_files/forms.py:596 archaeological_files/models.py:665 #: archaeological_operations/forms.py:522 -#: archaeological_operations/models.py:2704 +#: archaeological_operations/models.py:2715 msgid "Scientist in charge" msgstr "" @@ -1948,7 +1948,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:368 #: archaeological_operations/forms.py:1427 #: archaeological_operations/forms.py:1560 -#: archaeological_operations/models.py:2689 ishtar_common/admin.py:564 +#: archaeological_operations/models.py:2700 ishtar_common/admin.py:564 #: ishtar_common/models.py:4089 msgid "Index" msgstr "" @@ -1961,8 +1961,8 @@ msgstr "" #: archaeological_finds/forms_treatments.py:897 #: archaeological_operations/forms.py:1433 #: archaeological_operations/forms.py:1494 -#: archaeological_operations/models.py:2420 -#: archaeological_operations/models.py:2679 ishtar_common/models_imports.py:932 +#: archaeological_operations/models.py:2431 +#: archaeological_operations/models.py:2690 ishtar_common/models_imports.py:934 msgid "Act type" msgstr "" @@ -1983,7 +1983,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:844 #: archaeological_operations/forms.py:1440 #: archaeological_operations/forms.py:1501 -#: archaeological_operations/models.py:2748 +#: archaeological_operations/models.py:2759 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" @@ -2029,10 +2029,10 @@ msgstr "" #: archaeological_files/wizards.py:219 archaeological_files/wizards.py:231 #: archaeological_operations/forms.py:670 #: archaeological_operations/forms.py:931 -#: archaeological_operations/models.py:1883 -#: archaeological_operations/models.py:2403 -#: archaeological_operations/models.py:2519 -#: archaeological_operations/models.py:2727 +#: archaeological_operations/models.py:1894 +#: archaeological_operations/models.py:2414 +#: archaeological_operations/models.py:2530 +#: archaeological_operations/models.py:2738 #: archaeological_operations/wizards.py:85 ishtar_common/views.py:390 msgid "Archaeological file" msgstr "" @@ -2045,9 +2045,9 @@ msgstr "" #: archaeological_files/ishtar_menu.py:71 #: archaeological_finds/ishtar_menu.py:149 #: archaeological_finds/ishtar_menu.py:226 -#: archaeological_finds/models_finds.py:3345 +#: archaeological_finds/models_finds.py:3344 #: archaeological_operations/ishtar_menu.py:70 -#: archaeological_operations/models.py:2784 +#: archaeological_operations/models.py:2795 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "" @@ -2133,12 +2133,12 @@ msgstr "" msgid "Equipment/Service" msgstr "" -#: archaeological_files/models.py:208 ishtar_common/models_common.py:173 -#: ishtar_common/models_common.py:204 +#: archaeological_files/models.py:208 ishtar_common/models_common.py:174 +#: ishtar_common/models_common.py:205 msgid "Textual ID" msgstr "" -#: archaeological_files/models.py:212 ishtar_common/models_common.py:177 +#: archaeological_files/models.py:212 ishtar_common/models_common.py:178 msgid "" "The slug is the standardized version of the name. It contains only lowercase " "letters, numbers and hyphens. Each slug must be unique." @@ -2156,7 +2156,7 @@ msgstr "" msgid "Unitary cost" msgstr "" -#: archaeological_files/models.py:223 ishtar_common/models_imports.py:933 +#: archaeological_files/models.py:223 ishtar_common/models_imports.py:935 msgid "Unit" msgstr "" @@ -2170,14 +2170,14 @@ msgstr "" #: archaeological_files/models.py:231 ishtar_common/models.py:1558 #: ishtar_common/models.py:1970 ishtar_common/models.py:3423 -#: ishtar_common/models_common.py:183 ishtar_common/models_imports.py:187 +#: ishtar_common/models_common.py:184 ishtar_common/models_imports.py:187 #: ishtar_common/models_imports.py:812 msgid "Available" msgstr "" #: archaeological_files/models.py:237 archaeological_warehouse/forms.py:747 #: ishtar_common/admin.py:1126 ishtar_common/models.py:2275 -#: ishtar_common/models_common.py:715 +#: ishtar_common/models_common.py:716 msgid "Parent" msgstr "" @@ -2239,13 +2239,13 @@ msgstr "" #: archaeological_files/models.py:382 archaeological_finds/models_finds.py:1145 #: archaeological_operations/models.py:312 -#: archaeological_operations/models.py:945 ishtar_common/admin.py:1295 +#: archaeological_operations/models.py:955 ishtar_common/admin.py:1295 msgid "Area" msgstr "" #: archaeological_files/models.py:383 archaeological_finds/models_finds.py:1148 #: archaeological_operations/models.py:313 -#: archaeological_operations/models.py:946 +#: archaeological_operations/models.py:956 msgid "Extended area" msgstr "" @@ -2256,8 +2256,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:748 -#: ishtar_common/models_common.py:1934 ishtar_common/models_common.py:1950 +#: ishtar_common/models.py:1854 ishtar_common/models_common.py:749 +#: ishtar_common/models_common.py:1969 ishtar_common/models_common.py:1985 #: ishtar_common/templates/ishtar/sheet_person.html:30 msgid "Number" msgstr "" @@ -2273,8 +2273,8 @@ msgstr "" #: archaeological_files/models.py:455 archaeological_finds/models_finds.py:1252 #: archaeological_finds/models_treatments.py:152 #: archaeological_finds/models_treatments.py:1049 -#: archaeological_operations/models.py:1082 -#: archaeological_operations/models.py:2543 +#: archaeological_operations/models.py:1093 +#: archaeological_operations/models.py:2554 #: archaeological_operations/tests.py:3020 #: archaeological_operations/tests.py:3096 msgctxt "key for text search" @@ -2283,28 +2283,28 @@ msgstr "" #: archaeological_files/models.py:457 #: archaeological_finds/models_treatments.py:1046 -#: archaeological_operations/models.py:361 -#: archaeological_warehouse/models.py:913 ishtar_common/models.py:3854 +#: archaeological_operations/models.py:362 +#: archaeological_warehouse/models.py:914 ishtar_common/models.py:3854 msgctxt "key for text search" msgid "reference" msgstr "" #: archaeological_files/models.py:460 #: archaeological_finds/models_treatments.py:149 -#: archaeological_operations/models.py:367 +#: archaeological_operations/models.py:368 msgctxt "key for text search" msgid "other-reference" msgstr "" -#: archaeological_files/models.py:471 archaeological_operations/models.py:1101 +#: archaeological_files/models.py:471 archaeological_operations/models.py:1112 msgctxt "key for text search" msgid "department" msgstr "" #: archaeological_files/models.py:475 #: archaeological_finds/models_treatments.py:1043 -#: archaeological_operations/models.py:364 -#: archaeological_operations/models.py:1105 +#: archaeological_operations/models.py:365 +#: archaeological_operations/models.py:1116 #: archaeological_operations/tests.py:3140 #: archaeological_warehouse/models.py:309 ishtar_common/models.py:2458 #: ishtar_common/models.py:2710 ishtar_common/models.py:3284 @@ -2315,11 +2315,11 @@ msgstr "" #: archaeological_files/models.py:478 #: archaeological_finds/models_treatments.py:155 #: archaeological_finds/models_treatments.py:1052 -#: archaeological_operations/models.py:1111 -#: archaeological_operations/models.py:2554 +#: archaeological_operations/models.py:1122 +#: archaeological_operations/models.py:2565 #: archaeological_operations/tests.py:3153 #: archaeological_warehouse/models.py:312 -#: archaeological_warehouse/models.py:909 ishtar_common/models.py:2461 +#: archaeological_warehouse/models.py:910 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" @@ -2347,10 +2347,10 @@ msgid "permit-reference" msgstr "" #: archaeological_files/models.py:496 archaeological_finds/models_finds.py:1458 -#: archaeological_operations/models.py:383 -#: archaeological_operations/models.py:1153 -#: archaeological_operations/models.py:2664 -#: archaeological_warehouse/models.py:920 ishtar_common/models.py:3914 +#: archaeological_operations/models.py:384 +#: archaeological_operations/models.py:1164 +#: archaeological_operations/models.py:2675 +#: archaeological_warehouse/models.py:921 ishtar_common/models.py:3914 msgctxt "key for text search" msgid "comment" msgstr "" @@ -2362,12 +2362,12 @@ msgctxt "key for text search" msgid "in-charge" msgstr "" -#: archaeological_files/models.py:503 archaeological_operations/models.py:2599 +#: archaeological_files/models.py:503 archaeological_operations/models.py:2610 msgctxt "key for text search" msgid "general-contractor" msgstr "" -#: archaeological_files/models.py:507 archaeological_operations/models.py:2603 +#: archaeological_files/models.py:507 archaeological_operations/models.py:2614 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "" @@ -2389,7 +2389,7 @@ msgstr "" #: archaeological_operations/forms.py:1215 #: archaeological_operations/forms.py:1330 #: archaeological_operations/forms.py:1795 -#: archaeological_operations/models.py:484 +#: archaeological_operations/models.py:485 #: 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 @@ -2402,11 +2402,11 @@ msgstr "" #: ishtar_common/models.py:1556 ishtar_common/models.py:1940 #: 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:2138 -#: ishtar_common/models_common.py:2824 ishtar_common/models_common.py:2873 +#: ishtar_common/models.py:4940 ishtar_common/models_common.py:2184 +#: ishtar_common/models_common.py:2905 ishtar_common/models_common.py:2954 #: ishtar_common/models_imports.py:110 ishtar_common/models_imports.py:144 #: ishtar_common/models_imports.py:669 ishtar_common/models_imports.py:686 -#: ishtar_common/models_imports.py:807 ishtar_common/models_imports.py:1170 +#: ishtar_common/models_imports.py:807 ishtar_common/models_imports.py:1172 #: ishtar_common/models_rest.py:105 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:10 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:24 @@ -2512,11 +2512,11 @@ msgstr "" msgid "No town" msgstr "" -#: archaeological_files/models.py:1241 archaeological_operations/models.py:1842 +#: archaeological_files/models.py:1241 archaeological_operations/models.py:1853 msgid "Modify parcels" msgstr "" -#: archaeological_files/models.py:1243 archaeological_operations/models.py:1844 +#: archaeological_files/models.py:1243 archaeological_operations/models.py:1855 msgid "parcels" msgstr "" @@ -2549,8 +2549,8 @@ msgstr "" msgid "operation" msgstr "" -#: archaeological_files/models.py:1340 archaeological_operations/models.py:1321 -#: archaeological_operations/models.py:2998 +#: archaeological_files/models.py:1340 archaeological_operations/models.py:1332 +#: archaeological_operations/models.py:3009 msgid "File" msgstr "" @@ -2653,7 +2653,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:2785 +#: archaeological_operations/models.py:2796 #: archaeological_operations/templates/ishtar/sheet_operation.html:351 #: archaeological_operations/templates/ishtar/sheet_operation.html:488 msgid "Administrative acts" @@ -2666,8 +2666,8 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_files/templates/ishtar/sheet_file.html:218 -#: archaeological_operations/models.py:2517 -#: archaeological_operations/models.py:2820 +#: archaeological_operations/models.py:2528 +#: archaeological_operations/models.py:2831 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 #: archaeological_warehouse/forms.py:333 archaeological_warehouse/forms.py:505 @@ -2689,14 +2689,14 @@ 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:587 +#: archaeological_warehouse/models.py:889 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:2935 ishtar_common/models.py:745 #: 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:979 +#: ishtar_common/models_imports.py:981 #: ishtar_common/templates/blocks/DataTables-stats.html:27 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:24 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:8 @@ -2710,7 +2710,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:195 #: archaeological_operations/forms.py:781 -#: archaeological_operations/models.py:1281 +#: archaeological_operations/models.py:1292 msgid "Excavation end date" msgstr "" @@ -2725,7 +2725,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:220 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:9 #: archaeological_warehouse/forms.py:694 ishtar_common/models.py:714 -#: ishtar_common/models_imports.py:978 +#: ishtar_common/models_imports.py:980 msgid "Date" msgstr "" @@ -2764,10 +2764,10 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:307 #: archaeological_files/templates/ishtar/sheet_file.html:359 #: archaeological_files/templates/ishtar/sheet_file.html:415 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:231 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:255 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:186 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:211 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:243 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:267 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:202 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:227 #: ishtar_common/models.py:1847 ishtar_common/models.py:1879 msgid "Total" msgstr "" @@ -2876,48 +2876,48 @@ msgstr "" #: archaeological_finds/forms.py:811 archaeological_finds/forms.py:1024 #: archaeological_finds/forms.py:1333 archaeological_finds/forms.py:1965 #: archaeological_finds/models_finds.py:405 -#: archaeological_finds/models_finds.py:1810 +#: archaeological_finds/models_finds.py:1809 msgid "Free ID" msgstr "" #: archaeological_finds/forms.py:278 archaeological_finds/forms.py:614 #: archaeological_finds/forms.py:815 archaeological_finds/forms.py:1026 #: archaeological_finds/forms.py:1334 archaeological_finds/forms.py:2032 -#: archaeological_finds/models_finds.py:1811 +#: archaeological_finds/models_finds.py:1810 msgid "Denomination" msgstr "" #: archaeological_finds/forms.py:279 archaeological_finds/forms.py:816 -#: archaeological_finds/forms.py:1335 archaeological_finds/models_finds.py:1938 +#: archaeological_finds/forms.py:1335 archaeological_finds/models_finds.py:1937 msgid "Previous ID" msgstr "" #: archaeological_finds/forms.py:280 archaeological_finds/forms.py:820 -#: archaeological_finds/forms.py:1338 archaeological_finds/models_finds.py:1812 -msgid "Museum ID" +#: archaeological_finds/forms.py:1338 archaeological_finds/models_finds.py:1811 +msgid "Museum inventory number" msgstr "" #: archaeological_finds/forms.py:281 archaeological_finds/forms.py:821 -#: archaeological_finds/forms.py:1339 archaeological_finds/models_finds.py:1813 +#: archaeological_finds/forms.py:1339 archaeological_finds/models_finds.py:1812 msgid "Laboratory ID" msgstr "" #: archaeological_finds/forms.py:282 archaeological_finds/forms.py:822 -#: archaeological_finds/forms.py:1337 archaeological_finds/models_finds.py:1808 +#: archaeological_finds/forms.py:1337 archaeological_finds/models_finds.py:1807 msgid "Seal number" msgstr "" #: archaeological_finds/forms.py:283 archaeological_finds/forms.py:823 -#: archaeological_finds/forms.py:1340 archaeological_finds/models_finds.py:1935 +#: archaeological_finds/forms.py:1340 archaeological_finds/models_finds.py:1934 msgid "Mark" msgstr "" -#: archaeological_finds/forms.py:296 archaeological_finds/models_finds.py:1995 +#: archaeological_finds/forms.py:296 archaeological_finds/models_finds.py:1994 msgid "Public description" msgstr "" #: archaeological_finds/forms.py:298 archaeological_finds/forms.py:621 -#: archaeological_finds/forms.py:1446 archaeological_finds/models_finds.py:1878 +#: archaeological_finds/forms.py:1446 archaeological_finds/models_finds.py:1877 msgid "Is complete?" msgstr "" @@ -2925,18 +2925,18 @@ msgstr "" #: archaeological_finds/forms.py:835 archaeological_finds/models_finds.py:91 #: archaeological_finds/models_finds.py:1114 #: archaeological_finds/models_finds.py:1115 -#: archaeological_finds/models_finds.py:1821 +#: archaeological_finds/models_finds.py:1820 msgid "Material types" msgstr "" #: archaeological_finds/forms.py:303 archaeological_finds/forms.py:627 -#: archaeological_finds/forms.py:1455 archaeological_finds/models_finds.py:1825 -#: ishtar_common/models_imports.py:957 +#: archaeological_finds/forms.py:1455 archaeological_finds/models_finds.py:1824 +#: ishtar_common/models_imports.py:959 msgid "Material type quality" msgstr "" #: archaeological_finds/forms.py:306 archaeological_finds/forms.py:1457 -#: archaeological_finds/models_finds.py:1832 +#: archaeological_finds/models_finds.py:1831 msgid "Comment on the material" msgstr "" @@ -2944,12 +2944,12 @@ msgstr "" #: archaeological_finds/forms.py:838 archaeological_finds/models_finds.py:264 #: archaeological_finds/models_finds.py:1116 #: archaeological_finds/models_finds.py:1117 -#: archaeological_finds/models_finds.py:1880 +#: archaeological_finds/models_finds.py:1879 msgid "Object types" msgstr "" #: archaeological_finds/forms.py:313 archaeological_finds/forms.py:634 -#: archaeological_finds/forms.py:1464 archaeological_finds/models_finds.py:1884 +#: archaeological_finds/forms.py:1464 archaeological_finds/models_finds.py:1883 msgid "Object type quality" msgstr "" @@ -2960,48 +2960,48 @@ msgstr "" #: archaeological_finds/forms.py:319 archaeological_finds/forms.py:636 #: archaeological_finds/forms.py:1473 archaeological_finds/forms.py:1971 -#: archaeological_finds/models_finds.py:1839 +#: archaeological_finds/models_finds.py:1838 msgid "Number of remains" msgstr "" #: archaeological_finds/forms.py:321 archaeological_finds/forms.py:638 -#: archaeological_finds/forms.py:1475 archaeological_finds/models_finds.py:1915 +#: archaeological_finds/forms.py:1475 archaeological_finds/models_finds.py:1914 msgid "Minimum number of individuals (MNI)" msgstr "" #: archaeological_finds/forms.py:325 archaeological_finds/forms.py:642 -#: archaeological_finds/forms.py:1479 archaeological_finds/models_finds.py:1815 +#: archaeological_finds/forms.py:1479 archaeological_finds/models_finds.py:1814 msgid "Decoration" msgstr "" #: archaeological_finds/forms.py:328 archaeological_finds/forms.py:645 -#: archaeological_finds/forms.py:1480 archaeological_finds/models_finds.py:1816 +#: archaeological_finds/forms.py:1480 archaeological_finds/models_finds.py:1815 msgid "Inscription" msgstr "" #: archaeological_finds/forms.py:331 archaeological_finds/forms.py:648 #: archaeological_finds/forms.py:846 archaeological_finds/forms.py:1478 -#: archaeological_finds/models_finds.py:1818 +#: archaeological_finds/models_finds.py:1817 msgid "Manufacturing place" msgstr "" #: archaeological_finds/forms.py:334 archaeological_finds/forms.py:651 #: archaeological_finds/forms.py:849 archaeological_finds/forms.py:1482 #: archaeological_finds/models_finds.py:1157 -#: archaeological_finds/models_finds.py:1910 +#: archaeological_finds/models_finds.py:1909 msgid "Communicability" msgstr "" #: archaeological_finds/forms.py:338 archaeological_finds/forms.py:1486 -#: archaeological_finds/models_finds.py:1860 +#: archaeological_finds/models_finds.py:1859 #: archaeological_operations/forms.py:1221 -#: archaeological_operations/models.py:490 +#: archaeological_operations/models.py:491 msgid "Cultural attribution" msgstr "" #: archaeological_finds/forms.py:342 archaeological_finds/forms.py:657 #: archaeological_finds/forms.py:881 archaeological_finds/forms.py:1488 -#: archaeological_finds/models_finds.py:1937 +#: archaeological_finds/models_finds.py:1936 msgid "Comment on dating" msgstr "" @@ -3012,37 +3012,37 @@ msgid "Dimensions" msgstr "" #: archaeological_finds/forms.py:347 archaeological_finds/forms.py:661 -#: archaeological_finds/models_finds.py:1917 +#: archaeological_finds/models_finds.py:1916 msgid "Length (cm)" msgstr "" #: archaeological_finds/forms.py:350 archaeological_finds/forms.py:662 -#: archaeological_finds/models_finds.py:1918 +#: archaeological_finds/models_finds.py:1917 msgid "Width (cm)" msgstr "" #: archaeological_finds/forms.py:353 archaeological_finds/forms.py:663 -#: archaeological_finds/models_finds.py:1919 +#: archaeological_finds/models_finds.py:1918 msgid "Height (cm)" msgstr "" #: archaeological_finds/forms.py:356 archaeological_finds/forms.py:666 -#: archaeological_finds/models_finds.py:1922 +#: archaeological_finds/models_finds.py:1921 msgid "Thickness (cm)" msgstr "" #: archaeological_finds/forms.py:359 archaeological_finds/forms.py:664 -#: archaeological_finds/models_finds.py:1920 +#: archaeological_finds/models_finds.py:1919 msgid "Diameter (cm)" msgstr "" #: archaeological_finds/forms.py:362 archaeological_finds/forms.py:665 -#: archaeological_finds/models_finds.py:1921 +#: archaeological_finds/models_finds.py:1920 msgid "Circumference (cm)" msgstr "" #: archaeological_finds/forms.py:366 archaeological_finds/forms.py:667 -#: archaeological_finds/forms.py:1969 archaeological_finds/models_finds.py:1834 +#: archaeological_finds/forms.py:1969 archaeological_finds/models_finds.py:1833 #: archaeological_warehouse/models.py:692 msgid "Volume (l)" msgstr "" @@ -3066,19 +3066,19 @@ msgid "Clutter height (cm)" msgstr "" #: archaeological_finds/forms.py:386 archaeological_finds/forms.py:679 -#: archaeological_finds/forms.py:1559 archaeological_finds/models_finds.py:1933 +#: archaeological_finds/forms.py:1559 archaeological_finds/models_finds.py:1932 msgid "Dimensions comment" msgstr "" #: archaeological_finds/forms.py:390 archaeological_finds/forms.py:683 #: archaeological_finds/forms.py:868 archaeological_finds/forms.py:1564 #: archaeological_finds/models_finds.py:1158 -#: archaeological_finds/models_finds.py:1942 +#: archaeological_finds/models_finds.py:1941 msgid "Check" msgstr "" #: archaeological_finds/forms.py:392 archaeological_finds/forms.py:685 -#: archaeological_finds/forms.py:870 archaeological_finds/models_finds.py:1947 +#: archaeological_finds/forms.py:870 archaeological_finds/models_finds.py:1946 msgid "Check date" msgstr "" @@ -3096,12 +3096,13 @@ msgid "Excavation ID" msgstr "" #: archaeological_finds/forms.py:510 archaeological_finds/models_finds.py:423 -msgid "Discovery date (exact or TPQ)" +#: archaeological_finds/templates/ishtar/sheet_basefind.html:31 +msgid "Discovery date (exact or beginning)" msgstr "" #: archaeological_finds/forms.py:513 archaeological_finds/models_finds.py:426 #: archaeological_finds/templates/ishtar/sheet_basefind.html:33 -msgid "Discovery date (TAQ)" +msgid "Discovery date (end)" msgstr "" #: archaeological_finds/forms.py:516 archaeological_finds/forms.py:1445 @@ -3195,47 +3196,47 @@ msgstr "" #: archaeological_finds/forms.py:851 archaeological_finds/forms.py:1168 #: archaeological_finds/forms.py:1573 archaeological_finds/models_finds.py:1159 -#: archaeological_finds/models_finds.py:1977 +#: archaeological_finds/models_finds.py:1976 #: archaeological_warehouse/forms.py:580 msgid "Alteration" msgstr "" #: archaeological_finds/forms.py:853 archaeological_finds/forms.py:1174 #: archaeological_finds/forms.py:1574 archaeological_finds/models_finds.py:1160 -#: archaeological_finds/models_finds.py:1981 +#: archaeological_finds/models_finds.py:1980 #: archaeological_warehouse/forms.py:581 msgid "Alteration cause" msgstr "" #: archaeological_finds/forms.py:856 archaeological_finds/forms.py:1165 #: archaeological_finds/forms.py:1571 archaeological_finds/models_finds.py:1154 -#: archaeological_finds/models_finds.py:1962 -#: archaeological_warehouse/forms.py:579 ishtar_common/models_imports.py:941 +#: archaeological_finds/models_finds.py:1961 +#: archaeological_warehouse/forms.py:579 ishtar_common/models_imports.py:943 msgid "Conservatory state" msgstr "" #: archaeological_finds/forms.py:859 archaeological_finds/forms.py:1186 #: archaeological_finds/forms.py:1578 archaeological_finds/models_finds.py:1161 -#: archaeological_finds/models_finds.py:1987 +#: archaeological_finds/models_finds.py:1986 #: archaeological_warehouse/forms.py:585 msgid "Treatment emergency" msgstr "" #: archaeological_finds/forms.py:862 archaeological_finds/forms.py:1159 #: archaeological_finds/forms.py:1570 archaeological_finds/models_finds.py:1156 -#: archaeological_finds/models_finds.py:1904 +#: archaeological_finds/models_finds.py:1903 #: archaeological_warehouse/forms.py:578 msgid "Remarkability" msgstr "" #: archaeological_finds/forms.py:873 archaeological_finds/forms.py:1191 -#: archaeological_finds/models_finds.py:1993 +#: archaeological_finds/models_finds.py:1992 msgid "Appraisal date" msgstr "" #: archaeological_finds/forms.py:875 archaeological_finds/forms.py:1189 #: archaeological_finds/models_finds.py:1172 -#: archaeological_finds/models_finds.py:1992 +#: archaeological_finds/models_finds.py:1991 msgid "Insurance value" msgstr "" @@ -3261,7 +3262,7 @@ msgstr "" #: archaeological_finds/forms.py:2203 archaeological_finds/forms.py:2208 #: archaeological_finds/ishtar_menu.py:64 #: archaeological_finds/models_finds.py:884 -#: archaeological_finds/models_finds.py:1706 +#: archaeological_finds/models_finds.py:1705 #: archaeological_finds/templates/ishtar/sheet_findbasket.html:4 #: archaeological_finds/views.py:1230 archaeological_finds/wizards.py:416 msgid "Basket" @@ -3306,24 +3307,24 @@ msgstr "" #: archaeological_finds/forms.py:1153 archaeological_finds/forms.py:1569 #: archaeological_finds/models_finds.py:1155 -#: archaeological_finds/models_finds.py:1898 +#: archaeological_finds/models_finds.py:1897 #: archaeological_warehouse/forms.py:577 msgid "Integrity / interest" msgstr "" #: archaeological_finds/forms.py:1180 archaeological_finds/forms.py:1576 #: archaeological_finds/models_finds.py:1153 -#: archaeological_finds/models_finds.py:1972 +#: archaeological_finds/models_finds.py:1971 msgid "Recommended treatments" msgstr "" #: archaeological_finds/forms.py:1188 archaeological_finds/models_finds.py:1171 -#: archaeological_finds/models_finds.py:1948 +#: archaeological_finds/models_finds.py:1947 msgid "Estimated value" msgstr "" #: archaeological_finds/forms.py:1194 archaeological_finds/forms.py:1572 -#: archaeological_finds/models_finds.py:1968 +#: archaeological_finds/models_finds.py:1967 msgid "Conservatory comment" msgstr "" @@ -3357,10 +3358,10 @@ msgstr "" #: archaeological_operations/forms.py:712 #: archaeological_operations/forms.py:1678 #: archaeological_operations/forms.py:1744 -#: archaeological_operations/models.py:943 -#: archaeological_operations/models.py:1030 -#: archaeological_operations/models.py:1329 ishtar_common/models.py:4851 -#: ishtar_common/models_imports.py:927 +#: archaeological_operations/models.py:953 +#: archaeological_operations/models.py:1040 +#: archaeological_operations/models.py:1340 ishtar_common/models.py:4851 +#: ishtar_common/models_imports.py:929 msgid "Operation type" msgstr "" @@ -3419,19 +3420,19 @@ msgid "Discovery date before" msgstr "" #: archaeological_finds/forms.py:1434 -msgid "Discovery date (exact or TPQ) after" +msgid "Discovery date (exact or beginning) after" msgstr "" #: archaeological_finds/forms.py:1437 -msgid "Discovery date (exact or TPQ) before" +msgid "Discovery date (exact or beginning) before" msgstr "" #: archaeological_finds/forms.py:1440 -msgid "Discovery date (TAQ) after" +msgid "Discovery date (end) after" msgstr "" #: archaeological_finds/forms.py:1443 -msgid "Discovery date (TAQ) before" +msgid "Discovery date (end) before" msgstr "" #: archaeological_finds/forms.py:1448 archaeological_finds/forms.py:1968 @@ -3445,7 +3446,7 @@ msgstr "" #: archaeological_finds/forms.py:1459 archaeological_finds/models_finds.py:263 #: archaeological_finds/models_finds.py:1152 #: archaeological_operations/templates/ishtar/sheet_operation.html:544 -#: archaeological_warehouse/forms.py:572 ishtar_common/models_imports.py:950 +#: archaeological_warehouse/forms.py:572 ishtar_common/models_imports.py:952 msgid "Object type" msgstr "" @@ -3582,7 +3583,7 @@ msgid "Treatment end date before" msgstr "" #: archaeological_finds/forms.py:1654 archaeological_finds/models_finds.py:1111 -#: archaeological_finds/models_finds.py:1872 +#: archaeological_finds/models_finds.py:1871 #: archaeological_finds/templates/ishtar/sheet_find.html:310 #: ishtar_common/forms_common.py:1679 msgid "Reference container" @@ -3648,8 +3649,8 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:470 #: ishtar_common/forms_common.py:1613 ishtar_common/models.py:977 #: ishtar_common/models.py:1731 ishtar_common/models.py:3411 -#: ishtar_common/models_common.py:171 ishtar_common/models_common.py:204 -#: ishtar_common/models_common.py:1933 ishtar_common/models_common.py:1949 +#: ishtar_common/models_common.py:172 ishtar_common/models_common.py:205 +#: ishtar_common/models_common.py:1968 ishtar_common/models_common.py:1984 #: ishtar_common/models_imports.py:567 msgid "Label" msgstr "" @@ -3686,7 +3687,7 @@ msgstr "" #: archaeological_finds/models_finds.py:174 #: archaeological_finds/models_treatments.py:208 #: archaeological_finds/models_treatments.py:751 -#: ishtar_common/models_imports.py:945 +#: ishtar_common/models_imports.py:947 msgid "Treatment type" msgstr "" @@ -3705,8 +3706,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:740 #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 -#: archaeological_operations/models.py:2406 -#: archaeological_operations/models.py:2743 ishtar_common/views.py:402 +#: archaeological_operations/models.py:2417 +#: archaeological_operations/models.py:2754 ishtar_common/views.py:402 msgid "Treatment" msgstr "" @@ -3803,8 +3804,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1174 #: archaeological_finds/models_treatments.py:1193 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 -#: archaeological_finds/wizards.py:553 archaeological_operations/models.py:2405 -#: archaeological_operations/models.py:2735 ishtar_common/views.py:401 +#: archaeological_finds/wizards.py:553 archaeological_operations/models.py:2416 +#: archaeological_operations/models.py:2746 ishtar_common/views.py:401 msgid "Treatment request" msgstr "" @@ -3819,16 +3820,16 @@ msgid "Would you like to delete this treatment?" msgstr "" #: archaeological_finds/forms_treatments.py:401 -#: archaeological_finds/models_finds.py:1864 -#: archaeological_finds/models_finds.py:3327 +#: archaeological_finds/models_finds.py:1863 +#: archaeological_finds/models_finds.py:3326 #: archaeological_finds/models_treatments.py:262 #: archaeological_finds/models_treatments.py:755 #: archaeological_finds/templates/ishtar/sheet_find.html:399 #: archaeological_finds/templates/ishtar/sheet_find.html:437 #: archaeological_finds/templates/ishtar/sheet_find.html:475 #: archaeological_warehouse/forms.py:323 archaeological_warehouse/models.py:796 -#: archaeological_warehouse/models.py:1157 -#: archaeological_warehouse/models.py:1984 +#: archaeological_warehouse/models.py:1158 +#: archaeological_warehouse/models.py:1985 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 #: ishtar_common/forms_common.py:2174 ishtar_common/forms_common.py:2359 #: ishtar_common/templates/ishtar/sheet_document.html:100 @@ -4020,7 +4021,7 @@ msgid "Treatment one to many - creation" msgstr "" #: archaeological_finds/models_finds.py:86 -#: archaeological_operations/models.py:2410 ishtar_common/models.py:3625 +#: archaeological_operations/models.py:2421 ishtar_common/models.py:3625 msgid "Code" msgstr "" @@ -4116,7 +4117,7 @@ msgstr "" msgid "Integrity / interest types" msgstr "" -#: archaeological_finds/models_finds.py:239 ishtar_common/models_imports.py:952 +#: archaeological_finds/models_finds.py:239 ishtar_common/models_imports.py:954 msgid "Remarkability type" msgstr "" @@ -4124,7 +4125,7 @@ msgstr "" msgid "Remarkability types" msgstr "" -#: archaeological_finds/models_finds.py:252 ishtar_common/models_imports.py:955 +#: archaeological_finds/models_finds.py:252 ishtar_common/models_imports.py:957 msgid "Batch type" msgstr "" @@ -4133,8 +4134,8 @@ msgid "Batch types" msgstr "" #: archaeological_finds/models_finds.py:277 -#: archaeological_finds/models_finds.py:1892 -#: ishtar_common/models_imports.py:958 +#: archaeological_finds/models_finds.py:1891 +#: ishtar_common/models_imports.py:960 msgid "Functional area" msgstr "" @@ -4146,7 +4147,7 @@ msgstr "" msgid "Object type quality types" msgstr "" -#: archaeological_finds/models_finds.py:304 ishtar_common/models_imports.py:953 +#: archaeological_finds/models_finds.py:304 ishtar_common/models_imports.py:955 msgid "Alteration type" msgstr "" @@ -4154,7 +4155,7 @@ msgstr "" msgid "Alteration types" msgstr "" -#: archaeological_finds/models_finds.py:318 ishtar_common/models_imports.py:954 +#: archaeological_finds/models_finds.py:318 ishtar_common/models_imports.py:956 msgid "Alteration cause type" msgstr "" @@ -4162,7 +4163,7 @@ msgstr "" msgid "Alteration cause types" msgstr "" -#: archaeological_finds/models_finds.py:332 ishtar_common/models_imports.py:948 +#: archaeological_finds/models_finds.py:332 ishtar_common/models_imports.py:950 msgid "Treatment emergency type" msgstr "" @@ -4178,7 +4179,7 @@ msgstr "" msgid "Communicability types" msgstr "" -#: archaeological_finds/models_finds.py:359 ishtar_common/models_imports.py:956 +#: archaeological_finds/models_finds.py:359 ishtar_common/models_imports.py:958 msgid "Checked type" msgstr "" @@ -4218,7 +4219,7 @@ msgid "Concatenation of associated material types codes" msgstr "" #: archaeological_finds/models_finds.py:477 -#: archaeological_finds/models_finds.py:1801 +#: archaeological_finds/models_finds.py:1800 msgid "Base find" msgstr "" @@ -4251,7 +4252,7 @@ msgid "Manage basket" msgstr "" #: archaeological_finds/models_finds.py:935 -#: archaeological_warehouse/models.py:1853 +#: archaeological_warehouse/models.py:1854 msgid "Add treatment" msgstr "" @@ -4284,11 +4285,11 @@ msgid "Base find - Special interest" msgstr "" #: archaeological_finds/models_finds.py:1108 -msgid "Base find - Discovery date (exact or TPQ)" +msgid "Base find - Discovery date (exact or beginning)" msgstr "" #: archaeological_finds/models_finds.py:1109 -msgid "Base find - Discovery date (TAQ)" +msgid "Base find - Discovery date (end)" msgstr "" #: archaeological_finds/models_finds.py:1170 @@ -4316,7 +4317,7 @@ msgid "denomination" msgstr "" #: archaeological_finds/models_finds.py:1260 -#: archaeological_warehouse/models.py:933 +#: archaeological_warehouse/models.py:934 msgctxt "key for text search" msgid "code-patriarche" msgstr "" @@ -4327,34 +4328,34 @@ msgid "operation-type" msgstr "" #: archaeological_finds/models_finds.py:1268 -#: archaeological_operations/models.py:380 -#: archaeological_operations/models.py:1094 +#: archaeological_operations/models.py:381 +#: archaeological_operations/models.py:1105 msgctxt "key for text search" msgid "area" msgstr "" #: archaeological_finds/models_finds.py:1277 -#: archaeological_warehouse/models.py:942 +#: archaeological_warehouse/models.py:943 msgctxt "key for text search" msgid "site-name" msgstr "" #: archaeological_finds/models_finds.py:1282 -#: archaeological_finds/models_finds.py:1739 -#: archaeological_warehouse/models.py:947 +#: archaeological_finds/models_finds.py:1738 +#: archaeological_warehouse/models.py:948 msgctxt "key for text search" msgid "context-record-site" msgstr "" #: archaeological_finds/models_finds.py:1287 -#: archaeological_warehouse/models.py:952 +#: archaeological_warehouse/models.py:953 msgctxt "key for text search" msgid "context-record-site-name" msgstr "" #: archaeological_finds/models_finds.py:1291 -#: archaeological_finds/models_finds.py:1734 -#: archaeological_warehouse/models.py:956 ishtar_common/models.py:3936 +#: archaeological_finds/models_finds.py:1733 +#: archaeological_warehouse/models.py:957 ishtar_common/models.py:3936 #: ishtar_common/models.py:4033 msgctxt "key for text search" msgid "context-record" @@ -4366,13 +4367,13 @@ msgid "context-record-relation-type" msgstr "" #: archaeological_finds/models_finds.py:1303 archaeological_finds/tests.py:1260 -#: archaeological_warehouse/models.py:968 +#: archaeological_warehouse/models.py:969 msgctxt "key for text search" msgid "material" msgstr "" #: archaeological_finds/models_finds.py:1307 -#: archaeological_warehouse/models.py:972 +#: archaeological_warehouse/models.py:973 msgctxt "key for text search" msgid "object-type" msgstr "" @@ -4383,19 +4384,19 @@ msgid "recommended-treatments" msgstr "" #: archaeological_finds/models_finds.py:1315 archaeological_finds/tests.py:1438 -#: archaeological_warehouse/models.py:980 +#: archaeological_warehouse/models.py:981 msgctxt "key for text search" msgid "conservatory" msgstr "" #: archaeological_finds/models_finds.py:1319 -#: archaeological_warehouse/models.py:984 +#: archaeological_warehouse/models.py:985 msgctxt "key for text search" msgid "integrity" msgstr "" #: archaeological_finds/models_finds.py:1323 -#: archaeological_warehouse/models.py:988 +#: archaeological_warehouse/models.py:989 msgctxt "key for text search" msgid "remarkability" msgstr "" @@ -4421,8 +4422,8 @@ msgid "container" msgstr "" #: archaeological_finds/models_finds.py:1342 -#: archaeological_finds/models_finds.py:1737 -#: archaeological_warehouse/models.py:902 +#: archaeological_finds/models_finds.py:1736 +#: archaeological_warehouse/models.py:903 msgctxt "key for text search" msgid "location" msgstr "" @@ -4449,7 +4450,7 @@ msgid "last-modified-by" msgstr "" #: archaeological_finds/models_finds.py:1365 -#: ishtar_common/models_common.py:1437 +#: ishtar_common/models_common.py:1472 msgctxt "key for text search" msgid "created-by" msgstr "" @@ -4720,19 +4721,19 @@ msgid "check-date-after" msgstr "" #: archaeological_finds/models_finds.py:1561 -#: archaeological_warehouse/models.py:992 +#: archaeological_warehouse/models.py:993 msgctxt "key for text search" msgid "alterations" msgstr "" #: archaeological_finds/models_finds.py:1565 -#: archaeological_warehouse/models.py:996 +#: archaeological_warehouse/models.py:997 msgctxt "key for text search" msgid "alteration-causes" msgstr "" #: archaeological_finds/models_finds.py:1569 -#: archaeological_warehouse/models.py:1000 +#: archaeological_warehouse/models.py:1001 msgctxt "key for text search" msgid "treatment-emergency" msgstr "" @@ -4768,7 +4769,7 @@ msgid "appraisal-date-after" msgstr "" #: archaeological_finds/models_finds.py:1597 -#: archaeological_operations/models.py:428 +#: archaeological_operations/models.py:429 msgctxt "key for text search" msgid "cultural-attribution" msgstr "" @@ -4784,21 +4785,21 @@ msgid "operation-address" msgstr "" #: archaeological_finds/models_finds.py:1613 -#: archaeological_operations/models.py:1122 +#: archaeological_operations/models.py:1133 msgctxt "key for text search" msgid "scientist" msgstr "" #: archaeological_finds/models_finds.py:1617 archaeological_finds/tests.py:1354 -#: archaeological_operations/models.py:1126 +#: archaeological_operations/models.py:1137 #: archaeological_operations/tests.py:2873 #: archaeological_operations/tests.py:3324 msgctxt "key for text search" msgid "operator" msgstr "" -#: archaeological_finds/models_finds.py:1713 -#: archaeological_finds/models_finds.py:2353 +#: archaeological_finds/models_finds.py:1712 +#: archaeological_finds/models_finds.py:2352 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 #: archaeological_finds/views.py:1274 archaeological_warehouse/forms.py:679 #: archaeological_warehouse/views.py:297 ishtar_common/models.py:4071 @@ -4808,111 +4809,111 @@ msgstr "" msgid "Packaging" msgstr "" -#: archaeological_finds/models_finds.py:1721 +#: archaeological_finds/models_finds.py:1720 msgid "Treatment many to one" msgstr "" -#: archaeological_finds/models_finds.py:1835 +#: archaeological_finds/models_finds.py:1834 msgid "Weight" msgstr "" -#: archaeological_finds/models_finds.py:1837 +#: archaeological_finds/models_finds.py:1836 msgid "Weight unit" msgstr "" -#: archaeological_finds/models_finds.py:1846 +#: archaeological_finds/models_finds.py:1845 #: archaeological_finds/templates/ishtar/sheet_find.html:427 msgid "Upstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:1853 +#: archaeological_finds/models_finds.py:1852 #: archaeological_finds/templates/ishtar/sheet_find.html:465 msgid "Downstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:1924 +#: archaeological_finds/models_finds.py:1923 msgid "Clutter - long side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:1927 +#: archaeological_finds/models_finds.py:1926 msgid "Clutter - short side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:1930 +#: archaeological_finds/models_finds.py:1929 msgid "Clutter - height (cm)" msgstr "" -#: archaeological_finds/models_finds.py:1951 +#: archaeological_finds/models_finds.py:1950 msgid "Collection" msgstr "" -#: archaeological_finds/models_finds.py:1956 +#: archaeological_finds/models_finds.py:1955 msgid "Do not use - need evolutions" msgstr "" -#: archaeological_finds/models_finds.py:2010 +#: archaeological_finds/models_finds.py:2009 #: archaeological_finds/models_treatments.py:289 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:71 msgid "Treatments" msgstr "" -#: archaeological_finds/models_finds.py:2013 +#: archaeological_finds/models_finds.py:2012 msgid "Related treatments when no new find is created" msgstr "" -#: archaeological_finds/models_finds.py:2029 +#: archaeological_finds/models_finds.py:2028 msgid "Cached object types label" msgstr "" -#: archaeological_finds/models_finds.py:2035 +#: archaeological_finds/models_finds.py:2034 msgid "Cached material types label" msgstr "" -#: archaeological_finds/models_finds.py:2067 +#: archaeological_finds/models_finds.py:2066 msgid "FIND" msgstr "" -#: archaeological_finds/models_finds.py:2205 +#: archaeological_finds/models_finds.py:2204 msgid "Material types string" msgstr "" -#: archaeological_finds/models_finds.py:2206 +#: archaeological_finds/models_finds.py:2205 msgid "Material types code string" msgstr "" -#: archaeological_finds/models_finds.py:2207 +#: archaeological_finds/models_finds.py:2206 msgid "Recommendations string from material" msgstr "" -#: archaeological_finds/models_finds.py:2208 +#: archaeological_finds/models_finds.py:2207 msgid "Complete ID of associated base finds" msgstr "" -#: archaeological_finds/models_finds.py:2209 +#: archaeological_finds/models_finds.py:2208 msgid "Label of associated context records" msgstr "" -#: archaeological_finds/models_finds.py:2326 +#: archaeological_finds/models_finds.py:2325 msgid "Add to basket" msgstr "" -#: archaeological_finds/models_finds.py:2334 +#: archaeological_finds/models_finds.py:2333 msgid "Simple treatment" msgstr "" -#: archaeological_finds/models_finds.py:2342 +#: archaeological_finds/models_finds.py:2341 msgid "Divide treatment" msgstr "" -#: archaeological_finds/models_finds.py:2907 +#: archaeological_finds/models_finds.py:2906 msgid "No reference container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:2913 +#: archaeological_finds/models_finds.py:2912 msgid "No container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:3350 ishtar_common/forms_common.py:118 +#: archaeological_finds/models_finds.py:3349 ishtar_common/forms_common.py:118 #: 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 @@ -4920,11 +4921,11 @@ msgstr "" msgid "Person" msgstr "" -#: archaeological_finds/models_finds.py:3358 +#: archaeological_finds/models_finds.py:3357 msgid "Property" msgstr "" -#: archaeological_finds/models_finds.py:3359 +#: archaeological_finds/models_finds.py:3358 msgid "Properties" msgstr "" @@ -4955,7 +4956,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:153 #: archaeological_finds/models_treatments.py:1050 -#: archaeological_operations/models.py:2545 +#: archaeological_operations/models.py:2556 msgctxt "key for text search" msgid "index" msgstr "" @@ -5106,10 +5107,6 @@ msgstr "" msgid "Discovery year" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_basefind.html:31 -msgid "Discovery date (TPQ)" -msgstr "" - #: archaeological_finds/templates/ishtar/sheet_basefind.html:61 #: ishtar_common/forms.py:931 msgid "Last modified by" @@ -5207,8 +5204,8 @@ msgid "Associated treatment files" 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 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:36 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:32 #: ishtar_common/forms_common.py:1857 #: ishtar_common/templates/ishtar/sheet_document.html:57 msgid "Content" @@ -5283,7 +5280,7 @@ msgstr "" msgid "Treatment informations:" msgstr "" -#: archaeological_finds/tests.py:944 archaeological_warehouse/models.py:1623 +#: archaeological_finds/tests.py:944 archaeological_warehouse/models.py:1624 msgid "The division {} {} do not exist for the location {}." msgstr "" @@ -5292,8 +5289,8 @@ msgstr "" #: ishtar_common/forms.py:1157 ishtar_common/forms.py:1236 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 #: ishtar_common/templatetags/window_field.py:19 -#: ishtar_common/views_item.py:589 ishtar_common/views_item.py:855 -#: ishtar_common/views_item.py:892 ishtar_common/wizards.py:501 +#: ishtar_common/views_item.py:589 ishtar_common/views_item.py:857 +#: ishtar_common/views_item.py:894 ishtar_common/wizards.py:501 msgid "Yes" msgstr "" @@ -5399,26 +5396,26 @@ msgstr "" #: archaeological_operations/forms.py:1059 #: archaeological_operations/forms.py:1075 #: archaeological_operations/forms.py:1081 -#: archaeological_operations/models.py:3033 +#: archaeological_operations/models.py:3044 #: archaeological_operations/templates/ishtar/sheet_operation.html:494 msgid "Parcels" msgstr "" #: archaeological_operations/forms.py:76 -#: archaeological_operations/models.py:3015 +#: archaeological_operations/models.py:3026 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Section" msgstr "" #: archaeological_operations/forms.py:79 -#: archaeological_operations/models.py:3017 +#: archaeological_operations/models.py:3028 msgid "Parcel number" msgstr "" #: archaeological_operations/forms.py:81 -#: archaeological_operations/models.py:3019 -#: archaeological_operations/models.py:3047 -#: archaeological_operations/models.py:3112 +#: archaeological_operations/models.py:3030 +#: archaeological_operations/models.py:3058 +#: archaeological_operations/models.py:3123 msgid "Public domain" msgstr "" @@ -5476,13 +5473,13 @@ msgstr "" #: archaeological_operations/forms.py:497 #: archaeological_operations/forms.py:711 -#: archaeological_operations/models.py:1465 +#: archaeological_operations/models.py:1476 msgid "DRASSM code" msgstr "" #: archaeological_operations/forms.py:505 #: archaeological_operations/forms.py:716 -#: archaeological_operations/models.py:1400 +#: archaeological_operations/models.py:1411 msgid "Address / Locality" msgstr "" @@ -5492,14 +5489,14 @@ msgstr "" #: archaeological_operations/forms.py:515 #: archaeological_operations/forms.py:767 -#: archaeological_operations/models.py:2686 +#: archaeological_operations/models.py:2697 msgid "Scientific monitor" msgstr "" #: archaeological_operations/forms.py:524 #: archaeological_operations/forms.py:756 #: archaeological_operations/forms.py:1682 -#: archaeological_operations/models.py:1299 +#: archaeological_operations/models.py:1310 msgid "Operator" msgstr "" @@ -5510,10 +5507,10 @@ msgstr "" #: archaeological_operations/forms.py:1846 #: archaeological_operations/models.py:306 #: archaeological_operations/models.py:315 -#: archaeological_operations/models.py:487 -#: archaeological_operations/models.py:947 -#: archaeological_operations/models.py:1033 -#: archaeological_operations/models.py:1334 +#: archaeological_operations/models.py:488 +#: archaeological_operations/models.py:957 +#: archaeological_operations/models.py:1043 +#: archaeological_operations/models.py:1345 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:9 msgid "Remains" msgstr "" @@ -5540,34 +5537,34 @@ msgstr "" #: archaeological_operations/forms.py:544 #: archaeological_operations/forms.py:817 -#: archaeological_operations/models.py:1403 +#: archaeological_operations/models.py:1414 msgid "Comment about scientific documentation" msgstr "" #: archaeological_operations/forms.py:545 #: archaeological_operations/forms.py:819 -#: archaeological_operations/models.py:949 -#: archaeological_operations/models.py:1446 +#: archaeological_operations/models.py:959 +#: archaeological_operations/models.py:1457 msgid "Record quality" msgstr "" #: archaeological_operations/forms.py:546 #: archaeological_operations/forms.py:785 -#: archaeological_operations/models.py:1355 +#: archaeological_operations/models.py:1366 msgid "Report processing" msgstr "" #: archaeological_operations/forms.py:548 #: archaeological_operations/forms.py:738 -#: archaeological_operations/models.py:1437 +#: archaeological_operations/models.py:1448 msgid "Virtual operation" msgstr "" #: archaeological_operations/forms.py:569 #: archaeological_operations/forms.py:808 #: archaeological_operations/forms.py:1690 -#: archaeological_operations/models.py:950 -#: archaeological_operations/models.py:1456 +#: archaeological_operations/models.py:960 +#: archaeological_operations/models.py:1467 msgid "Documentation received" msgstr "" @@ -5582,8 +5579,8 @@ msgstr "" #: archaeological_operations/forms.py:576 #: archaeological_operations/forms.py:813 #: archaeological_operations/forms.py:1694 -#: archaeological_operations/models.py:951 -#: archaeological_operations/models.py:1461 +#: archaeological_operations/models.py:961 +#: archaeological_operations/models.py:1472 msgid "Finds received" msgstr "" @@ -5605,12 +5602,12 @@ msgstr "" #: archaeological_operations/forms.py:714 #: archaeological_operations/forms.py:1742 -#: archaeological_operations/models.py:1399 +#: archaeological_operations/models.py:1410 msgid "Generic name" msgstr "" #: archaeological_operations/forms.py:730 -#: archaeological_operations/models.py:1360 +#: archaeological_operations/models.py:1371 msgid "Old code" msgstr "" @@ -5623,7 +5620,7 @@ msgid "Head scientist" msgstr "" #: archaeological_operations/forms.py:764 -#: archaeological_operations/models.py:1397 +#: archaeological_operations/models.py:1408 msgid "Operator reference" msgstr "" @@ -5631,8 +5628,8 @@ msgstr "" #: archaeological_operations/forms.py:1344 #: archaeological_operations/forms.py:1698 #: archaeological_operations/forms.py:1835 -#: archaeological_operations/models.py:505 -#: archaeological_operations/models.py:1313 +#: archaeological_operations/models.py:506 +#: archaeological_operations/models.py:1324 msgid "Collaborators" msgstr "" @@ -5641,17 +5638,17 @@ msgid "Dates / Administrative" msgstr "" #: archaeological_operations/forms.py:783 -#: archaeological_operations/models.py:1284 +#: archaeological_operations/models.py:1295 msgid "Report delivery date" msgstr "" #: archaeological_operations/forms.py:805 -#: archaeological_operations/models.py:1453 +#: archaeological_operations/models.py:1464 msgid "Deadline for submission of the documentation" msgstr "" #: archaeological_operations/forms.py:810 -#: archaeological_operations/models.py:1459 +#: archaeological_operations/models.py:1470 msgid "Deadline for submission of the finds" msgstr "" @@ -5660,12 +5657,12 @@ msgid "Scientific" msgstr "" #: archaeological_operations/forms.py:822 -#: archaeological_operations/models.py:93 ishtar_common/models_imports.py:930 +#: archaeological_operations/models.py:93 ishtar_common/models_imports.py:932 msgid "Remain type" msgstr "" #: archaeological_operations/forms.py:828 -#: archaeological_operations/models.py:1451 +#: archaeological_operations/models.py:1462 msgid "Abstract" msgstr "" @@ -5690,7 +5687,7 @@ msgid "Bad operation code" msgstr "" #: archaeological_operations/forms.py:927 -#: archaeological_operations/models.py:1899 +#: archaeological_operations/models.py:1910 msgid "Operation code" msgstr "" @@ -5704,12 +5701,12 @@ msgid "Operation - 015 - Court-ordered seizure" msgstr "" #: archaeological_operations/forms.py:972 -#: archaeological_operations/models.py:1468 +#: archaeological_operations/models.py:1479 msgid "Seizure name" msgstr "" #: archaeological_operations/forms.py:975 -#: archaeological_operations/models.py:1470 +#: archaeological_operations/models.py:1481 msgid "Official report number" msgstr "" @@ -5718,12 +5715,12 @@ msgid "Protagonist" msgstr "" #: archaeological_operations/forms.py:987 -#: archaeological_operations/models.py:1482 +#: archaeological_operations/models.py:1493 msgid "Applicant authority" msgstr "" #: archaeological_operations/forms.py:993 -#: archaeological_operations/models.py:1490 +#: archaeological_operations/models.py:1501 msgid "Writer of the minutes" msgstr "" @@ -5736,22 +5733,22 @@ msgid "Operation - 033 - Preventive - Excavation" msgstr "" #: archaeological_operations/forms.py:1002 -#: archaeological_operations/models.py:1339 +#: archaeological_operations/models.py:1350 msgid "Cost (euros)" msgstr "" #: archaeological_operations/forms.py:1003 -#: archaeological_operations/models.py:1343 +#: archaeological_operations/models.py:1354 msgid "Scheduled man-days" msgstr "" #: archaeological_operations/forms.py:1005 -#: archaeological_operations/models.py:1347 +#: archaeological_operations/models.py:1358 msgid "Optional man-days" msgstr "" #: archaeological_operations/forms.py:1007 -#: archaeological_operations/models.py:1351 +#: archaeological_operations/models.py:1362 msgid "Effective man-days" msgstr "" @@ -5764,17 +5761,17 @@ msgid "Operation - 037 - Preventive - Diagnostic" msgstr "" #: archaeological_operations/forms.py:1023 -#: archaeological_operations/models.py:1371 +#: archaeological_operations/models.py:1382 msgid "Prescription on zoning" msgstr "" #: archaeological_operations/forms.py:1025 -#: archaeological_operations/models.py:1375 +#: archaeological_operations/models.py:1386 msgid "Prescription on large area" msgstr "" #: archaeological_operations/forms.py:1028 -#: archaeological_operations/models.py:1378 +#: archaeological_operations/models.py:1389 msgid "Prescription on geoarchaeological context" msgstr "" @@ -5798,8 +5795,8 @@ msgstr "" #: archaeological_operations/forms.py:1213 #: archaeological_operations/forms.py:1329 #: archaeological_operations/forms.py:1794 -#: archaeological_operations/models.py:482 -#: archaeological_warehouse/models.py:1991 ishtar_common/forms_common.py:1782 +#: archaeological_operations/models.py:483 +#: archaeological_warehouse/models.py:1992 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 @@ -5836,55 +5833,55 @@ msgstr "" #: archaeological_operations/forms.py:1239 #: archaeological_operations/forms.py:1348 -#: archaeological_operations/models.py:497 +#: archaeological_operations/models.py:498 msgid "National Geographic Institute locality" msgstr "" #: archaeological_operations/forms.py:1242 #: archaeological_operations/forms.py:1352 -#: archaeological_operations/models.py:500 +#: archaeological_operations/models.py:501 msgid "Cadastral locality" msgstr "" #: archaeological_operations/forms.py:1246 #: archaeological_operations/forms.py:1396 -#: archaeological_operations/models.py:517 +#: archaeological_operations/models.py:518 msgid "AffMar number" msgstr "" #: archaeological_operations/forms.py:1248 #: archaeological_operations/forms.py:1398 -#: archaeological_operations/models.py:520 +#: archaeological_operations/models.py:521 msgid "DRASSM number" msgstr "" #: archaeological_operations/forms.py:1250 #: archaeological_operations/forms.py:1400 -#: archaeological_operations/models.py:509 +#: archaeological_operations/models.py:510 msgid "Shipwreck name" msgstr "" #: archaeological_operations/forms.py:1253 #: archaeological_operations/forms.py:1408 -#: archaeological_operations/models.py:511 +#: archaeological_operations/models.py:512 msgid "Oceanographic service localisation" msgstr "" #: archaeological_operations/forms.py:1256 #: archaeological_operations/forms.py:1402 -#: archaeological_operations/models.py:513 +#: archaeological_operations/models.py:514 msgid "Shipwreck code" msgstr "" #: archaeological_operations/forms.py:1258 #: archaeological_operations/forms.py:1404 -#: archaeological_operations/models.py:514 +#: archaeological_operations/models.py:515 msgid "Sinking date" msgstr "" #: archaeological_operations/forms.py:1260 #: archaeological_operations/forms.py:1406 -#: archaeological_operations/models.py:515 +#: archaeological_operations/models.py:516 msgid "Discovery area" msgstr "" @@ -5917,12 +5914,12 @@ msgid "You should select an administrative act." msgstr "" #: archaeological_operations/forms.py:1496 -#: archaeological_operations/models.py:2711 +#: archaeological_operations/models.py:2722 msgid "Signatory" msgstr "" #: archaeological_operations/forms.py:1503 -#: archaeological_operations/models.py:2746 +#: archaeological_operations/models.py:2757 msgid "Signature date" msgstr "" @@ -6018,7 +6015,7 @@ msgstr "" msgid "Types of record quality" msgstr "" -#: archaeological_operations/models.py:158 +#: archaeological_operations/models.py:158 ishtar_common/models_imports.py:928 msgid "Cultural attribution type" msgstr "" @@ -6026,542 +6023,542 @@ msgstr "" msgid "Cultural attribution types" msgstr "" -#: archaeological_operations/models.py:374 -#: archaeological_operations/models.py:1130 +#: archaeological_operations/models.py:375 +#: archaeological_operations/models.py:1141 #: archaeological_operations/tests.py:3074 msgctxt "key for text search" msgid "remain" msgstr "" -#: archaeological_operations/models.py:386 +#: archaeological_operations/models.py:387 msgctxt "key for text search" msgid "locality-ngi" msgstr "" -#: archaeological_operations/models.py:389 +#: archaeological_operations/models.py:390 msgctxt "key for text search" msgid "locality-cadastral" msgstr "" -#: archaeological_operations/models.py:393 +#: archaeological_operations/models.py:394 msgctxt "key for text search" msgid "shipwreck-name" msgstr "" -#: archaeological_operations/models.py:397 +#: archaeological_operations/models.py:398 msgctxt "key for text search" msgid "oceanographic-service-localisation" msgstr "" -#: archaeological_operations/models.py:401 +#: archaeological_operations/models.py:402 msgctxt "key for text search" msgid "shipwreck-code" msgstr "" -#: archaeological_operations/models.py:405 +#: archaeological_operations/models.py:406 msgctxt "key for text search" msgid "sinking-date" msgstr "" -#: archaeological_operations/models.py:408 +#: archaeological_operations/models.py:409 msgctxt "key for text search" msgid "discovery-area" msgstr "" -#: archaeological_operations/models.py:416 +#: archaeological_operations/models.py:417 msgctxt "key for text search" msgid "top-operation" msgstr "" -#: archaeological_operations/models.py:420 +#: archaeological_operations/models.py:421 msgctxt "key for text search" msgid "numero-drassm" msgstr "" -#: archaeological_operations/models.py:424 +#: archaeological_operations/models.py:425 msgctxt "key for text search" msgid "numero-affmar" msgstr "" -#: archaeological_operations/models.py:542 -#: archaeological_operations/models.py:1497 +#: archaeological_operations/models.py:543 +#: archaeological_operations/models.py:1508 msgid "Cached town label" msgstr "" -#: archaeological_operations/models.py:554 -#: archaeological_operations/models.py:1509 +#: archaeological_operations/models.py:555 +#: archaeological_operations/models.py:1520 msgid "Cached remains label" msgstr "" -#: archaeological_operations/models.py:564 -#: archaeological_operations/models.py:1426 +#: archaeological_operations/models.py:565 +#: archaeological_operations/models.py:1437 #: archaeological_operations/templates/ishtar/sheet_operation.html:325 msgid "Archaeological sites" msgstr "" -#: archaeological_operations/models.py:580 +#: archaeological_operations/models.py:581 msgid "SITE" msgstr "" -#: archaeological_operations/models.py:771 ishtar_common/forms.py:1156 +#: archaeological_operations/models.py:772 ishtar_common/forms.py:1156 #: ishtar_common/models.py:4977 ishtar_common/models.py:5134 -#: ishtar_common/models.py:5193 ishtar_common/views_item.py:1524 +#: ishtar_common/models.py:5193 ishtar_common/views_item.py:1532 msgid "Unknown" msgstr "" -#: archaeological_operations/models.py:773 +#: archaeological_operations/models.py:774 msgid "Virtual operation of site: {}" msgstr "" -#: archaeological_operations/models.py:1012 +#: archaeological_operations/models.py:1022 msgid "Associated file (label)" msgstr "" -#: archaeological_operations/models.py:1013 +#: archaeological_operations/models.py:1023 msgid "Operator name" msgstr "" -#: archaeological_operations/models.py:1014 +#: archaeological_operations/models.py:1024 msgid "Associated file (external ID)" msgstr "" -#: archaeological_operations/models.py:1015 +#: archaeological_operations/models.py:1025 msgid "Scientist (title)" msgstr "" -#: archaeological_operations/models.py:1016 +#: archaeological_operations/models.py:1026 msgid "Scientist (surname)" msgstr "" -#: archaeological_operations/models.py:1017 +#: archaeological_operations/models.py:1027 msgid "Scientist (name)" msgstr "" -#: archaeological_operations/models.py:1018 +#: archaeological_operations/models.py:1028 msgid "Scientist (full name)" msgstr "" -#: archaeological_operations/models.py:1019 +#: archaeological_operations/models.py:1029 msgid "Scientist - Organization (name)" msgstr "" -#: archaeological_operations/models.py:1020 +#: archaeological_operations/models.py:1030 msgid "Scientific monitor (title)" msgstr "" -#: archaeological_operations/models.py:1021 +#: archaeological_operations/models.py:1031 msgid "Scientific monitor (surname)" msgstr "" -#: archaeological_operations/models.py:1022 +#: archaeological_operations/models.py:1032 msgid "Scientific monitor (name)" msgstr "" -#: archaeological_operations/models.py:1023 +#: archaeological_operations/models.py:1033 msgid "Scientific monitor - Organization (name)" msgstr "" -#: archaeological_operations/models.py:1028 +#: archaeological_operations/models.py:1038 msgid "Archaeological sites (reference)" msgstr "" -#: archaeological_operations/models.py:1108 +#: archaeological_operations/models.py:1119 msgctxt "key for text search" msgid "address" msgstr "" -#: archaeological_operations/models.py:1115 +#: archaeological_operations/models.py:1126 #: archaeological_operations/tests.py:3081 msgctxt "key for text search" msgid "is-open" msgstr "" -#: archaeological_operations/models.py:1118 +#: archaeological_operations/models.py:1129 msgctxt "key for text search" msgid "scientific-monitor" msgstr "" -#: archaeological_operations/models.py:1136 +#: archaeological_operations/models.py:1147 msgctxt "key for text search" msgid "start-before" msgstr "" -#: archaeological_operations/models.py:1139 +#: archaeological_operations/models.py:1150 msgctxt "key for text search" msgid "start-after" msgstr "" -#: archaeological_operations/models.py:1142 +#: archaeological_operations/models.py:1153 msgctxt "key for text search" msgid "end-before" msgstr "" -#: archaeological_operations/models.py:1146 +#: archaeological_operations/models.py:1157 msgctxt "key for text search" msgid "end-after" msgstr "" -#: archaeological_operations/models.py:1150 +#: archaeological_operations/models.py:1161 #: archaeological_operations/tests.py:3124 msgctxt "key for text search" msgid "relation-types" msgstr "" -#: archaeological_operations/models.py:1156 +#: archaeological_operations/models.py:1167 msgctxt "key for text search" msgid "abstract" msgstr "" -#: archaeological_operations/models.py:1159 +#: archaeological_operations/models.py:1170 msgctxt "key for text search" msgid "scientific-documentation-comment" msgstr "" -#: archaeological_operations/models.py:1163 +#: archaeological_operations/models.py:1174 msgctxt "key for text search" msgid "record-quality" msgstr "" -#: archaeological_operations/models.py:1167 +#: archaeological_operations/models.py:1178 msgctxt "key for text search" msgid "report-processing" msgstr "" -#: archaeological_operations/models.py:1171 +#: archaeological_operations/models.py:1182 msgctxt "key for text search" msgid "virtual-operation" msgstr "" -#: archaeological_operations/models.py:1179 +#: archaeological_operations/models.py:1190 msgctxt "key for text search" msgid "documentation-received" msgstr "" -#: archaeological_operations/models.py:1183 +#: archaeological_operations/models.py:1194 msgctxt "key for text search" msgid "documentation-deadline-before" msgstr "" -#: archaeological_operations/models.py:1187 +#: archaeological_operations/models.py:1198 msgctxt "key for text search" msgid "documentation-deadline-after" msgstr "" -#: archaeological_operations/models.py:1191 +#: archaeological_operations/models.py:1202 msgctxt "key for text search" msgid "finds-received" msgstr "" -#: archaeological_operations/models.py:1198 +#: archaeological_operations/models.py:1209 msgctxt "key for text search" msgid "finds-deadline-before" msgstr "" -#: archaeological_operations/models.py:1202 +#: archaeological_operations/models.py:1213 msgctxt "key for text search" msgid "finds-deadline-after" msgstr "" -#: archaeological_operations/models.py:1206 +#: archaeological_operations/models.py:1217 msgctxt "key for text search" msgid "code-drassm" msgstr "" -#: archaeological_operations/models.py:1241 ishtar_common/models.py:3952 +#: archaeological_operations/models.py:1252 ishtar_common/models.py:3952 #: ishtar_common/models.py:4036 msgctxt "key for text search" msgid "file" msgstr "" -#: archaeological_operations/models.py:1290 +#: archaeological_operations/models.py:1301 msgid "Scientific manager" msgstr "" -#: archaeological_operations/models.py:1306 +#: archaeological_operations/models.py:1317 msgid "Operation monitor" msgstr "" -#: archaeological_operations/models.py:1432 +#: archaeological_operations/models.py:1443 msgid "Sites for which this operation is top operation" msgstr "" -#: archaeological_operations/models.py:1440 +#: archaeological_operations/models.py:1451 msgid "" "If checked, it means that this operation have not been officialy registered." msgstr "" -#: archaeological_operations/models.py:1474 +#: archaeological_operations/models.py:1485 msgid "Name of the protagonist" msgstr "" -#: archaeological_operations/models.py:1519 +#: archaeological_operations/models.py:1530 #: archaeological_operations/templates/ishtar/sheet_site.html:87 #: ishtar_common/models.py:1005 msgid "Operations" msgstr "" -#: archaeological_operations/models.py:1559 +#: archaeological_operations/models.py:1570 msgid "List of associated context records" msgstr "" -#: archaeological_operations/models.py:1560 +#: archaeological_operations/models.py:1571 msgid "List of associated containers" msgstr "" -#: archaeological_operations/models.py:1633 +#: archaeological_operations/models.py:1644 msgid "OPE" msgstr "" -#: archaeological_operations/models.py:1742 +#: archaeological_operations/models.py:1753 msgid "Intercommunal" msgstr "" -#: archaeological_operations/models.py:1865 +#: archaeological_operations/models.py:1876 msgid "context record" msgstr "" -#: archaeological_operations/models.py:1884 +#: archaeological_operations/models.py:1895 msgid "Code patriarche" msgstr "" -#: archaeological_operations/models.py:1932 +#: archaeological_operations/models.py:1943 msgid "This operation code already exists for this year" msgstr "" -#: archaeological_operations/models.py:1993 +#: archaeological_operations/models.py:2004 msgid "Number of parcels" msgstr "" -#: archaeological_operations/models.py:2003 +#: archaeological_operations/models.py:2014 msgid "Number of administrative acts" msgstr "" -#: archaeological_operations/models.py:2011 +#: archaeological_operations/models.py:2022 msgid "Number of indexed administrative acts" msgstr "" -#: archaeological_operations/models.py:2019 +#: archaeological_operations/models.py:2030 msgid "Number of context records" msgstr "" -#: archaeological_operations/models.py:2073 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:103 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:85 +#: archaeological_operations/models.py:2084 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:117 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:99 msgid "Number of finds" msgstr "" -#: archaeological_operations/models.py:2135 -#: archaeological_operations/models.py:2214 +#: archaeological_operations/models.py:2146 +#: archaeological_operations/models.py:2225 msgid "No type" msgstr "" -#: archaeological_operations/models.py:2179 +#: archaeological_operations/models.py:2190 msgid "Number of sources" msgstr "" -#: archaeological_operations/models.py:2224 +#: archaeological_operations/models.py:2235 msgid "Mean" msgstr "" -#: archaeological_operations/models.py:2316 ishtar_common/models_imports.py:931 +#: archaeological_operations/models.py:2327 ishtar_common/models_imports.py:933 msgid "Operation relation type" msgstr "" -#: archaeological_operations/models.py:2317 +#: archaeological_operations/models.py:2328 msgid "Operation relation types" msgstr "" -#: archaeological_operations/models.py:2342 +#: archaeological_operations/models.py:2353 msgid "Operation record relation" msgstr "" -#: archaeological_operations/models.py:2343 +#: archaeological_operations/models.py:2354 msgid "Operation record relations" msgstr "" -#: archaeological_operations/models.py:2409 +#: archaeological_operations/models.py:2420 msgid "Intended to" msgstr "" -#: archaeological_operations/models.py:2414 +#: archaeological_operations/models.py:2425 msgid "Associated template" msgstr "" -#: archaeological_operations/models.py:2417 +#: archaeological_operations/models.py:2428 msgid "Indexed" msgstr "" -#: archaeological_operations/models.py:2421 +#: archaeological_operations/models.py:2432 msgid "Act types" msgstr "" -#: archaeological_operations/models.py:2547 +#: archaeological_operations/models.py:2558 msgctxt "key for text search" msgid "other-ref" msgstr "" -#: archaeological_operations/models.py:2557 +#: archaeological_operations/models.py:2568 msgctxt "key for text search" msgid "indexed" msgstr "" -#: archaeological_operations/models.py:2560 -#: archaeological_warehouse/models.py:923 +#: archaeological_operations/models.py:2571 +#: archaeological_warehouse/models.py:924 msgctxt "key for text search" msgid "operation-town" msgstr "" -#: archaeological_operations/models.py:2564 +#: archaeological_operations/models.py:2575 msgctxt "key for text search" msgid "file-town" msgstr "" -#: archaeological_operations/models.py:2576 +#: archaeological_operations/models.py:2587 msgctxt "key for text search" msgid "operation-department" msgstr "" -#: archaeological_operations/models.py:2580 +#: archaeological_operations/models.py:2591 msgctxt "key for text search" msgid "file-department" msgstr "" -#: archaeological_operations/models.py:2584 +#: archaeological_operations/models.py:2595 msgctxt "key for text search" msgid "object" msgstr "" -#: archaeological_operations/models.py:2587 +#: archaeological_operations/models.py:2598 msgctxt "key for text search" msgid "signature-before" msgstr "" -#: archaeological_operations/models.py:2591 +#: archaeological_operations/models.py:2602 msgctxt "key for text search" msgid "signature-after" msgstr "" -#: archaeological_operations/models.py:2595 +#: archaeological_operations/models.py:2606 msgctxt "key for text search" msgid "file-name" msgstr "" -#: archaeological_operations/models.py:2607 +#: archaeological_operations/models.py:2618 msgctxt "key for text search" msgid "file-reference" msgstr "" -#: archaeological_operations/models.py:2611 +#: archaeological_operations/models.py:2622 msgctxt "key for text search" msgid "file-year" msgstr "" -#: archaeological_operations/models.py:2614 +#: archaeological_operations/models.py:2625 msgctxt "key for text search" msgid "file-other-reference" msgstr "" -#: archaeological_operations/models.py:2618 +#: archaeological_operations/models.py:2629 msgctxt "key for text search" msgid "file-in-charge" msgstr "" -#: archaeological_operations/models.py:2622 +#: archaeological_operations/models.py:2633 msgctxt "key for text search" msgid "file-permit-reference" msgstr "" -#: archaeological_operations/models.py:2626 +#: archaeological_operations/models.py:2637 msgctxt "key for text search" msgid "treatment-name" msgstr "" -#: archaeological_operations/models.py:2630 +#: archaeological_operations/models.py:2641 msgctxt "key for text search" msgid "treatment-reference" msgstr "" -#: archaeological_operations/models.py:2634 +#: archaeological_operations/models.py:2645 msgctxt "key for text search" msgid "treatment-year" msgstr "" -#: archaeological_operations/models.py:2637 +#: archaeological_operations/models.py:2648 msgctxt "key for text search" msgid "treatment-index" msgstr "" -#: archaeological_operations/models.py:2640 +#: archaeological_operations/models.py:2651 msgctxt "key for text search" msgid "treatment-type" msgstr "" -#: archaeological_operations/models.py:2644 +#: archaeological_operations/models.py:2655 msgctxt "key for text search" msgid "treatment-file-name" msgstr "" -#: archaeological_operations/models.py:2648 +#: archaeological_operations/models.py:2659 msgctxt "key for text search" msgid "treatment-file-reference" msgstr "" -#: archaeological_operations/models.py:2652 +#: archaeological_operations/models.py:2663 msgctxt "key for text search" msgid "treatment-file-year" msgstr "" -#: archaeological_operations/models.py:2656 +#: archaeological_operations/models.py:2667 msgctxt "key for text search" msgid "treatment-file-index" msgstr "" -#: archaeological_operations/models.py:2660 +#: archaeological_operations/models.py:2671 msgctxt "key for text search" msgid "treatment-file-type" msgstr "" -#: archaeological_operations/models.py:2694 +#: archaeological_operations/models.py:2705 msgid "Archaeological preventive operator" msgstr "" -#: archaeological_operations/models.py:2756 +#: archaeological_operations/models.py:2767 msgid "Cached values get from associated departments" msgstr "" -#: archaeological_operations/models.py:2762 +#: archaeological_operations/models.py:2773 msgid "Cached values get from associated towns" msgstr "" -#: archaeological_operations/models.py:2936 +#: archaeological_operations/models.py:2947 msgid "This index already exists for this year" msgstr "" -#: archaeological_operations/models.py:3026 +#: archaeological_operations/models.py:3037 msgid "Address - Locality" msgstr "" -#: archaeological_operations/models.py:3298 ishtar_common/models.py:3421 +#: archaeological_operations/models.py:3309 ishtar_common/models.py:3421 msgid "Owner" msgstr "" -#: archaeological_operations/models.py:3313 +#: archaeological_operations/models.py:3324 msgid "Parcel owner" msgstr "" -#: archaeological_operations/models.py:3314 +#: archaeological_operations/models.py:3325 msgid "Parcel owners" msgstr "" -#: archaeological_operations/models.py:3336 ishtar_common/models.py:4847 +#: archaeological_operations/models.py:3347 ishtar_common/models.py:4847 msgid "Is preventive" msgstr "" -#: archaeological_operations/models.py:3339 +#: archaeological_operations/models.py:3350 msgid "Operation type old" msgstr "" -#: archaeological_operations/models.py:3340 +#: archaeological_operations/models.py:3351 msgid "Operation types old" msgstr "" @@ -6595,10 +6592,10 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:117 #: archaeological_operations/templates/ishtar/sheet_operation.html:468 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:38 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:194 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:34 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:149 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:43 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:206 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:39 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:165 #: ishtar_common/templates/blocks/DataTables-tabs.html:30 msgid "Statistics" msgstr "" @@ -6637,8 +6634,8 @@ msgid "Associated containers" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:473 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:199 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:154 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:211 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:170 #: ishtar_common/models_rest.py:74 #: ishtar_common/templates/blocks/DataTables-content.html:28 #: ishtar_common/templates/blocks/DataTables-content.html:101 @@ -6650,14 +6647,14 @@ msgid "Export" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:478 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:204 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:159 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:216 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:175 msgid "Regenerate statistics" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:483 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:209 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:164 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:221 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:180 msgid "Last update:" msgstr "" @@ -6797,7 +6794,7 @@ msgstr "" #: archaeological_warehouse/forms.py:502 archaeological_warehouse/forms.py:723 #: archaeological_warehouse/ishtar_menu.py:34 #: archaeological_warehouse/models.py:400 -#: archaeological_warehouse/models.py:889 +#: archaeological_warehouse/models.py:890 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:4 #: ishtar_common/forms_common.py:1862 ishtar_common/models.py:5070 #: ishtar_common/views.py:397 @@ -6821,8 +6818,8 @@ msgid "Order fields must be different." msgstr "" #: archaeological_warehouse/forms.py:129 archaeological_warehouse/models.py:370 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:167 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:117 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:179 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:133 msgid "Divisions" msgstr "" @@ -6836,7 +6833,7 @@ msgstr "" #: archaeological_warehouse/forms.py:144 archaeological_warehouse/forms.py:204 #: archaeological_warehouse/forms.py:313 archaeological_warehouse/models.py:260 -#: archaeological_warehouse/models.py:349 ishtar_common/models_imports.py:944 +#: archaeological_warehouse/models.py:349 ishtar_common/models_imports.py:946 msgid "Warehouse type" msgstr "" @@ -6862,31 +6859,31 @@ msgid "" msgstr "" #: archaeological_warehouse/forms.py:239 ishtar_common/forms_common.py:538 -#: ishtar_common/forms_common.py:921 ishtar_common/models_common.py:3061 -#: ishtar_common/models_common.py:3219 +#: ishtar_common/forms_common.py:921 ishtar_common/models_common.py:3142 +#: ishtar_common/models_common.py:3300 msgid "Address complement" msgstr "" #: archaeological_warehouse/forms.py:242 ishtar_common/forms_common.py:541 -#: ishtar_common/forms_common.py:924 ishtar_common/models_common.py:3066 +#: ishtar_common/forms_common.py:924 ishtar_common/models_common.py:3147 msgid "Town (freeform)" msgstr "" #: archaeological_warehouse/forms.py:244 ishtar_common/forms_common.py:543 -#: ishtar_common/forms_common.py:926 ishtar_common/models_common.py:3074 +#: ishtar_common/forms_common.py:926 ishtar_common/models_common.py:3155 msgid "Country" msgstr "" #: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:545 -#: ishtar_common/forms_common.py:897 ishtar_common/models_common.py:3088 -#: ishtar_common/models_common.py:3231 +#: ishtar_common/forms_common.py:897 ishtar_common/models_common.py:3169 +#: ishtar_common/models_common.py:3312 #: 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:547 -#: ishtar_common/forms_common.py:907 ishtar_common/models_common.py:3104 +#: ishtar_common/forms_common.py:907 ishtar_common/models_common.py:3185 #: ishtar_common/templates/ishtar/sheet_person.html:45 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:55 msgid "Mobile phone" @@ -6909,16 +6906,16 @@ msgid "Container - 010 - General" msgstr "" #: archaeological_warehouse/forms.py:335 archaeological_warehouse/forms.py:506 -#: archaeological_warehouse/models.py:1132 +#: archaeological_warehouse/models.py:1133 msgid "Old reference" msgstr "" #: archaeological_warehouse/forms.py:337 archaeological_warehouse/forms.py:504 #: archaeological_warehouse/forms.py:728 archaeological_warehouse/models.py:698 -#: archaeological_warehouse/models.py:859 -#: archaeological_warehouse/models.py:1098 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:138 -#: ishtar_common/models_imports.py:942 +#: archaeological_warehouse/models.py:860 +#: archaeological_warehouse/models.py:1099 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:152 +#: ishtar_common/models_imports.py:944 msgid "Container type" msgstr "" @@ -6927,12 +6924,12 @@ msgid "Current location (warehouse)" msgstr "" #: archaeological_warehouse/forms.py:348 archaeological_warehouse/forms.py:513 -#: archaeological_warehouse/models.py:1115 +#: archaeological_warehouse/models.py:1116 msgid "Parent container" msgstr "" #: archaeological_warehouse/forms.py:358 archaeological_warehouse/forms.py:739 -#: archaeological_warehouse/models.py:1089 +#: archaeological_warehouse/models.py:1090 msgid "Responsibility" msgstr "" @@ -6941,7 +6938,7 @@ msgid "Automatically attached to the current warehouse if not filled." msgstr "" #: archaeological_warehouse/forms.py:371 -#: archaeological_warehouse/models.py:1122 +#: archaeological_warehouse/models.py:1123 msgid "Measured weight (g)" msgstr "" @@ -7047,10 +7044,10 @@ msgid "" msgstr "" #: archaeological_warehouse/ishtar_menu.py:70 -#: archaeological_warehouse/models.py:1158 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:169 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:119 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:201 +#: archaeological_warehouse/models.py:1159 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:181 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:135 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:217 msgid "Containers" msgstr "" @@ -7090,7 +7087,7 @@ msgid "Warehouses" msgstr "" #: archaeological_warehouse/models.py:495 -#: archaeological_warehouse/models.py:1582 +#: archaeological_warehouse/models.py:1583 msgid "No value" msgstr "" @@ -7141,7 +7138,7 @@ msgid "Container types" msgstr "" #: archaeological_warehouse/models.py:722 -#: archaeological_warehouse/models.py:1084 +#: archaeological_warehouse/models.py:1085 msgid "Deprecated - do not use" msgstr "" @@ -7149,253 +7146,257 @@ msgstr "" msgid "Container parent" msgstr "" -#: archaeological_warehouse/models.py:853 -#: archaeological_warehouse/models.py:1074 +#: archaeological_warehouse/models.py:854 +#: archaeological_warehouse/models.py:1075 msgid "Location (warehouse)" msgstr "" -#: archaeological_warehouse/models.py:854 +#: archaeological_warehouse/models.py:855 msgid "Responsibility (warehouse)" msgstr "" -#: archaeological_warehouse/models.py:886 +#: archaeological_warehouse/models.py:887 msgid "Location - index" msgstr "" -#: archaeological_warehouse/models.py:887 +#: archaeological_warehouse/models.py:888 msgid "Precise localisation" msgstr "" -#: archaeological_warehouse/models.py:905 +#: archaeological_warehouse/models.py:906 msgctxt "key for text search" msgid "responsibility" msgstr "" -#: archaeological_warehouse/models.py:916 +#: archaeological_warehouse/models.py:917 msgctxt "key for text search" msgid "old-reference" msgstr "" -#: archaeological_warehouse/models.py:928 +#: archaeological_warehouse/models.py:929 msgctxt "key for text search" msgid "operation-scientist" msgstr "" -#: archaeological_warehouse/models.py:960 +#: archaeological_warehouse/models.py:961 msgctxt "key for text search" msgid "find-label" msgstr "" -#: archaeological_warehouse/models.py:964 ishtar_common/models.py:3948 +#: archaeological_warehouse/models.py:965 ishtar_common/models.py:3948 msgctxt "key for text search" msgid "find-denomination" msgstr "" -#: archaeological_warehouse/models.py:976 +#: archaeological_warehouse/models.py:977 msgctxt "key for text search" msgid "preservation" msgstr "" -#: archaeological_warehouse/models.py:1004 +#: archaeological_warehouse/models.py:1005 msgctxt "key for text search" msgid "find-description" msgstr "" -#: archaeological_warehouse/models.py:1007 +#: archaeological_warehouse/models.py:1008 msgctxt "key for text search" msgid "empty" msgstr "" -#: archaeological_warehouse/models.py:1010 +#: archaeological_warehouse/models.py:1011 msgctxt "key for text search" msgid "parent-container" msgstr "" -#: archaeological_warehouse/models.py:1014 +#: archaeological_warehouse/models.py:1015 msgctxt "key for text search" msgid "contain-containers" msgstr "" -#: archaeological_warehouse/models.py:1018 +#: archaeological_warehouse/models.py:1019 msgctxt "key for text search" msgid "is-stationary" msgstr "" -#: archaeological_warehouse/models.py:1036 +#: archaeological_warehouse/models.py:1037 msgid "Division -" msgstr "" -#: archaeological_warehouse/models.py:1040 +#: archaeological_warehouse/models.py:1041 msgctxt "key for text search" msgid "division" msgstr "" -#: archaeological_warehouse/models.py:1080 +#: archaeological_warehouse/models.py:1081 msgid "Responsible warehouse" msgstr "" -#: archaeological_warehouse/models.py:1093 +#: archaeological_warehouse/models.py:1094 msgid "Warehouse that owns the container" msgstr "" -#: archaeological_warehouse/models.py:1102 +#: archaeological_warehouse/models.py:1103 msgid "Container ref." msgstr "" -#: archaeological_warehouse/models.py:1108 +#: archaeological_warehouse/models.py:1106 ishtar_common/models_common.py:2908 +msgid "Localisation" +msgstr "" + +#: archaeological_warehouse/models.py:1109 msgid "Cached location" msgstr "" -#: archaeological_warehouse/models.py:1111 +#: archaeological_warehouse/models.py:1112 msgid "Cached division" msgstr "" -#: archaeological_warehouse/models.py:1121 ishtar_common/models.py:4183 +#: archaeological_warehouse/models.py:1122 ishtar_common/models.py:4183 #: ishtar_common/models.py:4187 msgid "Container ID" msgstr "" -#: archaeological_warehouse/models.py:1124 +#: archaeological_warehouse/models.py:1125 msgid "Calculated weight (g)" msgstr "" -#: archaeological_warehouse/models.py:1127 +#: archaeological_warehouse/models.py:1128 msgid "Cached weight (g)" msgstr "" -#: archaeological_warehouse/models.py:1130 +#: archaeological_warehouse/models.py:1131 msgid "Entered weight if available otherwise calculated weight." msgstr "" -#: archaeological_warehouse/models.py:1354 +#: archaeological_warehouse/models.py:1355 msgid "Document with {}: {} does not exists" msgstr "" -#: archaeological_warehouse/models.py:1358 +#: archaeological_warehouse/models.py:1359 msgid "Multiple document with {}: {}" msgstr "" -#: archaeological_warehouse/models.py:1749 +#: archaeological_warehouse/models.py:1750 msgid "" "Associated operation - use it with caution, only return the first found " "operation" msgstr "" -#: archaeological_warehouse/models.py:1756 +#: archaeological_warehouse/models.py:1757 msgid "" "Associated context record - use it with caution, only return the first found " "context_record" msgstr "" -#: archaeological_warehouse/models.py:1760 +#: archaeological_warehouse/models.py:1761 msgid "Material types inside the container - string" msgstr "" -#: archaeological_warehouse/models.py:1761 +#: archaeological_warehouse/models.py:1762 msgid "Material types code - string" msgstr "" -#: archaeological_warehouse/models.py:1762 +#: archaeological_warehouse/models.py:1763 msgid "List of associated finds" msgstr "" -#: archaeological_warehouse/models.py:1989 +#: archaeological_warehouse/models.py:1990 msgid "Division" msgstr "" -#: archaeological_warehouse/models.py:1996 +#: archaeological_warehouse/models.py:1997 msgid "Container localisation" msgstr "" -#: archaeological_warehouse/models.py:1997 +#: archaeological_warehouse/models.py:1998 msgid "Container localisations" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:95 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:77 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:109 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:91 msgid "Number of containers" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:99 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:81 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:113 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:95 msgid "Number of divisions" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:107 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:89 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:121 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:103 msgid "Number of owned finds" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:115 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:129 msgid "Measured weight (kg)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:116 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:130 msgid "Calculated weight (kg)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:120 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:134 #, python-format msgid "Calculated weight and measured weight are too different (over 10%%)." msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:186 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:198 msgid "Empty" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:217 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:229 msgid "No container/division inside this container." msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:223 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:235 msgid "Finds by location" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:247 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:259 msgid "Containers by location" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:275 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:287 msgid "Document for this container" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:94 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:108 msgid "Default divisions (imports)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:124 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:140 msgid "No container inside this warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:128 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:144 msgid "Finds (hosted)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:133 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:149 msgid "No find inside this warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:137 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:153 msgid "Finds (owned)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:142 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:158 msgid "No find owned by this warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:172 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:188 msgid "No container/division inside this container" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:178 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:194 msgid "Finds by location in the warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:203 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:219 msgid "Containers by location in the warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:231 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:247 msgid "Document for this warehouse" msgstr "" @@ -7705,7 +7706,7 @@ msgstr "" msgid "Center" msgstr "" -#: ishtar_common/admin.py:1119 ishtar_common/models_common.py:2829 +#: ishtar_common/admin.py:1119 ishtar_common/models_common.py:2910 msgid "Limit" msgstr "" @@ -7821,7 +7822,7 @@ msgstr "" msgid "Import already imported/scheduled." msgstr "" -#: ishtar_common/admin.py:2196 ishtar_common/models_imports.py:1397 +#: ishtar_common/admin.py:2196 ishtar_common/models_imports.py:1399 msgid "Launch import" msgstr "" @@ -7912,7 +7913,7 @@ msgid "API - Remote access - Search model" msgstr "" #: ishtar_common/admin.py:2584 ishtar_common/models.py:450 -#: ishtar_common/models.py:733 ishtar_common/models_common.py:808 +#: ishtar_common/models.py:733 ishtar_common/models_common.py:809 #: ishtar_common/models_imports.py:836 ishtar_common/models_rest.py:106 #: ishtar_common/templates/ishtar/formset_import_match.html:44 #: ishtar_common/templates/ishtar/import_step_by_step.html:171 @@ -8340,8 +8341,8 @@ msgstr "" #: 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:3106 -#: ishtar_common/models_common.py:3241 ishtar_common/wizards.py:1951 +#: ishtar_common/forms_common.py:1151 ishtar_common/models_common.py:3187 +#: ishtar_common/models_common.py:3322 ishtar_common/wizards.py:1951 msgid "Email" msgstr "" @@ -8413,12 +8414,12 @@ msgstr "" msgid "Raw name" msgstr "" -#: ishtar_common/forms_common.py:895 ishtar_common/models_common.py:3090 +#: ishtar_common/forms_common.py:895 ishtar_common/models_common.py:3171 msgid "Phone description" msgstr "" -#: ishtar_common/forms_common.py:899 ishtar_common/models_common.py:3093 -#: ishtar_common/models_common.py:3096 +#: ishtar_common/forms_common.py:899 ishtar_common/models_common.py:3174 +#: ishtar_common/models_common.py:3177 msgid "Phone description 2" msgstr "" @@ -8426,11 +8427,11 @@ msgstr "" msgid "Phone 2" msgstr "" -#: ishtar_common/forms_common.py:903 ishtar_common/models_common.py:3100 +#: ishtar_common/forms_common.py:903 ishtar_common/models_common.py:3181 msgid "Phone description 3" msgstr "" -#: ishtar_common/forms_common.py:905 ishtar_common/models_common.py:3098 +#: ishtar_common/forms_common.py:905 ishtar_common/models_common.py:3179 msgid "Phone 3" msgstr "" @@ -8438,23 +8439,23 @@ msgstr "" msgid "Current organization" msgstr "" -#: ishtar_common/forms_common.py:928 ishtar_common/models_common.py:3075 +#: ishtar_common/forms_common.py:928 ishtar_common/models_common.py:3156 msgid "Other address: address" msgstr "" -#: ishtar_common/forms_common.py:931 ishtar_common/models_common.py:3077 +#: ishtar_common/forms_common.py:931 ishtar_common/models_common.py:3158 msgid "Other address: address complement" msgstr "" -#: ishtar_common/forms_common.py:936 ishtar_common/models_common.py:3080 +#: ishtar_common/forms_common.py:936 ishtar_common/models_common.py:3161 msgid "Other address: postal code" msgstr "" -#: ishtar_common/forms_common.py:939 ishtar_common/models_common.py:3083 +#: ishtar_common/forms_common.py:939 ishtar_common/models_common.py:3164 msgid "Other address: town" msgstr "" -#: ishtar_common/forms_common.py:942 ishtar_common/models_common.py:3086 +#: ishtar_common/forms_common.py:942 ishtar_common/models_common.py:3167 msgid "Other address: country" msgstr "" @@ -8878,7 +8879,7 @@ msgstr "" msgid "Geo item - General" msgstr "" -#: ishtar_common/forms_common.py:2617 ishtar_common/models_common.py:2144 +#: ishtar_common/forms_common.py:2617 ishtar_common/models_common.py:2190 msgid "Import key" msgstr "" @@ -8888,26 +8889,26 @@ msgid "" "overwrite the data." msgstr "" -#: ishtar_common/forms_common.py:2628 ishtar_common/models_common.py:2159 +#: ishtar_common/forms_common.py:2628 ishtar_common/models_common.py:2205 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:7 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:33 msgid "Data type" msgstr "" -#: ishtar_common/forms_common.py:2631 ishtar_common/models_common.py:2151 +#: ishtar_common/forms_common.py:2631 ishtar_common/models_common.py:2197 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:11 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:30 msgid "Origin" msgstr "" -#: ishtar_common/forms_common.py:2634 ishtar_common/models_common.py:2167 +#: ishtar_common/forms_common.py:2634 ishtar_common/models_common.py:2213 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:12 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:36 msgid "Provider" msgstr "" #: ishtar_common/forms_common.py:2637 ishtar_common/forms_common.py:2674 -#: ishtar_common/models_common.py:2133 +#: ishtar_common/models_common.py:2179 msgid "Buffer" msgstr "" @@ -8915,18 +8916,18 @@ msgstr "" msgid "Buffer type" msgstr "" -#: ishtar_common/forms_common.py:2645 ishtar_common/models_common.py:2180 -#: ishtar_common/models_common.py:3737 +#: ishtar_common/forms_common.py:2645 ishtar_common/models_common.py:2226 +#: ishtar_common/models_common.py:3818 msgid "Estimated error for X" msgstr "" -#: ishtar_common/forms_common.py:2649 ishtar_common/models_common.py:2183 -#: ishtar_common/models_common.py:3740 +#: ishtar_common/forms_common.py:2649 ishtar_common/models_common.py:2229 +#: ishtar_common/models_common.py:3821 msgid "Estimated error for Y" msgstr "" -#: ishtar_common/forms_common.py:2653 ishtar_common/models_common.py:2186 -#: ishtar_common/models_common.py:3743 +#: ishtar_common/forms_common.py:2653 ishtar_common/models_common.py:2232 +#: ishtar_common/models_common.py:3824 msgid "Estimated error for Z" msgstr "" @@ -8962,8 +8963,8 @@ msgstr "" msgid "Coordinates" msgstr "" -#: ishtar_common/forms_common.py:2927 ishtar_common/models_common.py:2113 -#: ishtar_common/models_common.py:3752 +#: ishtar_common/forms_common.py:2927 ishtar_common/models_common.py:2148 +#: ishtar_common/models_common.py:3833 msgid "Point" msgstr "" @@ -9005,7 +9006,7 @@ msgstr "" msgid "Directory" msgstr "" -#: ishtar_common/ishtar_menu.py:178 ishtar_common/models_imports.py:1284 +#: ishtar_common/ishtar_menu.py:178 ishtar_common/models_imports.py:1286 msgid "Imports" msgstr "" @@ -9089,7 +9090,7 @@ msgstr "" msgid "Long text" msgstr "" -#: ishtar_common/models.py:711 ishtar_common/models_imports.py:975 +#: ishtar_common/models.py:711 ishtar_common/models_imports.py:977 msgid "Integer" msgstr "" @@ -9097,7 +9098,7 @@ msgstr "" msgid "Boolean" msgstr "" -#: ishtar_common/models.py:713 ishtar_common/models_imports.py:976 +#: ishtar_common/models.py:713 ishtar_common/models_imports.py:978 msgid "Float" msgstr "" @@ -9976,7 +9977,7 @@ msgstr "" msgid "Long title" msgstr "" -#: ishtar_common/models.py:2636 ishtar_common/models_imports.py:969 +#: ishtar_common/models.py:2636 ishtar_common/models_imports.py:971 msgid "Title type" msgstr "" @@ -10109,7 +10110,7 @@ msgid "In progress" msgstr "" #: ishtar_common/models.py:3212 ishtar_common/models.py:4955 -#: ishtar_common/models_imports.py:1102 +#: ishtar_common/models_imports.py:1104 msgid "Finished" msgstr "" @@ -10192,7 +10193,7 @@ msgid "Only available for these document types" msgstr "" #: ishtar_common/models.py:3646 ishtar_common/models_imports.py:926 -#: ishtar_common/models_imports.py:968 +#: ishtar_common/models_imports.py:970 msgid "Support type" msgstr "" @@ -10355,7 +10356,7 @@ msgctxt "key for text search" msgid "warehouse" msgstr "" -#: ishtar_common/models.py:3968 ishtar_common/models_common.py:3461 +#: ishtar_common/models.py:3968 ishtar_common/models_common.py:3542 msgctxt "key for text search" msgid "has-image" msgstr "" @@ -10479,7 +10480,7 @@ msgstr "" msgid "Administration scripts" msgstr "" -#: ishtar_common/models.py:4954 ishtar_common/models_imports.py:1101 +#: ishtar_common/models.py:4954 ishtar_common/models_imports.py:1103 msgid "Finished with errors" msgstr "" @@ -10514,7 +10515,7 @@ msgid "" "configuration." msgstr "" -#: ishtar_common/models.py:5074 ishtar_common/models_imports.py:1092 +#: ishtar_common/models.py:5074 ishtar_common/models_imports.py:1094 msgid "Created" msgstr "" @@ -10632,323 +10633,323 @@ msgstr "" msgid "Archive - Imports" msgstr "" -#: ishtar_common/models_common.py:838 +#: ishtar_common/models_common.py:839 msgid "Search vector" msgstr "" -#: ishtar_common/models_common.py:838 +#: ishtar_common/models_common.py:839 msgid "Auto filled at save" msgstr "" -#: ishtar_common/models_common.py:1401 +#: ishtar_common/models_common.py:1436 msgid "Last editor" msgstr "" -#: ishtar_common/models_common.py:1409 +#: ishtar_common/models_common.py:1444 msgid "Creator" msgstr "" -#: ishtar_common/models_common.py:1415 ishtar_common/models_common.py:2137 +#: ishtar_common/models_common.py:1450 ishtar_common/models_common.py:2183 msgid "Need update" msgstr "" -#: ishtar_common/models_common.py:1417 +#: ishtar_common/models_common.py:1452 msgid "Item locked for edition" msgstr "" -#: ishtar_common/models_common.py:1423 +#: ishtar_common/models_common.py:1458 msgid "Locked by" msgstr "" -#: ishtar_common/models_common.py:1441 +#: ishtar_common/models_common.py:1476 msgctxt "key for text search" msgid "modified-by" msgstr "" -#: ishtar_common/models_common.py:1445 +#: ishtar_common/models_common.py:1480 msgctxt "key for text search" msgid "modified-before" msgstr "" -#: ishtar_common/models_common.py:1449 +#: ishtar_common/models_common.py:1484 msgctxt "key for text search" msgid "modified-after" msgstr "" -#: ishtar_common/models_common.py:1452 +#: ishtar_common/models_common.py:1487 msgctxt "key for text search" msgid "locked" msgstr "" -#: ishtar_common/models_common.py:2009 ishtar_common/models_common.py:2027 +#: ishtar_common/models_common.py:2044 ishtar_common/models_common.py:2062 msgid "Authority name" msgstr "" -#: ishtar_common/models_common.py:2010 ishtar_common/models_common.py:2027 +#: ishtar_common/models_common.py:2045 ishtar_common/models_common.py:2062 msgid "Authority SRID" msgstr "" -#: ishtar_common/models_common.py:2013 +#: ishtar_common/models_common.py:2048 msgid "Geographic - Spatial reference system" msgstr "" -#: ishtar_common/models_common.py:2014 +#: ishtar_common/models_common.py:2049 msgid "Geographic - Spatial reference systems" msgstr "" -#: ishtar_common/models_common.py:2044 +#: ishtar_common/models_common.py:2079 msgid "Geographic - Origin type" msgstr "" -#: ishtar_common/models_common.py:2045 +#: ishtar_common/models_common.py:2080 msgid "Geographic - Origin types" msgstr "" -#: ishtar_common/models_common.py:2060 +#: ishtar_common/models_common.py:2095 msgid "Geographic - Data type" msgstr "" -#: ishtar_common/models_common.py:2061 +#: ishtar_common/models_common.py:2096 msgid "Geographic - Data types" msgstr "" -#: ishtar_common/models_common.py:2076 +#: ishtar_common/models_common.py:2111 msgid "Geographic - Provider type" msgstr "" -#: ishtar_common/models_common.py:2077 +#: ishtar_common/models_common.py:2112 msgid "Geographic - Provider types" msgstr "" -#: ishtar_common/models_common.py:2088 +#: ishtar_common/models_common.py:2123 msgid "Geographic - Buffer type" msgstr "" -#: ishtar_common/models_common.py:2089 +#: ishtar_common/models_common.py:2124 msgid "Geographic - Buffer types" msgstr "" -#: ishtar_common/models_common.py:2114 +#: ishtar_common/models_common.py:2149 msgid "Line(s)" msgstr "" -#: ishtar_common/models_common.py:2115 +#: ishtar_common/models_common.py:2150 msgid "Point(s)" msgstr "" -#: ishtar_common/models_common.py:2116 +#: ishtar_common/models_common.py:2151 msgid "Polygon(s)" msgstr "" -#: ishtar_common/models_common.py:2145 +#: ishtar_common/models_common.py:2191 msgid "Use this for update imports" msgstr "" -#: ishtar_common/models_common.py:2152 +#: ishtar_common/models_common.py:2198 msgid "For instance: topographical survey, georeferencing, ..." msgstr "" -#: ishtar_common/models_common.py:2160 +#: ishtar_common/models_common.py:2206 msgid "For instance: outline, z-sup, ..." msgstr "" -#: ishtar_common/models_common.py:2168 +#: ishtar_common/models_common.py:2214 msgid "Data provider" msgstr "" -#: ishtar_common/models_common.py:2171 ishtar_common/models_common.py:3733 +#: ishtar_common/models_common.py:2217 ishtar_common/models_common.py:3814 msgid "X" msgstr "" -#: ishtar_common/models_common.py:2171 ishtar_common/models_common.py:2172 -#: ishtar_common/models_common.py:2173 +#: ishtar_common/models_common.py:2217 ishtar_common/models_common.py:2218 +#: ishtar_common/models_common.py:2219 msgid "User input" msgstr "" -#: ishtar_common/models_common.py:2172 ishtar_common/models_common.py:3734 +#: ishtar_common/models_common.py:2218 ishtar_common/models_common.py:3815 msgid "Y" msgstr "" -#: ishtar_common/models_common.py:2173 ishtar_common/models_common.py:3735 +#: ishtar_common/models_common.py:2219 ishtar_common/models_common.py:3816 msgid "Z" msgstr "" -#: ishtar_common/models_common.py:2176 +#: ishtar_common/models_common.py:2222 msgid "X (cached)" msgstr "" -#: ishtar_common/models_common.py:2177 +#: ishtar_common/models_common.py:2223 msgid "Y (cached)" msgstr "" -#: ishtar_common/models_common.py:2178 +#: ishtar_common/models_common.py:2224 msgid "Z (cached)" msgstr "" -#: ishtar_common/models_common.py:2190 ishtar_common/models_common.py:3747 +#: ishtar_common/models_common.py:2236 ishtar_common/models_common.py:3828 msgid "Spatial Reference System" msgstr "" -#: ishtar_common/models_common.py:2195 ishtar_common/models_common.py:3753 +#: ishtar_common/models_common.py:2241 ishtar_common/models_common.py:3834 msgid "Point (2D)" msgstr "" -#: ishtar_common/models_common.py:2196 +#: ishtar_common/models_common.py:2242 msgid "Point (3D)" msgstr "" -#: ishtar_common/models_common.py:2197 +#: ishtar_common/models_common.py:2243 msgid "Multi points" msgstr "" -#: ishtar_common/models_common.py:2198 +#: ishtar_common/models_common.py:2244 msgid "Multi lines" msgstr "" -#: ishtar_common/models_common.py:2199 +#: ishtar_common/models_common.py:2245 msgid "Multi polygons" msgstr "" -#: ishtar_common/models_common.py:2202 ishtar_common/models_common.py:2203 +#: ishtar_common/models_common.py:2248 ishtar_common/models_common.py:2249 msgid "Geographic - Vector data" msgstr "" -#: ishtar_common/models_common.py:2310 +#: ishtar_common/models_common.py:2356 msgid "Only 2 or 3 dimensions" msgstr "" -#: ishtar_common/models_common.py:2725 +#: ishtar_common/models_common.py:2806 msgid "Main geodata" msgstr "" -#: ishtar_common/models_common.py:2729 +#: ishtar_common/models_common.py:2810 msgid "Geodata" msgstr "" -#: ishtar_common/models_common.py:2733 +#: ishtar_common/models_common.py:2814 msgctxt "key for text search" msgid "geo-name" msgstr "" -#: ishtar_common/models_common.py:2736 +#: ishtar_common/models_common.py:2817 msgctxt "key for text search" msgid "geo-type" msgstr "" -#: ishtar_common/models_common.py:2739 +#: ishtar_common/models_common.py:2820 msgctxt "key for text search" msgid "geo-origin" msgstr "" -#: ishtar_common/models_common.py:2742 +#: ishtar_common/models_common.py:2823 msgctxt "key for text search" msgid "geo-provider" msgstr "" -#: ishtar_common/models_common.py:2745 +#: ishtar_common/models_common.py:2826 msgctxt "key for text search" msgid "geo-comment" msgstr "" -#: ishtar_common/models_common.py:2767 +#: ishtar_common/models_common.py:2848 msgid "Add geographic item" msgstr "" -#: ishtar_common/models_common.py:2769 +#: ishtar_common/models_common.py:2850 msgid "geo." msgstr "" -#: ishtar_common/models_common.py:2839 +#: ishtar_common/models_common.py:2920 msgid "Year of creation" msgstr "" -#: ishtar_common/models_common.py:2843 +#: ishtar_common/models_common.py:2924 msgid "Filling this field is relevant to distinguish old towns from new towns." msgstr "" -#: ishtar_common/models_common.py:2847 +#: ishtar_common/models_common.py:2928 msgid "Town children" msgstr "" -#: ishtar_common/models_common.py:3069 +#: ishtar_common/models_common.py:3150 msgid "Town (precise)" msgstr "" -#: ishtar_common/models_common.py:3102 +#: ishtar_common/models_common.py:3183 msgid "Raw phone" msgstr "" -#: ishtar_common/models_common.py:3108 +#: ishtar_common/models_common.py:3189 msgid "Alternative address is prefered" msgstr "" -#: ishtar_common/models_common.py:3145 +#: ishtar_common/models_common.py:3226 msgid "No associated address" msgstr "" -#: ishtar_common/models_common.py:3226 +#: ishtar_common/models_common.py:3307 msgid "Postal code - Town" msgstr "" -#: ishtar_common/models_common.py:3236 +#: ishtar_common/models_common.py:3317 msgid "Mobile" msgstr "" -#: ishtar_common/models_common.py:3254 +#: ishtar_common/models_common.py:3335 msgid "Merge key" msgstr "" -#: ishtar_common/models_common.py:3465 +#: ishtar_common/models_common.py:3546 msgctxt "key for text search" msgid "has-url" msgstr "" -#: ishtar_common/models_common.py:3469 +#: ishtar_common/models_common.py:3550 msgctxt "key for text search" msgid "has-attached-file" msgstr "" -#: ishtar_common/models_common.py:3545 +#: ishtar_common/models_common.py:3626 msgid "Add document/image" msgstr "" -#: ishtar_common/models_common.py:3547 +#: ishtar_common/models_common.py:3628 msgid "doc./image" msgstr "" -#: ishtar_common/models_common.py:3731 +#: ishtar_common/models_common.py:3812 msgid "Precise" msgstr "" -#: ishtar_common/models_common.py:3731 +#: ishtar_common/models_common.py:3812 msgid "Polygon" msgstr "" -#: ishtar_common/models_common.py:3755 +#: ishtar_common/models_common.py:3836 msgid "Point source" msgstr "" -#: ishtar_common/models_common.py:3758 +#: ishtar_common/models_common.py:3839 msgid "Point source item" msgstr "" -#: ishtar_common/models_common.py:3760 +#: ishtar_common/models_common.py:3841 msgid "Multi polygon" msgstr "" -#: ishtar_common/models_common.py:3762 +#: ishtar_common/models_common.py:3843 msgid "Multi-polygon source" msgstr "" -#: ishtar_common/models_common.py:3769 +#: ishtar_common/models_common.py:3850 msgid "Multi polygon source item" msgstr "" -#: ishtar_common/models_common.py:4313 +#: ishtar_common/models_common.py:4397 msgid "Regenerate ID" msgstr "" -#: ishtar_common/models_common.py:4315 +#: ishtar_common/models_common.py:4399 msgid "regen." msgstr "" @@ -11147,11 +11148,11 @@ msgid "Importer - Targets" msgstr "" #: ishtar_common/models_imports.py:796 ishtar_common/views_item.py:590 -#: ishtar_common/views_item.py:1342 +#: ishtar_common/views_item.py:1350 msgid "True" msgstr "" -#: ishtar_common/models_imports.py:796 ishtar_common/views_item.py:1344 +#: ishtar_common/models_imports.py:796 ishtar_common/views_item.py:1352 msgid "False" msgstr "" @@ -11183,281 +11184,281 @@ msgstr "" msgid "Importer - Targets keys" msgstr "" -#: ishtar_common/models_imports.py:928 +#: ishtar_common/models_imports.py:930 msgid "Period" msgstr "" -#: ishtar_common/models_imports.py:929 +#: ishtar_common/models_imports.py:931 msgid "Report state" msgstr "" -#: ishtar_common/models_imports.py:934 +#: ishtar_common/models_imports.py:936 msgid "Activity type" msgstr "" -#: ishtar_common/models_imports.py:939 +#: ishtar_common/models_imports.py:941 msgid "Dating quality" msgstr "" -#: ishtar_common/models_imports.py:940 +#: ishtar_common/models_imports.py:942 msgid "Material" msgstr "" -#: ishtar_common/models_imports.py:943 +#: ishtar_common/models_imports.py:945 msgid "Warehouse division" msgstr "" -#: ishtar_common/models_imports.py:951 +#: ishtar_common/models_imports.py:953 msgid "Integrity type" msgstr "" -#: ishtar_common/models_imports.py:961 +#: ishtar_common/models_imports.py:963 msgid "Identification type" msgstr "" -#: ishtar_common/models_imports.py:965 +#: ishtar_common/models_imports.py:967 msgid "Context record relation type" msgstr "" -#: ishtar_common/models_imports.py:967 +#: ishtar_common/models_imports.py:969 msgid "Spatial reference system" msgstr "" -#: ishtar_common/models_imports.py:977 overload_translation/models.py:7 +#: ishtar_common/models_imports.py:979 overload_translation/models.py:7 msgid "String" msgstr "" -#: ishtar_common/models_imports.py:981 +#: ishtar_common/models_imports.py:983 msgid "INSEE code" msgstr "" -#: ishtar_common/models_imports.py:982 +#: ishtar_common/models_imports.py:984 msgid "Upper case" msgstr "" -#: ishtar_common/models_imports.py:983 +#: ishtar_common/models_imports.py:985 msgid "Lower case" msgstr "" -#: ishtar_common/models_imports.py:984 +#: ishtar_common/models_imports.py:986 msgid "String to boolean" msgstr "" -#: ishtar_common/models_imports.py:985 +#: ishtar_common/models_imports.py:987 msgctxt "filesystem" msgid "File" msgstr "" -#: ishtar_common/models_imports.py:986 +#: ishtar_common/models_imports.py:988 msgid "Unknow type" msgstr "" -#: ishtar_common/models_imports.py:1005 +#: ishtar_common/models_imports.py:1007 msgid "4 digit year. e.g.: \"2015\"" msgstr "" -#: ishtar_common/models_imports.py:1006 +#: ishtar_common/models_imports.py:1008 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "" -#: ishtar_common/models_imports.py:1007 +#: ishtar_common/models_imports.py:1009 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "" -#: ishtar_common/models_imports.py:1024 +#: ishtar_common/models_imports.py:1026 msgid "Options" msgstr "" -#: ishtar_common/models_imports.py:1026 +#: ishtar_common/models_imports.py:1028 msgid "Split character(s)" msgstr "" -#: ishtar_common/models_imports.py:1031 +#: ishtar_common/models_imports.py:1033 msgid "Importer - Formater type" msgstr "" -#: ishtar_common/models_imports.py:1032 +#: ishtar_common/models_imports.py:1034 msgid "Importer - Formater types" msgstr "" -#: ishtar_common/models_imports.py:1093 +#: ishtar_common/models_imports.py:1095 msgid "Analyse in progress" msgstr "" -#: ishtar_common/models_imports.py:1094 +#: ishtar_common/models_imports.py:1096 msgid "Analysed" msgstr "" -#: ishtar_common/models_imports.py:1095 +#: ishtar_common/models_imports.py:1097 msgid "Check modified in queue" msgstr "" -#: ishtar_common/models_imports.py:1096 +#: ishtar_common/models_imports.py:1098 msgid "Import in queue" msgstr "" -#: ishtar_common/models_imports.py:1097 +#: ishtar_common/models_imports.py:1099 msgid "Check modified in progress" msgstr "" -#: ishtar_common/models_imports.py:1098 +#: ishtar_common/models_imports.py:1100 msgid "Import in progress" msgstr "" -#: ishtar_common/models_imports.py:1099 +#: ishtar_common/models_imports.py:1101 msgid "Post-processing in progress" msgstr "" -#: ishtar_common/models_imports.py:1100 +#: ishtar_common/models_imports.py:1102 msgid "Partially imported" msgstr "" -#: ishtar_common/models_imports.py:1103 +#: ishtar_common/models_imports.py:1105 msgid "Archived" msgstr "" -#: ishtar_common/models_imports.py:1172 +#: ishtar_common/models_imports.py:1174 msgid "Importer type" msgstr "" -#: ishtar_common/models_imports.py:1174 +#: ishtar_common/models_imports.py:1176 msgid "Imported file" msgstr "" -#: ishtar_common/models_imports.py:1182 +#: ishtar_common/models_imports.py:1184 msgid "Associated images (zip file)" msgstr "" -#: ishtar_common/models_imports.py:1195 +#: ishtar_common/models_imports.py:1197 msgid "If a group is selected, target key saved in this group will be used." msgstr "" -#: ishtar_common/models_imports.py:1199 +#: ishtar_common/models_imports.py:1201 msgid "Encoding" msgstr "" -#: ishtar_common/models_imports.py:1200 +#: ishtar_common/models_imports.py:1202 msgid "Only required for CSV file" msgstr "" -#: ishtar_common/models_imports.py:1203 +#: ishtar_common/models_imports.py:1205 msgid "CSV separator" msgstr "" -#: ishtar_common/models_imports.py:1208 +#: ishtar_common/models_imports.py:1210 msgid "" "Separator for CSV file. Standard is comma but Microsoft Excel do not follow " "this standard and use semi-colon." msgstr "" -#: ishtar_common/models_imports.py:1213 +#: ishtar_common/models_imports.py:1215 msgid "Skip lines" msgstr "" -#: ishtar_common/models_imports.py:1215 +#: ishtar_common/models_imports.py:1217 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:1218 +#: ishtar_common/models_imports.py:1220 msgid "Error file" msgstr "" -#: ishtar_common/models_imports.py:1226 +#: ishtar_common/models_imports.py:1228 msgid "Result file" msgstr "" -#: ishtar_common/models_imports.py:1234 +#: ishtar_common/models_imports.py:1236 msgid "Match file" msgstr "" -#: ishtar_common/models_imports.py:1242 +#: ishtar_common/models_imports.py:1244 msgid "Archive file" msgstr "" -#: ishtar_common/models_imports.py:1253 +#: ishtar_common/models_imports.py:1255 msgid "Conservative import" msgstr "" -#: ishtar_common/models_imports.py:1255 +#: ishtar_common/models_imports.py:1257 msgid "If set to true, do not overload existing values." msgstr "" -#: ishtar_common/models_imports.py:1264 +#: ishtar_common/models_imports.py:1266 msgid "Remaining seconds" msgstr "" -#: ishtar_common/models_imports.py:1266 +#: ishtar_common/models_imports.py:1268 msgid "Current line" msgstr "" -#: ishtar_common/models_imports.py:1267 +#: ishtar_common/models_imports.py:1269 msgid "Number of line" msgstr "" -#: ishtar_common/models_imports.py:1269 +#: ishtar_common/models_imports.py:1271 msgid "Imported line numbers" msgstr "" -#: ishtar_common/models_imports.py:1274 +#: ishtar_common/models_imports.py:1276 msgid "Changed have been checked" msgstr "" -#: ishtar_common/models_imports.py:1276 +#: ishtar_common/models_imports.py:1278 msgid "Changed line numbers" msgstr "" -#: ishtar_common/models_imports.py:1283 +#: ishtar_common/models_imports.py:1285 msgid "Import" msgstr "" -#: ishtar_common/models_imports.py:1325 ishtar_common/models_imports.py:1469 +#: ishtar_common/models_imports.py:1327 ishtar_common/models_imports.py:1471 msgid "Error in the CSV file." msgstr "" -#: ishtar_common/models_imports.py:1394 +#: ishtar_common/models_imports.py:1396 msgid "Analyse" msgstr "" -#: ishtar_common/models_imports.py:1396 ishtar_common/models_imports.py:1405 +#: ishtar_common/models_imports.py:1398 ishtar_common/models_imports.py:1407 msgid "Re-analyse" msgstr "" -#: ishtar_common/models_imports.py:1400 +#: ishtar_common/models_imports.py:1402 msgid "Step by step import" msgstr "" -#: ishtar_common/models_imports.py:1401 ishtar_common/models_imports.py:1410 +#: ishtar_common/models_imports.py:1403 ishtar_common/models_imports.py:1412 msgid "Re-check for changes" msgstr "" -#: ishtar_common/models_imports.py:1403 ishtar_common/models_imports.py:1412 +#: ishtar_common/models_imports.py:1405 ishtar_common/models_imports.py:1414 msgid "Check for changes" msgstr "" -#: ishtar_common/models_imports.py:1406 +#: ishtar_common/models_imports.py:1408 msgid "Re-import" msgstr "" -#: ishtar_common/models_imports.py:1409 +#: ishtar_common/models_imports.py:1411 msgid "Step by step re-import" msgstr "" -#: ishtar_common/models_imports.py:1413 +#: ishtar_common/models_imports.py:1415 msgid "Archive" msgstr "" -#: ishtar_common/models_imports.py:1416 +#: ishtar_common/models_imports.py:1418 msgid "Unarchive" msgstr "" -#: ishtar_common/models_imports.py:1418 +#: ishtar_common/models_imports.py:1420 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:19 msgid "Edit" msgstr "" -#: ishtar_common/models_imports.py:1419 +#: ishtar_common/models_imports.py:1421 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:30 #: ishtar_common/templates/ishtar/blocks/window_nav.html:66 #: ishtar_common/templates/ishtar/form_delete.html:11 @@ -11466,41 +11467,41 @@ msgstr "" msgid "Delete" msgstr "" -#: ishtar_common/models_imports.py:1513 ishtar_common/models_imports.py:1516 -#: ishtar_common/models_imports.py:1578 +#: ishtar_common/models_imports.py:1515 ishtar_common/models_imports.py:1518 +#: ishtar_common/models_imports.py:1580 msgid "Invalid GIS file." msgstr "" -#: ishtar_common/models_imports.py:1526 +#: ishtar_common/models_imports.py:1528 #, python-brace-format msgid "Geometry \"{geometry}\" not managed." msgstr "" -#: ishtar_common/models_imports.py:1548 +#: ishtar_common/models_imports.py:1550 msgid "CRS not managed." msgstr "" -#: ishtar_common/models_imports.py:1575 +#: ishtar_common/models_imports.py:1577 msgid "Error reading feature {idx + 1} - {e}" msgstr "" -#: ishtar_common/models_imports.py:1614 +#: ishtar_common/models_imports.py:1616 msgid "Modification check {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:1682 +#: ishtar_common/models_imports.py:1684 msgid "Import {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:1713 +#: ishtar_common/models_imports.py:1715 msgid "Error on imported file: {}" msgstr "" -#: ishtar_common/models_imports.py:1749 +#: ishtar_common/models_imports.py:1751 msgid "Import {} finished with errors" msgstr "" -#: ishtar_common/models_imports.py:1757 +#: ishtar_common/models_imports.py:1759 msgid "Import {} finished with no errors" msgstr "" @@ -13107,7 +13108,7 @@ msgstr "" msgid "Load another random image?" msgstr "" -#: ishtar_common/utils.py:1568 +#: ishtar_common/utils.py:1575 msgid "The maximum supported file size is {} Mo." msgstr "" @@ -13282,7 +13283,7 @@ msgstr "" msgid "Modify a %s" msgstr "" -#: ishtar_common/views_item.py:902 +#: ishtar_common/views_item.py:904 msgctxt "key for text search" msgid "today" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 3de6adc56..d586b64fb 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: 2023-01-16 11:42+0100\n" +"POT-Creation-Date: 2023-01-19 18:47+0100\n" "PO-Revision-Date: 2022-07-08 13:04+0000\n" "Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n" "Language-Team: French <http://translate.iggdrasil.net/projects/ishtar/wip-" @@ -26,22 +26,22 @@ msgstr "" #: archaeological_context_records/templates/ishtar/forms/qa_contextrecord_duplicate.html:12 #: archaeological_context_records/wizards.py:85 #: archaeological_finds/models_finds.py:1142 -#: archaeological_finds/models_finds.py:2420 +#: archaeological_finds/models_finds.py:2419 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:16 #: archaeological_finds/wizards.py:92 archaeological_finds/wizards.py:565 #: archaeological_operations/forms.py:381 #: archaeological_operations/forms.py:1233 #: archaeological_operations/ishtar_menu.py:35 -#: archaeological_operations/models.py:1518 -#: archaeological_operations/models.py:2386 -#: archaeological_operations/models.py:2404 -#: archaeological_operations/models.py:2520 -#: archaeological_operations/models.py:2719 -#: archaeological_operations/models.py:3008 +#: archaeological_operations/models.py:1529 +#: archaeological_operations/models.py:2397 +#: archaeological_operations/models.py:2415 +#: archaeological_operations/models.py:2531 +#: archaeological_operations/models.py:2730 +#: archaeological_operations/models.py:3019 #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:246 #: archaeological_operations/wizards.py:258 -#: archaeological_warehouse/models.py:857 ishtar_common/forms_common.py:2136 +#: archaeological_warehouse/models.py:858 ishtar_common/forms_common.py:2136 #: ishtar_common/models.py:5066 ishtar_common/views.py:391 msgid "Operation" msgstr "Opération" @@ -135,7 +135,7 @@ msgstr "Numéro de l'opération (index par année)" #: archaeological_context_records/forms.py:711 #: archaeological_context_records/models.py:735 #: archaeological_operations/forms.py:550 -#: archaeological_operations/models.py:563 ishtar_common/models.py:5067 +#: archaeological_operations/models.py:564 ishtar_common/models.py:5067 msgid "Archaeological site" msgstr "Entité archéologique" @@ -163,8 +163,8 @@ msgstr "Type d'unité" #: archaeological_operations/forms.py:500 #: archaeological_operations/forms.py:1062 #: archaeological_operations/forms.py:1436 -#: archaeological_operations/models.py:3032 -#: archaeological_operations/models.py:3304 +#: archaeological_operations/models.py:3043 +#: archaeological_operations/models.py:3315 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Parcel" msgstr "Parcelle" @@ -203,8 +203,8 @@ msgstr "Rechercher une Unité d'Enregistrement" #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:46 #: archaeological_operations/templates/ishtar/sheet_site.html:41 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:24 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:20 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:29 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:25 msgid "General" msgstr "Général" @@ -222,11 +222,11 @@ msgstr "Unité d'enregistrement - 020 - Général" #: archaeological_finds/models_finds.py:1097 #: archaeological_operations/forms.py:71 archaeological_operations/forms.py:209 #: archaeological_operations/forms.py:1034 -#: archaeological_operations/models.py:3013 +#: archaeological_operations/models.py:3024 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_warehouse/forms.py:145 ishtar_common/forms_common.py:84 -#: ishtar_common/forms_common.py:106 ishtar_common/models_common.py:2855 -#: ishtar_common/models_common.py:3731 +#: ishtar_common/forms_common.py:106 ishtar_common/models_common.py:2936 +#: ishtar_common/models_common.py:3812 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 msgid "Town" msgstr "Commune" @@ -256,7 +256,7 @@ msgstr "Type d'Unité d'Enregistrement" #: archaeological_finds/forms.py:1426 #: archaeological_finds/forms_treatments.py:193 #: archaeological_finds/models_finds.py:411 -#: archaeological_finds/models_finds.py:1814 +#: archaeological_finds/models_finds.py:1813 #: archaeological_finds/models_treatments.py:255 #: archaeological_finds/templates/ishtar/sheet_find.html:178 #: ishtar_common/forms_common.py:1802 ishtar_common/forms_common.py:2070 @@ -327,7 +327,7 @@ msgstr "Date d'ouverture" #: archaeological_finds/forms_treatments.py:773 #: archaeological_finds/models_treatments.py:258 #: archaeological_finds/models_treatments.py:1132 -#: archaeological_operations/models.py:1278 +#: archaeological_operations/models.py:1289 #: archaeological_operations/templates/ishtar/sheet_operation.html:205 #: ishtar_common/forms.py:990 ishtar_common/forms.py:991 msgid "Closing date" @@ -344,7 +344,7 @@ msgstr "Documentation" #: archaeological_finds/models_treatments.py:219 #: archaeological_finds/models_treatments.py:754 #: archaeological_warehouse/forms.py:731 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:81 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:95 msgid "Location" msgstr "Localisation" @@ -360,7 +360,7 @@ msgstr "Vous devez choisir une commune ou une parcelle." #: archaeological_context_records/forms.py:459 #: archaeological_context_records/models.py:163 #: archaeological_finds/forms.py:1222 archaeological_finds/forms.py:1243 -#: archaeological_finds/models_finds.py:1857 +#: archaeological_finds/models_finds.py:1856 #: archaeological_finds/templates/ishtar/sheet_find.html:249 msgid "Dating" msgstr "Datation" @@ -385,7 +385,7 @@ msgstr "Période chronologique" #: archaeological_finds/forms.py:1231 #: archaeological_finds/forms_treatments.py:180 #: archaeological_finds/forms_treatments.py:770 -#: archaeological_finds/models_finds.py:3354 +#: archaeological_finds/models_finds.py:3353 #: archaeological_finds/models_treatments.py:257 #: archaeological_finds/models_treatments.py:752 #: archaeological_finds/templates/ishtar/sheet_find.html:258 @@ -394,8 +394,8 @@ msgstr "Période chronologique" #: archaeological_finds/templates/ishtar/sheet_find.html:476 #: archaeological_operations/forms.py:780 #: archaeological_operations/models.py:104 -#: archaeological_operations/models.py:1279 -#: archaeological_operations/models.py:3308 +#: archaeological_operations/models.py:1290 +#: archaeological_operations/models.py:3319 msgid "Start date" msgstr "Date de début" @@ -403,7 +403,7 @@ msgstr "Date de début" #: archaeological_context_records/models.py:110 #: archaeological_files/forms.py:791 archaeological_files/models.py:76 #: archaeological_files/models.py:699 archaeological_finds/forms.py:1232 -#: archaeological_finds/models_finds.py:3355 +#: archaeological_finds/models_finds.py:3354 #: archaeological_finds/models_treatments.py:753 #: archaeological_finds/templates/ishtar/sheet_find.html:259 #: archaeological_finds/templates/ishtar/sheet_find.html:401 @@ -411,8 +411,8 @@ msgstr "Date de début" #: archaeological_finds/templates/ishtar/sheet_find.html:477 #: archaeological_finds/templates/ishtar/sheet_find.html:515 #: archaeological_operations/models.py:105 -#: archaeological_operations/models.py:3309 -#: ishtar_common/models_imports.py:1261 +#: archaeological_operations/models.py:3320 +#: ishtar_common/models_imports.py:1263 msgid "End date" msgstr "Date de fin" @@ -450,7 +450,7 @@ msgstr "Unité d'enregistrement - 030 - Datation" #: archaeological_finds/forms.py:173 archaeological_finds/forms.py:179 #: archaeological_finds/forms.py:784 archaeological_finds/forms.py:802 #: archaeological_finds/forms.py:1405 archaeological_finds/models_finds.py:1093 -#: archaeological_finds/models_finds.py:2412 +#: archaeological_finds/models_finds.py:2411 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 #: archaeological_finds/wizards.py:93 archaeological_warehouse/forms.py:556 #: ishtar_common/forms_common.py:2149 ishtar_common/models.py:5068 @@ -674,7 +674,7 @@ msgid "Dating quality types" msgstr "Types de qualité de datation" #: archaeological_context_records/models.py:129 -#: archaeological_context_records/tests.py:911 +#: archaeological_context_records/tests.py:912 #: archaeological_finds/tests.py:1335 msgctxt "key for text search" msgid "datings-period" @@ -722,9 +722,9 @@ msgstr "Datations" #: archaeological_context_records/models.py:280 #: archaeological_finds/forms.py:210 archaeological_finds/forms.py:439 #: archaeological_finds/ishtar_menu.py:34 -#: archaeological_finds/models_finds.py:2044 -#: archaeological_finds/models_finds.py:3320 -#: archaeological_finds/models_finds.py:3342 +#: archaeological_finds/models_finds.py:2043 +#: archaeological_finds/models_finds.py:3319 +#: archaeological_finds/models_finds.py:3341 #: archaeological_finds/models_treatments.py:734 #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: ishtar_common/forms_common.py:2165 ishtar_common/models.py:5069 @@ -743,21 +743,21 @@ msgstr "Mobilier" #: archaeological_finds/models_finds.py:249 #: archaeological_finds/models_finds.py:290 #: archaeological_finds/models_finds.py:356 -#: archaeological_finds/models_finds.py:1809 +#: archaeological_finds/models_finds.py:1808 #: archaeological_finds/models_treatments.py:65 #: archaeological_finds/models_treatments.py:746 #: archaeological_operations/models.py:103 #: archaeological_operations/models.py:128 #: archaeological_operations/models.py:146 #: archaeological_operations/models.py:155 -#: archaeological_operations/models.py:3335 +#: archaeological_operations/models.py:3346 #: archaeological_warehouse/forms.py:108 archaeological_warehouse/models.py:695 #: archaeological_warehouse/models.py:727 ishtar_common/models.py:692 #: ishtar_common/models.py:747 ishtar_common/models.py:789 #: ishtar_common/models.py:1732 ishtar_common/models.py:3528 -#: ishtar_common/models.py:4846 ishtar_common/models_common.py:2008 -#: ishtar_common/models_common.py:2041 ishtar_common/models_common.py:2057 -#: ishtar_common/models_common.py:2073 ishtar_common/models_common.py:2085 +#: ishtar_common/models.py:4846 ishtar_common/models_common.py:2043 +#: ishtar_common/models_common.py:2076 ishtar_common/models_common.py:2092 +#: ishtar_common/models_common.py:2108 ishtar_common/models_common.py:2120 msgid "Order" msgstr "Ordre" @@ -798,7 +798,7 @@ msgid "Excavation technique types" msgstr "Types de méthode de fouille" #: archaeological_context_records/models.py:372 -#: ishtar_common/models_imports.py:937 +#: ishtar_common/models_imports.py:939 msgid "Documentation type" msgstr "Type de documentation" @@ -817,10 +817,10 @@ msgstr "Types de documentation" #: archaeological_operations/forms.py:1334 #: archaeological_operations/models.py:305 #: archaeological_operations/models.py:314 -#: archaeological_operations/models.py:485 -#: archaeological_operations/models.py:948 -#: archaeological_operations/models.py:1032 -#: archaeological_operations/models.py:1340 +#: archaeological_operations/models.py:486 +#: archaeological_operations/models.py:958 +#: archaeological_operations/models.py:1042 +#: archaeological_operations/models.py:1351 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:8 msgid "Periods" msgstr "Périodes" @@ -854,14 +854,14 @@ msgstr "Parcelle (année)" #: archaeological_context_records/models.py:536 #: archaeological_finds/models_finds.py:1162 #: archaeological_operations/models.py:316 -#: archaeological_operations/models.py:952 +#: archaeological_operations/models.py:962 msgid "Associated document type" msgstr "Type de document associé" #: archaeological_context_records/models.py:537 #: archaeological_finds/models_finds.py:1163 #: archaeological_operations/models.py:317 -#: archaeological_operations/models.py:953 +#: archaeological_operations/models.py:963 msgid "Modification (year)" msgstr "Modification (année)" @@ -871,10 +871,10 @@ msgid "id" msgstr "id" #: archaeological_context_records/models.py:579 -#: archaeological_context_records/tests.py:737 +#: archaeological_context_records/tests.py:738 #: archaeological_files/models.py:464 archaeological_finds/models_finds.py:1248 -#: archaeological_operations/models.py:377 -#: archaeological_operations/models.py:1091 +#: archaeological_operations/models.py:378 +#: archaeological_operations/models.py:1102 #: archaeological_operations/tests.py:3031 #: archaeological_warehouse/models.py:316 msgctxt "key for text search" @@ -893,8 +893,8 @@ msgid "operation-name" msgstr "operation-nom" #: archaeological_context_records/models.py:589 -#: archaeological_operations/models.py:1087 -#: archaeological_operations/models.py:2550 +#: archaeological_operations/models.py:1098 +#: archaeological_operations/models.py:2561 #: archaeological_operations/tests.py:4507 msgctxt "key for text search" msgid "patriarche" @@ -902,7 +902,7 @@ msgstr "patriarche" #: archaeological_context_records/models.py:593 #: archaeological_finds/models_finds.py:1256 -#: archaeological_operations/models.py:1084 +#: archaeological_operations/models.py:1095 msgctxt "key for text search" msgid "operation-code" msgstr "operation-code" @@ -910,9 +910,9 @@ msgstr "operation-code" #: archaeological_context_records/models.py:597 #: archaeological_context_records/models.py:655 #: archaeological_finds/models_finds.py:1357 -#: archaeological_finds/models_finds.py:1730 -#: archaeological_operations/models.py:412 -#: archaeological_operations/models.py:438 ishtar_common/models.py:3924 +#: archaeological_finds/models_finds.py:1729 +#: archaeological_operations/models.py:413 +#: archaeological_operations/models.py:439 ishtar_common/models.py:3924 #: ishtar_common/models.py:4029 msgctxt "key for text search" msgid "operation" @@ -921,24 +921,24 @@ msgstr "operation" #: archaeological_context_records/models.py:601 #: archaeological_context_records/models.py:658 #: archaeological_finds/models_finds.py:1272 -#: archaeological_operations/models.py:1175 -#: archaeological_operations/models.py:1240 -#: archaeological_warehouse/models.py:937 ishtar_common/models.py:3960 +#: archaeological_operations/models.py:1186 +#: archaeological_operations/models.py:1251 +#: archaeological_warehouse/models.py:938 ishtar_common/models.py:3960 #: ishtar_common/models.py:4038 msgctxt "key for text search" msgid "site" msgstr "site" #: archaeological_context_records/models.py:605 -#: archaeological_context_records/tests.py:804 +#: archaeological_context_records/tests.py:805 #: archaeological_finds/models_finds.py:1295 msgctxt "key for text search" msgid "operation-relation-type" msgstr "operation-type-relation" #: archaeological_context_records/models.py:609 -#: archaeological_operations/models.py:371 -#: archaeological_operations/models.py:1133 +#: archaeological_operations/models.py:372 +#: archaeological_operations/models.py:1144 #: archaeological_operations/tests.py:3014 #: archaeological_operations/tests.py:3196 msgctxt "key for text search" @@ -946,26 +946,26 @@ msgid "period" msgstr "periode" #: archaeological_context_records/models.py:613 -#: archaeological_context_records/tests.py:863 +#: archaeological_context_records/tests.py:864 msgctxt "key for text search" msgid "unit-type" msgstr "type-unite" #: archaeological_context_records/models.py:616 -#: archaeological_files/models.py:467 archaeological_operations/models.py:1097 -#: archaeological_operations/models.py:2568 +#: archaeological_files/models.py:467 archaeological_operations/models.py:1108 +#: archaeological_operations/models.py:2579 msgctxt "key for text search" msgid "parcel" msgstr "parcelle" #: archaeological_context_records/models.py:620 -#: archaeological_operations/models.py:1194 +#: archaeological_operations/models.py:1205 msgctxt "key for text search" msgid "has-finds" msgstr "mobilier-rattache" #: archaeological_context_records/models.py:623 -#: archaeological_context_records/tests.py:769 +#: archaeological_context_records/tests.py:770 msgctxt "key for text search" msgid "record-relation-type" msgstr "ue-type-relation" @@ -976,20 +976,20 @@ msgid "excavation-technique" msgstr "methode-de-fouille" #: archaeological_context_records/models.py:673 -#: archaeological_finds/models_finds.py:1689 -#: archaeological_operations/models.py:457 -#: archaeological_operations/models.py:1223 +#: archaeological_finds/models_finds.py:1688 +#: archaeological_operations/models.py:458 +#: archaeological_operations/models.py:1234 #: archaeological_warehouse/models.py:335 -#: archaeological_warehouse/models.py:1056 +#: archaeological_warehouse/models.py:1057 msgid "Lock/Unlock" msgstr "Verrouiller/Déverrouiller" #: archaeological_context_records/models.py:680 -#: archaeological_finds/models_finds.py:1682 -#: archaeological_operations/models.py:464 -#: archaeological_operations/models.py:1216 +#: archaeological_finds/models_finds.py:1681 +#: archaeological_operations/models.py:465 +#: archaeological_operations/models.py:1227 #: archaeological_warehouse/models.py:327 -#: archaeological_warehouse/models.py:1049 ishtar_common/models.py:2472 +#: archaeological_warehouse/models.py:1050 ishtar_common/models.py:2472 #: ishtar_common/models.py:2734 ishtar_common/models.py:4055 msgid "Bulk update" msgstr "Modification par lot" @@ -999,13 +999,13 @@ msgstr "Modification par lot" #: archaeological_context_records/views.py:272 #: archaeological_context_records/views.py:287 #: archaeological_finds/models_finds.py:877 -#: archaeological_finds/models_finds.py:1699 -#: archaeological_finds/models_finds.py:2318 archaeological_finds/views.py:1247 +#: archaeological_finds/models_finds.py:1698 +#: archaeological_finds/models_finds.py:2317 archaeological_finds/views.py:1247 #: archaeological_finds/views.py:1262 archaeological_finds/views.py:1300 -#: archaeological_finds/views.py:1316 archaeological_operations/models.py:474 -#: archaeological_operations/models.py:632 -#: archaeological_operations/models.py:1233 -#: archaeological_operations/models.py:1874 +#: archaeological_finds/views.py:1316 archaeological_operations/models.py:475 +#: archaeological_operations/models.py:633 +#: archaeological_operations/models.py:1244 +#: archaeological_operations/models.py:1885 #: archaeological_operations/views.py:843 #: archaeological_operations/views.py:858 #: archaeological_operations/views.py:865 @@ -1018,26 +1018,26 @@ msgstr "Dupliquer" #: archaeological_context_records/models.py:707 #: archaeological_files/models.py:530 archaeological_finds/models_finds.py:406 -#: archaeological_finds/models_finds.py:1803 +#: archaeological_finds/models_finds.py:1802 #: archaeological_finds/models_treatments.py:252 #: archaeological_finds/models_treatments.py:1100 -#: archaeological_operations/models.py:3021 +#: archaeological_operations/models.py:3032 #: archaeological_warehouse/models.py:388 -#: archaeological_warehouse/models.py:1133 ishtar_common/models.py:4090 +#: archaeological_warehouse/models.py:1134 ishtar_common/models.py:4090 msgid "External ID" msgstr "Identifiant" #: archaeological_context_records/models.py:709 #: archaeological_files/models.py:533 archaeological_finds/models_finds.py:408 -#: archaeological_finds/models_finds.py:1805 -#: archaeological_operations/models.py:3024 +#: archaeological_finds/models_finds.py:1804 +#: archaeological_operations/models.py:3035 #: archaeological_warehouse/models.py:390 -#: archaeological_warehouse/models.py:1135 +#: archaeological_warehouse/models.py:1136 msgid "External ID is set automatically" msgstr "L'identifiant est attribué automatiquement" #: archaeological_context_records/models.py:754 -#: archaeological_operations/models.py:1332 ishtar_common/models_common.py:2825 +#: archaeological_operations/models.py:1343 ishtar_common/models_common.py:2906 msgid "Surface (m2)" msgstr "Surface (m2)" @@ -1075,21 +1075,21 @@ msgstr "Estimation d'un « Terminus Post Quem »" #: archaeological_context_records/models.py:830 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 -#: archaeological_files/models.py:719 archaeological_finds/models_finds.py:1998 +#: archaeological_files/models.py:719 archaeological_finds/models_finds.py:1997 #: archaeological_finds/models_treatments.py:272 #: archaeological_finds/models_treatments.py:1150 #: archaeological_finds/templates/ishtar/sheet_find.html:72 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 -#: archaeological_operations/models.py:524 -#: archaeological_operations/models.py:1406 -#: archaeological_operations/models.py:2768 +#: archaeological_operations/models.py:525 +#: archaeological_operations/models.py:1417 +#: archaeological_operations/models.py:2779 #: archaeological_operations/templates/ishtar/sheet_operation.html:63 #: archaeological_operations/templates/ishtar/sheet_site.html:97 #: archaeological_warehouse/models.py:377 -#: archaeological_warehouse/models.py:1140 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:46 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:179 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:42 +#: archaeological_warehouse/models.py:1141 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:51 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:191 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:47 #: ishtar_common/models.py:4206 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_person.html:161 @@ -1097,50 +1097,50 @@ msgid "Documents" msgstr "Documents" #: archaeological_context_records/models.py:837 -#: archaeological_finds/models_finds.py:2004 +#: archaeological_finds/models_finds.py:2003 #: archaeological_finds/models_treatments.py:278 #: archaeological_finds/models_treatments.py:1157 -#: archaeological_operations/models.py:530 -#: archaeological_operations/models.py:1412 -#: archaeological_operations/models.py:2775 +#: archaeological_operations/models.py:531 +#: archaeological_operations/models.py:1423 +#: archaeological_operations/models.py:2786 #: archaeological_warehouse/models.py:384 -#: archaeological_warehouse/models.py:1147 +#: archaeological_warehouse/models.py:1148 msgid "Main image" msgstr "Image principale" #: archaeological_context_records/models.py:842 -#: archaeological_files/models.py:723 archaeological_finds/models_finds.py:2016 +#: archaeological_files/models.py:723 archaeological_finds/models_finds.py:2015 #: archaeological_finds/models_treatments.py:283 #: archaeological_finds/models_treatments.py:1169 -#: archaeological_operations/models.py:535 -#: archaeological_operations/models.py:1417 -#: archaeological_operations/models.py:3028 ishtar_common/models.py:2496 +#: archaeological_operations/models.py:536 +#: archaeological_operations/models.py:1428 +#: archaeological_operations/models.py:3039 ishtar_common/models.py:2496 #: ishtar_common/models.py:2783 ishtar_common/models.py:3555 -#: ishtar_common/models_common.py:2850 ishtar_common/models_common.py:2873 +#: ishtar_common/models_common.py:2931 ishtar_common/models_common.py:2954 msgid "Cached name" msgstr "Nom en cache" #: archaeological_context_records/models.py:845 -#: archaeological_finds/models_finds.py:2023 -#: archaeological_operations/models.py:548 -#: archaeological_operations/models.py:1503 +#: archaeological_finds/models_finds.py:2022 +#: archaeological_operations/models.py:549 +#: archaeological_operations/models.py:1514 msgid "Cached periods label" msgstr "Nom en cache des périodes" #: archaeological_context_records/models.py:848 #: archaeological_context_records/models.py:854 -#: archaeological_files/models.py:727 archaeological_finds/models_finds.py:2020 -#: archaeological_finds/models_finds.py:2026 -#: archaeological_finds/models_finds.py:2032 -#: archaeological_finds/models_finds.py:2038 -#: archaeological_operations/models.py:539 -#: archaeological_operations/models.py:545 -#: archaeological_operations/models.py:551 -#: archaeological_operations/models.py:557 -#: archaeological_operations/models.py:1419 -#: archaeological_operations/models.py:1500 -#: archaeological_operations/models.py:1506 -#: archaeological_operations/models.py:1512 +#: archaeological_files/models.py:727 archaeological_finds/models_finds.py:2019 +#: archaeological_finds/models_finds.py:2025 +#: archaeological_finds/models_finds.py:2031 +#: archaeological_finds/models_finds.py:2037 +#: archaeological_operations/models.py:540 +#: archaeological_operations/models.py:546 +#: archaeological_operations/models.py:552 +#: archaeological_operations/models.py:558 +#: archaeological_operations/models.py:1430 +#: archaeological_operations/models.py:1511 +#: archaeological_operations/models.py:1517 +#: archaeological_operations/models.py:1523 msgid "Generated automatically - do not edit" msgstr "Généré automatiquement - ne pas éditer" @@ -1161,7 +1161,7 @@ msgid "Context record" msgstr "UE" #: archaeological_context_records/models.py:915 -#: archaeological_finds/models_finds.py:2204 +#: archaeological_finds/models_finds.py:2203 msgid "List of associated base finds" msgstr "Liste du mobilier de base associé" @@ -1275,22 +1275,24 @@ msgstr "Opération / Site" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:74 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:266 -#: archaeological_finds/forms.py:1825 archaeological_finds/models_finds.py:2045 +#: archaeological_finds/forms.py:1825 archaeological_finds/models_finds.py:2044 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:11 #: archaeological_finds/templates/ishtar/sheet_treatment.html:24 #: archaeological_operations/templates/ishtar/sheet_operation.html:90 #: archaeological_operations/templates/ishtar/sheet_operation.html:434 #: archaeological_operations/templates/ishtar/sheet_operation.html:526 #: archaeological_operations/templates/ishtar/sheet_site.html:93 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:174 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:221 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:177 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:186 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:233 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:193 msgid "Finds" msgstr "Mobilier" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:101 #: archaeological_finds/templates/ishtar/sheet_find.html:81 #: archaeological_operations/templates/ishtar/sheet_operation.html:99 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:60 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:56 #: ishtar_common/templates/ishtar/blocks/sheet_map.html:9 msgid "Geographic data" msgstr "Donnée géographique" @@ -1306,9 +1308,9 @@ msgstr "Champs personnalisés" #: archaeological_finds/templates/ishtar/sheet_find.html:161 #: archaeological_operations/templates/ishtar/sheet_operation.html:139 #: 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:3903 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:84 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:77 +#: ishtar_common/models_common.py:3984 #: ishtar_common/templates/ishtar/sheet_document.html:37 msgid "Complete identifier" msgstr "Identifiant complet" @@ -1327,12 +1329,10 @@ msgstr "Surface" #: archaeological_finds/templates/ishtar/sheet_basefind.html:70 #: archaeological_operations/templates/ishtar/sheet_operation.html:300 #: archaeological_operations/templates/ishtar/sheet_site.html:68 -#: 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:2827 -msgid "Localisation" -msgstr "Localisation" +#: archaeological_warehouse/templates/ishtar/sheet_container.html:165 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:116 +msgid "Geographic localisation" +msgstr "Localisation géographique" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:178 #: archaeological_finds/forms.py:389 archaeological_finds/forms.py:682 @@ -1368,8 +1368,8 @@ msgstr "Référence numérique" #: archaeological_operations/templates/ishtar/sheet_operation.html:176 #: 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:1938 ishtar_common/models_common.py:1953 -#: ishtar_common/models_imports.py:1250 +#: ishtar_common/models_common.py:1973 ishtar_common/models_common.py:1988 +#: ishtar_common/models_imports.py:1252 msgid "State" msgstr "État" @@ -1437,7 +1437,7 @@ msgid "Context record deletion" msgstr "Supprimer une Unité d'Enregistrement" #: archaeological_context_records/views.py:254 -#: archaeological_operations/models.py:1863 +#: archaeological_operations/models.py:1874 msgid "Add context record" msgstr "Ajouter une Unité d'Enregistrement" @@ -1489,20 +1489,20 @@ msgstr "Dossier - 001 - Recherche" #: archaeological_operations/forms.py:725 #: archaeological_operations/forms.py:1426 #: archaeological_operations/forms.py:1739 -#: archaeological_operations/models.py:944 -#: archaeological_operations/models.py:1316 -#: archaeological_operations/models.py:2518 -#: archaeological_operations/models.py:2747 -#: archaeological_operations/models.py:3011 +#: archaeological_operations/models.py:954 +#: archaeological_operations/models.py:1327 +#: archaeological_operations/models.py:2529 +#: archaeological_operations/models.py:2758 +#: archaeological_operations/models.py:3022 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 -#: ishtar_common/models_imports.py:980 +#: ishtar_common/models_imports.py:982 msgid "Year" msgstr "Année" #: archaeological_files/forms.py:91 archaeological_files/forms.py:240 #: archaeological_files/forms.py:673 archaeological_files/models.py:524 #: archaeological_operations/forms.py:491 -#: archaeological_operations/models.py:1317 +#: archaeological_operations/models.py:1328 msgid "Numeric reference" msgstr "Identifiant numérique" @@ -1512,8 +1512,8 @@ msgstr "Identifiant numérique" #: archaeological_operations/forms.py:1331 #: archaeological_operations/forms.py:1428 #: archaeological_operations/forms.py:1505 -#: archaeological_operations/models.py:483 -#: archaeological_operations/models.py:2750 +#: archaeological_operations/models.py:484 +#: archaeological_operations/models.py:2761 msgid "Other reference" msgstr "Autre référence" @@ -1521,8 +1521,8 @@ msgstr "Autre référence" #: archaeological_files/forms.py:1167 archaeological_files/models.py:1343 #: archaeological_operations/forms.py:503 #: archaeological_operations/forms.py:1439 -#: archaeological_operations/models.py:2390 ishtar_common/models_common.py:1961 -#: ishtar_common/models_common.py:2833 +#: archaeological_operations/models.py:2401 ishtar_common/models_common.py:1996 +#: ishtar_common/models_common.py:2914 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "Département" @@ -1565,7 +1565,7 @@ msgstr "Référence du permis / de l'arrêté" #: archaeological_finds/forms_treatments.py:195 #: archaeological_finds/forms_treatments.py:765 #: archaeological_finds/models_finds.py:412 -#: archaeological_finds/models_finds.py:1936 +#: archaeological_finds/models_finds.py:1935 #: archaeological_finds/models_treatments.py:254 #: archaeological_finds/models_treatments.py:1146 #: archaeological_operations/forms.py:541 @@ -1574,16 +1574,16 @@ msgstr "Référence du permis / de l'arrêté" #: archaeological_operations/forms.py:1345 #: archaeological_operations/forms.py:1442 #: archaeological_operations/forms.py:1504 -#: archaeological_operations/models.py:495 -#: archaeological_operations/models.py:1401 -#: archaeological_operations/models.py:2764 +#: archaeological_operations/models.py:496 +#: archaeological_operations/models.py:1412 +#: archaeological_operations/models.py:2775 #: archaeological_warehouse/forms.py:226 archaeological_warehouse/forms.py:375 #: archaeological_warehouse/forms.py:507 archaeological_warehouse/models.py:367 -#: archaeological_warehouse/models.py:1103 ishtar_common/forms_common.py:1800 +#: archaeological_warehouse/models.py:1104 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:182 -#: ishtar_common/models_common.py:2170 ishtar_common/models_imports.py:751 +#: ishtar_common/models.py:4190 ishtar_common/models_common.py:183 +#: ishtar_common/models_common.py:2216 ishtar_common/models_imports.py:751 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:13 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:170 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:39 @@ -1631,9 +1631,9 @@ msgstr "Dossier archéologique - 010 - Général" #: archaeological_files/forms.py:218 archaeological_files/models.py:605 #: archaeological_finds/models_treatments.py:1134 -#: archaeological_operations/models.py:1277 ishtar_common/forms_common.py:1795 +#: archaeological_operations/models.py:1288 ishtar_common/forms_common.py:1795 #: ishtar_common/forms_common.py:2271 ishtar_common/models.py:4175 -#: ishtar_common/models_imports.py:1258 +#: ishtar_common/models_imports.py:1260 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 msgid "Creation date" msgstr "Date de création" @@ -1678,21 +1678,21 @@ msgstr "Nom de l'aménagement" #: archaeological_operations/forms.py:1053 #: archaeological_operations/forms.py:1381 #: archaeological_operations/models.py:304 -#: archaeological_operations/models.py:493 -#: archaeological_operations/models.py:1029 -#: archaeological_operations/models.py:1031 -#: archaeological_operations/models.py:1337 -#: archaeological_operations/models.py:2759 +#: archaeological_operations/models.py:494 +#: archaeological_operations/models.py:1039 +#: archaeological_operations/models.py:1041 +#: archaeological_operations/models.py:1348 +#: archaeological_operations/models.py:2770 #: archaeological_operations/templates/ishtar/sheet_operation.html:147 #: 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:2856 +#: ishtar_common/models_common.py:2937 msgid "Towns" msgstr "Communes" #: archaeological_files/forms.py:293 archaeological_files/forms.py:336 #: archaeological_files/forms.py:576 archaeological_files/models.py:641 -#: archaeological_operations/models.py:2753 ishtar_common/models_common.py:1962 +#: archaeological_operations/models.py:2764 ishtar_common/models_common.py:1997 msgid "Departments" msgstr "Départements" @@ -1715,7 +1715,7 @@ msgstr "N° / voie" #: archaeological_files/forms.py:303 archaeological_files/forms.py:344 #: archaeological_warehouse/forms.py:241 ishtar_common/forms_common.py:540 -#: ishtar_common/forms_common.py:923 ishtar_common/models_common.py:3064 +#: ishtar_common/forms_common.py:923 ishtar_common/models_common.py:3145 msgid "Postal code" msgstr "Code postal" @@ -1732,7 +1732,7 @@ msgstr "Surface totale aménagée (m2)" #: 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:536 ishtar_common/forms_common.py:919 -#: ishtar_common/models_common.py:3059 ishtar_common/models_common.py:3214 +#: ishtar_common/models_common.py:3140 ishtar_common/models_common.py:3295 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 msgid "Address" msgstr "Adresse" @@ -1801,7 +1801,7 @@ msgstr "Dossier archéologique - 045 - Recherche - Général" #: archaeological_files/forms.py:596 archaeological_files/models.py:665 #: archaeological_operations/forms.py:522 -#: archaeological_operations/models.py:2704 +#: archaeological_operations/models.py:2715 msgid "Scientist in charge" msgstr "Responsable d'opération" @@ -1962,7 +1962,7 @@ msgstr "Équipement / service" #: archaeological_finds/templates/ishtar/sheet_find.html:368 #: archaeological_operations/forms.py:1427 #: archaeological_operations/forms.py:1560 -#: archaeological_operations/models.py:2689 ishtar_common/admin.py:564 +#: archaeological_operations/models.py:2700 ishtar_common/admin.py:564 #: ishtar_common/models.py:4089 msgid "Index" msgstr "Index" @@ -1975,8 +1975,8 @@ msgstr "Index" #: archaeological_finds/forms_treatments.py:897 #: archaeological_operations/forms.py:1433 #: archaeological_operations/forms.py:1494 -#: archaeological_operations/models.py:2420 -#: archaeological_operations/models.py:2679 ishtar_common/models_imports.py:932 +#: archaeological_operations/models.py:2431 +#: archaeological_operations/models.py:2690 ishtar_common/models_imports.py:934 msgid "Act type" msgstr "Type d'acte" @@ -1997,7 +1997,7 @@ msgstr "Indexé ?" #: archaeological_finds/forms_treatments.py:844 #: archaeological_operations/forms.py:1440 #: archaeological_operations/forms.py:1501 -#: archaeological_operations/models.py:2748 +#: archaeological_operations/models.py:2759 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "Objet" @@ -2043,10 +2043,10 @@ msgstr "Dossier archéologique - Acte administratif - Général" #: archaeological_files/wizards.py:219 archaeological_files/wizards.py:231 #: archaeological_operations/forms.py:670 #: archaeological_operations/forms.py:931 -#: archaeological_operations/models.py:1883 -#: archaeological_operations/models.py:2403 -#: archaeological_operations/models.py:2519 -#: archaeological_operations/models.py:2727 +#: archaeological_operations/models.py:1894 +#: archaeological_operations/models.py:2414 +#: archaeological_operations/models.py:2530 +#: archaeological_operations/models.py:2738 #: archaeological_operations/wizards.py:85 ishtar_common/views.py:390 msgid "Archaeological file" msgstr "Dossier archéologique" @@ -2059,9 +2059,9 @@ msgstr "Clôture" #: archaeological_files/ishtar_menu.py:71 #: archaeological_finds/ishtar_menu.py:149 #: archaeological_finds/ishtar_menu.py:226 -#: archaeological_finds/models_finds.py:3345 +#: archaeological_finds/models_finds.py:3344 #: archaeological_operations/ishtar_menu.py:70 -#: archaeological_operations/models.py:2784 +#: archaeological_operations/models.py:2795 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "Acte administratif" @@ -2147,12 +2147,12 @@ msgstr "m. linéaire" msgid "Equipment/Service" msgstr "Équipement/Service" -#: archaeological_files/models.py:208 ishtar_common/models_common.py:173 -#: ishtar_common/models_common.py:204 +#: archaeological_files/models.py:208 ishtar_common/models_common.py:174 +#: ishtar_common/models_common.py:205 msgid "Textual ID" msgstr "Identifiant textuel" -#: archaeological_files/models.py:212 ishtar_common/models_common.py:177 +#: archaeological_files/models.py:212 ishtar_common/models_common.py:178 msgid "" "The slug is the standardized version of the name. It contains only lowercase " "letters, numbers and hyphens. Each slug must be unique." @@ -2173,7 +2173,7 @@ msgstr "Tarif forfaitaire" msgid "Unitary cost" msgstr "Coût unitaire" -#: archaeological_files/models.py:223 ishtar_common/models_imports.py:933 +#: archaeological_files/models.py:223 ishtar_common/models_imports.py:935 msgid "Unit" msgstr "Unité" @@ -2187,14 +2187,14 @@ msgstr "Quantité par défaut par jour" #: archaeological_files/models.py:231 ishtar_common/models.py:1558 #: ishtar_common/models.py:1970 ishtar_common/models.py:3423 -#: ishtar_common/models_common.py:183 ishtar_common/models_imports.py:187 +#: ishtar_common/models_common.py:184 ishtar_common/models_imports.py:187 #: ishtar_common/models_imports.py:812 msgid "Available" msgstr "Disponible" #: archaeological_files/models.py:237 archaeological_warehouse/forms.py:747 #: ishtar_common/admin.py:1126 ishtar_common/models.py:2275 -#: ishtar_common/models_common.py:715 +#: ishtar_common/models_common.py:716 msgid "Parent" msgstr "Parent" @@ -2256,13 +2256,13 @@ msgstr "Types d'opération pour les redevances - France" #: archaeological_files/models.py:382 archaeological_finds/models_finds.py:1145 #: archaeological_operations/models.py:312 -#: archaeological_operations/models.py:945 ishtar_common/admin.py:1295 +#: archaeological_operations/models.py:955 ishtar_common/admin.py:1295 msgid "Area" msgstr "Zone" #: archaeological_files/models.py:383 archaeological_finds/models_finds.py:1148 #: archaeological_operations/models.py:313 -#: archaeological_operations/models.py:946 +#: archaeological_operations/models.py:956 msgid "Extended area" msgstr "Zone étendue" @@ -2273,8 +2273,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:748 -#: ishtar_common/models_common.py:1934 ishtar_common/models_common.py:1950 +#: ishtar_common/models.py:1854 ishtar_common/models_common.py:749 +#: ishtar_common/models_common.py:1969 ishtar_common/models_common.py:1985 #: ishtar_common/templates/ishtar/sheet_person.html:30 msgid "Number" msgstr "Nombre" @@ -2290,8 +2290,8 @@ msgstr "Surface totale aménagée (km²)" #: archaeological_files/models.py:455 archaeological_finds/models_finds.py:1252 #: archaeological_finds/models_treatments.py:152 #: archaeological_finds/models_treatments.py:1049 -#: archaeological_operations/models.py:1082 -#: archaeological_operations/models.py:2543 +#: archaeological_operations/models.py:1093 +#: archaeological_operations/models.py:2554 #: archaeological_operations/tests.py:3020 #: archaeological_operations/tests.py:3096 msgctxt "key for text search" @@ -2300,28 +2300,28 @@ msgstr "annee" #: archaeological_files/models.py:457 #: archaeological_finds/models_treatments.py:1046 -#: archaeological_operations/models.py:361 -#: archaeological_warehouse/models.py:913 ishtar_common/models.py:3854 +#: archaeological_operations/models.py:362 +#: archaeological_warehouse/models.py:914 ishtar_common/models.py:3854 msgctxt "key for text search" msgid "reference" msgstr "reference" #: archaeological_files/models.py:460 #: archaeological_finds/models_treatments.py:149 -#: archaeological_operations/models.py:367 +#: archaeological_operations/models.py:368 msgctxt "key for text search" msgid "other-reference" msgstr "autre-reference" -#: archaeological_files/models.py:471 archaeological_operations/models.py:1101 +#: archaeological_files/models.py:471 archaeological_operations/models.py:1112 msgctxt "key for text search" msgid "department" msgstr "departement" #: archaeological_files/models.py:475 #: archaeological_finds/models_treatments.py:1043 -#: archaeological_operations/models.py:364 -#: archaeological_operations/models.py:1105 +#: archaeological_operations/models.py:365 +#: archaeological_operations/models.py:1116 #: archaeological_operations/tests.py:3140 #: archaeological_warehouse/models.py:309 ishtar_common/models.py:2458 #: ishtar_common/models.py:2710 ishtar_common/models.py:3284 @@ -2332,11 +2332,11 @@ msgstr "nom" #: archaeological_files/models.py:478 #: archaeological_finds/models_treatments.py:155 #: archaeological_finds/models_treatments.py:1052 -#: archaeological_operations/models.py:1111 -#: archaeological_operations/models.py:2554 +#: archaeological_operations/models.py:1122 +#: archaeological_operations/models.py:2565 #: archaeological_operations/tests.py:3153 #: archaeological_warehouse/models.py:312 -#: archaeological_warehouse/models.py:909 ishtar_common/models.py:2461 +#: archaeological_warehouse/models.py:910 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" @@ -2364,10 +2364,10 @@ msgid "permit-reference" msgstr "reference-permis" #: archaeological_files/models.py:496 archaeological_finds/models_finds.py:1458 -#: archaeological_operations/models.py:383 -#: archaeological_operations/models.py:1153 -#: archaeological_operations/models.py:2664 -#: archaeological_warehouse/models.py:920 ishtar_common/models.py:3914 +#: archaeological_operations/models.py:384 +#: archaeological_operations/models.py:1164 +#: archaeological_operations/models.py:2675 +#: archaeological_warehouse/models.py:921 ishtar_common/models.py:3914 msgctxt "key for text search" msgid "comment" msgstr "commentaire" @@ -2379,12 +2379,12 @@ msgctxt "key for text search" msgid "in-charge" msgstr "responsable" -#: archaeological_files/models.py:503 archaeological_operations/models.py:2599 +#: archaeological_files/models.py:503 archaeological_operations/models.py:2610 msgctxt "key for text search" msgid "general-contractor" msgstr "amenageur" -#: archaeological_files/models.py:507 archaeological_operations/models.py:2603 +#: archaeological_files/models.py:507 archaeological_operations/models.py:2614 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "amenageur-organisation" @@ -2406,7 +2406,7 @@ msgstr "Référence interne" #: archaeological_operations/forms.py:1215 #: archaeological_operations/forms.py:1330 #: archaeological_operations/forms.py:1795 -#: archaeological_operations/models.py:484 +#: archaeological_operations/models.py:485 #: 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 @@ -2419,11 +2419,11 @@ msgstr "Référence interne" #: ishtar_common/models.py:1556 ishtar_common/models.py:1940 #: 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:2138 -#: ishtar_common/models_common.py:2824 ishtar_common/models_common.py:2873 +#: ishtar_common/models.py:4940 ishtar_common/models_common.py:2184 +#: ishtar_common/models_common.py:2905 ishtar_common/models_common.py:2954 #: ishtar_common/models_imports.py:110 ishtar_common/models_imports.py:144 #: ishtar_common/models_imports.py:669 ishtar_common/models_imports.py:686 -#: ishtar_common/models_imports.py:807 ishtar_common/models_imports.py:1170 +#: ishtar_common/models_imports.py:807 ishtar_common/models_imports.py:1172 #: ishtar_common/models_rest.py:105 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:10 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:24 @@ -2529,11 +2529,11 @@ msgstr "Intercommunal" msgid "No town" msgstr "Pas de commune" -#: archaeological_files/models.py:1241 archaeological_operations/models.py:1842 +#: archaeological_files/models.py:1241 archaeological_operations/models.py:1853 msgid "Modify parcels" msgstr "Modifier les parcelles" -#: archaeological_files/models.py:1243 archaeological_operations/models.py:1844 +#: archaeological_files/models.py:1243 archaeological_operations/models.py:1855 msgid "parcels" msgstr "parcelles" @@ -2566,8 +2566,8 @@ msgstr "Ajouter une opération" msgid "operation" msgstr "opération" -#: archaeological_files/models.py:1340 archaeological_operations/models.py:1321 -#: archaeological_operations/models.py:2998 +#: archaeological_files/models.py:1340 archaeological_operations/models.py:1332 +#: archaeological_operations/models.py:3009 msgid "File" msgstr "Dossier" @@ -2670,7 +2670,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:2785 +#: archaeological_operations/models.py:2796 #: archaeological_operations/templates/ishtar/sheet_operation.html:351 #: archaeological_operations/templates/ishtar/sheet_operation.html:488 msgid "Administrative acts" @@ -2683,8 +2683,8 @@ 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:2517 -#: archaeological_operations/models.py:2820 +#: archaeological_operations/models.py:2528 +#: archaeological_operations/models.py:2831 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 #: archaeological_warehouse/forms.py:333 archaeological_warehouse/forms.py:505 @@ -2706,14 +2706,14 @@ 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:587 +#: archaeological_warehouse/models.py:889 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:2935 ishtar_common/models.py:745 #: 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:979 +#: ishtar_common/models_imports.py:981 #: ishtar_common/templates/blocks/DataTables-stats.html:27 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:24 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:8 @@ -2727,7 +2727,7 @@ msgstr "Type" #: archaeological_files/templates/ishtar/sheet_file.html:195 #: archaeological_operations/forms.py:781 -#: archaeological_operations/models.py:1281 +#: archaeological_operations/models.py:1292 msgid "Excavation end date" msgstr "Date de fin de chantier" @@ -2742,7 +2742,7 @@ msgstr "Actes administratifs associés à ces opérations" #: archaeological_files/templates/ishtar/sheet_file.html:220 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:9 #: archaeological_warehouse/forms.py:694 ishtar_common/models.py:714 -#: ishtar_common/models_imports.py:978 +#: ishtar_common/models_imports.py:980 msgid "Date" msgstr "Date" @@ -2781,10 +2781,10 @@ msgstr "Coût" #: archaeological_files/templates/ishtar/sheet_file.html:307 #: archaeological_files/templates/ishtar/sheet_file.html:359 #: archaeological_files/templates/ishtar/sheet_file.html:415 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:231 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:255 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:186 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:211 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:243 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:267 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:202 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:227 #: ishtar_common/models.py:1847 ishtar_common/models.py:1879 msgid "Total" msgstr "Total" @@ -2893,48 +2893,48 @@ msgstr "Mobilier simple - 020 - Général" #: archaeological_finds/forms.py:811 archaeological_finds/forms.py:1024 #: archaeological_finds/forms.py:1333 archaeological_finds/forms.py:1965 #: archaeological_finds/models_finds.py:405 -#: archaeological_finds/models_finds.py:1810 +#: archaeological_finds/models_finds.py:1809 msgid "Free ID" msgstr "Identifiant libre" #: archaeological_finds/forms.py:278 archaeological_finds/forms.py:614 #: archaeological_finds/forms.py:815 archaeological_finds/forms.py:1026 #: archaeological_finds/forms.py:1334 archaeological_finds/forms.py:2032 -#: archaeological_finds/models_finds.py:1811 +#: archaeological_finds/models_finds.py:1810 msgid "Denomination" msgstr "Dénomination" #: archaeological_finds/forms.py:279 archaeological_finds/forms.py:816 -#: archaeological_finds/forms.py:1335 archaeological_finds/models_finds.py:1938 +#: archaeological_finds/forms.py:1335 archaeological_finds/models_finds.py:1937 msgid "Previous ID" msgstr "Identifiant précédent" #: archaeological_finds/forms.py:280 archaeological_finds/forms.py:820 -#: archaeological_finds/forms.py:1338 archaeological_finds/models_finds.py:1812 -msgid "Museum ID" -msgstr "Identifiant musée" +#: archaeological_finds/forms.py:1338 archaeological_finds/models_finds.py:1811 +msgid "Museum inventory number" +msgstr "Numéro d'inventaire musée" #: archaeological_finds/forms.py:281 archaeological_finds/forms.py:821 -#: archaeological_finds/forms.py:1339 archaeological_finds/models_finds.py:1813 +#: archaeological_finds/forms.py:1339 archaeological_finds/models_finds.py:1812 msgid "Laboratory ID" msgstr "Numéro de laboratoire" #: archaeological_finds/forms.py:282 archaeological_finds/forms.py:822 -#: archaeological_finds/forms.py:1337 archaeological_finds/models_finds.py:1808 +#: archaeological_finds/forms.py:1337 archaeological_finds/models_finds.py:1807 msgid "Seal number" msgstr "Numéro de scellé" #: archaeological_finds/forms.py:283 archaeological_finds/forms.py:823 -#: archaeological_finds/forms.py:1340 archaeological_finds/models_finds.py:1935 +#: archaeological_finds/forms.py:1340 archaeological_finds/models_finds.py:1934 msgid "Mark" msgstr "Marquage" -#: archaeological_finds/forms.py:296 archaeological_finds/models_finds.py:1995 +#: archaeological_finds/forms.py:296 archaeological_finds/models_finds.py:1994 msgid "Public description" msgstr "Description publique" #: archaeological_finds/forms.py:298 archaeological_finds/forms.py:621 -#: archaeological_finds/forms.py:1446 archaeological_finds/models_finds.py:1878 +#: archaeological_finds/forms.py:1446 archaeological_finds/models_finds.py:1877 msgid "Is complete?" msgstr "Est complet ?" @@ -2942,18 +2942,18 @@ msgstr "Est complet ?" #: archaeological_finds/forms.py:835 archaeological_finds/models_finds.py:91 #: archaeological_finds/models_finds.py:1114 #: archaeological_finds/models_finds.py:1115 -#: archaeological_finds/models_finds.py:1821 +#: archaeological_finds/models_finds.py:1820 msgid "Material types" msgstr "Types de matériau" #: archaeological_finds/forms.py:303 archaeological_finds/forms.py:627 -#: archaeological_finds/forms.py:1455 archaeological_finds/models_finds.py:1825 -#: ishtar_common/models_imports.py:957 +#: archaeological_finds/forms.py:1455 archaeological_finds/models_finds.py:1824 +#: ishtar_common/models_imports.py:959 msgid "Material type quality" msgstr "Qualité du type de matériaux" #: archaeological_finds/forms.py:306 archaeological_finds/forms.py:1457 -#: archaeological_finds/models_finds.py:1832 +#: archaeological_finds/models_finds.py:1831 msgid "Comment on the material" msgstr "Commentaire relatif au matériau" @@ -2961,12 +2961,12 @@ msgstr "Commentaire relatif au matériau" #: archaeological_finds/forms.py:838 archaeological_finds/models_finds.py:264 #: archaeological_finds/models_finds.py:1116 #: archaeological_finds/models_finds.py:1117 -#: archaeological_finds/models_finds.py:1880 +#: archaeological_finds/models_finds.py:1879 msgid "Object types" msgstr "Types d'objet" #: archaeological_finds/forms.py:313 archaeological_finds/forms.py:634 -#: archaeological_finds/forms.py:1464 archaeological_finds/models_finds.py:1884 +#: archaeological_finds/forms.py:1464 archaeological_finds/models_finds.py:1883 msgid "Object type quality" msgstr "Qualité du type d'objet" @@ -2977,48 +2977,48 @@ msgstr "Domaines fonctionnels" #: archaeological_finds/forms.py:319 archaeological_finds/forms.py:636 #: archaeological_finds/forms.py:1473 archaeological_finds/forms.py:1971 -#: archaeological_finds/models_finds.py:1839 +#: archaeological_finds/models_finds.py:1838 msgid "Number of remains" msgstr "Nombre de restes (NR)" #: archaeological_finds/forms.py:321 archaeological_finds/forms.py:638 -#: archaeological_finds/forms.py:1475 archaeological_finds/models_finds.py:1915 +#: archaeological_finds/forms.py:1475 archaeological_finds/models_finds.py:1914 msgid "Minimum number of individuals (MNI)" msgstr "Nombre minimum d'individus (NMI)" #: archaeological_finds/forms.py:325 archaeological_finds/forms.py:642 -#: archaeological_finds/forms.py:1479 archaeological_finds/models_finds.py:1815 +#: archaeological_finds/forms.py:1479 archaeological_finds/models_finds.py:1814 msgid "Decoration" msgstr "Décor" #: archaeological_finds/forms.py:328 archaeological_finds/forms.py:645 -#: archaeological_finds/forms.py:1480 archaeological_finds/models_finds.py:1816 +#: archaeological_finds/forms.py:1480 archaeological_finds/models_finds.py:1815 msgid "Inscription" msgstr "Inscription" #: archaeological_finds/forms.py:331 archaeological_finds/forms.py:648 #: archaeological_finds/forms.py:846 archaeological_finds/forms.py:1478 -#: archaeological_finds/models_finds.py:1818 +#: archaeological_finds/models_finds.py:1817 msgid "Manufacturing place" msgstr "Lieu de fabrication" #: archaeological_finds/forms.py:334 archaeological_finds/forms.py:651 #: archaeological_finds/forms.py:849 archaeological_finds/forms.py:1482 #: archaeological_finds/models_finds.py:1157 -#: archaeological_finds/models_finds.py:1910 +#: archaeological_finds/models_finds.py:1909 msgid "Communicability" msgstr "Communicabilité" #: archaeological_finds/forms.py:338 archaeological_finds/forms.py:1486 -#: archaeological_finds/models_finds.py:1860 +#: archaeological_finds/models_finds.py:1859 #: archaeological_operations/forms.py:1221 -#: archaeological_operations/models.py:490 +#: archaeological_operations/models.py:491 msgid "Cultural attribution" msgstr "Attribution culturelle" #: archaeological_finds/forms.py:342 archaeological_finds/forms.py:657 #: archaeological_finds/forms.py:881 archaeological_finds/forms.py:1488 -#: archaeological_finds/models_finds.py:1937 +#: archaeological_finds/models_finds.py:1936 msgid "Comment on dating" msgstr "Commentaire relatif aux datations" @@ -3029,37 +3029,37 @@ msgid "Dimensions" msgstr "Dimensions" #: archaeological_finds/forms.py:347 archaeological_finds/forms.py:661 -#: archaeological_finds/models_finds.py:1917 +#: archaeological_finds/models_finds.py:1916 msgid "Length (cm)" msgstr "Longueur (cm)" #: archaeological_finds/forms.py:350 archaeological_finds/forms.py:662 -#: archaeological_finds/models_finds.py:1918 +#: archaeological_finds/models_finds.py:1917 msgid "Width (cm)" msgstr "Largeur (cm)" #: archaeological_finds/forms.py:353 archaeological_finds/forms.py:663 -#: archaeological_finds/models_finds.py:1919 +#: archaeological_finds/models_finds.py:1918 msgid "Height (cm)" msgstr "Hauteur (cm)" #: archaeological_finds/forms.py:356 archaeological_finds/forms.py:666 -#: archaeological_finds/models_finds.py:1922 +#: archaeological_finds/models_finds.py:1921 msgid "Thickness (cm)" msgstr "Épaisseur (cm)" #: archaeological_finds/forms.py:359 archaeological_finds/forms.py:664 -#: archaeological_finds/models_finds.py:1920 +#: archaeological_finds/models_finds.py:1919 msgid "Diameter (cm)" msgstr "Diamètre (cm)" #: archaeological_finds/forms.py:362 archaeological_finds/forms.py:665 -#: archaeological_finds/models_finds.py:1921 +#: archaeological_finds/models_finds.py:1920 msgid "Circumference (cm)" msgstr "Circonférence (cm)" #: archaeological_finds/forms.py:366 archaeological_finds/forms.py:667 -#: archaeological_finds/forms.py:1969 archaeological_finds/models_finds.py:1834 +#: archaeological_finds/forms.py:1969 archaeological_finds/models_finds.py:1833 #: archaeological_warehouse/models.py:692 msgid "Volume (l)" msgstr "Volume (l)" @@ -3083,19 +3083,19 @@ msgid "Clutter height (cm)" msgstr "Encombrement hauteur (cm)" #: archaeological_finds/forms.py:386 archaeological_finds/forms.py:679 -#: archaeological_finds/forms.py:1559 archaeological_finds/models_finds.py:1933 +#: archaeological_finds/forms.py:1559 archaeological_finds/models_finds.py:1932 msgid "Dimensions comment" msgstr "Commentaire relatif aux dimensions" #: archaeological_finds/forms.py:390 archaeological_finds/forms.py:683 #: archaeological_finds/forms.py:868 archaeological_finds/forms.py:1564 #: archaeological_finds/models_finds.py:1158 -#: archaeological_finds/models_finds.py:1942 +#: archaeological_finds/models_finds.py:1941 msgid "Check" msgstr "Vérification" #: archaeological_finds/forms.py:392 archaeological_finds/forms.py:685 -#: archaeological_finds/forms.py:870 archaeological_finds/models_finds.py:1947 +#: archaeological_finds/forms.py:870 archaeological_finds/models_finds.py:1946 msgid "Check date" msgstr "Date de vérification" @@ -3115,13 +3115,14 @@ msgid "Excavation ID" msgstr "Identifiant fouille" #: archaeological_finds/forms.py:510 archaeological_finds/models_finds.py:423 -msgid "Discovery date (exact or TPQ)" -msgstr "Date de découverte (exacte ou TPQ)" +#: archaeological_finds/templates/ishtar/sheet_basefind.html:31 +msgid "Discovery date (exact or beginning)" +msgstr "Date de découverte (exacte ou début)" #: archaeological_finds/forms.py:513 archaeological_finds/models_finds.py:426 #: archaeological_finds/templates/ishtar/sheet_basefind.html:33 -msgid "Discovery date (TAQ)" -msgstr "Date de découverte (TAQ)" +msgid "Discovery date (end)" +msgstr "Date de découverte (fin)" #: archaeological_finds/forms.py:516 archaeological_finds/forms.py:1445 #: archaeological_finds/models_finds.py:430 @@ -3223,47 +3224,47 @@ msgstr "Conservation" #: archaeological_finds/forms.py:851 archaeological_finds/forms.py:1168 #: archaeological_finds/forms.py:1573 archaeological_finds/models_finds.py:1159 -#: archaeological_finds/models_finds.py:1977 +#: archaeological_finds/models_finds.py:1976 #: archaeological_warehouse/forms.py:580 msgid "Alteration" msgstr "Altération" #: archaeological_finds/forms.py:853 archaeological_finds/forms.py:1174 #: archaeological_finds/forms.py:1574 archaeological_finds/models_finds.py:1160 -#: archaeological_finds/models_finds.py:1981 +#: archaeological_finds/models_finds.py:1980 #: archaeological_warehouse/forms.py:581 msgid "Alteration cause" msgstr "Cause d'altération" #: archaeological_finds/forms.py:856 archaeological_finds/forms.py:1165 #: archaeological_finds/forms.py:1571 archaeological_finds/models_finds.py:1154 -#: archaeological_finds/models_finds.py:1962 -#: archaeological_warehouse/forms.py:579 ishtar_common/models_imports.py:941 +#: archaeological_finds/models_finds.py:1961 +#: archaeological_warehouse/forms.py:579 ishtar_common/models_imports.py:943 msgid "Conservatory state" msgstr "État de conservation" #: archaeological_finds/forms.py:859 archaeological_finds/forms.py:1186 #: archaeological_finds/forms.py:1578 archaeological_finds/models_finds.py:1161 -#: archaeological_finds/models_finds.py:1987 +#: archaeological_finds/models_finds.py:1986 #: archaeological_warehouse/forms.py:585 msgid "Treatment emergency" msgstr "Urgence du traitement" #: archaeological_finds/forms.py:862 archaeological_finds/forms.py:1159 #: archaeological_finds/forms.py:1570 archaeological_finds/models_finds.py:1156 -#: archaeological_finds/models_finds.py:1904 +#: archaeological_finds/models_finds.py:1903 #: archaeological_warehouse/forms.py:578 msgid "Remarkability" msgstr "Remarquabilité" #: archaeological_finds/forms.py:873 archaeological_finds/forms.py:1191 -#: archaeological_finds/models_finds.py:1993 +#: archaeological_finds/models_finds.py:1992 msgid "Appraisal date" msgstr "Date d'évaluation" #: archaeological_finds/forms.py:875 archaeological_finds/forms.py:1189 #: archaeological_finds/models_finds.py:1172 -#: archaeological_finds/models_finds.py:1992 +#: archaeological_finds/models_finds.py:1991 msgid "Insurance value" msgstr "Valeur d'assurance" @@ -3289,7 +3290,7 @@ msgstr "Mettre à jour" #: archaeological_finds/forms.py:2203 archaeological_finds/forms.py:2208 #: archaeological_finds/ishtar_menu.py:64 #: archaeological_finds/models_finds.py:884 -#: archaeological_finds/models_finds.py:1706 +#: archaeological_finds/models_finds.py:1705 #: archaeological_finds/templates/ishtar/sheet_findbasket.html:4 #: archaeological_finds/views.py:1230 archaeological_finds/wizards.py:416 msgid "Basket" @@ -3334,24 +3335,24 @@ msgstr "Mobilier - 030 - Conservation" #: archaeological_finds/forms.py:1153 archaeological_finds/forms.py:1569 #: archaeological_finds/models_finds.py:1155 -#: archaeological_finds/models_finds.py:1898 +#: archaeological_finds/models_finds.py:1897 #: archaeological_warehouse/forms.py:577 msgid "Integrity / interest" msgstr "Intégrité / intérêt" #: archaeological_finds/forms.py:1180 archaeological_finds/forms.py:1576 #: archaeological_finds/models_finds.py:1153 -#: archaeological_finds/models_finds.py:1972 +#: archaeological_finds/models_finds.py:1971 msgid "Recommended treatments" msgstr "Traitements recommandés" #: archaeological_finds/forms.py:1188 archaeological_finds/models_finds.py:1171 -#: archaeological_finds/models_finds.py:1948 +#: archaeological_finds/models_finds.py:1947 msgid "Estimated value" msgstr "Valeur estimée" #: archaeological_finds/forms.py:1194 archaeological_finds/forms.py:1572 -#: archaeological_finds/models_finds.py:1968 +#: archaeological_finds/models_finds.py:1967 msgid "Conservatory comment" msgstr "Commentaire relatif à la conservation" @@ -3385,10 +3386,10 @@ msgstr "Mobilier d'origine - ID complet" #: archaeological_operations/forms.py:712 #: archaeological_operations/forms.py:1678 #: archaeological_operations/forms.py:1744 -#: archaeological_operations/models.py:943 -#: archaeological_operations/models.py:1030 -#: archaeological_operations/models.py:1329 ishtar_common/models.py:4851 -#: ishtar_common/models_imports.py:927 +#: archaeological_operations/models.py:953 +#: archaeological_operations/models.py:1040 +#: archaeological_operations/models.py:1340 ishtar_common/models.py:4851 +#: ishtar_common/models_imports.py:929 msgid "Operation type" msgstr "Type d'opération" @@ -3447,20 +3448,20 @@ msgid "Discovery date before" msgstr "Date de découverte avant" #: archaeological_finds/forms.py:1434 -msgid "Discovery date (exact or TPQ) after" -msgstr "Date de découverte (exacte ou TPQ) après" +msgid "Discovery date (exact or beginning) after" +msgstr "Date de découverte (exacte ou début) après" #: archaeological_finds/forms.py:1437 -msgid "Discovery date (exact or TPQ) before" -msgstr "Date de découverte (exacte ou TPQ) avant" +msgid "Discovery date (exact or beginning) before" +msgstr "Date de découverte (exacte ou début) avant" #: archaeological_finds/forms.py:1440 -msgid "Discovery date (TAQ) after" -msgstr "Date de découverte (TAQ) après" +msgid "Discovery date (end) after" +msgstr "Date de découverte (fin) après" #: archaeological_finds/forms.py:1443 -msgid "Discovery date (TAQ) before" -msgstr "Date de découverte (TAQ) avant" +msgid "Discovery date (end) before" +msgstr "Date de découverte (fin) avant" #: archaeological_finds/forms.py:1448 archaeological_finds/forms.py:1968 #: archaeological_finds/models_finds.py:90 @@ -3473,7 +3474,7 @@ msgstr "Type de matériau" #: archaeological_finds/forms.py:1459 archaeological_finds/models_finds.py:263 #: archaeological_finds/models_finds.py:1152 #: archaeological_operations/templates/ishtar/sheet_operation.html:544 -#: archaeological_warehouse/forms.py:572 ishtar_common/models_imports.py:950 +#: archaeological_warehouse/forms.py:572 ishtar_common/models_imports.py:952 msgid "Object type" msgstr "Type d'objet" @@ -3610,7 +3611,7 @@ msgid "Treatment end date before" msgstr "Traitement - date de clôture avant" #: archaeological_finds/forms.py:1654 archaeological_finds/models_finds.py:1111 -#: archaeological_finds/models_finds.py:1872 +#: archaeological_finds/models_finds.py:1871 #: archaeological_finds/templates/ishtar/sheet_find.html:310 #: ishtar_common/forms_common.py:1679 msgid "Reference container" @@ -3676,8 +3677,8 @@ msgstr "Panier de mobilier" #: archaeological_finds/templates/ishtar/sheet_find.html:470 #: ishtar_common/forms_common.py:1613 ishtar_common/models.py:977 #: ishtar_common/models.py:1731 ishtar_common/models.py:3411 -#: ishtar_common/models_common.py:171 ishtar_common/models_common.py:204 -#: ishtar_common/models_common.py:1933 ishtar_common/models_common.py:1949 +#: ishtar_common/models_common.py:172 ishtar_common/models_common.py:205 +#: ishtar_common/models_common.py:1968 ishtar_common/models_common.py:1984 #: ishtar_common/models_imports.py:567 msgid "Label" msgstr "Dénomination" @@ -3714,7 +3715,7 @@ msgstr "Responsable de suivi scientifique" #: archaeological_finds/models_finds.py:174 #: archaeological_finds/models_treatments.py:208 #: archaeological_finds/models_treatments.py:751 -#: ishtar_common/models_imports.py:945 +#: ishtar_common/models_imports.py:947 msgid "Treatment type" msgstr "Type de traitement" @@ -3733,8 +3734,8 @@ msgstr "Une fois validé, cet état n'est pas réversible." #: archaeological_finds/models_treatments.py:740 #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 -#: archaeological_operations/models.py:2406 -#: archaeological_operations/models.py:2743 ishtar_common/views.py:402 +#: archaeological_operations/models.py:2417 +#: archaeological_operations/models.py:2754 ishtar_common/views.py:402 msgid "Treatment" msgstr "Traitement" @@ -3837,8 +3838,8 @@ msgstr "Traitement - 010 - Choix de la demande de traitement" #: archaeological_finds/models_treatments.py:1174 #: archaeological_finds/models_treatments.py:1193 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 -#: archaeological_finds/wizards.py:553 archaeological_operations/models.py:2405 -#: archaeological_operations/models.py:2735 ishtar_common/views.py:401 +#: archaeological_finds/wizards.py:553 archaeological_operations/models.py:2416 +#: archaeological_operations/models.py:2746 ishtar_common/views.py:401 msgid "Treatment request" msgstr "Demande de traitement" @@ -3856,16 +3857,16 @@ msgid "Would you like to delete this treatment?" msgstr "Voulez-vous supprimer ce traitement ?" #: archaeological_finds/forms_treatments.py:401 -#: archaeological_finds/models_finds.py:1864 -#: archaeological_finds/models_finds.py:3327 +#: archaeological_finds/models_finds.py:1863 +#: archaeological_finds/models_finds.py:3326 #: archaeological_finds/models_treatments.py:262 #: archaeological_finds/models_treatments.py:755 #: archaeological_finds/templates/ishtar/sheet_find.html:399 #: archaeological_finds/templates/ishtar/sheet_find.html:437 #: archaeological_finds/templates/ishtar/sheet_find.html:475 #: archaeological_warehouse/forms.py:323 archaeological_warehouse/models.py:796 -#: archaeological_warehouse/models.py:1157 -#: archaeological_warehouse/models.py:1984 +#: archaeological_warehouse/models.py:1158 +#: archaeological_warehouse/models.py:1985 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 #: ishtar_common/forms_common.py:2174 ishtar_common/forms_common.py:2359 #: ishtar_common/templates/ishtar/sheet_document.html:100 @@ -4057,7 +4058,7 @@ msgid "Treatment one to many - creation" msgstr "Traitement de un à plusieurs - création" #: archaeological_finds/models_finds.py:86 -#: archaeological_operations/models.py:2410 ishtar_common/models.py:3625 +#: archaeological_operations/models.py:2421 ishtar_common/models.py:3625 msgid "Code" msgstr "Code" @@ -4161,7 +4162,7 @@ msgstr "Type d'intégrité / intérêt" msgid "Integrity / interest types" msgstr "Types d'intégrité / intérêt" -#: archaeological_finds/models_finds.py:239 ishtar_common/models_imports.py:952 +#: archaeological_finds/models_finds.py:239 ishtar_common/models_imports.py:954 msgid "Remarkability type" msgstr "Type de remarquabilité" @@ -4169,7 +4170,7 @@ msgstr "Type de remarquabilité" msgid "Remarkability types" msgstr "Types de remarquabilité" -#: archaeological_finds/models_finds.py:252 ishtar_common/models_imports.py:955 +#: archaeological_finds/models_finds.py:252 ishtar_common/models_imports.py:957 msgid "Batch type" msgstr "Type de lot" @@ -4178,8 +4179,8 @@ msgid "Batch types" msgstr "Types de lot" #: archaeological_finds/models_finds.py:277 -#: archaeological_finds/models_finds.py:1892 -#: ishtar_common/models_imports.py:958 +#: archaeological_finds/models_finds.py:1891 +#: ishtar_common/models_imports.py:960 msgid "Functional area" msgstr "Domaine fonctionnel" @@ -4191,7 +4192,7 @@ msgstr "Type de qualité du type d'objet" msgid "Object type quality types" msgstr "Types de qualité du type d'objet" -#: archaeological_finds/models_finds.py:304 ishtar_common/models_imports.py:953 +#: archaeological_finds/models_finds.py:304 ishtar_common/models_imports.py:955 msgid "Alteration type" msgstr "Type d'altération" @@ -4199,7 +4200,7 @@ msgstr "Type d'altération" msgid "Alteration types" msgstr "Types d'altération" -#: archaeological_finds/models_finds.py:318 ishtar_common/models_imports.py:954 +#: archaeological_finds/models_finds.py:318 ishtar_common/models_imports.py:956 msgid "Alteration cause type" msgstr "Type de cause d'altération" @@ -4207,7 +4208,7 @@ msgstr "Type de cause d'altération" msgid "Alteration cause types" msgstr "Types de cause d'altération" -#: archaeological_finds/models_finds.py:332 ishtar_common/models_imports.py:948 +#: archaeological_finds/models_finds.py:332 ishtar_common/models_imports.py:950 msgid "Treatment emergency type" msgstr "Type d'urgence de traitement" @@ -4223,7 +4224,7 @@ msgstr "Type de communicabilité" msgid "Communicability types" msgstr "Types de communicabilité" -#: archaeological_finds/models_finds.py:359 ishtar_common/models_imports.py:956 +#: archaeological_finds/models_finds.py:359 ishtar_common/models_imports.py:958 msgid "Checked type" msgstr "Type de vérification" @@ -4263,7 +4264,7 @@ msgid "Concatenation of associated material types codes" msgstr "Concaténation des types de matériaux associés" #: archaeological_finds/models_finds.py:477 -#: archaeological_finds/models_finds.py:1801 +#: archaeological_finds/models_finds.py:1800 msgid "Base find" msgstr "Mobilier d'origine" @@ -4296,7 +4297,7 @@ msgid "Manage basket" msgstr "Gérer un panier" #: archaeological_finds/models_finds.py:935 -#: archaeological_warehouse/models.py:1853 +#: archaeological_warehouse/models.py:1854 msgid "Add treatment" msgstr "Ajouter un traitement" @@ -4329,12 +4330,12 @@ msgid "Base find - Special interest" msgstr "Mobilier d'origine - Intérêt spécifique" #: archaeological_finds/models_finds.py:1108 -msgid "Base find - Discovery date (exact or TPQ)" -msgstr "Mobilier d'origine - Date de découverte (exacte ou TPQ)" +msgid "Base find - Discovery date (exact or beginning)" +msgstr "Mobilier d'origine - Date de découverte (exacte ou début)" #: archaeological_finds/models_finds.py:1109 -msgid "Base find - Discovery date (TAQ)" -msgstr "Mobilier d'origine - Date de découverte (TAQ)" +msgid "Base find - Discovery date (end)" +msgstr "Mobilier d'origine - Date de découverte (fin)" #: archaeological_finds/models_finds.py:1170 msgid "Weight (kg)" @@ -4361,7 +4362,7 @@ msgid "denomination" msgstr "denomination" #: archaeological_finds/models_finds.py:1260 -#: archaeological_warehouse/models.py:933 +#: archaeological_warehouse/models.py:934 msgctxt "key for text search" msgid "code-patriarche" msgstr "code-patriarche" @@ -4372,34 +4373,34 @@ msgid "operation-type" msgstr "type-operation" #: archaeological_finds/models_finds.py:1268 -#: archaeological_operations/models.py:380 -#: archaeological_operations/models.py:1094 +#: archaeological_operations/models.py:381 +#: archaeological_operations/models.py:1105 msgctxt "key for text search" msgid "area" msgstr "zone" #: archaeological_finds/models_finds.py:1277 -#: archaeological_warehouse/models.py:942 +#: archaeological_warehouse/models.py:943 msgctxt "key for text search" msgid "site-name" msgstr "site-nom" #: archaeological_finds/models_finds.py:1282 -#: archaeological_finds/models_finds.py:1739 -#: archaeological_warehouse/models.py:947 +#: archaeological_finds/models_finds.py:1738 +#: archaeological_warehouse/models.py:948 msgctxt "key for text search" msgid "context-record-site" msgstr "ue-site" #: archaeological_finds/models_finds.py:1287 -#: archaeological_warehouse/models.py:952 +#: archaeological_warehouse/models.py:953 msgctxt "key for text search" msgid "context-record-site-name" msgstr "ue-site-nom" #: archaeological_finds/models_finds.py:1291 -#: archaeological_finds/models_finds.py:1734 -#: archaeological_warehouse/models.py:956 ishtar_common/models.py:3936 +#: archaeological_finds/models_finds.py:1733 +#: archaeological_warehouse/models.py:957 ishtar_common/models.py:3936 #: ishtar_common/models.py:4033 msgctxt "key for text search" msgid "context-record" @@ -4411,13 +4412,13 @@ msgid "context-record-relation-type" msgstr "ue-type-relation" #: archaeological_finds/models_finds.py:1303 archaeological_finds/tests.py:1260 -#: archaeological_warehouse/models.py:968 +#: archaeological_warehouse/models.py:969 msgctxt "key for text search" msgid "material" msgstr "materiau" #: archaeological_finds/models_finds.py:1307 -#: archaeological_warehouse/models.py:972 +#: archaeological_warehouse/models.py:973 msgctxt "key for text search" msgid "object-type" msgstr "type-objet" @@ -4428,19 +4429,19 @@ msgid "recommended-treatments" msgstr "traitements-recommandes" #: archaeological_finds/models_finds.py:1315 archaeological_finds/tests.py:1438 -#: archaeological_warehouse/models.py:980 +#: archaeological_warehouse/models.py:981 msgctxt "key for text search" msgid "conservatory" msgstr "conservation" #: archaeological_finds/models_finds.py:1319 -#: archaeological_warehouse/models.py:984 +#: archaeological_warehouse/models.py:985 msgctxt "key for text search" msgid "integrity" msgstr "integrite" #: archaeological_finds/models_finds.py:1323 -#: archaeological_warehouse/models.py:988 +#: archaeological_warehouse/models.py:989 msgctxt "key for text search" msgid "remarkability" msgstr "remarquabilite" @@ -4466,8 +4467,8 @@ msgid "container" msgstr "contenant" #: archaeological_finds/models_finds.py:1342 -#: archaeological_finds/models_finds.py:1737 -#: archaeological_warehouse/models.py:902 +#: archaeological_finds/models_finds.py:1736 +#: archaeological_warehouse/models.py:903 msgctxt "key for text search" msgid "location" msgstr "localisation" @@ -4494,7 +4495,7 @@ msgid "last-modified-by" msgstr "modifie-en-dernier-par" #: archaeological_finds/models_finds.py:1365 -#: ishtar_common/models_common.py:1437 +#: ishtar_common/models_common.py:1472 msgctxt "key for text search" msgid "created-by" msgstr "cree-par" @@ -4765,19 +4766,19 @@ msgid "check-date-after" msgstr "date-verification-apres" #: archaeological_finds/models_finds.py:1561 -#: archaeological_warehouse/models.py:992 +#: archaeological_warehouse/models.py:993 msgctxt "key for text search" msgid "alterations" msgstr "alterations" #: archaeological_finds/models_finds.py:1565 -#: archaeological_warehouse/models.py:996 +#: archaeological_warehouse/models.py:997 msgctxt "key for text search" msgid "alteration-causes" msgstr "causes-alterations" #: archaeological_finds/models_finds.py:1569 -#: archaeological_warehouse/models.py:1000 +#: archaeological_warehouse/models.py:1001 msgctxt "key for text search" msgid "treatment-emergency" msgstr "urgence-traitement" @@ -4813,7 +4814,7 @@ msgid "appraisal-date-after" msgstr "date-evaluation-apres" #: archaeological_finds/models_finds.py:1597 -#: archaeological_operations/models.py:428 +#: archaeological_operations/models.py:429 msgctxt "key for text search" msgid "cultural-attribution" msgstr "attribution-culturelle" @@ -4829,21 +4830,21 @@ msgid "operation-address" msgstr "operation-adresse" #: archaeological_finds/models_finds.py:1613 -#: archaeological_operations/models.py:1122 +#: archaeological_operations/models.py:1133 msgctxt "key for text search" msgid "scientist" msgstr "scientifique" #: archaeological_finds/models_finds.py:1617 archaeological_finds/tests.py:1354 -#: archaeological_operations/models.py:1126 +#: archaeological_operations/models.py:1137 #: archaeological_operations/tests.py:2873 #: archaeological_operations/tests.py:3324 msgctxt "key for text search" msgid "operator" msgstr "operateur" -#: archaeological_finds/models_finds.py:1713 -#: archaeological_finds/models_finds.py:2353 +#: archaeological_finds/models_finds.py:1712 +#: archaeological_finds/models_finds.py:2352 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 #: archaeological_finds/views.py:1274 archaeological_warehouse/forms.py:679 #: archaeological_warehouse/views.py:297 ishtar_common/models.py:4071 @@ -4853,114 +4854,114 @@ msgstr "operateur" msgid "Packaging" msgstr "Conditionnement" -#: archaeological_finds/models_finds.py:1721 +#: archaeological_finds/models_finds.py:1720 msgid "Treatment many to one" msgstr "Traitement de plusieurs à un" -#: archaeological_finds/models_finds.py:1835 +#: archaeological_finds/models_finds.py:1834 msgid "Weight" msgstr "Poids" -#: archaeological_finds/models_finds.py:1837 +#: archaeological_finds/models_finds.py:1836 msgid "Weight unit" msgstr "Unité de poids" -#: archaeological_finds/models_finds.py:1846 +#: archaeological_finds/models_finds.py:1845 #: archaeological_finds/templates/ishtar/sheet_find.html:427 msgid "Upstream treatment" msgstr "Traitement amont" -#: archaeological_finds/models_finds.py:1853 +#: archaeological_finds/models_finds.py:1852 #: archaeological_finds/templates/ishtar/sheet_find.html:465 msgid "Downstream treatment" msgstr "Traitement aval" -#: archaeological_finds/models_finds.py:1924 +#: archaeological_finds/models_finds.py:1923 msgid "Clutter - long side (cm)" msgstr "Encombrement - grand côté (cm)" -#: archaeological_finds/models_finds.py:1927 +#: archaeological_finds/models_finds.py:1926 msgid "Clutter - short side (cm)" msgstr "Encombrement - petit côté (cm)" -#: archaeological_finds/models_finds.py:1930 +#: archaeological_finds/models_finds.py:1929 msgid "Clutter - height (cm)" msgstr "Encombrement - hauteur (cm)" -#: archaeological_finds/models_finds.py:1951 +#: archaeological_finds/models_finds.py:1950 msgid "Collection" msgstr "Collection" -#: archaeological_finds/models_finds.py:1956 +#: archaeological_finds/models_finds.py:1955 msgid "Do not use - need evolutions" msgstr "Ne pas utiliser - Nécessite des évolutions" -#: archaeological_finds/models_finds.py:2010 +#: archaeological_finds/models_finds.py:2009 #: archaeological_finds/models_treatments.py:289 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:71 msgid "Treatments" msgstr "Traitements" -#: archaeological_finds/models_finds.py:2013 +#: archaeological_finds/models_finds.py:2012 msgid "Related treatments when no new find is created" msgstr "" "Traitements associés quand il n'y a pas de création de nouveau mobilier" -#: archaeological_finds/models_finds.py:2029 +#: archaeological_finds/models_finds.py:2028 msgid "Cached object types label" msgstr "Nom en cache des types d'objet" -#: archaeological_finds/models_finds.py:2035 +#: archaeological_finds/models_finds.py:2034 msgid "Cached material types label" msgstr "Nom en cache des types de matériaux" -#: archaeological_finds/models_finds.py:2067 +#: archaeological_finds/models_finds.py:2066 msgid "FIND" msgstr "MOBILIER" -#: archaeological_finds/models_finds.py:2205 +#: archaeological_finds/models_finds.py:2204 msgid "Material types string" msgstr "Chaîne de caractère des types de matériau" -#: archaeological_finds/models_finds.py:2206 +#: archaeological_finds/models_finds.py:2205 msgid "Material types code string" msgstr "Code des types de matériau" -#: archaeological_finds/models_finds.py:2207 +#: archaeological_finds/models_finds.py:2206 msgid "Recommendations string from material" msgstr "Chaîne de caractères - recommandations pour le matériau" -#: archaeological_finds/models_finds.py:2208 +#: archaeological_finds/models_finds.py:2207 msgid "Complete ID of associated base finds" msgstr "Identifiant complet du mobilier d'origine associé" -#: archaeological_finds/models_finds.py:2209 +#: archaeological_finds/models_finds.py:2208 msgid "Label of associated context records" msgstr "Dénomination des unités d'enregistrement associées" -#: archaeological_finds/models_finds.py:2326 +#: archaeological_finds/models_finds.py:2325 msgid "Add to basket" msgstr "Ajouter au panier" -#: archaeological_finds/models_finds.py:2334 +#: archaeological_finds/models_finds.py:2333 msgid "Simple treatment" msgstr "Traitement simple" -#: archaeological_finds/models_finds.py:2342 +#: archaeological_finds/models_finds.py:2341 msgid "Divide treatment" msgstr "Traitement de division" -#: archaeological_finds/models_finds.py:2907 +#: archaeological_finds/models_finds.py:2906 msgid "No reference container have been set - the localisation cannot be set." msgstr "" "Aucun contenant de référence n'a été défini - la localisation ne peut être " "paramétrée." -#: archaeological_finds/models_finds.py:2913 +#: archaeological_finds/models_finds.py:2912 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:3350 ishtar_common/forms_common.py:118 +#: archaeological_finds/models_finds.py:3349 ishtar_common/forms_common.py:118 #: 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 @@ -4968,11 +4969,11 @@ msgstr "Aucun contenant n'a été défini - la localisation ne peut être défin msgid "Person" msgstr "Personne" -#: archaeological_finds/models_finds.py:3358 +#: archaeological_finds/models_finds.py:3357 msgid "Property" msgstr "Propriété" -#: archaeological_finds/models_finds.py:3359 +#: archaeological_finds/models_finds.py:3358 msgid "Properties" msgstr "Propriétés" @@ -5003,7 +5004,7 @@ msgstr "libelle" #: archaeological_finds/models_treatments.py:153 #: archaeological_finds/models_treatments.py:1050 -#: archaeological_operations/models.py:2545 +#: archaeological_operations/models.py:2556 msgctxt "key for text search" msgid "index" msgstr "index" @@ -5162,10 +5163,6 @@ msgstr "ID interne" msgid "Discovery year" msgstr "Date de découverte" -#: archaeological_finds/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:931 msgid "Last modified by" @@ -5265,8 +5262,8 @@ msgid "Associated treatment files" 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 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:36 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:32 #: ishtar_common/forms_common.py:1857 #: ishtar_common/templates/ishtar/sheet_document.html:57 msgid "Content" @@ -5350,7 +5347,7 @@ msgstr "" msgid "Treatment informations:" msgstr "Informations sur le traitement :" -#: archaeological_finds/tests.py:944 archaeological_warehouse/models.py:1623 +#: archaeological_finds/tests.py:944 archaeological_warehouse/models.py:1624 msgid "The division {} {} do not exist for the location {}." msgstr "La division {} {} n'existe pas pour le lieu de conservation {}." @@ -5359,8 +5356,8 @@ msgstr "La division {} {} n'existe pas pour le lieu de conservation {}." #: ishtar_common/forms.py:1157 ishtar_common/forms.py:1236 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 #: ishtar_common/templatetags/window_field.py:19 -#: ishtar_common/views_item.py:589 ishtar_common/views_item.py:855 -#: ishtar_common/views_item.py:892 ishtar_common/wizards.py:501 +#: ishtar_common/views_item.py:589 ishtar_common/views_item.py:857 +#: ishtar_common/views_item.py:894 ishtar_common/wizards.py:501 msgid "Yes" msgstr "Oui" @@ -5468,26 +5465,26 @@ msgstr "" #: archaeological_operations/forms.py:1059 #: archaeological_operations/forms.py:1075 #: archaeological_operations/forms.py:1081 -#: archaeological_operations/models.py:3033 +#: archaeological_operations/models.py:3044 #: archaeological_operations/templates/ishtar/sheet_operation.html:494 msgid "Parcels" msgstr "Parcelles" #: archaeological_operations/forms.py:76 -#: archaeological_operations/models.py:3015 +#: archaeological_operations/models.py:3026 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Section" msgstr "Section" #: archaeological_operations/forms.py:79 -#: archaeological_operations/models.py:3017 +#: archaeological_operations/models.py:3028 msgid "Parcel number" msgstr "Numéro de parcelle" #: archaeological_operations/forms.py:81 -#: archaeological_operations/models.py:3019 -#: archaeological_operations/models.py:3047 -#: archaeological_operations/models.py:3112 +#: archaeological_operations/models.py:3030 +#: archaeological_operations/models.py:3058 +#: archaeological_operations/models.py:3123 msgid "Public domain" msgstr "Domaine public" @@ -5545,13 +5542,13 @@ msgstr "Opération - 001 - Recherche" #: archaeological_operations/forms.py:497 #: archaeological_operations/forms.py:711 -#: archaeological_operations/models.py:1465 +#: archaeological_operations/models.py:1476 msgid "DRASSM code" msgstr "Code DRASSM" #: archaeological_operations/forms.py:505 #: archaeological_operations/forms.py:716 -#: archaeological_operations/models.py:1400 +#: archaeological_operations/models.py:1411 msgid "Address / Locality" msgstr "Adresse / Lieu-dit" @@ -5561,14 +5558,14 @@ msgstr "Est ouvert ?" #: archaeological_operations/forms.py:515 #: archaeological_operations/forms.py:767 -#: archaeological_operations/models.py:2686 +#: archaeological_operations/models.py:2697 msgid "Scientific monitor" msgstr "Responsable de suivi scientifique" #: archaeological_operations/forms.py:524 #: archaeological_operations/forms.py:756 #: archaeological_operations/forms.py:1682 -#: archaeological_operations/models.py:1299 +#: archaeological_operations/models.py:1310 msgid "Operator" msgstr "Opérateur" @@ -5579,10 +5576,10 @@ msgstr "Opérateur" #: archaeological_operations/forms.py:1846 #: archaeological_operations/models.py:306 #: archaeological_operations/models.py:315 -#: archaeological_operations/models.py:487 -#: archaeological_operations/models.py:947 -#: archaeological_operations/models.py:1033 -#: archaeological_operations/models.py:1334 +#: archaeological_operations/models.py:488 +#: archaeological_operations/models.py:957 +#: archaeological_operations/models.py:1043 +#: archaeological_operations/models.py:1345 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:9 msgid "Remains" msgstr "Vestiges" @@ -5609,34 +5606,34 @@ msgstr "Résumé (recherche en texte intégral)" #: archaeological_operations/forms.py:544 #: archaeological_operations/forms.py:817 -#: archaeological_operations/models.py:1403 +#: archaeological_operations/models.py:1414 msgid "Comment about scientific documentation" msgstr "Commentaire relatif à la documentation scientifique" #: archaeological_operations/forms.py:545 #: archaeological_operations/forms.py:819 -#: archaeological_operations/models.py:949 -#: archaeological_operations/models.py:1446 +#: archaeological_operations/models.py:959 +#: archaeological_operations/models.py:1457 msgid "Record quality" msgstr "Qualité d'enregistrement" #: archaeological_operations/forms.py:546 #: archaeological_operations/forms.py:785 -#: archaeological_operations/models.py:1355 +#: archaeological_operations/models.py:1366 msgid "Report processing" msgstr "Traitement du rapport" #: archaeological_operations/forms.py:548 #: archaeological_operations/forms.py:738 -#: archaeological_operations/models.py:1437 +#: archaeological_operations/models.py:1448 msgid "Virtual operation" msgstr "Opération virtuelle" #: archaeological_operations/forms.py:569 #: archaeological_operations/forms.py:808 #: archaeological_operations/forms.py:1690 -#: archaeological_operations/models.py:950 -#: archaeological_operations/models.py:1456 +#: archaeological_operations/models.py:960 +#: archaeological_operations/models.py:1467 msgid "Documentation received" msgstr "Documentation reçue" @@ -5651,8 +5648,8 @@ msgstr "Date limite de versement de la documentation après" #: archaeological_operations/forms.py:576 #: archaeological_operations/forms.py:813 #: archaeological_operations/forms.py:1694 -#: archaeological_operations/models.py:951 -#: archaeological_operations/models.py:1461 +#: archaeological_operations/models.py:961 +#: archaeological_operations/models.py:1472 msgid "Finds received" msgstr "Mobilier reçu" @@ -5674,12 +5671,12 @@ msgstr "Opération - 010 - Général" #: archaeological_operations/forms.py:714 #: archaeological_operations/forms.py:1742 -#: archaeological_operations/models.py:1399 +#: archaeological_operations/models.py:1410 msgid "Generic name" msgstr "Nom générique" #: archaeological_operations/forms.py:730 -#: archaeological_operations/models.py:1360 +#: archaeological_operations/models.py:1371 msgid "Old code" msgstr "Ancien code" @@ -5692,7 +5689,7 @@ msgid "Head scientist" msgstr "Responsable d'opération" #: archaeological_operations/forms.py:764 -#: archaeological_operations/models.py:1397 +#: archaeological_operations/models.py:1408 msgid "Operator reference" msgstr "Référence de l'opérateur" @@ -5700,8 +5697,8 @@ msgstr "Référence de l'opérateur" #: archaeological_operations/forms.py:1344 #: archaeological_operations/forms.py:1698 #: archaeological_operations/forms.py:1835 -#: archaeological_operations/models.py:505 -#: archaeological_operations/models.py:1313 +#: archaeological_operations/models.py:506 +#: archaeological_operations/models.py:1324 msgid "Collaborators" msgstr "Collaborateurs" @@ -5710,17 +5707,17 @@ msgid "Dates / Administrative" msgstr "Dates / Administratif" #: archaeological_operations/forms.py:783 -#: archaeological_operations/models.py:1284 +#: archaeological_operations/models.py:1295 msgid "Report delivery date" msgstr "Date de livraison du rapport" #: archaeological_operations/forms.py:805 -#: archaeological_operations/models.py:1453 +#: archaeological_operations/models.py:1464 msgid "Deadline for submission of the documentation" msgstr "Date limite de versement de la documentation" #: archaeological_operations/forms.py:810 -#: archaeological_operations/models.py:1459 +#: archaeological_operations/models.py:1470 msgid "Deadline for submission of the finds" msgstr "Date limite de versement du mobilier" @@ -5729,12 +5726,12 @@ msgid "Scientific" msgstr "Scientifique" #: archaeological_operations/forms.py:822 -#: archaeological_operations/models.py:93 ishtar_common/models_imports.py:930 +#: archaeological_operations/models.py:93 ishtar_common/models_imports.py:932 msgid "Remain type" msgstr "Type de vestige" #: archaeological_operations/forms.py:828 -#: archaeological_operations/models.py:1451 +#: archaeological_operations/models.py:1462 msgid "Abstract" msgstr "Résumé" @@ -5763,7 +5760,7 @@ msgid "Bad operation code" msgstr "Mauvais code d'opération" #: archaeological_operations/forms.py:927 -#: archaeological_operations/models.py:1899 +#: archaeological_operations/models.py:1910 msgid "Operation code" msgstr "Code de l'opération" @@ -5777,12 +5774,12 @@ msgid "Operation - 015 - Court-ordered seizure" msgstr "Opération - 015 - Saisie judiciaire" #: archaeological_operations/forms.py:972 -#: archaeological_operations/models.py:1468 +#: archaeological_operations/models.py:1479 msgid "Seizure name" msgstr "Nom de la saisie" #: archaeological_operations/forms.py:975 -#: archaeological_operations/models.py:1470 +#: archaeological_operations/models.py:1481 msgid "Official report number" msgstr "Numéro de procès-verbal ou de saisine" @@ -5791,12 +5788,12 @@ msgid "Protagonist" msgstr "Protagoniste" #: archaeological_operations/forms.py:987 -#: archaeological_operations/models.py:1482 +#: archaeological_operations/models.py:1493 msgid "Applicant authority" msgstr "Autorité requérante" #: archaeological_operations/forms.py:993 -#: archaeological_operations/models.py:1490 +#: archaeological_operations/models.py:1501 msgid "Writer of the minutes" msgstr "Rédacteur du procès verbal" @@ -5809,22 +5806,22 @@ msgid "Operation - 033 - Preventive - Excavation" msgstr "Opération - 033 - Préventif - Fouille" #: archaeological_operations/forms.py:1002 -#: archaeological_operations/models.py:1339 +#: archaeological_operations/models.py:1350 msgid "Cost (euros)" msgstr "Coût (euros)" #: archaeological_operations/forms.py:1003 -#: archaeological_operations/models.py:1343 +#: archaeological_operations/models.py:1354 msgid "Scheduled man-days" msgstr "Jours-hommes prévus" #: archaeological_operations/forms.py:1005 -#: archaeological_operations/models.py:1347 +#: archaeological_operations/models.py:1358 msgid "Optional man-days" msgstr "Jours-hommes optionnels" #: archaeological_operations/forms.py:1007 -#: archaeological_operations/models.py:1351 +#: archaeological_operations/models.py:1362 msgid "Effective man-days" msgstr "Jours-hommes effectifs" @@ -5837,17 +5834,17 @@ msgid "Operation - 037 - Preventive - Diagnostic" msgstr "Opération - 037 - Préventif - Diagnostic" #: archaeological_operations/forms.py:1023 -#: archaeological_operations/models.py:1371 +#: archaeological_operations/models.py:1382 msgid "Prescription on zoning" msgstr "Prescription sur zonage" #: archaeological_operations/forms.py:1025 -#: archaeological_operations/models.py:1375 +#: archaeological_operations/models.py:1386 msgid "Prescription on large area" msgstr "Prescription sur une vaste surface" #: archaeological_operations/forms.py:1028 -#: archaeological_operations/models.py:1378 +#: archaeological_operations/models.py:1389 msgid "Prescription on geoarchaeological context" msgstr "Prescription sur un contexte géoarchéologique" @@ -5871,8 +5868,8 @@ msgstr "Opération - 050 - Parcelles (2)" #: archaeological_operations/forms.py:1213 #: archaeological_operations/forms.py:1329 #: archaeological_operations/forms.py:1794 -#: archaeological_operations/models.py:482 -#: archaeological_warehouse/models.py:1991 ishtar_common/forms_common.py:1782 +#: archaeological_operations/models.py:483 +#: archaeological_warehouse/models.py:1992 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 @@ -5909,55 +5906,55 @@ msgstr "Opération chapeau" #: archaeological_operations/forms.py:1239 #: archaeological_operations/forms.py:1348 -#: archaeological_operations/models.py:497 +#: archaeological_operations/models.py:498 msgid "National Geographic Institute locality" msgstr "Lieu-dit IGN" #: archaeological_operations/forms.py:1242 #: archaeological_operations/forms.py:1352 -#: archaeological_operations/models.py:500 +#: archaeological_operations/models.py:501 msgid "Cadastral locality" msgstr "Lieu-dit cadastre" #: archaeological_operations/forms.py:1246 #: archaeological_operations/forms.py:1396 -#: archaeological_operations/models.py:517 +#: archaeological_operations/models.py:518 msgid "AffMar number" msgstr "Numéro AffMar" #: archaeological_operations/forms.py:1248 #: archaeological_operations/forms.py:1398 -#: archaeological_operations/models.py:520 +#: archaeological_operations/models.py:521 msgid "DRASSM number" msgstr "Numéro DRASSM" #: archaeological_operations/forms.py:1250 #: archaeological_operations/forms.py:1400 -#: archaeological_operations/models.py:509 +#: archaeological_operations/models.py:510 msgid "Shipwreck name" msgstr "Nom de l'épave" #: archaeological_operations/forms.py:1253 #: archaeological_operations/forms.py:1408 -#: archaeological_operations/models.py:511 +#: archaeological_operations/models.py:512 msgid "Oceanographic service localisation" msgstr "Localisation SHOM" #: archaeological_operations/forms.py:1256 #: archaeological_operations/forms.py:1402 -#: archaeological_operations/models.py:513 +#: archaeological_operations/models.py:514 msgid "Shipwreck code" msgstr "Code épave" #: archaeological_operations/forms.py:1258 #: archaeological_operations/forms.py:1404 -#: archaeological_operations/models.py:514 +#: archaeological_operations/models.py:515 msgid "Sinking date" msgstr "Date de naufrage" #: archaeological_operations/forms.py:1260 #: archaeological_operations/forms.py:1406 -#: archaeological_operations/models.py:515 +#: archaeological_operations/models.py:516 msgid "Discovery area" msgstr "Zone de découverte" @@ -5990,12 +5987,12 @@ msgid "You should select an administrative act." msgstr "Vous devez sélectionner un acte administratif." #: archaeological_operations/forms.py:1496 -#: archaeological_operations/models.py:2711 +#: archaeological_operations/models.py:2722 msgid "Signatory" msgstr "Signataire" #: archaeological_operations/forms.py:1503 -#: archaeological_operations/models.py:2746 +#: archaeological_operations/models.py:2757 msgid "Signature date" msgstr "Date de signature" @@ -6093,7 +6090,7 @@ msgstr "Type de qualité d'enregistrement" msgid "Types of record quality" msgstr "Types de qualité d'enregistrement" -#: archaeological_operations/models.py:158 +#: archaeological_operations/models.py:158 ishtar_common/models_imports.py:928 msgid "Cultural attribution type" msgstr "Type d'attribution culturelle" @@ -6101,544 +6098,544 @@ msgstr "Type d'attribution culturelle" msgid "Cultural attribution types" msgstr "Types d'attribution culturelle" -#: archaeological_operations/models.py:374 -#: archaeological_operations/models.py:1130 +#: archaeological_operations/models.py:375 +#: archaeological_operations/models.py:1141 #: archaeological_operations/tests.py:3074 msgctxt "key for text search" msgid "remain" msgstr "vestige" -#: archaeological_operations/models.py:386 +#: archaeological_operations/models.py:387 msgctxt "key for text search" msgid "locality-ngi" msgstr "lieu-dit-ign" -#: archaeological_operations/models.py:389 +#: archaeological_operations/models.py:390 msgctxt "key for text search" msgid "locality-cadastral" msgstr "lieu-dit-cadastre" -#: archaeological_operations/models.py:393 +#: archaeological_operations/models.py:394 msgctxt "key for text search" msgid "shipwreck-name" msgstr "nom-epave" -#: archaeological_operations/models.py:397 +#: archaeological_operations/models.py:398 msgctxt "key for text search" msgid "oceanographic-service-localisation" msgstr "localisation-shom" -#: archaeological_operations/models.py:401 +#: archaeological_operations/models.py:402 msgctxt "key for text search" msgid "shipwreck-code" msgstr "code-epave" -#: archaeological_operations/models.py:405 +#: archaeological_operations/models.py:406 msgctxt "key for text search" msgid "sinking-date" msgstr "date-naufrage" -#: archaeological_operations/models.py:408 +#: archaeological_operations/models.py:409 msgctxt "key for text search" msgid "discovery-area" msgstr "zone-decouverte" -#: archaeological_operations/models.py:416 +#: archaeological_operations/models.py:417 msgctxt "key for text search" msgid "top-operation" msgstr "operation-chapeau" -#: archaeological_operations/models.py:420 +#: archaeological_operations/models.py:421 msgctxt "key for text search" msgid "numero-drassm" msgstr "numero-drassm" -#: archaeological_operations/models.py:424 +#: archaeological_operations/models.py:425 msgctxt "key for text search" msgid "numero-affmar" msgstr "numero-affmar" -#: archaeological_operations/models.py:542 -#: archaeological_operations/models.py:1497 +#: archaeological_operations/models.py:543 +#: archaeological_operations/models.py:1508 msgid "Cached town label" msgstr "Nom en cache des communes" -#: archaeological_operations/models.py:554 -#: archaeological_operations/models.py:1509 +#: archaeological_operations/models.py:555 +#: archaeological_operations/models.py:1520 msgid "Cached remains label" msgstr "Nom en cache des vestiges" -#: archaeological_operations/models.py:564 -#: archaeological_operations/models.py:1426 +#: archaeological_operations/models.py:565 +#: archaeological_operations/models.py:1437 #: archaeological_operations/templates/ishtar/sheet_operation.html:325 msgid "Archaeological sites" msgstr "Entités archéologiques" -#: archaeological_operations/models.py:580 +#: archaeological_operations/models.py:581 msgid "SITE" msgstr "SITE" -#: archaeological_operations/models.py:771 ishtar_common/forms.py:1156 +#: archaeological_operations/models.py:772 ishtar_common/forms.py:1156 #: ishtar_common/models.py:4977 ishtar_common/models.py:5134 -#: ishtar_common/models.py:5193 ishtar_common/views_item.py:1524 +#: ishtar_common/models.py:5193 ishtar_common/views_item.py:1532 msgid "Unknown" msgstr "Inconnu" -#: archaeological_operations/models.py:773 +#: archaeological_operations/models.py:774 msgid "Virtual operation of site: {}" msgstr "Opération virtuelle du site : {}" -#: archaeological_operations/models.py:1012 +#: archaeological_operations/models.py:1022 msgid "Associated file (label)" msgstr "Dossier associé (nom)" -#: archaeological_operations/models.py:1013 +#: archaeological_operations/models.py:1023 msgid "Operator name" msgstr "Nom de l'opérateur" -#: archaeological_operations/models.py:1014 +#: archaeological_operations/models.py:1024 msgid "Associated file (external ID)" msgstr "Dossier associé (identifiant)" -#: archaeological_operations/models.py:1015 +#: archaeological_operations/models.py:1025 msgid "Scientist (title)" msgstr "Responsable d'opération (titre)" -#: archaeological_operations/models.py:1016 +#: archaeological_operations/models.py:1026 msgid "Scientist (surname)" msgstr "Responsable d'opération (nom)" -#: archaeological_operations/models.py:1017 +#: archaeological_operations/models.py:1027 msgid "Scientist (name)" msgstr "Scientifique (nom)" -#: archaeological_operations/models.py:1018 +#: archaeological_operations/models.py:1028 msgid "Scientist (full name)" msgstr "Responsable d'opération (nom complet)" -#: archaeological_operations/models.py:1019 +#: archaeological_operations/models.py:1029 msgid "Scientist - Organization (name)" msgstr "Scientifique - Organisation (nom)" -#: archaeological_operations/models.py:1020 +#: archaeological_operations/models.py:1030 msgid "Scientific monitor (title)" msgstr "Responsable de suivi scientifique (titre)" -#: archaeological_operations/models.py:1021 +#: archaeological_operations/models.py:1031 msgid "Scientific monitor (surname)" msgstr "Responsable de suivi scientifique (prénom)" -#: archaeological_operations/models.py:1022 +#: archaeological_operations/models.py:1032 msgid "Scientific monitor (name)" msgstr "Responsable de suivi scientifique (nom)" -#: archaeological_operations/models.py:1023 +#: archaeological_operations/models.py:1033 msgid "Scientific monitor - Organization (name)" msgstr "Responsable de suivi scientifique - Organisation (nom)" -#: archaeological_operations/models.py:1028 +#: archaeological_operations/models.py:1038 msgid "Archaeological sites (reference)" msgstr "Entités archéologiques (référence)" -#: archaeological_operations/models.py:1108 +#: archaeological_operations/models.py:1119 msgctxt "key for text search" msgid "address" msgstr "adresse" -#: archaeological_operations/models.py:1115 +#: archaeological_operations/models.py:1126 #: archaeological_operations/tests.py:3081 msgctxt "key for text search" msgid "is-open" msgstr "est-ouvert" -#: archaeological_operations/models.py:1118 +#: archaeological_operations/models.py:1129 msgctxt "key for text search" msgid "scientific-monitor" msgstr "reponsable-suivi-scientifique" -#: archaeological_operations/models.py:1136 +#: archaeological_operations/models.py:1147 msgctxt "key for text search" msgid "start-before" msgstr "commence-avant" -#: archaeological_operations/models.py:1139 +#: archaeological_operations/models.py:1150 msgctxt "key for text search" msgid "start-after" msgstr "commence-apres" -#: archaeological_operations/models.py:1142 +#: archaeological_operations/models.py:1153 msgctxt "key for text search" msgid "end-before" msgstr "fini-avant" -#: archaeological_operations/models.py:1146 +#: archaeological_operations/models.py:1157 msgctxt "key for text search" msgid "end-after" msgstr "fini-apres" -#: archaeological_operations/models.py:1150 +#: archaeological_operations/models.py:1161 #: archaeological_operations/tests.py:3124 msgctxt "key for text search" msgid "relation-types" msgstr "type-relation" -#: archaeological_operations/models.py:1156 +#: archaeological_operations/models.py:1167 msgctxt "key for text search" msgid "abstract" msgstr "resume" -#: archaeological_operations/models.py:1159 +#: archaeological_operations/models.py:1170 msgctxt "key for text search" msgid "scientific-documentation-comment" msgstr "commentaire-documentation-scientifique" -#: archaeological_operations/models.py:1163 +#: archaeological_operations/models.py:1174 msgctxt "key for text search" msgid "record-quality" msgstr "qualite-enregistrement" -#: archaeological_operations/models.py:1167 +#: archaeological_operations/models.py:1178 msgctxt "key for text search" msgid "report-processing" msgstr "traitement-rapport" -#: archaeological_operations/models.py:1171 +#: archaeological_operations/models.py:1182 msgctxt "key for text search" msgid "virtual-operation" msgstr "operation-virtuelle" -#: archaeological_operations/models.py:1179 +#: archaeological_operations/models.py:1190 msgctxt "key for text search" msgid "documentation-received" msgstr "documentation-recue" -#: archaeological_operations/models.py:1183 +#: archaeological_operations/models.py:1194 msgctxt "key for text search" msgid "documentation-deadline-before" msgstr "documentation-date-limite-avant" -#: archaeological_operations/models.py:1187 +#: archaeological_operations/models.py:1198 msgctxt "key for text search" msgid "documentation-deadline-after" msgstr "documentation-date-limite-après" -#: archaeological_operations/models.py:1191 +#: archaeological_operations/models.py:1202 msgctxt "key for text search" msgid "finds-received" msgstr "mobilier-recu" -#: archaeological_operations/models.py:1198 +#: archaeological_operations/models.py:1209 msgctxt "key for text search" msgid "finds-deadline-before" msgstr "mobilier-date-limite-avant" -#: archaeological_operations/models.py:1202 +#: archaeological_operations/models.py:1213 msgctxt "key for text search" msgid "finds-deadline-after" msgstr "mobilier-date-limite-apres" -#: archaeological_operations/models.py:1206 +#: archaeological_operations/models.py:1217 msgctxt "key for text search" msgid "code-drassm" msgstr "code-drassm" -#: archaeological_operations/models.py:1241 ishtar_common/models.py:3952 +#: archaeological_operations/models.py:1252 ishtar_common/models.py:3952 #: ishtar_common/models.py:4036 msgctxt "key for text search" msgid "file" msgstr "dossier" -#: archaeological_operations/models.py:1290 +#: archaeological_operations/models.py:1301 msgid "Scientific manager" msgstr "Responsable de suivi scientifique" -#: archaeological_operations/models.py:1306 +#: archaeological_operations/models.py:1317 msgid "Operation monitor" msgstr "Responsable de suivi scientifique" -#: archaeological_operations/models.py:1432 +#: archaeological_operations/models.py:1443 msgid "Sites for which this operation is top operation" msgstr "Sites pour lesquels cette opération est une opération chapeau" -#: archaeological_operations/models.py:1440 +#: archaeological_operations/models.py:1451 msgid "" "If checked, it means that this operation have not been officialy registered." msgstr "" "Si coché, cela signifie que cette opération n'a pas été officiellement " "enregistrée." -#: archaeological_operations/models.py:1474 +#: archaeological_operations/models.py:1485 msgid "Name of the protagonist" msgstr "Nom du protagoniste" -#: archaeological_operations/models.py:1519 +#: archaeological_operations/models.py:1530 #: archaeological_operations/templates/ishtar/sheet_site.html:87 #: ishtar_common/models.py:1005 msgid "Operations" msgstr "Opérations" -#: archaeological_operations/models.py:1559 +#: archaeological_operations/models.py:1570 msgid "List of associated context records" msgstr "Liste des unités d'enregistrement associées" -#: archaeological_operations/models.py:1560 +#: archaeological_operations/models.py:1571 msgid "List of associated containers" msgstr "Liste des contenants associés" -#: archaeological_operations/models.py:1633 +#: archaeological_operations/models.py:1644 msgid "OPE" msgstr "OPE" -#: archaeological_operations/models.py:1742 +#: archaeological_operations/models.py:1753 msgid "Intercommunal" msgstr "Intercommunal" -#: archaeological_operations/models.py:1865 +#: archaeological_operations/models.py:1876 msgid "context record" msgstr "UE" -#: archaeological_operations/models.py:1884 +#: archaeological_operations/models.py:1895 msgid "Code patriarche" msgstr "Code patriarche" -#: archaeological_operations/models.py:1932 +#: archaeological_operations/models.py:1943 msgid "This operation code already exists for this year" msgstr "Ce code d'opération existe déjà pour cette année" -#: archaeological_operations/models.py:1993 +#: archaeological_operations/models.py:2004 msgid "Number of parcels" msgstr "Nombre de parcelles" -#: archaeological_operations/models.py:2003 +#: archaeological_operations/models.py:2014 msgid "Number of administrative acts" msgstr "Nombre d'actes administratifs" -#: archaeological_operations/models.py:2011 +#: archaeological_operations/models.py:2022 msgid "Number of indexed administrative acts" msgstr "Nombre d'actes administratifs indexés" -#: archaeological_operations/models.py:2019 +#: archaeological_operations/models.py:2030 msgid "Number of context records" msgstr "Nombre d'Unités d'Enregistrement" -#: archaeological_operations/models.py:2073 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:103 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:85 +#: archaeological_operations/models.py:2084 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:117 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:99 msgid "Number of finds" msgstr "Nombre de mobiliers possédés" -#: archaeological_operations/models.py:2135 -#: archaeological_operations/models.py:2214 +#: archaeological_operations/models.py:2146 +#: archaeological_operations/models.py:2225 msgid "No type" msgstr "Pas de type" -#: archaeological_operations/models.py:2179 +#: archaeological_operations/models.py:2190 msgid "Number of sources" msgstr "Nombre de documents" -#: archaeological_operations/models.py:2224 +#: archaeological_operations/models.py:2235 msgid "Mean" msgstr "Moyenne" -#: archaeological_operations/models.py:2316 ishtar_common/models_imports.py:931 +#: archaeological_operations/models.py:2327 ishtar_common/models_imports.py:933 msgid "Operation relation type" msgstr "Type de relation entre opérations" -#: archaeological_operations/models.py:2317 +#: archaeological_operations/models.py:2328 msgid "Operation relation types" msgstr "Types de relation entre opérations" -#: archaeological_operations/models.py:2342 +#: archaeological_operations/models.py:2353 msgid "Operation record relation" msgstr "Relation entre opérations" -#: archaeological_operations/models.py:2343 +#: archaeological_operations/models.py:2354 msgid "Operation record relations" msgstr "Relations entre opérations" -#: archaeological_operations/models.py:2409 +#: archaeological_operations/models.py:2420 msgid "Intended to" msgstr "Destiné à" -#: archaeological_operations/models.py:2414 +#: archaeological_operations/models.py:2425 msgid "Associated template" msgstr "Patron associé" -#: archaeological_operations/models.py:2417 +#: archaeological_operations/models.py:2428 msgid "Indexed" msgstr "Indexé" -#: archaeological_operations/models.py:2421 +#: archaeological_operations/models.py:2432 msgid "Act types" msgstr "Types d'acte" -#: archaeological_operations/models.py:2547 +#: archaeological_operations/models.py:2558 msgctxt "key for text search" msgid "other-ref" msgstr "autre-ref" -#: archaeological_operations/models.py:2557 +#: archaeological_operations/models.py:2568 msgctxt "key for text search" msgid "indexed" msgstr "indexe" -#: archaeological_operations/models.py:2560 -#: archaeological_warehouse/models.py:923 +#: archaeological_operations/models.py:2571 +#: archaeological_warehouse/models.py:924 msgctxt "key for text search" msgid "operation-town" msgstr "operation-commune" -#: archaeological_operations/models.py:2564 +#: archaeological_operations/models.py:2575 msgctxt "key for text search" msgid "file-town" msgstr "dossier-commune" -#: archaeological_operations/models.py:2576 +#: archaeological_operations/models.py:2587 msgctxt "key for text search" msgid "operation-department" msgstr "operation-departement" -#: archaeological_operations/models.py:2580 +#: archaeological_operations/models.py:2591 msgctxt "key for text search" msgid "file-department" msgstr "dossier-departement" -#: archaeological_operations/models.py:2584 +#: archaeological_operations/models.py:2595 msgctxt "key for text search" msgid "object" msgstr "objet" -#: archaeological_operations/models.py:2587 +#: archaeological_operations/models.py:2598 msgctxt "key for text search" msgid "signature-before" msgstr "signature-avant" -#: archaeological_operations/models.py:2591 +#: archaeological_operations/models.py:2602 msgctxt "key for text search" msgid "signature-after" msgstr "signature-apres" -#: archaeological_operations/models.py:2595 +#: archaeological_operations/models.py:2606 msgctxt "key for text search" msgid "file-name" msgstr "dossier-nom" -#: archaeological_operations/models.py:2607 +#: archaeological_operations/models.py:2618 msgctxt "key for text search" msgid "file-reference" msgstr "dossier-reference" -#: archaeological_operations/models.py:2611 +#: archaeological_operations/models.py:2622 msgctxt "key for text search" msgid "file-year" msgstr "dossier-annee" -#: archaeological_operations/models.py:2614 +#: archaeological_operations/models.py:2625 msgctxt "key for text search" msgid "file-other-reference" msgstr "dossier-autre-reference" -#: archaeological_operations/models.py:2618 +#: archaeological_operations/models.py:2629 msgctxt "key for text search" msgid "file-in-charge" msgstr "dossier-responsable" -#: archaeological_operations/models.py:2622 +#: archaeological_operations/models.py:2633 msgctxt "key for text search" msgid "file-permit-reference" msgstr "dossier-ref-permis" -#: archaeological_operations/models.py:2626 +#: archaeological_operations/models.py:2637 msgctxt "key for text search" msgid "treatment-name" msgstr "traitement-nom" -#: archaeological_operations/models.py:2630 +#: archaeological_operations/models.py:2641 msgctxt "key for text search" msgid "treatment-reference" msgstr "traitement-reference" -#: archaeological_operations/models.py:2634 +#: archaeological_operations/models.py:2645 msgctxt "key for text search" msgid "treatment-year" msgstr "traitement-annee" -#: archaeological_operations/models.py:2637 +#: archaeological_operations/models.py:2648 msgctxt "key for text search" msgid "treatment-index" msgstr "traitement-index" -#: archaeological_operations/models.py:2640 +#: archaeological_operations/models.py:2651 msgctxt "key for text search" msgid "treatment-type" msgstr "traitement-type" -#: archaeological_operations/models.py:2644 +#: archaeological_operations/models.py:2655 msgctxt "key for text search" msgid "treatment-file-name" msgstr "dossier-traitement-nom" -#: archaeological_operations/models.py:2648 +#: archaeological_operations/models.py:2659 msgctxt "key for text search" msgid "treatment-file-reference" msgstr "dossier-traitement-reference" -#: archaeological_operations/models.py:2652 +#: archaeological_operations/models.py:2663 msgctxt "key for text search" msgid "treatment-file-year" msgstr "dossier-traitement-annee" -#: archaeological_operations/models.py:2656 +#: archaeological_operations/models.py:2667 msgctxt "key for text search" msgid "treatment-file-index" msgstr "dossier-traitement-index" -#: archaeological_operations/models.py:2660 +#: archaeological_operations/models.py:2671 msgctxt "key for text search" msgid "treatment-file-type" msgstr "dossier-traitement-type" -#: archaeological_operations/models.py:2694 +#: archaeological_operations/models.py:2705 msgid "Archaeological preventive operator" msgstr "Opérateur d'archéologie préventive" -#: archaeological_operations/models.py:2756 +#: archaeological_operations/models.py:2767 msgid "Cached values get from associated departments" msgstr "Valeur en cache des départements associés" -#: archaeological_operations/models.py:2762 +#: archaeological_operations/models.py:2773 msgid "Cached values get from associated towns" msgstr "Valeur en cache des communes associées" -#: archaeological_operations/models.py:2936 +#: archaeological_operations/models.py:2947 msgid "This index already exists for this year" msgstr "Cet index existe déjà pour cette année" -#: archaeological_operations/models.py:3026 +#: archaeological_operations/models.py:3037 msgid "Address - Locality" msgstr "Adresse - Lieu-dit" -#: archaeological_operations/models.py:3298 ishtar_common/models.py:3421 +#: archaeological_operations/models.py:3309 ishtar_common/models.py:3421 msgid "Owner" msgstr "Propriétaire" -#: archaeological_operations/models.py:3313 +#: archaeological_operations/models.py:3324 msgid "Parcel owner" msgstr "Propriétaire de parcelle" -#: archaeological_operations/models.py:3314 +#: archaeological_operations/models.py:3325 msgid "Parcel owners" msgstr "Propriétaires de parcelle" -#: archaeological_operations/models.py:3336 ishtar_common/models.py:4847 +#: archaeological_operations/models.py:3347 ishtar_common/models.py:4847 msgid "Is preventive" msgstr "Est du préventif" -#: archaeological_operations/models.py:3339 +#: archaeological_operations/models.py:3350 msgid "Operation type old" msgstr "Type d'opération - ancien" -#: archaeological_operations/models.py:3340 +#: archaeological_operations/models.py:3351 msgid "Operation types old" msgstr "Types d'opération - ancien" @@ -6672,10 +6669,10 @@ msgstr "Unités d'Enregistrement" #: archaeological_operations/templates/ishtar/sheet_operation.html:117 #: archaeological_operations/templates/ishtar/sheet_operation.html:468 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:38 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:194 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:34 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:149 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:43 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:206 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:39 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:165 #: ishtar_common/templates/blocks/DataTables-tabs.html:30 msgid "Statistics" msgstr "Statistiques" @@ -6714,8 +6711,8 @@ msgid "Associated containers" msgstr "Contenants associés" #: archaeological_operations/templates/ishtar/sheet_operation.html:473 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:199 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:154 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:211 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:170 #: ishtar_common/models_rest.py:74 #: ishtar_common/templates/blocks/DataTables-content.html:28 #: ishtar_common/templates/blocks/DataTables-content.html:101 @@ -6727,14 +6724,14 @@ msgid "Export" msgstr "Exporter" #: archaeological_operations/templates/ishtar/sheet_operation.html:478 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:204 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:159 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:216 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:175 msgid "Regenerate statistics" msgstr "Re-générer les statistiques" #: archaeological_operations/templates/ishtar/sheet_operation.html:483 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:209 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:164 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:221 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:180 msgid "Last update:" msgstr "Dernière mise à jour :" @@ -6888,7 +6885,7 @@ msgstr "" #: archaeological_warehouse/forms.py:502 archaeological_warehouse/forms.py:723 #: archaeological_warehouse/ishtar_menu.py:34 #: archaeological_warehouse/models.py:400 -#: archaeological_warehouse/models.py:889 +#: archaeological_warehouse/models.py:890 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:4 #: ishtar_common/forms_common.py:1862 ishtar_common/models.py:5070 #: ishtar_common/views.py:397 @@ -6912,8 +6909,8 @@ msgid "Order fields must be different." msgstr "Les champs « ordre » doivent être différents." #: archaeological_warehouse/forms.py:129 archaeological_warehouse/models.py:370 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:167 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:117 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:179 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:133 msgid "Divisions" msgstr "Divisions" @@ -6927,7 +6924,7 @@ msgstr "Lieu de conservation - 001 - Recherche" #: archaeological_warehouse/forms.py:144 archaeological_warehouse/forms.py:204 #: archaeological_warehouse/forms.py:313 archaeological_warehouse/models.py:260 -#: archaeological_warehouse/models.py:349 ishtar_common/models_imports.py:944 +#: archaeological_warehouse/models.py:349 ishtar_common/models_imports.py:946 msgid "Warehouse type" msgstr "Type de lieu de conservation" @@ -6957,31 +6954,31 @@ msgstr "" "conservation, les champs suivants sont utilisés pour cette organisation." #: archaeological_warehouse/forms.py:239 ishtar_common/forms_common.py:538 -#: ishtar_common/forms_common.py:921 ishtar_common/models_common.py:3061 -#: ishtar_common/models_common.py:3219 +#: ishtar_common/forms_common.py:921 ishtar_common/models_common.py:3142 +#: ishtar_common/models_common.py:3300 msgid "Address complement" msgstr "Complément d'adresse" #: archaeological_warehouse/forms.py:242 ishtar_common/forms_common.py:541 -#: ishtar_common/forms_common.py:924 ishtar_common/models_common.py:3066 +#: ishtar_common/forms_common.py:924 ishtar_common/models_common.py:3147 msgid "Town (freeform)" msgstr "Commune (saisie libre)" #: archaeological_warehouse/forms.py:244 ishtar_common/forms_common.py:543 -#: ishtar_common/forms_common.py:926 ishtar_common/models_common.py:3074 +#: ishtar_common/forms_common.py:926 ishtar_common/models_common.py:3155 msgid "Country" msgstr "Pays" #: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:545 -#: ishtar_common/forms_common.py:897 ishtar_common/models_common.py:3088 -#: ishtar_common/models_common.py:3231 +#: ishtar_common/forms_common.py:897 ishtar_common/models_common.py:3169 +#: ishtar_common/models_common.py:3312 #: 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:547 -#: ishtar_common/forms_common.py:907 ishtar_common/models_common.py:3104 +#: ishtar_common/forms_common.py:907 ishtar_common/models_common.py:3185 #: ishtar_common/templates/ishtar/sheet_person.html:45 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:55 msgid "Mobile phone" @@ -7006,16 +7003,16 @@ msgid "Container - 010 - General" msgstr "Contenant - 010 - Général" #: archaeological_warehouse/forms.py:335 archaeological_warehouse/forms.py:506 -#: archaeological_warehouse/models.py:1132 +#: archaeological_warehouse/models.py:1133 msgid "Old reference" msgstr "Ancienne référence" #: archaeological_warehouse/forms.py:337 archaeological_warehouse/forms.py:504 #: archaeological_warehouse/forms.py:728 archaeological_warehouse/models.py:698 -#: archaeological_warehouse/models.py:859 -#: archaeological_warehouse/models.py:1098 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:138 -#: ishtar_common/models_imports.py:942 +#: archaeological_warehouse/models.py:860 +#: archaeological_warehouse/models.py:1099 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:152 +#: ishtar_common/models_imports.py:944 msgid "Container type" msgstr "Type de contenant" @@ -7024,12 +7021,12 @@ msgid "Current location (warehouse)" msgstr "Lieu de conservation actuel" #: archaeological_warehouse/forms.py:348 archaeological_warehouse/forms.py:513 -#: archaeological_warehouse/models.py:1115 +#: archaeological_warehouse/models.py:1116 msgid "Parent container" msgstr "Contenant parent" #: archaeological_warehouse/forms.py:358 archaeological_warehouse/forms.py:739 -#: archaeological_warehouse/models.py:1089 +#: archaeological_warehouse/models.py:1090 msgid "Responsibility" msgstr "Responsabilité" @@ -7038,7 +7035,7 @@ msgid "Automatically attached to the current warehouse if not filled." msgstr "Rattaché au lieu de conservation actuel si ce champ n'est pas rempli." #: archaeological_warehouse/forms.py:371 -#: archaeological_warehouse/models.py:1122 +#: archaeological_warehouse/models.py:1123 msgid "Measured weight (g)" msgstr "Poids mesuré (g)" @@ -7147,10 +7144,10 @@ msgstr "" "parent : {} {} et référence : {}. Fusionner ces contenants d'abord ?" #: archaeological_warehouse/ishtar_menu.py:70 -#: archaeological_warehouse/models.py:1158 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:169 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:119 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:201 +#: archaeological_warehouse/models.py:1159 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:181 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:135 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:217 msgid "Containers" msgstr "Contenants" @@ -7191,7 +7188,7 @@ msgid "Warehouses" msgstr "Lieux de conservation" #: archaeological_warehouse/models.py:495 -#: archaeological_warehouse/models.py:1582 +#: archaeological_warehouse/models.py:1583 msgid "No value" msgstr "Pas de valeur" @@ -7247,7 +7244,7 @@ msgid "Container types" msgstr "Types de contenant" #: archaeological_warehouse/models.py:722 -#: archaeological_warehouse/models.py:1084 +#: archaeological_warehouse/models.py:1085 msgid "Deprecated - do not use" msgstr "Obsolète - ne pas utiliser" @@ -7255,133 +7252,137 @@ msgstr "Obsolète - ne pas utiliser" msgid "Container parent" msgstr "Contenant parent" -#: archaeological_warehouse/models.py:853 -#: archaeological_warehouse/models.py:1074 +#: archaeological_warehouse/models.py:854 +#: archaeological_warehouse/models.py:1075 msgid "Location (warehouse)" msgstr "Lieu de conservation" -#: archaeological_warehouse/models.py:854 +#: archaeological_warehouse/models.py:855 msgid "Responsibility (warehouse)" msgstr "Lieu de conservation responsable" -#: archaeological_warehouse/models.py:886 +#: archaeological_warehouse/models.py:887 msgid "Location - index" msgstr "Localisation - index" -#: archaeological_warehouse/models.py:887 +#: archaeological_warehouse/models.py:888 msgid "Precise localisation" msgstr "Localisation précise" -#: archaeological_warehouse/models.py:905 +#: archaeological_warehouse/models.py:906 msgctxt "key for text search" msgid "responsibility" msgstr "responsabilite" -#: archaeological_warehouse/models.py:916 +#: archaeological_warehouse/models.py:917 msgctxt "key for text search" msgid "old-reference" msgstr "ancienne-reference" -#: archaeological_warehouse/models.py:928 +#: archaeological_warehouse/models.py:929 msgctxt "key for text search" msgid "operation-scientist" msgstr "operation-responsable" -#: archaeological_warehouse/models.py:960 +#: archaeological_warehouse/models.py:961 msgctxt "key for text search" msgid "find-label" msgstr "mobilier-ID-libre" -#: archaeological_warehouse/models.py:964 ishtar_common/models.py:3948 +#: archaeological_warehouse/models.py:965 ishtar_common/models.py:3948 msgctxt "key for text search" msgid "find-denomination" msgstr "mobilier-denomination" -#: archaeological_warehouse/models.py:976 +#: archaeological_warehouse/models.py:977 msgctxt "key for text search" msgid "preservation" msgstr "preservation" -#: archaeological_warehouse/models.py:1004 +#: archaeological_warehouse/models.py:1005 msgctxt "key for text search" msgid "find-description" msgstr "mobilier-description" -#: archaeological_warehouse/models.py:1007 +#: archaeological_warehouse/models.py:1008 msgctxt "key for text search" msgid "empty" msgstr "vide" -#: archaeological_warehouse/models.py:1010 +#: archaeological_warehouse/models.py:1011 msgctxt "key for text search" msgid "parent-container" msgstr "contenant-parent" -#: archaeological_warehouse/models.py:1014 +#: archaeological_warehouse/models.py:1015 msgctxt "key for text search" msgid "contain-containers" msgstr "contient-contenants" -#: archaeological_warehouse/models.py:1018 +#: archaeological_warehouse/models.py:1019 msgctxt "key for text search" msgid "is-stationary" msgstr "est-immobile" -#: archaeological_warehouse/models.py:1036 +#: archaeological_warehouse/models.py:1037 msgid "Division -" msgstr "Division -" -#: archaeological_warehouse/models.py:1040 +#: archaeological_warehouse/models.py:1041 msgctxt "key for text search" msgid "division" msgstr "division" -#: archaeological_warehouse/models.py:1080 +#: archaeological_warehouse/models.py:1081 msgid "Responsible warehouse" msgstr "Lieu de conservation responsable" -#: archaeological_warehouse/models.py:1093 +#: archaeological_warehouse/models.py:1094 msgid "Warehouse that owns the container" msgstr "Lieu de conservation auquel le contenant appartient" -#: archaeological_warehouse/models.py:1102 +#: archaeological_warehouse/models.py:1103 msgid "Container ref." msgstr "Réf. du contenant" -#: archaeological_warehouse/models.py:1108 +#: archaeological_warehouse/models.py:1106 ishtar_common/models_common.py:2908 +msgid "Localisation" +msgstr "Localisation" + +#: archaeological_warehouse/models.py:1109 msgid "Cached location" msgstr "Localisation - en cache" -#: archaeological_warehouse/models.py:1111 +#: archaeological_warehouse/models.py:1112 msgid "Cached division" msgstr "Division mise en cache" -#: archaeological_warehouse/models.py:1121 ishtar_common/models.py:4183 +#: archaeological_warehouse/models.py:1122 ishtar_common/models.py:4183 #: ishtar_common/models.py:4187 msgid "Container ID" msgstr "ID contenant" -#: archaeological_warehouse/models.py:1124 +#: archaeological_warehouse/models.py:1125 msgid "Calculated weight (g)" msgstr "Poids calculé (g)" -#: archaeological_warehouse/models.py:1127 +#: archaeological_warehouse/models.py:1128 msgid "Cached weight (g)" msgstr "Poids mis en cache (g)" -#: archaeological_warehouse/models.py:1130 +#: archaeological_warehouse/models.py:1131 msgid "Entered weight if available otherwise calculated weight." msgstr "Poids saisi si disponible sinon poids calculé." -#: archaeological_warehouse/models.py:1354 +#: archaeological_warehouse/models.py:1355 msgid "Document with {}: {} does not exists" msgstr "Le document avec {} : {} n'existe pas" -#: archaeological_warehouse/models.py:1358 +#: archaeological_warehouse/models.py:1359 msgid "Multiple document with {}: {}" msgstr "Plusieurs documents avec {} : {}" -#: archaeological_warehouse/models.py:1749 +#: archaeological_warehouse/models.py:1750 msgid "" "Associated operation - use it with caution, only return the first found " "operation" @@ -7389,7 +7390,7 @@ msgstr "" "Opération associée - à utiliser avec précaution seule la première opération " "trouvée est retournée" -#: archaeological_warehouse/models.py:1756 +#: archaeological_warehouse/models.py:1757 msgid "" "Associated context record - use it with caution, only return the first found " "context_record" @@ -7397,116 +7398,116 @@ msgstr "" "Unité d'Enregistrement associée - à utiliser avec précaution seule la " "première unité d'enregistrement trouvée est retournée" -#: archaeological_warehouse/models.py:1760 +#: archaeological_warehouse/models.py:1761 msgid "Material types inside the container - string" msgstr "Types de matériaux dans le contenant - chaîne de caractères" -#: archaeological_warehouse/models.py:1761 +#: archaeological_warehouse/models.py:1762 msgid "Material types code - string" msgstr "Code des types de matériau - chaîne de caractères" -#: archaeological_warehouse/models.py:1762 +#: archaeological_warehouse/models.py:1763 msgid "List of associated finds" msgstr "Liste du mobilier associé" -#: archaeological_warehouse/models.py:1989 +#: archaeological_warehouse/models.py:1990 msgid "Division" msgstr "Niveau" -#: archaeological_warehouse/models.py:1996 +#: archaeological_warehouse/models.py:1997 msgid "Container localisation" msgstr "Localisation de contenant" -#: archaeological_warehouse/models.py:1997 +#: archaeological_warehouse/models.py:1998 msgid "Container localisations" msgstr "Localisations de contenant" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:95 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:77 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:109 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:91 msgid "Number of containers" msgstr "Nombre de contenants" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:99 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:81 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:113 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:95 msgid "Number of divisions" msgstr "Nombre de divisions" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:107 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:89 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:121 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:103 msgid "Number of owned finds" msgstr "Nombre de mobiliers accueillis" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:115 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:129 msgid "Measured weight (kg)" msgstr "Poids mesuré (kg)" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:116 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:130 msgid "Calculated weight (kg)" msgstr "Poids calculé (kg)" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:120 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:134 #, python-format msgid "Calculated weight and measured weight are too different (over 10%%)." msgstr "" "Le poids calculé et le poids mesuré sont trop différent (au delà de 10%%)." -#: archaeological_warehouse/templates/ishtar/sheet_container.html:186 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:198 msgid "Empty" msgstr "Vide" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:217 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:229 msgid "No container/division inside this container." msgstr "Pas de contenant ou de division dans ce contenant." -#: archaeological_warehouse/templates/ishtar/sheet_container.html:223 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:235 msgid "Finds by location" msgstr "Mobiliers par localisation" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:247 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:259 msgid "Containers by location" msgstr "Contenants par localisation" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:275 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:287 msgid "Document for this container" msgstr "Document associé à ce contenant" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:94 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:108 msgid "Default divisions (imports)" msgstr "Divisions par défaut (imports)" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:124 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:140 msgid "No container inside this warehouse" msgstr "Pas de contenant dans ce lieu de conservation" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:128 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:144 msgid "Finds (hosted)" msgstr "Mobiliers (accueillis)" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:133 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:149 msgid "No find inside this warehouse" msgstr "Pas de mobilier dans ce lieu de conservation" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:137 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:153 msgid "Finds (owned)" msgstr "Mobiliers (possédés)" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:142 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:158 msgid "No find owned by this warehouse" msgstr "Pas de mobilier possédé par ce lieu de conservation" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:172 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:188 msgid "No container/division inside this container" msgstr "Pas de contenant ou division dans ce contenant" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:178 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:194 msgid "Finds by location in the warehouse" msgstr "Mobiliers par localisation dans le lieu de conservation" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:203 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:219 msgid "Containers by location in the warehouse" msgstr "Contenants par localisation dans le lieu de conservation" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:231 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:247 msgid "Document for this warehouse" msgstr "Document associé à ce lieu de conservation" @@ -7834,7 +7835,7 @@ msgstr "{} {}(s) crées/mis à jour." msgid "Center" msgstr "Centre" -#: ishtar_common/admin.py:1119 ishtar_common/models_common.py:2829 +#: ishtar_common/admin.py:1119 ishtar_common/models_common.py:2910 msgid "Limit" msgstr "Limite" @@ -7951,7 +7952,7 @@ msgstr "Lancer l'export" msgid "Import already imported/scheduled." msgstr "Import déjà réalisé/planifié." -#: ishtar_common/admin.py:2196 ishtar_common/models_imports.py:1397 +#: ishtar_common/admin.py:2196 ishtar_common/models_imports.py:1399 msgid "Launch import" msgstr "Lancer l'import" @@ -8052,7 +8053,7 @@ msgid "API - Remote access - Search model" msgstr "API - Accès distant - Modèle de recherche" #: ishtar_common/admin.py:2584 ishtar_common/models.py:450 -#: ishtar_common/models.py:733 ishtar_common/models_common.py:808 +#: ishtar_common/models.py:733 ishtar_common/models_common.py:809 #: ishtar_common/models_imports.py:836 ishtar_common/models_rest.py:106 #: ishtar_common/templates/ishtar/formset_import_match.html:44 #: ishtar_common/templates/ishtar/import_step_by_step.html:171 @@ -8509,8 +8510,8 @@ msgstr "Peut être utilisé par les patrons" #: 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:3106 -#: ishtar_common/models_common.py:3241 ishtar_common/wizards.py:1951 +#: ishtar_common/forms_common.py:1151 ishtar_common/models_common.py:3187 +#: ishtar_common/models_common.py:3322 ishtar_common/wizards.py:1951 msgid "Email" msgstr "Courriel" @@ -8582,12 +8583,12 @@ msgstr "Formule d'appel" msgid "Raw name" msgstr "Nom brut" -#: ishtar_common/forms_common.py:895 ishtar_common/models_common.py:3090 +#: ishtar_common/forms_common.py:895 ishtar_common/models_common.py:3171 msgid "Phone description" msgstr "Type de téléphone" -#: ishtar_common/forms_common.py:899 ishtar_common/models_common.py:3093 -#: ishtar_common/models_common.py:3096 +#: ishtar_common/forms_common.py:899 ishtar_common/models_common.py:3174 +#: ishtar_common/models_common.py:3177 msgid "Phone description 2" msgstr "Type de téléphone 2" @@ -8595,11 +8596,11 @@ msgstr "Type de téléphone 2" msgid "Phone 2" msgstr "Téléphone 2" -#: ishtar_common/forms_common.py:903 ishtar_common/models_common.py:3100 +#: ishtar_common/forms_common.py:903 ishtar_common/models_common.py:3181 msgid "Phone description 3" msgstr "Type de téléphone 3" -#: ishtar_common/forms_common.py:905 ishtar_common/models_common.py:3098 +#: ishtar_common/forms_common.py:905 ishtar_common/models_common.py:3179 msgid "Phone 3" msgstr "Téléphone 3" @@ -8607,23 +8608,23 @@ msgstr "Téléphone 3" msgid "Current organization" msgstr "Organisation actuelle" -#: ishtar_common/forms_common.py:928 ishtar_common/models_common.py:3075 +#: ishtar_common/forms_common.py:928 ishtar_common/models_common.py:3156 msgid "Other address: address" msgstr "Autre adresse : adresse" -#: ishtar_common/forms_common.py:931 ishtar_common/models_common.py:3077 +#: ishtar_common/forms_common.py:931 ishtar_common/models_common.py:3158 msgid "Other address: address complement" msgstr "Autre adresse : complément d'adresse" -#: ishtar_common/forms_common.py:936 ishtar_common/models_common.py:3080 +#: ishtar_common/forms_common.py:936 ishtar_common/models_common.py:3161 msgid "Other address: postal code" msgstr "Autre adresse : code postal" -#: ishtar_common/forms_common.py:939 ishtar_common/models_common.py:3083 +#: ishtar_common/forms_common.py:939 ishtar_common/models_common.py:3164 msgid "Other address: town" msgstr "Autre adresse : ville" -#: ishtar_common/forms_common.py:942 ishtar_common/models_common.py:3086 +#: ishtar_common/forms_common.py:942 ishtar_common/models_common.py:3167 msgid "Other address: country" msgstr "Autre adresse : pays" @@ -9059,7 +9060,7 @@ msgstr "Élément géographique" msgid "Geo item - General" msgstr "Élément géographique - Général" -#: ishtar_common/forms_common.py:2617 ishtar_common/models_common.py:2144 +#: ishtar_common/forms_common.py:2617 ishtar_common/models_common.py:2190 msgid "Import key" msgstr "Clé d'import" @@ -9071,26 +9072,26 @@ msgstr "" "Une mise à jour via import correspondant à l'élément source et à cette clé " "va écraser la donnée." -#: ishtar_common/forms_common.py:2628 ishtar_common/models_common.py:2159 +#: ishtar_common/forms_common.py:2628 ishtar_common/models_common.py:2205 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:7 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:33 msgid "Data type" msgstr "Type de donnée" -#: ishtar_common/forms_common.py:2631 ishtar_common/models_common.py:2151 +#: ishtar_common/forms_common.py:2631 ishtar_common/models_common.py:2197 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:11 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:30 msgid "Origin" msgstr "Origine" -#: ishtar_common/forms_common.py:2634 ishtar_common/models_common.py:2167 +#: ishtar_common/forms_common.py:2634 ishtar_common/models_common.py:2213 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:12 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:36 msgid "Provider" msgstr "Fournisseur" #: ishtar_common/forms_common.py:2637 ishtar_common/forms_common.py:2674 -#: ishtar_common/models_common.py:2133 +#: ishtar_common/models_common.py:2179 msgid "Buffer" msgstr "Tampon" @@ -9098,18 +9099,18 @@ msgstr "Tampon" msgid "Buffer type" msgstr "Type de tampon" -#: ishtar_common/forms_common.py:2645 ishtar_common/models_common.py:2180 -#: ishtar_common/models_common.py:3737 +#: ishtar_common/forms_common.py:2645 ishtar_common/models_common.py:2226 +#: ishtar_common/models_common.py:3818 msgid "Estimated error for X" msgstr "Erreur estimée pour X" -#: ishtar_common/forms_common.py:2649 ishtar_common/models_common.py:2183 -#: ishtar_common/models_common.py:3740 +#: ishtar_common/forms_common.py:2649 ishtar_common/models_common.py:2229 +#: ishtar_common/models_common.py:3821 msgid "Estimated error for Y" msgstr "Erreur estimée pour Y" -#: ishtar_common/forms_common.py:2653 ishtar_common/models_common.py:2186 -#: ishtar_common/models_common.py:3743 +#: ishtar_common/forms_common.py:2653 ishtar_common/models_common.py:2232 +#: ishtar_common/models_common.py:3824 msgid "Estimated error for Z" msgstr "Erreur estimée pour Z" @@ -9145,8 +9146,8 @@ msgstr "Type de géométrie" msgid "Coordinates" msgstr "Coordonnées" -#: ishtar_common/forms_common.py:2927 ishtar_common/models_common.py:2113 -#: ishtar_common/models_common.py:3752 +#: ishtar_common/forms_common.py:2927 ishtar_common/models_common.py:2148 +#: ishtar_common/models_common.py:3833 msgid "Point" msgstr "Point" @@ -9188,7 +9189,7 @@ msgstr "Variables globales" msgid "Directory" msgstr "Annuaire" -#: ishtar_common/ishtar_menu.py:178 ishtar_common/models_imports.py:1284 +#: ishtar_common/ishtar_menu.py:178 ishtar_common/models_imports.py:1286 msgid "Imports" msgstr "Imports" @@ -9272,7 +9273,7 @@ msgstr "Texte" msgid "Long text" msgstr "Texte long" -#: ishtar_common/models.py:711 ishtar_common/models_imports.py:975 +#: ishtar_common/models.py:711 ishtar_common/models_imports.py:977 msgid "Integer" msgstr "Entier" @@ -9280,7 +9281,7 @@ msgstr "Entier" msgid "Boolean" msgstr "Booléen" -#: ishtar_common/models.py:713 ishtar_common/models_imports.py:976 +#: ishtar_common/models.py:713 ishtar_common/models_imports.py:978 msgid "Float" msgstr "Nombre à virgule" @@ -10242,7 +10243,7 @@ msgstr "Erreur : le type opérateur est manquant" msgid "Long title" msgstr "Titre long" -#: ishtar_common/models.py:2636 ishtar_common/models_imports.py:969 +#: ishtar_common/models.py:2636 ishtar_common/models_imports.py:971 msgid "Title type" msgstr "Type de titre" @@ -10380,7 +10381,7 @@ msgid "In progress" msgstr "En cours" #: ishtar_common/models.py:3212 ishtar_common/models.py:4955 -#: ishtar_common/models_imports.py:1102 +#: ishtar_common/models_imports.py:1104 msgid "Finished" msgstr "Terminé" @@ -10463,7 +10464,7 @@ msgid "Only available for these document types" msgstr "Seulement disponible pour ces types de document" #: ishtar_common/models.py:3646 ishtar_common/models_imports.py:926 -#: ishtar_common/models_imports.py:968 +#: ishtar_common/models_imports.py:970 msgid "Support type" msgstr "Type de support" @@ -10628,7 +10629,7 @@ msgctxt "key for text search" msgid "warehouse" msgstr "depot" -#: ishtar_common/models.py:3968 ishtar_common/models_common.py:3461 +#: ishtar_common/models.py:3968 ishtar_common/models_common.py:3542 msgctxt "key for text search" msgid "has-image" msgstr "a-une-image" @@ -10752,7 +10753,7 @@ msgstr "Script d'administration" msgid "Administration scripts" msgstr "Scripts d'administration" -#: ishtar_common/models.py:4954 ishtar_common/models_imports.py:1101 +#: ishtar_common/models.py:4954 ishtar_common/models_imports.py:1103 msgid "Finished with errors" msgstr "Terminé avec des erreurs" @@ -10795,7 +10796,7 @@ msgstr "" "Le script « {} »n'est pas un fichier valable de votre répertoire de script. " "Vérifiez la configuration." -#: ishtar_common/models.py:5074 ishtar_common/models_imports.py:1092 +#: ishtar_common/models.py:5074 ishtar_common/models_imports.py:1094 msgid "Created" msgstr "Créé" @@ -10924,325 +10925,325 @@ msgstr "Archive - Import" msgid "Archive - Imports" msgstr "Archive - Imports" -#: ishtar_common/models_common.py:838 +#: ishtar_common/models_common.py:839 msgid "Search vector" msgstr "Vecteur de recherche" -#: ishtar_common/models_common.py:838 +#: ishtar_common/models_common.py:839 msgid "Auto filled at save" msgstr "Auto-rempli à la sauvegarde" -#: ishtar_common/models_common.py:1401 +#: ishtar_common/models_common.py:1436 msgid "Last editor" msgstr "Dernier éditeur" -#: ishtar_common/models_common.py:1409 +#: ishtar_common/models_common.py:1444 msgid "Creator" msgstr "Créateur" -#: ishtar_common/models_common.py:1415 ishtar_common/models_common.py:2137 +#: ishtar_common/models_common.py:1450 ishtar_common/models_common.py:2183 msgid "Need update" msgstr "Nécessite une mise à jour" -#: ishtar_common/models_common.py:1417 +#: ishtar_common/models_common.py:1452 msgid "Item locked for edition" msgstr "Élément verrouillé pour l'édition" -#: ishtar_common/models_common.py:1423 +#: ishtar_common/models_common.py:1458 msgid "Locked by" msgstr "Verrouillé par" -#: ishtar_common/models_common.py:1441 +#: ishtar_common/models_common.py:1476 msgctxt "key for text search" msgid "modified-by" msgstr "modifie-par" -#: ishtar_common/models_common.py:1445 +#: ishtar_common/models_common.py:1480 msgctxt "key for text search" msgid "modified-before" msgstr "modifie-avant" -#: ishtar_common/models_common.py:1449 +#: ishtar_common/models_common.py:1484 msgctxt "key for text search" msgid "modified-after" msgstr "modifie-apres" -#: ishtar_common/models_common.py:1452 +#: ishtar_common/models_common.py:1487 msgctxt "key for text search" msgid "locked" msgstr "verrou" -#: ishtar_common/models_common.py:2009 ishtar_common/models_common.py:2027 +#: ishtar_common/models_common.py:2044 ishtar_common/models_common.py:2062 msgid "Authority name" msgstr "Registre" -#: ishtar_common/models_common.py:2010 ishtar_common/models_common.py:2027 +#: ishtar_common/models_common.py:2045 ishtar_common/models_common.py:2062 msgid "Authority SRID" msgstr "SRID" -#: ishtar_common/models_common.py:2013 +#: ishtar_common/models_common.py:2048 msgid "Geographic - Spatial reference system" msgstr "Géographie - Système de référence spatiale" -#: ishtar_common/models_common.py:2014 +#: ishtar_common/models_common.py:2049 msgid "Geographic - Spatial reference systems" msgstr "Géographie - Systèmes de référence spatiale" -#: ishtar_common/models_common.py:2044 +#: ishtar_common/models_common.py:2079 msgid "Geographic - Origin type" msgstr "Géographie - Type d'origine" -#: ishtar_common/models_common.py:2045 +#: ishtar_common/models_common.py:2080 msgid "Geographic - Origin types" msgstr "Géographie - Types d'origine" -#: ishtar_common/models_common.py:2060 +#: ishtar_common/models_common.py:2095 msgid "Geographic - Data type" msgstr "Géographie - Type de données" -#: ishtar_common/models_common.py:2061 +#: ishtar_common/models_common.py:2096 msgid "Geographic - Data types" msgstr "Géographie - Types de données" -#: ishtar_common/models_common.py:2076 +#: ishtar_common/models_common.py:2111 msgid "Geographic - Provider type" msgstr "Géographie - Type de fournisseur" -#: ishtar_common/models_common.py:2077 +#: ishtar_common/models_common.py:2112 msgid "Geographic - Provider types" msgstr "Géographie - Types de fournisseur" -#: ishtar_common/models_common.py:2088 +#: ishtar_common/models_common.py:2123 msgid "Geographic - Buffer type" msgstr "Géographie - Type de tampon" -#: ishtar_common/models_common.py:2089 +#: ishtar_common/models_common.py:2124 msgid "Geographic - Buffer types" msgstr "Géographie - Types de tampon" -#: ishtar_common/models_common.py:2114 +#: ishtar_common/models_common.py:2149 msgid "Line(s)" msgstr "Ligne(s)" -#: ishtar_common/models_common.py:2115 +#: ishtar_common/models_common.py:2150 msgid "Point(s)" msgstr "Point(s)" -#: ishtar_common/models_common.py:2116 +#: ishtar_common/models_common.py:2151 msgid "Polygon(s)" msgstr "Polygone(s)" -#: ishtar_common/models_common.py:2145 +#: ishtar_common/models_common.py:2191 msgid "Use this for update imports" msgstr "Utilisez cela pour des imports de mise à jour" -#: ishtar_common/models_common.py:2152 +#: ishtar_common/models_common.py:2198 msgid "For instance: topographical survey, georeferencing, ..." msgstr "Par exemple : levé topographiques, géoréférencement, ..." -#: ishtar_common/models_common.py:2160 +#: ishtar_common/models_common.py:2206 msgid "For instance: outline, z-sup, ..." msgstr "Par exemple : contour, Z-supérieur, ..." -#: ishtar_common/models_common.py:2168 +#: ishtar_common/models_common.py:2214 msgid "Data provider" msgstr "Fournisseur de données" -#: ishtar_common/models_common.py:2171 ishtar_common/models_common.py:3733 +#: ishtar_common/models_common.py:2217 ishtar_common/models_common.py:3814 msgid "X" msgstr "X/Long" -#: ishtar_common/models_common.py:2171 ishtar_common/models_common.py:2172 -#: ishtar_common/models_common.py:2173 +#: ishtar_common/models_common.py:2217 ishtar_common/models_common.py:2218 +#: ishtar_common/models_common.py:2219 msgid "User input" msgstr "Saisie utilisateur" -#: ishtar_common/models_common.py:2172 ishtar_common/models_common.py:3734 +#: ishtar_common/models_common.py:2218 ishtar_common/models_common.py:3815 msgid "Y" msgstr "Y/Lat" -#: ishtar_common/models_common.py:2173 ishtar_common/models_common.py:3735 +#: ishtar_common/models_common.py:2219 ishtar_common/models_common.py:3816 msgid "Z" msgstr "Z" -#: ishtar_common/models_common.py:2176 +#: ishtar_common/models_common.py:2222 msgid "X (cached)" msgstr "X (cache)" -#: ishtar_common/models_common.py:2177 +#: ishtar_common/models_common.py:2223 msgid "Y (cached)" msgstr "Y (cache)" -#: ishtar_common/models_common.py:2178 +#: ishtar_common/models_common.py:2224 msgid "Z (cached)" msgstr "Z (cache)" -#: ishtar_common/models_common.py:2190 ishtar_common/models_common.py:3747 +#: ishtar_common/models_common.py:2236 ishtar_common/models_common.py:3828 msgid "Spatial Reference System" msgstr "Système de référence spatiale" -#: ishtar_common/models_common.py:2195 ishtar_common/models_common.py:3753 +#: ishtar_common/models_common.py:2241 ishtar_common/models_common.py:3834 msgid "Point (2D)" msgstr "Point (2D)" -#: ishtar_common/models_common.py:2196 +#: ishtar_common/models_common.py:2242 msgid "Point (3D)" msgstr "Point (3D)" -#: ishtar_common/models_common.py:2197 +#: ishtar_common/models_common.py:2243 msgid "Multi points" msgstr "Points multiples" -#: ishtar_common/models_common.py:2198 +#: ishtar_common/models_common.py:2244 msgid "Multi lines" msgstr "Lignes multiples" -#: ishtar_common/models_common.py:2199 +#: ishtar_common/models_common.py:2245 msgid "Multi polygons" msgstr "Polygones multi-parties" -#: ishtar_common/models_common.py:2202 ishtar_common/models_common.py:2203 +#: ishtar_common/models_common.py:2248 ishtar_common/models_common.py:2249 msgid "Geographic - Vector data" msgstr "Géographie - Donnée vectorielle" -#: ishtar_common/models_common.py:2310 +#: ishtar_common/models_common.py:2356 msgid "Only 2 or 3 dimensions" msgstr "Seulement 2 ou 3 dimensions" -#: ishtar_common/models_common.py:2725 +#: ishtar_common/models_common.py:2806 msgid "Main geodata" msgstr "Élément géographique principal" -#: ishtar_common/models_common.py:2729 +#: ishtar_common/models_common.py:2810 msgid "Geodata" msgstr "Élément géographique" -#: ishtar_common/models_common.py:2733 +#: ishtar_common/models_common.py:2814 msgctxt "key for text search" msgid "geo-name" msgstr "geo-nom" -#: ishtar_common/models_common.py:2736 +#: ishtar_common/models_common.py:2817 msgctxt "key for text search" msgid "geo-type" msgstr "geo-type" -#: ishtar_common/models_common.py:2739 +#: ishtar_common/models_common.py:2820 msgctxt "key for text search" msgid "geo-origin" msgstr "geo-origine" -#: ishtar_common/models_common.py:2742 +#: ishtar_common/models_common.py:2823 msgctxt "key for text search" msgid "geo-provider" msgstr "geo-fournisseur" -#: ishtar_common/models_common.py:2745 +#: ishtar_common/models_common.py:2826 msgctxt "key for text search" msgid "geo-comment" msgstr "geo-commentaire" -#: ishtar_common/models_common.py:2767 +#: ishtar_common/models_common.py:2848 msgid "Add geographic item" msgstr "Ajouter élément géographique" -#: ishtar_common/models_common.py:2769 +#: ishtar_common/models_common.py:2850 msgid "geo." msgstr "géo." -#: ishtar_common/models_common.py:2839 +#: ishtar_common/models_common.py:2920 msgid "Year of creation" msgstr "Année de création" -#: ishtar_common/models_common.py:2843 +#: ishtar_common/models_common.py:2924 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:2847 +#: ishtar_common/models_common.py:2928 msgid "Town children" msgstr "Communes enfants" -#: ishtar_common/models_common.py:3069 +#: ishtar_common/models_common.py:3150 msgid "Town (precise)" msgstr "Commune (précis)" -#: ishtar_common/models_common.py:3102 +#: ishtar_common/models_common.py:3183 msgid "Raw phone" msgstr "Téléphone brut" -#: ishtar_common/models_common.py:3108 +#: ishtar_common/models_common.py:3189 msgid "Alternative address is prefered" msgstr "L'adresse alternative est préférée" -#: ishtar_common/models_common.py:3145 +#: ishtar_common/models_common.py:3226 msgid "No associated address" msgstr "Pas d'adresse associée" -#: ishtar_common/models_common.py:3226 +#: ishtar_common/models_common.py:3307 msgid "Postal code - Town" msgstr "Code postal - Commune" -#: ishtar_common/models_common.py:3236 +#: ishtar_common/models_common.py:3317 msgid "Mobile" msgstr "Mobile" -#: ishtar_common/models_common.py:3254 +#: ishtar_common/models_common.py:3335 msgid "Merge key" msgstr "Clé de fusion" -#: ishtar_common/models_common.py:3465 +#: ishtar_common/models_common.py:3546 msgctxt "key for text search" msgid "has-url" msgstr "a-une-url" -#: ishtar_common/models_common.py:3469 +#: ishtar_common/models_common.py:3550 msgctxt "key for text search" msgid "has-attached-file" msgstr "a-un-fichier" -#: ishtar_common/models_common.py:3545 +#: ishtar_common/models_common.py:3626 msgid "Add document/image" msgstr "Ajouter un document / une image" -#: ishtar_common/models_common.py:3547 +#: ishtar_common/models_common.py:3628 msgid "doc./image" msgstr "doc./image" -#: ishtar_common/models_common.py:3731 +#: ishtar_common/models_common.py:3812 msgid "Precise" msgstr "Précis" -#: ishtar_common/models_common.py:3731 +#: ishtar_common/models_common.py:3812 msgid "Polygon" msgstr "Polygone" -#: ishtar_common/models_common.py:3755 +#: ishtar_common/models_common.py:3836 msgid "Point source" msgstr "Source du point" -#: ishtar_common/models_common.py:3758 +#: ishtar_common/models_common.py:3839 msgid "Point source item" msgstr "Élément source du point" -#: ishtar_common/models_common.py:3760 +#: ishtar_common/models_common.py:3841 msgid "Multi polygon" msgstr "Polygones multi-parties" -#: ishtar_common/models_common.py:3762 +#: ishtar_common/models_common.py:3843 msgid "Multi-polygon source" msgstr "Source du multi-polygone" -#: ishtar_common/models_common.py:3769 +#: ishtar_common/models_common.py:3850 msgid "Multi polygon source item" msgstr "Élément source du multi-polygone" -#: ishtar_common/models_common.py:4313 +#: ishtar_common/models_common.py:4397 msgid "Regenerate ID" msgstr "Re-générer l'identifiant" -#: ishtar_common/models_common.py:4315 +#: ishtar_common/models_common.py:4399 msgid "regen." msgstr "regén." @@ -11453,11 +11454,11 @@ msgid "Importer - Targets" msgstr "Importeur - Cibles" #: ishtar_common/models_imports.py:796 ishtar_common/views_item.py:590 -#: ishtar_common/views_item.py:1342 +#: ishtar_common/views_item.py:1350 msgid "True" msgstr "Oui" -#: ishtar_common/models_imports.py:796 ishtar_common/views_item.py:1344 +#: ishtar_common/models_imports.py:796 ishtar_common/views_item.py:1352 msgid "False" msgstr "Non" @@ -11489,170 +11490,170 @@ msgstr "Importeur - Clé de rapprochement" msgid "Importer - Targets keys" msgstr "Importeur - Clés de rapprochement" -#: ishtar_common/models_imports.py:928 +#: ishtar_common/models_imports.py:930 msgid "Period" msgstr "Période" -#: ishtar_common/models_imports.py:929 +#: ishtar_common/models_imports.py:931 msgid "Report state" msgstr "État de rapport" -#: ishtar_common/models_imports.py:934 +#: ishtar_common/models_imports.py:936 msgid "Activity type" msgstr "Type d'activité" -#: ishtar_common/models_imports.py:939 +#: ishtar_common/models_imports.py:941 msgid "Dating quality" msgstr "Qualité de datation" -#: ishtar_common/models_imports.py:940 +#: ishtar_common/models_imports.py:942 msgid "Material" msgstr "Matériau" -#: ishtar_common/models_imports.py:943 +#: ishtar_common/models_imports.py:945 msgid "Warehouse division" msgstr "Division de lieu de conservation" -#: ishtar_common/models_imports.py:951 +#: ishtar_common/models_imports.py:953 msgid "Integrity type" msgstr "Type d'intégrité" -#: ishtar_common/models_imports.py:961 +#: ishtar_common/models_imports.py:963 msgid "Identification type" msgstr "Type d'identification" -#: ishtar_common/models_imports.py:965 +#: ishtar_common/models_imports.py:967 msgid "Context record relation type" msgstr "Type de relation entre Unités d'Enregistrement" -#: ishtar_common/models_imports.py:967 +#: ishtar_common/models_imports.py:969 msgid "Spatial reference system" msgstr "Système de référence spatiale" -#: ishtar_common/models_imports.py:977 overload_translation/models.py:7 +#: ishtar_common/models_imports.py:979 overload_translation/models.py:7 msgid "String" msgstr "Chaîne de caractères" -#: ishtar_common/models_imports.py:981 +#: ishtar_common/models_imports.py:983 msgid "INSEE code" msgstr "Code INSEE" -#: ishtar_common/models_imports.py:982 +#: ishtar_common/models_imports.py:984 msgid "Upper case" msgstr "Majuscule" -#: ishtar_common/models_imports.py:983 +#: ishtar_common/models_imports.py:985 msgid "Lower case" msgstr "Minuscule" -#: ishtar_common/models_imports.py:984 +#: ishtar_common/models_imports.py:986 msgid "String to boolean" msgstr "Chaîne de caractères vers booléen" -#: ishtar_common/models_imports.py:985 +#: ishtar_common/models_imports.py:987 msgctxt "filesystem" msgid "File" msgstr "Fichier" -#: ishtar_common/models_imports.py:986 +#: ishtar_common/models_imports.py:988 msgid "Unknow type" msgstr "Type inconnu" -#: ishtar_common/models_imports.py:1005 +#: ishtar_common/models_imports.py:1007 msgid "4 digit year. e.g.: \"2015\"" msgstr "Année sur 4 chiffres. Exemple : « 2015 »" -#: ishtar_common/models_imports.py:1006 +#: ishtar_common/models_imports.py:1008 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "Année sur 4 chiffres/mois/jour. Exemple : « 2015/02/04 »" -#: ishtar_common/models_imports.py:1007 +#: ishtar_common/models_imports.py:1009 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "Jour/mois/année sur 4 chiffres. Exemple : « 04/02/2015 »" -#: ishtar_common/models_imports.py:1024 +#: ishtar_common/models_imports.py:1026 msgid "Options" msgstr "Options" -#: ishtar_common/models_imports.py:1026 +#: ishtar_common/models_imports.py:1028 msgid "Split character(s)" msgstr "Caractère(s) de séparation" -#: ishtar_common/models_imports.py:1031 +#: ishtar_common/models_imports.py:1033 msgid "Importer - Formater type" msgstr "Importeur - Type de mise en forme" -#: ishtar_common/models_imports.py:1032 +#: ishtar_common/models_imports.py:1034 msgid "Importer - Formater types" msgstr "Importeur - Types de mise en forme" -#: ishtar_common/models_imports.py:1093 +#: ishtar_common/models_imports.py:1095 msgid "Analyse in progress" msgstr "Analyse en cours" -#: ishtar_common/models_imports.py:1094 +#: ishtar_common/models_imports.py:1096 msgid "Analysed" msgstr "Analysé" -#: ishtar_common/models_imports.py:1095 +#: ishtar_common/models_imports.py:1097 msgid "Check modified in queue" msgstr "Vérification des modifications dans la file" -#: ishtar_common/models_imports.py:1096 +#: ishtar_common/models_imports.py:1098 msgid "Import in queue" msgstr "Import en file d'attente" -#: ishtar_common/models_imports.py:1097 +#: ishtar_common/models_imports.py:1099 msgid "Check modified in progress" msgstr "Vérification des modifications en cours" -#: ishtar_common/models_imports.py:1098 +#: ishtar_common/models_imports.py:1100 msgid "Import in progress" msgstr "Import en cours" -#: ishtar_common/models_imports.py:1099 +#: ishtar_common/models_imports.py:1101 msgid "Post-processing in progress" msgstr "Post-traitement en cours" -#: ishtar_common/models_imports.py:1100 +#: ishtar_common/models_imports.py:1102 msgid "Partially imported" msgstr "Importé partiellement" -#: ishtar_common/models_imports.py:1103 +#: ishtar_common/models_imports.py:1105 msgid "Archived" msgstr "Archivé" -#: ishtar_common/models_imports.py:1172 +#: ishtar_common/models_imports.py:1174 msgid "Importer type" msgstr "Type d'importeur" -#: ishtar_common/models_imports.py:1174 +#: ishtar_common/models_imports.py:1176 msgid "Imported file" msgstr "Fichier importé" -#: ishtar_common/models_imports.py:1182 +#: ishtar_common/models_imports.py:1184 msgid "Associated images (zip file)" msgstr "Images associées (fichier zip)" -#: ishtar_common/models_imports.py:1195 +#: ishtar_common/models_imports.py:1197 msgid "If a group is selected, target key saved in this group will be used." msgstr "" "Si un groupe est sélectionné, les clés de rapprochement enregistrées dans ce " "groupe sont utilisées." -#: ishtar_common/models_imports.py:1199 +#: ishtar_common/models_imports.py:1201 msgid "Encoding" msgstr "Codage" -#: ishtar_common/models_imports.py:1200 +#: ishtar_common/models_imports.py:1202 msgid "Only required for CSV file" msgstr "Seulement requis pour les fichiers CSV" -#: ishtar_common/models_imports.py:1203 +#: ishtar_common/models_imports.py:1205 msgid "CSV separator" msgstr "Séparateur CSV" -#: ishtar_common/models_imports.py:1208 +#: ishtar_common/models_imports.py:1210 msgid "" "Separator for CSV file. Standard is comma but Microsoft Excel do not follow " "this standard and use semi-colon." @@ -11660,11 +11661,11 @@ msgstr "" "Séparateur pour les CSV. Le standard est la virgule mais Microsoft Excel ne " "suit pas cette norme et utilise le point-virgule." -#: ishtar_common/models_imports.py:1213 +#: ishtar_common/models_imports.py:1215 msgid "Skip lines" msgstr "Nombre de lignes d'entête" -#: ishtar_common/models_imports.py:1215 +#: ishtar_common/models_imports.py:1217 msgid "" "Number of header lines in your file (can be 0 and should be 0 for geopackage " "or Shapefile)." @@ -11672,104 +11673,104 @@ 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:1218 +#: ishtar_common/models_imports.py:1220 msgid "Error file" msgstr "Fichier erreur" -#: ishtar_common/models_imports.py:1226 +#: ishtar_common/models_imports.py:1228 msgid "Result file" msgstr "Fichier résultant" -#: ishtar_common/models_imports.py:1234 +#: ishtar_common/models_imports.py:1236 msgid "Match file" msgstr "Fichier de correspondance" -#: ishtar_common/models_imports.py:1242 +#: ishtar_common/models_imports.py:1244 msgid "Archive file" msgstr "Fichier d'archive" -#: ishtar_common/models_imports.py:1253 +#: ishtar_common/models_imports.py:1255 msgid "Conservative import" msgstr "Import conservateur" -#: ishtar_common/models_imports.py:1255 +#: ishtar_common/models_imports.py:1257 msgid "If set to true, do not overload existing values." msgstr "Si coché, ne surchargera pas les valeurs existantes." -#: ishtar_common/models_imports.py:1264 +#: ishtar_common/models_imports.py:1266 msgid "Remaining seconds" msgstr "Secondes restantes" -#: ishtar_common/models_imports.py:1266 +#: ishtar_common/models_imports.py:1268 msgid "Current line" msgstr "Ligne actuelle" -#: ishtar_common/models_imports.py:1267 +#: ishtar_common/models_imports.py:1269 msgid "Number of line" msgstr "Nombre de lignes" -#: ishtar_common/models_imports.py:1269 +#: ishtar_common/models_imports.py:1271 msgid "Imported line numbers" msgstr "Numéros des lignes importées" -#: ishtar_common/models_imports.py:1274 +#: ishtar_common/models_imports.py:1276 msgid "Changed have been checked" msgstr "Les changements ont été vérifiés" -#: ishtar_common/models_imports.py:1276 +#: ishtar_common/models_imports.py:1278 msgid "Changed line numbers" msgstr "Numéro des lignes modifiées" -#: ishtar_common/models_imports.py:1283 +#: ishtar_common/models_imports.py:1285 msgid "Import" msgstr "Import" -#: ishtar_common/models_imports.py:1325 ishtar_common/models_imports.py:1469 +#: ishtar_common/models_imports.py:1327 ishtar_common/models_imports.py:1471 msgid "Error in the CSV file." msgstr "Erreur dans le fichier CSV." -#: ishtar_common/models_imports.py:1394 +#: ishtar_common/models_imports.py:1396 msgid "Analyse" msgstr "Analyser" -#: ishtar_common/models_imports.py:1396 ishtar_common/models_imports.py:1405 +#: ishtar_common/models_imports.py:1398 ishtar_common/models_imports.py:1407 msgid "Re-analyse" msgstr "Analyser de nouveau" -#: ishtar_common/models_imports.py:1400 +#: ishtar_common/models_imports.py:1402 msgid "Step by step import" msgstr "Import pas à pas" -#: ishtar_common/models_imports.py:1401 ishtar_common/models_imports.py:1410 +#: ishtar_common/models_imports.py:1403 ishtar_common/models_imports.py:1412 msgid "Re-check for changes" msgstr "Re-vérifier les changements" -#: ishtar_common/models_imports.py:1403 ishtar_common/models_imports.py:1412 +#: ishtar_common/models_imports.py:1405 ishtar_common/models_imports.py:1414 msgid "Check for changes" msgstr "Vérifier les changements" -#: ishtar_common/models_imports.py:1406 +#: ishtar_common/models_imports.py:1408 msgid "Re-import" msgstr "Ré-importer" -#: ishtar_common/models_imports.py:1409 +#: ishtar_common/models_imports.py:1411 msgid "Step by step re-import" msgstr "Ré-import pas à pas" -#: ishtar_common/models_imports.py:1413 +#: ishtar_common/models_imports.py:1415 msgid "Archive" msgstr "Archiver" -#: ishtar_common/models_imports.py:1416 +#: ishtar_common/models_imports.py:1418 msgid "Unarchive" msgstr "Désarchiver" -#: ishtar_common/models_imports.py:1418 +#: ishtar_common/models_imports.py:1420 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:19 msgid "Edit" msgstr "Modifier" -#: ishtar_common/models_imports.py:1419 +#: ishtar_common/models_imports.py:1421 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:30 #: ishtar_common/templates/ishtar/blocks/window_nav.html:66 #: ishtar_common/templates/ishtar/form_delete.html:11 @@ -11778,41 +11779,41 @@ msgstr "Modifier" msgid "Delete" msgstr "Supprimer" -#: ishtar_common/models_imports.py:1513 ishtar_common/models_imports.py:1516 -#: ishtar_common/models_imports.py:1578 +#: ishtar_common/models_imports.py:1515 ishtar_common/models_imports.py:1518 +#: ishtar_common/models_imports.py:1580 msgid "Invalid GIS file." msgstr "Fichier SIG invalide." -#: ishtar_common/models_imports.py:1526 +#: ishtar_common/models_imports.py:1528 #, python-brace-format msgid "Geometry \"{geometry}\" not managed." msgstr "Géométrie \"{geometry}\" non gérée." -#: ishtar_common/models_imports.py:1548 +#: ishtar_common/models_imports.py:1550 msgid "CRS not managed." msgstr "CRS non géré." -#: ishtar_common/models_imports.py:1575 +#: ishtar_common/models_imports.py:1577 msgid "Error reading feature {idx + 1} - {e}" msgstr "Erreur en lisant l'entité geographique {idx + 1} - {e}" -#: ishtar_common/models_imports.py:1614 +#: ishtar_common/models_imports.py:1616 msgid "Modification check {} added to the queue" msgstr "Vérification des changements {} ajoutée à la file d'attente" -#: ishtar_common/models_imports.py:1682 +#: ishtar_common/models_imports.py:1684 msgid "Import {} added to the queue" msgstr "Import {} ajouté à la file d'attente" -#: ishtar_common/models_imports.py:1713 +#: ishtar_common/models_imports.py:1715 msgid "Error on imported file: {}" msgstr "Erreur sur le fichier d'import : {}" -#: ishtar_common/models_imports.py:1749 +#: ishtar_common/models_imports.py:1751 msgid "Import {} finished with errors" msgstr "Import {} fini avec des erreurs" -#: ishtar_common/models_imports.py:1757 +#: ishtar_common/models_imports.py:1759 msgid "Import {} finished with no errors" msgstr "Import {} fini avec aucune erreur" @@ -13483,7 +13484,7 @@ msgstr "Information" msgid "Load another random image?" msgstr "Charger une autre image au hasard ?" -#: ishtar_common/utils.py:1568 +#: ishtar_common/utils.py:1575 msgid "The maximum supported file size is {} Mo." msgstr "La taille maximale supportée pour le fichier est de {} Mo." @@ -13663,7 +13664,7 @@ msgstr "Nouveau %s" msgid "Modify a %s" msgstr "Modifier un %s" -#: ishtar_common/views_item.py:902 +#: ishtar_common/views_item.py:904 msgctxt "key for text search" msgid "today" msgstr "aujourdhui" @@ -13734,6 +13735,12 @@ msgstr "Surcharge de traduction" msgid "Translations overload" msgstr "Surcharges de traductions" +#~ msgid "Museum ID" +#~ msgstr "Identifiant musée" + +#~ msgid "Discovery date (TPQ)" +#~ msgstr "Date de découverte (TPQ)" + #~ msgid "Find number" #~ msgstr "Mobilier (en nombre)" @@ -13806,9 +13813,6 @@ msgstr "Surcharges de traductions" #~ msgid "surface by department (ha)" #~ msgstr "surface par département (ha)" -#~ msgid "main towns by number" -#~ msgstr "communes principales en nombre" - #~ msgid "main towns by surface (ha)" #~ msgstr "communes principales en surface (ha)" diff --git a/locale/pt/LC_MESSAGES/django.po b/locale/pt/LC_MESSAGES/django.po index ad6171311..8a328114c 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: 2023-01-16 11:42+0100\n" +"POT-Creation-Date: 2023-01-19 18:47+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -25,22 +25,22 @@ msgstr "" #: archaeological_context_records/templates/ishtar/forms/qa_contextrecord_duplicate.html:12 #: archaeological_context_records/wizards.py:85 #: archaeological_finds/models_finds.py:1142 -#: archaeological_finds/models_finds.py:2420 +#: archaeological_finds/models_finds.py:2419 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:16 #: archaeological_finds/wizards.py:92 archaeological_finds/wizards.py:565 #: archaeological_operations/forms.py:381 #: archaeological_operations/forms.py:1233 #: archaeological_operations/ishtar_menu.py:35 -#: archaeological_operations/models.py:1518 -#: archaeological_operations/models.py:2386 -#: archaeological_operations/models.py:2404 -#: archaeological_operations/models.py:2520 -#: archaeological_operations/models.py:2719 -#: archaeological_operations/models.py:3008 +#: archaeological_operations/models.py:1529 +#: archaeological_operations/models.py:2397 +#: archaeological_operations/models.py:2415 +#: archaeological_operations/models.py:2531 +#: archaeological_operations/models.py:2730 +#: archaeological_operations/models.py:3019 #: archaeological_operations/templates/ishtar/sheet_operation.html:4 #: archaeological_operations/wizards.py:246 #: archaeological_operations/wizards.py:258 -#: archaeological_warehouse/models.py:857 ishtar_common/forms_common.py:2136 +#: archaeological_warehouse/models.py:858 ishtar_common/forms_common.py:2136 #: ishtar_common/models.py:5066 ishtar_common/views.py:391 msgid "Operation" msgstr "" @@ -134,7 +134,7 @@ msgstr "" #: archaeological_context_records/forms.py:711 #: archaeological_context_records/models.py:735 #: archaeological_operations/forms.py:550 -#: archaeological_operations/models.py:563 ishtar_common/models.py:5067 +#: archaeological_operations/models.py:564 ishtar_common/models.py:5067 msgid "Archaeological site" msgstr "" @@ -162,8 +162,8 @@ msgstr "" #: archaeological_operations/forms.py:500 #: archaeological_operations/forms.py:1062 #: archaeological_operations/forms.py:1436 -#: archaeological_operations/models.py:3032 -#: archaeological_operations/models.py:3304 +#: archaeological_operations/models.py:3043 +#: archaeological_operations/models.py:3315 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Parcel" msgstr "" @@ -202,8 +202,8 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:40 #: archaeological_operations/templates/ishtar/sheet_operation.html:46 #: archaeological_operations/templates/ishtar/sheet_site.html:41 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:24 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:20 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:29 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:25 msgid "General" msgstr "" @@ -221,11 +221,11 @@ msgstr "" #: archaeological_finds/models_finds.py:1097 #: archaeological_operations/forms.py:71 archaeological_operations/forms.py:209 #: archaeological_operations/forms.py:1034 -#: archaeological_operations/models.py:3013 +#: archaeological_operations/models.py:3024 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 #: archaeological_warehouse/forms.py:145 ishtar_common/forms_common.py:84 -#: ishtar_common/forms_common.py:106 ishtar_common/models_common.py:2855 -#: ishtar_common/models_common.py:3731 +#: ishtar_common/forms_common.py:106 ishtar_common/models_common.py:2936 +#: ishtar_common/models_common.py:3812 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 msgid "Town" msgstr "" @@ -255,7 +255,7 @@ msgstr "" #: archaeological_finds/forms.py:1426 #: archaeological_finds/forms_treatments.py:193 #: archaeological_finds/models_finds.py:411 -#: archaeological_finds/models_finds.py:1814 +#: archaeological_finds/models_finds.py:1813 #: archaeological_finds/models_treatments.py:255 #: archaeological_finds/templates/ishtar/sheet_find.html:178 #: ishtar_common/forms_common.py:1802 ishtar_common/forms_common.py:2070 @@ -326,7 +326,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:773 #: archaeological_finds/models_treatments.py:258 #: archaeological_finds/models_treatments.py:1132 -#: archaeological_operations/models.py:1278 +#: archaeological_operations/models.py:1289 #: archaeological_operations/templates/ishtar/sheet_operation.html:205 #: ishtar_common/forms.py:990 ishtar_common/forms.py:991 msgid "Closing date" @@ -343,7 +343,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:219 #: archaeological_finds/models_treatments.py:754 #: archaeological_warehouse/forms.py:731 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:81 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:95 msgid "Location" msgstr "" @@ -359,7 +359,7 @@ msgstr "" #: archaeological_context_records/forms.py:459 #: archaeological_context_records/models.py:163 #: archaeological_finds/forms.py:1222 archaeological_finds/forms.py:1243 -#: archaeological_finds/models_finds.py:1857 +#: archaeological_finds/models_finds.py:1856 #: archaeological_finds/templates/ishtar/sheet_find.html:249 msgid "Dating" msgstr "" @@ -384,7 +384,7 @@ msgstr "" #: archaeological_finds/forms.py:1231 #: archaeological_finds/forms_treatments.py:180 #: archaeological_finds/forms_treatments.py:770 -#: archaeological_finds/models_finds.py:3354 +#: archaeological_finds/models_finds.py:3353 #: archaeological_finds/models_treatments.py:257 #: archaeological_finds/models_treatments.py:752 #: archaeological_finds/templates/ishtar/sheet_find.html:258 @@ -393,8 +393,8 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:476 #: archaeological_operations/forms.py:780 #: archaeological_operations/models.py:104 -#: archaeological_operations/models.py:1279 -#: archaeological_operations/models.py:3308 +#: archaeological_operations/models.py:1290 +#: archaeological_operations/models.py:3319 msgid "Start date" msgstr "" @@ -402,7 +402,7 @@ msgstr "" #: archaeological_context_records/models.py:110 #: archaeological_files/forms.py:791 archaeological_files/models.py:76 #: archaeological_files/models.py:699 archaeological_finds/forms.py:1232 -#: archaeological_finds/models_finds.py:3355 +#: archaeological_finds/models_finds.py:3354 #: archaeological_finds/models_treatments.py:753 #: archaeological_finds/templates/ishtar/sheet_find.html:259 #: archaeological_finds/templates/ishtar/sheet_find.html:401 @@ -410,8 +410,8 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:477 #: archaeological_finds/templates/ishtar/sheet_find.html:515 #: archaeological_operations/models.py:105 -#: archaeological_operations/models.py:3309 -#: ishtar_common/models_imports.py:1261 +#: archaeological_operations/models.py:3320 +#: ishtar_common/models_imports.py:1263 msgid "End date" msgstr "" @@ -449,7 +449,7 @@ msgstr "" #: archaeological_finds/forms.py:173 archaeological_finds/forms.py:179 #: archaeological_finds/forms.py:784 archaeological_finds/forms.py:802 #: archaeological_finds/forms.py:1405 archaeological_finds/models_finds.py:1093 -#: archaeological_finds/models_finds.py:2412 +#: archaeological_finds/models_finds.py:2411 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 #: archaeological_finds/wizards.py:93 archaeological_warehouse/forms.py:556 #: ishtar_common/forms_common.py:2149 ishtar_common/models.py:5068 @@ -669,7 +669,7 @@ msgid "Dating quality types" msgstr "" #: archaeological_context_records/models.py:129 -#: archaeological_context_records/tests.py:911 +#: archaeological_context_records/tests.py:912 #: archaeological_finds/tests.py:1335 msgctxt "key for text search" msgid "datings-period" @@ -717,9 +717,9 @@ msgstr "" #: archaeological_context_records/models.py:280 #: archaeological_finds/forms.py:210 archaeological_finds/forms.py:439 #: archaeological_finds/ishtar_menu.py:34 -#: archaeological_finds/models_finds.py:2044 -#: archaeological_finds/models_finds.py:3320 -#: archaeological_finds/models_finds.py:3342 +#: archaeological_finds/models_finds.py:2043 +#: archaeological_finds/models_finds.py:3319 +#: archaeological_finds/models_finds.py:3341 #: archaeological_finds/models_treatments.py:734 #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: ishtar_common/forms_common.py:2165 ishtar_common/models.py:5069 @@ -738,21 +738,21 @@ msgstr "" #: archaeological_finds/models_finds.py:249 #: archaeological_finds/models_finds.py:290 #: archaeological_finds/models_finds.py:356 -#: archaeological_finds/models_finds.py:1809 +#: archaeological_finds/models_finds.py:1808 #: archaeological_finds/models_treatments.py:65 #: archaeological_finds/models_treatments.py:746 #: archaeological_operations/models.py:103 #: archaeological_operations/models.py:128 #: archaeological_operations/models.py:146 #: archaeological_operations/models.py:155 -#: archaeological_operations/models.py:3335 +#: archaeological_operations/models.py:3346 #: archaeological_warehouse/forms.py:108 archaeological_warehouse/models.py:695 #: archaeological_warehouse/models.py:727 ishtar_common/models.py:692 #: ishtar_common/models.py:747 ishtar_common/models.py:789 #: ishtar_common/models.py:1732 ishtar_common/models.py:3528 -#: ishtar_common/models.py:4846 ishtar_common/models_common.py:2008 -#: ishtar_common/models_common.py:2041 ishtar_common/models_common.py:2057 -#: ishtar_common/models_common.py:2073 ishtar_common/models_common.py:2085 +#: ishtar_common/models.py:4846 ishtar_common/models_common.py:2043 +#: ishtar_common/models_common.py:2076 ishtar_common/models_common.py:2092 +#: ishtar_common/models_common.py:2108 ishtar_common/models_common.py:2120 msgid "Order" msgstr "" @@ -793,7 +793,7 @@ msgid "Excavation technique types" msgstr "" #: archaeological_context_records/models.py:372 -#: ishtar_common/models_imports.py:937 +#: ishtar_common/models_imports.py:939 msgid "Documentation type" msgstr "" @@ -812,10 +812,10 @@ msgstr "" #: archaeological_operations/forms.py:1334 #: archaeological_operations/models.py:305 #: archaeological_operations/models.py:314 -#: archaeological_operations/models.py:485 -#: archaeological_operations/models.py:948 -#: archaeological_operations/models.py:1032 -#: archaeological_operations/models.py:1340 +#: archaeological_operations/models.py:486 +#: archaeological_operations/models.py:958 +#: archaeological_operations/models.py:1042 +#: archaeological_operations/models.py:1351 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:8 msgid "Periods" msgstr "" @@ -849,14 +849,14 @@ msgstr "" #: archaeological_context_records/models.py:536 #: archaeological_finds/models_finds.py:1162 #: archaeological_operations/models.py:316 -#: archaeological_operations/models.py:952 +#: archaeological_operations/models.py:962 msgid "Associated document type" msgstr "" #: archaeological_context_records/models.py:537 #: archaeological_finds/models_finds.py:1163 #: archaeological_operations/models.py:317 -#: archaeological_operations/models.py:953 +#: archaeological_operations/models.py:963 msgid "Modification (year)" msgstr "" @@ -866,10 +866,10 @@ msgid "id" msgstr "" #: archaeological_context_records/models.py:579 -#: archaeological_context_records/tests.py:737 +#: archaeological_context_records/tests.py:738 #: archaeological_files/models.py:464 archaeological_finds/models_finds.py:1248 -#: archaeological_operations/models.py:377 -#: archaeological_operations/models.py:1091 +#: archaeological_operations/models.py:378 +#: archaeological_operations/models.py:1102 #: archaeological_operations/tests.py:3031 #: archaeological_warehouse/models.py:316 msgctxt "key for text search" @@ -888,8 +888,8 @@ msgid "operation-name" msgstr "" #: archaeological_context_records/models.py:589 -#: archaeological_operations/models.py:1087 -#: archaeological_operations/models.py:2550 +#: archaeological_operations/models.py:1098 +#: archaeological_operations/models.py:2561 #: archaeological_operations/tests.py:4507 msgctxt "key for text search" msgid "patriarche" @@ -897,7 +897,7 @@ msgstr "" #: archaeological_context_records/models.py:593 #: archaeological_finds/models_finds.py:1256 -#: archaeological_operations/models.py:1084 +#: archaeological_operations/models.py:1095 msgctxt "key for text search" msgid "operation-code" msgstr "" @@ -905,9 +905,9 @@ msgstr "" #: archaeological_context_records/models.py:597 #: archaeological_context_records/models.py:655 #: archaeological_finds/models_finds.py:1357 -#: archaeological_finds/models_finds.py:1730 -#: archaeological_operations/models.py:412 -#: archaeological_operations/models.py:438 ishtar_common/models.py:3924 +#: archaeological_finds/models_finds.py:1729 +#: archaeological_operations/models.py:413 +#: archaeological_operations/models.py:439 ishtar_common/models.py:3924 #: ishtar_common/models.py:4029 msgctxt "key for text search" msgid "operation" @@ -916,24 +916,24 @@ msgstr "" #: archaeological_context_records/models.py:601 #: archaeological_context_records/models.py:658 #: archaeological_finds/models_finds.py:1272 -#: archaeological_operations/models.py:1175 -#: archaeological_operations/models.py:1240 -#: archaeological_warehouse/models.py:937 ishtar_common/models.py:3960 +#: archaeological_operations/models.py:1186 +#: archaeological_operations/models.py:1251 +#: archaeological_warehouse/models.py:938 ishtar_common/models.py:3960 #: ishtar_common/models.py:4038 msgctxt "key for text search" msgid "site" msgstr "" #: archaeological_context_records/models.py:605 -#: archaeological_context_records/tests.py:804 +#: archaeological_context_records/tests.py:805 #: archaeological_finds/models_finds.py:1295 msgctxt "key for text search" msgid "operation-relation-type" msgstr "" #: archaeological_context_records/models.py:609 -#: archaeological_operations/models.py:371 -#: archaeological_operations/models.py:1133 +#: archaeological_operations/models.py:372 +#: archaeological_operations/models.py:1144 #: archaeological_operations/tests.py:3014 #: archaeological_operations/tests.py:3196 msgctxt "key for text search" @@ -941,26 +941,26 @@ msgid "period" msgstr "" #: archaeological_context_records/models.py:613 -#: archaeological_context_records/tests.py:863 +#: archaeological_context_records/tests.py:864 msgctxt "key for text search" msgid "unit-type" msgstr "" #: archaeological_context_records/models.py:616 -#: archaeological_files/models.py:467 archaeological_operations/models.py:1097 -#: archaeological_operations/models.py:2568 +#: archaeological_files/models.py:467 archaeological_operations/models.py:1108 +#: archaeological_operations/models.py:2579 msgctxt "key for text search" msgid "parcel" msgstr "" #: archaeological_context_records/models.py:620 -#: archaeological_operations/models.py:1194 +#: archaeological_operations/models.py:1205 msgctxt "key for text search" msgid "has-finds" msgstr "" #: archaeological_context_records/models.py:623 -#: archaeological_context_records/tests.py:769 +#: archaeological_context_records/tests.py:770 msgctxt "key for text search" msgid "record-relation-type" msgstr "" @@ -971,20 +971,20 @@ msgid "excavation-technique" msgstr "" #: archaeological_context_records/models.py:673 -#: archaeological_finds/models_finds.py:1689 -#: archaeological_operations/models.py:457 -#: archaeological_operations/models.py:1223 +#: archaeological_finds/models_finds.py:1688 +#: archaeological_operations/models.py:458 +#: archaeological_operations/models.py:1234 #: archaeological_warehouse/models.py:335 -#: archaeological_warehouse/models.py:1056 +#: archaeological_warehouse/models.py:1057 msgid "Lock/Unlock" msgstr "" #: archaeological_context_records/models.py:680 -#: archaeological_finds/models_finds.py:1682 -#: archaeological_operations/models.py:464 -#: archaeological_operations/models.py:1216 +#: archaeological_finds/models_finds.py:1681 +#: archaeological_operations/models.py:465 +#: archaeological_operations/models.py:1227 #: archaeological_warehouse/models.py:327 -#: archaeological_warehouse/models.py:1049 ishtar_common/models.py:2472 +#: archaeological_warehouse/models.py:1050 ishtar_common/models.py:2472 #: ishtar_common/models.py:2734 ishtar_common/models.py:4055 msgid "Bulk update" msgstr "" @@ -994,13 +994,13 @@ msgstr "" #: archaeological_context_records/views.py:272 #: archaeological_context_records/views.py:287 #: archaeological_finds/models_finds.py:877 -#: archaeological_finds/models_finds.py:1699 -#: archaeological_finds/models_finds.py:2318 archaeological_finds/views.py:1247 +#: archaeological_finds/models_finds.py:1698 +#: archaeological_finds/models_finds.py:2317 archaeological_finds/views.py:1247 #: archaeological_finds/views.py:1262 archaeological_finds/views.py:1300 -#: archaeological_finds/views.py:1316 archaeological_operations/models.py:474 -#: archaeological_operations/models.py:632 -#: archaeological_operations/models.py:1233 -#: archaeological_operations/models.py:1874 +#: archaeological_finds/views.py:1316 archaeological_operations/models.py:475 +#: archaeological_operations/models.py:633 +#: archaeological_operations/models.py:1244 +#: archaeological_operations/models.py:1885 #: archaeological_operations/views.py:843 #: archaeological_operations/views.py:858 #: archaeological_operations/views.py:865 @@ -1013,26 +1013,26 @@ msgstr "" #: archaeological_context_records/models.py:707 #: archaeological_files/models.py:530 archaeological_finds/models_finds.py:406 -#: archaeological_finds/models_finds.py:1803 +#: archaeological_finds/models_finds.py:1802 #: archaeological_finds/models_treatments.py:252 #: archaeological_finds/models_treatments.py:1100 -#: archaeological_operations/models.py:3021 +#: archaeological_operations/models.py:3032 #: archaeological_warehouse/models.py:388 -#: archaeological_warehouse/models.py:1133 ishtar_common/models.py:4090 +#: archaeological_warehouse/models.py:1134 ishtar_common/models.py:4090 msgid "External ID" msgstr "" #: archaeological_context_records/models.py:709 #: archaeological_files/models.py:533 archaeological_finds/models_finds.py:408 -#: archaeological_finds/models_finds.py:1805 -#: archaeological_operations/models.py:3024 +#: archaeological_finds/models_finds.py:1804 +#: archaeological_operations/models.py:3035 #: archaeological_warehouse/models.py:390 -#: archaeological_warehouse/models.py:1135 +#: archaeological_warehouse/models.py:1136 msgid "External ID is set automatically" msgstr "" #: archaeological_context_records/models.py:754 -#: archaeological_operations/models.py:1332 ishtar_common/models_common.py:2825 +#: archaeological_operations/models.py:1343 ishtar_common/models_common.py:2906 msgid "Surface (m2)" msgstr "" @@ -1066,21 +1066,21 @@ msgstr "" #: archaeological_context_records/models.py:830 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 -#: archaeological_files/models.py:719 archaeological_finds/models_finds.py:1998 +#: archaeological_files/models.py:719 archaeological_finds/models_finds.py:1997 #: archaeological_finds/models_treatments.py:272 #: archaeological_finds/models_treatments.py:1150 #: archaeological_finds/templates/ishtar/sheet_find.html:72 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 -#: archaeological_operations/models.py:524 -#: archaeological_operations/models.py:1406 -#: archaeological_operations/models.py:2768 +#: archaeological_operations/models.py:525 +#: archaeological_operations/models.py:1417 +#: archaeological_operations/models.py:2779 #: archaeological_operations/templates/ishtar/sheet_operation.html:63 #: archaeological_operations/templates/ishtar/sheet_site.html:97 #: archaeological_warehouse/models.py:377 -#: archaeological_warehouse/models.py:1140 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:46 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:179 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:42 +#: archaeological_warehouse/models.py:1141 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:51 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:191 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:47 #: ishtar_common/models.py:4206 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:11 #: ishtar_common/templates/ishtar/sheet_person.html:161 @@ -1088,50 +1088,50 @@ msgid "Documents" msgstr "" #: archaeological_context_records/models.py:837 -#: archaeological_finds/models_finds.py:2004 +#: archaeological_finds/models_finds.py:2003 #: archaeological_finds/models_treatments.py:278 #: archaeological_finds/models_treatments.py:1157 -#: archaeological_operations/models.py:530 -#: archaeological_operations/models.py:1412 -#: archaeological_operations/models.py:2775 +#: archaeological_operations/models.py:531 +#: archaeological_operations/models.py:1423 +#: archaeological_operations/models.py:2786 #: archaeological_warehouse/models.py:384 -#: archaeological_warehouse/models.py:1147 +#: archaeological_warehouse/models.py:1148 msgid "Main image" msgstr "" #: archaeological_context_records/models.py:842 -#: archaeological_files/models.py:723 archaeological_finds/models_finds.py:2016 +#: archaeological_files/models.py:723 archaeological_finds/models_finds.py:2015 #: archaeological_finds/models_treatments.py:283 #: archaeological_finds/models_treatments.py:1169 -#: archaeological_operations/models.py:535 -#: archaeological_operations/models.py:1417 -#: archaeological_operations/models.py:3028 ishtar_common/models.py:2496 +#: archaeological_operations/models.py:536 +#: archaeological_operations/models.py:1428 +#: archaeological_operations/models.py:3039 ishtar_common/models.py:2496 #: ishtar_common/models.py:2783 ishtar_common/models.py:3555 -#: ishtar_common/models_common.py:2850 ishtar_common/models_common.py:2873 +#: ishtar_common/models_common.py:2931 ishtar_common/models_common.py:2954 msgid "Cached name" msgstr "" #: archaeological_context_records/models.py:845 -#: archaeological_finds/models_finds.py:2023 -#: archaeological_operations/models.py:548 -#: archaeological_operations/models.py:1503 +#: archaeological_finds/models_finds.py:2022 +#: archaeological_operations/models.py:549 +#: archaeological_operations/models.py:1514 msgid "Cached periods label" msgstr "" #: archaeological_context_records/models.py:848 #: archaeological_context_records/models.py:854 -#: archaeological_files/models.py:727 archaeological_finds/models_finds.py:2020 -#: archaeological_finds/models_finds.py:2026 -#: archaeological_finds/models_finds.py:2032 -#: archaeological_finds/models_finds.py:2038 -#: archaeological_operations/models.py:539 -#: archaeological_operations/models.py:545 -#: archaeological_operations/models.py:551 -#: archaeological_operations/models.py:557 -#: archaeological_operations/models.py:1419 -#: archaeological_operations/models.py:1500 -#: archaeological_operations/models.py:1506 -#: archaeological_operations/models.py:1512 +#: archaeological_files/models.py:727 archaeological_finds/models_finds.py:2019 +#: archaeological_finds/models_finds.py:2025 +#: archaeological_finds/models_finds.py:2031 +#: archaeological_finds/models_finds.py:2037 +#: archaeological_operations/models.py:540 +#: archaeological_operations/models.py:546 +#: archaeological_operations/models.py:552 +#: archaeological_operations/models.py:558 +#: archaeological_operations/models.py:1430 +#: archaeological_operations/models.py:1511 +#: archaeological_operations/models.py:1517 +#: archaeological_operations/models.py:1523 msgid "Generated automatically - do not edit" msgstr "" @@ -1152,7 +1152,7 @@ msgid "Context record" msgstr "" #: archaeological_context_records/models.py:915 -#: archaeological_finds/models_finds.py:2204 +#: archaeological_finds/models_finds.py:2203 msgid "List of associated base finds" msgstr "" @@ -1264,22 +1264,24 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:74 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:266 -#: archaeological_finds/forms.py:1825 archaeological_finds/models_finds.py:2045 +#: archaeological_finds/forms.py:1825 archaeological_finds/models_finds.py:2044 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:11 #: archaeological_finds/templates/ishtar/sheet_treatment.html:24 #: archaeological_operations/templates/ishtar/sheet_operation.html:90 #: archaeological_operations/templates/ishtar/sheet_operation.html:434 #: archaeological_operations/templates/ishtar/sheet_operation.html:526 #: archaeological_operations/templates/ishtar/sheet_site.html:93 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:174 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:221 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:177 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:186 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:233 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:193 msgid "Finds" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:101 #: archaeological_finds/templates/ishtar/sheet_find.html:81 #: archaeological_operations/templates/ishtar/sheet_operation.html:99 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:60 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:56 #: ishtar_common/templates/ishtar/blocks/sheet_map.html:9 msgid "Geographic data" msgstr "" @@ -1295,9 +1297,9 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:161 #: archaeological_operations/templates/ishtar/sheet_operation.html:139 #: 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:3903 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:84 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:77 +#: ishtar_common/models_common.py:3984 #: ishtar_common/templates/ishtar/sheet_document.html:37 msgid "Complete identifier" msgstr "" @@ -1316,11 +1318,9 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_basefind.html:70 #: archaeological_operations/templates/ishtar/sheet_operation.html:300 #: archaeological_operations/templates/ishtar/sheet_site.html:68 -#: 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:2827 -msgid "Localisation" +#: archaeological_warehouse/templates/ishtar/sheet_container.html:165 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:116 +msgid "Geographic localisation" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:178 @@ -1357,8 +1357,8 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:176 #: 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:1938 ishtar_common/models_common.py:1953 -#: ishtar_common/models_imports.py:1250 +#: ishtar_common/models_common.py:1973 ishtar_common/models_common.py:1988 +#: ishtar_common/models_imports.py:1252 msgid "State" msgstr "" @@ -1426,7 +1426,7 @@ msgid "Context record deletion" msgstr "" #: archaeological_context_records/views.py:254 -#: archaeological_operations/models.py:1863 +#: archaeological_operations/models.py:1874 msgid "Add context record" msgstr "" @@ -1478,20 +1478,20 @@ msgstr "" #: archaeological_operations/forms.py:725 #: archaeological_operations/forms.py:1426 #: archaeological_operations/forms.py:1739 -#: archaeological_operations/models.py:944 -#: archaeological_operations/models.py:1316 -#: archaeological_operations/models.py:2518 -#: archaeological_operations/models.py:2747 -#: archaeological_operations/models.py:3011 +#: archaeological_operations/models.py:954 +#: archaeological_operations/models.py:1327 +#: archaeological_operations/models.py:2529 +#: archaeological_operations/models.py:2758 +#: archaeological_operations/models.py:3022 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:7 -#: ishtar_common/models_imports.py:980 +#: ishtar_common/models_imports.py:982 msgid "Year" msgstr "" #: archaeological_files/forms.py:91 archaeological_files/forms.py:240 #: archaeological_files/forms.py:673 archaeological_files/models.py:524 #: archaeological_operations/forms.py:491 -#: archaeological_operations/models.py:1317 +#: archaeological_operations/models.py:1328 msgid "Numeric reference" msgstr "" @@ -1501,8 +1501,8 @@ msgstr "" #: archaeological_operations/forms.py:1331 #: archaeological_operations/forms.py:1428 #: archaeological_operations/forms.py:1505 -#: archaeological_operations/models.py:483 -#: archaeological_operations/models.py:2750 +#: archaeological_operations/models.py:484 +#: archaeological_operations/models.py:2761 msgid "Other reference" msgstr "" @@ -1510,8 +1510,8 @@ msgstr "" #: archaeological_files/forms.py:1167 archaeological_files/models.py:1343 #: archaeological_operations/forms.py:503 #: archaeological_operations/forms.py:1439 -#: archaeological_operations/models.py:2390 ishtar_common/models_common.py:1961 -#: ishtar_common/models_common.py:2833 +#: archaeological_operations/models.py:2401 ishtar_common/models_common.py:1996 +#: ishtar_common/models_common.py:2914 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" @@ -1554,7 +1554,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:195 #: archaeological_finds/forms_treatments.py:765 #: archaeological_finds/models_finds.py:412 -#: archaeological_finds/models_finds.py:1936 +#: archaeological_finds/models_finds.py:1935 #: archaeological_finds/models_treatments.py:254 #: archaeological_finds/models_treatments.py:1146 #: archaeological_operations/forms.py:541 @@ -1563,16 +1563,16 @@ msgstr "" #: archaeological_operations/forms.py:1345 #: archaeological_operations/forms.py:1442 #: archaeological_operations/forms.py:1504 -#: archaeological_operations/models.py:495 -#: archaeological_operations/models.py:1401 -#: archaeological_operations/models.py:2764 +#: archaeological_operations/models.py:496 +#: archaeological_operations/models.py:1412 +#: archaeological_operations/models.py:2775 #: archaeological_warehouse/forms.py:226 archaeological_warehouse/forms.py:375 #: archaeological_warehouse/forms.py:507 archaeological_warehouse/models.py:367 -#: archaeological_warehouse/models.py:1103 ishtar_common/forms_common.py:1800 +#: archaeological_warehouse/models.py:1104 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:182 -#: ishtar_common/models_common.py:2170 ishtar_common/models_imports.py:751 +#: ishtar_common/models.py:4190 ishtar_common/models_common.py:183 +#: ishtar_common/models_common.py:2216 ishtar_common/models_imports.py:751 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:13 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:170 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:39 @@ -1620,9 +1620,9 @@ msgstr "" #: archaeological_files/forms.py:218 archaeological_files/models.py:605 #: archaeological_finds/models_treatments.py:1134 -#: archaeological_operations/models.py:1277 ishtar_common/forms_common.py:1795 +#: archaeological_operations/models.py:1288 ishtar_common/forms_common.py:1795 #: ishtar_common/forms_common.py:2271 ishtar_common/models.py:4175 -#: ishtar_common/models_imports.py:1258 +#: ishtar_common/models_imports.py:1260 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:54 msgid "Creation date" msgstr "" @@ -1667,21 +1667,21 @@ msgstr "" #: archaeological_operations/forms.py:1053 #: archaeological_operations/forms.py:1381 #: archaeological_operations/models.py:304 -#: archaeological_operations/models.py:493 -#: archaeological_operations/models.py:1029 -#: archaeological_operations/models.py:1031 -#: archaeological_operations/models.py:1337 -#: archaeological_operations/models.py:2759 +#: archaeological_operations/models.py:494 +#: archaeological_operations/models.py:1039 +#: archaeological_operations/models.py:1041 +#: archaeological_operations/models.py:1348 +#: archaeological_operations/models.py:2770 #: archaeological_operations/templates/ishtar/sheet_operation.html:147 #: 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:2856 +#: ishtar_common/models_common.py:2937 msgid "Towns" msgstr "" #: archaeological_files/forms.py:293 archaeological_files/forms.py:336 #: archaeological_files/forms.py:576 archaeological_files/models.py:641 -#: archaeological_operations/models.py:2753 ishtar_common/models_common.py:1962 +#: archaeological_operations/models.py:2764 ishtar_common/models_common.py:1997 msgid "Departments" msgstr "" @@ -1704,7 +1704,7 @@ msgstr "" #: archaeological_files/forms.py:303 archaeological_files/forms.py:344 #: archaeological_warehouse/forms.py:241 ishtar_common/forms_common.py:540 -#: ishtar_common/forms_common.py:923 ishtar_common/models_common.py:3064 +#: ishtar_common/forms_common.py:923 ishtar_common/models_common.py:3145 msgid "Postal code" msgstr "" @@ -1721,7 +1721,7 @@ msgstr "" #: 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:536 ishtar_common/forms_common.py:919 -#: ishtar_common/models_common.py:3059 ishtar_common/models_common.py:3214 +#: ishtar_common/models_common.py:3140 ishtar_common/models_common.py:3295 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 msgid "Address" msgstr "" @@ -1787,7 +1787,7 @@ msgstr "" #: archaeological_files/forms.py:596 archaeological_files/models.py:665 #: archaeological_operations/forms.py:522 -#: archaeological_operations/models.py:2704 +#: archaeological_operations/models.py:2715 msgid "Scientist in charge" msgstr "" @@ -1948,7 +1948,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:368 #: archaeological_operations/forms.py:1427 #: archaeological_operations/forms.py:1560 -#: archaeological_operations/models.py:2689 ishtar_common/admin.py:564 +#: archaeological_operations/models.py:2700 ishtar_common/admin.py:564 #: ishtar_common/models.py:4089 msgid "Index" msgstr "" @@ -1961,8 +1961,8 @@ msgstr "" #: archaeological_finds/forms_treatments.py:897 #: archaeological_operations/forms.py:1433 #: archaeological_operations/forms.py:1494 -#: archaeological_operations/models.py:2420 -#: archaeological_operations/models.py:2679 ishtar_common/models_imports.py:932 +#: archaeological_operations/models.py:2431 +#: archaeological_operations/models.py:2690 ishtar_common/models_imports.py:934 msgid "Act type" msgstr "" @@ -1983,7 +1983,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:844 #: archaeological_operations/forms.py:1440 #: archaeological_operations/forms.py:1501 -#: archaeological_operations/models.py:2748 +#: archaeological_operations/models.py:2759 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" @@ -2029,10 +2029,10 @@ msgstr "" #: archaeological_files/wizards.py:219 archaeological_files/wizards.py:231 #: archaeological_operations/forms.py:670 #: archaeological_operations/forms.py:931 -#: archaeological_operations/models.py:1883 -#: archaeological_operations/models.py:2403 -#: archaeological_operations/models.py:2519 -#: archaeological_operations/models.py:2727 +#: archaeological_operations/models.py:1894 +#: archaeological_operations/models.py:2414 +#: archaeological_operations/models.py:2530 +#: archaeological_operations/models.py:2738 #: archaeological_operations/wizards.py:85 ishtar_common/views.py:390 msgid "Archaeological file" msgstr "" @@ -2045,9 +2045,9 @@ msgstr "" #: archaeological_files/ishtar_menu.py:71 #: archaeological_finds/ishtar_menu.py:149 #: archaeological_finds/ishtar_menu.py:226 -#: archaeological_finds/models_finds.py:3345 +#: archaeological_finds/models_finds.py:3344 #: archaeological_operations/ishtar_menu.py:70 -#: archaeological_operations/models.py:2784 +#: archaeological_operations/models.py:2795 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "" @@ -2133,12 +2133,12 @@ msgstr "" msgid "Equipment/Service" msgstr "" -#: archaeological_files/models.py:208 ishtar_common/models_common.py:173 -#: ishtar_common/models_common.py:204 +#: archaeological_files/models.py:208 ishtar_common/models_common.py:174 +#: ishtar_common/models_common.py:205 msgid "Textual ID" msgstr "" -#: archaeological_files/models.py:212 ishtar_common/models_common.py:177 +#: archaeological_files/models.py:212 ishtar_common/models_common.py:178 msgid "" "The slug is the standardized version of the name. It contains only lowercase " "letters, numbers and hyphens. Each slug must be unique." @@ -2156,7 +2156,7 @@ msgstr "" msgid "Unitary cost" msgstr "" -#: archaeological_files/models.py:223 ishtar_common/models_imports.py:933 +#: archaeological_files/models.py:223 ishtar_common/models_imports.py:935 msgid "Unit" msgstr "" @@ -2170,14 +2170,14 @@ msgstr "" #: archaeological_files/models.py:231 ishtar_common/models.py:1558 #: ishtar_common/models.py:1970 ishtar_common/models.py:3423 -#: ishtar_common/models_common.py:183 ishtar_common/models_imports.py:187 +#: ishtar_common/models_common.py:184 ishtar_common/models_imports.py:187 #: ishtar_common/models_imports.py:812 msgid "Available" msgstr "" #: archaeological_files/models.py:237 archaeological_warehouse/forms.py:747 #: ishtar_common/admin.py:1126 ishtar_common/models.py:2275 -#: ishtar_common/models_common.py:715 +#: ishtar_common/models_common.py:716 msgid "Parent" msgstr "" @@ -2239,13 +2239,13 @@ msgstr "" #: archaeological_files/models.py:382 archaeological_finds/models_finds.py:1145 #: archaeological_operations/models.py:312 -#: archaeological_operations/models.py:945 ishtar_common/admin.py:1295 +#: archaeological_operations/models.py:955 ishtar_common/admin.py:1295 msgid "Area" msgstr "" #: archaeological_files/models.py:383 archaeological_finds/models_finds.py:1148 #: archaeological_operations/models.py:313 -#: archaeological_operations/models.py:946 +#: archaeological_operations/models.py:956 msgid "Extended area" msgstr "" @@ -2256,8 +2256,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:748 -#: ishtar_common/models_common.py:1934 ishtar_common/models_common.py:1950 +#: ishtar_common/models.py:1854 ishtar_common/models_common.py:749 +#: ishtar_common/models_common.py:1969 ishtar_common/models_common.py:1985 #: ishtar_common/templates/ishtar/sheet_person.html:30 msgid "Number" msgstr "" @@ -2273,8 +2273,8 @@ msgstr "" #: archaeological_files/models.py:455 archaeological_finds/models_finds.py:1252 #: archaeological_finds/models_treatments.py:152 #: archaeological_finds/models_treatments.py:1049 -#: archaeological_operations/models.py:1082 -#: archaeological_operations/models.py:2543 +#: archaeological_operations/models.py:1093 +#: archaeological_operations/models.py:2554 #: archaeological_operations/tests.py:3020 #: archaeological_operations/tests.py:3096 msgctxt "key for text search" @@ -2283,28 +2283,28 @@ msgstr "" #: archaeological_files/models.py:457 #: archaeological_finds/models_treatments.py:1046 -#: archaeological_operations/models.py:361 -#: archaeological_warehouse/models.py:913 ishtar_common/models.py:3854 +#: archaeological_operations/models.py:362 +#: archaeological_warehouse/models.py:914 ishtar_common/models.py:3854 msgctxt "key for text search" msgid "reference" msgstr "" #: archaeological_files/models.py:460 #: archaeological_finds/models_treatments.py:149 -#: archaeological_operations/models.py:367 +#: archaeological_operations/models.py:368 msgctxt "key for text search" msgid "other-reference" msgstr "" -#: archaeological_files/models.py:471 archaeological_operations/models.py:1101 +#: archaeological_files/models.py:471 archaeological_operations/models.py:1112 msgctxt "key for text search" msgid "department" msgstr "" #: archaeological_files/models.py:475 #: archaeological_finds/models_treatments.py:1043 -#: archaeological_operations/models.py:364 -#: archaeological_operations/models.py:1105 +#: archaeological_operations/models.py:365 +#: archaeological_operations/models.py:1116 #: archaeological_operations/tests.py:3140 #: archaeological_warehouse/models.py:309 ishtar_common/models.py:2458 #: ishtar_common/models.py:2710 ishtar_common/models.py:3284 @@ -2315,11 +2315,11 @@ msgstr "" #: archaeological_files/models.py:478 #: archaeological_finds/models_treatments.py:155 #: archaeological_finds/models_treatments.py:1052 -#: archaeological_operations/models.py:1111 -#: archaeological_operations/models.py:2554 +#: archaeological_operations/models.py:1122 +#: archaeological_operations/models.py:2565 #: archaeological_operations/tests.py:3153 #: archaeological_warehouse/models.py:312 -#: archaeological_warehouse/models.py:909 ishtar_common/models.py:2461 +#: archaeological_warehouse/models.py:910 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" @@ -2347,10 +2347,10 @@ msgid "permit-reference" msgstr "" #: archaeological_files/models.py:496 archaeological_finds/models_finds.py:1458 -#: archaeological_operations/models.py:383 -#: archaeological_operations/models.py:1153 -#: archaeological_operations/models.py:2664 -#: archaeological_warehouse/models.py:920 ishtar_common/models.py:3914 +#: archaeological_operations/models.py:384 +#: archaeological_operations/models.py:1164 +#: archaeological_operations/models.py:2675 +#: archaeological_warehouse/models.py:921 ishtar_common/models.py:3914 msgctxt "key for text search" msgid "comment" msgstr "" @@ -2362,12 +2362,12 @@ msgctxt "key for text search" msgid "in-charge" msgstr "" -#: archaeological_files/models.py:503 archaeological_operations/models.py:2599 +#: archaeological_files/models.py:503 archaeological_operations/models.py:2610 msgctxt "key for text search" msgid "general-contractor" msgstr "" -#: archaeological_files/models.py:507 archaeological_operations/models.py:2603 +#: archaeological_files/models.py:507 archaeological_operations/models.py:2614 msgctxt "key for text search" msgid "general-contractor-organization" msgstr "" @@ -2389,7 +2389,7 @@ msgstr "" #: archaeological_operations/forms.py:1215 #: archaeological_operations/forms.py:1330 #: archaeological_operations/forms.py:1795 -#: archaeological_operations/models.py:484 +#: archaeological_operations/models.py:485 #: 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 @@ -2402,11 +2402,11 @@ msgstr "" #: ishtar_common/models.py:1556 ishtar_common/models.py:1940 #: 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:2138 -#: ishtar_common/models_common.py:2824 ishtar_common/models_common.py:2873 +#: ishtar_common/models.py:4940 ishtar_common/models_common.py:2184 +#: ishtar_common/models_common.py:2905 ishtar_common/models_common.py:2954 #: ishtar_common/models_imports.py:110 ishtar_common/models_imports.py:144 #: ishtar_common/models_imports.py:669 ishtar_common/models_imports.py:686 -#: ishtar_common/models_imports.py:807 ishtar_common/models_imports.py:1170 +#: ishtar_common/models_imports.py:807 ishtar_common/models_imports.py:1172 #: ishtar_common/models_rest.py:105 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:10 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:24 @@ -2512,11 +2512,11 @@ msgstr "" msgid "No town" msgstr "" -#: archaeological_files/models.py:1241 archaeological_operations/models.py:1842 +#: archaeological_files/models.py:1241 archaeological_operations/models.py:1853 msgid "Modify parcels" msgstr "" -#: archaeological_files/models.py:1243 archaeological_operations/models.py:1844 +#: archaeological_files/models.py:1243 archaeological_operations/models.py:1855 msgid "parcels" msgstr "" @@ -2549,8 +2549,8 @@ msgstr "" msgid "operation" msgstr "" -#: archaeological_files/models.py:1340 archaeological_operations/models.py:1321 -#: archaeological_operations/models.py:2998 +#: archaeological_files/models.py:1340 archaeological_operations/models.py:1332 +#: archaeological_operations/models.py:3009 msgid "File" msgstr "" @@ -2653,7 +2653,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:2785 +#: archaeological_operations/models.py:2796 #: archaeological_operations/templates/ishtar/sheet_operation.html:351 #: archaeological_operations/templates/ishtar/sheet_operation.html:488 msgid "Administrative acts" @@ -2666,8 +2666,8 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_files/templates/ishtar/sheet_file.html:218 -#: archaeological_operations/models.py:2517 -#: archaeological_operations/models.py:2820 +#: archaeological_operations/models.py:2528 +#: archaeological_operations/models.py:2831 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 #: archaeological_warehouse/forms.py:333 archaeological_warehouse/forms.py:505 @@ -2689,14 +2689,14 @@ 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:587 +#: archaeological_warehouse/models.py:889 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:2935 ishtar_common/models.py:745 #: 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:979 +#: ishtar_common/models_imports.py:981 #: ishtar_common/templates/blocks/DataTables-stats.html:27 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:24 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:8 @@ -2710,7 +2710,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:195 #: archaeological_operations/forms.py:781 -#: archaeological_operations/models.py:1281 +#: archaeological_operations/models.py:1292 msgid "Excavation end date" msgstr "" @@ -2725,7 +2725,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:220 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:9 #: archaeological_warehouse/forms.py:694 ishtar_common/models.py:714 -#: ishtar_common/models_imports.py:978 +#: ishtar_common/models_imports.py:980 msgid "Date" msgstr "" @@ -2764,10 +2764,10 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:307 #: archaeological_files/templates/ishtar/sheet_file.html:359 #: archaeological_files/templates/ishtar/sheet_file.html:415 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:231 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:255 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:186 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:211 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:243 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:267 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:202 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:227 #: ishtar_common/models.py:1847 ishtar_common/models.py:1879 msgid "Total" msgstr "" @@ -2876,48 +2876,48 @@ msgstr "" #: archaeological_finds/forms.py:811 archaeological_finds/forms.py:1024 #: archaeological_finds/forms.py:1333 archaeological_finds/forms.py:1965 #: archaeological_finds/models_finds.py:405 -#: archaeological_finds/models_finds.py:1810 +#: archaeological_finds/models_finds.py:1809 msgid "Free ID" msgstr "" #: archaeological_finds/forms.py:278 archaeological_finds/forms.py:614 #: archaeological_finds/forms.py:815 archaeological_finds/forms.py:1026 #: archaeological_finds/forms.py:1334 archaeological_finds/forms.py:2032 -#: archaeological_finds/models_finds.py:1811 +#: archaeological_finds/models_finds.py:1810 msgid "Denomination" msgstr "" #: archaeological_finds/forms.py:279 archaeological_finds/forms.py:816 -#: archaeological_finds/forms.py:1335 archaeological_finds/models_finds.py:1938 +#: archaeological_finds/forms.py:1335 archaeological_finds/models_finds.py:1937 msgid "Previous ID" msgstr "" #: archaeological_finds/forms.py:280 archaeological_finds/forms.py:820 -#: archaeological_finds/forms.py:1338 archaeological_finds/models_finds.py:1812 -msgid "Museum ID" +#: archaeological_finds/forms.py:1338 archaeological_finds/models_finds.py:1811 +msgid "Museum inventory number" msgstr "" #: archaeological_finds/forms.py:281 archaeological_finds/forms.py:821 -#: archaeological_finds/forms.py:1339 archaeological_finds/models_finds.py:1813 +#: archaeological_finds/forms.py:1339 archaeological_finds/models_finds.py:1812 msgid "Laboratory ID" msgstr "" #: archaeological_finds/forms.py:282 archaeological_finds/forms.py:822 -#: archaeological_finds/forms.py:1337 archaeological_finds/models_finds.py:1808 +#: archaeological_finds/forms.py:1337 archaeological_finds/models_finds.py:1807 msgid "Seal number" msgstr "" #: archaeological_finds/forms.py:283 archaeological_finds/forms.py:823 -#: archaeological_finds/forms.py:1340 archaeological_finds/models_finds.py:1935 +#: archaeological_finds/forms.py:1340 archaeological_finds/models_finds.py:1934 msgid "Mark" msgstr "" -#: archaeological_finds/forms.py:296 archaeological_finds/models_finds.py:1995 +#: archaeological_finds/forms.py:296 archaeological_finds/models_finds.py:1994 msgid "Public description" msgstr "" #: archaeological_finds/forms.py:298 archaeological_finds/forms.py:621 -#: archaeological_finds/forms.py:1446 archaeological_finds/models_finds.py:1878 +#: archaeological_finds/forms.py:1446 archaeological_finds/models_finds.py:1877 msgid "Is complete?" msgstr "" @@ -2925,18 +2925,18 @@ msgstr "" #: archaeological_finds/forms.py:835 archaeological_finds/models_finds.py:91 #: archaeological_finds/models_finds.py:1114 #: archaeological_finds/models_finds.py:1115 -#: archaeological_finds/models_finds.py:1821 +#: archaeological_finds/models_finds.py:1820 msgid "Material types" msgstr "" #: archaeological_finds/forms.py:303 archaeological_finds/forms.py:627 -#: archaeological_finds/forms.py:1455 archaeological_finds/models_finds.py:1825 -#: ishtar_common/models_imports.py:957 +#: archaeological_finds/forms.py:1455 archaeological_finds/models_finds.py:1824 +#: ishtar_common/models_imports.py:959 msgid "Material type quality" msgstr "" #: archaeological_finds/forms.py:306 archaeological_finds/forms.py:1457 -#: archaeological_finds/models_finds.py:1832 +#: archaeological_finds/models_finds.py:1831 msgid "Comment on the material" msgstr "" @@ -2944,12 +2944,12 @@ msgstr "" #: archaeological_finds/forms.py:838 archaeological_finds/models_finds.py:264 #: archaeological_finds/models_finds.py:1116 #: archaeological_finds/models_finds.py:1117 -#: archaeological_finds/models_finds.py:1880 +#: archaeological_finds/models_finds.py:1879 msgid "Object types" msgstr "" #: archaeological_finds/forms.py:313 archaeological_finds/forms.py:634 -#: archaeological_finds/forms.py:1464 archaeological_finds/models_finds.py:1884 +#: archaeological_finds/forms.py:1464 archaeological_finds/models_finds.py:1883 msgid "Object type quality" msgstr "" @@ -2960,48 +2960,48 @@ msgstr "" #: archaeological_finds/forms.py:319 archaeological_finds/forms.py:636 #: archaeological_finds/forms.py:1473 archaeological_finds/forms.py:1971 -#: archaeological_finds/models_finds.py:1839 +#: archaeological_finds/models_finds.py:1838 msgid "Number of remains" msgstr "" #: archaeological_finds/forms.py:321 archaeological_finds/forms.py:638 -#: archaeological_finds/forms.py:1475 archaeological_finds/models_finds.py:1915 +#: archaeological_finds/forms.py:1475 archaeological_finds/models_finds.py:1914 msgid "Minimum number of individuals (MNI)" msgstr "" #: archaeological_finds/forms.py:325 archaeological_finds/forms.py:642 -#: archaeological_finds/forms.py:1479 archaeological_finds/models_finds.py:1815 +#: archaeological_finds/forms.py:1479 archaeological_finds/models_finds.py:1814 msgid "Decoration" msgstr "" #: archaeological_finds/forms.py:328 archaeological_finds/forms.py:645 -#: archaeological_finds/forms.py:1480 archaeological_finds/models_finds.py:1816 +#: archaeological_finds/forms.py:1480 archaeological_finds/models_finds.py:1815 msgid "Inscription" msgstr "" #: archaeological_finds/forms.py:331 archaeological_finds/forms.py:648 #: archaeological_finds/forms.py:846 archaeological_finds/forms.py:1478 -#: archaeological_finds/models_finds.py:1818 +#: archaeological_finds/models_finds.py:1817 msgid "Manufacturing place" msgstr "" #: archaeological_finds/forms.py:334 archaeological_finds/forms.py:651 #: archaeological_finds/forms.py:849 archaeological_finds/forms.py:1482 #: archaeological_finds/models_finds.py:1157 -#: archaeological_finds/models_finds.py:1910 +#: archaeological_finds/models_finds.py:1909 msgid "Communicability" msgstr "" #: archaeological_finds/forms.py:338 archaeological_finds/forms.py:1486 -#: archaeological_finds/models_finds.py:1860 +#: archaeological_finds/models_finds.py:1859 #: archaeological_operations/forms.py:1221 -#: archaeological_operations/models.py:490 +#: archaeological_operations/models.py:491 msgid "Cultural attribution" msgstr "" #: archaeological_finds/forms.py:342 archaeological_finds/forms.py:657 #: archaeological_finds/forms.py:881 archaeological_finds/forms.py:1488 -#: archaeological_finds/models_finds.py:1937 +#: archaeological_finds/models_finds.py:1936 msgid "Comment on dating" msgstr "" @@ -3012,37 +3012,37 @@ msgid "Dimensions" msgstr "" #: archaeological_finds/forms.py:347 archaeological_finds/forms.py:661 -#: archaeological_finds/models_finds.py:1917 +#: archaeological_finds/models_finds.py:1916 msgid "Length (cm)" msgstr "" #: archaeological_finds/forms.py:350 archaeological_finds/forms.py:662 -#: archaeological_finds/models_finds.py:1918 +#: archaeological_finds/models_finds.py:1917 msgid "Width (cm)" msgstr "" #: archaeological_finds/forms.py:353 archaeological_finds/forms.py:663 -#: archaeological_finds/models_finds.py:1919 +#: archaeological_finds/models_finds.py:1918 msgid "Height (cm)" msgstr "" #: archaeological_finds/forms.py:356 archaeological_finds/forms.py:666 -#: archaeological_finds/models_finds.py:1922 +#: archaeological_finds/models_finds.py:1921 msgid "Thickness (cm)" msgstr "" #: archaeological_finds/forms.py:359 archaeological_finds/forms.py:664 -#: archaeological_finds/models_finds.py:1920 +#: archaeological_finds/models_finds.py:1919 msgid "Diameter (cm)" msgstr "" #: archaeological_finds/forms.py:362 archaeological_finds/forms.py:665 -#: archaeological_finds/models_finds.py:1921 +#: archaeological_finds/models_finds.py:1920 msgid "Circumference (cm)" msgstr "" #: archaeological_finds/forms.py:366 archaeological_finds/forms.py:667 -#: archaeological_finds/forms.py:1969 archaeological_finds/models_finds.py:1834 +#: archaeological_finds/forms.py:1969 archaeological_finds/models_finds.py:1833 #: archaeological_warehouse/models.py:692 msgid "Volume (l)" msgstr "" @@ -3066,19 +3066,19 @@ msgid "Clutter height (cm)" msgstr "" #: archaeological_finds/forms.py:386 archaeological_finds/forms.py:679 -#: archaeological_finds/forms.py:1559 archaeological_finds/models_finds.py:1933 +#: archaeological_finds/forms.py:1559 archaeological_finds/models_finds.py:1932 msgid "Dimensions comment" msgstr "" #: archaeological_finds/forms.py:390 archaeological_finds/forms.py:683 #: archaeological_finds/forms.py:868 archaeological_finds/forms.py:1564 #: archaeological_finds/models_finds.py:1158 -#: archaeological_finds/models_finds.py:1942 +#: archaeological_finds/models_finds.py:1941 msgid "Check" msgstr "" #: archaeological_finds/forms.py:392 archaeological_finds/forms.py:685 -#: archaeological_finds/forms.py:870 archaeological_finds/models_finds.py:1947 +#: archaeological_finds/forms.py:870 archaeological_finds/models_finds.py:1946 msgid "Check date" msgstr "" @@ -3096,12 +3096,13 @@ msgid "Excavation ID" msgstr "" #: archaeological_finds/forms.py:510 archaeological_finds/models_finds.py:423 -msgid "Discovery date (exact or TPQ)" +#: archaeological_finds/templates/ishtar/sheet_basefind.html:31 +msgid "Discovery date (exact or beginning)" msgstr "" #: archaeological_finds/forms.py:513 archaeological_finds/models_finds.py:426 #: archaeological_finds/templates/ishtar/sheet_basefind.html:33 -msgid "Discovery date (TAQ)" +msgid "Discovery date (end)" msgstr "" #: archaeological_finds/forms.py:516 archaeological_finds/forms.py:1445 @@ -3195,47 +3196,47 @@ msgstr "" #: archaeological_finds/forms.py:851 archaeological_finds/forms.py:1168 #: archaeological_finds/forms.py:1573 archaeological_finds/models_finds.py:1159 -#: archaeological_finds/models_finds.py:1977 +#: archaeological_finds/models_finds.py:1976 #: archaeological_warehouse/forms.py:580 msgid "Alteration" msgstr "" #: archaeological_finds/forms.py:853 archaeological_finds/forms.py:1174 #: archaeological_finds/forms.py:1574 archaeological_finds/models_finds.py:1160 -#: archaeological_finds/models_finds.py:1981 +#: archaeological_finds/models_finds.py:1980 #: archaeological_warehouse/forms.py:581 msgid "Alteration cause" msgstr "" #: archaeological_finds/forms.py:856 archaeological_finds/forms.py:1165 #: archaeological_finds/forms.py:1571 archaeological_finds/models_finds.py:1154 -#: archaeological_finds/models_finds.py:1962 -#: archaeological_warehouse/forms.py:579 ishtar_common/models_imports.py:941 +#: archaeological_finds/models_finds.py:1961 +#: archaeological_warehouse/forms.py:579 ishtar_common/models_imports.py:943 msgid "Conservatory state" msgstr "" #: archaeological_finds/forms.py:859 archaeological_finds/forms.py:1186 #: archaeological_finds/forms.py:1578 archaeological_finds/models_finds.py:1161 -#: archaeological_finds/models_finds.py:1987 +#: archaeological_finds/models_finds.py:1986 #: archaeological_warehouse/forms.py:585 msgid "Treatment emergency" msgstr "" #: archaeological_finds/forms.py:862 archaeological_finds/forms.py:1159 #: archaeological_finds/forms.py:1570 archaeological_finds/models_finds.py:1156 -#: archaeological_finds/models_finds.py:1904 +#: archaeological_finds/models_finds.py:1903 #: archaeological_warehouse/forms.py:578 msgid "Remarkability" msgstr "" #: archaeological_finds/forms.py:873 archaeological_finds/forms.py:1191 -#: archaeological_finds/models_finds.py:1993 +#: archaeological_finds/models_finds.py:1992 msgid "Appraisal date" msgstr "" #: archaeological_finds/forms.py:875 archaeological_finds/forms.py:1189 #: archaeological_finds/models_finds.py:1172 -#: archaeological_finds/models_finds.py:1992 +#: archaeological_finds/models_finds.py:1991 msgid "Insurance value" msgstr "" @@ -3261,7 +3262,7 @@ msgstr "" #: archaeological_finds/forms.py:2203 archaeological_finds/forms.py:2208 #: archaeological_finds/ishtar_menu.py:64 #: archaeological_finds/models_finds.py:884 -#: archaeological_finds/models_finds.py:1706 +#: archaeological_finds/models_finds.py:1705 #: archaeological_finds/templates/ishtar/sheet_findbasket.html:4 #: archaeological_finds/views.py:1230 archaeological_finds/wizards.py:416 msgid "Basket" @@ -3306,24 +3307,24 @@ msgstr "" #: archaeological_finds/forms.py:1153 archaeological_finds/forms.py:1569 #: archaeological_finds/models_finds.py:1155 -#: archaeological_finds/models_finds.py:1898 +#: archaeological_finds/models_finds.py:1897 #: archaeological_warehouse/forms.py:577 msgid "Integrity / interest" msgstr "" #: archaeological_finds/forms.py:1180 archaeological_finds/forms.py:1576 #: archaeological_finds/models_finds.py:1153 -#: archaeological_finds/models_finds.py:1972 +#: archaeological_finds/models_finds.py:1971 msgid "Recommended treatments" msgstr "" #: archaeological_finds/forms.py:1188 archaeological_finds/models_finds.py:1171 -#: archaeological_finds/models_finds.py:1948 +#: archaeological_finds/models_finds.py:1947 msgid "Estimated value" msgstr "" #: archaeological_finds/forms.py:1194 archaeological_finds/forms.py:1572 -#: archaeological_finds/models_finds.py:1968 +#: archaeological_finds/models_finds.py:1967 msgid "Conservatory comment" msgstr "" @@ -3357,10 +3358,10 @@ msgstr "" #: archaeological_operations/forms.py:712 #: archaeological_operations/forms.py:1678 #: archaeological_operations/forms.py:1744 -#: archaeological_operations/models.py:943 -#: archaeological_operations/models.py:1030 -#: archaeological_operations/models.py:1329 ishtar_common/models.py:4851 -#: ishtar_common/models_imports.py:927 +#: archaeological_operations/models.py:953 +#: archaeological_operations/models.py:1040 +#: archaeological_operations/models.py:1340 ishtar_common/models.py:4851 +#: ishtar_common/models_imports.py:929 msgid "Operation type" msgstr "" @@ -3419,19 +3420,19 @@ msgid "Discovery date before" msgstr "" #: archaeological_finds/forms.py:1434 -msgid "Discovery date (exact or TPQ) after" +msgid "Discovery date (exact or beginning) after" msgstr "" #: archaeological_finds/forms.py:1437 -msgid "Discovery date (exact or TPQ) before" +msgid "Discovery date (exact or beginning) before" msgstr "" #: archaeological_finds/forms.py:1440 -msgid "Discovery date (TAQ) after" +msgid "Discovery date (end) after" msgstr "" #: archaeological_finds/forms.py:1443 -msgid "Discovery date (TAQ) before" +msgid "Discovery date (end) before" msgstr "" #: archaeological_finds/forms.py:1448 archaeological_finds/forms.py:1968 @@ -3445,7 +3446,7 @@ msgstr "" #: archaeological_finds/forms.py:1459 archaeological_finds/models_finds.py:263 #: archaeological_finds/models_finds.py:1152 #: archaeological_operations/templates/ishtar/sheet_operation.html:544 -#: archaeological_warehouse/forms.py:572 ishtar_common/models_imports.py:950 +#: archaeological_warehouse/forms.py:572 ishtar_common/models_imports.py:952 msgid "Object type" msgstr "" @@ -3582,7 +3583,7 @@ msgid "Treatment end date before" msgstr "" #: archaeological_finds/forms.py:1654 archaeological_finds/models_finds.py:1111 -#: archaeological_finds/models_finds.py:1872 +#: archaeological_finds/models_finds.py:1871 #: archaeological_finds/templates/ishtar/sheet_find.html:310 #: ishtar_common/forms_common.py:1679 msgid "Reference container" @@ -3648,8 +3649,8 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_find.html:470 #: ishtar_common/forms_common.py:1613 ishtar_common/models.py:977 #: ishtar_common/models.py:1731 ishtar_common/models.py:3411 -#: ishtar_common/models_common.py:171 ishtar_common/models_common.py:204 -#: ishtar_common/models_common.py:1933 ishtar_common/models_common.py:1949 +#: ishtar_common/models_common.py:172 ishtar_common/models_common.py:205 +#: ishtar_common/models_common.py:1968 ishtar_common/models_common.py:1984 #: ishtar_common/models_imports.py:567 msgid "Label" msgstr "" @@ -3686,7 +3687,7 @@ msgstr "" #: archaeological_finds/models_finds.py:174 #: archaeological_finds/models_treatments.py:208 #: archaeological_finds/models_treatments.py:751 -#: ishtar_common/models_imports.py:945 +#: ishtar_common/models_imports.py:947 msgid "Treatment type" msgstr "" @@ -3705,8 +3706,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:740 #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 -#: archaeological_operations/models.py:2406 -#: archaeological_operations/models.py:2743 ishtar_common/views.py:402 +#: archaeological_operations/models.py:2417 +#: archaeological_operations/models.py:2754 ishtar_common/views.py:402 msgid "Treatment" msgstr "" @@ -3803,8 +3804,8 @@ msgstr "" #: archaeological_finds/models_treatments.py:1174 #: archaeological_finds/models_treatments.py:1193 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 -#: archaeological_finds/wizards.py:553 archaeological_operations/models.py:2405 -#: archaeological_operations/models.py:2735 ishtar_common/views.py:401 +#: archaeological_finds/wizards.py:553 archaeological_operations/models.py:2416 +#: archaeological_operations/models.py:2746 ishtar_common/views.py:401 msgid "Treatment request" msgstr "" @@ -3819,16 +3820,16 @@ msgid "Would you like to delete this treatment?" msgstr "" #: archaeological_finds/forms_treatments.py:401 -#: archaeological_finds/models_finds.py:1864 -#: archaeological_finds/models_finds.py:3327 +#: archaeological_finds/models_finds.py:1863 +#: archaeological_finds/models_finds.py:3326 #: archaeological_finds/models_treatments.py:262 #: archaeological_finds/models_treatments.py:755 #: archaeological_finds/templates/ishtar/sheet_find.html:399 #: archaeological_finds/templates/ishtar/sheet_find.html:437 #: archaeological_finds/templates/ishtar/sheet_find.html:475 #: archaeological_warehouse/forms.py:323 archaeological_warehouse/models.py:796 -#: archaeological_warehouse/models.py:1157 -#: archaeological_warehouse/models.py:1984 +#: archaeological_warehouse/models.py:1158 +#: archaeological_warehouse/models.py:1985 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 #: ishtar_common/forms_common.py:2174 ishtar_common/forms_common.py:2359 #: ishtar_common/templates/ishtar/sheet_document.html:100 @@ -4020,7 +4021,7 @@ msgid "Treatment one to many - creation" msgstr "" #: archaeological_finds/models_finds.py:86 -#: archaeological_operations/models.py:2410 ishtar_common/models.py:3625 +#: archaeological_operations/models.py:2421 ishtar_common/models.py:3625 msgid "Code" msgstr "" @@ -4116,7 +4117,7 @@ msgstr "" msgid "Integrity / interest types" msgstr "" -#: archaeological_finds/models_finds.py:239 ishtar_common/models_imports.py:952 +#: archaeological_finds/models_finds.py:239 ishtar_common/models_imports.py:954 msgid "Remarkability type" msgstr "" @@ -4124,7 +4125,7 @@ msgstr "" msgid "Remarkability types" msgstr "" -#: archaeological_finds/models_finds.py:252 ishtar_common/models_imports.py:955 +#: archaeological_finds/models_finds.py:252 ishtar_common/models_imports.py:957 msgid "Batch type" msgstr "" @@ -4133,8 +4134,8 @@ msgid "Batch types" msgstr "" #: archaeological_finds/models_finds.py:277 -#: archaeological_finds/models_finds.py:1892 -#: ishtar_common/models_imports.py:958 +#: archaeological_finds/models_finds.py:1891 +#: ishtar_common/models_imports.py:960 msgid "Functional area" msgstr "" @@ -4146,7 +4147,7 @@ msgstr "" msgid "Object type quality types" msgstr "" -#: archaeological_finds/models_finds.py:304 ishtar_common/models_imports.py:953 +#: archaeological_finds/models_finds.py:304 ishtar_common/models_imports.py:955 msgid "Alteration type" msgstr "" @@ -4154,7 +4155,7 @@ msgstr "" msgid "Alteration types" msgstr "" -#: archaeological_finds/models_finds.py:318 ishtar_common/models_imports.py:954 +#: archaeological_finds/models_finds.py:318 ishtar_common/models_imports.py:956 msgid "Alteration cause type" msgstr "" @@ -4162,7 +4163,7 @@ msgstr "" msgid "Alteration cause types" msgstr "" -#: archaeological_finds/models_finds.py:332 ishtar_common/models_imports.py:948 +#: archaeological_finds/models_finds.py:332 ishtar_common/models_imports.py:950 msgid "Treatment emergency type" msgstr "" @@ -4178,7 +4179,7 @@ msgstr "" msgid "Communicability types" msgstr "" -#: archaeological_finds/models_finds.py:359 ishtar_common/models_imports.py:956 +#: archaeological_finds/models_finds.py:359 ishtar_common/models_imports.py:958 msgid "Checked type" msgstr "" @@ -4218,7 +4219,7 @@ msgid "Concatenation of associated material types codes" msgstr "" #: archaeological_finds/models_finds.py:477 -#: archaeological_finds/models_finds.py:1801 +#: archaeological_finds/models_finds.py:1800 msgid "Base find" msgstr "" @@ -4251,7 +4252,7 @@ msgid "Manage basket" msgstr "" #: archaeological_finds/models_finds.py:935 -#: archaeological_warehouse/models.py:1853 +#: archaeological_warehouse/models.py:1854 msgid "Add treatment" msgstr "" @@ -4284,11 +4285,11 @@ msgid "Base find - Special interest" msgstr "" #: archaeological_finds/models_finds.py:1108 -msgid "Base find - Discovery date (exact or TPQ)" +msgid "Base find - Discovery date (exact or beginning)" msgstr "" #: archaeological_finds/models_finds.py:1109 -msgid "Base find - Discovery date (TAQ)" +msgid "Base find - Discovery date (end)" msgstr "" #: archaeological_finds/models_finds.py:1170 @@ -4316,7 +4317,7 @@ msgid "denomination" msgstr "" #: archaeological_finds/models_finds.py:1260 -#: archaeological_warehouse/models.py:933 +#: archaeological_warehouse/models.py:934 msgctxt "key for text search" msgid "code-patriarche" msgstr "" @@ -4327,34 +4328,34 @@ msgid "operation-type" msgstr "" #: archaeological_finds/models_finds.py:1268 -#: archaeological_operations/models.py:380 -#: archaeological_operations/models.py:1094 +#: archaeological_operations/models.py:381 +#: archaeological_operations/models.py:1105 msgctxt "key for text search" msgid "area" msgstr "" #: archaeological_finds/models_finds.py:1277 -#: archaeological_warehouse/models.py:942 +#: archaeological_warehouse/models.py:943 msgctxt "key for text search" msgid "site-name" msgstr "" #: archaeological_finds/models_finds.py:1282 -#: archaeological_finds/models_finds.py:1739 -#: archaeological_warehouse/models.py:947 +#: archaeological_finds/models_finds.py:1738 +#: archaeological_warehouse/models.py:948 msgctxt "key for text search" msgid "context-record-site" msgstr "" #: archaeological_finds/models_finds.py:1287 -#: archaeological_warehouse/models.py:952 +#: archaeological_warehouse/models.py:953 msgctxt "key for text search" msgid "context-record-site-name" msgstr "" #: archaeological_finds/models_finds.py:1291 -#: archaeological_finds/models_finds.py:1734 -#: archaeological_warehouse/models.py:956 ishtar_common/models.py:3936 +#: archaeological_finds/models_finds.py:1733 +#: archaeological_warehouse/models.py:957 ishtar_common/models.py:3936 #: ishtar_common/models.py:4033 msgctxt "key for text search" msgid "context-record" @@ -4366,13 +4367,13 @@ msgid "context-record-relation-type" msgstr "" #: archaeological_finds/models_finds.py:1303 archaeological_finds/tests.py:1260 -#: archaeological_warehouse/models.py:968 +#: archaeological_warehouse/models.py:969 msgctxt "key for text search" msgid "material" msgstr "" #: archaeological_finds/models_finds.py:1307 -#: archaeological_warehouse/models.py:972 +#: archaeological_warehouse/models.py:973 msgctxt "key for text search" msgid "object-type" msgstr "" @@ -4383,19 +4384,19 @@ msgid "recommended-treatments" msgstr "" #: archaeological_finds/models_finds.py:1315 archaeological_finds/tests.py:1438 -#: archaeological_warehouse/models.py:980 +#: archaeological_warehouse/models.py:981 msgctxt "key for text search" msgid "conservatory" msgstr "" #: archaeological_finds/models_finds.py:1319 -#: archaeological_warehouse/models.py:984 +#: archaeological_warehouse/models.py:985 msgctxt "key for text search" msgid "integrity" msgstr "" #: archaeological_finds/models_finds.py:1323 -#: archaeological_warehouse/models.py:988 +#: archaeological_warehouse/models.py:989 msgctxt "key for text search" msgid "remarkability" msgstr "" @@ -4421,8 +4422,8 @@ msgid "container" msgstr "" #: archaeological_finds/models_finds.py:1342 -#: archaeological_finds/models_finds.py:1737 -#: archaeological_warehouse/models.py:902 +#: archaeological_finds/models_finds.py:1736 +#: archaeological_warehouse/models.py:903 msgctxt "key for text search" msgid "location" msgstr "" @@ -4449,7 +4450,7 @@ msgid "last-modified-by" msgstr "" #: archaeological_finds/models_finds.py:1365 -#: ishtar_common/models_common.py:1437 +#: ishtar_common/models_common.py:1472 msgctxt "key for text search" msgid "created-by" msgstr "" @@ -4720,19 +4721,19 @@ msgid "check-date-after" msgstr "" #: archaeological_finds/models_finds.py:1561 -#: archaeological_warehouse/models.py:992 +#: archaeological_warehouse/models.py:993 msgctxt "key for text search" msgid "alterations" msgstr "" #: archaeological_finds/models_finds.py:1565 -#: archaeological_warehouse/models.py:996 +#: archaeological_warehouse/models.py:997 msgctxt "key for text search" msgid "alteration-causes" msgstr "" #: archaeological_finds/models_finds.py:1569 -#: archaeological_warehouse/models.py:1000 +#: archaeological_warehouse/models.py:1001 msgctxt "key for text search" msgid "treatment-emergency" msgstr "" @@ -4768,7 +4769,7 @@ msgid "appraisal-date-after" msgstr "" #: archaeological_finds/models_finds.py:1597 -#: archaeological_operations/models.py:428 +#: archaeological_operations/models.py:429 msgctxt "key for text search" msgid "cultural-attribution" msgstr "" @@ -4784,21 +4785,21 @@ msgid "operation-address" msgstr "" #: archaeological_finds/models_finds.py:1613 -#: archaeological_operations/models.py:1122 +#: archaeological_operations/models.py:1133 msgctxt "key for text search" msgid "scientist" msgstr "" #: archaeological_finds/models_finds.py:1617 archaeological_finds/tests.py:1354 -#: archaeological_operations/models.py:1126 +#: archaeological_operations/models.py:1137 #: archaeological_operations/tests.py:2873 #: archaeological_operations/tests.py:3324 msgctxt "key for text search" msgid "operator" msgstr "" -#: archaeological_finds/models_finds.py:1713 -#: archaeological_finds/models_finds.py:2353 +#: archaeological_finds/models_finds.py:1712 +#: archaeological_finds/models_finds.py:2352 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 #: archaeological_finds/views.py:1274 archaeological_warehouse/forms.py:679 #: archaeological_warehouse/views.py:297 ishtar_common/models.py:4071 @@ -4808,111 +4809,111 @@ msgstr "" msgid "Packaging" msgstr "" -#: archaeological_finds/models_finds.py:1721 +#: archaeological_finds/models_finds.py:1720 msgid "Treatment many to one" msgstr "" -#: archaeological_finds/models_finds.py:1835 +#: archaeological_finds/models_finds.py:1834 msgid "Weight" msgstr "" -#: archaeological_finds/models_finds.py:1837 +#: archaeological_finds/models_finds.py:1836 msgid "Weight unit" msgstr "" -#: archaeological_finds/models_finds.py:1846 +#: archaeological_finds/models_finds.py:1845 #: archaeological_finds/templates/ishtar/sheet_find.html:427 msgid "Upstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:1853 +#: archaeological_finds/models_finds.py:1852 #: archaeological_finds/templates/ishtar/sheet_find.html:465 msgid "Downstream treatment" msgstr "" -#: archaeological_finds/models_finds.py:1924 +#: archaeological_finds/models_finds.py:1923 msgid "Clutter - long side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:1927 +#: archaeological_finds/models_finds.py:1926 msgid "Clutter - short side (cm)" msgstr "" -#: archaeological_finds/models_finds.py:1930 +#: archaeological_finds/models_finds.py:1929 msgid "Clutter - height (cm)" msgstr "" -#: archaeological_finds/models_finds.py:1951 +#: archaeological_finds/models_finds.py:1950 msgid "Collection" msgstr "" -#: archaeological_finds/models_finds.py:1956 +#: archaeological_finds/models_finds.py:1955 msgid "Do not use - need evolutions" msgstr "" -#: archaeological_finds/models_finds.py:2010 +#: archaeological_finds/models_finds.py:2009 #: archaeological_finds/models_treatments.py:289 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:71 msgid "Treatments" msgstr "" -#: archaeological_finds/models_finds.py:2013 +#: archaeological_finds/models_finds.py:2012 msgid "Related treatments when no new find is created" msgstr "" -#: archaeological_finds/models_finds.py:2029 +#: archaeological_finds/models_finds.py:2028 msgid "Cached object types label" msgstr "" -#: archaeological_finds/models_finds.py:2035 +#: archaeological_finds/models_finds.py:2034 msgid "Cached material types label" msgstr "" -#: archaeological_finds/models_finds.py:2067 +#: archaeological_finds/models_finds.py:2066 msgid "FIND" msgstr "" -#: archaeological_finds/models_finds.py:2205 +#: archaeological_finds/models_finds.py:2204 msgid "Material types string" msgstr "" -#: archaeological_finds/models_finds.py:2206 +#: archaeological_finds/models_finds.py:2205 msgid "Material types code string" msgstr "" -#: archaeological_finds/models_finds.py:2207 +#: archaeological_finds/models_finds.py:2206 msgid "Recommendations string from material" msgstr "" -#: archaeological_finds/models_finds.py:2208 +#: archaeological_finds/models_finds.py:2207 msgid "Complete ID of associated base finds" msgstr "" -#: archaeological_finds/models_finds.py:2209 +#: archaeological_finds/models_finds.py:2208 msgid "Label of associated context records" msgstr "" -#: archaeological_finds/models_finds.py:2326 +#: archaeological_finds/models_finds.py:2325 msgid "Add to basket" msgstr "" -#: archaeological_finds/models_finds.py:2334 +#: archaeological_finds/models_finds.py:2333 msgid "Simple treatment" msgstr "" -#: archaeological_finds/models_finds.py:2342 +#: archaeological_finds/models_finds.py:2341 msgid "Divide treatment" msgstr "" -#: archaeological_finds/models_finds.py:2907 +#: archaeological_finds/models_finds.py:2906 msgid "No reference container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:2913 +#: archaeological_finds/models_finds.py:2912 msgid "No container have been set - the localisation cannot be set." msgstr "" -#: archaeological_finds/models_finds.py:3350 ishtar_common/forms_common.py:118 +#: archaeological_finds/models_finds.py:3349 ishtar_common/forms_common.py:118 #: 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 @@ -4920,11 +4921,11 @@ msgstr "" msgid "Person" msgstr "" -#: archaeological_finds/models_finds.py:3358 +#: archaeological_finds/models_finds.py:3357 msgid "Property" msgstr "" -#: archaeological_finds/models_finds.py:3359 +#: archaeological_finds/models_finds.py:3358 msgid "Properties" msgstr "" @@ -4955,7 +4956,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:153 #: archaeological_finds/models_treatments.py:1050 -#: archaeological_operations/models.py:2545 +#: archaeological_operations/models.py:2556 msgctxt "key for text search" msgid "index" msgstr "" @@ -5106,10 +5107,6 @@ msgstr "" msgid "Discovery year" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_basefind.html:31 -msgid "Discovery date (TPQ)" -msgstr "" - #: archaeological_finds/templates/ishtar/sheet_basefind.html:61 #: ishtar_common/forms.py:931 msgid "Last modified by" @@ -5207,8 +5204,8 @@ msgid "Associated treatment files" 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 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:36 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:32 #: ishtar_common/forms_common.py:1857 #: ishtar_common/templates/ishtar/sheet_document.html:57 msgid "Content" @@ -5283,7 +5280,7 @@ msgstr "" msgid "Treatment informations:" msgstr "" -#: archaeological_finds/tests.py:944 archaeological_warehouse/models.py:1623 +#: archaeological_finds/tests.py:944 archaeological_warehouse/models.py:1624 msgid "The division {} {} do not exist for the location {}." msgstr "" @@ -5292,8 +5289,8 @@ msgstr "" #: ishtar_common/forms.py:1157 ishtar_common/forms.py:1236 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 #: ishtar_common/templatetags/window_field.py:19 -#: ishtar_common/views_item.py:589 ishtar_common/views_item.py:855 -#: ishtar_common/views_item.py:892 ishtar_common/wizards.py:501 +#: ishtar_common/views_item.py:589 ishtar_common/views_item.py:857 +#: ishtar_common/views_item.py:894 ishtar_common/wizards.py:501 msgid "Yes" msgstr "" @@ -5399,26 +5396,26 @@ msgstr "" #: archaeological_operations/forms.py:1059 #: archaeological_operations/forms.py:1075 #: archaeological_operations/forms.py:1081 -#: archaeological_operations/models.py:3033 +#: archaeological_operations/models.py:3044 #: archaeological_operations/templates/ishtar/sheet_operation.html:494 msgid "Parcels" msgstr "" #: archaeological_operations/forms.py:76 -#: archaeological_operations/models.py:3015 +#: archaeological_operations/models.py:3026 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Section" msgstr "" #: archaeological_operations/forms.py:79 -#: archaeological_operations/models.py:3017 +#: archaeological_operations/models.py:3028 msgid "Parcel number" msgstr "" #: archaeological_operations/forms.py:81 -#: archaeological_operations/models.py:3019 -#: archaeological_operations/models.py:3047 -#: archaeological_operations/models.py:3112 +#: archaeological_operations/models.py:3030 +#: archaeological_operations/models.py:3058 +#: archaeological_operations/models.py:3123 msgid "Public domain" msgstr "" @@ -5476,13 +5473,13 @@ msgstr "" #: archaeological_operations/forms.py:497 #: archaeological_operations/forms.py:711 -#: archaeological_operations/models.py:1465 +#: archaeological_operations/models.py:1476 msgid "DRASSM code" msgstr "" #: archaeological_operations/forms.py:505 #: archaeological_operations/forms.py:716 -#: archaeological_operations/models.py:1400 +#: archaeological_operations/models.py:1411 msgid "Address / Locality" msgstr "" @@ -5492,14 +5489,14 @@ msgstr "" #: archaeological_operations/forms.py:515 #: archaeological_operations/forms.py:767 -#: archaeological_operations/models.py:2686 +#: archaeological_operations/models.py:2697 msgid "Scientific monitor" msgstr "" #: archaeological_operations/forms.py:524 #: archaeological_operations/forms.py:756 #: archaeological_operations/forms.py:1682 -#: archaeological_operations/models.py:1299 +#: archaeological_operations/models.py:1310 msgid "Operator" msgstr "" @@ -5510,10 +5507,10 @@ msgstr "" #: archaeological_operations/forms.py:1846 #: archaeological_operations/models.py:306 #: archaeological_operations/models.py:315 -#: archaeological_operations/models.py:487 -#: archaeological_operations/models.py:947 -#: archaeological_operations/models.py:1033 -#: archaeological_operations/models.py:1334 +#: archaeological_operations/models.py:488 +#: archaeological_operations/models.py:957 +#: archaeological_operations/models.py:1043 +#: archaeological_operations/models.py:1345 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:9 msgid "Remains" msgstr "" @@ -5540,34 +5537,34 @@ msgstr "" #: archaeological_operations/forms.py:544 #: archaeological_operations/forms.py:817 -#: archaeological_operations/models.py:1403 +#: archaeological_operations/models.py:1414 msgid "Comment about scientific documentation" msgstr "" #: archaeological_operations/forms.py:545 #: archaeological_operations/forms.py:819 -#: archaeological_operations/models.py:949 -#: archaeological_operations/models.py:1446 +#: archaeological_operations/models.py:959 +#: archaeological_operations/models.py:1457 msgid "Record quality" msgstr "" #: archaeological_operations/forms.py:546 #: archaeological_operations/forms.py:785 -#: archaeological_operations/models.py:1355 +#: archaeological_operations/models.py:1366 msgid "Report processing" msgstr "" #: archaeological_operations/forms.py:548 #: archaeological_operations/forms.py:738 -#: archaeological_operations/models.py:1437 +#: archaeological_operations/models.py:1448 msgid "Virtual operation" msgstr "" #: archaeological_operations/forms.py:569 #: archaeological_operations/forms.py:808 #: archaeological_operations/forms.py:1690 -#: archaeological_operations/models.py:950 -#: archaeological_operations/models.py:1456 +#: archaeological_operations/models.py:960 +#: archaeological_operations/models.py:1467 msgid "Documentation received" msgstr "" @@ -5582,8 +5579,8 @@ msgstr "" #: archaeological_operations/forms.py:576 #: archaeological_operations/forms.py:813 #: archaeological_operations/forms.py:1694 -#: archaeological_operations/models.py:951 -#: archaeological_operations/models.py:1461 +#: archaeological_operations/models.py:961 +#: archaeological_operations/models.py:1472 msgid "Finds received" msgstr "" @@ -5605,12 +5602,12 @@ msgstr "" #: archaeological_operations/forms.py:714 #: archaeological_operations/forms.py:1742 -#: archaeological_operations/models.py:1399 +#: archaeological_operations/models.py:1410 msgid "Generic name" msgstr "" #: archaeological_operations/forms.py:730 -#: archaeological_operations/models.py:1360 +#: archaeological_operations/models.py:1371 msgid "Old code" msgstr "" @@ -5623,7 +5620,7 @@ msgid "Head scientist" msgstr "" #: archaeological_operations/forms.py:764 -#: archaeological_operations/models.py:1397 +#: archaeological_operations/models.py:1408 msgid "Operator reference" msgstr "" @@ -5631,8 +5628,8 @@ msgstr "" #: archaeological_operations/forms.py:1344 #: archaeological_operations/forms.py:1698 #: archaeological_operations/forms.py:1835 -#: archaeological_operations/models.py:505 -#: archaeological_operations/models.py:1313 +#: archaeological_operations/models.py:506 +#: archaeological_operations/models.py:1324 msgid "Collaborators" msgstr "" @@ -5641,17 +5638,17 @@ msgid "Dates / Administrative" msgstr "" #: archaeological_operations/forms.py:783 -#: archaeological_operations/models.py:1284 +#: archaeological_operations/models.py:1295 msgid "Report delivery date" msgstr "" #: archaeological_operations/forms.py:805 -#: archaeological_operations/models.py:1453 +#: archaeological_operations/models.py:1464 msgid "Deadline for submission of the documentation" msgstr "" #: archaeological_operations/forms.py:810 -#: archaeological_operations/models.py:1459 +#: archaeological_operations/models.py:1470 msgid "Deadline for submission of the finds" msgstr "" @@ -5660,12 +5657,12 @@ msgid "Scientific" msgstr "" #: archaeological_operations/forms.py:822 -#: archaeological_operations/models.py:93 ishtar_common/models_imports.py:930 +#: archaeological_operations/models.py:93 ishtar_common/models_imports.py:932 msgid "Remain type" msgstr "" #: archaeological_operations/forms.py:828 -#: archaeological_operations/models.py:1451 +#: archaeological_operations/models.py:1462 msgid "Abstract" msgstr "" @@ -5690,7 +5687,7 @@ msgid "Bad operation code" msgstr "" #: archaeological_operations/forms.py:927 -#: archaeological_operations/models.py:1899 +#: archaeological_operations/models.py:1910 msgid "Operation code" msgstr "" @@ -5704,12 +5701,12 @@ msgid "Operation - 015 - Court-ordered seizure" msgstr "" #: archaeological_operations/forms.py:972 -#: archaeological_operations/models.py:1468 +#: archaeological_operations/models.py:1479 msgid "Seizure name" msgstr "" #: archaeological_operations/forms.py:975 -#: archaeological_operations/models.py:1470 +#: archaeological_operations/models.py:1481 msgid "Official report number" msgstr "" @@ -5718,12 +5715,12 @@ msgid "Protagonist" msgstr "" #: archaeological_operations/forms.py:987 -#: archaeological_operations/models.py:1482 +#: archaeological_operations/models.py:1493 msgid "Applicant authority" msgstr "" #: archaeological_operations/forms.py:993 -#: archaeological_operations/models.py:1490 +#: archaeological_operations/models.py:1501 msgid "Writer of the minutes" msgstr "" @@ -5736,22 +5733,22 @@ msgid "Operation - 033 - Preventive - Excavation" msgstr "" #: archaeological_operations/forms.py:1002 -#: archaeological_operations/models.py:1339 +#: archaeological_operations/models.py:1350 msgid "Cost (euros)" msgstr "" #: archaeological_operations/forms.py:1003 -#: archaeological_operations/models.py:1343 +#: archaeological_operations/models.py:1354 msgid "Scheduled man-days" msgstr "" #: archaeological_operations/forms.py:1005 -#: archaeological_operations/models.py:1347 +#: archaeological_operations/models.py:1358 msgid "Optional man-days" msgstr "" #: archaeological_operations/forms.py:1007 -#: archaeological_operations/models.py:1351 +#: archaeological_operations/models.py:1362 msgid "Effective man-days" msgstr "" @@ -5764,17 +5761,17 @@ msgid "Operation - 037 - Preventive - Diagnostic" msgstr "" #: archaeological_operations/forms.py:1023 -#: archaeological_operations/models.py:1371 +#: archaeological_operations/models.py:1382 msgid "Prescription on zoning" msgstr "" #: archaeological_operations/forms.py:1025 -#: archaeological_operations/models.py:1375 +#: archaeological_operations/models.py:1386 msgid "Prescription on large area" msgstr "" #: archaeological_operations/forms.py:1028 -#: archaeological_operations/models.py:1378 +#: archaeological_operations/models.py:1389 msgid "Prescription on geoarchaeological context" msgstr "" @@ -5798,8 +5795,8 @@ msgstr "" #: archaeological_operations/forms.py:1213 #: archaeological_operations/forms.py:1329 #: archaeological_operations/forms.py:1794 -#: archaeological_operations/models.py:482 -#: archaeological_warehouse/models.py:1991 ishtar_common/forms_common.py:1782 +#: archaeological_operations/models.py:483 +#: archaeological_warehouse/models.py:1992 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 @@ -5836,55 +5833,55 @@ msgstr "" #: archaeological_operations/forms.py:1239 #: archaeological_operations/forms.py:1348 -#: archaeological_operations/models.py:497 +#: archaeological_operations/models.py:498 msgid "National Geographic Institute locality" msgstr "" #: archaeological_operations/forms.py:1242 #: archaeological_operations/forms.py:1352 -#: archaeological_operations/models.py:500 +#: archaeological_operations/models.py:501 msgid "Cadastral locality" msgstr "" #: archaeological_operations/forms.py:1246 #: archaeological_operations/forms.py:1396 -#: archaeological_operations/models.py:517 +#: archaeological_operations/models.py:518 msgid "AffMar number" msgstr "" #: archaeological_operations/forms.py:1248 #: archaeological_operations/forms.py:1398 -#: archaeological_operations/models.py:520 +#: archaeological_operations/models.py:521 msgid "DRASSM number" msgstr "" #: archaeological_operations/forms.py:1250 #: archaeological_operations/forms.py:1400 -#: archaeological_operations/models.py:509 +#: archaeological_operations/models.py:510 msgid "Shipwreck name" msgstr "" #: archaeological_operations/forms.py:1253 #: archaeological_operations/forms.py:1408 -#: archaeological_operations/models.py:511 +#: archaeological_operations/models.py:512 msgid "Oceanographic service localisation" msgstr "" #: archaeological_operations/forms.py:1256 #: archaeological_operations/forms.py:1402 -#: archaeological_operations/models.py:513 +#: archaeological_operations/models.py:514 msgid "Shipwreck code" msgstr "" #: archaeological_operations/forms.py:1258 #: archaeological_operations/forms.py:1404 -#: archaeological_operations/models.py:514 +#: archaeological_operations/models.py:515 msgid "Sinking date" msgstr "" #: archaeological_operations/forms.py:1260 #: archaeological_operations/forms.py:1406 -#: archaeological_operations/models.py:515 +#: archaeological_operations/models.py:516 msgid "Discovery area" msgstr "" @@ -5917,12 +5914,12 @@ msgid "You should select an administrative act." msgstr "" #: archaeological_operations/forms.py:1496 -#: archaeological_operations/models.py:2711 +#: archaeological_operations/models.py:2722 msgid "Signatory" msgstr "" #: archaeological_operations/forms.py:1503 -#: archaeological_operations/models.py:2746 +#: archaeological_operations/models.py:2757 msgid "Signature date" msgstr "" @@ -6018,7 +6015,7 @@ msgstr "" msgid "Types of record quality" msgstr "" -#: archaeological_operations/models.py:158 +#: archaeological_operations/models.py:158 ishtar_common/models_imports.py:928 msgid "Cultural attribution type" msgstr "" @@ -6026,542 +6023,542 @@ msgstr "" msgid "Cultural attribution types" msgstr "" -#: archaeological_operations/models.py:374 -#: archaeological_operations/models.py:1130 +#: archaeological_operations/models.py:375 +#: archaeological_operations/models.py:1141 #: archaeological_operations/tests.py:3074 msgctxt "key for text search" msgid "remain" msgstr "" -#: archaeological_operations/models.py:386 +#: archaeological_operations/models.py:387 msgctxt "key for text search" msgid "locality-ngi" msgstr "" -#: archaeological_operations/models.py:389 +#: archaeological_operations/models.py:390 msgctxt "key for text search" msgid "locality-cadastral" msgstr "" -#: archaeological_operations/models.py:393 +#: archaeological_operations/models.py:394 msgctxt "key for text search" msgid "shipwreck-name" msgstr "" -#: archaeological_operations/models.py:397 +#: archaeological_operations/models.py:398 msgctxt "key for text search" msgid "oceanographic-service-localisation" msgstr "" -#: archaeological_operations/models.py:401 +#: archaeological_operations/models.py:402 msgctxt "key for text search" msgid "shipwreck-code" msgstr "" -#: archaeological_operations/models.py:405 +#: archaeological_operations/models.py:406 msgctxt "key for text search" msgid "sinking-date" msgstr "" -#: archaeological_operations/models.py:408 +#: archaeological_operations/models.py:409 msgctxt "key for text search" msgid "discovery-area" msgstr "" -#: archaeological_operations/models.py:416 +#: archaeological_operations/models.py:417 msgctxt "key for text search" msgid "top-operation" msgstr "" -#: archaeological_operations/models.py:420 +#: archaeological_operations/models.py:421 msgctxt "key for text search" msgid "numero-drassm" msgstr "" -#: archaeological_operations/models.py:424 +#: archaeological_operations/models.py:425 msgctxt "key for text search" msgid "numero-affmar" msgstr "" -#: archaeological_operations/models.py:542 -#: archaeological_operations/models.py:1497 +#: archaeological_operations/models.py:543 +#: archaeological_operations/models.py:1508 msgid "Cached town label" msgstr "" -#: archaeological_operations/models.py:554 -#: archaeological_operations/models.py:1509 +#: archaeological_operations/models.py:555 +#: archaeological_operations/models.py:1520 msgid "Cached remains label" msgstr "" -#: archaeological_operations/models.py:564 -#: archaeological_operations/models.py:1426 +#: archaeological_operations/models.py:565 +#: archaeological_operations/models.py:1437 #: archaeological_operations/templates/ishtar/sheet_operation.html:325 msgid "Archaeological sites" msgstr "" -#: archaeological_operations/models.py:580 +#: archaeological_operations/models.py:581 msgid "SITE" msgstr "" -#: archaeological_operations/models.py:771 ishtar_common/forms.py:1156 +#: archaeological_operations/models.py:772 ishtar_common/forms.py:1156 #: ishtar_common/models.py:4977 ishtar_common/models.py:5134 -#: ishtar_common/models.py:5193 ishtar_common/views_item.py:1524 +#: ishtar_common/models.py:5193 ishtar_common/views_item.py:1532 msgid "Unknown" msgstr "" -#: archaeological_operations/models.py:773 +#: archaeological_operations/models.py:774 msgid "Virtual operation of site: {}" msgstr "" -#: archaeological_operations/models.py:1012 +#: archaeological_operations/models.py:1022 msgid "Associated file (label)" msgstr "" -#: archaeological_operations/models.py:1013 +#: archaeological_operations/models.py:1023 msgid "Operator name" msgstr "" -#: archaeological_operations/models.py:1014 +#: archaeological_operations/models.py:1024 msgid "Associated file (external ID)" msgstr "" -#: archaeological_operations/models.py:1015 +#: archaeological_operations/models.py:1025 msgid "Scientist (title)" msgstr "" -#: archaeological_operations/models.py:1016 +#: archaeological_operations/models.py:1026 msgid "Scientist (surname)" msgstr "" -#: archaeological_operations/models.py:1017 +#: archaeological_operations/models.py:1027 msgid "Scientist (name)" msgstr "" -#: archaeological_operations/models.py:1018 +#: archaeological_operations/models.py:1028 msgid "Scientist (full name)" msgstr "" -#: archaeological_operations/models.py:1019 +#: archaeological_operations/models.py:1029 msgid "Scientist - Organization (name)" msgstr "" -#: archaeological_operations/models.py:1020 +#: archaeological_operations/models.py:1030 msgid "Scientific monitor (title)" msgstr "" -#: archaeological_operations/models.py:1021 +#: archaeological_operations/models.py:1031 msgid "Scientific monitor (surname)" msgstr "" -#: archaeological_operations/models.py:1022 +#: archaeological_operations/models.py:1032 msgid "Scientific monitor (name)" msgstr "" -#: archaeological_operations/models.py:1023 +#: archaeological_operations/models.py:1033 msgid "Scientific monitor - Organization (name)" msgstr "" -#: archaeological_operations/models.py:1028 +#: archaeological_operations/models.py:1038 msgid "Archaeological sites (reference)" msgstr "" -#: archaeological_operations/models.py:1108 +#: archaeological_operations/models.py:1119 msgctxt "key for text search" msgid "address" msgstr "" -#: archaeological_operations/models.py:1115 +#: archaeological_operations/models.py:1126 #: archaeological_operations/tests.py:3081 msgctxt "key for text search" msgid "is-open" msgstr "" -#: archaeological_operations/models.py:1118 +#: archaeological_operations/models.py:1129 msgctxt "key for text search" msgid "scientific-monitor" msgstr "" -#: archaeological_operations/models.py:1136 +#: archaeological_operations/models.py:1147 msgctxt "key for text search" msgid "start-before" msgstr "" -#: archaeological_operations/models.py:1139 +#: archaeological_operations/models.py:1150 msgctxt "key for text search" msgid "start-after" msgstr "" -#: archaeological_operations/models.py:1142 +#: archaeological_operations/models.py:1153 msgctxt "key for text search" msgid "end-before" msgstr "" -#: archaeological_operations/models.py:1146 +#: archaeological_operations/models.py:1157 msgctxt "key for text search" msgid "end-after" msgstr "" -#: archaeological_operations/models.py:1150 +#: archaeological_operations/models.py:1161 #: archaeological_operations/tests.py:3124 msgctxt "key for text search" msgid "relation-types" msgstr "" -#: archaeological_operations/models.py:1156 +#: archaeological_operations/models.py:1167 msgctxt "key for text search" msgid "abstract" msgstr "" -#: archaeological_operations/models.py:1159 +#: archaeological_operations/models.py:1170 msgctxt "key for text search" msgid "scientific-documentation-comment" msgstr "" -#: archaeological_operations/models.py:1163 +#: archaeological_operations/models.py:1174 msgctxt "key for text search" msgid "record-quality" msgstr "" -#: archaeological_operations/models.py:1167 +#: archaeological_operations/models.py:1178 msgctxt "key for text search" msgid "report-processing" msgstr "" -#: archaeological_operations/models.py:1171 +#: archaeological_operations/models.py:1182 msgctxt "key for text search" msgid "virtual-operation" msgstr "" -#: archaeological_operations/models.py:1179 +#: archaeological_operations/models.py:1190 msgctxt "key for text search" msgid "documentation-received" msgstr "" -#: archaeological_operations/models.py:1183 +#: archaeological_operations/models.py:1194 msgctxt "key for text search" msgid "documentation-deadline-before" msgstr "" -#: archaeological_operations/models.py:1187 +#: archaeological_operations/models.py:1198 msgctxt "key for text search" msgid "documentation-deadline-after" msgstr "" -#: archaeological_operations/models.py:1191 +#: archaeological_operations/models.py:1202 msgctxt "key for text search" msgid "finds-received" msgstr "" -#: archaeological_operations/models.py:1198 +#: archaeological_operations/models.py:1209 msgctxt "key for text search" msgid "finds-deadline-before" msgstr "" -#: archaeological_operations/models.py:1202 +#: archaeological_operations/models.py:1213 msgctxt "key for text search" msgid "finds-deadline-after" msgstr "" -#: archaeological_operations/models.py:1206 +#: archaeological_operations/models.py:1217 msgctxt "key for text search" msgid "code-drassm" msgstr "" -#: archaeological_operations/models.py:1241 ishtar_common/models.py:3952 +#: archaeological_operations/models.py:1252 ishtar_common/models.py:3952 #: ishtar_common/models.py:4036 msgctxt "key for text search" msgid "file" msgstr "" -#: archaeological_operations/models.py:1290 +#: archaeological_operations/models.py:1301 msgid "Scientific manager" msgstr "" -#: archaeological_operations/models.py:1306 +#: archaeological_operations/models.py:1317 msgid "Operation monitor" msgstr "" -#: archaeological_operations/models.py:1432 +#: archaeological_operations/models.py:1443 msgid "Sites for which this operation is top operation" msgstr "" -#: archaeological_operations/models.py:1440 +#: archaeological_operations/models.py:1451 msgid "" "If checked, it means that this operation have not been officialy registered." msgstr "" -#: archaeological_operations/models.py:1474 +#: archaeological_operations/models.py:1485 msgid "Name of the protagonist" msgstr "" -#: archaeological_operations/models.py:1519 +#: archaeological_operations/models.py:1530 #: archaeological_operations/templates/ishtar/sheet_site.html:87 #: ishtar_common/models.py:1005 msgid "Operations" msgstr "" -#: archaeological_operations/models.py:1559 +#: archaeological_operations/models.py:1570 msgid "List of associated context records" msgstr "" -#: archaeological_operations/models.py:1560 +#: archaeological_operations/models.py:1571 msgid "List of associated containers" msgstr "" -#: archaeological_operations/models.py:1633 +#: archaeological_operations/models.py:1644 msgid "OPE" msgstr "" -#: archaeological_operations/models.py:1742 +#: archaeological_operations/models.py:1753 msgid "Intercommunal" msgstr "" -#: archaeological_operations/models.py:1865 +#: archaeological_operations/models.py:1876 msgid "context record" msgstr "" -#: archaeological_operations/models.py:1884 +#: archaeological_operations/models.py:1895 msgid "Code patriarche" msgstr "" -#: archaeological_operations/models.py:1932 +#: archaeological_operations/models.py:1943 msgid "This operation code already exists for this year" msgstr "" -#: archaeological_operations/models.py:1993 +#: archaeological_operations/models.py:2004 msgid "Number of parcels" msgstr "" -#: archaeological_operations/models.py:2003 +#: archaeological_operations/models.py:2014 msgid "Number of administrative acts" msgstr "" -#: archaeological_operations/models.py:2011 +#: archaeological_operations/models.py:2022 msgid "Number of indexed administrative acts" msgstr "" -#: archaeological_operations/models.py:2019 +#: archaeological_operations/models.py:2030 msgid "Number of context records" msgstr "" -#: archaeological_operations/models.py:2073 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:103 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:85 +#: archaeological_operations/models.py:2084 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:117 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:99 msgid "Number of finds" msgstr "" -#: archaeological_operations/models.py:2135 -#: archaeological_operations/models.py:2214 +#: archaeological_operations/models.py:2146 +#: archaeological_operations/models.py:2225 msgid "No type" msgstr "" -#: archaeological_operations/models.py:2179 +#: archaeological_operations/models.py:2190 msgid "Number of sources" msgstr "" -#: archaeological_operations/models.py:2224 +#: archaeological_operations/models.py:2235 msgid "Mean" msgstr "" -#: archaeological_operations/models.py:2316 ishtar_common/models_imports.py:931 +#: archaeological_operations/models.py:2327 ishtar_common/models_imports.py:933 msgid "Operation relation type" msgstr "" -#: archaeological_operations/models.py:2317 +#: archaeological_operations/models.py:2328 msgid "Operation relation types" msgstr "" -#: archaeological_operations/models.py:2342 +#: archaeological_operations/models.py:2353 msgid "Operation record relation" msgstr "" -#: archaeological_operations/models.py:2343 +#: archaeological_operations/models.py:2354 msgid "Operation record relations" msgstr "" -#: archaeological_operations/models.py:2409 +#: archaeological_operations/models.py:2420 msgid "Intended to" msgstr "" -#: archaeological_operations/models.py:2414 +#: archaeological_operations/models.py:2425 msgid "Associated template" msgstr "" -#: archaeological_operations/models.py:2417 +#: archaeological_operations/models.py:2428 msgid "Indexed" msgstr "" -#: archaeological_operations/models.py:2421 +#: archaeological_operations/models.py:2432 msgid "Act types" msgstr "" -#: archaeological_operations/models.py:2547 +#: archaeological_operations/models.py:2558 msgctxt "key for text search" msgid "other-ref" msgstr "" -#: archaeological_operations/models.py:2557 +#: archaeological_operations/models.py:2568 msgctxt "key for text search" msgid "indexed" msgstr "" -#: archaeological_operations/models.py:2560 -#: archaeological_warehouse/models.py:923 +#: archaeological_operations/models.py:2571 +#: archaeological_warehouse/models.py:924 msgctxt "key for text search" msgid "operation-town" msgstr "" -#: archaeological_operations/models.py:2564 +#: archaeological_operations/models.py:2575 msgctxt "key for text search" msgid "file-town" msgstr "" -#: archaeological_operations/models.py:2576 +#: archaeological_operations/models.py:2587 msgctxt "key for text search" msgid "operation-department" msgstr "" -#: archaeological_operations/models.py:2580 +#: archaeological_operations/models.py:2591 msgctxt "key for text search" msgid "file-department" msgstr "" -#: archaeological_operations/models.py:2584 +#: archaeological_operations/models.py:2595 msgctxt "key for text search" msgid "object" msgstr "" -#: archaeological_operations/models.py:2587 +#: archaeological_operations/models.py:2598 msgctxt "key for text search" msgid "signature-before" msgstr "" -#: archaeological_operations/models.py:2591 +#: archaeological_operations/models.py:2602 msgctxt "key for text search" msgid "signature-after" msgstr "" -#: archaeological_operations/models.py:2595 +#: archaeological_operations/models.py:2606 msgctxt "key for text search" msgid "file-name" msgstr "" -#: archaeological_operations/models.py:2607 +#: archaeological_operations/models.py:2618 msgctxt "key for text search" msgid "file-reference" msgstr "" -#: archaeological_operations/models.py:2611 +#: archaeological_operations/models.py:2622 msgctxt "key for text search" msgid "file-year" msgstr "" -#: archaeological_operations/models.py:2614 +#: archaeological_operations/models.py:2625 msgctxt "key for text search" msgid "file-other-reference" msgstr "" -#: archaeological_operations/models.py:2618 +#: archaeological_operations/models.py:2629 msgctxt "key for text search" msgid "file-in-charge" msgstr "" -#: archaeological_operations/models.py:2622 +#: archaeological_operations/models.py:2633 msgctxt "key for text search" msgid "file-permit-reference" msgstr "" -#: archaeological_operations/models.py:2626 +#: archaeological_operations/models.py:2637 msgctxt "key for text search" msgid "treatment-name" msgstr "" -#: archaeological_operations/models.py:2630 +#: archaeological_operations/models.py:2641 msgctxt "key for text search" msgid "treatment-reference" msgstr "" -#: archaeological_operations/models.py:2634 +#: archaeological_operations/models.py:2645 msgctxt "key for text search" msgid "treatment-year" msgstr "" -#: archaeological_operations/models.py:2637 +#: archaeological_operations/models.py:2648 msgctxt "key for text search" msgid "treatment-index" msgstr "" -#: archaeological_operations/models.py:2640 +#: archaeological_operations/models.py:2651 msgctxt "key for text search" msgid "treatment-type" msgstr "" -#: archaeological_operations/models.py:2644 +#: archaeological_operations/models.py:2655 msgctxt "key for text search" msgid "treatment-file-name" msgstr "" -#: archaeological_operations/models.py:2648 +#: archaeological_operations/models.py:2659 msgctxt "key for text search" msgid "treatment-file-reference" msgstr "" -#: archaeological_operations/models.py:2652 +#: archaeological_operations/models.py:2663 msgctxt "key for text search" msgid "treatment-file-year" msgstr "" -#: archaeological_operations/models.py:2656 +#: archaeological_operations/models.py:2667 msgctxt "key for text search" msgid "treatment-file-index" msgstr "" -#: archaeological_operations/models.py:2660 +#: archaeological_operations/models.py:2671 msgctxt "key for text search" msgid "treatment-file-type" msgstr "" -#: archaeological_operations/models.py:2694 +#: archaeological_operations/models.py:2705 msgid "Archaeological preventive operator" msgstr "" -#: archaeological_operations/models.py:2756 +#: archaeological_operations/models.py:2767 msgid "Cached values get from associated departments" msgstr "" -#: archaeological_operations/models.py:2762 +#: archaeological_operations/models.py:2773 msgid "Cached values get from associated towns" msgstr "" -#: archaeological_operations/models.py:2936 +#: archaeological_operations/models.py:2947 msgid "This index already exists for this year" msgstr "" -#: archaeological_operations/models.py:3026 +#: archaeological_operations/models.py:3037 msgid "Address - Locality" msgstr "" -#: archaeological_operations/models.py:3298 ishtar_common/models.py:3421 +#: archaeological_operations/models.py:3309 ishtar_common/models.py:3421 msgid "Owner" msgstr "" -#: archaeological_operations/models.py:3313 +#: archaeological_operations/models.py:3324 msgid "Parcel owner" msgstr "" -#: archaeological_operations/models.py:3314 +#: archaeological_operations/models.py:3325 msgid "Parcel owners" msgstr "" -#: archaeological_operations/models.py:3336 ishtar_common/models.py:4847 +#: archaeological_operations/models.py:3347 ishtar_common/models.py:4847 msgid "Is preventive" msgstr "" -#: archaeological_operations/models.py:3339 +#: archaeological_operations/models.py:3350 msgid "Operation type old" msgstr "" -#: archaeological_operations/models.py:3340 +#: archaeological_operations/models.py:3351 msgid "Operation types old" msgstr "" @@ -6595,10 +6592,10 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:117 #: archaeological_operations/templates/ishtar/sheet_operation.html:468 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:38 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:194 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:34 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:149 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:43 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:206 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:39 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:165 #: ishtar_common/templates/blocks/DataTables-tabs.html:30 msgid "Statistics" msgstr "" @@ -6637,8 +6634,8 @@ msgid "Associated containers" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:473 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:199 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:154 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:211 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:170 #: ishtar_common/models_rest.py:74 #: ishtar_common/templates/blocks/DataTables-content.html:28 #: ishtar_common/templates/blocks/DataTables-content.html:101 @@ -6650,14 +6647,14 @@ msgid "Export" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:478 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:204 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:159 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:216 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:175 msgid "Regenerate statistics" msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:483 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:209 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:164 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:221 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:180 msgid "Last update:" msgstr "" @@ -6797,7 +6794,7 @@ msgstr "" #: archaeological_warehouse/forms.py:502 archaeological_warehouse/forms.py:723 #: archaeological_warehouse/ishtar_menu.py:34 #: archaeological_warehouse/models.py:400 -#: archaeological_warehouse/models.py:889 +#: archaeological_warehouse/models.py:890 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:4 #: ishtar_common/forms_common.py:1862 ishtar_common/models.py:5070 #: ishtar_common/views.py:397 @@ -6821,8 +6818,8 @@ msgid "Order fields must be different." msgstr "" #: archaeological_warehouse/forms.py:129 archaeological_warehouse/models.py:370 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:167 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:117 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:179 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:133 msgid "Divisions" msgstr "" @@ -6836,7 +6833,7 @@ msgstr "" #: archaeological_warehouse/forms.py:144 archaeological_warehouse/forms.py:204 #: archaeological_warehouse/forms.py:313 archaeological_warehouse/models.py:260 -#: archaeological_warehouse/models.py:349 ishtar_common/models_imports.py:944 +#: archaeological_warehouse/models.py:349 ishtar_common/models_imports.py:946 msgid "Warehouse type" msgstr "" @@ -6862,31 +6859,31 @@ msgid "" msgstr "" #: archaeological_warehouse/forms.py:239 ishtar_common/forms_common.py:538 -#: ishtar_common/forms_common.py:921 ishtar_common/models_common.py:3061 -#: ishtar_common/models_common.py:3219 +#: ishtar_common/forms_common.py:921 ishtar_common/models_common.py:3142 +#: ishtar_common/models_common.py:3300 msgid "Address complement" msgstr "" #: archaeological_warehouse/forms.py:242 ishtar_common/forms_common.py:541 -#: ishtar_common/forms_common.py:924 ishtar_common/models_common.py:3066 +#: ishtar_common/forms_common.py:924 ishtar_common/models_common.py:3147 msgid "Town (freeform)" msgstr "" #: archaeological_warehouse/forms.py:244 ishtar_common/forms_common.py:543 -#: ishtar_common/forms_common.py:926 ishtar_common/models_common.py:3074 +#: ishtar_common/forms_common.py:926 ishtar_common/models_common.py:3155 msgid "Country" msgstr "" #: archaeological_warehouse/forms.py:245 ishtar_common/forms_common.py:545 -#: ishtar_common/forms_common.py:897 ishtar_common/models_common.py:3088 -#: ishtar_common/models_common.py:3231 +#: ishtar_common/forms_common.py:897 ishtar_common/models_common.py:3169 +#: ishtar_common/models_common.py:3312 #: 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:547 -#: ishtar_common/forms_common.py:907 ishtar_common/models_common.py:3104 +#: ishtar_common/forms_common.py:907 ishtar_common/models_common.py:3185 #: ishtar_common/templates/ishtar/sheet_person.html:45 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:55 msgid "Mobile phone" @@ -6909,16 +6906,16 @@ msgid "Container - 010 - General" msgstr "" #: archaeological_warehouse/forms.py:335 archaeological_warehouse/forms.py:506 -#: archaeological_warehouse/models.py:1132 +#: archaeological_warehouse/models.py:1133 msgid "Old reference" msgstr "" #: archaeological_warehouse/forms.py:337 archaeological_warehouse/forms.py:504 #: archaeological_warehouse/forms.py:728 archaeological_warehouse/models.py:698 -#: archaeological_warehouse/models.py:859 -#: archaeological_warehouse/models.py:1098 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:138 -#: ishtar_common/models_imports.py:942 +#: archaeological_warehouse/models.py:860 +#: archaeological_warehouse/models.py:1099 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:152 +#: ishtar_common/models_imports.py:944 msgid "Container type" msgstr "" @@ -6927,12 +6924,12 @@ msgid "Current location (warehouse)" msgstr "" #: archaeological_warehouse/forms.py:348 archaeological_warehouse/forms.py:513 -#: archaeological_warehouse/models.py:1115 +#: archaeological_warehouse/models.py:1116 msgid "Parent container" msgstr "" #: archaeological_warehouse/forms.py:358 archaeological_warehouse/forms.py:739 -#: archaeological_warehouse/models.py:1089 +#: archaeological_warehouse/models.py:1090 msgid "Responsibility" msgstr "" @@ -6941,7 +6938,7 @@ msgid "Automatically attached to the current warehouse if not filled." msgstr "" #: archaeological_warehouse/forms.py:371 -#: archaeological_warehouse/models.py:1122 +#: archaeological_warehouse/models.py:1123 msgid "Measured weight (g)" msgstr "" @@ -7047,10 +7044,10 @@ msgid "" msgstr "" #: archaeological_warehouse/ishtar_menu.py:70 -#: archaeological_warehouse/models.py:1158 -#: archaeological_warehouse/templates/ishtar/sheet_container.html:169 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:119 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:201 +#: archaeological_warehouse/models.py:1159 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:181 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:135 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:217 msgid "Containers" msgstr "" @@ -7090,7 +7087,7 @@ msgid "Warehouses" msgstr "" #: archaeological_warehouse/models.py:495 -#: archaeological_warehouse/models.py:1582 +#: archaeological_warehouse/models.py:1583 msgid "No value" msgstr "" @@ -7141,7 +7138,7 @@ msgid "Container types" msgstr "" #: archaeological_warehouse/models.py:722 -#: archaeological_warehouse/models.py:1084 +#: archaeological_warehouse/models.py:1085 msgid "Deprecated - do not use" msgstr "" @@ -7149,253 +7146,257 @@ msgstr "" msgid "Container parent" msgstr "" -#: archaeological_warehouse/models.py:853 -#: archaeological_warehouse/models.py:1074 +#: archaeological_warehouse/models.py:854 +#: archaeological_warehouse/models.py:1075 msgid "Location (warehouse)" msgstr "" -#: archaeological_warehouse/models.py:854 +#: archaeological_warehouse/models.py:855 msgid "Responsibility (warehouse)" msgstr "" -#: archaeological_warehouse/models.py:886 +#: archaeological_warehouse/models.py:887 msgid "Location - index" msgstr "" -#: archaeological_warehouse/models.py:887 +#: archaeological_warehouse/models.py:888 msgid "Precise localisation" msgstr "" -#: archaeological_warehouse/models.py:905 +#: archaeological_warehouse/models.py:906 msgctxt "key for text search" msgid "responsibility" msgstr "" -#: archaeological_warehouse/models.py:916 +#: archaeological_warehouse/models.py:917 msgctxt "key for text search" msgid "old-reference" msgstr "" -#: archaeological_warehouse/models.py:928 +#: archaeological_warehouse/models.py:929 msgctxt "key for text search" msgid "operation-scientist" msgstr "" -#: archaeological_warehouse/models.py:960 +#: archaeological_warehouse/models.py:961 msgctxt "key for text search" msgid "find-label" msgstr "" -#: archaeological_warehouse/models.py:964 ishtar_common/models.py:3948 +#: archaeological_warehouse/models.py:965 ishtar_common/models.py:3948 msgctxt "key for text search" msgid "find-denomination" msgstr "" -#: archaeological_warehouse/models.py:976 +#: archaeological_warehouse/models.py:977 msgctxt "key for text search" msgid "preservation" msgstr "" -#: archaeological_warehouse/models.py:1004 +#: archaeological_warehouse/models.py:1005 msgctxt "key for text search" msgid "find-description" msgstr "" -#: archaeological_warehouse/models.py:1007 +#: archaeological_warehouse/models.py:1008 msgctxt "key for text search" msgid "empty" msgstr "" -#: archaeological_warehouse/models.py:1010 +#: archaeological_warehouse/models.py:1011 msgctxt "key for text search" msgid "parent-container" msgstr "" -#: archaeological_warehouse/models.py:1014 +#: archaeological_warehouse/models.py:1015 msgctxt "key for text search" msgid "contain-containers" msgstr "" -#: archaeological_warehouse/models.py:1018 +#: archaeological_warehouse/models.py:1019 msgctxt "key for text search" msgid "is-stationary" msgstr "" -#: archaeological_warehouse/models.py:1036 +#: archaeological_warehouse/models.py:1037 msgid "Division -" msgstr "" -#: archaeological_warehouse/models.py:1040 +#: archaeological_warehouse/models.py:1041 msgctxt "key for text search" msgid "division" msgstr "" -#: archaeological_warehouse/models.py:1080 +#: archaeological_warehouse/models.py:1081 msgid "Responsible warehouse" msgstr "" -#: archaeological_warehouse/models.py:1093 +#: archaeological_warehouse/models.py:1094 msgid "Warehouse that owns the container" msgstr "" -#: archaeological_warehouse/models.py:1102 +#: archaeological_warehouse/models.py:1103 msgid "Container ref." msgstr "" -#: archaeological_warehouse/models.py:1108 +#: archaeological_warehouse/models.py:1106 ishtar_common/models_common.py:2908 +msgid "Localisation" +msgstr "" + +#: archaeological_warehouse/models.py:1109 msgid "Cached location" msgstr "" -#: archaeological_warehouse/models.py:1111 +#: archaeological_warehouse/models.py:1112 msgid "Cached division" msgstr "" -#: archaeological_warehouse/models.py:1121 ishtar_common/models.py:4183 +#: archaeological_warehouse/models.py:1122 ishtar_common/models.py:4183 #: ishtar_common/models.py:4187 msgid "Container ID" msgstr "" -#: archaeological_warehouse/models.py:1124 +#: archaeological_warehouse/models.py:1125 msgid "Calculated weight (g)" msgstr "" -#: archaeological_warehouse/models.py:1127 +#: archaeological_warehouse/models.py:1128 msgid "Cached weight (g)" msgstr "" -#: archaeological_warehouse/models.py:1130 +#: archaeological_warehouse/models.py:1131 msgid "Entered weight if available otherwise calculated weight." msgstr "" -#: archaeological_warehouse/models.py:1354 +#: archaeological_warehouse/models.py:1355 msgid "Document with {}: {} does not exists" msgstr "" -#: archaeological_warehouse/models.py:1358 +#: archaeological_warehouse/models.py:1359 msgid "Multiple document with {}: {}" msgstr "" -#: archaeological_warehouse/models.py:1749 +#: archaeological_warehouse/models.py:1750 msgid "" "Associated operation - use it with caution, only return the first found " "operation" msgstr "" -#: archaeological_warehouse/models.py:1756 +#: archaeological_warehouse/models.py:1757 msgid "" "Associated context record - use it with caution, only return the first found " "context_record" msgstr "" -#: archaeological_warehouse/models.py:1760 +#: archaeological_warehouse/models.py:1761 msgid "Material types inside the container - string" msgstr "" -#: archaeological_warehouse/models.py:1761 +#: archaeological_warehouse/models.py:1762 msgid "Material types code - string" msgstr "" -#: archaeological_warehouse/models.py:1762 +#: archaeological_warehouse/models.py:1763 msgid "List of associated finds" msgstr "" -#: archaeological_warehouse/models.py:1989 +#: archaeological_warehouse/models.py:1990 msgid "Division" msgstr "" -#: archaeological_warehouse/models.py:1996 +#: archaeological_warehouse/models.py:1997 msgid "Container localisation" msgstr "" -#: archaeological_warehouse/models.py:1997 +#: archaeological_warehouse/models.py:1998 msgid "Container localisations" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:95 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:77 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:109 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:91 msgid "Number of containers" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:99 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:81 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:113 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:95 msgid "Number of divisions" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:107 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:89 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:121 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:103 msgid "Number of owned finds" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:115 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:129 msgid "Measured weight (kg)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:116 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:130 msgid "Calculated weight (kg)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:120 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:134 #, python-format msgid "Calculated weight and measured weight are too different (over 10%%)." msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:186 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:198 msgid "Empty" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:217 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:229 msgid "No container/division inside this container." msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:223 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:235 msgid "Finds by location" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:247 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:259 msgid "Containers by location" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_container.html:275 +#: archaeological_warehouse/templates/ishtar/sheet_container.html:287 msgid "Document for this container" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:94 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:108 msgid "Default divisions (imports)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:124 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:140 msgid "No container inside this warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:128 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:144 msgid "Finds (hosted)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:133 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:149 msgid "No find inside this warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:137 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:153 msgid "Finds (owned)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:142 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:158 msgid "No find owned by this warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:172 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:188 msgid "No container/division inside this container" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:178 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:194 msgid "Finds by location in the warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:203 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:219 msgid "Containers by location in the warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:231 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:247 msgid "Document for this warehouse" msgstr "" @@ -7705,7 +7706,7 @@ msgstr "" msgid "Center" msgstr "" -#: ishtar_common/admin.py:1119 ishtar_common/models_common.py:2829 +#: ishtar_common/admin.py:1119 ishtar_common/models_common.py:2910 msgid "Limit" msgstr "" @@ -7821,7 +7822,7 @@ msgstr "" msgid "Import already imported/scheduled." msgstr "" -#: ishtar_common/admin.py:2196 ishtar_common/models_imports.py:1397 +#: ishtar_common/admin.py:2196 ishtar_common/models_imports.py:1399 msgid "Launch import" msgstr "" @@ -7912,7 +7913,7 @@ msgid "API - Remote access - Search model" msgstr "" #: ishtar_common/admin.py:2584 ishtar_common/models.py:450 -#: ishtar_common/models.py:733 ishtar_common/models_common.py:808 +#: ishtar_common/models.py:733 ishtar_common/models_common.py:809 #: ishtar_common/models_imports.py:836 ishtar_common/models_rest.py:106 #: ishtar_common/templates/ishtar/formset_import_match.html:44 #: ishtar_common/templates/ishtar/import_step_by_step.html:171 @@ -8340,8 +8341,8 @@ msgstr "" #: 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:3106 -#: ishtar_common/models_common.py:3241 ishtar_common/wizards.py:1951 +#: ishtar_common/forms_common.py:1151 ishtar_common/models_common.py:3187 +#: ishtar_common/models_common.py:3322 ishtar_common/wizards.py:1951 msgid "Email" msgstr "" @@ -8413,12 +8414,12 @@ msgstr "" msgid "Raw name" msgstr "" -#: ishtar_common/forms_common.py:895 ishtar_common/models_common.py:3090 +#: ishtar_common/forms_common.py:895 ishtar_common/models_common.py:3171 msgid "Phone description" msgstr "" -#: ishtar_common/forms_common.py:899 ishtar_common/models_common.py:3093 -#: ishtar_common/models_common.py:3096 +#: ishtar_common/forms_common.py:899 ishtar_common/models_common.py:3174 +#: ishtar_common/models_common.py:3177 msgid "Phone description 2" msgstr "" @@ -8426,11 +8427,11 @@ msgstr "" msgid "Phone 2" msgstr "" -#: ishtar_common/forms_common.py:903 ishtar_common/models_common.py:3100 +#: ishtar_common/forms_common.py:903 ishtar_common/models_common.py:3181 msgid "Phone description 3" msgstr "" -#: ishtar_common/forms_common.py:905 ishtar_common/models_common.py:3098 +#: ishtar_common/forms_common.py:905 ishtar_common/models_common.py:3179 msgid "Phone 3" msgstr "" @@ -8438,23 +8439,23 @@ msgstr "" msgid "Current organization" msgstr "" -#: ishtar_common/forms_common.py:928 ishtar_common/models_common.py:3075 +#: ishtar_common/forms_common.py:928 ishtar_common/models_common.py:3156 msgid "Other address: address" msgstr "" -#: ishtar_common/forms_common.py:931 ishtar_common/models_common.py:3077 +#: ishtar_common/forms_common.py:931 ishtar_common/models_common.py:3158 msgid "Other address: address complement" msgstr "" -#: ishtar_common/forms_common.py:936 ishtar_common/models_common.py:3080 +#: ishtar_common/forms_common.py:936 ishtar_common/models_common.py:3161 msgid "Other address: postal code" msgstr "" -#: ishtar_common/forms_common.py:939 ishtar_common/models_common.py:3083 +#: ishtar_common/forms_common.py:939 ishtar_common/models_common.py:3164 msgid "Other address: town" msgstr "" -#: ishtar_common/forms_common.py:942 ishtar_common/models_common.py:3086 +#: ishtar_common/forms_common.py:942 ishtar_common/models_common.py:3167 msgid "Other address: country" msgstr "" @@ -8878,7 +8879,7 @@ msgstr "" msgid "Geo item - General" msgstr "" -#: ishtar_common/forms_common.py:2617 ishtar_common/models_common.py:2144 +#: ishtar_common/forms_common.py:2617 ishtar_common/models_common.py:2190 msgid "Import key" msgstr "" @@ -8888,26 +8889,26 @@ msgid "" "overwrite the data." msgstr "" -#: ishtar_common/forms_common.py:2628 ishtar_common/models_common.py:2159 +#: ishtar_common/forms_common.py:2628 ishtar_common/models_common.py:2205 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:7 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:33 msgid "Data type" msgstr "" -#: ishtar_common/forms_common.py:2631 ishtar_common/models_common.py:2151 +#: ishtar_common/forms_common.py:2631 ishtar_common/models_common.py:2197 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:11 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:30 msgid "Origin" msgstr "" -#: ishtar_common/forms_common.py:2634 ishtar_common/models_common.py:2167 +#: ishtar_common/forms_common.py:2634 ishtar_common/models_common.py:2213 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:12 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:36 msgid "Provider" msgstr "" #: ishtar_common/forms_common.py:2637 ishtar_common/forms_common.py:2674 -#: ishtar_common/models_common.py:2133 +#: ishtar_common/models_common.py:2179 msgid "Buffer" msgstr "" @@ -8915,18 +8916,18 @@ msgstr "" msgid "Buffer type" msgstr "" -#: ishtar_common/forms_common.py:2645 ishtar_common/models_common.py:2180 -#: ishtar_common/models_common.py:3737 +#: ishtar_common/forms_common.py:2645 ishtar_common/models_common.py:2226 +#: ishtar_common/models_common.py:3818 msgid "Estimated error for X" msgstr "" -#: ishtar_common/forms_common.py:2649 ishtar_common/models_common.py:2183 -#: ishtar_common/models_common.py:3740 +#: ishtar_common/forms_common.py:2649 ishtar_common/models_common.py:2229 +#: ishtar_common/models_common.py:3821 msgid "Estimated error for Y" msgstr "" -#: ishtar_common/forms_common.py:2653 ishtar_common/models_common.py:2186 -#: ishtar_common/models_common.py:3743 +#: ishtar_common/forms_common.py:2653 ishtar_common/models_common.py:2232 +#: ishtar_common/models_common.py:3824 msgid "Estimated error for Z" msgstr "" @@ -8962,8 +8963,8 @@ msgstr "" msgid "Coordinates" msgstr "" -#: ishtar_common/forms_common.py:2927 ishtar_common/models_common.py:2113 -#: ishtar_common/models_common.py:3752 +#: ishtar_common/forms_common.py:2927 ishtar_common/models_common.py:2148 +#: ishtar_common/models_common.py:3833 msgid "Point" msgstr "" @@ -9005,7 +9006,7 @@ msgstr "" msgid "Directory" msgstr "" -#: ishtar_common/ishtar_menu.py:178 ishtar_common/models_imports.py:1284 +#: ishtar_common/ishtar_menu.py:178 ishtar_common/models_imports.py:1286 msgid "Imports" msgstr "" @@ -9089,7 +9090,7 @@ msgstr "" msgid "Long text" msgstr "" -#: ishtar_common/models.py:711 ishtar_common/models_imports.py:975 +#: ishtar_common/models.py:711 ishtar_common/models_imports.py:977 msgid "Integer" msgstr "" @@ -9097,7 +9098,7 @@ msgstr "" msgid "Boolean" msgstr "" -#: ishtar_common/models.py:713 ishtar_common/models_imports.py:976 +#: ishtar_common/models.py:713 ishtar_common/models_imports.py:978 msgid "Float" msgstr "" @@ -9976,7 +9977,7 @@ msgstr "" msgid "Long title" msgstr "" -#: ishtar_common/models.py:2636 ishtar_common/models_imports.py:969 +#: ishtar_common/models.py:2636 ishtar_common/models_imports.py:971 msgid "Title type" msgstr "" @@ -10109,7 +10110,7 @@ msgid "In progress" msgstr "" #: ishtar_common/models.py:3212 ishtar_common/models.py:4955 -#: ishtar_common/models_imports.py:1102 +#: ishtar_common/models_imports.py:1104 msgid "Finished" msgstr "" @@ -10192,7 +10193,7 @@ msgid "Only available for these document types" msgstr "" #: ishtar_common/models.py:3646 ishtar_common/models_imports.py:926 -#: ishtar_common/models_imports.py:968 +#: ishtar_common/models_imports.py:970 msgid "Support type" msgstr "" @@ -10355,7 +10356,7 @@ msgctxt "key for text search" msgid "warehouse" msgstr "" -#: ishtar_common/models.py:3968 ishtar_common/models_common.py:3461 +#: ishtar_common/models.py:3968 ishtar_common/models_common.py:3542 msgctxt "key for text search" msgid "has-image" msgstr "" @@ -10479,7 +10480,7 @@ msgstr "" msgid "Administration scripts" msgstr "" -#: ishtar_common/models.py:4954 ishtar_common/models_imports.py:1101 +#: ishtar_common/models.py:4954 ishtar_common/models_imports.py:1103 msgid "Finished with errors" msgstr "" @@ -10514,7 +10515,7 @@ msgid "" "configuration." msgstr "" -#: ishtar_common/models.py:5074 ishtar_common/models_imports.py:1092 +#: ishtar_common/models.py:5074 ishtar_common/models_imports.py:1094 msgid "Created" msgstr "" @@ -10632,323 +10633,323 @@ msgstr "" msgid "Archive - Imports" msgstr "" -#: ishtar_common/models_common.py:838 +#: ishtar_common/models_common.py:839 msgid "Search vector" msgstr "" -#: ishtar_common/models_common.py:838 +#: ishtar_common/models_common.py:839 msgid "Auto filled at save" msgstr "" -#: ishtar_common/models_common.py:1401 +#: ishtar_common/models_common.py:1436 msgid "Last editor" msgstr "" -#: ishtar_common/models_common.py:1409 +#: ishtar_common/models_common.py:1444 msgid "Creator" msgstr "" -#: ishtar_common/models_common.py:1415 ishtar_common/models_common.py:2137 +#: ishtar_common/models_common.py:1450 ishtar_common/models_common.py:2183 msgid "Need update" msgstr "" -#: ishtar_common/models_common.py:1417 +#: ishtar_common/models_common.py:1452 msgid "Item locked for edition" msgstr "" -#: ishtar_common/models_common.py:1423 +#: ishtar_common/models_common.py:1458 msgid "Locked by" msgstr "" -#: ishtar_common/models_common.py:1441 +#: ishtar_common/models_common.py:1476 msgctxt "key for text search" msgid "modified-by" msgstr "" -#: ishtar_common/models_common.py:1445 +#: ishtar_common/models_common.py:1480 msgctxt "key for text search" msgid "modified-before" msgstr "" -#: ishtar_common/models_common.py:1449 +#: ishtar_common/models_common.py:1484 msgctxt "key for text search" msgid "modified-after" msgstr "" -#: ishtar_common/models_common.py:1452 +#: ishtar_common/models_common.py:1487 msgctxt "key for text search" msgid "locked" msgstr "" -#: ishtar_common/models_common.py:2009 ishtar_common/models_common.py:2027 +#: ishtar_common/models_common.py:2044 ishtar_common/models_common.py:2062 msgid "Authority name" msgstr "" -#: ishtar_common/models_common.py:2010 ishtar_common/models_common.py:2027 +#: ishtar_common/models_common.py:2045 ishtar_common/models_common.py:2062 msgid "Authority SRID" msgstr "" -#: ishtar_common/models_common.py:2013 +#: ishtar_common/models_common.py:2048 msgid "Geographic - Spatial reference system" msgstr "" -#: ishtar_common/models_common.py:2014 +#: ishtar_common/models_common.py:2049 msgid "Geographic - Spatial reference systems" msgstr "" -#: ishtar_common/models_common.py:2044 +#: ishtar_common/models_common.py:2079 msgid "Geographic - Origin type" msgstr "" -#: ishtar_common/models_common.py:2045 +#: ishtar_common/models_common.py:2080 msgid "Geographic - Origin types" msgstr "" -#: ishtar_common/models_common.py:2060 +#: ishtar_common/models_common.py:2095 msgid "Geographic - Data type" msgstr "" -#: ishtar_common/models_common.py:2061 +#: ishtar_common/models_common.py:2096 msgid "Geographic - Data types" msgstr "" -#: ishtar_common/models_common.py:2076 +#: ishtar_common/models_common.py:2111 msgid "Geographic - Provider type" msgstr "" -#: ishtar_common/models_common.py:2077 +#: ishtar_common/models_common.py:2112 msgid "Geographic - Provider types" msgstr "" -#: ishtar_common/models_common.py:2088 +#: ishtar_common/models_common.py:2123 msgid "Geographic - Buffer type" msgstr "" -#: ishtar_common/models_common.py:2089 +#: ishtar_common/models_common.py:2124 msgid "Geographic - Buffer types" msgstr "" -#: ishtar_common/models_common.py:2114 +#: ishtar_common/models_common.py:2149 msgid "Line(s)" msgstr "" -#: ishtar_common/models_common.py:2115 +#: ishtar_common/models_common.py:2150 msgid "Point(s)" msgstr "" -#: ishtar_common/models_common.py:2116 +#: ishtar_common/models_common.py:2151 msgid "Polygon(s)" msgstr "" -#: ishtar_common/models_common.py:2145 +#: ishtar_common/models_common.py:2191 msgid "Use this for update imports" msgstr "" -#: ishtar_common/models_common.py:2152 +#: ishtar_common/models_common.py:2198 msgid "For instance: topographical survey, georeferencing, ..." msgstr "" -#: ishtar_common/models_common.py:2160 +#: ishtar_common/models_common.py:2206 msgid "For instance: outline, z-sup, ..." msgstr "" -#: ishtar_common/models_common.py:2168 +#: ishtar_common/models_common.py:2214 msgid "Data provider" msgstr "" -#: ishtar_common/models_common.py:2171 ishtar_common/models_common.py:3733 +#: ishtar_common/models_common.py:2217 ishtar_common/models_common.py:3814 msgid "X" msgstr "" -#: ishtar_common/models_common.py:2171 ishtar_common/models_common.py:2172 -#: ishtar_common/models_common.py:2173 +#: ishtar_common/models_common.py:2217 ishtar_common/models_common.py:2218 +#: ishtar_common/models_common.py:2219 msgid "User input" msgstr "" -#: ishtar_common/models_common.py:2172 ishtar_common/models_common.py:3734 +#: ishtar_common/models_common.py:2218 ishtar_common/models_common.py:3815 msgid "Y" msgstr "" -#: ishtar_common/models_common.py:2173 ishtar_common/models_common.py:3735 +#: ishtar_common/models_common.py:2219 ishtar_common/models_common.py:3816 msgid "Z" msgstr "" -#: ishtar_common/models_common.py:2176 +#: ishtar_common/models_common.py:2222 msgid "X (cached)" msgstr "" -#: ishtar_common/models_common.py:2177 +#: ishtar_common/models_common.py:2223 msgid "Y (cached)" msgstr "" -#: ishtar_common/models_common.py:2178 +#: ishtar_common/models_common.py:2224 msgid "Z (cached)" msgstr "" -#: ishtar_common/models_common.py:2190 ishtar_common/models_common.py:3747 +#: ishtar_common/models_common.py:2236 ishtar_common/models_common.py:3828 msgid "Spatial Reference System" msgstr "" -#: ishtar_common/models_common.py:2195 ishtar_common/models_common.py:3753 +#: ishtar_common/models_common.py:2241 ishtar_common/models_common.py:3834 msgid "Point (2D)" msgstr "" -#: ishtar_common/models_common.py:2196 +#: ishtar_common/models_common.py:2242 msgid "Point (3D)" msgstr "" -#: ishtar_common/models_common.py:2197 +#: ishtar_common/models_common.py:2243 msgid "Multi points" msgstr "" -#: ishtar_common/models_common.py:2198 +#: ishtar_common/models_common.py:2244 msgid "Multi lines" msgstr "" -#: ishtar_common/models_common.py:2199 +#: ishtar_common/models_common.py:2245 msgid "Multi polygons" msgstr "" -#: ishtar_common/models_common.py:2202 ishtar_common/models_common.py:2203 +#: ishtar_common/models_common.py:2248 ishtar_common/models_common.py:2249 msgid "Geographic - Vector data" msgstr "" -#: ishtar_common/models_common.py:2310 +#: ishtar_common/models_common.py:2356 msgid "Only 2 or 3 dimensions" msgstr "" -#: ishtar_common/models_common.py:2725 +#: ishtar_common/models_common.py:2806 msgid "Main geodata" msgstr "" -#: ishtar_common/models_common.py:2729 +#: ishtar_common/models_common.py:2810 msgid "Geodata" msgstr "" -#: ishtar_common/models_common.py:2733 +#: ishtar_common/models_common.py:2814 msgctxt "key for text search" msgid "geo-name" msgstr "" -#: ishtar_common/models_common.py:2736 +#: ishtar_common/models_common.py:2817 msgctxt "key for text search" msgid "geo-type" msgstr "" -#: ishtar_common/models_common.py:2739 +#: ishtar_common/models_common.py:2820 msgctxt "key for text search" msgid "geo-origin" msgstr "" -#: ishtar_common/models_common.py:2742 +#: ishtar_common/models_common.py:2823 msgctxt "key for text search" msgid "geo-provider" msgstr "" -#: ishtar_common/models_common.py:2745 +#: ishtar_common/models_common.py:2826 msgctxt "key for text search" msgid "geo-comment" msgstr "" -#: ishtar_common/models_common.py:2767 +#: ishtar_common/models_common.py:2848 msgid "Add geographic item" msgstr "" -#: ishtar_common/models_common.py:2769 +#: ishtar_common/models_common.py:2850 msgid "geo." msgstr "" -#: ishtar_common/models_common.py:2839 +#: ishtar_common/models_common.py:2920 msgid "Year of creation" msgstr "" -#: ishtar_common/models_common.py:2843 +#: ishtar_common/models_common.py:2924 msgid "Filling this field is relevant to distinguish old towns from new towns." msgstr "" -#: ishtar_common/models_common.py:2847 +#: ishtar_common/models_common.py:2928 msgid "Town children" msgstr "" -#: ishtar_common/models_common.py:3069 +#: ishtar_common/models_common.py:3150 msgid "Town (precise)" msgstr "" -#: ishtar_common/models_common.py:3102 +#: ishtar_common/models_common.py:3183 msgid "Raw phone" msgstr "" -#: ishtar_common/models_common.py:3108 +#: ishtar_common/models_common.py:3189 msgid "Alternative address is prefered" msgstr "" -#: ishtar_common/models_common.py:3145 +#: ishtar_common/models_common.py:3226 msgid "No associated address" msgstr "" -#: ishtar_common/models_common.py:3226 +#: ishtar_common/models_common.py:3307 msgid "Postal code - Town" msgstr "" -#: ishtar_common/models_common.py:3236 +#: ishtar_common/models_common.py:3317 msgid "Mobile" msgstr "" -#: ishtar_common/models_common.py:3254 +#: ishtar_common/models_common.py:3335 msgid "Merge key" msgstr "" -#: ishtar_common/models_common.py:3465 +#: ishtar_common/models_common.py:3546 msgctxt "key for text search" msgid "has-url" msgstr "" -#: ishtar_common/models_common.py:3469 +#: ishtar_common/models_common.py:3550 msgctxt "key for text search" msgid "has-attached-file" msgstr "" -#: ishtar_common/models_common.py:3545 +#: ishtar_common/models_common.py:3626 msgid "Add document/image" msgstr "" -#: ishtar_common/models_common.py:3547 +#: ishtar_common/models_common.py:3628 msgid "doc./image" msgstr "" -#: ishtar_common/models_common.py:3731 +#: ishtar_common/models_common.py:3812 msgid "Precise" msgstr "" -#: ishtar_common/models_common.py:3731 +#: ishtar_common/models_common.py:3812 msgid "Polygon" msgstr "" -#: ishtar_common/models_common.py:3755 +#: ishtar_common/models_common.py:3836 msgid "Point source" msgstr "" -#: ishtar_common/models_common.py:3758 +#: ishtar_common/models_common.py:3839 msgid "Point source item" msgstr "" -#: ishtar_common/models_common.py:3760 +#: ishtar_common/models_common.py:3841 msgid "Multi polygon" msgstr "" -#: ishtar_common/models_common.py:3762 +#: ishtar_common/models_common.py:3843 msgid "Multi-polygon source" msgstr "" -#: ishtar_common/models_common.py:3769 +#: ishtar_common/models_common.py:3850 msgid "Multi polygon source item" msgstr "" -#: ishtar_common/models_common.py:4313 +#: ishtar_common/models_common.py:4397 msgid "Regenerate ID" msgstr "" -#: ishtar_common/models_common.py:4315 +#: ishtar_common/models_common.py:4399 msgid "regen." msgstr "" @@ -11147,11 +11148,11 @@ msgid "Importer - Targets" msgstr "" #: ishtar_common/models_imports.py:796 ishtar_common/views_item.py:590 -#: ishtar_common/views_item.py:1342 +#: ishtar_common/views_item.py:1350 msgid "True" msgstr "" -#: ishtar_common/models_imports.py:796 ishtar_common/views_item.py:1344 +#: ishtar_common/models_imports.py:796 ishtar_common/views_item.py:1352 msgid "False" msgstr "" @@ -11183,281 +11184,281 @@ msgstr "" msgid "Importer - Targets keys" msgstr "" -#: ishtar_common/models_imports.py:928 +#: ishtar_common/models_imports.py:930 msgid "Period" msgstr "" -#: ishtar_common/models_imports.py:929 +#: ishtar_common/models_imports.py:931 msgid "Report state" msgstr "" -#: ishtar_common/models_imports.py:934 +#: ishtar_common/models_imports.py:936 msgid "Activity type" msgstr "" -#: ishtar_common/models_imports.py:939 +#: ishtar_common/models_imports.py:941 msgid "Dating quality" msgstr "" -#: ishtar_common/models_imports.py:940 +#: ishtar_common/models_imports.py:942 msgid "Material" msgstr "" -#: ishtar_common/models_imports.py:943 +#: ishtar_common/models_imports.py:945 msgid "Warehouse division" msgstr "" -#: ishtar_common/models_imports.py:951 +#: ishtar_common/models_imports.py:953 msgid "Integrity type" msgstr "" -#: ishtar_common/models_imports.py:961 +#: ishtar_common/models_imports.py:963 msgid "Identification type" msgstr "" -#: ishtar_common/models_imports.py:965 +#: ishtar_common/models_imports.py:967 msgid "Context record relation type" msgstr "" -#: ishtar_common/models_imports.py:967 +#: ishtar_common/models_imports.py:969 msgid "Spatial reference system" msgstr "" -#: ishtar_common/models_imports.py:977 overload_translation/models.py:7 +#: ishtar_common/models_imports.py:979 overload_translation/models.py:7 msgid "String" msgstr "" -#: ishtar_common/models_imports.py:981 +#: ishtar_common/models_imports.py:983 msgid "INSEE code" msgstr "" -#: ishtar_common/models_imports.py:982 +#: ishtar_common/models_imports.py:984 msgid "Upper case" msgstr "" -#: ishtar_common/models_imports.py:983 +#: ishtar_common/models_imports.py:985 msgid "Lower case" msgstr "" -#: ishtar_common/models_imports.py:984 +#: ishtar_common/models_imports.py:986 msgid "String to boolean" msgstr "" -#: ishtar_common/models_imports.py:985 +#: ishtar_common/models_imports.py:987 msgctxt "filesystem" msgid "File" msgstr "" -#: ishtar_common/models_imports.py:986 +#: ishtar_common/models_imports.py:988 msgid "Unknow type" msgstr "" -#: ishtar_common/models_imports.py:1005 +#: ishtar_common/models_imports.py:1007 msgid "4 digit year. e.g.: \"2015\"" msgstr "" -#: ishtar_common/models_imports.py:1006 +#: ishtar_common/models_imports.py:1008 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "" -#: ishtar_common/models_imports.py:1007 +#: ishtar_common/models_imports.py:1009 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "" -#: ishtar_common/models_imports.py:1024 +#: ishtar_common/models_imports.py:1026 msgid "Options" msgstr "" -#: ishtar_common/models_imports.py:1026 +#: ishtar_common/models_imports.py:1028 msgid "Split character(s)" msgstr "" -#: ishtar_common/models_imports.py:1031 +#: ishtar_common/models_imports.py:1033 msgid "Importer - Formater type" msgstr "" -#: ishtar_common/models_imports.py:1032 +#: ishtar_common/models_imports.py:1034 msgid "Importer - Formater types" msgstr "" -#: ishtar_common/models_imports.py:1093 +#: ishtar_common/models_imports.py:1095 msgid "Analyse in progress" msgstr "" -#: ishtar_common/models_imports.py:1094 +#: ishtar_common/models_imports.py:1096 msgid "Analysed" msgstr "" -#: ishtar_common/models_imports.py:1095 +#: ishtar_common/models_imports.py:1097 msgid "Check modified in queue" msgstr "" -#: ishtar_common/models_imports.py:1096 +#: ishtar_common/models_imports.py:1098 msgid "Import in queue" msgstr "" -#: ishtar_common/models_imports.py:1097 +#: ishtar_common/models_imports.py:1099 msgid "Check modified in progress" msgstr "" -#: ishtar_common/models_imports.py:1098 +#: ishtar_common/models_imports.py:1100 msgid "Import in progress" msgstr "" -#: ishtar_common/models_imports.py:1099 +#: ishtar_common/models_imports.py:1101 msgid "Post-processing in progress" msgstr "" -#: ishtar_common/models_imports.py:1100 +#: ishtar_common/models_imports.py:1102 msgid "Partially imported" msgstr "" -#: ishtar_common/models_imports.py:1103 +#: ishtar_common/models_imports.py:1105 msgid "Archived" msgstr "" -#: ishtar_common/models_imports.py:1172 +#: ishtar_common/models_imports.py:1174 msgid "Importer type" msgstr "" -#: ishtar_common/models_imports.py:1174 +#: ishtar_common/models_imports.py:1176 msgid "Imported file" msgstr "" -#: ishtar_common/models_imports.py:1182 +#: ishtar_common/models_imports.py:1184 msgid "Associated images (zip file)" msgstr "" -#: ishtar_common/models_imports.py:1195 +#: ishtar_common/models_imports.py:1197 msgid "If a group is selected, target key saved in this group will be used." msgstr "" -#: ishtar_common/models_imports.py:1199 +#: ishtar_common/models_imports.py:1201 msgid "Encoding" msgstr "" -#: ishtar_common/models_imports.py:1200 +#: ishtar_common/models_imports.py:1202 msgid "Only required for CSV file" msgstr "" -#: ishtar_common/models_imports.py:1203 +#: ishtar_common/models_imports.py:1205 msgid "CSV separator" msgstr "" -#: ishtar_common/models_imports.py:1208 +#: ishtar_common/models_imports.py:1210 msgid "" "Separator for CSV file. Standard is comma but Microsoft Excel do not follow " "this standard and use semi-colon." msgstr "" -#: ishtar_common/models_imports.py:1213 +#: ishtar_common/models_imports.py:1215 msgid "Skip lines" msgstr "" -#: ishtar_common/models_imports.py:1215 +#: ishtar_common/models_imports.py:1217 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:1218 +#: ishtar_common/models_imports.py:1220 msgid "Error file" msgstr "" -#: ishtar_common/models_imports.py:1226 +#: ishtar_common/models_imports.py:1228 msgid "Result file" msgstr "" -#: ishtar_common/models_imports.py:1234 +#: ishtar_common/models_imports.py:1236 msgid "Match file" msgstr "" -#: ishtar_common/models_imports.py:1242 +#: ishtar_common/models_imports.py:1244 msgid "Archive file" msgstr "" -#: ishtar_common/models_imports.py:1253 +#: ishtar_common/models_imports.py:1255 msgid "Conservative import" msgstr "" -#: ishtar_common/models_imports.py:1255 +#: ishtar_common/models_imports.py:1257 msgid "If set to true, do not overload existing values." msgstr "" -#: ishtar_common/models_imports.py:1264 +#: ishtar_common/models_imports.py:1266 msgid "Remaining seconds" msgstr "" -#: ishtar_common/models_imports.py:1266 +#: ishtar_common/models_imports.py:1268 msgid "Current line" msgstr "" -#: ishtar_common/models_imports.py:1267 +#: ishtar_common/models_imports.py:1269 msgid "Number of line" msgstr "" -#: ishtar_common/models_imports.py:1269 +#: ishtar_common/models_imports.py:1271 msgid "Imported line numbers" msgstr "" -#: ishtar_common/models_imports.py:1274 +#: ishtar_common/models_imports.py:1276 msgid "Changed have been checked" msgstr "" -#: ishtar_common/models_imports.py:1276 +#: ishtar_common/models_imports.py:1278 msgid "Changed line numbers" msgstr "" -#: ishtar_common/models_imports.py:1283 +#: ishtar_common/models_imports.py:1285 msgid "Import" msgstr "" -#: ishtar_common/models_imports.py:1325 ishtar_common/models_imports.py:1469 +#: ishtar_common/models_imports.py:1327 ishtar_common/models_imports.py:1471 msgid "Error in the CSV file." msgstr "" -#: ishtar_common/models_imports.py:1394 +#: ishtar_common/models_imports.py:1396 msgid "Analyse" msgstr "" -#: ishtar_common/models_imports.py:1396 ishtar_common/models_imports.py:1405 +#: ishtar_common/models_imports.py:1398 ishtar_common/models_imports.py:1407 msgid "Re-analyse" msgstr "" -#: ishtar_common/models_imports.py:1400 +#: ishtar_common/models_imports.py:1402 msgid "Step by step import" msgstr "" -#: ishtar_common/models_imports.py:1401 ishtar_common/models_imports.py:1410 +#: ishtar_common/models_imports.py:1403 ishtar_common/models_imports.py:1412 msgid "Re-check for changes" msgstr "" -#: ishtar_common/models_imports.py:1403 ishtar_common/models_imports.py:1412 +#: ishtar_common/models_imports.py:1405 ishtar_common/models_imports.py:1414 msgid "Check for changes" msgstr "" -#: ishtar_common/models_imports.py:1406 +#: ishtar_common/models_imports.py:1408 msgid "Re-import" msgstr "" -#: ishtar_common/models_imports.py:1409 +#: ishtar_common/models_imports.py:1411 msgid "Step by step re-import" msgstr "" -#: ishtar_common/models_imports.py:1413 +#: ishtar_common/models_imports.py:1415 msgid "Archive" msgstr "" -#: ishtar_common/models_imports.py:1416 +#: ishtar_common/models_imports.py:1418 msgid "Unarchive" msgstr "" -#: ishtar_common/models_imports.py:1418 +#: ishtar_common/models_imports.py:1420 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:19 msgid "Edit" msgstr "" -#: ishtar_common/models_imports.py:1419 +#: ishtar_common/models_imports.py:1421 #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:30 #: ishtar_common/templates/ishtar/blocks/window_nav.html:66 #: ishtar_common/templates/ishtar/form_delete.html:11 @@ -11466,41 +11467,41 @@ msgstr "" msgid "Delete" msgstr "" -#: ishtar_common/models_imports.py:1513 ishtar_common/models_imports.py:1516 -#: ishtar_common/models_imports.py:1578 +#: ishtar_common/models_imports.py:1515 ishtar_common/models_imports.py:1518 +#: ishtar_common/models_imports.py:1580 msgid "Invalid GIS file." msgstr "" -#: ishtar_common/models_imports.py:1526 +#: ishtar_common/models_imports.py:1528 #, python-brace-format msgid "Geometry \"{geometry}\" not managed." msgstr "" -#: ishtar_common/models_imports.py:1548 +#: ishtar_common/models_imports.py:1550 msgid "CRS not managed." msgstr "" -#: ishtar_common/models_imports.py:1575 +#: ishtar_common/models_imports.py:1577 msgid "Error reading feature {idx + 1} - {e}" msgstr "" -#: ishtar_common/models_imports.py:1614 +#: ishtar_common/models_imports.py:1616 msgid "Modification check {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:1682 +#: ishtar_common/models_imports.py:1684 msgid "Import {} added to the queue" msgstr "" -#: ishtar_common/models_imports.py:1713 +#: ishtar_common/models_imports.py:1715 msgid "Error on imported file: {}" msgstr "" -#: ishtar_common/models_imports.py:1749 +#: ishtar_common/models_imports.py:1751 msgid "Import {} finished with errors" msgstr "" -#: ishtar_common/models_imports.py:1757 +#: ishtar_common/models_imports.py:1759 msgid "Import {} finished with no errors" msgstr "" @@ -13107,7 +13108,7 @@ msgstr "" msgid "Load another random image?" msgstr "" -#: ishtar_common/utils.py:1568 +#: ishtar_common/utils.py:1575 msgid "The maximum supported file size is {} Mo." msgstr "" @@ -13282,7 +13283,7 @@ msgstr "" msgid "Modify a %s" msgstr "" -#: ishtar_common/views_item.py:902 +#: ishtar_common/views_item.py:904 msgctxt "key for text search" msgid "today" msgstr "" |