In translation strings replace %s and %d with {{}} formatting

28 files changed, 93 insertions, 89 deletions

diff --git a/app/views/public_body/show.rhtml b/app/views/public_body/show.rhtml
index 4833657f6..563beb383 100644
--- a/app/views/public_body/show.rhtml
+++ b/app/views/public_body/show.rhtml
@@ -93,7 +93,11 @@
                <% if  @public_body.info_requests.size > 4 %>
                 <%= n_('Search within the %d Freedom of Information requests to %s', 'Search within the %d Freedom of Information requests made to %s', @public_body.info_requests.size) % [@public_body.info_requests.size, @public_body.name] %>
                    <% else %>
-                  <%= n_('%d Freedom of Information request to %s', '%d Freedom of Information requests to %s', @public_body.info_requests.size) % [@public_body.info_requests.size, @public_body.name] %>
+                  <%= n_('{{count}} Freedom of Information request to {{public_body_name}}',
+                        '{{count}} Freedom of Information requests to {{public_body_name}}',
+                        @public_body.info_requests.size,
+                        :count => @public_body.info_requests.size,
+                        :public_body_name => @public_body.name) %>
                <% end %>
                 <% end %>
                 <%= @page_desc %>
diff --git a/locale/aln/app.po b/locale/aln/app.po
index 1c1e6ae3c..514277248 100644
--- a/locale/aln/app.po
+++ b/locale/aln/app.po
@@ -90,8 +90,8 @@ msgstr ""
 msgid "\"Hello! We have an  <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important message</a> for visitors outside {{country_name}}\""
 msgstr ""
 
-msgid "%d Freedom of Information request to %s"
-msgid_plural "%d Freedom of Information requests to %s"
+msgid "{{count}} Freedom of Information request to {{public_body_name}}"
+msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/app.pot b/locale/app.pot
index 5185cc23a..094507333 100644
--- a/locale/app.pot
+++ b/locale/app.pot
@@ -88,8 +88,8 @@ msgstr ""
 msgid "\"Hello! We have an  <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important message</a> for visitors outside {{country_name}}\""
 msgstr ""
 
-msgid "%d Freedom of Information request to %s"
-msgid_plural "%d Freedom of Information requests to %s"
+msgid "{{count}} Freedom of Information request to {{public_body_name}}"
+msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/ar/app.po b/locale/ar/app.po
index a1ec80e4f..cee9eaea9 100644
--- a/locale/ar/app.po
+++ b/locale/ar/app.po
@@ -90,8 +90,8 @@ msgstr "عند إرسال هذه الرسالة."
 msgid "\"Hello! We have an  <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important message</a> for visitors outside {{country_name}}\""
 msgstr ""
 
-msgid "%d Freedom of Information request to %s"
-msgid_plural "%d Freedom of Information requests to %s"
+msgid "{{count}} Freedom of Information request to {{public_body_name}}"
+msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/bs/app.po b/locale/bs/app.po
index 12d77107f..a5009fdd0 100644
--- a/locale/bs/app.po
+++ b/locale/bs/app.po
@@ -102,11 +102,11 @@ msgstr " kada pošaljete ovu poruku."
 msgid "\"Hello! We have an  <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important message</a> for visitors outside {{country_name}}\""
 msgstr ""
 
-msgid "%d Freedom of Information request to %s"
-msgid_plural "%d Freedom of Information requests to %s"
-msgstr[0] "%d Freedom of Information requests to %s"
-msgstr[1] "%d Freedom of Information requests to %s"
-msgstr[2] "%d Freedom of Information requests to %s"
+msgid "{{count}} Freedom of Information request to {{public_body_name}}"
+msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
+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"
diff --git a/locale/ca/app.po b/locale/ca/app.po
index 8116f020b..0e0223b69 100644
--- a/locale/ca/app.po
+++ b/locale/ca/app.po
@@ -100,10 +100,10 @@ msgstr " quan enviares aquest missatge."
 msgid "\"Hello! We have an  <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important message</a> for visitors outside {{country_name}}\""
 msgstr ""
 
-msgid "%d Freedom of Information request to %s"
-msgid_plural "%d Freedom of Information requests to %s"
-msgstr[0] "%d sol·licitud d'informació a %s"
-msgstr[1] "%d sol·licituds d'informació a %s"
+msgid "{{count}} Freedom of Information request to {{public_body_name}}"
+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"
diff --git a/locale/cs/app.po b/locale/cs/app.po
index 2be583280..ab2fc285d 100644
--- a/locale/cs/app.po
+++ b/locale/cs/app.po
@@ -99,11 +99,11 @@ msgstr " když tuto zprávu pošlete."
 msgid "\"Hello! We have an  <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important message</a> for visitors outside {{country_name}}\""
 msgstr "\"Hello! We have an <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important message</a> for visitors outside {{country_name}}\""
 
-msgid "%d Freedom of Information request to %s"
-msgid_plural "%d Freedom of Information requests to %s"
-msgstr[0] "%d dotaz vznesený podle zákona 106/1999 Sb. na instituci %s"
-msgstr[1] "%d dotazy vznesené podle zákona 106/1999 Sb. na instituci  %s"
-msgstr[2] "%d dotazů vznesených podle zákona 106/1999 Sb. na instituci  %s"
+msgid "{{count}} Freedom of Information request to {{public_body_name}}"
+msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
+msgstr[0] "{{count}} dotaz vznesený podle zákona 106/1999 Sb. na instituci {{public_body_name}}"
+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"
diff --git a/locale/cy/app.po b/locale/cy/app.po
index 4bf7d6d11..e7f4e1cb2 100644
--- a/locale/cy/app.po
+++ b/locale/cy/app.po
@@ -91,8 +91,8 @@ msgstr "pan chi'n anfon y neges hon"
 msgid "\"Hello! We have an  <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important message</a> for visitors outside {{country_name}}\""
 msgstr ""
 
-msgid "%d Freedom of Information request to %s"
-msgid_plural "%d Freedom of Information requests to %s"
+msgid "{{count}} Freedom of Information request to {{public_body_name}}"
+msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/de/app.po b/locale/de/app.po
index 0d8765d64..549fae72b 100644
--- a/locale/de/app.po
+++ b/locale/de/app.po
@@ -95,10 +95,10 @@ msgstr "wenn Sie diese Nachricht senden. "
 msgid "\"Hello! We have an  <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important message</a> for visitors outside {{country_name}}\""
 msgstr ""
 
-msgid "%d Freedom of Information request to %s"
-msgid_plural "%d Freedom of Information requests to %s"
-msgstr[0] "%d Informationsfreiheitsanfrage an %s"
-msgstr[1] "%d Informationsfreiheitsanfragen an %s"
+msgid "{{count}} Freedom of Information request to {{public_body_name}}"
+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"
diff --git a/locale/en/app.po b/locale/en/app.po
index 08f9fbbf9..46f2d390f 100644
--- a/locale/en/app.po
+++ b/locale/en/app.po
@@ -89,8 +89,8 @@ msgstr ""
 msgid "\"Hello! We have an  <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important message</a> for visitors outside {{country_name}}\""
 msgstr ""
 
-msgid "%d Freedom of Information request to %s"
-msgid_plural "%d Freedom of Information requests to %s"
+msgid "{{count}} Freedom of Information request to {{public_body_name}}"
+msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/en_IE/app.po b/locale/en_IE/app.po
index be97d35d2..ab5fce0f2 100644
--- a/locale/en_IE/app.po
+++ b/locale/en_IE/app.po
@@ -91,8 +91,8 @@ msgstr ""
 msgid "\"Hello! We have an  <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important message</a> for visitors outside {{country_name}}\""
 msgstr ""
 
-msgid "%d Freedom of Information request to %s"
-msgid_plural "%d Freedom of Information requests to %s"
+msgid "{{count}} Freedom of Information request to {{public_body_name}}"
+msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/es/app.po b/locale/es/app.po
index aca420fc1..56b264fe4 100644
--- a/locale/es/app.po
+++ b/locale/es/app.po
@@ -104,10 +104,10 @@ msgstr " cuando envió este mensaje."
 msgid "\"Hello! We have an  <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important message</a> for visitors outside {{country_name}}\""
 msgstr ""
 
-msgid "%d Freedom of Information request to %s"
-msgid_plural "%d Freedom of Information requests to %s"
-msgstr[0] "%d solicitud de información a %s"
-msgstr[1] "%d solicitudes de información a %s"
+msgid "{{count}} Freedom of Information request to {{public_body_name}}"
+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"
diff --git a/locale/eu/app.po b/locale/eu/app.po
index c3567e060..dab96f710 100644
--- a/locale/eu/app.po
+++ b/locale/eu/app.po
@@ -95,10 +95,10 @@ msgstr " Mezu hau bidali duzunean."
 msgid "\"Hello! We have an  <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important message</a> for visitors outside {{country_name}}\""
 msgstr ""
 
-msgid "%d Freedom of Information request to %s"
-msgid_plural "%d Freedom of Information requests to %s"
-msgstr[0] "_____ %d -ri egindako informazio eskabidea %s"
-msgstr[1] "_______ %d -ri egindako informazio eskabideak %s"
+msgid "{{count}} Freedom of Information request to {{public_body_name}}"
+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"
diff --git a/locale/fr/app.po b/locale/fr/app.po
index 3d2570725..074d7373e 100644
--- a/locale/fr/app.po
+++ b/locale/fr/app.po
@@ -99,8 +99,8 @@ msgstr ""
 msgid "\"Hello! We have an  <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important message</a> for visitors outside {{country_name}}\""
 msgstr ""
 
-msgid "%d Freedom of Information request to %s"
-msgid_plural "%d Freedom of Information requests to %s"
+msgid "{{count}} Freedom of Information request to {{public_body_name}}"
+msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/gl/app.po b/locale/gl/app.po
index 939a4513e..687c51d2e 100644
--- a/locale/gl/app.po
+++ b/locale/gl/app.po
@@ -100,10 +100,10 @@ msgstr " cuando envió este mensaje."
 msgid "\"Hello! We have an  <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important message</a> for visitors outside {{country_name}}\""
 msgstr ""
 
-msgid "%d Freedom of Information request to %s"
-msgid_plural "%d Freedom of Information requests to %s"
-msgstr[0] "%d solicitud de información a %s"
-msgstr[1] "%d solicitudes de información a %s"
+msgid "{{count}} Freedom of Information request to {{public_body_name}}"
+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"
diff --git a/locale/hu_HU/app.po b/locale/hu_HU/app.po
index 42e3dc0a6..b62960faa 100644
--- a/locale/hu_HU/app.po
+++ b/locale/hu_HU/app.po
@@ -96,10 +96,10 @@ msgstr " részére, így a címzett megismerheti azt."
 msgid "\"Hello! We have an  <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important message</a> for visitors outside {{country_name}}\""
 msgstr ""
 
-msgid "%d Freedom of Information request to %s"
-msgid_plural "%d Freedom of Information requests to %s"
-msgstr[0] "%2$s az alábbi %1$ddb közérdekűadat-igénylést kapta eddig"
-msgstr[1] "%2$s az alábbi %1$ddb közérdekűadat-igénylést kapta eddig"
+msgid "{{count}} Freedom of Information request to {{public_body_name}}"
+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"
diff --git a/locale/id/app.po b/locale/id/app.po
index e674c7718..5f5638834 100644
--- a/locale/id/app.po
+++ b/locale/id/app.po
@@ -102,9 +102,9 @@ msgstr " saat Anda mengirim pesan ini."
 msgid "\"Hello! We have an  <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important message</a> for visitors outside {{country_name}}\""
 msgstr ""
 
-msgid "%d Freedom of Information request to %s"
-msgid_plural "%d Freedom of Information requests to %s"
-msgstr[0] "%d Permintaan Kebebasan Informasi ke %s"
+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"
diff --git a/locale/nb_NO/app.po b/locale/nb_NO/app.po
index 5dcfbab11..6036cb136 100644
--- a/locale/nb_NO/app.po
+++ b/locale/nb_NO/app.po
@@ -89,8 +89,8 @@ msgstr ""
 msgid "\"Hello! We have an  <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important message</a> for visitors outside {{country_name}}\""
 msgstr ""
 
-msgid "%d Freedom of Information request to %s"
-msgid_plural "%d Freedom of Information requests to %s"
+msgid "{{count}} Freedom of Information request to {{public_body_name}}"
+msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/pt_BR/app.po b/locale/pt_BR/app.po
index c022c8f54..a4c557ded 100644
--- a/locale/pt_BR/app.po
+++ b/locale/pt_BR/app.po
@@ -106,10 +106,10 @@ msgstr "quando você enviar esta mensagem."
 msgid "\"Hello! We have an  <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important message</a> for visitors outside {{country_name}}\""
 msgstr ""
 
-msgid "%d Freedom of Information request to %s"
-msgid_plural "%d Freedom of Information requests to %s"
-msgstr[0] "%d pedido para %s"
-msgstr[1] "%d pedidos para %s"
+msgid "{{count}} Freedom of Information request to {{public_body_name}}"
+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"
diff --git a/locale/ro_RO/app.po b/locale/ro_RO/app.po
index 4bcfca0d0..ee221d3b2 100644
--- a/locale/ro_RO/app.po
+++ b/locale/ro_RO/app.po
@@ -91,11 +91,11 @@ msgstr "când trimiți acest mesaj."
 msgid "\"Hello! We have an  <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important message</a> for visitors outside {{country_name}}\""
 msgstr ""
 
-msgid "%d Freedom of Information request to %s"
-msgid_plural "%d Freedom of Information requests to %s"
-msgstr[0] "%dcerere Libertatea de Informare pana la %s"
-msgstr[1] "%d cereri Libertatea de Informare pana la %s"
-msgstr[2] "%d cereri Libertatea de Informare pana la %s "
+msgid "{{count}} Freedom of Information request to {{public_body_name}}"
+msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
+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"
diff --git a/locale/sl/app.po b/locale/sl/app.po
index f49c5d583..13fb174fd 100644
--- a/locale/sl/app.po
+++ b/locale/sl/app.po
@@ -89,8 +89,8 @@ msgstr ""
 msgid "\"Hello! We have an  <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important message</a> for visitors outside {{country_name}}\""
 msgstr ""
 
-msgid "%d Freedom of Information request to %s"
-msgid_plural "%d Freedom of Information requests to %s"
+msgid "{{count}} Freedom of Information request to {{public_body_name}}"
+msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/sq/app.po b/locale/sq/app.po
index cd99230c5..ba0f58285 100644
--- a/locale/sq/app.po
+++ b/locale/sq/app.po
@@ -106,10 +106,10 @@ msgstr " kur e dërgoni këtë mesazh."
 msgid "\"Hello! We have an  <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important message</a> for visitors outside {{country_name}}\""
 msgstr ""
 
-msgid "%d Freedom of Information request to %s"
-msgid_plural "%d Freedom of Information requests to %s"
-msgstr[0] "%d Kërkesë për informata zyrtare për %s"
-msgstr[1] "%d Kërkesa për informata zyrtare për %s"
+msgid "{{count}} Freedom of Information request to {{public_body_name}}"
+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"
diff --git a/locale/sr@latin/app.po b/locale/sr@latin/app.po
index f459f3135..946766d67 100644
--- a/locale/sr@latin/app.po
+++ b/locale/sr@latin/app.po
@@ -99,11 +99,11 @@ msgstr " kada pošaljete ovu poruku."
 msgid "\"Hello! We have an  <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important message</a> for visitors outside {{country_name}}\""
 msgstr ""
 
-msgid "%d Freedom of Information request to %s"
-msgid_plural "%d Freedom of Information requests to %s"
-msgstr[0] "%d Freedom of Information requests to %s"
-msgstr[1] "%d Freedom of Information requests to %s"
-msgstr[2] "%d Freedom of Information requests to %s"
+msgid "{{count}} Freedom of Information request to {{public_body_name}}"
+msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
+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"
diff --git a/locale/tr/app.po b/locale/tr/app.po
index 380390814..514c90c98 100644
--- a/locale/tr/app.po
+++ b/locale/tr/app.po
@@ -90,8 +90,8 @@ msgstr ""
 msgid "\"Hello! We have an  <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important message</a> for visitors outside {{country_name}}\""
 msgstr ""
 
-msgid "%d Freedom of Information request to %s"
-msgid_plural "%d Freedom of Information requests to %s"
+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"
diff --git a/locale/uk/app.po b/locale/uk/app.po
index 687c552fb..34bb21b3a 100644
--- a/locale/uk/app.po
+++ b/locale/uk/app.po
@@ -93,11 +93,11 @@ msgstr " коли ви відправите повідомлення."
 msgid "\"Hello! We have an  <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important message</a> for visitors outside {{country_name}}\""
 msgstr ""
 
-msgid "%d Freedom of Information request to %s"
-msgid_plural "%d Freedom of Information requests to %s"
-msgstr[0] "%d інформаційний запит до %s"
-msgstr[1] "%d інформаційні запити до %s"
-msgstr[2] "%d інформаційних запитів до %s"
+msgid "{{count}} Freedom of Information request to {{public_body_name}}"
+msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
+msgstr[0] "{{count}} інформаційний запит до {{public_body_name}}"
+msgstr[1] "{{count}} інформаційні запити до {{public_body_name}}"
+msgstr[2] "{{count}} інформаційних запитів до {{public_body_name}}"
 
 msgid "%d request"
 msgid_plural "%d requests"
diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po
index 7b1ad22bf..b3bd524d4 100644
--- a/spec/fixtures/locale/en/app.po
+++ b/spec/fixtures/locale/en/app.po
@@ -123,8 +123,8 @@ msgid " when you send this message."
 msgstr ""
 
 #: app/views/public_body/show.rhtml:87
-msgid "%d Freedom of Information request to %s"
-msgid_plural "%d Freedom of Information requests to %s"
+msgid "{{count}} Freedom of Information request to {{public_body_name}}"
+msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po
index 7b1ad22bf..b3bd524d4 100644
--- a/spec/fixtures/locale/en_GB/app.po
+++ b/spec/fixtures/locale/en_GB/app.po
@@ -123,8 +123,8 @@ msgid " when you send this message."
 msgstr ""
 
 #: app/views/public_body/show.rhtml:87
-msgid "%d Freedom of Information request to %s"
-msgid_plural "%d Freedom of Information requests to %s"
+msgid "{{count}} Freedom of Information request to {{public_body_name}}"
+msgid_plural "{{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po
index 8ebdd814c..e6ee59581 100644
--- a/spec/fixtures/locale/es/app.po
+++ b/spec/fixtures/locale/es/app.po
@@ -140,10 +140,10 @@ msgid " when you send this message."
 msgstr " cuando envió este mensaje."
 
 #: app/views/public_body/show.rhtml:87
-msgid "%d Freedom of Information request to %s"
-msgid_plural "%d Freedom of Information requests to %s"
-msgstr[0] "%d solicitud de información a %s"
-msgstr[1] "%d solicitudes de información a %s"
+msgid "{{count}} Freedom of Information request to {{public_body_name}}"
+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}}"
 
 #: app/views/general/frontpage.rhtml:43
 msgid "%d request"