Merge pull request #445 from af83/6370-translations-2

Refs #6370 Add some more translations

14 files changed, 54 insertions, 20 deletions

diff --git a/config/locales/calendars.en.yml b/config/locales/calendars.en.yml
index 3d16e7c05..696ae2734 100644
--- a/config/locales/calendars.en.yml
+++ b/config/locales/calendars.en.yml
@@ -69,7 +69,7 @@ en:
         date_ranges: Date ranges
         dates: Dates
         shared: Shared
-        organisation: Organisation
+        organisation: Organization
         monday: "Monday"
         tuesday: "Tuesday"
         wednesday: "Wednesday"
diff --git a/config/locales/companies.en.yml b/config/locales/companies.en.yml
index becb087b1..f2b19bc19 100644
--- a/config/locales/companies.en.yml
+++ b/config/locales/companies.en.yml
@@ -16,7 +16,7 @@ en:
     index:
       title: "Companies"
       name: "Search by name..."
-      name_or_objectid: "Search by name or by Codifligne ID..."
+      name_or_objectid: "Search by name or by ID..."
       advanced_search: "Advanced search"
   activerecord:
     models:
diff --git a/config/locales/line_referentials.en.yml b/config/locales/line_referentials.en.yml
index 5663ed691..18ff28c24 100644
--- a/config/locales/line_referentials.en.yml
+++ b/config/locales/line_referentials.en.yml
@@ -7,7 +7,7 @@ en:
     edit:
       title: "Edit %{name} referential"
     show:
-      title: "iLICO synchronization"
+      title: Line referential
       synchronized: Synchronized
       status: Status
       message: Message
diff --git a/config/locales/lines.en.yml b/config/locales/lines.en.yml
index e61013725..1cd5150db 100644
--- a/config/locales/lines.en.yml
+++ b/config/locales/lines.en.yml
@@ -1,6 +1,5 @@
 en:
   lines: &en_lines
-    search_no_results: "No line matching your query"
     actions:
       new: "Add a new line"
       edit: "Edit this line"
@@ -20,6 +19,8 @@ en:
       show: 'Show'
       show_network: 'Show network'
       show_company: 'Show company'
+    filters:
+      name_or_objectid_cont: "Search by name or objectid"
     new:
       title: "Add a new line"
     create:
@@ -33,11 +34,12 @@ en:
       routes:
         title: "Routes list"
       group_of_lines: "Groups of lines"
+      search_no_results: "No line matching your query"
     index:
       deactivated: "Disabled line"
       title: "Lines"
       line: "Line %{line}"
-      name_or_number_or_objectid: "Search by name, short name or ID Codif..."
+      name_or_number_or_objectid: "Search by name, short name or ID..."
       no_networks: "No networks"
       no_companies: "No companies"
       no_group_of_lines: "No group of lines"
@@ -115,7 +117,7 @@ en:
         creator_id: "Created by"
         footnotes: "Footnotes"
         stable_id: External permanent idenifier"
-        state: State
+        state: Status
         activated: Activated
         deactivated: Deactivated
   formtastic:
diff --git a/config/locales/lines.fr.yml b/config/locales/lines.fr.yml
index d3069f1d1..058238710 100644
--- a/config/locales/lines.fr.yml
+++ b/config/locales/lines.fr.yml
@@ -1,6 +1,5 @@
 fr:
   lines: &fr_lines
-    search_no_results: "Aucune ligne ne correspond à votre recherche"
     actions:
       new: "Ajouter une ligne"
       edit: "Editer cette ligne"
@@ -20,6 +19,8 @@ fr:
       show: 'Consulter'
       show_network: 'Voir le réseau'
       show_company: 'Voir le transporteur principal'
+    filters:
+      name_or_objectid_cont: "Indiquez un nom d'itinéraire ou un ID..."
     new:
       title: "Ajouter une ligne"
     create:
@@ -34,6 +35,7 @@ fr:
         title: "Liste des Itinéraires"
       itineraries: "Liste des séquences d'arrêts de la ligne"
       group_of_lines: "Groupes de lignes"
+      search_no_results: "Aucune ligne ne correspond à votre recherche"
     index:
       deactivated: "Ligne désactivée"
       title: "Lignes"
diff --git a/config/locales/networks.en.yml b/config/locales/networks.en.yml
index 94a8d9df0..2046a30ae 100644
--- a/config/locales/networks.en.yml
+++ b/config/locales/networks.en.yml
@@ -15,7 +15,7 @@ en:
     index:
       title: "Networks"
       name: "Search by name..."
-      name_or_objectid: "Search by name or by Codifligne ID..."
+      name_or_objectid: "Search by name or by ID..."
       advanced_search: "Advanced search"
   activerecord:
     models:
diff --git a/config/locales/routes.en.yml b/config/locales/routes.en.yml
index 58869b895..66805e050 100644
--- a/config/locales/routes.en.yml
+++ b/config/locales/routes.en.yml
@@ -15,7 +15,7 @@ en:
       export_hub_all: "Export HUB routes"
       add_stop_point: "Add stop point"
       new_stop_point: "Create new stop"
-      opposite_route_timetable: "Timetable back"
+      reversed_vehicle_journey: "Reversed vehicle journeys"
     new:
       title: "Add a new route"
     edit:
diff --git a/config/locales/routes.fr.yml b/config/locales/routes.fr.yml
index 9539a2ee3..f4eefa10d 100644
--- a/config/locales/routes.fr.yml
+++ b/config/locales/routes.fr.yml
@@ -15,7 +15,7 @@ fr:
       export_hub_all: "Export HUB des itinéraires"
       add_stop_point: "Ajouter un arrêt"
       new_stop_point: "Créer un arrêt pour l'ajouter"
-      opposite_route_timetable: "Horaires retour"
+      reversed_vehicle_journey: "Horaires retour"
     opposite: "%{name} (retour)"
     new:
       title: "Ajouter un itinéraire"
diff --git a/config/locales/select2.en.yml b/config/locales/select2.en.yml
new file mode 100644
index 000000000..308540af0
--- /dev/null
+++ b/config/locales/select2.en.yml
@@ -0,0 +1,15 @@
+en:
+  select2:
+    error_loading: The results cannot be loaded.
+    input_too_long:
+      one: Remove %{count} letter
+      other: Remove %{count} letters
+    input_too_short:
+      one: Type %{count} letter
+      other: Type %{count} letters
+    loading_more: Loading more…
+    maximum_selected:
+      one: You can select %{count} element
+      other: You can select %{count} elements
+    no_results: No Results
+    searching: Searching...
diff --git a/config/locales/select2.fr.yml b/config/locales/select2.fr.yml
new file mode 100644
index 000000000..4a37a3d78
--- /dev/null
+++ b/config/locales/select2.fr.yml
@@ -0,0 +1,15 @@
+fr:
+  select2:
+    error_loading: Les résultats ne peuvent pas être chargés.
+    input_too_long:
+      one: Supprimez %{count} caractère
+      other: Supprimez %{count} caractères
+    input_too_short:
+      one: Saisissez %{count} caractère
+      other: Saisissez %{count} caractères
+    loading_more: Chargement de résultats supplémentaires…
+    maximum_selected:
+      one: Vous pouvez sélectionner %{count} élément
+      other: Vous pouvez sélectionner %{count} élément
+    no_results: Aucun résultat trouvé
+    searching: Recherche en cours...
\ No newline at end of file
diff --git a/config/locales/stop_area_referentials.en.yml b/config/locales/stop_area_referentials.en.yml
index 11baf67e2..9d49d7c5d 100644
--- a/config/locales/stop_area_referentials.en.yml
+++ b/config/locales/stop_area_referentials.en.yml
@@ -4,7 +4,7 @@ en:
       sync: "Launch a new reflex synchronization"
       cancel_sync: "Cancel reflex synchronization"
     show:
-      title: 'Synchronization iCAR'
+      title: 'Stop area referential'
   activerecord:
     models:
       stop_area_referential:
diff --git a/config/locales/stop_areas.en.yml b/config/locales/stop_areas.en.yml
index ddb2d940c..1da4b58b4 100644
--- a/config/locales/stop_areas.en.yml
+++ b/config/locales/stop_areas.en.yml
@@ -48,9 +48,9 @@ en:
       export_hub_physical: "Export HUB physical"
     filters:
       name_or_objectid: "Search by name or by objectid..."
-      zip_code: Type a zip code...
-      city_name: Type a city name...
-      area_type: Type an area type...
+      zip_code: Enter a zip code...
+      city_name: Enter a city name...
+      area_type: Enter an area type...
     new:
       title: "Add a new stop"
     update:
@@ -70,7 +70,7 @@ en:
       stop_managment: "Parent-child relations"
       access_managment: "Access Points and Links managment"
       access_points: "Access Points"
-      not_editable: "Le type d'arrêt est non modifiable"
+      not_editable: "The area type is not editable"
       state:
         active: Active
         deactivated: Deactivated
@@ -148,7 +148,7 @@ en:
         zip_code: "Zip code"
         city_name: "City"
         waiting_time: Waiting time (minutes)
-        state: State
+        state: Status
   formtastic:
     titles:
       stop_area:
diff --git a/config/locales/stop_points.en.yml b/config/locales/stop_points.en.yml
index 72e138270..76e142ba1 100644
--- a/config/locales/stop_points.en.yml
+++ b/config/locales/stop_points.en.yml
@@ -43,8 +43,8 @@ en:
         created_at: Created
         updated_at: Updated
         deleted_at: "Activated"
-        for_boarding: "For boarding"
-        for_alighting: "For alighting"
+        for_boarding: "Boarding"
+        for_alighting: "Alighting"
         area_type: "Area type"
         city_name: "City name"
         zip_code: "Zip code"
diff --git a/config/locales/vehicle_journeys.en.yml b/config/locales/vehicle_journeys.en.yml
index 79e805ee8..12d8d0da4 100644
--- a/config/locales/vehicle_journeys.en.yml
+++ b/config/locales/vehicle_journeys.en.yml
@@ -3,8 +3,8 @@ en:
     vehicle_journeys_matrix:
       filters:
         id: Filter by ID...
-        timetable: Filter by journey pattern...
-        timetable: Filter by timetable...
+        journey_pattern: Filter by journey pattern...
+        timetable: Filter by timetable...          
       cancel_selection: "Cancel Selection"
       fetching_error: "There has been a problem fetching the data. Please reload the page to try again."
       line_routes: "Line's routes"