merge

3 files changed, 25 insertions, 7 deletions

diff --git a/config/locales/connection_links.yml b/config/locales/connection_links.yml
index 6c7426f82..fb9b98ba4 100644
--- a/config/locales/connection_links.yml
+++ b/config/locales/connection_links.yml
@@ -13,6 +13,9 @@ en:
     show:
       title: Connection link %{connection_link}
       durations: "Durations (hh mm ss):"
+    connection_link:
+      from: From
+      to: to
     index:
       title: Connection links
       name: Name
@@ -73,7 +76,10 @@ fr:
       title: Modifier la correspondance %{connection_link}
     show:
       title: Correspondance %{connection_link}
-      durations: "Durées  (hh mm ss) :"
+      durations: "Durées (hh mm ss) :"
+    connection_link:
+      from: De
+      to: vers
     index:
       name: Nom
       title: Correspondances
diff --git a/config/locales/referentials.yml b/config/locales/referentials.yml
index ff09fc35d..ea56917bc 100644
--- a/config/locales/referentials.yml
+++ b/config/locales/referentials.yml
@@ -4,11 +4,15 @@ en:
       title: "Edit the data space"
     show:
       title: Data space
+      clean_up: Clean up
+      validity_out_time_tables: Closed timetables
+      validity_out_soon_time_tables: Timetables closed in %{count} days   
+    counts:    
       objects: Data space elements
       count: count
-      clean_up: Clean up
-      expired_time_tables: Closed timetables
-      almost_expired_time_tables: Timetables closed in %{count} days    
+    validity_out:
+      validity_out_time_tables: Closed timetables
+      validity_out_soon_time_tables: Timetables closed in %{count} days   
     new:
       title: Create a new data space
       submit: "Create a data space"
@@ -66,11 +70,15 @@ fr:
       title: "Modifier l'espace de données"
     show:
       title: Espace de données
+      clean_up: Purge des données obsolètes
+      validity_out_time_tables: Calendriers échus
+      validity_out_soon_time_tables: Calendriers à échoir dans %{count} jours    
+    counts:    
       objects: Eléments 
       count: Qté
-      clean_up: Purge des données obsolètes
-      expired_time_tables: Calendriers échus
-      almost_expired_time_tables: Calendriers à échoir dans %{count} jours    
+    validity_out:
+      validity_out_time_tables: Calendriers échus
+      validity_out_soon_time_tables: Calendriers à échoir dans %{count} jours    
     new:
       title: Créer un nouvel espace de données
       submit: "Créer un espace de données"
diff --git a/config/locales/time_tables.yml b/config/locales/time_tables.yml
index 421838586..d2fd44887 100644
--- a/config/locales/time_tables.yml
+++ b/config/locales/time_tables.yml
@@ -18,6 +18,8 @@ en:
     edit:
       title: Update timetable %{time_table}
     show:
+      resume: "From %{start_date} to %{end_date} (independently of any period day types)"
+      resume_empty: "Empty timetable"
       title: Timetable %{time_table}
       dates: "Application dates"
       periods: "Application periods"
@@ -84,6 +86,8 @@ fr:
     edit:
       title: "Modifier le calendrier %{time_table}"
     show:
+      resume: "Validité comprise du %{start_date} au %{end_date} (sans tenir compte des jours d'application)"
+      resume_empty: "Calendrier vide"
       title: Calendrier %{time_table}
       dates: "Dates d'application"
       periods: "Périodes d'application"