Refs #3961: updating wording

10 files changed, 16 insertions, 8 deletions

diff --git a/config/locales/actions.en.yml b/config/locales/actions.en.yml
index fe4d3d4e5..cffd04fcf 100644
--- a/config/locales/actions.en.yml
+++ b/config/locales/actions.en.yml
@@ -15,6 +15,7 @@ en:
     sync: 'Synchronize'
     combine: 'Combine'
     actualize: 'Actualize'
+    import: 'Import'
   or: "or"
   cancel: "Cancel"
   search_hint: "Type in a search term"
diff --git a/config/locales/actions.fr.yml b/config/locales/actions.fr.yml
index ae0537ebb..86e72088a 100644
--- a/config/locales/actions.fr.yml
+++ b/config/locales/actions.fr.yml
@@ -5,8 +5,8 @@ fr:
     delete: 'Supprimer'
     search: "Chercher"
     submit: "Valider"
-    add: 'Ajouter'
-    new: 'Ajouter'
+    add: 'Créer'
+    new: 'Créer'
     show: 'Consulter'
     archive: 'Conserver'
     unarchive: 'Déconserver'
@@ -16,6 +16,7 @@ fr:
     sync: 'Synchroniser'
     combine: 'Combiner'
     actualize: 'Actualiser'
+    import: 'Importer'
   or: "ou"
   cancel: "Annuler"
   search_hint: "Entrez un texte à rechercher"
diff --git a/config/locales/companies.en.yml b/config/locales/companies.en.yml
index ac11a896a..301f4d68d 100644
--- a/config/locales/companies.en.yml
+++ b/config/locales/companies.en.yml
@@ -15,7 +15,7 @@ en:
     index:
       title: "Companies"
       name: "Search by name..."
-      name_or_objectid: "Search by name or by objectid..."
+      name_or_objectid: "Search by name or by Codifligne ID..."
       advanced_search: "Advanced search"
   activerecord:
     models:
diff --git a/config/locales/companies.fr.yml b/config/locales/companies.fr.yml
index e582736c9..58fcc2ed7 100644
--- a/config/locales/companies.fr.yml
+++ b/config/locales/companies.fr.yml
@@ -15,7 +15,7 @@ fr:
     index:
       title: "Transporteurs"
       name: "Recherche par nom..."
-      name_or_objectid: "Recherche par nom ou objectid..."
+      name_or_objectid: "Recherche par nom ou ID Codifligne..."
       advanced_search: "Recherche avancée"
   activerecord:
     models:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3f6a68f8d..0a6002175 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -20,3 +20,7 @@ en:
   validity_range: '%{debut} > %{end}'
   bounding_dates: '%{debut} > %{end}'
   metadatas: 'Informations'
+
+  id_codif: 'Codifligne ID'
+  id_reflex: 'Reflex ID'
+  objectid: 'ID'
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 49d1c5bb7..782844ba4 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -20,3 +20,6 @@ fr:
   validity_range: '%{debut} > %{end}'
   bounding_dates: '%{debut} > %{end}'
   metadatas: 'Informations'
+
+  id_codif: 'ID Codifligne'
+  id_reflex: 'ID Reflex'
diff --git a/config/locales/networks.en.yml b/config/locales/networks.en.yml
index a5962e2a6..86be535e4 100644
--- a/config/locales/networks.en.yml
+++ b/config/locales/networks.en.yml
@@ -15,7 +15,7 @@ en:
     index:
       title: "Networks"
       name: "Search by name..."
-      name_or_objectid: "Search by name or by objectid..."
+      name_or_objectid: "Search by name or by Codifligne ID..."
       advanced_search: "Advanced search"
   activerecord:
     models:
diff --git a/config/locales/networks.fr.yml b/config/locales/networks.fr.yml
index 99fd2ac95..30d061968 100644
--- a/config/locales/networks.fr.yml
+++ b/config/locales/networks.fr.yml
@@ -15,7 +15,7 @@ fr:
     index:
       title: "Réseaux"
       name: "Recherche par nom..."
-      name_or_objectid: "Recherche par nom ou objectid..."
+      name_or_objectid: "Recherche par nom ou ID Codifligne..."
       advanced_search: "Recherche avancée"
   activerecord:
     models:
diff --git a/config/locales/routing_constraint_zones.fr.yml b/config/locales/routing_constraint_zones.fr.yml
index 4faff6606..65cd03de9 100644
--- a/config/locales/routing_constraint_zones.fr.yml
+++ b/config/locales/routing_constraint_zones.fr.yml
@@ -9,7 +9,6 @@ fr:
         line: Ligne associée
         created_at: "Créé le"
         updated_at: "Edité le"
-        objectid: Object ID
         stop_points_count: Nombre d'arrêts
         route: Itinéraire associé
         route_id: Itinéraire associé
diff --git a/config/locales/stop_areas.fr.yml b/config/locales/stop_areas.fr.yml
index 60ab3fa3d..3e49cdf7c 100644
--- a/config/locales/stop_areas.fr.yml
+++ b/config/locales/stop_areas.fr.yml
@@ -90,7 +90,7 @@ fr:
         published_name: "Nom public"
         deleted: "Supprimé"
         deleted_at: "Activé"
-        comment: "Description"
+        comment: "Commentaire"
         stop_area_type: "Type d'arrêt"
         area_type: "Type d'arrêt"
         nearest_topic_name: "Point d'intérêt le plus proche"