28 files changed, 42 insertions, 44 deletions
diff --git a/app/models/profile_photo.rb b/app/models/profile_photo.rb
index 6e605651d..bcb0390b5 100644
--- a/app/models/profile_photo.rb
+++ b/app/models/profile_photo.rb
@@ -97,7 +97,7 @@ class ProfilePhoto < ActiveRecord::Base
         end
 
         if !self.draft && (self.image.columns != WIDTH || self.image.rows != HEIGHT)
-            errors.add(:data, N_("Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}" % { :cols => self.image.columns, :rows => self.image.rows, :width => WIDTH, :height => HEIGHT }))
+            errors.add(:data, _("Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}", :cols => self.image.columns, :rows => self.image.rows, :width => WIDTH, :height => HEIGHT))
         end
 
         if self.draft && self.user_id
diff --git a/locale/aln/app.po b/locale/aln/app.po
index 6cea7e9b1..ab356c4f0 100644
--- a/locale/aln/app.po
+++ b/locale/aln/app.po
@@ -719,7 +719,7 @@ msgstr ""
 msgid "Failed to convert image to a PNG"
 msgstr ""
 
-msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}"
+msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
 msgstr ""
 
 msgid "Filter"
diff --git a/locale/app.pot b/locale/app.pot
index ac5bd123b..ab407ebd4 100644
--- a/locale/app.pot
+++ b/locale/app.pot
@@ -717,7 +717,7 @@ msgstr ""
 msgid "Failed to convert image to a PNG"
 msgstr ""
 
-msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}"
+msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
 msgstr ""
 
 msgid "Filter"
diff --git a/locale/ar/app.po b/locale/ar/app.po
index 53f2ea1db..d4a2ea753 100644
--- a/locale/ar/app.po
+++ b/locale/ar/app.po
@@ -735,7 +735,7 @@ msgstr ""
 msgid "Failed to convert image to a PNG"
 msgstr ""
 
-msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}"
+msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
 msgstr ""
 
 msgid "Filter"
diff --git a/locale/bs/app.po b/locale/bs/app.po
index f97d9f1b5..39c222c0e 100644
--- a/locale/bs/app.po
+++ b/locale/bs/app.po
@@ -778,8 +778,8 @@ msgstr ""
 msgid "Failed to convert image to a PNG"
 msgstr "Nismo uspjeli konvertovati sliku u PNG format"
 
-msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}"
-msgstr "Nismo uspjeli konvertovati sliku u odgovarajuću veličinu:  %{cols}x%{rows}, potrebno %{width}x%{height}"
+msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
+msgstr "Nismo uspjeli konvertovati sliku u odgovarajuću veličinu:  {{cols}}x{{rows}}, potrebno {{width}}x{{height}}"
 
 msgid "Filter"
 msgstr "Filtriraj"
diff --git a/locale/ca/app.po b/locale/ca/app.po
index e2d5c512f..0daf1c6c5 100644
--- a/locale/ca/app.po
+++ b/locale/ca/app.po
@@ -789,8 +789,8 @@ msgstr ""
 msgid "Failed to convert image to a PNG"
 msgstr "Error al convertir la imagen a PNG"
 
-msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}"
-msgstr "Error al convertir la imagen al tamaño adecuado: es %{cols}x%{rows}, debería ser %{width}x%{height}"
+msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
+msgstr "Error al convertir la imagen al tamaño adecuado: es {{cols}}x{{rows}}, debería ser {{width}}x{{height}}"
 
 msgid "Filter"
 msgstr "Filtrar"
diff --git a/locale/cs/app.po b/locale/cs/app.po
index 5df8b815e..fddc4e4fc 100644
--- a/locale/cs/app.po
+++ b/locale/cs/app.po
@@ -789,8 +789,8 @@ msgstr "Odpověď vyžaduje zásah administrátora -  ({{reason}}) - {{title}}"
 msgid "Failed to convert image to a PNG"
 msgstr "Nepodařilo se konvertovat obrázek do PNG. "
 
-msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}"
-msgstr "Nepodařilo se konvertovat obrázek do správné velikosti: at %{cols}x%{rows}, need %{width}x%{height}"
+msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
+msgstr "Nepodařilo se konvertovat obrázek do správné velikosti: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
 
 msgid "Filter"
 msgstr "Filtr"
diff --git a/locale/cy/app.po b/locale/cy/app.po
index 3651c3b77..669e07494 100644
--- a/locale/cy/app.po
+++ b/locale/cy/app.po
@@ -728,7 +728,7 @@ msgstr ""
 msgid "Failed to convert image to a PNG"
 msgstr ""
 
-msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}"
+msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
 msgstr ""
 
 msgid "Filter"
diff --git a/locale/de/app.po b/locale/de/app.po
index 76f6e2af7..84fe3c650 100644
--- a/locale/de/app.po
+++ b/locale/de/app.po
@@ -760,8 +760,8 @@ msgstr ""
 msgid "Failed to convert image to a PNG"
 msgstr "Konnte Bild nicht in ein PNG konvertieren"
 
-msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}"
-msgstr "Konnte Bild nicht in die richtige Größe umwandeln: %{cols} x %{rows}, brauche %{width} x %{height}"
+msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
+msgstr "Konnte Bild nicht in die richtige Größe umwandeln: {{cols}} x {{rows}}, brauche {{width}} x {{height}}"
 
 msgid "Filter"
 msgstr ""
diff --git a/locale/en/app.po b/locale/en/app.po
index 0ebba2200..bdfdcefd5 100644
--- a/locale/en/app.po
+++ b/locale/en/app.po
@@ -718,7 +718,7 @@ msgstr ""
 msgid "Failed to convert image to a PNG"
 msgstr ""
 
-msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}"
+msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
 msgstr ""
 
 msgid "Filter"
diff --git a/locale/en_IE/app.po b/locale/en_IE/app.po
index 9739b00d5..beaf94fd6 100644
--- a/locale/en_IE/app.po
+++ b/locale/en_IE/app.po
@@ -720,7 +720,7 @@ msgstr ""
 msgid "Failed to convert image to a PNG"
 msgstr ""
 
-msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}"
+msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
 msgstr ""
 
 msgid "Filter"
diff --git a/locale/es/app.po b/locale/es/app.po
index a91095c85..378871742 100644
--- a/locale/es/app.po
+++ b/locale/es/app.po
@@ -809,8 +809,8 @@ msgstr "El pedido de acceso requiere del administrador ({{reason}}) - {{title}}"
 msgid "Failed to convert image to a PNG"
 msgstr "Error al convertir la imagen a PNG"
 
-msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}"
-msgstr "Error al convertir la imagen al tamaño adecuado: es %{cols}x%{rows}, debería ser %{width}x%{height}"
+msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
+msgstr "Error al convertir la imagen al tamaño adecuado: es {{cols}}x{{rows}}, debería ser {{width}}x{{height}}"
 
 msgid "Filter"
 msgstr "Filtrar"
diff --git a/locale/eu/app.po b/locale/eu/app.po
index 9c8fcf797..6da6d150d 100644
--- a/locale/eu/app.po
+++ b/locale/eu/app.po
@@ -752,8 +752,8 @@ msgstr ""
 msgid "Failed to convert image to a PNG"
 msgstr "Irudia PNG formatura bihurtzean huts egin da"
 
-msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}"
-msgstr "Irudia behar bezalako tamainera bihurtzean huts egin da:: %{cols}x%{rows} da, %{width}x%{height} izan beharko luke."
+msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
+msgstr "Irudia behar bezalako tamainera bihurtzean huts egin da:: {{cols}}x{{rows}} da, {{width}}x{{height}} izan beharko luke."
 
 msgid "Filter"
 msgstr "Iragazi"
diff --git a/locale/fr/app.po b/locale/fr/app.po
index 0c63d888d..e90d161a3 100644
--- a/locale/fr/app.po
+++ b/locale/fr/app.po
@@ -728,8 +728,8 @@ msgstr ""
 msgid "Failed to convert image to a PNG"
 msgstr "Nous n'avons pas pu convertir l'image au format PNG."
 
-msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}"
-msgstr "Nous n'avons pas pu changer les dimensions de l'image: at %{cols}x%{rows}, need %{width}x%{height}"
+msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
+msgstr "Nous n'avons pas pu changer les dimensions de l'image: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
 
 msgid "Filter"
 msgstr ""
diff --git a/locale/gl/app.po b/locale/gl/app.po
index 9f3543a6e..067ceff3c 100644
--- a/locale/gl/app.po
+++ b/locale/gl/app.po
@@ -790,8 +790,8 @@ msgstr ""
 msgid "Failed to convert image to a PNG"
 msgstr "Error al convertir la imagen a PNG"
 
-msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}"
-msgstr "Error al convertir la imagen al tamaño adecuado: es %{cols}x%{rows}, debería ser %{width}x%{height}"
+msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
+msgstr "Error al convertir la imagen al tamaño adecuado: es {{cols}}x{{rows}}, debería ser {{width}}x{{height}}"
 
 msgid "Filter"
 msgstr "Filtrar"
diff --git a/locale/hu_HU/app.po b/locale/hu_HU/app.po
index e42ddb38c..59220933a 100644
--- a/locale/hu_HU/app.po
+++ b/locale/hu_HU/app.po
@@ -779,8 +779,8 @@ msgstr ""
 msgid "Failed to convert image to a PNG"
 msgstr "Nem sikerült a kép PNG formátumba való átalakítása "
 
-msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}"
-msgstr "Nem sikerült a képet a megfelelő méretre alakítani: %{cols}x%{rows} esetén: %{width}x%{height} "
+msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
+msgstr "Nem sikerült a képet a megfelelő méretre alakítani: {{cols}}x{{rows}} esetén: {{width}}x{{height}} "
 
 msgid "Filter"
 msgstr "Szűrő"
diff --git a/locale/id/app.po b/locale/id/app.po
index beca416f7..22588c210 100644
--- a/locale/id/app.po
+++ b/locale/id/app.po
@@ -802,8 +802,8 @@ msgstr "Jawaban permintaan membutuhkan {{{reason}}} - {{title}}"
 msgid "Failed to convert image to a PNG"
 msgstr "Failed to convert image to a PNG"
 
-msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}"
-msgstr "Tidak berhasil mengubah gambar ke ukuran yang tepat: pada %{cols}x%{rows}, need %{width}x%{height}"
+msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
+msgstr "Tidak berhasil mengubah gambar ke ukuran yang tepat: pada {{cols}}x{{rows}}, need {{width}}x{{height}}"
 
 msgid "Filter"
 msgstr "Filter"
diff --git a/locale/nb_NO/app.po b/locale/nb_NO/app.po
index 0993c926e..5bc5f9192 100644
--- a/locale/nb_NO/app.po
+++ b/locale/nb_NO/app.po
@@ -718,7 +718,7 @@ msgstr ""
 msgid "Failed to convert image to a PNG"
 msgstr ""
 
-msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}"
+msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
 msgstr ""
 
 msgid "Filter"
diff --git a/locale/pt_BR/app.po b/locale/pt_BR/app.po
index 9191179fa..598f77971 100644
--- a/locale/pt_BR/app.po
+++ b/locale/pt_BR/app.po
@@ -755,8 +755,8 @@ msgstr ""
 msgid "Failed to convert image to a PNG"
 msgstr "Erro ao converter a imagem para PNG"
 
-msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}"
-msgstr "Erro ao tentar converter a imagem para o tamanho correto: no %{colunas} x% {linhas}, precisa de um % {largura} x%{altura}"
+msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
+msgstr "Erro ao tentar converter a imagem para o tamanho correto: no {{cols}}x{{rows}, precisa de um {{width}x{{height}}"
 
 msgid "Filter"
 msgstr "Filtro"
diff --git a/locale/ro_RO/app.po b/locale/ro_RO/app.po
index 1e101738b..ba8f0540e 100644
--- a/locale/ro_RO/app.po
+++ b/locale/ro_RO/app.po
@@ -724,7 +724,7 @@ msgstr ""
 msgid "Failed to convert image to a PNG"
 msgstr "Eroare la convertirea imaginii in PNG"
 
-msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}"
+msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
 msgstr ""
 
 msgid "Filter"
diff --git a/locale/sl/app.po b/locale/sl/app.po
index e67b27be5..837cbc97b 100644
--- a/locale/sl/app.po
+++ b/locale/sl/app.po
@@ -726,7 +726,7 @@ msgstr ""
 msgid "Failed to convert image to a PNG"
 msgstr ""
 
-msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}"
+msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
 msgstr ""
 
 msgid "Filter"
diff --git a/locale/sq/app.po b/locale/sq/app.po
index 3ab2bae38..84de5ada4 100644
--- a/locale/sq/app.po
+++ b/locale/sq/app.po
@@ -779,8 +779,8 @@ msgstr ""
 msgid "Failed to convert image to a PNG"
 msgstr "Konvertimi i imazhit në PNG dështoi"
 
-msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}"
-msgstr "Konvertimi i imazhit në madhësinë adekuate dështoi: në %{cols}x%{rows}, duhet %{width}x%{height}"
+msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
+msgstr "Konvertimi i imazhit në madhësinë adekuate dështoi: në {{cols}}x{{rows}}, duhet {{width}}x{{height}}"
 
 msgid "Filter"
 msgstr "Filtro"
diff --git a/locale/sr@latin/app.po b/locale/sr@latin/app.po
index 5ca307245..e71b76a96 100644
--- a/locale/sr@latin/app.po
+++ b/locale/sr@latin/app.po
@@ -774,8 +774,8 @@ msgstr ""
 msgid "Failed to convert image to a PNG"
 msgstr "Nismo uspeli konvertovati sliku u PNG format"
 
-msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}"
-msgstr "Nismo uspeli konvertovati sliku u odgovarajuću veličinu:  %{cols}x%{rows}, potrebno %{width}x%{height}"
+msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
+msgstr "Nismo uspeli konvertovati sliku u odgovarajuću veličinu:  {{cols}}x{{rows}}, potrebno {{width}}x{{height}}"
 
 msgid "Filter"
 msgstr "Filtriraj"
diff --git a/locale/tr/app.po b/locale/tr/app.po
index cf33b1d6c..6d32db6bd 100644
--- a/locale/tr/app.po
+++ b/locale/tr/app.po
@@ -715,7 +715,7 @@ msgstr ""
 msgid "Failed to convert image to a PNG"
 msgstr ""
 
-msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}"
+msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
 msgstr ""
 
 msgid "Filter"
diff --git a/locale/uk/app.po b/locale/uk/app.po
index 7e0b326f1..a745fbf76 100644
--- a/locale/uk/app.po
+++ b/locale/uk/app.po
@@ -790,7 +790,7 @@ msgstr ""
 msgid "Failed to convert image to a PNG"
 msgstr "Не вдалося конвертувати зображення в PNG"
 
-msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}"
+msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
 msgstr ""
 
 msgid "Filter"
diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po
index 06fae9a81..915d80df8 100644
--- a/spec/fixtures/locale/en/app.po
+++ b/spec/fixtures/locale/en/app.po
@@ -1001,7 +1001,7 @@ msgid "Failed to convert image to a PNG"
 msgstr ""
 
 #: app/models/profile_photo.rb:105
-msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}"
+msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
 msgstr ""
 
 #: app/views/general/search.rhtml:117
diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po
index 06fae9a81..915d80df8 100644
--- a/spec/fixtures/locale/en_GB/app.po
+++ b/spec/fixtures/locale/en_GB/app.po
@@ -1001,7 +1001,7 @@ msgid "Failed to convert image to a PNG"
 msgstr ""
 
 #: app/models/profile_photo.rb:105
-msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}"
+msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
 msgstr ""
 
 #: app/views/general/search.rhtml:117
diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po
index 626e39e94..bb49e0ff6 100644
--- a/spec/fixtures/locale/es/app.po
+++ b/spec/fixtures/locale/es/app.po
@@ -1117,10 +1117,8 @@ msgid "Failed to convert image to a PNG"
 msgstr "Error al convertir la imagen a PNG"
 
 #: app/models/profile_photo.rb:105
-msgid ""
-"Failed to convert image to the correct size: at %{cols}x%{rows}, need "
-"%{width}x%{height}"
-msgstr "Error al convertir la imagen al tamaño adecuado: es %{cols}x%{rows}, debería ser %{width}x%{height}"
+msgid "Failed to convert image to the correct size: at {{cols}}x{{rows}}, need {{width}}x{{height}}"
+msgstr "Error al convertir la imagen al tamaño adecuado: es {{cols}}x{{rows}}, debería ser {{width}}x{{height}}"
 
 #: app/views/general/search.rhtml:117
 msgid "Filter"