diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-02-26 20:52:11 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-02-26 20:52:11 +0100 |
| commit | f72f7d90893b4f4ae0e000563b7c20faeefc8f18 (patch) | |
| tree | 8c8f06c9fb974edde62e82875f7a1b8aad49d7c3 /archaeological_files_pdl | |
| parent | 90b20a15bd6bf4f7808957bb8820f10f0d66d5e8 (diff) | |
| parent | 0cd8904defe334ad5307e6ab3ce13638479815a8 (diff) | |
| download | Ishtar-f72f7d90893b4f4ae0e000563b7c20faeefc8f18.tar.bz2 Ishtar-f72f7d90893b4f4ae0e000563b7c20faeefc8f18.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_files_pdl')
| -rw-r--r-- | archaeological_files_pdl/locale/django.pot | 7 | ||||
| -rw-r--r-- | archaeological_files_pdl/templates/ishtar/wizard/file_confirm_wizard.html | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/archaeological_files_pdl/locale/django.pot b/archaeological_files_pdl/locale/django.pot index e7592e95d..ebafd55d6 100644 --- a/archaeological_files_pdl/locale/django.pot +++ b/archaeological_files_pdl/locale/django.pot @@ -3,6 +3,7 @@ # This file is distributed under the same license as the Ishtar package. # Étienne Loks <etienne.loks at peacefrogs net>, 2014. # Étienne Loks <etienne.loks@iggdrasil.net>, 2015. #zanata +# Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata msgid "" msgstr "" @@ -133,7 +134,7 @@ msgid "File followed by" msgstr "" #: templates/ishtar/wizard/file_confirm_wizard.html:8 -msgid "These(s) file(s) have the same numeric index." +msgid "The following files have the same numeric index as this file:" msgstr "" #: templates/ishtar/wizard/file_confirm_wizard.html:11 @@ -142,7 +143,9 @@ msgid "Details" msgstr "" #: templates/ishtar/wizard/file_confirm_wizard.html:19 -msgid "These(s) file(s) are in the same town and have parcel(s) in common." +msgid "" +"The following files are in the same town and have parcels in common with " +"this file:" msgstr "" #: templates/ishtar/wizard/wizard_person_orga.html:28 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 18b8378de..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 "These(s) file(s) have the same numeric index." %}</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 "These(s) file(s) are in the same town and have parcel(s) in common." %}</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> |