diff options
| author | Luc Donnet | 2016-11-21 12:37:07 +0100 |
|---|---|---|
| committer | Luc Donnet | 2016-11-21 12:37:07 +0100 |
| commit | 53263bf43dd386606204a1aaabc7d02aa282d332 (patch) | |
| tree | 8e9bb329f7976e7ebae802d783d5a8058d63d7d5 /config | |
| parent | 61aa1075680b321212326a704d76a5dd60ea3e49 (diff) | |
| parent | 0c05eb7e70644d5358896c55ed2e993bf379f584 (diff) | |
| download | chouette-core-53263bf43dd386606204a1aaabc7d02aa282d332.tar.bz2 | |
Merge branch 'master' of github.com:AF83/stif-boiv
Diffstat (limited to 'config')
| -rw-r--r-- | config/environment.rb | 2 | ||||
| -rw-r--r-- | config/locales/lines.en.yml | 2 | ||||
| -rw-r--r-- | config/locales/lines.fr.yml | 2 | ||||
| -rw-r--r-- | config/locales/routes.fr.yml | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/config/environment.rb b/config/environment.rb index 000bf1c03..592eda45a 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -6,4 +6,4 @@ require File.expand_path('../application', __FILE__) Rails.application.initialize! # Fix version -APP_VERSION = 'Itération 5' +APP_VERSION = 'Itération 7' diff --git a/config/locales/lines.en.yml b/config/locales/lines.en.yml index 51ea2a176..33e979a00 100644 --- a/config/locales/lines.en.yml +++ b/config/locales/lines.en.yml @@ -23,7 +23,7 @@ en: deactivated: "Disabled line" title: "Lines" name_or_number: "Search by name or number..." - name_or_number_or_objectid_or_comment: "Search by name, number, objectid or comment..." + name_or_number_or_objectid: "Search by name, number or objectid..." no_networks: "No networks" no_companies: "No companies" no_group_of_lines: "No group of lines" diff --git a/config/locales/lines.fr.yml b/config/locales/lines.fr.yml index 0ac9e676e..58331b363 100644 --- a/config/locales/lines.fr.yml +++ b/config/locales/lines.fr.yml @@ -23,7 +23,7 @@ fr: deactivated: "Ligne désactivée" title: "Lignes" name_or_number: "Recherche par nom ou indice..." - name_or_number_or_objectid_or_comment: "Recherche par nom, indice, objectid ou commentaire..." + name_or_number_or_objectid: "Recherche par nom, indice ou objectid..." no_networks: "Aucun réseaux" no_companies: "Aucun transporteurs" no_group_of_lines: "Aucun groupes de ligne" diff --git a/config/locales/routes.fr.yml b/config/locales/routes.fr.yml index 74a07e0c0..183531236 100644 --- a/config/locales/routes.fr.yml +++ b/config/locales/routes.fr.yml @@ -59,6 +59,7 @@ fr: direction: "Direction" wayback: "Sens" opposite_route: "Itinéraire associé en sens opposé" + opposite_route_id: "Itinéraire associé en sens opposé" objectid: "Identifiant Neptune" object_version: "Version" creation_time: "Créé le" |