From 72c1fef0bb9cdb39f5c6f212ca6b6d44f8132fb1 Mon Sep 17 00:00:00 2001
From: Valérie-Emma Leroux <emma@iggdrasil.net>
Date: Tue, 23 Feb 2016 13:00:11 +0100
Subject: Update translation

---
 .../ishtar/wizard/file_confirm_wizard.html         |  4 ++--
 archaeological_finds/forms.py                      |  4 ++--
 archaeological_finds/models.py                     |  8 ++++----
 archaeological_operations/models.py                |  8 ++++----
 .../fixtures/groups_person_types-SRA-fr.json       | 22 +++++++++++-----------
 5 files changed, 23 insertions(+), 23 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 18b8378de..87c9adc88 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>
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 1498d4028..198d69035 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -51,7 +51,7 @@ class FindForm(forms.Form):
                          'preservation_to_consider': models.PreservationType,
                          'integritie': models.IntegrityType}
     label = forms.CharField(
-        label=_(u"Free-ID"),
+        label=_(u"Free ID"),
         validators=[validators.MaxLengthValidator(60)])
     previous_id = forms.CharField(label=_("Previous ID"), required=False)
     description = forms.CharField(label=_("Description"),
@@ -292,7 +292,7 @@ class ResultFindForm(forms.Form):
     form_label = _(u"Resulting find")
     associated_models = {'material_type': models.MaterialType}
     label = forms.CharField(
-        label=_(u"Free-ID"),
+        label=_(u"Free ID"),
         validators=[validators.MaxLengthValidator(60)])
     description = forms.CharField(label=_(u"Precise description"),
                                   widget=forms.Textarea)
diff --git a/archaeological_finds/models.py b/archaeological_finds/models.py
index 8fc4c9c31..9308be593 100644
--- a/archaeological_finds/models.py
+++ b/archaeological_finds/models.py
@@ -101,7 +101,7 @@ IS_ISOLATED_CHOICES = (
 
 class BaseFind(BaseHistorizedItem, OwnPerms):
     IS_ISOLATED_DICT = dict(IS_ISOLATED_CHOICES)
-    label = models.TextField(_(u"Free-ID"))
+    label = models.TextField(_(u"Free ID"))
     external_id = models.CharField(_(u"External ID"), blank=True, null=True,
                                    max_length=120)
     description = models.TextField(_(u"Description"), blank=True, null=True)
@@ -281,7 +281,7 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
     external_id = models.CharField(_(u"External ID"), blank=True, null=True,
                                    max_length=120)
     order = models.IntegerField(_(u"Order"), default=1)
-    label = models.TextField(_(u"Free-ID"))
+    label = models.TextField(_(u"Free ID"))
     description = models.TextField(_(u"Description"), blank=True, null=True)
     material_types = models.ManyToManyField(
         MaterialType, verbose_name=_(u"Material types"), related_name='finds')
@@ -341,7 +341,7 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
         verbose_name = _(u"Find")
         verbose_name_plural = _(u"Finds")
         permissions = (
-            ("view_find", ugettext(u"Can view all Find")),
+            ("view_find", ugettext(u"Can view all Finds")),
             ("view_own_find", ugettext(u"Can view own Find")),
             ("add_own_find", ugettext(u"Can add own Find")),
             ("change_own_find", ugettext(u"Can change own Find")),
@@ -575,7 +575,7 @@ class Treatment(BaseHistorizedItem, OwnPerms):
         verbose_name = _(u"Treatment")
         verbose_name_plural = _(u"Treatments")
         permissions = (
-            ("view_treatment", ugettext(u"Can view all Treatment")),
+            ("view_treatment", ugettext(u"Can view all Treatments")),
             ("view_own_treatment", ugettext(u"Can view own Treatment")),
             ("add_own_treatment", ugettext(u"Can add own Treatment")),
             ("change_own_treatment", ugettext(u"Can change own Treatment")),
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index 5bbe357c0..945af21a4 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -86,7 +86,7 @@ class ArchaeologicalSite(BaseHistorizedItem):
         verbose_name_plural = _(u"Archaeological sites")
         permissions = (
             ("view_archaeologicalsite",
-             ugettext(u"Can view all Archaeological site")),
+             ugettext(u"Can view all Archaeological sites")),
             ("view_own_archaeologicalsite",
              ugettext(u"Can view own Archaeological site")),
             ("add_own_archaeologicalsite",
@@ -237,7 +237,7 @@ class Operation(BaseHistorizedItem, OwnPerms, ValueGetter, ShortMenuItem,
         verbose_name = _(u"Operation")
         verbose_name_plural = _(u"Operations")
         permissions = (
-            ("view_operation", ugettext(u"Can view all Operation")),
+            ("view_operation", ugettext(u"Can view all Operations")),
             ("view_own_operation", ugettext(u"Can view own Operation")),
             ("add_own_operation", ugettext(u"Can add own Operation")),
             ("change_own_operation", ugettext(u"Can change own Operation")),
@@ -500,7 +500,7 @@ class OperationSource(Source):
         verbose_name_plural = _(u"Operation documentations")
         permissions = (
             ("view_operationsource",
-             ugettext(u"Can view all Operation source")),
+             ugettext(u"Can view all Operation sources")),
             ("view_own_operationsource",
              ugettext(u"Can view own Operation source")),
             ("add_own_operationsource",
@@ -605,7 +605,7 @@ class AdministrativeAct(BaseHistorizedItem, OwnPerms, ValueGetter):
         verbose_name_plural = _(u"Administrative acts")
         permissions = (
             ("view_administrativeact",
-             ugettext(u"Can view all Administrative act")),
+             ugettext(u"Can view all Administrative acts")),
             ("view_own_administrativeact",
              ugettext(u"Can view own Administrative act")),
             ("add_own_administrativeact",
diff --git a/ishtar_common/fixtures/groups_person_types-SRA-fr.json b/ishtar_common/fixtures/groups_person_types-SRA-fr.json
index 6a3044cdd..92fabaccd 100644
--- a/ishtar_common/fixtures/groups_person_types-SRA-fr.json
+++ b/ishtar_common/fixtures/groups_person_types-SRA-fr.json
@@ -112,7 +112,7 @@
         "model": "auth.permission",
         "fields": {
             "codename": "view_contextrecord",
-            "name": "Can view all Context Record",
+            "name": "Can view all Context Records",
             "content_type": 50
         }
     },
@@ -382,7 +382,7 @@
         "model": "auth.permission",
         "fields": {
             "codename": "view_file",
-            "name": "Can view all Archaelogical file",
+            "name": "Can view all Archaelogical files",
             "content_type": 29
         }
     },
@@ -589,7 +589,7 @@
         "model": "auth.permission",
         "fields": {
             "codename": "view_basefind",
-            "name": "Can view all Base find",
+            "name": "Can view all Base finds",
             "content_type": 58
         }
     },
@@ -688,7 +688,7 @@
         "model": "auth.permission",
         "fields": {
             "codename": "view_find",
-            "name": "Can view all Find",
+            "name": "Can view all Finds",
             "content_type": 60
         }
     },
@@ -931,7 +931,7 @@
         "model": "auth.permission",
         "fields": {
             "codename": "view_treatment",
-            "name": "Can view all Treatment",
+            "name": "Can view all Treatments",
             "content_type": 64
         }
     },
@@ -1075,7 +1075,7 @@
         "model": "auth.permission",
         "fields": {
             "codename": "view_administrativeact",
-            "name": "Can view all Administrative act",
+            "name": "Can view all Administrative acts",
             "content_type": 40
         }
     },
@@ -1147,7 +1147,7 @@
         "model": "auth.permission",
         "fields": {
             "codename": "view_archaeologicalsite",
-            "name": "Can view all Archaeological site",
+            "name": "Can view all Archaeological sites",
             "content_type": 69
         }
     },
@@ -1282,7 +1282,7 @@
         "model": "auth.permission",
         "fields": {
             "codename": "view_operation",
-            "name": "Can view all Operation",
+            "name": "Can view all Operations",
             "content_type": 35
         }
     },
@@ -1381,7 +1381,7 @@
         "model": "auth.permission",
         "fields": {
             "codename": "view_operationsource",
-            "name": "Can view all Operation source",
+            "name": "Can view all Operation sources",
             "content_type": 37
         }
     },
@@ -1624,7 +1624,7 @@
         "model": "auth.permission",
         "fields": {
             "codename": "view_warehouse",
-            "name": "Can view all Warehouse",
+            "name": "Can view all Warehouses",
             "content_type": 53
         }
     },
@@ -2038,7 +2038,7 @@
         "model": "auth.permission",
         "fields": {
             "codename": "view_organization",
-            "name": "Can view all Organization",
+            "name": "Can view all Organizations",
             "content_type": 15
         }
     },
-- 
cgit v1.2.3