25 files changed, 62 insertions, 56 deletions

diff --git a/app/views/public_body/list.rhtml b/app/views/public_body/list.rhtml
index 9ae9e0c5f..9edaf1c36 100644
--- a/app/views/public_body/list.rhtml
+++ b/app/views/public_body/list.rhtml
@@ -39,7 +39,13 @@
  </div>
 <% end %>
 
-<h2 class="publicbody_results"><%= n_('Found %d public authority %s', 'Found %d public authorities %s', @public_bodies.total_entries) % [@public_bodies.total_entries, @description] %></h2>
+<h2 class="publicbody_results">
+  <%= n_('Found {{count}} public authority {{description}}',
+        'Found {{count}} public authorities {{description}}',
+        @public_bodies.total_entries,
+        :count => @public_bodies.total_entries,
+        :description => @description) %>
+</h2>
 <%= render :partial => 'body_listing', :locals => { :public_bodies => @public_bodies } %>
 
   <%= will_paginate(@public_bodies) %><br/>
diff --git a/locale/aln/app.po b/locale/aln/app.po
index 463d5c232..6cea7e9b1 100644
--- a/locale/aln/app.po
+++ b/locale/aln/app.po
@@ -806,8 +806,8 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr ""
 
-msgid "Found %d public authority %s"
-msgid_plural "Found %d public authorities %s"
+msgid "Found {{count}} public authority {{description}}"
+msgid_plural "Found {{count}} public authorities {{description}}"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/app.pot b/locale/app.pot
index e2554cfc6..ac5bd123b 100644
--- a/locale/app.pot
+++ b/locale/app.pot
@@ -804,8 +804,8 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr ""
 
-msgid "Found %d public authority %s"
-msgid_plural "Found %d public authorities %s"
+msgid "Found {{count}} public authority {{description}}"
+msgid_plural "Found {{count}} public authorities {{description}}"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/ar/app.po b/locale/ar/app.po
index ce78a39e8..53f2ea1db 100644
--- a/locale/ar/app.po
+++ b/locale/ar/app.po
@@ -822,8 +822,8 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr ""
 
-msgid "Found %d public authority %s"
-msgid_plural "Found %d public authorities %s"
+msgid "Found {{count}} public authority {{description}}"
+msgid_plural "Found {{count}} public authorities {{description}}"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/bs/app.po b/locale/bs/app.po
index e8801fe99..f97d9f1b5 100644
--- a/locale/bs/app.po
+++ b/locale/bs/app.po
@@ -865,8 +865,8 @@ msgstr "Iz nepoznatog razloga, nije moguće podnijeti zahtjev ovoj ustanovi."
 msgid "Forgotten your password?"
 msgstr "Zaboravili ste Vaš password?"
 
-msgid "Found %d public authority %s"
-msgid_plural "Found %d public authorities %s"
+msgid "Found {{count}} public authority {{description}}"
+msgid_plural "Found {{count}} public authorities {{description}}"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/ca/app.po b/locale/ca/app.po
index 26c442104..e2d5c512f 100644
--- a/locale/ca/app.po
+++ b/locale/ca/app.po
@@ -876,8 +876,8 @@ msgstr "No es posible hacer una solicitud a este organismo, por motivos desconoc
 msgid "Forgotten your password?"
 msgstr "¿Has olvidado tu contraseña?"
 
-msgid "Found %d public authority %s"
-msgid_plural "Found %d public authorities %s"
+msgid "Found {{count}} public authority {{description}}"
+msgid_plural "Found {{count}} public authorities {{description}}"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/cs/app.po b/locale/cs/app.po
index 10d68e9e5..5df8b815e 100644
--- a/locale/cs/app.po
+++ b/locale/cs/app.po
@@ -878,11 +878,11 @@ msgstr "Z neznámého důvodu není možné vznést dotaz na tuto instituci. "
 msgid "Forgotten your password?"
 msgstr "Zapomněli jste heslo?"
 
-msgid "Found %d public authority %s"
-msgid_plural "Found %d public authorities %s"
-msgstr[0] "Nalezena  %d instituce %s"
-msgstr[1] "Nalezeny %d instituce %s"
-msgstr[2] "Nalezeno %d institucí %s"
+msgid "Found {{count}} public authority {{description}}"
+msgid_plural "Found {{count}} public authorities {{description}}"
+msgstr[0] "Nalezena  {{count}} instituce {{description}}"
+msgstr[1] "Nalezeny {{count}} instituce {{description}}"
+msgstr[2] "Nalezeno {{count}} institucí {{description}}"
 
 msgid "Freedom of Information"
 msgstr "dotaz"
diff --git a/locale/cy/app.po b/locale/cy/app.po
index caedbc107..3651c3b77 100644
--- a/locale/cy/app.po
+++ b/locale/cy/app.po
@@ -815,8 +815,8 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr "Wedi anghofio eich cyfrinair?"
 
-msgid "Found %d public authority %s"
-msgid_plural "Found %d public authorities %s"
+msgid "Found {{count}} public authority {{description}}"
+msgid_plural "Found {{count}} public authorities {{description}}"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/de/app.po b/locale/de/app.po
index 265189da0..76f6e2af7 100644
--- a/locale/de/app.po
+++ b/locale/de/app.po
@@ -847,8 +847,8 @@ msgstr "Aus unbekannten Gründen ist es nicht möglich eine Anfrage a diese BehÃ
 msgid "Forgotten your password?"
 msgstr "Passwort vergessen?"
 
-msgid "Found %d public authority %s"
-msgid_plural "Found %d public authorities %s"
+msgid "Found {{count}} public authority {{description}}"
+msgid_plural "Found {{count}} public authorities {{description}}"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/en/app.po b/locale/en/app.po
index f1f2a4d48..0ebba2200 100644
--- a/locale/en/app.po
+++ b/locale/en/app.po
@@ -805,8 +805,8 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr ""
 
-msgid "Found %d public authority %s"
-msgid_plural "Found %d public authorities %s"
+msgid "Found {{count}} public authority {{description}}"
+msgid_plural "Found {{count}} public authorities {{description}}"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/en_IE/app.po b/locale/en_IE/app.po
index d3b2f116a..9739b00d5 100644
--- a/locale/en_IE/app.po
+++ b/locale/en_IE/app.po
@@ -807,8 +807,8 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr ""
 
-msgid "Found %d public authority %s"
-msgid_plural "Found %d public authorities %s"
+msgid "Found {{count}} public authority {{description}}"
+msgid_plural "Found {{count}} public authorities {{description}}"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/es/app.po b/locale/es/app.po
index f2a26660c..a91095c85 100644
--- a/locale/es/app.po
+++ b/locale/es/app.po
@@ -896,8 +896,8 @@ msgstr "No es posible hacer una solicitud a este organismo, por motivos desconoc
 msgid "Forgotten your password?"
 msgstr "¿Has olvidado tu contraseña?"
 
-msgid "Found %d public authority %s"
-msgid_plural "Found %d public authorities %s"
+msgid "Found {{count}} public authority {{description}}"
+msgid_plural "Found {{count}} public authorities {{description}}"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/eu/app.po b/locale/eu/app.po
index 337d3bf65..9c8fcf797 100644
--- a/locale/eu/app.po
+++ b/locale/eu/app.po
@@ -839,8 +839,8 @@ msgstr "Ez dakigun arrazoia dela eta, erakunde honi eskabidea egitea ezinezkoa d
 msgid "Forgotten your password?"
 msgstr "Zure pasahitza ahaztu al duzu?"
 
-msgid "Found %d public authority %s"
-msgid_plural "Found %d public authorities %s"
+msgid "Found {{count}} public authority {{description}}"
+msgid_plural "Found {{count}} public authorities {{description}}"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/fr/app.po b/locale/fr/app.po
index fd5ff3cb2..0c63d888d 100644
--- a/locale/fr/app.po
+++ b/locale/fr/app.po
@@ -815,8 +815,8 @@ msgstr "Par des raisons que nous ne pouvons pas déterminer, il est impossible d
 msgid "Forgotten your password?"
 msgstr ""
 
-msgid "Found %d public authority %s"
-msgid_plural "Found %d public authorities %s"
+msgid "Found {{count}} public authority {{description}}"
+msgid_plural "Found {{count}} public authorities {{description}}"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/gl/app.po b/locale/gl/app.po
index 76cde4f4e..9f3543a6e 100644
--- a/locale/gl/app.po
+++ b/locale/gl/app.po
@@ -877,8 +877,8 @@ msgstr "No es posible hacer una solicitud a este organismo, por motivos desconoc
 msgid "Forgotten your password?"
 msgstr "¿Has olvidado tu contraseña?"
 
-msgid "Found %d public authority %s"
-msgid_plural "Found %d public authorities %s"
+msgid "Found {{count}} public authority {{description}}"
+msgid_plural "Found {{count}} public authorities {{description}}"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/hu_HU/app.po b/locale/hu_HU/app.po
index 139bc95f0..e42ddb38c 100644
--- a/locale/hu_HU/app.po
+++ b/locale/hu_HU/app.po
@@ -869,8 +869,8 @@ msgstr "Ismeretlen okból kifolyólag ennek a közintézménynek nem lehet igén
 msgid "Forgotten your password?"
 msgstr "Elfelejtette jelszavát? "
 
-msgid "Found %d public authority %s"
-msgid_plural "Found %d public authorities %s"
+msgid "Found {{count}} public authority {{description}}"
+msgid_plural "Found {{count}} public authorities {{description}}"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/id/app.po b/locale/id/app.po
index 0056330ed..beca416f7 100644
--- a/locale/id/app.po
+++ b/locale/id/app.po
@@ -892,8 +892,8 @@ msgstr "Untuk alasan yang tidak diketahui, Anda tidak dapat mengajukan permintaa
 msgid "Forgotten your password?"
 msgstr "Lupa kode sandi Anda?"
 
-msgid "Found %d public authority %s"
-msgid_plural "Found %d public authorities %s"
+msgid "Found {{count}} public authority {{description}}"
+msgid_plural "Found {{count}} public authorities {{description}}"
 msgstr[0] ""
 
 msgid "Freedom of Information"
diff --git a/locale/nb_NO/app.po b/locale/nb_NO/app.po
index 1d652648a..0993c926e 100644
--- a/locale/nb_NO/app.po
+++ b/locale/nb_NO/app.po
@@ -805,8 +805,8 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr ""
 
-msgid "Found %d public authority %s"
-msgid_plural "Found %d public authorities %s"
+msgid "Found {{count}} public authority {{description}}"
+msgid_plural "Found {{count}} public authorities {{description}}"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/pt_BR/app.po b/locale/pt_BR/app.po
index 713417173..9191179fa 100644
--- a/locale/pt_BR/app.po
+++ b/locale/pt_BR/app.po
@@ -844,10 +844,10 @@ msgstr "Devido a um erro desconhecido, não foi possível realizar seu pedido pa
 msgid "Forgotten your password?"
 msgstr "Esqueceu a sua senha?"
 
-msgid "Found %d public authority %s"
-msgid_plural "Found %d public authorities %s"
-msgstr[0] "%d órgão público encontrado %s"
-msgstr[1] "%d órgãos públicos encontrados %s"
+msgid "Found {{count}} public authority {{description}}"
+msgid_plural "Found {{count}} public authorities {{description}}"
+msgstr[0] "{{count}} órgão público encontrado {{description}}"
+msgstr[1] "{{count}} órgãos públicos encontrados {{description}}"
 
 msgid "Freedom of Information"
 msgstr "Liberdade de Informação"
diff --git a/locale/ro_RO/app.po b/locale/ro_RO/app.po
index da0e747bf..1e101738b 100644
--- a/locale/ro_RO/app.po
+++ b/locale/ro_RO/app.po
@@ -811,8 +811,8 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr ""
 
-msgid "Found %d public authority %s"
-msgid_plural "Found %d public authorities %s"
+msgid "Found {{count}} public authority {{description}}"
+msgid_plural "Found {{count}} public authorities {{description}}"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/sl/app.po b/locale/sl/app.po
index af7d7ad76..e67b27be5 100644
--- a/locale/sl/app.po
+++ b/locale/sl/app.po
@@ -813,8 +813,8 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr ""
 
-msgid "Found %d public authority %s"
-msgid_plural "Found %d public authorities %s"
+msgid "Found {{count}} public authority {{description}}"
+msgid_plural "Found {{count}} public authorities {{description}}"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/sq/app.po b/locale/sq/app.po
index 1893211e6..3ab2bae38 100644
--- a/locale/sq/app.po
+++ b/locale/sq/app.po
@@ -869,10 +869,10 @@ msgstr "Për një arsye të panjohur, nuk është e mundur për të bërë një
 msgid "Forgotten your password?"
 msgstr "Ke harru fjalëkalimin?"
 
-msgid "Found %d public authority %s"
-msgid_plural "Found %d public authorities %s"
-msgstr[0] "Gjeti %d autoritet publik %s"
-msgstr[1] "Gjeti %d autoriteti publike %s"
+msgid "Found {{count}} public authority {{description}}"
+msgid_plural "Found {{count}} public authorities {{description}}"
+msgstr[0] "Gjeti {{count}} autoritet publik {{description}}"
+msgstr[1] "Gjeti {{count}} autoriteti publike {{description}}"
 
 msgid "Freedom of Information"
 msgstr "Informata Zyrtare"
diff --git a/locale/sr@latin/app.po b/locale/sr@latin/app.po
index 441595520..5ca307245 100644
--- a/locale/sr@latin/app.po
+++ b/locale/sr@latin/app.po
@@ -861,8 +861,8 @@ msgstr "Iz nepoznatog razloga, nije moguće podneti zahtev ovoj ustanovi."
 msgid "Forgotten your password?"
 msgstr "Zaboravili ste Vaš password?"
 
-msgid "Found %d public authority %s"
-msgid_plural "Found %d public authorities %s"
+msgid "Found {{count}} public authority {{description}}"
+msgid_plural "Found {{count}} public authorities {{description}}"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/tr/app.po b/locale/tr/app.po
index dbba7be16..cf33b1d6c 100644
--- a/locale/tr/app.po
+++ b/locale/tr/app.po
@@ -802,8 +802,8 @@ msgstr ""
 msgid "Forgotten your password?"
 msgstr ""
 
-msgid "Found %d public authority %s"
-msgid_plural "Found %d public authorities %s"
+msgid "Found {{count}} public authority {{description}}"
+msgid_plural "Found {{count}} public authorities {{description}}"
 msgstr[0] ""
 
 msgid "Freedom of Information"
diff --git a/locale/uk/app.po b/locale/uk/app.po
index 3f0d10aba..7e0b326f1 100644
--- a/locale/uk/app.po
+++ b/locale/uk/app.po
@@ -880,8 +880,8 @@ msgstr "З невідомих причин, зробити запит до цьÐ
 msgid "Forgotten your password?"
 msgstr "Забули пароль?"
 
-msgid "Found %d public authority %s"
-msgid_plural "Found %d public authorities %s"
+msgid "Found {{count}} public authority {{description}}"
+msgid_plural "Found {{count}} public authorities {{description}}"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""