Relevant BUGIDs: none

Purpose of commit: bugfix Commit summary: --------------- pam_vsyslog: Restore errno after each asprintf. misc_conv.c: don't use special control characters, non-ascii terminal can run into problems with them. de.po: Translate some more strings. *.po: Adjust translations for misc_conv.c.
author: Thorsten Kukuk <kukuk@thkukuk.de> 2005-09-14 17:49:01 +0000
committer: Thorsten Kukuk <kukuk@thkukuk.de> 2005-09-14 17:49:01 +0000
commit: f690636933b7d212240b2ce09dddaea703f391c9 (patch)
tree: c3847f63fc17533d346e3e7a9de88b242c69dad3
parent: faf4e0e73632c500cc1380c882310d6965ebfaf8 (diff)
download: pam-f690636933b7d212240b2ce09dddaea703f391c9.tar.gz
pam-f690636933b7d212240b2ce09dddaea703f391c9.tar.bz2
pam-f690636933b7d212240b2ce09dddaea703f391c9.zip
19 files changed, 1265 insertions, 2994 deletions
diff --git a/CHANGELOG b/CHANGELOG
index bdecdb78..4ae55ca9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,29 +16,10 @@ TODO:
   - verify that the PAM_INCOMPLETE interface works (auth seems ok..)
   - add PAM_INCOMPLETE support to modules (partially added to pam_pwdb)
   - work on RFC.
-  - do we still need to remove openlog/closelog from modules..?
   - auth and acct support in pam_cracklib, "yes, I know the password
     you just typed was valid, I just don't think it was very strong..."
 
 ====================================================================
-Note, as of release 0.73, all checkins should be accompanied with a
-Bug ID. The bug IDs relate to sourceforge IDs.. (Of course, nothing is
-ever that simple. It turns out that at some point in Sourceforge's
-history all of the bug ids got bumped by 100000, so pretty much if you
-see a bug ID below that begins with a '1' and your attempted query
-fails, try adding 100000 to the number and trying again. I believe
-this only affects bugs before release 0.76.)
-
-You can query the related bug description with the following URL:
-
- http://sourceforge.net/tracker/index.php?func=detail&aid=XXXXXX&group_id=6663&atid=106663
-
-Where you should replace XXXXXX with a bug-id.
-
-For general documentation completion work, I'm doing it all with
-respect to specific tasks. Open tasks are listed here:
-
- http://sourceforge.net/pm/task.php?group_id=6663&group_project_id=2741&func=browse&set=open
 
 If you have found a bug in Linux-PAM (including a documentation bug,
 or a new feature request and/or patch), please consider filing such a
@@ -48,14 +29,6 @@ bug report - outstanding bugs are listed here:
 
 (to file another bug see the 'submit bug' button on that page).
 
-
-There is now a second bug tracking system for Linux-PAM on BerliOS.
-You can find the list of outstanding bugs on BerliOS here:
-
-http://developer.berlios.de/bugs/?func=browse&group_id=2134&set=open
-
-BerliOS Bugs are marked with (BerliOS #XXXX).
-
 ====================================================================
 
 0.81: please submit patches for this section with actual code/doc
diff --git a/libpam/pam_syslog.c b/libpam/pam_syslog.c
index 573e7e67..1dbb2f91 100644
--- a/libpam/pam_syslog.c
+++ b/libpam/pam_syslog.c
@@ -83,6 +83,7 @@ pam_vsyslog (const pam_handle_t *pamh, int priority,
 	}
     }
 
+  errno = save_errno;
   if (vasprintf (&msgbuf2, fmt, args) < 0)
     {
       syslog (LOG_AUTHPRIV|LOG_ERR, "vasprintf: %m");
diff --git a/libpam_misc/misc_conv.c b/libpam_misc/misc_conv.c
index dc8e1b2e..ded256b2 100644
--- a/libpam_misc/misc_conv.c
+++ b/libpam_misc/misc_conv.c
@@ -32,8 +32,8 @@
 time_t pam_misc_conv_warn_time = 0;                  /* time when we warn */
 time_t pam_misc_conv_die_time  = 0;               /* time when we timeout */
 
-const char *pam_misc_conv_warn_line = N_("..\a.Time is running out...\n");
-const char *pam_misc_conv_die_line  = N_("..\a.Sorry, your time is up!\n");
+const char *pam_misc_conv_warn_line = N_("...Time is running out...\n");
+const char *pam_misc_conv_die_line  = N_("...Sorry, your time is up!\n");
 
 int pam_misc_conv_died=0;       /* application can probe this for timeout */
 
diff --git a/po/Linux-PAM.pot b/po/Linux-PAM.pot
index 2b4a1c09..1ff05134 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-09-05 15:43+0200\n"
+"POT-Creation-Date: 2005-09-14 19:09+0200\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"
@@ -53,121 +53,59 @@ msgstr ""
 msgid "%s: Can't reset all users to non-zero\n"
 msgstr ""
 
-#: modules/pam_selinux/pam_selinux.c:127
+#: modules/pam_selinux/pam_selinux_check.c:99
 #, c-format
-msgid "Your default context is %s. \n"
+msgid "failed to initialize PAM\n"
 msgstr ""
 
-#: modules/pam_selinux/pam_selinux.c:130
-msgid "Do you want to choose a different one? [n]"
+#: modules/pam_selinux/pam_selinux_check.c:105
+#, c-format
+msgid "failed to pam_set_item()\n"
 msgstr ""
 
-#: modules/pam_selinux/pam_selinux.c:137
-msgid "Enter number of choice: "
+#: modules/pam_selinux/pam_selinux_check.c:132
+#, c-format
+msgid "login: failure forking: %s"
 msgstr ""
 
-#: modules/pam_selinux/pam_selinux.c:164 modules/pam_selinux/pam_selinux.c:245
-#: modules/pam_selinux/pam_selinux.c:352
+#: modules/pam_selinux/pam_selinux.c:102
 #, c-format
-msgid "%s: bogus conversation function"
+msgid "Your default context is %s. \n"
 msgstr ""
 
-#: modules/pam_selinux/pam_selinux.c:168 modules/pam_selinux/pam_selinux.c:249
-#: modules/pam_selinux/pam_selinux.c:356
-#, c-format
-msgid "%s: no conversation function"
+#: modules/pam_selinux/pam_selinux.c:105
+msgid "Do you want to choose a different one? [n]"
 msgstr ""
 
-#: modules/pam_selinux/pam_selinux.c:187
+#: modules/pam_selinux/pam_selinux.c:112
+msgid "Enter number of choice: "
+msgstr ""
+
+#: modules/pam_selinux/pam_selinux.c:152
 msgid "Would you like to enter a security context? [y] "
 msgstr ""
 
-#: modules/pam_selinux/pam_selinux.c:204
+#: modules/pam_selinux/pam_selinux.c:169
 msgid "role: "
 msgstr ""
 
-#: modules/pam_selinux/pam_selinux.c:212
+#: modules/pam_selinux/pam_selinux.c:177
 msgid "type: "
 msgstr ""
 
-#: modules/pam_selinux/pam_selinux.c:222
+#: modules/pam_selinux/pam_selinux.c:187
 msgid "level: "
 msgstr ""
 
-#: modules/pam_selinux/pam_selinux.c:236
+#: modules/pam_selinux/pam_selinux.c:203
 msgid "Not a valid security context"
 msgstr ""
 
-#: modules/pam_selinux/pam_selinux.c:272
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.\n"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:296
-#, c-format
-msgid "Warning!  Could not get current context for %s, not relabeling."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:303
-#, c-format
-msgid "Warning!  Could not get new context for %s, not relabeling."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:313
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.%s"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:429
-#, c-format
-msgid "Unable to get valid context for %s"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:433
-#, c-format
-msgid "Unable to get valid context for %s, No valid tty"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:465
+#: modules/pam_selinux/pam_selinux.c:416
 #, c-format
 msgid "Security Context %s Assigned"
 msgstr ""
 
-#: modules/pam_selinux/pam_selinux.c:469
-#, c-format
-msgid "Error!  Unable to set %s executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:475
-#, c-format
-msgid "%s: set %s security context to %s"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:518
-#, c-format
-msgid "Error!  Unable to set executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:524
-#, c-format
-msgid "%s: setcontext back to orginal"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:585
-#, c-format
-msgid "failed to initialize PAM\n"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:591
-#, c-format
-msgid "failed to pam_set_item()\n"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:616
-#, c-format
-msgid "login: failure forking: %s"
-msgstr ""
-
 #: modules/pam_unix/pam_unix_acct.c:268 modules/pam_unix/pam_unix_acct.c:295
 msgid "Your account has expired; please contact your system administrator"
 msgstr ""
@@ -227,19 +165,19 @@ msgstr ""
 msgid "Retype new UNIX password: "
 msgstr ""
 
-#: modules/pam_stress/pam_stress.c:481
+#: modules/pam_stress/pam_stress.c:474
 msgid "Changing STRESS password for "
 msgstr ""
 
-#: modules/pam_stress/pam_stress.c:495
+#: modules/pam_stress/pam_stress.c:488
 msgid "Enter new STRESS password: "
 msgstr ""
 
-#: modules/pam_stress/pam_stress.c:498
+#: modules/pam_stress/pam_stress.c:491
 msgid "Retype new STRESS password: "
 msgstr ""
 
-#: modules/pam_stress/pam_stress.c:526
+#: modules/pam_stress/pam_stress.c:519
 msgid "Verification mis-typed; password unchanged"
 msgstr ""
 
@@ -428,11 +366,11 @@ msgid "Unknown PAM error"
 msgstr ""
 
 #: libpam_misc/misc_conv.c:35
-msgid "..\007.Time is running out...\n"
+msgid "...Time is running out...\n"
 msgstr ""
 
 #: libpam_misc/misc_conv.c:36
-msgid "..\007.Sorry, your time is up!\n"
+msgid "...Sorry, your time is up!\n"
 msgstr ""
 
 #: libpam_misc/misc_conv.c:334
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 0bce7ba6..4705780e 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -35,7 +35,7 @@ mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
 GMSGFMT = @GMSGFMT@
 MSGFMT = @MSGFMT@
 XGETTEXT = @XGETTEXT@
-MSGMERGE = msgmerge -E
+MSGMERGE = msgmerge
 MSGMERGE_UPDATE = @MSGMERGE@ --update
 MSGINIT = msginit
 MSGCONV = msgconv
diff --git a/po/cs.po b/po/cs.po
index 91cf48dd..23c1f983 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-09-05 15:43+0200\n"
+"POT-Creation-Date: 2005-09-14 19:09+0200\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"
@@ -23,25 +23,25 @@ msgstr "Chyba autentizace"
 
 #: modules/pam_tally/pam_tally.c:731
 msgid "Service error"
-msgstr "Chyba slu\305\276by"
+msgstr "Chyba služby"
 
 #: modules/pam_tally/pam_tally.c:732
 msgid "Unknown user"
-msgstr "Nezn\303\241m\303\275 u\305\276ivatel"
+msgstr "Neznámý uživatel"
 
 #: modules/pam_tally/pam_tally.c:733
 msgid "Unknown error"
-msgstr "Nezn\303\241m\303\241 chyba"
+msgstr "Neznámá chyba"
 
 #: modules/pam_tally/pam_tally.c:747
 #, c-format
 msgid "%s: Bad number given to --reset=\n"
-msgstr "%s: Zad\303\241na \305\241patn\303\241 hodnota --reset=\n"
+msgstr "%s: Zadána špatná hodnota --reset=\n"
 
 #: modules/pam_tally/pam_tally.c:751
 #, c-format
 msgid "%s: Unrecognised option %s\n"
-msgstr "%s: Nezn\303\241m\303\241 volba %s\n"
+msgstr "%s: Neznámá volba %s\n"
 
 #: modules/pam_tally/pam_tally.c:763
 #, c-format
@@ -54,174 +54,104 @@ msgstr ""
 #: modules/pam_tally/pam_tally.c:836
 #, c-format
 msgid "%s: Can't reset all users to non-zero\n"
-msgstr "%s: Nelze resetovat v\305\241echny u\305\276ivatele nenulov\304\233\n"
+msgstr "%s: Nelze resetovat všechny uživatele nenulově\n"
 
-#: modules/pam_selinux/pam_selinux.c:127
+#: modules/pam_selinux/pam_selinux_check.c:99
 #, c-format
-msgid "Your default context is %s. \n"
-msgstr "V\303\241\305\241 v\303\275choz\303\255 kontext je %s. \n"
-
-#: modules/pam_selinux/pam_selinux.c:130
-msgid "Do you want to choose a different one? [n]"
-msgstr "Chcete zvolit jin\303\275? [n]"
+msgid "failed to initialize PAM\n"
+msgstr "chyba při inicializaci PAM\n"
 
-#: modules/pam_selinux/pam_selinux.c:137
-msgid "Enter number of choice: "
-msgstr "Zadejte \304\215\303\255slo volby: "
+#: modules/pam_selinux/pam_selinux_check.c:105
+#, c-format
+msgid "failed to pam_set_item()\n"
+msgstr "chyba pam_set_item()\n"
 
-#: modules/pam_selinux/pam_selinux.c:164 modules/pam_selinux/pam_selinux.c:245
-#: modules/pam_selinux/pam_selinux.c:352
+#: modules/pam_selinux/pam_selinux_check.c:132
 #, c-format
-msgid "%s: bogus conversation function"
-msgstr ""
+msgid "login: failure forking: %s"
+msgstr "login: chyba forku: %s"
 
-#: modules/pam_selinux/pam_selinux.c:168 modules/pam_selinux/pam_selinux.c:249
-#: modules/pam_selinux/pam_selinux.c:356
+#: modules/pam_selinux/pam_selinux.c:102
 #, c-format
-msgid "%s: no conversation function"
-msgstr ""
+msgid "Your default context is %s. \n"
+msgstr "Váš výchozí kontext je %s. \n"
 
-#: modules/pam_selinux/pam_selinux.c:187
+#: modules/pam_selinux/pam_selinux.c:105
+msgid "Do you want to choose a different one? [n]"
+msgstr "Chcete zvolit jiný? [n]"
+
+#: modules/pam_selinux/pam_selinux.c:112
+msgid "Enter number of choice: "
+msgstr "Zadejte číslo volby: "
+
+#: modules/pam_selinux/pam_selinux.c:152
 msgid "Would you like to enter a security context? [y] "
-msgstr "Chcete zadat bezpe\304\215nostn\303\255 kontext? [y]"
+msgstr "Chcete zadat bezpečnostní kontext? [y]"
 
-#: modules/pam_selinux/pam_selinux.c:204
+#: modules/pam_selinux/pam_selinux.c:169
 msgid "role: "
 msgstr "role: "
 
-#: modules/pam_selinux/pam_selinux.c:212
+#: modules/pam_selinux/pam_selinux.c:177
 msgid "type: "
 msgstr "typ: "
 
-#: modules/pam_selinux/pam_selinux.c:222
+#: modules/pam_selinux/pam_selinux.c:187
 msgid "level: "
-msgstr "\303\272rove\305\210: "
+msgstr "úroveň: "
 
-#: modules/pam_selinux/pam_selinux.c:236
+#: modules/pam_selinux/pam_selinux.c:203
 msgid "Not a valid security context"
-msgstr "Neplatn\303\275 bezpe\304\215nostn\303\255 kontext"
-
-#: modules/pam_selinux/pam_selinux.c:272
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.\n"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:296
-#, c-format
-msgid "Warning!  Could not get current context for %s, not relabeling."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:303
-#, c-format
-msgid "Warning!  Could not get new context for %s, not relabeling."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:313
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.%s"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:429
-#, c-format
-msgid "Unable to get valid context for %s"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:433
-#, c-format
-msgid "Unable to get valid context for %s, No valid tty"
-msgstr ""
+msgstr "Neplatný bezpečnostní kontext"
 
-#: modules/pam_selinux/pam_selinux.c:465
+#: modules/pam_selinux/pam_selinux.c:416
 #, c-format
 msgid "Security Context %s Assigned"
-msgstr "Bezpe\304\215nostn\303\255 kontext %s p\305\231id\304\233len"
-
-#: modules/pam_selinux/pam_selinux.c:469
-#, c-format
-msgid "Error!  Unable to set %s executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:475
-#, fuzzy, c-format
-msgid "%s: set %s security context to %s"
-msgstr "Neplatn\303\275 bezpe\304\215nostn\303\255 kontext"
-
-#: modules/pam_selinux/pam_selinux.c:518
-#, c-format
-msgid "Error!  Unable to set executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:524
-#, c-format
-msgid "%s: setcontext back to orginal"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:585
-#, c-format
-msgid "failed to initialize PAM\n"
-msgstr "chyba p\305\231i inicializaci PAM\n"
-
-#: modules/pam_selinux/pam_selinux.c:591
-#, c-format
-msgid "failed to pam_set_item()\n"
-msgstr "chyba pam_set_item()\n"
-
-#: modules/pam_selinux/pam_selinux.c:616
-#, c-format
-msgid "login: failure forking: %s"
-msgstr "login: chyba forku: %s"
+msgstr "Bezpečnostní kontext %s přidělen"
 
 #: modules/pam_unix/pam_unix_acct.c:268 modules/pam_unix/pam_unix_acct.c:295
 msgid "Your account has expired; please contact your system administrator"
-msgstr ""
-"V\303\241\305\241 \303\272\304\215et vypr\305\241el; kontaktujte pros\303"
-"\255m sv\303\251ho spr\303\241vce syst\303\251mu"
+msgstr "Váš účet vypršel; kontaktujte prosím svého správce systému"
 
 #: modules/pam_unix/pam_unix_acct.c:277
 msgid "You are required to change your password immediately (root enforced)"
-msgstr ""
-"Mus\303\255te okam\305\276it\304\233 zm\304\233nit sv\303\251 heslo "
-"(vynuceno rootem)"
+msgstr "Musíte okamžitě změnit své heslo (vynuceno rootem)"
 
 #: modules/pam_unix/pam_unix_acct.c:304
 msgid "You are required to change your password immediately (password aged)"
-msgstr ""
-"Mus\303\255te okam\305\276it\304\233 zm\304\233nit sv\303\251 heslo (heslo "
-"vypr\305\241elo)"
+msgstr "Musíte okamžitě změnit své heslo (heslo vypršelo)"
 
 #: modules/pam_unix/pam_unix_acct.c:314
 #, c-format
 msgid "Warning: your password will expire in %d day%.2s"
-msgstr ""
-"Varov\303\241n\303\255: Po\304\215et dn\303\255 do vypr\305\241en\303\255 "
-"hesla: %d %.0s"
+msgstr "Varování: Počet dní do vypršení hesla: %d %.0s"
 
 #: modules/pam_unix/pam_unix_auth.c:163
 #, fuzzy
 msgid "Password: "
-msgstr "Heslo nebylo zm\304\233n\304\233no"
+msgstr "Heslo nebylo změněno"
 
 #: modules/pam_unix/pam_unix_passwd.c:818
 msgid "NIS password could not be changed."
-msgstr "NIS heslo se nepoda\305\231ilo zm\304\233nit."
+msgstr "NIS heslo se nepodařilo změnit."
 
 #: modules/pam_unix/pam_unix_passwd.c:962
 #: modules/pam_cracklib/pam_cracklib.c:465
 msgid "No password supplied"
-msgstr "Nezad\303\241no heslo"
+msgstr "Nezadáno heslo"
 
 #: modules/pam_unix/pam_unix_passwd.c:962
 #: modules/pam_cracklib/pam_cracklib.c:465
 msgid "Password unchanged"
-msgstr "Heslo nebylo zm\304\233n\304\233no"
+msgstr "Heslo nebylo změněno"
 
 #: modules/pam_unix/pam_unix_passwd.c:983
 msgid "You must choose a longer password"
-msgstr "Mus\303\255te zvolit del\305\241\303\255 heslo"
+msgstr "Musíte zvolit delší heslo"
 
 #: modules/pam_unix/pam_unix_passwd.c:988
 msgid "Password has been already used. Choose another."
-msgstr "Heslo ji\305\276 bylo pou\305\276ito. Zvolte jin\303\251."
+msgstr "Heslo již bylo použito. Zvolte jiné."
 
 #: modules/pam_unix/pam_unix_passwd.c:1112
 msgid "(current) UNIX password: "
@@ -229,39 +159,38 @@ msgstr ""
 
 #: modules/pam_unix/pam_unix_passwd.c:1147
 msgid "You must wait longer to change your password"
-msgstr ""
-"Na zm\304\233nu sv\303\251ho hesla mus\303\255te po\304\215kat d\303\251le"
+msgstr "Na změnu svého hesla musíte počkat déle"
 
 #: modules/pam_unix/pam_unix_passwd.c:1207
 #, fuzzy
 msgid "Enter new UNIX password: "
-msgstr "Zadejte nov\303\251 STRESS heslo: "
+msgstr "Zadejte nové STRESS heslo: "
 
 #: modules/pam_unix/pam_unix_passwd.c:1208
 #, fuzzy
 msgid "Retype new UNIX password: "
 msgstr "Opakujte STRESS heslo: "
 
-#: modules/pam_stress/pam_stress.c:481
+#: modules/pam_stress/pam_stress.c:474
 msgid "Changing STRESS password for "
-msgstr "Zm\304\233na STRESS hesla pro"
+msgstr "Změna STRESS hesla pro"
 
-#: modules/pam_stress/pam_stress.c:495
+#: modules/pam_stress/pam_stress.c:488
 msgid "Enter new STRESS password: "
-msgstr "Zadejte nov\303\251 STRESS heslo: "
+msgstr "Zadejte nové STRESS heslo: "
 
-#: modules/pam_stress/pam_stress.c:498
+#: modules/pam_stress/pam_stress.c:491
 msgid "Retype new STRESS password: "
 msgstr "Opakujte STRESS heslo: "
 
-#: modules/pam_stress/pam_stress.c:526
+#: modules/pam_stress/pam_stress.c:519
 msgid "Verification mis-typed; password unchanged"
-msgstr "Chybn\303\251 potvrzen\303\255. Heslo nezm\304\233n\304\233no"
+msgstr "Chybné potvrzení. Heslo nezměněno"
 
 #: modules/pam_cracklib/pam_cracklib.c:61
 #, fuzzy, c-format
 msgid "New %s%spassword: "
-msgstr "Heslo nebylo zm\304\233n\304\233no"
+msgstr "Heslo nebylo změněno"
 
 #: modules/pam_cracklib/pam_cracklib.c:63
 #, fuzzy, c-format
@@ -271,7 +200,7 @@ msgstr "Opakujte STRESS heslo: "
 #: modules/pam_cracklib/pam_cracklib.c:64
 #, fuzzy
 msgid "Sorry, passwords do not match."
-msgstr "NIS heslo se nepoda\305\231ilo zm\304\233nit."
+msgstr "NIS heslo se nepodařilo změnit."
 
 #: modules/pam_cracklib/pam_cracklib.c:379
 msgid "is the same as the old one"
@@ -300,7 +229,7 @@ msgstr ""
 #: modules/pam_cracklib/pam_cracklib.c:437
 #, fuzzy
 msgid "has been already used"
-msgstr "Heslo ji\305\276 bylo pou\305\276ito. Zvolte jin\303\251."
+msgstr "Heslo již bylo použito. Zvolte jiné."
 
 #: modules/pam_cracklib/pam_cracklib.c:489
 #: modules/pam_cracklib/pam_cracklib.c:617
@@ -314,15 +243,15 @@ msgstr ""
 
 #: libpam/pam_strerror.c:13
 msgid "Success"
-msgstr "\303\232sp\304\233ch"
+msgstr "Úspěch"
 
 #: libpam/pam_strerror.c:15
 msgid "Critical error - immediate abort"
-msgstr "Kritick\303\241 chyba - okam\305\276it\303\251 ukon\304\215en\303\255"
+msgstr "Kritická chyba - okamžité ukončení"
 
 #: libpam/pam_strerror.c:17
 msgid "dlopen() failure"
-msgstr "Selh\303\241n\303\255 dlopen()"
+msgstr "Selhání dlopen()"
 
 #: libpam/pam_strerror.c:19
 msgid "Symbol not found"
@@ -330,90 +259,71 @@ msgstr "Symbol nenalezen"
 
 #: libpam/pam_strerror.c:21
 msgid "Error in service module"
-msgstr "Chyba v modulu slu\305\276by"
+msgstr "Chyba v modulu služby"
 
 #: libpam/pam_strerror.c:23
 msgid "System error"
-msgstr "Chyba syst\303\251mu"
+msgstr "Chyba systému"
 
 #: libpam/pam_strerror.c:25
 msgid "Memory buffer error"
-msgstr "Chyba alokace pam\304\233ti"
+msgstr "Chyba alokace paměti"
 
 #: libpam/pam_strerror.c:27
 msgid "Permission denied"
-msgstr "P\305\231\303\255stup zam\303\255tnut"
+msgstr "Přístup zamítnut"
 
 #: libpam/pam_strerror.c:29
 msgid "Authentication failure"
-msgstr "Selh\303\241n\303\255 autentizace"
+msgstr "Selhání autentizace"
 
 #: libpam/pam_strerror.c:31
 msgid "Insufficient credentials to access authentication data"
-msgstr ""
-"Nedostate\304\215n\303\241 opr\303\241vn\304\233n\303\255 pro p\305\231\303"
-"\255stup k autentiza\304\215n\303\255m dat\305\257m"
+msgstr "Nedostatečná oprávnění pro přístup k autentizačním datům"
 
 #: libpam/pam_strerror.c:33
 msgid "Authentication service cannot retrieve authentication info."
-msgstr ""
-"Autentiza\304\215n\303\255 slu\305\276ba nem\305\257\305\276e z\303\255skat "
-"informace pro autentizaci."
+msgstr "Autentizační služba nemůže získat informace pro autentizaci."
 
 #: libpam/pam_strerror.c:35
 msgid "User not known to the underlying authentication module"
-msgstr ""
-"U\305\276ivatel nen\303\255 zn\303\241m pou\305\276it\303\251mu autentiza\304"
-"\215n\303\255mu modulu"
+msgstr "Uživatel není znám použitému autentizačnímu modulu"
 
 #: libpam/pam_strerror.c:37
 msgid "Have exhausted maximum number of retries for service."
-msgstr ""
-"Vy\304\215erp\303\241n maxim\303\241ln\303\255 po\304\215et pokus\305\257 "
-"pro slu\305\276bu."
+msgstr "Vyčerpán maximální počet pokusů pro službu."
 
 #: libpam/pam_strerror.c:39
 msgid "Authentication token is no longer valid; new one required."
-msgstr ""
-"Autentiza\304\215n\303\255 token ji\305\276 nen\303\255 platn\303\275; vy\305"
-"\276adov\303\241n nov\303\275."
+msgstr "Autentizační token již není platný; vyžadován nový."
 
 #: libpam/pam_strerror.c:41
 msgid "User account has expired"
-msgstr "U\305\276ivatelsk\303\275 \303\272\304\215et vypr\305\241el"
+msgstr "Uživatelský účet vypršel"
 
 #: libpam/pam_strerror.c:43
 msgid "Cannot make/remove an entry for the specified session"
-msgstr ""
-"Pro zadan\303\251 sezen\303\255 nelze vytvo\305\231it/odstranit z\303\241znam"
+msgstr "Pro zadané sezení nelze vytvořit/odstranit záznam"
 
 #: libpam/pam_strerror.c:45
 msgid "Authentication service cannot retrieve user credentials"
-msgstr ""
-"Autentiza\304\215n\303\255 slu\305\276ba nem\305\257\305\276e z\303\255skat "
-"\303\272daje o opr\303\241vn\304\233n\303\255ch u\305\276ivatele"
+msgstr "Autentizační služba nemůže získat údaje o oprávněních uživatele"
 
 #: libpam/pam_strerror.c:47
 msgid "User credentials expired"
-msgstr ""
-"\303\232daje o opr\303\241vn\304\233n\303\255ch u\305\276ivatele vypr\305"
-"\241ely"
+msgstr "Údaje o oprávněních uživatele vypršely"
 
 #: libpam/pam_strerror.c:49
 msgid "Failure setting user credentials"
-msgstr ""
-"Chyba p\305\231i nastaven\303\255 \303\272daj\305\257 o opr\303\241vn\304"
-"\233n\303\255ch u\305\276ivatele"
+msgstr "Chyba při nastavení údajů o oprávněních uživatele"
 
 #: libpam/pam_strerror.c:51
 msgid "No module specific data is present"
-msgstr "Nelze naj\303\255t data pot\305\231ebn\303\241 pro modul"
+msgstr "Nelze najít data potřebná pro modul"
 
 #: libpam/pam_strerror.c:53
 msgid "Bad item passed to pam_*_item()"
-msgstr ""
-"Funkci pam_*_item() byla p\305\231ed\303\241na \305\241patn\303\241 polo\305"
-"\276ka"
+msgstr "Funkci pam_*_item() byla předána špatná položka"
 
 #: libpam/pam_strerror.c:55
 msgid "Conversation error"
@@ -421,63 +331,61 @@ msgstr "Chyba konverzace"
 
 #: libpam/pam_strerror.c:57
 msgid "Authentication token manipulation error"
-msgstr "Chyba manipulace s autentiza\304\215n\303\255m tokenem"
+msgstr "Chyba manipulace s autentizačním tokenem"
 
 #: libpam/pam_strerror.c:59
 msgid "Authentication information cannot be recovered"
-msgstr "Autentiza\304\215n\303\255 informace nelze z\303\255skat"
+msgstr "Autentizační informace nelze získat"
 
 #: libpam/pam_strerror.c:61
 msgid "Authentication token lock busy"
-msgstr "Autentiza\304\215n\303\255 token je uzam\304\215en"
+msgstr "Autentizační token je uzamčen"
 
 #: libpam/pam_strerror.c:63
 msgid "Authentication token aging disabled"
-msgstr ""
-"St\303\241rnut\303\255 autentiza\304\215n\303\255ho tokenu zak\303\241z\303"
-"\241no"
+msgstr "Stárnutí autentizačního tokenu zakázáno"
 
 #: libpam/pam_strerror.c:65
 msgid "Failed preliminary check by password service"
-msgstr ""
-"Selh\303\241n\303\255 p\305\231edb\304\233\305\276n\303\251 kontroly ve slu"
-"\305\276b\304\233 hesla"
+msgstr "Selhání předběžné kontroly ve službě hesla"
 
 #: libpam/pam_strerror.c:67
 msgid "The return value should be ignored by PAM dispatch"
-msgstr ""
-"N\303\241vratov\303\241 hodnota by m\304\233la b\303\275t ignorov\303\241na "
-"rozhodovac\303\255m mechanismem PAM"
+msgstr "Návratová hodnota by měla být ignorována rozhodovacím mechanismem PAM"
 
 #: libpam/pam_strerror.c:69
 msgid "Module is unknown"
-msgstr "Nezn\303\241m\303\275 modul"
+msgstr "Neznámý modul"
 
 #: libpam/pam_strerror.c:71
 msgid "Authentication token expired"
-msgstr "Autentiza\304\215n\303\255 token vypr\305\241el"
+msgstr "Autentizační token vypršel"
 
 #: libpam/pam_strerror.c:73
 msgid "Conversation is waiting for event"
-msgstr "Konverzace \304\215ek\303\241 na ud\303\241lost"
+msgstr "Konverzace čeká na událost"
 
 #: libpam/pam_strerror.c:75
 msgid "Application needs to call libpam again"
-msgstr "Aplikace mus\303\255 znovu zavolat libpam"
+msgstr "Aplikace musí znovu zavolat libpam"
 
 #: libpam/pam_strerror.c:78
 msgid "Unknown PAM error"
-msgstr "Nezn\303\241m\303\241 chyba PAM"
+msgstr "Neznámá chyba PAM"
 
 #: libpam_misc/misc_conv.c:35
-msgid "..\007.Time is running out...\n"
-msgstr "..\007.Odpo\304\215et byl spu\305\241t\304\233n...\n"
+msgid "...Time is running out...\n"
+msgstr "..Odpočet byl spuštěn...\n"
 
 #: libpam_misc/misc_conv.c:36
-msgid "..\007.Sorry, your time is up!\n"
-msgstr "..\007.\304\214as vypr\305\241el!\n"
+msgid "...Sorry, your time is up!\n"
+msgstr "...Čas vypršel!\n"
 
 #: libpam_misc/misc_conv.c:334
 #, c-format
 msgid "erroneous conversation (%d)\n"
-msgstr "nespr\303\241vn\303\241 konverzace (%d)\n"
+msgstr "nesprávná konverzace (%d)\n"
+
+#, fuzzy
+#~ msgid "%s: set %s security context to %s"
+#~ msgstr "Neplatný bezpečnostní kontext"
diff --git a/po/de.po b/po/de.po
index dd72a2a3..4bf99298 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-09-05 15:43+0200\n"
-"PO-Revision-Date: 2005-08-17 16:50+0000\n"
+"POT-Creation-Date: 2005-09-14 19:09+0200\n"
+"PO-Revision-Date: 2005-09-14 19:44+02:00\n"
 "Last-Translator: Novell Language <language@novell.com>\n"
 "Language-Team: Novell Language <language@novell.com>\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgstr "Unbekannter Fehler"
 #: modules/pam_tally/pam_tally.c:747
 #, c-format
 msgid "%s: Bad number given to --reset=\n"
-msgstr "%s: Ung\303\274ltige Nummer f\303\274r --reset=\n"
+msgstr "%s: Ungültige Nummer für --reset=\n"
 
 #: modules/pam_tally/pam_tally.c:751
 #, c-format
@@ -52,150 +52,85 @@ msgstr ""
 #, c-format
 msgid "%s: Can't reset all users to non-zero\n"
 msgstr ""
-"%s: Es k\303\266nnen nicht alle Benutzer auf Nicht-null zur\303\274ckgesetzt "
-"werden\n"
+"%s: Es können nicht alle Benutzer auf Nicht-null zurückgesetzt werden\n"
 
-#: modules/pam_selinux/pam_selinux.c:127
+#: modules/pam_selinux/pam_selinux_check.c:99
+#, c-format
+msgid "failed to initialize PAM\n"
+msgstr "Fehler beim Initialisieren von PAM\n"
+
+#: modules/pam_selinux/pam_selinux_check.c:105
+#, c-format
+msgid "failed to pam_set_item()\n"
+msgstr "Fehler bei pam_set_item()\n"
+
+#: modules/pam_selinux/pam_selinux_check.c:132
+#, c-format
+msgid "login: failure forking: %s"
+msgstr "Anmeldung: Fehler bei Abspaltung: %s"
+
+#: modules/pam_selinux/pam_selinux.c:102
 #, c-format
 msgid "Your default context is %s. \n"
 msgstr "Ihr Standardkontext lautet %s. \n"
 
-#: modules/pam_selinux/pam_selinux.c:130
+#: modules/pam_selinux/pam_selinux.c:105
 msgid "Do you want to choose a different one? [n]"
-msgstr "M\303\266chten Sie einen anderen ausw\303\244hlen? [n]"
+msgstr "Möchten Sie einen anderen auswählen? [n]"
 
-#: modules/pam_selinux/pam_selinux.c:137
+#: modules/pam_selinux/pam_selinux.c:112
 msgid "Enter number of choice: "
-msgstr "Geben Sie die gew\303\274nschte Nummer ein:"
-
-#: modules/pam_selinux/pam_selinux.c:164 modules/pam_selinux/pam_selinux.c:245
-#: modules/pam_selinux/pam_selinux.c:352
-#, c-format
-msgid "%s: bogus conversation function"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:168 modules/pam_selinux/pam_selinux.c:249
-#: modules/pam_selinux/pam_selinux.c:356
-#, c-format
-msgid "%s: no conversation function"
-msgstr ""
+msgstr "Geben Sie die gewünschte Nummer ein:"
 
-#: modules/pam_selinux/pam_selinux.c:187
+#: modules/pam_selinux/pam_selinux.c:152
 msgid "Would you like to enter a security context? [y] "
-msgstr "M\303\266chten Sie einen Sicherheitskontext eingeben? [j]"
+msgstr "Möchten Sie einen Sicherheitskontext eingeben? [j]"
 
-#: modules/pam_selinux/pam_selinux.c:204
+#: modules/pam_selinux/pam_selinux.c:169
 msgid "role: "
 msgstr "Funktion:"
 
-#: modules/pam_selinux/pam_selinux.c:212
+#: modules/pam_selinux/pam_selinux.c:177
 msgid "type: "
 msgstr "Typ:"
 
-#: modules/pam_selinux/pam_selinux.c:222
+#: modules/pam_selinux/pam_selinux.c:187
 msgid "level: "
 msgstr "Stufe:"
 
-#: modules/pam_selinux/pam_selinux.c:236
+#: modules/pam_selinux/pam_selinux.c:203
 msgid "Not a valid security context"
-msgstr "Kein g\303\274ltiger Sicherheitskontext"
+msgstr "Kein gültiger Sicherheitskontext"
 
-#: modules/pam_selinux/pam_selinux.c:272
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.\n"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:296
-#, c-format
-msgid "Warning!  Could not get current context for %s, not relabeling."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:303
-#, c-format
-msgid "Warning!  Could not get new context for %s, not relabeling."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:313
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.%s"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:429
-#, c-format
-msgid "Unable to get valid context for %s"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:433
-#, c-format
-msgid "Unable to get valid context for %s, No valid tty"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:465
+#: modules/pam_selinux/pam_selinux.c:416
 #, c-format
 msgid "Security Context %s Assigned"
 msgstr "Sicherheitskontext %s zugewiesen"
 
-#: modules/pam_selinux/pam_selinux.c:469
-#, c-format
-msgid "Error!  Unable to set %s executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:475
-#, fuzzy, c-format
-msgid "%s: set %s security context to %s"
-msgstr "Kein g\303\274ltiger Sicherheitskontext"
-
-#: modules/pam_selinux/pam_selinux.c:518
-#, c-format
-msgid "Error!  Unable to set executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:524
-#, c-format
-msgid "%s: setcontext back to orginal"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:585
-#, c-format
-msgid "failed to initialize PAM\n"
-msgstr "Fehler beim Initialisieren von PAM\n"
-
-#: modules/pam_selinux/pam_selinux.c:591
-#, c-format
-msgid "failed to pam_set_item()\n"
-msgstr "Fehler bei pam_set_item()\n"
-
-#: modules/pam_selinux/pam_selinux.c:616
-#, c-format
-msgid "login: failure forking: %s"
-msgstr "Anmeldung: Fehler bei Abspaltung: %s"
-
 #: modules/pam_unix/pam_unix_acct.c:268 modules/pam_unix/pam_unix_acct.c:295
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Ihr Konto ist abgelaufen. Wenden Sie sich an den Systemadministrator"
 
 #: modules/pam_unix/pam_unix_acct.c:277
 msgid "You are required to change your password immediately (root enforced)"
-msgstr ""
-"Sie m\303\274ssen Ihr Passwort sofort \303\244ndern (von Root erzwungen)."
+msgstr "Sie müssen Ihr Passwort sofort ändern (von Root erzwungen)."
 
 #: modules/pam_unix/pam_unix_acct.c:304
 msgid "You are required to change your password immediately (password aged)"
-msgstr "Sie m\303\274ssen Ihr Passwort sofort \303\244ndern (Passwortablauf)."
+msgstr "Sie müssen Ihr Passwort sofort ändern (Passwortablauf)."
 
 #: modules/pam_unix/pam_unix_acct.c:314
 #, c-format
 msgid "Warning: your password will expire in %d day%.2s"
-msgstr "Warnung: Ihr Passwort l\303\244uft in %d Tag%.2s(en) ab."
+msgstr "Warnung: Ihr Passwort läuft in %d Tag%.2s(en) ab."
 
 #: modules/pam_unix/pam_unix_auth.c:163
-#, fuzzy
 msgid "Password: "
-msgstr "Passwort nicht ge\303\244ndert"
+msgstr "Passwort: "
 
 #: modules/pam_unix/pam_unix_passwd.c:818
 msgid "NIS password could not be changed."
-msgstr "\303\204nderung des NIS-Passworts nicht m\303\266glich."
+msgstr "Änderung des NIS-Passworts nicht möglich."
 
 #: modules/pam_unix/pam_unix_passwd.c:962
 #: modules/pam_cracklib/pam_cracklib.c:465
@@ -205,73 +140,69 @@ msgstr "Kein Passwort angegeben"
 #: modules/pam_unix/pam_unix_passwd.c:962
 #: modules/pam_cracklib/pam_cracklib.c:465
 msgid "Password unchanged"
-msgstr "Passwort nicht ge\303\244ndert"
+msgstr "Passwort nicht geändert"
 
 #: modules/pam_unix/pam_unix_passwd.c:983
 msgid "You must choose a longer password"
-msgstr "Sie m\303\274ssen ein l\303\244ngeres Passwort ausw\303\244hlen."
+msgstr "Sie müssen ein längeres Passwort auswählen."
 
 #: modules/pam_unix/pam_unix_passwd.c:988
 msgid "Password has been already used. Choose another."
-msgstr "Passwort wurde bereits verwendet. W\303\244hlen Sie ein anderes aus."
+msgstr "Passwort wurde bereits verwendet. Wählen Sie ein anderes aus."
 
 #: modules/pam_unix/pam_unix_passwd.c:1112
 msgid "(current) UNIX password: "
-msgstr ""
+msgstr "(aktuelles) UNIX Passwort: "
 
 #: modules/pam_unix/pam_unix_passwd.c:1147
 msgid "You must wait longer to change your password"
-msgstr "Sie k\303\266nnen Ihr Passwort noch nicht \303\244ndern."
+msgstr "Sie können Ihr Passwort noch nicht ändern."
 
 #: modules/pam_unix/pam_unix_passwd.c:1207
-#, fuzzy
 msgid "Enter new UNIX password: "
-msgstr "Geben Sie ein neues STRESS-Passwort ein:"
+msgstr "Geben Sie ein neues UNIX Passwort ein: "
 
 #: modules/pam_unix/pam_unix_passwd.c:1208
-#, fuzzy
 msgid "Retype new UNIX password: "
-msgstr "Geben Sie das neue STRESS-Passwort erneut ein:"
+msgstr "Geben Sie das neue UNIX Passwort erneut ein: "
 
-#: modules/pam_stress/pam_stress.c:481
+#: modules/pam_stress/pam_stress.c:474
 msgid "Changing STRESS password for "
-msgstr "\303\204ndern des STRESS-Passworts f\303\274r"
+msgstr "Ändern des STRESS-Passworts für"
 
-#: modules/pam_stress/pam_stress.c:495
+#: modules/pam_stress/pam_stress.c:488
 msgid "Enter new STRESS password: "
 msgstr "Geben Sie ein neues STRESS-Passwort ein:"
 
-#: modules/pam_stress/pam_stress.c:498
+#: modules/pam_stress/pam_stress.c:491
 msgid "Retype new STRESS password: "
 msgstr "Geben Sie das neue STRESS-Passwort erneut ein:"
 
-#: modules/pam_stress/pam_stress.c:526
+#: modules/pam_stress/pam_stress.c:519
 msgid "Verification mis-typed; password unchanged"
-msgstr ""
-"Best\303\244tigungspasswort falsch eingegeben; Passwort nicht ge\303\244ndert"
+msgstr "Bestätigungspasswort falsch eingegeben; Passwort nicht geändert"
 
 #: modules/pam_cracklib/pam_cracklib.c:61
-#, fuzzy, c-format
+#, c-format
 msgid "New %s%spassword: "
-msgstr "Passwort nicht ge\303\244ndert"
+msgstr "Geben sie ein neues %s%sPasswort ein: "
 
 #: modules/pam_cracklib/pam_cracklib.c:63
-#, fuzzy, c-format
+#, c-format
 msgid "Retype new %s%spassword: "
-msgstr "Geben Sie das neue STRESS-Passwort erneut ein:"
+msgstr "Geben sie das neue %s%sPasswort erneut ein: "
 
 #: modules/pam_cracklib/pam_cracklib.c:64
-#, fuzzy
 msgid "Sorry, passwords do not match."
-msgstr "\303\204nderung des NIS-Passworts nicht m\303\266glich."
+msgstr ""
 
 #: modules/pam_cracklib/pam_cracklib.c:379
 msgid "is the same as the old one"
-msgstr ""
+msgstr "ist das gleiche wie das Alte"
 
 #: modules/pam_cracklib/pam_cracklib.c:390
 msgid "is a palindrome"
-msgstr ""
+msgstr "ist ein Palindrome"
 
 #: modules/pam_cracklib/pam_cracklib.c:393
 msgid "case changes only"
@@ -290,19 +221,18 @@ msgid "is rotated"
 msgstr ""
 
 #: modules/pam_cracklib/pam_cracklib.c:437
-#, fuzzy
 msgid "has been already used"
-msgstr "Passwort wurde bereits verwendet. W\303\244hlen Sie ein anderes aus."
+msgstr "es wurde bereits verwendet"
 
 #: modules/pam_cracklib/pam_cracklib.c:489
 #: modules/pam_cracklib/pam_cracklib.c:617
 #, c-format
 msgid "BAD PASSWORD: %s"
-msgstr ""
+msgstr "Schlechtes Passwort: %s"
 
 #: libpam/pam_item.c:268
 msgid "login:"
-msgstr ""
+msgstr "login:"
 
 #: libpam/pam_strerror.c:13
 msgid "Success"
@@ -343,7 +273,7 @@ msgstr "Fehler bei Authentifizierung."
 #: libpam/pam_strerror.c:31
 msgid "Insufficient credentials to access authentication data"
 msgstr ""
-"Berechtigungsnachweis f\303\274r Zugriff auf Authentifizierungsdaten nicht "
+"Berechtigungsnachweis für Zugriff auf Authentifizierungsdaten nicht "
 "ausreichend"
 
 #: libpam/pam_strerror.c:33
@@ -357,12 +287,11 @@ msgstr "Benutzer bei zu Grunde liegendem Authentifizierungsmodul nicht bekannt"
 
 #: libpam/pam_strerror.c:37
 msgid "Have exhausted maximum number of retries for service."
-msgstr "Maximale Anzahl an Versuchen f\303\274r den Dienst erreicht."
+msgstr "Maximale Anzahl an Versuchen für den Dienst erreicht."
 
 #: libpam/pam_strerror.c:39
 msgid "Authentication token is no longer valid; new one required."
-msgstr ""
-"Authentifizierungs-Token ist nicht mehr g\303\274ltig; neues erforderlich."
+msgstr "Authentifizierungs-Token ist nicht mehr gültig; neues erforderlich."
 
 #: libpam/pam_strerror.c:41
 msgid "User account has expired"
@@ -371,8 +300,7 @@ msgstr "Benutzerkonto ist abgelaufen."
 #: libpam/pam_strerror.c:43
 msgid "Cannot make/remove an entry for the specified session"
 msgstr ""
-"Erstellen/Entfernen eines Eintrags f\303\274r die angegebene Sitzung nicht m"
-"\303\266glich"
+"Erstellen/Entfernen eines Eintrags für die angegebene Sitzung nicht möglich"
 
 #: libpam/pam_strerror.c:45
 msgid "Authentication service cannot retrieve user credentials"
@@ -392,7 +320,7 @@ msgstr "Keine modulspezifischen Daten vorhanden"
 
 #: libpam/pam_strerror.c:53
 msgid "Bad item passed to pam_*_item()"
-msgstr "Ung\303\274ltiges Element an pam_*_item() \303\274bergeben"
+msgstr "Ungültiges Element an pam_*_item() übergeben"
 
 #: libpam/pam_strerror.c:55
 msgid "Conversation error"
@@ -400,20 +328,19 @@ msgstr "Kommunikationsfehler"
 
 #: libpam/pam_strerror.c:57
 msgid "Authentication token manipulation error"
-msgstr "Fehler beim \303\204ndern des Authentifizierungs-Token"
+msgstr "Fehler beim Ändern des Authentifizierungs-Token"
 
 #: libpam/pam_strerror.c:59
 msgid "Authentication information cannot be recovered"
-msgstr ""
-"Authentifizierungsinformationen k\303\266nnen nicht wiederhergestellt werden"
+msgstr "Authentifizierungsinformationen können nicht wiederhergestellt werden"
 
 #: libpam/pam_strerror.c:61
 msgid "Authentication token lock busy"
-msgstr "Sperre f\303\274r Authentifizierungs-Token belegt"
+msgstr "Sperre für Authentifizierungs-Token belegt"
 
 #: libpam/pam_strerror.c:63
 msgid "Authentication token aging disabled"
-msgstr "Zeitablauf f\303\274r Authentifizierungs-Token deaktiviert"
+msgstr "Zeitablauf für Authentifizierungs-Token deaktiviert"
 
 #: libpam/pam_strerror.c:65
 msgid "Failed preliminary check by password service"
@@ -421,7 +348,7 @@ msgstr "Vorabtest durch Passwortdienst gescheitert"
 
 #: libpam/pam_strerror.c:67
 msgid "The return value should be ignored by PAM dispatch"
-msgstr "Der R\303\274ckgabewert sollte von PAM-Dispatch ignoriert werden"
+msgstr "Der Rückgabewert sollte von PAM-Dispatch ignoriert werden"
 
 #: libpam/pam_strerror.c:69
 msgid "Module is unknown"
@@ -444,14 +371,18 @@ msgid "Unknown PAM error"
 msgstr "Unbekannter PAM-Fehler"
 
 #: libpam_misc/misc_conv.c:35
-msgid "..\007.Time is running out...\n"
-msgstr "..\007.Time l\303\244uft ab...\n"
+msgid "...Time is running out...\n"
+msgstr "...Time läuft ab...\n"
 
 #: libpam_misc/misc_conv.c:36
-msgid "..\007.Sorry, your time is up!\n"
-msgstr "..\007.Ihre Zeit ist abgelaufen.\n"
+msgid "...Sorry, your time is up!\n"
+msgstr "...Ihre Zeit ist abgelaufen.\n"
 
 #: libpam_misc/misc_conv.c:334
 #, c-format
 msgid "erroneous conversation (%d)\n"
 msgstr "fehlerhafte Kommunikation (%d)\n"
+
+#, 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 1a8be632..f36efbb8 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-09-05 15:43+0200\n"
+"POT-Creation-Date: 2005-09-14 19:09+0200\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"
@@ -17,7 +17,7 @@ msgstr ""
 
 #: modules/pam_tally/pam_tally.c:730
 msgid "Authentication error"
-msgstr "Error de autenticaci\303\263n"
+msgstr "Error de autenticación"
 
 #: modules/pam_tally/pam_tally.c:731
 msgid "Service error"
@@ -34,193 +34,126 @@ msgstr "Error desconocido"
 #: modules/pam_tally/pam_tally.c:747
 #, c-format
 msgid "%s: Bad number given to --reset=\n"
-msgstr "%s: N\303\272mero incorrecto proporcionado a --reset=\n"
+msgstr "%s: Número incorrecto proporcionado a --reset=\n"
 
 #: modules/pam_tally/pam_tally.c:751
 #, c-format
 msgid "%s: Unrecognised option %s\n"
-msgstr "%s: Opci\303\263n no reconocida %s\n"
+msgstr "%s: Opción no reconocida %s\n"
 
 #: modules/pam_tally/pam_tally.c:763
 #, c-format
 msgid ""
 "%s: [--file rooted-filename] [--user username] [--reset[=n]] [--quiet]\n"
 msgstr ""
-"%s: [--file nombre de archivo-ra\303\255z] [--user nombre de usuario] [--"
-"reset[=n]] [--quiet]\n"
+"%s: [--file nombre de archivo-raíz] [--user nombre de usuario] [--reset[=n]] "
+"[--quiet]\n"
 
 #: modules/pam_tally/pam_tally.c:836
 #, c-format
 msgid "%s: Can't reset all users to non-zero\n"
 msgstr ""
-"%s: No es posible restaurar a todos los usuarios a un n\303\272mero distinto "
-"de cero\n"
+"%s: No es posible restaurar a todos los usuarios a un número distinto de "
+"cero\n"
 
-#: modules/pam_selinux/pam_selinux.c:127
+#: modules/pam_selinux/pam_selinux_check.c:99
+#, c-format
+msgid "failed to initialize PAM\n"
+msgstr "error al iniciar PAM\n"
+
+#: modules/pam_selinux/pam_selinux_check.c:105
+#, c-format
+msgid "failed to pam_set_item()\n"
+msgstr "error en pam_set_item()\n"
+
+#: modules/pam_selinux/pam_selinux_check.c:132
+#, c-format
+msgid "login: failure forking: %s"
+msgstr "inicio de sesión: error en horquilla: %s"
+
+#: modules/pam_selinux/pam_selinux.c:102
 #, c-format
 msgid "Your default context is %s. \n"
 msgstr "El contexto predeterminado es %s. \n"
 
-#: modules/pam_selinux/pam_selinux.c:130
+#: modules/pam_selinux/pam_selinux.c:105
 msgid "Do you want to choose a different one? [n]"
-msgstr "\302\277Desea seleccionar uno distinto? [n]"
+msgstr "¿Desea seleccionar uno distinto? [n]"
 
-#: modules/pam_selinux/pam_selinux.c:137
+#: modules/pam_selinux/pam_selinux.c:112
 msgid "Enter number of choice: "
-msgstr "Introduzca el n\303\272mero de su elecci\303\263n:"
-
-#: modules/pam_selinux/pam_selinux.c:164 modules/pam_selinux/pam_selinux.c:245
-#: modules/pam_selinux/pam_selinux.c:352
-#, c-format
-msgid "%s: bogus conversation function"
-msgstr ""
+msgstr "Introduzca el número de su elección:"
 
-#: modules/pam_selinux/pam_selinux.c:168 modules/pam_selinux/pam_selinux.c:249
-#: modules/pam_selinux/pam_selinux.c:356
-#, c-format
-msgid "%s: no conversation function"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:187
+#: modules/pam_selinux/pam_selinux.c:152
 msgid "Would you like to enter a security context? [y] "
-msgstr "\302\277Desea introducir un contexto de seguridad? [s]"
+msgstr "¿Desea introducir un contexto de seguridad? [s]"
 
-#: modules/pam_selinux/pam_selinux.c:204
+#: modules/pam_selinux/pam_selinux.c:169
 msgid "role: "
-msgstr "funci\303\263n:"
+msgstr "función:"
 
-#: modules/pam_selinux/pam_selinux.c:212
+#: modules/pam_selinux/pam_selinux.c:177
 msgid "type: "
 msgstr "tipo:"
 
-#: modules/pam_selinux/pam_selinux.c:222
+#: modules/pam_selinux/pam_selinux.c:187
 msgid "level: "
 msgstr "nivel:"
 
-#: modules/pam_selinux/pam_selinux.c:236
+#: modules/pam_selinux/pam_selinux.c:203
 msgid "Not a valid security context"
-msgstr "No es un contexto de seguridad v\303\241lido"
-
-#: modules/pam_selinux/pam_selinux.c:272
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.\n"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:296
-#, c-format
-msgid "Warning!  Could not get current context for %s, not relabeling."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:303
-#, c-format
-msgid "Warning!  Could not get new context for %s, not relabeling."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:313
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.%s"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:429
-#, c-format
-msgid "Unable to get valid context for %s"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:433
-#, c-format
-msgid "Unable to get valid context for %s, No valid tty"
-msgstr ""
+msgstr "No es un contexto de seguridad válido"
 
-#: modules/pam_selinux/pam_selinux.c:465
+#: modules/pam_selinux/pam_selinux.c:416
 #, c-format
 msgid "Security Context %s Assigned"
 msgstr "Contexto de seguridad %s asignado"
 
-#: modules/pam_selinux/pam_selinux.c:469
-#, c-format
-msgid "Error!  Unable to set %s executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:475
-#, fuzzy, c-format
-msgid "%s: set %s security context to %s"
-msgstr "No es un contexto de seguridad v\303\241lido"
-
-#: modules/pam_selinux/pam_selinux.c:518
-#, c-format
-msgid "Error!  Unable to set executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:524
-#, c-format
-msgid "%s: setcontext back to orginal"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:585
-#, c-format
-msgid "failed to initialize PAM\n"
-msgstr "error al iniciar PAM\n"
-
-#: modules/pam_selinux/pam_selinux.c:591
-#, c-format
-msgid "failed to pam_set_item()\n"
-msgstr "error en pam_set_item()\n"
-
-#: modules/pam_selinux/pam_selinux.c:616
-#, c-format
-msgid "login: failure forking: %s"
-msgstr "inicio de sesi\303\263n: error en horquilla: %s"
-
 #: modules/pam_unix/pam_unix_acct.c:268 modules/pam_unix/pam_unix_acct.c:295
 msgid "Your account has expired; please contact your system administrator"
 msgstr ""
-"La cuenta ha caducado, p\303\263ngase en contacto con el administrador del "
-"sistema"
+"La cuenta ha caducado, póngase en contacto con el administrador del sistema"
 
 #: modules/pam_unix/pam_unix_acct.c:277
 msgid "You are required to change your password immediately (root enforced)"
 msgstr ""
-"Debe cambiar la contrase\303\261a inmediatamente (aplicado por el usuario "
-"root)"
+"Debe cambiar la contraseña inmediatamente (aplicado por el usuario root)"
 
 #: modules/pam_unix/pam_unix_acct.c:304
 msgid "You are required to change your password immediately (password aged)"
-msgstr ""
-"Debe cambiar la contrase\303\261a inmediatamente (la contrase\303\261a ha "
-"caducado)"
+msgstr "Debe cambiar la contraseña inmediatamente (la contraseña ha caducado)"
 
 #: modules/pam_unix/pam_unix_acct.c:314
 #, c-format
 msgid "Warning: your password will expire in %d day%.2s"
-msgstr ""
-"Advertencia: la contrase\303\261a caducar\303\241 dentro de %d d\303\255a%.2s"
+msgstr "Advertencia: la contraseña caducará dentro de %d día%.2s"
 
 #: modules/pam_unix/pam_unix_auth.c:163
 #, fuzzy
 msgid "Password: "
-msgstr "La contrase\303\261a no ha cambiado"
+msgstr "La contraseña no ha cambiado"
 
 #: modules/pam_unix/pam_unix_passwd.c:818
 msgid "NIS password could not be changed."
-msgstr "No es posible cambiar la contrase\303\261a NIS."
+msgstr "No es posible cambiar la contraseña NIS."
 
 #: modules/pam_unix/pam_unix_passwd.c:962
 #: modules/pam_cracklib/pam_cracklib.c:465
 msgid "No password supplied"
-msgstr "No se ha proporcionado ninguna contrase\303\261a"
+msgstr "No se ha proporcionado ninguna contraseña"
 
 #: modules/pam_unix/pam_unix_passwd.c:962
 #: modules/pam_cracklib/pam_cracklib.c:465
 msgid "Password unchanged"
-msgstr "La contrase\303\261a no ha cambiado"
+msgstr "La contraseña no ha cambiado"
 
 #: modules/pam_unix/pam_unix_passwd.c:983
 msgid "You must choose a longer password"
-msgstr "Debe elegir una contrase\303\261a m\303\241s larga"
+msgstr "Debe elegir una contraseña más larga"
 
 #: modules/pam_unix/pam_unix_passwd.c:988
 msgid "Password has been already used. Choose another."
-msgstr "La contrase\303\261a ya se ha utilizado. Seleccione otra."
+msgstr "La contraseña ya se ha utilizado. Seleccione otra."
 
 #: modules/pam_unix/pam_unix_passwd.c:1112
 msgid "(current) UNIX password: "
@@ -228,49 +161,48 @@ msgstr ""
 
 #: modules/pam_unix/pam_unix_passwd.c:1147
 msgid "You must wait longer to change your password"
-msgstr "Debe esperar m\303\241s tiempo para cambiar la contrase\303\261a"
+msgstr "Debe esperar más tiempo para cambiar la contraseña"
 
 #: modules/pam_unix/pam_unix_passwd.c:1207
 #, fuzzy
 msgid "Enter new UNIX password: "
-msgstr "Introduzca la nueva contrase\303\261a STRESS:"
+msgstr "Introduzca la nueva contraseña STRESS:"
 
 #: modules/pam_unix/pam_unix_passwd.c:1208
 #, fuzzy
 msgid "Retype new UNIX password: "
-msgstr "Vuelva a escribir la nueva contrase\303\261a STRESS:"
+msgstr "Vuelva a escribir la nueva contraseña STRESS:"
 
-#: modules/pam_stress/pam_stress.c:481
+#: modules/pam_stress/pam_stress.c:474
 msgid "Changing STRESS password for "
-msgstr "Cambiando la contrase\303\261a STRESS para"
+msgstr "Cambiando la contraseña STRESS para"
 
-#: modules/pam_stress/pam_stress.c:495
+#: modules/pam_stress/pam_stress.c:488
 msgid "Enter new STRESS password: "
-msgstr "Introduzca la nueva contrase\303\261a STRESS:"
+msgstr "Introduzca la nueva contraseña STRESS:"
 
-#: modules/pam_stress/pam_stress.c:498
+#: modules/pam_stress/pam_stress.c:491
 msgid "Retype new STRESS password: "
-msgstr "Vuelva a escribir la nueva contrase\303\261a STRESS:"
+msgstr "Vuelva a escribir la nueva contraseña STRESS:"
 
-#: modules/pam_stress/pam_stress.c:526
+#: modules/pam_stress/pam_stress.c:519
 msgid "Verification mis-typed; password unchanged"
-msgstr ""
-"Error al escribir la verificaci\303\263n; la contrase\303\261a no ha cambiado"
+msgstr "Error al escribir la verificación; la contraseña no ha cambiado"
 
 #: modules/pam_cracklib/pam_cracklib.c:61
 #, fuzzy, c-format
 msgid "New %s%spassword: "
-msgstr "La contrase\303\261a no ha cambiado"
+msgstr "La contraseña no ha cambiado"
 
 #: modules/pam_cracklib/pam_cracklib.c:63
 #, fuzzy, c-format
 msgid "Retype new %s%spassword: "
-msgstr "Vuelva a escribir la nueva contrase\303\261a STRESS:"
+msgstr "Vuelva a escribir la nueva contraseña STRESS:"
 
 #: modules/pam_cracklib/pam_cracklib.c:64
 #, fuzzy
 msgid "Sorry, passwords do not match."
-msgstr "No es posible cambiar la contrase\303\261a NIS."
+msgstr "No es posible cambiar la contraseña NIS."
 
 #: modules/pam_cracklib/pam_cracklib.c:379
 msgid "is the same as the old one"
@@ -299,7 +231,7 @@ msgstr ""
 #: modules/pam_cracklib/pam_cracklib.c:437
 #, fuzzy
 msgid "has been already used"
-msgstr "La contrase\303\261a ya se ha utilizado. Seleccione otra."
+msgstr "La contraseña ya se ha utilizado. Seleccione otra."
 
 #: modules/pam_cracklib/pam_cracklib.c:489
 #: modules/pam_cracklib/pam_cracklib.c:617
@@ -313,11 +245,11 @@ msgstr ""
 
 #: libpam/pam_strerror.c:13
 msgid "Success"
-msgstr "\303\211xito"
+msgstr "Éxito"
 
 #: libpam/pam_strerror.c:15
 msgid "Critical error - immediate abort"
-msgstr "Error cr\303\255tico: cancelaci\303\263n inmediata"
+msgstr "Error crítico: cancelación inmediata"
 
 #: libpam/pam_strerror.c:17
 msgid "dlopen() failure"
@@ -325,11 +257,11 @@ msgstr "error de dlopen()"
 
 #: libpam/pam_strerror.c:19
 msgid "Symbol not found"
-msgstr "S\303\255mbolo no encontrado"
+msgstr "Símbolo no encontrado"
 
 #: libpam/pam_strerror.c:21
 msgid "Error in service module"
-msgstr "Error en el m\303\263dulo de servicios"
+msgstr "Error en el módulo de servicios"
 
 #: libpam/pam_strerror.c:23
 msgid "System error"
@@ -345,34 +277,29 @@ msgstr "Permiso denegado"
 
 #: libpam/pam_strerror.c:29
 msgid "Authentication failure"
-msgstr "Fallo de autenticaci\303\263n"
+msgstr "Fallo de autenticación"
 
 #: libpam/pam_strerror.c:31
 msgid "Insufficient credentials to access authentication data"
-msgstr ""
-"Credenciales insuficientes para acceder a los datos de autenticaci\303\263n"
+msgstr "Credenciales insuficientes para acceder a los datos de autenticación"
 
 #: libpam/pam_strerror.c:33
 msgid "Authentication service cannot retrieve authentication info."
 msgstr ""
-"El servicio de autenticaci\303\263n no puede recuperar la informaci\303\263n "
-"de autenticaci\303\263n."
+"El servicio de autenticación no puede recuperar la información de "
+"autenticación."
 
 #: libpam/pam_strerror.c:35
 msgid "User not known to the underlying authentication module"
-msgstr ""
-"Usuario desconocido para el m\303\263dulo de autenticaci\303\263n subyacente"
+msgstr "Usuario desconocido para el módulo de autenticación subyacente"
 
 #: libpam/pam_strerror.c:37
 msgid "Have exhausted maximum number of retries for service."
-msgstr ""
-"Se ha agotado el n\303\272mero m\303\241ximo de reintentos para el servicio."
+msgstr "Se ha agotado el número máximo de reintentos para el servicio."
 
 #: libpam/pam_strerror.c:39
 msgid "Authentication token is no longer valid; new one required."
-msgstr ""
-"El testigo de autenticaci\303\263n ya no es v\303\241lido; necesitar\303\241 "
-"uno nuevo."
+msgstr "El testigo de autenticación ya no es válido; necesitará uno nuevo."
 
 #: libpam/pam_strerror.c:41
 msgid "User account has expired"
@@ -380,14 +307,12 @@ msgstr "La cuenta del usuario ha caducado"
 
 #: libpam/pam_strerror.c:43
 msgid "Cannot make/remove an entry for the specified session"
-msgstr ""
-"No es posible crear o eliminar una entrada de la sesi\303\263n especificada"
+msgstr "No es posible crear o eliminar una entrada de la sesión especificada"
 
 #: libpam/pam_strerror.c:45
 msgid "Authentication service cannot retrieve user credentials"
 msgstr ""
-"El servicio de autenticaci\303\263n no puede recuperar las credenciales del "
-"usuario"
+"El servicio de autenticación no puede recuperar las credenciales del usuario"
 
 #: libpam/pam_strerror.c:47
 msgid "User credentials expired"
@@ -399,7 +324,7 @@ msgstr "Error al definir las credenciales del usuario"
 
 #: libpam/pam_strerror.c:51
 msgid "No module specific data is present"
-msgstr "No hay datos espec\303\255ficos del m\303\263dulo presentes"
+msgstr "No hay datos específicos del módulo presentes"
 
 #: libpam/pam_strerror.c:53
 msgid "Bad item passed to pam_*_item()"
@@ -407,28 +332,27 @@ msgstr "Elemento incorrecto enviado a pam_*_item()"
 
 #: libpam/pam_strerror.c:55
 msgid "Conversation error"
-msgstr "Error de conversaci\303\263n"
+msgstr "Error de conversación"
 
 #: libpam/pam_strerror.c:57
 msgid "Authentication token manipulation error"
-msgstr "Error de manipulaci\303\263n del testigo de autenticaci\303\263n"
+msgstr "Error de manipulación del testigo de autenticación"
 
 #: libpam/pam_strerror.c:59
 msgid "Authentication information cannot be recovered"
-msgstr "No es posible recuperar la informaci\303\263n de autenticaci\303\263n"
+msgstr "No es posible recuperar la información de autenticación"
 
 #: libpam/pam_strerror.c:61
 msgid "Authentication token lock busy"
-msgstr "El testigo de autenticaci\303\263n parece ocupado"
+msgstr "El testigo de autenticación parece ocupado"
 
 #: libpam/pam_strerror.c:63
 msgid "Authentication token aging disabled"
-msgstr "Antig\303\274edad del testigo de autenticaci\303\263n inhabilitada"
+msgstr "Antigüedad del testigo de autenticación inhabilitada"
 
 #: libpam/pam_strerror.c:65
 msgid "Failed preliminary check by password service"
-msgstr ""
-"Error de comprobaci\303\263n preliminar del servicio de contrase\303\261a"
+msgstr "Error de comprobación preliminar del servicio de contraseña"
 
 #: libpam/pam_strerror.c:67
 msgid "The return value should be ignored by PAM dispatch"
@@ -436,33 +360,37 @@ msgstr "El valor devuelto debe ser omitido por el expedidor PAM"
 
 #: libpam/pam_strerror.c:69
 msgid "Module is unknown"
-msgstr "M\303\263dulo desconocido"
+msgstr "Módulo desconocido"
 
 #: libpam/pam_strerror.c:71
 msgid "Authentication token expired"
-msgstr "Testigo de autenticaci\303\263n caducado"
+msgstr "Testigo de autenticación caducado"
 
 #: libpam/pam_strerror.c:73
 msgid "Conversation is waiting for event"
-msgstr "La conversaci\303\263n est\303\241 esperando el evento"
+msgstr "La conversación está esperando el evento"
 
 #: libpam/pam_strerror.c:75
 msgid "Application needs to call libpam again"
-msgstr "La aplicaci\303\263n debe llamar a libpam de nuevo"
+msgstr "La aplicación debe llamar a libpam de nuevo"
 
 #: libpam/pam_strerror.c:78
 msgid "Unknown PAM error"
 msgstr "Error desconocido de PAM"
 
 #: libpam_misc/misc_conv.c:35
-msgid "..\007.Time is running out...\n"
-msgstr "..\007.El tiempo se est\303\241 agotando...\n"
+msgid "...Time is running out...\n"
+msgstr "...El tiempo se está agotando...\n"
 
 #: libpam_misc/misc_conv.c:36
-msgid "..\007.Sorry, your time is up!\n"
-msgstr "..\007.Lo sentimos, el tiempo se ha agotado.\n"
+msgid "...Sorry, your time is up!\n"
+msgstr "...Lo sentimos, el tiempo se ha agotado.\n"
 
 #: libpam_misc/misc_conv.c:334
 #, c-format
 msgid "erroneous conversation (%d)\n"
-msgstr "conversaci\303\263n incorrecta (%d)\n"
+msgstr "conversación incorrecta (%d)\n"
+
+#, fuzzy
+#~ msgid "%s: set %s security context to %s"
+#~ msgstr "No es un contexto de seguridad válido"
diff --git a/po/fr.po b/po/fr.po
index 05fb5881..39361587 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-09-05 15:43+0200\n"
+"POT-Creation-Date: 2005-09-14 19:09+0200\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"
@@ -34,7 +34,7 @@ msgstr "Erreur inconnue"
 #: modules/pam_tally/pam_tally.c:747
 #, c-format
 msgid "%s: Bad number given to --reset=\n"
-msgstr "%s: Num\303\251ro incorrect attribu\303\251 \303\240 --reset=\n"
+msgstr "%s: Numéro incorrect attribué à --reset=\n"
 
 #: modules/pam_tally/pam_tally.c:751
 #, c-format
@@ -51,140 +51,73 @@ msgstr ""
 #: modules/pam_tally/pam_tally.c:836
 #, c-format
 msgid "%s: Can't reset all users to non-zero\n"
-msgstr ""
-"%s: Impossible de r\303\251initialiser tous les utilisateurs \303\240 non-z"
-"\303\251ro\n"
+msgstr "%s: Impossible de réinitialiser tous les utilisateurs à non-zéro\n"
 
-#: modules/pam_selinux/pam_selinux.c:127
+#: modules/pam_selinux/pam_selinux_check.c:99
+#, c-format
+msgid "failed to initialize PAM\n"
+msgstr "échec d'initialisation PAM\n"
+
+#: modules/pam_selinux/pam_selinux_check.c:105
+#, c-format
+msgid "failed to pam_set_item()\n"
+msgstr "échec de pam_set_item()\n"
+
+#: modules/pam_selinux/pam_selinux_check.c:132
+#, c-format
+msgid "login: failure forking: %s"
+msgstr "login : échec d'autoclonage : %s"
+
+#: modules/pam_selinux/pam_selinux.c:102
 #, c-format
 msgid "Your default context is %s. \n"
-msgstr "Votre contexte par d\303\251faut est %s. \n"
+msgstr "Votre contexte par défaut est %s. \n"
 
-#: modules/pam_selinux/pam_selinux.c:130
+#: modules/pam_selinux/pam_selinux.c:105
 msgid "Do you want to choose a different one? [n]"
 msgstr "Voulez-vous en choisir un autre ? [n]"
 
-#: modules/pam_selinux/pam_selinux.c:137
+#: modules/pam_selinux/pam_selinux.c:112
 msgid "Enter number of choice: "
-msgstr "Entrer le num\303\251ro du choix :"
-
-#: modules/pam_selinux/pam_selinux.c:164 modules/pam_selinux/pam_selinux.c:245
-#: modules/pam_selinux/pam_selinux.c:352
-#, c-format
-msgid "%s: bogus conversation function"
-msgstr ""
+msgstr "Entrer le numéro du choix :"
 
-#: modules/pam_selinux/pam_selinux.c:168 modules/pam_selinux/pam_selinux.c:249
-#: modules/pam_selinux/pam_selinux.c:356
-#, c-format
-msgid "%s: no conversation function"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:187
+#: modules/pam_selinux/pam_selinux.c:152
 msgid "Would you like to enter a security context? [y] "
-msgstr "Voulez-vous entrer un contexte de s\303\251curit\303\251 ? [o]"
+msgstr "Voulez-vous entrer un contexte de sécurité ? [o]"
 
-#: modules/pam_selinux/pam_selinux.c:204
+#: modules/pam_selinux/pam_selinux.c:169
 msgid "role: "
-msgstr "r\303\264le :"
+msgstr "rôle :"
 
-#: modules/pam_selinux/pam_selinux.c:212
+#: modules/pam_selinux/pam_selinux.c:177
 msgid "type: "
 msgstr "type :"
 
-#: modules/pam_selinux/pam_selinux.c:222
+#: modules/pam_selinux/pam_selinux.c:187
 msgid "level: "
 msgstr "niveau :"
 
-#: modules/pam_selinux/pam_selinux.c:236
+#: modules/pam_selinux/pam_selinux.c:203
 msgid "Not a valid security context"
-msgstr "Contexte de s\303\251curit\303\251 non valide"
-
-#: modules/pam_selinux/pam_selinux.c:272
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.\n"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:296
-#, c-format
-msgid "Warning!  Could not get current context for %s, not relabeling."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:303
-#, c-format
-msgid "Warning!  Could not get new context for %s, not relabeling."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:313
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.%s"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:429
-#, c-format
-msgid "Unable to get valid context for %s"
-msgstr ""
+msgstr "Contexte de sécurité non valide"
 
-#: modules/pam_selinux/pam_selinux.c:433
-#, c-format
-msgid "Unable to get valid context for %s, No valid tty"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:465
+#: modules/pam_selinux/pam_selinux.c:416
 #, c-format
 msgid "Security Context %s Assigned"
-msgstr "Contexte de s\303\251curit\303\251 %s attribu\303\251"
-
-#: modules/pam_selinux/pam_selinux.c:469
-#, c-format
-msgid "Error!  Unable to set %s executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:475
-#, fuzzy, c-format
-msgid "%s: set %s security context to %s"
-msgstr "Contexte de s\303\251curit\303\251 non valide"
-
-#: modules/pam_selinux/pam_selinux.c:518
-#, c-format
-msgid "Error!  Unable to set executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:524
-#, c-format
-msgid "%s: setcontext back to orginal"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:585
-#, c-format
-msgid "failed to initialize PAM\n"
-msgstr "\303\251chec d'initialisation PAM\n"
-
-#: modules/pam_selinux/pam_selinux.c:591
-#, c-format
-msgid "failed to pam_set_item()\n"
-msgstr "\303\251chec de pam_set_item()\n"
-
-#: modules/pam_selinux/pam_selinux.c:616
-#, c-format
-msgid "login: failure forking: %s"
-msgstr "login : \303\251chec d'autoclonage : %s"
+msgstr "Contexte de sécurité %s attribué"
 
 #: modules/pam_unix/pam_unix_acct.c:268 modules/pam_unix/pam_unix_acct.c:295
 msgid "Your account has expired; please contact your system administrator"
-msgstr ""
-"Votre compte a expir\303\251. Contactez votre administrateur syst\303\250me"
+msgstr "Votre compte a expiré. Contactez votre administrateur système"
 
 #: modules/pam_unix/pam_unix_acct.c:277
 msgid "You are required to change your password immediately (root enforced)"
-msgstr ""
-"Vous devez changer votre mot de passe imm\303\251diatement (imposition root)"
+msgstr "Vous devez changer votre mot de passe immédiatement (imposition root)"
 
 #: modules/pam_unix/pam_unix_acct.c:304
 msgid "You are required to change your password immediately (password aged)"
 msgstr ""
-"Vous devez changer votre mot de passe imm\303\251diatement (mot de passe p"
-"\303\251rim\303\251)"
+"Vous devez changer votre mot de passe immédiatement (mot de passe périmé)"
 
 #: modules/pam_unix/pam_unix_acct.c:314
 #, c-format
@@ -194,11 +127,11 @@ msgstr "Avertissement : votre mot de passe expire dans %d day%.2s"
 #: modules/pam_unix/pam_unix_auth.c:163
 #, fuzzy
 msgid "Password: "
-msgstr "Mot de passe inchang\303\251"
+msgstr "Mot de passe inchangé"
 
 #: modules/pam_unix/pam_unix_passwd.c:818
 msgid "NIS password could not be changed."
-msgstr "Le mot de passe NIS n'a pas pu \303\252tre chang\303\251."
+msgstr "Le mot de passe NIS n'a pas pu être changé."
 
 #: modules/pam_unix/pam_unix_passwd.c:962
 #: modules/pam_cracklib/pam_cracklib.c:465
@@ -208,7 +141,7 @@ msgstr "Aucun mot de passe fourni"
 #: modules/pam_unix/pam_unix_passwd.c:962
 #: modules/pam_cracklib/pam_cracklib.c:465
 msgid "Password unchanged"
-msgstr "Mot de passe inchang\303\251"
+msgstr "Mot de passe inchangé"
 
 #: modules/pam_unix/pam_unix_passwd.c:983
 msgid "You must choose a longer password"
@@ -216,8 +149,7 @@ msgstr "Vous devez choisir un mot de passe plus long"
 
 #: modules/pam_unix/pam_unix_passwd.c:988
 msgid "Password has been already used. Choose another."
-msgstr ""
-"Mot de passe d\303\251j\303\240 utilis\303\251. Choisissez-en un autre."
+msgstr "Mot de passe déjà utilisé. Choisissez-en un autre."
 
 #: modules/pam_unix/pam_unix_passwd.c:1112
 msgid "(current) UNIX password: "
@@ -237,26 +169,26 @@ msgstr "Entrer le nouveau mot de passe STRESS :"
 msgid "Retype new UNIX password: "
 msgstr "Retaper le nouveau mot de passe STRESS :"
 
-#: modules/pam_stress/pam_stress.c:481
+#: modules/pam_stress/pam_stress.c:474
 msgid "Changing STRESS password for "
 msgstr "Changement du mot de passe STRESS pour"
 
-#: modules/pam_stress/pam_stress.c:495
+#: modules/pam_stress/pam_stress.c:488
 msgid "Enter new STRESS password: "
 msgstr "Entrer le nouveau mot de passe STRESS :"
 
-#: modules/pam_stress/pam_stress.c:498
+#: modules/pam_stress/pam_stress.c:491
 msgid "Retype new STRESS password: "
 msgstr "Retaper le nouveau mot de passe STRESS :"
 
-#: modules/pam_stress/pam_stress.c:526
+#: modules/pam_stress/pam_stress.c:519
 msgid "Verification mis-typed; password unchanged"
-msgstr "Verification erron\303\251e : mot de passe inchang\303\251"
+msgstr "Verification erronée : mot de passe inchangé"
 
 #: modules/pam_cracklib/pam_cracklib.c:61
 #, fuzzy, c-format
 msgid "New %s%spassword: "
-msgstr "Mot de passe inchang\303\251"
+msgstr "Mot de passe inchangé"
 
 #: modules/pam_cracklib/pam_cracklib.c:63
 #, fuzzy, c-format
@@ -266,7 +198,7 @@ msgstr "Retaper le nouveau mot de passe STRESS :"
 #: modules/pam_cracklib/pam_cracklib.c:64
 #, fuzzy
 msgid "Sorry, passwords do not match."
-msgstr "Le mot de passe NIS n'a pas pu \303\252tre chang\303\251."
+msgstr "Le mot de passe NIS n'a pas pu être changé."
 
 #: modules/pam_cracklib/pam_cracklib.c:379
 msgid "is the same as the old one"
@@ -295,8 +227,7 @@ msgstr ""
 #: modules/pam_cracklib/pam_cracklib.c:437
 #, fuzzy
 msgid "has been already used"
-msgstr ""
-"Mot de passe d\303\251j\303\240 utilis\303\251. Choisissez-en un autre."
+msgstr "Mot de passe déjà utilisé. Choisissez-en un autre."
 
 #: modules/pam_cracklib/pam_cracklib.c:489
 #: modules/pam_cracklib/pam_cracklib.c:617
@@ -310,19 +241,19 @@ msgstr ""
 
 #: libpam/pam_strerror.c:13
 msgid "Success"
-msgstr "Succ\303\250s"
+msgstr "Succès"
 
 #: libpam/pam_strerror.c:15
 msgid "Critical error - immediate abort"
-msgstr "Erreur critique - abandon imm\303\251diat"
+msgstr "Erreur critique - abandon immédiat"
 
 #: libpam/pam_strerror.c:17
 msgid "dlopen() failure"
-msgstr "\303\251chec de dlopen()"
+msgstr "échec de dlopen()"
 
 #: libpam/pam_strerror.c:19
 msgid "Symbol not found"
-msgstr "Symbole non trouv\303\251"
+msgstr "Symbole non trouvé"
 
 #: libpam/pam_strerror.c:21
 msgid "Error in service module"
@@ -330,30 +261,30 @@ msgstr "Erreur dans le module de service"
 
 #: libpam/pam_strerror.c:23
 msgid "System error"
-msgstr "Erreur syst\303\250me"
+msgstr "Erreur système"
 
 #: libpam/pam_strerror.c:25
 msgid "Memory buffer error"
-msgstr "Erreur tampon m\303\251moire"
+msgstr "Erreur tampon mémoire"
 
 #: libpam/pam_strerror.c:27
 msgid "Permission denied"
-msgstr "Autorisation refus\303\251e"
+msgstr "Autorisation refusée"
 
 #: libpam/pam_strerror.c:29
 msgid "Authentication failure"
-msgstr "\303\211chec d'authentification"
+msgstr "Échec d'authentification"
 
 #: libpam/pam_strerror.c:31
 msgid "Insufficient credentials to access authentication data"
 msgstr ""
-"Infos d'identification insuffisantes pour acc\303\251der aux donn\303\251es "
+"Infos d'identification insuffisantes pour accéder aux données "
 "d'authentification"
 
 #: libpam/pam_strerror.c:33
 msgid "Authentication service cannot retrieve authentication info."
 msgstr ""
-"Le service d'authentification n'a pas pu r\303\251cup\303\251rer les infos "
+"Le service d'authentification n'a pas pu récupérer les infos "
 "d'authentification."
 
 #: libpam/pam_strerror.c:35
@@ -362,7 +293,7 @@ msgstr "Utilisateur inconnu par le module d'authentification sous-jacent"
 
 #: libpam/pam_strerror.c:37
 msgid "Have exhausted maximum number of retries for service."
-msgstr "Nombre maximum de tentatives \303\251puis\303\251es pour le service."
+msgstr "Nombre maximum de tentatives épuisées pour le service."
 
 #: libpam/pam_strerror.c:39
 msgid "Authentication token is no longer valid; new one required."
@@ -371,37 +302,34 @@ msgstr ""
 
 #: libpam/pam_strerror.c:41
 msgid "User account has expired"
-msgstr "Le compte de l'utilisateur a expir\303\251"
+msgstr "Le compte de l'utilisateur a expiré"
 
 #: libpam/pam_strerror.c:43
 msgid "Cannot make/remove an entry for the specified session"
-msgstr ""
-"Impossible de cr\303\251er/supprimer une entr\303\251e pour la session sp\303"
-"\251cifi\303\251e"
+msgstr "Impossible de créer/supprimer une entrée pour la session spécifiée"
 
 #: libpam/pam_strerror.c:45
 msgid "Authentication service cannot retrieve user credentials"
 msgstr ""
-"Le service d'authentification n'a pas pu r\303\251cup\303\251rer les infos "
+"Le service d'authentification n'a pas pu récupérer les infos "
 "d'identification de l'utilisateur"
 
 #: libpam/pam_strerror.c:47
 msgid "User credentials expired"
-msgstr "Infos d'identification de l'utilisateur expir\303\251es"
+msgstr "Infos d'identification de l'utilisateur expirées"
 
 #: libpam/pam_strerror.c:49
 msgid "Failure setting user credentials"
 msgstr ""
-"\303\211chec lors de la d\303\251finition des infos d'identification de "
-"l'utilisateur"
+"Échec lors de la définition des infos d'identification de l'utilisateur"
 
 #: libpam/pam_strerror.c:51
 msgid "No module specific data is present"
-msgstr "Aucune donn\303\251e sp\303\251cifique au module pr\303\251sente"
+msgstr "Aucune donnée spécifique au module présente"
 
 #: libpam/pam_strerror.c:53
 msgid "Bad item passed to pam_*_item()"
-msgstr "\303\211l\303\251ment incorrect transmis \303\240 pam_*_item()"
+msgstr "Élément incorrect transmis à pam_*_item()"
 
 #: libpam/pam_strerror.c:55
 msgid "Conversation error"
@@ -413,28 +341,23 @@ msgstr "Erreur de manipulation du jeton d'authentification"
 
 #: libpam/pam_strerror.c:59
 msgid "Authentication information cannot be recovered"
-msgstr ""
-"Impossible de r\303\251cup\303\251rer les informations d'authentification"
+msgstr "Impossible de récupérer les informations d'authentification"
 
 #: libpam/pam_strerror.c:61
 msgid "Authentication token lock busy"
-msgstr "Jeton d'authentification occup\303\251"
+msgstr "Jeton d'authentification occupé"
 
 #: libpam/pam_strerror.c:63
 msgid "Authentication token aging disabled"
-msgstr "P\303\251remption du jeton d'authentification d\303\251sactiv\303\251e"
+msgstr "Péremption du jeton d'authentification désactivée"
 
 #: libpam/pam_strerror.c:65
 msgid "Failed preliminary check by password service"
-msgstr ""
-"\303\211chec du contr\303\264le pr\303\251liminaire par le service de mot de "
-"passe"
+msgstr "Échec du contrôle préliminaire par le service de mot de passe"
 
 #: libpam/pam_strerror.c:67
 msgid "The return value should be ignored by PAM dispatch"
-msgstr ""
-"La valeur retourn\303\251e devrait \303\252tre ignor\303\251e par la r\303"
-"\251partition PAM"
+msgstr "La valeur retournée devrait être ignorée par la répartition PAM"
 
 #: libpam/pam_strerror.c:69
 msgid "Module is unknown"
@@ -442,29 +365,33 @@ msgstr "Module inconnu"
 
 #: libpam/pam_strerror.c:71
 msgid "Authentication token expired"
-msgstr "Le jeton d'authentification a expir\303\251"
+msgstr "Le jeton d'authentification a expiré"
 
 #: libpam/pam_strerror.c:73
 msgid "Conversation is waiting for event"
-msgstr "Conversation en attente d'\303\251v\303\251nement"
+msgstr "Conversation en attente d'événement"
 
 #: libpam/pam_strerror.c:75
 msgid "Application needs to call libpam again"
-msgstr "L'application doit appeler \303\240 nouveau libpam"
+msgstr "L'application doit appeler à nouveau libpam"
 
 #: libpam/pam_strerror.c:78
 msgid "Unknown PAM error"
 msgstr "Erreur PAM inconnue"
 
 #: libpam_misc/misc_conv.c:35
-msgid "..\007.Time is running out...\n"
-msgstr "..\007.Temps bient\303\264t \303\251coul\303\251...\n"
+msgid "...Time is running out...\n"
+msgstr "...Temps bientôt écoulé...\n"
 
 #: libpam_misc/misc_conv.c:36
-msgid "..\007.Sorry, your time is up!\n"
-msgstr "..\007.Votre temps est \303\251puis\303\251 !\n"
+msgid "...Sorry, your time is up!\n"
+msgstr "...Votre temps est épuisé !\n"
 
 #: libpam_misc/misc_conv.c:334
 #, c-format
 msgid "erroneous conversation (%d)\n"
 msgstr "erreurs de conversation (%d)\n"
+
+#, fuzzy
+#~ msgid "%s: set %s security context to %s"
+#~ msgstr "Contexte de sécurité non valide"
diff --git a/po/hu.po b/po/hu.po
index a8292de1..108d75d3 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-09-05 15:43+0200\n"
+"POT-Creation-Date: 2005-09-14 19:09+0200\n"
 "PO-Revision-Date: 2005-08-07 02:59+0100\n"
 "Last-Translator: Szabolcs Varga <shirokuma@shirokuma.hu>\n"
 "Language-Team: hu\n"
@@ -17,15 +17,15 @@ msgstr ""
 
 #: modules/pam_tally/pam_tally.c:730
 msgid "Authentication error"
-msgstr "Hiteles\303\255t\303\251si hiba"
+msgstr "Hitelesítési hiba"
 
 #: modules/pam_tally/pam_tally.c:731
 msgid "Service error"
-msgstr "Szolg\303\241ltat\303\241si hiba"
+msgstr "Szolgáltatási hiba"
 
 #: modules/pam_tally/pam_tally.c:732
 msgid "Unknown user"
-msgstr "Ismeretlen felhaszn\303\241l\303\263"
+msgstr "Ismeretlen felhasználó"
 
 #: modules/pam_tally/pam_tally.c:733
 msgid "Unknown error"
@@ -34,195 +34,121 @@ msgstr "Ismeretlen hiba"
 #: modules/pam_tally/pam_tally.c:747
 #, c-format
 msgid "%s: Bad number given to --reset=\n"
-msgstr "%s: Rossz sz\303\241m lett megadva: --reset=\n"
+msgstr "%s: Rossz szám lett megadva: --reset=\n"
 
 #: modules/pam_tally/pam_tally.c:751
 #, c-format
 msgid "%s: Unrecognised option %s\n"
-msgstr "%s: Fel nem ismert param\303\251ter (%s)\n"
+msgstr "%s: Fel nem ismert paraméter (%s)\n"
 
 #: modules/pam_tally/pam_tally.c:763
 #, c-format
 msgid ""
 "%s: [--file rooted-filename] [--user username] [--reset[=n]] [--quiet]\n"
 msgstr ""
-"%s: [--file rooted-f\303\241jln\303\251v] [--user felhaszn\303\241l\303\263n"
-"\303\251v] [--reset[=n]] [--quiet]\n"
+"%s: [--file rooted-fájlnév] [--user felhasználónév] [--reset[=n]] [--quiet]\n"
 
 #: modules/pam_tally/pam_tally.c:836
 #, c-format
 msgid "%s: Can't reset all users to non-zero\n"
-msgstr ""
-"%s: Nem \303\241ll\303\255that\303\263 vissza minden felhaszn\303\241l\303"
-"\263 nem null\303\241ra\n"
+msgstr "%s: Nem állítható vissza minden felhasználó nem nullára\n"
 
-#: modules/pam_selinux/pam_selinux.c:127
+#: modules/pam_selinux/pam_selinux_check.c:99
 #, c-format
-msgid "Your default context is %s. \n"
-msgstr "Az \303\226n alap\303\251rtelmezett kontextusa: %s. \n"
-
-#: modules/pam_selinux/pam_selinux.c:130
-msgid "Do you want to choose a different one? [n]"
-msgstr "K\303\255v\303\241n m\303\241sikat v\303\241lasztani? [n]"
+msgid "failed to initialize PAM\n"
+msgstr "PAM inicializálása sikertelen\n"
 
-#: modules/pam_selinux/pam_selinux.c:137
-msgid "Enter number of choice: "
-msgstr ""
-"Adja meg a k\303\255v\303\241nt lehet\305\221s\303\251g sz\303\241m\303\241t:"
+#: modules/pam_selinux/pam_selinux_check.c:105
+#, c-format
+msgid "failed to pam_set_item()\n"
+msgstr "pam_set_item() meghiúsult\n"
 
-#: modules/pam_selinux/pam_selinux.c:164 modules/pam_selinux/pam_selinux.c:245
-#: modules/pam_selinux/pam_selinux.c:352
+#: modules/pam_selinux/pam_selinux_check.c:132
 #, c-format
-msgid "%s: bogus conversation function"
-msgstr ""
+msgid "login: failure forking: %s"
+msgstr "bejelentkezés: hiba az elágazás közben: %s"
 
-#: modules/pam_selinux/pam_selinux.c:168 modules/pam_selinux/pam_selinux.c:249
-#: modules/pam_selinux/pam_selinux.c:356
+#: modules/pam_selinux/pam_selinux.c:102
 #, c-format
-msgid "%s: no conversation function"
-msgstr ""
+msgid "Your default context is %s. \n"
+msgstr "Az Ön alapértelmezett kontextusa: %s. \n"
 
-#: modules/pam_selinux/pam_selinux.c:187
+#: modules/pam_selinux/pam_selinux.c:105
+msgid "Do you want to choose a different one? [n]"
+msgstr "Kíván másikat választani? [n]"
+
+#: modules/pam_selinux/pam_selinux.c:112
+msgid "Enter number of choice: "
+msgstr "Adja meg a kívánt lehetőség számát:"
+
+#: modules/pam_selinux/pam_selinux.c:152
 msgid "Would you like to enter a security context? [y] "
-msgstr "K\303\255v\303\241n megadni egy biztons\303\241gi kontextust? [y] "
+msgstr "Kíván megadni egy biztonsági kontextust? [y] "
 
-#: modules/pam_selinux/pam_selinux.c:204
+#: modules/pam_selinux/pam_selinux.c:169
 msgid "role: "
 msgstr "szerep:"
 
-#: modules/pam_selinux/pam_selinux.c:212
+#: modules/pam_selinux/pam_selinux.c:177
 msgid "type: "
-msgstr "t\303\255pus:"
+msgstr "típus:"
 
-#: modules/pam_selinux/pam_selinux.c:222
+#: modules/pam_selinux/pam_selinux.c:187
 msgid "level: "
 msgstr "szint:"
 
-#: modules/pam_selinux/pam_selinux.c:236
+#: modules/pam_selinux/pam_selinux.c:203
 msgid "Not a valid security context"
-msgstr "Nem \303\251rv\303\251nyes biztons\303\241gi kontextus"
+msgstr "Nem érvényes biztonsági kontextus"
 
-#: modules/pam_selinux/pam_selinux.c:272
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.\n"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:296
-#, c-format
-msgid "Warning!  Could not get current context for %s, not relabeling."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:303
-#, c-format
-msgid "Warning!  Could not get new context for %s, not relabeling."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:313
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.%s"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:429
-#, c-format
-msgid "Unable to get valid context for %s"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:433
-#, c-format
-msgid "Unable to get valid context for %s, No valid tty"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:465
+#: modules/pam_selinux/pam_selinux.c:416
 #, c-format
 msgid "Security Context %s Assigned"
-msgstr "%s biztons\303\241gi kontextus hozz\303\241rendelve"
-
-#: modules/pam_selinux/pam_selinux.c:469
-#, c-format
-msgid "Error!  Unable to set %s executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:475
-#, fuzzy, c-format
-msgid "%s: set %s security context to %s"
-msgstr "Nem \303\251rv\303\251nyes biztons\303\241gi kontextus"
-
-#: modules/pam_selinux/pam_selinux.c:518
-#, c-format
-msgid "Error!  Unable to set executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:524
-#, c-format
-msgid "%s: setcontext back to orginal"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:585
-#, c-format
-msgid "failed to initialize PAM\n"
-msgstr "PAM inicializ\303\241l\303\241sa sikertelen\n"
-
-#: modules/pam_selinux/pam_selinux.c:591
-#, c-format
-msgid "failed to pam_set_item()\n"
-msgstr "pam_set_item() meghi\303\272sult\n"
-
-#: modules/pam_selinux/pam_selinux.c:616
-#, c-format
-msgid "login: failure forking: %s"
-msgstr "bejelentkez\303\251s: hiba az el\303\241gaz\303\241s k\303\266zben: %s"
+msgstr "%s biztonsági kontextus hozzárendelve"
 
 #: modules/pam_unix/pam_unix_acct.c:268 modules/pam_unix/pam_unix_acct.c:295
 msgid "Your account has expired; please contact your system administrator"
-msgstr ""
-"A fi\303\263k \303\251rv\303\251nyess\303\251ge lej\303\241rt; keresse meg a "
-"rendszergazd\303\241t"
+msgstr "A fiók érvényessége lejárt; keresse meg a rendszergazdát"
 
 #: modules/pam_unix/pam_unix_acct.c:277
 msgid "You are required to change your password immediately (root enforced)"
-msgstr ""
-"Azonnal meg kell v\303\241ltoztatnia a jelszav\303\241t (a root \303\255rta "
-"el\305\221)"
+msgstr "Azonnal meg kell változtatnia a jelszavát (a root írta elő)"
 
 #: modules/pam_unix/pam_unix_acct.c:304
 msgid "You are required to change your password immediately (password aged)"
-msgstr ""
-"Azonnal meg kell v\303\241ltoztatnia a jelszav\303\241t (a jelsz\303\263 el"
-"\303\251v\303\274lt)"
+msgstr "Azonnal meg kell változtatnia a jelszavát (a jelszó elévült)"
 
 #: modules/pam_unix/pam_unix_acct.c:314
 #, c-format
 msgid "Warning: your password will expire in %d day%.2s"
-msgstr "Figyelmeztet\303\251s: a jelszava lej\303\241r %d nap m\303\272lva%.2s"
+msgstr "Figyelmeztetés: a jelszava lejár %d nap múlva%.2s"
 
 #: modules/pam_unix/pam_unix_auth.c:163
 #, fuzzy
 msgid "Password: "
-msgstr "A jelsz\303\263 nem v\303\241ltozott"
+msgstr "A jelszó nem változott"
 
 #: modules/pam_unix/pam_unix_passwd.c:818
 msgid "NIS password could not be changed."
-msgstr "A NIS-jelsz\303\263 nem m\303\263dos\303\255that\303\263."
+msgstr "A NIS-jelszó nem módosítható."
 
 #: modules/pam_unix/pam_unix_passwd.c:962
 #: modules/pam_cracklib/pam_cracklib.c:465
 msgid "No password supplied"
-msgstr "Nem lett megadva jelsz\303\263"
+msgstr "Nem lett megadva jelszó"
 
 #: modules/pam_unix/pam_unix_passwd.c:962
 #: modules/pam_cracklib/pam_cracklib.c:465
 msgid "Password unchanged"
-msgstr "A jelsz\303\263 nem v\303\241ltozott"
+msgstr "A jelszó nem változott"
 
 #: modules/pam_unix/pam_unix_passwd.c:983
 msgid "You must choose a longer password"
-msgstr "Hosszabb jelsz\303\263t kell v\303\241lasztania"
+msgstr "Hosszabb jelszót kell választania"
 
 #: modules/pam_unix/pam_unix_passwd.c:988
 msgid "Password has been already used. Choose another."
-msgstr ""
-"A jelsz\303\263t m\303\241r haszn\303\241lta. V\303\241lasszon egy m\303"
-"\241sikat."
+msgstr "A jelszót már használta. Válasszon egy másikat."
 
 #: modules/pam_unix/pam_unix_passwd.c:1112
 msgid "(current) UNIX password: "
@@ -230,52 +156,48 @@ msgstr ""
 
 #: modules/pam_unix/pam_unix_passwd.c:1147
 msgid "You must wait longer to change your password"
-msgstr ""
-"Tov\303\241bb kell v\303\241rnia a jelsz\303\263 m\303\263dos\303\255t\303"
-"\241s\303\241ra"
+msgstr "Tovább kell várnia a jelszó módosítására"
 
 #: modules/pam_unix/pam_unix_passwd.c:1207
 #, fuzzy
 msgid "Enter new UNIX password: "
-msgstr "\303\232j STRESS jelsz\303\263: "
+msgstr "Új STRESS jelszó: "
 
 #: modules/pam_unix/pam_unix_passwd.c:1208
 #, fuzzy
 msgid "Retype new UNIX password: "
-msgstr "\303\215rja be m\303\251gegyszer az \303\272j STRESS jelsz\303\263t:"
+msgstr "Írja be mégegyszer az új STRESS jelszót:"
 
-#: modules/pam_stress/pam_stress.c:481
+#: modules/pam_stress/pam_stress.c:474
 msgid "Changing STRESS password for "
-msgstr "STRESS jelsz\303\263 megv\303\241ltoztat\303\241sa - "
+msgstr "STRESS jelszó megváltoztatása - "
 
-#: modules/pam_stress/pam_stress.c:495
+#: modules/pam_stress/pam_stress.c:488
 msgid "Enter new STRESS password: "
-msgstr "\303\232j STRESS jelsz\303\263: "
+msgstr "Új STRESS jelszó: "
 
-#: modules/pam_stress/pam_stress.c:498
+#: modules/pam_stress/pam_stress.c:491
 msgid "Retype new STRESS password: "
-msgstr "\303\215rja be m\303\251gegyszer az \303\272j STRESS jelsz\303\263t:"
+msgstr "Írja be mégegyszer az új STRESS jelszót:"
 
-#: modules/pam_stress/pam_stress.c:526
+#: modules/pam_stress/pam_stress.c:519
 msgid "Verification mis-typed; password unchanged"
-msgstr ""
-"Az ellen\305\221rz\305\221 jelsz\303\263 nem egyezik; a jelsz\303\263 nem ker"
-"\303\274lt m\303\263dos\303\255t\303\241sra"
+msgstr "Az ellenőrző jelszó nem egyezik; a jelszó nem került módosításra"
 
 #: modules/pam_cracklib/pam_cracklib.c:61
 #, fuzzy, c-format
 msgid "New %s%spassword: "
-msgstr "A jelsz\303\263 nem v\303\241ltozott"
+msgstr "A jelszó nem változott"
 
 #: modules/pam_cracklib/pam_cracklib.c:63
 #, fuzzy, c-format
 msgid "Retype new %s%spassword: "
-msgstr "\303\215rja be m\303\251gegyszer az \303\272j STRESS jelsz\303\263t:"
+msgstr "Írja be mégegyszer az új STRESS jelszót:"
 
 #: modules/pam_cracklib/pam_cracklib.c:64
 #, fuzzy
 msgid "Sorry, passwords do not match."
-msgstr "A NIS-jelsz\303\263 nem m\303\263dos\303\255that\303\263."
+msgstr "A NIS-jelszó nem módosítható."
 
 #: modules/pam_cracklib/pam_cracklib.c:379
 msgid "is the same as the old one"
@@ -304,9 +226,7 @@ msgstr ""
 #: modules/pam_cracklib/pam_cracklib.c:437
 #, fuzzy
 msgid "has been already used"
-msgstr ""
-"A jelsz\303\263t m\303\241r haszn\303\241lta. V\303\241lasszon egy m\303"
-"\241sikat."
+msgstr "A jelszót már használta. Válasszon egy másikat."
 
 #: modules/pam_cracklib/pam_cracklib.c:489
 #: modules/pam_cracklib/pam_cracklib.c:617
@@ -320,11 +240,11 @@ msgstr ""
 
 #: libpam/pam_strerror.c:13
 msgid "Success"
-msgstr "Siker\303\274lt"
+msgstr "Sikerült"
 
 #: libpam/pam_strerror.c:15
 msgid "Critical error - immediate abort"
-msgstr "Kritikus hiba - azonnali le\303\241ll\303\241s"
+msgstr "Kritikus hiba - azonnali leállás"
 
 #: libpam/pam_strerror.c:17
 msgid "dlopen() failure"
@@ -332,7 +252,7 @@ msgstr "dlopen() hiba"
 
 #: libpam/pam_strerror.c:19
 msgid "Symbol not found"
-msgstr "A szimb\303\263lum nem tal\303\241lhat\303\263"
+msgstr "A szimbólum nem található"
 
 #: libpam/pam_strerror.c:21
 msgid "Error in service module"
@@ -344,115 +264,94 @@ msgstr "Rendszerhiba"
 
 #: libpam/pam_strerror.c:25
 msgid "Memory buffer error"
-msgstr "Mem\303\263riapuffer-hiba"
+msgstr "Memóriapuffer-hiba"
 
 #: libpam/pam_strerror.c:27
 msgid "Permission denied"
-msgstr "Enged\303\251ly megtagadva"
+msgstr "Engedély megtagadva"
 
 #: libpam/pam_strerror.c:29
 msgid "Authentication failure"
-msgstr "Hiteles\303\255t\303\251si hiba"
+msgstr "Hitelesítési hiba"
 
 #: libpam/pam_strerror.c:31
 msgid "Insufficient credentials to access authentication data"
-msgstr ""
-"Nem elegend\305\221 azonos\303\255t\303\241si adat a hiteles\303\255t\303"
-"\251si adatok el\303\251r\303\251s\303\251hez"
+msgstr "Nem elegendő azonosítási adat a hitelesítési adatok eléréséhez"
 
 #: libpam/pam_strerror.c:33
 msgid "Authentication service cannot retrieve authentication info."
-msgstr ""
-"A hiteles\303\255t\303\251si szolg\303\241ltat\303\241s nem tudja lek\303"
-"\251rni a hiteles\303\255t\303\251si adatokat."
+msgstr "A hitelesítési szolgáltatás nem tudja lekérni a hitelesítési adatokat."
 
 #: libpam/pam_strerror.c:35
 msgid "User not known to the underlying authentication module"
-msgstr ""
-"Az als\303\263bb szint\305\261 hiteles\303\255t\303\251si modul nem ismeri a "
-"felhaszn\303\241l\303\263t"
+msgstr "Az alsóbb szintű hitelesítési modul nem ismeri a felhasználót"
 
 #: libpam/pam_strerror.c:37
 msgid "Have exhausted maximum number of retries for service."
 msgstr ""
-"El\303\251rte a szolg\303\241ltat\303\241s \303\241ltal enged\303\251lyezett "
-"\303\272jrapr\303\263b\303\241lkoz\303\241sok maxim\303\241lis sz\303\241m"
-"\303\241t."
+"Elérte a szolgáltatás által engedélyezett újrapróbálkozások maximális számát."
 
 #: libpam/pam_strerror.c:39
 msgid "Authentication token is no longer valid; new one required."
-msgstr ""
-"A hiteles\303\255t\303\251si token m\303\241r nem \303\251rv\303\251nyes; "
-"\303\272jra van sz\303\274ks\303\251g."
+msgstr "A hitelesítési token már nem érvényes; újra van szükség."
 
 #: libpam/pam_strerror.c:41
 msgid "User account has expired"
-msgstr "A felhaszn\303\241l\303\263i fi\303\263k lej\303\241rt"
+msgstr "A felhasználói fiók lejárt"
 
 #: libpam/pam_strerror.c:43
 msgid "Cannot make/remove an entry for the specified session"
-msgstr ""
-"Nem k\303\251sz\303\255thet\305\221/t\303\266r\303\266lhet\305\221 bejegyz"
-"\303\251s az adott munkamenethez"
+msgstr "Nem készíthető/törölhető bejegyzés az adott munkamenethez"
 
 #: libpam/pam_strerror.c:45
 msgid "Authentication service cannot retrieve user credentials"
 msgstr ""
-"A hiteles\303\255t\303\251si szolg\303\241ltat\303\241s nem tudja lek\303"
-"\251rni a felhaszn\303\241l\303\263 hiteles\303\255t\303\251si adatait"
+"A hitelesítési szolgáltatás nem tudja lekérni a felhasználó hitelesítési "
+"adatait"
 
 #: libpam/pam_strerror.c:47
 msgid "User credentials expired"
-msgstr ""
-"A felhaszn\303\241l\303\263 hiteles\303\255t\303\251si adatai lej\303\241rtak"
+msgstr "A felhasználó hitelesítési adatai lejártak"
 
 #: libpam/pam_strerror.c:49
 msgid "Failure setting user credentials"
-msgstr ""
-"Hiba a felhaszn\303\241l\303\263 hiteles\303\255t\303\251si adatainak be\303"
-"\241ll\303\255t\303\241sa k\303\266zben"
+msgstr "Hiba a felhasználó hitelesítési adatainak beállítása közben"
 
 #: libpam/pam_strerror.c:51
 msgid "No module specific data is present"
-msgstr "Nem tal\303\241lhat\303\263 modulspecifikus adat"
+msgstr "Nem található modulspecifikus adat"
 
 #: libpam/pam_strerror.c:53
 msgid "Bad item passed to pam_*_item()"
-msgstr "Rossz elem lett \303\241tadva a pam_*_item() sz\303\241m\303\241ra"
+msgstr "Rossz elem lett átadva a pam_*_item() számára"
 
 #: libpam/pam_strerror.c:55
 msgid "Conversation error"
-msgstr "Besz\303\251lget\303\251si hiba"
+msgstr "Beszélgetési hiba"
 
 #: libpam/pam_strerror.c:57
 msgid "Authentication token manipulation error"
-msgstr "Hiteles\303\255t\303\251sitoken-kezel\303\251si hiba"
+msgstr "Hitelesítésitoken-kezelési hiba"
 
 #: libpam/pam_strerror.c:59
 msgid "Authentication information cannot be recovered"
-msgstr ""
-"A hiteles\303\255t\303\251si adatok nem \303\241ll\303\255that\303\263k "
-"helyre"
+msgstr "A hitelesítési adatok nem állíthatók helyre"
 
 #: libpam/pam_strerror.c:61
 msgid "Authentication token lock busy"
-msgstr "Hiteles\303\255t\303\251si token z\303\241r foglalt"
+msgstr "Hitelesítési token zár foglalt"
 
 #: libpam/pam_strerror.c:63
 msgid "Authentication token aging disabled"
-msgstr "Hiteles\303\255t\303\251si token lej\303\241rat kikapcsolva"
+msgstr "Hitelesítési token lejárat kikapcsolva"
 
 #: libpam/pam_strerror.c:65
 msgid "Failed preliminary check by password service"
-msgstr ""
-"A jelsz\303\263szolg\303\241ltat\303\241s el\305\221zetes ellen\305\221rz\303"
-"\251s\303\251n megbukott"
+msgstr "A jelszószolgáltatás előzetes ellenőrzésén megbukott"
 
 #: libpam/pam_strerror.c:67
 msgid "The return value should be ignored by PAM dispatch"
-msgstr ""
-"A PAM eloszt\303\263nak a visszat\303\251r\303\251si \303\251rt\303\251ket "
-"figyelmen k\303\255v\303\274l kell hagynia"
+msgstr "A PAM elosztónak a visszatérési értéket figyelmen kívül kell hagynia"
 
 #: libpam/pam_strerror.c:69
 msgid "Module is unknown"
@@ -460,30 +359,33 @@ msgstr "A modul ismeretlen"
 
 #: libpam/pam_strerror.c:71
 msgid "Authentication token expired"
-msgstr "A hiteles\303\255t\303\251si token lej\303\241rt"
+msgstr "A hitelesítési token lejárt"
 
 #: libpam/pam_strerror.c:73
 msgid "Conversation is waiting for event"
-msgstr "A besz\303\251lget\303\251s egy esem\303\251nyre v\303\241rakozik"
+msgstr "A beszélgetés egy eseményre várakozik"
 
 #: libpam/pam_strerror.c:75
 msgid "Application needs to call libpam again"
-msgstr ""
-"Az alkalmaz\303\241snak \303\272jra meg kell h\303\255vnia a libpam modult"
+msgstr "Az alkalmazásnak újra meg kell hívnia a libpam modult"
 
 #: libpam/pam_strerror.c:78
 msgid "Unknown PAM error"
 msgstr "Ismeretlen PAM-hiba"
 
 #: libpam_misc/misc_conv.c:35
-msgid "..\007.Time is running out...\n"
-msgstr "..\007.Kifut az id\305\221b\305\221l...\n"
+msgid "...Time is running out...\n"
+msgstr "...Kifut az időből...\n"
 
 #: libpam_misc/misc_conv.c:36
-msgid "..\007.Sorry, your time is up!\n"
-msgstr "..\007.Eln\303\251z\303\251st, de az id\305\221 lej\303\241rt!\n"
+msgid "...Sorry, your time is up!\n"
+msgstr "...Elnézést, de az idő lejárt!\n"
 
 #: libpam_misc/misc_conv.c:334
 #, c-format
 msgid "erroneous conversation (%d)\n"
-msgstr "hib\303\241s besz\303\251lget\303\251s (%d)\n"
+msgstr "hibás beszélgetés (%d)\n"
+
+#, fuzzy
+#~ msgid "%s: set %s security context to %s"
+#~ msgstr "Nem érvényes biztonsági kontextus"
diff --git a/po/it.po b/po/it.po
index 4bcc943a..b1a020a3 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-09-05 15:43+0200\n"
+"POT-Creation-Date: 2005-09-14 19:09+0200\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"
@@ -54,121 +54,59 @@ msgid "%s: Can't reset all users to non-zero\n"
 msgstr ""
 "%s: Impossibile ripristinare tutti gli utenti a valori diversi da zero\n"
 
-#: modules/pam_selinux/pam_selinux.c:127
+#: modules/pam_selinux/pam_selinux_check.c:99
+#, c-format
+msgid "failed to initialize PAM\n"
+msgstr "impossibile inizializzare PAM\n"
+
+#: modules/pam_selinux/pam_selinux_check.c:105
+#, c-format
+msgid "failed to pam_set_item()\n"
+msgstr "impossibile pam_set_item()\n"
+
+#: modules/pam_selinux/pam_selinux_check.c:132
+#, c-format
+msgid "login: failure forking: %s"
+msgstr "login: errore forking: %s"
+
+#: modules/pam_selinux/pam_selinux.c:102
 #, c-format
 msgid "Your default context is %s. \n"
-msgstr "Il contesto di default \303\250 %s. \n"
+msgstr "Il contesto di default è %s. \n"
 
-#: modules/pam_selinux/pam_selinux.c:130
+#: modules/pam_selinux/pam_selinux.c:105
 msgid "Do you want to choose a different one? [n]"
 msgstr "Sceglierne un altro? [n]"
 
-#: modules/pam_selinux/pam_selinux.c:137
+#: modules/pam_selinux/pam_selinux.c:112
 msgid "Enter number of choice: "
 msgstr "Immettere il numero di scelta:"
 
-#: modules/pam_selinux/pam_selinux.c:164 modules/pam_selinux/pam_selinux.c:245
-#: modules/pam_selinux/pam_selinux.c:352
-#, c-format
-msgid "%s: bogus conversation function"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:168 modules/pam_selinux/pam_selinux.c:249
-#: modules/pam_selinux/pam_selinux.c:356
-#, c-format
-msgid "%s: no conversation function"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:187
+#: modules/pam_selinux/pam_selinux.c:152
 msgid "Would you like to enter a security context? [y] "
 msgstr "Immettere un contesto di sicurezza? [s]"
 
-#: modules/pam_selinux/pam_selinux.c:204
+#: modules/pam_selinux/pam_selinux.c:169
 msgid "role: "
 msgstr "ruolo:"
 
-#: modules/pam_selinux/pam_selinux.c:212
+#: modules/pam_selinux/pam_selinux.c:177
 msgid "type: "
 msgstr "tipo:"
 
-#: modules/pam_selinux/pam_selinux.c:222
+#: modules/pam_selinux/pam_selinux.c:187
 msgid "level: "
 msgstr "livello:"
 
-#: modules/pam_selinux/pam_selinux.c:236
+#: modules/pam_selinux/pam_selinux.c:203
 msgid "Not a valid security context"
-msgstr "Non \303\250 un contesto di sicurezza valido"
-
-#: modules/pam_selinux/pam_selinux.c:272
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.\n"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:296
-#, c-format
-msgid "Warning!  Could not get current context for %s, not relabeling."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:303
-#, c-format
-msgid "Warning!  Could not get new context for %s, not relabeling."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:313
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.%s"
-msgstr ""
+msgstr "Non è un contesto di sicurezza valido"
 
-#: modules/pam_selinux/pam_selinux.c:429
-#, c-format
-msgid "Unable to get valid context for %s"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:433
-#, c-format
-msgid "Unable to get valid context for %s, No valid tty"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:465
+#: modules/pam_selinux/pam_selinux.c:416
 #, c-format
 msgid "Security Context %s Assigned"
 msgstr "Contesto di sicurezza %s assegnato"
 
-#: modules/pam_selinux/pam_selinux.c:469
-#, c-format
-msgid "Error!  Unable to set %s executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:475
-#, fuzzy, c-format
-msgid "%s: set %s security context to %s"
-msgstr "Non \303\250 un contesto di sicurezza valido"
-
-#: modules/pam_selinux/pam_selinux.c:518
-#, c-format
-msgid "Error!  Unable to set executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:524
-#, c-format
-msgid "%s: setcontext back to orginal"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:585
-#, c-format
-msgid "failed to initialize PAM\n"
-msgstr "impossibile inizializzare PAM\n"
-
-#: modules/pam_selinux/pam_selinux.c:591
-#, c-format
-msgid "failed to pam_set_item()\n"
-msgstr "impossibile pam_set_item()\n"
-
-#: modules/pam_selinux/pam_selinux.c:616
-#, c-format
-msgid "login: failure forking: %s"
-msgstr "login: errore forking: %s"
-
 #: modules/pam_unix/pam_unix_acct.c:268 modules/pam_unix/pam_unix_acct.c:295
 msgid "Your account has expired; please contact your system administrator"
 msgstr "Account scaduto; contattare l'amministratore di sistema"
@@ -176,19 +114,18 @@ msgstr "Account scaduto; contattare l'amministratore di sistema"
 #: modules/pam_unix/pam_unix_acct.c:277
 msgid "You are required to change your password immediately (root enforced)"
 msgstr ""
-"\303\210 richiesta la modifica immediata della parola d'ordine (applicato da "
-"root)"
+"È richiesta la modifica immediata della parola d'ordine (applicato da root)"
 
 #: modules/pam_unix/pam_unix_acct.c:304
 msgid "You are required to change your password immediately (password aged)"
 msgstr ""
-"\303\210 richiesta la modifica immediata della parola d'ordine (parola "
-"d'ordine obsoleta)"
+"È richiesta la modifica immediata della parola d'ordine (parola d'ordine "
+"obsoleta)"
 
 #: modules/pam_unix/pam_unix_acct.c:314
 #, c-format
 msgid "Warning: your password will expire in %d day%.2s"
-msgstr "Avviso: la parola d'ordine scadr\303\240 tra %d giorni%.2s"
+msgstr "Avviso: la parola d'ordine scadrà tra %d giorni%.2s"
 
 #: modules/pam_unix/pam_unix_auth.c:163
 #, fuzzy
@@ -211,11 +148,11 @@ msgstr "Parola d'ordine non modificata"
 
 #: modules/pam_unix/pam_unix_passwd.c:983
 msgid "You must choose a longer password"
-msgstr "Scegliere una parola d'ordine pi\303\271 lunga"
+msgstr "Scegliere una parola d'ordine più lunga"
 
 #: modules/pam_unix/pam_unix_passwd.c:988
 msgid "Password has been already used. Choose another."
-msgstr "Parola d'ordine gi\303\240 utilizzata. Sceglierne un'altra."
+msgstr "Parola d'ordine già utilizzata. Sceglierne un'altra."
 
 #: modules/pam_unix/pam_unix_passwd.c:1112
 msgid "(current) UNIX password: "
@@ -235,19 +172,19 @@ msgstr "Immettere nuova parola d'ordine STRESS:"
 msgid "Retype new UNIX password: "
 msgstr "Ridigitare nuova parola d'ordine STRESS:"
 
-#: modules/pam_stress/pam_stress.c:481
+#: modules/pam_stress/pam_stress.c:474
 msgid "Changing STRESS password for "
 msgstr "Cambio parola d'ordine STRESS per"
 
-#: modules/pam_stress/pam_stress.c:495
+#: modules/pam_stress/pam_stress.c:488
 msgid "Enter new STRESS password: "
 msgstr "Immettere nuova parola d'ordine STRESS:"
 
-#: modules/pam_stress/pam_stress.c:498
+#: modules/pam_stress/pam_stress.c:491
 msgid "Retype new STRESS password: "
 msgstr "Ridigitare nuova parola d'ordine STRESS:"
 
-#: modules/pam_stress/pam_stress.c:526
+#: modules/pam_stress/pam_stress.c:519
 msgid "Verification mis-typed; password unchanged"
 msgstr "Errore digitazione verifica; parola d'ordine non cambiata"
 
@@ -293,7 +230,7 @@ msgstr ""
 #: modules/pam_cracklib/pam_cracklib.c:437
 #, fuzzy
 msgid "has been already used"
-msgstr "Parola d'ordine gi\303\240 utilizzata. Sceglierne un'altra."
+msgstr "Parola d'ordine già utilizzata. Sceglierne un'altra."
 
 #: modules/pam_cracklib/pam_cracklib.c:489
 #: modules/pam_cracklib/pam_cracklib.c:617
@@ -348,8 +285,8 @@ msgstr "Credenziali insufficienti per accedere ai dati di autenticazione"
 #: libpam/pam_strerror.c:33
 msgid "Authentication service cannot retrieve authentication info."
 msgstr ""
-"Il servizio di autenticazione non \303\250 in grado di recuperare le "
-"informazioni di autenticazione."
+"Il servizio di autenticazione non è in grado di recuperare le informazioni "
+"di autenticazione."
 
 #: libpam/pam_strerror.c:35
 msgid "User not known to the underlying authentication module"
@@ -361,7 +298,7 @@ msgstr "Numero massimo di tentativi per il servizio superato."
 
 #: libpam/pam_strerror.c:39
 msgid "Authentication token is no longer valid; new one required."
-msgstr "Token di autenticazione non pi\303\271 valido; richiesto uno nuovo."
+msgstr "Token di autenticazione non più valido; richiesto uno nuovo."
 
 #: libpam/pam_strerror.c:41
 msgid "User account has expired"
@@ -375,8 +312,8 @@ msgstr ""
 #: libpam/pam_strerror.c:45
 msgid "Authentication service cannot retrieve user credentials"
 msgstr ""
-"Il servizio di autenticazione non \303\250 in grado di recuperare le "
-"credenziali utente"
+"Il servizio di autenticazione non è in grado di recuperare le credenziali "
+"utente"
 
 #: libpam/pam_strerror.c:47
 msgid "User credentials expired"
@@ -443,14 +380,18 @@ msgid "Unknown PAM error"
 msgstr "Errore PAM sconosciuto"
 
 #: libpam_misc/misc_conv.c:35
-msgid "..\007.Time is running out...\n"
-msgstr "..\007.Il tempo sta per scadere...\n"
+msgid "...Time is running out...\n"
+msgstr "...Il tempo sta per scadere...\n"
 
 #: libpam_misc/misc_conv.c:36
-msgid "..\007.Sorry, your time is up!\n"
-msgstr "..\007.Tempo scaduto!\n"
+msgid "...Sorry, your time is up!\n"
+msgstr "...Tempo scaduto!\n"
 
 #: libpam_misc/misc_conv.c:334
 #, c-format
 msgid "erroneous conversation (%d)\n"
 msgstr "conversazione errata (%d)\n"
+
+#, fuzzy
+#~ msgid "%s: set %s security context to %s"
+#~ msgstr "Non è un contesto di sicurezza valido"
diff --git a/po/ja.po b/po/ja.po
index 0034dbe8..ba594bf7 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-09-05 15:43+0200\n"
+"POT-Creation-Date: 2005-09-14 19:09+0200\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"
@@ -17,38 +17,29 @@ msgstr ""
 
 #: modules/pam_tally/pam_tally.c:730
 msgid "Authentication error"
-msgstr "\350\252\215\350\250\274\343\202\250\343\203\251\343\203\274"
+msgstr "認証エラー"
 
 #: modules/pam_tally/pam_tally.c:731
 msgid "Service error"
-msgstr ""
-"\343\202\265\343\203\274\343\203\223\343\202\271\343\202\250\343\203\251\343"
-"\203\274"
+msgstr "サービスエラー"
 
 #: modules/pam_tally/pam_tally.c:732
 msgid "Unknown user"
-msgstr ""
-"\344\270\215\346\230\216\343\201\252\343\203\246\343\203\274\343\202\266"
+msgstr "不明なユーザ"
 
 #: modules/pam_tally/pam_tally.c:733
 msgid "Unknown error"
-msgstr ""
-"\344\270\215\346\230\216\343\201\252\343\202\250\343\203\251\343\203\274"
+msgstr "不明なエラー"
 
 #: modules/pam_tally/pam_tally.c:747
 #, c-format
 msgid "%s: Bad number given to --reset=\n"
-msgstr ""
-"%s: \344\270\215\346\255\243\347\225\252\345\217\267\343\201\214--reset=\343"
-"\201\253\344\270\216\343\201\210\343\202\211\343\202\214\343\201\276\343\201"
-"\227\343\201\237\n"
+msgstr "%s: 不正番号が--reset=に与えられました\n"
 
 #: modules/pam_tally/pam_tally.c:751
 #, c-format
 msgid "%s: Unrecognised option %s\n"
-msgstr ""
-"%s: \346\234\252\350\252\215\350\255\230\343\202\252\343\203\227\343\202\267"
-"\343\203\247\343\203\263%s\n"
+msgstr "%s: 未認識オプション%s\n"
 
 #: modules/pam_tally/pam_tally.c:763
 #, c-format
@@ -60,242 +51,106 @@ msgstr ""
 #: modules/pam_tally/pam_tally.c:836
 #, c-format
 msgid "%s: Can't reset all users to non-zero\n"
-msgstr ""
-"%s: \343\201\231\343\201\271\343\201\246\343\201\256\343\203\246\343\203\274"
-"\343\202\266\343\202\222\351\235\236\343\202\274\343\203\255\343\201\253\343"
-"\203\252\343\202\273\343\203\203\343\203\210\343\201\247\343\201\215\343\201"
-"\276\343\201\233\343\202\223\n"
+msgstr "%s: すべてのユーザを非ゼロにリセットできません\n"
 
-#: modules/pam_selinux/pam_selinux.c:127
+#: modules/pam_selinux/pam_selinux_check.c:99
 #, c-format
-msgid "Your default context is %s. \n"
-msgstr ""
-"\343\203\207\343\203\225\343\202\251\343\203\253\343\203\210\343\201\256\343"
-"\202\263\343\203\263\343\203\206\343\202\255\343\202\271\343\203\210\343\201"
-"\257%s\343\201\247\343\201\231\343\200\202 \n"
-
-#: modules/pam_selinux/pam_selinux.c:130
-msgid "Do you want to choose a different one? [n]"
-msgstr ""
-"\347\225\260\343\201\252\343\202\213\343\202\263\343\203\263\343\203\206\343"
-"\202\255\343\202\271\343\203\210\343\202\222\351\201\270\346\212\236\343\201"
-"\227\343\201\276\343\201\231\343\201\213? [n]"
+msgid "failed to initialize PAM\n"
+msgstr "PAMの初期化に失敗しました\n"
 
-#: modules/pam_selinux/pam_selinux.c:137
-msgid "Enter number of choice: "
-msgstr ""
-"\351\201\270\346\212\236\343\201\256\347\225\252\345\217\267\343\202\222\345"
-"\205\245\345\212\233\343\201\227\343\201\246\343\201\217\343\201\240\343\201"
-"\225\343\201\204:"
+#: modules/pam_selinux/pam_selinux_check.c:105
+#, c-format
+msgid "failed to pam_set_item()\n"
+msgstr "pam_set_item()に失敗しました\n"
 
-#: modules/pam_selinux/pam_selinux.c:164 modules/pam_selinux/pam_selinux.c:245
-#: modules/pam_selinux/pam_selinux.c:352
+#: modules/pam_selinux/pam_selinux_check.c:132
 #, c-format
-msgid "%s: bogus conversation function"
-msgstr ""
+msgid "login: failure forking: %s"
+msgstr "ログイン: いまいましい失敗: %s"
 
-#: modules/pam_selinux/pam_selinux.c:168 modules/pam_selinux/pam_selinux.c:249
-#: modules/pam_selinux/pam_selinux.c:356
+#: modules/pam_selinux/pam_selinux.c:102
 #, c-format
-msgid "%s: no conversation function"
-msgstr ""
+msgid "Your default context is %s. \n"
+msgstr "デフォルトのコンテキストは%sです。 \n"
 
-#: modules/pam_selinux/pam_selinux.c:187
+#: modules/pam_selinux/pam_selinux.c:105
+msgid "Do you want to choose a different one? [n]"
+msgstr "異なるコンテキストを選択しますか? [n]"
+
+#: modules/pam_selinux/pam_selinux.c:112
+msgid "Enter number of choice: "
+msgstr "選択の番号を入力してください:"
+
+#: modules/pam_selinux/pam_selinux.c:152
 msgid "Would you like to enter a security context? [y] "
-msgstr ""
-"\343\202\273\343\202\255\343\203\245\343\203\252\343\203\206\343\202\243\343"
-"\202\263\343\203\263\343\203\206\343\202\255\343\202\271\343\203\210\343\202"
-"\222\345\205\245\345\212\233\343\201\227\343\201\276\343\201\231\343\201"
-"\213? [y]"
+msgstr "セキュリティコンテキストを入力しますか? [y]"
 
-#: modules/pam_selinux/pam_selinux.c:204
+#: modules/pam_selinux/pam_selinux.c:169
 msgid "role: "
-msgstr "\345\275\271\345\211\262:"
+msgstr "役割:"
 
-#: modules/pam_selinux/pam_selinux.c:212
+#: modules/pam_selinux/pam_selinux.c:177
 msgid "type: "
-msgstr "\343\202\277\343\202\244\343\203\227:"
+msgstr "タイプ:"
 
-#: modules/pam_selinux/pam_selinux.c:222
+#: modules/pam_selinux/pam_selinux.c:187
 msgid "level: "
-msgstr "\343\203\254\343\203\231\343\203\253:"
+msgstr "レベル:"
 
-#: modules/pam_selinux/pam_selinux.c:236
+#: modules/pam_selinux/pam_selinux.c:203
 msgid "Not a valid security context"
-msgstr ""
-"\346\234\211\345\212\271\343\201\252\343\202\273\343\202\255\343\203\245\343"
-"\203\252\343\203\206\343\202\243\343\202\263\343\203\263\343\203\206\343\202"
-"\255\343\202\271\343\203\210\343\201\247\343\201\202\343\202\212\343\201\276"
-"\343\201\233\343\202\223"
-
-#: modules/pam_selinux/pam_selinux.c:272
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.\n"
-msgstr ""
+msgstr "有効なセキュリティコンテキストでありません"
 
-#: modules/pam_selinux/pam_selinux.c:296
-#, c-format
-msgid "Warning!  Could not get current context for %s, not relabeling."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:303
-#, c-format
-msgid "Warning!  Could not get new context for %s, not relabeling."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:313
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.%s"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:429
-#, c-format
-msgid "Unable to get valid context for %s"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:433
-#, c-format
-msgid "Unable to get valid context for %s, No valid tty"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:465
+#: modules/pam_selinux/pam_selinux.c:416
 #, c-format
 msgid "Security Context %s Assigned"
-msgstr ""
-"\345\211\262\343\202\212\345\275\223\343\201\246\343\202\211\343\202\214\343"
-"\201\237\343\202\273\343\202\255\343\203\245\343\203\252\343\203\206\343\202"
-"\243\343\202\263\343\203\263\343\203\206\343\202\255\343\202\271\343\203\210%"
-"s"
-
-#: modules/pam_selinux/pam_selinux.c:469
-#, c-format
-msgid "Error!  Unable to set %s executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:475
-#, fuzzy, c-format
-msgid "%s: set %s security context to %s"
-msgstr ""
-"\346\234\211\345\212\271\343\201\252\343\202\273\343\202\255\343\203\245\343"
-"\203\252\343\203\206\343\202\243\343\202\263\343\203\263\343\203\206\343\202"
-"\255\343\202\271\343\203\210\343\201\247\343\201\202\343\202\212\343\201\276"
-"\343\201\233\343\202\223"
-
-#: modules/pam_selinux/pam_selinux.c:518
-#, c-format
-msgid "Error!  Unable to set executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:524
-#, c-format
-msgid "%s: setcontext back to orginal"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:585
-#, c-format
-msgid "failed to initialize PAM\n"
-msgstr ""
-"PAM\343\201\256\345\210\235\346\234\237\345\214\226\343\201\253\345\244\261"
-"\346\225\227\343\201\227\343\201\276\343\201\227\343\201\237\n"
-
-#: modules/pam_selinux/pam_selinux.c:591
-#, c-format
-msgid "failed to pam_set_item()\n"
-msgstr ""
-"pam_set_item()\343\201\253\345\244\261\346\225\227\343\201\227\343\201\276"
-"\343\201\227\343\201\237\n"
-
-#: modules/pam_selinux/pam_selinux.c:616
-#, c-format
-msgid "login: failure forking: %s"
-msgstr ""
-"\343\203\255\343\202\260\343\202\244\343\203\263: \343\201\204\343\201\276"
-"\343\201\204\343\201\276\343\201\227\343\201\204\345\244\261\346\225\227: %s"
+msgstr "割り当てられたセキュリティコンテキスト%s"
 
 #: modules/pam_unix/pam_unix_acct.c:268 modules/pam_unix/pam_unix_acct.c:295
 msgid "Your account has expired; please contact your system administrator"
 msgstr ""
-"\343\202\242\343\202\253\343\202\246\343\203\263\343\203\210\343\201\256\346"
-"\234\211\345\212\271\346\234\237\351\231\220\343\201\214\345\210\207\343\202"
-"\214\343\201\276\343\201\227\343\201\237\343\200\202\343\202\267\343\202\271"
-"\343\203\206\343\203\240\347\256\241\347\220\206\350\200\205\343\201\253\343"
-"\201\212\345\225\217\343\201\204\345\220\210\343\202\217\343\201\233\343\201"
-"\217\343\201\240\343\201\225\343\201\204\343\200\202"
+"アカウントの有効期限が切れました。システム管理者にお問い合わせください。"
 
 #: modules/pam_unix/pam_unix_acct.c:277
 msgid "You are required to change your password immediately (root enforced)"
-msgstr ""
-"\343\203\221\343\202\271\343\203\257\343\203\274\343\203\211\343\202\222\347"
-"\233\264\343\201\241\343\201\253\345\244\211\346\233\264\343\201\231\343\202"
-"\213\345\277\205\350\246\201\343\201\214\343\201\202\343\202\212\343\201\276"
-"\343\201\231(\345\274\267\345\210\266\343\201\225\343\202\214\343\201\237\343"
-"\203\253\343\203\274\343\203\210)"
+msgstr "パスワードを直ちに変更する必要があります(強制されたルート)"
 
 #: modules/pam_unix/pam_unix_acct.c:304
 msgid "You are required to change your password immediately (password aged)"
-msgstr ""
-"\343\203\221\343\202\271\343\203\257\343\203\274\343\203\211\343\202\222\347"
-"\233\264\343\201\241\343\201\253\345\244\211\346\233\264\343\201\231\343\202"
-"\213\345\277\205\350\246\201\343\201\214\343\201\202\343\202\212\343\201\276"
-"\343\201\231(\345\217\244\343\201\204\343\203\221\343\202\271\343\203\257\343"
-"\203\274\343\203\211)"
+msgstr "パスワードを直ちに変更する必要があります(古いパスワード)"
 
 #: modules/pam_unix/pam_unix_acct.c:314
 #, c-format
 msgid "Warning: your password will expire in %d day%.2s"
-msgstr ""
-"\350\255\246\345\221\212: \343\203\221\343\202\271\343\203\257\343\203\274"
-"\343\203\211\343\201\257%d\346\227\245\343\201\247\346\234\211\345\212\271"
-"\346\234\237\351\231\220\343\201\214\345\210\207\343\202\214\343\201\276\343"
-"\201\231\343\200\202%.2s"
+msgstr "警告: パスワードは%d日で有効期限が切れます。%.2s"
 
 #: modules/pam_unix/pam_unix_auth.c:163
 #, fuzzy
 msgid "Password: "
-msgstr ""
-"\343\203\221\343\202\271\343\203\257\343\203\274\343\203\211\343\201\214\345"
-"\244\211\346\233\264\343\201\225\343\202\214\343\201\246\343\201\204\343\201"
-"\276\343\201\233\343\202\223"
+msgstr "パスワードが変更されていません"
 
 #: modules/pam_unix/pam_unix_passwd.c:818
 msgid "NIS password could not be changed."
-msgstr ""
-"NIS\343\203\221\343\202\271\343\203\257\343\203\274\343\203\211\343\202\222"
-"\345\244\211\346\233\264\343\201\247\343\201\215\343\201\276\343\201\233\343"
-"\202\223\343\201\247\343\201\227\343\201\237\343\200\202"
+msgstr "NISパスワードを変更できませんでした。"
 
 #: modules/pam_unix/pam_unix_passwd.c:962
 #: modules/pam_cracklib/pam_cracklib.c:465
 msgid "No password supplied"
-msgstr ""
-"\343\203\221\343\202\271\343\203\257\343\203\274\343\203\211\343\201\214\344"
-"\270\216\343\201\210\343\202\211\343\202\214\343\201\246\343\201\204\343\201"
-"\276\343\201\233\343\202\223"
+msgstr "パスワードが与えられていません"
 
 #: modules/pam_unix/pam_unix_passwd.c:962
 #: modules/pam_cracklib/pam_cracklib.c:465
 msgid "Password unchanged"
-msgstr ""
-"\343\203\221\343\202\271\343\203\257\343\203\274\343\203\211\343\201\214\345"
-"\244\211\346\233\264\343\201\225\343\202\214\343\201\246\343\201\204\343\201"
-"\276\343\201\233\343\202\223"
+msgstr "パスワードが変更されていません"
 
 #: modules/pam_unix/pam_unix_passwd.c:983
 msgid "You must choose a longer password"
-msgstr ""
-"\351\225\267\343\201\204\343\203\221\343\202\271\343\203\257\343\203\274\343"
-"\203\211\343\202\222\351\201\270\346\212\236\343\201\231\343\202\213\345\277"
-"\205\350\246\201\343\201\214\343\201\202\343\202\212\343\201\276\343\201\231"
+msgstr "長いパスワードを選択する必要があります"
 
 #: modules/pam_unix/pam_unix_passwd.c:988
 msgid "Password has been already used. Choose another."
 msgstr ""
-"\343\203\221\343\202\271\343\203\257\343\203\274\343\203\211\343\201\257\343"
-"\201\231\343\201\247\343\201\253\344\275\277\347\224\250\343\201\225\343\202"
-"\214\343\201\246\343\201\204\343\201\276\343\201\231\343\200\202 \345\210\245"
-"\343\201\256\343\203\221\343\202\271\343\203\257\343\203\274\343\203\211\343"
-"\202\222\351\201\270\346\212\236\343\201\227\343\201\246\343\201\217\343\201"
-"\240\343\201\225\343\201\204\343\200\202"
+"パスワードはすでに使用されています。 別のパスワードを選択してください。"
 
 #: modules/pam_unix/pam_unix_passwd.c:1112
 msgid "(current) UNIX password: "
@@ -303,79 +158,48 @@ msgstr ""
 
 #: modules/pam_unix/pam_unix_passwd.c:1147
 msgid "You must wait longer to change your password"
-msgstr ""
-"\343\203\221\343\202\271\343\203\257\343\203\274\343\203\211\343\202\222\345"
-"\244\211\346\233\264\343\201\231\343\202\213\343\201\253\343\201\257\351\225"
-"\267\343\201\217\345\276\205\343\201\244\345\277\205\350\246\201\343\201\214"
-"\343\201\202\343\202\212\343\201\276\343\201\231"
+msgstr "パスワードを変更するには長く待つ必要があります"
 
 #: modules/pam_unix/pam_unix_passwd.c:1207
 #, fuzzy
 msgid "Enter new UNIX password: "
-msgstr ""
-"\346\226\260\343\201\227\343\201\204STRESS\343\203\221\343\202\271\343\203"
-"\257\343\203\274\343\203\211\343\202\222\345\205\245\345\212\233\343\201\227"
-"\343\201\246\343\201\217\343\201\240\343\201\225\343\201\204:"
+msgstr "新しいSTRESSパスワードを入力してください:"
 
 #: modules/pam_unix/pam_unix_passwd.c:1208
 #, fuzzy
 msgid "Retype new UNIX password: "
-msgstr ""
-"\346\226\260\343\201\227\343\201\204STRESS\343\203\221\343\202\271\343\203"
-"\257\343\203\274\343\203\211\343\202\222\345\206\215\345\205\245\345\212\233"
-"\343\201\227\343\201\246\343\201\217\343\201\240\343\201\225\343\201\204:"
+msgstr "新しいSTRESSパスワードを再入力してください:"
 
-#: modules/pam_stress/pam_stress.c:481
+#: modules/pam_stress/pam_stress.c:474
 msgid "Changing STRESS password for "
-msgstr ""
-"STRESS\343\203\221\343\202\271\343\203\257\343\203\274\343\203\211\343\201"
-"\256\345\244\211\346\233\264\345\205\203"
+msgstr "STRESSパスワードの変更元"
 
-#: modules/pam_stress/pam_stress.c:495
+#: modules/pam_stress/pam_stress.c:488
 msgid "Enter new STRESS password: "
-msgstr ""
-"\346\226\260\343\201\227\343\201\204STRESS\343\203\221\343\202\271\343\203"
-"\257\343\203\274\343\203\211\343\202\222\345\205\245\345\212\233\343\201\227"
-"\343\201\246\343\201\217\343\201\240\343\201\225\343\201\204:"
+msgstr "新しいSTRESSパスワードを入力してください:"
 
-#: modules/pam_stress/pam_stress.c:498
+#: modules/pam_stress/pam_stress.c:491
 msgid "Retype new STRESS password: "
-msgstr ""
-"\346\226\260\343\201\227\343\201\204STRESS\343\203\221\343\202\271\343\203"
-"\257\343\203\274\343\203\211\343\202\222\345\206\215\345\205\245\345\212\233"
-"\343\201\227\343\201\246\343\201\217\343\201\240\343\201\225\343\201\204:"
+msgstr "新しいSTRESSパスワードを再入力してください:"
 
-#: modules/pam_stress/pam_stress.c:526
+#: modules/pam_stress/pam_stress.c:519
 msgid "Verification mis-typed; password unchanged"
-msgstr ""
-"\343\203\237\343\202\271\343\202\277\343\202\244\343\203\227\343\201\256\347"
-"\242\272\350\252\215\343\200\201\343\203\221\343\202\271\343\203\257\343\203"
-"\274\343\203\211\343\201\214\345\244\211\346\233\264\343\201\225\343\202\214"
-"\343\201\246\343\201\204\343\201\276\343\201\233\343\202\223"
+msgstr "ミスタイプの確認、パスワードが変更されていません"
 
 #: modules/pam_cracklib/pam_cracklib.c:61
 #, fuzzy, c-format
 msgid "New %s%spassword: "
-msgstr ""
-"\343\203\221\343\202\271\343\203\257\343\203\274\343\203\211\343\201\214\345"
-"\244\211\346\233\264\343\201\225\343\202\214\343\201\246\343\201\204\343\201"
-"\276\343\201\233\343\202\223"
+msgstr "パスワードが変更されていません"
 
 #: modules/pam_cracklib/pam_cracklib.c:63
 #, fuzzy, c-format
 msgid "Retype new %s%spassword: "
-msgstr ""
-"\346\226\260\343\201\227\343\201\204STRESS\343\203\221\343\202\271\343\203"
-"\257\343\203\274\343\203\211\343\202\222\345\206\215\345\205\245\345\212\233"
-"\343\201\227\343\201\246\343\201\217\343\201\240\343\201\225\343\201\204:"
+msgstr "新しいSTRESSパスワードを再入力してください:"
 
 #: modules/pam_cracklib/pam_cracklib.c:64
 #, fuzzy
 msgid "Sorry, passwords do not match."
-msgstr ""
-"NIS\343\203\221\343\202\271\343\203\257\343\203\274\343\203\211\343\202\222"
-"\345\244\211\346\233\264\343\201\247\343\201\215\343\201\276\343\201\233\343"
-"\202\223\343\201\247\343\201\227\343\201\237\343\200\202"
+msgstr "NISパスワードを変更できませんでした。"
 
 #: modules/pam_cracklib/pam_cracklib.c:379
 msgid "is the same as the old one"
@@ -405,12 +229,7 @@ msgstr ""
 #, fuzzy
 msgid "has been already used"
 msgstr ""
-"\343\203\221\343\202\271\343\203\257\343\203\274\343\203\211\343\201\257\343"
-"\201\231\343\201\247\343\201\253\344\275\277\347\224\250\343\201\225\343\202"
-"\214\343\201\246\343\201\204\343\201\276\343\201\231\343\200\202 \345\210\245"
-"\343\201\256\343\203\221\343\202\271\343\203\257\343\203\274\343\203\211\343"
-"\202\222\351\201\270\346\212\236\343\201\227\343\201\246\343\201\217\343\201"
-"\240\343\201\225\343\201\204\343\200\202"
+"パスワードはすでに使用されています。 別のパスワードを選択してください。"
 
 #: modules/pam_cracklib/pam_cracklib.c:489
 #: modules/pam_cracklib/pam_cracklib.c:617
@@ -424,239 +243,149 @@ msgstr ""
 
 #: libpam/pam_strerror.c:13
 msgid "Success"
-msgstr "\346\210\220\345\212\237"
+msgstr "成功"
 
 #: libpam/pam_strerror.c:15
 msgid "Critical error - immediate abort"
-msgstr ""
-"\350\207\264\345\221\275\347\232\204\343\202\250\343\203\251\343\203\274 - "
-"\347\233\264\343\201\241\343\201\253\344\270\255\346\255\242\343\201\227\343"
-"\201\246\343\201\217\343\201\240\343\201\225\343\201\204"
+msgstr "致命的エラー - 直ちに中止してください"
 
 #: libpam/pam_strerror.c:17
 msgid "dlopen() failure"
-msgstr "dlopen()\345\244\261\346\225\227"
+msgstr "dlopen()失敗"
 
 #: libpam/pam_strerror.c:19
 msgid "Symbol not found"
-msgstr ""
-"\350\250\230\345\217\267\343\201\214\350\246\213\343\201\244\343\201\213\343"
-"\202\212\343\201\276\343\201\233\343\202\223"
+msgstr "記号が見つかりません"
 
 #: libpam/pam_strerror.c:21
 msgid "Error in service module"
-msgstr ""
-"\343\202\265\343\203\274\343\203\223\343\202\271\343\203\242\343\202\270\343"
-"\203\245\343\203\274\343\203\253\343\201\256\343\202\250\343\203\251\343\203"
-"\274"
+msgstr "サービスモジュールのエラー"
 
 #: libpam/pam_strerror.c:23
 msgid "System error"
-msgstr ""
-"\343\202\267\343\202\271\343\203\206\343\203\240\343\202\250\343\203\251\343"
-"\203\274"
+msgstr "システムエラー"
 
 #: libpam/pam_strerror.c:25
 msgid "Memory buffer error"
-msgstr ""
-"\343\203\241\343\203\242\343\203\252\343\203\220\343\203\203\343\203\225\343"
-"\202\241\343\202\250\343\203\251\343\203\274"
+msgstr "メモリバッファエラー"
 
 #: libpam/pam_strerror.c:27
 msgid "Permission denied"
-msgstr ""
-"\346\213\222\345\220\246\343\201\225\343\202\214\343\201\237\343\203\221\343"
-"\203\274\343\203\237\343\203\203\343\202\267\343\203\247\343\203\263"
+msgstr "拒否されたパーミッション"
 
 #: libpam/pam_strerror.c:29
 msgid "Authentication failure"
-msgstr "\350\252\215\350\250\274\345\244\261\346\225\227"
+msgstr "認証失敗"
 
 #: libpam/pam_strerror.c:31
 msgid "Insufficient credentials to access authentication data"
-msgstr ""
-"\350\252\215\350\250\274\343\203\207\343\203\274\343\202\277\343\201\253\343"
-"\202\242\343\202\257\343\202\273\343\202\271\343\201\231\343\202\213\350\263"
-"\207\346\240\274\350\252\215\345\256\232\343\201\214\343\201\202\343\202\212"
-"\343\201\276\343\201\233\343\202\223"
+msgstr "認証データにアクセスする資格認定がありません"
 
 #: libpam/pam_strerror.c:33
 msgid "Authentication service cannot retrieve authentication info."
-msgstr ""
-"\350\252\215\350\250\274\343\202\265\343\203\274\343\203\223\343\202\271\343"
-"\201\214\350\252\215\350\250\274\346\203\205\345\240\261\343\202\222\346\244"
-"\234\347\264\242\343\201\247\343\201\215\343\201\276\343\201\233\343\202\223"
-"\343\200\202"
+msgstr "認証サービスが認証情報を検索できません。"
 
 #: libpam/pam_strerror.c:35
 msgid "User not known to the underlying authentication module"
-msgstr ""
-"\345\237\272\347\244\216\343\201\250\343\201\252\343\202\213\350\252\215\350"
-"\250\274\343\203\242\343\202\270\343\203\245\343\203\274\343\203\253\343\202"
-"\222\347\237\245\343\202\211\343\201\252\343\201\204\343\203\246\343\203\274"
-"\343\202\266"
+msgstr "基礎となる認証モジュールを知らないユーザ"
 
 #: libpam/pam_strerror.c:37
 msgid "Have exhausted maximum number of retries for service."
-msgstr ""
-"\343\202\265\343\203\274\343\203\223\343\202\271\343\201\256\346\234\200\345"
-"\244\247\350\251\246\350\241\214\345\233\236\346\225\260\343\201\253\351\201"
-"\224\343\201\227\343\201\276\343\201\227\343\201\237\343\200\202"
+msgstr "サービスの最大試行回数に達しました。"
 
 #: libpam/pam_strerror.c:39
 msgid "Authentication token is no longer valid; new one required."
-msgstr ""
-"\350\252\215\350\250\274\343\203\210\343\203\274\343\202\257\343\203\263\343"
-"\201\257\343\202\202\343\201\257\343\202\204\346\234\211\345\212\271\343\201"
-"\247\343\201\257\343\201\202\343\202\212\343\201\276\343\201\233\343\202\223"
-"\343\200\202\346\226\260\343\201\227\343\201\204\350\252\215\350\250\274\343"
-"\203\210\343\203\274\343\202\257\343\203\263\343\201\214\345\277\205\350\246"
-"\201\343\201\247\343\201\231\343\200\202"
+msgstr "認証トークンはもはや有効ではありません。新しい認証トークンが必要です。"
 
 #: libpam/pam_strerror.c:41
 msgid "User account has expired"
-msgstr ""
-"\343\203\246\343\203\274\343\202\266\343\202\242\343\202\253\343\202\246\343"
-"\203\263\343\203\210\343\201\256\346\234\211\345\212\271\346\234\237\351\231"
-"\220\343\201\214\345\210\207\343\202\214\343\201\276\343\201\227\343\201\237"
+msgstr "ユーザアカウントの有効期限が切れました"
 
 #: libpam/pam_strerror.c:43
 msgid "Cannot make/remove an entry for the specified session"
-msgstr ""
-"\346\214\207\345\256\232\343\201\227\343\201\237\343\202\273\343\203\203\343"
-"\202\267\343\203\247\343\203\263\343\201\253\345\257\276\343\201\231\343\202"
-"\213\343\202\250\343\203\263\343\203\210\343\203\252\343\202\222\344\275\234"
-"\346\210\220/\345\211\212\351\231\244\343\201\247\343\201\215\343\201\276\343"
-"\201\233\343\202\223"
+msgstr "指定したセッションに対するエントリを作成/削除できません"
 
 #: libpam/pam_strerror.c:45
 msgid "Authentication service cannot retrieve user credentials"
-msgstr ""
-"\350\252\215\350\250\274\343\202\265\343\203\274\343\203\223\343\202\271\343"
-"\201\214\343\203\246\343\203\274\343\202\266\350\263\207\346\240\274\350\252"
-"\215\345\256\232\343\202\222\346\244\234\347\264\242\343\201\247\343\201\215"
-"\343\201\276\343\201\233\343\202\223"
+msgstr "認証サービスがユーザ資格認定を検索できません"
 
 #: libpam/pam_strerror.c:47
 msgid "User credentials expired"
-msgstr ""
-"\343\203\246\343\203\274\343\202\266\350\263\207\346\240\274\350\252\215\345"
-"\256\232\343\201\256\346\234\211\345\212\271\346\234\237\351\231\220\345\210"
-"\207\343\202\214"
+msgstr "ユーザ資格認定の有効期限切れ"
 
 #: libpam/pam_strerror.c:49
 msgid "Failure setting user credentials"
-msgstr ""
-"\343\203\246\343\203\274\343\202\266\350\263\207\346\240\274\350\252\215\345"
-"\256\232\343\201\256\350\250\255\345\256\232\343\201\253\345\244\261\346\225"
-"\227\343\201\227\343\201\276\343\201\227\343\201\237"
+msgstr "ユーザ資格認定の設定に失敗しました"
 
 #: libpam/pam_strerror.c:51
 msgid "No module specific data is present"
-msgstr ""
-"\343\203\242\343\202\270\343\203\245\343\203\274\343\203\253\345\233\272\346"
-"\234\211\343\203\207\343\203\274\343\202\277\343\201\214\343\201\202\343\202"
-"\212\343\201\276\343\201\233\343\202\223"
+msgstr "モジュール固有データがありません"
 
 #: libpam/pam_strerror.c:53
 msgid "Bad item passed to pam_*_item()"
-msgstr ""
-"pam_*_item()\343\201\253\346\270\241\343\201\225\343\202\214\343\201\237\344"
-"\270\215\346\255\243\351\240\205\347\233\256"
+msgstr "pam_*_item()に渡された不正項目"
 
 #: libpam/pam_strerror.c:55
 msgid "Conversation error"
-msgstr "\344\274\232\350\251\261\343\202\250\343\203\251\343\203\274"
+msgstr "会話エラー"
 
 #: libpam/pam_strerror.c:57
 msgid "Authentication token manipulation error"
-msgstr ""
-"\350\252\215\350\250\274\343\203\210\343\203\274\343\202\257\343\203\263\346"
-"\223\215\344\275\234\343\202\250\343\203\251\343\203\274"
+msgstr "認証トークン操作エラー"
 
 #: libpam/pam_strerror.c:59
 msgid "Authentication information cannot be recovered"
-msgstr ""
-"\350\252\215\350\250\274\346\203\205\345\240\261\343\202\222\345\233\236\345"
-"\276\251\343\201\247\343\201\215\343\201\276\343\201\233\343\202\223"
+msgstr "認証情報を回復できません"
 
 #: libpam/pam_strerror.c:61
 msgid "Authentication token lock busy"
-msgstr ""
-"\350\252\215\350\250\274\343\203\210\343\203\274\343\202\257\343\203\263\343"
-"\202\222\343\203\255\343\203\203\343\202\257\344\270\255\343\201\247\343\201"
-"\231"
+msgstr "認証トークンをロック中です"
 
 #: libpam/pam_strerror.c:63
 msgid "Authentication token aging disabled"
-msgstr ""
-"\350\252\215\350\250\274\343\203\210\343\203\274\343\202\257\343\203\263\343"
-"\202\250\343\203\274\343\202\270\343\203\263\343\202\260\343\201\214\347\204"
-"\241\345\212\271\343\201\247\343\201\231"
+msgstr "認証トークンエージングが無効です"
 
 #: libpam/pam_strerror.c:65
 msgid "Failed preliminary check by password service"
-msgstr ""
-"\343\203\221\343\202\271\343\203\257\343\203\274\343\203\211\343\202\265\343"
-"\203\274\343\203\223\343\202\271\343\201\253\343\202\210\343\202\213\344\272"
-"\210\345\202\231\343\203\201\343\202\247\343\203\203\343\202\257\343\201\253"
-"\345\244\261\346\225\227\343\201\227\343\201\276\343\201\227\343\201\237"
+msgstr "パスワードサービスによる予備チェックに失敗しました"
 
 #: libpam/pam_strerror.c:67
 msgid "The return value should be ignored by PAM dispatch"
-msgstr ""
-"\346\210\273\343\202\212\345\200\244\343\201\257PAM\343\202\277\343\202\271"
-"\343\202\257\346\214\207\345\220\215\343\201\253\343\202\210\343\202\212\347"
-"\204\241\350\246\226\343\201\231\343\202\213\345\277\205\350\246\201\343\201"
-"\214\343\201\202\343\202\212\343\201\276\343\201\231"
+msgstr "戻り値はPAMタスク指名により無視する必要があります"
 
 #: libpam/pam_strerror.c:69
 msgid "Module is unknown"
-msgstr ""
-"\343\203\242\343\202\270\343\203\245\343\203\274\343\203\253\343\201\214\344"
-"\270\215\346\230\216\343\201\247\343\201\231"
+msgstr "モジュールが不明です"
 
 #: libpam/pam_strerror.c:71
 msgid "Authentication token expired"
-msgstr ""
-"\350\252\215\350\250\274\343\203\210\343\203\274\343\202\257\343\203\263\343"
-"\201\256\346\234\211\345\212\271\346\234\237\351\231\220\345\210\207\343\202"
-"\214\343\201\247\343\201\231"
+msgstr "認証トークンの有効期限切れです"
 
 #: libpam/pam_strerror.c:73
 msgid "Conversation is waiting for event"
-msgstr ""
-"\344\274\232\350\251\261\343\201\257\343\202\244\343\203\231\343\203\263\343"
-"\203\210\343\202\222\345\276\205\343\201\243\343\201\246\343\201\204\343\201"
-"\276\343\201\231"
+msgstr "会話はイベントを待っています"
 
 #: libpam/pam_strerror.c:75
 msgid "Application needs to call libpam again"
-msgstr ""
-"\343\202\242\343\203\227\343\203\252\343\202\261\343\203\274\343\202\267\343"
-"\203\247\343\203\263\343\201\257libpam\343\202\222\345\206\215\343\201\263"
-"\345\221\274\343\201\263\345\207\272\343\201\231\345\277\205\350\246\201\343"
-"\201\214\343\201\202\343\202\212\343\201\276\343\201\231"
+msgstr "アプリケーションはlibpamを再び呼び出す必要があります"
 
 #: libpam/pam_strerror.c:78
 msgid "Unknown PAM error"
-msgstr ""
-"\344\270\215\346\230\216\343\201\252PAM\343\202\250\343\203\251\343\203\274"
+msgstr "不明なPAMエラー"
 
 #: libpam_misc/misc_conv.c:35
-msgid "..\007.Time is running out...\n"
-msgstr ""
-"..\007.\346\231\202\351\226\223\343\201\214\345\210\207\343\202\214\343\201"
-"\213\343\201\213\343\201\243\343\201\246\343\201\204\343\201\276\343\201"
-"\231...\n"
+msgid "...Time is running out...\n"
+msgstr "...時間が切れかかっています...\n"
 
 #: libpam_misc/misc_conv.c:36
-msgid "..\007.Sorry, your time is up!\n"
-msgstr ""
-"..\007.\346\231\202\351\226\223\345\210\207\343\202\214\343\201\247\343\201"
-"\231\343\200\202\n"
+msgid "...Sorry, your time is up!\n"
+msgstr "...時間切れです。\n"
 
 #: libpam_misc/misc_conv.c:334
 #, c-format
 msgid "erroneous conversation (%d)\n"
-msgstr "\350\252\244\343\201\243\343\201\237\344\274\232\350\251\261(%d)\n"
+msgstr "誤った会話(%d)\n"
+
+#, fuzzy
+#~ msgid "%s: set %s security context to %s"
+#~ msgstr "有効なセキュリティコンテキストでありません"
diff --git a/po/nb.po b/po/nb.po
index 9c5fd48e..359a09c8 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-09-05 15:43+0200\n"
+"POT-Creation-Date: 2005-09-14 19:09+0200\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"
@@ -54,137 +54,75 @@ msgstr ""
 msgid "%s: Can't reset all users to non-zero\n"
 msgstr "%s: Kan ikke tilbakestille alle brukere til non-zero\n"
 
-#: modules/pam_selinux/pam_selinux.c:127
+#: modules/pam_selinux/pam_selinux_check.c:99
+#, c-format
+msgid "failed to initialize PAM\n"
+msgstr "kunne ikke initialisere PAM\n"
+
+#: modules/pam_selinux/pam_selinux_check.c:105
+#, c-format
+msgid "failed to pam_set_item()\n"
+msgstr "kunne ikke pam_set_item()\n"
+
+#: modules/pam_selinux/pam_selinux_check.c:132
+#, c-format
+msgid "login: failure forking: %s"
+msgstr "login: feil under forgrening: %s"
+
+#: modules/pam_selinux/pam_selinux.c:102
 #, c-format
 msgid "Your default context is %s. \n"
 msgstr "Din standardkontekst er %s. \n"
 
-#: modules/pam_selinux/pam_selinux.c:130
+#: modules/pam_selinux/pam_selinux.c:105
 msgid "Do you want to choose a different one? [n]"
 msgstr "Vil du velge en annen? [n]"
 
-#: modules/pam_selinux/pam_selinux.c:137
+#: modules/pam_selinux/pam_selinux.c:112
 msgid "Enter number of choice: "
 msgstr "Angi et tall: "
 
-#: modules/pam_selinux/pam_selinux.c:164 modules/pam_selinux/pam_selinux.c:245
-#: modules/pam_selinux/pam_selinux.c:352
-#, c-format
-msgid "%s: bogus conversation function"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:168 modules/pam_selinux/pam_selinux.c:249
-#: modules/pam_selinux/pam_selinux.c:356
-#, c-format
-msgid "%s: no conversation function"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:187
+#: modules/pam_selinux/pam_selinux.c:152
 msgid "Would you like to enter a security context? [y] "
 msgstr "Vil du angi en sikkerhetskontekst? [y] "
 
-#: modules/pam_selinux/pam_selinux.c:204
+#: modules/pam_selinux/pam_selinux.c:169
 msgid "role: "
 msgstr "rolle: "
 
-#: modules/pam_selinux/pam_selinux.c:212
+#: modules/pam_selinux/pam_selinux.c:177
 msgid "type: "
 msgstr "type: "
 
-#: modules/pam_selinux/pam_selinux.c:222
+#: modules/pam_selinux/pam_selinux.c:187
 msgid "level: "
-msgstr "niv\303\245: "
+msgstr "nivå: "
 
-#: modules/pam_selinux/pam_selinux.c:236
+#: modules/pam_selinux/pam_selinux.c:203
 msgid "Not a valid security context"
 msgstr "Ikke en gyldig sikkerhetskontekst"
 
-#: modules/pam_selinux/pam_selinux.c:272
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.\n"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:296
-#, c-format
-msgid "Warning!  Could not get current context for %s, not relabeling."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:303
-#, c-format
-msgid "Warning!  Could not get new context for %s, not relabeling."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:313
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.%s"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:429
-#, c-format
-msgid "Unable to get valid context for %s"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:433
-#, c-format
-msgid "Unable to get valid context for %s, No valid tty"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:465
+#: modules/pam_selinux/pam_selinux.c:416
 #, c-format
 msgid "Security Context %s Assigned"
 msgstr "Sikkerhetskontekst %s tilordnet"
 
-#: modules/pam_selinux/pam_selinux.c:469
-#, c-format
-msgid "Error!  Unable to set %s executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:475
-#, fuzzy, c-format
-msgid "%s: set %s security context to %s"
-msgstr "Ikke en gyldig sikkerhetskontekst"
-
-#: modules/pam_selinux/pam_selinux.c:518
-#, c-format
-msgid "Error!  Unable to set executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:524
-#, c-format
-msgid "%s: setcontext back to orginal"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:585
-#, c-format
-msgid "failed to initialize PAM\n"
-msgstr "kunne ikke initialisere PAM\n"
-
-#: modules/pam_selinux/pam_selinux.c:591
-#, c-format
-msgid "failed to pam_set_item()\n"
-msgstr "kunne ikke pam_set_item()\n"
-
-#: modules/pam_selinux/pam_selinux.c:616
-#, c-format
-msgid "login: failure forking: %s"
-msgstr "login: feil under forgrening: %s"
-
 #: modules/pam_unix/pam_unix_acct.c:268 modules/pam_unix/pam_unix_acct.c:295
 msgid "Your account has expired; please contact your system administrator"
-msgstr "Din konto er utl\303\270pt; kontakt systemadministratoren"
+msgstr "Din konto er utløpt; kontakt systemadministratoren"
 
 #: modules/pam_unix/pam_unix_acct.c:277
 msgid "You are required to change your password immediately (root enforced)"
-msgstr "Du m\303\245 straks endre passordet ditt (ordre fra rot)"
+msgstr "Du må straks endre passordet ditt (ordre fra rot)"
 
 #: modules/pam_unix/pam_unix_acct.c:304
 msgid "You are required to change your password immediately (password aged)"
-msgstr "Du m\303\245 straks endre passordet ditt (passord for gammelt)"
+msgstr "Du må straks endre passordet ditt (passord for gammelt)"
 
 #: modules/pam_unix/pam_unix_acct.c:314
 #, c-format
 msgid "Warning: your password will expire in %d day%.2s"
-msgstr "Advarsel: passordet ditt vil utl\303\270pe om %d dager%.2s"
+msgstr "Advarsel: passordet ditt vil utløpe om %d dager%.2s"
 
 #: modules/pam_unix/pam_unix_auth.c:163
 #, fuzzy
@@ -207,7 +145,7 @@ msgstr "Passord uendret"
 
 #: modules/pam_unix/pam_unix_passwd.c:983
 msgid "You must choose a longer password"
-msgstr "Du m\303\245 velge et lengre passord"
+msgstr "Du må velge et lengre passord"
 
 #: modules/pam_unix/pam_unix_passwd.c:988
 msgid "Password has been already used. Choose another."
@@ -219,7 +157,7 @@ msgstr ""
 
 #: modules/pam_unix/pam_unix_passwd.c:1147
 msgid "You must wait longer to change your password"
-msgstr "Du m\303\245 vente lenger f\303\270r du kan endre passordet"
+msgstr "Du må vente lenger før du kan endre passordet"
 
 #: modules/pam_unix/pam_unix_passwd.c:1207
 #, fuzzy
@@ -231,19 +169,19 @@ msgstr "Angi nytt STRESS-passord: "
 msgid "Retype new UNIX password: "
 msgstr "Bekreft nytt STRESS-passord: "
 
-#: modules/pam_stress/pam_stress.c:481
+#: modules/pam_stress/pam_stress.c:474
 msgid "Changing STRESS password for "
 msgstr "Endrer STRESS-passord for "
 
-#: modules/pam_stress/pam_stress.c:495
+#: modules/pam_stress/pam_stress.c:488
 msgid "Enter new STRESS password: "
 msgstr "Angi nytt STRESS-passord: "
 
-#: modules/pam_stress/pam_stress.c:498
+#: modules/pam_stress/pam_stress.c:491
 msgid "Retype new STRESS password: "
 msgstr "Bekreft nytt STRESS-passord: "
 
-#: modules/pam_stress/pam_stress.c:526
+#: modules/pam_stress/pam_stress.c:519
 msgid "Verification mis-typed; password unchanged"
 msgstr "Bekreftelse feil skrevet; passord uendret"
 
@@ -303,7 +241,7 @@ msgstr ""
 
 #: libpam/pam_strerror.c:13
 msgid "Success"
-msgstr "Utf\303\270rt"
+msgstr "Utført"
 
 #: libpam/pam_strerror.c:15
 msgid "Critical error - immediate abort"
@@ -351,7 +289,7 @@ msgstr "Bruker ukjent for autentiseringsmodul"
 
 #: libpam/pam_strerror.c:37
 msgid "Have exhausted maximum number of retries for service."
-msgstr "Maksimalt antall fors\303\270k er overskredet for tjenesten."
+msgstr "Maksimalt antall forsøk er overskredet for tjenesten."
 
 #: libpam/pam_strerror.c:39
 msgid "Authentication token is no longer valid; new one required."
@@ -359,12 +297,11 @@ msgstr "Autentiseringsjide ikke lenger gyldig; ny kode kreves."
 
 #: libpam/pam_strerror.c:41
 msgid "User account has expired"
-msgstr "Brukerkonto er utl\303\270pt"
+msgstr "Brukerkonto er utløpt"
 
 #: libpam/pam_strerror.c:43
 msgid "Cannot make/remove an entry for the specified session"
-msgstr ""
-"Kan ikke opprette/fjerne en oppf\303\270ring for den valgte \303\270kten"
+msgstr "Kan ikke opprette/fjerne en oppføring for den valgte økten"
 
 #: libpam/pam_strerror.c:45
 msgid "Authentication service cannot retrieve user credentials"
@@ -372,7 +309,7 @@ msgstr "Autentiseringstjenesten kan ikke hente brukerrettigheter"
 
 #: libpam/pam_strerror.c:47
 msgid "User credentials expired"
-msgstr "Brukerrettigheter utl\303\270pt"
+msgstr "Brukerrettigheter utløpt"
 
 #: libpam/pam_strerror.c:49
 msgid "Failure setting user credentials"
@@ -384,7 +321,7 @@ msgstr "Nei modulspesifikk informasjon finnes"
 
 #: libpam/pam_strerror.c:53
 msgid "Bad item passed to pam_*_item()"
-msgstr "Ugyldig oppf\303\270ring angitt for pam_*_item()"
+msgstr "Ugyldig oppføring angitt for pam_*_item()"
 
 #: libpam/pam_strerror.c:55
 msgid "Conversation error"
@@ -400,7 +337,7 @@ msgstr "Autentiseringsinformasjon kan ikke gjenopprettes"
 
 #: libpam/pam_strerror.c:61
 msgid "Authentication token lock busy"
-msgstr "L\303\245sing av autentiseringskode opptatt"
+msgstr "Låsing av autentiseringskode opptatt"
 
 #: libpam/pam_strerror.c:63
 msgid "Authentication token aging disabled"
@@ -412,7 +349,7 @@ msgstr "Passordtjenestens innledende kontroll mislyktes"
 
 #: libpam/pam_strerror.c:67
 msgid "The return value should be ignored by PAM dispatch"
-msgstr "Resultatverdien b\303\270r ignoreres av PAM"
+msgstr "Resultatverdien bør ignoreres av PAM"
 
 #: libpam/pam_strerror.c:69
 msgid "Module is unknown"
@@ -420,29 +357,33 @@ msgstr "Modulen er ukjent"
 
 #: libpam/pam_strerror.c:71
 msgid "Authentication token expired"
-msgstr "Autentiseringskode utl\303\270pt"
+msgstr "Autentiseringskode utløpt"
 
 #: libpam/pam_strerror.c:73
 msgid "Conversation is waiting for event"
-msgstr "Dialogen venter p\303\245 hendelse"
+msgstr "Dialogen venter på hendelse"
 
 #: libpam/pam_strerror.c:75
 msgid "Application needs to call libpam again"
-msgstr "Programmet m\303\245 sp\303\270rre libpam p\303\245 nytt"
+msgstr "Programmet må spørre libpam på nytt"
 
 #: libpam/pam_strerror.c:78
 msgid "Unknown PAM error"
 msgstr "Ukjent PAM-feil"
 
 #: libpam_misc/misc_conv.c:35
-msgid "..\007.Time is running out...\n"
-msgstr "..\007.Tiden er i ferd med utl\303\270pe..\n"
+msgid "...Time is running out...\n"
+msgstr "...Tiden er i ferd med utløpe..\n"
 
 #: libpam_misc/misc_conv.c:36
-msgid "..\007.Sorry, your time is up!\n"
-msgstr "..\007.Beklager, tiden er utl\303\270pt!\n"
+msgid "...Sorry, your time is up!\n"
+msgstr "...Beklager, tiden er utløpt!\n"
 
 #: libpam_misc/misc_conv.c:334
 #, c-format
 msgid "erroneous conversation (%d)\n"
 msgstr "mislykket dialog (%d)\n"
+
+#, fuzzy
+#~ msgid "%s: set %s security context to %s"
+#~ msgstr "Ikke en gyldig sikkerhetskontekst"
diff --git a/po/pa.po b/po/pa.po
index 777f4be0..fff40756 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -3,40 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR Linux-PAM Project.
 # Amanpreet Singh Alam[ਆਲਮ] <amanpreetalam@yahoo.com>, 2005.
-# Amanpreet Singh Alam[ਆਲਮ] <amanpreetalam@yahoo.com>, 2005.
-# Amanpreet Singh Alam[ਆਲਮ] <amanpreetalam@yahoo.com>, 2005.
-# Amanpreet Singh Alam[ਆਲਮ] <amanpreetalam@yahoo.com>, 2005.
-# Amanpreet Singh Alam[ਆਲਮ] <amanpreetalam@yahoo.com>, 2005.
-# Amanpreet Singh Alam[ਆਲਮ] <amanpreetalam@yahoo.com>, 2005.
-# Amanpreet Singh Alam[ਆਲਮ] <amanpreetalam@yahoo.com>, 2005.
-# Amanpreet Singh Alam[ਆਲਮ] <amanpreetalam@yahoo.com>, 2005.
-# Amanpreet Singh Alam[ਆਲਮ] <amanpreetalam@yahoo.com>, 2005.
-# Amanpreet Singh Alam[ਆਲਮ] <amanpreetalam@yahoo.com>, 2005.
-# Amanpreet Singh Alam[ਆਲਮ] <amanpreetalam@yahoo.com>, 2005.
-# Amanpreet Singh Alam[ਆਲਮ] <amanpreetalam@yahoo.com>, 2005.
-# Amanpreet Singh Alam[ਆਲਮ] <amanpreetalam@yahoo.com>, 2005.
-# Amanpreet Singh Alam[ਆਲਮ] <amanpreetalam@yahoo.com>, 2005.
-# Amanpreet Singh Alam[ਆਲਮ] <amanpreetalam@yahoo.com>, 2005.
-# Amanpreet Singh Alam[ਆਲਮ] <amanpreetalam@yahoo.com>, 2005.
-# Amanpreet Singh Alam[ਆਲਮ] <amanpreetalam@yahoo.com>, 2005.
-# Amanpreet Singh Alam[ਆਲਮ] <amanpreetalam@yahoo.com>, 2005.
-# Amanpreet Singh Alam[ਆਲਮ] <amanpreetalam@yahoo.com>, 2005.
-# Amanpreet Singh Alam[ਆਲਮ] <amanpreetalam@yahoo.com>, 2005.
-# Amanpreet Singh Alam[ਆਲਮ] <amanpreetalam@yahoo.com>, 2005.
-# Amanpreet Singh Alam[ਆਲਮ] <amanpreetalam@yahoo.com>, 2005.
-# Amanpreet Singh Alam[ਆਲਮ] <amanpreetalam@yahoo.com>, 2005.
-# Amanpreet Singh Alam[ਆਲਮ] <amanpreetalam@yahoo.com>, 2005.
-# Amanpreet Singh Alam[ਆਲਮ] <amanpreetalam@yahoo.com>, 2005.
-# Amanpreet Singh Alam[ਆਲਮ] <amanpreetalam@yahoo.com>, 2005.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Linux-PAM.pa\n"
 "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n"
-"POT-Creation-Date: 2005-09-05 15:43+0200\n"
+"POT-Creation-Date: 2005-09-14 19:09+0200\n"
 "PO-Revision-Date: 2005-08-06 08:34+0530\n"
-"Last-Translator: Amanpreet Singh Alam[\340\250\206\340\250\262\340\250\256] "
-"<amanpreetalam@yahoo.com>\n"
+"Last-Translator: Amanpreet Singh Alam[ਆਲਮ] <amanpreetalam@yahoo.com>\n"
 "Language-Team: Panjabi <pa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -46,43 +20,29 @@ msgstr ""
 
 #: modules/pam_tally/pam_tally.c:730
 msgid "Authentication error"
-msgstr ""
-"\340\250\252\340\250\260\340\250\256\340\250\276\340\250\243\340\250\225\340"
-"\250\277\340\250\244\340\250\276 \340\250\227\340\250\262\340\250\244\340\251"
-"\200"
+msgstr "ਪਰਮਾਣਕਿਤਾ ਗਲਤੀ"
 
 #: modules/pam_tally/pam_tally.c:731
 msgid "Service error"
-msgstr ""
-"\340\250\270\340\251\207\340\250\265\340\250\276 \340\250\227\340\250\262\340"
-"\250\244\340\251\200"
+msgstr "ਸੇਵਾ ਗਲਤੀ"
 
 #: modules/pam_tally/pam_tally.c:732
 msgid "Unknown user"
-msgstr ""
-"\340\250\205\340\250\243\340\250\234\340\250\276\340\250\243 \340\250\211\340"
-"\250\252\340\250\255\340\251\213\340\250\227\340\251\200"
+msgstr "ਅਣਜਾਣ ਉਪਭੋਗੀ"
 
 #: modules/pam_tally/pam_tally.c:733
 msgid "Unknown error"
-msgstr ""
-"\340\250\205\340\250\243\340\250\234\340\250\276\340\250\243\340\251\200 \340"
-"\250\227\340\250\262\340\250\244\340\251\200"
+msgstr "ਅਣਜਾਣੀ ਗਲਤੀ"
 
 #: modules/pam_tally/pam_tally.c:747
 #, c-format
 msgid "%s: Bad number given to --reset=\n"
-msgstr ""
-"%s: --reset= \340\250\262\340\250\210 \340\250\227\340\250\262\340\250\244 "
-"\340\250\250\340\251\260\340\250\254\340\250\260 \340\250\246\340\250\277\340"
-"\251\261\340\250\244\340\250\276 \340\250\227\340\250\277\340\250\206\n"
+msgstr "%s: --reset= ਲਈ ਗਲਤ ਨੰਬਰ ਦਿੱਤਾ ਗਿਆ\n"
 
 #: modules/pam_tally/pam_tally.c:751
 #, c-format
 msgid "%s: Unrecognised option %s\n"
-msgstr ""
-"%s: \340\250\254\340\251\207\340\250\252\340\250\233\340\250\276\340\250\243 "
-"\340\250\232\340\251\213\340\250\243 %s\n"
+msgstr "%s: ਬੇਪਛਾਣ ਚੋਣ %s\n"
 
 #: modules/pam_tally/pam_tally.c:763
 #, c-format
@@ -96,150 +56,59 @@ msgstr ""
 msgid "%s: Can't reset all users to non-zero\n"
 msgstr ""
 
-#: modules/pam_selinux/pam_selinux.c:127
+#: modules/pam_selinux/pam_selinux_check.c:99
 #, c-format
-msgid "Your default context is %s. \n"
-msgstr ""
-"\340\250\244\340\251\201\340\250\271\340\250\276\340\250\241\340\250\276 \340"
-"\250\256\340\251\201\340\251\261\340\250\262 \340\250\252\340\250\260\340\250"
-"\270\340\251\260\340\250\227 %s \340\250\271\340\251\210 \n"
-
-#: modules/pam_selinux/pam_selinux.c:130
-msgid "Do you want to choose a different one? [n]"
-msgstr ""
-"\340\250\225\340\251\200 \340\250\244\340\251\201\340\250\270\340\251\200\340"
-"\250\202 \340\250\265\340\251\261\340\250\226\340\250\260\340\251\207 \340"
-"\250\246\340\251\200 \340\250\232\340\251\213\340\250\243 \340\250\225\340"
-"\250\260\340\250\250\340\251\200 \340\250\232\340\250\276\340\250\271\340\251"
-"\201\340\251\260\340\250\246\340\251\207 \340\250\271\340\251\213? [n]"
+msgid "failed to initialize PAM\n"
+msgstr "PAM ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਫੇਲ\n"
 
-#: modules/pam_selinux/pam_selinux.c:137
-msgid "Enter number of choice: "
-msgstr ""
-"\340\250\232\340\251\213\340\250\243 \340\250\246\340\250\276 \340\250\250"
-"\340\251\260\340\250\254\340\250\260 \340\250\246\340\250\277\340\250\223: "
+#: modules/pam_selinux/pam_selinux_check.c:105
+#, c-format
+msgid "failed to pam_set_item()\n"
+msgstr "pam_set_item() ਲਈ ਫੇਲ\n"
 
-#: modules/pam_selinux/pam_selinux.c:164 modules/pam_selinux/pam_selinux.c:245
-#: modules/pam_selinux/pam_selinux.c:352
+#: modules/pam_selinux/pam_selinux_check.c:132
 #, c-format
-msgid "%s: bogus conversation function"
+msgid "login: failure forking: %s"
 msgstr ""
 
-#: modules/pam_selinux/pam_selinux.c:168 modules/pam_selinux/pam_selinux.c:249
-#: modules/pam_selinux/pam_selinux.c:356
+#: modules/pam_selinux/pam_selinux.c:102
 #, c-format
-msgid "%s: no conversation function"
-msgstr ""
+msgid "Your default context is %s. \n"
+msgstr "ਤੁਹਾਡਾ ਮੁੱਲ ਪਰਸੰਗ %s ਹੈ \n"
 
-#: modules/pam_selinux/pam_selinux.c:187
+#: modules/pam_selinux/pam_selinux.c:105
+msgid "Do you want to choose a different one? [n]"
+msgstr "ਕੀ ਤੁਸੀਂ ਵੱਖਰੇ ਦੀ ਚੋਣ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ? [n]"
+
+#: modules/pam_selinux/pam_selinux.c:112
+msgid "Enter number of choice: "
+msgstr "ਚੋਣ ਦਾ ਨੰਬਰ ਦਿਓ: "
+
+#: modules/pam_selinux/pam_selinux.c:152
 msgid "Would you like to enter a security context? [y] "
-msgstr ""
-"\340\250\225\340\251\200 \340\250\244\340\251\201\340\250\270\340\251\200\340"
-"\250\202 \340\250\207\340\251\261\340\250\225 \340\250\270\340\251\201\340"
-"\250\260\340\251\261\340\250\226\340\250\277\340\250\206 \340\250\252\340\250"
-"\260\340\250\270\340\251\260\340\250\227 \340\250\246\340\251\207\340\250\243"
-"\340\250\276 \340\250\232\340\250\276\340\250\271\340\251\201\340\251\260\340"
-"\250\246\340\251\207 \340\250\271\340\251\213? [y] "
+msgstr "ਕੀ ਤੁਸੀਂ ਇੱਕ ਸੁਰੱਖਿਆ ਪਰਸੰਗ ਦੇਣਾ ਚਾਹੁੰਦੇ ਹੋ? [y] "
 
-#: modules/pam_selinux/pam_selinux.c:204
+#: modules/pam_selinux/pam_selinux.c:169
 msgid "role: "
-msgstr "\340\250\260\340\251\213\340\250\262: "
+msgstr "ਰੋਲ: "
 
-#: modules/pam_selinux/pam_selinux.c:212
+#: modules/pam_selinux/pam_selinux.c:177
 msgid "type: "
-msgstr "\340\250\225\340\250\277\340\250\270\340\250\256: "
+msgstr "ਕਿਸਮ: "
 
-#: modules/pam_selinux/pam_selinux.c:222
+#: modules/pam_selinux/pam_selinux.c:187
 msgid "level: "
-msgstr "\340\250\252\340\251\261\340\250\247\340\250\260: "
+msgstr "ਪੱਧਰ: "
 
-#: modules/pam_selinux/pam_selinux.c:236
+#: modules/pam_selinux/pam_selinux.c:203
 msgid "Not a valid security context"
-msgstr ""
-"\340\250\207\340\251\261\340\250\225 \340\250\240\340\251\200\340\250\225 "
-"\340\250\270\340\251\201\340\250\260\340\251\261\340\250\226\340\250\277\340"
-"\250\206 \340\250\252\340\250\260\340\250\270\340\251\260\340\250\227 \340"
-"\250\250\340\250\271\340\251\200\340\250\202"
+msgstr "ਇੱਕ ਠੀਕ ਸੁਰੱਖਿਆ ਪਰਸੰਗ ਨਹੀਂ"
 
-#: modules/pam_selinux/pam_selinux.c:272
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.\n"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:296
-#, c-format
-msgid "Warning!  Could not get current context for %s, not relabeling."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:303
-#, c-format
-msgid "Warning!  Could not get new context for %s, not relabeling."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:313
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.%s"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:429
-#, c-format
-msgid "Unable to get valid context for %s"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:433
-#, c-format
-msgid "Unable to get valid context for %s, No valid tty"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:465
+#: modules/pam_selinux/pam_selinux.c:416
 #, c-format
 msgid "Security Context %s Assigned"
 msgstr ""
 
-#: modules/pam_selinux/pam_selinux.c:469
-#, c-format
-msgid "Error!  Unable to set %s executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:475
-#, fuzzy, c-format
-msgid "%s: set %s security context to %s"
-msgstr ""
-"\340\250\207\340\251\261\340\250\225 \340\250\240\340\251\200\340\250\225 "
-"\340\250\270\340\251\201\340\250\260\340\251\261\340\250\226\340\250\277\340"
-"\250\206 \340\250\252\340\250\260\340\250\270\340\251\260\340\250\227 \340"
-"\250\250\340\250\271\340\251\200\340\250\202"
-
-#: modules/pam_selinux/pam_selinux.c:518
-#, c-format
-msgid "Error!  Unable to set executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:524
-#, c-format
-msgid "%s: setcontext back to orginal"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:585
-#, c-format
-msgid "failed to initialize PAM\n"
-msgstr ""
-"PAM \340\250\270\340\250\274\340\251\201\340\250\260\340\251\202 \340\250\225"
-"\340\250\260\340\250\250 \340\250\262\340\250\210 \340\250\253\340\251\207"
-"\340\250\262\n"
-
-#: modules/pam_selinux/pam_selinux.c:591
-#, c-format
-msgid "failed to pam_set_item()\n"
-msgstr ""
-"pam_set_item() \340\250\262\340\250\210 \340\250\253\340\251\207\340\250"
-"\262\n"
-
-#: modules/pam_selinux/pam_selinux.c:616
-#, c-format
-msgid "login: failure forking: %s"
-msgstr ""
-
 #: modules/pam_unix/pam_unix_acct.c:268 modules/pam_unix/pam_unix_acct.c:295
 msgid "Your account has expired; please contact your system administrator"
 msgstr ""
@@ -255,68 +124,34 @@ msgstr ""
 #: modules/pam_unix/pam_unix_acct.c:314
 #, c-format
 msgid "Warning: your password will expire in %d day%.2s"
-msgstr ""
-"\340\250\270\340\250\276\340\250\265\340\250\247\340\250\276\340\250\250: "
-"\340\250\244\340\251\201\340\250\271\340\250\276\340\250\241\340\250\276 \340"
-"\250\227\340\251\201\340\250\252\340\250\244-\340\250\225\340\251\213\340\250"
-"\241 \340\250\246\340\251\200 \340\250\256\340\250\277\340\250\206\340\250"
-"\246 %d \340\250\246\340\250\277\340\250\250%.2s '\340\250\232 \340\250\252"
-"\340\251\201\340\251\261\340\250\227 \340\250\234\340\250\276\340\250\265\340"
-"\251\207\340\250\227\340\251\200\340\245\244"
+msgstr "ਸਾਵਧਾਨ: ਤੁਹਾਡਾ ਗੁਪਤ-ਕੋਡ ਦੀ ਮਿਆਦ %d ਦਿਨ%.2s 'ਚ ਪੁੱਗ ਜਾਵੇਗੀ।"
 
 #: modules/pam_unix/pam_unix_auth.c:163
 #, fuzzy
 msgid "Password: "
-msgstr ""
-"\340\250\227\340\251\201\340\250\252\340\250\244-\340\250\225\340\251\213\340"
-"\250\241 \340\250\250\340\250\276-\340\250\244\340\250\254\340\250\246\340"
-"\251\200\340\250\262 \340\250\271\340\251\210"
+msgstr "ਗੁਪਤ-ਕੋਡ ਨਾ-ਤਬਦੀਲ ਹੈ"
 
 #: modules/pam_unix/pam_unix_passwd.c:818
 msgid "NIS password could not be changed."
-msgstr ""
-"NIS \340\250\227\340\251\201\340\250\252\340\250\244-\340\250\225\340\251\213"
-"\340\250\241 \340\250\244\340\250\254\340\250\246\340\251\200\340\250\262 "
-"\340\250\250\340\250\271\340\251\200\340\250\202 \340\250\225\340\251\200\340"
-"\250\244\340\250\276 \340\250\234\340\250\276 \340\250\270\340\250\225\340"
-"\250\277\340\250\206 \340\250\271\340\251\210\340\245\244"
+msgstr "NIS ਗੁਪਤ-ਕੋਡ ਤਬਦੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।"
 
 #: modules/pam_unix/pam_unix_passwd.c:962
 #: modules/pam_cracklib/pam_cracklib.c:465
 msgid "No password supplied"
-msgstr ""
-"\340\250\225\340\251\213\340\250\210 \340\250\227\340\251\201\340\250\252\340"
-"\250\244-\340\250\225\340\251\213\340\250\241 \340\250\250\340\250\271\340"
-"\251\200\340\250\202 \340\250\246\340\250\277\340\251\261\340\250\244\340\250"
-"\276 \340\250\227\340\250\277\340\250\206"
+msgstr "ਕੋਈ ਗੁਪਤ-ਕੋਡ ਨਹੀਂ ਦਿੱਤਾ ਗਿਆ"
 
 #: modules/pam_unix/pam_unix_passwd.c:962
 #: modules/pam_cracklib/pam_cracklib.c:465
 msgid "Password unchanged"
-msgstr ""
-"\340\250\227\340\251\201\340\250\252\340\250\244-\340\250\225\340\251\213\340"
-"\250\241 \340\250\250\340\250\276-\340\250\244\340\250\254\340\250\246\340"
-"\251\200\340\250\262 \340\250\271\340\251\210"
+msgstr "ਗੁਪਤ-ਕੋਡ ਨਾ-ਤਬਦੀਲ ਹੈ"
 
 #: modules/pam_unix/pam_unix_passwd.c:983
 msgid "You must choose a longer password"
-msgstr ""
-"\340\250\244\340\251\201\340\250\271\340\250\276\340\250\250\340\251\202\340"
-"\251\260 \340\250\262\340\251\260\340\250\256\340\251\207 \340\250\227\340"
-"\251\201\340\250\252\340\250\244-\340\250\225\340\251\213\340\250\241 \340"
-"\250\246\340\251\200 \340\250\232\340\251\213\340\250\243 \340\250\225\340"
-"\250\260\340\250\250\340\251\200 \340\250\232\340\250\276\340\250\271\340\251"
-"\200\340\250\246\340\251\200 \340\250\271\340\251\210"
+msgstr "ਤੁਹਾਨੂੰ ਲੰਮੇ ਗੁਪਤ-ਕੋਡ ਦੀ ਚੋਣ ਕਰਨੀ ਚਾਹੀਦੀ ਹੈ"
 
 #: modules/pam_unix/pam_unix_passwd.c:988
 msgid "Password has been already used. Choose another."
-msgstr ""
-"\340\250\227\340\251\201\340\250\252\340\250\244-\340\250\225\340\251\213\340"
-"\250\241 \340\250\252\340\250\271\340\250\277\340\250\262\340\250\276\340\250"
-"\202 \340\250\265\340\251\200 \340\250\265\340\250\260\340\250\244\340\250"
-"\277\340\250\206 \340\250\227\340\250\277\340\250\206 \340\250\271\340\251"
-"\210\340\245\244 \340\250\265\340\251\261\340\250\226\340\250\260\340\250"
-"\276 \340\250\232\340\251\201\340\250\243\340\251\213\340\245\244"
+msgstr "ਗੁਪਤ-ਕੋਡ ਪਹਿਲਾਂ ਵੀ ਵਰਤਿਆ ਗਿਆ ਹੈ। ਵੱਖਰਾ ਚੁਣੋ।"
 
 #: modules/pam_unix/pam_unix_passwd.c:1112
 msgid "(current) UNIX password: "
@@ -329,69 +164,43 @@ msgstr ""
 #: modules/pam_unix/pam_unix_passwd.c:1207
 #, fuzzy
 msgid "Enter new UNIX password: "
-msgstr ""
-"\340\250\250\340\250\265\340\250\276\340\250\202 STRESS \340\250\227\340\251"
-"\201\340\250\252\340\250\244-\340\250\225\340\251\213\340\250\241 \340\250"
-"\246\340\250\277\340\250\223: "
+msgstr "ਨਵਾਂ STRESS ਗੁਪਤ-ਕੋਡ ਦਿਓ: "
 
 #: modules/pam_unix/pam_unix_passwd.c:1208
 #, fuzzy
 msgid "Retype new UNIX password: "
-msgstr ""
-"\340\250\250\340\250\265\340\250\276\340\250\202 STRESS \340\250\227\340\251"
-"\201\340\250\252\340\250\244-\340\250\225\340\251\213\340\250\241 \340\250"
-"\256\340\251\201\340\251\234-\340\250\262\340\250\277\340\250\226\340\251"
-"\213: "
+msgstr "ਨਵਾਂ STRESS ਗੁਪਤ-ਕੋਡ ਮੁੜ-ਲਿਖੋ: "
 
-#: modules/pam_stress/pam_stress.c:481
+#: modules/pam_stress/pam_stress.c:474
 msgid "Changing STRESS password for "
 msgstr ""
 
-#: modules/pam_stress/pam_stress.c:495
+#: modules/pam_stress/pam_stress.c:488
 msgid "Enter new STRESS password: "
-msgstr ""
-"\340\250\250\340\250\265\340\250\276\340\250\202 STRESS \340\250\227\340\251"
-"\201\340\250\252\340\250\244-\340\250\225\340\251\213\340\250\241 \340\250"
-"\246\340\250\277\340\250\223: "
+msgstr "ਨਵਾਂ STRESS ਗੁਪਤ-ਕੋਡ ਦਿਓ: "
 
-#: modules/pam_stress/pam_stress.c:498
+#: modules/pam_stress/pam_stress.c:491
 msgid "Retype new STRESS password: "
-msgstr ""
-"\340\250\250\340\250\265\340\250\276\340\250\202 STRESS \340\250\227\340\251"
-"\201\340\250\252\340\250\244-\340\250\225\340\251\213\340\250\241 \340\250"
-"\256\340\251\201\340\251\234-\340\250\262\340\250\277\340\250\226\340\251"
-"\213: "
+msgstr "ਨਵਾਂ STRESS ਗੁਪਤ-ਕੋਡ ਮੁੜ-ਲਿਖੋ: "
 
-#: modules/pam_stress/pam_stress.c:526
+#: modules/pam_stress/pam_stress.c:519
 msgid "Verification mis-typed; password unchanged"
 msgstr ""
 
 #: modules/pam_cracklib/pam_cracklib.c:61
 #, fuzzy, c-format
 msgid "New %s%spassword: "
-msgstr ""
-"\340\250\227\340\251\201\340\250\252\340\250\244-\340\250\225\340\251\213\340"
-"\250\241 \340\250\250\340\250\276-\340\250\244\340\250\254\340\250\246\340"
-"\251\200\340\250\262 \340\250\271\340\251\210"
+msgstr "ਗੁਪਤ-ਕੋਡ ਨਾ-ਤਬਦੀਲ ਹੈ"
 
 #: modules/pam_cracklib/pam_cracklib.c:63
 #, fuzzy, c-format
 msgid "Retype new %s%spassword: "
-msgstr ""
-"\340\250\250\340\250\265\340\250\276\340\250\202 STRESS \340\250\227\340\251"
-"\201\340\250\252\340\250\244-\340\250\225\340\251\213\340\250\241 \340\250"
-"\256\340\251\201\340\251\234-\340\250\262\340\250\277\340\250\226\340\251"
-"\213: "
+msgstr "ਨਵਾਂ STRESS ਗੁਪਤ-ਕੋਡ ਮੁੜ-ਲਿਖੋ: "
 
 #: modules/pam_cracklib/pam_cracklib.c:64
 #, fuzzy
 msgid "Sorry, passwords do not match."
-msgstr ""
-"NIS \340\250\227\340\251\201\340\250\252\340\250\244-\340\250\225\340\251\213"
-"\340\250\241 \340\250\244\340\250\254\340\250\246\340\251\200\340\250\262 "
-"\340\250\250\340\250\271\340\251\200\340\250\202 \340\250\225\340\251\200\340"
-"\250\244\340\250\276 \340\250\234\340\250\276 \340\250\270\340\250\225\340"
-"\250\277\340\250\206 \340\250\271\340\251\210\340\245\244"
+msgstr "NIS ਗੁਪਤ-ਕੋਡ ਤਬਦੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।"
 
 #: modules/pam_cracklib/pam_cracklib.c:379
 msgid "is the same as the old one"
@@ -420,13 +229,7 @@ msgstr ""
 #: modules/pam_cracklib/pam_cracklib.c:437
 #, fuzzy
 msgid "has been already used"
-msgstr ""
-"\340\250\227\340\251\201\340\250\252\340\250\244-\340\250\225\340\251\213\340"
-"\250\241 \340\250\252\340\250\271\340\250\277\340\250\262\340\250\276\340\250"
-"\202 \340\250\265\340\251\200 \340\250\265\340\250\260\340\250\244\340\250"
-"\277\340\250\206 \340\250\227\340\250\277\340\250\206 \340\250\271\340\251"
-"\210\340\245\244 \340\250\265\340\251\261\340\250\226\340\250\260\340\250"
-"\276 \340\250\232\340\251\201\340\250\243\340\251\213\340\245\244"
+msgstr "ਗੁਪਤ-ਕੋਡ ਪਹਿਲਾਂ ਵੀ ਵਰਤਿਆ ਗਿਆ ਹੈ। ਵੱਖਰਾ ਚੁਣੋ।"
 
 #: modules/pam_cracklib/pam_cracklib.c:489
 #: modules/pam_cracklib/pam_cracklib.c:617
@@ -440,58 +243,39 @@ msgstr ""
 
 #: libpam/pam_strerror.c:13
 msgid "Success"
-msgstr "\340\250\270\340\250\253\340\250\274\340\250\262"
+msgstr "ਸਫ਼ਲ"
 
 #: libpam/pam_strerror.c:15
 msgid "Critical error - immediate abort"
-msgstr ""
-"\340\250\250\340\250\276\340\250\234\340\250\274\340\251\201\340\250\225 \340"
-"\250\227\340\250\262\340\250\244\340\251\200 - \340\250\244\340\250\260\340"
-"\251\201\340\251\260\340\250\244 \340\250\205\340\250\247\340\251\202\340\250"
-"\260\340\250\276 \340\250\233\340\251\261\340\250\241\340\250\277\340\250\206"
+msgstr "ਨਾਜ਼ੁਕ ਗਲਤੀ - ਤਰੁੰਤ ਅਧੂਰਾ ਛੱਡਿਆ"
 
 #: libpam/pam_strerror.c:17
 msgid "dlopen() failure"
-msgstr "dlopen() \340\250\253\340\251\207\340\250\262"
+msgstr "dlopen() ਫੇਲ"
 
 #: libpam/pam_strerror.c:19
 msgid "Symbol not found"
-msgstr ""
-"\340\250\250\340\250\277\340\250\270\340\250\274\340\250\276\340\250\250 \340"
-"\250\250\340\250\271\340\251\200\340\250\202 \340\250\256\340\250\277\340\250"
-"\262\340\250\277\340\250\206"
+msgstr "ਨਿਸ਼ਾਨ ਨਹੀਂ ਮਿਲਿਆ"
 
 #: libpam/pam_strerror.c:21
 msgid "Error in service module"
-msgstr ""
-"\340\250\270\340\251\207\340\250\265\340\250\276 \340\250\256\340\251\210\340"
-"\250\241\340\251\200\340\250\212\340\250\262 \340\250\265\340\250\277\340\251"
-"\261\340\250\232 \340\250\227\340\250\262\340\250\244\340\251\200"
+msgstr "ਸੇਵਾ ਮੈਡੀਊਲ ਵਿੱਚ ਗਲਤੀ"
 
 #: libpam/pam_strerror.c:23
 msgid "System error"
-msgstr ""
-"\340\250\270\340\250\277\340\250\270\340\250\237\340\250\256 \340\250\227\340"
-"\250\262\340\250\244\340\251\200"
+msgstr "ਸਿਸਟਮ ਗਲਤੀ"
 
 #: libpam/pam_strerror.c:25
 msgid "Memory buffer error"
-msgstr ""
-"\340\250\256\340\251\210\340\250\256\340\251\213\340\250\260\340\251\200 \340"
-"\250\254\340\250\253\340\250\274\340\250\260 \340\250\227\340\250\262\340\250"
-"\244\340\251\200"
+msgstr "ਮੈਮੋਰੀ ਬਫ਼ਰ ਗਲਤੀ"
 
 #: libpam/pam_strerror.c:27
 msgid "Permission denied"
-msgstr ""
-"\340\250\205\340\250\247\340\250\277\340\250\225\340\250\276\340\250\260 \340"
-"\250\252\340\250\276\340\250\254\340\251\260\340\250\246\340\251\200"
+msgstr "ਅਧਿਕਾਰ ਪਾਬੰਦੀ"
 
 #: libpam/pam_strerror.c:29
 msgid "Authentication failure"
-msgstr ""
-"\340\250\252\340\250\260\340\250\256\340\250\276\340\250\243\340\250\225\340"
-"\250\277\340\250\244\340\250\276 \340\250\253\340\251\207\340\250\262"
+msgstr "ਪਰਮਾਣਕਿਤਾ ਫੇਲ"
 
 #: libpam/pam_strerror.c:31
 msgid "Insufficient credentials to access authentication data"
@@ -515,12 +299,7 @@ msgstr ""
 
 #: libpam/pam_strerror.c:41
 msgid "User account has expired"
-msgstr ""
-"\340\250\211\340\250\252\340\250\255\340\251\213\340\250\227\340\251\200 \340"
-"\250\226\340\250\276\340\250\244\340\251\207 \340\250\246\340\251\200 \340"
-"\250\256\340\250\277\340\250\206\340\250\246 \340\250\252\340\251\201\340\251"
-"\261\340\250\227 \340\250\232\340\251\201\340\251\261\340\250\225\340\251"
-"\200 \340\250\271\340\251\210"
+msgstr "ਉਪਭੋਗੀ ਖਾਤੇ ਦੀ ਮਿਆਦ ਪੁੱਗ ਚੁੱਕੀ ਹੈ"
 
 #: libpam/pam_strerror.c:43
 msgid "Cannot make/remove an entry for the specified session"
@@ -548,9 +327,7 @@ msgstr ""
 
 #: libpam/pam_strerror.c:55
 msgid "Conversation error"
-msgstr ""
-"\340\250\244\340\250\254\340\250\246\340\251\200\340\250\262\340\251\200 \340"
-"\250\227\340\250\262\340\250\244\340\251\200"
+msgstr "ਤਬਦੀਲੀ ਗਲਤੀ"
 
 #: libpam/pam_strerror.c:57
 msgid "Authentication token manipulation error"
@@ -578,19 +355,11 @@ msgstr ""
 
 #: libpam/pam_strerror.c:69
 msgid "Module is unknown"
-msgstr ""
-"\340\250\256\340\251\210\340\250\241\340\251\200\340\250\212\340\250\262 \340"
-"\250\205\340\250\243\340\250\234\340\250\276\340\250\243 \340\250\271\340\251"
-"\210"
+msgstr "ਮੈਡੀਊਲ ਅਣਜਾਣ ਹੈ"
 
 #: libpam/pam_strerror.c:71
 msgid "Authentication token expired"
-msgstr ""
-"\340\250\252\340\250\260\340\250\256\340\250\276\340\250\243\340\250\225\340"
-"\250\277\340\250\244\340\250\276 \340\250\237\340\251\213\340\250\225\340\250"
-"\250 \340\250\246\340\251\200 \340\250\256\340\250\277\340\250\206\340\250"
-"\246 \340\250\252\340\251\201\340\251\261\340\250\227 \340\250\232\340\251"
-"\201\340\251\261\340\250\225\340\251\200 \340\250\271\340\251\210"
+msgstr "ਪਰਮਾਣਕਿਤਾ ਟੋਕਨ ਦੀ ਮਿਆਦ ਪੁੱਗ ਚੁੱਕੀ ਹੈ"
 
 #: libpam/pam_strerror.c:73
 msgid "Conversation is waiting for event"
@@ -602,27 +371,21 @@ msgstr ""
 
 #: libpam/pam_strerror.c:78
 msgid "Unknown PAM error"
-msgstr ""
-"\340\250\205\340\250\243\340\250\234\340\250\276\340\250\243 PAM \340\250\227"
-"\340\250\262\340\250\244\340\251\200"
+msgstr "ਅਣਜਾਣ PAM ਗਲਤੀ"
 
 #: libpam_misc/misc_conv.c:35
-msgid "..\007.Time is running out...\n"
-msgstr ""
-"..\007.\340\250\270\340\250\256\340\250\276\340\250\202 \340\250\270\340\250"
-"\256\340\250\276\340\250\252\340\250\244 \340\250\271\340\251\213 \340\250"
-"\260\340\250\277\340\250\271\340\250\276 \340\250\271\340\251\210...\n"
+msgid "...Time is running out...\n"
+msgstr "...ਸਮਾਂ ਸਮਾਪਤ ਹੋ ਰਿਹਾ ਹੈ...\n"
 
 #: libpam_misc/misc_conv.c:36
-msgid "..\007.Sorry, your time is up!\n"
-msgstr ""
-"..\007.\340\250\205\340\250\253\340\250\274\340\250\270\340\251\213\340\250"
-"\270, \340\250\244\340\251\201\340\250\271\340\250\276\340\250\241\340\250"
-"\276 \340\250\270\340\250\256\340\250\276\340\250\202 \340\250\270\340\250"
-"\256\340\250\276\340\250\252\340\250\244 \340\250\271\340\251\213 \340\250"
-"\227\340\250\277\340\250\206 \340\250\271\340\251\210!\n"
+msgid "...Sorry, your time is up!\n"
+msgstr "...ਅਫ਼ਸੋਸ, ਤੁਹਾਡਾ ਸਮਾਂ ਸਮਾਪਤ ਹੋ ਗਿਆ ਹੈ!\n"
 
 #: libpam_misc/misc_conv.c:334
 #, c-format
 msgid "erroneous conversation (%d)\n"
 msgstr ""
+
+#, fuzzy
+#~ msgid "%s: set %s security context to %s"
+#~ msgstr "ਇੱਕ ਠੀਕ ਸੁਰੱਖਿਆ ਪਰਸੰਗ ਨਹੀਂ"
diff --git a/po/pl.po b/po/pl.po
index 97b7efe7..89b639f0 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-09-05 15:43+0200\n"
+"POT-Creation-Date: 2005-09-14 19:09+0200\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"
@@ -17,24 +17,24 @@ msgstr ""
 
 #: modules/pam_tally/pam_tally.c:730
 msgid "Authentication error"
-msgstr "B\305\202\304\205d autoryzacji"
+msgstr "Błąd autoryzacji"
 
 #: modules/pam_tally/pam_tally.c:731
 msgid "Service error"
-msgstr "B\305\202\304\205d us\305\202ugi"
+msgstr "Błąd usługi"
 
 #: modules/pam_tally/pam_tally.c:732
 msgid "Unknown user"
-msgstr "Nieznany u\305\274ytkownik"
+msgstr "Nieznany użytkownik"
 
 #: modules/pam_tally/pam_tally.c:733
 msgid "Unknown error"
-msgstr "Nieznany b\305\202\304\205d"
+msgstr "Nieznany błąd"
 
 #: modules/pam_tally/pam_tally.c:747
 #, c-format
 msgid "%s: Bad number given to --reset=\n"
-msgstr "%s: B\305\202\304\231dny numer podany w opcji --reset=\n"
+msgstr "%s: Błędny numer podany w opcji --reset=\n"
 
 #: modules/pam_tally/pam_tally.c:751
 #, c-format
@@ -51,172 +51,104 @@ msgstr ""
 #: modules/pam_tally/pam_tally.c:836
 #, c-format
 msgid "%s: Can't reset all users to non-zero\n"
-msgstr ""
-"%s: Nie mo\305\274na zresetowa\304\207 wszystkich u\305\274ytkownik\303"
-"\263w\n"
+msgstr "%s: Nie można zresetować wszystkich użytkowników\n"
 
-#: modules/pam_selinux/pam_selinux.c:127
+#: modules/pam_selinux/pam_selinux_check.c:99
 #, c-format
-msgid "Your default context is %s. \n"
-msgstr "Tw\303\263j domy\305\233lny kontekst to %s. \n"
-
-#: modules/pam_selinux/pam_selinux.c:130
-msgid "Do you want to choose a different one? [n]"
-msgstr "Czy chcesz wybra\304\207 jakie\305\233 inne? [n]"
+msgid "failed to initialize PAM\n"
+msgstr "Nie można zainicjować PAM\n"
 
-#: modules/pam_selinux/pam_selinux.c:137
-msgid "Enter number of choice: "
-msgstr "Podaj liczb\304\231: "
+#: modules/pam_selinux/pam_selinux_check.c:105
+#, c-format
+msgid "failed to pam_set_item()\n"
+msgstr "nieudane pam_set_item()\n"
 
-#: modules/pam_selinux/pam_selinux.c:164 modules/pam_selinux/pam_selinux.c:245
-#: modules/pam_selinux/pam_selinux.c:352
+#: modules/pam_selinux/pam_selinux_check.c:132
 #, c-format
-msgid "%s: bogus conversation function"
-msgstr ""
+msgid "login: failure forking: %s"
+msgstr "login: nieudany fork: %s"
 
-#: modules/pam_selinux/pam_selinux.c:168 modules/pam_selinux/pam_selinux.c:249
-#: modules/pam_selinux/pam_selinux.c:356
+#: modules/pam_selinux/pam_selinux.c:102
 #, c-format
-msgid "%s: no conversation function"
-msgstr ""
+msgid "Your default context is %s. \n"
+msgstr "Twój domyślny kontekst to %s. \n"
 
-#: modules/pam_selinux/pam_selinux.c:187
+#: modules/pam_selinux/pam_selinux.c:105
+msgid "Do you want to choose a different one? [n]"
+msgstr "Czy chcesz wybrać jakieś inne? [n]"
+
+#: modules/pam_selinux/pam_selinux.c:112
+msgid "Enter number of choice: "
+msgstr "Podaj liczbę: "
+
+#: modules/pam_selinux/pam_selinux.c:152
 msgid "Would you like to enter a security context? [y] "
-msgstr "Czy chcesz wej\305\233\304\207 w kontekst bezpiecze\305\204stwa? [y]"
+msgstr "Czy chcesz wejść w kontekst bezpieczeństwa? [y]"
 
-#: modules/pam_selinux/pam_selinux.c:204
+#: modules/pam_selinux/pam_selinux.c:169
 msgid "role: "
 msgstr "rola: "
 
-#: modules/pam_selinux/pam_selinux.c:212
+#: modules/pam_selinux/pam_selinux.c:177
 msgid "type: "
 msgstr "typ:"
 
-#: modules/pam_selinux/pam_selinux.c:222
+#: modules/pam_selinux/pam_selinux.c:187
 msgid "level: "
 msgstr "poziom: "
 
-#: modules/pam_selinux/pam_selinux.c:236
+#: modules/pam_selinux/pam_selinux.c:203
 msgid "Not a valid security context"
-msgstr "Niewa\305\274ny kontekst bezpiecze\305\204stwa"
-
-#: modules/pam_selinux/pam_selinux.c:272
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.\n"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:296
-#, c-format
-msgid "Warning!  Could not get current context for %s, not relabeling."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:303
-#, c-format
-msgid "Warning!  Could not get new context for %s, not relabeling."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:313
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.%s"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:429
-#, c-format
-msgid "Unable to get valid context for %s"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:433
-#, c-format
-msgid "Unable to get valid context for %s, No valid tty"
-msgstr ""
+msgstr "Nieważny kontekst bezpieczeństwa"
 
-#: modules/pam_selinux/pam_selinux.c:465
+#: modules/pam_selinux/pam_selinux.c:416
 #, c-format
 msgid "Security Context %s Assigned"
-msgstr "Kontekst bezpiecze\305\204stwa %s przypisany"
-
-#: modules/pam_selinux/pam_selinux.c:469
-#, c-format
-msgid "Error!  Unable to set %s executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:475
-#, fuzzy, c-format
-msgid "%s: set %s security context to %s"
-msgstr "Niewa\305\274ny kontekst bezpiecze\305\204stwa"
-
-#: modules/pam_selinux/pam_selinux.c:518
-#, c-format
-msgid "Error!  Unable to set executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:524
-#, c-format
-msgid "%s: setcontext back to orginal"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:585
-#, c-format
-msgid "failed to initialize PAM\n"
-msgstr "Nie mo\305\274na zainicjowa\304\207 PAM\n"
-
-#: modules/pam_selinux/pam_selinux.c:591
-#, c-format
-msgid "failed to pam_set_item()\n"
-msgstr "nieudane pam_set_item()\n"
-
-#: modules/pam_selinux/pam_selinux.c:616
-#, c-format
-msgid "login: failure forking: %s"
-msgstr "login: nieudany fork: %s"
+msgstr "Kontekst bezpieczeństwa %s przypisany"
 
 #: modules/pam_unix/pam_unix_acct.c:268 modules/pam_unix/pam_unix_acct.c:295
 msgid "Your account has expired; please contact your system administrator"
-msgstr ""
-"Twoje konto si\304\231 uniewa\305\274ni\305\202o; skontaktuj si\304\231 z "
-"administratorem"
+msgstr "Twoje konto się unieważniło; skontaktuj się z administratorem"
 
 #: modules/pam_unix/pam_unix_acct.c:277
 msgid "You are required to change your password immediately (root enforced)"
-msgstr ""
-"Musisz natychmiast zmieni\304\207 has\305\202o (wymuszone przez root-a)"
+msgstr "Musisz natychmiast zmienić hasło (wymuszone przez root-a)"
 
 #: modules/pam_unix/pam_unix_acct.c:304
 msgid "You are required to change your password immediately (password aged)"
-msgstr ""
-"Musisz natychmiast zmieni\304\207 has\305\202o (has\305\202o wygas\305\202o)"
+msgstr "Musisz natychmiast zmienić hasło (hasło wygasło)"
 
 #: modules/pam_unix/pam_unix_acct.c:314
 #, c-format
 msgid "Warning: your password will expire in %d day%.2s"
-msgstr "Ostrze\305\274enie: twoje has\305\202o wyga\305\233nie za %d dni%.2s"
+msgstr "Ostrzeżenie: twoje hasło wygaśnie za %d dni%.2s"
 
 #: modules/pam_unix/pam_unix_auth.c:163
 #, fuzzy
 msgid "Password: "
-msgstr "Has\305\202o nie zmienione"
+msgstr "Hasło nie zmienione"
 
 #: modules/pam_unix/pam_unix_passwd.c:818
 msgid "NIS password could not be changed."
-msgstr "Nie mo\305\274na zmienia\304\207 has\305\202a NIS."
+msgstr "Nie można zmieniać hasła NIS."
 
 #: modules/pam_unix/pam_unix_passwd.c:962
 #: modules/pam_cracklib/pam_cracklib.c:465
 msgid "No password supplied"
-msgstr "Nie podano has\305\202a"
+msgstr "Nie podano hasła"
 
 #: modules/pam_unix/pam_unix_passwd.c:962
 #: modules/pam_cracklib/pam_cracklib.c:465
 msgid "Password unchanged"
-msgstr "Has\305\202o nie zmienione"
+msgstr "Hasło nie zmienione"
 
 #: modules/pam_unix/pam_unix_passwd.c:983
 msgid "You must choose a longer password"
-msgstr "Musisz poda\304\207 d\305\202u\305\274sze has\305\202o"
+msgstr "Musisz podać dłuższe hasło"
 
 #: modules/pam_unix/pam_unix_passwd.c:988
 msgid "Password has been already used. Choose another."
-msgstr "Has\305\202o by\305\202o ju\305\274 u\305\274ywane. Podaj inne."
+msgstr "Hasło było już używane. Podaj inne."
 
 #: modules/pam_unix/pam_unix_passwd.c:1112
 msgid "(current) UNIX password: "
@@ -224,50 +156,48 @@ msgstr ""
 
 #: modules/pam_unix/pam_unix_passwd.c:1147
 msgid "You must wait longer to change your password"
-msgstr ""
-"Musisz poczeka\304\207 d\305\202u\305\274ej \305\274eby zmieni\304\207 has"
-"\305\202o"
+msgstr "Musisz poczekać dłużej żeby zmienić hasło"
 
 #: modules/pam_unix/pam_unix_passwd.c:1207
 #, fuzzy
 msgid "Enter new UNIX password: "
-msgstr "Poda nowe has\305\202o STRESS: "
+msgstr "Poda nowe hasło STRESS: "
 
 #: modules/pam_unix/pam_unix_passwd.c:1208
 #, fuzzy
 msgid "Retype new UNIX password: "
-msgstr "Wpisz ponownie has\305\202o STRESS: "
+msgstr "Wpisz ponownie hasło STRESS: "
 
-#: modules/pam_stress/pam_stress.c:481
+#: modules/pam_stress/pam_stress.c:474
 msgid "Changing STRESS password for "
-msgstr "Zmiana has\305\202a STRESS dla "
+msgstr "Zmiana hasła STRESS dla "
 
-#: modules/pam_stress/pam_stress.c:495
+#: modules/pam_stress/pam_stress.c:488
 msgid "Enter new STRESS password: "
-msgstr "Poda nowe has\305\202o STRESS: "
+msgstr "Poda nowe hasło STRESS: "
 
-#: modules/pam_stress/pam_stress.c:498
+#: modules/pam_stress/pam_stress.c:491
 msgid "Retype new STRESS password: "
-msgstr "Wpisz ponownie has\305\202o STRESS: "
+msgstr "Wpisz ponownie hasło STRESS: "
 
-#: modules/pam_stress/pam_stress.c:526
+#: modules/pam_stress/pam_stress.c:519
 msgid "Verification mis-typed; password unchanged"
-msgstr "B\305\202\304\231dna weryfikacja; has\305\202o niezmienione"
+msgstr "Błędna weryfikacja; hasło niezmienione"
 
 #: modules/pam_cracklib/pam_cracklib.c:61
 #, fuzzy, c-format
 msgid "New %s%spassword: "
-msgstr "Has\305\202o nie zmienione"
+msgstr "Hasło nie zmienione"
 
 #: modules/pam_cracklib/pam_cracklib.c:63
 #, fuzzy, c-format
 msgid "Retype new %s%spassword: "
-msgstr "Wpisz ponownie has\305\202o STRESS: "
+msgstr "Wpisz ponownie hasło STRESS: "
 
 #: modules/pam_cracklib/pam_cracklib.c:64
 #, fuzzy
 msgid "Sorry, passwords do not match."
-msgstr "Nie mo\305\274na zmienia\304\207 has\305\202a NIS."
+msgstr "Nie można zmieniać hasła NIS."
 
 #: modules/pam_cracklib/pam_cracklib.c:379
 msgid "is the same as the old one"
@@ -296,7 +226,7 @@ msgstr ""
 #: modules/pam_cracklib/pam_cracklib.c:437
 #, fuzzy
 msgid "has been already used"
-msgstr "Has\305\202o by\305\202o ju\305\274 u\305\274ywane. Podaj inne."
+msgstr "Hasło było już używane. Podaj inne."
 
 #: modules/pam_cracklib/pam_cracklib.c:489
 #: modules/pam_cracklib/pam_cracklib.c:617
@@ -310,11 +240,11 @@ msgstr ""
 
 #: libpam/pam_strerror.c:13
 msgid "Success"
-msgstr "Powiod\305\202o si\304\231"
+msgstr "Powiodło się"
 
 #: libpam/pam_strerror.c:15
 msgid "Critical error - immediate abort"
-msgstr "B\305\202\304\205d krytyczny - natychmiastowe przerwanie"
+msgstr "Błąd krytyczny - natychmiastowe przerwanie"
 
 #: libpam/pam_strerror.c:17
 msgid "dlopen() failure"
@@ -326,19 +256,19 @@ msgstr "Symbol nie znaleziony"
 
 #: libpam/pam_strerror.c:21
 msgid "Error in service module"
-msgstr "B\305\202\304\205d w module us\305\202ugi"
+msgstr "Błąd w module usługi"
 
 #: libpam/pam_strerror.c:23
 msgid "System error"
-msgstr "B\305\202\304\205d systemowy"
+msgstr "Błąd systemowy"
 
 #: libpam/pam_strerror.c:25
 msgid "Memory buffer error"
-msgstr "B\305\202\304\205d buforowania pami\304\231ci"
+msgstr "Błąd buforowania pamięci"
 
 #: libpam/pam_strerror.c:27
 msgid "Permission denied"
-msgstr "Brak dost\304\231pu"
+msgstr "Brak dostępu"
 
 #: libpam/pam_strerror.c:29
 msgid "Authentication failure"
@@ -346,99 +276,87 @@ msgstr "Nieudana autoryzacja"
 
 #: libpam/pam_strerror.c:31
 msgid "Insufficient credentials to access authentication data"
-msgstr ""
-"Niedostateczne uwierzytelnienie do dost\304\231pu do danych autoryzacyjnych"
+msgstr "Niedostateczne uwierzytelnienie do dostępu do danych autoryzacyjnych"
 
 #: libpam/pam_strerror.c:33
 msgid "Authentication service cannot retrieve authentication info."
-msgstr ""
-"Us\305\202uga autoryzacji nie mo\305\274e uzyska\304\207 danych "
-"autoryzacyjnych."
+msgstr "Usługa autoryzacji nie może uzyskać danych autoryzacyjnych."
 
 #: libpam/pam_strerror.c:35
 msgid "User not known to the underlying authentication module"
-msgstr ""
-"U\305\274ytkownik nieznany w module autoryzacji ni\305\274szego poziomu"
+msgstr "Użytkownik nieznany w module autoryzacji niższego poziomu"
 
 #: libpam/pam_strerror.c:37
 msgid "Have exhausted maximum number of retries for service."
-msgstr "Wykorzystana maksymalna liczba pr\303\263b dla us\305\202ugi."
+msgstr "Wykorzystana maksymalna liczba prób dla usługi."
 
 #: libpam/pam_strerror.c:39
 msgid "Authentication token is no longer valid; new one required."
-msgstr "Bilety autoryzacyjny jest ju\305\274 niewa\305\274ny; konieczny nowy."
+msgstr "Bilety autoryzacyjny jest już nieważny; konieczny nowy."
 
 #: libpam/pam_strerror.c:41
 msgid "User account has expired"
-msgstr "Konto u\305\274ytkownika wygas\305\202o"
+msgstr "Konto użytkownika wygasło"
 
 #: libpam/pam_strerror.c:43
 msgid "Cannot make/remove an entry for the specified session"
-msgstr ""
-"Nie mo\305\274na utworzy\304\207/usun\304\205\304\207 pozycji dla podanej "
-"sesji"
+msgstr "Nie można utworzyć/usunąć pozycji dla podanej sesji"
 
 #: libpam/pam_strerror.c:45
 msgid "Authentication service cannot retrieve user credentials"
-msgstr ""
-"Us\305\202uga autoryzacyjna nie mo\305\274e uzyska\304\207 uwierzytelnienia u"
-"\305\274ytkownika"
+msgstr "Usługa autoryzacyjna nie może uzyskać uwierzytelnienia użytkownika"
 
 #: libpam/pam_strerror.c:47
 msgid "User credentials expired"
-msgstr "Uwierzytelnienie u\305\274ytkownika przeterminowa\305\202o si\304\231"
+msgstr "Uwierzytelnienie użytkownika przeterminowało się"
 
 #: libpam/pam_strerror.c:49
 msgid "Failure setting user credentials"
-msgstr "Niemo\305\274na uwierzytelni\304\207 u\305\274ytkownika"
+msgstr "Niemożna uwierzytelnić użytkownika"
 
 #: libpam/pam_strerror.c:51
 msgid "No module specific data is present"
-msgstr "Brak danych specyficznych dla modu\305\202u"
+msgstr "Brak danych specyficznych dla modułu"
 
 #: libpam/pam_strerror.c:53
 msgid "Bad item passed to pam_*_item()"
-msgstr "Z\305\202y element przekazany do pam_*_item()"
+msgstr "Zły element przekazany do pam_*_item()"
 
 #: libpam/pam_strerror.c:55
 msgid "Conversation error"
-msgstr "B\305\202\304\205d konwersjacji"
+msgstr "Błąd konwersjacji"
 
 #: libpam/pam_strerror.c:57
 msgid "Authentication token manipulation error"
-msgstr "B\305\202\304\205d obs\305\202ugi biletu autoryzacji"
+msgstr "Błąd obsługi biletu autoryzacji"
 
 #: libpam/pam_strerror.c:59
 msgid "Authentication information cannot be recovered"
-msgstr "Nie mo\305\274na odzyska\304\207 informacji autoryzacyjnych"
+msgstr "Nie można odzyskać informacji autoryzacyjnych"
 
 #: libpam/pam_strerror.c:61
 msgid "Authentication token lock busy"
-msgstr "Zaj\304\231ta blokada biletu autoryzacji"
+msgstr "Zajęta blokada biletu autoryzacji"
 
 #: libpam/pam_strerror.c:63
 msgid "Authentication token aging disabled"
-msgstr "Przeterminowanie biletu autoryzacyjnego wy\305\202\304\205czone"
+msgstr "Przeterminowanie biletu autoryzacyjnego wyłączone"
 
 #: libpam/pam_strerror.c:65
 msgid "Failed preliminary check by password service"
-msgstr ""
-"Nieudane pocz\304\205tkowe sprawdzenie has\305\202a przez us\305\202ug\304"
-"\231"
+msgstr "Nieudane początkowe sprawdzenie hasła przez usługę"
 
 #: libpam/pam_strerror.c:67
 msgid "The return value should be ignored by PAM dispatch"
-msgstr ""
-"Zwr\303\263cona warto\305\233\304\207 powinna by\304\207 zignorowana przez "
-"PAM"
+msgstr "Zwrócona wartość powinna być zignorowana przez PAM"
 
 #: libpam/pam_strerror.c:69
 msgid "Module is unknown"
-msgstr "Modu\305\202 jest nieznany"
+msgstr "Moduł jest nieznany"
 
 #: libpam/pam_strerror.c:71
 msgid "Authentication token expired"
-msgstr "Bilet autoryzacyjny przeterminowa\305\202 si\304\231"
+msgstr "Bilet autoryzacyjny przeterminował się"
 
 #: libpam/pam_strerror.c:73
 msgid "Conversation is waiting for event"
@@ -446,22 +364,25 @@ msgstr "Oczekiwanie na zdarzenie konwersjacji"
 
 #: libpam/pam_strerror.c:75
 msgid "Application needs to call libpam again"
-msgstr "Aplikacja musi jeszcze raz wywo\305\202a\304\207 libpam"
+msgstr "Aplikacja musi jeszcze raz wywołać libpam"
 
 #: libpam/pam_strerror.c:78
 msgid "Unknown PAM error"
-msgstr "Nieznany b\305\202\304\205d PAM"
+msgstr "Nieznany błąd PAM"
 
 #: libpam_misc/misc_conv.c:35
-msgid "..\007.Time is running out...\n"
-msgstr "..\007.Czas ucieka...\n"
+msgid "...Time is running out...\n"
+msgstr "...Czas ucieka...\n"
 
 #: libpam_misc/misc_conv.c:36
-msgid "..\007.Sorry, your time is up!\n"
-msgstr ""
-"..\007.Przykro mi, tw\303\263j czas si\304\231 sko\305\204czy\305\202!\n"
+msgid "...Sorry, your time is up!\n"
+msgstr "...Przykro mi, twój czas się skończył!\n"
 
 #: libpam_misc/misc_conv.c:334
 #, c-format
 msgid "erroneous conversation (%d)\n"
-msgstr "b\305\202\304\231dna konwersacja (%d)\n"
+msgstr "błędna konwersacja (%d)\n"
+
+#, fuzzy
+#~ msgid "%s: set %s security context to %s"
+#~ msgstr "Nieważny kontekst bezpieczeństwa"
diff --git a/po/pt.po b/po/pt.po
index 0888c496..cd90f7b4 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-09-05 15:43+0200\n"
+"POT-Creation-Date: 2005-09-14 19:09+0200\n"
 "PO-Revision-Date: 2005-08-07 00:41+0100\n"
 "Last-Translator: Antonio Cardoso Martins <digiplan@netvisao.pt>\n"
 "Language-Team: portuguese\n"
@@ -18,11 +18,11 @@ msgstr ""
 
 #: modules/pam_tally/pam_tally.c:730
 msgid "Authentication error"
-msgstr "Erro de autentica\303\247\303\243o"
+msgstr "Erro de autenticação"
 
 #: modules/pam_tally/pam_tally.c:731
 msgid "Service error"
-msgstr "Erro de servi\303\247o"
+msgstr "Erro de serviço"
 
 #: modules/pam_tally/pam_tally.c:732
 msgid "Unknown user"
@@ -35,12 +35,12 @@ msgstr "Erro desconhecido"
 #: modules/pam_tally/pam_tally.c:747
 #, c-format
 msgid "%s: Bad number given to --reset=\n"
-msgstr "%s: N\303\272mero errado fornecido a --reset=\n"
+msgstr "%s: Número errado fornecido a --reset=\n"
 
 #: modules/pam_tally/pam_tally.c:751
 #, c-format
 msgid "%s: Unrecognised option %s\n"
-msgstr "%s: Op\303\247\303\243o n\303\243o reconhecida %s\n"
+msgstr "%s: Opção não reconhecida %s\n"
 
 #: modules/pam_tally/pam_tally.c:763
 #, c-format
@@ -52,124 +52,60 @@ msgstr ""
 #: modules/pam_tally/pam_tally.c:836
 #, c-format
 msgid "%s: Can't reset all users to non-zero\n"
-msgstr ""
-"%s: N\303\243o foi poss\303\255vel reiniciar todos os utilizadores para n\303"
-"\243o zero\n"
+msgstr "%s: Não foi possível reiniciar todos os utilizadores para não zero\n"
+
+#: modules/pam_selinux/pam_selinux_check.c:99
+#, c-format
+msgid "failed to initialize PAM\n"
+msgstr "falha ao inicializar o PAM\n"
 
-#: modules/pam_selinux/pam_selinux.c:127
+#: modules/pam_selinux/pam_selinux_check.c:105
+#, c-format
+msgid "failed to pam_set_item()\n"
+msgstr "falha em pam_set_item()\n"
+
+#: modules/pam_selinux/pam_selinux_check.c:132
+#, c-format
+msgid "login: failure forking: %s"
+msgstr "sessão: falha ao executar o forking: %s"
+
+#: modules/pam_selinux/pam_selinux.c:102
 #, c-format
 msgid "Your default context is %s. \n"
-msgstr "O seu contexto pr\303\251-definido \303\251 %s: \n"
+msgstr "O seu contexto pré-definido é %s: \n"
 
-#: modules/pam_selinux/pam_selinux.c:130
+#: modules/pam_selinux/pam_selinux.c:105
 msgid "Do you want to choose a different one? [n]"
 msgstr "Pretende escolher um diferente? [n]"
 
-#: modules/pam_selinux/pam_selinux.c:137
+#: modules/pam_selinux/pam_selinux.c:112
 msgid "Enter number of choice: "
-msgstr "Digite o n\303\272mero da escolha: "
-
-#: modules/pam_selinux/pam_selinux.c:164 modules/pam_selinux/pam_selinux.c:245
-#: modules/pam_selinux/pam_selinux.c:352
-#, c-format
-msgid "%s: bogus conversation function"
-msgstr ""
+msgstr "Digite o número da escolha: "
 
-#: modules/pam_selinux/pam_selinux.c:168 modules/pam_selinux/pam_selinux.c:249
-#: modules/pam_selinux/pam_selinux.c:356
-#, c-format
-msgid "%s: no conversation function"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:187
+#: modules/pam_selinux/pam_selinux.c:152
 msgid "Would you like to enter a security context? [y] "
-msgstr "Pretende introduzir um contexto de seguran\303\247a? [y]"
+msgstr "Pretende introduzir um contexto de segurança? [y]"
 
-#: modules/pam_selinux/pam_selinux.c:204
+#: modules/pam_selinux/pam_selinux.c:169
 msgid "role: "
 msgstr "papel: "
 
-#: modules/pam_selinux/pam_selinux.c:212
+#: modules/pam_selinux/pam_selinux.c:177
 msgid "type: "
 msgstr "tipo: "
 
-#: modules/pam_selinux/pam_selinux.c:222
+#: modules/pam_selinux/pam_selinux.c:187
 msgid "level: "
-msgstr "n\303\255vel: "
+msgstr "nível: "
 
-#: modules/pam_selinux/pam_selinux.c:236
+#: modules/pam_selinux/pam_selinux.c:203
 msgid "Not a valid security context"
-msgstr "N\303\243o \303\251 um contexto de seguran\303\247a v\303\241lido"
-
-#: modules/pam_selinux/pam_selinux.c:272
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.\n"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:296
-#, c-format
-msgid "Warning!  Could not get current context for %s, not relabeling."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:303
-#, c-format
-msgid "Warning!  Could not get new context for %s, not relabeling."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:313
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.%s"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:429
-#, c-format
-msgid "Unable to get valid context for %s"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:433
-#, c-format
-msgid "Unable to get valid context for %s, No valid tty"
-msgstr ""
+msgstr "Não é um contexto de segurança válido"
 
-#: modules/pam_selinux/pam_selinux.c:465
+#: modules/pam_selinux/pam_selinux.c:416
 #, c-format
 msgid "Security Context %s Assigned"
-msgstr "Contexto de Seguran\303\247a %s Atribu\303\255do"
-
-#: modules/pam_selinux/pam_selinux.c:469
-#, c-format
-msgid "Error!  Unable to set %s executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:475
-#, fuzzy, c-format
-msgid "%s: set %s security context to %s"
-msgstr "N\303\243o \303\251 um contexto de seguran\303\247a v\303\241lido"
-
-#: modules/pam_selinux/pam_selinux.c:518
-#, c-format
-msgid "Error!  Unable to set executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:524
-#, c-format
-msgid "%s: setcontext back to orginal"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:585
-#, c-format
-msgid "failed to initialize PAM\n"
-msgstr "falha ao inicializar o PAM\n"
-
-#: modules/pam_selinux/pam_selinux.c:591
-#, c-format
-msgid "failed to pam_set_item()\n"
-msgstr "falha em pam_set_item()\n"
-
-#: modules/pam_selinux/pam_selinux.c:616
-#, c-format
-msgid "login: failure forking: %s"
-msgstr "sess\303\243o: falha ao executar o forking: %s"
+msgstr "Contexto de Segurança %s Atribuído"
 
 #: modules/pam_unix/pam_unix_acct.c:268 modules/pam_unix/pam_unix_acct.c:295
 msgid "Your account has expired; please contact your system administrator"
@@ -180,14 +116,12 @@ msgstr ""
 #: modules/pam_unix/pam_unix_acct.c:277
 msgid "You are required to change your password immediately (root enforced)"
 msgstr ""
-"\303\211 obrigat\303\263rio que altere de imediato a sua palavra passe (for"
-"\303\247ado pelo root)"
+"É obrigatório que altere de imediato a sua palavra passe (forçado pelo root)"
 
 #: modules/pam_unix/pam_unix_acct.c:304
 msgid "You are required to change your password immediately (password aged)"
 msgstr ""
-"\303\211 obrigat\303\263rio que altere de imediato a sua palavra passe (for"
-"\303\247ado pela idade)"
+"É obrigatório que altere de imediato a sua palavra passe (forçado pela idade)"
 
 #: modules/pam_unix/pam_unix_acct.c:314
 #, c-format
@@ -201,12 +135,12 @@ msgstr "Palavra passe inalterada"
 
 #: modules/pam_unix/pam_unix_passwd.c:818
 msgid "NIS password could not be changed."
-msgstr "A palavra passe de NIS n\303\243o pode ser alterada."
+msgstr "A palavra passe de NIS não pode ser alterada."
 
 #: modules/pam_unix/pam_unix_passwd.c:962
 #: modules/pam_cracklib/pam_cracklib.c:465
 msgid "No password supplied"
-msgstr "N\303\243o foi fornecida uma palavra passe"
+msgstr "Não foi fornecida uma palavra passe"
 
 #: modules/pam_unix/pam_unix_passwd.c:962
 #: modules/pam_cracklib/pam_cracklib.c:465
@@ -219,7 +153,7 @@ msgstr "Deve escolher uma palavra passe mais longa"
 
 #: modules/pam_unix/pam_unix_passwd.c:988
 msgid "Password has been already used. Choose another."
-msgstr "A palavra passe j\303\241 foi anteriormente utilizada. Escolha outra."
+msgstr "A palavra passe já foi anteriormente utilizada. Escolha outra."
 
 #: modules/pam_unix/pam_unix_passwd.c:1112
 msgid "(current) UNIX password: "
@@ -239,22 +173,21 @@ msgstr "Digite a nova palavra passe de STRESS: "
 msgid "Retype new UNIX password: "
 msgstr "Digite novamente a nova palavra passe de STRESS: "
 
-#: modules/pam_stress/pam_stress.c:481
+#: modules/pam_stress/pam_stress.c:474
 msgid "Changing STRESS password for "
 msgstr "A alterar a palavra passe de STRESS para "
 
-#: modules/pam_stress/pam_stress.c:495
+#: modules/pam_stress/pam_stress.c:488
 msgid "Enter new STRESS password: "
 msgstr "Digite a nova palavra passe de STRESS: "
 
-#: modules/pam_stress/pam_stress.c:498
+#: modules/pam_stress/pam_stress.c:491
 msgid "Retype new STRESS password: "
 msgstr "Digite novamente a nova palavra passe de STRESS: "
 
-#: modules/pam_stress/pam_stress.c:526
+#: modules/pam_stress/pam_stress.c:519
 msgid "Verification mis-typed; password unchanged"
-msgstr ""
-"A verifica\303\247\303\243o n\303\243o coincide; palavra passe inalterada"
+msgstr "A verificação não coincide; palavra passe inalterada"
 
 #: modules/pam_cracklib/pam_cracklib.c:61
 #, fuzzy, c-format
@@ -269,7 +202,7 @@ msgstr "Digite novamente a nova palavra passe de STRESS: "
 #: modules/pam_cracklib/pam_cracklib.c:64
 #, fuzzy
 msgid "Sorry, passwords do not match."
-msgstr "A palavra passe de NIS n\303\243o pode ser alterada."
+msgstr "A palavra passe de NIS não pode ser alterada."
 
 #: modules/pam_cracklib/pam_cracklib.c:379
 msgid "is the same as the old one"
@@ -298,7 +231,7 @@ msgstr ""
 #: modules/pam_cracklib/pam_cracklib.c:437
 #, fuzzy
 msgid "has been already used"
-msgstr "A palavra passe j\303\241 foi anteriormente utilizada. Escolha outra."
+msgstr "A palavra passe já foi anteriormente utilizada. Escolha outra."
 
 #: modules/pam_cracklib/pam_cracklib.c:489
 #: modules/pam_cracklib/pam_cracklib.c:617
@@ -316,7 +249,7 @@ msgstr "Sucesso"
 
 #: libpam/pam_strerror.c:15
 msgid "Critical error - immediate abort"
-msgstr "Erro cr\303\255tico - interrup\303\247\303\243o imediata"
+msgstr "Erro crítico - interrupção imediata"
 
 #: libpam/pam_strerror.c:17
 msgid "dlopen() failure"
@@ -324,11 +257,11 @@ msgstr "falha em dlopen()"
 
 #: libpam/pam_strerror.c:19
 msgid "Symbol not found"
-msgstr "S\303\255mbolo n\303\243o encontrado"
+msgstr "Símbolo não encontrado"
 
 #: libpam/pam_strerror.c:21
 msgid "Error in service module"
-msgstr "Erro no m\303\263dulo do servi\303\247o"
+msgstr "Erro no módulo do serviço"
 
 #: libpam/pam_strerror.c:23
 msgid "System error"
@@ -336,43 +269,35 @@ msgstr "Erro de sistema"
 
 #: libpam/pam_strerror.c:25
 msgid "Memory buffer error"
-msgstr "Erro de buffer de mem\303\263ria"
+msgstr "Erro de buffer de memória"
 
 #: libpam/pam_strerror.c:27
 msgid "Permission denied"
-msgstr "Permiss\303\243o negada"
+msgstr "Permissão negada"
 
 #: libpam/pam_strerror.c:29
 msgid "Authentication failure"
-msgstr "Falha de autentica\303\247\303\243o"
+msgstr "Falha de autenticação"
 
 #: libpam/pam_strerror.c:31
 msgid "Insufficient credentials to access authentication data"
-msgstr ""
-"Credenciais insuficientes para aceder aos dados de autentica\303\247\303\243o"
+msgstr "Credenciais insuficientes para aceder aos dados de autenticação"
 
 #: libpam/pam_strerror.c:33
 msgid "Authentication service cannot retrieve authentication info."
-msgstr ""
-"O servi\303\247o de autentica\303\247\303\243o n\303\243o pode obter informa"
-"\303\247\303\243o de autentica\303\247\303\243o."
+msgstr "O serviço de autenticação não pode obter informação de autenticação."
 
 #: libpam/pam_strerror.c:35
 msgid "User not known to the underlying authentication module"
-msgstr ""
-"Utilizador desconhecido para o m\303\263dulo de autentica\303\247\303\243o "
-"subjacente"
+msgstr "Utilizador desconhecido para o módulo de autenticação subjacente"
 
 #: libpam/pam_strerror.c:37
 msgid "Have exhausted maximum number of retries for service."
-msgstr ""
-"Esgotou o n\303\272mero m\303\241ximo de tentativas para o servi\303\247o."
+msgstr "Esgotou o número máximo de tentativas para o serviço."
 
 #: libpam/pam_strerror.c:39
 msgid "Authentication token is no longer valid; new one required."
-msgstr ""
-"O testemunho de autentica\303\247\303\243o j\303\241 n\303\243o \303\251 v"
-"\303\241lido; \303\251 necess\303\241rio um novo."
+msgstr "O testemunho de autenticação já não é válido; é necessário um novo."
 
 #: libpam/pam_strerror.c:41
 msgid "User account has expired"
@@ -380,15 +305,12 @@ msgstr "A conta de utilizador expirou"
 
 #: libpam/pam_strerror.c:43
 msgid "Cannot make/remove an entry for the specified session"
-msgstr ""
-"N\303\243o \303\251 poss\303\255vel criar/remover uma entrada para a sess\303"
-"\243o especificada"
+msgstr "Não é possível criar/remover uma entrada para a sessão especificada"
 
 #: libpam/pam_strerror.c:45
 msgid "Authentication service cannot retrieve user credentials"
 msgstr ""
-"O servi\303\247o de autentica\303\247\303\243o n\303\243o consegue obter as "
-"credenciais do utilizador"
+"O serviço de autenticação não consegue obter as credenciais do utilizador"
 
 #: libpam/pam_strerror.c:47
 msgid "User credentials expired"
@@ -396,12 +318,11 @@ msgstr "As credenciais do utilizador expiraram"
 
 #: libpam/pam_strerror.c:49
 msgid "Failure setting user credentials"
-msgstr "Falha na defini\303\247\303\243o das credenciais do utilizador"
+msgstr "Falha na definição das credenciais do utilizador"
 
 #: libpam/pam_strerror.c:51
 msgid "No module specific data is present"
-msgstr ""
-"N\303\243o est\303\241 presente os dados espec\303\255ficos do m\303\263dulo"
+msgstr "Não está presente os dados específicos do módulo"
 
 #: libpam/pam_strerror.c:53
 msgid "Bad item passed to pam_*_item()"
@@ -409,35 +330,27 @@ msgstr "Item incorrecto passado para pam_*_item()"
 
 #: libpam/pam_strerror.c:55
 msgid "Conversation error"
-msgstr "Erro de conversa\303\247\303\243o"
+msgstr "Erro de conversação"
 
 #: libpam/pam_strerror.c:57
 msgid "Authentication token manipulation error"
-msgstr ""
-"Erro de manipula\303\247\303\243o do testemunho de autentica\303\247\303\243o"
+msgstr "Erro de manipulação do testemunho de autenticação"
 
 #: libpam/pam_strerror.c:59
 msgid "Authentication information cannot be recovered"
-msgstr ""
-"A informa\303\247\303\243o de autentica\303\247\303\243o n\303\243o pode ser "
-"recuperada"
+msgstr "A informação de autenticação não pode ser recuperada"
 
 #: libpam/pam_strerror.c:61
 msgid "Authentication token lock busy"
-msgstr ""
-"A fechadura to testemunho de autentica\303\247\303\243o encontra-se ocupado"
+msgstr "A fechadura to testemunho de autenticação encontra-se ocupado"
 
 #: libpam/pam_strerror.c:63
 msgid "Authentication token aging disabled"
-msgstr ""
-"O envelhecimento do testemunho de autentica\303\247\303\243o encontra-se "
-"desactivado"
+msgstr "O envelhecimento do testemunho de autenticação encontra-se desactivado"
 
 #: libpam/pam_strerror.c:65
 msgid "Failed preliminary check by password service"
-msgstr ""
-"Falha na valida\303\247\303\243o preliminar pelo servi\303\247o de palavra "
-"passe"
+msgstr "Falha na validação preliminar pelo serviço de palavra passe"
 
 #: libpam/pam_strerror.c:67
 msgid "The return value should be ignored by PAM dispatch"
@@ -445,33 +358,37 @@ msgstr "O valor de retorno deve ser ignorado pelo expedidor de PAM"
 
 #: libpam/pam_strerror.c:69
 msgid "Module is unknown"
-msgstr "O m\303\263dulo \303\251 desconhecido"
+msgstr "O módulo é desconhecido"
 
 #: libpam/pam_strerror.c:71
 msgid "Authentication token expired"
-msgstr "O testemunho de autentica\303\247\303\243o expirou"
+msgstr "O testemunho de autenticação expirou"
 
 #: libpam/pam_strerror.c:73
 msgid "Conversation is waiting for event"
-msgstr "A conversa\303\247\303\243o est\303\241 a aguardar um evento"
+msgstr "A conversação está a aguardar um evento"
 
 #: libpam/pam_strerror.c:75
 msgid "Application needs to call libpam again"
-msgstr "A aplica\303\247\303\243o necessita de invocar o libpam novamente"
+msgstr "A aplicação necessita de invocar o libpam novamente"
 
 #: libpam/pam_strerror.c:78
 msgid "Unknown PAM error"
 msgstr "Erro PAM desconhecido"
 
 #: libpam_misc/misc_conv.c:35
-msgid "..\007.Time is running out...\n"
-msgstr "...O tempo est\303\241 a esgotar-se...\n"
+msgid "...Time is running out...\n"
+msgstr "...O tempo está a esgotar-se...\n"
 
 #: libpam_misc/misc_conv.c:36
-msgid "..\007.Sorry, your time is up!\n"
+msgid "...Sorry, your time is up!\n"
 msgstr "...Lamento, o seu tempo esgotou-se!\n"
 
 #: libpam_misc/misc_conv.c:334
 #, c-format
 msgid "erroneous conversation (%d)\n"
-msgstr "conversa\303\247\303\243o err\303\263nea (%d)\n"
+msgstr "conversação errónea (%d)\n"
+
+#, fuzzy
+#~ msgid "%s: set %s security context to %s"
+#~ msgstr "Não é um contexto de segurança válido"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e546369b..c23b27f2 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-09-05 15:43+0200\n"
+"POT-Creation-Date: 2005-09-14 19:09+0200\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"
@@ -17,15 +17,15 @@ msgstr ""
 
 #: modules/pam_tally/pam_tally.c:730
 msgid "Authentication error"
-msgstr "Erro de autentica\303\247\303\243o"
+msgstr "Erro de autenticação"
 
 #: modules/pam_tally/pam_tally.c:731
 msgid "Service error"
-msgstr "Erro de servi\303\247o"
+msgstr "Erro de serviço"
 
 #: modules/pam_tally/pam_tally.c:732
 msgid "Unknown user"
-msgstr "Usu\303\241rio desconhecido"
+msgstr "Usuário desconhecido"
 
 #: modules/pam_tally/pam_tally.c:733
 msgid "Unknown error"
@@ -34,12 +34,12 @@ msgstr "Erro desconhecido"
 #: modules/pam_tally/pam_tally.c:747
 #, c-format
 msgid "%s: Bad number given to --reset=\n"
-msgstr "%s: N\303\272mero insuficiente fornecido a --reset=\n"
+msgstr "%s: Número insuficiente fornecido a --reset=\n"
 
 #: modules/pam_tally/pam_tally.c:751
 #, c-format
 msgid "%s: Unrecognised option %s\n"
-msgstr "%s: Op\303\247\303\243o n\303\243o reconhecida %s\n"
+msgstr "%s: Opção não reconhecida %s\n"
 
 #: modules/pam_tally/pam_tally.c:763
 #, c-format
@@ -51,124 +51,60 @@ msgstr ""
 #: modules/pam_tally/pam_tally.c:836
 #, c-format
 msgid "%s: Can't reset all users to non-zero\n"
-msgstr ""
-"%s: Imposs\303\255vel redefinir todos os usu\303\241rios para n\303\243o-"
-"zero\n"
+msgstr "%s: Impossível redefinir todos os usuários para não-zero\n"
+
+#: modules/pam_selinux/pam_selinux_check.c:99
+#, c-format
+msgid "failed to initialize PAM\n"
+msgstr "falha ao inicializar PAM\n"
 
-#: modules/pam_selinux/pam_selinux.c:127
+#: modules/pam_selinux/pam_selinux_check.c:105
+#, c-format
+msgid "failed to pam_set_item()\n"
+msgstr "falha em pam_set_item()\n"
+
+#: modules/pam_selinux/pam_selinux_check.c:132
+#, c-format
+msgid "login: failure forking: %s"
+msgstr "login: falha na bifurcação: %s"
+
+#: modules/pam_selinux/pam_selinux.c:102
 #, c-format
 msgid "Your default context is %s. \n"
-msgstr "Seu contexto padr\303\243o \303\251 %s. \n"
+msgstr "Seu contexto padrão é %s. \n"
 
-#: modules/pam_selinux/pam_selinux.c:130
+#: modules/pam_selinux/pam_selinux.c:105
 msgid "Do you want to choose a different one? [n]"
 msgstr "Deseja escolher um diferente? [n]"
 
-#: modules/pam_selinux/pam_selinux.c:137
+#: modules/pam_selinux/pam_selinux.c:112
 msgid "Enter number of choice: "
-msgstr "Digite o n\303\272mero escolhido:"
-
-#: modules/pam_selinux/pam_selinux.c:164 modules/pam_selinux/pam_selinux.c:245
-#: modules/pam_selinux/pam_selinux.c:352
-#, c-format
-msgid "%s: bogus conversation function"
-msgstr ""
+msgstr "Digite o número escolhido:"
 
-#: modules/pam_selinux/pam_selinux.c:168 modules/pam_selinux/pam_selinux.c:249
-#: modules/pam_selinux/pam_selinux.c:356
-#, c-format
-msgid "%s: no conversation function"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:187
+#: modules/pam_selinux/pam_selinux.c:152
 msgid "Would you like to enter a security context? [y] "
-msgstr "Deseja digitar um contexto de seguran\303\247a? [s]"
+msgstr "Deseja digitar um contexto de segurança? [s]"
 
-#: modules/pam_selinux/pam_selinux.c:204
+#: modules/pam_selinux/pam_selinux.c:169
 msgid "role: "
-msgstr "fun\303\247\303\243o:"
+msgstr "função:"
 
-#: modules/pam_selinux/pam_selinux.c:212
+#: modules/pam_selinux/pam_selinux.c:177
 msgid "type: "
 msgstr "digite:"
 
-#: modules/pam_selinux/pam_selinux.c:222
+#: modules/pam_selinux/pam_selinux.c:187
 msgid "level: "
-msgstr "n\303\255vel:"
+msgstr "nível:"
 
-#: modules/pam_selinux/pam_selinux.c:236
+#: modules/pam_selinux/pam_selinux.c:203
 msgid "Not a valid security context"
-msgstr "N\303\243o \303\251 um contexto de seguran\303\247a v\303\241lido"
-
-#: modules/pam_selinux/pam_selinux.c:272
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.\n"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:296
-#, c-format
-msgid "Warning!  Could not get current context for %s, not relabeling."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:303
-#, c-format
-msgid "Warning!  Could not get new context for %s, not relabeling."
-msgstr ""
+msgstr "Não é um contexto de segurança válido"
 
-#: modules/pam_selinux/pam_selinux.c:313
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.%s"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:429
-#, c-format
-msgid "Unable to get valid context for %s"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:433
-#, c-format
-msgid "Unable to get valid context for %s, No valid tty"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:465
+#: modules/pam_selinux/pam_selinux.c:416
 #, c-format
 msgid "Security Context %s Assigned"
-msgstr "Contexto de Seguran\303\247a %s Atribu\303\255do"
-
-#: modules/pam_selinux/pam_selinux.c:469
-#, c-format
-msgid "Error!  Unable to set %s executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:475
-#, fuzzy, c-format
-msgid "%s: set %s security context to %s"
-msgstr "N\303\243o \303\251 um contexto de seguran\303\247a v\303\241lido"
-
-#: modules/pam_selinux/pam_selinux.c:518
-#, c-format
-msgid "Error!  Unable to set executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:524
-#, c-format
-msgid "%s: setcontext back to orginal"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:585
-#, c-format
-msgid "failed to initialize PAM\n"
-msgstr "falha ao inicializar PAM\n"
-
-#: modules/pam_selinux/pam_selinux.c:591
-#, c-format
-msgid "failed to pam_set_item()\n"
-msgstr "falha em pam_set_item()\n"
-
-#: modules/pam_selinux/pam_selinux.c:616
-#, c-format
-msgid "login: failure forking: %s"
-msgstr "login: falha na bifurca\303\247\303\243o: %s"
+msgstr "Contexto de Segurança %s Atribuído"
 
 #: modules/pam_unix/pam_unix_acct.c:268 modules/pam_unix/pam_unix_acct.c:295
 msgid "Your account has expired; please contact your system administrator"
@@ -185,7 +121,7 @@ msgstr "Mude sua senha imediatamente (senha expirada)"
 #: modules/pam_unix/pam_unix_acct.c:314
 #, c-format
 msgid "Warning: your password will expire in %d day%.2s"
-msgstr "Aviso: sua senha expirar\303\241 em %d dia%.2s"
+msgstr "Aviso: sua senha expirará em %d dia%.2s"
 
 #: modules/pam_unix/pam_unix_auth.c:163
 #, fuzzy
@@ -194,7 +130,7 @@ msgstr "Senha inalterada"
 
 #: modules/pam_unix/pam_unix_passwd.c:818
 msgid "NIS password could not be changed."
-msgstr "A senha NIS n\303\243o p\303\264de ser mudada."
+msgstr "A senha NIS não pôde ser mudada."
 
 #: modules/pam_unix/pam_unix_passwd.c:962
 #: modules/pam_cracklib/pam_cracklib.c:465
@@ -212,7 +148,7 @@ msgstr "Escolha uma senha mais longa"
 
 #: modules/pam_unix/pam_unix_passwd.c:988
 msgid "Password has been already used. Choose another."
-msgstr "A senha j\303\241 foi usada. Escolha outra."
+msgstr "A senha já foi usada. Escolha outra."
 
 #: modules/pam_unix/pam_unix_passwd.c:1112
 msgid "(current) UNIX password: "
@@ -232,21 +168,21 @@ msgstr "Digite a nova senha STRESS:"
 msgid "Retype new UNIX password: "
 msgstr "Digite novamente a nova senha STRESS:"
 
-#: modules/pam_stress/pam_stress.c:481
+#: modules/pam_stress/pam_stress.c:474
 msgid "Changing STRESS password for "
 msgstr "Mudando senha STRESS para"
 
-#: modules/pam_stress/pam_stress.c:495
+#: modules/pam_stress/pam_stress.c:488
 msgid "Enter new STRESS password: "
 msgstr "Digite a nova senha STRESS:"
 
-#: modules/pam_stress/pam_stress.c:498
+#: modules/pam_stress/pam_stress.c:491
 msgid "Retype new STRESS password: "
 msgstr "Digite novamente a nova senha STRESS:"
 
-#: modules/pam_stress/pam_stress.c:526
+#: modules/pam_stress/pam_stress.c:519
 msgid "Verification mis-typed; password unchanged"
-msgstr "Verifica\303\247\303\243o digitada incorretamente; senha inalterada"
+msgstr "Verificação digitada incorretamente; senha inalterada"
 
 #: modules/pam_cracklib/pam_cracklib.c:61
 #, fuzzy, c-format
@@ -261,7 +197,7 @@ msgstr "Digite novamente a nova senha STRESS:"
 #: modules/pam_cracklib/pam_cracklib.c:64
 #, fuzzy
 msgid "Sorry, passwords do not match."
-msgstr "A senha NIS n\303\243o p\303\264de ser mudada."
+msgstr "A senha NIS não pôde ser mudada."
 
 #: modules/pam_cracklib/pam_cracklib.c:379
 msgid "is the same as the old one"
@@ -290,7 +226,7 @@ msgstr ""
 #: modules/pam_cracklib/pam_cracklib.c:437
 #, fuzzy
 msgid "has been already used"
-msgstr "A senha j\303\241 foi usada. Escolha outra."
+msgstr "A senha já foi usada. Escolha outra."
 
 #: modules/pam_cracklib/pam_cracklib.c:489
 #: modules/pam_cracklib/pam_cracklib.c:617
@@ -308,7 +244,7 @@ msgstr "Sucesso"
 
 #: libpam/pam_strerror.c:15
 msgid "Critical error - immediate abort"
-msgstr "Erro cr\303\255tico - abortar imediatamente"
+msgstr "Erro crítico - abortar imediatamente"
 
 #: libpam/pam_strerror.c:17
 msgid "dlopen() failure"
@@ -316,11 +252,11 @@ msgstr "falha de dlopen ()"
 
 #: libpam/pam_strerror.c:19
 msgid "Symbol not found"
-msgstr "S\303\255mbolo n\303\243o encontrado"
+msgstr "Símbolo não encontrado"
 
 #: libpam/pam_strerror.c:21
 msgid "Error in service module"
-msgstr "Erro no m\303\263dulo de servi\303\247o"
+msgstr "Erro no módulo de serviço"
 
 #: libpam/pam_strerror.c:23
 msgid "System error"
@@ -328,72 +264,59 @@ msgstr "Erro do sistema"
 
 #: libpam/pam_strerror.c:25
 msgid "Memory buffer error"
-msgstr "Erro do buffer de mem\303\263ria"
+msgstr "Erro do buffer de memória"
 
 #: libpam/pam_strerror.c:27
 msgid "Permission denied"
-msgstr "Permiss\303\243o negada"
+msgstr "Permissão negada"
 
 #: libpam/pam_strerror.c:29
 msgid "Authentication failure"
-msgstr "Falha de autentica\303\247\303\243o"
+msgstr "Falha de autenticação"
 
 #: libpam/pam_strerror.c:31
 msgid "Insufficient credentials to access authentication data"
-msgstr ""
-"Credenciais insuficientes para acessar dados de autentica\303\247\303\243o"
+msgstr "Credenciais insuficientes para acessar dados de autenticação"
 
 #: libpam/pam_strerror.c:33
 msgid "Authentication service cannot retrieve authentication info."
-msgstr ""
-"O servi\303\247o de autentica\303\247\303\243o n\303\243o recuperou informa"
-"\303\247\303\265es de autentica\303\247\303\243o."
+msgstr "O serviço de autenticação não recuperou informações de autenticação."
 
 #: libpam/pam_strerror.c:35
 msgid "User not known to the underlying authentication module"
-msgstr ""
-"Usu\303\241rio desconhecido para o m\303\263dulo de autentica\303\247\303"
-"\243o subjacente"
+msgstr "Usuário desconhecido para o módulo de autenticação subjacente"
 
 #: libpam/pam_strerror.c:37
 msgid "Have exhausted maximum number of retries for service."
-msgstr ""
-"Esgotado o n\303\272mero m\303\241ximo de tentativas para servi\303\247o."
+msgstr "Esgotado o número máximo de tentativas para serviço."
 
 #: libpam/pam_strerror.c:39
 msgid "Authentication token is no longer valid; new one required."
-msgstr ""
-"O token de autentica\303\247\303\243o n\303\243o \303\251 mais v\303"
-"\241lido; token novo necess\303\241rio."
+msgstr "O token de autenticação não é mais válido; token novo necessário."
 
 #: libpam/pam_strerror.c:41
 msgid "User account has expired"
-msgstr "A conta do usu\303\241rio expirou"
+msgstr "A conta do usuário expirou"
 
 #: libpam/pam_strerror.c:43
 msgid "Cannot make/remove an entry for the specified session"
-msgstr ""
-"Imposs\303\255vel fazer/remover entrada para a sess\303\243o espec\303"
-"\255fica"
+msgstr "Impossível fazer/remover entrada para a sessão específica"
 
 #: libpam/pam_strerror.c:45
 msgid "Authentication service cannot retrieve user credentials"
-msgstr ""
-"O servi\303\247o de autentica\303\247\303\243o n\303\243o recuperou "
-"credenciais do usu\303\241rio"
+msgstr "O serviço de autenticação não recuperou credenciais do usuário"
 
 #: libpam/pam_strerror.c:47
 msgid "User credentials expired"
-msgstr "Credenciais do usu\303\241rio expiradas"
+msgstr "Credenciais do usuário expiradas"
 
 #: libpam/pam_strerror.c:49
 msgid "Failure setting user credentials"
-msgstr "Falha ao definir credenciais do usu\303\241rio"
+msgstr "Falha ao definir credenciais do usuário"
 
 #: libpam/pam_strerror.c:51
 msgid "No module specific data is present"
-msgstr ""
-"N\303\243o h\303\241 nenhum dado espec\303\255fico para o m\303\263dulo "
+msgstr "Não há nenhum dado específico para o módulo "
 
 #: libpam/pam_strerror.c:53
 msgid "Bad item passed to pam_*_item()"
@@ -401,31 +324,27 @@ msgstr "Item incorreto passado para pam_*_item()"
 
 #: libpam/pam_strerror.c:55
 msgid "Conversation error"
-msgstr "Erro de conversa\303\247\303\243o"
+msgstr "Erro de conversação"
 
 #: libpam/pam_strerror.c:57
 msgid "Authentication token manipulation error"
-msgstr ""
-"Erro de manipula\303\247\303\243o de token de autentica\303\247\303\243o"
+msgstr "Erro de manipulação de token de autenticação"
 
 #: libpam/pam_strerror.c:59
 msgid "Authentication information cannot be recovered"
-msgstr ""
-"Imposs\303\255vel recuperar informa\303\247\303\265es de autentica\303\247"
-"\303\243o"
+msgstr "Impossível recuperar informações de autenticação"
 
 #: libpam/pam_strerror.c:61
 msgid "Authentication token lock busy"
-msgstr "Bloqueio de token de autentica\303\247\303\243o ocupado"
+msgstr "Bloqueio de token de autenticação ocupado"
 
 #: libpam/pam_strerror.c:63
 msgid "Authentication token aging disabled"
-msgstr "Validade do token de autentica\303\247\303\243o desabilitado"
+msgstr "Validade do token de autenticação desabilitado"
 
 #: libpam/pam_strerror.c:65
 msgid "Failed preliminary check by password service"
-msgstr ""
-"Falha na verifica\303\247\303\243o preliminar por servi\303\247o de senha"
+msgstr "Falha na verificação preliminar por serviço de senha"
 
 #: libpam/pam_strerror.c:67
 msgid "The return value should be ignored by PAM dispatch"
@@ -433,15 +352,15 @@ msgstr "O valor de retorno deve ser ignorado pelo despacho PAM"
 
 #: libpam/pam_strerror.c:69
 msgid "Module is unknown"
-msgstr "M\303\263dulo desconhecido"
+msgstr "Módulo desconhecido"
 
 #: libpam/pam_strerror.c:71
 msgid "Authentication token expired"
-msgstr "Token de autentica\303\247\303\243o expirado"
+msgstr "Token de autenticação expirado"
 
 #: libpam/pam_strerror.c:73
 msgid "Conversation is waiting for event"
-msgstr "Conversa\303\247\303\243o aguardando por evento"
+msgstr "Conversação aguardando por evento"
 
 #: libpam/pam_strerror.c:75
 msgid "Application needs to call libpam again"
@@ -452,14 +371,18 @@ msgid "Unknown PAM error"
 msgstr "Erro desconhecido no PAM"
 
 #: libpam_misc/misc_conv.c:35
-msgid "..\007.Time is running out...\n"
-msgstr ".._.Tempo acabando...\n"
+msgid "...Time is running out...\n"
+msgstr "...Tempo acabando...\n"
 
 #: libpam_misc/misc_conv.c:36
-msgid "..\007.Sorry, your time is up!\n"
-msgstr ".._.Tempo contando.\n"
+msgid "...Sorry, your time is up!\n"
+msgstr "...Tempo contando.\n"
 
 #: libpam_misc/misc_conv.c:334
 #, c-format
 msgid "erroneous conversation (%d)\n"
-msgstr "conversa\303\247\303\243o err\303\264nea (%d)\n"
+msgstr "conversação errônea (%d)\n"
+
+#, fuzzy
+#~ msgid "%s: set %s security context to %s"
+#~ msgstr "Não é um contexto de segurança válido"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0640a568..aeb911bd 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-09-05 15:43+0200\n"
+"POT-Creation-Date: 2005-09-14 19:09+0200\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"
@@ -17,244 +17,137 @@ msgstr ""
 
 #: modules/pam_tally/pam_tally.c:730
 msgid "Authentication error"
-msgstr "\351\211\264\345\256\232\351\224\231\350\257\257"
+msgstr "鉴定错误"
 
 #: modules/pam_tally/pam_tally.c:731
 msgid "Service error"
-msgstr "\346\234\215\345\212\241\351\224\231\350\257\257"
+msgstr "服务错误"
 
 #: modules/pam_tally/pam_tally.c:732
 msgid "Unknown user"
-msgstr "\346\234\252\347\237\245\347\232\204\347\224\250\346\210\267"
+msgstr "未知的用户"
 
 #: modules/pam_tally/pam_tally.c:733
 msgid "Unknown error"
-msgstr "\346\234\252\347\237\245\347\232\204\351\224\231\350\257\257"
+msgstr "未知的错误"
 
 #: modules/pam_tally/pam_tally.c:747
 #, c-format
 msgid "%s: Bad number given to --reset=\n"
-msgstr ""
-"%s: \347\273\231\345\256\232\347\232\204\346\225\260\345\255\227\346\227\240"
-"\346\225\210 --\351\207\215\350\256\276\347\275\256=\n"
+msgstr "%s: 给定的数字无效 --重设置=\n"
 
 #: modules/pam_tally/pam_tally.c:751
 #, c-format
 msgid "%s: Unrecognised option %s\n"
-msgstr ""
-"%s: \346\234\252\350\257\206\345\210\253\347\232\204\351\200\211\351\241\271 "
-"%s\n"
+msgstr "%s: 未识别的选项 %s\n"
 
 #: modules/pam_tally/pam_tally.c:763
 #, c-format
 msgid ""
 "%s: [--file rooted-filename] [--user username] [--reset[=n]] [--quiet]\n"
-msgstr ""
-"%s: [--\346\226\207\344\273\266 \346\240\271\346\226\207\344\273\266\345\220"
-"\215] [--\347\224\250\346\210\267 \347\224\250\346\210\267\345\220\215] [--"
-"\351\207\215\350\256\276\347\275\256[=n]] [--\345\256\211\351\235\231]\n"
+msgstr "%s: [--文件 根文件名] [--用户 用户名] [--重设置[=n]] [--安静]\n"
 
 #: modules/pam_tally/pam_tally.c:836
 #, c-format
 msgid "%s: Can't reset all users to non-zero\n"
-msgstr ""
-"%s: \346\227\240\346\263\225\345\260\206\346\211\200\346\234\211\347\224\250"
-"\346\210\267\351\207\215\350\256\276\347\275\256\344\270\272\351\235\236\351"
-"\233\266\n"
+msgstr "%s: 无法将所有用户重设置为非零\n"
 
-#: modules/pam_selinux/pam_selinux.c:127
+#: modules/pam_selinux/pam_selinux_check.c:99
 #, c-format
-msgid "Your default context is %s. \n"
-msgstr ""
-"\346\202\250\347\232\204\351\273\230\350\256\244\347\216\257\345\242\203\344"
-"\270\272 %s\343\200\202\n"
-
-#: modules/pam_selinux/pam_selinux.c:130
-msgid "Do you want to choose a different one? [n]"
-msgstr ""
-"\346\230\257\345\220\246\346\203\263\350\246\201\351\200\211\346\213\251\345"
-"\217\246\344\270\200\344\270\252\357\274\237[n]"
+msgid "failed to initialize PAM\n"
+msgstr "未能初始化 PAM\n"
 
-#: modules/pam_selinux/pam_selinux.c:137
-msgid "Enter number of choice: "
-msgstr ""
-"\350\276\223\345\205\245\351\200\211\351\241\271\347\232\204\346\225\260\345"
-"\255\227\357\274\232"
+#: modules/pam_selinux/pam_selinux_check.c:105
+#, c-format
+msgid "failed to pam_set_item()\n"
+msgstr "未能 pam_set_item()\n"
 
-#: modules/pam_selinux/pam_selinux.c:164 modules/pam_selinux/pam_selinux.c:245
-#: modules/pam_selinux/pam_selinux.c:352
+#: modules/pam_selinux/pam_selinux_check.c:132
 #, c-format
-msgid "%s: bogus conversation function"
-msgstr ""
+msgid "login: failure forking: %s"
+msgstr "登录：故障派生：%s"
 
-#: modules/pam_selinux/pam_selinux.c:168 modules/pam_selinux/pam_selinux.c:249
-#: modules/pam_selinux/pam_selinux.c:356
+#: modules/pam_selinux/pam_selinux.c:102
 #, c-format
-msgid "%s: no conversation function"
-msgstr ""
+msgid "Your default context is %s. \n"
+msgstr "您的默认环境为 %s。\n"
 
-#: modules/pam_selinux/pam_selinux.c:187
+#: modules/pam_selinux/pam_selinux.c:105
+msgid "Do you want to choose a different one? [n]"
+msgstr "是否想要选择另一个？[n]"
+
+#: modules/pam_selinux/pam_selinux.c:112
+msgid "Enter number of choice: "
+msgstr "输入选项的数字："
+
+#: modules/pam_selinux/pam_selinux.c:152
 msgid "Would you like to enter a security context? [y] "
-msgstr ""
-"\346\230\257\345\220\246\346\204\277\346\204\217\350\276\223\345\205\245\345"
-"\256\211\345\205\250\346\200\247\347\216\257\345\242\203\357\274\237[y]"
+msgstr "是否愿意输入安全性环境？[y]"
 
-#: modules/pam_selinux/pam_selinux.c:204
+#: modules/pam_selinux/pam_selinux.c:169
 msgid "role: "
-msgstr "\350\201\214\350\203\275\357\274\232"
+msgstr "职能："
 
-#: modules/pam_selinux/pam_selinux.c:212
+#: modules/pam_selinux/pam_selinux.c:177
 msgid "type: "
-msgstr "\347\261\273\345\236\213\357\274\232"
+msgstr "类型："
 
-#: modules/pam_selinux/pam_selinux.c:222
+#: modules/pam_selinux/pam_selinux.c:187
 msgid "level: "
-msgstr "\347\272\247\345\210\253\357\274\232"
+msgstr "级别："
 
-#: modules/pam_selinux/pam_selinux.c:236
+#: modules/pam_selinux/pam_selinux.c:203
 msgid "Not a valid security context"
-msgstr ""
-"\344\270\215\346\230\257\346\234\211\346\225\210\347\232\204\345\256\211\345"
-"\205\250\346\200\247\347\216\257\345\242\203"
-
-#: modules/pam_selinux/pam_selinux.c:272
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.\n"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:296
-#, c-format
-msgid "Warning!  Could not get current context for %s, not relabeling."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:303
-#, c-format
-msgid "Warning!  Could not get new context for %s, not relabeling."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:313
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.%s"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:429
-#, c-format
-msgid "Unable to get valid context for %s"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:433
-#, c-format
-msgid "Unable to get valid context for %s, No valid tty"
-msgstr ""
+msgstr "不是有效的安全性环境"
 
-#: modules/pam_selinux/pam_selinux.c:465
+#: modules/pam_selinux/pam_selinux.c:416
 #, c-format
 msgid "Security Context %s Assigned"
-msgstr ""
-"\345\267\262\346\214\207\346\264\276\345\256\211\345\205\250\346\200\247\347"
-"\216\257\345\242\203 %s"
-
-#: modules/pam_selinux/pam_selinux.c:469
-#, c-format
-msgid "Error!  Unable to set %s executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:475
-#, fuzzy, c-format
-msgid "%s: set %s security context to %s"
-msgstr ""
-"\344\270\215\346\230\257\346\234\211\346\225\210\347\232\204\345\256\211\345"
-"\205\250\346\200\247\347\216\257\345\242\203"
-
-#: modules/pam_selinux/pam_selinux.c:518
-#, c-format
-msgid "Error!  Unable to set executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:524
-#, c-format
-msgid "%s: setcontext back to orginal"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:585
-#, c-format
-msgid "failed to initialize PAM\n"
-msgstr "\346\234\252\350\203\275\345\210\235\345\247\213\345\214\226 PAM\n"
-
-#: modules/pam_selinux/pam_selinux.c:591
-#, c-format
-msgid "failed to pam_set_item()\n"
-msgstr "\346\234\252\350\203\275 pam_set_item()\n"
-
-#: modules/pam_selinux/pam_selinux.c:616
-#, c-format
-msgid "login: failure forking: %s"
-msgstr ""
-"\347\231\273\345\275\225\357\274\232\346\225\205\351\232\234\346\264\276\347"
-"\224\237\357\274\232%s"
+msgstr "已指派安全性环境 %s"
 
 #: modules/pam_unix/pam_unix_acct.c:268 modules/pam_unix/pam_unix_acct.c:295
 msgid "Your account has expired; please contact your system administrator"
-msgstr ""
-"\346\202\250\347\232\204\345\270\220\346\210\267\345\267\262\345\244\261\346"
-"\225\210\357\274\233\350\257\267\344\270\216\347\263\273\347\273\237\347\256"
-"\241\347\220\206\345\221\230\345\217\226\345\276\227\350\201\224\347\263\273"
+msgstr "您的帐户已失效；请与系统管理员取得联系"
 
 #: modules/pam_unix/pam_unix_acct.c:277
 msgid "You are required to change your password immediately (root enforced)"
-msgstr ""
-"\346\202\250\351\234\200\350\246\201\347\253\213\345\215\263\346\233\264\346"
-"\224\271\345\217\243\344\273\244\357\274\210root \345\274\272\345\210\266\357"
-"\274\211"
+msgstr "您需要立即更改口令（root 强制）"
 
 #: modules/pam_unix/pam_unix_acct.c:304
 msgid "You are required to change your password immediately (password aged)"
-msgstr ""
-"\346\202\250\351\234\200\350\246\201\347\253\213\345\215\263\346\233\264\346"
-"\224\271\345\217\243\344\273\244\357\274\210\345\217\243\344\273\244\350\277"
-"\207\346\234\237\357\274\211"
+msgstr "您需要立即更改口令（口令过期）"
 
 #: modules/pam_unix/pam_unix_acct.c:314
 #, c-format
 msgid "Warning: your password will expire in %d day%.2s"
-msgstr ""
-"\350\255\246\345\221\212\357\274\232\346\202\250\347\232\204\345\217\243\344"
-"\273\244\345\260\206\345\234\250 %d \345\244\251 %.2s \345\220\216\345\244"
-"\261\346\225\210\343\200\202"
+msgstr "警告：您的口令将在 %d 天 %.2s 后失效。"
 
 #: modules/pam_unix/pam_unix_auth.c:163
 #, fuzzy
 msgid "Password: "
-msgstr "\345\217\243\344\273\244\346\234\252\346\233\264\346\224\271"
+msgstr "口令未更改"
 
 #: modules/pam_unix/pam_unix_passwd.c:818
 msgid "NIS password could not be changed."
-msgstr ""
-"\346\227\240\346\263\225\346\233\264\346\224\271 NIS \345\217\243\344\273\244"
-"\343\200\202"
+msgstr "无法更改 NIS 口令。"
 
 #: modules/pam_unix/pam_unix_passwd.c:962
 #: modules/pam_cracklib/pam_cracklib.c:465
 msgid "No password supplied"
-msgstr "\345\217\243\344\273\244\346\234\252\346\217\220\344\276\233"
+msgstr "口令未提供"
 
 #: modules/pam_unix/pam_unix_passwd.c:962
 #: modules/pam_cracklib/pam_cracklib.c:465
 msgid "Password unchanged"
-msgstr "\345\217\243\344\273\244\346\234\252\346\233\264\346\224\271"
+msgstr "口令未更改"
 
 #: modules/pam_unix/pam_unix_passwd.c:983
 msgid "You must choose a longer password"
-msgstr ""
-"\345\277\205\351\241\273\351\200\211\346\213\251\346\233\264\351\225\277\347"
-"\232\204\345\217\243\344\273\244"
+msgstr "必须选择更长的口令"
 
 #: modules/pam_unix/pam_unix_passwd.c:988
 msgid "Password has been already used. Choose another."
-msgstr ""
-"\345\217\243\344\273\244\345\267\262\344\275\277\347\224\250\343\200\202\350"
-"\257\267\351\200\211\346\213\251\345\205\266\344\273\226\345\217\243\344\273"
-"\244\343\200\202"
+msgstr "口令已使用。请选择其他口令。"
 
 #: modules/pam_unix/pam_unix_passwd.c:1112
 msgid "(current) UNIX password: "
@@ -262,65 +155,48 @@ msgstr ""
 
 #: modules/pam_unix/pam_unix_passwd.c:1147
 msgid "You must wait longer to change your password"
-msgstr ""
-"\346\202\250\345\277\205\351\241\273\347\255\211\345\276\205\346\233\264\351"
-"\225\277\346\227\266\351\227\264\344\273\245\346\233\264\346\224\271\345\217"
-"\243\344\273\244"
+msgstr "您必须等待更长时间以更改口令"
 
 #: modules/pam_unix/pam_unix_passwd.c:1207
 #, fuzzy
 msgid "Enter new UNIX password: "
-msgstr ""
-"\350\276\223\345\205\245\346\226\260\347\232\204 STRESS \345\217\243\344\273"
-"\244\357\274\232"
+msgstr "输入新的 STRESS 口令："
 
 #: modules/pam_unix/pam_unix_passwd.c:1208
 #, fuzzy
 msgid "Retype new UNIX password: "
-msgstr ""
-"\351\207\215\346\226\260\350\276\223\345\205\245\346\226\260\347\232\204 "
-"STRESS \345\217\243\344\273\244\357\274\232"
+msgstr "重新输入新的 STRESS 口令："
 
-#: modules/pam_stress/pam_stress.c:481
+#: modules/pam_stress/pam_stress.c:474
 msgid "Changing STRESS password for "
-msgstr "\346\233\264\346\224\271 STRESS \345\217\243\344\273\244\344\273\245"
+msgstr "更改 STRESS 口令以"
 
-#: modules/pam_stress/pam_stress.c:495
+#: modules/pam_stress/pam_stress.c:488
 msgid "Enter new STRESS password: "
-msgstr ""
-"\350\276\223\345\205\245\346\226\260\347\232\204 STRESS \345\217\243\344\273"
-"\244\357\274\232"
+msgstr "输入新的 STRESS 口令："
 
-#: modules/pam_stress/pam_stress.c:498
+#: modules/pam_stress/pam_stress.c:491
 msgid "Retype new STRESS password: "
-msgstr ""
-"\351\207\215\346\226\260\350\276\223\345\205\245\346\226\260\347\232\204 "
-"STRESS \345\217\243\344\273\244\357\274\232"
+msgstr "重新输入新的 STRESS 口令："
 
-#: modules/pam_stress/pam_stress.c:526
+#: modules/pam_stress/pam_stress.c:519
 msgid "Verification mis-typed; password unchanged"
-msgstr ""
-"\346\240\241\351\252\214\347\261\273\345\236\213\351\224\231\350\257\257\357"
-"\274\233\345\217\243\344\273\244\346\234\252\346\233\264\346\224\271"
+msgstr "校验类型错误；口令未更改"
 
 #: modules/pam_cracklib/pam_cracklib.c:61
 #, fuzzy, c-format
 msgid "New %s%spassword: "
-msgstr "\345\217\243\344\273\244\346\234\252\346\233\264\346\224\271"
+msgstr "口令未更改"
 
 #: modules/pam_cracklib/pam_cracklib.c:63
 #, fuzzy, c-format
 msgid "Retype new %s%spassword: "
-msgstr ""
-"\351\207\215\346\226\260\350\276\223\345\205\245\346\226\260\347\232\204 "
-"STRESS \345\217\243\344\273\244\357\274\232"
+msgstr "重新输入新的 STRESS 口令："
 
 #: modules/pam_cracklib/pam_cracklib.c:64
 #, fuzzy
 msgid "Sorry, passwords do not match."
-msgstr ""
-"\346\227\240\346\263\225\346\233\264\346\224\271 NIS \345\217\243\344\273\244"
-"\343\200\202"
+msgstr "无法更改 NIS 口令。"
 
 #: modules/pam_cracklib/pam_cracklib.c:379
 msgid "is the same as the old one"
@@ -349,10 +225,7 @@ msgstr ""
 #: modules/pam_cracklib/pam_cracklib.c:437
 #, fuzzy
 msgid "has been already used"
-msgstr ""
-"\345\217\243\344\273\244\345\267\262\344\275\277\347\224\250\343\200\202\350"
-"\257\267\351\200\211\346\213\251\345\205\266\344\273\226\345\217\243\344\273"
-"\244\343\200\202"
+msgstr "口令已使用。请选择其他口令。"
 
 #: modules/pam_cracklib/pam_cracklib.c:489
 #: modules/pam_cracklib/pam_cracklib.c:617
@@ -366,207 +239,149 @@ msgstr ""
 
 #: libpam/pam_strerror.c:13
 msgid "Success"
-msgstr "\346\210\220\345\212\237"
+msgstr "成功"
 
 #: libpam/pam_strerror.c:15
 msgid "Critical error - immediate abort"
-msgstr ""
-"\344\270\245\351\207\215\351\224\231\350\257\257 - \347\253\213\345\215\263"
-"\344\270\255\346\255\242"
+msgstr "严重错误 - 立即中止"
 
 #: libpam/pam_strerror.c:17
 msgid "dlopen() failure"
-msgstr "dlopen() \346\225\205\351\232\234"
+msgstr "dlopen() 故障"
 
 #: libpam/pam_strerror.c:19
 msgid "Symbol not found"
-msgstr "\346\211\276\344\270\215\345\210\260\347\254\246\345\217\267"
+msgstr "找不到符号"
 
 #: libpam/pam_strerror.c:21
 msgid "Error in service module"
-msgstr ""
-"\346\234\215\345\212\241\346\250\241\345\235\227\345\255\230\345\234\250\351"
-"\224\231\350\257\257"
+msgstr "服务模块存在错误"
 
 #: libpam/pam_strerror.c:23
 msgid "System error"
-msgstr "\347\263\273\347\273\237\351\224\231\350\257\257"
+msgstr "系统错误"
 
 #: libpam/pam_strerror.c:25
 msgid "Memory buffer error"
-msgstr ""
-"\345\206\205\345\255\230\347\274\223\345\206\262\345\214\272\351\224\231\350"
-"\257\257"
+msgstr "内存缓冲区错误"
 
 #: libpam/pam_strerror.c:27
 msgid "Permission denied"
-msgstr "\346\213\222\347\273\235\346\235\203\351\231\220"
+msgstr "拒绝权限"
 
 #: libpam/pam_strerror.c:29
 msgid "Authentication failure"
-msgstr "\351\211\264\345\256\232\346\225\205\351\232\234"
+msgstr "鉴定故障"
 
 #: libpam/pam_strerror.c:31
 msgid "Insufficient credentials to access authentication data"
-msgstr ""
-"\346\262\241\346\234\211\350\266\263\345\244\237\347\232\204\350\272\253\344"
-"\273\275\345\207\255\350\257\201\344\273\245\350\256\277\351\227\256\351\211"
-"\264\345\256\232\346\225\260\346\215\256"
+msgstr "没有足够的身份凭证以访问鉴定数据"
 
 #: libpam/pam_strerror.c:33
 msgid "Authentication service cannot retrieve authentication info."
-msgstr ""
-"\351\211\264\345\256\232\346\234\215\345\212\241\346\227\240\346\263\225\346"
-"\243\200\347\264\242\345\210\260\351\211\264\345\256\232\344\277\241\346\201"
-"\257"
+msgstr "鉴定服务无法检索到鉴定信息"
 
 #: libpam/pam_strerror.c:35
 msgid "User not known to the underlying authentication module"
-msgstr ""
-"\345\272\225\345\261\202\347\232\204\351\211\264\345\256\232\346\250\241\345"
-"\235\227\346\227\240\346\263\225\350\257\206\345\210\253\347\224\250\346\210"
-"\267"
+msgstr "底层的鉴定模块无法识别用户"
 
 #: libpam/pam_strerror.c:37
 msgid "Have exhausted maximum number of retries for service."
-msgstr ""
-"\345\267\262\347\273\217\350\266\205\345\207\272\346\234\215\345\212\241\351"
-"\207\215\350\257\225\347\232\204\346\234\200\345\244\232\346\254\241\346\225"
-"\260\343\200\202"
+msgstr "已经超出服务重试的最多次数。"
 
 #: libpam/pam_strerror.c:39
 msgid "Authentication token is no longer valid; new one required."
-msgstr ""
-"\351\211\264\345\256\232\344\273\244\347\211\214\344\270\215\345\206\215\346"
-"\234\211\346\225\210\357\274\233\351\234\200\350\246\201\346\226\260\347\232"
-"\204\351\211\264\345\256\232\344\273\244\347\211\214\343\200\202"
+msgstr "鉴定令牌不再有效；需要新的鉴定令牌。"
 
 #: libpam/pam_strerror.c:41
 msgid "User account has expired"
-msgstr ""
-"\347\224\250\346\210\267\345\270\220\346\210\267\345\267\262\345\244\261\346"
-"\225\210"
+msgstr "用户帐户已失效"
 
 #: libpam/pam_strerror.c:43
 msgid "Cannot make/remove an entry for the specified session"
-msgstr ""
-"\346\227\240\346\263\225\344\270\272\346\214\207\345\256\232\347\232\204\344"
-"\274\232\350\257\235\345\210\233\345\273\272\357\274\217\345\216\273\351\231"
-"\244\351\241\271\343\200\202"
+msgstr "无法为指定的会话创建／去除项。"
 
 #: libpam/pam_strerror.c:45
 msgid "Authentication service cannot retrieve user credentials"
-msgstr ""
-"\351\211\264\345\256\232\346\234\215\345\212\241\346\227\240\346\263\225\346"
-"\243\200\347\264\242\345\210\260\347\224\250\346\210\267\350\272\253\344\273"
-"\275\345\207\255\350\257\201"
+msgstr "鉴定服务无法检索到用户身份凭证"
 
 #: libpam/pam_strerror.c:47
 msgid "User credentials expired"
-msgstr ""
-"\347\224\250\346\210\267\350\272\253\344\273\275\345\207\255\350\257\201\345"
-"\244\261\346\225\210"
+msgstr "用户身份凭证失效"
 
 #: libpam/pam_strerror.c:49
 msgid "Failure setting user credentials"
-msgstr ""
-"\350\256\276\347\275\256\347\224\250\346\210\267\350\272\253\344\273\275\345"
-"\207\255\350\257\201\346\227\266\345\207\272\347\216\260\346\225\205\351\232"
-"\234"
+msgstr "设置用户身份凭证时出现故障"
 
 #: libpam/pam_strerror.c:51
 msgid "No module specific data is present"
-msgstr ""
-"\344\270\215\345\255\230\345\234\250\347\211\271\345\256\232\344\272\216\346"
-"\250\241\345\235\227\347\232\204\346\225\260\346\215\256"
+msgstr "不存在特定于模块的数据"
 
 #: libpam/pam_strerror.c:53
 msgid "Bad item passed to pam_*_item()"
-msgstr ""
-"\344\274\240\351\200\222\350\207\263 pam_*_item() \347\232\204\351\241\271"
-"\347\233\256\346\227\240\346\225\210"
+msgstr "传递至 pam_*_item() 的项目无效"
 
 #: libpam/pam_strerror.c:55
 msgid "Conversation error"
-msgstr "\350\275\254\346\215\242\351\224\231\350\257\257"
+msgstr "转换错误"
 
 #: libpam/pam_strerror.c:57
 msgid "Authentication token manipulation error"
-msgstr ""
-"\351\211\264\345\256\232\344\273\244\347\211\214\346\223\215\344\275\234\351"
-"\224\231\350\257\257"
+msgstr "鉴定令牌操作错误"
 
 #: libpam/pam_strerror.c:59
 msgid "Authentication information cannot be recovered"
-msgstr ""
-"\346\227\240\346\263\225\346\201\242\345\244\215\351\211\264\345\256\232\344"
-"\277\241\346\201\257"
+msgstr "无法恢复鉴定信息"
 
 #: libpam/pam_strerror.c:61
 msgid "Authentication token lock busy"
-msgstr ""
-"\351\211\264\345\256\232\344\273\244\347\211\214\351\224\201\345\277\231\347"
-"\242\214"
+msgstr "鉴定令牌锁忙碌"
 
 #: libpam/pam_strerror.c:63
 msgid "Authentication token aging disabled"
-msgstr ""
-"\345\267\262\347\246\201\347\224\250\351\211\264\345\256\232\344\273\244\347"
-"\211\214\350\277\207\346\234\237\345\244\204\347\220\206"
+msgstr "已禁用鉴定令牌过期处理"
 
 #: libpam/pam_strerror.c:65
 msgid "Failed preliminary check by password service"
-msgstr ""
-"\345\217\243\344\273\244\346\234\215\345\212\241\345\210\235\346\255\245\346"
-"\243\200\346\237\245\345\244\261\350\264\245"
+msgstr "口令服务初步检查失败"
 
 #: libpam/pam_strerror.c:67
 msgid "The return value should be ignored by PAM dispatch"
-msgstr ""
-"\350\277\224\345\233\236\345\200\274\345\272\224\350\257\245\350\242\253 PAM "
-"dispatch \345\277\275\347\225\245"
+msgstr "返回值应该被 PAM dispatch 忽略"
 
 #: libpam/pam_strerror.c:69
 msgid "Module is unknown"
-msgstr "\346\250\241\345\235\227\346\234\252\347\237\245"
+msgstr "模块未知"
 
 #: libpam/pam_strerror.c:71
 msgid "Authentication token expired"
-msgstr ""
-"\351\211\264\345\256\232\344\273\244\347\211\214\345\244\261\346\225\210"
+msgstr "鉴定令牌失效"
 
 #: libpam/pam_strerror.c:73
 msgid "Conversation is waiting for event"
-msgstr ""
-"\350\275\254\346\215\242\346\255\243\345\234\250\347\255\211\345\276\205\344"
-"\272\213\344\273\266"
+msgstr "转换正在等待事件"
 
 #: libpam/pam_strerror.c:75
 msgid "Application needs to call libpam again"
-msgstr ""
-"\345\272\224\347\224\250\347\250\213\345\272\217\351\234\200\350\246\201\345"
-"\206\215\346\254\241\350\260\203\347\224\250 libpam"
+msgstr "应用程序需要再次调用 libpam"
 
 #: libpam/pam_strerror.c:78
 msgid "Unknown PAM error"
-msgstr "\346\234\252\347\237\245\347\232\204 PAM \351\224\231\350\257\257"
+msgstr "未知的 PAM 错误"
 
 #: libpam_misc/misc_conv.c:35
-msgid "..\007.Time is running out...\n"
-msgstr ""
-"..\007.\346\227\266\351\227\264\345\215\263\345\260\206\350\200\227\345\260"
-"\275...\n"
+msgid "...Time is running out...\n"
+msgstr "...时间即将耗尽...\n"
 
 #: libpam_misc/misc_conv.c:36
-msgid "..\007.Sorry, your time is up!\n"
-msgstr ""
-"..\007.\345\257\271\344\270\215\350\265\267\357\274\214\346\202\250\347\232"
-"\204\346\227\266\351\227\264\345\267\262\347\273\217\350\200\227\345\260\275"
-"\357\274\201\n"
+msgid "...Sorry, your time is up!\n"
+msgstr "...对不起，您的时间已经耗尽！\n"
 
 #: libpam_misc/misc_conv.c:334
 #, c-format
 msgid "erroneous conversation (%d)\n"
-msgstr ""
-"\346\234\211\351\224\231\350\257\257\347\232\204\350\275\254\346\215\242 (%"
-"d)\n"
+msgstr "有错误的转换 (%d)\n"
+
+#, fuzzy
+#~ msgid "%s: set %s security context to %s"
+#~ msgstr "不是有效的安全性环境"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ebf63e54..dcfe69a5 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-09-05 15:43+0200\n"
+"POT-Creation-Date: 2005-09-14 19:09+0200\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"
@@ -17,34 +17,29 @@ msgstr ""
 
 #: modules/pam_tally/pam_tally.c:730
 msgid "Authentication error"
-msgstr "\351\251\227\350\255\211\351\214\257\350\252\244"
+msgstr "驗證錯誤"
 
 #: modules/pam_tally/pam_tally.c:731
 msgid "Service error"
-msgstr "\346\234\215\345\213\231\351\214\257\350\252\244"
+msgstr "服務錯誤"
 
 #: modules/pam_tally/pam_tally.c:732
 msgid "Unknown user"
-msgstr ""
-"\346\234\252\347\237\245\347\232\204\344\275\277\347\224\250\350\200\205"
+msgstr "未知的使用者"
 
 #: modules/pam_tally/pam_tally.c:733
 msgid "Unknown error"
-msgstr "\346\234\252\347\237\245\347\232\204\351\214\257\350\252\244"
+msgstr "未知的錯誤"
 
 #: modules/pam_tally/pam_tally.c:747
 #, c-format
 msgid "%s: Bad number given to --reset=\n"
-msgstr ""
-"%s: \344\270\215\350\211\257\347\232\204\350\231\237\347\242\274\346\217\220"
-"\344\276\233\350\207\263 --reset=\n"
+msgstr "%s: 不良的號碼提供至 --reset=\n"
 
 #: modules/pam_tally/pam_tally.c:751
 #, c-format
 msgid "%s: Unrecognised option %s\n"
-msgstr ""
-"%s: \346\234\252\350\255\230\345\210\245\347\232\204\351\201\270\351\240\205 "
-"%s\n"
+msgstr "%s: 未識別的選項 %s\n"
 
 #: modules/pam_tally/pam_tally.c:763
 #, c-format
@@ -56,207 +51,104 @@ msgstr ""
 #: modules/pam_tally/pam_tally.c:836
 #, c-format
 msgid "%s: Can't reset all users to non-zero\n"
-msgstr ""
-"%s: \347\204\241\346\263\225\345\260\207\346\211\200\346\234\211\344\275\277"
-"\347\224\250\350\200\205\351\207\215\346\226\260\350\250\255\345\256\232\347"
-"\202\272\351\235\236\351\233\266\n"
+msgstr "%s: 無法將所有使用者重新設定為非零\n"
 
-#: modules/pam_selinux/pam_selinux.c:127
+#: modules/pam_selinux/pam_selinux_check.c:99
 #, c-format
-msgid "Your default context is %s. \n"
-msgstr ""
-"\346\202\250\347\232\204\351\240\220\350\250\255\347\266\262\350\267\257\344"
-"\275\215\347\275\256\347\202\272 %s\343\200\202\n"
-
-#: modules/pam_selinux/pam_selinux.c:130
-msgid "Do you want to choose a different one? [n]"
-msgstr ""
-"\346\202\250\350\246\201\351\201\270\346\223\207\344\270\215\345\220\214\347"
-"\232\204\347\266\262\350\267\257\344\275\215\347\275\256\345\227\216\357\274"
-"\237 [\345\220\246]"
+msgid "failed to initialize PAM\n"
+msgstr "起始 PAM 失敗\n"
 
-#: modules/pam_selinux/pam_selinux.c:137
-msgid "Enter number of choice: "
-msgstr ""
-"\350\274\270\345\205\245\351\201\270\346\223\207\347\232\204\345\257\206\347"
-"\242\274\357\274\232"
+#: modules/pam_selinux/pam_selinux_check.c:105
+#, c-format
+msgid "failed to pam_set_item()\n"
+msgstr "pam_set_item() 失敗\n"
 
-#: modules/pam_selinux/pam_selinux.c:164 modules/pam_selinux/pam_selinux.c:245
-#: modules/pam_selinux/pam_selinux.c:352
+#: modules/pam_selinux/pam_selinux_check.c:132
 #, c-format
-msgid "%s: bogus conversation function"
-msgstr ""
+msgid "login: failure forking: %s"
+msgstr "登入：失敗的分叉：%s"
 
-#: modules/pam_selinux/pam_selinux.c:168 modules/pam_selinux/pam_selinux.c:249
-#: modules/pam_selinux/pam_selinux.c:356
+#: modules/pam_selinux/pam_selinux.c:102
 #, c-format
-msgid "%s: no conversation function"
-msgstr ""
+msgid "Your default context is %s. \n"
+msgstr "您的預設網路位置為 %s。\n"
 
-#: modules/pam_selinux/pam_selinux.c:187
+#: modules/pam_selinux/pam_selinux.c:105
+msgid "Do you want to choose a different one? [n]"
+msgstr "您要選擇不同的網路位置嗎？ [否]"
+
+#: modules/pam_selinux/pam_selinux.c:112
+msgid "Enter number of choice: "
+msgstr "輸入選擇的密碼："
+
+#: modules/pam_selinux/pam_selinux.c:152
 msgid "Would you like to enter a security context? [y] "
-msgstr ""
-"\346\202\250\346\230\257\345\220\246\350\246\201\350\274\270\345\205\245\345"
-"\256\211\345\205\250\347\266\262\350\267\257\344\275\215\347\275\256\357\274"
-"\237 [\346\230\257]"
+msgstr "您是否要輸入安全網路位置？ [是]"
 
-#: modules/pam_selinux/pam_selinux.c:204
+#: modules/pam_selinux/pam_selinux.c:169
 msgid "role: "
-msgstr "\350\201\267\350\203\275\357\274\232"
+msgstr "職能："
 
-#: modules/pam_selinux/pam_selinux.c:212
+#: modules/pam_selinux/pam_selinux.c:177
 msgid "type: "
-msgstr "\351\241\236\345\236\213\357\274\232"
+msgstr "類型："
 
-#: modules/pam_selinux/pam_selinux.c:222
+#: modules/pam_selinux/pam_selinux.c:187
 msgid "level: "
-msgstr "\345\261\244\347\264\232\357\274\232"
+msgstr "層級："
 
-#: modules/pam_selinux/pam_selinux.c:236
+#: modules/pam_selinux/pam_selinux.c:203
 msgid "Not a valid security context"
-msgstr ""
-"\344\270\215\346\230\257\346\234\211\346\225\210\347\232\204\345\256\211\345"
-"\205\250\347\266\262\350\267\257\344\275\215\347\275\256"
-
-#: modules/pam_selinux/pam_selinux.c:272
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.\n"
-msgstr ""
+msgstr "不是有效的安全網路位置"
 
-#: modules/pam_selinux/pam_selinux.c:296
-#, c-format
-msgid "Warning!  Could not get current context for %s, not relabeling."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:303
-#, c-format
-msgid "Warning!  Could not get new context for %s, not relabeling."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:313
-#, c-format
-msgid "Warning!  Could not relabel %s with %s, not relabeling.%s"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:429
-#, c-format
-msgid "Unable to get valid context for %s"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:433
-#, c-format
-msgid "Unable to get valid context for %s, No valid tty"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:465
+#: modules/pam_selinux/pam_selinux.c:416
 #, c-format
 msgid "Security Context %s Assigned"
-msgstr ""
-"\345\267\262\346\214\207\345\256\232\345\256\211\345\205\250\347\266\262\350"
-"\267\257\344\275\215\347\275\256 %s"
-
-#: modules/pam_selinux/pam_selinux.c:469
-#, c-format
-msgid "Error!  Unable to set %s executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:475
-#, fuzzy, c-format
-msgid "%s: set %s security context to %s"
-msgstr ""
-"\344\270\215\346\230\257\346\234\211\346\225\210\347\232\204\345\256\211\345"
-"\205\250\347\266\262\350\267\257\344\275\215\347\275\256"
-
-#: modules/pam_selinux/pam_selinux.c:518
-#, c-format
-msgid "Error!  Unable to set executable context %s."
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:524
-#, c-format
-msgid "%s: setcontext back to orginal"
-msgstr ""
-
-#: modules/pam_selinux/pam_selinux.c:585
-#, c-format
-msgid "failed to initialize PAM\n"
-msgstr "\350\265\267\345\247\213 PAM \345\244\261\346\225\227\n"
-
-#: modules/pam_selinux/pam_selinux.c:591
-#, c-format
-msgid "failed to pam_set_item()\n"
-msgstr "pam_set_item() \345\244\261\346\225\227\n"
-
-#: modules/pam_selinux/pam_selinux.c:616
-#, c-format
-msgid "login: failure forking: %s"
-msgstr ""
-"\347\231\273\345\205\245\357\274\232\345\244\261\346\225\227\347\232\204\345"
-"\210\206\345\217\211\357\274\232%s"
+msgstr "已指定安全網路位置 %s"
 
 #: modules/pam_unix/pam_unix_acct.c:268 modules/pam_unix/pam_unix_acct.c:295
 msgid "Your account has expired; please contact your system administrator"
-msgstr ""
-"\346\202\250\347\232\204\345\270\263\346\210\266\345\267\262\347\266\223\351"
-"\200\276\346\234\237\357\274\214\350\253\213\346\264\275\350\251\242\346\202"
-"\250\347\232\204\347\263\273\347\265\261\347\256\241\347\220\206\345\223\241"
+msgstr "您的帳戶已經逾期，請洽詢您的系統管理員"
 
 #: modules/pam_unix/pam_unix_acct.c:277
 msgid "You are required to change your password immediately (root enforced)"
-msgstr ""
-"\346\202\250\345\277\205\351\240\210\347\253\213\345\210\273\350\256\212\346"
-"\233\264\346\202\250\347\232\204\345\257\206\347\242\274 (root \345\274\267"
-"\345\210\266\345\237\267\350\241\214)"
+msgstr "您必須立刻變更您的密碼 (root 強制執行)"
 
 #: modules/pam_unix/pam_unix_acct.c:304
 msgid "You are required to change your password immediately (password aged)"
-msgstr ""
-"\346\202\250\345\277\205\351\240\210\347\253\213\345\210\273\350\256\212\346"
-"\233\264\346\202\250\347\232\204\345\257\206\347\242\274 (\345\257\206\347"
-"\242\274\344\275\277\347\224\250\351\201\216\344\271\205)"
+msgstr "您必須立刻變更您的密碼 (密碼使用過久)"
 
 #: modules/pam_unix/pam_unix_acct.c:314
 #, c-format
 msgid "Warning: your password will expire in %d day%.2s"
-msgstr ""
-"\350\255\246\345\221\212\357\274\232\346\202\250\347\232\204\345\257\206\347"
-"\242\274\345\260\207\345\234\250 %d \345\244\251\344\271\213\345\276\214\351"
-"\200\276\346\234\237\343\200\202%2s"
+msgstr "警告：您的密碼將在 %d 天之後逾期。%2s"
 
 #: modules/pam_unix/pam_unix_auth.c:163
 #, fuzzy
 msgid "Password: "
-msgstr "\345\257\206\347\242\274\346\234\252\350\256\212\346\233\264"
+msgstr "密碼未變更"
 
 #: modules/pam_unix/pam_unix_passwd.c:818
 msgid "NIS password could not be changed."
-msgstr ""
-"\347\204\241\346\263\225\350\256\212\346\233\264 NIS \345\257\206\347\242\274"
-"\343\200\202"
+msgstr "無法變更 NIS 密碼。"
 
 #: modules/pam_unix/pam_unix_passwd.c:962
 #: modules/pam_cracklib/pam_cracklib.c:465
 msgid "No password supplied"
-msgstr "\346\234\252\346\217\220\344\276\233\345\257\206\347\242\274"
+msgstr "未提供密碼"
 
 #: modules/pam_unix/pam_unix_passwd.c:962
 #: modules/pam_cracklib/pam_cracklib.c:465
 msgid "Password unchanged"
-msgstr "\345\257\206\347\242\274\346\234\252\350\256\212\346\233\264"
+msgstr "密碼未變更"
 
 #: modules/pam_unix/pam_unix_passwd.c:983
 msgid "You must choose a longer password"
-msgstr ""
-"\346\202\250\345\277\205\351\240\210\351\201\270\346\223\207\346\233\264\351"
-"\225\267\347\232\204\345\257\206\347\242\274"
+msgstr "您必須選擇更長的密碼"
 
 #: modules/pam_unix/pam_unix_passwd.c:988
 msgid "Password has been already used. Choose another."
-msgstr ""
-"\345\257\206\347\242\274\345\267\262\347\266\223\347\224\261\345\205\266\344"
-"\273\226\344\275\277\347\224\250\350\200\205\344\275\277\347\224\250\343\200"
-"\202\350\253\213\351\201\270\346\223\207\345\205\266\344\273\226\345\257\206"
-"\347\242\274\343\200\202"
+msgstr "密碼已經由其他使用者使用。請選擇其他密碼。"
 
 #: modules/pam_unix/pam_unix_passwd.c:1112
 msgid "(current) UNIX password: "
@@ -264,67 +156,48 @@ msgstr ""
 
 #: modules/pam_unix/pam_unix_passwd.c:1147
 msgid "You must wait longer to change your password"
-msgstr ""
-"\346\202\250\345\277\205\351\240\210\344\271\205\345\200\231\357\274\214\344"
-"\273\245\350\256\212\346\233\264\346\202\250\347\232\204\345\257\206\347\242"
-"\274\343\200\202"
+msgstr "您必須久候，以變更您的密碼。"
 
 #: modules/pam_unix/pam_unix_passwd.c:1207
 #, fuzzy
 msgid "Enter new UNIX password: "
-msgstr ""
-"\350\274\270\345\205\245\346\226\260\347\232\204 STRESS \345\257\206\347\242"
-"\274\357\274\232"
+msgstr "輸入新的 STRESS 密碼："
 
 #: modules/pam_unix/pam_unix_passwd.c:1208
 #, fuzzy
 msgid "Retype new UNIX password: "
-msgstr ""
-"\345\206\215\346\254\241\350\274\270\345\205\245\346\226\260\347\232\204 "
-"STRESS \345\257\206\347\242\274\357\274\232"
+msgstr "再次輸入新的 STRESS 密碼："
 
-#: modules/pam_stress/pam_stress.c:481
+#: modules/pam_stress/pam_stress.c:474
 msgid "Changing STRESS password for "
-msgstr ""
-"\346\255\243\345\234\250\350\256\212\346\233\264 STRESS \345\257\206\347\242"
-"\274"
+msgstr "正在變更 STRESS 密碼"
 
-#: modules/pam_stress/pam_stress.c:495
+#: modules/pam_stress/pam_stress.c:488
 msgid "Enter new STRESS password: "
-msgstr ""
-"\350\274\270\345\205\245\346\226\260\347\232\204 STRESS \345\257\206\347\242"
-"\274\357\274\232"
+msgstr "輸入新的 STRESS 密碼："
 
-#: modules/pam_stress/pam_stress.c:498
+#: modules/pam_stress/pam_stress.c:491
 msgid "Retype new STRESS password: "
-msgstr ""
-"\345\206\215\346\254\241\350\274\270\345\205\245\346\226\260\347\232\204 "
-"STRESS \345\257\206\347\242\274\357\274\232"
+msgstr "再次輸入新的 STRESS 密碼："
 
-#: modules/pam_stress/pam_stress.c:526
+#: modules/pam_stress/pam_stress.c:519
 msgid "Verification mis-typed; password unchanged"
-msgstr ""
-"\347\242\272\350\252\215\351\214\257\350\252\244\350\274\270\345\205\245\357"
-"\274\233\345\257\206\347\242\274\346\234\252\350\256\212\346\233\264"
+msgstr "確認錯誤輸入；密碼未變更"
 
 #: modules/pam_cracklib/pam_cracklib.c:61
 #, fuzzy, c-format
 msgid "New %s%spassword: "
-msgstr "\345\257\206\347\242\274\346\234\252\350\256\212\346\233\264"
+msgstr "密碼未變更"
 
 #: modules/pam_cracklib/pam_cracklib.c:63
 #, fuzzy, c-format
 msgid "Retype new %s%spassword: "
-msgstr ""
-"\345\206\215\346\254\241\350\274\270\345\205\245\346\226\260\347\232\204 "
-"STRESS \345\257\206\347\242\274\357\274\232"
+msgstr "再次輸入新的 STRESS 密碼："
 
 #: modules/pam_cracklib/pam_cracklib.c:64
 #, fuzzy
 msgid "Sorry, passwords do not match."
-msgstr ""
-"\347\204\241\346\263\225\350\256\212\346\233\264 NIS \345\257\206\347\242\274"
-"\343\200\202"
+msgstr "無法變更 NIS 密碼。"
 
 #: modules/pam_cracklib/pam_cracklib.c:379
 msgid "is the same as the old one"
@@ -353,11 +226,7 @@ msgstr ""
 #: modules/pam_cracklib/pam_cracklib.c:437
 #, fuzzy
 msgid "has been already used"
-msgstr ""
-"\345\257\206\347\242\274\345\267\262\347\266\223\347\224\261\345\205\266\344"
-"\273\226\344\275\277\347\224\250\350\200\205\344\275\277\347\224\250\343\200"
-"\202\350\253\213\351\201\270\346\223\207\345\205\266\344\273\226\345\257\206"
-"\347\242\274\343\200\202"
+msgstr "密碼已經由其他使用者使用。請選擇其他密碼。"
 
 #: modules/pam_cracklib/pam_cracklib.c:489
 #: modules/pam_cracklib/pam_cracklib.c:617
@@ -371,205 +240,149 @@ msgstr ""
 
 #: libpam/pam_strerror.c:13
 msgid "Success"
-msgstr "\346\210\220\345\212\237"
+msgstr "成功"
 
 #: libpam/pam_strerror.c:15
 msgid "Critical error - immediate abort"
-msgstr ""
-"\345\232\264\351\207\215\351\214\257\350\252\244 - \347\253\213\345\215\263"
-"\344\270\255\346\255\242"
+msgstr "嚴重錯誤 - 立即中止"
 
 #: libpam/pam_strerror.c:17
 msgid "dlopen() failure"
-msgstr "dlopen() \345\244\261\346\225\227"
+msgstr "dlopen() 失敗"
 
 #: libpam/pam_strerror.c:19
 msgid "Symbol not found"
-msgstr "\346\211\276\344\270\215\345\210\260\347\254\246\350\231\237"
+msgstr "找不到符號"
 
 #: libpam/pam_strerror.c:21
 msgid "Error in service module"
-msgstr ""
-"\346\234\215\345\213\231\346\250\241\347\265\204\347\231\274\347\224\237\351"
-"\214\257\350\252\244"
+msgstr "服務模組發生錯誤"
 
 #: libpam/pam_strerror.c:23
 msgid "System error"
-msgstr "\347\263\273\347\265\261\351\214\257\350\252\244"
+msgstr "系統錯誤"
 
 #: libpam/pam_strerror.c:25
 msgid "Memory buffer error"
-msgstr ""
-"\350\250\230\346\206\266\351\253\224\346\232\253\345\255\230\345\215\200\351"
-"\214\257\350\252\244"
+msgstr "記憶體暫存區錯誤"
 
 #: libpam/pam_strerror.c:27
 msgid "Permission denied"
-msgstr ""
-"\350\250\261\345\217\257\346\254\212\350\242\253\346\213\222\347\265\225"
+msgstr "許可權被拒絕"
 
 #: libpam/pam_strerror.c:29
 msgid "Authentication failure"
-msgstr "\351\251\227\350\255\211\345\244\261\346\225\227"
+msgstr "驗證失敗"
 
 #: libpam/pam_strerror.c:31
 msgid "Insufficient credentials to access authentication data"
-msgstr ""
-"\346\206\221\350\255\211\344\270\215\350\266\263\357\274\214\347\204\241\346"
-"\263\225\345\255\230\345\217\226\351\251\227\350\255\211\350\263\207\346\226"
-"\231"
+msgstr "憑證不足，無法存取驗證資料"
 
 #: libpam/pam_strerror.c:33
 msgid "Authentication service cannot retrieve authentication info."
-msgstr ""
-"\351\251\227\350\255\211\346\234\215\345\213\231\347\204\241\346\263\225\345"
-"\217\226\345\207\272\351\251\227\350\255\211\350\263\207\350\250\212\343\200"
-"\202"
+msgstr "驗證服務無法取出驗證資訊。"
 
 #: libpam/pam_strerror.c:35
 msgid "User not known to the underlying authentication module"
-msgstr ""
-"\345\272\225\345\261\244\347\232\204\351\251\227\350\255\211\346\250\241\347"
-"\265\204\347\204\241\346\263\225\350\255\230\345\210\245\344\275\277\347\224"
-"\250\350\200\205"
+msgstr "底層的驗證模組無法識別使用者"
 
 #: libpam/pam_strerror.c:37
 msgid "Have exhausted maximum number of retries for service."
-msgstr ""
-"\346\234\215\345\213\231\347\232\204\351\207\215\350\251\246\346\254\241\346"
-"\225\270\345\267\262\350\266\205\351\201\216\346\234\200\345\244\247\346\225"
-"\270\351\207\217\343\200\202"
+msgstr "服務的重試次數已超過最大數量。"
 
 #: libpam/pam_strerror.c:39
 msgid "Authentication token is no longer valid; new one required."
-msgstr ""
-"\351\251\227\350\255\211\350\250\230\350\231\237\345\267\262\347\266\223\345"
-"\244\261\346\225\210\357\274\233\351\234\200\350\246\201\346\226\260\347\232"
-"\204\351\251\227\350\255\211\350\250\230\350\231\237\343\200\202"
+msgstr "驗證記號已經失效；需要新的驗證記號。"
 
 #: libpam/pam_strerror.c:41
 msgid "User account has expired"
-msgstr ""
-"\344\275\277\347\224\250\350\200\205\345\270\263\346\210\266\345\267\262\351"
-"\200\276\346\234\237"
+msgstr "使用者帳戶已逾期"
 
 #: libpam/pam_strerror.c:43
 msgid "Cannot make/remove an entry for the specified session"
-msgstr ""
-"\347\204\241\346\263\225\347\202\272\346\214\207\345\256\232\347\232\204\345"
-"\267\245\344\275\234\351\232\216\346\256\265\350\243\275\344\275\234/\347\247"
-"\273\351\231\244\351\240\205\347\233\256"
+msgstr "無法為指定的工作階段製作/移除項目"
 
 #: libpam/pam_strerror.c:45
 msgid "Authentication service cannot retrieve user credentials"
-msgstr ""
-"\351\251\227\350\255\211\346\234\215\345\213\231\347\204\241\346\263\225\345"
-"\217\226\345\207\272\344\275\277\347\224\250\350\200\205\346\206\221\350\255"
-"\211"
+msgstr "驗證服務無法取出使用者憑證"
 
 #: libpam/pam_strerror.c:47
 msgid "User credentials expired"
-msgstr ""
-"\344\275\277\347\224\250\350\200\205\346\206\221\350\255\211\345\267\262\351"
-"\200\276\346\234\237"
+msgstr "使用者憑證已逾期"
 
 #: libpam/pam_strerror.c:49
 msgid "Failure setting user credentials"
-msgstr ""
-"\347\204\241\346\263\225\350\250\255\345\256\232\344\275\277\347\224\250\350"
-"\200\205\346\206\221\350\255\211"
+msgstr "無法設定使用者憑證"
 
 #: libpam/pam_strerror.c:51
 msgid "No module specific data is present"
-msgstr ""
-"\346\262\222\346\234\211\346\250\241\347\265\204\347\232\204\350\251\263\347"
-"\264\260\350\263\207\346\226\231"
+msgstr "沒有模組的詳細資料"
 
 #: libpam/pam_strerror.c:53
 msgid "Bad item passed to pam_*_item()"
-msgstr ""
-"\344\270\215\350\211\257\347\232\204\351\240\205\347\233\256\345\202\263\351"
-"\200\201\350\207\263 pam_*_item()"
+msgstr "不良的項目傳送至 pam_*_item()"
 
 #: libpam/pam_strerror.c:55
 msgid "Conversation error"
-msgstr "\344\272\244\350\253\207\351\214\257\350\252\244"
+msgstr "交談錯誤"
 
 #: libpam/pam_strerror.c:57
 msgid "Authentication token manipulation error"
-msgstr ""
-"\351\251\227\350\255\211\350\250\230\350\231\237\350\231\225\347\220\206\351"
-"\214\257\350\252\244"
+msgstr "驗證記號處理錯誤"
 
 #: libpam/pam_strerror.c:59
 msgid "Authentication information cannot be recovered"
-msgstr ""
-"\347\204\241\346\263\225\346\201\242\345\276\251\351\251\227\350\255\211\350"
-"\263\207\350\250\212"
+msgstr "無法恢復驗證資訊"
 
 #: libpam/pam_strerror.c:61
 msgid "Authentication token lock busy"
-msgstr ""
-"\351\251\227\350\255\211\350\250\230\350\231\237\351\216\226\345\256\232\345"
-"\277\231\347\242\214"
+msgstr "驗證記號鎖定忙碌"
 
 #: libpam/pam_strerror.c:63
 msgid "Authentication token aging disabled"
-msgstr ""
-"\351\251\227\350\255\211\350\250\230\350\231\237\350\250\210\346\231\202\345"
-"\267\262\345\201\234\347\224\250"
+msgstr "驗證記號計時已停用"
 
 #: libpam/pam_strerror.c:65
 msgid "Failed preliminary check by password service"
-msgstr ""
-"\345\257\206\347\242\274\346\234\215\345\213\231\347\232\204\345\210\235\346"
-"\255\245\346\252\242\346\237\245\345\244\261\346\225\227"
+msgstr "密碼服務的初步檢查失敗"
 
 #: libpam/pam_strerror.c:67
 msgid "The return value should be ignored by PAM dispatch"
-msgstr ""
-"PAM \347\231\274\351\200\201\346\207\211\345\277\275\347\225\245\345\202\263"
-"\345\233\236\345\200\274"
+msgstr "PAM 發送應忽略傳回值"
 
 #: libpam/pam_strerror.c:69
 msgid "Module is unknown"
-msgstr "\346\234\252\347\237\245\347\232\204\346\250\241\347\265\204"
+msgstr "未知的模組"
 
 #: libpam/pam_strerror.c:71
 msgid "Authentication token expired"
-msgstr ""
-"\351\251\227\350\255\211\350\250\230\350\231\237\345\267\262\351\200\276\346"
-"\234\237"
+msgstr "驗證記號已逾期"
 
 #: libpam/pam_strerror.c:73
 msgid "Conversation is waiting for event"
-msgstr ""
-"\344\272\244\350\253\207\346\255\243\345\234\250\347\255\211\345\200\231\344"
-"\272\213\344\273\266"
+msgstr "交談正在等候事件"
 
 #: libpam/pam_strerror.c:75
 msgid "Application needs to call libpam again"
-msgstr ""
-"\346\207\211\347\224\250\347\250\213\345\274\217\351\234\200\350\246\201\345"
-"\206\215\346\254\241\345\221\274\345\217\253 libpam"
+msgstr "應用程式需要再次呼叫 libpam"
 
 #: libpam/pam_strerror.c:78
 msgid "Unknown PAM error"
-msgstr "\346\234\252\347\237\245\347\232\204 PAM \351\214\257\350\252\244"
+msgstr "未知的 PAM 錯誤"
 
 #: libpam_misc/misc_conv.c:35
-msgid "..\007.Time is running out...\n"
-msgstr ""
-"..\007.\346\231\202\351\226\223\345\267\262\347\266\223\350\266\205\351\201"
-"\216...\n"
+msgid "...Time is running out...\n"
+msgstr "...時間已經超過...\n"
 
 #: libpam_misc/misc_conv.c:36
-msgid "..\007.Sorry, your time is up!\n"
-msgstr ""
-"..\007.\346\212\261\346\255\211\357\274\214\346\202\250\347\232\204\346\231"
-"\202\351\226\223\345\267\262\345\210\260\357\274\201\n"
+msgid "...Sorry, your time is up!\n"
+msgstr "...抱歉，您的時間已到！\n"
 
 #: libpam_misc/misc_conv.c:334
 #, c-format
 msgid "erroneous conversation (%d)\n"
-msgstr "\351\214\257\350\252\244\347\232\204\344\272\244\350\253\207 (%d)\n"
+msgstr "錯誤的交談 (%d)\n"
+
+#, fuzzy
+#~ msgid "%s: set %s security context to %s"
+#~ msgstr "不是有效的安全網路位置"
author	Thorsten Kukuk <kukuk@thkukuk.de>	2005-09-14 17:49:01 +0000
committer	Thorsten Kukuk <kukuk@thkukuk.de>	2005-09-14 17:49:01 +0000
commit	f690636933b7d212240b2ce09dddaea703f391c9 (patch)
tree	c3847f63fc17533d346e3e7a9de88b242c69dad3
parent	faf4e0e73632c500cc1380c882310d6965ebfaf8 (diff)
download	pam-f690636933b7d212240b2ce09dddaea703f391c9.tar.gz pam-f690636933b7d212240b2ce09dddaea703f391c9.tar.bz2 pam-f690636933b7d212240b2ce09dddaea703f391c9.zip