aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/locales/lines.en.yml2
-rw-r--r--config/locales/lines.fr.yml2
-rw-r--r--config/locales/stop_areas.en.yml6
-rw-r--r--config/locales/stop_areas.fr.yml7
4 files changed, 6 insertions, 11 deletions
diff --git a/config/locales/lines.en.yml b/config/locales/lines.en.yml
index c1f9063a7..6501faa57 100644
--- a/config/locales/lines.en.yml
+++ b/config/locales/lines.en.yml
@@ -118,7 +118,7 @@ en:
creator_id: "Created by"
footnotes: "Footnotes"
stable_id: External permanent idenifier"
- state: Status
+ status: Status
activated: Activated
deactivated: Deactivated
formtastic:
diff --git a/config/locales/lines.fr.yml b/config/locales/lines.fr.yml
index 487cae35c..587453e83 100644
--- a/config/locales/lines.fr.yml
+++ b/config/locales/lines.fr.yml
@@ -118,7 +118,7 @@ fr:
creator_id: "Créé par"
footnotes: "Notes de bas de page"
stable_id: "Identifiant externe pérenne"
- state: État
+ status: État
activated: Activée
deactivated: Désactivée
formtastic:
diff --git a/config/locales/stop_areas.en.yml b/config/locales/stop_areas.en.yml
index 4d19a77e9..7f460381c 100644
--- a/config/locales/stop_areas.en.yml
+++ b/config/locales/stop_areas.en.yml
@@ -71,9 +71,6 @@ en:
access_managment: "Access Points and Links managment"
access_points: "Access Points"
not_editable: "The area type is not editable"
- state:
- active: Active
- deactivated: Deactivated
genealogical:
genealogical: "Links between stop area"
genealogical_routing: "Routing constraint's links"
@@ -115,6 +112,7 @@ en:
confirmed: "Activated"
confirmed_at: "Activated at"
deleted: "Deactivated"
+ deactivated: "Deactivated"
deleted_at: "Deactivated at"
comment: "Description"
stop_area_type: "Area type"
@@ -148,7 +146,7 @@ en:
zip_code: "Zip code"
city_name: "City"
waiting_time: Waiting time (minutes)
- state: Status
+ status: Status
formtastic:
titles:
stop_area:
diff --git a/config/locales/stop_areas.fr.yml b/config/locales/stop_areas.fr.yml
index 6a5fbf24b..c85faaf7d 100644
--- a/config/locales/stop_areas.fr.yml
+++ b/config/locales/stop_areas.fr.yml
@@ -72,9 +72,6 @@ fr:
access_managment: "Gestion des accès et liens associés"
access_points: "Points d'accès"
not_editable: "Le type d'arrêt est non modifiable"
- state:
- active: Actif
- deactivated: Désactivé
genealogical:
genealogical: "Lien entre arrêts"
genealogical_routing: "Liens de l'ITL"
@@ -114,7 +111,7 @@ fr:
registration_number: "Numéro d'enregistrement"
published_name: "Nom public"
in_creation: "En création"
- confirmed: "Actif"
+ confirmed: "Activé"
confirmed_at: "Activé le"
deleted: "Désactivé"
deactivated: "Désactivé"
@@ -151,7 +148,7 @@ fr:
zip_code: "Code postal"
city_name: "Commune"
waiting_time: Temps de desserte (minutes)
- state: État
+ status: État
formtastic:
titles:
stop_area: