Merge pull request #500 from af83/6545-add_generic_navbar

6545 add generic navbar

5 files changed, 31 insertions, 2 deletions

diff --git a/config/locales/layouts.en.yml b/config/locales/layouts.en.yml
index 76a4d65d1..31bff403c 100644
--- a/config/locales/layouts.en.yml
+++ b/config/locales/layouts.en.yml
@@ -22,7 +22,7 @@ en:
         other: Current offers
       workbench_output:
         organisation: Organisation offers
-        idf: IDF offers
+        workgroup: Workgroup offers
       tools: Tools
       sync: Synchronization
       sync_icar: iCAR synchronization
diff --git a/config/locales/merges.en.yml b/config/locales/merges.en.yml
new file mode 100644
index 000000000..f9e90f1ef
--- /dev/null
+++ b/config/locales/merges.en.yml
@@ -0,0 +1,23 @@
+fr:
+  merges:
+    referential_name: "Merged offer %{date}"
+    index:
+      title: "Merged offers"
+    new:
+      title: "New merged offer"
+    show:
+      title: "Merged offer %{name}"
+    actions:
+      create: Merge data spaces
+  activerecord:
+    models:
+      merge: "Merged offer"
+    attributes:
+      merge:
+        created_at: "Created at"
+        started_at: Started at
+        name: Name
+        ended_at: Ended at
+        status: "Status"
+        creator: "Creator"
+        referentials: "Data spaces"
diff --git a/config/locales/merges.yml b/config/locales/merges.fr.yml
index 345727b74..345727b74 100644
--- a/config/locales/merges.yml
+++ b/config/locales/merges.fr.yml
diff --git a/config/locales/stop_area_referentials.en.yml b/config/locales/stop_area_referentials.en.yml
index 9d49d7c5d..3fa91bc92 100644
--- a/config/locales/stop_area_referentials.en.yml
+++ b/config/locales/stop_area_referentials.en.yml
@@ -4,7 +4,10 @@ en:
       sync: "Launch a new reflex synchronization"
       cancel_sync: "Cancel reflex synchronization"
     show:
-      title: 'Stop area referential'
+      title: 'Synchronization iCAR'
+      synchronized: Synchronized
+      status: status
+      message: Message
   activerecord:
     models:
       stop_area_referential:
diff --git a/config/locales/stop_area_referentials.fr.yml b/config/locales/stop_area_referentials.fr.yml
index bb4c4463a..956e801f1 100644
--- a/config/locales/stop_area_referentials.fr.yml
+++ b/config/locales/stop_area_referentials.fr.yml
@@ -5,6 +5,9 @@ fr:
       cancel_sync: "Annuler la synchronisation Reflex"
     show:
       title: 'Synchronisation iCAR'
+      synchronized: Synchronisé
+      status: Statut
+      message: Message      
   activerecord:
     models:
       stop_area_referential: