Merge branch 'sismo' of github.com:afimb/chouette2 into sismo

2 files changed, 20 insertions, 9 deletions

diff --git a/config/locales/vehicle_journeys.yml b/config/locales/vehicle_journeys.yml
index 0e1b5ad34..ae5946963 100644
--- a/config/locales/vehicle_journeys.yml
+++ b/config/locales/vehicle_journeys.yml
@@ -21,9 +21,12 @@ en:
       to_arrivals: "Copy departures to arrivals"
       to_departures: "Copy arrivals to departures"
       time_tables: "Associated calendars to vehicle journey"
-      slide: "Slide"
-      slide_departure: "Shift 1° departure time"
-      slide_arrival: "Shift 1° arrival time"
+      slide: "Shift"
+      slide_title: "Shift all vehicle passing times"
+      set: "Set"
+      to: "at"
+      slide_departure: "departure time at first stop"
+      slide_arrival: "arrival time at first stop"
     timeless:
       title: "Timeless vehicle journeys"
       vehicle_journeys: "Vehicle journeys with times at stop"
@@ -114,8 +117,12 @@ fr:
       to_arrivals: "Copie départs vers arrivées"
       to_departures: "Copie arrivées vers départs"
       time_tables: "Calendriers associés à la course"
-      slide_departure: "Fixer 1° horaire départ à"
-      slide_arrival: "Fixer 1° horaire arrivée à"
+      slide: "Décaler"
+      slide_title: "Décaler l'ensemble des horaires de course"
+      set: "Fixer"
+      to: "à"
+      slide_departure: "horaire de départ au 1° arrêt à"
+      slide_arrival: "horaire d'arrivée au 1° arrêt à"
     timeless:
       title: "Courses sans horaire"
       vehicle_journeys: "Courses ayant des horaires"
diff --git a/config/locales/vehicle_translations.yml b/config/locales/vehicle_translations.yml
index 9c413f2b3..58dc5c6b8 100644
--- a/config/locales/vehicle_translations.yml
+++ b/config/locales/vehicle_translations.yml
@@ -2,9 +2,11 @@ en:
   vehicle_translations:
     success: "%{count} vehicle journeys created by translation"
     failure: "Fail when creating vehicle journeys by translation"
-    first_stop_arrival_time: "Arrival time at first stop (%{stop_name})"
-    first_stop_departure_time: "Arrival time at first stop (%{stop_name})"
     translate_form:
+      set: "Set"
+      to: "at (hh:mm)"
+      first_stop_arrival_time: "Arrival time at first stop '%{stop_name}'"
+      first_stop_departure_time: "Arrival time at first stop '%{stop_name}'"
       multiple_cloning_form: "Repeat cloning based on a time interval"
   activemodel:
     attributes:
@@ -21,9 +23,11 @@ fr:
   vehicle_translations:
     success: "%{count} course(s) crée(s) par translation"
     failure: "Echec de la création de courses par tanslation"
-    first_stop_arrival_time: "Horaire d'arrivée au premier arrêt (%{stop_name})"
-    first_stop_departure_time: "Horaire de départ au premier arrêt (%{stop_name})"
     translate_form:
+      set: "Fixer"
+      to: "à (hh:mm)"
+      first_stop_arrival_time: "Horaire d'arrivée au premier arrêt '%{stop_name}'"
+      first_stop_departure_time: "Horaire de départ au premier arrêt '%{stop_name}'"
       multiple_cloning_form: "Répéter le clonage à intervalle régulier"
 
   activemodel: