From dacf4371a68ffcc9ac32c6590e19dd201c0a27ab Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Thu, 18 Jan 2018 13:50:46 +0100
Subject: Update translations

---
 ishtar_common/locale/django.pot                          | 13 ++++++++++---
 ishtar_common/models.py                                  |  2 +-
 ishtar_common/templates/ishtar/wizard/wizard_person.html |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'ishtar_common')

diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot
index 96993d3b1..fe237992b 100644
--- a/ishtar_common/locale/django.pot
+++ b/ishtar_common/locale/django.pot
@@ -2,11 +2,11 @@
 # Copyright (C) 2010-2015
 # This file is distributed under the same license as the Ishtar package.
 # Étienne Loks <etienne.loks at peacefrogs net>, 2010-2015.
-# Étienne Loks <etienne.loks@iggdrasil.net>, 2015. #zanata
 # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata
 # Étienne Loks <etienne.loks@iggdrasil.net>, 2016. #zanata
 # Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata
 # Étienne Loks <etienne.loks@iggdrasil.net>, 2017. #zanata
+# Valérie-Emma Leroux <emma@iggdrasil.net>, 2018. #zanata
 msgid ""
 msgstr ""
 
@@ -983,7 +983,6 @@ msgstr ""
 #: templates/ishtar/dashboards/dashboard_main_detail.html:140
 #: templates/ishtar/dashboards/dashboard_main_detail_users.html:26
 #: templates/ishtar/sheet_person.html:24
-#: templates/ishtar/wizard/wizard_person.html:20
 msgid "Number"
 msgstr ""
 
@@ -1176,7 +1175,9 @@ msgid "Year of creation"
 msgstr ""
 
 #: models.py:2734
-msgid "Filling this field is relevant to distinguish old towns to new towns."
+#| msgid ""
+#| "Filling this field is relevant to distinguish old towns to new towns."
+msgid "Filling this field is relevant to distinguish old towns from new towns."
 msgstr ""
 
 #: models.py:2739
@@ -2372,6 +2373,12 @@ msgstr ""
 msgid "Adminact: operator of archaeological operations"
 msgstr ""
 
+#: templates/ishtar/wizard/wizard_person.html:20
+#| msgid "Number"
+msgctxt "phone number"
+msgid "Number"
+msgstr ""
+
 #: templates/ishtar/wizard/wizard_person_deletion.html:33
 msgid "Scientist in charge of archaeological files"
 msgstr ""
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 2c8240a72..aa3e94ae0 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -2732,7 +2732,7 @@ class Town(Imported, models.Model):
     year = models.IntegerField(
         _("Year of creation"), null=True, blank=True,
         help_text=_(u"Filling this field is relevant to distinguish old towns "
-                    u"to new towns."))
+                    u"from new towns."))
     children = models.ManyToManyField(
         'Town', verbose_name=_(u"Town children"), blank=True,
         related_name='parents')
diff --git a/ishtar_common/templates/ishtar/wizard/wizard_person.html b/ishtar_common/templates/ishtar/wizard/wizard_person.html
index 85bbfc75e..e518ecc3d 100644
--- a/ishtar_common/templates/ishtar/wizard/wizard_person.html
+++ b/ishtar_common/templates/ishtar/wizard/wizard_person.html
@@ -17,7 +17,7 @@
   <caption>{% trans "Phone" %}</caption>
   <tr>
     <th>{% trans "Phone type" %}</th>
-    <th>{% trans "Number" %}</th>
+    <th>{% trans "Number" context "phone number" %}</th>
   </tr>
   <tr>
     <td>{{ wizard.form.phone_desc.errors }}{{wizard.form.phone_desc|safe}}</td>
-- 
cgit v1.2.3