Merge branch 'master' into develop

1 files changed, 4 insertions, 4 deletions

diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index aab532cfc..12dbf9069 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -934,9 +934,9 @@ class JsonDataField(models.Model):
     key = models.CharField(
         _(u"Key"), max_length=200,
         help_text=_(u"Value of the key in the JSON schema. For hierarchical "
-                    u"key use \"__\" to explain it. For instance the key "
+                    u"key use \"__\" to explain it. For instance for the key "
                     u"'my_subkey' with data such as {'my_key': {'my_subkey': "
-                    u"'value'}} will be reached with my_key__my_subkey."))
+                    u"'value'}}, its value will be reached with my_key__my_subkey."))
     display = models.BooleanField(_(u"Display"), default=True)
     order = models.IntegerField(_(u"Order"), default=10)
     section = models.ForeignKey(JsonDataSection, blank=True, null=True)
@@ -954,7 +954,7 @@ class JsonDataField(models.Model):
             return
         if self.section.content_type != self.content_type:
             raise ValidationError(
-                _(u"Content type of the field and of the menu do not match"))
+                _(u"Content types of the field and of the menu do not match"))
 
 
 class JsonData(models.Model):
@@ -2859,7 +2859,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')