[svn-upgrade] Integrating new upstream version, shadow (20000826)

2007-10-07 11:44:26 +00:00
parent 5cd76a407a
commit be1f391d2a
41 changed files with 720 additions and 910 deletions
--- a/po/cat-id-tbl.c
+++ b/po/cat-id-tbl.c
@@ -468,37 +468,36 @@ Type control-d to proceed with normal startup,\n\
  {"%s: error removing directory %s\n", 435},
  {"\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n", 436},
  {"[-A {DEFAULT|program},... ] ", 437},
-  {"[-p passwd] [-L|-U] name\n", 438},
-  {"%s: out of memory in update_group\n", 439},
-  {"%s: out of memory in update_gshadow\n", 440},
-  {"%s: no flags given\n", 441},
-  {"%s: shadow passwords required for -e and -f\n", 442},
-  {"%s: uid %ld is not unique\n", 443},
-  {"%s: error deleting authentication method\n", 444},
-  {"%s: error changing authentication method\n", 445},
-  {"%s: error changing password entry\n", 446},
-  {"%s: error removing password entry\n", 447},
-  {"%s: error adding password dbm entry\n", 448},
-  {"%s: error removing passwd dbm entry\n", 449},
-  {"%s: error removing shadow password entry\n", 450},
-  {"%s: error removing shadow passwd dbm entry\n", 451},
-  {"%s: directory %s exists\n", 452},
-  {"%s: can't create %s\n", 453},
-  {"%s: can't chown %s\n", 454},
-  {"%s: cannot rename directory %s to %s\n", 455},
-  {"%s: warning: %s not owned by %s\n", 456},
-  {"failed to change mailbox owner", 457},
-  {"failed to rename mailbox", 458},
+  {"%s: out of memory in update_group\n", 438},
+  {"%s: out of memory in update_gshadow\n", 439},
+  {"%s: no flags given\n", 440},
+  {"%s: shadow passwords required for -e and -f\n", 441},
+  {"%s: uid %ld is not unique\n", 442},
+  {"%s: error deleting authentication method\n", 443},
+  {"%s: error changing authentication method\n", 444},
+  {"%s: error changing password entry\n", 445},
+  {"%s: error removing password entry\n", 446},
+  {"%s: error adding password dbm entry\n", 447},
+  {"%s: error removing passwd dbm entry\n", 448},
+  {"%s: error removing shadow password entry\n", 449},
+  {"%s: error removing shadow passwd dbm entry\n", 450},
+  {"%s: directory %s exists\n", 451},
+  {"%s: can't create %s\n", 452},
+  {"%s: can't chown %s\n", 453},
+  {"%s: cannot rename directory %s to %s\n", 454},
+  {"%s: warning: %s not owned by %s\n", 455},
+  {"failed to change mailbox owner", 456},
+  {"failed to rename mailbox", 457},
  {"\
 \n\
-%s: %s is unchanged\n", 459},
-  {"Couldn't lock file", 460},
-  {"Couldn't make backup", 461},
-  {"%s: can't restore %s: %s (your changes are in %s)\n", 462},
+%s: %s is unchanged\n", 458},
+  {"Couldn't lock file", 459},
+  {"Couldn't make backup", 460},
+  {"%s: can't restore %s: %s (your changes are in %s)\n", 461},
  {"\
 Usage:\n\
 `vipw' edits /etc/passwd        `vipw -s' edits /etc/shadow\n\
-`vigr' edits /etc/group         `vigr -s' edits /etc/gshadow\n", 463},
+`vigr' edits /etc/group         `vigr -s' edits /etc/gshadow\n", 462},
 };

-int _msg_tbl_length = 463;
+int _msg_tbl_length = 462;
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Shadow 980726\n"
-"POT-Creation-Date: 2000-09-02 20:40+0200\n"
+"POT-Creation-Date: 2000-08-26 20:28+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Nikos Mavroyanopoulos <nmav@i-net.paiko.gr>\n"
 "Language-Team: Hellenic <el@li.org>\n"
@@ -227,7 +227,7 @@ msgstr ""
 msgid "Unknown error %d"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %d"

-#: src/chage.c:156
+#: src/chage.c:141
 #, c-format
 msgid ""
 "Usage: %s [ -l ] [ -m min_days ] [ -M max_days ] [ -W warn ]\n"
@@ -236,14 +236,14 @@ msgstr ""
 "<22><><EFBFBD><EFBFBD><EFBFBD>: %s [ -l ] [ -m <20><><EFBFBD><EFBFBD>_<EFBFBD><5F><EFBFBD><EFBFBD><EFBFBD> ] [ -M <20><><EFBFBD>_<EFBFBD><5F><EFBFBD><EFBFBD><EFBFBD> ] [ -W <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. ]\n"
 "\t[ -I <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ] [ -E <20><><EFBFBD><EFBFBD> ] [ -d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>_<EFBFBD><5F><EFBFBD><EFBFBD> ] <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/chage.c:158
+#: src/chage.c:143
 #, c-format
 msgid "Usage: %s [ -l ] [ -m min_days ] [ -M max_days ] [ -d last_day ] user\n"
 msgstr ""
 "<22><><EFBFBD><EFBFBD><EFBFBD>: %s [ -l ] [ -m <20><><EFBFBD><EFBFBD>_<EFBFBD><5F><EFBFBD><EFBFBD><EFBFBD> ] [ -M <20><><EFBFBD>_<EFBFBD><5F><EFBFBD><EFBFBD><EFBFBD> ]\n"
 "[ -d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>_<EFBFBD><5F><EFBFBD><EFBFBD> ] <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/chage.c:193
+#: src/chage.c:178
 msgid ""
 "Enter the new value, or press return for the default\n"
 "\n"
@@ -251,27 +251,27 @@ msgstr ""
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD>, <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> `return' <20><><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
 "\n"

-#: src/chage.c:196
+#: src/chage.c:181
 msgid "Minimum Password Age"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

-#: src/chage.c:201
+#: src/chage.c:186
 msgid "Maximum Password Age"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

-#: src/chage.c:207
+#: src/chage.c:192
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD>-<2D><>-<2D><>)"

-#: src/chage.c:216
+#: src/chage.c:201
 msgid "Password Expiration Warning"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

-#: src/chage.c:221
+#: src/chage.c:206
 msgid "Password Inactive"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

-#: src/chage.c:227
+#: src/chage.c:212
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD>-<2D><>-<2D><>)"

@@ -283,22 +283,22 @@ msgstr "
 #. * days after the password expires that the account becomes
 #. * unusable.
 #.
-#: src/chage.c:281
+#: src/chage.c:266
 #, c-format
 msgid "Minimum:\t%ld\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:\t%ld\n"

-#: src/chage.c:282
+#: src/chage.c:267
 #, c-format
 msgid "Maximum:\t%ld\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:\t%ld\n"

-#: src/chage.c:284
+#: src/chage.c:269
 #, c-format
 msgid "Warning:\t%ld\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:\t%ld\n"

-#: src/chage.c:285
+#: src/chage.c:270
 #, c-format
 msgid "Inactive:\t%ld\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:\t%ld\n"
@@ -308,11 +308,11 @@ msgstr "
 #. * password was last modified.  The date is the number of
 #. * days since 1/1/1970.
 #.
-#: src/chage.c:294
+#: src/chage.c:279
 msgid "Last Change:\t\t"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:\t\t"

-#: src/chage.c:296 src/chage.c:310 src/chage.c:327 src/chage.c:340
+#: src/chage.c:281 src/chage.c:295 src/chage.c:312 src/chage.c:325
 msgid "Never\n"
 msgstr "<22><><EFBFBD><EFBFBD>\n"

@@ -321,7 +321,7 @@ msgstr "
 #. * change date plus the number of days the password is valid
 #. * for.
 #.
-#: src/chage.c:308
+#: src/chage.c:293
 msgid "Password Expires:\t"
 msgstr "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>:\t"

@@ -331,7 +331,7 @@ msgstr "
 #. * and the number of inactive days is added.  The resulting date
 #. * is when the active will be disabled.
 #.
-#: src/chage.c:324
+#: src/chage.c:309
 #, fuzzy
 msgid "Password Inactive:\t"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -340,83 +340,83 @@ msgstr "
 #. * The account will expire on the given date regardless of the
 #. * password expiring or not.
 #.
-#: src/chage.c:338
+#: src/chage.c:323
 #, fuzzy
 msgid "Account Expires:\t"
 msgstr "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>:\t"

-#: src/chage.c:486
+#: src/chage.c:471
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s: <20><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> \"l\" <20><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/chage.c:498 src/chage.c:610 src/login.c:529
+#: src/chage.c:483 src/chage.c:595 src/login.c:529
 #, c-format
 msgid "%s: permission denied\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/chage.c:510 src/chpasswd.c:120
+#: src/chage.c:495 src/chpasswd.c:120
 #, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/chage.c:516 src/chpasswd.c:124
+#: src/chage.c:501 src/chpasswd.c:124
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/chage.c:523
+#: src/chage.c:508
 #, c-format
 msgid "%s: unknown user: %s\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %s\n"

-#: src/chage.c:542
+#: src/chage.c:527
 #, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/chage.c:549
+#: src/chage.c:534
 #, c-format
 msgid "%s: can't open shadow password file\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/chage.c:631
+#: src/chage.c:616
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD> %s\n"

-#: src/chage.c:633
+#: src/chage.c:618
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/chage.c:660 src/chage.c:723 src/pwunconv.c:183
+#: src/chage.c:645 src/chage.c:708 src/pwunconv.c:183
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/chage.c:690 src/pwunconv.c:178
+#: src/chage.c:675 src/pwunconv.c:178
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/chage.c:739 src/chage.c:754 src/chfn.c:570 src/chsh.c:409
+#: src/chage.c:724 src/chage.c:739 src/chfn.c:571 src/chsh.c:410
 #: src/passwd.c:825 src/passwd.c:926
 msgid "Error updating the DBM password entry.\n"
 msgstr ""
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> dbm <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"

-#: src/chage.c:771
+#: src/chage.c:756
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/chage.c:785
+#: src/chage.c:770
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/chage.c:836
+#: src/chage.c:821
 #, c-format
 msgid "%s: no aging information present\n"
 msgstr "%s: <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
@@ -482,94 +482,94 @@ msgstr "\t
 msgid "Other"
 msgstr "<22><><EFBFBD><EFBFBD>"

-#: src/chfn.c:298 src/chfn.c:306 src/chfn.c:314 src/chfn.c:322 src/chfn.c:330
-#: src/chfn.c:391 src/passwd.c:1226
+#: src/chfn.c:299 src/chfn.c:307 src/chfn.c:315 src/chfn.c:323 src/chfn.c:331
+#: src/chfn.c:392 src/passwd.c:1226
 #, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"

-#: src/chfn.c:351 src/chsh.c:224 src/passwd.c:1277
+#: src/chfn.c:352 src/chsh.c:225 src/passwd.c:1277
 #, c-format
 msgid "%s: Unknown user %s\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s\n"

-#: src/chfn.c:357 src/chsh.c:232 src/passwd.c:1207
+#: src/chfn.c:358 src/chsh.c:233 src/passwd.c:1207
 #, c-format
 msgid "%s: Cannot determine your user name.\n"
 msgstr "%s: <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>.\n"

-#: src/chfn.c:373 src/chsh.c:250
+#: src/chfn.c:374 src/chsh.c:251
 #, c-format
 msgid "%s: cannot change user `%s' on NIS client.\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> `%s' <20><><EFBFBD><EFBFBD> NIS <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"

-#: src/chfn.c:378 src/chsh.c:257
+#: src/chfn.c:379 src/chsh.c:258
 #, c-format
 msgid "%s: `%s' is the NIS master for this client.\n"
 msgstr "%s: `%s' <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> NIS <20><>'<27><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"

-#: src/chfn.c:453
+#: src/chfn.c:454
 #, c-format
 msgid "Changing the user information for %s\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD> %s\n"

-#: src/chfn.c:462
+#: src/chfn.c:463
 #, c-format
 msgid "%s: invalid name: \"%s\"\n"
 msgstr "%s: <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>: `%s'\n"

-#: src/chfn.c:467
+#: src/chfn.c:468
 #, c-format
 msgid "%s: invalid room number: \"%s\"\n"
 msgstr "%s: <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: `%s'\n"

-#: src/chfn.c:472
+#: src/chfn.c:473
 #, c-format
 msgid "%s: invalid work phone: \"%s\"\n"
 msgstr "%s: <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: `%s'\n"

-#: src/chfn.c:477
+#: src/chfn.c:478
 #, c-format
 msgid "%s: invalid home phone: \"%s\"\n"
 msgstr "%s: <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: `%s'\n"

-#: src/chfn.c:482
+#: src/chfn.c:483
 #, c-format
 msgid "%s: \"%s\" contains illegal characters\n"
 msgstr "%s: \"%s\" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/chfn.c:494
+#: src/chfn.c:495
 #, c-format
 msgid "%s: fields too long\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/chfn.c:509 src/chsh.c:347 src/gpasswd.c:582 src/passwd.c:1388
+#: src/chfn.c:510 src/chsh.c:348 src/gpasswd.c:582 src/passwd.c:1388
 msgid "Cannot change ID to root.\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> root.\n"

-#: src/chfn.c:522 src/chsh.c:361 src/passwd.c:735 src/passwd.c:880
+#: src/chfn.c:523 src/chsh.c:362 src/passwd.c:735 src/passwd.c:880
 msgid "Cannot lock the password file; try again later.\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"

-#: src/chfn.c:528 src/chsh.c:367 src/passwd.c:740 src/passwd.c:885
+#: src/chfn.c:529 src/chsh.c:368 src/passwd.c:740 src/passwd.c:885
 msgid "Cannot open the password file.\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"

-#: src/chfn.c:545 src/chsh.c:382 src/passwd.c:746 src/usermod.c:1313
+#: src/chfn.c:546 src/chsh.c:383 src/passwd.c:746 src/usermod.c:1271
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: <20> %s <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> /etc/passwd\n"

-#: src/chfn.c:562 src/chsh.c:401 src/passwd.c:819 src/passwd.c:920
+#: src/chfn.c:563 src/chsh.c:402 src/passwd.c:819 src/passwd.c:920
 #: src/passwd.c:960
 msgid "Error updating the password entry.\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"

-#: src/chfn.c:585 src/chsh.c:424 src/passwd.c:832 src/passwd.c:933
+#: src/chfn.c:586 src/chsh.c:425 src/passwd.c:832 src/passwd.c:933
 msgid "Cannot commit password file changes.\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"

-#: src/chfn.c:592 src/chsh.c:431
+#: src/chfn.c:593 src/chsh.c:432
 msgid "Cannot unlock the password file.\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

@@ -634,22 +634,22 @@ msgstr "
 msgid "Login Shell"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

-#: src/chsh.c:273 src/chsh.c:286
+#: src/chsh.c:274 src/chsh.c:287
 #, c-format
 msgid "You may not change the shell for %s.\n"
 msgstr "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><>(<28>) %s.\n"

-#: src/chsh.c:315
+#: src/chsh.c:316
 #, c-format
 msgid "Changing the login shell for %s\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD> %s\n"

-#: src/chsh.c:327
+#: src/chsh.c:328
 #, c-format
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %s\n"

-#: src/chsh.c:332
+#: src/chsh.c:333
 #, c-format
 msgid "%s is an invalid shell.\n"
 msgstr "%s <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"
@@ -885,13 +885,13 @@ msgid "usage: groupadd [-g gid [-o]] group\n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>: groupadd [-g gid [-o]] <20><><EFBFBD><EFBFBD><EFBFBD>\n"

 #: src/groupadd.c:173 src/groupadd.c:196 src/groupmod.c:183 src/groupmod.c:230
-#: src/useradd.c:931 src/usermod.c:539 src/usermod.c:675
+#: src/useradd.c:931 src/usermod.c:512 src/usermod.c:648
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

 #: src/groupadd.c:183 src/groupadd.c:206 src/groupmod.c:199 src/useradd.c:942
-#: src/usermod.c:551 src/usermod.c:687
+#: src/usermod.c:524 src/usermod.c:660
 #, c-format
 msgid "%s: cannot add new dbm group entry\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> dbm <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
@@ -930,13 +930,13 @@ msgid "%s: -O requires NAME=VALUE\n"
 msgstr "%s: -O <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>=<3D><><EFBFBD><EFBFBD>\n"

 #: src/groupadd.c:412 src/groupdel.c:167 src/groupmod.c:403 src/useradd.c:1381
-#: src/userdel.c:303 src/usermod.c:563
+#: src/userdel.c:303 src/usermod.c:536
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

 #: src/groupadd.c:418 src/groupdel.c:173 src/groupmod.c:409 src/useradd.c:1389
-#: src/userdel.c:309 src/usermod.c:700
+#: src/userdel.c:309 src/usermod.c:673
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
@@ -1011,7 +1011,7 @@ msgstr "%s:
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s: <20> <20><><EFBFBD><EFBFBD><EFBFBD> %s <20><><EFBFBD><EFBFBD><EFBFBD> NIS <20><><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/groupdel.c:325 src/groupmod.c:523 src/userdel.c:761 src/usermod.c:1016
+#: src/groupdel.c:325 src/groupmod.c:523 src/userdel.c:761 src/usermod.c:989
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: <20> %s <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> NIS\n"
@@ -1915,7 +1915,7 @@ msgstr "%s:
 msgid "%s: rebuild the shadow group database\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/useradd.c:287 src/usermod.c:967
+#: src/useradd.c:287 src/usermod.c:940
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s: <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> `%s'\n"
@@ -1925,8 +1925,8 @@ msgstr "%s:
 msgid "%s: unknown gid %s\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> gid %s\n"

-#: src/useradd.c:350 src/useradd.c:642 src/useradd.c:1228 src/usermod.c:254
-#: src/usermod.c:1098
+#: src/useradd.c:350 src/useradd.c:642 src/useradd.c:1228 src/usermod.c:252
+#: src/usermod.c:1071
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> %s\n"
@@ -1986,17 +1986,17 @@ msgstr "%s:
 msgid "%s: rename: %s"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %s"

-#: src/useradd.c:662 src/usermod.c:274
+#: src/useradd.c:662 src/usermod.c:272
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s: <20> <20><><EFBFBD><EFBFBD><EFBFBD> `%s' <20><><EFBFBD><EFBFBD><EFBFBD> NIS <20><><EFBFBD><EFBFBD><EFBFBD>.\n"

-#: src/useradd.c:670 src/usermod.c:282
+#: src/useradd.c:670 src/usermod.c:280
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>. %d).\n"

-#: src/useradd.c:702 src/usermod.c:314
+#: src/useradd.c:702 src/usermod.c:312
 #, c-format
 msgid "usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>: %s\t[-u uid [-o]] [-g <20><><EFBFBD><EFBFBD><EFBFBD>] [-G <20><><EFBFBD><EFBFBD><EFBFBD>,...] \n"
@@ -2007,7 +2007,7 @@ msgstr ""
 "\t\t[-d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>_<EFBFBD><5F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>] [-s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>] [-c <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]\n"
 "\t\t[-m [-k <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]]\n"

-#: src/useradd.c:708 src/usermod.c:320
+#: src/useradd.c:708 src/usermod.c:318
 msgid "[-f inactive] [-e expire ] "
 msgstr "[-f <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>] [-e <20><><EFBFBD><EFBFBD> ] "

@@ -2015,7 +2015,7 @@ msgstr "[-f
 msgid "[-A program] "
 msgstr "[-A <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>] "

-#: src/useradd.c:713
+#: src/useradd.c:713 src/usermod.c:323
 msgid "[-p passwd] name\n"
 msgstr "[-p <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>] <20><><EFBFBD><EFBFBD><EFBFBD>\n"

@@ -2028,22 +2028,22 @@ msgstr "       %s\t-D [-g
 msgid "\t\t[-f inactive] [-e expire ]\n"
 msgstr "\t\t[-f <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>] [-e <20><><EFBFBD><EFBFBD> ]\n"

-#: src/useradd.c:815 src/usermod.c:472
+#: src/useradd.c:815 src/usermod.c:445
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/useradd.c:819 src/usermod.c:477
+#: src/useradd.c:819 src/usermod.c:450
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/useradd.c:824 src/usermod.c:584
+#: src/useradd.c:824 src/usermod.c:557
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/useradd.c:829 src/usermod.c:590
+#: src/useradd.c:829 src/usermod.c:563
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
@@ -2058,8 +2058,8 @@ msgstr "%s:
 msgid "%s: can't get unique uid\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> uid\n"

-#: src/useradd.c:1139 src/useradd.c:1283 src/usermod.c:1046 src/usermod.c:1057
-#: src/usermod.c:1067 src/usermod.c:1113 src/usermod.c:1157
+#: src/useradd.c:1139 src/useradd.c:1283 src/usermod.c:1019 src/usermod.c:1030
+#: src/usermod.c:1040 src/usermod.c:1086 src/usermod.c:1121
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s: <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> `%s'\n"
@@ -2079,7 +2079,7 @@ msgstr "%s:
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s: <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> `%s'\n"

-#: src/useradd.c:1191 src/usermod.c:1080
+#: src/useradd.c:1191 src/usermod.c:1053
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s: <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> `%s'\n"
@@ -2104,37 +2104,37 @@ msgstr "%s:
 msgid "%s: invalid user name `%s'\n"
 msgstr "%s: <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> `%s'\n"

-#: src/useradd.c:1369 src/userdel.c:292 src/usermod.c:1225
+#: src/useradd.c:1369 src/userdel.c:292 src/usermod.c:1183
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/useradd.c:1374 src/userdel.c:295 src/usermod.c:1230
+#: src/useradd.c:1374 src/userdel.c:295 src/usermod.c:1188
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/useradd.c:1414 src/userdel.c:359 src/usermod.c:1265
+#: src/useradd.c:1414 src/userdel.c:359 src/usermod.c:1223
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/useradd.c:1418 src/userdel.c:363 src/usermod.c:1269
+#: src/useradd.c:1418 src/userdel.c:363 src/usermod.c:1227
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/useradd.c:1424 src/userdel.c:368 src/usermod.c:1274
+#: src/useradd.c:1424 src/userdel.c:368 src/usermod.c:1232
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/useradd.c:1430 src/userdel.c:373 src/usermod.c:1279
+#: src/useradd.c:1430 src/userdel.c:373 src/usermod.c:1237
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/useradd.c:1529 src/usermod.c:1366
+#: src/useradd.c:1529 src/usermod.c:1324
 #, c-format
 msgid "%s: error adding authentication method\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
@@ -2151,14 +2151,14 @@ msgid "%s: error updating password dbm entry\n"
 msgstr ""
 "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> dbm <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/useradd.c:1583 src/usermod.c:1425
+#: src/useradd.c:1583 src/usermod.c:1383
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr ""
 "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> "
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/useradd.c:1599 src/usermod.c:1440
+#: src/useradd.c:1599 src/usermod.c:1398
 #, c-format
 msgid "%s: error updating shadow passwd dbm entry\n"
 msgstr ""
@@ -2170,7 +2170,7 @@ msgstr ""
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s\n"

-#: src/useradd.c:1708 src/usermod.c:1203
+#: src/useradd.c:1708 src/usermod.c:1161
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s: <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
@@ -2273,12 +2273,12 @@ msgstr "%s:
 msgid "%s: warning: can't remove "
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> "

-#: src/userdel.c:741 src/usermod.c:994
+#: src/userdel.c:741 src/usermod.c:967
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s: <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/userdel.c:755 src/usermod.c:1010
+#: src/userdel.c:755 src/usermod.c:983
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s <20><><EFBFBD><EFBFBD><EFBFBD> NIS <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
@@ -2300,122 +2300,117 @@ msgstr ""
 msgid "%s: error removing directory %s\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s\n"

-#: src/usermod.c:317
+#: src/usermod.c:315
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr ""
 "\t\t[-d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>_<EFBFBD><5F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> [-m]] [-s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>] [-c <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]\n"
 "\t\t[-l <20><><EFBFBD>_<EFBFBD><5F><EFBFBD><EFBFBD><EFBFBD>]\n"

-#: src/usermod.c:323
+#: src/usermod.c:321
 msgid "[-A {DEFAULT|program},... ] "
 msgstr "[-A {DEFAULT|<7C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>},... ] "

-#: src/usermod.c:325
-#, fuzzy
-msgid "[-p passwd] [-L|-U] name\n"
-msgstr "[-p <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>] <20><><EFBFBD><EFBFBD><EFBFBD>\n"
-
-#: src/usermod.c:504
+#: src/usermod.c:477
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s: <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> update_group\n"

-#: src/usermod.c:627
+#: src/usermod.c:600
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s:  <20><><EFBFBD> update_gshadow\n"

-#: src/usermod.c:1180
+#: src/usermod.c:1138
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/usermod.c:1187
+#: src/usermod.c:1145
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> -e <20><><EFBFBD> -f\n"

-#: src/usermod.c:1208
+#: src/usermod.c:1166
 #, c-format
 msgid "%s: uid %ld is not unique\n"
 msgstr "%s: <20><> uid %ld <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/usermod.c:1356
+#: src/usermod.c:1314
 #, c-format
 msgid "%s: error deleting authentication method\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/usermod.c:1376
+#: src/usermod.c:1334
 #, c-format
 msgid "%s: error changing authentication method\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/usermod.c:1393
+#: src/usermod.c:1351
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/usermod.c:1399
+#: src/usermod.c:1357
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/usermod.c:1407
+#: src/usermod.c:1365
 #, c-format
 msgid "%s: error adding password dbm entry\n"
 msgstr ""
 "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> dbm <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/usermod.c:1414
+#: src/usermod.c:1372
 #, c-format
 msgid "%s: error removing passwd dbm entry\n"
 msgstr ""
 "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> dbm <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/usermod.c:1431
+#: src/usermod.c:1389
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr ""
 "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/usermod.c:1446
+#: src/usermod.c:1404
 #, c-format
 msgid "%s: error removing shadow passwd dbm entry\n"
 msgstr ""
 "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> dbm <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> "
 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/usermod.c:1477
+#: src/usermod.c:1435
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"

-#: src/usermod.c:1484
+#: src/usermod.c:1442
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> %s\n"

-#: src/usermod.c:1490
+#: src/usermod.c:1448
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(chown) <20><><EFBFBD> %s\n"

-#: src/usermod.c:1506
+#: src/usermod.c:1464
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s <20><> %s\n"

 #. better leave it alone
-#: src/usermod.c:1603
+#: src/usermod.c:1561
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: <20><> %s <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> %s\n"

-#: src/usermod.c:1609
+#: src/usermod.c:1567
 msgid "failed to change mailbox owner"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

-#: src/usermod.c:1616
+#: src/usermod.c:1574
 msgid "failed to rename mailbox"
 msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

--- a/po/fr.gmo
+++ b/po/fr.gmo
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: shadow 19990709\n"
-"POT-Creation-Date: 2000-09-02 20:40+0200\n"
+"POT-Creation-Date: 2000-08-26 20:28+0200\n"
 "PO-Revision-Date: 1999-07-09 20:02+0200\n"
 "Last-Translator: Vincent Renardias <vincent@ldsol.com>\n"
 "Language-Team: Vincent Renardias <vincent@ldsol.com>\n"
@@ -227,7 +227,7 @@ msgstr ""
 msgid "Unknown error %d"
 msgstr "Erreur %d inconnue"

-#: src/chage.c:156
+#: src/chage.c:141
 #, c-format
 msgid ""
 "Usage: %s [ -l ] [ -m min_days ] [ -M max_days ] [ -W warn ]\n"
@@ -237,14 +237,14 @@ msgstr ""
 "  [ -W avertissement ] [ -I inactif ] [ -E expire ] [ -d dernier_jour ]\n"
 "  utilisateur\n"

-#: src/chage.c:158
+#: src/chage.c:143
 #, c-format
 msgid "Usage: %s [ -l ] [ -m min_days ] [ -M max_days ] [ -d last_day ] user\n"
 msgstr ""
 "Usage: %s [ -l ] [ -m min_jours ] [ -M max_jours ] [ -d dernier_jour ] "
 "utilisateur\n"

-#: src/chage.c:193
+#: src/chage.c:178
 msgid ""
 "Enter the new value, or press return for the default\n"
 "\n"
@@ -252,27 +252,27 @@ msgstr ""
 "Entrez la nouvelle valeur ou tapes Entr<74>e pour la valeur par d<>faut\n"
 "\n"

-#: src/chage.c:196
+#: src/chage.c:181
 msgid "Minimum Password Age"
 msgstr "Age minimum du mot de passe"

-#: src/chage.c:201
+#: src/chage.c:186
 msgid "Maximum Password Age"
 msgstr "Age maximum du mot de passe"

-#: src/chage.c:207
+#: src/chage.c:192
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "Dernier changement de mot de passe (YYYY-MM-DD)"

-#: src/chage.c:216
+#: src/chage.c:201
 msgid "Password Expiration Warning"
 msgstr "Avertissement d'expiration de mot de passe"

-#: src/chage.c:221
+#: src/chage.c:206
 msgid "Password Inactive"
 msgstr "Mot de passe d<>sactiv<69>"

-#: src/chage.c:227
+#: src/chage.c:212
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Date d'expiration du compte (YYYY-MM-DD)"

@@ -284,22 +284,22 @@ msgstr "Date d'expiration du compte (YYYY-MM-DD)"
 #. * days after the password expires that the account becomes
 #. * unusable.
 #.
-#: src/chage.c:281
+#: src/chage.c:266
 #, c-format
 msgid "Minimum:\t%ld\n"
 msgstr "Minimum :\t%ld\n"

-#: src/chage.c:282
+#: src/chage.c:267
 #, c-format
 msgid "Maximum:\t%ld\n"
 msgstr "Maximum :\t%ld\n"

-#: src/chage.c:284
+#: src/chage.c:269
 #, c-format
 msgid "Warning:\t%ld\n"
 msgstr "Avertissement :\t%ld\n"

-#: src/chage.c:285
+#: src/chage.c:270
 #, c-format
 msgid "Inactive:\t%ld\n"
 msgstr "D<>sactiv<69> :\t%ld\n"
@@ -309,11 +309,11 @@ msgstr "D
 #. * password was last modified.  The date is the number of
 #. * days since 1/1/1970.
 #.
-#: src/chage.c:294
+#: src/chage.c:279
 msgid "Last Change:\t\t"
 msgstr "Dernier changement :\t\t"

-#: src/chage.c:296 src/chage.c:310 src/chage.c:327 src/chage.c:340
+#: src/chage.c:281 src/chage.c:295 src/chage.c:312 src/chage.c:325
 msgid "Never\n"
 msgstr "Jamais\n"

@@ -322,7 +322,7 @@ msgstr "Jamais\n"
 #. * change date plus the number of days the password is valid
 #. * for.
 #.
-#: src/chage.c:308
+#: src/chage.c:293
 msgid "Password Expires:\t"
 msgstr "Expiration du mot de passe :\t"

@@ -332,7 +332,7 @@ msgstr "Expiration du mot de passe :\t"
 #. * and the number of inactive days is added.  The resulting date
 #. * is when the active will be disabled.
 #.
-#: src/chage.c:324
+#: src/chage.c:309
 #, fuzzy
 msgid "Password Inactive:\t"
 msgstr "Mot de passe d<>sactiv<69>"
@@ -341,82 +341,82 @@ msgstr "Mot de passe d
 #. * The account will expire on the given date regardless of the
 #. * password expiring or not.
 #.
-#: src/chage.c:338
+#: src/chage.c:323
 #, fuzzy
 msgid "Account Expires:\t"
 msgstr "Expiration du mot de passe :\t"

-#: src/chage.c:486
+#: src/chage.c:471
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s : ne pas include \"l\" avec les autres drapeaux\n"

-#: src/chage.c:498 src/chage.c:610 src/login.c:529
+#: src/chage.c:483 src/chage.c:595 src/login.c:529
 #, c-format
 msgid "%s: permission denied\n"
 msgstr "%s : permission refus<75>e\n"

-#: src/chage.c:510 src/chpasswd.c:120
+#: src/chage.c:495 src/chpasswd.c:120
 #, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: impossible de v<>rouiller de fichier de mots de passe\n"

-#: src/chage.c:516 src/chpasswd.c:124
+#: src/chage.c:501 src/chpasswd.c:124
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: impossible d'ouvrir le fichier de mots de passe\n"

-#: src/chage.c:523
+#: src/chage.c:508
 #, c-format
 msgid "%s: unknown user: %s\n"
 msgstr "%s: utilisateur inconnu: %s\n"

-#: src/chage.c:542
+#: src/chage.c:527
 #, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s : impossible de v<>rouiller le fichier shadow password\n"

-#: src/chage.c:549
+#: src/chage.c:534
 #, c-format
 msgid "%s: can't open shadow password file\n"
 msgstr "%s : impossible d'ouvrir le fichier shadow password\n"

-#: src/chage.c:631
+#: src/chage.c:616
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "Changement des informations sur l'age pour %s\n"

-#: src/chage.c:633
+#: src/chage.c:618
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s : erreur lors du changement des champs\n"

-#: src/chage.c:660 src/chage.c:723 src/pwunconv.c:183
+#: src/chage.c:645 src/chage.c:708 src/pwunconv.c:183
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s : impossible de mettre <20> jour le fichier passwd\n"

-#: src/chage.c:690 src/pwunconv.c:178
+#: src/chage.c:675 src/pwunconv.c:178
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s : impossible de mettre <20> jour le fichier shadow password\n"

-#: src/chage.c:739 src/chage.c:754 src/chfn.c:570 src/chsh.c:409
+#: src/chage.c:724 src/chage.c:739 src/chfn.c:571 src/chsh.c:410
 #: src/passwd.c:825 src/passwd.c:926
 msgid "Error updating the DBM password entry.\n"
 msgstr "Erreur durant la mise <20> jour de l'entr<74>e du mot de passe DBM.\n"

-#: src/chage.c:771
+#: src/chage.c:756
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s : impossible de re-<2D>crire le fichier shadow password\n"

-#: src/chage.c:785
+#: src/chage.c:770
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s : impossible de re-<2D>crire le fichier password\n"

-#: src/chage.c:836
+#: src/chage.c:821
 #, c-format
 msgid "%s: no aging information present\n"
 msgstr "%s : aucune information sur l'age\n"
@@ -480,95 +480,95 @@ msgstr "\tT
 msgid "Other"
 msgstr "Autre"

-#: src/chfn.c:298 src/chfn.c:306 src/chfn.c:314 src/chfn.c:322 src/chfn.c:330
-#: src/chfn.c:391 src/passwd.c:1226
+#: src/chfn.c:299 src/chfn.c:307 src/chfn.c:315 src/chfn.c:323 src/chfn.c:331
+#: src/chfn.c:392 src/passwd.c:1226
 #, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: Permission refus<75>e.\n"

-#: src/chfn.c:351 src/chsh.c:224 src/passwd.c:1277
+#: src/chfn.c:352 src/chsh.c:225 src/passwd.c:1277
 #, c-format
 msgid "%s: Unknown user %s\n"
 msgstr "%s: Utilisateur %s inconnu\n"

-#: src/chfn.c:357 src/chsh.c:232 src/passwd.c:1207
+#: src/chfn.c:358 src/chsh.c:233 src/passwd.c:1207
 #, c-format
 msgid "%s: Cannot determine your user name.\n"
 msgstr "%s: Impossible de d<>terminer votre nom d'utilisateur.\n"

-#: src/chfn.c:373 src/chsh.c:250
+#: src/chfn.c:374 src/chsh.c:251
 #, c-format
 msgid "%s: cannot change user `%s' on NIS client.\n"
 msgstr "%s: impossible de changer l'utilisateur `%' sur le client NIS.\n"

-#: src/chfn.c:378 src/chsh.c:257
+#: src/chfn.c:379 src/chsh.c:258
 #, c-format
 msgid "%s: `%s' is the NIS master for this client.\n"
 msgstr "%s: `%s' est le ma<6D>tre NIS pour ce client.\n"

-#: src/chfn.c:453
+#: src/chfn.c:454
 #, c-format
 msgid "Changing the user information for %s\n"
 msgstr "Changement de l'information utilisateur pour %s\n"

-#: src/chfn.c:462
+#: src/chfn.c:463
 #, c-format
 msgid "%s: invalid name: \"%s\"\n"
 msgstr "%s : nom non valide : \"%s\"\n"

-#: src/chfn.c:467
+#: src/chfn.c:468
 #, c-format
 msgid "%s: invalid room number: \"%s\"\n"
 msgstr "%s : no de bureau non valide : \"%s\"\n"

-#: src/chfn.c:472
+#: src/chfn.c:473
 #, c-format
 msgid "%s: invalid work phone: \"%s\"\n"
 msgstr "%s : t<>l<EFBFBD>phone du bureau non valide : \"%s\"\n"

-#: src/chfn.c:477
+#: src/chfn.c:478
 #, c-format
 msgid "%s: invalid home phone: \"%s\"\n"
 msgstr "%s : t<>l<EFBFBD>phone perso non valide : \"%s\"\n"

-#: src/chfn.c:482
+#: src/chfn.c:483
 #, c-format
 msgid "%s: \"%s\" contains illegal characters\n"
 msgstr "%s : \"%s\" contient des caract<63>res non valide\n"

-#: src/chfn.c:494
+#: src/chfn.c:495
 #, c-format
 msgid "%s: fields too long\n"
 msgstr "%s: champs trop longs\n"

-#: src/chfn.c:509 src/chsh.c:347 src/gpasswd.c:582 src/passwd.c:1388
+#: src/chfn.c:510 src/chsh.c:348 src/gpasswd.c:582 src/passwd.c:1388
 msgid "Cannot change ID to root.\n"
 msgstr "Impossible de changer l'ID en root.\n"

-#: src/chfn.c:522 src/chsh.c:361 src/passwd.c:735 src/passwd.c:880
+#: src/chfn.c:523 src/chsh.c:362 src/passwd.c:735 src/passwd.c:880
 msgid "Cannot lock the password file; try again later.\n"
 msgstr ""
 "Impossible de v<>rouiller le fichier de mots de passe; essayez plus tard.\n"

-#: src/chfn.c:528 src/chsh.c:367 src/passwd.c:740 src/passwd.c:885
+#: src/chfn.c:529 src/chsh.c:368 src/passwd.c:740 src/passwd.c:885
 msgid "Cannot open the password file.\n"
 msgstr "Impossible d'ouvrir le fichier de mots de passe.\n"

-#: src/chfn.c:545 src/chsh.c:382 src/passwd.c:746 src/usermod.c:1313
+#: src/chfn.c:546 src/chsh.c:383 src/passwd.c:746 src/usermod.c:1271
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: %s non trouv<75> dans /etc/passwd\n"

-#: src/chfn.c:562 src/chsh.c:401 src/passwd.c:819 src/passwd.c:920
+#: src/chfn.c:563 src/chsh.c:402 src/passwd.c:819 src/passwd.c:920
 #: src/passwd.c:960
 msgid "Error updating the password entry.\n"
 msgstr "Erreur durant la mise <20> jour du mot de passe.\n"

-#: src/chfn.c:585 src/chsh.c:424 src/passwd.c:832 src/passwd.c:933
+#: src/chfn.c:586 src/chsh.c:425 src/passwd.c:832 src/passwd.c:933
 msgid "Cannot commit password file changes.\n"
 msgstr "Impossible de valider le changement de mot de passe.\n"

-#: src/chfn.c:592 src/chsh.c:431
+#: src/chfn.c:593 src/chsh.c:432
 msgid "Cannot unlock the password file.\n"
 msgstr "Impossible de d<>v<EFBFBD>rouiller le fichier de mots de passe.\n"

@@ -632,22 +632,22 @@ msgstr "Usage: %s [ -s shell ] [ nom ]\n"
 msgid "Login Shell"
 msgstr "Shell de login"

-#: src/chsh.c:273 src/chsh.c:286
+#: src/chsh.c:274 src/chsh.c:287
 #, c-format
 msgid "You may not change the shell for %s.\n"
 msgstr "Vous ne pouvez pas changer le shell de %s.\n"

-#: src/chsh.c:315
+#: src/chsh.c:316
 #, c-format
 msgid "Changing the login shell for %s\n"
 msgstr "Changement du shell de login pour %s\n"

-#: src/chsh.c:327
+#: src/chsh.c:328
 #, c-format
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Entr<74>e non valide : %s\n"

-#: src/chsh.c:332
+#: src/chsh.c:333
 #, c-format
 msgid "%s is an invalid shell.\n"
 msgstr "%s n'est pas un shell valide.\n"
@@ -880,13 +880,13 @@ msgid "usage: groupadd [-g gid [-o]] group\n"
 msgstr "usage: groupadd [-g gid [-o]] groupe\n"

 #: src/groupadd.c:173 src/groupadd.c:196 src/groupmod.c:183 src/groupmod.c:230
-#: src/useradd.c:931 src/usermod.c:539 src/usermod.c:675
+#: src/useradd.c:931 src/usermod.c:512 src/usermod.c:648
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s : erreur durant l'addition du nouveau groupe\n"

 #: src/groupadd.c:183 src/groupadd.c:206 src/groupmod.c:199 src/useradd.c:942
-#: src/usermod.c:551 src/usermod.c:687
+#: src/usermod.c:524 src/usermod.c:660
 #, c-format
 msgid "%s: cannot add new dbm group entry\n"
 msgstr "%s : impossible d'ajouter une nouvelle entr<74>e pour le groupe dbm\n"
@@ -925,13 +925,13 @@ msgid "%s: -O requires NAME=VALUE\n"
 msgstr "%s : -O requiert NAME=VALEUR\n"

 #: src/groupadd.c:412 src/groupdel.c:167 src/groupmod.c:403 src/useradd.c:1381
-#: src/userdel.c:303 src/usermod.c:563
+#: src/userdel.c:303 src/usermod.c:536
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s : impossible de re-<2D>crire le fichier group\n"

 #: src/groupadd.c:418 src/groupdel.c:173 src/groupmod.c:409 src/useradd.c:1389
-#: src/userdel.c:309 src/usermod.c:700
+#: src/userdel.c:309 src/usermod.c:673
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s : impossible de re-<2D>crire le fichier shadow group\n"
@@ -1003,7 +1003,7 @@ msgstr "%s : le groupe %s n'existe pas\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s : le groupe %s est un groupe NIS\n"

-#: src/groupdel.c:325 src/groupmod.c:523 src/userdel.c:761 src/usermod.c:1016
+#: src/groupdel.c:325 src/groupmod.c:523 src/userdel.c:761 src/usermod.c:989
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s : %s est le ma<6D>tre NIS\n"
@@ -1897,7 +1897,7 @@ msgstr "%s : reconstruction de la base de donn
 msgid "%s: rebuild the shadow group database\n"
 msgstr "%s : reconstruction de la base de donn<6E>es des groupes shadow\n"

-#: src/useradd.c:287 src/usermod.c:967
+#: src/useradd.c:287 src/usermod.c:940
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s : argument num<75>rique `%s' non valide\n"
@@ -1907,8 +1907,8 @@ msgstr "%s : argument num
 msgid "%s: unknown gid %s\n"
 msgstr "%s : gid %s inconnu\n"

-#: src/useradd.c:350 src/useradd.c:642 src/useradd.c:1228 src/usermod.c:254
-#: src/usermod.c:1098
+#: src/useradd.c:350 src/useradd.c:642 src/useradd.c:1228 src/usermod.c:252
+#: src/usermod.c:1071
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s : groupe %s inconnu\n"
@@ -1968,17 +1968,17 @@ msgstr "%s : impossible de cr
 msgid "%s: rename: %s"
 msgstr "%s : rename : %s"

-#: src/useradd.c:662 src/usermod.c:274
+#: src/useradd.c:662 src/usermod.c:272
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s : le groupe `%s' est un groupe NIS.\n"

-#: src/useradd.c:670 src/usermod.c:282
+#: src/useradd.c:670 src/usermod.c:280
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s : trop de groupes sp<73>cifi<66>s (max %d).\n"

-#: src/useradd.c:702 src/usermod.c:314
+#: src/useradd.c:702 src/usermod.c:312
 #, c-format
 msgid "usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
 msgstr "Usage : %s\t[-u uid [-o]] [-g groupe] [-G groupe,...] \n"
@@ -1987,7 +1987,7 @@ msgstr "Usage : %s\t[-u uid [-o]] [-g groupe] [-G groupe,...] \n"
 msgid "\t\t[-d home] [-s shell] [-c comment] [-m [-k template]]\n"
 msgstr "\t\t[-d home] [-s shell] [-c commentaire] [-m [-k template]]\n"

-#: src/useradd.c:708 src/usermod.c:320
+#: src/useradd.c:708 src/usermod.c:318
 msgid "[-f inactive] [-e expire ] "
 msgstr "[-f inactif] [-e expire ] "

@@ -1995,7 +1995,7 @@ msgstr "[-f inactif] [-e expire ] "
 msgid "[-A program] "
 msgstr "[-A program] "

-#: src/useradd.c:713
+#: src/useradd.c:713 src/usermod.c:323
 msgid "[-p passwd] name\n"
 msgstr "[-p mot-de-passe] nom\n"

@@ -2008,22 +2008,22 @@ msgstr "       %s\t-D [-g groupe] [-b base] [-s shell]\n"
 msgid "\t\t[-f inactive] [-e expire ]\n"
 msgstr "\t\t[-f inactif] [-e expire ]\n"

-#: src/useradd.c:815 src/usermod.c:472
+#: src/useradd.c:815 src/usermod.c:445
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s : erreur lors du v<>rouillage du fichier de groupe\n"

-#: src/useradd.c:819 src/usermod.c:477
+#: src/useradd.c:819 src/usermod.c:450
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s : erreur lors d'ouverture du fichier de groupe\n"

-#: src/useradd.c:824 src/usermod.c:584
+#: src/useradd.c:824 src/usermod.c:557
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s : erreur lors du v<>rouillage du fichier shadow group\n"

-#: src/useradd.c:829 src/usermod.c:590
+#: src/useradd.c:829 src/usermod.c:563
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s : erreur lors de l'ouverture du fichier shadow group\n"
@@ -2038,8 +2038,8 @@ msgstr "%s : l'uid %d n'est pas unique\n"
 msgid "%s: can't get unique uid\n"
 msgstr "%s : impossible d'obtenir un uid unique\n"

-#: src/useradd.c:1139 src/useradd.c:1283 src/usermod.c:1046 src/usermod.c:1057
-#: src/usermod.c:1067 src/usermod.c:1113 src/usermod.c:1157
+#: src/useradd.c:1139 src/useradd.c:1283 src/usermod.c:1019 src/usermod.c:1030
+#: src/usermod.c:1040 src/usermod.c:1086 src/usermod.c:1121
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s : champs `%s' non valide\n"
@@ -2059,7 +2059,7 @@ msgstr "%s : commentaire `%s' non valide\n"
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s : r<>pertoire personnel `%s' non valide\n"

-#: src/useradd.c:1191 src/usermod.c:1080
+#: src/useradd.c:1191 src/usermod.c:1053
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s : date `%s' non valide\n"
@@ -2084,37 +2084,37 @@ msgstr "%s : shell `%s' non valide\n"
 msgid "%s: invalid user name `%s'\n"
 msgstr "%s : nom d'utilisateur `%s' non valide\n"

-#: src/useradd.c:1369 src/userdel.c:292 src/usermod.c:1225
+#: src/useradd.c:1369 src/userdel.c:292 src/usermod.c:1183
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s : impossible de re<72>crire le fichier de mots de passe\n"

-#: src/useradd.c:1374 src/userdel.c:295 src/usermod.c:1230
+#: src/useradd.c:1374 src/userdel.c:295 src/usermod.c:1188
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s : impossible de re<72>crire le fichier shadow\n"

-#: src/useradd.c:1414 src/userdel.c:359 src/usermod.c:1265
+#: src/useradd.c:1414 src/userdel.c:359 src/usermod.c:1223
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s : impossible de v<>rouiller le fichier de mots de passe\n"

-#: src/useradd.c:1418 src/userdel.c:363 src/usermod.c:1269
+#: src/useradd.c:1418 src/userdel.c:363 src/usermod.c:1227
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s : impossible d'ouvrir le fichier de mots de passe\n"

-#: src/useradd.c:1424 src/userdel.c:368 src/usermod.c:1274
+#: src/useradd.c:1424 src/userdel.c:368 src/usermod.c:1232
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s : impossible de v<>rouiller le fichier de mots de passe\n"

-#: src/useradd.c:1430 src/userdel.c:373 src/usermod.c:1279
+#: src/useradd.c:1430 src/userdel.c:373 src/usermod.c:1237
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s : impossible d'ouvrir le fichier shadow\n"

-#: src/useradd.c:1529 src/usermod.c:1366
+#: src/useradd.c:1529 src/usermod.c:1324
 #, c-format
 msgid "%s: error adding authentication method\n"
 msgstr "%s : erreur lors de l'ajout de la m<>thode d'authentification\n"
@@ -2129,12 +2129,12 @@ msgstr "%s : erreur lors de l'ajout de la nouvelle entr
 msgid "%s: error updating password dbm entry\n"
 msgstr "%s : erreur lors de la mise <20> jour de l'entr<74>e dbm\n"

-#: src/useradd.c:1583 src/usermod.c:1425
+#: src/useradd.c:1583 src/usermod.c:1383
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr "%s : erreur lors de l'ajout de la nouvelle entr<74>e shadow\n"

-#: src/useradd.c:1599 src/usermod.c:1440
+#: src/useradd.c:1599 src/usermod.c:1398
 #, c-format
 msgid "%s: error updating shadow passwd dbm entry\n"
 msgstr "%s : erreur lors de la mise <20> jour de l'entr<74>e shadow passwd dbm\n"
@@ -2144,7 +2144,7 @@ msgstr "%s : erreur lors de la mise
 msgid "%s: cannot create directory %s\n"
 msgstr "%s : impossible de cr<63>er le r<>pertoire %s\n"

-#: src/useradd.c:1708 src/usermod.c:1203
+#: src/useradd.c:1708 src/usermod.c:1161
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s : l'utilisateur %s existe\n"
@@ -2245,12 +2245,12 @@ msgstr "%s : avertissement : %s n'appartient pas
 msgid "%s: warning: can't remove "
 msgstr "%s : impossible d'enlever "

-#: src/userdel.c:741 src/usermod.c:994
+#: src/userdel.c:741 src/usermod.c:967
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s : l'utilisateur %s n'existe pas\n"

-#: src/userdel.c:755 src/usermod.c:1010
+#: src/userdel.c:755 src/usermod.c:983
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s : le compte %s est un compte NIS\n"
@@ -2272,115 +2272,110 @@ msgstr ""
 msgid "%s: error removing directory %s\n"
 msgstr "%s : erreur lors de l'effacement du r<>pertoire %s\n"

-#: src/usermod.c:317
+#: src/usermod.c:315
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr "\t\t[-d home [-m]] [-s shell] [-c commentaire] [-l nouveau_nom]\n"

-#: src/usermod.c:323
+#: src/usermod.c:321
 msgid "[-A {DEFAULT|program},... ] "
 msgstr "[-A {D<>FAUT|programme},... ] "

-#: src/usermod.c:325
-#, fuzzy
-msgid "[-p passwd] [-L|-U] name\n"
-msgstr "[-p mot-de-passe] nom\n"
-
-#: src/usermod.c:504
+#: src/usermod.c:477
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s : plus de m<>moire pour update_group\n"

-#: src/usermod.c:627
+#: src/usermod.c:600
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s : plus de m<>moire pour update_gshadow\n"

-#: src/usermod.c:1180
+#: src/usermod.c:1138
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s : aucun drapeau donn<6E>\n"

-#: src/usermod.c:1187
+#: src/usermod.c:1145
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s : mots de passe shadow n<>cessaires pour -e ou -f\n"

-#: src/usermod.c:1208
+#: src/usermod.c:1166
 #, c-format
 msgid "%s: uid %ld is not unique\n"
 msgstr "%s : l'uid %ld n'est pas unique\n"

-#: src/usermod.c:1356
+#: src/usermod.c:1314
 #, c-format
 msgid "%s: error deleting authentication method\n"
 msgstr "%s : erreur lors de l'effacement de la m<>thode d'authentification\n"

-#: src/usermod.c:1376
+#: src/usermod.c:1334
 #, c-format
 msgid "%s: error changing authentication method\n"
 msgstr "%s : erreur lors du changement de la m<>thode d'authentification\n"

-#: src/usermod.c:1393
+#: src/usermod.c:1351
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s : erreur lors du changement de l'entr<74>e dans /etc/passwd\n"

-#: src/usermod.c:1399
+#: src/usermod.c:1357
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s : erreur lors de l'effacement du mot de passe\n"

-#: src/usermod.c:1407
+#: src/usermod.c:1365
 #, c-format
 msgid "%s: error adding password dbm entry\n"
 msgstr ""

-#: src/usermod.c:1414
+#: src/usermod.c:1372
 #, c-format
 msgid "%s: error removing passwd dbm entry\n"
 msgstr ""

-#: src/usermod.c:1431
+#: src/usermod.c:1389
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr ""

-#: src/usermod.c:1446
+#: src/usermod.c:1404
 #, c-format
 msgid "%s: error removing shadow passwd dbm entry\n"
 msgstr ""

-#: src/usermod.c:1477
+#: src/usermod.c:1435
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s : le r<>pertoire %s existe\n"

-#: src/usermod.c:1484
+#: src/usermod.c:1442
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s : impossible de cr<63>er %s\n"

-#: src/usermod.c:1490
+#: src/usermod.c:1448
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s : impossible de changer le propri<72>taire de %s\n"

-#: src/usermod.c:1506
+#: src/usermod.c:1464
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s : impossible de renommer le r<>pertoire %s en %s\n"

 #. better leave it alone
-#: src/usermod.c:1603
+#: src/usermod.c:1561
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s : avertissement : %s n'appartient pas <20> %s\n"

-#: src/usermod.c:1609
+#: src/usermod.c:1567
 msgid "failed to change mailbox owner"
 msgstr "<22>chec du changement de propri<72>taire de la mailbox"

-#: src/usermod.c:1616
+#: src/usermod.c:1574
 msgid "failed to rename mailbox"
 msgstr "<22>chec du renommage de la mailbox"

--- a/po/pl.gmo
+++ b/po/pl.gmo
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: shadow-981228\n"
-"POT-Creation-Date: 2000-09-02 20:40+0200\n"
+"POT-Creation-Date: 2000-08-26 20:28+0200\n"
 "PO-Revision-Date: 1999-03-02 22:29+01:00\n"
 "Last-Translator: Arkadiusz Mi<4D>kiewicz <misiek@misiek.eu.org>\n"
 "Language-Team: PL <pl@li.org>\n"
@@ -225,7 +225,7 @@ msgstr ""
 msgid "Unknown error %d"
 msgstr "Nieznany b<><62>d %d"

-#: src/chage.c:156
+#: src/chage.c:141
 #, c-format
 msgid ""
 "Usage: %s [ -l ] [ -m min_days ] [ -M max_days ] [ -W warn ]\n"
@@ -234,14 +234,14 @@ msgstr ""
 "U<>ycie: %s [ -l ] [ -m min_dni ] [ -M maks_dni ] [ -W ostrze<7A> ]\n"
 "  [ -I nieaktywne ] [ -E utrata_wa<77>no<6E>ci ] [ -d ostatni_dzie<69> ] u<>ytkownik\n"

-#: src/chage.c:158
+#: src/chage.c:143
 #, c-format
 msgid "Usage: %s [ -l ] [ -m min_days ] [ -M max_days ] [ -d last_day ] user\n"
 msgstr ""
 "U<>ycie: %s [ -l ] [ -m min_dni ] [ -M maks_dni ] [ -d ostatni_dzie<69> ] "
 "u<>ytkownik\n"

-#: src/chage.c:193
+#: src/chage.c:178
 msgid ""
 "Enter the new value, or press return for the default\n"
 "\n"
@@ -249,27 +249,27 @@ msgstr ""
 "Wpisz now<6F> warto<74><6F> lub wci<63>nij return by przyj<79>c warto<74><6F> domy<6D>ln<6C>\n"
 "\n"

-#: src/chage.c:196
+#: src/chage.c:181
 msgid "Minimum Password Age"
 msgstr "Minimalny wiek has<61>a"

-#: src/chage.c:201
+#: src/chage.c:186
 msgid "Maximum Password Age"
 msgstr "Maksymalny wiek has<61>a"

-#: src/chage.c:207
+#: src/chage.c:192
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "Ostatnia zmiana has<61>a (RRRR-MM-DD)"

-#: src/chage.c:216
+#: src/chage.c:201
 msgid "Password Expiration Warning"
 msgstr "Ostrze<7A>enie o utracie wa<77>no<6E>ci has<61>a"

-#: src/chage.c:221
+#: src/chage.c:206
 msgid "Password Inactive"
 msgstr "Has<61>o nieaktywne"

-#: src/chage.c:227
+#: src/chage.c:212
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Data utraty wa<77>no<6E>ci konta (RRRR-MM-DD)"

@@ -281,22 +281,22 @@ msgstr "Data utraty wa
 #. * days after the password expires that the account becomes
 #. * unusable.
 #.
-#: src/chage.c:281
+#: src/chage.c:266
 #, c-format
 msgid "Minimum:\t%ld\n"
 msgstr "Minimum:\t%ld\n"

-#: src/chage.c:282
+#: src/chage.c:267
 #, c-format
 msgid "Maximum:\t%ld\n"
 msgstr "Maksimim:\t%ld\n"

-#: src/chage.c:284
+#: src/chage.c:269
 #, c-format
 msgid "Warning:\t%ld\n"
 msgstr "Ostrze<7A>enie:\t%ld\n"

-#: src/chage.c:285
+#: src/chage.c:270
 #, c-format
 msgid "Inactive:\t%ld\n"
 msgstr "Nieaktywne:\t%ld\n"
@@ -306,11 +306,11 @@ msgstr "Nieaktywne:\t%ld\n"
 #. * password was last modified.  The date is the number of
 #. * days since 1/1/1970.
 #.
-#: src/chage.c:294
+#: src/chage.c:279
 msgid "Last Change:\t\t"
 msgstr "Ostatnia zmiana:\t\t"

-#: src/chage.c:296 src/chage.c:310 src/chage.c:327 src/chage.c:340
+#: src/chage.c:281 src/chage.c:295 src/chage.c:312 src/chage.c:325
 msgid "Never\n"
 msgstr "Nigdy\n"

@@ -319,7 +319,7 @@ msgstr "Nigdy\n"
 #. * change date plus the number of days the password is valid
 #. * for.
 #.
-#: src/chage.c:308
+#: src/chage.c:293
 msgid "Password Expires:\t"
 msgstr "Has<61>o traci wa<77>no<6E><6F>:\t"

@@ -329,7 +329,7 @@ msgstr "Has
 #. * and the number of inactive days is added.  The resulting date
 #. * is when the active will be disabled.
 #.
-#: src/chage.c:324
+#: src/chage.c:309
 #, fuzzy
 msgid "Password Inactive:\t"
 msgstr "Has<61>o nieaktywne:\t"
@@ -338,82 +338,82 @@ msgstr "Has
 #. * The account will expire on the given date regardless of the
 #. * password expiring or not.
 #.
-#: src/chage.c:338
+#: src/chage.c:323
 #, fuzzy
 msgid "Account Expires:\t"
 msgstr "Has<61>o traci wa<77>no<6E><6F>:\t"

-#: src/chage.c:486
+#: src/chage.c:471
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s: nie <20><>cz \"l\" z innymi flagami\n"

-#: src/chage.c:498 src/chage.c:610 src/login.c:529
+#: src/chage.c:483 src/chage.c:595 src/login.c:529
 #, c-format
 msgid "%s: permission denied\n"
 msgstr "%s: odmowa dost<73>pu\n"

-#: src/chage.c:510 src/chpasswd.c:120
+#: src/chage.c:495 src/chpasswd.c:120
 #, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: nie mog<6F> zablokowa<77> pliku z has<61>ami\n"

-#: src/chage.c:516 src/chpasswd.c:124
+#: src/chage.c:501 src/chpasswd.c:124
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: nie mog<6F> otworzy<7A> pliku z has<61>ami\n"

-#: src/chage.c:523
+#: src/chage.c:508
 #, c-format
 msgid "%s: unknown user: %s\n"
 msgstr "%s: nieznany u<>ytkownik: %s\n"

-#: src/chage.c:542
+#: src/chage.c:527
 #, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: nie mog<6F> zablokowa<77> pliku z ukrytymi has<61>ami\n"

-#: src/chage.c:549
+#: src/chage.c:534
 #, c-format
 msgid "%s: can't open shadow password file\n"
 msgstr "%s: nie mog<6F> otworzy<7A> pliku z ukrytymi has<61>ami\n"

-#: src/chage.c:631
+#: src/chage.c:616
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "Zmieniam informacj<63> o u<>ytkowniku %s\n"

-#: src/chage.c:633
+#: src/chage.c:618
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: b<><62>d podczas zmieniania p<>l\n"

-#: src/chage.c:660 src/chage.c:723 src/pwunconv.c:183
+#: src/chage.c:645 src/chage.c:708 src/pwunconv.c:183
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: nie mog<6F> zaktualizowa<77> pliku z has<61>ami\n"

-#: src/chage.c:690 src/pwunconv.c:178
+#: src/chage.c:675 src/pwunconv.c:178
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: nie mog<6F> zaktualizowa<77> pliku z ukrytymi has<61>ami\n"

-#: src/chage.c:739 src/chage.c:754 src/chfn.c:570 src/chsh.c:409
+#: src/chage.c:724 src/chage.c:739 src/chfn.c:571 src/chsh.c:410
 #: src/passwd.c:825 src/passwd.c:926
 msgid "Error updating the DBM password entry.\n"
 msgstr "B<><42>d podczas aktualizacki bazy hase<73> DBM.\n"

-#: src/chage.c:771
+#: src/chage.c:756
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s: nie mog<6F> przepisa<73> pliku z ukrytymi has<61>ami\n"

-#: src/chage.c:785
+#: src/chage.c:770
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: nie mog<6F> przepisa<73> pliku z has<61>ami\n"

-#: src/chage.c:836
+#: src/chage.c:821
 #, c-format
 msgid "%s: no aging information present\n"
 msgstr "%s: brak informacji\n"
@@ -479,94 +479,94 @@ msgstr "\tTelefon domowy: %s\n"
 msgid "Other"
 msgstr "Inne"

-#: src/chfn.c:298 src/chfn.c:306 src/chfn.c:314 src/chfn.c:322 src/chfn.c:330
-#: src/chfn.c:391 src/passwd.c:1226
+#: src/chfn.c:299 src/chfn.c:307 src/chfn.c:315 src/chfn.c:323 src/chfn.c:331
+#: src/chfn.c:392 src/passwd.c:1226
 #, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: Brak praw dost<73>pu.\n"

-#: src/chfn.c:351 src/chsh.c:224 src/passwd.c:1277
+#: src/chfn.c:352 src/chsh.c:225 src/passwd.c:1277
 #, c-format
 msgid "%s: Unknown user %s\n"
 msgstr "%s: Nieznany u<>ytkownik %s\n"

-#: src/chfn.c:357 src/chsh.c:232 src/passwd.c:1207
+#: src/chfn.c:358 src/chsh.c:233 src/passwd.c:1207
 #, c-format
 msgid "%s: Cannot determine your user name.\n"
 msgstr "%s: Nie mog<6F> ustali<6C> twojej nazwy u<>ytkownika.\n"

-#: src/chfn.c:373 src/chsh.c:250
+#: src/chfn.c:374 src/chsh.c:251
 #, c-format
 msgid "%s: cannot change user `%s' on NIS client.\n"
 msgstr "%s: nie mog<6F> zmieni<6E> u<>ytkownika `%s' na kliencie NIS.\n"

-#: src/chfn.c:378 src/chsh.c:257
+#: src/chfn.c:379 src/chsh.c:258
 #, c-format
 msgid "%s: `%s' is the NIS master for this client.\n"
 msgstr "%s: `%s' jest nadrz<72>dnym serwerm NIS dla tego klienta.\n"

-#: src/chfn.c:453
+#: src/chfn.c:454
 #, c-format
 msgid "Changing the user information for %s\n"
 msgstr "Zmieniam informacj<63> o u<>ytkowniku %s\n"

-#: src/chfn.c:462
+#: src/chfn.c:463
 #, c-format
 msgid "%s: invalid name: \"%s\"\n"
 msgstr "%s: nieprawid<69>owa nazwa: \"%s\"\n"

-#: src/chfn.c:467
+#: src/chfn.c:468
 #, c-format
 msgid "%s: invalid room number: \"%s\"\n"
 msgstr "%s: nieprawid<69>owy numer pokoju: \"%s\"\n"

-#: src/chfn.c:472
+#: src/chfn.c:473
 #, c-format
 msgid "%s: invalid work phone: \"%s\"\n"
 msgstr "%s: nieprawid<69>owy numer telefonu do pracy: \"%s\"\n"

-#: src/chfn.c:477
+#: src/chfn.c:478
 #, c-format
 msgid "%s: invalid home phone: \"%s\"\n"
 msgstr "%s: nieprawid<69>owy numer telefonu domowego: \"%s\"\n"

-#: src/chfn.c:482
+#: src/chfn.c:483
 #, c-format
 msgid "%s: \"%s\" contains illegal characters\n"
 msgstr "%s: \"%s\" zawiera nieprawid<69>owe znaki\n"

-#: src/chfn.c:494
+#: src/chfn.c:495
 #, c-format
 msgid "%s: fields too long\n"
 msgstr "%s: pola zbyt d<>ugie\n"

-#: src/chfn.c:509 src/chsh.c:347 src/gpasswd.c:582 src/passwd.c:1388
+#: src/chfn.c:510 src/chsh.c:348 src/gpasswd.c:582 src/passwd.c:1388
 msgid "Cannot change ID to root.\n"
 msgstr "Nie mog<6F> zmieni<6E> ID na root.\n"

-#: src/chfn.c:522 src/chsh.c:361 src/passwd.c:735 src/passwd.c:880
+#: src/chfn.c:523 src/chsh.c:362 src/passwd.c:735 src/passwd.c:880
 msgid "Cannot lock the password file; try again later.\n"
 msgstr "Nie mog<6F> zablokowa<77> pliku z has<61>ami; spr<70>buj p<><70>niej.\n"

-#: src/chfn.c:528 src/chsh.c:367 src/passwd.c:740 src/passwd.c:885
+#: src/chfn.c:529 src/chsh.c:368 src/passwd.c:740 src/passwd.c:885
 msgid "Cannot open the password file.\n"
 msgstr "Nie mog<6F> otworzy<7A> pliku z has<61>ami.\n"

-#: src/chfn.c:545 src/chsh.c:382 src/passwd.c:746 src/usermod.c:1313
+#: src/chfn.c:546 src/chsh.c:383 src/passwd.c:746 src/usermod.c:1271
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: %s nie znaleziony w /etc/passwd\n"

-#: src/chfn.c:562 src/chsh.c:401 src/passwd.c:819 src/passwd.c:920
+#: src/chfn.c:563 src/chsh.c:402 src/passwd.c:819 src/passwd.c:920
 #: src/passwd.c:960
 msgid "Error updating the password entry.\n"
 msgstr "B<><42>d podczas aktualizacji wpisu do bazy hase<73>.\n"

-#: src/chfn.c:585 src/chsh.c:424 src/passwd.c:832 src/passwd.c:933
+#: src/chfn.c:586 src/chsh.c:425 src/passwd.c:832 src/passwd.c:933
 msgid "Cannot commit password file changes.\n"
 msgstr "Wprowadzenie zmian do pliku passwd jest niemo<6D>liwe.\n"

-#: src/chfn.c:592 src/chsh.c:431
+#: src/chfn.c:593 src/chsh.c:432
 msgid "Cannot unlock the password file.\n"
 msgstr "Nie mog<6F> usun<75>c blokady z pliku z has<61>ami.\n"

@@ -630,22 +630,22 @@ msgstr "U
 msgid "Login Shell"
 msgstr "Pow<6F>oka logowania"

-#: src/chsh.c:273 src/chsh.c:286
+#: src/chsh.c:274 src/chsh.c:287
 #, c-format
 msgid "You may not change the shell for %s.\n"
 msgstr "Nie mo<6D>esz zmienia<69> pow<6F>oki dla %s.\n"

-#: src/chsh.c:315
+#: src/chsh.c:316
 #, c-format
 msgid "Changing the login shell for %s\n"
 msgstr "Zmieniam pow<6F>ok<6F> logowania dla %s\n"

-#: src/chsh.c:327
+#: src/chsh.c:328
 #, c-format
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Nieprawid<69>owy wpis: %s\n"

-#: src/chsh.c:332
+#: src/chsh.c:333
 #, c-format
 msgid "%s is an invalid shell.\n"
 msgstr "%s jest nieprawid<69>ow<6F> pow<6F>ok<6F>.\n"
@@ -878,13 +878,13 @@ msgid "usage: groupadd [-g gid [-o]] group\n"
 msgstr "u<>ycie: groupadd [-g gid [-o]] grupa\n"

 #: src/groupadd.c:173 src/groupadd.c:196 src/groupmod.c:183 src/groupmod.c:230
-#: src/useradd.c:931 src/usermod.c:539 src/usermod.c:675
+#: src/useradd.c:931 src/usermod.c:512 src/usermod.c:648
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s: b<><62>d podczas dodawania nowej grupy\n"

 #: src/groupadd.c:183 src/groupadd.c:206 src/groupmod.c:199 src/useradd.c:942
-#: src/usermod.c:551 src/usermod.c:687
+#: src/usermod.c:524 src/usermod.c:660
 #, c-format
 msgid "%s: cannot add new dbm group entry\n"
 msgstr "%s: nie mog<6F> doda<64> nowego wpisu do bazy dbm grup\n"
@@ -923,13 +923,13 @@ msgid "%s: -O requires NAME=VALUE\n"
 msgstr "%s: -O wymaga ZMIENNA=WARTO<54><4F>\n"

 #: src/groupadd.c:412 src/groupdel.c:167 src/groupmod.c:403 src/useradd.c:1381
-#: src/userdel.c:303 src/usermod.c:563
+#: src/userdel.c:303 src/usermod.c:536
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s: nie mog<6F> przepisa<73> pliku z grupami\n"

 #: src/groupadd.c:418 src/groupdel.c:173 src/groupmod.c:409 src/useradd.c:1389
-#: src/userdel.c:309 src/usermod.c:700
+#: src/userdel.c:309 src/usermod.c:673
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s: nie mog<6F> przepisa<73> pliku z ukrytymi grupami\n"
@@ -1001,7 +1001,7 @@ msgstr "%s: grupa %s nie isnieje\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s: grupa %s jest grup<75> NIS\n"

-#: src/groupdel.c:325 src/groupmod.c:523 src/userdel.c:761 src/usermod.c:1016
+#: src/groupdel.c:325 src/groupmod.c:523 src/userdel.c:761 src/usermod.c:989
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s jest g<><67>wnym serwerem NIS\n"
@@ -1890,7 +1890,7 @@ msgstr "%s: przebuduj baz
 msgid "%s: rebuild the shadow group database\n"
 msgstr "%s: przebuduj baz<61> przes<65>oni<6E>tych hase<73>\n"

-#: src/useradd.c:287 src/usermod.c:967
+#: src/useradd.c:287 src/usermod.c:940
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s: nieprawid<69>owy argument numeryczny `%s'\n"
@@ -1900,8 +1900,8 @@ msgstr "%s: nieprawid
 msgid "%s: unknown gid %s\n"
 msgstr "%s: nieznany gid %s\n"

-#: src/useradd.c:350 src/useradd.c:642 src/useradd.c:1228 src/usermod.c:254
-#: src/usermod.c:1098
+#: src/useradd.c:350 src/useradd.c:642 src/useradd.c:1228 src/usermod.c:252
+#: src/usermod.c:1071
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s: nieznana grupa %s\n"
@@ -1961,17 +1961,17 @@ msgstr "%s: nie mog
 msgid "%s: rename: %s"
 msgstr "%s: zmiana nazwy: %s"

-#: src/useradd.c:662 src/usermod.c:274
+#: src/useradd.c:662 src/usermod.c:272
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s: grupa `%s' jest grup<75> NIS.\n"

-#: src/useradd.c:670 src/usermod.c:282
+#: src/useradd.c:670 src/usermod.c:280
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: podano zbyt wiele grup (maks %d).\n"

-#: src/useradd.c:702 src/usermod.c:314
+#: src/useradd.c:702 src/usermod.c:312
 #, c-format
 msgid "usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
 msgstr "u<>ycie: %s\t[-u uid [-o]] [-g grupa] [-G grupa,...] \n"
@@ -1980,7 +1980,7 @@ msgstr "u
 msgid "\t\t[-d home] [-s shell] [-c comment] [-m [-k template]]\n"
 msgstr "\t\t[-d kat_dom] [-s pow<6F>oka] [-c komentarz] [-m [-k wz<77>r]]\n"

-#: src/useradd.c:708 src/usermod.c:320
+#: src/useradd.c:708 src/usermod.c:318
 msgid "[-f inactive] [-e expire ] "
 msgstr "[-f nieaktywne] [-e utrata_wa<77>no<6E>ci ]"

@@ -1988,7 +1988,7 @@ msgstr "[-f nieaktywne] [-e utrata_wa
 msgid "[-A program] "
 msgstr "[-A program] "

-#: src/useradd.c:713
+#: src/useradd.c:713 src/usermod.c:323
 msgid "[-p passwd] name\n"
 msgstr "[-p has<61>o] nazwa\n"

@@ -2001,22 +2001,22 @@ msgstr "       %s\t-D [-g grupa] [-b baza] [-s pow
 msgid "\t\t[-f inactive] [-e expire ]\n"
 msgstr "\t\t[-f nieaktywne] [-e utrata_wa<77>no<6E>ci ]\n"

-#: src/useradd.c:815 src/usermod.c:472
+#: src/useradd.c:815 src/usermod.c:445
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s: b<><62>d podczas blokowania pliku z grupami\n"

-#: src/useradd.c:819 src/usermod.c:477
+#: src/useradd.c:819 src/usermod.c:450
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s: b<><62>d podczas otwierania pliku z grupami\n"

-#: src/useradd.c:824 src/usermod.c:584
+#: src/useradd.c:824 src/usermod.c:557
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s: b<><62>d podczas blokowania pliku z ukrytymi has<61>ami\n"

-#: src/useradd.c:829 src/usermod.c:590
+#: src/useradd.c:829 src/usermod.c:563
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s: b<><62>d podczas otwierania pliku z ukrytymi grupami\n"
@@ -2031,8 +2031,8 @@ msgstr "%s: uid %d nie jest niepowtarzalny\n"
 msgid "%s: can't get unique uid\n"
 msgstr "%s: nie mog<6F> uzyska<6B> niepowtarzalnego uid\n"

-#: src/useradd.c:1139 src/useradd.c:1283 src/usermod.c:1046 src/usermod.c:1057
-#: src/usermod.c:1067 src/usermod.c:1113 src/usermod.c:1157
+#: src/useradd.c:1139 src/useradd.c:1283 src/usermod.c:1019 src/usermod.c:1030
+#: src/usermod.c:1040 src/usermod.c:1086 src/usermod.c:1121
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s: nieprawid<69>owe pole `%s'\n"
@@ -2052,7 +2052,7 @@ msgstr "%s: nieprawid
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s: nieprawid<69>owy katalog domowy `%s'\n"

-#: src/useradd.c:1191 src/usermod.c:1080
+#: src/useradd.c:1191 src/usermod.c:1053
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s: nieprawid<69>owa data `%s'\n"
@@ -2077,37 +2077,37 @@ msgstr "%s: nieprawid
 msgid "%s: invalid user name `%s'\n"
 msgstr "%s: nieprawid<69>owa nazwa u<>ytkownika `%s'\n"

-#: src/useradd.c:1369 src/userdel.c:292 src/usermod.c:1225
+#: src/useradd.c:1369 src/userdel.c:292 src/usermod.c:1183
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s: nie mog<6F> przepisa<73> pliku z has<61>ami\n"

-#: src/useradd.c:1374 src/userdel.c:295 src/usermod.c:1230
+#: src/useradd.c:1374 src/userdel.c:295 src/usermod.c:1188
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s: nie mog<6F> przepisa<73> pliku z ukrytymi has<61>ami\n"

-#: src/useradd.c:1414 src/userdel.c:359 src/usermod.c:1265
+#: src/useradd.c:1414 src/userdel.c:359 src/usermod.c:1223
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s: nie mog<6F> zablokowa<77> pliku z has<61>ami\n"

-#: src/useradd.c:1418 src/userdel.c:363 src/usermod.c:1269
+#: src/useradd.c:1418 src/userdel.c:363 src/usermod.c:1227
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s: nie mog<6F> otworzy<7A> pliku z has<61>ami\n"

-#: src/useradd.c:1424 src/userdel.c:368 src/usermod.c:1274
+#: src/useradd.c:1424 src/userdel.c:368 src/usermod.c:1232
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s: nie mog<6F> zablokowa<77> pliku z ukrytymi has<61>ami\n"

-#: src/useradd.c:1430 src/userdel.c:373 src/usermod.c:1279
+#: src/useradd.c:1430 src/userdel.c:373 src/usermod.c:1237
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s: nie mog<6F> otworzy<7A> pliku z ukrytymi has<61>ami\n"

-#: src/useradd.c:1529 src/usermod.c:1366
+#: src/useradd.c:1529 src/usermod.c:1324
 #, c-format
 msgid "%s: error adding authentication method\n"
 msgstr "%s: b<><62>d podczas dodawania metody uwierzytelniania\n"
@@ -2122,12 +2122,12 @@ msgstr "%s: b
 msgid "%s: error updating password dbm entry\n"
 msgstr "%s: b<><62>d podczas aktualizacji wpisu dbm do pliku z has<61>ami\n"

-#: src/useradd.c:1583 src/usermod.c:1425
+#: src/useradd.c:1583 src/usermod.c:1383
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr "%s: b<><62>d podczas dodawania nowego wpisu do pliku z ukrytymi has<61>ami\n"

-#: src/useradd.c:1599 src/usermod.c:1440
+#: src/useradd.c:1599 src/usermod.c:1398
 #, c-format
 msgid "%s: error updating shadow passwd dbm entry\n"
 msgstr "%s: b<><62>d podczas aktualizacji wpisu dbm do pliku z ukrytymi has<61>ami\n"
@@ -2137,7 +2137,7 @@ msgstr "%s: b
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: nie mog<6F> utworzy<7A> katalogu %s\n"

-#: src/useradd.c:1708 src/usermod.c:1203
+#: src/useradd.c:1708 src/usermod.c:1161
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s: u<>ytkownik %s istnieje\n"
@@ -2237,12 +2237,12 @@ msgstr "%s: ostrze
 msgid "%s: warning: can't remove "
 msgstr "%s: ostrze<7A>enie: nie mog<6F> usun<75><6E> "

-#: src/userdel.c:741 src/usermod.c:994
+#: src/userdel.c:741 src/usermod.c:967
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s: u<>ytkownik %s nie istnieje\n"

-#: src/userdel.c:755 src/usermod.c:1010
+#: src/userdel.c:755 src/usermod.c:983
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: u<>ytkownik %s jest u<>ytkownikiem NIS\n"
@@ -2262,115 +2262,110 @@ msgstr "%s: nie usuwam katalogu %s (would remove home of user %s)\n"
 msgid "%s: error removing directory %s\n"
 msgstr "%s: b<><62>d podczas usuwania katalogu %s\n"

-#: src/usermod.c:317
+#: src/usermod.c:315
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr "\t\t[-d kat_dom [-m]] [-s pow<6F>oka] [-c komentarz] [-l nowa_nazwa]\n"

-#: src/usermod.c:323
+#: src/usermod.c:321
 msgid "[-A {DEFAULT|program},... ] "
 msgstr "[-A {DEFAULT|program},... ] "

-#: src/usermod.c:325
-#, fuzzy
-msgid "[-p passwd] [-L|-U] name\n"
-msgstr "[-p has<61>o] nazwa\n"
-
-#: src/usermod.c:504
+#: src/usermod.c:477
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s: zabrak<61>o pami<6D>ci w pdate_group\n"

-#: src/usermod.c:627
+#: src/usermod.c:600
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s: zabrak<61>o pami<6D>ci w update_gshadow\n"

-#: src/usermod.c:1180
+#: src/usermod.c:1138
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: nie podano flag\n"

-#: src/usermod.c:1187
+#: src/usermod.c:1145
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: ukryte has<61>a wymagane dla -e i -f\n"

-#: src/usermod.c:1208
+#: src/usermod.c:1166
 #, c-format
 msgid "%s: uid %ld is not unique\n"
 msgstr "%s: uid %ld nie jest niepowtarzalny\n"

-#: src/usermod.c:1356
+#: src/usermod.c:1314
 #, c-format
 msgid "%s: error deleting authentication method\n"
 msgstr "%s: b<><62>d podczas usuwania metody uwierzytelniania\n"

-#: src/usermod.c:1376
+#: src/usermod.c:1334
 #, c-format
 msgid "%s: error changing authentication method\n"
 msgstr "%s: b<><62>d podczas zmiany metody uwierzytelniania\n"

-#: src/usermod.c:1393
+#: src/usermod.c:1351
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s: b<><62>d podczas zmiany wpisu w pliku z has<61>ami\n"

-#: src/usermod.c:1399
+#: src/usermod.c:1357
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s: b<><62>d podczas usuwania wpisu z pliku z has<61>ami\n"

-#: src/usermod.c:1407
+#: src/usermod.c:1365
 #, c-format
 msgid "%s: error adding password dbm entry\n"
 msgstr "%s: b<><62>d podczas dodawania wpisu dbm do pliku z has<61>ami\n"

-#: src/usermod.c:1414
+#: src/usermod.c:1372
 #, c-format
 msgid "%s: error removing passwd dbm entry\n"
 msgstr "%s: b<><62>d podczas usuwania wpisu dbm z pliku z has<61>ami\n"

-#: src/usermod.c:1431
+#: src/usermod.c:1389
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr "%s: b<><62>d podczas usuwania wpisu z pliku z ukrytymi has<61>ami\n"

-#: src/usermod.c:1446
+#: src/usermod.c:1404
 #, c-format
 msgid "%s: error removing shadow passwd dbm entry\n"
 msgstr "%s: b<><62>d podczas usuwania wpisu dbm z pliku z ukrytymi has<61>ami\n"

-#: src/usermod.c:1477
+#: src/usermod.c:1435
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: katalog %s isnieje\n"

-#: src/usermod.c:1484
+#: src/usermod.c:1442
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s: nie mog<6F> utworzy<7A> %s\n"

-#: src/usermod.c:1490
+#: src/usermod.c:1448
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s: nie mog<6F> zmieni<6E> w<>a<EFBFBD>ciciela %s\n"

-#: src/usermod.c:1506
+#: src/usermod.c:1464
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s: nie mog<6F> zmieni<6E> nazwy katalogu z %s na %s\n"

 #. better leave it alone
-#: src/usermod.c:1603
+#: src/usermod.c:1561
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: ostrze<7A>enie: w<>a<EFBFBD>cicielem %s nie jest %s\n"

-#: src/usermod.c:1609
+#: src/usermod.c:1567
 msgid "failed to change mailbox owner"
 msgstr "nie powiod<6F>a si<73> zmiana w<>a<EFBFBD>ciciela skrzynki pocztowej"

-#: src/usermod.c:1616
+#: src/usermod.c:1574
 msgid "failed to rename mailbox"
 msgstr "zmiana nazwy skrzynki pocztowej nie powiod<6F>a si<73>"

--- a/po/shadow.pot
+++ b/po/shadow.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-02 20:40+0200\n"
+"POT-Creation-Date: 2000-08-26 20:28+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"
@@ -223,45 +223,45 @@ msgstr ""
 msgid "Unknown error %d"
 msgstr ""

-#: src/chage.c:156
+#: src/chage.c:141
 #, c-format
 msgid ""
 "Usage: %s [ -l ] [ -m min_days ] [ -M max_days ] [ -W warn ]\n"
 "  [ -I inactive ] [ -E expire ] [ -d last_day ] user\n"
 msgstr ""

-#: src/chage.c:158
+#: src/chage.c:143
 #, c-format
 msgid "Usage: %s [ -l ] [ -m min_days ] [ -M max_days ] [ -d last_day ] user\n"
 msgstr ""

-#: src/chage.c:193
+#: src/chage.c:178
 msgid ""
 "Enter the new value, or press return for the default\n"
 "\n"
 msgstr ""

-#: src/chage.c:196
+#: src/chage.c:181
 msgid "Minimum Password Age"
 msgstr ""

-#: src/chage.c:201
+#: src/chage.c:186
 msgid "Maximum Password Age"
 msgstr ""

-#: src/chage.c:207
+#: src/chage.c:192
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr ""

-#: src/chage.c:216
+#: src/chage.c:201
 msgid "Password Expiration Warning"
 msgstr ""

-#: src/chage.c:221
+#: src/chage.c:206
 msgid "Password Inactive"
 msgstr ""

-#: src/chage.c:227
+#: src/chage.c:212
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr ""

@@ -273,22 +273,22 @@ msgstr ""
 #. * days after the password expires that the account becomes
 #. * unusable.
 #.
-#: src/chage.c:281
+#: src/chage.c:266
 #, c-format
 msgid "Minimum:\t%ld\n"
 msgstr ""

-#: src/chage.c:282
+#: src/chage.c:267
 #, c-format
 msgid "Maximum:\t%ld\n"
 msgstr ""

-#: src/chage.c:284
+#: src/chage.c:269
 #, c-format
 msgid "Warning:\t%ld\n"
 msgstr ""

-#: src/chage.c:285
+#: src/chage.c:270
 #, c-format
 msgid "Inactive:\t%ld\n"
 msgstr ""
@@ -298,11 +298,11 @@ msgstr ""
 #. * password was last modified.  The date is the number of
 #. * days since 1/1/1970.
 #.
-#: src/chage.c:294
+#: src/chage.c:279
 msgid "Last Change:\t\t"
 msgstr ""

-#: src/chage.c:296 src/chage.c:310 src/chage.c:327 src/chage.c:340
+#: src/chage.c:281 src/chage.c:295 src/chage.c:312 src/chage.c:325
 msgid "Never\n"
 msgstr ""

@@ -311,7 +311,7 @@ msgstr ""
 #. * change date plus the number of days the password is valid
 #. * for.
 #.
-#: src/chage.c:308
+#: src/chage.c:293
 msgid "Password Expires:\t"
 msgstr ""

@@ -321,7 +321,7 @@ msgstr ""
 #. * and the number of inactive days is added.  The resulting date
 #. * is when the active will be disabled.
 #.
-#: src/chage.c:324
+#: src/chage.c:309
 msgid "Password Inactive:\t"
 msgstr ""

@@ -329,81 +329,81 @@ msgstr ""
 #. * The account will expire on the given date regardless of the
 #. * password expiring or not.
 #.
-#: src/chage.c:338
+#: src/chage.c:323
 msgid "Account Expires:\t"
 msgstr ""

-#: src/chage.c:486
+#: src/chage.c:471
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr ""

-#: src/chage.c:498 src/chage.c:610 src/login.c:529
+#: src/chage.c:483 src/chage.c:595 src/login.c:529
 #, c-format
 msgid "%s: permission denied\n"
 msgstr ""

-#: src/chage.c:510 src/chpasswd.c:120
+#: src/chage.c:495 src/chpasswd.c:120
 #, c-format
 msgid "%s: can't lock password file\n"
 msgstr ""

-#: src/chage.c:516 src/chpasswd.c:124
+#: src/chage.c:501 src/chpasswd.c:124
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr ""

-#: src/chage.c:523
+#: src/chage.c:508
 #, c-format
 msgid "%s: unknown user: %s\n"
 msgstr ""

-#: src/chage.c:542
+#: src/chage.c:527
 #, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr ""

-#: src/chage.c:549
+#: src/chage.c:534
 #, c-format
 msgid "%s: can't open shadow password file\n"
 msgstr ""

-#: src/chage.c:631
+#: src/chage.c:616
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr ""

-#: src/chage.c:633
+#: src/chage.c:618
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr ""

-#: src/chage.c:660 src/chage.c:723 src/pwunconv.c:183
+#: src/chage.c:645 src/chage.c:708 src/pwunconv.c:183
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr ""

-#: src/chage.c:690 src/pwunconv.c:178
+#: src/chage.c:675 src/pwunconv.c:178
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr ""

-#: src/chage.c:739 src/chage.c:754 src/chfn.c:570 src/chsh.c:409
+#: src/chage.c:724 src/chage.c:739 src/chfn.c:571 src/chsh.c:410
 #: src/passwd.c:825 src/passwd.c:926
 msgid "Error updating the DBM password entry.\n"
 msgstr ""

-#: src/chage.c:771
+#: src/chage.c:756
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr ""

-#: src/chage.c:785
+#: src/chage.c:770
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr ""

-#: src/chage.c:836
+#: src/chage.c:821
 #, c-format
 msgid "%s: no aging information present\n"
 msgstr ""
@@ -465,94 +465,94 @@ msgstr ""
 msgid "Other"
 msgstr ""

-#: src/chfn.c:298 src/chfn.c:306 src/chfn.c:314 src/chfn.c:322 src/chfn.c:330
-#: src/chfn.c:391 src/passwd.c:1226
+#: src/chfn.c:299 src/chfn.c:307 src/chfn.c:315 src/chfn.c:323 src/chfn.c:331
+#: src/chfn.c:392 src/passwd.c:1226
 #, c-format
 msgid "%s: Permission denied.\n"
 msgstr ""

-#: src/chfn.c:351 src/chsh.c:224 src/passwd.c:1277
+#: src/chfn.c:352 src/chsh.c:225 src/passwd.c:1277
 #, c-format
 msgid "%s: Unknown user %s\n"
 msgstr ""

-#: src/chfn.c:357 src/chsh.c:232 src/passwd.c:1207
+#: src/chfn.c:358 src/chsh.c:233 src/passwd.c:1207
 #, c-format
 msgid "%s: Cannot determine your user name.\n"
 msgstr ""

-#: src/chfn.c:373 src/chsh.c:250
+#: src/chfn.c:374 src/chsh.c:251
 #, c-format
 msgid "%s: cannot change user `%s' on NIS client.\n"
 msgstr ""

-#: src/chfn.c:378 src/chsh.c:257
+#: src/chfn.c:379 src/chsh.c:258
 #, c-format
 msgid "%s: `%s' is the NIS master for this client.\n"
 msgstr ""

-#: src/chfn.c:453
+#: src/chfn.c:454
 #, c-format
 msgid "Changing the user information for %s\n"
 msgstr ""

-#: src/chfn.c:462
+#: src/chfn.c:463
 #, c-format
 msgid "%s: invalid name: \"%s\"\n"
 msgstr ""

-#: src/chfn.c:467
+#: src/chfn.c:468
 #, c-format
 msgid "%s: invalid room number: \"%s\"\n"
 msgstr ""

-#: src/chfn.c:472
+#: src/chfn.c:473
 #, c-format
 msgid "%s: invalid work phone: \"%s\"\n"
 msgstr ""

-#: src/chfn.c:477
+#: src/chfn.c:478
 #, c-format
 msgid "%s: invalid home phone: \"%s\"\n"
 msgstr ""

-#: src/chfn.c:482
+#: src/chfn.c:483
 #, c-format
 msgid "%s: \"%s\" contains illegal characters\n"
 msgstr ""

-#: src/chfn.c:494
+#: src/chfn.c:495
 #, c-format
 msgid "%s: fields too long\n"
 msgstr ""

-#: src/chfn.c:509 src/chsh.c:347 src/gpasswd.c:582 src/passwd.c:1388
+#: src/chfn.c:510 src/chsh.c:348 src/gpasswd.c:582 src/passwd.c:1388
 msgid "Cannot change ID to root.\n"
 msgstr ""

-#: src/chfn.c:522 src/chsh.c:361 src/passwd.c:735 src/passwd.c:880
+#: src/chfn.c:523 src/chsh.c:362 src/passwd.c:735 src/passwd.c:880
 msgid "Cannot lock the password file; try again later.\n"
 msgstr ""

-#: src/chfn.c:528 src/chsh.c:367 src/passwd.c:740 src/passwd.c:885
+#: src/chfn.c:529 src/chsh.c:368 src/passwd.c:740 src/passwd.c:885
 msgid "Cannot open the password file.\n"
 msgstr ""

-#: src/chfn.c:545 src/chsh.c:382 src/passwd.c:746 src/usermod.c:1313
+#: src/chfn.c:546 src/chsh.c:383 src/passwd.c:746 src/usermod.c:1271
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr ""

-#: src/chfn.c:562 src/chsh.c:401 src/passwd.c:819 src/passwd.c:920
+#: src/chfn.c:563 src/chsh.c:402 src/passwd.c:819 src/passwd.c:920
 #: src/passwd.c:960
 msgid "Error updating the password entry.\n"
 msgstr ""

-#: src/chfn.c:585 src/chsh.c:424 src/passwd.c:832 src/passwd.c:933
+#: src/chfn.c:586 src/chsh.c:425 src/passwd.c:832 src/passwd.c:933
 msgid "Cannot commit password file changes.\n"
 msgstr ""

-#: src/chfn.c:592 src/chsh.c:431
+#: src/chfn.c:593 src/chsh.c:432
 msgid "Cannot unlock the password file.\n"
 msgstr ""

@@ -616,22 +616,22 @@ msgstr ""
 msgid "Login Shell"
 msgstr ""

-#: src/chsh.c:273 src/chsh.c:286
+#: src/chsh.c:274 src/chsh.c:287
 #, c-format
 msgid "You may not change the shell for %s.\n"
 msgstr ""

-#: src/chsh.c:315
+#: src/chsh.c:316
 #, c-format
 msgid "Changing the login shell for %s\n"
 msgstr ""

-#: src/chsh.c:327
+#: src/chsh.c:328
 #, c-format
 msgid "%s: Invalid entry: %s\n"
 msgstr ""

-#: src/chsh.c:332
+#: src/chsh.c:333
 #, c-format
 msgid "%s is an invalid shell.\n"
 msgstr ""
@@ -864,13 +864,13 @@ msgid "usage: groupadd [-g gid [-o]] group\n"
 msgstr ""

 #: src/groupadd.c:173 src/groupadd.c:196 src/groupmod.c:183 src/groupmod.c:230
-#: src/useradd.c:931 src/usermod.c:539 src/usermod.c:675
+#: src/useradd.c:931 src/usermod.c:512 src/usermod.c:648
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr ""

 #: src/groupadd.c:183 src/groupadd.c:206 src/groupmod.c:199 src/useradd.c:942
-#: src/usermod.c:551 src/usermod.c:687
+#: src/usermod.c:524 src/usermod.c:660
 #, c-format
 msgid "%s: cannot add new dbm group entry\n"
 msgstr ""
@@ -909,13 +909,13 @@ msgid "%s: -O requires NAME=VALUE\n"
 msgstr ""

 #: src/groupadd.c:412 src/groupdel.c:167 src/groupmod.c:403 src/useradd.c:1381
-#: src/userdel.c:303 src/usermod.c:563
+#: src/userdel.c:303 src/usermod.c:536
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr ""

 #: src/groupadd.c:418 src/groupdel.c:173 src/groupmod.c:409 src/useradd.c:1389
-#: src/userdel.c:309 src/usermod.c:700
+#: src/userdel.c:309 src/usermod.c:673
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr ""
@@ -987,7 +987,7 @@ msgstr ""
 msgid "%s: group %s is a NIS group\n"
 msgstr ""

-#: src/groupdel.c:325 src/groupmod.c:523 src/userdel.c:761 src/usermod.c:1016
+#: src/groupdel.c:325 src/groupmod.c:523 src/userdel.c:761 src/usermod.c:989
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr ""
@@ -1857,7 +1857,7 @@ msgstr ""
 msgid "%s: rebuild the shadow group database\n"
 msgstr ""

-#: src/useradd.c:287 src/usermod.c:967
+#: src/useradd.c:287 src/usermod.c:940
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr ""
@@ -1867,8 +1867,8 @@ msgstr ""
 msgid "%s: unknown gid %s\n"
 msgstr ""

-#: src/useradd.c:350 src/useradd.c:642 src/useradd.c:1228 src/usermod.c:254
-#: src/usermod.c:1098
+#: src/useradd.c:350 src/useradd.c:642 src/useradd.c:1228 src/usermod.c:252
+#: src/usermod.c:1071
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr ""
@@ -1928,17 +1928,17 @@ msgstr ""
 msgid "%s: rename: %s"
 msgstr ""

-#: src/useradd.c:662 src/usermod.c:274
+#: src/useradd.c:662 src/usermod.c:272
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr ""

-#: src/useradd.c:670 src/usermod.c:282
+#: src/useradd.c:670 src/usermod.c:280
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr ""

-#: src/useradd.c:702 src/usermod.c:314
+#: src/useradd.c:702 src/usermod.c:312
 #, c-format
 msgid "usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
 msgstr ""
@@ -1947,7 +1947,7 @@ msgstr ""
 msgid "\t\t[-d home] [-s shell] [-c comment] [-m [-k template]]\n"
 msgstr ""

-#: src/useradd.c:708 src/usermod.c:320
+#: src/useradd.c:708 src/usermod.c:318
 msgid "[-f inactive] [-e expire ] "
 msgstr ""

@@ -1955,7 +1955,7 @@ msgstr ""
 msgid "[-A program] "
 msgstr ""

-#: src/useradd.c:713
+#: src/useradd.c:713 src/usermod.c:323
 msgid "[-p passwd] name\n"
 msgstr ""

@@ -1968,22 +1968,22 @@ msgstr ""
 msgid "\t\t[-f inactive] [-e expire ]\n"
 msgstr ""

-#: src/useradd.c:815 src/usermod.c:472
+#: src/useradd.c:815 src/usermod.c:445
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr ""

-#: src/useradd.c:819 src/usermod.c:477
+#: src/useradd.c:819 src/usermod.c:450
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr ""

-#: src/useradd.c:824 src/usermod.c:584
+#: src/useradd.c:824 src/usermod.c:557
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr ""

-#: src/useradd.c:829 src/usermod.c:590
+#: src/useradd.c:829 src/usermod.c:563
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr ""
@@ -1998,8 +1998,8 @@ msgstr ""
 msgid "%s: can't get unique uid\n"
 msgstr ""

-#: src/useradd.c:1139 src/useradd.c:1283 src/usermod.c:1046 src/usermod.c:1057
-#: src/usermod.c:1067 src/usermod.c:1113 src/usermod.c:1157
+#: src/useradd.c:1139 src/useradd.c:1283 src/usermod.c:1019 src/usermod.c:1030
+#: src/usermod.c:1040 src/usermod.c:1086 src/usermod.c:1121
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr ""
@@ -2019,7 +2019,7 @@ msgstr ""
 msgid "%s: invalid home directory `%s'\n"
 msgstr ""

-#: src/useradd.c:1191 src/usermod.c:1080
+#: src/useradd.c:1191 src/usermod.c:1053
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr ""
@@ -2044,37 +2044,37 @@ msgstr ""
 msgid "%s: invalid user name `%s'\n"
 msgstr ""

-#: src/useradd.c:1369 src/userdel.c:292 src/usermod.c:1225
+#: src/useradd.c:1369 src/userdel.c:292 src/usermod.c:1183
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr ""

-#: src/useradd.c:1374 src/userdel.c:295 src/usermod.c:1230
+#: src/useradd.c:1374 src/userdel.c:295 src/usermod.c:1188
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr ""

-#: src/useradd.c:1414 src/userdel.c:359 src/usermod.c:1265
+#: src/useradd.c:1414 src/userdel.c:359 src/usermod.c:1223
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr ""

-#: src/useradd.c:1418 src/userdel.c:363 src/usermod.c:1269
+#: src/useradd.c:1418 src/userdel.c:363 src/usermod.c:1227
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr ""

-#: src/useradd.c:1424 src/userdel.c:368 src/usermod.c:1274
+#: src/useradd.c:1424 src/userdel.c:368 src/usermod.c:1232
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr ""

-#: src/useradd.c:1430 src/userdel.c:373 src/usermod.c:1279
+#: src/useradd.c:1430 src/userdel.c:373 src/usermod.c:1237
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr ""

-#: src/useradd.c:1529 src/usermod.c:1366
+#: src/useradd.c:1529 src/usermod.c:1324
 #, c-format
 msgid "%s: error adding authentication method\n"
 msgstr ""
@@ -2089,12 +2089,12 @@ msgstr ""
 msgid "%s: error updating password dbm entry\n"
 msgstr ""

-#: src/useradd.c:1583 src/usermod.c:1425
+#: src/useradd.c:1583 src/usermod.c:1383
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr ""

-#: src/useradd.c:1599 src/usermod.c:1440
+#: src/useradd.c:1599 src/usermod.c:1398
 #, c-format
 msgid "%s: error updating shadow passwd dbm entry\n"
 msgstr ""
@@ -2104,7 +2104,7 @@ msgstr ""
 msgid "%s: cannot create directory %s\n"
 msgstr ""

-#: src/useradd.c:1708 src/usermod.c:1203
+#: src/useradd.c:1708 src/usermod.c:1161
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr ""
@@ -2204,12 +2204,12 @@ msgstr ""
 msgid "%s: warning: can't remove "
 msgstr ""

-#: src/userdel.c:741 src/usermod.c:994
+#: src/userdel.c:741 src/usermod.c:967
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr ""

-#: src/userdel.c:755 src/usermod.c:1010
+#: src/userdel.c:755 src/usermod.c:983
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr ""
@@ -2229,114 +2229,110 @@ msgstr ""
 msgid "%s: error removing directory %s\n"
 msgstr ""

-#: src/usermod.c:317
+#: src/usermod.c:315
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr ""

-#: src/usermod.c:323
+#: src/usermod.c:321
 msgid "[-A {DEFAULT|program},... ] "
 msgstr ""

-#: src/usermod.c:325
-msgid "[-p passwd] [-L|-U] name\n"
-msgstr ""
-
-#: src/usermod.c:504
+#: src/usermod.c:477
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr ""

-#: src/usermod.c:627
+#: src/usermod.c:600
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr ""

-#: src/usermod.c:1180
+#: src/usermod.c:1138
 #, c-format
 msgid "%s: no flags given\n"
 msgstr ""

-#: src/usermod.c:1187
+#: src/usermod.c:1145
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr ""

-#: src/usermod.c:1208
+#: src/usermod.c:1166
 #, c-format
 msgid "%s: uid %ld is not unique\n"
 msgstr ""

-#: src/usermod.c:1356
+#: src/usermod.c:1314
 #, c-format
 msgid "%s: error deleting authentication method\n"
 msgstr ""

-#: src/usermod.c:1376
+#: src/usermod.c:1334
 #, c-format
 msgid "%s: error changing authentication method\n"
 msgstr ""

-#: src/usermod.c:1393
+#: src/usermod.c:1351
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr ""

-#: src/usermod.c:1399
+#: src/usermod.c:1357
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr ""

-#: src/usermod.c:1407
+#: src/usermod.c:1365
 #, c-format
 msgid "%s: error adding password dbm entry\n"
 msgstr ""

-#: src/usermod.c:1414
+#: src/usermod.c:1372
 #, c-format
 msgid "%s: error removing passwd dbm entry\n"
 msgstr ""

-#: src/usermod.c:1431
+#: src/usermod.c:1389
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr ""

-#: src/usermod.c:1446
+#: src/usermod.c:1404
 #, c-format
 msgid "%s: error removing shadow passwd dbm entry\n"
 msgstr ""

-#: src/usermod.c:1477
+#: src/usermod.c:1435
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr ""

-#: src/usermod.c:1484
+#: src/usermod.c:1442
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr ""

-#: src/usermod.c:1490
+#: src/usermod.c:1448
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr ""

-#: src/usermod.c:1506
+#: src/usermod.c:1464
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr ""

 #. better leave it alone
-#: src/usermod.c:1603
+#: src/usermod.c:1561
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr ""

-#: src/usermod.c:1609
+#: src/usermod.c:1567
 msgid "failed to change mailbox owner"
 msgstr ""

-#: src/usermod.c:1616
+#: src/usermod.c:1574
 msgid "failed to rename mailbox"
 msgstr ""

--- a/po/sv.po
+++ b/po/sv.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: shadow 19990709\n"
-"POT-Creation-Date: 2000-09-02 20:40+0200\n"
+"POT-Creation-Date: 2000-08-26 20:28+0200\n"
 "PO-Revision-Date: 1999-08-16 21:20+0100\n"
 "Last-Translator: Kristoffer Br<42>nemyr <ztion@swipnet.se>\n"
 "Language-Team: sv <sv@li.org>\n"
@@ -224,7 +224,7 @@ msgstr ""
 msgid "Unknown error %d"
 msgstr "Ok<4F>nt fel %d"

-#: src/chage.c:156
+#: src/chage.c:141
 #, c-format
 msgid ""
 "Usage: %s [ -l ] [ -m min_days ] [ -M max_days ] [ -W warn ]\n"
@@ -233,14 +233,14 @@ msgstr ""
 "Anv<6E>ndning: %s [ -l ] [ -m min_dagar ] [ -M max_dagar ] [ -W varna ]\n"
 "  [ -I inaktiv ] [ -E utg<74>ng ] [ -d senaste_dag ] anv<6E>ndare\n"

-#: src/chage.c:158
+#: src/chage.c:143
 #, c-format
 msgid "Usage: %s [ -l ] [ -m min_days ] [ -M max_days ] [ -d last_day ] user\n"
 msgstr ""
 "Anv<6E>ndning: %s [ -l ] [ -m min_dagar ] [ -M max_dagar ] [ -d senaste_dag ] "
 "anv<6E>ndare\n"

-#: src/chage.c:193
+#: src/chage.c:178
 msgid ""
 "Enter the new value, or press return for the default\n"
 "\n"
@@ -248,27 +248,27 @@ msgstr ""
 "Skriv in det nya v<>rdet, eller tryck p<> return f<>r standardv<64>rdet\n"
 "\n"

-#: src/chage.c:196
+#: src/chage.c:181
 msgid "Minimum Password Age"
 msgstr "Minsta l<>senords<64>lder"

-#: src/chage.c:201
+#: src/chage.c:186
 msgid "Maximum Password Age"
 msgstr "H<>gsta l<>senords<64>lder"

-#: src/chage.c:207
+#: src/chage.c:192
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "Senaste l<>senords<64>ndring (<28><><EFBFBD><EFBFBD>-MM-DD)"

-#: src/chage.c:216
+#: src/chage.c:201
 msgid "Password Expiration Warning"
 msgstr "L<>senords upph<70>rningsvarning"

-#: src/chage.c:221
+#: src/chage.c:206
 msgid "Password Inactive"
 msgstr "L<>senord inaktivt"

-#: src/chage.c:227
+#: src/chage.c:212
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Kontot upph<70>r (<28><><EFBFBD><EFBFBD>-MM-DD)"

@@ -280,22 +280,22 @@ msgstr "Kontot upph
 #. * days after the password expires that the account becomes
 #. * unusable.
 #.
-#: src/chage.c:281
+#: src/chage.c:266
 #, c-format
 msgid "Minimum:\t%ld\n"
 msgstr "Minst:\t%ld\n"

-#: src/chage.c:282
+#: src/chage.c:267
 #, c-format
 msgid "Maximum:\t%ld\n"
 msgstr "H<>gst:\t%ld\n"

-#: src/chage.c:284
+#: src/chage.c:269
 #, c-format
 msgid "Warning:\t%ld\n"
 msgstr "Varning:\t%ld\n"

-#: src/chage.c:285
+#: src/chage.c:270
 #, c-format
 msgid "Inactive:\t%ld\n"
 msgstr "Inaktivt:\t%ld\n"
@@ -305,11 +305,11 @@ msgstr "Inaktivt:\t%ld\n"
 #. * password was last modified.  The date is the number of
 #. * days since 1/1/1970.
 #.
-#: src/chage.c:294
+#: src/chage.c:279
 msgid "Last Change:\t\t"
 msgstr "Senaste <20>ndring:\t\t"

-#: src/chage.c:296 src/chage.c:310 src/chage.c:327 src/chage.c:340
+#: src/chage.c:281 src/chage.c:295 src/chage.c:312 src/chage.c:325
 msgid "Never\n"
 msgstr "Aldrig\n"

@@ -318,7 +318,7 @@ msgstr "Aldrig\n"
 #. * change date plus the number of days the password is valid
 #. * for.
 #.
-#: src/chage.c:308
+#: src/chage.c:293
 msgid "Password Expires:\t"
 msgstr "L<>senordet upph<70>r:\t"

@@ -328,7 +328,7 @@ msgstr "L
 #. * and the number of inactive days is added.  The resulting date
 #. * is when the active will be disabled.
 #.
-#: src/chage.c:324
+#: src/chage.c:309
 #, fuzzy
 msgid "Password Inactive:\t"
 msgstr "L<>senord inaktivt"
@@ -337,82 +337,82 @@ msgstr "L
 #. * The account will expire on the given date regardless of the
 #. * password expiring or not.
 #.
-#: src/chage.c:338
+#: src/chage.c:323
 #, fuzzy
 msgid "Account Expires:\t"
 msgstr "L<>senordet upph<70>r:\t"

-#: src/chage.c:486
+#: src/chage.c:471
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s: inkludera inte \"l\" tillsammands med andra flaggor\n"

-#: src/chage.c:498 src/chage.c:610 src/login.c:529
+#: src/chage.c:483 src/chage.c:595 src/login.c:529
 #, c-format
 msgid "%s: permission denied\n"
 msgstr "%s: till<6C>telse nekas\n"

-#: src/chage.c:510 src/chpasswd.c:120
+#: src/chage.c:495 src/chpasswd.c:120
 #, c-format
 msgid "%s: can't lock password file\n"
 msgstr "%s: kan inte l<>sa l<>senordsfilen\n"

-#: src/chage.c:516 src/chpasswd.c:124
+#: src/chage.c:501 src/chpasswd.c:124
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: kan inte <20>ppna l<>senordsfilen\n"

-#: src/chage.c:523
+#: src/chage.c:508
 #, c-format
 msgid "%s: unknown user: %s\n"
 msgstr "%s: ok<6F>nd anv<6E>ndare: %s\n"

-#: src/chage.c:542
+#: src/chage.c:527
 #, c-format
 msgid "%s: can't lock shadow password file\n"
 msgstr "%s: kan inte l<>sa skuggl<67>senordsfilen\n"

-#: src/chage.c:549
+#: src/chage.c:534
 #, c-format
 msgid "%s: can't open shadow password file\n"
 msgstr "%s: kan inte <20>ppna skuggl<67>senordsfilen\n"

-#: src/chage.c:631
+#: src/chage.c:616
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "<22>ndrar <20>ldringsinformation f<>r %s\n"

-#: src/chage.c:633
+#: src/chage.c:618
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: fel uppstod under byte av f<>lt\n"

-#: src/chage.c:660 src/chage.c:723 src/pwunconv.c:183
+#: src/chage.c:645 src/chage.c:708 src/pwunconv.c:183
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: kan inte uppdatera l<>senordsfilen\n"

-#: src/chage.c:690 src/pwunconv.c:178
+#: src/chage.c:675 src/pwunconv.c:178
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: kan inte uppdatera skuggl<67>senordsfilen\n"

-#: src/chage.c:739 src/chage.c:754 src/chfn.c:570 src/chsh.c:409
+#: src/chage.c:724 src/chage.c:739 src/chfn.c:571 src/chsh.c:410
 #: src/passwd.c:825 src/passwd.c:926
 msgid "Error updating the DBM password entry.\n"
 msgstr "Fel under uppdatering av DBM-l<>senordsnoteringen.\n"

-#: src/chage.c:771
+#: src/chage.c:756
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s: kan inte skriva om skuggl<67>senordsfilen\n"

-#: src/chage.c:785
+#: src/chage.c:770
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: kan inte skriva om l<>senordsfilen\n"

-#: src/chage.c:836
+#: src/chage.c:821
 #, c-format
 msgid "%s: no aging information present\n"
 msgstr "%s: ingen <20>ldringsinformation finns tillg<6C>nglig\n"
@@ -478,94 +478,94 @@ msgstr "\tHemtelefonnummer: %s\n"
 msgid "Other"
 msgstr "<22>vrigt"

-#: src/chfn.c:298 src/chfn.c:306 src/chfn.c:314 src/chfn.c:322 src/chfn.c:330
-#: src/chfn.c:391 src/passwd.c:1226
+#: src/chfn.c:299 src/chfn.c:307 src/chfn.c:315 src/chfn.c:323 src/chfn.c:331
+#: src/chfn.c:392 src/passwd.c:1226
 #, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: Till<6C>telse nekas.\n"

-#: src/chfn.c:351 src/chsh.c:224 src/passwd.c:1277
+#: src/chfn.c:352 src/chsh.c:225 src/passwd.c:1277
 #, c-format
 msgid "%s: Unknown user %s\n"
 msgstr "%s: Ok<4F>nd anv<6E>ndare %s\n"

-#: src/chfn.c:357 src/chsh.c:232 src/passwd.c:1207
+#: src/chfn.c:358 src/chsh.c:233 src/passwd.c:1207
 #, c-format
 msgid "%s: Cannot determine your user name.\n"
 msgstr "%s: Kan inte avg<76>ra ditt anv<6E>ndarnamn.\n"

-#: src/chfn.c:373 src/chsh.c:250
+#: src/chfn.c:374 src/chsh.c:251
 #, c-format
 msgid "%s: cannot change user `%s' on NIS client.\n"
 msgstr "%s: kan inte <20>ndra anv<6E>ndare \"%s\" p<> NIS-klienten.\n"

-#: src/chfn.c:378 src/chsh.c:257
+#: src/chfn.c:379 src/chsh.c:258
 #, c-format
 msgid "%s: `%s' is the NIS master for this client.\n"
 msgstr "%s: \"%s\" <20>r NIS-m<>stare f<>r denna klient.\n"

-#: src/chfn.c:453
+#: src/chfn.c:454
 #, c-format
 msgid "Changing the user information for %s\n"
 msgstr "<22>ndrar anv<6E>ndarinformation f<>r %s\n"

-#: src/chfn.c:462
+#: src/chfn.c:463
 #, c-format
 msgid "%s: invalid name: \"%s\"\n"
 msgstr "%s: felaktigt namn: \"%s\"\n"

-#: src/chfn.c:467
+#: src/chfn.c:468
 #, c-format
 msgid "%s: invalid room number: \"%s\"\n"
 msgstr "%s: felaktigt rumsnummer: \"%s\"\n"

-#: src/chfn.c:472
+#: src/chfn.c:473
 #, c-format
 msgid "%s: invalid work phone: \"%s\"\n"
 msgstr "%s: felaktigt arbetstelefonnummer: \"%s\"\n"

-#: src/chfn.c:477
+#: src/chfn.c:478
 #, c-format
 msgid "%s: invalid home phone: \"%s\"\n"
 msgstr "%s: felaktigt hemtelefonnummer: \"%s\"\n"

-#: src/chfn.c:482
+#: src/chfn.c:483
 #, c-format
 msgid "%s: \"%s\" contains illegal characters\n"
 msgstr "%s: \"%s\" inneh<65>ller otill<6C>tna tecken\n"

-#: src/chfn.c:494
+#: src/chfn.c:495
 #, c-format
 msgid "%s: fields too long\n"
 msgstr "%s: f<>r l<>nga f<>lt\n"

-#: src/chfn.c:509 src/chsh.c:347 src/gpasswd.c:582 src/passwd.c:1388
+#: src/chfn.c:510 src/chsh.c:348 src/gpasswd.c:582 src/passwd.c:1388
 msgid "Cannot change ID to root.\n"
 msgstr "Kan inte <20>ndra ID till root.\n"

-#: src/chfn.c:522 src/chsh.c:361 src/passwd.c:735 src/passwd.c:880
+#: src/chfn.c:523 src/chsh.c:362 src/passwd.c:735 src/passwd.c:880
 msgid "Cannot lock the password file; try again later.\n"
 msgstr "Kan inte l<>sa l<>senordsfilen; f<>rs<72>k igen senare.\n"

-#: src/chfn.c:528 src/chsh.c:367 src/passwd.c:740 src/passwd.c:885
+#: src/chfn.c:529 src/chsh.c:368 src/passwd.c:740 src/passwd.c:885
 msgid "Cannot open the password file.\n"
 msgstr "Kan inte <20>ppna l<>senordsfilen.\n"

-#: src/chfn.c:545 src/chsh.c:382 src/passwd.c:746 src/usermod.c:1313
+#: src/chfn.c:546 src/chsh.c:383 src/passwd.c:746 src/usermod.c:1271
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: %s hittades inte i /etc/passwd\n"

-#: src/chfn.c:562 src/chsh.c:401 src/passwd.c:819 src/passwd.c:920
+#: src/chfn.c:563 src/chsh.c:402 src/passwd.c:819 src/passwd.c:920
 #: src/passwd.c:960
 msgid "Error updating the password entry.\n"
 msgstr "Fel under uppdatering av l<>senordsnoteringen.\n"

-#: src/chfn.c:585 src/chsh.c:424 src/passwd.c:832 src/passwd.c:933
+#: src/chfn.c:586 src/chsh.c:425 src/passwd.c:832 src/passwd.c:933
 msgid "Cannot commit password file changes.\n"
 msgstr "Kan inte genomf<6D>ra <20>ndringar i l<>senordsfilen.\n"

-#: src/chfn.c:592 src/chsh.c:431
+#: src/chfn.c:593 src/chsh.c:432
 msgid "Cannot unlock the password file.\n"
 msgstr "Kan inte l<>sa upp l<>senordsfilen.\n"

@@ -629,22 +629,22 @@ msgstr "Anv
 msgid "Login Shell"
 msgstr "Inloggningsskal"

-#: src/chsh.c:273 src/chsh.c:286
+#: src/chsh.c:274 src/chsh.c:287
 #, c-format
 msgid "You may not change the shell for %s.\n"
 msgstr "Du f<>r inte <20>ndra skal <20>t %s.\n"

-#: src/chsh.c:315
+#: src/chsh.c:316
 #, c-format
 msgid "Changing the login shell for %s\n"
 msgstr "<22>ndrar inloggningsskal <20>t %s\n"

-#: src/chsh.c:327
+#: src/chsh.c:328
 #, c-format
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: Felaktig notering: %s\n"

-#: src/chsh.c:332
+#: src/chsh.c:333
 #, c-format
 msgid "%s is an invalid shell.\n"
 msgstr "%s <20>r ett felaktigt skal.\n"
@@ -878,13 +878,13 @@ msgid "usage: groupadd [-g gid [-o]] group\n"
 msgstr "Anv<6E>ndning: groupadd [-g gid [-o]] grupp\n"

 #: src/groupadd.c:173 src/groupadd.c:196 src/groupmod.c:183 src/groupmod.c:230
-#: src/useradd.c:931 src/usermod.c:539 src/usermod.c:675
+#: src/useradd.c:931 src/usermod.c:512 src/usermod.c:648
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s: gick inte att l<>gga till en ny gruppnotering\n"

 #: src/groupadd.c:183 src/groupadd.c:206 src/groupmod.c:199 src/useradd.c:942
-#: src/usermod.c:551 src/usermod.c:687
+#: src/usermod.c:524 src/usermod.c:660
 #, c-format
 msgid "%s: cannot add new dbm group entry\n"
 msgstr "%s: kan inte l<>gga till en ny dbm-gruppnotering\n"
@@ -923,13 +923,13 @@ msgid "%s: -O requires NAME=VALUE\n"
 msgstr "%s: -O kr<6B>ver NAME=V<>RDE\n"

 #: src/groupadd.c:412 src/groupdel.c:167 src/groupmod.c:403 src/useradd.c:1381
-#: src/userdel.c:303 src/usermod.c:563
+#: src/userdel.c:303 src/usermod.c:536
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s: kan inte skriva om gruppfilen\n"

 #: src/groupadd.c:418 src/groupdel.c:173 src/groupmod.c:409 src/useradd.c:1389
-#: src/userdel.c:309 src/usermod.c:700
+#: src/userdel.c:309 src/usermod.c:673
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s: kan inte skriva om skuggruppfilen\n"
@@ -1001,7 +1001,7 @@ msgstr "%s: grupp %s existerar inte\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s: grupp %s <20>r en NIS-grupp\n"

-#: src/groupdel.c:325 src/groupmod.c:523 src/userdel.c:761 src/usermod.c:1016
+#: src/groupdel.c:325 src/groupmod.c:523 src/userdel.c:761 src/usermod.c:989
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s <20>r NIS-m<>steren\n"
@@ -1889,7 +1889,7 @@ msgstr "%s: bygg om gruppdatabasen\n"
 msgid "%s: rebuild the shadow group database\n"
 msgstr "%s: bygg om skuggruppdatabasen\n"

-#: src/useradd.c:287 src/usermod.c:967
+#: src/useradd.c:287 src/usermod.c:940
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s: ogiltigt numeriskt argument \"%s\"\n"
@@ -1899,8 +1899,8 @@ msgstr "%s: ogiltigt numeriskt argument \"%s\"\n"
 msgid "%s: unknown gid %s\n"
 msgstr "%s: ok<6F>nt gid %s\n"

-#: src/useradd.c:350 src/useradd.c:642 src/useradd.c:1228 src/usermod.c:254
-#: src/usermod.c:1098
+#: src/useradd.c:350 src/useradd.c:642 src/useradd.c:1228 src/usermod.c:252
+#: src/usermod.c:1071
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s: ok<6F>nd grupp %s\n"
@@ -1960,17 +1960,17 @@ msgstr "%s: kan inte skapa en ny standardfil\n"
 msgid "%s: rename: %s"
 msgstr "%s: rename: %s"

-#: src/useradd.c:662 src/usermod.c:274
+#: src/useradd.c:662 src/usermod.c:272
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s: grupp \"%s\" <20>r en NIS-grupp.\n"

-#: src/useradd.c:670 src/usermod.c:282
+#: src/useradd.c:670 src/usermod.c:280
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: f<>r m<>nga grupper speciferade (max %d).\n"

-#: src/useradd.c:702 src/usermod.c:314
+#: src/useradd.c:702 src/usermod.c:312
 #, c-format
 msgid "usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
 msgstr "Anv<6E>ndning: %s\t[-u uid [-o]] [-g grupp] [-G grupp,...] \n"
@@ -1979,7 +1979,7 @@ msgstr "Anv
 msgid "\t\t[-d home] [-s shell] [-c comment] [-m [-k template]]\n"
 msgstr "\t\t[-d hem] [-s skal] [-c kommentar] [-m [-k mall]]\n"

-#: src/useradd.c:708 src/usermod.c:320
+#: src/useradd.c:708 src/usermod.c:318
 msgid "[-f inactive] [-e expire ] "
 msgstr "[-f inaktiv] [-e upph<70>r ] "

@@ -1987,7 +1987,7 @@ msgstr "[-f inaktiv] [-e upph
 msgid "[-A program] "
 msgstr "[-A program] "

-#: src/useradd.c:713
+#: src/useradd.c:713 src/usermod.c:323
 msgid "[-p passwd] name\n"
 msgstr "[-p passwd] namn\n"

@@ -2000,22 +2000,22 @@ msgstr "       %s\t-D [-g grupp] [-b bas] [-s skal]\n"
 msgid "\t\t[-f inactive] [-e expire ]\n"
 msgstr "\t\t[-f inaktiv] [-e utg<74>ng ]\n"

-#: src/useradd.c:815 src/usermod.c:472
+#: src/useradd.c:815 src/usermod.c:445
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s: fel under l<>sning av gruppfilen\n"

-#: src/useradd.c:819 src/usermod.c:477
+#: src/useradd.c:819 src/usermod.c:450
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s: fel under <20>ppning av gruppfilen\n"

-#: src/useradd.c:824 src/usermod.c:584
+#: src/useradd.c:824 src/usermod.c:557
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s: fel under l<>sning av skuggruppfilen\n"

-#: src/useradd.c:829 src/usermod.c:590
+#: src/useradd.c:829 src/usermod.c:563
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s: fel under <20>ppning av skuggruppfilen\n"
@@ -2030,8 +2030,8 @@ msgstr "%s: uid %d
 msgid "%s: can't get unique uid\n"
 msgstr "%s: kan inte hitta ett unikt uid\n"

-#: src/useradd.c:1139 src/useradd.c:1283 src/usermod.c:1046 src/usermod.c:1057
-#: src/usermod.c:1067 src/usermod.c:1113 src/usermod.c:1157
+#: src/useradd.c:1139 src/useradd.c:1283 src/usermod.c:1019 src/usermod.c:1030
+#: src/usermod.c:1040 src/usermod.c:1086 src/usermod.c:1121
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s: felaktigt f<>lt \"%s\"\n"
@@ -2051,7 +2051,7 @@ msgstr "%s: felaktig kommentar \"%s\"\n"
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s: felaktig hemkatalog \"%s\"\n"

-#: src/useradd.c:1191 src/usermod.c:1080
+#: src/useradd.c:1191 src/usermod.c:1053
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s: felaktigt datum \"%s\"\n"
@@ -2076,37 +2076,37 @@ msgstr "%s: felaktigt skal \"%s\"\n"
 msgid "%s: invalid user name `%s'\n"
 msgstr "%s: felaktigt anv<6E>ndar namn \"%s\"\n"

-#: src/useradd.c:1369 src/userdel.c:292 src/usermod.c:1225
+#: src/useradd.c:1369 src/userdel.c:292 src/usermod.c:1183
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s: kan inte skriva om l<>senordsfilen\n"

-#: src/useradd.c:1374 src/userdel.c:295 src/usermod.c:1230
+#: src/useradd.c:1374 src/userdel.c:295 src/usermod.c:1188
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s: kan inte skriva om skuggl<67>senordsfilen\n"

-#: src/useradd.c:1414 src/userdel.c:359 src/usermod.c:1265
+#: src/useradd.c:1414 src/userdel.c:359 src/usermod.c:1223
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s: kan inte l<>sa l<>senordsfilen\n"

-#: src/useradd.c:1418 src/userdel.c:363 src/usermod.c:1269
+#: src/useradd.c:1418 src/userdel.c:363 src/usermod.c:1227
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s: kan inte <20>ppna l<>senordsfilen\n"

-#: src/useradd.c:1424 src/userdel.c:368 src/usermod.c:1274
+#: src/useradd.c:1424 src/userdel.c:368 src/usermod.c:1232
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s: kan inte l<>sa skuggl<67>senordsfilen\n"

-#: src/useradd.c:1430 src/userdel.c:373 src/usermod.c:1279
+#: src/useradd.c:1430 src/userdel.c:373 src/usermod.c:1237
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s: kan inte <20>ppna skuggl<67>senordsfilen\n"

-#: src/useradd.c:1529 src/usermod.c:1366
+#: src/useradd.c:1529 src/usermod.c:1324
 #, c-format
 msgid "%s: error adding authentication method\n"
 msgstr "%s: fel under till<6C>gning av metod f<>r <20>kthetsbevisning\n"
@@ -2121,12 +2121,12 @@ msgstr "%s: fel under till
 msgid "%s: error updating password dbm entry\n"
 msgstr "%s: fel under uppdatering av dbm-l<>senordsnotering\n"

-#: src/useradd.c:1583 src/usermod.c:1425
+#: src/useradd.c:1583 src/usermod.c:1383
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr "%s: fel under till<6C>ggning av ny skuggl<67>senordsnotering\n"

-#: src/useradd.c:1599 src/usermod.c:1440
+#: src/useradd.c:1599 src/usermod.c:1398
 #, c-format
 msgid "%s: error updating shadow passwd dbm entry\n"
 msgstr "%s: fel under uppdatering av dbm-skuggl<67>senordsnotering\n"
@@ -2136,7 +2136,7 @@ msgstr "%s: fel under uppdatering av dbm-skuggl
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: kan inte skapa katalog %s\n"

-#: src/useradd.c:1708 src/usermod.c:1203
+#: src/useradd.c:1708 src/usermod.c:1161
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s: anv<6E>ndare %s existerar\n"
@@ -2236,12 +2236,12 @@ msgstr "%s: varning: %s
 msgid "%s: warning: can't remove "
 msgstr "%s: varning: kan inte ta bort "

-#: src/userdel.c:741 src/usermod.c:994
+#: src/userdel.c:741 src/usermod.c:967
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s: anv<6E>ndare %s finns inte\n"

-#: src/userdel.c:755 src/usermod.c:1010
+#: src/userdel.c:755 src/usermod.c:983
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: anv<6E>ndare %s <20>r en NIS-anv<6E>ndare\n"
@@ -2261,115 +2261,110 @@ msgstr "%s: tar inte bort katalogen %s (skulle ta bort hemkatalogen f
 msgid "%s: error removing directory %s\n"
 msgstr "%s: fel under borttagning av katalogen %s\n"

-#: src/usermod.c:317
+#: src/usermod.c:315
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr "\t\t[-d hem [-m]] [-s skal] [-c kommentar] [-l nytt_namn]\n"

-#: src/usermod.c:323
+#: src/usermod.c:321
 msgid "[-A {DEFAULT|program},... ] "
 msgstr "[-A {DEFAULT|program},... ] "

-#: src/usermod.c:325
-#, fuzzy
-msgid "[-p passwd] [-L|-U] name\n"
-msgstr "[-p passwd] namn\n"
-
-#: src/usermod.c:504
+#: src/usermod.c:477
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s: slut p<> minne i update_group\n"

-#: src/usermod.c:627
+#: src/usermod.c:600
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s: slut p<> minne i update_gshadow\n"

-#: src/usermod.c:1180
+#: src/usermod.c:1138
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: inga flaggor givna\n"

-#: src/usermod.c:1187
+#: src/usermod.c:1145
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: skuggl<67>senord kr<6B>vs f<>r -e och -f\n"

-#: src/usermod.c:1208
+#: src/usermod.c:1166
 #, c-format
 msgid "%s: uid %ld is not unique\n"
 msgstr "%s: uid %ld <20>r inte unikt\n"

-#: src/usermod.c:1356
+#: src/usermod.c:1314
 #, c-format
 msgid "%s: error deleting authentication method\n"
 msgstr "%s: fel under borttagning av metod f<>r <20>kthetsbevisning\n"

-#: src/usermod.c:1376
+#: src/usermod.c:1334
 #, c-format
 msgid "%s: error changing authentication method\n"
 msgstr "%s: fel under <20>ndring av metod f<>r <20>kthetsbevisning\n"

-#: src/usermod.c:1393
+#: src/usermod.c:1351
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s: fel under <20>ndring av l<>senordsnotering\n"

-#: src/usermod.c:1399
+#: src/usermod.c:1357
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s: fel under borttagning av l<>senordsnotering\n"

-#: src/usermod.c:1407
+#: src/usermod.c:1365
 #, c-format
 msgid "%s: error adding password dbm entry\n"
 msgstr "%s: fel under till<6C>ggning av dbm-l<>senordsnotering\n"

-#: src/usermod.c:1414
+#: src/usermod.c:1372
 #, c-format
 msgid "%s: error removing passwd dbm entry\n"
 msgstr "%s: fel under borttagning av dbm-l<>senordsnotering\n"

-#: src/usermod.c:1431
+#: src/usermod.c:1389
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr "%s: fel under borttagning av skuggl<67>senordsnotering\n"

-#: src/usermod.c:1446
+#: src/usermod.c:1404
 #, c-format
 msgid "%s: error removing shadow passwd dbm entry\n"
 msgstr "%s: fel under borttagning av dbm-skuggl<67>senordsnotering\n"

-#: src/usermod.c:1477
+#: src/usermod.c:1435
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: katalogen %s existerar\n"

-#: src/usermod.c:1484
+#: src/usermod.c:1442
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s: kan inte skapa %s\n"

-#: src/usermod.c:1490
+#: src/usermod.c:1448
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s: kan inte byta <20>gare p<> %s\n"

-#: src/usermod.c:1506
+#: src/usermod.c:1464
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s: kan inte byta namn p<> katalogen %s till %s\n"

 #. better leave it alone
-#: src/usermod.c:1603
+#: src/usermod.c:1561
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: varning: %s <20>gs inte av %s\n"

-#: src/usermod.c:1609
+#: src/usermod.c:1567
 msgid "failed to change mailbox owner"
 msgstr "kunde inte byta <20>gare av brevl<76>dan"

-#: src/usermod.c:1616
+#: src/usermod.c:1574
 msgid "failed to rename mailbox"
 msgstr "kunde inte byta namn p<> brevl<76>dan"