merge i18n keys to better support fr locale and update en, fr and nl locale for the change

es was updated by tolk, but no changes in content

app/views/contexts/_context_state_group.html.erb

@@ -1,7 +1,7 @@
 <div class="list-stategroup-contexts-container" id="list-<%= state %>-contexts-container">
   <h2>
     <span id="<%= state %>-contexts-count" class="badge"><%= context_state_group.length %></span>
-    <%= t("states."+ state +"_plural")%> <%= t('common.contexts') %>
+    <%= t("states.contexts."+ state) %>
   </h2>
   
   <div id="<%= state%>-contexts-empty-nd" style="<%= no_contexts ? 'display:block' : 'display:none'%>">

app/views/projects/_project_state_group.html.erb

@@ -8,14 +8,9 @@
   <h2>
     <span id="<%= state %>-projects-count" class="badge"><%= project_state_group.length%><%= total_count_string%></span>
 
-    <%= t('common.last' ) unless ( ['review','stalled','blocked','current'].include?(state) )%>
+    <%= t('common.last' ) if state == 'completed' %>
-    <% if (I18n.locale == :fr) %>
+    <%= t('states.projects.'+state) %>
-      <%= t('common.projects').downcase %>
+    <%= total_count==-1 ? "" : " (#{link_to(t('common.show_all'), done_projects_path)})".html_safe%>
-      <%= t('states.'+state+'_plural' ).downcase %><%= total_count==-1 ? "" : " (#{link_to(t('common.show_all'), done_projects_path)})".html_safe%>
-    <% else %>
-      <%= t('states.'+state+'_plural' )%>
-      <%= t('common.projects') %><%= total_count==-1 ? "" : " (#{link_to(t('common.show_all'), done_projects_path)})".html_safe%>
-    <% end %>
 
   </h2>
   <% unless suppress_sort_menu %>

config/locales/en.yml

@@ -333,6 +333,14 @@ en:
     hide_action_form_title: Hide new action form
     make_actions_dependent: Make actions dependent on each other
   states:
+    contexts:
+      hidden: Hidden contexts
+      active: Active contexts
+      closed: Closed contexts
+    projects:
+      hidden: Hidden projects
+      active: Active projects
+      closed: Closed projects
     hidden_plural: Hidden
     completed: Completed
     completed_plural: Completed

config/locales/es.yml

@@ -334,7 +334,7 @@ es:
       completed_tasks_title: Completed
       contexts_title: Contexts
       export: Exportar
-      export_title: "Importar y exportar datos"
+      export_title: Importar y exportar datos
       feeds: Feeds
       feeds_title: See a list of available feeds
       help: '?'
@@ -471,7 +471,7 @@ es:
     updated: Las preferencias de actualización
   projects:
     actions_in_project_title: Actions in this project
-    active_projects: "Proyectos Activos"
+    active_projects: Proyectos Activos
     add_note: Añadir una nota
     add_note_submit: Añadir nota
     add_project: Añadir Proyecto
@@ -547,12 +547,12 @@ es:
     toggle_single_title: Add a new next action
   sidebar:
     list_empty: None
-    list_name_active_contexts: "Contextos activos"
+    list_name_active_contexts: Contextos activos
-    list_name_active_projects: "Proyectos activos"
+    list_name_active_projects: Proyectos activos
-    list_name_completed_projects: "Proyectos completados"
+    list_name_completed_projects: Proyectos completados
-    list_name_hidden_contexts: "Contextos ocultos"
+    list_name_hidden_contexts: Contextos ocultos
-    list_name_hidden_projects: "Proyectos ocultos"
+    list_name_hidden_projects: Proyectos ocultos
-  states: 
+  states:
     active: Active
     active_plural: Active
     blocked: Bloqueado
@@ -570,10 +570,10 @@ es:
     visible: Visible
     visible_plural: Visible
   stats:
-    action_completion_time_title: "Tiempo de finalización (todas las acciones completadas)"
+    action_completion_time_title: Tiempo de finalización (todas las acciones completadas)
-    action_selection_title: "TRACKS::Selección de Acción"
+    action_selection_title: TRACKS::Selección de Acción
     actions: Acciones
-    actions_30days_title: "Acciones en los últimos 30 días"
+    actions_30days_title: Acciones en los últimos 30 días
     actions_actions_avg_created_30days: In the last 30 days you created on average
       %{count} actions
     actions_avg_completed: and completed an average of %{count} actions per month.
@@ -701,7 +701,7 @@ es:
     pm: pm
   todos:
     no_actions:
-      completed: "Actualmente no hay acciones completadas."
+      completed: Actualmente no hay acciones completadas.
     action_deferred: La acción \'%{description}\' se aplazó
     action_deleted_error: Failed to delete the action
     action_deleted_success: Successfully deleted next action
@@ -739,8 +739,7 @@ es:
     clear_due_date: Clear due date
     clear_show_from_date: Clear show from date
     completed: Completed
-    completed_actions: "Acciones completadas"
+    completed_actions_with: Acciones completadas with the tag %{tag_name}
-    completed_actions_with: "Acciones completadas with the tag %{tag_name}"
     completed_in_archive:
       one: There is one completed action in the archive.
       other: There are %{count} completed actions in the archive.

config/locales/fr.yml

@@ -610,6 +610,10 @@ fr:
     stalled_plural: Bloqués
     visible: Visible
     visible_plural: Visibles
+    contexts:
+      active: Contextes actifs
+      closed: Contextes fermés
+      hidden: Contextes cachés
   stats:
     action_completion_time_title: Temps de réalisation (toutes les actions réalisées)
     action_selection_title: TRACKS::Selection action

config/locales/nl.yml

@@ -647,6 +647,14 @@ nl:
     visible_plural: Zichtbare
     close: Gesloten
     closed_plural: Gesloten
+    contexts:
+      active: Actieve contexten
+      closed: Gesloten contexten
+      hidden: Verborgen contexten
+    projects:
+      active: Actieve projecten
+      closed: Gesloten projecten
+      hidden: Verborgen projecten
   stats:
     action_completion_time_title: Doorlooptijd (alle voltooide acties)
     action_selection_title: 'TRACKS:: Actie selectie'