diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index 8253291..679aee3 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -95,7 +95,7 @@ class MyController < ApplicationController
       if !@user.check_password?(params[:password])
         flash.now[:error] = l(:notice_account_wrong_password)
       elsif params[:password] == params[:new_password]
-        flash.now[:error] = 'Your new password must be different from your current password'
+        flash.now[:error] = l(:notice_new_password_must_be_different)
       else
         @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
         @user.must_change_passwd = false
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 5730bc0..68712ce 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1097,3 +1097,5 @@ ar:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/az.yml b/config/locales/az.yml
index 45ad750..fa6f778 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -1194,3 +1194,5 @@ az:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 7318090..1111638 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1095,3 +1095,5 @@ bg:
   description_date_to: Въведете крайна дата
   text_repository_identifier_info: 'Позволени са малки букви (a-z), цифри, тирета и _.<br />Промяна след създаването му не е възможна.'
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 859f13d..21da6a1 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1110,3 +1110,5 @@ bs:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 1df7a6e..5c75bc2 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1099,3 +1099,5 @@ ca:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index a1c394b..0dc0602 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1101,3 +1101,5 @@ cs:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 66488da..f364dca 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1114,3 +1114,5 @@ da:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/de.yml b/config/locales/de.yml
index d56cf90..04d0cf1 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1109,3 +1109,5 @@ de:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/el.yml b/config/locales/el.yml
index be77c67..afe27fb 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -1097,3 +1097,5 @@ el:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 8d9efbc..f8dc8f5 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1099,3 +1099,5 @@ en-GB:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e63a724..6db1262 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -181,6 +181,7 @@ en:
   notice_issue_update_conflict: "The issue has been updated by an other user while you were editing it."
   notice_account_deleted: "Your account has been permanently deleted."
   notice_user_successful_create: "User %{id} created."
+  notice_new_password_must_be_different: The new password must be different from the current password
 
   error_can_t_load_default_data: "Default configuration could not be loaded: %{value}"
   error_scm_not_found: "The entry or revision was not found in the repository."
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 7c57fc3..7b54d36 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1133,3 +1133,5 @@ es:
   label_visibility_roles: solamente para estos roles
   label_visibility_public: para cualquier usuario
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 05f2db6..032f2ef 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1110,3 +1110,5 @@ et:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index e7de3cc..97d1aa2 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1098,3 +1098,5 @@ eu:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index edc9afd..51d8aa9 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1099,3 +1099,5 @@ fa:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 36b8982..bcd08e3 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1118,3 +1118,5 @@ fi:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index c2e72c4..71d4f77 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -196,6 +196,7 @@ fr:
   notice_issue_update_conflict: "La demande a été mise à jour par un autre utilisateur pendant que vous la modifiez."
   notice_account_deleted: "Votre compte a été définitivement supprimé."
   notice_user_successful_create: "Utilisateur %{id} créé."
+  notice_new_password_must_be_different: Votre nouveau mot de passe doit être différent de votre mot de passe actuel
 
   error_can_t_load_default_data: "Une erreur s'est produite lors du chargement du paramétrage : %{value}"
   error_scm_not_found: "L'entrée et/ou la révision demandée n'existe pas dans le dépôt."
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 06bbb71..a9d802d 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1108,3 +1108,5 @@ gl:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 0740e58..e3e6a1b 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1102,3 +1102,5 @@ he:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 08851db..a0eaac8 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -1098,3 +1098,5 @@ hr:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 491b503..e687920 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1116,3 +1116,5 @@
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 315912b..a96442d 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1101,3 +1101,5 @@ id:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/it.yml b/config/locales/it.yml
index ce0b681..4c11743 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1096,3 +1096,5 @@ it:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index dd2f364..f93f9c6 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1125,3 +1125,5 @@ ja:
   label_visibility_roles: 以下のロールのみ
   label_visibility_public: すべてのユーザー
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index ad48d94..268ec87 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1146,3 +1146,5 @@ ko:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 66235cf..7876599 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1156,3 +1156,5 @@ lt:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index e8f7d3f..e326091 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1091,3 +1091,5 @@ lv:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 48703b7..fa4a6fc 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -1097,3 +1097,5 @@ mk:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/mn.yml b/config/locales/mn.yml
index f709708..a363be0 100644
--- a/config/locales/mn.yml
+++ b/config/locales/mn.yml
@@ -1098,3 +1098,5 @@ mn:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 7c71b55..218c8aa 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1079,3 +1079,5 @@ nl:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/no.yml b/config/locales/no.yml
index dfdc134..04b94bc 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -1087,3 +1087,5 @@
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 9fe5efb..89d0837 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1119,3 +1119,5 @@ pl:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index a36a629..6ecd508 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1117,3 +1117,5 @@ pt-BR:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 6a68139..9cec4b7 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -1104,3 +1104,5 @@ pt:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 229c66f..153f883 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -1092,3 +1092,5 @@ ro:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 3402d39..c7a538c 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1207,3 +1207,5 @@ ru:
   label_visibility_roles: только этим ролям
   label_visibility_public: всем пользователям
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 2121b2f..0c727af 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1094,3 +1094,5 @@ sk:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 6360195..bb2e649 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1097,3 +1097,5 @@ sl:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 258e3d3..acdc343 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1093,3 +1093,5 @@ sq:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml
index bddd03c..b409c47 100644
--- a/config/locales/sr-YU.yml
+++ b/config/locales/sr-YU.yml
@@ -1099,3 +1099,5 @@ sr-YU:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 5aa80e3..f28c45f 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1098,3 +1098,5 @@ sr:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 3081fc4..0ff567f 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1135,3 +1135,5 @@ sv:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 974d248..ada3f15 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1094,3 +1094,5 @@ th:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index dc7c83d..29d0733 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1116,3 +1116,5 @@ tr:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 96bb019..44eb00b 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1092,3 +1092,5 @@ uk:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 50437d8..e88d7b2 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1150,3 +1150,5 @@ vi:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 4e304a9..24fb783 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1178,3 +1178,5 @@
   description_date_to: 輸入結束日期
   text_repository_identifier_info: '僅允許使用小寫英文字母 (a-z), 阿拉伯數字, 虛線與底線。<br />一旦儲存之後, 代碼便無法再次被更改。'
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index c120c59..ca58fd2 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1101,3 +1101,5 @@ zh:
   label_visibility_roles: to these roles only
   label_visibility_public: to any users
   field_must_change_passwd: Must change password at next logon
+  notice_new_password_must_be_different: The new password must be different from the
+    current password