diff --git a/config/locales/en.yml b/config/locales/en.yml
index 38e489d4..983aee73 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -96,8 +96,9 @@ en:
     action: Action
     actions: Actions
     actions_midsentence:
-      one: actions
-      other: action
+      one: action
+      other: actions
+      zero: actions
     add: Add
     ajaxError: There was an error retrieving from server
     back: Back
@@ -109,8 +110,9 @@ en:
     contribute: Contribute
     create: Create
     days_midsentence:
-      one: days
-      other: day
+      one: day
+      other: days
+      zero: days
     deferred: deferred
     description: Description
     drag_handle: DRAG
@@ -129,8 +131,9 @@ en:
     none: None
     not_available_abbr: n/a
     note:
-      one: no notes
-      other: 1 notes
+      one: 1 notes
+      other: "%{count} notes"
+      zero: no notes
     notes: Notes
     numbered_step: Step %{number}
     ok: Ok
@@ -317,11 +320,13 @@ en:
         other: almost %{count} years
       half_a_minute: half a minute
       less_than_x_minutes:
-        one: less than 1 minute
-        other: less than a minute
+        one: less than a minute
+        other: less than %{count} minutes
+        zero: less than 1 minute
       less_than_x_seconds:
         one: less than 1 second
-        other: less than 1 second
+        other: less than %{count} seconds
+        zero: less than 1 second
       over_x_years:
         one: over 1 year
         other: over %{count} years
@@ -1320,11 +1325,13 @@ en:
       multi_page_html: Displaying %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> of <b>%{count}</b>
         in total
       single_page:
-        one: No %{model} found
-        other: Displaying 1 %{model}
+        one: Displaying 1 %{model}
+        other: Displaying all %{count} %{model}
+        zero: No %{model} found
       single_page_html:
-        one: No %{model} found
-        other: Displaying <b>1</b> %{model}
+        one: Displaying <b>1</b> %{model}
+        other: Displaying <b>all&nbsp;%{count}</b> %{model}
+        zero: No %{model} found
     page_gap: "&hellip;"
     previous_label: "&#8592; Previous"
   auth_type:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 94fac183..387ad0c0 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -98,8 +98,9 @@ es:
     action: Tarea
     actions: Tareas
     actions_midsentence:
-      one: tareas
-      other: tarea
+      one: tarea
+      other: tareas
+      zero: tareas
     add: Añadir
     ajaxError: Hubo un error al recuperar desde el servidor
     back: Atrás
@@ -131,8 +132,9 @@ es:
     none: Ninguno
     not_available_abbr: n/d
     note:
-      one: 0 notas
-      other: 1 nota
+      one: 1 nota
+      other: "%{count} notas"
+      zero: 0 notas
     notes: Notas
     numbered_step: Paso %{number}
     ok: Aceptar
@@ -314,11 +316,13 @@ es:
         other: Casi %{count} años
       half_a_minute: medio minuto
       less_than_x_minutes:
-        one: menos de 1 minuto
-        other: menos de un minuto
+        one: menos de un minuto
+        other: menos de %{count} minutos
+        zero: menos de 1 minuto
       less_than_x_seconds:
         one: menos de 1 segundo
-        other: menos de 1 segundo
+        other: menos de %{count} segundos
+        zero: menos de 1 segundo
       over_x_years:
         one: más de un año
         other: en %{count} años
@@ -1232,11 +1236,13 @@ es:
       multi_page_html: Representando %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> de
         <b>%{count}</b> en el total
       single_page:
-        one: No %{model} encontrado
-        other: Viendo del 1 %{model}
+        one: Viendo del 1 %{model}
+        other: Viendo todos los %{count} %{model}
+        zero: No %{model} encontrado
       single_page_html:
-        one: No %{model} encontrado
-        other: Viendo del <b>1</b> %{model}
+        one: Viendo del <b>1</b> %{model}
+        other: Viendo <b>todos los %{count}</b> %{model}
+        zero: No %{model} encontrado
     page_gap: "&hellip;"
     previous_label: "« Anterior"
   rest_help:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index c0da25dc..a3761cb0 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -131,8 +131,9 @@ fi:
     none: Ei
     not_available_abbr: ei
     note:
-      one: ei muistiinpanoja
-      other: 1 muistiinpano
+      one: 1 muistiinpano
+      other: "%{count} muistiinpanoa"
+      zero: ei muistiinpanoja
     notes: Muistiinpanot
     numbered_step: Askel %{number}
     ok: Ok
@@ -1331,11 +1332,13 @@ fi:
       multi_page_html: Näytetään %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> yhteensä
         <b>%{count}</b> tietueesta
       single_page:
-        one: '%{model} ei löytynyt'
-        other: Näytetään 1 %{model}
+        one: Näytetään 1 %{model}
+        other: Näytetään kaikki %{count} %{model}
+        zero: '%{model} ei löytynyt'
       single_page_html:
-        one: '%{model} ei löytynyt'
-        other: Näytetään <b>1</b> %{model}
+        one: Näytetään <b>1</b> %{model}
+        other: Näytetään <b>kaikki&nbsp;%{count}</b> %{model}
+        zero: '%{model} ei löytynyt'
     page_gap: "&hellip;"
     previous_label: "&#8592; Edellinen"
   auth_type: