Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2

4 files changed, 129 insertions, 43 deletions

diff --git a/config/locales/companies.yml b/config/locales/companies.yml
index 43f104418..d044d72b6 100644
--- a/config/locales/companies.yml
+++ b/config/locales/companies.yml
@@ -1,46 +1,68 @@
 en:
-  companys:
+  companies:
     actions:
-      new: Add a new company
-      edit: Edit this company
-      destroy: Remove this company
+      new: "Add a new company"
+      edit: "Edit this company"
+      destroy: "Remove this company"
       destroy_confirm: "Are you sure you want destroy this company?"
     new:
       title: "Add a new company"        
     edit:
-      title: "Update company"
+      title: "Update company  %{company}"
     show:
-      title: "Company"
+      title: "Company  %{company}"
     index:
       title: "Companies"
+  activerecord:
+    models:
+      company: "Companies"
+    attributes:
+      company:
+        registration_number: "Registration number"
+        name: "Name"
+        short_name: "Short name"
+        organizational_unit: "Unit"
+        operating_department_name: "Department"
+        code: "Zip code"
+        phone: "Phone number"
+        fax: "Fax number"
+        email: "E-mail"
+        object_id: Neptune identifier
+        object_version: Version
+        creation_time: Created on
+        creator_id: Created by 
 
 fr:
   companies:
     actions:
-      new: Ajouter une compagnie
-      edit: Modifier cette compagnie
-      destroy: Supprimer cette compagnie
-      destroy_confirm: "Etes vous sûr de détruire cette compagnie ?"
+      new: "Ajouter un transporteur"
+      edit: "Modifier ce transporteur"
+      destroy: "Supprimer ce transporteur"
+      destroy_confirm: "Etes vous sûr de détruire ce transporteur ?"
     new:
-      title: Ajouter une compagnie
+      title: "Ajouter un transporteur"
     edit:
-      title: Modifier la compagnie %{company}
+      title: "Modifier le transporteur %{company}"
     show:
-      title: Compagnie %{company}
+      title: "Transporteur %{company}"
     index:
-      title: Compagnies
+      title: "Transporteurs"
   activerecord:
     models:
-      company: Compagnies
+      company: "Transporteurs"
     attributes:
       company:
-        registration_number: Identifiant
-        name: Nom
-        short_name: Nom court
-        organizational_unit: Service
-        operating_department_name: Nom du département
-        code: Code
-        phone: Téléphone
-        fax: Fax
-        email: Adresse mail
+        registration_number: "Numéro d'enregistrement"
+        name: "Nom"
+        short_name: "Nom court"
+        organizational_unit: "Service"
+        operating_department_name: "Nom du département"
+        code: "Code postal"
+        phone: "Téléphone"
+        fax: "Fax"
+        email: "Adresse mel"
+        object_id: "Identifiant Neptune"
+        object_version: "Version"
+        creation_time: "Créé le"
+        creator_id: "Créé par"
 
diff --git a/config/locales/lines.yml b/config/locales/lines.yml
index 486c13b36..f7b9d55df 100644
--- a/config/locales/lines.yml
+++ b/config/locales/lines.yml
@@ -11,6 +11,23 @@ en:
       title: "Update line"
     show:
       title: "Line"
+  activerecord:        
+    models:        
+      line: Lignes
+    attributes:
+      line:
+        network: "Network"
+        company: "Company"
+        registration_number: "Registration number"
+        name: "Name"
+        published_name: "Public name"        
+        number: "NUmber"
+        transport_mode_name: "Transport mode"
+        comment: "Comments"
+        object_id: Neptune identifier
+        object_version: Version
+        creation_time: Created on
+        creator_id: Created by 
 
 fr:
   lines:
@@ -34,9 +51,14 @@ fr:
       line:
         network: "Réseau"
         company: "Transporteur"
-        registrationnumber: "Identifiant"
+        registration_number: "Numéro d'enregistrement"
         name: "Nom"
-        publishedname: "Nom publié"        
+        published_name: "Nom publié"        
         number: "Indice"
-        transportmodename: "Mode de transport"
+        transport_mode_name: "Mode de transport"
         comment: "Commentaire"
+        object_id: "Identifiant Neptune"
+        object_version: "Version"
+        creation_time: "Créé le"
+        creator_id: "Créé par"
+
diff --git a/config/locales/networks.yml b/config/locales/networks.yml
index efe748364..1a555abc3 100644
--- a/config/locales/networks.yml
+++ b/config/locales/networks.yml
@@ -13,6 +13,23 @@ en:
       title: "Network"
     index:
       title: "Networks"
+  activerecord:
+    models:
+      network: Networks
+    attributes:
+      network:
+        registration_number: "Registration number"
+        name: "Name"
+        comment: "Comments"
+        version_date: Version date
+        description: Description
+        source_type: Origin system date
+        source_name: Origin system name
+        source_identifier: Origin system identifier        
+        object_id: Neptune identifier
+        object_version: Version
+        creation_time: Created on
+        creator_id: Created by 
 
 fr:
   networks:
@@ -34,10 +51,15 @@ fr:
       network: Réseau
     attributes:
       network:
-        registrationnumber: "Identifiant"
+        registration_number: "Numéro d'enregistrement"
         name: "Nom"
         comment: "Commentaire"
-        version_date: Date de version
+        version_date: Date de cette version
         description: Description
-        source_name: Nom de la source
-        source_identifier: Identifiant de la source        
+        source_type: "Type de système d'origine"
+        source_name: "Nom du système à l'origine du réseau"
+        source_identifier: "Identifiant du système"        
+        object_id: "Identifiant Neptune"
+        object_version: "Version"
+        creation_time: "Créé le"
+        creator_id: "Créé par"
diff --git a/config/locales/transport_modes.yml b/config/locales/transport_modes.yml
index 45e273903..51bea6b00 100644
--- a/config/locales/transport_modes.yml
+++ b/config/locales/transport_modes.yml
@@ -1,24 +1,44 @@
 en:
+  unknown: unknown
+  air: Air
+  train: Train
+  long_distance_train: Long distance train
+  local_train: Local train
+  rapid_transit: Rapid transit
+  metro: Metro
+  tramway: Tramway
+  coach: Coach
+  bus: Bus
+  ferry: Ferry
+  waterborne: Waterborne
+  private_vehicle: Private vehicle
+  walk: Walk
+  trolley_bus: Trolleybus
+  bicycle: Bicycle
+  shuttle: Shuttle
+  taxi: Taxi
+  val: VAL
+  other: Other
 
 fr:
-  interchange: Correspondance
   unknown: Inconnu
-  coach: Voiture
   air: Air
-  waterborne: Eau
+  train: Train
+  long_distance_train: Train longue distance
+  local_train: Train local
+  rapid_transit: Lignes rapides
+  metro: Métro
+  tramway: Tramway
+  coach: Voiture
   bus: Bus
   ferry: Ferry
+  waterborne: Eau
+  private_vehicle: Véhicule privé
   walk: Piéton
-  metro: Métro
+  trolley_bus: Trolley bus
+  bicycle: Vélo
   shuttle: Navette
-  rapid_transit: Lignes rapides
   taxi: Taxi
-  local_train: Train Local
-  train: Train
-  long_distance_train: Train longue distance
-  tramway: Tramway
-  trolley_bus: Bus Trolley
-  private_vehicle: Véhicule Privé
-  bicycle: Vélo
+  val: VAL
   other: Autre
   
\ No newline at end of file