Merge pull request #396 from af83/6242-workbench-output

Ref #6242 Add changes to navbar menu and dashboard

7 files changed, 42 insertions, 6 deletions

diff --git a/config/locales/dashboard.en.yml b/config/locales/dashboard.en.yml
index 361a3cf2b..472f5bc2f 100644
--- a/config/locales/dashboard.en.yml
+++ b/config/locales/dashboard.en.yml
@@ -1,5 +1,6 @@
 en:
   dashboards:
+    main_nav_left: Dashboard 
     show:
       title: "Dashboard %{organisation}"
     workbench:
diff --git a/config/locales/dashboard.fr.yml b/config/locales/dashboard.fr.yml
index 1e1c095b1..65022fcb8 100644
--- a/config/locales/dashboard.fr.yml
+++ b/config/locales/dashboard.fr.yml
@@ -1,5 +1,6 @@
 fr:
   dashboards:
+    main_nav_left: Tableau de bord
     show:
       title: "Tableau de bord %{organisation}"
     workbench:
diff --git a/config/locales/layouts.en.yml b/config/locales/layouts.en.yml
index d5717b400..954525ac4 100644
--- a/config/locales/layouts.en.yml
+++ b/config/locales/layouts.en.yml
@@ -10,9 +10,26 @@ en:
     navbar:
       return_to_referentials: "Return to data spaces"
       select_referential: "Select data space"
+      select_referential_for_more_features: "Select data space for more foeatures"
       select_referential_datas: "Select datas"
       return_to_dashboard: "Return to Dashboard"
+      dashboard: Dashboard
       referential_datas: "Datas"
+      current_offer: 
+        one: Current offer
+        other: Current offers
+      workbench_output:
+        organisation: Organisation offers
+        idf: IDF offers
+      tools: Tools
+      sync: Synchronization
+      sync_icar: iCAR synchronization
+      sync_ilico: iLICO synchronization
+      icar: iCAR
+      ilico: iLICO
+      portal: Portal (POSTIF)
+      support: Support
+      shapes: Shapes
     history_tag:
       title: "Metadatas"
       created_at: "Created at"
diff --git a/config/locales/layouts.fr.yml b/config/locales/layouts.fr.yml
index 17d23c756..f125a002d 100644
--- a/config/locales/layouts.fr.yml
+++ b/config/locales/layouts.fr.yml
@@ -10,9 +10,26 @@ fr:
     navbar:
       return_to_referentials: "Retour à la liste des espaces de données"
       select_referential: "Sélection de l'espace de données"
+      select_referential_for_more_features: "Sélectionnez un jeu de données pour accéder à plus de fonctionnalités"
       select_referential_datas: "Sélection des données"
       return_to_dashboard: "Retour au Tableau de Bord"
+      dashboard: Tableau de bord
       referential_datas: "Données"
+      current_offer: 
+        one: Offres courante
+        other: Offres courantes
+      workbench_outputs:
+        organisation: Offres de mon organisation
+        idf: Offres IDF
+      tools: Outils
+      sync: Synchronisation
+      sync_icar: Synchronisation iCAR
+      sync_ilico: Synchronisation iLICO
+      icar: iCAR
+      ilico: iLICO
+      portal: Portail (POSTIF)
+      support: Support
+      shapes: Tracés
     history_tag:
       title: "Métadonnées"
       created_at: "Créé le"
diff --git a/config/locales/merges.yml b/config/locales/merges.yml
index d8511a7b4..345727b74 100644
--- a/config/locales/merges.yml
+++ b/config/locales/merges.yml
@@ -8,7 +8,7 @@ fr:
     show:
       title: "Finalisation de l'offre %{name}"
     actions:
-      create: "Finaliser des Jeux de Données"
+      create: Finaliser des Jeux de Données
   activerecord:
     models:
       merge: "Finalisation de l'offre"
diff --git a/config/locales/workbench_outputs.en.yml b/config/locales/workbench_outputs.en.yml
index 05cf52d0e..2af2f7023 100644
--- a/config/locales/workbench_outputs.en.yml
+++ b/config/locales/workbench_outputs.en.yml
@@ -1,7 +1,7 @@
 en:
   workbench_outputs:
     show:
-      title: "Finalisations de l'offre"
-      see_current_output: "Voir l'Offre actuelle"
+      title: Current offers
+      see_current_output: See the current offer
       table_headers:
-        ended_at: "Offer created date"
+        ended_at: "Ended at"
diff --git a/config/locales/workbench_outputs.fr.yml b/config/locales/workbench_outputs.fr.yml
index 560888c54..b4d339434 100644
--- a/config/locales/workbench_outputs.fr.yml
+++ b/config/locales/workbench_outputs.fr.yml
@@ -1,7 +1,7 @@
 fr:
   workbench_outputs:
     show:
-      title: "Finalisations de l'offre"
+      title: Finaliser des jeux de données
       see_current_output: "Voir l'Offre actuelle"
       table_headers:
-        ended_at: "Date et heure de création de l'offre"
+        ended_at: "Date et heure de création"