diff options
| author | Luc Donnet | 2013-07-01 08:53:34 +0200 |
|---|---|---|
| committer | Luc Donnet | 2013-07-01 08:53:34 +0200 |
| commit | e8f8d98b66d3dc912a8ccc253f46b705d77f7db7 (patch) | |
| tree | 38271d32f5743328e94587fd6e5ceb4a2ddc23da /config | |
| parent | 8f8c8b07b587b0f5f2300f8635b68aeb0415024d (diff) | |
| parent | 3529f9d5f2851b65fcf94b5a4ec3b722b9f6c64c (diff) | |
| download | chouette-core-e8f8d98b66d3dc912a8ccc253f46b705d77f7db7.tar.bz2 | |
Merge branch 'master' of github.com:dryade/chouette2
Diffstat (limited to 'config')
| -rw-r--r-- | config/environment.rb | 2 | ||||
| -rw-r--r-- | config/locales/access_points.yml | 12 | ||||
| -rw-r--r-- | config/locales/stop_areas.yml | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/config/environment.rb b/config/environment.rb index e82bdc5f6..436f5cbba 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -6,4 +6,4 @@ require File.expand_path('../application', __FILE__) ChouetteIhm::Application.initialize! # Fix version -APP_VERSION = '2.0.3' +APP_VERSION = '2.1.0' diff --git a/config/locales/access_points.yml b/config/locales/access_points.yml index 83007d088..caaa55eaf 100644 --- a/config/locales/access_points.yml +++ b/config/locales/access_points.yml @@ -38,9 +38,9 @@ en: country_code: "INSEE code" openning_time: "Opening time" closing_time: "Closing time" - projection_type: "Projection type" - x: "x-position" - y: "y-position" + projection: "Projection type" + projection_x: "x-position" + projection_y: "y-position" long_lat_type: "Projection type" longitude: "Longitude" latitude: "Latitude" @@ -94,9 +94,9 @@ fr: access_point_type: "Type d'accès" street_name: "Nom de la rue" country_code: "Code INSEE" - projection_type: "Projection" - x: "Position X" - y: "Position Y" + projection: "Projection" + projection_x: "Position X" + projection_y: "Position Y" long_lat_type: "Projection" longitude: "Longitude" latitude: "Latitude" diff --git a/config/locales/stop_areas.yml b/config/locales/stop_areas.yml index ffc670522..81720ec3d 100644 --- a/config/locales/stop_areas.yml +++ b/config/locales/stop_areas.yml @@ -70,9 +70,9 @@ en: street_name: "Street name" country_code: "INSEE code" fare_code: "Fare code" - projection_type: "Projection type" - x: "x-position" - y: "y-position" + projection: "Projection type" + projection_x: "x-position" + projection_y: "y-position" long_lat_type: "Projection type" longitude: "Longitude" latitude: "Latitude" @@ -164,9 +164,9 @@ fr: street_name: "Nom de la rue" country_code: "Code INSEE" fare_code: "Zone tarifaire" - projection_type: "Projection" - x: "Position X" - y: "Position Y" + projection: "Projection" + projection_x: "Position X" + projection_y: "Position Y" long_lat_type: "Projection" longitude: "Longitude" latitude: "Latitude" |