28 files changed, 42 insertions, 45 deletions
diff --git a/app/models/outgoing_message.rb b/app/models/outgoing_message.rb
index 441813e5f..3cb0ebf49 100644
--- a/app/models/outgoing_message.rb
+++ b/app/models/outgoing_message.rb
@@ -152,7 +152,7 @@ class OutgoingMessage < ActiveRecord::Base
             end
         end
         if self.body =~ /#{get_signoff}\s*\Z/m
-            errors.add(:body, _("Please sign at the bottom with your name, or alter the \"%{signoff}\" signature" % { :signoff => get_signoff }))
+            errors.add(:body, _("Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature", :signoff => get_signoff))
         end
         if !MySociety::Validate.uses_mixed_capitals(self.body)
             errors.add(:body, _('Please write your message using a mixture of capital and lower case letters. This makes it easier for others to read.'))
diff --git a/locale/aln/app.po b/locale/aln/app.po
index 8ab688597..aa6c560a6 100644
--- a/locale/aln/app.po
+++ b/locale/aln/app.po
@@ -1504,7 +1504,7 @@ msgstr ""
 msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
 msgstr ""
 
-msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature"
+msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature"
 msgstr ""
 
 msgid "Please sign in as "
diff --git a/locale/app.pot b/locale/app.pot
index 80fb31ac1..b42a61134 100644
--- a/locale/app.pot
+++ b/locale/app.pot
@@ -1502,7 +1502,7 @@ msgstr ""
 msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
 msgstr ""
 
-msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature"
+msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature"
 msgstr ""
 
 msgid "Please sign in as "
diff --git a/locale/ar/app.po b/locale/ar/app.po
index 56d9b8e2e..515d0183a 100644
--- a/locale/ar/app.po
+++ b/locale/ar/app.po
@@ -708,7 +708,6 @@ msgstr ""
 msgid "Event history details"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Everything that you enter on this page \\n                will be <strong>displayed publicly</strong> on\\n                this website forever (<a href=\"{{url}}\">why?</a>)."
 msgstr ""
 
@@ -1525,7 +1524,7 @@ msgstr ""
 msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
 msgstr ""
 
-msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature"
+msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature"
 msgstr ""
 
 msgid "Please sign in as "
diff --git a/locale/bs/app.po b/locale/bs/app.po
index 89e5fcc73..642acc7a1 100644
--- a/locale/bs/app.po
+++ b/locale/bs/app.po
@@ -1615,8 +1615,8 @@ msgstr ""
 "Molimo odaberite svaki od ovih zahtjeva naizmjenice, i <strong>obavijestite sviju</strong>\n"
 "da li su bili uspješni ili ne."
 
-msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature"
-msgstr "Molimo da se na dnu potpišete, ili izmijenite  \"%{signoff}\" potpis"
+msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature"
+msgstr "Molimo da se na dnu potpišete, ili izmijenite  \"{{signoff}}\" potpis"
 
 msgid "Please sign in as "
 msgstr "Molimo prijavite se kao "
diff --git a/locale/ca/app.po b/locale/ca/app.po
index 71917a4b6..98234c82a 100644
--- a/locale/ca/app.po
+++ b/locale/ca/app.po
@@ -1631,8 +1631,8 @@ msgstr ""
 "Por favor elije estas solicitudes una a una, y <strong>haz que se sepa</strong>\n"
 "si han tenido éxito o no."
 
-msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature"
-msgstr "Por favor, firma con tu nombre en la parte inferior, o cambia la firma \"%{signoff}\""
+msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature"
+msgstr "Por favor, firma con tu nombre en la parte inferior, o cambia la firma \"{{signoff}}\""
 
 msgid "Please sign in as "
 msgstr "Por favor abre una sesión como "
diff --git a/locale/cs/app.po b/locale/cs/app.po
index 90159c79e..63cd9840e 100644
--- a/locale/cs/app.po
+++ b/locale/cs/app.po
@@ -1611,8 +1611,8 @@ msgstr ""
 "Vyberte každý dotaz jednotlivě, a <strong>dejte ostatním vědět</strong>\n"
 "jestli byl úspěšně zodpovězen, nebo ne."
 
-msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature"
-msgstr "Podepište se na konci dopisu svým jménem, nebo změňte \"%{signoff}\" podpis. "
+msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature"
+msgstr "Podepište se na konci dopisu svým jménem, nebo změňte \"{{signoff}}\" podpis. "
 
 msgid "Please sign in as "
 msgstr "Přihlašte se jako"
diff --git a/locale/cy/app.po b/locale/cy/app.po
index cd39bd09a..8237cc6d0 100644
--- a/locale/cy/app.po
+++ b/locale/cy/app.po
@@ -1515,7 +1515,7 @@ msgstr ""
 msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
 msgstr ""
 
-msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature"
+msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature"
 msgstr ""
 
 msgid "Please sign in as "
diff --git a/locale/de/app.po b/locale/de/app.po
index e9714969d..88f3b060c 100644
--- a/locale/de/app.po
+++ b/locale/de/app.po
@@ -1560,8 +1560,8 @@ msgstr "Bitte fragen Sie ausschliesslich auf diese Kategorien zutreffende Inform
 msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
 msgstr "Bitte wählen Sie diese Anfragen der Reihe nach aus und <strong>lassen Sie jederman wissen</strong>, ob sie bereits erfolgreich waren oder noch nicht. "
 
-msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature"
-msgstr "Bitte unterschreiben Sie unten mit Ihrem Namen oder ändern Sie Ihre \"% {signoff}\" Signatur"
+msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature"
+msgstr "Bitte unterschreiben Sie unten mit Ihrem Namen oder ändern Sie Ihre \"{{signoff}}\" Signatur"
 
 msgid "Please sign in as "
 msgstr "Anmelden als"
diff --git a/locale/en/app.po b/locale/en/app.po
index c62a04f67..cee89ccfa 100644
--- a/locale/en/app.po
+++ b/locale/en/app.po
@@ -1503,7 +1503,7 @@ msgstr ""
 msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
 msgstr ""
 
-msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature"
+msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature"
 msgstr ""
 
 msgid "Please sign in as "
diff --git a/locale/en_IE/app.po b/locale/en_IE/app.po
index 79f0f3782..469e4cb4a 100644
--- a/locale/en_IE/app.po
+++ b/locale/en_IE/app.po
@@ -1505,7 +1505,7 @@ msgstr ""
 msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
 msgstr ""
 
-msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature"
+msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature"
 msgstr ""
 
 msgid "Please sign in as "
diff --git a/locale/es/app.po b/locale/es/app.po
index c30c67e2c..d1a6b53ef 100644
--- a/locale/es/app.po
+++ b/locale/es/app.po
@@ -1651,8 +1651,8 @@ msgstr ""
 "Por favor elije estas solicitudes una a una, y <strong>haz que se sepa</strong>\n"
 "si han tenido éxito o no."
 
-msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature"
-msgstr "Por favor, firma con tu nombre en la parte inferior, o cambia la firma \"%{signoff}\""
+msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature"
+msgstr "Por favor, firma con tu nombre en la parte inferior, o cambia la firma \"{{signoff}}\""
 
 msgid "Please sign in as "
 msgstr "Por favor abre una sesión como "
diff --git a/locale/eu/app.po b/locale/eu/app.po
index cf158f7ee..e7548dbf7 100644
--- a/locale/eu/app.po
+++ b/locale/eu/app.po
@@ -1549,8 +1549,8 @@ msgstr "Mesedez, eska ezazu kategoria hauetako informazioa soilik, <strong>ez ga
 msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
 msgstr "Mesedez, aukera itzazu eskabideak banan banan, eta <strong>jakinarazi </strong> arrakasta izan duten ala ez."
 
-msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature"
-msgstr "Mesedez, beheko aldean sinatu zure izenarekin, edo aldatu sinadura \"%{signoff}\""
+msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature"
+msgstr "Mesedez, beheko aldean sinatu zure izenarekin, edo aldatu sinadura \"{{signoff}}\""
 
 msgid "Please sign in as "
 msgstr "Mesedez, ireki saioa ___________  bezala"
diff --git a/locale/fr/app.po b/locale/fr/app.po
index b2987aa0e..a4039877a 100644
--- a/locale/fr/app.po
+++ b/locale/fr/app.po
@@ -1513,8 +1513,8 @@ msgstr ""
 msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
 msgstr ""
 
-msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature"
-msgstr "S'il vous plait signer à la fin avec votre nom, ou changez la \"%{signoff}\" signature"
+msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature"
+msgstr "S'il vous plait signer à la fin avec votre nom, ou changez la \"{{signoff}}\" signature"
 
 msgid "Please sign in as "
 msgstr ""
diff --git a/locale/gl/app.po b/locale/gl/app.po
index ffa30e269..e7fa7dd94 100644
--- a/locale/gl/app.po
+++ b/locale/gl/app.po
@@ -1632,8 +1632,8 @@ msgstr ""
 "Por favor elije estas solicitudes una a una, y <strong>haz que se sepa</strong>\n"
 "si han tenido éxito o no."
 
-msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature"
-msgstr "Por favor, firma con tu nombre en la parte inferior, o cambia la firma \"%{signoff}\""
+msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature"
+msgstr "Por favor, firma con tu nombre en la parte inferior, o cambia la firma \"{{signoff}}\""
 
 msgid "Please sign in as "
 msgstr "Por favor abre una sesión como "
diff --git a/locale/hu_HU/app.po b/locale/hu_HU/app.po
index bb8a079a1..c93c627d6 100644
--- a/locale/hu_HU/app.po
+++ b/locale/hu_HU/app.po
@@ -1630,8 +1630,8 @@ msgstr ""
 "Sorban jelölje ki az egyes igényléseket, és <strong>jelezze mindannyiunk számára,</strong>\n"
 "hogy ezek sikeresen lezárultak-e vagy sem. "
 
-msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature"
-msgstr "Kérjük, írja alá nevét a lap alján vagy módosítsa a \"%{signoff}\" aláírást "
+msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature"
+msgstr "Kérjük, írja alá nevét a lap alján vagy módosítsa a \"{{signoff}}\" aláírást "
 
 msgid "Please sign in as "
 msgstr "Jelentkezzen be mint "
diff --git a/locale/id/app.po b/locale/id/app.po
index 84d516045..643d2546b 100644
--- a/locale/id/app.po
+++ b/locale/id/app.po
@@ -1648,9 +1648,9 @@ msgstr ""
 "Silakan pilih masing-masing permintaan ini bergantian, dan <strong>biarkan semua orang tahu </strong>\n"
 "apakah mereka sudah berhasil atau belum."
 
-msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature"
+msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature"
 msgstr ""
-"Mohon tandatangani bagian bawah dengan nama Anda, atau ubah \"%{signoff}\" tanda tangan\n"
+"Mohon tandatangani bagian bawah dengan nama Anda, atau ubah \"{{signoff}}\" tanda tangan\n"
 "Silakan masuk sebagai "
 
 msgid "Please sign in as "
diff --git a/locale/nb_NO/app.po b/locale/nb_NO/app.po
index c744cd5d9..e34e943e7 100644
--- a/locale/nb_NO/app.po
+++ b/locale/nb_NO/app.po
@@ -1503,7 +1503,7 @@ msgstr ""
 msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
 msgstr ""
 
-msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature"
+msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature"
 msgstr ""
 
 msgid "Please sign in as "
diff --git a/locale/pt_BR/app.po b/locale/pt_BR/app.po
index 279d73d59..00b3b6b55 100644
--- a/locale/pt_BR/app.po
+++ b/locale/pt_BR/app.po
@@ -1551,8 +1551,8 @@ msgstr "Por favor, solicitar somente informações referentes às categorias do
 msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
 msgstr "Por favor, selecione uma solicitação por vez e <strong>deixe todo mundo saber</strong> se elas já são bem sucedidas ou não."
 
-msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature"
-msgstr "Por favor, assine com seu nome ao fim da mensagem, ou altere a sua \"%{signoff}\" assinatura"
+msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature"
+msgstr "Por favor, assine com seu nome ao fim da mensagem, ou altere a sua \"{{signoff}}\" assinatura"
 
 msgid "Please sign in as "
 msgstr "Faça o login como "
diff --git a/locale/ro_RO/app.po b/locale/ro_RO/app.po
index 7baab390b..9bd268b90 100644
--- a/locale/ro_RO/app.po
+++ b/locale/ro_RO/app.po
@@ -1510,7 +1510,7 @@ msgstr ""
 msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
 msgstr ""
 
-msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature"
+msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature"
 msgstr ""
 
 msgid "Please sign in as "
diff --git a/locale/sl/app.po b/locale/sl/app.po
index f9719148e..cb16b99c5 100644
--- a/locale/sl/app.po
+++ b/locale/sl/app.po
@@ -1513,7 +1513,7 @@ msgstr ""
 msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
 msgstr ""
 
-msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature"
+msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature"
 msgstr ""
 
 msgid "Please sign in as "
diff --git a/locale/sq/app.po b/locale/sq/app.po
index 737472b43..484985c2b 100644
--- a/locale/sq/app.po
+++ b/locale/sq/app.po
@@ -1605,8 +1605,8 @@ msgstr ""
 "Të lutem selektoi të gjitha kërkesat një pas një, dhe <strong>bëje të njohur për të gjithë</strong>\n"
 "nëse kanë qenë të suksesshme deri tash apo jo."
 
-msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature"
-msgstr "Te lutem nënshkruaj në fund me emrin tënd, ose ndrysho \"% {signoff}\" nënshkrimin"
+msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature"
+msgstr "Te lutem nënshkruaj në fund me emrin tënd, ose ndrysho \"{{signoff}}\" nënshkrimin"
 
 msgid "Please sign in as "
 msgstr "Të lutem kyçu si "
diff --git a/locale/sr@latin/app.po b/locale/sr@latin/app.po
index 3b547c2f4..f18b91fb1 100644
--- a/locale/sr@latin/app.po
+++ b/locale/sr@latin/app.po
@@ -1611,8 +1611,8 @@ msgstr ""
 "Molimo odaberite svaki od ovih zahteva naizmjenice, i <strong>obavestite sve</strong>\n"
 "da li su bili uspešni ili ne."
 
-msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature"
-msgstr "Molimo da se na dnu potpišete, ili izmijenite  \"%{signoff}\" potpis"
+msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature"
+msgstr "Molimo da se na dnu potpišete, ili izmijenite  \"{{signoff}}\" potpis"
 
 msgid "Please sign in as "
 msgstr "Molimo prijavite se kao "
diff --git a/locale/tr/app.po b/locale/tr/app.po
index 653be6b11..2bef868f3 100644
--- a/locale/tr/app.po
+++ b/locale/tr/app.po
@@ -1499,7 +1499,7 @@ msgstr ""
 msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
 msgstr ""
 
-msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature"
+msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature"
 msgstr ""
 
 msgid "Please sign in as "
diff --git a/locale/uk/app.po b/locale/uk/app.po
index 5cc517b56..e04b43720 100644
--- a/locale/uk/app.po
+++ b/locale/uk/app.po
@@ -1617,7 +1617,7 @@ msgstr ""
 msgid "Please select each of these requests in turn, and <strong>let everyone know</strong>\\nif they are successful yet or not."
 msgstr ""
 
-msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature"
+msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature"
 msgstr ""
 
 msgid "Please sign in as "
diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po
index d162b71f6..491d606d2 100644
--- a/spec/fixtures/locale/en/app.po
+++ b/spec/fixtures/locale/en/app.po
@@ -1984,7 +1984,7 @@ msgid ""
 msgstr ""
 
 #: app/models/outgoing_message.rb:157
-msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature"
+msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature"
 msgstr ""
 
 #: app/views/user/sign.rhtml:8
diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po
index 3297ecbd9..31fbe777b 100644
--- a/spec/fixtures/locale/en_GB/app.po
+++ b/spec/fixtures/locale/en_GB/app.po
@@ -1984,7 +1984,7 @@ msgid ""
 msgstr ""
 
 #: app/models/outgoing_message.rb:157
-msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature"
+msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature"
 msgstr ""
 
 #: app/views/user/sign.rhtml:8
diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po
index 33df65bd9..417cfd75a 100644
--- a/spec/fixtures/locale/es/app.po
+++ b/spec/fixtures/locale/es/app.po
@@ -2146,10 +2146,8 @@ msgid ""
 msgstr "Por favor elije estas solicitudes una a una, y <strong>haz que se sepa</strong>\nsi han tenido éxito o no."
 
 #: app/models/outgoing_message.rb:157
-msgid ""
-"Please sign at the bottom with your name, or alter the \"%{signoff}\" "
-"signature"
-msgstr "Por favor, firma con tu nombre en la parte inferior, o cambia la firma \"%{signoff}\""
+msgid "Please sign at the bottom with your name, or alter the \"{{signoff}}\" signature"
+msgstr "Por favor, firma con tu nombre en la parte inferior, o cambia la firma \"{{signoff}}\""
 
 #: app/views/user/sign.rhtml:8
 msgid "Please sign in as "