From: Thorsten Kukuk Date: Wed, 7 Dec 2005 17:09:18 +0000 (+0000) Subject: Relevant BUGIDs: none X-Git-Tag: Linux-PAM-0_99_2_1~6 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=964e18bfb0d348a75783246f19ab9655717aa969;p=linux-pam Relevant BUGIDs: none Purpose of commit: cleanup Commit summary: --------------- 2005-12-07 Thorsten Kukuk * modules/pam_mail/pam_mail.c: Modify assembling of output for easier translation. * po/de.po: Translate new pam_mail messages. --- diff --git a/ChangeLog b/ChangeLog index 9f9d9405..12b8d72c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-12-07 Thorsten Kukuk + + * modules/pam_mail/pam_mail.c: Modify assembling of output + for easier translation. + + * po/de.po: Translate new pam_mail messages. + + 2005-11-24 Thorsten Kukuk * po/de.po: Add new translation, fix wrong format specifier. diff --git a/modules/pam_mail/pam_mail.c b/modules/pam_mail/pam_mail.c index c67a36c4..71a25d45 100644 --- a/modules/pam_mail/pam_mail.c +++ b/modules/pam_mail/pam_mail.c @@ -60,6 +60,11 @@ #define PAM_STANDARD_MAIL 0x0400 #define PAM_QUIET_MAIL 0x1000 +#define HAVE_NEW_MAIL 0x1 +#define HAVE_OLD_MAIL 0x2 +#define HAVE_NO_MAIL 0x3 +#define HAVE_MAIL 0x4 + static int _pam_parse (const pam_handle_t *pamh, int flags, int argc, const char **argv, const char **maildir, size_t *hashcount) @@ -209,14 +214,14 @@ get_folder(pam_handle_t *pamh, int ctrl, return retval; } -static const char * +static int get_mail_status(pam_handle_t *pamh, int ctrl, const char *folder) { - const char *type = NULL; + int type = 0; struct stat mail_st; if (stat(folder, &mail_st) < 0) - return NULL; + return 0; if (S_ISDIR(mail_st.st_mode)) { /* Assume Maildir format */ int i, save_errno; @@ -232,18 +237,18 @@ get_mail_status(pam_handle_t *pamh, int ctrl, const char *folder) _pam_overwrite(dir); _pam_drop(dir); if (i < 0) { - type = NULL; + type = 0; namelist = NULL; if (save_errno == ENOMEM) { pam_syslog(pamh, LOG_CRIT, "out of memory"); goto get_mail_status_cleanup; } } - type = (i > 2) ? _("new") : NULL; + type = (i > 2) ? HAVE_NEW_MAIL : 0; while (--i >= 0) _pam_drop(namelist[i]); _pam_drop(namelist); - if (type == NULL) { + if (type == 0) { if (asprintf(&dir, "%s/cur", folder) < 0) { pam_syslog(pamh, LOG_CRIT, "out of memory"); goto get_mail_status_cleanup; @@ -253,7 +258,7 @@ get_mail_status(pam_handle_t *pamh, int ctrl, const char *folder) _pam_overwrite(dir); _pam_drop(dir); if (i < 0) { - type = NULL; + type = 0; namelist = NULL; if (save_errno == ENOMEM) { pam_syslog(pamh, LOG_CRIT, "out of memory"); @@ -261,9 +266,9 @@ get_mail_status(pam_handle_t *pamh, int ctrl, const char *folder) } } if (i > 2) - type = _("old"); + type = HAVE_OLD_MAIL; else - type = (ctrl & PAM_EMPTY_TOO) ? _("no") : NULL; + type = (ctrl & PAM_EMPTY_TOO) ? HAVE_NO_MAIL : 0; while (--i >= 0) _pam_drop(namelist[i]); _pam_drop(namelist); @@ -271,37 +276,68 @@ get_mail_status(pam_handle_t *pamh, int ctrl, const char *folder) } else { if (mail_st.st_size > 0) { if (mail_st.st_atime < mail_st.st_mtime) /* new */ - type = (ctrl & PAM_STANDARD_MAIL) ? _("new ") : _("new"); + type = HAVE_NEW_MAIL; else /* old */ - type = (ctrl & PAM_STANDARD_MAIL) ? "" : _("old"); + type = (ctrl & PAM_STANDARD_MAIL) ? HAVE_MAIL : HAVE_OLD_MAIL; } else if (ctrl & PAM_EMPTY_TOO) { - type = _("no"); + type = HAVE_NO_MAIL; } else { - type = NULL; + type = 0; } } get_mail_status_cleanup: memset(&mail_st, 0, sizeof(mail_st)); - D(("user has %s mail in %s folder", type, folder)); + D(("user has %d mail in %s folder", type, folder)); return type; } static int -report_mail(pam_handle_t *pamh, int ctrl, const char *type, const char *folder) +report_mail(pam_handle_t *pamh, int ctrl, int type, const char *folder) { int retval; if (!(ctrl & PAM_MAIL_SILENT) || - ((ctrl & PAM_QUIET_MAIL) && strcmp(type, _("new")))) + ((ctrl & PAM_QUIET_MAIL) && type == HAVE_NEW_MAIL)) { if (ctrl & PAM_STANDARD_MAIL) - if (!strcmp(type, _("no"))) - retval = pam_info (pamh, "%s", _("No mail.")); - else - retval = pam_info (pamh, _("You have %smail."), type); + switch (type) + { + case HAVE_NO_MAIL: + retval = pam_info (pamh, "%s", _("No mail.")); + break; + case HAVE_NEW_MAIL: + retval = pam_info (pamh, "%s", _("You have new mail.")); + break; + case HAVE_OLD_MAIL: + retval = pam_info (pamh, "%s", _("You have old mail.")); + break; + case HAVE_MAIL: + default: + retval = pam_info (pamh, "%s", _("You have mail.")); + break; + } else - retval = pam_info (pamh, _("You have %s mail in %s."), type, folder); + switch (type) + { + case HAVE_NO_MAIL: + retval = pam_info (pamh, _("You have no mail in folder %s."), + folder); + break; + case HAVE_NEW_MAIL: + retval = pam_info (pamh, _("You have mew mail in folder %s."), + folder); + break; + case HAVE_OLD_MAIL: + retval = pam_info (pamh, _("You have old mail in folder %s."), + folder); + break; + case HAVE_MAIL: + default: + retval = pam_info (pamh, _("You have mail in folder %s."), + folder); + break; + } } else { @@ -357,10 +393,10 @@ int pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, static int _do_mail(pam_handle_t *pamh, int flags, int argc, const char **argv, int est) { - int retval, ctrl; + int retval, ctrl, type; size_t hashcount; char *folder = NULL; - const char *path_mail = NULL, *type; + const char *path_mail = NULL; /* * this module (un)sets the MAIL environment variable, and checks if @@ -414,9 +450,9 @@ static int _do_mail(pam_handle_t *pamh, int flags, int argc, if ((est && !(ctrl & PAM_NO_LOGIN)) || (!est && (ctrl & PAM_LOGOUT_TOO))) { type = get_mail_status(pamh, ctrl, folder); - if (type != NULL) { + if (type != 0) { retval = report_mail(pamh, ctrl, type, folder); - type = NULL; + type = 0; } } diff --git a/po/Linux-PAM.pot b/po/Linux-PAM.pot index 6dc7f833..76f108da 100644 --- a/po/Linux-PAM.pot +++ b/po/Linux-PAM.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2005-11-24 23:22+0100\n" +"POT-Creation-Date: 2005-12-07 18:03+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -133,36 +133,40 @@ msgstr "" msgid "Security Context %s Assigned" msgstr "" -#: modules/pam_mail/pam_mail.c:242 modules/pam_mail/pam_mail.c:274 -#: modules/pam_mail/pam_mail.c:296 -msgid "new" +#: modules/pam_mail/pam_mail.c:307 +msgid "No mail." msgstr "" -#: modules/pam_mail/pam_mail.c:264 modules/pam_mail/pam_mail.c:276 -msgid "old" +#: modules/pam_mail/pam_mail.c:310 +msgid "You have new mail." msgstr "" -#: modules/pam_mail/pam_mail.c:266 modules/pam_mail/pam_mail.c:278 -#: modules/pam_mail/pam_mail.c:299 -msgid "no" +#: modules/pam_mail/pam_mail.c:313 +msgid "You have old mail." msgstr "" -#: modules/pam_mail/pam_mail.c:274 -msgid "new " +#: modules/pam_mail/pam_mail.c:317 +msgid "You have mail." msgstr "" -#: modules/pam_mail/pam_mail.c:300 -msgid "No mail." +#: modules/pam_mail/pam_mail.c:324 +#, c-format +msgid "You have no mail in folder %s." +msgstr "" + +#: modules/pam_mail/pam_mail.c:328 +#, c-format +msgid "You have mew mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:302 +#: modules/pam_mail/pam_mail.c:332 #, c-format -msgid "You have %smail." +msgid "You have old mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:304 +#: modules/pam_mail/pam_mail.c:337 #, c-format -msgid "You have %s mail in %s." +msgid "You have mail in folder %s." msgstr "" #: modules/pam_unix/pam_unix_acct.c:274 modules/pam_unix/pam_unix_acct.c:301 diff --git a/po/cs.po b/po/cs.po index ea004295..26f2c412 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2005-11-24 23:22+0100\n" +"POT-Creation-Date: 2005-12-07 18:03+0100\n" "PO-Revision-Date: 2005-08-24 13:58+0200\n" "Last-Translator: Tomas Mraz \n" "Language-Team: cs_CZ \n" @@ -136,36 +136,40 @@ msgstr "Neplatný bezpečnostní kontext" msgid "Security Context %s Assigned" msgstr "Bezpečnostní kontext %s přidělen" -#: modules/pam_mail/pam_mail.c:242 modules/pam_mail/pam_mail.c:274 -#: modules/pam_mail/pam_mail.c:296 -msgid "new" +#: modules/pam_mail/pam_mail.c:307 +msgid "No mail." msgstr "" -#: modules/pam_mail/pam_mail.c:264 modules/pam_mail/pam_mail.c:276 -msgid "old" +#: modules/pam_mail/pam_mail.c:310 +msgid "You have new mail." msgstr "" -#: modules/pam_mail/pam_mail.c:266 modules/pam_mail/pam_mail.c:278 -#: modules/pam_mail/pam_mail.c:299 -msgid "no" +#: modules/pam_mail/pam_mail.c:313 +msgid "You have old mail." msgstr "" -#: modules/pam_mail/pam_mail.c:274 -msgid "new " +#: modules/pam_mail/pam_mail.c:317 +msgid "You have mail." msgstr "" -#: modules/pam_mail/pam_mail.c:300 -msgid "No mail." +#: modules/pam_mail/pam_mail.c:324 +#, c-format +msgid "You have no mail in folder %s." +msgstr "" + +#: modules/pam_mail/pam_mail.c:328 +#, c-format +msgid "You have mew mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:302 +#: modules/pam_mail/pam_mail.c:332 #, c-format -msgid "You have %smail." +msgid "You have old mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:304 +#: modules/pam_mail/pam_mail.c:337 #, c-format -msgid "You have %s mail in %s." +msgid "You have mail in folder %s." msgstr "" #: modules/pam_unix/pam_unix_acct.c:274 modules/pam_unix/pam_unix_acct.c:301 diff --git a/po/de.po b/po/de.po index 4fb2f2bb..5c8a3ca4 100644 --- a/po/de.po +++ b/po/de.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2005-11-24 23:22+0100\n" -"PO-Revision-Date: 2005-11-24 23:11+01:00\n" +"POT-Creation-Date: 2005-12-07 18:03+0100\n" +"PO-Revision-Date: 2005-12-07 18:08+01:00\n" "Last-Translator: Novell Language \n" "Language-Team: Novell Language \n" "MIME-Version: 1.0\n" @@ -134,37 +134,41 @@ msgstr "Kein gültiger Sicherheitskontext" msgid "Security Context %s Assigned" msgstr "Sicherheitskontext %s zugewiesen" -#: modules/pam_mail/pam_mail.c:242 modules/pam_mail/pam_mail.c:274 -#: modules/pam_mail/pam_mail.c:296 -msgid "new" -msgstr "neue" +#: modules/pam_mail/pam_mail.c:307 +msgid "No mail." +msgstr "Keine Nachrichten." -#: modules/pam_mail/pam_mail.c:264 modules/pam_mail/pam_mail.c:276 -msgid "old" -msgstr "alte" +#: modules/pam_mail/pam_mail.c:310 +msgid "You have new mail." +msgstr "Sie haben neue Nachrichten." -#: modules/pam_mail/pam_mail.c:266 modules/pam_mail/pam_mail.c:278 -#: modules/pam_mail/pam_mail.c:299 -msgid "no" -msgstr "keine" +#: modules/pam_mail/pam_mail.c:313 +msgid "You have old mail." +msgstr "Sie haben alte Nachrichten." -#: modules/pam_mail/pam_mail.c:274 -msgid "new " -msgstr "neue " +#: modules/pam_mail/pam_mail.c:317 +msgid "You have mail." +msgstr "Sie haben Nachrichten." -#: modules/pam_mail/pam_mail.c:300 -msgid "No mail." -msgstr "Keine Nachrichten." +#: modules/pam_mail/pam_mail.c:324 +#, c-format +msgid "You have no mail in folder %s." +msgstr "Sie haben keine Nachrichten in %s." -#: modules/pam_mail/pam_mail.c:302 +#: modules/pam_mail/pam_mail.c:328 #, c-format -msgid "You have %smail." -msgstr "Sie haben %sNachrichten." +msgid "You have mew mail in folder %s." +msgstr "Sie haben neue Nachrichten in %s." -#: modules/pam_mail/pam_mail.c:304 +#: modules/pam_mail/pam_mail.c:332 #, c-format -msgid "You have %s mail in %s." -msgstr "Sie haben %s Nachrichten in %s." +msgid "You have old mail in folder %s." +msgstr "Sie haben alte Nachrichten in %s." + +#: modules/pam_mail/pam_mail.c:337 +#, c-format +msgid "You have mail in folder %s." +msgstr "Sie haben Nachrichten in %s." #: modules/pam_unix/pam_unix_acct.c:274 modules/pam_unix/pam_unix_acct.c:301 msgid "Your account has expired; please contact your system administrator" @@ -442,6 +446,18 @@ msgstr "...Ihre Zeit ist abgelaufen.\n" msgid "erroneous conversation (%d)\n" msgstr "fehlerhafte Kommunikation (%d)\n" +#~ msgid "new" +#~ msgstr "neue" + +#~ msgid "old" +#~ msgstr "alte" + +#~ msgid "no" +#~ msgstr "keine" + +#~ msgid "new " +#~ msgstr "neue " + #, fuzzy #~ msgid "%s: set %s security context to %s" #~ msgstr "Kein gültiger Sicherheitskontext" diff --git a/po/es.po b/po/es.po index ce03424f..aa8bd365 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2005-11-24 23:22+0100\n" +"POT-Creation-Date: 2005-12-07 18:03+0100\n" "PO-Revision-Date: 2005-08-18 HO:MI+ZONE\n" "Last-Translator: Novell Language \n" "Language-Team: Novell Language \n" @@ -136,36 +136,40 @@ msgstr "No es un contexto de seguridad válido" msgid "Security Context %s Assigned" msgstr "Contexto de seguridad %s asignado" -#: modules/pam_mail/pam_mail.c:242 modules/pam_mail/pam_mail.c:274 -#: modules/pam_mail/pam_mail.c:296 -msgid "new" +#: modules/pam_mail/pam_mail.c:307 +msgid "No mail." msgstr "" -#: modules/pam_mail/pam_mail.c:264 modules/pam_mail/pam_mail.c:276 -msgid "old" +#: modules/pam_mail/pam_mail.c:310 +msgid "You have new mail." msgstr "" -#: modules/pam_mail/pam_mail.c:266 modules/pam_mail/pam_mail.c:278 -#: modules/pam_mail/pam_mail.c:299 -msgid "no" +#: modules/pam_mail/pam_mail.c:313 +msgid "You have old mail." msgstr "" -#: modules/pam_mail/pam_mail.c:274 -msgid "new " +#: modules/pam_mail/pam_mail.c:317 +msgid "You have mail." msgstr "" -#: modules/pam_mail/pam_mail.c:300 -msgid "No mail." +#: modules/pam_mail/pam_mail.c:324 +#, c-format +msgid "You have no mail in folder %s." +msgstr "" + +#: modules/pam_mail/pam_mail.c:328 +#, c-format +msgid "You have mew mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:302 +#: modules/pam_mail/pam_mail.c:332 #, c-format -msgid "You have %smail." +msgid "You have old mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:304 +#: modules/pam_mail/pam_mail.c:337 #, c-format -msgid "You have %s mail in %s." +msgid "You have mail in folder %s." msgstr "" #: modules/pam_unix/pam_unix_acct.c:274 modules/pam_unix/pam_unix_acct.c:301 diff --git a/po/fi.po b/po/fi.po index b3d7383e..6dcfeb56 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2005-11-24 23:22+0100\n" +"POT-Creation-Date: 2005-12-07 18:03+0100\n" "PO-Revision-Date: 2005-09-17 12:27+0300\n" "Last-Translator: Ilkka Pirskanen \n" "Language-Team: Finnish \n" @@ -135,36 +135,40 @@ msgstr "Ei kelvollinen tietoturvaympäristö" msgid "Security Context %s Assigned" msgstr "Tietoturvaympäristö %s asetettiin" -#: modules/pam_mail/pam_mail.c:242 modules/pam_mail/pam_mail.c:274 -#: modules/pam_mail/pam_mail.c:296 -msgid "new" +#: modules/pam_mail/pam_mail.c:307 +msgid "No mail." msgstr "" -#: modules/pam_mail/pam_mail.c:264 modules/pam_mail/pam_mail.c:276 -msgid "old" +#: modules/pam_mail/pam_mail.c:310 +msgid "You have new mail." msgstr "" -#: modules/pam_mail/pam_mail.c:266 modules/pam_mail/pam_mail.c:278 -#: modules/pam_mail/pam_mail.c:299 -msgid "no" +#: modules/pam_mail/pam_mail.c:313 +msgid "You have old mail." msgstr "" -#: modules/pam_mail/pam_mail.c:274 -msgid "new " +#: modules/pam_mail/pam_mail.c:317 +msgid "You have mail." msgstr "" -#: modules/pam_mail/pam_mail.c:300 -msgid "No mail." +#: modules/pam_mail/pam_mail.c:324 +#, c-format +msgid "You have no mail in folder %s." +msgstr "" + +#: modules/pam_mail/pam_mail.c:328 +#, c-format +msgid "You have mew mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:302 +#: modules/pam_mail/pam_mail.c:332 #, c-format -msgid "You have %smail." +msgid "You have old mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:304 +#: modules/pam_mail/pam_mail.c:337 #, c-format -msgid "You have %s mail in %s." +msgid "You have mail in folder %s." msgstr "" #: modules/pam_unix/pam_unix_acct.c:274 modules/pam_unix/pam_unix_acct.c:301 diff --git a/po/fr.po b/po/fr.po index e9aca3a5..01d262a6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2005-11-24 23:22+0100\n" +"POT-Creation-Date: 2005-12-07 18:03+0100\n" "PO-Revision-Date: 2005-08-18 12:12+0000\n" "Last-Translator: Novell Language \n" "Language-Team: Novell Language \n" @@ -133,36 +133,40 @@ msgstr "Contexte de sécurité non valide" msgid "Security Context %s Assigned" msgstr "Contexte de sécurité %s attribué" -#: modules/pam_mail/pam_mail.c:242 modules/pam_mail/pam_mail.c:274 -#: modules/pam_mail/pam_mail.c:296 -msgid "new" +#: modules/pam_mail/pam_mail.c:307 +msgid "No mail." msgstr "" -#: modules/pam_mail/pam_mail.c:264 modules/pam_mail/pam_mail.c:276 -msgid "old" +#: modules/pam_mail/pam_mail.c:310 +msgid "You have new mail." msgstr "" -#: modules/pam_mail/pam_mail.c:266 modules/pam_mail/pam_mail.c:278 -#: modules/pam_mail/pam_mail.c:299 -msgid "no" +#: modules/pam_mail/pam_mail.c:313 +msgid "You have old mail." msgstr "" -#: modules/pam_mail/pam_mail.c:274 -msgid "new " +#: modules/pam_mail/pam_mail.c:317 +msgid "You have mail." msgstr "" -#: modules/pam_mail/pam_mail.c:300 -msgid "No mail." +#: modules/pam_mail/pam_mail.c:324 +#, c-format +msgid "You have no mail in folder %s." +msgstr "" + +#: modules/pam_mail/pam_mail.c:328 +#, c-format +msgid "You have mew mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:302 +#: modules/pam_mail/pam_mail.c:332 #, c-format -msgid "You have %smail." +msgid "You have old mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:304 +#: modules/pam_mail/pam_mail.c:337 #, c-format -msgid "You have %s mail in %s." +msgid "You have mail in folder %s." msgstr "" #: modules/pam_unix/pam_unix_acct.c:274 modules/pam_unix/pam_unix_acct.c:301 diff --git a/po/hu.po b/po/hu.po index ada4179a..c9fab606 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM 0.80\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2005-11-24 23:22+0100\n" +"POT-Creation-Date: 2005-12-07 18:03+0100\n" "PO-Revision-Date: 2005-08-07 02:59+0100\n" "Last-Translator: Szabolcs Varga \n" "Language-Team: hu\n" @@ -133,36 +133,40 @@ msgstr "Nem érvényes biztonsági kontextus" msgid "Security Context %s Assigned" msgstr "%s biztonsági kontextus hozzárendelve" -#: modules/pam_mail/pam_mail.c:242 modules/pam_mail/pam_mail.c:274 -#: modules/pam_mail/pam_mail.c:296 -msgid "new" +#: modules/pam_mail/pam_mail.c:307 +msgid "No mail." msgstr "" -#: modules/pam_mail/pam_mail.c:264 modules/pam_mail/pam_mail.c:276 -msgid "old" +#: modules/pam_mail/pam_mail.c:310 +msgid "You have new mail." msgstr "" -#: modules/pam_mail/pam_mail.c:266 modules/pam_mail/pam_mail.c:278 -#: modules/pam_mail/pam_mail.c:299 -msgid "no" +#: modules/pam_mail/pam_mail.c:313 +msgid "You have old mail." msgstr "" -#: modules/pam_mail/pam_mail.c:274 -msgid "new " +#: modules/pam_mail/pam_mail.c:317 +msgid "You have mail." msgstr "" -#: modules/pam_mail/pam_mail.c:300 -msgid "No mail." +#: modules/pam_mail/pam_mail.c:324 +#, c-format +msgid "You have no mail in folder %s." +msgstr "" + +#: modules/pam_mail/pam_mail.c:328 +#, c-format +msgid "You have mew mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:302 +#: modules/pam_mail/pam_mail.c:332 #, c-format -msgid "You have %smail." +msgid "You have old mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:304 +#: modules/pam_mail/pam_mail.c:337 #, c-format -msgid "You have %s mail in %s." +msgid "You have mail in folder %s." msgstr "" #: modules/pam_unix/pam_unix_acct.c:274 modules/pam_unix/pam_unix_acct.c:301 diff --git a/po/it.po b/po/it.po index 9e4ed17a..c8c7edd6 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2005-11-24 23:22+0100\n" +"POT-Creation-Date: 2005-12-07 18:03+0100\n" "PO-Revision-Date: 2005-08-18 13:43-0000\n" "Last-Translator: Novell Language \n" "Language-Team: Novell Language \n" @@ -134,36 +134,40 @@ msgstr "Non è un contesto di sicurezza valido" msgid "Security Context %s Assigned" msgstr "Contesto di sicurezza %s assegnato" -#: modules/pam_mail/pam_mail.c:242 modules/pam_mail/pam_mail.c:274 -#: modules/pam_mail/pam_mail.c:296 -msgid "new" +#: modules/pam_mail/pam_mail.c:307 +msgid "No mail." msgstr "" -#: modules/pam_mail/pam_mail.c:264 modules/pam_mail/pam_mail.c:276 -msgid "old" +#: modules/pam_mail/pam_mail.c:310 +msgid "You have new mail." msgstr "" -#: modules/pam_mail/pam_mail.c:266 modules/pam_mail/pam_mail.c:278 -#: modules/pam_mail/pam_mail.c:299 -msgid "no" +#: modules/pam_mail/pam_mail.c:313 +msgid "You have old mail." msgstr "" -#: modules/pam_mail/pam_mail.c:274 -msgid "new " +#: modules/pam_mail/pam_mail.c:317 +msgid "You have mail." msgstr "" -#: modules/pam_mail/pam_mail.c:300 -msgid "No mail." +#: modules/pam_mail/pam_mail.c:324 +#, c-format +msgid "You have no mail in folder %s." +msgstr "" + +#: modules/pam_mail/pam_mail.c:328 +#, c-format +msgid "You have mew mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:302 +#: modules/pam_mail/pam_mail.c:332 #, c-format -msgid "You have %smail." +msgid "You have old mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:304 +#: modules/pam_mail/pam_mail.c:337 #, c-format -msgid "You have %s mail in %s." +msgid "You have mail in folder %s." msgstr "" #: modules/pam_unix/pam_unix_acct.c:274 modules/pam_unix/pam_unix_acct.c:301 diff --git a/po/ja.po b/po/ja.po index 450514a2..cf46aeb3 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2005-11-24 23:22+0100\n" +"POT-Creation-Date: 2005-12-07 18:03+0100\n" "PO-Revision-Date: 2005-08-18 11:52-0000\n" "Last-Translator: Novell Language \n" "Language-Team: Novell Language \n" @@ -133,36 +133,40 @@ msgstr "有効なセキュリティコンテキストでありません" msgid "Security Context %s Assigned" msgstr "割り当てられたセキュリティコンテキスト%s" -#: modules/pam_mail/pam_mail.c:242 modules/pam_mail/pam_mail.c:274 -#: modules/pam_mail/pam_mail.c:296 -msgid "new" +#: modules/pam_mail/pam_mail.c:307 +msgid "No mail." msgstr "" -#: modules/pam_mail/pam_mail.c:264 modules/pam_mail/pam_mail.c:276 -msgid "old" +#: modules/pam_mail/pam_mail.c:310 +msgid "You have new mail." msgstr "" -#: modules/pam_mail/pam_mail.c:266 modules/pam_mail/pam_mail.c:278 -#: modules/pam_mail/pam_mail.c:299 -msgid "no" +#: modules/pam_mail/pam_mail.c:313 +msgid "You have old mail." msgstr "" -#: modules/pam_mail/pam_mail.c:274 -msgid "new " +#: modules/pam_mail/pam_mail.c:317 +msgid "You have mail." msgstr "" -#: modules/pam_mail/pam_mail.c:300 -msgid "No mail." +#: modules/pam_mail/pam_mail.c:324 +#, c-format +msgid "You have no mail in folder %s." +msgstr "" + +#: modules/pam_mail/pam_mail.c:328 +#, c-format +msgid "You have mew mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:302 +#: modules/pam_mail/pam_mail.c:332 #, c-format -msgid "You have %smail." +msgid "You have old mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:304 +#: modules/pam_mail/pam_mail.c:337 #, c-format -msgid "You have %s mail in %s." +msgid "You have mail in folder %s." msgstr "" #: modules/pam_unix/pam_unix_acct.c:274 modules/pam_unix/pam_unix_acct.c:301 diff --git a/po/nb.po b/po/nb.po index 008f59e2..d5be203e 100644 --- a/po/nb.po +++ b/po/nb.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2005-11-24 23:22+0100\n" +"POT-Creation-Date: 2005-12-07 18:03+0100\n" "PO-Revision-Date: 2005-08-13 22:44+0200\n" "Last-Translator: Olav Pettershagen \n" "Language-Team: \n" @@ -134,36 +134,40 @@ msgstr "Ikke en gyldig sikkerhetskontekst" msgid "Security Context %s Assigned" msgstr "Sikkerhetskontekst %s tilordnet" -#: modules/pam_mail/pam_mail.c:242 modules/pam_mail/pam_mail.c:274 -#: modules/pam_mail/pam_mail.c:296 -msgid "new" +#: modules/pam_mail/pam_mail.c:307 +msgid "No mail." msgstr "" -#: modules/pam_mail/pam_mail.c:264 modules/pam_mail/pam_mail.c:276 -msgid "old" +#: modules/pam_mail/pam_mail.c:310 +msgid "You have new mail." msgstr "" -#: modules/pam_mail/pam_mail.c:266 modules/pam_mail/pam_mail.c:278 -#: modules/pam_mail/pam_mail.c:299 -msgid "no" +#: modules/pam_mail/pam_mail.c:313 +msgid "You have old mail." msgstr "" -#: modules/pam_mail/pam_mail.c:274 -msgid "new " +#: modules/pam_mail/pam_mail.c:317 +msgid "You have mail." msgstr "" -#: modules/pam_mail/pam_mail.c:300 -msgid "No mail." +#: modules/pam_mail/pam_mail.c:324 +#, c-format +msgid "You have no mail in folder %s." +msgstr "" + +#: modules/pam_mail/pam_mail.c:328 +#, c-format +msgid "You have mew mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:302 +#: modules/pam_mail/pam_mail.c:332 #, c-format -msgid "You have %smail." +msgid "You have old mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:304 +#: modules/pam_mail/pam_mail.c:337 #, c-format -msgid "You have %s mail in %s." +msgid "You have mail in folder %s." msgstr "" #: modules/pam_unix/pam_unix_acct.c:274 modules/pam_unix/pam_unix_acct.c:301 diff --git a/po/pa.po b/po/pa.po index 7b02ad03..1397f99d 100644 --- a/po/pa.po +++ b/po/pa.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM.pa\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2005-11-24 23:22+0100\n" +"POT-Creation-Date: 2005-12-07 18:03+0100\n" "PO-Revision-Date: 2005-08-06 08:34+0530\n" "Last-Translator: Amanpreet Singh Alam[ਆਲਮ] \n" "Language-Team: Panjabi \n" @@ -136,36 +136,40 @@ msgstr "ਇੱਕ ਠੀਕ ਸੁਰੱਖਿਆ ਪਰਸੰਗ ਨਹੀਂ" msgid "Security Context %s Assigned" msgstr "" -#: modules/pam_mail/pam_mail.c:242 modules/pam_mail/pam_mail.c:274 -#: modules/pam_mail/pam_mail.c:296 -msgid "new" +#: modules/pam_mail/pam_mail.c:307 +msgid "No mail." msgstr "" -#: modules/pam_mail/pam_mail.c:264 modules/pam_mail/pam_mail.c:276 -msgid "old" +#: modules/pam_mail/pam_mail.c:310 +msgid "You have new mail." msgstr "" -#: modules/pam_mail/pam_mail.c:266 modules/pam_mail/pam_mail.c:278 -#: modules/pam_mail/pam_mail.c:299 -msgid "no" +#: modules/pam_mail/pam_mail.c:313 +msgid "You have old mail." msgstr "" -#: modules/pam_mail/pam_mail.c:274 -msgid "new " +#: modules/pam_mail/pam_mail.c:317 +msgid "You have mail." msgstr "" -#: modules/pam_mail/pam_mail.c:300 -msgid "No mail." +#: modules/pam_mail/pam_mail.c:324 +#, c-format +msgid "You have no mail in folder %s." +msgstr "" + +#: modules/pam_mail/pam_mail.c:328 +#, c-format +msgid "You have mew mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:302 +#: modules/pam_mail/pam_mail.c:332 #, c-format -msgid "You have %smail." +msgid "You have old mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:304 +#: modules/pam_mail/pam_mail.c:337 #, c-format -msgid "You have %s mail in %s." +msgid "You have mail in folder %s." msgstr "" #: modules/pam_unix/pam_unix_acct.c:274 modules/pam_unix/pam_unix_acct.c:301 diff --git a/po/pl.po b/po/pl.po index f5ae9b0c..32a61ec1 100644 --- a/po/pl.po +++ b/po/pl.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM TBD\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2005-11-24 23:22+0100\n" +"POT-Creation-Date: 2005-12-07 18:03+0100\n" "PO-Revision-Date: 2005-08-23 15:22+0200\n" "Last-Translator: Piotr Bolek \n" "Language-Team: Polish \n" @@ -133,36 +133,40 @@ msgstr "Nieważny kontekst bezpieczeństwa" msgid "Security Context %s Assigned" msgstr "Kontekst bezpieczeństwa %s przypisany" -#: modules/pam_mail/pam_mail.c:242 modules/pam_mail/pam_mail.c:274 -#: modules/pam_mail/pam_mail.c:296 -msgid "new" +#: modules/pam_mail/pam_mail.c:307 +msgid "No mail." msgstr "" -#: modules/pam_mail/pam_mail.c:264 modules/pam_mail/pam_mail.c:276 -msgid "old" +#: modules/pam_mail/pam_mail.c:310 +msgid "You have new mail." msgstr "" -#: modules/pam_mail/pam_mail.c:266 modules/pam_mail/pam_mail.c:278 -#: modules/pam_mail/pam_mail.c:299 -msgid "no" +#: modules/pam_mail/pam_mail.c:313 +msgid "You have old mail." msgstr "" -#: modules/pam_mail/pam_mail.c:274 -msgid "new " +#: modules/pam_mail/pam_mail.c:317 +msgid "You have mail." msgstr "" -#: modules/pam_mail/pam_mail.c:300 -msgid "No mail." +#: modules/pam_mail/pam_mail.c:324 +#, c-format +msgid "You have no mail in folder %s." +msgstr "" + +#: modules/pam_mail/pam_mail.c:328 +#, c-format +msgid "You have mew mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:302 +#: modules/pam_mail/pam_mail.c:332 #, c-format -msgid "You have %smail." +msgid "You have old mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:304 +#: modules/pam_mail/pam_mail.c:337 #, c-format -msgid "You have %s mail in %s." +msgid "You have mail in folder %s." msgstr "" #: modules/pam_unix/pam_unix_acct.c:274 modules/pam_unix/pam_unix_acct.c:301 diff --git a/po/pt.po b/po/pt.po index 7abf2a89..ba95d20a 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM-pt\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2005-11-24 23:22+0100\n" +"POT-Creation-Date: 2005-12-07 18:03+0100\n" "PO-Revision-Date: 2005-08-07 00:41+0100\n" "Last-Translator: Antonio Cardoso Martins \n" "Language-Team: portuguese\n" @@ -134,36 +134,40 @@ msgstr "Não é um contexto de segurança válido" msgid "Security Context %s Assigned" msgstr "Contexto de Segurança %s Atribuído" -#: modules/pam_mail/pam_mail.c:242 modules/pam_mail/pam_mail.c:274 -#: modules/pam_mail/pam_mail.c:296 -msgid "new" +#: modules/pam_mail/pam_mail.c:307 +msgid "No mail." msgstr "" -#: modules/pam_mail/pam_mail.c:264 modules/pam_mail/pam_mail.c:276 -msgid "old" +#: modules/pam_mail/pam_mail.c:310 +msgid "You have new mail." msgstr "" -#: modules/pam_mail/pam_mail.c:266 modules/pam_mail/pam_mail.c:278 -#: modules/pam_mail/pam_mail.c:299 -msgid "no" +#: modules/pam_mail/pam_mail.c:313 +msgid "You have old mail." msgstr "" -#: modules/pam_mail/pam_mail.c:274 -msgid "new " +#: modules/pam_mail/pam_mail.c:317 +msgid "You have mail." msgstr "" -#: modules/pam_mail/pam_mail.c:300 -msgid "No mail." +#: modules/pam_mail/pam_mail.c:324 +#, c-format +msgid "You have no mail in folder %s." +msgstr "" + +#: modules/pam_mail/pam_mail.c:328 +#, c-format +msgid "You have mew mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:302 +#: modules/pam_mail/pam_mail.c:332 #, c-format -msgid "You have %smail." +msgid "You have old mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:304 +#: modules/pam_mail/pam_mail.c:337 #, c-format -msgid "You have %s mail in %s." +msgid "You have mail in folder %s." msgstr "" #: modules/pam_unix/pam_unix_acct.c:274 modules/pam_unix/pam_unix_acct.c:301 diff --git a/po/pt_BR.po b/po/pt_BR.po index d2816d49..d343e1c1 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2005-11-24 23:22+0100\n" +"POT-Creation-Date: 2005-12-07 18:03+0100\n" "PO-Revision-Date: 2005-08-18 15:02+0000\n" "Last-Translator: Novell Language \n" "Language-Team: Novell Language \n" @@ -133,36 +133,40 @@ msgstr "Não é um contexto de segurança válido" msgid "Security Context %s Assigned" msgstr "Contexto de Segurança %s Atribuído" -#: modules/pam_mail/pam_mail.c:242 modules/pam_mail/pam_mail.c:274 -#: modules/pam_mail/pam_mail.c:296 -msgid "new" +#: modules/pam_mail/pam_mail.c:307 +msgid "No mail." msgstr "" -#: modules/pam_mail/pam_mail.c:264 modules/pam_mail/pam_mail.c:276 -msgid "old" +#: modules/pam_mail/pam_mail.c:310 +msgid "You have new mail." msgstr "" -#: modules/pam_mail/pam_mail.c:266 modules/pam_mail/pam_mail.c:278 -#: modules/pam_mail/pam_mail.c:299 -msgid "no" +#: modules/pam_mail/pam_mail.c:313 +msgid "You have old mail." msgstr "" -#: modules/pam_mail/pam_mail.c:274 -msgid "new " +#: modules/pam_mail/pam_mail.c:317 +msgid "You have mail." msgstr "" -#: modules/pam_mail/pam_mail.c:300 -msgid "No mail." +#: modules/pam_mail/pam_mail.c:324 +#, c-format +msgid "You have no mail in folder %s." +msgstr "" + +#: modules/pam_mail/pam_mail.c:328 +#, c-format +msgid "You have mew mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:302 +#: modules/pam_mail/pam_mail.c:332 #, c-format -msgid "You have %smail." +msgid "You have old mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:304 +#: modules/pam_mail/pam_mail.c:337 #, c-format -msgid "You have %s mail in %s." +msgid "You have mail in folder %s." msgstr "" #: modules/pam_unix/pam_unix_acct.c:274 modules/pam_unix/pam_unix_acct.c:301 diff --git a/po/zh_CN.po b/po/zh_CN.po index af77335c..4745eca2 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux_PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2005-11-24 23:22+0100\n" +"POT-Creation-Date: 2005-12-07 18:03+0100\n" "PO-Revision-Date: 2005-08-18 HO:MI+ZONE\n" "Last-Translator: Novell Language \n" "Language-Team: Novell Language \n" @@ -132,36 +132,40 @@ msgstr "不是有效的安全性环境" msgid "Security Context %s Assigned" msgstr "已指派安全性环境 %s" -#: modules/pam_mail/pam_mail.c:242 modules/pam_mail/pam_mail.c:274 -#: modules/pam_mail/pam_mail.c:296 -msgid "new" +#: modules/pam_mail/pam_mail.c:307 +msgid "No mail." msgstr "" -#: modules/pam_mail/pam_mail.c:264 modules/pam_mail/pam_mail.c:276 -msgid "old" +#: modules/pam_mail/pam_mail.c:310 +msgid "You have new mail." msgstr "" -#: modules/pam_mail/pam_mail.c:266 modules/pam_mail/pam_mail.c:278 -#: modules/pam_mail/pam_mail.c:299 -msgid "no" +#: modules/pam_mail/pam_mail.c:313 +msgid "You have old mail." msgstr "" -#: modules/pam_mail/pam_mail.c:274 -msgid "new " +#: modules/pam_mail/pam_mail.c:317 +msgid "You have mail." msgstr "" -#: modules/pam_mail/pam_mail.c:300 -msgid "No mail." +#: modules/pam_mail/pam_mail.c:324 +#, c-format +msgid "You have no mail in folder %s." +msgstr "" + +#: modules/pam_mail/pam_mail.c:328 +#, c-format +msgid "You have mew mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:302 +#: modules/pam_mail/pam_mail.c:332 #, c-format -msgid "You have %smail." +msgid "You have old mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:304 +#: modules/pam_mail/pam_mail.c:337 #, c-format -msgid "You have %s mail in %s." +msgid "You have mail in folder %s." msgstr "" #: modules/pam_unix/pam_unix_acct.c:274 modules/pam_unix/pam_unix_acct.c:301 diff --git a/po/zh_TW.po b/po/zh_TW.po index 2992fe59..15394ae1 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux_PAM\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2005-11-24 23:22+0100\n" +"POT-Creation-Date: 2005-12-07 18:03+0100\n" "PO-Revision-Date: 2005-08-18 12:12+0200\n" "Last-Translator: Novell Language \n" "Language-Team: Novell Language \n" @@ -133,36 +133,40 @@ msgstr "不是有效的安全網路位置" msgid "Security Context %s Assigned" msgstr "已指定安全網路位置 %s" -#: modules/pam_mail/pam_mail.c:242 modules/pam_mail/pam_mail.c:274 -#: modules/pam_mail/pam_mail.c:296 -msgid "new" +#: modules/pam_mail/pam_mail.c:307 +msgid "No mail." msgstr "" -#: modules/pam_mail/pam_mail.c:264 modules/pam_mail/pam_mail.c:276 -msgid "old" +#: modules/pam_mail/pam_mail.c:310 +msgid "You have new mail." msgstr "" -#: modules/pam_mail/pam_mail.c:266 modules/pam_mail/pam_mail.c:278 -#: modules/pam_mail/pam_mail.c:299 -msgid "no" +#: modules/pam_mail/pam_mail.c:313 +msgid "You have old mail." msgstr "" -#: modules/pam_mail/pam_mail.c:274 -msgid "new " +#: modules/pam_mail/pam_mail.c:317 +msgid "You have mail." msgstr "" -#: modules/pam_mail/pam_mail.c:300 -msgid "No mail." +#: modules/pam_mail/pam_mail.c:324 +#, c-format +msgid "You have no mail in folder %s." +msgstr "" + +#: modules/pam_mail/pam_mail.c:328 +#, c-format +msgid "You have mew mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:302 +#: modules/pam_mail/pam_mail.c:332 #, c-format -msgid "You have %smail." +msgid "You have old mail in folder %s." msgstr "" -#: modules/pam_mail/pam_mail.c:304 +#: modules/pam_mail/pam_mail.c:337 #, c-format -msgid "You have %s mail in %s." +msgid "You have mail in folder %s." msgstr "" #: modules/pam_unix/pam_unix_acct.c:274 modules/pam_unix/pam_unix_acct.c:301