Merge branch 'master' into journey_pattern

2 files changed, 25 insertions, 9 deletions

diff --git a/config/locales/referentials.yml b/config/locales/referentials.yml
index dc0a160ed..7aa60fc1d 100644
--- a/config/locales/referentials.yml
+++ b/config/locales/referentials.yml
@@ -19,6 +19,14 @@ en:
       referential:
         name: Name
         slug: Code
+        prefix: Neptune Object Id prefix
+        projection_type: Alternate projection code (SRID)
+        time_zone: time zone
+  formtastic:
+    hints:
+      referential:
+        slug: only lowercase alphanumerical or underscore characters 
+        prefix: only alphanumerical or underscore characters
 
 fr:
   referentials:
@@ -41,3 +49,11 @@ fr:
       referential:
         name: Nom
         slug: Code
+        prefix: Préfixe des identifiants Neptune
+        projection_type: Code (SRID) de la seconde projection
+        time_zone: Fuseau horaire
+  formtastic:
+    hints:
+      referential:
+        slug: "caractères autorisés : alphanumériques minuscules et 'souligné'"  
+        prefix: "caractères autorisés : alphanumériques et 'souligné'" 
diff --git a/config/locales/stop_areas.yml b/config/locales/stop_areas.yml
index 1029e7e21..d6050cc79 100644
--- a/config/locales/stop_areas.yml
+++ b/config/locales/stop_areas.yml
@@ -8,8 +8,8 @@ en:
       edit: Edit this stop
       destroy: Remove this stop
       destroy_confirm: Are you sure you want destroy this stop?
-      select_parent: Select Parent
-      add_children: Add Children
+      select_parent: Manage Parent
+      add_children: Manage Children
     new:
       title: Add a new stop
     edit:
@@ -26,9 +26,9 @@ en:
       selection_all: All
       area_type: Area Type
     select_parent:
-      title: Select parent of stop area %{stop_area} 
+      title: Manage parent of stop area %{stop_area} 
     add_children:
-      title: Add children of stop area %{stop_area} 
+      title: Manage children of stop area %{stop_area} 
   activerecord:        
     models:        
       stop_area: 
@@ -73,8 +73,8 @@ fr:
       edit: Modifier cet arrêt
       destroy: Supprimer cet arrêt
       destroy_confirm: Etes vous sûr de détruire cet arrêt ?
-      select_parent: Sélectionner le parent
-      add_children: Ajouter un fils
+      select_parent: Gérer le parent
+      add_children: Gérer les fils
     new:
       title: Ajouter un arrêt
     edit:
@@ -91,9 +91,9 @@ fr:
       selection_all: Tous
       area_type: "Type d'arrêt"
     select_parent:
-      title: "Sélection du parent de l'arrêt %{stop_area}"
+      title: "Gérer le parent de l'arrêt %{stop_area}"
     add_children:
-      title: "Ajouter les enfants de l'arrêt %{stop_area}"
+      title: "Gérer les fils de l'arrêt %{stop_area}"
   activerecord:        
     models:        
       stop_area: 
@@ -121,7 +121,7 @@ fr:
         object_version: Version
         creation_time: Créé le
         creator_id: Créé par
-        children_ids: Enfants 
+        children_ids: Fils 
         parent: Parent
   formtastic:
     hints: