prepare version 2.5.1

2 files changed, 5 insertions, 1 deletions

diff --git a/config/environments/production.rb b/config/environments/production.rb
index de408f29f..a320dc448 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -152,7 +152,7 @@ ChouetteIhm::Application.configure do
   # paths for external resources
   config.to_prepare do
     Devise::Mailer.layout "mailer"
-    Chouette::Command.command = ENV['CHOUETTE_GUI_COMMAND'].nil? ? "/usr/local/opt/chouette-command/chouette-cmd_2.5.0/chouette" : ENV['CHOUETTE_GUI_COMMAND']
+    Chouette::Command.command = ENV['CHOUETTE_GUI_COMMAND'].nil? ? "/usr/local/opt/chouette-command/chouette-cmd_2.5.1/chouette" : ENV['CHOUETTE_GUI_COMMAND']
     ImportTask.root = "/var/lib/chouette/imports"
     Export.root = "/var/lib/chouette/exports"
   end
diff --git a/config/locales/exports.yml b/config/locales/exports.yml
index 7b1531314..6ade85762 100644
--- a/config/locales/exports.yml
+++ b/config/locales/exports.yml
@@ -106,6 +106,7 @@ en:
         time_zone: "Time Zone"
         start_date: "Start of period"
         end_date: "End of period"
+        object_id_prefix: "objectId prefix to be ignored"
       export_log_message:
         created_at: "Date"
         position: "N."
@@ -114,6 +115,7 @@ en:
     titles:
       export:
         time_zone: "according to TZ  encoding (see http://en.wikipedia.org/wiki/Tz_database)"
+        object_id_prefix: "when prefix has this value, it will be removed to build GTFS id"
         start_date: "reduce import to vehicle journeys running from this date"
         end_date: "reduce import to vehicle journeys running until this date"
   area_types:
@@ -229,6 +231,7 @@ fr:
         time_zone: "Fuseau horaire"
         start_date: "Début de période"
         end_date: "Fin de période"
+        object_id_prefix: "Préfixe d'identifiant Neptune à ignorer"
       export_log_message:
         created_at: "Date"
         position: "No"
@@ -237,6 +240,7 @@ fr:
     titles:
       export:
         time_zone: "selon le codage TZ  (http://fr.wikipedia.org/wiki/Tz_database)"
+        object_id_prefix: "lorsque le préfixe d'identifiant Netpune prend cette valeur, il n'est pas utilisé pour composer l'identifiant GTFS"
         start_date: "limite l'export aux courses circulant à partir de cette date"
         end_date: "limite l'export aux courses circulant jusqu'à cette date"
   area_types: