Merge branch 'release/0.9'0.9

Conflicts:
    locale/cs/app.po
    locale/he_IL/app.po
    locale/id/app.po
    locale/it/app.po
    locale/ro_RO/app.po
    locale/uk/app.po

1 files changed, 1 insertions, 1 deletions

diff --git a/app/models/profile_photo.rb b/app/models/profile_photo.rb
index 73d7ca12b..f6aec6338 100644
--- a/app/models/profile_photo.rb
+++ b/app/models/profile_photo.rb
@@ -101,7 +101,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, 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))
         end
 
         if self.draft && self.user_id