325e98186d
Update Version, Release, BuildRequires, stage 'files' Delete 4 patches, modify the left 6 patches
41 lines
2.5 KiB
Diff
41 lines
2.5 KiB
Diff
diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c
|
|
index 56eea9f..1abefcd 100644
|
|
--- a/panels/user-accounts/run-passwd.c
|
|
+++ b/panels/user-accounts/run-passwd.c
|
|
@@ -471,7 +471,7 @@ io_watch_stdout (GIOChannel *source, GIOCondition condition, PasswdHandler *pass
|
|
"different",
|
|
"wrapped",
|
|
"recovered",
|
|
- "recent",
|
|
+ "already used",
|
|
"unchanged",
|
|
"match",
|
|
"1 numeric or special",
|
|
@@ -514,9 +514,9 @@ io_watch_stdout (GIOChannel *source, GIOCondition condition, PasswdHandler *pass
|
|
strstr (str->str, "wrapped") != NULL) {
|
|
error = g_error_new (PASSWD_ERROR, PASSWD_ERROR_REJECTED,
|
|
_("The old and new passwords are too similar"));
|
|
- } else if (strstr (str->str, "recent") != NULL) {
|
|
+ } else if (strstr (str->str, "already used") != NULL) {
|
|
error = g_error_new (PASSWD_ERROR, PASSWD_ERROR_REJECTED,
|
|
- _("The new password has already been used recently."));
|
|
+ _("Password has been already used. Choose another."));
|
|
} else if (strstr (str->str, "1 numeric or special") != NULL) {
|
|
error = g_error_new (PASSWD_ERROR, PASSWD_ERROR_REJECTED,
|
|
_("The new password must contain numeric or special characters"));
|
|
diff --git a/po/zh_CN.po b/po/zh_CN.po
|
|
index ba8a7a8..03540dd 100644
|
|
--- a/po/zh_CN.po
|
|
+++ b/po/zh_CN.po
|
|
@@ -7642,8 +7642,8 @@ msgstr "新密码和旧密码太相似"
|
|
|
|
#: panels/user-accounts/run-passwd.c:519
|
|
#, c-format
|
|
-msgid "The new password has already been used recently."
|
|
-msgstr "新的密码最近已使用过。"
|
|
+msgid "Password has been already used. Choose another."
|
|
+msgstr "新密码在最近已经使用过。请选用其他密码"
|
|
|
|
#: panels/user-accounts/run-passwd.c:522
|
|
#, c-format
|