diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-02-24 02:00:38 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-02-24 02:00:38 +0100 |
| commit | 4ea19ff12254d1fbe6206551b01a37e674c59a0b (patch) | |
| tree | 2ce66a68b00fa892f347cdd4b9689447681f7d0f | |
| parent | a15f6165f04cc249a42edde5f01851ccd2d7d4ac (diff) | |
| parent | d9b5c6d54d220ccb05c54636681bcc3bacf4111d (diff) | |
| download | Ishtar-4ea19ff12254d1fbe6206551b01a37e674c59a0b.tar.bz2 Ishtar-4ea19ff12254d1fbe6206551b01a37e674c59a0b.zip | |
Merge branch 'master' of gitlab.com:ishtar/ishtar
| -rw-r--r-- | archaeological_files_pdl/templates/ishtar/wizard/file_confirm_wizard.html | 4 | ||||
| -rw-r--r-- | archaeological_operations/templates/ishtar/sheet_operation.html | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/archaeological_files_pdl/templates/ishtar/wizard/file_confirm_wizard.html b/archaeological_files_pdl/templates/ishtar/wizard/file_confirm_wizard.html index 87c9adc88..fd85de473 100644 --- a/archaeological_files_pdl/templates/ishtar/wizard/file_confirm_wizard.html +++ b/archaeological_files_pdl/templates/ishtar/wizard/file_confirm_wizard.html @@ -5,7 +5,7 @@ {% block "warning_informations" %} {% for file in numeric_reference_files %} {% if forloop.first %} -<p class='alert'><label>{% trans "The following files have the same numeric index as this file." %}</label></p> +<p class='alert'><label>{% trans "The following files have the same numeric index as this file:" %}</label></p> <ul> {% endif%} <li>{{file}} <a href='#' onclick='load_window("{% url 'show-file' file.pk '' %}", "{{model_name}}");' class='display_details'>{% trans "Details" %}</a></li> @@ -16,7 +16,7 @@ {% endfor %} {% for file in similar_files %} {% if forloop.first %} -<p class='alert'><label>{% trans "The following files are in the same town and have parcels in common with this file." %}</label></p> +<p class='alert'><label>{% trans "The following files are in the same town and have parcels in common with this file:" %}</label></p> <ul> {% endif%} <li>{{file}} <a href='#' onclick='load_window("{% url 'show-file' file.pk '' %}", "{{model_name}}");' class='display_details'>{% trans "Details" %}</a></li> diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 4e6c85516..87cf53b27 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -124,7 +124,7 @@ {% include "ishtar/blocks/window_tables/parcels.html" %} {% if item.administrative_act %} -{% trans "Administrativ acts" as administrativeacts_label %} +{% trans "Administrative acts" as administrativeacts_label %} {% table_administrativact administrativeacts_label item.administrative_act.all %} {% endif %} |