Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."

28 files changed, 219 insertions, 50 deletions

diff --git a/app/views/request/followup_bad.rhtml b/app/views/request/followup_bad.rhtml
index c892263e6..b712674d8 100644
--- a/app/views/request/followup_bad.rhtml
+++ b/app/views/request/followup_bad.rhtml
@@ -9,16 +9,16 @@
 <% if @reason == 'not_apply' %>
     <!-- we should never get here, but just in case give a sensible message -->
     <p><%= _('Freedom of Information law no longer applies to') %> <%=h @info_request.public_body.name %>.
-    <%= raw(_('From the request page, try replying to a particular message, rather than sending
+    <%= _('From the request page, try replying to a particular message, rather than sending
     a general followup. If you need to make a general followup, and know
-    an email which will go to the right place, please <a href="%s">send it to us</a>.') % [help_contact_path]) %>
+    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 == 'defunct' %>
     <!-- we should never get here, but just in case give a sensible message -->
-    <p><%=h @info_request.public_body.name %> <%= raw(_('no longer exists. If you are trying to make
+    <p><%=h @info_request.public_body.name %> <%= _('no longer exists. If you are trying to make
     From the request page, try replying to a particular message, rather than sending
     a general followup. If you need to make a general followup, and know
-    an email which will go to the right place, please <a href="%s">send it to us</a>.') % [help_contact_path]) %>
+    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
diff --git a/locale/aln/app.po b/locale/aln/app.po
index e4b9e8d5e..04e876fb1 100644
--- a/locale/aln/app.po
+++ b/locale/aln/app.po
@@ -844,7 +844,7 @@ msgstr ""
 msgid "From"
 msgstr ""
 
-msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 msgid "From:"
@@ -3040,7 +3040,15 @@ msgstr ""
 msgid "no later than"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+=======
+msgid ""
+"no longer exists. If you are trying to make\\n    From the request page, try"
+" replying to a particular message, rather than sending\\n    a general "
+"followup. If you need to make a general followup, and know\\n    an email "
+"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
+>>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
 msgstr ""
 
 msgid "normally"
diff --git a/locale/app.pot b/locale/app.pot
index 8ee157a3f..9a8f59b85 100644
--- a/locale/app.pot
+++ b/locale/app.pot
@@ -842,7 +842,7 @@ msgstr ""
 msgid "From"
 msgstr ""
 
-msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 msgid "From:"
@@ -3038,7 +3038,7 @@ msgstr ""
 msgid "no later than"
 msgstr ""
 
-msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 msgid "normally"
diff --git a/locale/ar/app.po b/locale/ar/app.po
index f262ad528..e4ea05922 100644
--- a/locale/ar/app.po
+++ b/locale/ar/app.po
@@ -864,7 +864,7 @@ msgstr ""
 msgid "From"
 msgstr ""
 
-msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 msgid "From:"
@@ -3084,7 +3084,15 @@ msgstr ""
 msgid "no later than"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+=======
+msgid ""
+"no longer exists. If you are trying to make\\n    From the request page, try"
+" replying to a particular message, rather than sending\\n    a general "
+"followup. If you need to make a general followup, and know\\n    an email "
+"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
+>>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
 msgstr ""
 
 msgid "normally"
diff --git a/locale/bs/app.po b/locale/bs/app.po
index 6597b7890..a3b7d3001 100644
--- a/locale/bs/app.po
+++ b/locale/bs/app.po
@@ -904,7 +904,7 @@ msgstr ""
 msgid "From"
 msgstr ""
 
-msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 msgid "From:"
@@ -3234,7 +3234,15 @@ msgstr "poruke od korisnika"
 msgid "no later than"
 msgstr "ne kasnije od"
 
+<<<<<<< HEAD
 msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+=======
+msgid ""
+"no longer exists. If you are trying to make\\n    From the request page, try"
+" replying to a particular message, rather than sending\\n    a general "
+"followup. If you need to make a general followup, and know\\n    an email "
+"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
+>>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
 msgstr ""
 
 msgid "normally"
diff --git a/locale/ca/app.po b/locale/ca/app.po
index 35436ed08..2fc174a54 100644
--- a/locale/ca/app.po
+++ b/locale/ca/app.po
@@ -914,11 +914,11 @@ msgstr "Solicitudes de información a"
 msgid "From"
 msgstr ""
 
-msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 "Desde la página de la solicitud, intente responder a un mensaje en concreto, en vez de\n"
 "    responder a la solicitud en general. Si necesita hacerlo y tiene una dirección de\n"
-"    correo válida, por favor <a href=\"%s\">mándenosla</a>."
+"    correo válida, por favor <a href=\"{{url}}\">mándenosla</a>."
 
 msgid "From:"
 msgstr "De:"
@@ -3278,12 +3278,21 @@ msgstr "mensajes de usuarios"
 msgid "no later than"
 msgstr "no más tarde de"
 
+<<<<<<< HEAD
 msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
 msgstr ""
 "ya no existe. \n"
 "Desde la página de la solicitud, intente responder a un mensaje en concreto, en vez de\n"
 "    responder a la solicitud en general. Si necesita hacerlo y tiene una dirección de\n"
 "    correo válida, por favor <a href=\"%s\">mándenosla</a>."
+=======
+msgid ""
+"no longer exists. If you are trying to make\\n    From the request page, try"
+" replying to a particular message, rather than sending\\n    a general "
+"followup. If you need to make a general followup, and know\\n    an email "
+"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
+msgstr "ya no existe. \nDesde la página de la solicitud, intente responder a un mensaje en concreto, en vez de\n    responder a la solicitud en general. Si necesita hacerlo y tiene una dirección de\n    correo válida, por favor <a href=\"{{url}}\">mándenosla</a>."
+>>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
 
 msgid "normally"
 msgstr "normalmente"
diff --git a/locale/cs/app.po b/locale/cs/app.po
index cc5bf6840..314c74583 100644
--- a/locale/cs/app.po
+++ b/locale/cs/app.po
@@ -919,8 +919,8 @@ msgstr "Dotaz vznesený na"
 msgid "From"
 msgstr "Od"
 
-msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
-msgstr "Spíše než vložení obecné odpovědi zkuste odpovědět na vybranou zprávu ze stránky pro vznesení dotazu. Pokud potřebujete vložit obecnou odpověď a znáte správnou e-mailovou adresu, prosíme <a href=\"%s\">pošlete nám ji</a>"
+msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
+msgstr "Spíše než vložení obecné odpovědi zkuste odpovědět na vybranou zprávu ze stránky pro vznesení dotazu. Pokud potřebujete vložit obecnou odpověď a znáte správnou e-mailovou adresu, prosíme <a href=\"{{url}}\">pošlete nám ji</a>"
 
 msgid "From:"
 msgstr "Od:"
@@ -3248,10 +3248,19 @@ msgstr "zprávy od uživatelů"
 msgid "no later than"
 msgstr "nejpozději do"
 
+<<<<<<< HEAD
 msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
 msgstr ""
 "již neexistuje. Pokud se pokoušíte\n"
 "    Ze stránky pro vznesení dotazu, pokuste se odpovědět na vybranou zprávu místo podávání obecné odpovědi. Pokud potřebujete poslat obecnou zprávu a znáte správný e-mail, na který to poslat, prosíme <a href=\"%s\">pošlete nám jej</a>."
+=======
+msgid ""
+"no longer exists. If you are trying to make\\n    From the request page, try"
+" replying to a particular message, rather than sending\\n    a general "
+"followup. If you need to make a general followup, and know\\n    an email "
+"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
+msgstr "již neexistuje. Pokud se pokoušíte\n    Ze stránky pro vznesení dotazu, pokuste se odpovědět na vybranou zprávu místo podávání obecné odpovědi. Pokud potřebujete poslat obecnou zprávu a znáte správný e-mail, na který to poslat, prosíme <a href=\"{{url}}\">pošlete nám jej</a>."
+>>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
 
 msgid "normally"
 msgstr "to"
diff --git a/locale/cy/app.po b/locale/cy/app.po
index 8834fb149..b49c371f5 100644
--- a/locale/cy/app.po
+++ b/locale/cy/app.po
@@ -855,7 +855,7 @@ msgstr ""
 msgid "From"
 msgstr ""
 
-msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 msgid "From:"
@@ -3067,7 +3067,15 @@ msgstr ""
 msgid "no later than"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+=======
+msgid ""
+"no longer exists. If you are trying to make\\n    From the request page, try"
+" replying to a particular message, rather than sending\\n    a general "
+"followup. If you need to make a general followup, and know\\n    an email "
+"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
+>>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
 msgstr ""
 
 msgid "normally"
diff --git a/locale/de/app.po b/locale/de/app.po
index 649c08bef..8ecd6d500 100644
--- a/locale/de/app.po
+++ b/locale/de/app.po
@@ -885,8 +885,8 @@ msgstr "IFG-Anfrage an"
 msgid "From"
 msgstr ""
 
-msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
-msgstr "Von der Anfragen-Seite, versuchen Sie direkt auf spezifische Nachrichten zu reagieren anstall eine generelle Nachfrage zu senden. Falls Sie eine generelle Nachfrage stellen müssen und eine Emailadresse kennen, welche an die richtige Stelle geht, sind Sie so freundlich uns <a href=\"%s\">diese zu senden. "
+msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
+msgstr "Von der Anfragen-Seite, versuchen Sie direkt auf spezifische Nachrichten zu reagieren anstall eine generelle Nachfrage zu senden. Falls Sie eine generelle Nachfrage stellen müssen und eine Emailadresse kennen, welche an die richtige Stelle geht, sind Sie so freundlich uns <a href=\"{{url}}\">diese zu senden. "
 
 msgid "From:"
 msgstr "Von:"
@@ -3129,10 +3129,19 @@ msgstr "Nachrichten von Nutzern"
 msgid "no later than"
 msgstr "nicht später als"
 
+<<<<<<< HEAD
 msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
 msgstr ""
 "besteht nicht mehr. Falls Sie versuchen \n"
 "   Von der Anfragen-Seite, versuchen Sie auf spezifische Nachrichten zu Antworten anstatt generelle Nachfragen zu versenden. Wenn Sie eine gnerelle Nachfrage stellen müssen und eine Email-Adresse kennen, die an die richtige Stelle geht, <a href=\"%s\">senden Sie uns diese</a> bitte zu."
+=======
+msgid ""
+"no longer exists. If you are trying to make\\n    From the request page, try"
+" replying to a particular message, rather than sending\\n    a general "
+"followup. If you need to make a general followup, and know\\n    an email "
+"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
+msgstr "besteht nicht mehr. Falls Sie versuchen \n   Von der Anfragen-Seite, versuchen Sie auf spezifische Nachrichten zu Antworten anstatt generelle Nachfragen zu versenden. Wenn Sie eine gnerelle Nachfrage stellen müssen und eine Email-Adresse kennen, die an die richtige Stelle geht, <a href=\"{{url}}\">senden Sie uns diese</a> bitte zu."
+>>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
 
 msgid "normally"
 msgstr "normalerweise"
diff --git a/locale/en/app.po b/locale/en/app.po
index 0e00cdc71..369d386d6 100644
--- a/locale/en/app.po
+++ b/locale/en/app.po
@@ -843,7 +843,7 @@ msgstr ""
 msgid "From"
 msgstr ""
 
-msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 msgid "From:"
@@ -3039,7 +3039,7 @@ msgstr ""
 msgid "no later than"
 msgstr ""
 
-msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 msgid "normally"
diff --git a/locale/en_IE/app.po b/locale/en_IE/app.po
index 3b756b734..924230a73 100644
--- a/locale/en_IE/app.po
+++ b/locale/en_IE/app.po
@@ -845,7 +845,7 @@ msgstr ""
 msgid "From"
 msgstr ""
 
-msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 msgid "From:"
@@ -3041,7 +3041,15 @@ msgstr ""
 msgid "no later than"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+=======
+msgid ""
+"no longer exists. If you are trying to make\\n    From the request page, try"
+" replying to a particular message, rather than sending\\n    a general "
+"followup. If you need to make a general followup, and know\\n    an email "
+"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
+>>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
 msgstr ""
 
 msgid "normally"
diff --git a/locale/es/app.po b/locale/es/app.po
index ba90353fe..2309af5d2 100644
--- a/locale/es/app.po
+++ b/locale/es/app.po
@@ -934,11 +934,11 @@ msgstr "Solicitudes de información a"
 msgid "From"
 msgstr ""
 
-msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 "Desde la página de la solicitud, intenta responder a un mensaje en concreto, en vez de\n"
 "    responder a la solicitud en general. Si necesitas hacerlo y tienes una dirección de\n"
-"    correo válida, por favor <a href=\"%s\">mándanosla</a>."
+"    correo válida, por favor <a href=\"{{url}}\">mándanosla</a>."
 
 msgid "From:"
 msgstr "De:"
@@ -3308,12 +3308,21 @@ msgstr "mensajes de usuarios"
 msgid "no later than"
 msgstr "no más tarde de"
 
+<<<<<<< HEAD
 msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
 msgstr ""
 "ya no existe. \n"
 "Desde la página de la solicitud, intenta responder a un mensaje en concreto, en vez de\n"
 "    responder a la solicitud en general. Si necesitas hacerlo y tienes una dirección de\n"
 "    correo válida, por favor <a href=\"%s\">mándanosla</a>."
+=======
+msgid ""
+"no longer exists. If you are trying to make\\n    From the request page, try"
+" replying to a particular message, rather than sending\\n    a general "
+"followup. If you need to make a general followup, and know\\n    an email "
+"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
+msgstr "ya no existe. \nDesde la página de la solicitud, intenta responder a un mensaje en concreto, en vez de\n    responder a la solicitud en general. Si necesitas hacerlo y tienes una dirección de\n    correo válida, por favor <a href=\"{{url}}\">mándanosla</a>."
+>>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
 
 msgid "normally"
 msgstr "normalmente"
diff --git a/locale/eu/app.po b/locale/eu/app.po
index 5bfcd5c72..b47d4832c 100644
--- a/locale/eu/app.po
+++ b/locale/eu/app.po
@@ -877,8 +877,8 @@ msgstr "_______-ra egin diren informazio eskabideak"
 msgid "From"
 msgstr ""
 
-msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
-msgstr "Eskabidearen orrialdetik, saia zaitez mezu zehatz bati erantzuten, orokorrean eskabideari baino. Egin behar izanez gero eta posta helbide baliagarria baldin baduzu, mesedez <a href=\"%s\">bidal iezaguzu</a>."
+msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
+msgstr "Eskabidearen orrialdetik, saia zaitez mezu zehatz bati erantzuten, orokorrean eskabideari baino. Egin behar izanez gero eta posta helbide baliagarria baldin baduzu, mesedez <a href=\"{{url}}\">bidal iezaguzu</a>."
 
 msgid "From:"
 msgstr "Nondik:"
@@ -3122,10 +3122,19 @@ msgstr "erabiltzaileen mezuak"
 msgid "no later than"
 msgstr "______ baino beranduago ez"
 
+<<<<<<< HEAD
 msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
 msgstr ""
 "ez da existitzen. \n"
 "Eskabidearen orrialdetik saia zaitez mezu zehatz bati erantzuten, eskabide osoari orokorrean erantzun baino. Hala egin behar izanez gero eta helbide elektroniko baliagarria baldin baduzu, mesedez <a href=\"%s\">bidal iezaguzu</a>."
+=======
+msgid ""
+"no longer exists. If you are trying to make\\n    From the request page, try"
+" replying to a particular message, rather than sending\\n    a general "
+"followup. If you need to make a general followup, and know\\n    an email "
+"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
+msgstr "ez da existitzen. \nEskabidearen orrialdetik saia zaitez mezu zehatz bati erantzuten, eskabide osoari orokorrean erantzun baino. Hala egin behar izanez gero eta helbide elektroniko baliagarria baldin baduzu, mesedez <a href=\"{{url}}\">bidal iezaguzu</a>."
+>>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
 
 msgid "normally"
 msgstr "normalean"
diff --git a/locale/fr/app.po b/locale/fr/app.po
index 9bbd2acc6..22ea05eba 100644
--- a/locale/fr/app.po
+++ b/locale/fr/app.po
@@ -853,7 +853,7 @@ msgstr ""
 msgid "From"
 msgstr ""
 
-msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 msgid "From:"
@@ -3051,7 +3051,15 @@ msgstr "messages des utilisateurs"
 msgid "no later than"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+=======
+msgid ""
+"no longer exists. If you are trying to make\\n    From the request page, try"
+" replying to a particular message, rather than sending\\n    a general "
+"followup. If you need to make a general followup, and know\\n    an email "
+"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
+>>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
 msgstr ""
 
 msgid "normally"
diff --git a/locale/gl/app.po b/locale/gl/app.po
index 33f548690..d0562c020 100644
--- a/locale/gl/app.po
+++ b/locale/gl/app.po
@@ -915,11 +915,11 @@ msgstr "Solicitudes de información a"
 msgid "From"
 msgstr ""
 
-msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 "Desde la página de la solicitud, intente responder a un mensaje en concreto, en vez de\n"
 "    responder a la solicitud en general. Si necesita hacerlo y tiene una dirección de\n"
-"    correo válida, por favor <a href=\"%s\">mándenosla</a>."
+"    correo válida, por favor <a href=\"{{url}}\">mándenosla</a>."
 
 msgid "From:"
 msgstr "De:"
@@ -3279,12 +3279,21 @@ msgstr "mensajes de usuarios"
 msgid "no later than"
 msgstr "no más tarde de"
 
+<<<<<<< HEAD
 msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
 msgstr ""
 "ya no existe. \n"
 "Desde la página de la solicitud, intente responder a un mensaje en concreto, en vez de\n"
 "    responder a la solicitud en general. Si necesita hacerlo y tiene una dirección de\n"
 "    correo válida, por favor <a href=\"%s\">mándenosla</a>."
+=======
+msgid ""
+"no longer exists. If you are trying to make\\n    From the request page, try"
+" replying to a particular message, rather than sending\\n    a general "
+"followup. If you need to make a general followup, and know\\n    an email "
+"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
+msgstr "ya no existe. \nDesde la página de la solicitud, intente responder a un mensaje en concreto, en vez de\n    responder a la solicitud en general. Si necesita hacerlo y tiene una dirección de\n    correo válida, por favor <a href=\"{{url}}\">mándenosla</a>."
+>>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
 
 msgid "normally"
 msgstr "normalmente"
diff --git a/locale/hu_HU/app.po b/locale/hu_HU/app.po
index 65f172084..d8b815e18 100644
--- a/locale/hu_HU/app.po
+++ b/locale/hu_HU/app.po
@@ -909,11 +909,11 @@ msgstr "Közérdekű adatok, melyeket a ettől az adatgazdától igényeltek: "
 msgid "From"
 msgstr ""
 
-msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 "Az igénylési oldalról próbáljon választ adni egy adott üzenetre ahelyett, hogy\n"
 "    általános nyomon követést küldene. Ha általános nyomon követést kíván küldeni, és ismer olyan\n"
-"    e-mail címet, amely a megfelelő helyre kerül, <a href=\"%s\">küldje el nekünk is</a>. "
+"    e-mail címet, amely a megfelelő helyre kerül, <a href=\"{{url}}\">küldje el nekünk is</a>. "
 
 msgid "From:"
 msgstr "Feladó:"
@@ -3273,12 +3273,21 @@ msgstr "felhasználóktól érkező üzenetek "
 msgid "no later than"
 msgstr "nem később, mint "
 
+<<<<<<< HEAD
 msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
 msgstr ""
 "már nem létezik. Ha \n"
 "   Az igénylési oldalról próbáljon választ adni egy adott üzenetre ahelyett, hogy\n"
 "   általános nyomon követést küldene. Ha általános nyomon követést kíván küldeni, és ismer olyan\n"
 "   e-mail címet, amely a megfelelő helyre kerül, <a href=\"%s\">küldje el nekünk is</a>. "
+=======
+msgid ""
+"no longer exists. If you are trying to make\\n    From the request page, try"
+" replying to a particular message, rather than sending\\n    a general "
+"followup. If you need to make a general followup, and know\\n    an email "
+"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
+msgstr "már nem létezik. Ha \n   Az igénylési oldalról próbáljon választ adni egy adott üzenetre ahelyett, hogy\n   általános nyomon követést küldene. Ha általános nyomon követést kíván küldeni, és ismer olyan\n   e-mail címet, amely a megfelelő helyre kerül, <a href=\"{{url}}\">küldje el nekünk is</a>. "
+>>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
 
 msgid "normally"
 msgstr "normális esetben "
diff --git a/locale/id/app.po b/locale/id/app.po
index 0d92d4bff..214de3d30 100644
--- a/locale/id/app.po
+++ b/locale/id/app.po
@@ -931,11 +931,11 @@ msgstr "Permintaan Freedom of information kepada"
 msgid "From"
 msgstr ""
 
-msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 "Dari halaman permintaan, cobalah untuk membalas ke pesan tertentu, daripada mengirimkan\n"
 "    tindak lanjut umum. Jika Anda perlu membuat tindak lanjut umum, dan tahu\n"
-"    email yang akan dikirimkan ke tempat yang benar, silakan <a href=\"%s\">kirimkan kepada kami</a>."
+"    email yang akan dikirimkan ke tempat yang benar, silakan <a href=\"{{url}}\">kirimkan kepada kami</a>."
 
 msgid "From:"
 msgstr "Dari:"
@@ -3293,12 +3293,21 @@ msgstr "pesan dari pengguna"
 msgid "no later than"
 msgstr "tidak kurang dari"
 
+<<<<<<< HEAD
 msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
 msgstr ""
 "tidak lagi ada. Jika Anda mencoba untuk membuat\n"
 "    Dari halaman permintaan, coba untuk membalas ke pesan tertentu, daripada mengirim\n"
 "    tindak lanjut umum. Jika Anda perlu membuat tindak lanjut umum, dan tahu\n"
 "    email yang akan pergi ke tempat yang tepat, silakan <a href=\"%s\">mengirimkannya kepada kami</a>."
+=======
+msgid ""
+"no longer exists. If you are trying to make\\n    From the request page, try"
+" replying to a particular message, rather than sending\\n    a general "
+"followup. If you need to make a general followup, and know\\n    an email "
+"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
+msgstr "tidak lagi ada. Jika Anda mencoba untuk membuat\n    Dari halaman permintaan, coba untuk membalas ke pesan tertentu, daripada mengirim\n    tindak lanjut umum. Jika Anda perlu membuat tindak lanjut umum, dan tahu\n    email yang akan pergi ke tempat yang tepat, silakan <a href=\"{{url}}\">mengirimkannya kepada kami</a>."
+>>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
 
 msgid "normally"
 msgstr "biasanya"
diff --git a/locale/nb_NO/app.po b/locale/nb_NO/app.po
index 0dc13fe38..11729f632 100644
--- a/locale/nb_NO/app.po
+++ b/locale/nb_NO/app.po
@@ -843,7 +843,7 @@ msgstr ""
 msgid "From"
 msgstr ""
 
-msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 msgid "From:"
@@ -3039,7 +3039,7 @@ msgstr ""
 msgid "no later than"
 msgstr ""
 
-msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 msgid "normally"
diff --git a/locale/pt_BR/app.po b/locale/pt_BR/app.po
index 7828fd5cb..d6d909e21 100644
--- a/locale/pt_BR/app.po
+++ b/locale/pt_BR/app.po
@@ -882,8 +882,8 @@ msgstr "Pedidos de acesso a informação para "
 msgid "From"
 msgstr "De"
 
-msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
-msgstr "A partir da página de solicitação, tente responder a uma mensagem específica, em vez de enviar um pedido de acompanhamento geral. Se você precisa fazer um acompanhamento geral, e sabe um endereço de e-mail para que ele chegue ao lugar certo, por favor, <a href=\"%s\">envie para nós</a> ."
+msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
+msgstr "A partir da página de solicitação, tente responder a uma mensagem específica, em vez de enviar um pedido de acompanhamento geral. Se você precisa fazer um acompanhamento geral, e sabe um endereço de e-mail para que ele chegue ao lugar certo, por favor, <a href=\"{{url}}\">envie para nós</a> ."
 
 msgid "From:"
 msgstr "De:"
@@ -3107,7 +3107,15 @@ msgstr "mensagens de usuários"
 msgid "no later than"
 msgstr "até o dia"
 
+<<<<<<< HEAD
 msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+=======
+msgid ""
+"no longer exists. If you are trying to make\\n    From the request page, try"
+" replying to a particular message, rather than sending\\n    a general "
+"followup. If you need to make a general followup, and know\\n    an email "
+"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
+>>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
 msgstr ""
 
 msgid "normally"
diff --git a/locale/ro_RO/app.po b/locale/ro_RO/app.po
index 112e1ac1f..49e16b783 100644
--- a/locale/ro_RO/app.po
+++ b/locale/ro_RO/app.po
@@ -850,7 +850,7 @@ msgstr ""
 msgid "From"
 msgstr ""
 
-msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 msgid "From:"
@@ -3052,7 +3052,15 @@ msgstr ""
 msgid "no later than"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+=======
+msgid ""
+"no longer exists. If you are trying to make\\n    From the request page, try"
+" replying to a particular message, rather than sending\\n    a general "
+"followup. If you need to make a general followup, and know\\n    an email "
+"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
+>>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
 msgstr ""
 
 msgid "normally"
diff --git a/locale/sl/app.po b/locale/sl/app.po
index 1edcba0fd..41cbc82f3 100644
--- a/locale/sl/app.po
+++ b/locale/sl/app.po
@@ -853,7 +853,7 @@ msgstr ""
 msgid "From"
 msgstr ""
 
-msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 msgid "From:"
@@ -3061,7 +3061,7 @@ msgstr ""
 msgid "no later than"
 msgstr ""
 
-msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 msgid "normally"
diff --git a/locale/sq/app.po b/locale/sq/app.po
index 5ce0765bd..f9b31c52e 100644
--- a/locale/sq/app.po
+++ b/locale/sq/app.po
@@ -909,11 +909,11 @@ msgstr "Kërkesa për informata zyrtare për"
 msgid "From"
 msgstr "Nga"
 
-msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 "Nga faqja e kërkesës, provo të përgjigjesh në një mesazh të caktuar, më parë se të\n"
 "    shkruash një përgjigje të përgjithshme. Nëse të duhet të shkruash përgjigje të përgjithshme, dhe e di\n"
-"    emailin ku duhet ta drejtosh, atëherë të lutem <a href=\"%s\">dërgoje te ne</a>."
+"    emailin ku duhet ta drejtosh, atëherë të lutem <a href=\"{{url}}\">dërgoje te ne</a>."
 
 msgid "From:"
 msgstr "Prej:"
@@ -3205,10 +3205,19 @@ msgstr "mesazhe nga përdoruesit"
 msgid "no later than"
 msgstr "jo më vonë se"
 
+<<<<<<< HEAD
 msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
 msgstr ""
 "nuk ekziston më. Nëse je duke u përpjekur për të bërë\n"
 "    Prej faqes së kërkesës, provo ti përgjigjesh një mesazhi të veçant, në vend se të dërgosh një mesazh vazhdues. Nëse keni nevojë të bëni një mesazh prëcjellës të përgjithshëm dhe e di një adresë të emailit që do të shkon ne vendin e duhur, të lutem <a href=\"%s\">na e dërgo</a>."
+=======
+msgid ""
+"no longer exists. If you are trying to make\\n    From the request page, try"
+" replying to a particular message, rather than sending\\n    a general "
+"followup. If you need to make a general followup, and know\\n    an email "
+"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
+msgstr "nuk ekziston më. Nëse je duke u përpjekur për të bërë\n    Prej faqes së kërkesës, provo ti përgjigjesh një mesazhi të veçant, në vend se të dërgosh një mesazh vazhdues. Nëse keni nevojë të bëni një mesazh prëcjellës të përgjithshëm dhe e di një adresë të emailit që do të shkon ne vendin e duhur, të lutem <a href=\"{{url}}\">na e dërgo</a>."
+>>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
 
 msgid "normally"
 msgstr "normalisht"
diff --git a/locale/sr@latin/app.po b/locale/sr@latin/app.po
index 48dc8f0d6..24e9c3a8a 100644
--- a/locale/sr@latin/app.po
+++ b/locale/sr@latin/app.po
@@ -900,7 +900,7 @@ msgstr ""
 msgid "From"
 msgstr ""
 
-msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 msgid "From:"
@@ -3233,7 +3233,15 @@ msgstr "poruke od korisnika"
 msgid "no later than"
 msgstr "ne kasnije od"
 
+<<<<<<< HEAD
 msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+=======
+msgid ""
+"no longer exists. If you are trying to make\\n    From the request page, try"
+" replying to a particular message, rather than sending\\n    a general "
+"followup. If you need to make a general followup, and know\\n    an email "
+"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
+>>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
 msgstr ""
 
 msgid "normally"
diff --git a/locale/tr/app.po b/locale/tr/app.po
index 59b042e77..b37314364 100644
--- a/locale/tr/app.po
+++ b/locale/tr/app.po
@@ -839,7 +839,7 @@ msgstr ""
 msgid "From"
 msgstr ""
 
-msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 msgid "From:"
@@ -3029,7 +3029,15 @@ msgstr ""
 msgid "no later than"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+=======
+msgid ""
+"no longer exists. If you are trying to make\\n    From the request page, try"
+" replying to a particular message, rather than sending\\n    a general "
+"followup. If you need to make a general followup, and know\\n    an email "
+"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
+>>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
 msgstr ""
 
 msgid "normally"
diff --git a/locale/uk/app.po b/locale/uk/app.po
index 92290f111..eba31211c 100644
--- a/locale/uk/app.po
+++ b/locale/uk/app.po
@@ -921,7 +921,7 @@ msgstr "Запити до"
 msgid "From"
 msgstr "Від"
 
-msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 msgid "From:"
@@ -3203,7 +3203,15 @@ msgstr "повідомлення від користувачів"
 msgid "no later than"
 msgstr "не пізніше, ніж"
 
+<<<<<<< HEAD
 msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+=======
+msgid ""
+"no longer exists. If you are trying to make\\n    From the request page, try"
+" replying to a particular message, rather than sending\\n    a general "
+"followup. If you need to make a general followup, and know\\n    an email "
+"which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
+>>>>>>> 543eb94... Replacing %s with {{}} in translations "From the request page, try replying to a particular message.."
 msgstr ""
 
 msgid "normally"
diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po
index b82aeb4a8..c7ae67452 100644
--- a/spec/fixtures/locale/en/app.po
+++ b/spec/fixtures/locale/en/app.po
@@ -1141,7 +1141,7 @@ msgstr ""
 msgid ""
 "From the request page, try replying to a particular message, rather than sending\n"
 "    a general followup. If you need to make a general followup, and know\n"
-"    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+"    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 #: app/views/request/_correspondence.rhtml:12
@@ -3980,7 +3980,7 @@ msgid ""
 "no longer exists. If you are trying to make\n"
 "    From the request page, try replying to a particular message, rather than sending\n"
 "    a general followup. If you need to make a general followup, and know\n"
-"    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+"    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 #: app/views/request/show.rhtml:72
diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po
index 4f88cd764..d7d0c1986 100644
--- a/spec/fixtures/locale/en_GB/app.po
+++ b/spec/fixtures/locale/en_GB/app.po
@@ -1141,7 +1141,7 @@ msgstr ""
 msgid ""
 "From the request page, try replying to a particular message, rather than sending\n"
 "    a general followup. If you need to make a general followup, and know\n"
-"    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+"    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 #: app/views/request/_correspondence.rhtml:12
@@ -3979,7 +3979,7 @@ msgid ""
 "no longer exists. If you are trying to make\n"
 "    From the request page, try replying to a particular message, rather than sending\n"
 "    a general followup. If you need to make a general followup, and know\n"
-"    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+"    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
 msgstr ""
 
 #: app/views/request/show.rhtml:72
diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po
index a6f978182..3b2eddb47 100644
--- a/spec/fixtures/locale/es/app.po
+++ b/spec/fixtures/locale/es/app.po
@@ -1264,8 +1264,8 @@ msgstr "Solicitudes de información a"
 msgid ""
 "From the request page, try replying to a particular message, rather than sending\n"
 "    a general followup. If you need to make a general followup, and know\n"
-"    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
-msgstr "Desde la página de la solicitud, intenta responder a un mensaje en concreto, en vez de\n    responder a la solicitud en general. Si necesitas hacerlo y tienes una dirección de\n    correo válida, por favor <a href=\"%s\">mándanosla</a>."
+"    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
+msgstr "Desde la página de la solicitud, intenta responder a un mensaje en concreto, en vez de\n    responder a la solicitud en general. Si necesitas hacerlo y tienes una dirección de\n    correo válida, por favor <a href=\"{{url}}\">mándanosla</a>."
 
 #: app/views/request/_correspondence.rhtml:12
 #: app/views/request/_correspondence.rhtml:36
@@ -4263,8 +4263,8 @@ msgid ""
 "no longer exists. If you are trying to make\n"
 "    From the request page, try replying to a particular message, rather than sending\n"
 "    a general followup. If you need to make a general followup, and know\n"
-"    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
-msgstr "ya no existe. \nDesde la página de la solicitud, intenta responder a un mensaje en concreto, en vez de\n    responder a la solicitud en general. Si necesitas hacerlo y tienes una dirección de\n    correo válida, por favor <a href=\"%s\">mándanosla</a>."
+"    an email which will go to the right place, please <a href=\"{{url}}\">send it to us</a>."
+msgstr "ya no existe. \nDesde la página de la solicitud, intenta responder a un mensaje en concreto, en vez de\n    responder a la solicitud en general. Si necesitas hacerlo y tienes una dirección de\n    correo válida, por favor <a href=\"{{url}}\">mándanosla</a>."
 
 #: app/views/request/show.rhtml:72
 msgid "normally"