10:14 p.m.
Some of prompts issued directly or indirectly by pam_unix that start
with a capital letter are finished with a dot, some are not.
Fix this grammatical inconsistency by changing all these prompts
to finish with a dot.
* modules/pam_cracklib/pam_cracklib.c (_pam_unix_approve_pass):
Harmonize prompts.
* modules/pam_unix/pam_unix_acct.c (pam_sm_acct_mgmt): Likewise.
* modules/pam_unix/pam_unix_passwd.c (_pam_unix_approve_pass,
pam_sm_chauthtok): Likewise.
* po/Linux-PAM.pot: Regenerate.
---
modules/pam_cracklib/pam_cracklib.c | 2 +-
modules/pam_unix/pam_unix_acct.c | 16 ++++++++--------
modules/pam_unix/pam_unix_passwd.c | 6 +++---
po/Linux-PAM.pot | 22 +++++++++++-----------
4 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/modules/pam_cracklib/pam_cracklib.c b/modules/pam_cracklib/pam_cracklib.c
index 45c02ab..840ee1f 100644
--- a/modules/pam_cracklib/pam_cracklib.c
+++ b/modules/pam_cracklib/pam_cracklib.c
@@ -692,7 +692,7 @@ static int _pam_unix_approve_pass(pam_handle_t *pamh,
if (ctrl & PAM_DEBUG_ARG)
pam_syslog(pamh, LOG_DEBUG, "bad authentication token");
pam_error(pamh, "%s", pass_new == NULL ?
- _("No password supplied"):_("Password unchanged"));
+ _("No password supplied."):_("Password unchanged."));
return PAM_AUTHTOK_ERR;
}
diff --git a/modules/pam_unix/pam_unix_acct.c b/modules/pam_unix/pam_unix_acct.c
index 8833114..fbc84e2 100644
--- a/modules/pam_unix/pam_unix_acct.c
+++ b/modules/pam_unix/pam_unix_acct.c
@@ -250,7 +250,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc, const char
**argv)
"account %s has expired (account expired)",
uname);
_make_remark(pamh, ctrl, PAM_ERROR_MSG,
- _("Your account has expired; please contact your system administrator"));
+ _("Your account has expired; please contact your system administrator."));
break;
case PAM_NEW_AUTHTOK_REQD:
if (daysleft == 0) {
@@ -258,13 +258,13 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc, const char
**argv)
"expired password for user %s (root enforced)",
uname);
_make_remark(pamh, ctrl, PAM_ERROR_MSG,
- _("You are required to change your password immediately (administrator
enforced)"));
+ _("You are required to change your password immediately (administrator
enforced)."));
} else {
pam_syslog(pamh, LOG_DEBUG,
"expired password for user %s (password aged)",
uname);
_make_remark(pamh, ctrl, PAM_ERROR_MSG,
- _("You are required to change your password immediately (password
expired)"));
+ _("You are required to change your password immediately (password
expired)."));
}
break;
case PAM_AUTHTOK_EXPIRED:
@@ -272,7 +272,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc, const char
**argv)
"account %s has expired (failed to change password)",
uname);
_make_remark(pamh, ctrl, PAM_ERROR_MSG,
- _("Your account has expired; please contact your system administrator"));
+ _("Your account has expired; please contact your system administrator."));
break;
case PAM_AUTHTOK_ERR:
retval = PAM_SUCCESS;
@@ -285,19 +285,19 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc, const char
**argv)
#if defined HAVE_DNGETTEXT && defined ENABLE_NLS
snprintf (buf, sizeof (buf),
dngettext(PACKAGE,
- "Warning: your password will expire in %d day",
- "Warning: your password will expire in %d days",
+ "Warning: your password will expire in %d day.",
+ "Warning: your password will expire in %d days.",
daysleft),
daysleft);
#else
if (daysleft == 1)
snprintf(buf, sizeof (buf),
- _("Warning: your password will expire in %d day"),
+ _("Warning: your password will expire in %d day."),
daysleft);
else
snprintf(buf, sizeof (buf),
/* TRANSLATORS: only used if dngettext is not supported */
- _("Warning: your password will expire in %d days"),
+ _("Warning: your password will expire in %d days."),
daysleft);
#endif
_make_remark(pamh, ctrl, PAM_TEXT_INFO, buf);
diff --git a/modules/pam_unix/pam_unix_passwd.c b/modules/pam_unix/pam_unix_passwd.c
index 302cf12..3bab510 100644
--- a/modules/pam_unix/pam_unix_passwd.c
+++ b/modules/pam_unix/pam_unix_passwd.c
@@ -560,7 +560,7 @@ static int _pam_unix_approve_pass(pam_handle_t * pamh
pam_syslog(pamh, LOG_DEBUG, "bad authentication token");
}
_make_remark(pamh, ctrl, PAM_ERROR_MSG, pass_new == NULL ?
- _("No password supplied") : _("Password unchanged"));
+ _("No password supplied.") : _("Password unchanged."));
return PAM_AUTHTOK_ERR;
}
/*
@@ -577,7 +577,7 @@ static int _pam_unix_approve_pass(pam_handle_t * pamh
}
if (off(UNIX__IAMROOT, ctrl)) {
if (strlen(pass_new) < pass_min_len)
- remark = _("You must choose a longer password");
+ remark = _("You must choose a longer password.");
D(("length check [%s]", remark));
if (on(UNIX_REMEMBER_PASSWD, ctrl)) {
if ((retval = check_old_password(user, pass_new)) == PAM_AUTHTOK_ERR)
@@ -714,7 +714,7 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char
**argv)
if (retval == PAM_AUTHTOK_ERR) {
if (off(UNIX__IAMROOT, ctrl))
_make_remark(pamh, ctrl, PAM_ERROR_MSG,
- _("You must wait longer to change your password"));
+ _("You must wait longer to change your password."));
else
retval = PAM_SUCCESS;
}
diff --git a/po/Linux-PAM.pot b/po/Linux-PAM.pot
index 9082a4c..dc47975 100644
--- a/po/Linux-PAM.pot
+++ b/po/Linux-PAM.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Linux-PAM 1.3.1\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n"
-"POT-Creation-Date: 2018-05-18 12:58+0200\n"
+"POT-Creation-Date: 2018-05-31 00:00+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -248,12 +248,12 @@ msgstr ""
#: modules/pam_cracklib/pam_cracklib.c:695
#: modules/pam_unix/pam_unix_passwd.c:568
-msgid "No password supplied"
+msgid "No password supplied."
msgstr ""
#: modules/pam_cracklib/pam_cracklib.c:695
#: modules/pam_unix/pam_unix_passwd.c:568
-msgid "Password unchanged"
+msgid "Password unchanged."
msgstr ""
#: modules/pam_cracklib/pam_cracklib.c:715
@@ -523,29 +523,29 @@ msgid "Access granted (last access was %ld seconds ago)."
msgstr ""
#: modules/pam_unix/pam_unix_acct.c:253 modules/pam_unix/pam_unix_acct.c:275
-msgid "Your account has expired; please contact your system administrator"
+msgid "Your account has expired; please contact your system administrator."
msgstr ""
#: modules/pam_unix/pam_unix_acct.c:261
msgid ""
-"You are required to change your password immediately (administrator
enforced)"
+"You are required to change your password immediately (administrator
enforced)."
msgstr ""
#: modules/pam_unix/pam_unix_acct.c:267
-msgid "You are required to change your password immediately (password
expired)"
+msgid "You are required to change your password immediately (password
expired)."
msgstr ""
#: modules/pam_unix/pam_unix_acct.c:288 modules/pam_unix/pam_unix_acct.c:295
#, c-format
-msgid "Warning: your password will expire in %d day"
-msgid_plural "Warning: your password will expire in %d days"
+msgid "Warning: your password will expire in %d day."
+msgid_plural "Warning: your password will expire in %d days."
msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: only used if dngettext is not supported
#: modules/pam_unix/pam_unix_acct.c:300
#, c-format
-msgid "Warning: your password will expire in %d days"
+msgid "Warning: your password will expire in %d days."
msgstr ""
#: modules/pam_unix/pam_unix_passwd.c:470
@@ -553,7 +553,7 @@ msgid "NIS password could not be changed."
msgstr ""
#: modules/pam_unix/pam_unix_passwd.c:585
-msgid "You must choose a longer password"
+msgid "You must choose a longer password."
msgstr ""
#: modules/pam_unix/pam_unix_passwd.c:692
@@ -562,5 +562,5 @@ msgid "Changing password for %s."
msgstr ""
#: modules/pam_unix/pam_unix_passwd.c:722
-msgid "You must wait longer to change your password"
+msgid "You must wait longer to change your password."
msgstr ""
--
ldv