13 files changed, 19 insertions, 18 deletions
diff --git a/config/breadcrumbs.rb b/config/breadcrumbs.rb
index af1dec3ae..28a117d52 100644
--- a/config/breadcrumbs.rb
+++ b/config/breadcrumbs.rb
@@ -175,7 +175,6 @@ end
 
 crumb :stop_areas do |stop_area_referential|
   link I18n.t('stop_areas.index.title'), stop_area_referential_stop_areas_path(stop_area_referential)
-  parent :stop_area_referential, stop_area_referential
 end
 
 crumb :stop_area do |stop_area_referential, stop_area|
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"
diff --git a/config/locales/time_tables.en.yml b/config/locales/time_tables.en.yml
index ce890942d..234f36e81 100644
--- a/config/locales/time_tables.en.yml
+++ b/config/locales/time_tables.en.yml
@@ -90,7 +90,7 @@ en:
       to: " to: "
       start_date: "mm/jj/aaaa"
       end_date: "mm/jj/aaaa"
-      title: "timetables"
+      title: "Timetables"
       selection: "Selection"
       selection_all: "All"
       advanced_search: "Advanced Search"
diff --git a/config/schedule.rb b/config/schedule.rb
index 0d2a24f31..9642fa3a4 100644
--- a/config/schedule.rb
+++ b/config/schedule.rb
@@ -28,25 +28,19 @@ set :NEW_RELIC_LOG, 'stdout'
 set :job_template, "/bin/bash -c ':job'"
 
 every :hour do
-  rake "organisations:sync"
-  rake "users:sync"
+  runner "Cron.every_hour"
 end
 
 every :day, :at => '3:00am' do
-  rake "reflex:sync"
-end
-every :day, :at => '4:00 am' do
-  rake "codifligne:sync"
+  runner "Cron.every_day_at_3AM"
 end
 
-every 5.minutes do
-  rake "import:netex_abort_old"
-  rake "import:notify_parent"
+every :day, :at => '4:00 am' do
+ runner "Cron.every_day_at_4AM"
 end
 
 every 5.minutes do
-  rake "compliance_check_sets:abort_old"
-  rake "compliance_check_sets:notify_parent"
+  runner "Cron.every_5_minutes"
 end
 
 every 1.minute do