From: Dmitry V. Levin Date: Fri, 22 Jun 2018 10:21:22 +0000 (+0000) Subject: pam_tally, pam_tally2: fix grammar and spelling (#54) X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=955b3e2f100205be2db4358e9c812de2ae453b8e;p=linux-pam pam_tally, pam_tally2: fix grammar and spelling (#54) * modules/pam_tally/pam_tally.c (tally_check): Replace "Account is temporary locked" with "The account is temporarily locked" in translated messages. * modules/pam_tally2/pam_tally2.c (tally_check): Likewise. * po/Linux-PAM.pot: Update pam_tally and pam_tally2 messages. Closes: https://github.com/linux-pam/linux-pam/issues/54 --- diff --git a/modules/pam_tally/pam_tally.c b/modules/pam_tally/pam_tally.c index 0e51693c..aa3b6ecd 100644 --- a/modules/pam_tally/pam_tally.c +++ b/modules/pam_tally/pam_tally.c @@ -538,7 +538,7 @@ tally_check (time_t oldtime, pam_handle_t *pamh, uid_t uid, { if (!(opts->ctrl & OPT_SILENT)) pam_info (pamh, - _("Account is temporary locked (%ld seconds left)."), + _("The account is temporarily locked (%ld seconds left)."), oldtime+lock_time-time(NULL)); if (!(opts->ctrl & OPT_NOLOGNOTICE)) @@ -563,7 +563,7 @@ tally_check (time_t oldtime, pam_handle_t *pamh, uid_t uid, ( ((opts->ctrl & OPT_DENY_ROOT) || uid) ) /* even_deny stops uid check */ ) { if (!(opts->ctrl & OPT_SILENT)) - pam_info (pamh, _("Account is locked due to %u failed logins."), + pam_info (pamh, _("The account is locked due to %u failed logins."), (unsigned int)tally); if (!(opts->ctrl & OPT_NOLOGNOTICE)) diff --git a/modules/pam_tally2/pam_tally2.c b/modules/pam_tally2/pam_tally2.c index 9a24d881..984edf6a 100644 --- a/modules/pam_tally2/pam_tally2.c +++ b/modules/pam_tally2/pam_tally2.c @@ -577,7 +577,7 @@ tally_check (tally_t oldcnt, time_t oldtime, pam_handle_t *pamh, uid_t uid, #endif if (!(opts->ctrl & OPT_QUIET)) { - pam_info(pamh, _("Account is locked due to %u failed logins."), + pam_info(pamh, _("The account is locked due to %u failed logins."), (unsigned int)tally->fail_cnt); } loglevel = LOG_NOTICE; @@ -594,7 +594,7 @@ tally_check (tally_t oldcnt, time_t oldtime, pam_handle_t *pamh, uid_t uid, tally->fail_time = oldtime; if (!(opts->ctrl & OPT_QUIET)) { - pam_info(pamh, _("Account is temporary locked (%ld seconds left)."), + pam_info(pamh, _("The account is temporarily locked (%ld seconds left)."), oldtime+opts->lock_time-time(NULL)); } if (!(opts->ctrl & OPT_NOLOGNOTICE)) { diff --git a/po/Linux-PAM.pot b/po/Linux-PAM.pot index 25a59788..91178042 100644 --- a/po/Linux-PAM.pot +++ b/po/Linux-PAM.pot @@ -442,12 +442,12 @@ msgstr "" #: modules/pam_tally/pam_tally.c:541 modules/pam_tally2/pam_tally2.c:597 #, c-format -msgid "Account is temporary locked (%ld seconds left)." +msgid "The account is temporarily locked (%ld seconds left)." msgstr "" #: modules/pam_tally/pam_tally.c:566 modules/pam_tally2/pam_tally2.c:580 #, c-format -msgid "Account is locked due to %u failed logins." +msgid "The account is locked due to %u failed logins." msgstr "" #: modules/pam_tally/pam_tally.c:750 modules/pam_tally2/pam_tally2.c:863