Relevant BUGIDs: none

Purpose of commit: cleanup

Commit summary:
---------------

2005-12-07  Thorsten Kukuk  <kukuk@suse.de>

        * modules/pam_mail/pam_mail.c: Modify assembling of output
        for easier translation.

        * po/de.po: Translate new pam_mail messages.

16 files changed, 356 insertions, 280 deletions

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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 <t8m@centrum.cz>\n"
 "Language-Team: cs_CZ <cs@li.org>\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 <language@novell.com>\n"
 "Language-Team: Novell Language <language@novell.com>\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 <language@novell.com>\n"
 "Language-Team: Novell Language <language@novell.com>\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 <ilkka.pirskanen@kolumbus.fi>\n"
 "Language-Team: Finnish <fi@li.org>\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 <language@novell.com>\n"
 "Language-Team: Novell Language <language@novell.com>\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 <shirokuma@shirokuma.hu>\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 <language@novell.com>\n"
 "Language-Team: Novell Language <language@novell.com>\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 <language@novell.com>\n"
 "Language-Team: Novell Language <language@novell.com>\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 <olav.pet@online.no>\n"
 "Language-Team:  <nb@li.org>\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[ਆਲਮ] <amanpreetalam@yahoo.com>\n"
 "Language-Team: Panjabi <pa@li.org>\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 <pb@7bulls.com>\n"
 "Language-Team: Polish <i18n@suse.de>\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 <digiplan@netvisao.pt>\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 <language@novell.com>\n"
 "Language-Team: Novell Language <language@novell.com>\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 <language@novell.com>\n"
 "Language-Team: Novell Language <language@novell.com>\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 <language@novell.com>\n"
 "Language-Team: Novell Language <language@novell.com>\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