28 files changed, 89 insertions, 89 deletions

diff --git a/app/views/general/_frontpage_bodies_list.rhtml b/app/views/general/_frontpage_bodies_list.rhtml
index 503b38953..a32885f31 100644
--- a/app/views/general/_frontpage_bodies_list.rhtml
+++ b/app/views/general/_frontpage_bodies_list.rhtml
@@ -6,7 +6,7 @@
     <ul>
         <% for popular_body in @popular_bodies %>
             <li><%=public_body_link(popular_body)%>
-             <%= n_('%d request', '%d requests', popular_body.info_requests_count) % popular_body.info_requests_count %>
+             <%= n_('{{count}} request', '{{count}} requests', popular_body.info_requests_count, :count => popular_body.info_requests_count) %>
             </li>
         <% end%>
     </ul>
diff --git a/locale/aln/app.po b/locale/aln/app.po
index e0d94c076..8d9839740 100644
--- a/locale/aln/app.po
+++ b/locale/aln/app.po
@@ -95,8 +95,8 @@ msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "%d request"
-msgid_plural "%d requests"
+msgid "{{count}} request"
+msgid_plural "{{count}} requests"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/app.pot b/locale/app.pot
index 926241047..972bc55dd 100644
--- a/locale/app.pot
+++ b/locale/app.pot
@@ -93,8 +93,8 @@ msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "%d request"
-msgid_plural "%d requests"
+msgid "{{count}} request"
+msgid_plural "{{count}} requests"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/ar/app.po b/locale/ar/app.po
index 439c06815..d7354d63c 100644
--- a/locale/ar/app.po
+++ b/locale/ar/app.po
@@ -99,8 +99,8 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-msgid "%d request"
-msgid_plural "%d requests"
+msgid "{{count}} request"
+msgid_plural "{{count}} requests"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/bs/app.po b/locale/bs/app.po
index 4178ba1c2..c1c211ebb 100644
--- a/locale/bs/app.po
+++ b/locale/bs/app.po
@@ -108,8 +108,8 @@ msgstr[0] "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[1] "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[2] "{{count}} Freedom of Information requests to {{public_body_name}}"
 
-msgid "%d request"
-msgid_plural "%d requests"
+msgid "{{count}} request"
+msgid_plural "{{count}} requests"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/ca/app.po b/locale/ca/app.po
index 8a728b2f5..3af09d4fa 100644
--- a/locale/ca/app.po
+++ b/locale/ca/app.po
@@ -105,10 +105,10 @@ msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] "{{count}} sol·licitud d'informació a {{public_body_name}}"
 msgstr[1] "{{count}} sol·licituds d'informació a {{public_body_name}}"
 
-msgid "%d request"
-msgid_plural "%d requests"
-msgstr[0] "%d sol·licitud"
-msgstr[1] "%d sol·licituds"
+msgid "{{count}} request"
+msgid_plural "{{count}} requests"
+msgstr[0] "{{count}} sol·licitud"
+msgstr[1] "{{count}} sol·licituds"
 
 msgid "{{count}} request made."
 msgid_plural "{{count}} requests made."
diff --git a/locale/cs/app.po b/locale/cs/app.po
index b563fd535..6c53fc0a4 100644
--- a/locale/cs/app.po
+++ b/locale/cs/app.po
@@ -105,11 +105,11 @@ msgstr[0] "{{count}} dotaz vznesený podle zákona 106/1999 Sb. na instituci {{p
 msgstr[1] "{{count}} dotazy vznesené podle zákona 106/1999 Sb. na instituci  {{public_body_name}}"
 msgstr[2] "{{count}} dotazů vznesených podle zákona 106/1999 Sb. na instituci  {{public_body_name}}"
 
-msgid "%d request"
-msgid_plural "%d requests"
-msgstr[0] "%d dotaz"
-msgstr[1] "%d dotazy"
-msgstr[2] "%d dotazů"
+msgid "{{count}} request"
+msgid_plural "{{count}} requests"
+msgstr[0] "{{count}} dotaz"
+msgstr[1] "{{count}} dotazy"
+msgstr[2] "{{count}} dotazů"
 
 msgid "{{count}} request made."
 msgid_plural "{{count}} requests made."
diff --git a/locale/cy/app.po b/locale/cy/app.po
index 743ece0d8..6508210bc 100644
--- a/locale/cy/app.po
+++ b/locale/cy/app.po
@@ -98,12 +98,12 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-msgid "%d request"
-msgid_plural "%d requests"
-msgstr[0] "Nifer o geisiadau: %d"
-msgstr[1] "Nifer o geisiadau: %d"
-msgstr[2] "Nifer o geisiadau: %d"
-msgstr[3] "Nifer o geisiadau: %d"
+msgid "{{count}} request"
+msgid_plural "{{count}} requests"
+msgstr[0] "Nifer o geisiadau: {{count}}"
+msgstr[1] "Nifer o geisiadau: {{count}}"
+msgstr[2] "Nifer o geisiadau: {{count}}"
+msgstr[3] "Nifer o geisiadau: {{count}}"
 
 msgid "{{count}} request made."
 msgid_plural "{{count}} requests made."
diff --git a/locale/de/app.po b/locale/de/app.po
index 1f979e954..9834db8d9 100644
--- a/locale/de/app.po
+++ b/locale/de/app.po
@@ -100,10 +100,10 @@ msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] "{{count}} Informationsfreiheitsanfrage an {{public_body_name}}"
 msgstr[1] "{{count}} Informationsfreiheitsanfragen an {{public_body_name}}"
 
-msgid "%d request"
-msgid_plural "%d requests"
-msgstr[0] "%d Anfrage"
-msgstr[1] "%d Anfragen"
+msgid "{{count}} request"
+msgid_plural "{{count}} requests"
+msgstr[0] "{{count}} Anfrage"
+msgstr[1] "{{count}} Anfragen"
 
 msgid "{{count}} request made."
 msgid_plural "{{count}} requests made."
diff --git a/locale/en/app.po b/locale/en/app.po
index 8fd2271e5..d6e4ddc9d 100644
--- a/locale/en/app.po
+++ b/locale/en/app.po
@@ -94,8 +94,8 @@ msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "%d request"
-msgid_plural "%d requests"
+msgid "{{count}} request"
+msgid_plural "{{count}} requests"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/en_IE/app.po b/locale/en_IE/app.po
index 4dfe5d406..8a193b47f 100644
--- a/locale/en_IE/app.po
+++ b/locale/en_IE/app.po
@@ -96,8 +96,8 @@ msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "%d request"
-msgid_plural "%d requests"
+msgid "{{count}} request"
+msgid_plural "{{count}} requests"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/es/app.po b/locale/es/app.po
index bbb58815d..13fdcff5c 100644
--- a/locale/es/app.po
+++ b/locale/es/app.po
@@ -109,10 +109,10 @@ msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] "{{count}} solicitud de información a {{public_body_name}}"
 msgstr[1] "{{count}} solicitudes de información a {{public_body_name}}"
 
-msgid "%d request"
-msgid_plural "%d requests"
-msgstr[0] "%d solicitud"
-msgstr[1] "%d solicitudes"
+msgid "{{count}} request"
+msgid_plural "{{count}} requests"
+msgstr[0] "{{count}} solicitud"
+msgstr[1] "{{count}} solicitudes"
 
 msgid "{{count}} request made."
 msgid_plural "{{count}} requests made."
diff --git a/locale/eu/app.po b/locale/eu/app.po
index 87ca10c48..183bd5708 100644
--- a/locale/eu/app.po
+++ b/locale/eu/app.po
@@ -100,10 +100,10 @@ msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] "_____ {{count}} -ri egindako informazio eskabidea {{public_body_name}}"
 msgstr[1] "_______ {{count}} -ri egindako informazio eskabideak {{public_body_name}}"
 
-msgid "%d request"
-msgid_plural "%d requests"
-msgstr[0] "%d eskabidea"
-msgstr[1] "%d eskabideak"
+msgid "{{count}} request"
+msgid_plural "{{count}} requests"
+msgstr[0] "{{count}} eskabidea"
+msgstr[1] "{{count}} eskabideak"
 
 msgid "{{count}} request made."
 msgid_plural "{{count}} requests made."
diff --git a/locale/fr/app.po b/locale/fr/app.po
index 0f28584dd..2e1e6e4b6 100644
--- a/locale/fr/app.po
+++ b/locale/fr/app.po
@@ -104,10 +104,10 @@ msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "%d request"
-msgid_plural "%d requests"
-msgstr[0] "%d demande"
-msgstr[1] "%d demandes"
+msgid "{{count}} request"
+msgid_plural "{{count}} requests"
+msgstr[0] "{{count}} demande"
+msgstr[1] "{{count}} demandes"
 
 msgid "{{count}} request made."
 msgid_plural "{{count}} requests made."
diff --git a/locale/gl/app.po b/locale/gl/app.po
index 9a9d16948..ab2ff2a2d 100644
--- a/locale/gl/app.po
+++ b/locale/gl/app.po
@@ -105,10 +105,10 @@ msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] "{{count}} solicitud de información a {{public_body_name}}"
 msgstr[1] "{{count}} solicitudes de información a {{public_body_name}}"
 
-msgid "%d request"
-msgid_plural "%d requests"
-msgstr[0] "%d solicitud"
-msgstr[1] "%d solicitudes"
+msgid "{{count}} request"
+msgid_plural "{{count}} requests"
+msgstr[0] "{{count}} solicitud"
+msgstr[1] "{{count}} solicitudes"
 
 msgid "{{count}} request made."
 msgid_plural "{{count}} requests made."
diff --git a/locale/hu_HU/app.po b/locale/hu_HU/app.po
index 04ded199d..8ed7b8be2 100644
--- a/locale/hu_HU/app.po
+++ b/locale/hu_HU/app.po
@@ -101,10 +101,10 @@ msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] "{{public_body_name}} az alábbi {{count}}db közérdekűadat-igénylést kapta eddig"
 msgstr[1] "{{public_body_name}} az alábbi {{count}}db közérdekűadat-igénylést kapta eddig"
 
-msgid "%d request"
-msgid_plural "%d requests"
-msgstr[0] "%d igénylés"
-msgstr[1] "%d igénylés"
+msgid "{{count}} request"
+msgid_plural "{{count}} requests"
+msgstr[0] "{{count}} igénylés"
+msgstr[1] "{{count}} igénylés"
 
 msgid "{{count}} request made."
 msgid_plural "{{count}} requests made."
diff --git a/locale/id/app.po b/locale/id/app.po
index 50f060cfe..53b3e3757 100644
--- a/locale/id/app.po
+++ b/locale/id/app.po
@@ -106,9 +106,9 @@ msgid "{{count}} Freedom of Information request to {{public_body_name}}"
 msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] "{{count}} Permintaan Kebebasan Informasi ke {{public_body_name}}"
 
-msgid "%d request"
-msgid_plural "%d requests"
-msgstr[0] "%d permintaan-permintaan"
+msgid "{{count}} request"
+msgid_plural "{{count}} requests"
+msgstr[0] "{{count}} permintaan-permintaan"
 
 msgid "{{count}} request made."
 msgid_plural "{{count}} requests made."
diff --git a/locale/nb_NO/app.po b/locale/nb_NO/app.po
index 413a8d476..1c710068f 100644
--- a/locale/nb_NO/app.po
+++ b/locale/nb_NO/app.po
@@ -94,8 +94,8 @@ msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "%d request"
-msgid_plural "%d requests"
+msgid "{{count}} request"
+msgid_plural "{{count}} requests"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/pt_BR/app.po b/locale/pt_BR/app.po
index 375063164..15f977460 100644
--- a/locale/pt_BR/app.po
+++ b/locale/pt_BR/app.po
@@ -111,10 +111,10 @@ msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] "{{count}} pedido para {{public_body_name}}"
 msgstr[1] "{{count}} pedidos para {{public_body_name}}"
 
-msgid "%d request"
-msgid_plural "%d requests"
-msgstr[0] "one: %d pedido"
-msgstr[1] "other: %d pedidos"
+msgid "{{count}} request"
+msgid_plural "{{count}} requests"
+msgstr[0] "one: {{count}} pedido"
+msgstr[1] "other: {{count}} pedidos"
 
 msgid "{{count}} request made."
 msgid_plural "{{count}} requests made."
diff --git a/locale/ro_RO/app.po b/locale/ro_RO/app.po
index 2587d3bb1..da1ffb35a 100644
--- a/locale/ro_RO/app.po
+++ b/locale/ro_RO/app.po
@@ -97,11 +97,11 @@ msgstr[0] "{{count}}cerere Libertatea de Informare pana la {{public_body_name}}"
 msgstr[1] "{{count}} cereri Libertatea de Informare pana la {{public_body_name}}"
 msgstr[2] "{{count}} cereri Libertatea de Informare pana la {{public_body_name}} "
 
-msgid "%d request"
-msgid_plural "%d requests"
-msgstr[0] "%d  cerere"
-msgstr[1] "%d cereri"
-msgstr[2] "%d cereri"
+msgid "{{count}} request"
+msgid_plural "{{count}} requests"
+msgstr[0] "{{count}}  cerere"
+msgstr[1] "{{count}} cereri"
+msgstr[2] "{{count}} cereri"
 
 msgid "{{count}} request made."
 msgid_plural "{{count}} requests made."
diff --git a/locale/sl/app.po b/locale/sl/app.po
index 85cd5b0a3..7879be536 100644
--- a/locale/sl/app.po
+++ b/locale/sl/app.po
@@ -96,8 +96,8 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-msgid "%d request"
-msgid_plural "%d requests"
+msgid "{{count}} request"
+msgid_plural "{{count}} requests"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/sq/app.po b/locale/sq/app.po
index 057509232..aad398a42 100644
--- a/locale/sq/app.po
+++ b/locale/sq/app.po
@@ -111,10 +111,10 @@ msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] "{{count}} Kërkesë për informata zyrtare për {{public_body_name}}"
 msgstr[1] "{{count}} Kërkesa për informata zyrtare për {{public_body_name}}"
 
-msgid "%d request"
-msgid_plural "%d requests"
-msgstr[0] "%d kërkesë"
-msgstr[1] "%d kërkesa"
+msgid "{{count}} request"
+msgid_plural "{{count}} requests"
+msgstr[0] "{{count}} kërkesë"
+msgstr[1] "{{count}} kërkesa"
 
 msgid "{{count}} request made."
 msgid_plural "{{count}} requests made."
diff --git a/locale/sr@latin/app.po b/locale/sr@latin/app.po
index e16d06ee4..219c7598c 100644
--- a/locale/sr@latin/app.po
+++ b/locale/sr@latin/app.po
@@ -105,8 +105,8 @@ msgstr[0] "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[1] "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[2] "{{count}} Freedom of Information requests to {{public_body_name}}"
 
-msgid "%d request"
-msgid_plural "%d requests"
+msgid "{{count}} request"
+msgid_plural "{{count}} requests"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/tr/app.po b/locale/tr/app.po
index 8f6bae2e6..cbf52eb18 100644
--- a/locale/tr/app.po
+++ b/locale/tr/app.po
@@ -94,8 +94,8 @@ msgid "{{count}} Freedom of Information request to {{public_body_name}}"
 msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 
-msgid "%d request"
-msgid_plural "%d requests"
+msgid "{{count}} request"
+msgid_plural "{{count}} requests"
 msgstr[0] ""
 
 msgid "{{count}} request made."
diff --git a/locale/uk/app.po b/locale/uk/app.po
index d36f198fd..a2f9aa138 100644
--- a/locale/uk/app.po
+++ b/locale/uk/app.po
@@ -99,11 +99,11 @@ msgstr[0] "{{count}} інформаційний запит до {{public_body_na
 msgstr[1] "{{count}} інформаційні запити до {{public_body_name}}"
 msgstr[2] "{{count}} інформаційних запитів до {{public_body_name}}"
 
-msgid "%d request"
-msgid_plural "%d requests"
-msgstr[0] "%d запит"
-msgstr[1] "%d запити"
-msgstr[2] "%d запитів"
+msgid "{{count}} request"
+msgid_plural "{{count}} requests"
+msgstr[0] "{{count}} запит"
+msgstr[1] "{{count}} запити"
+msgstr[2] "{{count}} запитів"
 
 msgid "{{count}} request made."
 msgid_plural "{{count}} requests made."
diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po
index 6a21336bf..06fae9a81 100644
--- a/spec/fixtures/locale/en/app.po
+++ b/spec/fixtures/locale/en/app.po
@@ -129,8 +129,8 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: app/views/general/frontpage.rhtml:43
-msgid "%d request"
-msgid_plural "%d requests"
+msgid "{{count}} request"
+msgid_plural "{{count}} requests"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po
index 6a21336bf..06fae9a81 100644
--- a/spec/fixtures/locale/en_GB/app.po
+++ b/spec/fixtures/locale/en_GB/app.po
@@ -129,8 +129,8 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: app/views/general/frontpage.rhtml:43
-msgid "%d request"
-msgid_plural "%d requests"
+msgid "{{count}} request"
+msgid_plural "{{count}} requests"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po
index ab72de22f..626e39e94 100644
--- a/spec/fixtures/locale/es/app.po
+++ b/spec/fixtures/locale/es/app.po
@@ -146,10 +146,10 @@ msgstr[0] "{{count}} solicitud de información a {{public_body_name}}"
 msgstr[1] "{{count}} solicitudes de información a {{public_body_name}}"
 
 #: app/views/general/frontpage.rhtml:43
-msgid "%d request"
-msgid_plural "%d requests"
-msgstr[0] "%d solicitud"
-msgstr[1] "%d solicitudes"
+msgid "{{count}} request"
+msgid_plural "{{count}} requests"
+msgstr[0] "{{count}} solicitud"
+msgstr[1] "{{count}} solicitudes"
 
 #: app/views/public_body/_body_listing_single.rhtml:21
 msgid "{{count}} request made."