From 4daceedd3387b418ff23fc1ac5b8342558a459f5 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Thu, 5 Mar 2020 22:27:33 +0000 Subject: pam_get_authtok: fix i18n of default prompts Change formatting of default prompts, making them translatable to those languages that use a different word order. From non-i18n perspective this change is essentially a no-op. * libpam/pam_get_authtok.c (PROMPTCURRENT): Replace with PROMPT_CURRENT_ARG and PROMPT_CURRENT_NOARG. (PROMPT1): Replace with PROMPT_NEW_ARG and PROMPT_NEW_NOARG. (PROMPT2): Replace with PROMPT_RETYPE_ARG and PROMPT_RETYPE_NOARG. (pam_get_authtok_internal, pam_get_authtok_verify): Use new macros. * po/Linux-PAM.pot: Regenerated. Resolves: https://github.com/linux-pam/linux-pam/issues/29 --- po/Linux-PAM.pot | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) (limited to 'po/Linux-PAM.pot') diff --git a/po/Linux-PAM.pot b/po/Linux-PAM.pot index 309dbef7..dc74d537 100644 --- a/po/Linux-PAM.pot +++ b/po/Linux-PAM.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM 1.4.0\n" "Report-Msgid-Bugs-To: https://github.com/linux-pam/linux-pam/issues\n" -"POT-Creation-Date: 2020-03-05 19:33+0000\n" +"POT-Creation-Date: 2020-03-05 22:27+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -38,29 +38,41 @@ msgstr "" #: libpam/pam_get_authtok.c:41 #, c-format -msgid "Current %s%spassword: " +msgid "Current %s password: " msgstr "" -#: libpam/pam_get_authtok.c:43 +#: libpam/pam_get_authtok.c:42 +msgid "Current password: " +msgstr "" + +#: libpam/pam_get_authtok.c:44 #, c-format -msgid "New %s%spassword: " +msgid "New %s password: " msgstr "" #: libpam/pam_get_authtok.c:45 +msgid "New password: " +msgstr "" + +#: libpam/pam_get_authtok.c:47 #, c-format -msgid "Retype new %s%spassword: " +msgid "Retype new %s password: " +msgstr "" + +#: libpam/pam_get_authtok.c:48 +msgid "Retype new password: " msgstr "" -#: libpam/pam_get_authtok.c:46 +#: libpam/pam_get_authtok.c:49 msgid "Sorry, passwords do not match." msgstr "" -#: libpam/pam_get_authtok.c:139 libpam/pam_get_authtok.c:228 +#: libpam/pam_get_authtok.c:142 libpam/pam_get_authtok.c:240 #, c-format msgid "Retype %s" msgstr "" -#: libpam/pam_get_authtok.c:166 libpam/pam_get_authtok.c:244 +#: libpam/pam_get_authtok.c:178 libpam/pam_get_authtok.c:258 msgid "Password change has been aborted." msgstr "" -- cgit v1.2.3