aboutsummaryrefslogtreecommitdiffstats
path: root/config/locales
diff options
context:
space:
mode:
Diffstat (limited to 'config/locales')
-rw-r--r--config/locales/actions.en.yml1
-rw-r--r--config/locales/actions.fr.yml1
-rw-r--r--config/locales/companies.en.yml2
-rw-r--r--config/locales/layouts.en.yml1
-rw-r--r--config/locales/layouts.fr.yml1
-rw-r--r--config/locales/lines.en.yml4
-rw-r--r--config/locales/networks.en.yml2
-rw-r--r--config/locales/routing_constraint_zones.en.yml2
-rw-r--r--config/locales/routing_constraint_zones.fr.yml2
-rw-r--r--config/locales/stop_areas.en.yml2
10 files changed, 13 insertions, 5 deletions
diff --git a/config/locales/actions.en.yml b/config/locales/actions.en.yml
index faf0dcec2..2c48f11a9 100644
--- a/config/locales/actions.en.yml
+++ b/config/locales/actions.en.yml
@@ -35,3 +35,4 @@ en:
no_result_text: "No Results"
searching_term: "Searching..."
are_you_sure: Are you sure?
+ ok: Ok
diff --git a/config/locales/actions.fr.yml b/config/locales/actions.fr.yml
index 9e1a132a7..f02ab2198 100644
--- a/config/locales/actions.fr.yml
+++ b/config/locales/actions.fr.yml
@@ -35,3 +35,4 @@ fr:
no_result_text: "Aucun résultat"
searching_term: "Recherche en cours..."
are_you_sure: Etes vous sûr ?
+ ok: Ok
diff --git a/config/locales/companies.en.yml b/config/locales/companies.en.yml
index f2b19bc19..8a746f6b7 100644
--- a/config/locales/companies.en.yml
+++ b/config/locales/companies.en.yml
@@ -6,7 +6,7 @@ en:
new: "Add a new company"
edit: "Edit this company"
destroy: "Remove this company"
- destroy_confirm: "Are you sure you want destroy this company?"
+ destroy_confirm: "Are you sure you want to destroy this company?"
new:
title: "Add a new company"
edit:
diff --git a/config/locales/layouts.en.yml b/config/locales/layouts.en.yml
index 2f75bffbf..3f67c5c20 100644
--- a/config/locales/layouts.en.yml
+++ b/config/locales/layouts.en.yml
@@ -71,6 +71,7 @@ en:
yesterday: "Yestersday"
edit_periods: "Edit periods"
delete_periods: "Delete periods"
+ warning: Warning
attributes:
author: "Edited by"
created_at: "Created at"
diff --git a/config/locales/layouts.fr.yml b/config/locales/layouts.fr.yml
index 4526a9e56..48c1211d4 100644
--- a/config/locales/layouts.fr.yml
+++ b/config/locales/layouts.fr.yml
@@ -71,6 +71,7 @@ fr:
yesterday: "Hier"
edit_periods: "Editer Périodes"
delete_periods: "Supprimer Périodes"
+ warning: Avertissement
attributes:
author: "Edité par"
created_at: "Créé le"
diff --git a/config/locales/lines.en.yml b/config/locales/lines.en.yml
index 6501faa57..0f3eaadd9 100644
--- a/config/locales/lines.en.yml
+++ b/config/locales/lines.en.yml
@@ -8,7 +8,7 @@ en:
activate: "Activate this line"
deactivate: "Deactivate this line"
activate_confirm: "Are you sure you want to activate this line ?"
- deactivate_confirm: "Are you sure you want tode activate this line ?"
+ deactivate_confirm: "Are you sure you want to deactivate this line ?"
destroy_confirm: "Are you sure you want to destroy this line ?"
destroy_selection_confirm: "Are you sure you want to destroy those lines ?"
import: "Import lines"
@@ -117,7 +117,7 @@ en:
updated_at: Updated at
creator_id: "Created by"
footnotes: "Footnotes"
- stable_id: External permanent idenifier"
+ stable_id: External permanent identifier
status: Status
activated: Activated
deactivated: Deactivated
diff --git a/config/locales/networks.en.yml b/config/locales/networks.en.yml
index 2046a30ae..d4164f9a6 100644
--- a/config/locales/networks.en.yml
+++ b/config/locales/networks.en.yml
@@ -5,7 +5,7 @@ en:
new: "Add a new network"
edit: "Edit this network"
destroy: "Remove this network"
- destroy_confirm: "Are you sure you want destroy this network?"
+ destroy_confirm: "Are you sure you want to destroy this network ?"
new:
title: "Add a new network"
edit:
diff --git a/config/locales/routing_constraint_zones.en.yml b/config/locales/routing_constraint_zones.en.yml
index 2143ce1e1..a4bb9b36c 100644
--- a/config/locales/routing_constraint_zones.en.yml
+++ b/config/locales/routing_constraint_zones.en.yml
@@ -39,6 +39,8 @@ en:
title: "Update routing constraint zone %{name}"
show:
title: "Routing constraint zone %{name}"
+ route_stop_points: Route stop points
+ stop_points: Stop points included in the RCZ
index:
title: "Routing constraint zones"
search_no_results: "No ITL matches your query"
diff --git a/config/locales/routing_constraint_zones.fr.yml b/config/locales/routing_constraint_zones.fr.yml
index b5e0fa7fb..8de1bc225 100644
--- a/config/locales/routing_constraint_zones.fr.yml
+++ b/config/locales/routing_constraint_zones.fr.yml
@@ -39,6 +39,8 @@ fr:
title: "Editer l'ITL : %{name}"
show:
title: "Zone de contrainte %{name}"
+ route_stop_points: Arrêts de l'itinéraire
+ stop_points: Arrêts inclus dans l'ITL
index:
title: "Interdictions de trafic local"
search_no_results: "Aucune ITL ne correspond à votre recherche"
diff --git a/config/locales/stop_areas.en.yml b/config/locales/stop_areas.en.yml
index 7f460381c..3a26f93b2 100644
--- a/config/locales/stop_areas.en.yml
+++ b/config/locales/stop_areas.en.yml
@@ -28,7 +28,7 @@ en:
activate: "Activate this stop"
deactivate: "Deactivate this stop"
activate_confirm: "Are you sure you want to activate this stop ?"
- deactivate_confirm: "Are you sure you want tode activate this stop ?"
+ deactivate_confirm: "Are you sure you want to deactivate this stop ?"
deleted_at: "Activated"
destroy_confirm: "Are you sure you want destroy this stop and all of his children ?"
select_parent: "Create or modify the relation child -> parent"