28 files changed, 79 insertions, 79 deletions
diff --git a/app/views/user/show.rhtml b/app/views/user/show.rhtml
index 31ea2a70b..2d784cf52 100644
--- a/app/views/user/show.rhtml
+++ b/app/views/user/show.rhtml
@@ -128,7 +128,7 @@
             <% end %>
         <% else %>
             <h2 class="foi_results" id="foi_requests">
-                <%= @is_you ? n_('Your %d Freedom of Information request', 'Your %d Freedom of Information requests', @xapian_requests.matches_estimated) % @xapian_requests.matches_estimated.to_s : n_('This person\'s %d Freedom of Information request', 'This person\'s %d Freedom of Information requests',  @xapian_requests.matches_estimated) % @xapian_requests.matches_estimated %>
+                <%= @is_you ? n_('Your %d Freedom of Information request', 'Your %d Freedom of Information requests', @xapian_requests.matches_estimated) % @xapian_requests.matches_estimated.to_s : n_("This person's {{count}} Freedom of Information request", "This person's {{count}} Freedom of Information requests",  @xapian_requests.matches_estimated, :count => @xapian_requests.matches_estimated) %>
                 <!-- matches_estimated <%=@xapian_requests.matches_estimated%> -->
                 <%= @match_phrase %>
                 <%= @page_desc %>
diff --git a/locale/aln/app.po b/locale/aln/app.po
index 05d9a3401..637f85c39 100644
--- a/locale/aln/app.po
+++ b/locale/aln/app.po
@@ -2255,8 +2255,8 @@ msgstr ""
 msgid "This person has made no Freedom of Information requests using this site."
 msgstr ""
 
-msgid "This person's %d Freedom of Information request"
-msgid_plural "This person's %d Freedom of Information requests"
+msgid "This person's {{count}} Freedom of Information request"
+msgid_plural "This person's {{count}} Freedom of Information requests"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/app.pot b/locale/app.pot
index 95f25cebc..1904947f4 100644
--- a/locale/app.pot
+++ b/locale/app.pot
@@ -2253,8 +2253,8 @@ msgstr ""
 msgid "This person has made no Freedom of Information requests using this site."
 msgstr ""
 
-msgid "This person's %d Freedom of Information request"
-msgid_plural "This person's %d Freedom of Information requests"
+msgid "This person's {{count}} Freedom of Information request"
+msgid_plural "This person's {{count}} Freedom of Information requests"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/ar/app.po b/locale/ar/app.po
index be1bec84b..994468376 100644
--- a/locale/ar/app.po
+++ b/locale/ar/app.po
@@ -2283,8 +2283,8 @@ msgstr ""
 msgid "This person has made no Freedom of Information requests using this site."
 msgstr ""
 
-msgid "This person's %d Freedom of Information request"
-msgid_plural "This person's %d Freedom of Information requests"
+msgid "This person's {{count}} Freedom of Information request"
+msgid_plural "This person's {{count}} Freedom of Information requests"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/bs/app.po b/locale/bs/app.po
index 182a33dfd..2aa5bd7c1 100644
--- a/locale/bs/app.po
+++ b/locale/bs/app.po
@@ -2399,8 +2399,8 @@ msgstr "Ovaj zahtjev je završen:"
 msgid "This person has made no Freedom of Information requests using this site."
 msgstr "Ova osoba nije podnijela nijedan Zahtjev za slobodan pristup informacijama koristeći ovu web stranicu."
 
-msgid "This person's %d Freedom of Information request"
-msgid_plural "This person's %d Freedom of Information requests"
+msgid "This person's {{count}} Freedom of Information request"
+msgid_plural "This person's {{count}} Freedom of Information requests"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/ca/app.po b/locale/ca/app.po
index b905bcf3a..e797e9131 100644
--- a/locale/ca/app.po
+++ b/locale/ca/app.po
@@ -2425,10 +2425,10 @@ msgstr "Esta solicitud está cerrada:"
 msgid "This person has made no Freedom of Information requests using this site."
 msgstr "Esta persona no ha realizado solicitudes de información usando esta web."
 
-msgid "This person's %d Freedom of Information request"
-msgid_plural "This person's %d Freedom of Information requests"
-msgstr[0] "Tu %d solicitud de información"
-msgstr[1] "Tus %d solicitudes de información"
+msgid "This person's {{count}} Freedom of Information request"
+msgid_plural "This person's {{count}} Freedom of Information requests"
+msgstr[0] "Tu {{count}} solicitud de información"
+msgstr[1] "Tus {{count}} solicitudes de información"
 
 msgid "This person's %d annotation"
 msgid_plural "This person's %d annotations"
diff --git a/locale/cs/app.po b/locale/cs/app.po
index 3448b61e1..adbfaeb9e 100644
--- a/locale/cs/app.po
+++ b/locale/cs/app.po
@@ -2401,11 +2401,11 @@ msgstr "Tento dotaz je ukončen:"
 msgid "This person has made no Freedom of Information requests using this site."
 msgstr "Tento uživatel na těchto stránkách vznesl dotaz podle zákona o svobodném přístupu k informacím."
 
-msgid "This person's %d Freedom of Information request"
-msgid_plural "This person's %d Freedom of Information requests"
-msgstr[0] " %d dotaz od tohoto uživatele"
-msgstr[1] "%d dotazy od tohoto uživatele"
-msgstr[2] "%d dotazů od tohoto uživatele"
+msgid "This person's {{count}} Freedom of Information request"
+msgid_plural "This person's {{count}} Freedom of Information requests"
+msgstr[0] " {{count}} dotaz od tohoto uživatele"
+msgstr[1] "{{count}} dotazy od tohoto uživatele"
+msgstr[2] "{{count}} dotazů od tohoto uživatele"
 
 msgid "This person's %d annotation"
 msgid_plural "This person's %d annotations"
diff --git a/locale/cy/app.po b/locale/cy/app.po
index bbeff4eae..1e257e82e 100644
--- a/locale/cy/app.po
+++ b/locale/cy/app.po
@@ -2270,8 +2270,8 @@ msgstr ""
 msgid "This person has made no Freedom of Information requests using this site."
 msgstr ""
 
-msgid "This person's %d Freedom of Information request"
-msgid_plural "This person's %d Freedom of Information requests"
+msgid "This person's {{count}} Freedom of Information request"
+msgid_plural "This person's {{count}} Freedom of Information requests"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/de/app.po b/locale/de/app.po
index d561ce6cc..5781070f8 100644
--- a/locale/de/app.po
+++ b/locale/de/app.po
@@ -2323,10 +2323,10 @@ msgstr "Diese Anfrage wurde abgeschlossen:"
 msgid "This person has made no Freedom of Information requests using this site."
 msgstr "Diese Person hat eine Informationsfreiheits-Anfrage über diese Seite gestellt. "
 
-msgid "This person's %d Freedom of Information request"
-msgid_plural "This person's %d Freedom of Information requests"
-msgstr[0] " %d Informationsfreiheitsanfragen dieses Benutzers / dieser Benutzerin"
-msgstr[1] " %d Informationsfreiheitsanfragen dieses Benutzers / dieser Benutzerin"
+msgid "This person's {{count}} Freedom of Information request"
+msgid_plural "This person's {{count}} Freedom of Information requests"
+msgstr[0] " {{count}} Informationsfreiheitsanfragen dieses Benutzers / dieser Benutzerin"
+msgstr[1] " {{count}} Informationsfreiheitsanfragen dieses Benutzers / dieser Benutzerin"
 
 msgid "This person's %d annotation"
 msgid_plural "This person's %d annotations"
diff --git a/locale/en/app.po b/locale/en/app.po
index fb0fd9849..3f2af5db1 100644
--- a/locale/en/app.po
+++ b/locale/en/app.po
@@ -2254,8 +2254,8 @@ msgstr ""
 msgid "This person has made no Freedom of Information requests using this site."
 msgstr ""
 
-msgid "This person's %d Freedom of Information request"
-msgid_plural "This person's %d Freedom of Information requests"
+msgid "This person's {{count}} Freedom of Information request"
+msgid_plural "This person's {{count}} Freedom of Information requests"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/en_IE/app.po b/locale/en_IE/app.po
index 313be9d76..01ed71e78 100644
--- a/locale/en_IE/app.po
+++ b/locale/en_IE/app.po
@@ -2256,8 +2256,8 @@ msgstr ""
 msgid "This person has made no Freedom of Information requests using this site."
 msgstr ""
 
-msgid "This person's %d Freedom of Information request"
-msgid_plural "This person's %d Freedom of Information requests"
+msgid "This person's {{count}} Freedom of Information request"
+msgid_plural "This person's {{count}} Freedom of Information requests"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/es/app.po b/locale/es/app.po
index e81e04304..57cbd117a 100644
--- a/locale/es/app.po
+++ b/locale/es/app.po
@@ -2455,10 +2455,10 @@ msgstr "Esta solicitud está cerrada:"
 msgid "This person has made no Freedom of Information requests using this site."
 msgstr "Esta persona no ha realizado solicitudes de información usando esta web."
 
-msgid "This person's %d Freedom of Information request"
-msgid_plural "This person's %d Freedom of Information requests"
-msgstr[0] "Tu %d solicitud de información"
-msgstr[1] "Tus %d solicitudes de información"
+msgid "This person's {{count}} Freedom of Information request"
+msgid_plural "This person's {{count}} Freedom of Information requests"
+msgstr[0] "Tu {{count}} solicitud de información"
+msgstr[1] "Tus {{count}} solicitudes de información"
 
 msgid "This person's %d annotation"
 msgid_plural "This person's %d annotations"
diff --git a/locale/eu/app.po b/locale/eu/app.po
index 6c13fde89..53ea47846 100644
--- a/locale/eu/app.po
+++ b/locale/eu/app.po
@@ -2319,10 +2319,10 @@ msgstr "Eskabide hau itxita dago:"
 msgid "This person has made no Freedom of Information requests using this site."
 msgstr "Pertsona honek ez du informazio eskabiderik egin web honen bidez."
 
-msgid "This person's %d Freedom of Information request"
-msgid_plural "This person's %d Freedom of Information requests"
-msgstr[0] "Zure informazio eskabide %d"
-msgstr[1] "Zure %d informazio eskabideak"
+msgid "This person's {{count}} Freedom of Information request"
+msgid_plural "This person's {{count}} Freedom of Information requests"
+msgstr[0] "Zure informazio eskabide {{count}}"
+msgstr[1] "Zure {{count}} informazio eskabideak"
 
 msgid "This person's %d annotation"
 msgid_plural "This person's %d annotations"
diff --git a/locale/fr/app.po b/locale/fr/app.po
index 67064f488..2bb6c8464 100644
--- a/locale/fr/app.po
+++ b/locale/fr/app.po
@@ -2264,8 +2264,8 @@ msgstr ""
 msgid "This person has made no Freedom of Information requests using this site."
 msgstr ""
 
-msgid "This person's %d Freedom of Information request"
-msgid_plural "This person's %d Freedom of Information requests"
+msgid "This person's {{count}} Freedom of Information request"
+msgid_plural "This person's {{count}} Freedom of Information requests"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/gl/app.po b/locale/gl/app.po
index 6bb7dcc10..5a249a1f2 100644
--- a/locale/gl/app.po
+++ b/locale/gl/app.po
@@ -2426,10 +2426,10 @@ msgstr "Esta solicitud está cerrada:"
 msgid "This person has made no Freedom of Information requests using this site."
 msgstr "Esta persona no ha realizado solicitudes de información usando esta web."
 
-msgid "This person's %d Freedom of Information request"
-msgid_plural "This person's %d Freedom of Information requests"
-msgstr[0] "Tu %d solicitud de información"
-msgstr[1] "Tus %d solicitudes de información"
+msgid "This person's {{count}} Freedom of Information request"
+msgid_plural "This person's {{count}} Freedom of Information requests"
+msgstr[0] "Tu {{count}} solicitud de información"
+msgstr[1] "Tus {{count}} solicitudes de información"
 
 msgid "This person's %d annotation"
 msgid_plural "This person's %d annotations"
diff --git a/locale/hu_HU/app.po b/locale/hu_HU/app.po
index b4a8e425f..d5d1a1f55 100644
--- a/locale/hu_HU/app.po
+++ b/locale/hu_HU/app.po
@@ -2424,10 +2424,10 @@ msgstr "Ez az igénylés lezárult: "
 msgid "This person has made no Freedom of Information requests using this site."
 msgstr "Ez a személy még nem igényelt közérdekű adatokat a KiMitTud weboldal segítségével. "
 
-msgid "This person's %d Freedom of Information request"
-msgid_plural "This person's %d Freedom of Information requests"
+msgid "This person's {{count}} Freedom of Information request"
+msgid_plural "This person's {{count}} Freedom of Information requests"
 msgstr[0] "Ez a felhasználó még nem kísér figyelemmel semmilyen adatigénylést figyel."
-msgstr[1] "Ez a felhazsnáló az alábbi %d adatigénylést kíséri figyelemmel."
+msgstr[1] "Ez a felhazsnáló az alábbi {{count}} adatigénylést kíséri figyelemmel."
 
 msgid "This person's %d annotation"
 msgid_plural "This person's %d annotations"
diff --git a/locale/id/app.po b/locale/id/app.po
index 9dbfc242b..652fccd4f 100644
--- a/locale/id/app.po
+++ b/locale/id/app.po
@@ -2442,9 +2442,9 @@ msgstr "Peemintaan khusus ini telah selesai:"
 msgid "This person has made no Freedom of Information requests using this site."
 msgstr "Orang ini belum membuat permintaan Freedom of Information apapun menggunakan situs ini."
 
-msgid "This person's %d Freedom of Information request"
-msgid_plural "This person's %d Freedom of Information requests"
-msgstr[0] "Orang ini %d permintaan Freedom of Information"
+msgid "This person's {{count}} Freedom of Information request"
+msgid_plural "This person's {{count}} Freedom of Information requests"
+msgstr[0] "Orang ini {{count}} permintaan Freedom of Information"
 
 msgid "This person's %d annotation"
 msgid_plural "This person's %d annotations"
diff --git a/locale/nb_NO/app.po b/locale/nb_NO/app.po
index 9a66009f6..102081fcd 100644
--- a/locale/nb_NO/app.po
+++ b/locale/nb_NO/app.po
@@ -2254,8 +2254,8 @@ msgstr ""
 msgid "This person has made no Freedom of Information requests using this site."
 msgstr ""
 
-msgid "This person's %d Freedom of Information request"
-msgid_plural "This person's %d Freedom of Information requests"
+msgid "This person's {{count}} Freedom of Information request"
+msgid_plural "This person's {{count}} Freedom of Information requests"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/pt_BR/app.po b/locale/pt_BR/app.po
index 9d6b9efa7..57ebc8a39 100644
--- a/locale/pt_BR/app.po
+++ b/locale/pt_BR/app.po
@@ -2308,10 +2308,10 @@ msgstr "Esse pedido foi finalizado:"
 msgid "This person has made no Freedom of Information requests using this site."
 msgstr "Essa pessoa não fez nenhum pedido de acesso a informação usando este site."
 
-msgid "This person's %d Freedom of Information request"
-msgid_plural "This person's %d Freedom of Information requests"
-msgstr[0] "%d pedidos dessa pessoa."
-msgstr[1] "%d pedidos dessa pessoa."
+msgid "This person's {{count}} Freedom of Information request"
+msgid_plural "This person's {{count}} Freedom of Information requests"
+msgstr[0] "{{count}} pedidos dessa pessoa."
+msgstr[1] "{{count}} pedidos dessa pessoa."
 
 msgid "This person's %d annotation"
 msgid_plural "This person's %d annotations"
diff --git a/locale/ro_RO/app.po b/locale/ro_RO/app.po
index 0f4ff1040..b9b1719ef 100644
--- a/locale/ro_RO/app.po
+++ b/locale/ro_RO/app.po
@@ -2263,8 +2263,8 @@ msgstr ""
 msgid "This person has made no Freedom of Information requests using this site."
 msgstr ""
 
-msgid "This person's %d Freedom of Information request"
-msgid_plural "This person's %d Freedom of Information requests"
+msgid "This person's {{count}} Freedom of Information request"
+msgid_plural "This person's {{count}} Freedom of Information requests"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/sl/app.po b/locale/sl/app.po
index 50a78058d..944ddc0ac 100644
--- a/locale/sl/app.po
+++ b/locale/sl/app.po
@@ -2268,8 +2268,8 @@ msgstr ""
 msgid "This person has made no Freedom of Information requests using this site."
 msgstr ""
 
-msgid "This person's %d Freedom of Information request"
-msgid_plural "This person's %d Freedom of Information requests"
+msgid "This person's {{count}} Freedom of Information request"
+msgid_plural "This person's {{count}} Freedom of Information requests"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/sq/app.po b/locale/sq/app.po
index 83c3acc86..930fa8152 100644
--- a/locale/sq/app.po
+++ b/locale/sq/app.po
@@ -2375,10 +2375,10 @@ msgstr "Kjo kërkesë është përmbyllur:"
 msgid "This person has made no Freedom of Information requests using this site."
 msgstr "Ky person nuk ka bërë kërkesa për informata zyrtare duke përdorur këtë ueb faqe."
 
-msgid "This person's %d Freedom of Information request"
-msgid_plural "This person's %d Freedom of Information requests"
-msgstr[0] "%d kërkesë për informatë zyrtare të këtij personi"
-msgstr[1] "%d kërkesa për informata zyrtare të këtij personi"
+msgid "This person's {{count}} Freedom of Information request"
+msgid_plural "This person's {{count}} Freedom of Information requests"
+msgstr[0] "{{count}} kërkesë për informatë zyrtare të këtij personi"
+msgstr[1] "{{count}} kërkesa për informata zyrtare të këtij personi"
 
 msgid "This person's %d annotation"
 msgid_plural "This person's %d annotations"
diff --git a/locale/sr@latin/app.po b/locale/sr@latin/app.po
index fa1f5edc8..7014bc13c 100644
--- a/locale/sr@latin/app.po
+++ b/locale/sr@latin/app.po
@@ -2398,8 +2398,8 @@ msgstr "Ovaj zahtev je završen:"
 msgid "This person has made no Freedom of Information requests using this site."
 msgstr "Ova osoba nije podnela nijedan Zahtev za slobodan pristup informacijama koristeći ovu web stranicu."
 
-msgid "This person's %d Freedom of Information request"
-msgid_plural "This person's %d Freedom of Information requests"
+msgid "This person's {{count}} Freedom of Information request"
+msgid_plural "This person's {{count}} Freedom of Information requests"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/tr/app.po b/locale/tr/app.po
index f8dc0e914..27003628e 100644
--- a/locale/tr/app.po
+++ b/locale/tr/app.po
@@ -2248,8 +2248,8 @@ msgstr ""
 msgid "This person has made no Freedom of Information requests using this site."
 msgstr ""
 
-msgid "This person's %d Freedom of Information request"
-msgid_plural "This person's %d Freedom of Information requests"
+msgid "This person's {{count}} Freedom of Information request"
+msgid_plural "This person's {{count}} Freedom of Information requests"
 msgstr[0] ""
 
 msgid "This person's %d annotation"
diff --git a/locale/uk/app.po b/locale/uk/app.po
index febca7945..a3669ae86 100644
--- a/locale/uk/app.po
+++ b/locale/uk/app.po
@@ -2376,11 +2376,11 @@ msgstr "Переписка щодо цього запиту завершена:"
 msgid "This person has made no Freedom of Information requests using this site."
 msgstr "Ця людина не зробила жодного запиту через цей сайт."
 
-msgid "This person's %d Freedom of Information request"
-msgid_plural "This person's %d Freedom of Information requests"
-msgstr[0] "Ця людина має %d запитів"
-msgstr[1] "Ця людина має %d запит"
-msgstr[2] "Ця людина має %d запитів (запити)"
+msgid "This person's {{count}} Freedom of Information request"
+msgid_plural "This person's {{count}} Freedom of Information requests"
+msgstr[0] "Ця людина має {{count}} запитів"
+msgstr[1] "Ця людина має {{count}} запит"
+msgstr[2] "Ця людина має {{count}} запитів (запити)"
 
 msgid "This person's %d annotation"
 msgid_plural "This person's %d annotations"
diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po
index 6b2cf8348..6347d0256 100644
--- a/spec/fixtures/locale/en/app.po
+++ b/spec/fixtures/locale/en/app.po
@@ -2914,8 +2914,8 @@ msgid "This person has made no Freedom of Information requests using this site."
 msgstr ""
 
 #: app/views/user/show.rhtml:149
-msgid "This person's %d Freedom of Information request"
-msgid_plural "This person's %d Freedom of Information requests"
+msgid "This person's {{count}} Freedom of Information request"
+msgid_plural "This person's {{count}} Freedom of Information requests"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po
index 4b8bd90a7..445aaea7c 100644
--- a/spec/fixtures/locale/en_GB/app.po
+++ b/spec/fixtures/locale/en_GB/app.po
@@ -2913,8 +2913,8 @@ msgid "This person has made no Freedom of Information requests using this site."
 msgstr ""
 
 #: app/views/user/show.rhtml:149
-msgid "This person's %d Freedom of Information request"
-msgid_plural "This person's %d Freedom of Information requests"
+msgid "This person's {{count}} Freedom of Information request"
+msgid_plural "This person's {{count}} Freedom of Information requests"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po
index 639825f91..50de28a47 100644
--- a/spec/fixtures/locale/es/app.po
+++ b/spec/fixtures/locale/es/app.po
@@ -3146,10 +3146,10 @@ msgid ""
 msgstr "Esta persona no ha realizado solicitudes de información usando esta web."
 
 #: app/views/user/show.rhtml:149
-msgid "This person's %d Freedom of Information request"
-msgid_plural "This person's %d Freedom of Information requests"
-msgstr[0] "Tu %d solicitud de información"
-msgstr[1] "Tus %d solicitudes de información"
+msgid "This person's {{count}} Freedom of Information request"
+msgid_plural "This person's {{count}} Freedom of Information requests"
+msgstr[0] "Tu {{count}} solicitud de información"
+msgstr[1] "Tus {{count}} solicitudes de información"
 
 #: app/views/user/show.rhtml:179
 msgid "This person's %d annotation"