aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorMarc Florisson2014-09-19 12:28:23 +0200
committerMarc Florisson2014-09-19 12:28:23 +0200
commitff4e748da69889a4441a051c0577b38bbaea3b47 (patch)
tree45f226442c269ef6d9db5506a6ac3ab1f0c88915 /config
parent45ac008c5964a78d3666b76c967b765a3ca3d23d (diff)
parentf7609b02356d4aa773562f49db6b9a540cd28800 (diff)
downloadchouette-core-ff4e748da69889a4441a051c0577b38bbaea3b47.tar.bz2
fix merge
Diffstat (limited to 'config')
-rw-r--r--config/locales/vehicle_journeys.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/locales/vehicle_journeys.yml b/config/locales/vehicle_journeys.yml
index 2c7f93fe6..810c80ddb 100644
--- a/config/locales/vehicle_journeys.yml
+++ b/config/locales/vehicle_journeys.yml
@@ -45,6 +45,8 @@ en:
vehicle_journeys: "Departure's times"
selection: "Filter on"
selection_all: "All"
+ select_journey_patterns: "Select journey pattern"
+ select_time_tables: "Enter a timetable"
time_range: "Departure time threshold"
advanced_search: "Advanced Search"
sidebar:
@@ -143,6 +145,8 @@ fr:
vehicle_journeys: "Horaires de départ aux arrêts"
selection: "Filtrer sur"
selection_all: "Tous"
+ select_journey_patterns: "Sélectionner une mission"
+ select_time_tables: "Saisir un calendrier"
time_range: "Seuil horaire au départ"
advanced_search: "Recherche avancée"
time_filter: