diff options
16 files changed, 958 insertions, 822 deletions
diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html index 6f3bafed7..fa639f177 100644 --- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html +++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html @@ -16,8 +16,8 @@ {% with permission_view_own_find=permission_view_own_find %} {% with permission_change_own_geovectordata=permission_change_own_geovectordata %} {% with permission_change_geovectordata=permission_change_geovectordata %} - {% with permission_change_geo=permission_change_own_geovectordata|or_:permission_change_geovectordata %} +{% with dating_list=item|m2m_listing:"datings" %} {% with can_view_documents=permission_view_own_document|or_:permission_view_document %} {% with has_documents=item|safe_or:"documents.count" %} @@ -25,8 +25,8 @@ {% with display_relations=item|safe_or:"right_relations.count|left_relations.count" %} {% with has_image=item|safe_or:"images.count" %} {% with has_cultural_attributions=item|safe_or:"cultural_attributions.count" %} -{% with display_interpretation=item.activity|or_:item.identification|or_:item.interpretation|or_:item.filling %} -{% with display_datations=item.taq|or_:item.taq_estimated|or_:item.tpq|or_:item.tpq_estimated|or_:has_cultural_attributions %} +{% with display_interpretation=item.activity|or_:item.identification|or_:item.interpretation %} +{% with display_datations=dating_list|or_:item.taq|or_:item.taq_estimated|or_:item.tpq|or_:item.tpq_estimated|or_:has_cultural_attributions %} {% with can_view_finds=permission_view_own_find|or_:permission_view_find %} {% with has_finds=item|safe_or:"base_finds.count" %} {% with display_finds=has_finds|and_:can_view_finds %} @@ -141,11 +141,12 @@ {% field_flex_multiple_obj "Excavation techniques" item 'excavation_technics' has_image %} {% field_flex_multiple_obj "Periods" item 'datings' has_image %} {% field_flex_multiple_obj "Documentation" item 'documentations' has_image %} - {% field_flex "Opening date" item.opening_date '' '' has_image %} - {% field_flex "Closing date" item.closing_date '' '' has_image %} - {% field_flex_full "Comment on datings" item.datings_comment "<pre>" "</pre>" has_image %} + {% field_flex "Opening date" item.opening_date|date:"DATE_FORMAT" '' '' has_image %} + {% field_flex "Closing date" item.closing_date|date:"DATE_FORMAT" '' '' has_image %} + {% field_flex_full "Filling" item.filling "<pre>" "</pre>" %} + {% field_flex_full "Location" item.location "<pre>" "</pre>" has_image %} {% field_flex_full "Description" item.description "<pre>" "</pre>" has_image %} - {% field_flex_full "Comment" item.comment "<pre>" "</pre>" has_image %} + {% field_flex_full "General comment" item.comment "<pre>" "</pre>" has_image %} {% if item.surface %} <dl class="col-12 col-md-6 col-lg-3 flex-wrap"> <dt>{%trans "Surface"%}</dt> @@ -184,10 +185,8 @@ role="tabpanel" aria-labelledby="{{window_id}}-interpretation-tab"> <h3>{% trans "Interpretation"%}</h3> <div class='row'> - {% field_flex_multiple "Documentation" item.documentations %} {% field_flex "Activity" item.activity %} {% field_flex "Identification" item.identification %} - {% field_flex_full "Filling" item.filling "<pre>" "</pre>" %} {% field_flex_full "Interpretation" item.interpretation "<pre>" "</pre>" %} </div> </div> @@ -196,13 +195,18 @@ {% if display_datations %} <div class="tab-pane fade" id="{{window_id}}-datations" role="tabpanel" aria-labelledby="{{window_id}}-datations-tab"> - <h3>{% trans "Datations"%}</h3> + {% if dating_list %} + <h3>{% trans "Datations" %}</h3> + {% endif %} + {% include "ishtar/blocks/sheet_dating_list.html" %} + <h3>{% trans "Dating complements" %}</h3> <div class='row'> {% field_flex_multiple_obj "Cultural attributions" item 'cultural_attributions' %} {% field_flex "TAQ" item.taq %} {% field_flex "Estimated TAQ" item.taq_estimated %} {% field_flex "TPQ" item.tpq %} {% field_flex "Estimated TPQ" item.tpq_estimated %} + {% field_flex_full "Comment on datings" item.datings_comment "<pre>" "</pre>" has_image %} </div> </div> {% endif %} @@ -347,6 +351,6 @@ {% endif %} </div> -{% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} +{% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endblock %} diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py index 2548d5f71..bee0e7caa 100644 --- a/archaeological_files/forms.py +++ b/archaeological_files/forms.py @@ -662,7 +662,7 @@ class FileFormInstruction(CustomForm, IshtarForm): validators=[valid_id(models.File)], ) comment = forms.CharField(label=_("Comment"), widget=forms.Textarea, required=False) - instruction_deadline = forms.DateField(widget=DatePicker, required=False) + instruction_deadline = forms.DateField(label=_("Instruction deadline"), widget=DatePicker, required=False) year = forms.IntegerField( label=_("Year"), validators=[ diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html index 30a428262..b2a1a71fc 100644 --- a/archaeological_files/templates/ishtar/sheet_file.html +++ b/archaeological_files/templates/ishtar/sheet_file.html @@ -1,5 +1,5 @@ {% extends "ishtar/sheet.html" %} -{% load i18n ishtar_helpers window_ope_tables window_field window_header window_tables %} +{% load i18n l10n ishtar_helpers window_ope_tables window_field window_header window_tables %} {% block head_title %}<strong>{% trans "Archaeological file" %}</strong> - {{item.full_internal_ref|default:''}}{% endblock %} @@ -60,29 +60,24 @@ <h3>{% trans "General"%}</h3> <div class="row"> + {% field_flex _("Creation date") item.creation_date|date:"DATE_FORMAT" %} {% field_flex "Reception date" item.reception_date|date:"DATE_FORMAT" %} + {% field_flex _("Instruction deadline") item.instruction_deadline|date:"DATE_FORMAT" %} {% include "ishtar/blocks/sheet_creation_section.html" %} - - {% comment %} - {% if item.deadline_date and not item.acts %} - <p><label>{%trans "Deadline"%}</label> <span class='value'>{% item.deadline_date %}</span></p> <!-- calculated deadline for some preventive files , see saisine_type, not displayed if an act as been send --> - {% endif %} - {% endcomment %} - - {% field_flex_detail "In charge" item.in_charge %} - <div class="col-12 col-md-6 col-lg-4 d-flex flex-wrap row"> - <dt class="col-5">{%trans "State"%}</dt> - <dd class='col-7'> + {% field_flex_detail _("File managed by") item.in_charge %} + <dl class="col-12 col-md-6 col-lg-3 flex-wrap"> + <dt>{%trans "State of the file"%}</dt> + <dd> {% if item.is_active %}{%trans "Active file"%}{% else %}{%trans "Closed file"%}{% endif %} </dd> - </div> + </dl> {% if item.closing %} - <div class="col-12 col-md-6 col-lg-4 d-flex flex-wrap row"> - <dt class="col-5">{%trans "Closing date"%}</dt> - <dd class='col-7'> + <dl class="col-12 col-md-6 col-lg-3 flex-wrap"> + <dt>{%trans "Closing date"%}</dt> + <dd> {{ item.closing.date }} <strong>{%trans "by" %}</strong> {{ item.closing.user.full_label }} </dd> - </div> + </dl> {% endif %} {% field_flex "Type" item.file_type %} {% field_flex_detail "Related file" item.related_file %} @@ -95,6 +90,7 @@ <div class="row"> {% field_flex_detail_multiple_full "Towns" item.towns %} {% field_flex_multiple_obj "Departments" item 'departments' %} + {% field_flex "Locality" item.locality %} {% field_flex "Main address" item.address %} {% field_flex "Complement" item.address_complement %} {% field_flex "Postal code" item.postal_code %} @@ -125,7 +121,7 @@ {% field_flex "Saisine type" item.saisine_type %} {% field_flex_detail "Responsible for planning service" item.responsible_town_planning_service %} - {% field_flex "Responsible for planning service address" item.responsible_town_planning_service.full_address %} + {% field_flex _("Responsible for planning service address") item.responsible_town_planning_service.full_address %} {% if item.town_planning_service %} {% field_flex "Planning service organization" item.town_planning_service.full_address %} {% else %} @@ -133,7 +129,7 @@ {% endif %} {% field_flex "Permit type" item.permit_type %} - {% field_flex "Permit/order reference" item.permit_reference %} + {% field_flex _("Permit/order reference") item.permit_reference %} {% field_flex "Date of planning service file" item.planning_service_date|date:"DATE_FORMAT" %} {% field_flex "General contractor" item.general_contractor.full_address %} @@ -172,7 +168,7 @@ {% field_flex "Protected area" item.protected_area|yesno %} {% endif %} - {% field_flex_full "Comment" item.research_comment "<pre>" "</pre>" %} + {% field_flex_full _("Research archaeology comment") item.research_comment "<pre>" "</pre>" %} </div> {% endif %} @@ -188,24 +184,24 @@ <h3>{%trans "Associated operations"%}</h3> <table class="table table-striped"> <tr> + <th class='link'> </th> <th>{% trans "Ref." %}</th> <th>Code Patriarche</th> <th>{% trans "Type" %}</th> <th>{% trans "In charge" %}</th> <th>{% trans "Start date" %}</th> <th>{% trans "Excavation end date" %}</th> - <th class='link'> </th> </tr> {% for operation in item.operations.all %} <tr> + <td class='link'><a href="#" class='display_details' + onclick='load_window("{% url "show-operation" operation.pk "" %}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></td> <td>{{operation.year_index}}</td> <td>{{operation.full_code_patriarche|default:""}}</td> <td class='string'>{{operation.operation_type}}</td> <td class='string'>{{operation.in_charge|default:""}}</td> <td>{{operation.start_date|default:""}}</td> <td>{{operation.excavation_end_date|default:""}}</td> - <td class='link'><a href="#" class='display_details' - onclick='load_window("{% url "show-operation" operation.pk "" %}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></td> </tr> {% empty %} <tr><td colspan="8" class='no_items'>{% trans "No operation associated to this archaeological file" %}</td></tr> diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 6af22839f..c0f525dfa 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -253,38 +253,7 @@ </div> {% endif %} {% if dating_list %} - <table id='{{window_id}}-datings' class="table table-striped"> - <tr> - <th>{% trans "Chronological period" %}</th> - <th>{% trans "Start date" %}</th> - <th>{% trans "End date" %}</th> - <th>{% trans "Dating type" %}</th> - <th>{% trans "Quality" %}</th> - <th>{% trans "Precise on this dating" %}</th> - </tr> - {% for dating in dating_list %} - <tr> - <td> - {{dating.period}} - </td> - <td> - {{dating.start_date|default_if_none:"-"}} - </td> - <td> - {{dating.end_date|default_if_none:"-"}} - </td> - <td> - {{dating.dating_type|default_if_none:"-"}} - </td> - <td> - {{dating.quality|default_if_none:"-"}} - </td> - <td> - {{dating.precise_dating|default_if_none:"-"}} - </td> - </tr> - {% endfor %} - </table> + {% include "ishtar/blocks/sheet_dating_list.html" %} {% endif %} <div class='row'> {% field_flex_full "Comment on dating" item.dating_comment "<pre>" "</pre>" %} diff --git a/archaeological_finds/templates/ishtar/sheet_treatment.html b/archaeological_finds/templates/ishtar/sheet_treatment.html index b5025b3fe..772cfd903 100644 --- a/archaeological_finds/templates/ishtar/sheet_treatment.html +++ b/archaeological_finds/templates/ishtar/sheet_treatment.html @@ -1,5 +1,5 @@ {% extends "ishtar/sheet.html" %} -{% load i18n window_field from_dict link_to_window window_tables window_ope_tables window_header humanize %} +{% load i18n l10n window_field from_dict link_to_window window_tables window_ope_tables window_header humanize %} {% block head_title %}<strong>{% trans "Treatment" %}</strong> - {{ item|default:"" }}{% endblock %} @@ -63,7 +63,7 @@ <p class="window-refs">{{ item.label|default:"" }}</p> {% if item.other_reference %} <p class="window-refs">{{ item.other_reference }}</p>{% endif %} - <p class="window-refs">{{ item.year }} - {{ item.index }}</p> + <p class="window-refs">{{ item.year|unlocalize }} - {{ item.index|unlocalize }}</p> {% if item.external_id %} <p class="window-refs">{{ item.external_id }}</p>{% endif %} {% if item.end_date %} diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentfile.html b/archaeological_finds/templates/ishtar/sheet_treatmentfile.html index eacf853ca..676d3b4a6 100644 --- a/archaeological_finds/templates/ishtar/sheet_treatmentfile.html +++ b/archaeological_finds/templates/ishtar/sheet_treatmentfile.html @@ -40,9 +40,9 @@ {% field_flex "Type" item.type %} {% field_flex_detail "Responsible" item.in_charge %} {% field_flex_detail "Associated basket" item.associated_basket %} - {% field_flex "Reception date" item.reception_date %} - {% field_flex "Start date" item.creation_date %} - {% field_flex "Closing date" item.end_date %} + {% field_flex "Reception date" item.reception_date|date:"DATE_FORMAT" %} + {% field_flex "Start date" item.creation_date|date:"DATE_FORMAT" %} + {% field_flex "Closing date" item.end_date|date:"DATE_FORMAT" %} {% field_flex_full "Comment" item.comment "<pre>" "</pre>" %} {% include "ishtar/blocks/sheet_json.html" %} </div> diff --git a/archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html b/archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html index 8ea08cc22..918b372e9 100644 --- a/archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html +++ b/archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html @@ -20,7 +20,7 @@ <td>{{act.act_object}}</td> </tr> {% empty %} - <tr><td colspan="4" class='no_items'>{% trans "No administrative act associated" %}</td></tr> + <tr><td colspan="5" class='no_items'>{% trans "No administrative act associated" %}</td></tr> {% endfor %} </tbody> </table> diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 5528ff170..e1cbd1583 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -277,7 +277,7 @@ {% field_flex "Planning service organization" item.associated_file.responsible_town_planning_service.attached_to.full_address %} {% endif %} {% field_flex "Permit type" item.associated_file.permit_type %} - {% field_flex "Permit reference" item.associated_file.permit_reference %} + {% field_flex _("Permit/order reference") item.associated_file.permit_reference %} {% field_flex "General contractor" item.associated_file.general_contractor.full_address %} {% if item.associated_file.corporation_general_contractor %} {% field_flex "General contractor organization" item.associated_file.corporation_general_contractor.full_address %} diff --git a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html index ab22d10e4..2f953478e 100644 --- a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html +++ b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html @@ -111,8 +111,8 @@ </div> {% include "ishtar/blocks/sheet_json.html" %} - {% if item.get_address or item.get_address_complement or item.get_postal_code or item.get_town %} - <h3>{% trans "Geographic localisation" %}</h3> + {% if item.get_address or item.get_address_complement or item.get_postal_code or item.get_town or item.phone or item.mobile_phone %} + <h3>{% trans "Geographic localisation/contact details" %}</h3> {% if PROFILE.locate_warehouses and SHOW_GEO %} <div class='row'> {% with geo_item=item %} @@ -122,6 +122,8 @@ {% endif %} <div class="row"> {% with full=True %}{% include "ishtar/blocks/sheet_address_section.html" %}{% endwith %} + {% field_flex _("Phone") item.phone %} + {% field_flex _("Mobile phone") item.mobile_phone %} </div> {% endif %} </div> diff --git a/ishtar_common/templates/ishtar/blocks/sheet_address_section.html b/ishtar_common/templates/ishtar/blocks/sheet_address_section.html index 80dbc07a4..5f577c9c9 100644 --- a/ishtar_common/templates/ishtar/blocks/sheet_address_section.html +++ b/ishtar_common/templates/ishtar/blocks/sheet_address_section.html @@ -5,6 +5,6 @@ <dd> <pre>{% if item.get_address %}{{item.get_address}}{% endif %}{% if item.get_address_complement %} {{item.get_address_complement}}{% endif %}{% if item.get_postal_code or item.get_town or item.get_precise_town %} -{{item.get_postal_code}} {% if item.get_precise_town %}{{item.get_precise_town}}{% else %}{{item.get_town}}{% endif %}{% endif %}</pre> +{{item.get_postal_code}} {% if item.get_precise_town %}{{item.get_precise_town.name}}{% else %}{{item.get_town}}{% endif %}{% endif %}</pre> </dd> </dl>{% endif %} diff --git a/ishtar_common/templates/ishtar/blocks/sheet_dating_list.html b/ishtar_common/templates/ishtar/blocks/sheet_dating_list.html new file mode 100644 index 000000000..6135bbf77 --- /dev/null +++ b/ishtar_common/templates/ishtar/blocks/sheet_dating_list.html @@ -0,0 +1,33 @@ +{% load i18n %} +<table id='{{window_id}}-datings' class="table table-striped"> + <tr> + <th>{% trans "Chronological period" %}</th> + <th>{% trans "Start date" %}</th> + <th>{% trans "End date" %}</th> + <th>{% trans "Dating type" %}</th> + <th>{% trans "Quality" %}</th> + <th>{% trans "Precise on this dating" %}</th> + </tr> + {% for dating in dating_list %} + <tr> + <td> + {{dating.period}} + </td> + <td> + {{dating.start_date|default_if_none:"-"}} + </td> + <td> + {{dating.end_date|default_if_none:"-"}} + </td> + <td> + {{dating.dating_type|default_if_none:"-"}} + </td> + <td> + {{dating.quality|default_if_none:"-"}} + </td> + <td> + {{dating.precise_dating|default_if_none:"-"}} + </td> + </tr> + {% endfor %} +</table> diff --git a/ishtar_common/templates/ishtar/sheet_document.html b/ishtar_common/templates/ishtar/sheet_document.html index 258243a24..2ffcc451b 100644 --- a/ishtar_common/templates/ishtar/sheet_document.html +++ b/ishtar_common/templates/ishtar/sheet_document.html @@ -46,12 +46,14 @@ {% field_flex "Type" item.source_type_html "" "" 1 %} {% include "ishtar/blocks/sheet_creation_section.html" %} - {% if item.format_type or item.support_type or item.scale or item.shooting_angle %} + {% if item.format_type or item.support_type or item.scale or item.shooting_angle or item.duplicate != None or item.item_number != 1 %} <h4 class="col-12">{% trans "Format" %}</h4> {% field_flex "Format" item.format_type %} {% field_flex "Support" item.support_type %} {% field_flex "Scale" item.scale %} {% field_flex "Shooting angle" item.shooting_angle %} + {% if item.duplicate != None %}{% field_flex "Has a duplicate" item.duplicate %}{% endif %} + {% if item.item_number != 1 %}{% field_flex "Item number" item.item_number %}{% endif %} {% endif %} {% if item.associated_file or item.associated_url or item.tags.count %} @@ -99,12 +101,10 @@ {% field_flex_detail "Pages" item.source_page_range %} {% endif %} - {% if item.container or item.container_ref or item.item_number != 1 or item.duplicate %} + {% if item.container or item.container_ref %} <h4 class="col-12">{% trans "Container" %}</h4> {% field_flex_detail "Container" item.container 2 %} {% field_flex_detail "Reference container" item.container_ref 2 %} - {% if item.item_number != 1 %}{% field_flex "Item number" item.item_number %}{% endif %} - {% if item.duplicate %}{% field_flex "Has a duplicate" item.duplicate %}{% endif %} {% endif %} {% if item.description or item.comment or item.additional_information %} @@ -122,17 +122,17 @@ {% if item.has_related %} <h3>{% trans "Related items" %}</h3> {% field_flex_full _("Files") item.files|add_links %} -{% field_flex_full "Administrative acts" item.administrativeacts|add_links %} -{% field_flex_full "Sites" item.sites|add_links %} -{% field_flex_full "Operations" item.operations|add_links %} -{% field_flex_full "Context records" item.context_records|add_links %} -{% field_flex_full "Finds" item.finds|add_links %} -{% field_flex_full "Treatments" item.treatments|add_links %} -{% field_flex_full "Treatment files" item.treatment_files|add_links %} -{% field_flex_full "Warehouses" item.warehouses|add_links %} -{% field_flex_full "Containers" item.containers|add_links %} -{% field_flex_full "Towns" item.towns|add_links %} -{% field_flex_full "Areas" item.areas|add_links %} +{% field_flex_full _("Administrative acts") item.administrativeacts|add_links %} +{% field_flex_full _("Sites") item.sites|add_links %} +{% field_flex_full _("Operations") item.operations|add_links %} +{% field_flex_full _("Context records") item.context_records|add_links %} +{% field_flex_full _("Finds") item.finds|add_links %} +{% field_flex_full _("Treatments") item.treatments|add_links %} +{% field_flex_full _("Treatment files") item.treatment_files|add_links %} +{% field_flex_full _("Warehouses") item.warehouses|add_links %} +{% field_flex_full _("Containers") item.containers|add_links %} +{% field_flex_full _("Towns") item.towns|add_links %} +{% field_flex_full _("Areas") item.areas|add_links %} {% endif %} {{ item.coins_tag|default:""|safe }} {% endblock %} diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index f39c39403..735fdc50a 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-06 16:24+0200\n" +"POT-Creation-Date: 2024-06-07 15:30+0200\n" "PO-Revision-Date: 2019-11-01 18:52+0000\n" "Last-Translator: Valérie-Emma Leroux <valerie-emma.leroux@iggdrasil.net>\n" "Language-Team: German <http://translate.iggdrasil.net/projects/ishtar/wip-" @@ -379,9 +379,9 @@ msgstr "" #: archaeological_context_records/forms.py:341 #: archaeological_context_records/models.py:756 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:235 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:239 #: archaeological_files/models.py:609 -#: archaeological_files/templates/ishtar/sheet_file.html:82 +#: archaeological_files/templates/ishtar/sheet_file.html:75 #: archaeological_finds/forms_treatments.py:182 #: archaeological_finds/forms_treatments.py:667 #: archaeological_finds/forms_treatments.py:773 @@ -439,12 +439,12 @@ msgstr "" #: archaeological_context_records/models.py:530 #: archaeological_finds/forms.py:1149 archaeological_finds/forms.py:1566 #: archaeological_finds/models_finds.py:1204 -#: archaeological_finds/templates/ishtar/sheet_find.html:258 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:206 #: archaeological_operations/forms.py:841 #: archaeological_operations/templates/ishtar/sheet_operation.html:556 #: archaeological_operations/templates/ishtar/sheet_operation.html:593 #: cd17_app/templates/ishtar/sheet_find.html:229 +#: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:4 #: man_app/templates/ishtar/sheet_museum_find.html:215 #: na_app/templates/ishtar/sheet_find.html:233 #: na_app/templates/ishtar/sheet_operation.html:524 @@ -460,17 +460,16 @@ msgstr "" #: archaeological_context_records/models.py:111 #: archaeological_files/forms.py:786 archaeological_files/models.py:76 #: archaeological_files/models.py:715 -#: archaeological_files/templates/ishtar/sheet_file.html:196 +#: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_finds/forms.py:1568 #: archaeological_finds/forms_treatments.py:180 #: archaeological_finds/forms_treatments.py:770 #: archaeological_finds/models_finds.py:3623 #: archaeological_finds/models_treatments.py:264 #: archaeological_finds/models_treatments.py:758 -#: archaeological_finds/templates/ishtar/sheet_find.html:259 -#: archaeological_finds/templates/ishtar/sheet_find.html:426 -#: archaeological_finds/templates/ishtar/sheet_find.html:464 -#: archaeological_finds/templates/ishtar/sheet_find.html:502 +#: archaeological_finds/templates/ishtar/sheet_find.html:395 +#: archaeological_finds/templates/ishtar/sheet_find.html:433 +#: archaeological_finds/templates/ishtar/sheet_find.html:471 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:207 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:421 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:459 @@ -483,6 +482,7 @@ msgstr "" #: cd17_app/templates/ishtar/sheet_find.html:397 #: cd17_app/templates/ishtar/sheet_find.html:435 #: cd17_app/templates/ishtar/sheet_find.html:473 +#: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:5 #: man_app/templates/ishtar/sheet_museum_find.html:216 #: man_app/templates/ishtar/sheet_museum_find.html:430 #: man_app/templates/ishtar/sheet_museum_find.html:468 @@ -508,11 +508,10 @@ msgstr "" #: archaeological_files/models.py:716 archaeological_finds/forms.py:1569 #: archaeological_finds/models_finds.py:3624 #: archaeological_finds/models_treatments.py:759 -#: archaeological_finds/templates/ishtar/sheet_find.html:260 -#: archaeological_finds/templates/ishtar/sheet_find.html:427 -#: archaeological_finds/templates/ishtar/sheet_find.html:465 -#: archaeological_finds/templates/ishtar/sheet_find.html:503 -#: archaeological_finds/templates/ishtar/sheet_find.html:541 +#: archaeological_finds/templates/ishtar/sheet_find.html:396 +#: archaeological_finds/templates/ishtar/sheet_find.html:434 +#: archaeological_finds/templates/ishtar/sheet_find.html:472 +#: archaeological_finds/templates/ishtar/sheet_find.html:510 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:208 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:422 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:460 @@ -526,6 +525,7 @@ msgstr "" #: cd17_app/templates/ishtar/sheet_find.html:474 #: cd17_app/templates/ishtar/sheet_find.html:512 #: ishtar_common/models_imports.py:1439 +#: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:6 #: man_app/templates/ishtar/sheet_museum_find.html:217 #: man_app/templates/ishtar/sheet_museum_find.html:431 #: man_app/templates/ishtar/sheet_museum_find.html:469 @@ -552,9 +552,9 @@ msgstr "" #: archaeological_context_records/forms.py:454 #: archaeological_context_records/models.py:122 #: archaeological_finds/forms.py:1570 -#: archaeological_finds/templates/ishtar/sheet_find.html:262 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:210 #: cd17_app/templates/ishtar/sheet_find.html:233 +#: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:8 #: man_app/templates/ishtar/sheet_museum_find.html:219 #: na_app/templates/ishtar/sheet_find.html:237 #: pdl_app/templates/ishtar/sheet_find.html:228 @@ -566,9 +566,9 @@ msgstr "" #: archaeological_context_records/models.py:84 #: archaeological_context_records/models.py:115 #: archaeological_finds/forms.py:1567 -#: archaeological_finds/templates/ishtar/sheet_find.html:261 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:209 #: cd17_app/templates/ishtar/sheet_find.html:232 +#: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:7 #: man_app/templates/ishtar/sheet_museum_find.html:218 #: na_app/templates/ishtar/sheet_find.html:236 #: pdl_app/templates/ishtar/sheet_find.html:227 @@ -579,8 +579,8 @@ msgstr "" #: archaeological_context_records/forms.py:456 #: archaeological_context_records/models.py:127 #: archaeological_finds/forms.py:1571 -#: archaeological_finds/templates/ishtar/sheet_find.html:263 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:211 +#: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:9 msgid "Precise on this dating" msgstr "" @@ -624,7 +624,7 @@ msgstr "" #: archaeological_context_records/forms.py:515 #: archaeological_context_records/models.py:784 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:49 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:185 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:186 msgid "Interpretation" msgstr "" @@ -633,6 +633,7 @@ msgid "Context record - 040 - Interpretation" msgstr "" #: archaeological_context_records/forms.py:521 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:202 msgid "Dating complements" msgstr "" @@ -1448,7 +1449,7 @@ msgid "Operation / Archaeological site" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:74 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:266 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:270 #: archaeological_finds/forms.py:2331 archaeological_finds/models_finds.py:98 #: archaeological_finds/models_finds.py:112 #: archaeological_finds/models_finds.py:129 @@ -1479,7 +1480,8 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:92 #: archaeological_warehouse/templates/ishtar/sheet_container.html:189 #: archaeological_warehouse/templates/ishtar/sheet_container.html:236 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:192 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:194 +#: ishtar_common/templates/ishtar/sheet_document.html:129 #: na_app/templates/ishtar/sheet_container.html:195 #: na_app/templates/ishtar/sheet_container.html:242 #: na_app/templates/ishtar/sheet_operation.html:89 @@ -1493,7 +1495,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:101 #: archaeological_finds/templates/ishtar/sheet_find.html:74 -#: archaeological_finds/templates/ishtar/sheet_find.html:581 +#: archaeological_finds/templates/ishtar/sheet_find.html:550 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:74 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:576 #: archaeological_operations/templates/ishtar/sheet_operation.html:98 @@ -1551,9 +1553,9 @@ msgstr "" msgid "Complete identifier" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:151 -#: archaeological_files/templates/ishtar/sheet_file.html:104 -#: archaeological_files/templates/ishtar/sheet_file.html:269 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:152 +#: archaeological_files/templates/ishtar/sheet_file.html:98 +#: archaeological_files/templates/ishtar/sheet_file.html:263 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:58 #: archaeological_operations/templates/ishtar/sheet_operation.html:216 #: ishtar_common/templates/ishtar/sheet_town.html:71 @@ -1562,14 +1564,13 @@ msgstr "" msgid "Surface" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:166 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:167 #: archaeological_files/forms.py:286 -#: archaeological_files/templates/ishtar/sheet_file.html:95 +#: archaeological_files/templates/ishtar/sheet_file.html:88 #: archaeological_finds/templates/ishtar/sheet_basefind.html:59 #: archaeological_operations/templates/ishtar/sheet_operation.html:332 #: archaeological_operations/templates/ishtar/sheet_site.html:67 #: archaeological_warehouse/templates/ishtar/sheet_container.html:168 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:115 #: ishtar_common/templates/ishtar/sheet_town.html:95 #: man_app/templates/ishtar/sheet_basefind.html:56 #: na_app/templates/ishtar/sheet_container.html:174 @@ -1578,11 +1579,11 @@ msgstr "" msgid "Geographic localisation" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:177 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:178 #: archaeological_finds/forms.py:546 archaeological_finds/forms.py:827 #: archaeological_finds/forms.py:987 #: archaeological_finds/templates/ishtar/sheet_basefind.html:70 -#: archaeological_finds/templates/ishtar/sheet_find.html:295 +#: archaeological_finds/templates/ishtar/sheet_find.html:264 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:243 #: archaeological_operations/templates/ishtar/sheet_operation.html:353 #: cd17_app/templates/ishtar/sheet_find.html:265 @@ -1598,29 +1599,28 @@ msgstr "" msgid "Sheet" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:214 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:218 msgid "Operation summary" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:217 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:221 #: archaeological_operations/templates/ishtar/sheet_operation.html:303 #: na_app/templates/ishtar/sheet_operation.html:285 #: sra_idf_app/templates/ishtar/sheet_operation.html:293 msgid "Patriarche OA code not yet recorded!" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:223 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:227 msgid "Numerical reference" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:229 -#: archaeological_files/templates/ishtar/sheet_file.html:75 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:233 #: archaeological_finds/forms_treatments.py:144 #: archaeological_finds/models_treatments.py:132 #: archaeological_finds/models_treatments.py:219 -#: archaeological_finds/templates/ishtar/sheet_find.html:422 -#: archaeological_finds/templates/ishtar/sheet_find.html:460 -#: archaeological_finds/templates/ishtar/sheet_find.html:498 +#: archaeological_finds/templates/ishtar/sheet_find.html:391 +#: archaeological_finds/templates/ishtar/sheet_find.html:429 +#: archaeological_finds/templates/ishtar/sheet_find.html:467 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:417 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:455 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:493 @@ -1649,66 +1649,66 @@ msgstr "" msgid "State" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:230 -#: archaeological_files/templates/ishtar/sheet_file.html:77 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:234 +#: archaeological_files/templates/ishtar/sheet_file.html:70 #: archaeological_operations/templates/ishtar/sheet_operation.html:184 #: na_app/templates/ishtar/sheet_operation.html:180 #: sra_idf_app/templates/ishtar/sheet_operation.html:180 msgid "Active file" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:230 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:234 #: archaeological_operations/templates/ishtar/sheet_operation.html:187 #: na_app/templates/ishtar/sheet_operation.html:183 #: sra_idf_app/templates/ishtar/sheet_operation.html:183 msgid "Closed operation" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:237 -#: archaeological_files/templates/ishtar/sheet_file.html:84 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:241 +#: archaeological_files/templates/ishtar/sheet_file.html:77 #: archaeological_operations/templates/ishtar/sheet_operation.html:210 #: na_app/templates/ishtar/sheet_operation.html:206 #: sra_idf_app/templates/ishtar/sheet_operation.html:206 msgid "by" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:249 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:253 msgid "No operation linked to this context record!" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:271 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:275 #, fuzzy #| msgid "email address" msgid "No associated finds." msgstr "E-Mail-Adresse" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:275 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:279 #: archaeological_operations/templates/ishtar/sheet_operation.html:478 #: na_app/templates/ishtar/sheet_operation.html:446 #: sra_idf_app/templates/ishtar/sheet_operation.html:468 msgid "Documents from associated finds" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:288 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:292 #: archaeological_operations/templates/ishtar/sheet_operation.html:444 #: na_app/templates/ishtar/sheet_operation.html:412 #: sra_idf_app/templates/ishtar/sheet_operation.html:434 msgid "Context record relations" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:294 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:298 msgid "Diagram of stratigraphic relations - above" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:302 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:306 msgid "Diagram of stratigraphic relations - below" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:310 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:314 msgid "Diagram of stratigraphic relations - full" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:326 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:330 msgid "Document from this context record" msgstr "" @@ -1761,7 +1761,7 @@ msgstr "" #: archaeological_files/forms.py:237 archaeological_files/forms.py:667 #: archaeological_files/forms.py:1122 archaeological_files/forms.py:1158 #: archaeological_files/models.py:388 archaeological_files/models.py:539 -#: archaeological_files/templates/ishtar/sheet_file.html:219 +#: archaeological_files/templates/ishtar/sheet_file.html:213 #: archaeological_finds/forms.py:1746 #: archaeological_finds/forms_treatments.py:58 #: archaeological_finds/forms_treatments.py:146 @@ -1841,6 +1841,8 @@ msgstr "" #: archaeological_files/forms.py:104 archaeological_files/forms.py:531 #: archaeological_files/models.py:607 +#: archaeological_files/templates/ishtar/sheet_file.html:131 +#: archaeological_operations/templates/ishtar/sheet_operation.html:280 msgid "Permit/order reference" msgstr "" @@ -1876,7 +1878,7 @@ msgstr "" #: archaeological_files/forms.py:107 archaeological_files/forms.py:378 #: archaeological_files/forms.py:447 -#: archaeological_files/templates/ishtar/sheet_file.html:195 +#: archaeological_files/templates/ishtar/sheet_file.html:189 #: archaeological_finds/forms_treatments.py:649 msgid "In charge" msgstr "" @@ -1926,7 +1928,7 @@ msgstr "" #: archaeological_files/models.py:624 #: archaeological_finds/forms_treatments.py:768 #: archaeological_finds/models_treatments.py:1148 -#: archaeological_finds/templates/ishtar/sheet_find.html:540 +#: archaeological_finds/templates/ishtar/sheet_find.html:509 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:535 #: cd17_app/templates/ishtar/sheet_find.html:511 #: man_app/templates/ishtar/sheet_museum_find.html:544 @@ -1978,6 +1980,7 @@ msgstr "" #: ishtar_common/forms_common.py:1810 ishtar_common/models.py:2408 #: ishtar_common/models_common.py:3414 #: ishtar_common/templates/ishtar/sheet_area.html:71 +#: ishtar_common/templates/ishtar/sheet_document.html:134 #: na_app/templates/ishtar/sheet_operation.html:146 #: sra_idf_app/templates/ishtar/sheet_operation.html:146 msgid "Towns" @@ -2081,7 +2084,7 @@ msgid "Responsible for planning service" msgstr "" #: archaeological_files/forms.py:565 -#: archaeological_files/templates/ishtar/sheet_file.html:150 +#: archaeological_files/templates/ishtar/sheet_file.html:144 msgid "Research archaeology" msgstr "" @@ -2120,6 +2123,7 @@ msgid "Archaeological file - 050 - Instruction" msgstr "" #: archaeological_files/forms.py:644 +#: archaeological_files/templates/ishtar/sheet_file.html:66 msgid "File managed by" msgstr "" @@ -2127,6 +2131,11 @@ msgstr "" msgid "Related file" msgstr "" +#: archaeological_files/forms.py:665 archaeological_files/models.py:644 +#: archaeological_files/templates/ishtar/sheet_file.html:64 +msgid "Instruction deadline" +msgstr "" + #: archaeological_files/forms.py:730 msgid "Would you like to close this archaeological file?" msgstr "" @@ -2144,7 +2153,7 @@ msgid "Preventive file - 020 - Edition form" msgstr "" #: archaeological_files/forms.py:746 ishtar_common/forms_common.py:2232 -#: ishtar_common/templates/ishtar/sheet_document.html:77 +#: ishtar_common/templates/ishtar/sheet_document.html:79 msgid "Dates" msgstr "" @@ -2181,25 +2190,25 @@ msgid "Linear meter (m)" msgstr "" #: archaeological_files/forms.py:889 archaeological_files/forms.py:891 -#: archaeological_files/templates/ishtar/sheet_file.html:289 -#: archaeological_files/templates/ishtar/sheet_file.html:292 -#: archaeological_files/templates/ishtar/sheet_file.html:341 -#: archaeological_files/templates/ishtar/sheet_file.html:344 +#: archaeological_files/templates/ishtar/sheet_file.html:283 +#: archaeological_files/templates/ishtar/sheet_file.html:286 +#: archaeological_files/templates/ishtar/sheet_file.html:335 +#: archaeological_files/templates/ishtar/sheet_file.html:338 msgid "Man by day" msgstr "" #: archaeological_files/forms.py:890 archaeological_files/forms.py:892 -#: archaeological_files/templates/ishtar/sheet_file.html:290 -#: archaeological_files/templates/ishtar/sheet_file.html:293 -#: archaeological_files/templates/ishtar/sheet_file.html:342 -#: archaeological_files/templates/ishtar/sheet_file.html:345 +#: archaeological_files/templates/ishtar/sheet_file.html:284 +#: archaeological_files/templates/ishtar/sheet_file.html:287 +#: archaeological_files/templates/ishtar/sheet_file.html:336 +#: archaeological_files/templates/ishtar/sheet_file.html:339 msgid "Days" msgstr "" #: archaeological_files/forms.py:893 archaeological_files/models.py:116 #: archaeological_files/models.py:1418 archaeological_files/models.py:1435 -#: archaeological_files/templates/ishtar/sheet_file.html:283 -#: archaeological_files/templates/ishtar/sheet_file.html:335 +#: archaeological_files/templates/ishtar/sheet_file.html:277 +#: archaeological_files/templates/ishtar/sheet_file.html:329 msgid "Job" msgstr "" @@ -2218,7 +2227,7 @@ msgid "Preventive file - 030 - Post-excavation" msgstr "" #: archaeological_files/forms.py:997 -#: archaeological_files/templates/ishtar/sheet_file.html:279 +#: archaeological_files/templates/ishtar/sheet_file.html:273 msgid "Ground jobs" msgstr "" @@ -2227,13 +2236,13 @@ msgid "Preventive file - 040 - Ground jobs" msgstr "" #: archaeological_files/forms.py:1005 archaeological_files/forms.py:1007 -#: archaeological_files/templates/ishtar/sheet_file.html:393 -#: archaeological_files/templates/ishtar/sheet_file.html:396 +#: archaeological_files/templates/ishtar/sheet_file.html:387 +#: archaeological_files/templates/ishtar/sheet_file.html:390 msgid "Quantity" msgstr "" #: archaeological_files/forms.py:1009 -#: archaeological_files/templates/ishtar/sheet_file.html:387 +#: archaeological_files/templates/ishtar/sheet_file.html:381 msgid "Equipment / service" msgstr "" @@ -2249,7 +2258,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:908 #: archaeological_finds/models_treatments.py:205 #: archaeological_finds/models_treatments.py:1107 -#: archaeological_finds/templates/ishtar/sheet_find.html:396 +#: archaeological_finds/templates/ishtar/sheet_find.html:365 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:391 #: archaeological_operations/forms.py:1448 #: archaeological_operations/forms.py:1581 @@ -2727,7 +2736,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:642 #: archaeological_finds/forms_treatments.py:724 #: archaeological_finds/models_treatments.py:1114 -#: archaeological_finds/templates/ishtar/sheet_find.html:536 +#: archaeological_finds/templates/ishtar/sheet_find.html:505 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:531 #: archaeological_operations/forms.py:507 #: archaeological_operations/forms.py:1136 @@ -2779,7 +2788,7 @@ msgstr "" #: archaeological_files/models.py:557 #: archaeological_finds/models_treatments.py:1123 -#: archaeological_finds/templates/ishtar/sheet_find.html:537 +#: archaeological_finds/templates/ishtar/sheet_find.html:506 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:532 #: archaeological_warehouse/forms.py:222 archaeological_warehouse/models.py:406 #: cd17_app/templates/ishtar/sheet_find.html:508 @@ -2810,10 +2819,6 @@ msgstr "" msgid "Main town" msgstr "" -#: archaeological_files/models.py:644 -msgid "Instruction deadline" -msgstr "" - #: archaeological_files/models.py:651 msgid "Main address" msgstr "" @@ -2965,9 +2970,9 @@ msgid "Change price agreement" msgstr "" #: archaeological_files/templates/ishtar/forms/preventive_detail.html:21 -#: archaeological_files/templates/ishtar/sheet_file.html:284 -#: archaeological_files/templates/ishtar/sheet_file.html:336 -#: archaeological_files/templates/ishtar/sheet_file.html:388 +#: archaeological_files/templates/ishtar/sheet_file.html:278 +#: archaeological_files/templates/ishtar/sheet_file.html:330 +#: archaeological_files/templates/ishtar/sheet_file.html:382 msgid "Planned" msgstr "" @@ -2992,32 +2997,41 @@ msgstr "" msgid "Back to the file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:77 +#: archaeological_files/templates/ishtar/sheet_file.html:68 +msgid "State of the file" +msgstr "" + +#: archaeological_files/templates/ishtar/sheet_file.html:70 msgid "Closed file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:114 +#: archaeological_files/templates/ishtar/sheet_file.html:108 msgid "Preventive archaeological file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:119 +#: archaeological_files/templates/ishtar/sheet_file.html:113 msgid "Developed surface" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:183 +#: archaeological_files/templates/ishtar/sheet_file.html:123 +msgid "Responsible for planning service address" +msgstr "" + +#: archaeological_files/templates/ishtar/sheet_file.html:177 #: archaeological_operations/templates/ishtar/sheet_operation.html:385 #: na_app/templates/ishtar/sheet_operation.html:353 #: sra_idf_app/templates/ishtar/sheet_operation.html:375 msgid "Associated parcels" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:186 +#: archaeological_files/templates/ishtar/sheet_file.html:180 #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 #: archaeological_finds/templates/ishtar/sheet_treatment.html:140 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:87 #: archaeological_operations/models.py:2933 #: archaeological_operations/templates/ishtar/sheet_operation.html:390 #: archaeological_operations/templates/ishtar/sheet_operation.html:527 +#: ishtar_common/templates/ishtar/sheet_document.html:125 #: na_app/templates/ishtar/sheet_operation.html:358 #: na_app/templates/ishtar/sheet_operation.html:495 #: sra_idf_app/templates/ishtar/sheet_operation.html:380 @@ -3025,13 +3039,13 @@ msgstr "" msgid "Administrative acts" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:189 +#: archaeological_files/templates/ishtar/sheet_file.html:183 #: archaeological_files/templates/ishtar/wizard/wizard_file_deletion.html:5 msgid "Associated operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:192 -#: archaeological_files/templates/ishtar/sheet_file.html:220 +#: archaeological_files/templates/ishtar/sheet_file.html:186 +#: archaeological_files/templates/ishtar/sheet_file.html:214 #: archaeological_operations/models.py:2665 #: archaeological_operations/models.py:2968 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 @@ -3042,15 +3056,15 @@ msgstr "" msgid "Ref." msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:194 -#: archaeological_files/templates/ishtar/sheet_file.html:221 +#: archaeological_files/templates/ishtar/sheet_file.html:188 +#: archaeological_files/templates/ishtar/sheet_file.html:215 #: archaeological_finds/forms_treatments.py:646 #: archaeological_finds/forms_treatments.py:735 #: archaeological_finds/models_treatments.py:131 -#: archaeological_finds/templates/ishtar/sheet_find.html:421 -#: archaeological_finds/templates/ishtar/sheet_find.html:459 -#: archaeological_finds/templates/ishtar/sheet_find.html:497 -#: archaeological_finds/templates/ishtar/sheet_find.html:535 +#: archaeological_finds/templates/ishtar/sheet_find.html:390 +#: archaeological_finds/templates/ishtar/sheet_find.html:428 +#: archaeological_finds/templates/ishtar/sheet_find.html:466 +#: archaeological_finds/templates/ishtar/sheet_find.html:504 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:416 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:454 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:492 @@ -3102,21 +3116,21 @@ msgstr "" msgid "Type" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:197 +#: archaeological_files/templates/ishtar/sheet_file.html:191 #: archaeological_operations/forms.py:791 #: archaeological_operations/models.py:1352 msgid "Excavation end date" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:212 +#: archaeological_files/templates/ishtar/sheet_file.html:206 msgid "No operation associated to this archaeological file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:216 +#: archaeological_files/templates/ishtar/sheet_file.html:210 msgid "Admninistrative acts linked to associated operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:222 +#: archaeological_files/templates/ishtar/sheet_file.html:216 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:9 #: archaeological_warehouse/forms.py:707 ishtar_common/admin.py:766 #: ishtar_common/models.py:736 ishtar_common/models.py:3411 @@ -3124,60 +3138,60 @@ msgstr "" msgid "Date" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:232 +#: archaeological_files/templates/ishtar/sheet_file.html:226 msgid "No administrative act linked to operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:238 +#: archaeological_files/templates/ishtar/sheet_file.html:232 msgid "Document for this archaeological file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:261 +#: archaeological_files/templates/ishtar/sheet_file.html:255 msgid "Total developed surface" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:276 +#: archaeological_files/templates/ishtar/sheet_file.html:270 msgid "Human and technical requirements" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:285 -#: archaeological_files/templates/ishtar/sheet_file.html:337 -#: archaeological_files/templates/ishtar/sheet_file.html:389 +#: archaeological_files/templates/ishtar/sheet_file.html:279 +#: archaeological_files/templates/ishtar/sheet_file.html:331 +#: archaeological_files/templates/ishtar/sheet_file.html:383 msgid "Effective" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:291 -#: archaeological_files/templates/ishtar/sheet_file.html:294 -#: archaeological_files/templates/ishtar/sheet_file.html:343 -#: archaeological_files/templates/ishtar/sheet_file.html:346 -#: archaeological_files/templates/ishtar/sheet_file.html:395 -#: archaeological_files/templates/ishtar/sheet_file.html:398 +#: archaeological_files/templates/ishtar/sheet_file.html:285 +#: archaeological_files/templates/ishtar/sheet_file.html:288 +#: archaeological_files/templates/ishtar/sheet_file.html:337 +#: archaeological_files/templates/ishtar/sheet_file.html:340 +#: archaeological_files/templates/ishtar/sheet_file.html:389 +#: archaeological_files/templates/ishtar/sheet_file.html:392 #: archaeological_operations/templates/ishtar/sheet_operation.html:224 #: na_app/templates/ishtar/sheet_operation.html:220 #: sra_idf_app/templates/ishtar/sheet_operation.html:220 msgid "Cost" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:309 -#: archaeological_files/templates/ishtar/sheet_file.html:361 -#: archaeological_files/templates/ishtar/sheet_file.html:417 +#: archaeological_files/templates/ishtar/sheet_file.html:303 +#: archaeological_files/templates/ishtar/sheet_file.html:355 +#: archaeological_files/templates/ishtar/sheet_file.html:411 #: archaeological_warehouse/templates/ishtar/sheet_container.html:246 #: archaeological_warehouse/templates/ishtar/sheet_container.html:270 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:201 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:226 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:203 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:228 #: ishtar_common/models.py:1985 ishtar_common/models.py:2017 #: na_app/templates/ishtar/sheet_container.html:252 #: na_app/templates/ishtar/sheet_container.html:276 msgid "Total" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:320 -#: archaeological_files/templates/ishtar/sheet_file.html:372 -#: archaeological_files/templates/ishtar/sheet_file.html:424 +#: archaeological_files/templates/ishtar/sheet_file.html:314 +#: archaeological_files/templates/ishtar/sheet_file.html:366 +#: archaeological_files/templates/ishtar/sheet_file.html:418 msgid "Difference" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:331 +#: archaeological_files/templates/ishtar/sheet_file.html:325 msgid "Post-excavation jobs" msgstr "" @@ -3741,7 +3755,7 @@ msgstr "" #: archaeological_finds/forms.py:989 archaeological_finds/forms.py:1466 #: archaeological_finds/forms.py:1651 -#: archaeological_finds/templates/ishtar/sheet_find.html:317 +#: archaeological_finds/templates/ishtar/sheet_find.html:286 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:312 #: cd17_app/templates/ishtar/sheet_find.html:287 #: man_app/templates/ishtar/sheet_museum_find.html:321 @@ -3768,7 +3782,7 @@ msgstr "" #: archaeological_finds/forms.py:1125 archaeological_finds/forms.py:1499 #: archaeological_finds/forms.py:1988 archaeological_finds/models_finds.py:1208 #: archaeological_finds/models_finds.py:2266 -#: archaeological_finds/templates/ishtar/sheet_find.html:321 +#: archaeological_finds/templates/ishtar/sheet_find.html:290 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:316 #: man_app/templates/ishtar/sheet_museum_find.html:325 msgid "Conservatory states" @@ -3960,6 +3974,7 @@ msgstr "E-Mail-Adresse" #: archaeological_finds/forms.py:1784 archaeological_operations/forms.py:502 #: archaeological_operations/forms.py:1242 ishtar_common/forms_common.py:1571 #: ishtar_common/models.py:2434 ishtar_common/models.py:3507 +#: ishtar_common/templates/ishtar/sheet_document.html:135 #: ishtar_common/templates/ishtar/sheet_town.html:80 msgid "Areas" msgstr "" @@ -4265,7 +4280,7 @@ msgstr "" #: archaeological_finds/forms.py:2160 archaeological_finds/models_finds.py:1165 #: archaeological_finds/models_finds.py:2108 -#: archaeological_finds/templates/ishtar/sheet_find.html:338 +#: archaeological_finds/templates/ishtar/sheet_find.html:307 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:333 #: cd17_app/templates/ishtar/sheet_find.html:308 #: ishtar_common/forms_common.py:2035 @@ -4281,7 +4296,7 @@ msgid "Reference container - Warehouse (location)" msgstr "" #: archaeological_finds/forms.py:2186 archaeological_finds/models_finds.py:1164 -#: archaeological_finds/templates/ishtar/sheet_find.html:363 +#: archaeological_finds/templates/ishtar/sheet_find.html:332 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:358 #: cd17_app/templates/ishtar/sheet_find.html:333 #: ishtar_common/forms_common.py:2027 @@ -4337,9 +4352,9 @@ msgstr "" #: archaeological_finds/forms_treatments.py:174 #: archaeological_finds/models_treatments.py:200 #: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 -#: archaeological_finds/templates/ishtar/sheet_find.html:420 -#: archaeological_finds/templates/ishtar/sheet_find.html:458 -#: archaeological_finds/templates/ishtar/sheet_find.html:496 +#: archaeological_finds/templates/ishtar/sheet_find.html:389 +#: archaeological_finds/templates/ishtar/sheet_find.html:427 +#: archaeological_finds/templates/ishtar/sheet_find.html:465 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:415 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:453 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:491 @@ -4535,9 +4550,9 @@ msgstr "" #: archaeological_finds/models_finds.py:3592 #: archaeological_finds/models_treatments.py:269 #: archaeological_finds/models_treatments.py:761 -#: archaeological_finds/templates/ishtar/sheet_find.html:425 -#: archaeological_finds/templates/ishtar/sheet_find.html:463 -#: archaeological_finds/templates/ishtar/sheet_find.html:501 +#: archaeological_finds/templates/ishtar/sheet_find.html:394 +#: archaeological_finds/templates/ishtar/sheet_find.html:432 +#: archaeological_finds/templates/ishtar/sheet_find.html:470 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:420 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:458 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:496 @@ -4549,7 +4564,7 @@ msgstr "" #: cd17_app/templates/ishtar/sheet_find.html:434 #: cd17_app/templates/ishtar/sheet_find.html:472 #: ishtar_common/forms_common.py:2560 ishtar_common/forms_common.py:2774 -#: ishtar_common/templates/ishtar/sheet_document.html:103 +#: ishtar_common/templates/ishtar/sheet_document.html:105 #: man_app/templates/ishtar/sheet_museum_find.html:429 #: man_app/templates/ishtar/sheet_museum_find.html:467 #: man_app/templates/ishtar/sheet_museum_find.html:505 @@ -4638,7 +4653,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:655 #: archaeological_finds/forms_treatments.py:743 #: archaeological_finds/models_treatments.py:1131 -#: archaeological_finds/templates/ishtar/sheet_find.html:538 +#: archaeological_finds/templates/ishtar/sheet_find.html:507 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:533 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:61 #: cd17_app/templates/ishtar/sheet_find.html:509 @@ -4652,7 +4667,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:661 #: archaeological_finds/forms_treatments.py:749 #: archaeological_finds/models_treatments.py:1139 -#: archaeological_finds/templates/ishtar/sheet_find.html:539 +#: archaeological_finds/templates/ishtar/sheet_find.html:508 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:534 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:69 #: cd17_app/templates/ishtar/sheet_find.html:510 @@ -4861,6 +4876,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1006 #: archaeological_finds/models_treatments.py:1196 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:77 +#: ishtar_common/templates/ishtar/sheet_document.html:130 msgid "Treatments" msgstr "" @@ -5820,7 +5836,7 @@ msgid "Weight unit" msgstr "" #: archaeological_finds/models_finds.py:2082 -#: archaeological_finds/templates/ishtar/sheet_find.html:453 +#: archaeological_finds/templates/ishtar/sheet_find.html:422 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:448 #: cd17_app/templates/ishtar/sheet_find.html:424 #: man_app/templates/ishtar/sheet_museum_find.html:457 @@ -5831,7 +5847,7 @@ msgid "Upstream treatment" msgstr "" #: archaeological_finds/models_finds.py:2089 -#: archaeological_finds/templates/ishtar/sheet_find.html:491 +#: archaeological_finds/templates/ishtar/sheet_find.html:460 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:486 #: cd17_app/templates/ishtar/sheet_find.html:462 #: man_app/templates/ishtar/sheet_museum_find.html:495 @@ -6011,9 +6027,9 @@ msgid "Downstream finds" msgstr "" #: archaeological_finds/models_treatments.py:762 -#: archaeological_finds/templates/ishtar/sheet_find.html:424 -#: archaeological_finds/templates/ishtar/sheet_find.html:462 -#: archaeological_finds/templates/ishtar/sheet_find.html:500 +#: archaeological_finds/templates/ishtar/sheet_find.html:393 +#: archaeological_finds/templates/ishtar/sheet_find.html:431 +#: archaeological_finds/templates/ishtar/sheet_find.html:469 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:419 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:457 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:495 @@ -6080,7 +6096,7 @@ msgid "exhibition-end-after" msgstr "" #: archaeological_finds/models_treatments.py:1184 -#: archaeological_finds/templates/ishtar/sheet_find.html:530 +#: archaeological_finds/templates/ishtar/sheet_find.html:499 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:525 #: cd17_app/templates/ishtar/sheet_find.html:501 #: man_app/templates/ishtar/sheet_museum_find.html:534 @@ -6203,7 +6219,7 @@ msgstr "" msgid "Museum entry date" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:297 +#: archaeological_finds/templates/ishtar/sheet_find.html:266 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:245 #: cd17_app/templates/ishtar/sheet_find.html:267 #: man_app/templates/ishtar/sheet_museum_find.html:254 @@ -6213,7 +6229,7 @@ msgstr "" msgid "Checked" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:334 +#: archaeological_finds/templates/ishtar/sheet_find.html:303 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:329 #: cd17_app/templates/ishtar/sheet_find.html:304 #: man_app/templates/ishtar/sheet_museum_find.html:338 @@ -6223,7 +6239,7 @@ msgstr "" msgid "Warehouse - container" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:364 +#: archaeological_finds/templates/ishtar/sheet_find.html:333 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:359 #: cd17_app/templates/ishtar/sheet_find.html:334 #: man_app/templates/ishtar/sheet_museum_find.html:368 @@ -6233,7 +6249,7 @@ msgstr "" msgid "Reference container / current container" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:408 +#: archaeological_finds/templates/ishtar/sheet_find.html:377 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:403 #: cd17_app/templates/ishtar/sheet_find.html:378 #: man_app/templates/ishtar/sheet_museum_find.html:412 @@ -6243,7 +6259,7 @@ msgstr "" msgid "Container information not available." msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:415 +#: archaeological_finds/templates/ishtar/sheet_find.html:384 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:410 #: cd17_app/templates/ishtar/sheet_find.html:386 #: man_app/templates/ishtar/sheet_museum_find.html:419 @@ -6253,10 +6269,10 @@ msgstr "" msgid "Simple treatments" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:419 -#: archaeological_finds/templates/ishtar/sheet_find.html:457 -#: archaeological_finds/templates/ishtar/sheet_find.html:495 -#: archaeological_finds/templates/ishtar/sheet_find.html:534 +#: archaeological_finds/templates/ishtar/sheet_find.html:388 +#: archaeological_finds/templates/ishtar/sheet_find.html:426 +#: archaeological_finds/templates/ishtar/sheet_find.html:464 +#: archaeological_finds/templates/ishtar/sheet_find.html:503 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:414 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:452 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:490 @@ -6284,9 +6300,9 @@ msgstr "" msgid "Year - index" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:423 -#: archaeological_finds/templates/ishtar/sheet_find.html:461 -#: archaeological_finds/templates/ishtar/sheet_find.html:499 +#: archaeological_finds/templates/ishtar/sheet_find.html:392 +#: archaeological_finds/templates/ishtar/sheet_find.html:430 +#: archaeological_finds/templates/ishtar/sheet_find.html:468 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:418 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:456 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:494 @@ -6308,7 +6324,7 @@ msgstr "" msgid "Related finds (max. 15 displayed)" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:487 +#: archaeological_finds/templates/ishtar/sheet_find.html:456 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:482 #: cd17_app/templates/ishtar/sheet_find.html:458 #: ishtar_common/templates/blocks/DataTables-content.html:39 @@ -6323,8 +6339,8 @@ msgstr "" msgid "Export as CSV" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:487 -#: archaeological_finds/templates/ishtar/sheet_find.html:526 +#: archaeological_finds/templates/ishtar/sheet_find.html:456 +#: archaeological_finds/templates/ishtar/sheet_find.html:495 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:482 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:521 #: cd17_app/templates/ishtar/sheet_find.html:458 @@ -6344,7 +6360,7 @@ msgstr "" msgid "CSV" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:568 +#: archaeological_finds/templates/ishtar/sheet_find.html:537 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:563 #: archaeological_finds/templates/ishtar/sheet_treatment.html:132 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:82 @@ -6365,7 +6381,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:35 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:31 #: ishtar_common/forms_common.py:2230 -#: ishtar_common/templates/ishtar/sheet_document.html:58 +#: ishtar_common/templates/ishtar/sheet_document.html:60 #: na_app/templates/ishtar/sheet_container.html:35 msgid "Content" msgstr "" @@ -7544,6 +7560,7 @@ msgstr "E-Mail-Adresse" #: archaeological_operations/models.py:1590 #: archaeological_operations/templates/ishtar/sheet_site.html:86 #: ishtar_common/models.py:1039 +#: ishtar_common/templates/ishtar/sheet_document.html:127 #: ishtar_common/templates/ishtar/sheet_town.html:114 msgid "Operations" msgstr "" @@ -7859,7 +7876,9 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:80 #: archaeological_operations/templates/ishtar/sheet_operation.html:440 #: archaeological_operations/templates/ishtar/sheet_operation.html:538 -#: ishtar_common/models.py:1039 na_app/templates/ishtar/sheet_operation.html:80 +#: ishtar_common/models.py:1039 +#: ishtar_common/templates/ishtar/sheet_document.html:128 +#: na_app/templates/ishtar/sheet_operation.html:80 #: na_app/templates/ishtar/sheet_operation.html:408 #: na_app/templates/ishtar/sheet_operation.html:506 #: sra_idf_app/templates/ishtar/sheet_operation.html:80 @@ -7873,7 +7892,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:42 #: archaeological_warehouse/templates/ishtar/sheet_container.html:209 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:38 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:164 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:166 #: ishtar_common/templates/blocks/DataTables-tabs.html:30 #: na_app/templates/ishtar/sheet_container.html:42 #: na_app/templates/ishtar/sheet_container.html:215 @@ -7935,7 +7954,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:512 #: archaeological_warehouse/templates/ishtar/sheet_container.html:214 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:169 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:171 #: ishtar_common/models_rest.py:77 #: ishtar_common/templates/blocks/DataTables-content.html:28 #: ishtar_common/templates/blocks/DataTables-content.html:101 @@ -7951,7 +7970,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:517 #: archaeological_warehouse/templates/ishtar/sheet_container.html:219 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:174 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:176 #: na_app/templates/ishtar/sheet_container.html:225 #: na_app/templates/ishtar/sheet_operation.html:485 #: sra_idf_app/templates/ishtar/sheet_operation.html:507 @@ -7960,7 +7979,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:522 #: archaeological_warehouse/templates/ishtar/sheet_container.html:224 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:179 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:181 #: na_app/templates/ishtar/sheet_container.html:230 #: na_app/templates/ishtar/sheet_operation.html:490 #: sra_idf_app/templates/ishtar/sheet_operation.html:512 @@ -8132,7 +8151,7 @@ msgstr "" #: archaeological_warehouse/forms.py:130 archaeological_warehouse/models.py:421 #: archaeological_warehouse/templates/ishtar/sheet_container.html:182 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:132 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:134 #: na_app/templates/ishtar/sheet_container.html:188 msgid "Divisions" msgstr "" @@ -8192,16 +8211,19 @@ msgstr "" msgid "Country" msgstr "" -#: archaeological_warehouse/forms.py:251 ishtar_common/forms_common.py:775 -#: ishtar_common/forms_common.py:1152 ishtar_common/models_common.py:3678 -#: ishtar_common/models_common.py:3854 +#: archaeological_warehouse/forms.py:251 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:125 +#: ishtar_common/forms_common.py:775 ishtar_common/forms_common.py:1152 +#: ishtar_common/models_common.py:3678 ishtar_common/models_common.py:3854 #: ishtar_common/templates/ishtar/sheet_person.html:28 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:34 msgid "Phone" msgstr "" -#: archaeological_warehouse/forms.py:253 ishtar_common/forms_common.py:777 -#: ishtar_common/forms_common.py:1162 ishtar_common/models_common.py:3694 +#: archaeological_warehouse/forms.py:253 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:126 +#: ishtar_common/forms_common.py:777 ishtar_common/forms_common.py:1162 +#: ishtar_common/models_common.py:3694 #: ishtar_common/templates/ishtar/sheet_person.html:46 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:55 msgid "Mobile phone" @@ -8369,8 +8391,9 @@ msgstr "" #: archaeological_warehouse/ishtar_menu.py:70 #: archaeological_warehouse/models.py:1213 #: archaeological_warehouse/templates/ishtar/sheet_container.html:184 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:134 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:216 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:136 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:218 +#: ishtar_common/templates/ishtar/sheet_document.html:133 #: na_app/templates/ishtar/sheet_container.html:190 msgid "Containers" msgstr "" @@ -8406,6 +8429,7 @@ msgid "Automatically generated" msgstr "" #: archaeological_warehouse/models.py:458 +#: ishtar_common/templates/ishtar/sheet_document.html:132 #: ishtar_common/templates/ishtar/sheet_organization.html:49 msgid "Warehouses" msgstr "" @@ -8698,39 +8722,43 @@ msgstr "" msgid "Default divisions (imports)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:139 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:115 +msgid "Geographic localisation/contact details" +msgstr "" + +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:141 msgid "No container inside this warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:143 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:145 msgid "Finds (hosted)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:148 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:150 msgid "No find inside this warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:152 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:154 msgid "Finds (owned)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:157 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:159 msgid "No find owned by this warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:187 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:189 msgid "No container/division inside this container" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:193 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:195 msgid "Finds by location in the warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:218 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:220 msgid "Containers by location in the warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:246 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:248 msgid "Document for this warehouse" msgstr "" @@ -10134,7 +10162,7 @@ msgstr "" #: ishtar_common/models.py:4668 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:9 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:9 -#: ishtar_common/templates/ishtar/sheet_document.html:67 +#: ishtar_common/templates/ishtar/sheet_document.html:69 msgid "Authors" msgstr "" @@ -10190,7 +10218,7 @@ msgstr "" #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:8 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:27 #: ishtar_common/templates/ishtar/import_table.html:2 -#: ishtar_common/templates/ishtar/sheet_document.html:96 +#: ishtar_common/templates/ishtar/sheet_document.html:98 #: ishtar_common/templates/ishtar/sheet_import_gen.html:2 #: ishtar_common/views.py:2318 msgid "Source" @@ -10221,7 +10249,7 @@ msgid "Image" msgstr "" #: ishtar_common/forms_common.py:2144 -#: ishtar_common/templates/ishtar/sheet_document.html:59 +#: ishtar_common/templates/ishtar/sheet_document.html:61 msgctxt "Not directory" msgid "File" msgstr "" @@ -10254,7 +10282,7 @@ msgid "Related items" msgstr "" #: ishtar_common/forms_common.py:2233 -#: ishtar_common/templates/ishtar/sheet_document.html:84 +#: ishtar_common/templates/ishtar/sheet_document.html:86 msgid "Publishing" msgstr "" @@ -10763,6 +10791,7 @@ msgid "Archaeological entity" msgstr "" #: ishtar_common/models.py:1044 +#: ishtar_common/templates/ishtar/sheet_document.html:126 #: ishtar_common/templates/ishtar/sheet_town.html:119 msgid "Sites" msgstr "" @@ -14655,7 +14684,7 @@ msgstr "" msgid "You have locked this item." msgstr "" -#: ishtar_common/templates/ishtar/sheet_document.html:61 +#: ishtar_common/templates/ishtar/sheet_document.html:63 msgid "Web link" msgstr "" @@ -14667,6 +14696,10 @@ msgstr "" msgid "Files" msgstr "" +#: ishtar_common/templates/ishtar/sheet_document.html:131 +msgid "Treatment files" +msgstr "" + #: ishtar_common/templates/ishtar/sheet_import.html:4 msgid "Import" msgstr "" diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 793d27d31..2ca13cf40 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-06 16:24+0200\n" +"POT-Creation-Date: 2024-06-07 15:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -374,9 +374,9 @@ msgstr "" #: archaeological_context_records/forms.py:341 #: archaeological_context_records/models.py:756 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:235 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:239 #: archaeological_files/models.py:609 -#: archaeological_files/templates/ishtar/sheet_file.html:82 +#: archaeological_files/templates/ishtar/sheet_file.html:75 #: archaeological_finds/forms_treatments.py:182 #: archaeological_finds/forms_treatments.py:667 #: archaeological_finds/forms_treatments.py:773 @@ -434,12 +434,12 @@ msgstr "" #: archaeological_context_records/models.py:530 #: archaeological_finds/forms.py:1149 archaeological_finds/forms.py:1566 #: archaeological_finds/models_finds.py:1204 -#: archaeological_finds/templates/ishtar/sheet_find.html:258 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:206 #: archaeological_operations/forms.py:841 #: archaeological_operations/templates/ishtar/sheet_operation.html:556 #: archaeological_operations/templates/ishtar/sheet_operation.html:593 #: cd17_app/templates/ishtar/sheet_find.html:229 +#: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:4 #: man_app/templates/ishtar/sheet_museum_find.html:215 #: na_app/templates/ishtar/sheet_find.html:233 #: na_app/templates/ishtar/sheet_operation.html:524 @@ -455,17 +455,16 @@ msgstr "" #: archaeological_context_records/models.py:111 #: archaeological_files/forms.py:786 archaeological_files/models.py:76 #: archaeological_files/models.py:715 -#: archaeological_files/templates/ishtar/sheet_file.html:196 +#: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_finds/forms.py:1568 #: archaeological_finds/forms_treatments.py:180 #: archaeological_finds/forms_treatments.py:770 #: archaeological_finds/models_finds.py:3623 #: archaeological_finds/models_treatments.py:264 #: archaeological_finds/models_treatments.py:758 -#: archaeological_finds/templates/ishtar/sheet_find.html:259 -#: archaeological_finds/templates/ishtar/sheet_find.html:426 -#: archaeological_finds/templates/ishtar/sheet_find.html:464 -#: archaeological_finds/templates/ishtar/sheet_find.html:502 +#: archaeological_finds/templates/ishtar/sheet_find.html:395 +#: archaeological_finds/templates/ishtar/sheet_find.html:433 +#: archaeological_finds/templates/ishtar/sheet_find.html:471 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:207 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:421 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:459 @@ -478,6 +477,7 @@ msgstr "" #: cd17_app/templates/ishtar/sheet_find.html:397 #: cd17_app/templates/ishtar/sheet_find.html:435 #: cd17_app/templates/ishtar/sheet_find.html:473 +#: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:5 #: man_app/templates/ishtar/sheet_museum_find.html:216 #: man_app/templates/ishtar/sheet_museum_find.html:430 #: man_app/templates/ishtar/sheet_museum_find.html:468 @@ -503,11 +503,10 @@ msgstr "" #: archaeological_files/models.py:716 archaeological_finds/forms.py:1569 #: archaeological_finds/models_finds.py:3624 #: archaeological_finds/models_treatments.py:759 -#: archaeological_finds/templates/ishtar/sheet_find.html:260 -#: archaeological_finds/templates/ishtar/sheet_find.html:427 -#: archaeological_finds/templates/ishtar/sheet_find.html:465 -#: archaeological_finds/templates/ishtar/sheet_find.html:503 -#: archaeological_finds/templates/ishtar/sheet_find.html:541 +#: archaeological_finds/templates/ishtar/sheet_find.html:396 +#: archaeological_finds/templates/ishtar/sheet_find.html:434 +#: archaeological_finds/templates/ishtar/sheet_find.html:472 +#: archaeological_finds/templates/ishtar/sheet_find.html:510 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:208 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:422 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:460 @@ -521,6 +520,7 @@ msgstr "" #: cd17_app/templates/ishtar/sheet_find.html:474 #: cd17_app/templates/ishtar/sheet_find.html:512 #: ishtar_common/models_imports.py:1439 +#: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:6 #: man_app/templates/ishtar/sheet_museum_find.html:217 #: man_app/templates/ishtar/sheet_museum_find.html:431 #: man_app/templates/ishtar/sheet_museum_find.html:469 @@ -547,9 +547,9 @@ msgstr "" #: archaeological_context_records/forms.py:454 #: archaeological_context_records/models.py:122 #: archaeological_finds/forms.py:1570 -#: archaeological_finds/templates/ishtar/sheet_find.html:262 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:210 #: cd17_app/templates/ishtar/sheet_find.html:233 +#: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:8 #: man_app/templates/ishtar/sheet_museum_find.html:219 #: na_app/templates/ishtar/sheet_find.html:237 #: pdl_app/templates/ishtar/sheet_find.html:228 @@ -561,9 +561,9 @@ msgstr "" #: archaeological_context_records/models.py:84 #: archaeological_context_records/models.py:115 #: archaeological_finds/forms.py:1567 -#: archaeological_finds/templates/ishtar/sheet_find.html:261 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:209 #: cd17_app/templates/ishtar/sheet_find.html:232 +#: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:7 #: man_app/templates/ishtar/sheet_museum_find.html:218 #: na_app/templates/ishtar/sheet_find.html:236 #: pdl_app/templates/ishtar/sheet_find.html:227 @@ -574,8 +574,8 @@ msgstr "" #: archaeological_context_records/forms.py:456 #: archaeological_context_records/models.py:127 #: archaeological_finds/forms.py:1571 -#: archaeological_finds/templates/ishtar/sheet_find.html:263 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:211 +#: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:9 msgid "Precise on this dating" msgstr "" @@ -619,7 +619,7 @@ msgstr "" #: archaeological_context_records/forms.py:515 #: archaeological_context_records/models.py:784 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:49 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:185 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:186 msgid "Interpretation" msgstr "" @@ -628,6 +628,7 @@ msgid "Context record - 040 - Interpretation" msgstr "" #: archaeological_context_records/forms.py:521 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:202 msgid "Dating complements" msgstr "" @@ -1439,7 +1440,7 @@ msgid "Operation / Archaeological site" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:74 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:266 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:270 #: archaeological_finds/forms.py:2331 archaeological_finds/models_finds.py:98 #: archaeological_finds/models_finds.py:112 #: archaeological_finds/models_finds.py:129 @@ -1470,7 +1471,8 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:92 #: archaeological_warehouse/templates/ishtar/sheet_container.html:189 #: archaeological_warehouse/templates/ishtar/sheet_container.html:236 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:192 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:194 +#: ishtar_common/templates/ishtar/sheet_document.html:129 #: na_app/templates/ishtar/sheet_container.html:195 #: na_app/templates/ishtar/sheet_container.html:242 #: na_app/templates/ishtar/sheet_operation.html:89 @@ -1484,7 +1486,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:101 #: archaeological_finds/templates/ishtar/sheet_find.html:74 -#: archaeological_finds/templates/ishtar/sheet_find.html:581 +#: archaeological_finds/templates/ishtar/sheet_find.html:550 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:74 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:576 #: archaeological_operations/templates/ishtar/sheet_operation.html:98 @@ -1542,9 +1544,9 @@ msgstr "" msgid "Complete identifier" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:151 -#: archaeological_files/templates/ishtar/sheet_file.html:104 -#: archaeological_files/templates/ishtar/sheet_file.html:269 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:152 +#: archaeological_files/templates/ishtar/sheet_file.html:98 +#: archaeological_files/templates/ishtar/sheet_file.html:263 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:58 #: archaeological_operations/templates/ishtar/sheet_operation.html:216 #: ishtar_common/templates/ishtar/sheet_town.html:71 @@ -1553,14 +1555,13 @@ msgstr "" msgid "Surface" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:166 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:167 #: archaeological_files/forms.py:286 -#: archaeological_files/templates/ishtar/sheet_file.html:95 +#: archaeological_files/templates/ishtar/sheet_file.html:88 #: archaeological_finds/templates/ishtar/sheet_basefind.html:59 #: archaeological_operations/templates/ishtar/sheet_operation.html:332 #: archaeological_operations/templates/ishtar/sheet_site.html:67 #: archaeological_warehouse/templates/ishtar/sheet_container.html:168 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:115 #: ishtar_common/templates/ishtar/sheet_town.html:95 #: man_app/templates/ishtar/sheet_basefind.html:56 #: na_app/templates/ishtar/sheet_container.html:174 @@ -1569,11 +1570,11 @@ msgstr "" msgid "Geographic localisation" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:177 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:178 #: archaeological_finds/forms.py:546 archaeological_finds/forms.py:827 #: archaeological_finds/forms.py:987 #: archaeological_finds/templates/ishtar/sheet_basefind.html:70 -#: archaeological_finds/templates/ishtar/sheet_find.html:295 +#: archaeological_finds/templates/ishtar/sheet_find.html:264 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:243 #: archaeological_operations/templates/ishtar/sheet_operation.html:353 #: cd17_app/templates/ishtar/sheet_find.html:265 @@ -1589,29 +1590,28 @@ msgstr "" msgid "Sheet" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:214 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:218 msgid "Operation summary" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:217 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:221 #: archaeological_operations/templates/ishtar/sheet_operation.html:303 #: na_app/templates/ishtar/sheet_operation.html:285 #: sra_idf_app/templates/ishtar/sheet_operation.html:293 msgid "Patriarche OA code not yet recorded!" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:223 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:227 msgid "Numerical reference" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:229 -#: archaeological_files/templates/ishtar/sheet_file.html:75 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:233 #: archaeological_finds/forms_treatments.py:144 #: archaeological_finds/models_treatments.py:132 #: archaeological_finds/models_treatments.py:219 -#: archaeological_finds/templates/ishtar/sheet_find.html:422 -#: archaeological_finds/templates/ishtar/sheet_find.html:460 -#: archaeological_finds/templates/ishtar/sheet_find.html:498 +#: archaeological_finds/templates/ishtar/sheet_find.html:391 +#: archaeological_finds/templates/ishtar/sheet_find.html:429 +#: archaeological_finds/templates/ishtar/sheet_find.html:467 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:417 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:455 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:493 @@ -1640,64 +1640,64 @@ msgstr "" msgid "State" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:230 -#: archaeological_files/templates/ishtar/sheet_file.html:77 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:234 +#: archaeological_files/templates/ishtar/sheet_file.html:70 #: archaeological_operations/templates/ishtar/sheet_operation.html:184 #: na_app/templates/ishtar/sheet_operation.html:180 #: sra_idf_app/templates/ishtar/sheet_operation.html:180 msgid "Active file" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:230 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:234 #: archaeological_operations/templates/ishtar/sheet_operation.html:187 #: na_app/templates/ishtar/sheet_operation.html:183 #: sra_idf_app/templates/ishtar/sheet_operation.html:183 msgid "Closed operation" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:237 -#: archaeological_files/templates/ishtar/sheet_file.html:84 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:241 +#: archaeological_files/templates/ishtar/sheet_file.html:77 #: archaeological_operations/templates/ishtar/sheet_operation.html:210 #: na_app/templates/ishtar/sheet_operation.html:206 #: sra_idf_app/templates/ishtar/sheet_operation.html:206 msgid "by" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:249 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:253 msgid "No operation linked to this context record!" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:271 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:275 msgid "No associated finds." msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:275 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:279 #: archaeological_operations/templates/ishtar/sheet_operation.html:478 #: na_app/templates/ishtar/sheet_operation.html:446 #: sra_idf_app/templates/ishtar/sheet_operation.html:468 msgid "Documents from associated finds" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:288 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:292 #: archaeological_operations/templates/ishtar/sheet_operation.html:444 #: na_app/templates/ishtar/sheet_operation.html:412 #: sra_idf_app/templates/ishtar/sheet_operation.html:434 msgid "Context record relations" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:294 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:298 msgid "Diagram of stratigraphic relations - above" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:302 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:306 msgid "Diagram of stratigraphic relations - below" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:310 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:314 msgid "Diagram of stratigraphic relations - full" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:326 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:330 msgid "Document from this context record" msgstr "" @@ -1750,7 +1750,7 @@ msgstr "" #: archaeological_files/forms.py:237 archaeological_files/forms.py:667 #: archaeological_files/forms.py:1122 archaeological_files/forms.py:1158 #: archaeological_files/models.py:388 archaeological_files/models.py:539 -#: archaeological_files/templates/ishtar/sheet_file.html:219 +#: archaeological_files/templates/ishtar/sheet_file.html:213 #: archaeological_finds/forms.py:1746 #: archaeological_finds/forms_treatments.py:58 #: archaeological_finds/forms_treatments.py:146 @@ -1830,6 +1830,8 @@ msgstr "" #: archaeological_files/forms.py:104 archaeological_files/forms.py:531 #: archaeological_files/models.py:607 +#: archaeological_files/templates/ishtar/sheet_file.html:131 +#: archaeological_operations/templates/ishtar/sheet_operation.html:280 msgid "Permit/order reference" msgstr "" @@ -1865,7 +1867,7 @@ msgstr "" #: archaeological_files/forms.py:107 archaeological_files/forms.py:378 #: archaeological_files/forms.py:447 -#: archaeological_files/templates/ishtar/sheet_file.html:195 +#: archaeological_files/templates/ishtar/sheet_file.html:189 #: archaeological_finds/forms_treatments.py:649 msgid "In charge" msgstr "" @@ -1915,7 +1917,7 @@ msgstr "" #: archaeological_files/models.py:624 #: archaeological_finds/forms_treatments.py:768 #: archaeological_finds/models_treatments.py:1148 -#: archaeological_finds/templates/ishtar/sheet_find.html:540 +#: archaeological_finds/templates/ishtar/sheet_find.html:509 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:535 #: cd17_app/templates/ishtar/sheet_find.html:511 #: man_app/templates/ishtar/sheet_museum_find.html:544 @@ -1967,6 +1969,7 @@ msgstr "" #: ishtar_common/forms_common.py:1810 ishtar_common/models.py:2408 #: ishtar_common/models_common.py:3414 #: ishtar_common/templates/ishtar/sheet_area.html:71 +#: ishtar_common/templates/ishtar/sheet_document.html:134 #: na_app/templates/ishtar/sheet_operation.html:146 #: sra_idf_app/templates/ishtar/sheet_operation.html:146 msgid "Towns" @@ -2070,7 +2073,7 @@ msgid "Responsible for planning service" msgstr "" #: archaeological_files/forms.py:565 -#: archaeological_files/templates/ishtar/sheet_file.html:150 +#: archaeological_files/templates/ishtar/sheet_file.html:144 msgid "Research archaeology" msgstr "" @@ -2109,6 +2112,7 @@ msgid "Archaeological file - 050 - Instruction" msgstr "" #: archaeological_files/forms.py:644 +#: archaeological_files/templates/ishtar/sheet_file.html:66 msgid "File managed by" msgstr "" @@ -2116,6 +2120,11 @@ msgstr "" msgid "Related file" msgstr "" +#: archaeological_files/forms.py:665 archaeological_files/models.py:644 +#: archaeological_files/templates/ishtar/sheet_file.html:64 +msgid "Instruction deadline" +msgstr "" + #: archaeological_files/forms.py:730 msgid "Would you like to close this archaeological file?" msgstr "" @@ -2133,7 +2142,7 @@ msgid "Preventive file - 020 - Edition form" msgstr "" #: archaeological_files/forms.py:746 ishtar_common/forms_common.py:2232 -#: ishtar_common/templates/ishtar/sheet_document.html:77 +#: ishtar_common/templates/ishtar/sheet_document.html:79 msgid "Dates" msgstr "" @@ -2170,25 +2179,25 @@ msgid "Linear meter (m)" msgstr "" #: archaeological_files/forms.py:889 archaeological_files/forms.py:891 -#: archaeological_files/templates/ishtar/sheet_file.html:289 -#: archaeological_files/templates/ishtar/sheet_file.html:292 -#: archaeological_files/templates/ishtar/sheet_file.html:341 -#: archaeological_files/templates/ishtar/sheet_file.html:344 +#: archaeological_files/templates/ishtar/sheet_file.html:283 +#: archaeological_files/templates/ishtar/sheet_file.html:286 +#: archaeological_files/templates/ishtar/sheet_file.html:335 +#: archaeological_files/templates/ishtar/sheet_file.html:338 msgid "Man by day" msgstr "" #: archaeological_files/forms.py:890 archaeological_files/forms.py:892 -#: archaeological_files/templates/ishtar/sheet_file.html:290 -#: archaeological_files/templates/ishtar/sheet_file.html:293 -#: archaeological_files/templates/ishtar/sheet_file.html:342 -#: archaeological_files/templates/ishtar/sheet_file.html:345 +#: archaeological_files/templates/ishtar/sheet_file.html:284 +#: archaeological_files/templates/ishtar/sheet_file.html:287 +#: archaeological_files/templates/ishtar/sheet_file.html:336 +#: archaeological_files/templates/ishtar/sheet_file.html:339 msgid "Days" msgstr "" #: archaeological_files/forms.py:893 archaeological_files/models.py:116 #: archaeological_files/models.py:1418 archaeological_files/models.py:1435 -#: archaeological_files/templates/ishtar/sheet_file.html:283 -#: archaeological_files/templates/ishtar/sheet_file.html:335 +#: archaeological_files/templates/ishtar/sheet_file.html:277 +#: archaeological_files/templates/ishtar/sheet_file.html:329 msgid "Job" msgstr "" @@ -2207,7 +2216,7 @@ msgid "Preventive file - 030 - Post-excavation" msgstr "" #: archaeological_files/forms.py:997 -#: archaeological_files/templates/ishtar/sheet_file.html:279 +#: archaeological_files/templates/ishtar/sheet_file.html:273 msgid "Ground jobs" msgstr "" @@ -2216,13 +2225,13 @@ msgid "Preventive file - 040 - Ground jobs" msgstr "" #: archaeological_files/forms.py:1005 archaeological_files/forms.py:1007 -#: archaeological_files/templates/ishtar/sheet_file.html:393 -#: archaeological_files/templates/ishtar/sheet_file.html:396 +#: archaeological_files/templates/ishtar/sheet_file.html:387 +#: archaeological_files/templates/ishtar/sheet_file.html:390 msgid "Quantity" msgstr "" #: archaeological_files/forms.py:1009 -#: archaeological_files/templates/ishtar/sheet_file.html:387 +#: archaeological_files/templates/ishtar/sheet_file.html:381 msgid "Equipment / service" msgstr "" @@ -2238,7 +2247,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:908 #: archaeological_finds/models_treatments.py:205 #: archaeological_finds/models_treatments.py:1107 -#: archaeological_finds/templates/ishtar/sheet_find.html:396 +#: archaeological_finds/templates/ishtar/sheet_find.html:365 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:391 #: archaeological_operations/forms.py:1448 #: archaeological_operations/forms.py:1581 @@ -2716,7 +2725,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:642 #: archaeological_finds/forms_treatments.py:724 #: archaeological_finds/models_treatments.py:1114 -#: archaeological_finds/templates/ishtar/sheet_find.html:536 +#: archaeological_finds/templates/ishtar/sheet_find.html:505 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:531 #: archaeological_operations/forms.py:507 #: archaeological_operations/forms.py:1136 @@ -2768,7 +2777,7 @@ msgstr "" #: archaeological_files/models.py:557 #: archaeological_finds/models_treatments.py:1123 -#: archaeological_finds/templates/ishtar/sheet_find.html:537 +#: archaeological_finds/templates/ishtar/sheet_find.html:506 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:532 #: archaeological_warehouse/forms.py:222 archaeological_warehouse/models.py:406 #: cd17_app/templates/ishtar/sheet_find.html:508 @@ -2799,10 +2808,6 @@ msgstr "" msgid "Main town" msgstr "" -#: archaeological_files/models.py:644 -msgid "Instruction deadline" -msgstr "" - #: archaeological_files/models.py:651 msgid "Main address" msgstr "" @@ -2954,9 +2959,9 @@ msgid "Change price agreement" msgstr "" #: archaeological_files/templates/ishtar/forms/preventive_detail.html:21 -#: archaeological_files/templates/ishtar/sheet_file.html:284 -#: archaeological_files/templates/ishtar/sheet_file.html:336 -#: archaeological_files/templates/ishtar/sheet_file.html:388 +#: archaeological_files/templates/ishtar/sheet_file.html:278 +#: archaeological_files/templates/ishtar/sheet_file.html:330 +#: archaeological_files/templates/ishtar/sheet_file.html:382 msgid "Planned" msgstr "" @@ -2981,32 +2986,41 @@ msgstr "" msgid "Back to the file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:77 +#: archaeological_files/templates/ishtar/sheet_file.html:68 +msgid "State of the file" +msgstr "" + +#: archaeological_files/templates/ishtar/sheet_file.html:70 msgid "Closed file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:114 +#: archaeological_files/templates/ishtar/sheet_file.html:108 msgid "Preventive archaeological file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:119 +#: archaeological_files/templates/ishtar/sheet_file.html:113 msgid "Developed surface" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:183 +#: archaeological_files/templates/ishtar/sheet_file.html:123 +msgid "Responsible for planning service address" +msgstr "" + +#: archaeological_files/templates/ishtar/sheet_file.html:177 #: archaeological_operations/templates/ishtar/sheet_operation.html:385 #: na_app/templates/ishtar/sheet_operation.html:353 #: sra_idf_app/templates/ishtar/sheet_operation.html:375 msgid "Associated parcels" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:186 +#: archaeological_files/templates/ishtar/sheet_file.html:180 #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 #: archaeological_finds/templates/ishtar/sheet_treatment.html:140 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:87 #: archaeological_operations/models.py:2933 #: archaeological_operations/templates/ishtar/sheet_operation.html:390 #: archaeological_operations/templates/ishtar/sheet_operation.html:527 +#: ishtar_common/templates/ishtar/sheet_document.html:125 #: na_app/templates/ishtar/sheet_operation.html:358 #: na_app/templates/ishtar/sheet_operation.html:495 #: sra_idf_app/templates/ishtar/sheet_operation.html:380 @@ -3014,13 +3028,13 @@ msgstr "" msgid "Administrative acts" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:189 +#: archaeological_files/templates/ishtar/sheet_file.html:183 #: archaeological_files/templates/ishtar/wizard/wizard_file_deletion.html:5 msgid "Associated operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:192 -#: archaeological_files/templates/ishtar/sheet_file.html:220 +#: archaeological_files/templates/ishtar/sheet_file.html:186 +#: archaeological_files/templates/ishtar/sheet_file.html:214 #: archaeological_operations/models.py:2665 #: archaeological_operations/models.py:2968 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 @@ -3031,15 +3045,15 @@ msgstr "" msgid "Ref." msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:194 -#: archaeological_files/templates/ishtar/sheet_file.html:221 +#: archaeological_files/templates/ishtar/sheet_file.html:188 +#: archaeological_files/templates/ishtar/sheet_file.html:215 #: archaeological_finds/forms_treatments.py:646 #: archaeological_finds/forms_treatments.py:735 #: archaeological_finds/models_treatments.py:131 -#: archaeological_finds/templates/ishtar/sheet_find.html:421 -#: archaeological_finds/templates/ishtar/sheet_find.html:459 -#: archaeological_finds/templates/ishtar/sheet_find.html:497 -#: archaeological_finds/templates/ishtar/sheet_find.html:535 +#: archaeological_finds/templates/ishtar/sheet_find.html:390 +#: archaeological_finds/templates/ishtar/sheet_find.html:428 +#: archaeological_finds/templates/ishtar/sheet_find.html:466 +#: archaeological_finds/templates/ishtar/sheet_find.html:504 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:416 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:454 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:492 @@ -3091,21 +3105,21 @@ msgstr "" msgid "Type" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:197 +#: archaeological_files/templates/ishtar/sheet_file.html:191 #: archaeological_operations/forms.py:791 #: archaeological_operations/models.py:1352 msgid "Excavation end date" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:212 +#: archaeological_files/templates/ishtar/sheet_file.html:206 msgid "No operation associated to this archaeological file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:216 +#: archaeological_files/templates/ishtar/sheet_file.html:210 msgid "Admninistrative acts linked to associated operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:222 +#: archaeological_files/templates/ishtar/sheet_file.html:216 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:9 #: archaeological_warehouse/forms.py:707 ishtar_common/admin.py:766 #: ishtar_common/models.py:736 ishtar_common/models.py:3411 @@ -3113,60 +3127,60 @@ msgstr "" msgid "Date" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:232 +#: archaeological_files/templates/ishtar/sheet_file.html:226 msgid "No administrative act linked to operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:238 +#: archaeological_files/templates/ishtar/sheet_file.html:232 msgid "Document for this archaeological file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:261 +#: archaeological_files/templates/ishtar/sheet_file.html:255 msgid "Total developed surface" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:276 +#: archaeological_files/templates/ishtar/sheet_file.html:270 msgid "Human and technical requirements" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:285 -#: archaeological_files/templates/ishtar/sheet_file.html:337 -#: archaeological_files/templates/ishtar/sheet_file.html:389 +#: archaeological_files/templates/ishtar/sheet_file.html:279 +#: archaeological_files/templates/ishtar/sheet_file.html:331 +#: archaeological_files/templates/ishtar/sheet_file.html:383 msgid "Effective" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:291 -#: archaeological_files/templates/ishtar/sheet_file.html:294 -#: archaeological_files/templates/ishtar/sheet_file.html:343 -#: archaeological_files/templates/ishtar/sheet_file.html:346 -#: archaeological_files/templates/ishtar/sheet_file.html:395 -#: archaeological_files/templates/ishtar/sheet_file.html:398 +#: archaeological_files/templates/ishtar/sheet_file.html:285 +#: archaeological_files/templates/ishtar/sheet_file.html:288 +#: archaeological_files/templates/ishtar/sheet_file.html:337 +#: archaeological_files/templates/ishtar/sheet_file.html:340 +#: archaeological_files/templates/ishtar/sheet_file.html:389 +#: archaeological_files/templates/ishtar/sheet_file.html:392 #: archaeological_operations/templates/ishtar/sheet_operation.html:224 #: na_app/templates/ishtar/sheet_operation.html:220 #: sra_idf_app/templates/ishtar/sheet_operation.html:220 msgid "Cost" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:309 -#: archaeological_files/templates/ishtar/sheet_file.html:361 -#: archaeological_files/templates/ishtar/sheet_file.html:417 +#: archaeological_files/templates/ishtar/sheet_file.html:303 +#: archaeological_files/templates/ishtar/sheet_file.html:355 +#: archaeological_files/templates/ishtar/sheet_file.html:411 #: archaeological_warehouse/templates/ishtar/sheet_container.html:246 #: archaeological_warehouse/templates/ishtar/sheet_container.html:270 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:201 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:226 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:203 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:228 #: ishtar_common/models.py:1985 ishtar_common/models.py:2017 #: na_app/templates/ishtar/sheet_container.html:252 #: na_app/templates/ishtar/sheet_container.html:276 msgid "Total" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:320 -#: archaeological_files/templates/ishtar/sheet_file.html:372 -#: archaeological_files/templates/ishtar/sheet_file.html:424 +#: archaeological_files/templates/ishtar/sheet_file.html:314 +#: archaeological_files/templates/ishtar/sheet_file.html:366 +#: archaeological_files/templates/ishtar/sheet_file.html:418 msgid "Difference" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:331 +#: archaeological_files/templates/ishtar/sheet_file.html:325 msgid "Post-excavation jobs" msgstr "" @@ -3730,7 +3744,7 @@ msgstr "" #: archaeological_finds/forms.py:989 archaeological_finds/forms.py:1466 #: archaeological_finds/forms.py:1651 -#: archaeological_finds/templates/ishtar/sheet_find.html:317 +#: archaeological_finds/templates/ishtar/sheet_find.html:286 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:312 #: cd17_app/templates/ishtar/sheet_find.html:287 #: man_app/templates/ishtar/sheet_museum_find.html:321 @@ -3757,7 +3771,7 @@ msgstr "" #: archaeological_finds/forms.py:1125 archaeological_finds/forms.py:1499 #: archaeological_finds/forms.py:1988 archaeological_finds/models_finds.py:1208 #: archaeological_finds/models_finds.py:2266 -#: archaeological_finds/templates/ishtar/sheet_find.html:321 +#: archaeological_finds/templates/ishtar/sheet_find.html:290 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:316 #: man_app/templates/ishtar/sheet_museum_find.html:325 msgid "Conservatory states" @@ -3943,6 +3957,7 @@ msgstr "" #: archaeological_finds/forms.py:1784 archaeological_operations/forms.py:502 #: archaeological_operations/forms.py:1242 ishtar_common/forms_common.py:1571 #: ishtar_common/models.py:2434 ishtar_common/models.py:3507 +#: ishtar_common/templates/ishtar/sheet_document.html:135 #: ishtar_common/templates/ishtar/sheet_town.html:80 msgid "Areas" msgstr "" @@ -4248,7 +4263,7 @@ msgstr "" #: archaeological_finds/forms.py:2160 archaeological_finds/models_finds.py:1165 #: archaeological_finds/models_finds.py:2108 -#: archaeological_finds/templates/ishtar/sheet_find.html:338 +#: archaeological_finds/templates/ishtar/sheet_find.html:307 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:333 #: cd17_app/templates/ishtar/sheet_find.html:308 #: ishtar_common/forms_common.py:2035 @@ -4264,7 +4279,7 @@ msgid "Reference container - Warehouse (location)" msgstr "" #: archaeological_finds/forms.py:2186 archaeological_finds/models_finds.py:1164 -#: archaeological_finds/templates/ishtar/sheet_find.html:363 +#: archaeological_finds/templates/ishtar/sheet_find.html:332 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:358 #: cd17_app/templates/ishtar/sheet_find.html:333 #: ishtar_common/forms_common.py:2027 @@ -4320,9 +4335,9 @@ msgstr "" #: archaeological_finds/forms_treatments.py:174 #: archaeological_finds/models_treatments.py:200 #: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 -#: archaeological_finds/templates/ishtar/sheet_find.html:420 -#: archaeological_finds/templates/ishtar/sheet_find.html:458 -#: archaeological_finds/templates/ishtar/sheet_find.html:496 +#: archaeological_finds/templates/ishtar/sheet_find.html:389 +#: archaeological_finds/templates/ishtar/sheet_find.html:427 +#: archaeological_finds/templates/ishtar/sheet_find.html:465 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:415 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:453 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:491 @@ -4518,9 +4533,9 @@ msgstr "" #: archaeological_finds/models_finds.py:3592 #: archaeological_finds/models_treatments.py:269 #: archaeological_finds/models_treatments.py:761 -#: archaeological_finds/templates/ishtar/sheet_find.html:425 -#: archaeological_finds/templates/ishtar/sheet_find.html:463 -#: archaeological_finds/templates/ishtar/sheet_find.html:501 +#: archaeological_finds/templates/ishtar/sheet_find.html:394 +#: archaeological_finds/templates/ishtar/sheet_find.html:432 +#: archaeological_finds/templates/ishtar/sheet_find.html:470 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:420 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:458 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:496 @@ -4532,7 +4547,7 @@ msgstr "" #: cd17_app/templates/ishtar/sheet_find.html:434 #: cd17_app/templates/ishtar/sheet_find.html:472 #: ishtar_common/forms_common.py:2560 ishtar_common/forms_common.py:2774 -#: ishtar_common/templates/ishtar/sheet_document.html:103 +#: ishtar_common/templates/ishtar/sheet_document.html:105 #: man_app/templates/ishtar/sheet_museum_find.html:429 #: man_app/templates/ishtar/sheet_museum_find.html:467 #: man_app/templates/ishtar/sheet_museum_find.html:505 @@ -4621,7 +4636,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:655 #: archaeological_finds/forms_treatments.py:743 #: archaeological_finds/models_treatments.py:1131 -#: archaeological_finds/templates/ishtar/sheet_find.html:538 +#: archaeological_finds/templates/ishtar/sheet_find.html:507 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:533 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:61 #: cd17_app/templates/ishtar/sheet_find.html:509 @@ -4635,7 +4650,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:661 #: archaeological_finds/forms_treatments.py:749 #: archaeological_finds/models_treatments.py:1139 -#: archaeological_finds/templates/ishtar/sheet_find.html:539 +#: archaeological_finds/templates/ishtar/sheet_find.html:508 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:534 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:69 #: cd17_app/templates/ishtar/sheet_find.html:510 @@ -4844,6 +4859,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1006 #: archaeological_finds/models_treatments.py:1196 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:77 +#: ishtar_common/templates/ishtar/sheet_document.html:130 msgid "Treatments" msgstr "" @@ -5799,7 +5815,7 @@ msgid "Weight unit" msgstr "" #: archaeological_finds/models_finds.py:2082 -#: archaeological_finds/templates/ishtar/sheet_find.html:453 +#: archaeological_finds/templates/ishtar/sheet_find.html:422 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:448 #: cd17_app/templates/ishtar/sheet_find.html:424 #: man_app/templates/ishtar/sheet_museum_find.html:457 @@ -5810,7 +5826,7 @@ msgid "Upstream treatment" msgstr "" #: archaeological_finds/models_finds.py:2089 -#: archaeological_finds/templates/ishtar/sheet_find.html:491 +#: archaeological_finds/templates/ishtar/sheet_find.html:460 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:486 #: cd17_app/templates/ishtar/sheet_find.html:462 #: man_app/templates/ishtar/sheet_museum_find.html:495 @@ -5986,9 +6002,9 @@ msgid "Downstream finds" msgstr "" #: archaeological_finds/models_treatments.py:762 -#: archaeological_finds/templates/ishtar/sheet_find.html:424 -#: archaeological_finds/templates/ishtar/sheet_find.html:462 -#: archaeological_finds/templates/ishtar/sheet_find.html:500 +#: archaeological_finds/templates/ishtar/sheet_find.html:393 +#: archaeological_finds/templates/ishtar/sheet_find.html:431 +#: archaeological_finds/templates/ishtar/sheet_find.html:469 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:419 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:457 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:495 @@ -6055,7 +6071,7 @@ msgid "exhibition-end-after" msgstr "" #: archaeological_finds/models_treatments.py:1184 -#: archaeological_finds/templates/ishtar/sheet_find.html:530 +#: archaeological_finds/templates/ishtar/sheet_find.html:499 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:525 #: cd17_app/templates/ishtar/sheet_find.html:501 #: man_app/templates/ishtar/sheet_museum_find.html:534 @@ -6178,7 +6194,7 @@ msgstr "" msgid "Museum entry date" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:297 +#: archaeological_finds/templates/ishtar/sheet_find.html:266 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:245 #: cd17_app/templates/ishtar/sheet_find.html:267 #: man_app/templates/ishtar/sheet_museum_find.html:254 @@ -6188,7 +6204,7 @@ msgstr "" msgid "Checked" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:334 +#: archaeological_finds/templates/ishtar/sheet_find.html:303 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:329 #: cd17_app/templates/ishtar/sheet_find.html:304 #: man_app/templates/ishtar/sheet_museum_find.html:338 @@ -6198,7 +6214,7 @@ msgstr "" msgid "Warehouse - container" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:364 +#: archaeological_finds/templates/ishtar/sheet_find.html:333 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:359 #: cd17_app/templates/ishtar/sheet_find.html:334 #: man_app/templates/ishtar/sheet_museum_find.html:368 @@ -6208,7 +6224,7 @@ msgstr "" msgid "Reference container / current container" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:408 +#: archaeological_finds/templates/ishtar/sheet_find.html:377 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:403 #: cd17_app/templates/ishtar/sheet_find.html:378 #: man_app/templates/ishtar/sheet_museum_find.html:412 @@ -6218,7 +6234,7 @@ msgstr "" msgid "Container information not available." msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:415 +#: archaeological_finds/templates/ishtar/sheet_find.html:384 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:410 #: cd17_app/templates/ishtar/sheet_find.html:386 #: man_app/templates/ishtar/sheet_museum_find.html:419 @@ -6228,10 +6244,10 @@ msgstr "" msgid "Simple treatments" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:419 -#: archaeological_finds/templates/ishtar/sheet_find.html:457 -#: archaeological_finds/templates/ishtar/sheet_find.html:495 -#: archaeological_finds/templates/ishtar/sheet_find.html:534 +#: archaeological_finds/templates/ishtar/sheet_find.html:388 +#: archaeological_finds/templates/ishtar/sheet_find.html:426 +#: archaeological_finds/templates/ishtar/sheet_find.html:464 +#: archaeological_finds/templates/ishtar/sheet_find.html:503 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:414 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:452 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:490 @@ -6259,9 +6275,9 @@ msgstr "" msgid "Year - index" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:423 -#: archaeological_finds/templates/ishtar/sheet_find.html:461 -#: archaeological_finds/templates/ishtar/sheet_find.html:499 +#: archaeological_finds/templates/ishtar/sheet_find.html:392 +#: archaeological_finds/templates/ishtar/sheet_find.html:430 +#: archaeological_finds/templates/ishtar/sheet_find.html:468 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:418 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:456 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:494 @@ -6283,7 +6299,7 @@ msgstr "" msgid "Related finds (max. 15 displayed)" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:487 +#: archaeological_finds/templates/ishtar/sheet_find.html:456 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:482 #: cd17_app/templates/ishtar/sheet_find.html:458 #: ishtar_common/templates/blocks/DataTables-content.html:39 @@ -6298,8 +6314,8 @@ msgstr "" msgid "Export as CSV" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:487 -#: archaeological_finds/templates/ishtar/sheet_find.html:526 +#: archaeological_finds/templates/ishtar/sheet_find.html:456 +#: archaeological_finds/templates/ishtar/sheet_find.html:495 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:482 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:521 #: cd17_app/templates/ishtar/sheet_find.html:458 @@ -6319,7 +6335,7 @@ msgstr "" msgid "CSV" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:568 +#: archaeological_finds/templates/ishtar/sheet_find.html:537 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:563 #: archaeological_finds/templates/ishtar/sheet_treatment.html:132 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:82 @@ -6340,7 +6356,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:35 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:31 #: ishtar_common/forms_common.py:2230 -#: ishtar_common/templates/ishtar/sheet_document.html:58 +#: ishtar_common/templates/ishtar/sheet_document.html:60 #: na_app/templates/ishtar/sheet_container.html:35 msgid "Content" msgstr "" @@ -7509,6 +7525,7 @@ msgstr "" #: archaeological_operations/models.py:1590 #: archaeological_operations/templates/ishtar/sheet_site.html:86 #: ishtar_common/models.py:1039 +#: ishtar_common/templates/ishtar/sheet_document.html:127 #: ishtar_common/templates/ishtar/sheet_town.html:114 msgid "Operations" msgstr "" @@ -7822,7 +7839,9 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:80 #: archaeological_operations/templates/ishtar/sheet_operation.html:440 #: archaeological_operations/templates/ishtar/sheet_operation.html:538 -#: ishtar_common/models.py:1039 na_app/templates/ishtar/sheet_operation.html:80 +#: ishtar_common/models.py:1039 +#: ishtar_common/templates/ishtar/sheet_document.html:128 +#: na_app/templates/ishtar/sheet_operation.html:80 #: na_app/templates/ishtar/sheet_operation.html:408 #: na_app/templates/ishtar/sheet_operation.html:506 #: sra_idf_app/templates/ishtar/sheet_operation.html:80 @@ -7836,7 +7855,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:42 #: archaeological_warehouse/templates/ishtar/sheet_container.html:209 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:38 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:164 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:166 #: ishtar_common/templates/blocks/DataTables-tabs.html:30 #: na_app/templates/ishtar/sheet_container.html:42 #: na_app/templates/ishtar/sheet_container.html:215 @@ -7898,7 +7917,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:512 #: archaeological_warehouse/templates/ishtar/sheet_container.html:214 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:169 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:171 #: ishtar_common/models_rest.py:77 #: ishtar_common/templates/blocks/DataTables-content.html:28 #: ishtar_common/templates/blocks/DataTables-content.html:101 @@ -7914,7 +7933,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:517 #: archaeological_warehouse/templates/ishtar/sheet_container.html:219 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:174 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:176 #: na_app/templates/ishtar/sheet_container.html:225 #: na_app/templates/ishtar/sheet_operation.html:485 #: sra_idf_app/templates/ishtar/sheet_operation.html:507 @@ -7923,7 +7942,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:522 #: archaeological_warehouse/templates/ishtar/sheet_container.html:224 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:179 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:181 #: na_app/templates/ishtar/sheet_container.html:230 #: na_app/templates/ishtar/sheet_operation.html:490 #: sra_idf_app/templates/ishtar/sheet_operation.html:512 @@ -8095,7 +8114,7 @@ msgstr "" #: archaeological_warehouse/forms.py:130 archaeological_warehouse/models.py:421 #: archaeological_warehouse/templates/ishtar/sheet_container.html:182 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:132 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:134 #: na_app/templates/ishtar/sheet_container.html:188 msgid "Divisions" msgstr "" @@ -8155,16 +8174,19 @@ msgstr "" msgid "Country" msgstr "" -#: archaeological_warehouse/forms.py:251 ishtar_common/forms_common.py:775 -#: ishtar_common/forms_common.py:1152 ishtar_common/models_common.py:3678 -#: ishtar_common/models_common.py:3854 +#: archaeological_warehouse/forms.py:251 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:125 +#: ishtar_common/forms_common.py:775 ishtar_common/forms_common.py:1152 +#: ishtar_common/models_common.py:3678 ishtar_common/models_common.py:3854 #: ishtar_common/templates/ishtar/sheet_person.html:28 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:34 msgid "Phone" msgstr "" -#: archaeological_warehouse/forms.py:253 ishtar_common/forms_common.py:777 -#: ishtar_common/forms_common.py:1162 ishtar_common/models_common.py:3694 +#: archaeological_warehouse/forms.py:253 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:126 +#: ishtar_common/forms_common.py:777 ishtar_common/forms_common.py:1162 +#: ishtar_common/models_common.py:3694 #: ishtar_common/templates/ishtar/sheet_person.html:46 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:55 msgid "Mobile phone" @@ -8332,8 +8354,9 @@ msgstr "" #: archaeological_warehouse/ishtar_menu.py:70 #: archaeological_warehouse/models.py:1213 #: archaeological_warehouse/templates/ishtar/sheet_container.html:184 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:134 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:216 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:136 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:218 +#: ishtar_common/templates/ishtar/sheet_document.html:133 #: na_app/templates/ishtar/sheet_container.html:190 msgid "Containers" msgstr "" @@ -8369,6 +8392,7 @@ msgid "Automatically generated" msgstr "" #: archaeological_warehouse/models.py:458 +#: ishtar_common/templates/ishtar/sheet_document.html:132 #: ishtar_common/templates/ishtar/sheet_organization.html:49 msgid "Warehouses" msgstr "" @@ -8657,39 +8681,43 @@ msgstr "" msgid "Default divisions (imports)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:139 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:115 +msgid "Geographic localisation/contact details" +msgstr "" + +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:141 msgid "No container inside this warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:143 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:145 msgid "Finds (hosted)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:148 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:150 msgid "No find inside this warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:152 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:154 msgid "Finds (owned)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:157 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:159 msgid "No find owned by this warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:187 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:189 msgid "No container/division inside this container" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:193 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:195 msgid "Finds by location in the warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:218 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:220 msgid "Containers by location in the warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:246 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:248 msgid "Document for this warehouse" msgstr "" @@ -10077,7 +10105,7 @@ msgstr "" #: ishtar_common/models.py:4668 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:9 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:9 -#: ishtar_common/templates/ishtar/sheet_document.html:67 +#: ishtar_common/templates/ishtar/sheet_document.html:69 msgid "Authors" msgstr "" @@ -10133,7 +10161,7 @@ msgstr "" #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:8 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:27 #: ishtar_common/templates/ishtar/import_table.html:2 -#: ishtar_common/templates/ishtar/sheet_document.html:96 +#: ishtar_common/templates/ishtar/sheet_document.html:98 #: ishtar_common/templates/ishtar/sheet_import_gen.html:2 #: ishtar_common/views.py:2318 msgid "Source" @@ -10164,7 +10192,7 @@ msgid "Image" msgstr "" #: ishtar_common/forms_common.py:2144 -#: ishtar_common/templates/ishtar/sheet_document.html:59 +#: ishtar_common/templates/ishtar/sheet_document.html:61 msgctxt "Not directory" msgid "File" msgstr "" @@ -10197,7 +10225,7 @@ msgid "Related items" msgstr "" #: ishtar_common/forms_common.py:2233 -#: ishtar_common/templates/ishtar/sheet_document.html:84 +#: ishtar_common/templates/ishtar/sheet_document.html:86 msgid "Publishing" msgstr "" @@ -10704,6 +10732,7 @@ msgid "Archaeological entity" msgstr "" #: ishtar_common/models.py:1044 +#: ishtar_common/templates/ishtar/sheet_document.html:126 #: ishtar_common/templates/ishtar/sheet_town.html:119 msgid "Sites" msgstr "" @@ -14572,7 +14601,7 @@ msgstr "" msgid "You have locked this item." msgstr "" -#: ishtar_common/templates/ishtar/sheet_document.html:61 +#: ishtar_common/templates/ishtar/sheet_document.html:63 msgid "Web link" msgstr "" @@ -14584,6 +14613,10 @@ msgstr "" msgid "Files" msgstr "" +#: ishtar_common/templates/ishtar/sheet_document.html:131 +msgid "Treatment files" +msgstr "" + #: ishtar_common/templates/ishtar/sheet_import.html:4 msgid "Import" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index aef6b6d3a..48652ea06 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-06 16:24+0200\n" +"POT-Creation-Date: 2024-06-07 15:30+0200\n" "PO-Revision-Date: 2022-07-08 13:04+0000\n" "Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n" "Language-Team: French <http://translate.iggdrasil.net/projects/ishtar/wip-" @@ -375,9 +375,9 @@ msgstr "Date d'ouverture" #: archaeological_context_records/forms.py:341 #: archaeological_context_records/models.py:756 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:235 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:239 #: archaeological_files/models.py:609 -#: archaeological_files/templates/ishtar/sheet_file.html:82 +#: archaeological_files/templates/ishtar/sheet_file.html:75 #: archaeological_finds/forms_treatments.py:182 #: archaeological_finds/forms_treatments.py:667 #: archaeological_finds/forms_treatments.py:773 @@ -435,12 +435,12 @@ msgstr "Datation" #: archaeological_context_records/models.py:530 #: archaeological_finds/forms.py:1149 archaeological_finds/forms.py:1566 #: archaeological_finds/models_finds.py:1204 -#: archaeological_finds/templates/ishtar/sheet_find.html:258 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:206 #: archaeological_operations/forms.py:841 #: archaeological_operations/templates/ishtar/sheet_operation.html:556 #: archaeological_operations/templates/ishtar/sheet_operation.html:593 #: cd17_app/templates/ishtar/sheet_find.html:229 +#: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:4 #: man_app/templates/ishtar/sheet_museum_find.html:215 #: na_app/templates/ishtar/sheet_find.html:233 #: na_app/templates/ishtar/sheet_operation.html:524 @@ -456,17 +456,16 @@ msgstr "Période chronologique" #: archaeological_context_records/models.py:111 #: archaeological_files/forms.py:786 archaeological_files/models.py:76 #: archaeological_files/models.py:715 -#: archaeological_files/templates/ishtar/sheet_file.html:196 +#: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_finds/forms.py:1568 #: archaeological_finds/forms_treatments.py:180 #: archaeological_finds/forms_treatments.py:770 #: archaeological_finds/models_finds.py:3623 #: archaeological_finds/models_treatments.py:264 #: archaeological_finds/models_treatments.py:758 -#: archaeological_finds/templates/ishtar/sheet_find.html:259 -#: archaeological_finds/templates/ishtar/sheet_find.html:426 -#: archaeological_finds/templates/ishtar/sheet_find.html:464 -#: archaeological_finds/templates/ishtar/sheet_find.html:502 +#: archaeological_finds/templates/ishtar/sheet_find.html:395 +#: archaeological_finds/templates/ishtar/sheet_find.html:433 +#: archaeological_finds/templates/ishtar/sheet_find.html:471 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:207 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:421 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:459 @@ -479,6 +478,7 @@ msgstr "Période chronologique" #: cd17_app/templates/ishtar/sheet_find.html:397 #: cd17_app/templates/ishtar/sheet_find.html:435 #: cd17_app/templates/ishtar/sheet_find.html:473 +#: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:5 #: man_app/templates/ishtar/sheet_museum_find.html:216 #: man_app/templates/ishtar/sheet_museum_find.html:430 #: man_app/templates/ishtar/sheet_museum_find.html:468 @@ -504,11 +504,10 @@ msgstr "Date de début" #: archaeological_files/models.py:716 archaeological_finds/forms.py:1569 #: archaeological_finds/models_finds.py:3624 #: archaeological_finds/models_treatments.py:759 -#: archaeological_finds/templates/ishtar/sheet_find.html:260 -#: archaeological_finds/templates/ishtar/sheet_find.html:427 -#: archaeological_finds/templates/ishtar/sheet_find.html:465 -#: archaeological_finds/templates/ishtar/sheet_find.html:503 -#: archaeological_finds/templates/ishtar/sheet_find.html:541 +#: archaeological_finds/templates/ishtar/sheet_find.html:396 +#: archaeological_finds/templates/ishtar/sheet_find.html:434 +#: archaeological_finds/templates/ishtar/sheet_find.html:472 +#: archaeological_finds/templates/ishtar/sheet_find.html:510 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:208 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:422 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:460 @@ -522,6 +521,7 @@ msgstr "Date de début" #: cd17_app/templates/ishtar/sheet_find.html:474 #: cd17_app/templates/ishtar/sheet_find.html:512 #: ishtar_common/models_imports.py:1439 +#: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:6 #: man_app/templates/ishtar/sheet_museum_find.html:217 #: man_app/templates/ishtar/sheet_museum_find.html:431 #: man_app/templates/ishtar/sheet_museum_find.html:469 @@ -548,9 +548,9 @@ msgstr "Date de fin" #: archaeological_context_records/forms.py:454 #: archaeological_context_records/models.py:122 #: archaeological_finds/forms.py:1570 -#: archaeological_finds/templates/ishtar/sheet_find.html:262 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:210 #: cd17_app/templates/ishtar/sheet_find.html:233 +#: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:8 #: man_app/templates/ishtar/sheet_museum_find.html:219 #: na_app/templates/ishtar/sheet_find.html:237 #: pdl_app/templates/ishtar/sheet_find.html:228 @@ -562,9 +562,9 @@ msgstr "Qualité" #: archaeological_context_records/models.py:84 #: archaeological_context_records/models.py:115 #: archaeological_finds/forms.py:1567 -#: archaeological_finds/templates/ishtar/sheet_find.html:261 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:209 #: cd17_app/templates/ishtar/sheet_find.html:232 +#: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:7 #: man_app/templates/ishtar/sheet_museum_find.html:218 #: na_app/templates/ishtar/sheet_find.html:236 #: pdl_app/templates/ishtar/sheet_find.html:227 @@ -575,8 +575,8 @@ msgstr "Type de datation" #: archaeological_context_records/forms.py:456 #: archaeological_context_records/models.py:127 #: archaeological_finds/forms.py:1571 -#: archaeological_finds/templates/ishtar/sheet_find.html:263 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:211 +#: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:9 msgid "Precise on this dating" msgstr "Précision sur cette datation" @@ -620,7 +620,7 @@ msgstr "Unité d'enregistrement - 050 - Relations" #: archaeological_context_records/forms.py:515 #: archaeological_context_records/models.py:784 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:49 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:185 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:186 msgid "Interpretation" msgstr "Interprétation" @@ -629,6 +629,7 @@ msgid "Context record - 040 - Interpretation" msgstr "Unité d'enregistrement - 040 - Interprétation" #: archaeological_context_records/forms.py:521 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:202 msgid "Dating complements" msgstr "Compléments sur la datation" @@ -1451,7 +1452,7 @@ msgid "Operation / Archaeological site" msgstr "Opération / Site" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:74 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:266 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:270 #: archaeological_finds/forms.py:2331 archaeological_finds/models_finds.py:98 #: archaeological_finds/models_finds.py:112 #: archaeological_finds/models_finds.py:129 @@ -1482,7 +1483,8 @@ msgstr "Opération / Site" #: archaeological_operations/templates/ishtar/sheet_site.html:92 #: archaeological_warehouse/templates/ishtar/sheet_container.html:189 #: archaeological_warehouse/templates/ishtar/sheet_container.html:236 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:192 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:194 +#: ishtar_common/templates/ishtar/sheet_document.html:129 #: na_app/templates/ishtar/sheet_container.html:195 #: na_app/templates/ishtar/sheet_container.html:242 #: na_app/templates/ishtar/sheet_operation.html:89 @@ -1496,7 +1498,7 @@ msgstr "Mobilier" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:101 #: archaeological_finds/templates/ishtar/sheet_find.html:74 -#: archaeological_finds/templates/ishtar/sheet_find.html:581 +#: archaeological_finds/templates/ishtar/sheet_find.html:550 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:74 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:576 #: archaeological_operations/templates/ishtar/sheet_operation.html:98 @@ -1554,9 +1556,9 @@ msgstr "Champs personnalisés" msgid "Complete identifier" msgstr "Identifiant complet" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:151 -#: archaeological_files/templates/ishtar/sheet_file.html:104 -#: archaeological_files/templates/ishtar/sheet_file.html:269 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:152 +#: archaeological_files/templates/ishtar/sheet_file.html:98 +#: archaeological_files/templates/ishtar/sheet_file.html:263 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:58 #: archaeological_operations/templates/ishtar/sheet_operation.html:216 #: ishtar_common/templates/ishtar/sheet_town.html:71 @@ -1565,14 +1567,13 @@ msgstr "Identifiant complet" msgid "Surface" msgstr "Surface" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:166 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:167 #: archaeological_files/forms.py:286 -#: archaeological_files/templates/ishtar/sheet_file.html:95 +#: archaeological_files/templates/ishtar/sheet_file.html:88 #: archaeological_finds/templates/ishtar/sheet_basefind.html:59 #: archaeological_operations/templates/ishtar/sheet_operation.html:332 #: archaeological_operations/templates/ishtar/sheet_site.html:67 #: archaeological_warehouse/templates/ishtar/sheet_container.html:168 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:115 #: ishtar_common/templates/ishtar/sheet_town.html:95 #: man_app/templates/ishtar/sheet_basefind.html:56 #: na_app/templates/ishtar/sheet_container.html:174 @@ -1581,11 +1582,11 @@ msgstr "Surface" msgid "Geographic localisation" msgstr "Localisation géographique" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:177 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:178 #: archaeological_finds/forms.py:546 archaeological_finds/forms.py:827 #: archaeological_finds/forms.py:987 #: archaeological_finds/templates/ishtar/sheet_basefind.html:70 -#: archaeological_finds/templates/ishtar/sheet_find.html:295 +#: archaeological_finds/templates/ishtar/sheet_find.html:264 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:243 #: archaeological_operations/templates/ishtar/sheet_operation.html:353 #: cd17_app/templates/ishtar/sheet_find.html:265 @@ -1601,29 +1602,28 @@ msgstr "Localisation géographique" msgid "Sheet" msgstr "Fiche" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:214 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:218 msgid "Operation summary" msgstr "Résumé de l'opération" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:217 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:221 #: archaeological_operations/templates/ishtar/sheet_operation.html:303 #: na_app/templates/ishtar/sheet_operation.html:285 #: sra_idf_app/templates/ishtar/sheet_operation.html:293 msgid "Patriarche OA code not yet recorded!" msgstr "Code d'opération Patriarche non renseigné !" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:223 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:227 msgid "Numerical reference" msgstr "Référence numérique" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:229 -#: archaeological_files/templates/ishtar/sheet_file.html:75 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:233 #: archaeological_finds/forms_treatments.py:144 #: archaeological_finds/models_treatments.py:132 #: archaeological_finds/models_treatments.py:219 -#: archaeological_finds/templates/ishtar/sheet_find.html:422 -#: archaeological_finds/templates/ishtar/sheet_find.html:460 -#: archaeological_finds/templates/ishtar/sheet_find.html:498 +#: archaeological_finds/templates/ishtar/sheet_find.html:391 +#: archaeological_finds/templates/ishtar/sheet_find.html:429 +#: archaeological_finds/templates/ishtar/sheet_find.html:467 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:417 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:455 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:493 @@ -1652,64 +1652,64 @@ msgstr "Référence numérique" msgid "State" msgstr "État" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:230 -#: archaeological_files/templates/ishtar/sheet_file.html:77 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:234 +#: archaeological_files/templates/ishtar/sheet_file.html:70 #: archaeological_operations/templates/ishtar/sheet_operation.html:184 #: na_app/templates/ishtar/sheet_operation.html:180 #: sra_idf_app/templates/ishtar/sheet_operation.html:180 msgid "Active file" msgstr "Dossier actif" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:230 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:234 #: archaeological_operations/templates/ishtar/sheet_operation.html:187 #: na_app/templates/ishtar/sheet_operation.html:183 #: sra_idf_app/templates/ishtar/sheet_operation.html:183 msgid "Closed operation" msgstr "Opération close" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:237 -#: archaeological_files/templates/ishtar/sheet_file.html:84 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:241 +#: archaeological_files/templates/ishtar/sheet_file.html:77 #: archaeological_operations/templates/ishtar/sheet_operation.html:210 #: na_app/templates/ishtar/sheet_operation.html:206 #: sra_idf_app/templates/ishtar/sheet_operation.html:206 msgid "by" msgstr "par" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:249 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:253 msgid "No operation linked to this context record!" msgstr "Pas d'opération liée à cette Unité d'Enregistrement !" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:271 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:275 msgid "No associated finds." msgstr "Pas de mobilier associé." -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:275 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:279 #: archaeological_operations/templates/ishtar/sheet_operation.html:478 #: na_app/templates/ishtar/sheet_operation.html:446 #: sra_idf_app/templates/ishtar/sheet_operation.html:468 msgid "Documents from associated finds" msgstr "Documents du mobilier associé" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:288 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:292 #: archaeological_operations/templates/ishtar/sheet_operation.html:444 #: na_app/templates/ishtar/sheet_operation.html:412 #: sra_idf_app/templates/ishtar/sheet_operation.html:434 msgid "Context record relations" msgstr "Relations entre Unités d'Enregistrement" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:294 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:298 msgid "Diagram of stratigraphic relations - above" msgstr "Diagramme de relations stratigraphiques - au dessus de" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:302 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:306 msgid "Diagram of stratigraphic relations - below" msgstr "Diagramme de relations stratigraphiques - au dessous de" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:310 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:314 msgid "Diagram of stratigraphic relations - full" msgstr "Diagramme de relations stratigraphiques - complet" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:326 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:330 msgid "Document from this context record" msgstr "Document associé à cette Unité d'Enregistrement" @@ -1762,7 +1762,7 @@ msgstr "Dossier - 001 - Recherche" #: archaeological_files/forms.py:237 archaeological_files/forms.py:667 #: archaeological_files/forms.py:1122 archaeological_files/forms.py:1158 #: archaeological_files/models.py:388 archaeological_files/models.py:539 -#: archaeological_files/templates/ishtar/sheet_file.html:219 +#: archaeological_files/templates/ishtar/sheet_file.html:213 #: archaeological_finds/forms.py:1746 #: archaeological_finds/forms_treatments.py:58 #: archaeological_finds/forms_treatments.py:146 @@ -1842,6 +1842,8 @@ msgstr "Type de permis" #: archaeological_files/forms.py:104 archaeological_files/forms.py:531 #: archaeological_files/models.py:607 +#: archaeological_files/templates/ishtar/sheet_file.html:131 +#: archaeological_operations/templates/ishtar/sheet_operation.html:280 msgid "Permit/order reference" msgstr "Référence du permis / de l'arrêté" @@ -1877,7 +1879,7 @@ msgstr "Commentaire" #: archaeological_files/forms.py:107 archaeological_files/forms.py:378 #: archaeological_files/forms.py:447 -#: archaeological_files/templates/ishtar/sheet_file.html:195 +#: archaeological_files/templates/ishtar/sheet_file.html:189 #: archaeological_finds/forms_treatments.py:649 msgid "In charge" msgstr "Responsable" @@ -1927,7 +1929,7 @@ msgstr "Date de création" #: archaeological_files/models.py:624 #: archaeological_finds/forms_treatments.py:768 #: archaeological_finds/models_treatments.py:1148 -#: archaeological_finds/templates/ishtar/sheet_find.html:540 +#: archaeological_finds/templates/ishtar/sheet_find.html:509 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:535 #: cd17_app/templates/ishtar/sheet_find.html:511 #: man_app/templates/ishtar/sheet_museum_find.html:544 @@ -1979,6 +1981,7 @@ msgstr "Nom de l'aménagement" #: ishtar_common/forms_common.py:1810 ishtar_common/models.py:2408 #: ishtar_common/models_common.py:3414 #: ishtar_common/templates/ishtar/sheet_area.html:71 +#: ishtar_common/templates/ishtar/sheet_document.html:134 #: na_app/templates/ishtar/sheet_operation.html:146 #: sra_idf_app/templates/ishtar/sheet_operation.html:146 msgid "Towns" @@ -2085,7 +2088,7 @@ msgid "Responsible for planning service" msgstr "Responsable pour le service instructeur" #: archaeological_files/forms.py:565 -#: archaeological_files/templates/ishtar/sheet_file.html:150 +#: archaeological_files/templates/ishtar/sheet_file.html:144 msgid "Research archaeology" msgstr "Archéologie programmée" @@ -2124,6 +2127,7 @@ msgid "Archaeological file - 050 - Instruction" msgstr "Dossier archéologique - 050 - Instruction" #: archaeological_files/forms.py:644 +#: archaeological_files/templates/ishtar/sheet_file.html:66 msgid "File managed by" msgstr "Dossier géré par" @@ -2131,6 +2135,11 @@ msgstr "Dossier géré par" msgid "Related file" msgstr "Dossier associé" +#: archaeological_files/forms.py:665 archaeological_files/models.py:644 +#: archaeological_files/templates/ishtar/sheet_file.html:64 +msgid "Instruction deadline" +msgstr "Date limite d'instruction" + #: archaeological_files/forms.py:730 msgid "Would you like to close this archaeological file?" msgstr "Voulez-vous clore ce dossier archéologique ?" @@ -2148,7 +2157,7 @@ msgid "Preventive file - 020 - Edition form" msgstr "Dossier préventif - 020 - Formulaire d'édition" #: archaeological_files/forms.py:746 ishtar_common/forms_common.py:2232 -#: ishtar_common/templates/ishtar/sheet_document.html:77 +#: ishtar_common/templates/ishtar/sheet_document.html:79 msgid "Dates" msgstr "Dates" @@ -2185,25 +2194,25 @@ msgid "Linear meter (m)" msgstr "Mètre linéaire (m)" #: archaeological_files/forms.py:889 archaeological_files/forms.py:891 -#: archaeological_files/templates/ishtar/sheet_file.html:289 -#: archaeological_files/templates/ishtar/sheet_file.html:292 -#: archaeological_files/templates/ishtar/sheet_file.html:341 -#: archaeological_files/templates/ishtar/sheet_file.html:344 +#: archaeological_files/templates/ishtar/sheet_file.html:283 +#: archaeological_files/templates/ishtar/sheet_file.html:286 +#: archaeological_files/templates/ishtar/sheet_file.html:335 +#: archaeological_files/templates/ishtar/sheet_file.html:338 msgid "Man by day" msgstr "Personnes par jour" #: archaeological_files/forms.py:890 archaeological_files/forms.py:892 -#: archaeological_files/templates/ishtar/sheet_file.html:290 -#: archaeological_files/templates/ishtar/sheet_file.html:293 -#: archaeological_files/templates/ishtar/sheet_file.html:342 -#: archaeological_files/templates/ishtar/sheet_file.html:345 +#: archaeological_files/templates/ishtar/sheet_file.html:284 +#: archaeological_files/templates/ishtar/sheet_file.html:287 +#: archaeological_files/templates/ishtar/sheet_file.html:336 +#: archaeological_files/templates/ishtar/sheet_file.html:339 msgid "Days" msgstr "Jours" #: archaeological_files/forms.py:893 archaeological_files/models.py:116 #: archaeological_files/models.py:1418 archaeological_files/models.py:1435 -#: archaeological_files/templates/ishtar/sheet_file.html:283 -#: archaeological_files/templates/ishtar/sheet_file.html:335 +#: archaeological_files/templates/ishtar/sheet_file.html:277 +#: archaeological_files/templates/ishtar/sheet_file.html:329 msgid "Job" msgstr "Emploi" @@ -2222,7 +2231,7 @@ msgid "Preventive file - 030 - Post-excavation" msgstr "Dossier préventif - 030 - Post-fouille" #: archaeological_files/forms.py:997 -#: archaeological_files/templates/ishtar/sheet_file.html:279 +#: archaeological_files/templates/ishtar/sheet_file.html:273 msgid "Ground jobs" msgstr "Emplois de terrain" @@ -2231,13 +2240,13 @@ msgid "Preventive file - 040 - Ground jobs" msgstr "Dossier préventif - 040 - Emplois de terrain" #: archaeological_files/forms.py:1005 archaeological_files/forms.py:1007 -#: archaeological_files/templates/ishtar/sheet_file.html:393 -#: archaeological_files/templates/ishtar/sheet_file.html:396 +#: archaeological_files/templates/ishtar/sheet_file.html:387 +#: archaeological_files/templates/ishtar/sheet_file.html:390 msgid "Quantity" msgstr "Quantité" #: archaeological_files/forms.py:1009 -#: archaeological_files/templates/ishtar/sheet_file.html:387 +#: archaeological_files/templates/ishtar/sheet_file.html:381 msgid "Equipment / service" msgstr "Équipement / service" @@ -2253,7 +2262,7 @@ msgstr "Équipement / service" #: archaeological_finds/forms_treatments.py:908 #: archaeological_finds/models_treatments.py:205 #: archaeological_finds/models_treatments.py:1107 -#: archaeological_finds/templates/ishtar/sheet_find.html:396 +#: archaeological_finds/templates/ishtar/sheet_find.html:365 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:391 #: archaeological_operations/forms.py:1448 #: archaeological_operations/forms.py:1581 @@ -2734,7 +2743,7 @@ msgstr "Référence interne" #: archaeological_finds/forms_treatments.py:642 #: archaeological_finds/forms_treatments.py:724 #: archaeological_finds/models_treatments.py:1114 -#: archaeological_finds/templates/ishtar/sheet_find.html:536 +#: archaeological_finds/templates/ishtar/sheet_find.html:505 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:531 #: archaeological_operations/forms.py:507 #: archaeological_operations/forms.py:1136 @@ -2786,7 +2795,7 @@ msgstr "Nom" #: archaeological_files/models.py:557 #: archaeological_finds/models_treatments.py:1123 -#: archaeological_finds/templates/ishtar/sheet_find.html:537 +#: archaeological_finds/templates/ishtar/sheet_find.html:506 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:532 #: archaeological_warehouse/forms.py:222 archaeological_warehouse/models.py:406 #: cd17_app/templates/ishtar/sheet_find.html:508 @@ -2817,10 +2826,6 @@ msgstr "Service instructeur" msgid "Main town" msgstr "Commune principale" -#: archaeological_files/models.py:644 -msgid "Instruction deadline" -msgstr "Date limite d'instruction" - #: archaeological_files/models.py:651 msgid "Main address" msgstr "Adresse des terrains" @@ -2972,9 +2977,9 @@ msgid "Change price agreement" msgstr "Changer le contrat tarifaire" #: archaeological_files/templates/ishtar/forms/preventive_detail.html:21 -#: archaeological_files/templates/ishtar/sheet_file.html:284 -#: archaeological_files/templates/ishtar/sheet_file.html:336 -#: archaeological_files/templates/ishtar/sheet_file.html:388 +#: archaeological_files/templates/ishtar/sheet_file.html:278 +#: archaeological_files/templates/ishtar/sheet_file.html:330 +#: archaeological_files/templates/ishtar/sheet_file.html:382 msgid "Planned" msgstr "Planifié" @@ -2999,32 +3004,41 @@ msgstr "Le formulaire a changé. Validez d'abord vos modifications." msgid "Back to the file" msgstr "Retourner au dossier" -#: archaeological_files/templates/ishtar/sheet_file.html:77 +#: archaeological_files/templates/ishtar/sheet_file.html:68 +msgid "State of the file" +msgstr "Statut du dossier" + +#: archaeological_files/templates/ishtar/sheet_file.html:70 msgid "Closed file" msgstr "Dossier clos" -#: archaeological_files/templates/ishtar/sheet_file.html:114 +#: archaeological_files/templates/ishtar/sheet_file.html:108 msgid "Preventive archaeological file" msgstr "Dossier d'archéologie préventive" -#: archaeological_files/templates/ishtar/sheet_file.html:119 +#: archaeological_files/templates/ishtar/sheet_file.html:113 msgid "Developed surface" msgstr "Surface aménagée" -#: archaeological_files/templates/ishtar/sheet_file.html:183 +#: archaeological_files/templates/ishtar/sheet_file.html:123 +msgid "Responsible for planning service address" +msgstr "Responsable pour le service instructeur - adresse" + +#: archaeological_files/templates/ishtar/sheet_file.html:177 #: archaeological_operations/templates/ishtar/sheet_operation.html:385 #: na_app/templates/ishtar/sheet_operation.html:353 #: sra_idf_app/templates/ishtar/sheet_operation.html:375 msgid "Associated parcels" msgstr "Parcelles associées" -#: archaeological_files/templates/ishtar/sheet_file.html:186 +#: archaeological_files/templates/ishtar/sheet_file.html:180 #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 #: archaeological_finds/templates/ishtar/sheet_treatment.html:140 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:87 #: archaeological_operations/models.py:2933 #: archaeological_operations/templates/ishtar/sheet_operation.html:390 #: archaeological_operations/templates/ishtar/sheet_operation.html:527 +#: ishtar_common/templates/ishtar/sheet_document.html:125 #: na_app/templates/ishtar/sheet_operation.html:358 #: na_app/templates/ishtar/sheet_operation.html:495 #: sra_idf_app/templates/ishtar/sheet_operation.html:380 @@ -3032,13 +3046,13 @@ msgstr "Parcelles associées" msgid "Administrative acts" msgstr "Actes administratifs" -#: archaeological_files/templates/ishtar/sheet_file.html:189 +#: archaeological_files/templates/ishtar/sheet_file.html:183 #: archaeological_files/templates/ishtar/wizard/wizard_file_deletion.html:5 msgid "Associated operations" msgstr "Opérations associées" -#: archaeological_files/templates/ishtar/sheet_file.html:192 -#: archaeological_files/templates/ishtar/sheet_file.html:220 +#: archaeological_files/templates/ishtar/sheet_file.html:186 +#: archaeological_files/templates/ishtar/sheet_file.html:214 #: archaeological_operations/models.py:2665 #: archaeological_operations/models.py:2968 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 @@ -3049,15 +3063,15 @@ msgstr "Opérations associées" msgid "Ref." msgstr "Réf." -#: archaeological_files/templates/ishtar/sheet_file.html:194 -#: archaeological_files/templates/ishtar/sheet_file.html:221 +#: archaeological_files/templates/ishtar/sheet_file.html:188 +#: archaeological_files/templates/ishtar/sheet_file.html:215 #: archaeological_finds/forms_treatments.py:646 #: archaeological_finds/forms_treatments.py:735 #: archaeological_finds/models_treatments.py:131 -#: archaeological_finds/templates/ishtar/sheet_find.html:421 -#: archaeological_finds/templates/ishtar/sheet_find.html:459 -#: archaeological_finds/templates/ishtar/sheet_find.html:497 -#: archaeological_finds/templates/ishtar/sheet_find.html:535 +#: archaeological_finds/templates/ishtar/sheet_find.html:390 +#: archaeological_finds/templates/ishtar/sheet_find.html:428 +#: archaeological_finds/templates/ishtar/sheet_find.html:466 +#: archaeological_finds/templates/ishtar/sheet_find.html:504 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:416 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:454 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:492 @@ -3109,21 +3123,21 @@ msgstr "Réf." msgid "Type" msgstr "Type" -#: archaeological_files/templates/ishtar/sheet_file.html:197 +#: archaeological_files/templates/ishtar/sheet_file.html:191 #: archaeological_operations/forms.py:791 #: archaeological_operations/models.py:1352 msgid "Excavation end date" msgstr "Date de fin de chantier" -#: archaeological_files/templates/ishtar/sheet_file.html:212 +#: archaeological_files/templates/ishtar/sheet_file.html:206 msgid "No operation associated to this archaeological file" msgstr "Pas d'opération associée à ce dossier archéologique" -#: archaeological_files/templates/ishtar/sheet_file.html:216 +#: archaeological_files/templates/ishtar/sheet_file.html:210 msgid "Admninistrative acts linked to associated operations" msgstr "Actes administratifs associés à ces opérations" -#: archaeological_files/templates/ishtar/sheet_file.html:222 +#: archaeological_files/templates/ishtar/sheet_file.html:216 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:9 #: archaeological_warehouse/forms.py:707 ishtar_common/admin.py:766 #: ishtar_common/models.py:736 ishtar_common/models.py:3411 @@ -3131,60 +3145,60 @@ msgstr "Actes administratifs associés à ces opérations" msgid "Date" msgstr "Date" -#: archaeological_files/templates/ishtar/sheet_file.html:232 +#: archaeological_files/templates/ishtar/sheet_file.html:226 msgid "No administrative act linked to operations" msgstr "Pas d'acte administratif associé à ces opérations" -#: archaeological_files/templates/ishtar/sheet_file.html:238 +#: archaeological_files/templates/ishtar/sheet_file.html:232 msgid "Document for this archaeological file" msgstr "Document pour ce dossier archéologique" -#: archaeological_files/templates/ishtar/sheet_file.html:261 +#: archaeological_files/templates/ishtar/sheet_file.html:255 msgid "Total developed surface" msgstr "Surface totale aménagée" -#: archaeological_files/templates/ishtar/sheet_file.html:276 +#: archaeological_files/templates/ishtar/sheet_file.html:270 msgid "Human and technical requirements" msgstr "Besoins humains et techniques" -#: archaeological_files/templates/ishtar/sheet_file.html:285 -#: archaeological_files/templates/ishtar/sheet_file.html:337 -#: archaeological_files/templates/ishtar/sheet_file.html:389 +#: archaeological_files/templates/ishtar/sheet_file.html:279 +#: archaeological_files/templates/ishtar/sheet_file.html:331 +#: archaeological_files/templates/ishtar/sheet_file.html:383 msgid "Effective" msgstr "Effectif" -#: archaeological_files/templates/ishtar/sheet_file.html:291 -#: archaeological_files/templates/ishtar/sheet_file.html:294 -#: archaeological_files/templates/ishtar/sheet_file.html:343 -#: archaeological_files/templates/ishtar/sheet_file.html:346 -#: archaeological_files/templates/ishtar/sheet_file.html:395 -#: archaeological_files/templates/ishtar/sheet_file.html:398 +#: archaeological_files/templates/ishtar/sheet_file.html:285 +#: archaeological_files/templates/ishtar/sheet_file.html:288 +#: archaeological_files/templates/ishtar/sheet_file.html:337 +#: archaeological_files/templates/ishtar/sheet_file.html:340 +#: archaeological_files/templates/ishtar/sheet_file.html:389 +#: archaeological_files/templates/ishtar/sheet_file.html:392 #: archaeological_operations/templates/ishtar/sheet_operation.html:224 #: na_app/templates/ishtar/sheet_operation.html:220 #: sra_idf_app/templates/ishtar/sheet_operation.html:220 msgid "Cost" msgstr "Coût" -#: archaeological_files/templates/ishtar/sheet_file.html:309 -#: archaeological_files/templates/ishtar/sheet_file.html:361 -#: archaeological_files/templates/ishtar/sheet_file.html:417 +#: archaeological_files/templates/ishtar/sheet_file.html:303 +#: archaeological_files/templates/ishtar/sheet_file.html:355 +#: archaeological_files/templates/ishtar/sheet_file.html:411 #: archaeological_warehouse/templates/ishtar/sheet_container.html:246 #: archaeological_warehouse/templates/ishtar/sheet_container.html:270 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:201 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:226 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:203 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:228 #: ishtar_common/models.py:1985 ishtar_common/models.py:2017 #: na_app/templates/ishtar/sheet_container.html:252 #: na_app/templates/ishtar/sheet_container.html:276 msgid "Total" msgstr "Total" -#: archaeological_files/templates/ishtar/sheet_file.html:320 -#: archaeological_files/templates/ishtar/sheet_file.html:372 -#: archaeological_files/templates/ishtar/sheet_file.html:424 +#: archaeological_files/templates/ishtar/sheet_file.html:314 +#: archaeological_files/templates/ishtar/sheet_file.html:366 +#: archaeological_files/templates/ishtar/sheet_file.html:418 msgid "Difference" msgstr "Différence" -#: archaeological_files/templates/ishtar/sheet_file.html:331 +#: archaeological_files/templates/ishtar/sheet_file.html:325 msgid "Post-excavation jobs" msgstr "Emplois post-fouille" @@ -3752,7 +3766,7 @@ msgstr "Datation" #: archaeological_finds/forms.py:989 archaeological_finds/forms.py:1466 #: archaeological_finds/forms.py:1651 -#: archaeological_finds/templates/ishtar/sheet_find.html:317 +#: archaeological_finds/templates/ishtar/sheet_find.html:286 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:312 #: cd17_app/templates/ishtar/sheet_find.html:287 #: man_app/templates/ishtar/sheet_museum_find.html:321 @@ -3779,7 +3793,7 @@ msgstr "Cause d'altération" #: archaeological_finds/forms.py:1125 archaeological_finds/forms.py:1499 #: archaeological_finds/forms.py:1988 archaeological_finds/models_finds.py:1208 #: archaeological_finds/models_finds.py:2266 -#: archaeological_finds/templates/ishtar/sheet_find.html:321 +#: archaeological_finds/templates/ishtar/sheet_find.html:290 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:316 #: man_app/templates/ishtar/sheet_museum_find.html:325 msgid "Conservatory states" @@ -3965,6 +3979,7 @@ msgstr "Opération - Vestiges" #: archaeological_finds/forms.py:1784 archaeological_operations/forms.py:502 #: archaeological_operations/forms.py:1242 ishtar_common/forms_common.py:1571 #: ishtar_common/models.py:2434 ishtar_common/models.py:3507 +#: ishtar_common/templates/ishtar/sheet_document.html:135 #: ishtar_common/templates/ishtar/sheet_town.html:80 msgid "Areas" msgstr "Zones" @@ -4270,7 +4285,7 @@ msgstr "Musée - Prix d’achat" #: archaeological_finds/forms.py:2160 archaeological_finds/models_finds.py:1165 #: archaeological_finds/models_finds.py:2108 -#: archaeological_finds/templates/ishtar/sheet_find.html:338 +#: archaeological_finds/templates/ishtar/sheet_find.html:307 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:333 #: cd17_app/templates/ishtar/sheet_find.html:308 #: ishtar_common/forms_common.py:2035 @@ -4286,7 +4301,7 @@ msgid "Reference container - Warehouse (location)" msgstr "Lieu de conservation du contenant de référence" #: archaeological_finds/forms.py:2186 archaeological_finds/models_finds.py:1164 -#: archaeological_finds/templates/ishtar/sheet_find.html:363 +#: archaeological_finds/templates/ishtar/sheet_find.html:332 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:358 #: cd17_app/templates/ishtar/sheet_find.html:333 #: ishtar_common/forms_common.py:2027 @@ -4342,9 +4357,9 @@ msgstr "Panier de mobilier" #: archaeological_finds/forms_treatments.py:174 #: archaeological_finds/models_treatments.py:200 #: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 -#: archaeological_finds/templates/ishtar/sheet_find.html:420 -#: archaeological_finds/templates/ishtar/sheet_find.html:458 -#: archaeological_finds/templates/ishtar/sheet_find.html:496 +#: archaeological_finds/templates/ishtar/sheet_find.html:389 +#: archaeological_finds/templates/ishtar/sheet_find.html:427 +#: archaeological_finds/templates/ishtar/sheet_find.html:465 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:415 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:453 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:491 @@ -4549,9 +4564,9 @@ msgstr "Voulez-vous supprimer ce traitement ?" #: archaeological_finds/models_finds.py:3592 #: archaeological_finds/models_treatments.py:269 #: archaeological_finds/models_treatments.py:761 -#: archaeological_finds/templates/ishtar/sheet_find.html:425 -#: archaeological_finds/templates/ishtar/sheet_find.html:463 -#: archaeological_finds/templates/ishtar/sheet_find.html:501 +#: archaeological_finds/templates/ishtar/sheet_find.html:394 +#: archaeological_finds/templates/ishtar/sheet_find.html:432 +#: archaeological_finds/templates/ishtar/sheet_find.html:470 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:420 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:458 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:496 @@ -4563,7 +4578,7 @@ msgstr "Voulez-vous supprimer ce traitement ?" #: cd17_app/templates/ishtar/sheet_find.html:434 #: cd17_app/templates/ishtar/sheet_find.html:472 #: ishtar_common/forms_common.py:2560 ishtar_common/forms_common.py:2774 -#: ishtar_common/templates/ishtar/sheet_document.html:103 +#: ishtar_common/templates/ishtar/sheet_document.html:105 #: man_app/templates/ishtar/sheet_museum_find.html:429 #: man_app/templates/ishtar/sheet_museum_find.html:467 #: man_app/templates/ishtar/sheet_museum_find.html:505 @@ -4652,7 +4667,7 @@ msgstr "Réf. interne" #: archaeological_finds/forms_treatments.py:655 #: archaeological_finds/forms_treatments.py:743 #: archaeological_finds/models_treatments.py:1131 -#: archaeological_finds/templates/ishtar/sheet_find.html:538 +#: archaeological_finds/templates/ishtar/sheet_find.html:507 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:533 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:61 #: cd17_app/templates/ishtar/sheet_find.html:509 @@ -4666,7 +4681,7 @@ msgstr "Demandeur" #: archaeological_finds/forms_treatments.py:661 #: archaeological_finds/forms_treatments.py:749 #: archaeological_finds/models_treatments.py:1139 -#: archaeological_finds/templates/ishtar/sheet_find.html:539 +#: archaeological_finds/templates/ishtar/sheet_find.html:508 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:534 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:69 #: cd17_app/templates/ishtar/sheet_find.html:510 @@ -4883,6 +4898,7 @@ msgstr "Types de traitement" #: archaeological_finds/models_treatments.py:1006 #: archaeological_finds/models_treatments.py:1196 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:77 +#: ishtar_common/templates/ishtar/sheet_document.html:130 msgid "Treatments" msgstr "Traitements" @@ -5838,7 +5854,7 @@ msgid "Weight unit" msgstr "Unité de poids" #: archaeological_finds/models_finds.py:2082 -#: archaeological_finds/templates/ishtar/sheet_find.html:453 +#: archaeological_finds/templates/ishtar/sheet_find.html:422 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:448 #: cd17_app/templates/ishtar/sheet_find.html:424 #: man_app/templates/ishtar/sheet_museum_find.html:457 @@ -5849,7 +5865,7 @@ msgid "Upstream treatment" msgstr "Traitement amont" #: archaeological_finds/models_finds.py:2089 -#: archaeological_finds/templates/ishtar/sheet_find.html:491 +#: archaeological_finds/templates/ishtar/sheet_find.html:460 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:486 #: cd17_app/templates/ishtar/sheet_find.html:462 #: man_app/templates/ishtar/sheet_museum_find.html:495 @@ -6030,9 +6046,9 @@ msgid "Downstream finds" msgstr "Mobilier aval" #: archaeological_finds/models_treatments.py:762 -#: archaeological_finds/templates/ishtar/sheet_find.html:424 -#: archaeological_finds/templates/ishtar/sheet_find.html:462 -#: archaeological_finds/templates/ishtar/sheet_find.html:500 +#: archaeological_finds/templates/ishtar/sheet_find.html:393 +#: archaeological_finds/templates/ishtar/sheet_find.html:431 +#: archaeological_finds/templates/ishtar/sheet_find.html:469 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:419 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:457 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:495 @@ -6099,7 +6115,7 @@ msgid "exhibition-end-after" msgstr "exposition-termine-apres" #: archaeological_finds/models_treatments.py:1184 -#: archaeological_finds/templates/ishtar/sheet_find.html:530 +#: archaeological_finds/templates/ishtar/sheet_find.html:499 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:525 #: cd17_app/templates/ishtar/sheet_find.html:501 #: man_app/templates/ishtar/sheet_museum_find.html:534 @@ -6230,7 +6246,7 @@ msgstr "Musée / statut juridique" msgid "Museum entry date" msgstr "Date d’entrée au musée" -#: archaeological_finds/templates/ishtar/sheet_find.html:297 +#: archaeological_finds/templates/ishtar/sheet_find.html:266 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:245 #: cd17_app/templates/ishtar/sheet_find.html:267 #: man_app/templates/ishtar/sheet_museum_find.html:254 @@ -6240,7 +6256,7 @@ msgstr "Date d’entrée au musée" msgid "Checked" msgstr "Vérifié" -#: archaeological_finds/templates/ishtar/sheet_find.html:334 +#: archaeological_finds/templates/ishtar/sheet_find.html:303 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:329 #: cd17_app/templates/ishtar/sheet_find.html:304 #: man_app/templates/ishtar/sheet_museum_find.html:338 @@ -6250,7 +6266,7 @@ msgstr "Vérifié" msgid "Warehouse - container" msgstr "Lieu de conservation - contenant" -#: archaeological_finds/templates/ishtar/sheet_find.html:364 +#: archaeological_finds/templates/ishtar/sheet_find.html:333 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:359 #: cd17_app/templates/ishtar/sheet_find.html:334 #: man_app/templates/ishtar/sheet_museum_find.html:368 @@ -6260,7 +6276,7 @@ msgstr "Lieu de conservation - contenant" msgid "Reference container / current container" msgstr "Contenant de référence / contenant actuel" -#: archaeological_finds/templates/ishtar/sheet_find.html:408 +#: archaeological_finds/templates/ishtar/sheet_find.html:377 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:403 #: cd17_app/templates/ishtar/sheet_find.html:378 #: man_app/templates/ishtar/sheet_museum_find.html:412 @@ -6270,7 +6286,7 @@ msgstr "Contenant de référence / contenant actuel" msgid "Container information not available." msgstr "Information de contenant non disponible." -#: archaeological_finds/templates/ishtar/sheet_find.html:415 +#: archaeological_finds/templates/ishtar/sheet_find.html:384 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:410 #: cd17_app/templates/ishtar/sheet_find.html:386 #: man_app/templates/ishtar/sheet_museum_find.html:419 @@ -6280,10 +6296,10 @@ msgstr "Information de contenant non disponible." msgid "Simple treatments" msgstr "Traitements simples" -#: archaeological_finds/templates/ishtar/sheet_find.html:419 -#: archaeological_finds/templates/ishtar/sheet_find.html:457 -#: archaeological_finds/templates/ishtar/sheet_find.html:495 -#: archaeological_finds/templates/ishtar/sheet_find.html:534 +#: archaeological_finds/templates/ishtar/sheet_find.html:388 +#: archaeological_finds/templates/ishtar/sheet_find.html:426 +#: archaeological_finds/templates/ishtar/sheet_find.html:464 +#: archaeological_finds/templates/ishtar/sheet_find.html:503 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:414 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:452 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:490 @@ -6311,9 +6327,9 @@ msgstr "Traitements simples" msgid "Year - index" msgstr "Année - index" -#: archaeological_finds/templates/ishtar/sheet_find.html:423 -#: archaeological_finds/templates/ishtar/sheet_find.html:461 -#: archaeological_finds/templates/ishtar/sheet_find.html:499 +#: archaeological_finds/templates/ishtar/sheet_find.html:392 +#: archaeological_finds/templates/ishtar/sheet_find.html:430 +#: archaeological_finds/templates/ishtar/sheet_find.html:468 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:418 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:456 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:494 @@ -6335,7 +6351,7 @@ msgstr "Année - index" msgid "Related finds (max. 15 displayed)" msgstr "Mobilier associé (max. 15 affichés)" -#: archaeological_finds/templates/ishtar/sheet_find.html:487 +#: archaeological_finds/templates/ishtar/sheet_find.html:456 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:482 #: cd17_app/templates/ishtar/sheet_find.html:458 #: ishtar_common/templates/blocks/DataTables-content.html:39 @@ -6350,8 +6366,8 @@ msgstr "Mobilier associé (max. 15 affichés)" msgid "Export as CSV" msgstr "Export en CSV" -#: archaeological_finds/templates/ishtar/sheet_find.html:487 -#: archaeological_finds/templates/ishtar/sheet_find.html:526 +#: archaeological_finds/templates/ishtar/sheet_find.html:456 +#: archaeological_finds/templates/ishtar/sheet_find.html:495 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:482 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:521 #: cd17_app/templates/ishtar/sheet_find.html:458 @@ -6371,7 +6387,7 @@ msgstr "Export en CSV" msgid "CSV" msgstr "CSV" -#: archaeological_finds/templates/ishtar/sheet_find.html:568 +#: archaeological_finds/templates/ishtar/sheet_find.html:537 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:563 #: archaeological_finds/templates/ishtar/sheet_treatment.html:132 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:82 @@ -6392,7 +6408,7 @@ msgstr "Demandes de traitements associés" #: archaeological_warehouse/templates/ishtar/sheet_container.html:35 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:31 #: ishtar_common/forms_common.py:2230 -#: ishtar_common/templates/ishtar/sheet_document.html:58 +#: ishtar_common/templates/ishtar/sheet_document.html:60 #: na_app/templates/ishtar/sheet_container.html:35 msgid "Content" msgstr "Contenu" @@ -6405,7 +6421,7 @@ msgstr "Contexte archéologique" #: archaeological_finds/templates/ishtar/sheet_treatment.html:70 msgctxt "Treatment" msgid "Closed" -msgstr "Close" +msgstr "Terminé" #: archaeological_finds/templates/ishtar/sheet_treatment.html:72 msgctxt "Treatment" @@ -6415,7 +6431,7 @@ msgstr "Actif" #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:27 msgctxt "Treatment request" msgid "Closed" -msgstr "Close" +msgstr "Terminé" #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:29 msgctxt "Treatment request" @@ -7581,6 +7597,7 @@ msgstr "Libellé en cache" #: archaeological_operations/models.py:1590 #: archaeological_operations/templates/ishtar/sheet_site.html:86 #: ishtar_common/models.py:1039 +#: ishtar_common/templates/ishtar/sheet_document.html:127 #: ishtar_common/templates/ishtar/sheet_town.html:114 msgid "Operations" msgstr "Opérations" @@ -7895,7 +7912,9 @@ msgstr "Sites / parcelles / actes administratifs" #: archaeological_operations/templates/ishtar/sheet_operation.html:80 #: archaeological_operations/templates/ishtar/sheet_operation.html:440 #: archaeological_operations/templates/ishtar/sheet_operation.html:538 -#: ishtar_common/models.py:1039 na_app/templates/ishtar/sheet_operation.html:80 +#: ishtar_common/models.py:1039 +#: ishtar_common/templates/ishtar/sheet_document.html:128 +#: na_app/templates/ishtar/sheet_operation.html:80 #: na_app/templates/ishtar/sheet_operation.html:408 #: na_app/templates/ishtar/sheet_operation.html:506 #: sra_idf_app/templates/ishtar/sheet_operation.html:80 @@ -7909,7 +7928,7 @@ msgstr "Unités d'Enregistrement" #: archaeological_warehouse/templates/ishtar/sheet_container.html:42 #: archaeological_warehouse/templates/ishtar/sheet_container.html:209 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:38 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:164 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:166 #: ishtar_common/templates/blocks/DataTables-tabs.html:30 #: na_app/templates/ishtar/sheet_container.html:42 #: na_app/templates/ishtar/sheet_container.html:215 @@ -7971,7 +7990,7 @@ msgstr "Contenants associés" #: archaeological_operations/templates/ishtar/sheet_operation.html:512 #: archaeological_warehouse/templates/ishtar/sheet_container.html:214 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:169 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:171 #: ishtar_common/models_rest.py:77 #: ishtar_common/templates/blocks/DataTables-content.html:28 #: ishtar_common/templates/blocks/DataTables-content.html:101 @@ -7987,7 +8006,7 @@ msgstr "Exporter" #: archaeological_operations/templates/ishtar/sheet_operation.html:517 #: archaeological_warehouse/templates/ishtar/sheet_container.html:219 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:174 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:176 #: na_app/templates/ishtar/sheet_container.html:225 #: na_app/templates/ishtar/sheet_operation.html:485 #: sra_idf_app/templates/ishtar/sheet_operation.html:507 @@ -7996,7 +8015,7 @@ msgstr "Re-générer les statistiques" #: archaeological_operations/templates/ishtar/sheet_operation.html:522 #: archaeological_warehouse/templates/ishtar/sheet_container.html:224 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:179 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:181 #: na_app/templates/ishtar/sheet_container.html:230 #: na_app/templates/ishtar/sheet_operation.html:490 #: sra_idf_app/templates/ishtar/sheet_operation.html:512 @@ -8182,7 +8201,7 @@ msgstr "Les champs « ordre » doivent être différents." #: archaeological_warehouse/forms.py:130 archaeological_warehouse/models.py:421 #: archaeological_warehouse/templates/ishtar/sheet_container.html:182 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:132 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:134 #: na_app/templates/ishtar/sheet_container.html:188 msgid "Divisions" msgstr "Divisions" @@ -8246,16 +8265,19 @@ msgstr "Commune (saisie libre)" msgid "Country" msgstr "Pays" -#: archaeological_warehouse/forms.py:251 ishtar_common/forms_common.py:775 -#: ishtar_common/forms_common.py:1152 ishtar_common/models_common.py:3678 -#: ishtar_common/models_common.py:3854 +#: archaeological_warehouse/forms.py:251 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:125 +#: ishtar_common/forms_common.py:775 ishtar_common/forms_common.py:1152 +#: ishtar_common/models_common.py:3678 ishtar_common/models_common.py:3854 #: ishtar_common/templates/ishtar/sheet_person.html:28 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:34 msgid "Phone" msgstr "Téléphone" -#: archaeological_warehouse/forms.py:253 ishtar_common/forms_common.py:777 -#: ishtar_common/forms_common.py:1162 ishtar_common/models_common.py:3694 +#: archaeological_warehouse/forms.py:253 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:126 +#: ishtar_common/forms_common.py:777 ishtar_common/forms_common.py:1162 +#: ishtar_common/models_common.py:3694 #: ishtar_common/templates/ishtar/sheet_person.html:46 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:55 msgid "Mobile phone" @@ -8428,8 +8450,9 @@ msgstr "" #: archaeological_warehouse/ishtar_menu.py:70 #: archaeological_warehouse/models.py:1213 #: archaeological_warehouse/templates/ishtar/sheet_container.html:184 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:134 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:216 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:136 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:218 +#: ishtar_common/templates/ishtar/sheet_document.html:133 #: na_app/templates/ishtar/sheet_container.html:190 msgid "Containers" msgstr "Contenants" @@ -8466,6 +8489,7 @@ msgid "Automatically generated" msgstr "Généré automatiquement" #: archaeological_warehouse/models.py:458 +#: ishtar_common/templates/ishtar/sheet_document.html:132 #: ishtar_common/templates/ishtar/sheet_organization.html:49 msgid "Warehouses" msgstr "Lieux de conservation" @@ -8764,39 +8788,43 @@ msgstr "Document associé à ce contenant" msgid "Default divisions (imports)" msgstr "Divisions par défaut (imports)" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:139 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:115 +msgid "Geographic localisation/contact details" +msgstr "Localisation géographique/coordonnées" + +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:141 msgid "No container inside this warehouse" msgstr "Pas de contenant dans ce lieu de conservation" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:143 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:145 msgid "Finds (hosted)" msgstr "Mobiliers (accueillis)" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:148 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:150 msgid "No find inside this warehouse" msgstr "Pas de mobilier dans ce lieu de conservation" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:152 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:154 msgid "Finds (owned)" msgstr "Mobiliers (possédés)" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:157 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:159 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:187 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:189 msgid "No container/division inside this container" msgstr "Pas de contenant ou division dans ce contenant" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:193 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:195 msgid "Finds by location in the warehouse" msgstr "Mobiliers par localisation dans le lieu de conservation" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:218 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:220 msgid "Containers by location in the warehouse" msgstr "Contenants par localisation dans le lieu de conservation" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:246 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:248 msgid "Document for this warehouse" msgstr "Document associé à ce lieu de conservation" @@ -10254,7 +10282,7 @@ msgstr "Angle de prise de vue" #: ishtar_common/models.py:4668 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:9 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:9 -#: ishtar_common/templates/ishtar/sheet_document.html:67 +#: ishtar_common/templates/ishtar/sheet_document.html:69 msgid "Authors" msgstr "Auteurs" @@ -10310,7 +10338,7 @@ msgstr "ISBN" #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:8 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:27 #: ishtar_common/templates/ishtar/import_table.html:2 -#: ishtar_common/templates/ishtar/sheet_document.html:96 +#: ishtar_common/templates/ishtar/sheet_document.html:98 #: ishtar_common/templates/ishtar/sheet_import_gen.html:2 #: ishtar_common/views.py:2318 msgid "Source" @@ -10344,7 +10372,7 @@ msgid "Image" msgstr "Image" #: ishtar_common/forms_common.py:2144 -#: ishtar_common/templates/ishtar/sheet_document.html:59 +#: ishtar_common/templates/ishtar/sheet_document.html:61 msgctxt "Not directory" msgid "File" msgstr "Fichier" @@ -10377,7 +10405,7 @@ msgid "Related items" msgstr "Éléments reliés" #: ishtar_common/forms_common.py:2233 -#: ishtar_common/templates/ishtar/sheet_document.html:84 +#: ishtar_common/templates/ishtar/sheet_document.html:86 msgid "Publishing" msgstr "Éditions" @@ -10893,6 +10921,7 @@ msgid "Archaeological entity" msgstr "Entité (EA)" #: ishtar_common/models.py:1044 +#: ishtar_common/templates/ishtar/sheet_document.html:126 #: ishtar_common/templates/ishtar/sheet_town.html:119 msgid "Sites" msgstr "Sites" @@ -14948,7 +14977,7 @@ msgstr "" msgid "You have locked this item." msgstr "Vous avez verrouillé cet élément." -#: ishtar_common/templates/ishtar/sheet_document.html:61 +#: ishtar_common/templates/ishtar/sheet_document.html:63 msgid "Web link" msgstr "Lien Internet" @@ -14960,6 +14989,10 @@ msgstr "Autre" msgid "Files" msgstr "Dossiers" +#: ishtar_common/templates/ishtar/sheet_document.html:131 +msgid "Treatment files" +msgstr "Demandes de traitement" + #: ishtar_common/templates/ishtar/sheet_import.html:4 msgid "Import" msgstr "Import" diff --git a/locale/pt/LC_MESSAGES/django.po b/locale/pt/LC_MESSAGES/django.po index 793d27d31..2ca13cf40 100644 --- a/locale/pt/LC_MESSAGES/django.po +++ b/locale/pt/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-06 16:24+0200\n" +"POT-Creation-Date: 2024-06-07 15:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -374,9 +374,9 @@ msgstr "" #: archaeological_context_records/forms.py:341 #: archaeological_context_records/models.py:756 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:235 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:239 #: archaeological_files/models.py:609 -#: archaeological_files/templates/ishtar/sheet_file.html:82 +#: archaeological_files/templates/ishtar/sheet_file.html:75 #: archaeological_finds/forms_treatments.py:182 #: archaeological_finds/forms_treatments.py:667 #: archaeological_finds/forms_treatments.py:773 @@ -434,12 +434,12 @@ msgstr "" #: archaeological_context_records/models.py:530 #: archaeological_finds/forms.py:1149 archaeological_finds/forms.py:1566 #: archaeological_finds/models_finds.py:1204 -#: archaeological_finds/templates/ishtar/sheet_find.html:258 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:206 #: archaeological_operations/forms.py:841 #: archaeological_operations/templates/ishtar/sheet_operation.html:556 #: archaeological_operations/templates/ishtar/sheet_operation.html:593 #: cd17_app/templates/ishtar/sheet_find.html:229 +#: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:4 #: man_app/templates/ishtar/sheet_museum_find.html:215 #: na_app/templates/ishtar/sheet_find.html:233 #: na_app/templates/ishtar/sheet_operation.html:524 @@ -455,17 +455,16 @@ msgstr "" #: archaeological_context_records/models.py:111 #: archaeological_files/forms.py:786 archaeological_files/models.py:76 #: archaeological_files/models.py:715 -#: archaeological_files/templates/ishtar/sheet_file.html:196 +#: archaeological_files/templates/ishtar/sheet_file.html:190 #: archaeological_finds/forms.py:1568 #: archaeological_finds/forms_treatments.py:180 #: archaeological_finds/forms_treatments.py:770 #: archaeological_finds/models_finds.py:3623 #: archaeological_finds/models_treatments.py:264 #: archaeological_finds/models_treatments.py:758 -#: archaeological_finds/templates/ishtar/sheet_find.html:259 -#: archaeological_finds/templates/ishtar/sheet_find.html:426 -#: archaeological_finds/templates/ishtar/sheet_find.html:464 -#: archaeological_finds/templates/ishtar/sheet_find.html:502 +#: archaeological_finds/templates/ishtar/sheet_find.html:395 +#: archaeological_finds/templates/ishtar/sheet_find.html:433 +#: archaeological_finds/templates/ishtar/sheet_find.html:471 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:207 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:421 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:459 @@ -478,6 +477,7 @@ msgstr "" #: cd17_app/templates/ishtar/sheet_find.html:397 #: cd17_app/templates/ishtar/sheet_find.html:435 #: cd17_app/templates/ishtar/sheet_find.html:473 +#: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:5 #: man_app/templates/ishtar/sheet_museum_find.html:216 #: man_app/templates/ishtar/sheet_museum_find.html:430 #: man_app/templates/ishtar/sheet_museum_find.html:468 @@ -503,11 +503,10 @@ msgstr "" #: archaeological_files/models.py:716 archaeological_finds/forms.py:1569 #: archaeological_finds/models_finds.py:3624 #: archaeological_finds/models_treatments.py:759 -#: archaeological_finds/templates/ishtar/sheet_find.html:260 -#: archaeological_finds/templates/ishtar/sheet_find.html:427 -#: archaeological_finds/templates/ishtar/sheet_find.html:465 -#: archaeological_finds/templates/ishtar/sheet_find.html:503 -#: archaeological_finds/templates/ishtar/sheet_find.html:541 +#: archaeological_finds/templates/ishtar/sheet_find.html:396 +#: archaeological_finds/templates/ishtar/sheet_find.html:434 +#: archaeological_finds/templates/ishtar/sheet_find.html:472 +#: archaeological_finds/templates/ishtar/sheet_find.html:510 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:208 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:422 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:460 @@ -521,6 +520,7 @@ msgstr "" #: cd17_app/templates/ishtar/sheet_find.html:474 #: cd17_app/templates/ishtar/sheet_find.html:512 #: ishtar_common/models_imports.py:1439 +#: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:6 #: man_app/templates/ishtar/sheet_museum_find.html:217 #: man_app/templates/ishtar/sheet_museum_find.html:431 #: man_app/templates/ishtar/sheet_museum_find.html:469 @@ -547,9 +547,9 @@ msgstr "" #: archaeological_context_records/forms.py:454 #: archaeological_context_records/models.py:122 #: archaeological_finds/forms.py:1570 -#: archaeological_finds/templates/ishtar/sheet_find.html:262 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:210 #: cd17_app/templates/ishtar/sheet_find.html:233 +#: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:8 #: man_app/templates/ishtar/sheet_museum_find.html:219 #: na_app/templates/ishtar/sheet_find.html:237 #: pdl_app/templates/ishtar/sheet_find.html:228 @@ -561,9 +561,9 @@ msgstr "" #: archaeological_context_records/models.py:84 #: archaeological_context_records/models.py:115 #: archaeological_finds/forms.py:1567 -#: archaeological_finds/templates/ishtar/sheet_find.html:261 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:209 #: cd17_app/templates/ishtar/sheet_find.html:232 +#: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:7 #: man_app/templates/ishtar/sheet_museum_find.html:218 #: na_app/templates/ishtar/sheet_find.html:236 #: pdl_app/templates/ishtar/sheet_find.html:227 @@ -574,8 +574,8 @@ msgstr "" #: archaeological_context_records/forms.py:456 #: archaeological_context_records/models.py:127 #: archaeological_finds/forms.py:1571 -#: archaeological_finds/templates/ishtar/sheet_find.html:263 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:211 +#: ishtar_common/templates/ishtar/blocks/sheet_dating_list.html:9 msgid "Precise on this dating" msgstr "" @@ -619,7 +619,7 @@ msgstr "" #: archaeological_context_records/forms.py:515 #: archaeological_context_records/models.py:784 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:49 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:185 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:186 msgid "Interpretation" msgstr "" @@ -628,6 +628,7 @@ msgid "Context record - 040 - Interpretation" msgstr "" #: archaeological_context_records/forms.py:521 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:202 msgid "Dating complements" msgstr "" @@ -1439,7 +1440,7 @@ msgid "Operation / Archaeological site" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:74 -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:266 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:270 #: archaeological_finds/forms.py:2331 archaeological_finds/models_finds.py:98 #: archaeological_finds/models_finds.py:112 #: archaeological_finds/models_finds.py:129 @@ -1470,7 +1471,8 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_site.html:92 #: archaeological_warehouse/templates/ishtar/sheet_container.html:189 #: archaeological_warehouse/templates/ishtar/sheet_container.html:236 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:192 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:194 +#: ishtar_common/templates/ishtar/sheet_document.html:129 #: na_app/templates/ishtar/sheet_container.html:195 #: na_app/templates/ishtar/sheet_container.html:242 #: na_app/templates/ishtar/sheet_operation.html:89 @@ -1484,7 +1486,7 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:101 #: archaeological_finds/templates/ishtar/sheet_find.html:74 -#: archaeological_finds/templates/ishtar/sheet_find.html:581 +#: archaeological_finds/templates/ishtar/sheet_find.html:550 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:74 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:576 #: archaeological_operations/templates/ishtar/sheet_operation.html:98 @@ -1542,9 +1544,9 @@ msgstr "" msgid "Complete identifier" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:151 -#: archaeological_files/templates/ishtar/sheet_file.html:104 -#: archaeological_files/templates/ishtar/sheet_file.html:269 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:152 +#: archaeological_files/templates/ishtar/sheet_file.html:98 +#: archaeological_files/templates/ishtar/sheet_file.html:263 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:58 #: archaeological_operations/templates/ishtar/sheet_operation.html:216 #: ishtar_common/templates/ishtar/sheet_town.html:71 @@ -1553,14 +1555,13 @@ msgstr "" msgid "Surface" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:166 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:167 #: archaeological_files/forms.py:286 -#: archaeological_files/templates/ishtar/sheet_file.html:95 +#: archaeological_files/templates/ishtar/sheet_file.html:88 #: archaeological_finds/templates/ishtar/sheet_basefind.html:59 #: archaeological_operations/templates/ishtar/sheet_operation.html:332 #: archaeological_operations/templates/ishtar/sheet_site.html:67 #: archaeological_warehouse/templates/ishtar/sheet_container.html:168 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:115 #: ishtar_common/templates/ishtar/sheet_town.html:95 #: man_app/templates/ishtar/sheet_basefind.html:56 #: na_app/templates/ishtar/sheet_container.html:174 @@ -1569,11 +1570,11 @@ msgstr "" msgid "Geographic localisation" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:177 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:178 #: archaeological_finds/forms.py:546 archaeological_finds/forms.py:827 #: archaeological_finds/forms.py:987 #: archaeological_finds/templates/ishtar/sheet_basefind.html:70 -#: archaeological_finds/templates/ishtar/sheet_find.html:295 +#: archaeological_finds/templates/ishtar/sheet_find.html:264 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:243 #: archaeological_operations/templates/ishtar/sheet_operation.html:353 #: cd17_app/templates/ishtar/sheet_find.html:265 @@ -1589,29 +1590,28 @@ msgstr "" msgid "Sheet" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:214 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:218 msgid "Operation summary" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:217 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:221 #: archaeological_operations/templates/ishtar/sheet_operation.html:303 #: na_app/templates/ishtar/sheet_operation.html:285 #: sra_idf_app/templates/ishtar/sheet_operation.html:293 msgid "Patriarche OA code not yet recorded!" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:223 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:227 msgid "Numerical reference" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:229 -#: archaeological_files/templates/ishtar/sheet_file.html:75 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:233 #: archaeological_finds/forms_treatments.py:144 #: archaeological_finds/models_treatments.py:132 #: archaeological_finds/models_treatments.py:219 -#: archaeological_finds/templates/ishtar/sheet_find.html:422 -#: archaeological_finds/templates/ishtar/sheet_find.html:460 -#: archaeological_finds/templates/ishtar/sheet_find.html:498 +#: archaeological_finds/templates/ishtar/sheet_find.html:391 +#: archaeological_finds/templates/ishtar/sheet_find.html:429 +#: archaeological_finds/templates/ishtar/sheet_find.html:467 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:417 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:455 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:493 @@ -1640,64 +1640,64 @@ msgstr "" msgid "State" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:230 -#: archaeological_files/templates/ishtar/sheet_file.html:77 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:234 +#: archaeological_files/templates/ishtar/sheet_file.html:70 #: archaeological_operations/templates/ishtar/sheet_operation.html:184 #: na_app/templates/ishtar/sheet_operation.html:180 #: sra_idf_app/templates/ishtar/sheet_operation.html:180 msgid "Active file" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:230 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:234 #: archaeological_operations/templates/ishtar/sheet_operation.html:187 #: na_app/templates/ishtar/sheet_operation.html:183 #: sra_idf_app/templates/ishtar/sheet_operation.html:183 msgid "Closed operation" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:237 -#: archaeological_files/templates/ishtar/sheet_file.html:84 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:241 +#: archaeological_files/templates/ishtar/sheet_file.html:77 #: archaeological_operations/templates/ishtar/sheet_operation.html:210 #: na_app/templates/ishtar/sheet_operation.html:206 #: sra_idf_app/templates/ishtar/sheet_operation.html:206 msgid "by" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:249 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:253 msgid "No operation linked to this context record!" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:271 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:275 msgid "No associated finds." msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:275 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:279 #: archaeological_operations/templates/ishtar/sheet_operation.html:478 #: na_app/templates/ishtar/sheet_operation.html:446 #: sra_idf_app/templates/ishtar/sheet_operation.html:468 msgid "Documents from associated finds" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:288 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:292 #: archaeological_operations/templates/ishtar/sheet_operation.html:444 #: na_app/templates/ishtar/sheet_operation.html:412 #: sra_idf_app/templates/ishtar/sheet_operation.html:434 msgid "Context record relations" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:294 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:298 msgid "Diagram of stratigraphic relations - above" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:302 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:306 msgid "Diagram of stratigraphic relations - below" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:310 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:314 msgid "Diagram of stratigraphic relations - full" msgstr "" -#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:326 +#: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:330 msgid "Document from this context record" msgstr "" @@ -1750,7 +1750,7 @@ msgstr "" #: archaeological_files/forms.py:237 archaeological_files/forms.py:667 #: archaeological_files/forms.py:1122 archaeological_files/forms.py:1158 #: archaeological_files/models.py:388 archaeological_files/models.py:539 -#: archaeological_files/templates/ishtar/sheet_file.html:219 +#: archaeological_files/templates/ishtar/sheet_file.html:213 #: archaeological_finds/forms.py:1746 #: archaeological_finds/forms_treatments.py:58 #: archaeological_finds/forms_treatments.py:146 @@ -1830,6 +1830,8 @@ msgstr "" #: archaeological_files/forms.py:104 archaeological_files/forms.py:531 #: archaeological_files/models.py:607 +#: archaeological_files/templates/ishtar/sheet_file.html:131 +#: archaeological_operations/templates/ishtar/sheet_operation.html:280 msgid "Permit/order reference" msgstr "" @@ -1865,7 +1867,7 @@ msgstr "" #: archaeological_files/forms.py:107 archaeological_files/forms.py:378 #: archaeological_files/forms.py:447 -#: archaeological_files/templates/ishtar/sheet_file.html:195 +#: archaeological_files/templates/ishtar/sheet_file.html:189 #: archaeological_finds/forms_treatments.py:649 msgid "In charge" msgstr "" @@ -1915,7 +1917,7 @@ msgstr "" #: archaeological_files/models.py:624 #: archaeological_finds/forms_treatments.py:768 #: archaeological_finds/models_treatments.py:1148 -#: archaeological_finds/templates/ishtar/sheet_find.html:540 +#: archaeological_finds/templates/ishtar/sheet_find.html:509 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:535 #: cd17_app/templates/ishtar/sheet_find.html:511 #: man_app/templates/ishtar/sheet_museum_find.html:544 @@ -1967,6 +1969,7 @@ msgstr "" #: ishtar_common/forms_common.py:1810 ishtar_common/models.py:2408 #: ishtar_common/models_common.py:3414 #: ishtar_common/templates/ishtar/sheet_area.html:71 +#: ishtar_common/templates/ishtar/sheet_document.html:134 #: na_app/templates/ishtar/sheet_operation.html:146 #: sra_idf_app/templates/ishtar/sheet_operation.html:146 msgid "Towns" @@ -2070,7 +2073,7 @@ msgid "Responsible for planning service" msgstr "" #: archaeological_files/forms.py:565 -#: archaeological_files/templates/ishtar/sheet_file.html:150 +#: archaeological_files/templates/ishtar/sheet_file.html:144 msgid "Research archaeology" msgstr "" @@ -2109,6 +2112,7 @@ msgid "Archaeological file - 050 - Instruction" msgstr "" #: archaeological_files/forms.py:644 +#: archaeological_files/templates/ishtar/sheet_file.html:66 msgid "File managed by" msgstr "" @@ -2116,6 +2120,11 @@ msgstr "" msgid "Related file" msgstr "" +#: archaeological_files/forms.py:665 archaeological_files/models.py:644 +#: archaeological_files/templates/ishtar/sheet_file.html:64 +msgid "Instruction deadline" +msgstr "" + #: archaeological_files/forms.py:730 msgid "Would you like to close this archaeological file?" msgstr "" @@ -2133,7 +2142,7 @@ msgid "Preventive file - 020 - Edition form" msgstr "" #: archaeological_files/forms.py:746 ishtar_common/forms_common.py:2232 -#: ishtar_common/templates/ishtar/sheet_document.html:77 +#: ishtar_common/templates/ishtar/sheet_document.html:79 msgid "Dates" msgstr "" @@ -2170,25 +2179,25 @@ msgid "Linear meter (m)" msgstr "" #: archaeological_files/forms.py:889 archaeological_files/forms.py:891 -#: archaeological_files/templates/ishtar/sheet_file.html:289 -#: archaeological_files/templates/ishtar/sheet_file.html:292 -#: archaeological_files/templates/ishtar/sheet_file.html:341 -#: archaeological_files/templates/ishtar/sheet_file.html:344 +#: archaeological_files/templates/ishtar/sheet_file.html:283 +#: archaeological_files/templates/ishtar/sheet_file.html:286 +#: archaeological_files/templates/ishtar/sheet_file.html:335 +#: archaeological_files/templates/ishtar/sheet_file.html:338 msgid "Man by day" msgstr "" #: archaeological_files/forms.py:890 archaeological_files/forms.py:892 -#: archaeological_files/templates/ishtar/sheet_file.html:290 -#: archaeological_files/templates/ishtar/sheet_file.html:293 -#: archaeological_files/templates/ishtar/sheet_file.html:342 -#: archaeological_files/templates/ishtar/sheet_file.html:345 +#: archaeological_files/templates/ishtar/sheet_file.html:284 +#: archaeological_files/templates/ishtar/sheet_file.html:287 +#: archaeological_files/templates/ishtar/sheet_file.html:336 +#: archaeological_files/templates/ishtar/sheet_file.html:339 msgid "Days" msgstr "" #: archaeological_files/forms.py:893 archaeological_files/models.py:116 #: archaeological_files/models.py:1418 archaeological_files/models.py:1435 -#: archaeological_files/templates/ishtar/sheet_file.html:283 -#: archaeological_files/templates/ishtar/sheet_file.html:335 +#: archaeological_files/templates/ishtar/sheet_file.html:277 +#: archaeological_files/templates/ishtar/sheet_file.html:329 msgid "Job" msgstr "" @@ -2207,7 +2216,7 @@ msgid "Preventive file - 030 - Post-excavation" msgstr "" #: archaeological_files/forms.py:997 -#: archaeological_files/templates/ishtar/sheet_file.html:279 +#: archaeological_files/templates/ishtar/sheet_file.html:273 msgid "Ground jobs" msgstr "" @@ -2216,13 +2225,13 @@ msgid "Preventive file - 040 - Ground jobs" msgstr "" #: archaeological_files/forms.py:1005 archaeological_files/forms.py:1007 -#: archaeological_files/templates/ishtar/sheet_file.html:393 -#: archaeological_files/templates/ishtar/sheet_file.html:396 +#: archaeological_files/templates/ishtar/sheet_file.html:387 +#: archaeological_files/templates/ishtar/sheet_file.html:390 msgid "Quantity" msgstr "" #: archaeological_files/forms.py:1009 -#: archaeological_files/templates/ishtar/sheet_file.html:387 +#: archaeological_files/templates/ishtar/sheet_file.html:381 msgid "Equipment / service" msgstr "" @@ -2238,7 +2247,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:908 #: archaeological_finds/models_treatments.py:205 #: archaeological_finds/models_treatments.py:1107 -#: archaeological_finds/templates/ishtar/sheet_find.html:396 +#: archaeological_finds/templates/ishtar/sheet_find.html:365 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:391 #: archaeological_operations/forms.py:1448 #: archaeological_operations/forms.py:1581 @@ -2716,7 +2725,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:642 #: archaeological_finds/forms_treatments.py:724 #: archaeological_finds/models_treatments.py:1114 -#: archaeological_finds/templates/ishtar/sheet_find.html:536 +#: archaeological_finds/templates/ishtar/sheet_find.html:505 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:531 #: archaeological_operations/forms.py:507 #: archaeological_operations/forms.py:1136 @@ -2768,7 +2777,7 @@ msgstr "" #: archaeological_files/models.py:557 #: archaeological_finds/models_treatments.py:1123 -#: archaeological_finds/templates/ishtar/sheet_find.html:537 +#: archaeological_finds/templates/ishtar/sheet_find.html:506 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:532 #: archaeological_warehouse/forms.py:222 archaeological_warehouse/models.py:406 #: cd17_app/templates/ishtar/sheet_find.html:508 @@ -2799,10 +2808,6 @@ msgstr "" msgid "Main town" msgstr "" -#: archaeological_files/models.py:644 -msgid "Instruction deadline" -msgstr "" - #: archaeological_files/models.py:651 msgid "Main address" msgstr "" @@ -2954,9 +2959,9 @@ msgid "Change price agreement" msgstr "" #: archaeological_files/templates/ishtar/forms/preventive_detail.html:21 -#: archaeological_files/templates/ishtar/sheet_file.html:284 -#: archaeological_files/templates/ishtar/sheet_file.html:336 -#: archaeological_files/templates/ishtar/sheet_file.html:388 +#: archaeological_files/templates/ishtar/sheet_file.html:278 +#: archaeological_files/templates/ishtar/sheet_file.html:330 +#: archaeological_files/templates/ishtar/sheet_file.html:382 msgid "Planned" msgstr "" @@ -2981,32 +2986,41 @@ msgstr "" msgid "Back to the file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:77 +#: archaeological_files/templates/ishtar/sheet_file.html:68 +msgid "State of the file" +msgstr "" + +#: archaeological_files/templates/ishtar/sheet_file.html:70 msgid "Closed file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:114 +#: archaeological_files/templates/ishtar/sheet_file.html:108 msgid "Preventive archaeological file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:119 +#: archaeological_files/templates/ishtar/sheet_file.html:113 msgid "Developed surface" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:183 +#: archaeological_files/templates/ishtar/sheet_file.html:123 +msgid "Responsible for planning service address" +msgstr "" + +#: archaeological_files/templates/ishtar/sheet_file.html:177 #: archaeological_operations/templates/ishtar/sheet_operation.html:385 #: na_app/templates/ishtar/sheet_operation.html:353 #: sra_idf_app/templates/ishtar/sheet_operation.html:375 msgid "Associated parcels" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:186 +#: archaeological_files/templates/ishtar/sheet_file.html:180 #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 #: archaeological_finds/templates/ishtar/sheet_treatment.html:140 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:87 #: archaeological_operations/models.py:2933 #: archaeological_operations/templates/ishtar/sheet_operation.html:390 #: archaeological_operations/templates/ishtar/sheet_operation.html:527 +#: ishtar_common/templates/ishtar/sheet_document.html:125 #: na_app/templates/ishtar/sheet_operation.html:358 #: na_app/templates/ishtar/sheet_operation.html:495 #: sra_idf_app/templates/ishtar/sheet_operation.html:380 @@ -3014,13 +3028,13 @@ msgstr "" msgid "Administrative acts" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:189 +#: archaeological_files/templates/ishtar/sheet_file.html:183 #: archaeological_files/templates/ishtar/wizard/wizard_file_deletion.html:5 msgid "Associated operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:192 -#: archaeological_files/templates/ishtar/sheet_file.html:220 +#: archaeological_files/templates/ishtar/sheet_file.html:186 +#: archaeological_files/templates/ishtar/sheet_file.html:214 #: archaeological_operations/models.py:2665 #: archaeological_operations/models.py:2968 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 @@ -3031,15 +3045,15 @@ msgstr "" msgid "Ref." msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:194 -#: archaeological_files/templates/ishtar/sheet_file.html:221 +#: archaeological_files/templates/ishtar/sheet_file.html:188 +#: archaeological_files/templates/ishtar/sheet_file.html:215 #: archaeological_finds/forms_treatments.py:646 #: archaeological_finds/forms_treatments.py:735 #: archaeological_finds/models_treatments.py:131 -#: archaeological_finds/templates/ishtar/sheet_find.html:421 -#: archaeological_finds/templates/ishtar/sheet_find.html:459 -#: archaeological_finds/templates/ishtar/sheet_find.html:497 -#: archaeological_finds/templates/ishtar/sheet_find.html:535 +#: archaeological_finds/templates/ishtar/sheet_find.html:390 +#: archaeological_finds/templates/ishtar/sheet_find.html:428 +#: archaeological_finds/templates/ishtar/sheet_find.html:466 +#: archaeological_finds/templates/ishtar/sheet_find.html:504 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:416 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:454 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:492 @@ -3091,21 +3105,21 @@ msgstr "" msgid "Type" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:197 +#: archaeological_files/templates/ishtar/sheet_file.html:191 #: archaeological_operations/forms.py:791 #: archaeological_operations/models.py:1352 msgid "Excavation end date" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:212 +#: archaeological_files/templates/ishtar/sheet_file.html:206 msgid "No operation associated to this archaeological file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:216 +#: archaeological_files/templates/ishtar/sheet_file.html:210 msgid "Admninistrative acts linked to associated operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:222 +#: archaeological_files/templates/ishtar/sheet_file.html:216 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:9 #: archaeological_warehouse/forms.py:707 ishtar_common/admin.py:766 #: ishtar_common/models.py:736 ishtar_common/models.py:3411 @@ -3113,60 +3127,60 @@ msgstr "" msgid "Date" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:232 +#: archaeological_files/templates/ishtar/sheet_file.html:226 msgid "No administrative act linked to operations" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:238 +#: archaeological_files/templates/ishtar/sheet_file.html:232 msgid "Document for this archaeological file" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:261 +#: archaeological_files/templates/ishtar/sheet_file.html:255 msgid "Total developed surface" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:276 +#: archaeological_files/templates/ishtar/sheet_file.html:270 msgid "Human and technical requirements" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:285 -#: archaeological_files/templates/ishtar/sheet_file.html:337 -#: archaeological_files/templates/ishtar/sheet_file.html:389 +#: archaeological_files/templates/ishtar/sheet_file.html:279 +#: archaeological_files/templates/ishtar/sheet_file.html:331 +#: archaeological_files/templates/ishtar/sheet_file.html:383 msgid "Effective" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:291 -#: archaeological_files/templates/ishtar/sheet_file.html:294 -#: archaeological_files/templates/ishtar/sheet_file.html:343 -#: archaeological_files/templates/ishtar/sheet_file.html:346 -#: archaeological_files/templates/ishtar/sheet_file.html:395 -#: archaeological_files/templates/ishtar/sheet_file.html:398 +#: archaeological_files/templates/ishtar/sheet_file.html:285 +#: archaeological_files/templates/ishtar/sheet_file.html:288 +#: archaeological_files/templates/ishtar/sheet_file.html:337 +#: archaeological_files/templates/ishtar/sheet_file.html:340 +#: archaeological_files/templates/ishtar/sheet_file.html:389 +#: archaeological_files/templates/ishtar/sheet_file.html:392 #: archaeological_operations/templates/ishtar/sheet_operation.html:224 #: na_app/templates/ishtar/sheet_operation.html:220 #: sra_idf_app/templates/ishtar/sheet_operation.html:220 msgid "Cost" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:309 -#: archaeological_files/templates/ishtar/sheet_file.html:361 -#: archaeological_files/templates/ishtar/sheet_file.html:417 +#: archaeological_files/templates/ishtar/sheet_file.html:303 +#: archaeological_files/templates/ishtar/sheet_file.html:355 +#: archaeological_files/templates/ishtar/sheet_file.html:411 #: archaeological_warehouse/templates/ishtar/sheet_container.html:246 #: archaeological_warehouse/templates/ishtar/sheet_container.html:270 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:201 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:226 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:203 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:228 #: ishtar_common/models.py:1985 ishtar_common/models.py:2017 #: na_app/templates/ishtar/sheet_container.html:252 #: na_app/templates/ishtar/sheet_container.html:276 msgid "Total" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:320 -#: archaeological_files/templates/ishtar/sheet_file.html:372 -#: archaeological_files/templates/ishtar/sheet_file.html:424 +#: archaeological_files/templates/ishtar/sheet_file.html:314 +#: archaeological_files/templates/ishtar/sheet_file.html:366 +#: archaeological_files/templates/ishtar/sheet_file.html:418 msgid "Difference" msgstr "" -#: archaeological_files/templates/ishtar/sheet_file.html:331 +#: archaeological_files/templates/ishtar/sheet_file.html:325 msgid "Post-excavation jobs" msgstr "" @@ -3730,7 +3744,7 @@ msgstr "" #: archaeological_finds/forms.py:989 archaeological_finds/forms.py:1466 #: archaeological_finds/forms.py:1651 -#: archaeological_finds/templates/ishtar/sheet_find.html:317 +#: archaeological_finds/templates/ishtar/sheet_find.html:286 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:312 #: cd17_app/templates/ishtar/sheet_find.html:287 #: man_app/templates/ishtar/sheet_museum_find.html:321 @@ -3757,7 +3771,7 @@ msgstr "" #: archaeological_finds/forms.py:1125 archaeological_finds/forms.py:1499 #: archaeological_finds/forms.py:1988 archaeological_finds/models_finds.py:1208 #: archaeological_finds/models_finds.py:2266 -#: archaeological_finds/templates/ishtar/sheet_find.html:321 +#: archaeological_finds/templates/ishtar/sheet_find.html:290 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:316 #: man_app/templates/ishtar/sheet_museum_find.html:325 msgid "Conservatory states" @@ -3943,6 +3957,7 @@ msgstr "" #: archaeological_finds/forms.py:1784 archaeological_operations/forms.py:502 #: archaeological_operations/forms.py:1242 ishtar_common/forms_common.py:1571 #: ishtar_common/models.py:2434 ishtar_common/models.py:3507 +#: ishtar_common/templates/ishtar/sheet_document.html:135 #: ishtar_common/templates/ishtar/sheet_town.html:80 msgid "Areas" msgstr "" @@ -4248,7 +4263,7 @@ msgstr "" #: archaeological_finds/forms.py:2160 archaeological_finds/models_finds.py:1165 #: archaeological_finds/models_finds.py:2108 -#: archaeological_finds/templates/ishtar/sheet_find.html:338 +#: archaeological_finds/templates/ishtar/sheet_find.html:307 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:333 #: cd17_app/templates/ishtar/sheet_find.html:308 #: ishtar_common/forms_common.py:2035 @@ -4264,7 +4279,7 @@ msgid "Reference container - Warehouse (location)" msgstr "" #: archaeological_finds/forms.py:2186 archaeological_finds/models_finds.py:1164 -#: archaeological_finds/templates/ishtar/sheet_find.html:363 +#: archaeological_finds/templates/ishtar/sheet_find.html:332 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:358 #: cd17_app/templates/ishtar/sheet_find.html:333 #: ishtar_common/forms_common.py:2027 @@ -4320,9 +4335,9 @@ msgstr "" #: archaeological_finds/forms_treatments.py:174 #: archaeological_finds/models_treatments.py:200 #: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 -#: archaeological_finds/templates/ishtar/sheet_find.html:420 -#: archaeological_finds/templates/ishtar/sheet_find.html:458 -#: archaeological_finds/templates/ishtar/sheet_find.html:496 +#: archaeological_finds/templates/ishtar/sheet_find.html:389 +#: archaeological_finds/templates/ishtar/sheet_find.html:427 +#: archaeological_finds/templates/ishtar/sheet_find.html:465 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:415 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:453 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:491 @@ -4518,9 +4533,9 @@ msgstr "" #: archaeological_finds/models_finds.py:3592 #: archaeological_finds/models_treatments.py:269 #: archaeological_finds/models_treatments.py:761 -#: archaeological_finds/templates/ishtar/sheet_find.html:425 -#: archaeological_finds/templates/ishtar/sheet_find.html:463 -#: archaeological_finds/templates/ishtar/sheet_find.html:501 +#: archaeological_finds/templates/ishtar/sheet_find.html:394 +#: archaeological_finds/templates/ishtar/sheet_find.html:432 +#: archaeological_finds/templates/ishtar/sheet_find.html:470 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:420 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:458 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:496 @@ -4532,7 +4547,7 @@ msgstr "" #: cd17_app/templates/ishtar/sheet_find.html:434 #: cd17_app/templates/ishtar/sheet_find.html:472 #: ishtar_common/forms_common.py:2560 ishtar_common/forms_common.py:2774 -#: ishtar_common/templates/ishtar/sheet_document.html:103 +#: ishtar_common/templates/ishtar/sheet_document.html:105 #: man_app/templates/ishtar/sheet_museum_find.html:429 #: man_app/templates/ishtar/sheet_museum_find.html:467 #: man_app/templates/ishtar/sheet_museum_find.html:505 @@ -4621,7 +4636,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:655 #: archaeological_finds/forms_treatments.py:743 #: archaeological_finds/models_treatments.py:1131 -#: archaeological_finds/templates/ishtar/sheet_find.html:538 +#: archaeological_finds/templates/ishtar/sheet_find.html:507 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:533 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:61 #: cd17_app/templates/ishtar/sheet_find.html:509 @@ -4635,7 +4650,7 @@ msgstr "" #: archaeological_finds/forms_treatments.py:661 #: archaeological_finds/forms_treatments.py:749 #: archaeological_finds/models_treatments.py:1139 -#: archaeological_finds/templates/ishtar/sheet_find.html:539 +#: archaeological_finds/templates/ishtar/sheet_find.html:508 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:534 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:69 #: cd17_app/templates/ishtar/sheet_find.html:510 @@ -4844,6 +4859,7 @@ msgstr "" #: archaeological_finds/models_treatments.py:1006 #: archaeological_finds/models_treatments.py:1196 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:77 +#: ishtar_common/templates/ishtar/sheet_document.html:130 msgid "Treatments" msgstr "" @@ -5799,7 +5815,7 @@ msgid "Weight unit" msgstr "" #: archaeological_finds/models_finds.py:2082 -#: archaeological_finds/templates/ishtar/sheet_find.html:453 +#: archaeological_finds/templates/ishtar/sheet_find.html:422 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:448 #: cd17_app/templates/ishtar/sheet_find.html:424 #: man_app/templates/ishtar/sheet_museum_find.html:457 @@ -5810,7 +5826,7 @@ msgid "Upstream treatment" msgstr "" #: archaeological_finds/models_finds.py:2089 -#: archaeological_finds/templates/ishtar/sheet_find.html:491 +#: archaeological_finds/templates/ishtar/sheet_find.html:460 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:486 #: cd17_app/templates/ishtar/sheet_find.html:462 #: man_app/templates/ishtar/sheet_museum_find.html:495 @@ -5986,9 +6002,9 @@ msgid "Downstream finds" msgstr "" #: archaeological_finds/models_treatments.py:762 -#: archaeological_finds/templates/ishtar/sheet_find.html:424 -#: archaeological_finds/templates/ishtar/sheet_find.html:462 -#: archaeological_finds/templates/ishtar/sheet_find.html:500 +#: archaeological_finds/templates/ishtar/sheet_find.html:393 +#: archaeological_finds/templates/ishtar/sheet_find.html:431 +#: archaeological_finds/templates/ishtar/sheet_find.html:469 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:419 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:457 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:495 @@ -6055,7 +6071,7 @@ msgid "exhibition-end-after" msgstr "" #: archaeological_finds/models_treatments.py:1184 -#: archaeological_finds/templates/ishtar/sheet_find.html:530 +#: archaeological_finds/templates/ishtar/sheet_find.html:499 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:525 #: cd17_app/templates/ishtar/sheet_find.html:501 #: man_app/templates/ishtar/sheet_museum_find.html:534 @@ -6178,7 +6194,7 @@ msgstr "" msgid "Museum entry date" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:297 +#: archaeological_finds/templates/ishtar/sheet_find.html:266 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:245 #: cd17_app/templates/ishtar/sheet_find.html:267 #: man_app/templates/ishtar/sheet_museum_find.html:254 @@ -6188,7 +6204,7 @@ msgstr "" msgid "Checked" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:334 +#: archaeological_finds/templates/ishtar/sheet_find.html:303 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:329 #: cd17_app/templates/ishtar/sheet_find.html:304 #: man_app/templates/ishtar/sheet_museum_find.html:338 @@ -6198,7 +6214,7 @@ msgstr "" msgid "Warehouse - container" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:364 +#: archaeological_finds/templates/ishtar/sheet_find.html:333 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:359 #: cd17_app/templates/ishtar/sheet_find.html:334 #: man_app/templates/ishtar/sheet_museum_find.html:368 @@ -6208,7 +6224,7 @@ msgstr "" msgid "Reference container / current container" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:408 +#: archaeological_finds/templates/ishtar/sheet_find.html:377 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:403 #: cd17_app/templates/ishtar/sheet_find.html:378 #: man_app/templates/ishtar/sheet_museum_find.html:412 @@ -6218,7 +6234,7 @@ msgstr "" msgid "Container information not available." msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:415 +#: archaeological_finds/templates/ishtar/sheet_find.html:384 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:410 #: cd17_app/templates/ishtar/sheet_find.html:386 #: man_app/templates/ishtar/sheet_museum_find.html:419 @@ -6228,10 +6244,10 @@ msgstr "" msgid "Simple treatments" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:419 -#: archaeological_finds/templates/ishtar/sheet_find.html:457 -#: archaeological_finds/templates/ishtar/sheet_find.html:495 -#: archaeological_finds/templates/ishtar/sheet_find.html:534 +#: archaeological_finds/templates/ishtar/sheet_find.html:388 +#: archaeological_finds/templates/ishtar/sheet_find.html:426 +#: archaeological_finds/templates/ishtar/sheet_find.html:464 +#: archaeological_finds/templates/ishtar/sheet_find.html:503 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:414 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:452 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:490 @@ -6259,9 +6275,9 @@ msgstr "" msgid "Year - index" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:423 -#: archaeological_finds/templates/ishtar/sheet_find.html:461 -#: archaeological_finds/templates/ishtar/sheet_find.html:499 +#: archaeological_finds/templates/ishtar/sheet_find.html:392 +#: archaeological_finds/templates/ishtar/sheet_find.html:430 +#: archaeological_finds/templates/ishtar/sheet_find.html:468 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:418 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:456 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:494 @@ -6283,7 +6299,7 @@ msgstr "" msgid "Related finds (max. 15 displayed)" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:487 +#: archaeological_finds/templates/ishtar/sheet_find.html:456 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:482 #: cd17_app/templates/ishtar/sheet_find.html:458 #: ishtar_common/templates/blocks/DataTables-content.html:39 @@ -6298,8 +6314,8 @@ msgstr "" msgid "Export as CSV" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:487 -#: archaeological_finds/templates/ishtar/sheet_find.html:526 +#: archaeological_finds/templates/ishtar/sheet_find.html:456 +#: archaeological_finds/templates/ishtar/sheet_find.html:495 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:482 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:521 #: cd17_app/templates/ishtar/sheet_find.html:458 @@ -6319,7 +6335,7 @@ msgstr "" msgid "CSV" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_find.html:568 +#: archaeological_finds/templates/ishtar/sheet_find.html:537 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:563 #: archaeological_finds/templates/ishtar/sheet_treatment.html:132 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:82 @@ -6340,7 +6356,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:35 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:31 #: ishtar_common/forms_common.py:2230 -#: ishtar_common/templates/ishtar/sheet_document.html:58 +#: ishtar_common/templates/ishtar/sheet_document.html:60 #: na_app/templates/ishtar/sheet_container.html:35 msgid "Content" msgstr "" @@ -7509,6 +7525,7 @@ msgstr "" #: archaeological_operations/models.py:1590 #: archaeological_operations/templates/ishtar/sheet_site.html:86 #: ishtar_common/models.py:1039 +#: ishtar_common/templates/ishtar/sheet_document.html:127 #: ishtar_common/templates/ishtar/sheet_town.html:114 msgid "Operations" msgstr "" @@ -7822,7 +7839,9 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:80 #: archaeological_operations/templates/ishtar/sheet_operation.html:440 #: archaeological_operations/templates/ishtar/sheet_operation.html:538 -#: ishtar_common/models.py:1039 na_app/templates/ishtar/sheet_operation.html:80 +#: ishtar_common/models.py:1039 +#: ishtar_common/templates/ishtar/sheet_document.html:128 +#: na_app/templates/ishtar/sheet_operation.html:80 #: na_app/templates/ishtar/sheet_operation.html:408 #: na_app/templates/ishtar/sheet_operation.html:506 #: sra_idf_app/templates/ishtar/sheet_operation.html:80 @@ -7836,7 +7855,7 @@ msgstr "" #: archaeological_warehouse/templates/ishtar/sheet_container.html:42 #: archaeological_warehouse/templates/ishtar/sheet_container.html:209 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:38 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:164 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:166 #: ishtar_common/templates/blocks/DataTables-tabs.html:30 #: na_app/templates/ishtar/sheet_container.html:42 #: na_app/templates/ishtar/sheet_container.html:215 @@ -7898,7 +7917,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:512 #: archaeological_warehouse/templates/ishtar/sheet_container.html:214 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:169 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:171 #: ishtar_common/models_rest.py:77 #: ishtar_common/templates/blocks/DataTables-content.html:28 #: ishtar_common/templates/blocks/DataTables-content.html:101 @@ -7914,7 +7933,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:517 #: archaeological_warehouse/templates/ishtar/sheet_container.html:219 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:174 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:176 #: na_app/templates/ishtar/sheet_container.html:225 #: na_app/templates/ishtar/sheet_operation.html:485 #: sra_idf_app/templates/ishtar/sheet_operation.html:507 @@ -7923,7 +7942,7 @@ msgstr "" #: archaeological_operations/templates/ishtar/sheet_operation.html:522 #: archaeological_warehouse/templates/ishtar/sheet_container.html:224 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:179 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:181 #: na_app/templates/ishtar/sheet_container.html:230 #: na_app/templates/ishtar/sheet_operation.html:490 #: sra_idf_app/templates/ishtar/sheet_operation.html:512 @@ -8095,7 +8114,7 @@ msgstr "" #: archaeological_warehouse/forms.py:130 archaeological_warehouse/models.py:421 #: archaeological_warehouse/templates/ishtar/sheet_container.html:182 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:132 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:134 #: na_app/templates/ishtar/sheet_container.html:188 msgid "Divisions" msgstr "" @@ -8155,16 +8174,19 @@ msgstr "" msgid "Country" msgstr "" -#: archaeological_warehouse/forms.py:251 ishtar_common/forms_common.py:775 -#: ishtar_common/forms_common.py:1152 ishtar_common/models_common.py:3678 -#: ishtar_common/models_common.py:3854 +#: archaeological_warehouse/forms.py:251 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:125 +#: ishtar_common/forms_common.py:775 ishtar_common/forms_common.py:1152 +#: ishtar_common/models_common.py:3678 ishtar_common/models_common.py:3854 #: ishtar_common/templates/ishtar/sheet_person.html:28 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:34 msgid "Phone" msgstr "" -#: archaeological_warehouse/forms.py:253 ishtar_common/forms_common.py:777 -#: ishtar_common/forms_common.py:1162 ishtar_common/models_common.py:3694 +#: archaeological_warehouse/forms.py:253 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:126 +#: ishtar_common/forms_common.py:777 ishtar_common/forms_common.py:1162 +#: ishtar_common/models_common.py:3694 #: ishtar_common/templates/ishtar/sheet_person.html:46 #: ishtar_common/templates/ishtar/wizard/wizard_person.html:55 msgid "Mobile phone" @@ -8332,8 +8354,9 @@ msgstr "" #: archaeological_warehouse/ishtar_menu.py:70 #: archaeological_warehouse/models.py:1213 #: archaeological_warehouse/templates/ishtar/sheet_container.html:184 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:134 -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:216 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:136 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:218 +#: ishtar_common/templates/ishtar/sheet_document.html:133 #: na_app/templates/ishtar/sheet_container.html:190 msgid "Containers" msgstr "" @@ -8369,6 +8392,7 @@ msgid "Automatically generated" msgstr "" #: archaeological_warehouse/models.py:458 +#: ishtar_common/templates/ishtar/sheet_document.html:132 #: ishtar_common/templates/ishtar/sheet_organization.html:49 msgid "Warehouses" msgstr "" @@ -8657,39 +8681,43 @@ msgstr "" msgid "Default divisions (imports)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:139 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:115 +msgid "Geographic localisation/contact details" +msgstr "" + +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:141 msgid "No container inside this warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:143 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:145 msgid "Finds (hosted)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:148 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:150 msgid "No find inside this warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:152 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:154 msgid "Finds (owned)" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:157 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:159 msgid "No find owned by this warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:187 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:189 msgid "No container/division inside this container" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:193 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:195 msgid "Finds by location in the warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:218 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:220 msgid "Containers by location in the warehouse" msgstr "" -#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:246 +#: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:248 msgid "Document for this warehouse" msgstr "" @@ -10077,7 +10105,7 @@ msgstr "" #: ishtar_common/models.py:4668 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:9 #: ishtar_common/templates/ishtar/blocks/window_tables/documents.html:9 -#: ishtar_common/templates/ishtar/sheet_document.html:67 +#: ishtar_common/templates/ishtar/sheet_document.html:69 msgid "Authors" msgstr "" @@ -10133,7 +10161,7 @@ msgstr "" #: ishtar_common/templates/ishtar/blocks/sheet_geographic.html:8 #: ishtar_common/templates/ishtar/forms/geo_delete_form.html:27 #: ishtar_common/templates/ishtar/import_table.html:2 -#: ishtar_common/templates/ishtar/sheet_document.html:96 +#: ishtar_common/templates/ishtar/sheet_document.html:98 #: ishtar_common/templates/ishtar/sheet_import_gen.html:2 #: ishtar_common/views.py:2318 msgid "Source" @@ -10164,7 +10192,7 @@ msgid "Image" msgstr "" #: ishtar_common/forms_common.py:2144 -#: ishtar_common/templates/ishtar/sheet_document.html:59 +#: ishtar_common/templates/ishtar/sheet_document.html:61 msgctxt "Not directory" msgid "File" msgstr "" @@ -10197,7 +10225,7 @@ msgid "Related items" msgstr "" #: ishtar_common/forms_common.py:2233 -#: ishtar_common/templates/ishtar/sheet_document.html:84 +#: ishtar_common/templates/ishtar/sheet_document.html:86 msgid "Publishing" msgstr "" @@ -10704,6 +10732,7 @@ msgid "Archaeological entity" msgstr "" #: ishtar_common/models.py:1044 +#: ishtar_common/templates/ishtar/sheet_document.html:126 #: ishtar_common/templates/ishtar/sheet_town.html:119 msgid "Sites" msgstr "" @@ -14572,7 +14601,7 @@ msgstr "" msgid "You have locked this item." msgstr "" -#: ishtar_common/templates/ishtar/sheet_document.html:61 +#: ishtar_common/templates/ishtar/sheet_document.html:63 msgid "Web link" msgstr "" @@ -14584,6 +14613,10 @@ msgstr "" msgid "Files" msgstr "" +#: ishtar_common/templates/ishtar/sheet_document.html:131 +msgid "Treatment files" +msgstr "" + #: ishtar_common/templates/ishtar/sheet_import.html:4 msgid "Import" msgstr "" |