fix translations. Mantis 26840

2 files changed, 16 insertions, 11 deletions

diff --git a/app/views/vehicle_journeys/_form.html.erb b/app/views/vehicle_journeys/_form.html.erb
index 8074e6811..d5d4cffdd 100644
--- a/app/views/vehicle_journeys/_form.html.erb
+++ b/app/views/vehicle_journeys/_form.html.erb
@@ -17,19 +17,19 @@
 	    <%= form.label @vehicle_journey.human_attribute_name(:vehicle_journey_at_stop_ids), :class => "label" %>
     </li>
     <% unless @vehicle_journey.vehicle_journey_at_stops.empty? ||
-       @vehicle_journey.vehicle_journey_at_stops.any? { |vjas| vjas.departure_time.nil? } %>    <div class="vehicle_journey_at_stops">     
+       @vehicle_journey.vehicle_journey_at_stops.any? { |vjas| vjas.departure_time.nil? } %>    <div class="vehicle_journey_at_stops">
       <div class="well">
 	<span class="title"><%= t(".slide_title") %></span>
         <div>
           <span><%= t(".set") %></span> <%= select_tag "", options_for_select( [ [t('.slide_departure'), "departure"], [t('.slide_arrival'), "arrival"] ] ), :class => "departure_or_arrival" %> <span><%= t(".to") %></span>
           <%= select_hour(@vehicle_journey.vehicle_journey_at_stops.first.departure_time.hour) %>
           <%= select_minute(@vehicle_journey.vehicle_journey_at_stops.first.departure_time.min) %>
-          <a class="slide btn btn-default"><%= t("formtastic.slide") %></a>
+          <a class="slide btn btn-default"><%= t(".slide") %></a>
         </div>
       </div>
-      
+
       <% end %>
-    
+
 	    <table class="table table-hover table-striped">
 	      <thead>
 	        <tr>
diff --git a/config/locales/vehicle_journeys.yml b/config/locales/vehicle_journeys.yml
index a7e751674..ae5946963 100644
--- a/config/locales/vehicle_journeys.yml
+++ b/config/locales/vehicle_journeys.yml
@@ -21,10 +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_title: "Shift all hours of the vehicle journey based on existing ones"
-      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"
@@ -115,9 +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_title: "Décaler tous les horaires de la course en fonction de ceux existants"
-      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"