aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/views/request/followup_bad.rhtml4
-rw-r--r--locale/aln/app.po2
-rw-r--r--locale/app.pot2
-rw-r--r--locale/ar/app.po2
-rw-r--r--locale/bs/app.po4
-rw-r--r--locale/ca/app.po4
-rw-r--r--locale/cs/app.po4
-rw-r--r--locale/cy/app.po2
-rw-r--r--locale/de/app.po4
-rw-r--r--locale/en/app.po2
-rw-r--r--locale/en_IE/app.po2
-rw-r--r--locale/es/app.po4
-rw-r--r--locale/eu/app.po4
-rw-r--r--locale/fr/app.po2
-rw-r--r--locale/gl/app.po4
-rw-r--r--locale/hu_HU/app.po4
-rw-r--r--locale/id/app.po4
-rw-r--r--locale/nb_NO/app.po2
-rw-r--r--locale/pt_BR/app.po4
-rw-r--r--locale/ro_RO/app.po2
-rw-r--r--locale/sl/app.po2
-rw-r--r--locale/sq/app.po4
-rw-r--r--locale/sr@latin/app.po13
-rw-r--r--locale/tr/app.po2
-rw-r--r--locale/uk/app.po2
-rw-r--r--spec/fixtures/locale/en/app.po2
-rw-r--r--spec/fixtures/locale/en_GB/app.po2
-rw-r--r--spec/fixtures/locale/es/app.po4
28 files changed, 43 insertions, 50 deletions
diff --git a/app/views/request/followup_bad.rhtml b/app/views/request/followup_bad.rhtml
index b712674d8..ea2400c5d 100644
--- a/app/views/request/followup_bad.rhtml
+++ b/app/views/request/followup_bad.rhtml
@@ -21,9 +21,9 @@
an email which will go to the right place, please <a href="{{url}}">send it to us</a>.', :url => help_contact_path.html_safe) %>
</p>
<% elsif @reason == 'bad_contact' %>
- <p><%= _('We do not have a working {{law_used_full}} address for {{public_body_name}}.',:law_used_full=>h(@info_request.law_used_full),:public_body_name=>h(@info_request.public_body.name)) %> <%= raw(_('You may be able to find
+ <p><%= _('We do not have a working {{law_used_full}} address for {{public_body_name}}.',:law_used_full=>h(@info_request.law_used_full),:public_body_name=>h(@info_request.public_body.name)) %> <%= _('You may be able to find
one on their website, or by phoning them up and asking. If you manage
- to find one, then please <a href="%s">send it to us</a>.') % [help_contact_path]) %>
+ to find one, then please <a href="{{url}}">send it to us</a>.', :url => help_contact_path.html_safe) %>
</p>
<% elsif @reason == 'external' %>
<p><%= _("Followups cannot be sent for this request, as it was made externally, and published here by {{public_body_name}} on the requester's behalf.", :public_body_name => h(@info_request.public_body.name)) %>
diff --git a/locale/aln/app.po b/locale/aln/app.po
index e274a5bc1..af4278f65 100644
--- a/locale/aln/app.po
+++ b/locale/aln/app.po
@@ -2754,7 +2754,7 @@ msgstr ""
msgid "You may <strong>include attachments</strong>. If you would like to attach a\\n file too large for email, use the form below."
msgstr ""
-msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"%s\">send it to us</a>."
+msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"{{url}}\">send it to us</a>."
msgstr ""
msgid "You may be able to find\\none on their website, or by phoning them up and asking. If you manage\\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>."
diff --git a/locale/app.pot b/locale/app.pot
index 906284f91..9bdbc7550 100644
--- a/locale/app.pot
+++ b/locale/app.pot
@@ -2752,7 +2752,7 @@ msgstr ""
msgid "You may <strong>include attachments</strong>. If you would like to attach a\\n file too large for email, use the form below."
msgstr ""
-msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"%s\">send it to us</a>."
+msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"{{url}}\">send it to us</a>."
msgstr ""
msgid "You may be able to find\\none on their website, or by phoning them up and asking. If you manage\\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>."
diff --git a/locale/ar/app.po b/locale/ar/app.po
index 3ce2e2606..d28da329c 100644
--- a/locale/ar/app.po
+++ b/locale/ar/app.po
@@ -2790,7 +2790,7 @@ msgstr ""
msgid "You may <strong>include attachments</strong>. If you would like to attach a\\n file too large for email, use the form below."
msgstr ""
-msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"%s\">send it to us</a>."
+msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"{{url}}\">send it to us</a>."
msgstr ""
msgid "You may be able to find\\none on their website, or by phoning them up and asking. If you manage\\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>."
diff --git a/locale/bs/app.po b/locale/bs/app.po
index dd38c757e..6e5eb0bc3 100644
--- a/locale/bs/app.po
+++ b/locale/bs/app.po
@@ -2934,11 +2934,11 @@ msgstr "Znate šta je uzrok greške i možete <strong>predložiti rješenje</str
msgid "You may <strong>include attachments</strong>. If you would like to attach a\\n file too large for email, use the form below."
msgstr ""
-msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"%s\">send it to us</a>."
+msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"{{url}}\">send it to us</a>."
msgstr ""
"Moguće je da je nađete\n"
" na njihovoj web stranici, ili putem telefonskog poziva. Ako uspijete\n"
-" da je nađete, onda molimo <a href=\"%s\">da nam je pošaljete</a>."
+" da je nađete, onda molimo <a href=\"{{url}}\">da nam je pošaljete</a>."
msgid "You may be able to find\\none on their website, or by phoning them up and asking. If you manage\\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>."
msgstr ""
diff --git a/locale/ca/app.po b/locale/ca/app.po
index efce3a2a6..eb62af913 100644
--- a/locale/ca/app.po
+++ b/locale/ca/app.po
@@ -2970,11 +2970,11 @@ msgstr "Sabes lo que ha causado el error, y puedes <strong>sugerir una solución
msgid "You may <strong>include attachments</strong>. If you would like to attach a\\n file too large for email, use the form below."
msgstr ""
-msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"%s\">send it to us</a>."
+msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"{{url}}\">send it to us</a>."
msgstr ""
"Puede que encuentres una\n"
" en su página web, o preguntando por teléfono. Si la consigues\n"
-" por favor <a href=\"%s\">envíanosla</a>."
+" por favor <a href=\"{{url}}\">envíanosla</a>."
msgid "You may be able to find\\none on their website, or by phoning them up and asking. If you manage\\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>."
msgstr ""
diff --git a/locale/cs/app.po b/locale/cs/app.po
index 702aaf88e..2d88148c7 100644
--- a/locale/cs/app.po
+++ b/locale/cs/app.po
@@ -2938,11 +2938,11 @@ msgstr "Víte, co způsobilo chybu a můžete <strong>navrhnout řešení</stron
msgid "You may <strong>include attachments</strong>. If you would like to attach a\\n file too large for email, use the form below."
msgstr "Můžete <strong>přiložit dokumenty</strong>. POkud je vaše příloha⏎ příliš velká pro poslání e-mailem, použíjte formulář níže."
-msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"%s\">send it to us</a>."
+msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"{{url}}\">send it to us</a>."
msgstr ""
"Možná se vám podaří\n"
" najít adresu na jejich stránkách, nebo jim zavolejte a zeptejte se. Pokud uspějete,\n"
-" prosíme <a href=\"%s\">pošlete nám ji</a>."
+" prosíme <a href=\"{{url}}\">pošlete nám ji</a>."
msgid "You may be able to find\\none on their website, or by phoning them up and asking. If you manage\\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>."
msgstr ""
diff --git a/locale/cy/app.po b/locale/cy/app.po
index e0f00ffd3..d1f51caac 100644
--- a/locale/cy/app.po
+++ b/locale/cy/app.po
@@ -2773,7 +2773,7 @@ msgstr ""
msgid "You may <strong>include attachments</strong>. If you would like to attach a\\n file too large for email, use the form below."
msgstr ""
-msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"%s\">send it to us</a>."
+msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"{{url}}\">send it to us</a>."
msgstr ""
msgid "You may be able to find\\none on their website, or by phoning them up and asking. If you manage\\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>."
diff --git a/locale/de/app.po b/locale/de/app.po
index f61164116..c8033da61 100644
--- a/locale/de/app.po
+++ b/locale/de/app.po
@@ -2833,8 +2833,8 @@ msgstr "Sie kennen die Ursache des Fehlers und können eine <strong>Lösung anbi
msgid "You may <strong>include attachments</strong>. If you would like to attach a\\n file too large for email, use the form below."
msgstr ""
-msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"%s\">send it to us</a>."
-msgstr "Es ist mögliche eine auf deren Internetseite zu finden oder sie telefonisch zu erfragen. Sollten Sie sie herausfinden, <a href=\"%s\">senden sie sie uns bitte zu</a>."
+msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"{{url}}\">send it to us</a>."
+msgstr "Es ist mögliche eine auf deren Internetseite zu finden oder sie telefonisch zu erfragen. Sollten Sie sie herausfinden, <a href=\"{{url}}\">senden sie sie uns bitte zu</a>."
msgid "You may be able to find\\none on their website, or by phoning them up and asking. If you manage\\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>."
msgstr "Sie können eventuell eine auf deren Internetseite finden, oder sie anrufen und nachfragen. Sollten Sie eine herausfinden, freuen wir uns über Ihre <a href=\"{{help_url}}\">Zusendung</a>."
diff --git a/locale/en/app.po b/locale/en/app.po
index 5da603463..ce4e8bc18 100644
--- a/locale/en/app.po
+++ b/locale/en/app.po
@@ -2753,7 +2753,7 @@ msgstr ""
msgid "You may <strong>include attachments</strong>. If you would like to attach a\\n file too large for email, use the form below."
msgstr ""
-msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"%s\">send it to us</a>."
+msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"{{url}}\">send it to us</a>."
msgstr ""
msgid "You may be able to find\\none on their website, or by phoning them up and asking. If you manage\\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>."
diff --git a/locale/en_IE/app.po b/locale/en_IE/app.po
index c2a979d03..9ce30a02c 100644
--- a/locale/en_IE/app.po
+++ b/locale/en_IE/app.po
@@ -2755,7 +2755,7 @@ msgstr ""
msgid "You may <strong>include attachments</strong>. If you would like to attach a\\n file too large for email, use the form below."
msgstr ""
-msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"%s\">send it to us</a>."
+msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"{{url}}\">send it to us</a>."
msgstr ""
msgid "You may be able to find\\none on their website, or by phoning them up and asking. If you manage\\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>."
diff --git a/locale/es/app.po b/locale/es/app.po
index 7387929af..a6b6fb7e5 100644
--- a/locale/es/app.po
+++ b/locale/es/app.po
@@ -3000,11 +3000,11 @@ msgstr "Sabes lo que ha causado el error, y puedes <strong>sugerir una solución
msgid "You may <strong>include attachments</strong>. If you would like to attach a\\n file too large for email, use the form below."
msgstr ""
-msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"%s\">send it to us</a>."
+msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"{{url}}\">send it to us</a>."
msgstr ""
"Puede que encuentres una\n"
" en su página web, o preguntando por teléfono. Si la consigues\n"
-" por favor <a href=\"%s\">envíanosla</a>."
+" por favor <a href=\"{{url}}\">envíanosla</a>."
msgid "You may be able to find\\none on their website, or by phoning them up and asking. If you manage\\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>."
msgstr ""
diff --git a/locale/eu/app.po b/locale/eu/app.po
index 056b4c0b7..f42c5bdf6 100644
--- a/locale/eu/app.po
+++ b/locale/eu/app.po
@@ -2826,8 +2826,8 @@ msgstr "Badakizu zerk eragin duen errorea eta <strong>irtenbidea iradoki</a> aha
msgid "You may <strong>include attachments</strong>. If you would like to attach a\\n file too large for email, use the form below."
msgstr ""
-msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"%s\">send it to us</a>."
-msgstr "Agian aurkitu ahal duzu haien web orrialdean edo telefonoz galdetzen. Lortuz gero, mesedez <a href=\"%s\">bidal iezaguzu</a>."
+msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"{{url}}\">send it to us</a>."
+msgstr "Agian aurkitu ahal duzu haien web orrialdean edo telefonoz galdetzen. Lortuz gero, mesedez <a href=\"{{url}}\">bidal iezaguzu</a>."
msgid "You may be able to find\\none on their website, or by phoning them up and asking. If you manage\\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>."
msgstr ""
diff --git a/locale/fr/app.po b/locale/fr/app.po
index c3fb03f65..cea92fa9e 100644
--- a/locale/fr/app.po
+++ b/locale/fr/app.po
@@ -2765,7 +2765,7 @@ msgstr ""
msgid "You may <strong>include attachments</strong>. If you would like to attach a\\n file too large for email, use the form below."
msgstr ""
-msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"%s\">send it to us</a>."
+msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"{{url}}\">send it to us</a>."
msgstr ""
msgid "You may be able to find\\none on their website, or by phoning them up and asking. If you manage\\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>."
diff --git a/locale/gl/app.po b/locale/gl/app.po
index aa9b8bc64..8613a111f 100644
--- a/locale/gl/app.po
+++ b/locale/gl/app.po
@@ -2971,11 +2971,11 @@ msgstr "Sabes lo que ha causado el error, y puedes <strong>sugerir una solución
msgid "You may <strong>include attachments</strong>. If you would like to attach a\\n file too large for email, use the form below."
msgstr ""
-msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"%s\">send it to us</a>."
+msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"{{url}}\">send it to us</a>."
msgstr ""
"Puede que encuentres una\n"
" en su página web, o preguntando por teléfono. Si la consigues\n"
-" por favor <a href=\"%s\">envíanosla</a>."
+" por favor <a href=\"{{url}}\">envíanosla</a>."
msgid "You may be able to find\\none on their website, or by phoning them up and asking. If you manage\\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>."
msgstr ""
diff --git a/locale/hu_HU/app.po b/locale/hu_HU/app.po
index ea067902f..cc8fb477d 100644
--- a/locale/hu_HU/app.po
+++ b/locale/hu_HU/app.po
@@ -2969,11 +2969,11 @@ msgstr "ön tudja, hogy mi okozta a hibát, és tud <strong>megoldást javasolni
msgid "You may <strong>include attachments</strong>. If you would like to attach a\\n file too large for email, use the form below."
msgstr ""
-msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"%s\">send it to us</a>."
+msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"{{url}}\">send it to us</a>."
msgstr ""
"Előfordulhat, hogy\n"
" weboldalukon is talál ilyet, vagy hívja fel őket és érdeklődjön. Ha sikerült\n"
-" ilyet találnia, kérjük, <a href=\"%s\">küldje el nekünk</a> is. "
+" ilyet találnia, kérjük, <a href=\"{{url}}\">küldje el nekünk</a> is. "
msgid "You may be able to find\\none on their website, or by phoning them up and asking. If you manage\\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>."
msgstr ""
diff --git a/locale/id/app.po b/locale/id/app.po
index ae2a7f478..bdcaabb7b 100644
--- a/locale/id/app.po
+++ b/locale/id/app.po
@@ -2987,11 +2987,11 @@ msgstr "Anda tahu apa yang menyebabkan kesalahan tersebut, dan dapat <strong>men
msgid "You may <strong>include attachments</strong>. If you would like to attach a\\n file too large for email, use the form below."
msgstr ""
-msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"%s\">send it to us</a>."
+msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"{{url}}\">send it to us</a>."
msgstr ""
"Anda mungkin dapat menemukan\n"
" satu di website mereka, atau dengan menelepon mereka dan bertanya. Jika Anda berhasil\n"
-" menemukannya, maka mohon <a href=\"%s\">kirimkan kepada kami</a>."
+" menemukannya, maka mohon <a href=\"{{url}}\">kirimkan kepada kami</a>."
msgid "You may be able to find\\none on their website, or by phoning them up and asking. If you manage\\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>."
msgstr ""
diff --git a/locale/nb_NO/app.po b/locale/nb_NO/app.po
index ff011fd08..0d9440e60 100644
--- a/locale/nb_NO/app.po
+++ b/locale/nb_NO/app.po
@@ -2753,7 +2753,7 @@ msgstr ""
msgid "You may <strong>include attachments</strong>. If you would like to attach a\\n file too large for email, use the form below."
msgstr ""
-msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"%s\">send it to us</a>."
+msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"{{url}}\">send it to us</a>."
msgstr ""
msgid "You may be able to find\\none on their website, or by phoning them up and asking. If you manage\\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>."
diff --git a/locale/pt_BR/app.po b/locale/pt_BR/app.po
index 80d6b3e4d..7d8bb8dae 100644
--- a/locale/pt_BR/app.po
+++ b/locale/pt_BR/app.po
@@ -2816,8 +2816,8 @@ msgstr "Você sabe o que causou o erro e pode <strong>sugerir uma solução</str
msgid "You may <strong>include attachments</strong>. If you would like to attach a\\n file too large for email, use the form below."
msgstr ""
-msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"%s\">send it to us</a>."
-msgstr "Talvez você consiga achar um email no site deles ou telefonando e perguntando. Se você conseguir encontrar, por favor <a href=\"%s\">envie para nós</a>."
+msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"{{url}}\">send it to us</a>."
+msgstr "Talvez você consiga achar um email no site deles ou telefonando e perguntando. Se você conseguir encontrar, por favor <a href=\"{{url}}\">envie para nós</a>."
msgid "You may be able to find\\none on their website, or by phoning them up and asking. If you manage\\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>."
msgstr ""
diff --git a/locale/ro_RO/app.po b/locale/ro_RO/app.po
index 9c119661c..82807002f 100644
--- a/locale/ro_RO/app.po
+++ b/locale/ro_RO/app.po
@@ -2764,7 +2764,7 @@ msgstr ""
msgid "You may <strong>include attachments</strong>. If you would like to attach a\\n file too large for email, use the form below."
msgstr ""
-msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"%s\">send it to us</a>."
+msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"{{url}}\">send it to us</a>."
msgstr ""
msgid "You may be able to find\\none on their website, or by phoning them up and asking. If you manage\\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>."
diff --git a/locale/sl/app.po b/locale/sl/app.po
index 61bd55421..4ea13994b 100644
--- a/locale/sl/app.po
+++ b/locale/sl/app.po
@@ -2771,7 +2771,7 @@ msgstr ""
msgid "You may <strong>include attachments</strong>. If you would like to attach a\\n file too large for email, use the form below."
msgstr ""
-msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"%s\">send it to us</a>."
+msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"{{url}}\">send it to us</a>."
msgstr ""
msgid "You may be able to find\\none on their website, or by phoning them up and asking. If you manage\\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>."
diff --git a/locale/sq/app.po b/locale/sq/app.po
index b1ef8a305..b8af7b4e4 100644
--- a/locale/sq/app.po
+++ b/locale/sq/app.po
@@ -2898,11 +2898,11 @@ msgstr "Ti e di se çfarë e shkaktoi gabim, dhe mund të <strong>sugjerosh një
msgid "You may <strong>include attachments</strong>. If you would like to attach a\\n file too large for email, use the form below."
msgstr ""
-msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"%s\">send it to us</a>."
+msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"{{url}}\">send it to us</a>."
msgstr ""
"Ti ke mundësi të gjejsh atë\n"
" në ueb sajtin e tyre, ose duke iu telefonuar. Nëse keni arritur të gjeni adresën,\n"
-" atëherë të lutem <a href=\"%s\">na e dërgo të njejtën</a>."
+" atëherë të lutem <a href=\"{{url}}\">na e dërgo të njejtën</a>."
msgid "You may be able to find\\none on their website, or by phoning them up and asking. If you manage\\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>."
msgstr ""
diff --git a/locale/sr@latin/app.po b/locale/sr@latin/app.po
index 5ecc81f67..572ce4fc9 100644
--- a/locale/sr@latin/app.po
+++ b/locale/sr@latin/app.po
@@ -1016,15 +1016,8 @@ msgstr ""
msgid "If you are still having trouble, please <a href=\"{{url}}\">contact us</a>."
msgstr "Ako i dalje imate problema, molimo <a href=\"{{url}}\">kontaktirajte nas</a>."
-<<<<<<< HEAD
-msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view the request."
-msgstr "Ako ste podnosioc zahteva, možete se <a href=\"%s\">prijaviti</a> da biste pogledali zahtev."
-=======
-msgid ""
-"If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view "
-"the request."
+msgid "If you are the requester, then you may <a href=\"{{url}}\">sign in</a> to view the request."
msgstr "Ako ste podnosioc zahteva, možete se <a href=\"{{url}}\">prijaviti</a> da biste pogledali zahtev."
->>>>>>> 46e9f2b... Change %s to {{}} in translation "If you are the requester,..."
msgid "If you are thinking of using a pseudonym,\\n please <a href=\"%s\">read this first</a>."
msgstr ""
@@ -2940,11 +2933,11 @@ msgstr "Znate šta je uzrok greške i možete <strong>predložiti rešenje</stro
msgid "You may <strong>include attachments</strong>. If you would like to attach a\\n file too large for email, use the form below."
msgstr ""
-msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"%s\">send it to us</a>."
+msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"{{url}}\">send it to us</a>."
msgstr ""
"Moguće je da je nađete\n"
" na njihovoj web stranici, ili putem telefonskog poziva. Ako uspete\n"
-" da je nađete, onda molimo <a href=\"%s\">da nam je pošaljete</a>."
+" da je nađete, onda molimo <a href=\"{{url}}\">da nam je pošaljete</a>."
msgid "You may be able to find\\none on their website, or by phoning them up and asking. If you manage\\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>."
msgstr ""
diff --git a/locale/tr/app.po b/locale/tr/app.po
index 7b7f41ab8..47afe6310 100644
--- a/locale/tr/app.po
+++ b/locale/tr/app.po
@@ -2745,7 +2745,7 @@ msgstr ""
msgid "You may <strong>include attachments</strong>. If you would like to attach a\\n file too large for email, use the form below."
msgstr ""
-msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"%s\">send it to us</a>."
+msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"{{url}}\">send it to us</a>."
msgstr ""
msgid "You may be able to find\\none on their website, or by phoning them up and asking. If you manage\\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>."
diff --git a/locale/uk/app.po b/locale/uk/app.po
index 842c7ef7a..b12a293e6 100644
--- a/locale/uk/app.po
+++ b/locale/uk/app.po
@@ -2898,7 +2898,7 @@ msgstr ""
"Ви можете прикріпити до листа файл. Якщо він надто великий для електронної пошти,\n"
" скористайтеся формою нижче."
-msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"%s\">send it to us</a>."
+msgid "You may be able to find\\n one on their website, or by phoning them up and asking. If you manage\\n to find one, then please <a href=\"{{url}}\">send it to us</a>."
msgstr ""
msgid "You may be able to find\\none on their website, or by phoning them up and asking. If you manage\\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>."
diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po
index f28f35c01..6145e27bc 100644
--- a/spec/fixtures/locale/en/app.po
+++ b/spec/fixtures/locale/en/app.po
@@ -3566,7 +3566,7 @@ msgstr ""
msgid ""
"You may be able to find\n"
" one on their website, or by phoning them up and asking. If you manage\n"
-" to find one, then please <a href=\"%s\">send it to us</a>."
+" to find one, then please <a href=\"{{url}}\">send it to us</a>."
msgstr ""
#: app/views/request/new_bad_contact.rhtml:6
diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po
index 6ef7babff..ef05cb694 100644
--- a/spec/fixtures/locale/en_GB/app.po
+++ b/spec/fixtures/locale/en_GB/app.po
@@ -3565,7 +3565,7 @@ msgstr ""
msgid ""
"You may be able to find\n"
" one on their website, or by phoning them up and asking. If you manage\n"
-" to find one, then please <a href=\"%s\">send it to us</a>."
+" to find one, then please <a href=\"{{url}}\">send it to us</a>."
msgstr ""
#: app/views/request/new_bad_contact.rhtml:6
diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po
index a9f2f3b63..5e42c74a6 100644
--- a/spec/fixtures/locale/es/app.po
+++ b/spec/fixtures/locale/es/app.po
@@ -3832,8 +3832,8 @@ msgstr "Puede <strong>adjuntar ficheros</strong>. Si quiere adjuntar un fichero\
msgid ""
"You may be able to find\n"
" one on their website, or by phoning them up and asking. If you manage\n"
-" to find one, then please <a href=\"%s\">send it to us</a>."
-msgstr "Puede que encuentres una\n en su página web, o preguntando por teléfono. Si la consigues\n por favor <a href=\"%s\">envíanosla</a>."
+" to find one, then please <a href=\"{{url}}\">send it to us</a>."
+msgstr "Puede que encuentres una\n en su página web, o preguntando por teléfono. Si la consigues\n por favor <a href=\"{{url}}\">envíanosla</a>."
#: app/views/request/new_bad_contact.rhtml:6
msgid ""