gnome-control-center/bugfix-fix_used_passwd_error_capture.patch

41 lines
2.6 KiB
Diff
Raw Normal View History

diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c
2022-06-09 11:53:41 +08:00
index 86f53d4..14230c8 100644
--- a/panels/user-accounts/run-passwd.c
+++ b/panels/user-accounts/run-passwd.c
2022-06-09 11:53:41 +08:00
@@ -458,7 +458,7 @@ io_watch_stdout (GIOChannel *source, GIOCondition condition, PasswdHandler *pass
2019-12-29 16:48:42 +08:00
"different",
"wrapped",
"recovered",
- "recent",
2022-06-09 11:53:41 +08:00
+ "already used",
2019-12-29 16:48:42 +08:00
"unchanged",
"match",
"1 numeric or special",
2022-06-09 11:53:41 +08:00
@@ -502,9 +502,9 @@ io_watch_stdout (GIOChannel *source, GIOCondition condition, PasswdHandler *pass
2019-12-29 16:48:42 +08:00
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
2022-06-09 11:53:41 +08:00
index f811497..1e1984e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
2022-06-09 11:53:41 +08:00
@@ -7738,8 +7738,8 @@ msgstr "新密码和旧密码太相似"
2019-12-29 16:48:42 +08:00
2022-06-09 11:53:41 +08:00
#: panels/user-accounts/run-passwd.c:507
2019-12-29 16:48:42 +08:00
#, c-format
-msgid "The new password has already been used recently."
-msgstr "新的密码最近已使用过。"
+msgid "Password has been already used. Choose another."
+msgstr "新密码在最近已经使用过。请选用其他密码"
2022-06-09 11:53:41 +08:00
#: panels/user-accounts/run-passwd.c:510
2019-12-29 16:48:42 +08:00
#, c-format