[Pkg-shadow-commits] r1461 - in upstream/trunk: . po

nekral-guest at alioth.debian.org nekral-guest at alioth.debian.org
Sun Nov 25 20:21:53 UTC 2007


Author: nekral-guest
Date: 2007-11-25 20:21:53 +0000 (Sun, 25 Nov 2007)
New Revision: 1461

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/po/gl.po
   upstream/trunk/po/he.po
   upstream/trunk/po/hu.po
   upstream/trunk/po/id.po
   upstream/trunk/po/it.po
   upstream/trunk/po/ja.po
   upstream/trunk/po/km.po
   upstream/trunk/po/ko.po
   upstream/trunk/po/nb.po
   upstream/trunk/po/ne.po
   upstream/trunk/po/nl.po
   upstream/trunk/po/nn.po
   upstream/trunk/po/pl.po
Log:
Unfuzzy other Usage strings translations.

Note: km.po and ne.po contain translated options.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2007-11-24 22:41:24 UTC (rev 1460)
+++ upstream/trunk/ChangeLog	2007-11-25 20:21:53 UTC (rev 1461)
@@ -6,11 +6,14 @@
 	src/chage.c, src/faillog.c, src/chsh.c: Do not use tabulations in
 	Usage strings.
 	* po/ca.po, po/cs.po, po/da.po, po/de.po, po/el.po, po/es.po,
-	po/eu.po, po/fi.po, po/fr.po:
+	po/eu.po, po/fi.po, po/fr.po, po/gl.po, po/hu.po, po/id.po,
+	po/it.po, po/ja.po, po/nb.po, po/pl.po:
 	Unfuzzy previous changes.
-	* po/bs.po: No Usage string translated. Just updated PO.
-	* po/dz.po: It would be too error prone for me to unfuzzy these
-	ones. Updated PO.
+	* po/bs.po, po/he.po, po/nn.po:
+	No Usage string translated. Just updated PO.
+	* po/dz.po, po/km.po, po/ko.po, po/ne.po, po/nl.po:
+	It would be too error prone for me to unfuzzy these ones. Updated
+	PO. (km and ne should be reviewed: options are translated).
 
 2007-11-24  Nicolas François  <nicolas.francois at centraliens.net>
 

Modified: upstream/trunk/po/gl.po
===================================================================
--- upstream/trunk/po/gl.po	2007-11-24 22:41:24 UTC (rev 1460)
+++ upstream/trunk/po/gl.po	2007-11-25 20:21:53 UTC (rev 1461)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 12:26+0100\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
 "PO-Revision-Date: 2006-07-18 23:27+0200\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
 "Language-Team: Galician <trasno at ceu.fi.udc.es>\n"
@@ -195,22 +195,22 @@
 msgid "%s's Password: "
 msgstr "Contrasinal de %s: "
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -d, --lastday LAST_DAY\tset last password change to LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -I, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --list\t\t\tshow account aging information\n"
-"  -m, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
+"  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+"  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -h, --help                    display this help message and exit\n"
+"  -I, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --list                    show account aging information\n"
+"  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
+"  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 "\n"
 msgstr ""
 "Emprego: chage [opcións] [USUARIO]\n"
@@ -467,10 +467,11 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
+"  -e, --encrypted               supplied passwords are encrypted\n"
+"  -h, --help                    display this help message and exit\n"
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
 "%s\n"
 msgstr ""
 "Emprego: chpasswd [opcións]\n"
@@ -483,7 +484,8 @@
 "\n"
 
 msgid ""
-"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+"  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+"                                crypt algorithms\n"
 msgstr ""
 
 #, c-format
@@ -558,13 +560,13 @@
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: liña %d: usuario %s descoñecido\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -h, --help\t\t\t\tdisplay this help message and exit\n"
-"  -s, --shell SHELL\t\t\tnew login shell for the user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
 "\n"
 msgstr ""
 "Emprego: chsh [opcións] [USUARIO]\n"
@@ -601,20 +603,23 @@
 msgid "%s: unknown user\n"
 msgstr "%s: usuario descoñecido\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\tdisplay faillog records for all users\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n"
-"  -m, --maximum MAX\t\tset maximum failed login counters to MAX\n"
-"  -r, --reset\t\t\treset the counters of login failures\n"
-"  -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n"
-"  -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n"
-"\t\t\t\tand limits (if used with -r, -m or -l options) only\n"
-"\t\t\t\tfor user with LOGIN\n"
+"  -a, --all                     display faillog records for all users\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"seconds\n"
+"  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+"  -r, --reset                   reset the counters of login failures\n"
+"  -t, --time DAYS               display faillog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m or -"
+"l\n"
+"                                options) only for user with LOGIN\n"
 "\n"
 msgstr ""
 "Emprego: faillog [opcións]\n"
@@ -755,18 +760,18 @@
 msgid "%s: can't unlock file\n"
 msgstr "%s: non se pode desbloquear o ficheiro\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce exit with success status if the specified\n"
-"\t\t\t\tgroup already exists\n"
-"  -g, --gid GID\t\t\tuse GID for the new group\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -o, --non-unique\t\tallow create group with duplicate\n"
-"\t\t\t\t(non-unique) GID\n"
+"  -f, --force                   force exit with success status if the\n"
+"                                specified group already exists\n"
+"  -g, --gid GID                 use GID for the new group\n"
+"  -h, --help                    display this help message and exit\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -o, --non-unique              allow create group with duplicate\n"
+"                                (non-unique) GID\n"
 "\n"
 msgstr ""
 "Emprego: groupadd [opcións] GRUPO\n"
@@ -899,15 +904,16 @@
 msgid "Cannot close group file\n"
 msgstr "Non se pode pechar o ficheiro de grupos\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -g, --gid GID\t\t\tforce use new GID by GROUP\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -n, --new-name NEW_GROUP\tforce use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) GID by GROUP\n"
+"  -g, --gid GID                 force use new GID by GROUP\n"
+"  -h, --help                    display this help message and exit\n"
+"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+"  -o, --non-unique              allow using duplicate (non-unique) GID by "
+"GROUP\n"
 "\n"
 msgstr ""
 "Emprego: groupmod [opcións] GRUPO\n"
@@ -1063,15 +1069,16 @@
 msgid " groups="
 msgstr " grupos="
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
 "Options:\n"
-"  -b, --before DAYS\tprint only lastlog records older than DAYS\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -t, --time DAYS\tprint only lastlog records more recent than DAYS\n"
-"  -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n"
+"  -b, --before DAYS             print only lastlog records older than DAYS\n"
+"  -h, --help                    display this help message and exit\n"
+"  -t, --time DAYS               print only lastlog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 "\n"
 msgstr ""
 "Emprego: lastlog [opcións]\n"
@@ -1233,14 +1240,10 @@
 msgid ""
 "Usage: %s [options] [input]\n"
 "\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
 "%s\n"
 msgstr ""
 
-msgid ""
-"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
-msgstr ""
-
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: non se pode bloquear /etc/passwd.\n"
@@ -1289,28 +1292,29 @@
 msgid "%s: error updating files\n"
 msgstr "%s: erro ao actualizar os ficheiros\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\treport password status on all accounts\n"
-"  -d, --delete\t\t\tdelete the password for the named account\n"
-"  -e, --expire\t\t\tforce expire the password for the named account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --keep-tokens\t\tchange password only if expired\n"
-"  -i, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --lock\t\t\tlock the named account\n"
-"  -n, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -r, --repository REPOSITORY\tchange password in REPOSITORY repository\n"
-"  -S, --status\t\t\treport password status on the named account\n"
-"  -u, --unlock\t\t\tunlock the named account\n"
-"  -w, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
+"  -a, --all                     report password status on all accounts\n"
+"  -d, --delete                  delete the password for the named account\n"
+"  -e, --expire                  force expire the password for the named "
+"account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --keep-tokens             change password only if expired\n"
+"  -i, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --lock                    lock the named account\n"
+"  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -q, --quiet                   quiet mode\n"
+"  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+"  -S, --status                  report password status on the named account\n"
+"  -u, --unlock                  unlock the named account\n"
+"  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
 "Emprego: passwd [opcións] [USUARIO]\n"
@@ -1512,18 +1516,18 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -, -l, --login\t\tmake the shell a login shell\n"
+"  -c, --command COMMAND         pass COMMAND to the invoked shell\n"
+"  -h, --help                    display this help message and exit\n"
+"  -, -l, --login                make the shell a login shell\n"
 "  -m, -p,\n"
-"  --preserve-environment\tdo not reset environment variables, and keep\n"
-"\t\t\t\tthe same shell\n"
-"  -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n"
+"  --preserve-environment        do not reset environment variables, and\n"
+"                                keep the same shell\n"
+"  -s, --shell SHELL             use SHELL instead of the default in passwd\n"
 "\n"
 msgstr ""
 "Emprego: su [opcións] [USUARIO]\n"
@@ -1617,34 +1621,35 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: especificáronse grupos de máis (máximo %d).\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR\tbase directory for the new user account\n"
-"\t\t\t\thome directory\n"
-"  -c, --comment COMMENT\t\tset the GECOS field for the new user account\n"
-"  -d, --home-dir HOME_DIR\thome directory for the new user account\n"
-"  -D, --defaults\t\tprint or save modified default useradd\n"
-"\t\t\t\tconfiguration\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP for the new user account\n"
-"  -G, --groups GROUPS\t\tlist of supplementary groups for the new\n"
-"\t\t\t\tuser account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --skel SKEL_DIR\t\tspecify an alternative skel directory\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -m, --create-home\t\tcreate home directory for the new user\n"
-"\t\t\t\taccount\n"
-"  -o, --non-unique\t\tallow create user with duplicate\n"
-"\t\t\t\t(non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new user\n"
-"\t\t\t\taccount\n"
-"  -s, --shell SHELL\t\tthe login shell for the new user account\n"
-"  -u, --uid UID\t\t\tforce use the UID for the new user account\n"
+"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+"                                home directory\n"
+"  -c, --comment COMMENT         set the GECOS field for the new user "
+"account\n"
+"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+"  -D, --defaults                print or save modified default useradd\n"
+"                                configuration\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP for the new user account\n"
+"  -G, --groups GROUPS           list of supplementary groups for the new\n"
+"                                user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -m, --create-home             create home directory for the new user\n"
+"                                account\n"
+"  -o, --non-unique              allow create user with duplicate\n"
+"                                (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new user\n"
+"                                account\n"
+"  -s, --shell SHELL             the login shell for the new user account\n"
+"  -u, --uid UID                 force use the UID for the new user account\n"
 "\n"
 msgstr ""
 "Emprego: useradd [opcións] USUARIO\n"
@@ -1815,14 +1820,15 @@
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: aviso: CREATE_HOME non está soportado, empregue -m no seu canto.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce removal of files, even if not owned by user\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -r, --remove\t\t\tremove home directory and mail spool\n"
+"  -f, --force                   force removal of files,\n"
+"                                even if not owned by user\n"
+"  -h, --help                    display this help message and exit\n"
+"  -r, --remove                  remove home directory and mail spool\n"
 "\n"
 msgstr ""
 "Emprego: userdel [opcións] USUARIO\n"
@@ -1898,26 +1904,26 @@
 "Usage: usermod [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -c, --comment COMMENT\t\tnew value of the GECOS field\n"
-"  -d, --home HOME_DIR\t\tnew home directory for the user account\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP as new primary group\n"
-"  -G, --groups GROUPS\t\tnew list of supplementary GROUPS\n"
-"  -a, --append\t\tappend the user to the supplemental GROUPS\n"
-"\t\t\t\tmentioned by the -G option without removing\n"
-"\t\t\t\thim/her from other groups\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --login NEW_LOGIN\t\tnew value of the login name\n"
-"  -L, --lock\t\t\tlock the user account\n"
-"  -m, --move-home\t\tmove contents of the home directory to the new\n"
-"\t\t\t\tlocation (use only with -d)\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new password\n"
-"  -s, --shell SHELL\t\tnew login shell for the user account\n"
-"  -u, --uid UID\t\t\tnew UID for the user account\n"
-"  -U, --unlock\t\t\tunlock the user account\n"
+"  -c, --comment COMMENT         new value of the GECOS field\n"
+"  -d, --home HOME_DIR           new home directory for the user account\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP as new primary group\n"
+"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+"  -a, --append                  append the user to the supplemental GROUPS\n"
+"                                mentioned by the -G option without removing\n"
+"                                him/her from other groups\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --login NEW_LOGIN         new value of the login name\n"
+"  -L, --lock                    lock the user account\n"
+"  -m, --move-home               move contents of the home directory to the\n"
+"                                new location (use only with -d)\n"
+"  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
+"  -u, --uid UID                 new UID for the user account\n"
+"  -U, --unlock                  unlock the user account\n"
 "\n"
 msgstr ""
 "Emprego: usermod [opcións] USUARIO\n"
@@ -2008,16 +2014,16 @@
 msgid "failed to rename mailbox"
 msgstr "non se puido cambiar o nome da caixa do correo"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
-"  -g, --group\t\t\tedit group database\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -p, --passwd\t\t\tedit passwd database\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -s, --shadow\t\t\tedit shadow or gshadow database\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
 "\n"
 msgstr ""
 "Emprego: vipw [opcións]\n"

Modified: upstream/trunk/po/he.po
===================================================================
--- upstream/trunk/po/he.po	2007-11-24 22:41:24 UTC (rev 1460)
+++ upstream/trunk/po/he.po	2007-11-25 20:21:53 UTC (rev 1461)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: shadow\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 12:26+0100\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
 "PO-Revision-Date: 2004-07-21 23:59+0300\n"
 "Last-Translator: Lior Kaplan <webmaster at guides.co.il>\n"
 "Language-Team: Hebrew <en at li.org>\n"
@@ -195,17 +195,17 @@
 "Usage: chage [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -d, --lastday LAST_DAY\tset last password change to LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -I, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --list\t\t\tshow account aging information\n"
-"  -m, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
+"  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+"  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -h, --help                    display this help message and exit\n"
+"  -I, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --list                    show account aging information\n"
+"  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
+"  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 "\n"
 msgstr ""
 
@@ -441,15 +441,17 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
+"  -e, --encrypted               supplied passwords are encrypted\n"
+"  -h, --help                    display this help message and exit\n"
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
 "%s\n"
 msgstr ""
 
 msgid ""
-"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+"  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+"                                crypt algorithms\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -529,8 +531,8 @@
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -h, --help\t\t\t\tdisplay this help message and exit\n"
-"  -s, --shell SHELL\t\t\tnew login shell for the user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
 "\n"
 msgstr ""
 
@@ -566,15 +568,18 @@
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\tdisplay faillog records for all users\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n"
-"  -m, --maximum MAX\t\tset maximum failed login counters to MAX\n"
-"  -r, --reset\t\t\treset the counters of login failures\n"
-"  -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n"
-"  -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n"
-"\t\t\t\tand limits (if used with -r, -m or -l options) only\n"
-"\t\t\t\tfor user with LOGIN\n"
+"  -a, --all                     display faillog records for all users\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"seconds\n"
+"  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+"  -r, --reset                   reset the counters of login failures\n"
+"  -t, --time DAYS               display faillog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m or -"
+"l\n"
+"                                options) only for user with LOGIN\n"
 "\n"
 msgstr ""
 
@@ -704,13 +709,13 @@
 "Usage: groupadd [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce exit with success status if the specified\n"
-"\t\t\t\tgroup already exists\n"
-"  -g, --gid GID\t\t\tuse GID for the new group\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -o, --non-unique\t\tallow create group with duplicate\n"
-"\t\t\t\t(non-unique) GID\n"
+"  -f, --force                   force exit with success status if the\n"
+"                                specified group already exists\n"
+"  -g, --gid GID                 use GID for the new group\n"
+"  -h, --help                    display this help message and exit\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -o, --non-unique              allow create group with duplicate\n"
+"                                (non-unique) GID\n"
 "\n"
 msgstr ""
 
@@ -839,10 +844,11 @@
 "Usage: groupmod [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -g, --gid GID\t\t\tforce use new GID by GROUP\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -n, --new-name NEW_GROUP\tforce use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) GID by GROUP\n"
+"  -g, --gid GID                 force use new GID by GROUP\n"
+"  -h, --help                    display this help message and exit\n"
+"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+"  -o, --non-unique              allow using duplicate (non-unique) GID by "
+"GROUP\n"
 "\n"
 msgstr ""
 
@@ -995,10 +1001,11 @@
 "Usage: lastlog [options]\n"
 "\n"
 "Options:\n"
-"  -b, --before DAYS\tprint only lastlog records older than DAYS\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -t, --time DAYS\tprint only lastlog records more recent than DAYS\n"
-"  -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n"
+"  -b, --before DAYS             print only lastlog records older than DAYS\n"
+"  -h, --help                    display this help message and exit\n"
+"  -t, --time DAYS               print only lastlog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 "\n"
 msgstr ""
 
@@ -1140,14 +1147,10 @@
 msgid ""
 "Usage: %s [options] [input]\n"
 "\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
 "%s\n"
 msgstr ""
 
-msgid ""
-"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
-msgstr ""
-
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr ""
@@ -1201,23 +1204,24 @@
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\treport password status on all accounts\n"
-"  -d, --delete\t\t\tdelete the password for the named account\n"
-"  -e, --expire\t\t\tforce expire the password for the named account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --keep-tokens\t\tchange password only if expired\n"
-"  -i, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --lock\t\t\tlock the named account\n"
-"  -n, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -r, --repository REPOSITORY\tchange password in REPOSITORY repository\n"
-"  -S, --status\t\t\treport password status on the named account\n"
-"  -u, --unlock\t\t\tunlock the named account\n"
-"  -w, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
+"  -a, --all                     report password status on all accounts\n"
+"  -d, --delete                  delete the password for the named account\n"
+"  -e, --expire                  force expire the password for the named "
+"account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --keep-tokens             change password only if expired\n"
+"  -i, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --lock                    lock the named account\n"
+"  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -q, --quiet                   quiet mode\n"
+"  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+"  -S, --status                  report password status on the named account\n"
+"  -u, --unlock                  unlock the named account\n"
+"  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
 
@@ -1396,13 +1400,13 @@
 "Usage: su [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -, -l, --login\t\tmake the shell a login shell\n"
+"  -c, --command COMMAND         pass COMMAND to the invoked shell\n"
+"  -h, --help                    display this help message and exit\n"
+"  -, -l, --login                make the shell a login shell\n"
 "  -m, -p,\n"
-"  --preserve-environment\tdo not reset environment variables, and keep\n"
-"\t\t\t\tthe same shell\n"
-"  -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n"
+"  --preserve-environment        do not reset environment variables, and\n"
+"                                keep the same shell\n"
+"  -s, --shell SHELL             use SHELL instead of the default in passwd\n"
 "\n"
 msgstr ""
 
@@ -1485,29 +1489,30 @@
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR\tbase directory for the new user account\n"
-"\t\t\t\thome directory\n"
-"  -c, --comment COMMENT\t\tset the GECOS field for the new user account\n"
-"  -d, --home-dir HOME_DIR\thome directory for the new user account\n"
-"  -D, --defaults\t\tprint or save modified default useradd\n"
-"\t\t\t\tconfiguration\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP for the new user account\n"
-"  -G, --groups GROUPS\t\tlist of supplementary groups for the new\n"
-"\t\t\t\tuser account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --skel SKEL_DIR\t\tspecify an alternative skel directory\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -m, --create-home\t\tcreate home directory for the new user\n"
-"\t\t\t\taccount\n"
-"  -o, --non-unique\t\tallow create user with duplicate\n"
-"\t\t\t\t(non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new user\n"
-"\t\t\t\taccount\n"
-"  -s, --shell SHELL\t\tthe login shell for the new user account\n"
-"  -u, --uid UID\t\t\tforce use the UID for the new user account\n"
+"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+"                                home directory\n"
+"  -c, --comment COMMENT         set the GECOS field for the new user "
+"account\n"
+"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+"  -D, --defaults                print or save modified default useradd\n"
+"                                configuration\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP for the new user account\n"
+"  -G, --groups GROUPS           list of supplementary groups for the new\n"
+"                                user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -m, --create-home             create home directory for the new user\n"
+"                                account\n"
+"  -o, --non-unique              allow create user with duplicate\n"
+"                                (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new user\n"
+"                                account\n"
+"  -s, --shell SHELL             the login shell for the new user account\n"
+"  -u, --uid UID                 force use the UID for the new user account\n"
 "\n"
 msgstr ""
 
@@ -1650,9 +1655,10 @@
 "Usage: userdel [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce removal of files, even if not owned by user\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -r, --remove\t\t\tremove home directory and mail spool\n"
+"  -f, --force                   force removal of files,\n"
+"                                even if not owned by user\n"
+"  -h, --help                    display this help message and exit\n"
+"  -r, --remove                  remove home directory and mail spool\n"
 "\n"
 msgstr ""
 
@@ -1717,26 +1723,26 @@
 "Usage: usermod [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -c, --comment COMMENT\t\tnew value of the GECOS field\n"
-"  -d, --home HOME_DIR\t\tnew home directory for the user account\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP as new primary group\n"
-"  -G, --groups GROUPS\t\tnew list of supplementary GROUPS\n"
-"  -a, --append\t\tappend the user to the supplemental GROUPS\n"
-"\t\t\t\tmentioned by the -G option without removing\n"
-"\t\t\t\thim/her from other groups\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --login NEW_LOGIN\t\tnew value of the login name\n"
-"  -L, --lock\t\t\tlock the user account\n"
-"  -m, --move-home\t\tmove contents of the home directory to the new\n"
-"\t\t\t\tlocation (use only with -d)\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new password\n"
-"  -s, --shell SHELL\t\tnew login shell for the user account\n"
-"  -u, --uid UID\t\t\tnew UID for the user account\n"
-"  -U, --unlock\t\t\tunlock the user account\n"
+"  -c, --comment COMMENT         new value of the GECOS field\n"
+"  -d, --home HOME_DIR           new home directory for the user account\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP as new primary group\n"
+"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+"  -a, --append                  append the user to the supplemental GROUPS\n"
+"                                mentioned by the -G option without removing\n"
+"                                him/her from other groups\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --login NEW_LOGIN         new value of the login name\n"
+"  -L, --lock                    lock the user account\n"
+"  -m, --move-home               move contents of the home directory to the\n"
+"                                new location (use only with -d)\n"
+"  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
+"  -u, --uid UID                 new UID for the user account\n"
+"  -U, --unlock                  unlock the user account\n"
 "\n"
 msgstr ""
 
@@ -1807,11 +1813,11 @@
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
-"  -g, --group\t\t\tedit group database\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -p, --passwd\t\t\tedit passwd database\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -s, --shadow\t\t\tedit shadow or gshadow database\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
 "\n"
 msgstr ""
 

Modified: upstream/trunk/po/hu.po
===================================================================
--- upstream/trunk/po/hu.po	2007-11-24 22:41:24 UTC (rev 1460)
+++ upstream/trunk/po/hu.po	2007-11-25 20:21:53 UTC (rev 1461)
@@ -3,8 +3,8 @@
 msgstr ""
 "Project-Id-Version: 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 12:26+0100\n"
-"PO-Revision-Date: 2006-07-18 21:33+0100\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"PO-Revision-Date: 2007-11-25 20:56+0100\n"
 "Last-Translator: SZERVÁC Attila <sas at 321.hu>\n"
 "Language-Team: Hungarian <gnome at gnome.hu>\n"
 "MIME-Version: 1.0\n"
@@ -195,36 +195,38 @@
 "Usage: chage [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -d, --lastday LAST_DAY\tset last password change to LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -I, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --list\t\t\tshow account aging information\n"
-"  -m, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
+"  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+"  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -h, --help                    display this help message and exit\n"
+"  -I, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --list                    show account aging information\n"
+"  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
+"  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 "\n"
 msgstr ""
 "Használat: chage [kapcsolók] [NÉV]\n"
 "\n"
 "Kapcsolók:\n"
-"  -d, --lastday UTOLSÓ_NAP\tutolsó jelszómódosítás beállítása az\n"
-"\t\t\t\tUTOLSÓ_NAPRA\n"
-"  -E, --expiredate LEJÁRATI_DÁTUM\tfiók lejárati dátumának beállítása a\n"
-"\t\t\t\tLEJÁRATI_DÁTUMRA\n"
-"  -h, --help\t\t\tezen súgószöveg megjelenítése és kilépés\n"
-"  -I, --inactive INAKTÍV\ta jelszó inaktívvá tétele lejárat után\n"
-"\t\t\t\taz INAKTÍV értékre\n"
-"  -l, --list\t\t\tfiókelévülési információk megjelenítése\n"
-"  -m, --mindays MIN_NAPOK\tnapok minimális számának beállítása\n"
-"\t\t\t\tjelszómódosítás előtt a MIN_NAPOK értékre\n"
-"  -M, --maxdays MAX_NAPOK\tnapok maximális számának beállítása\n"
-"\t\t\t\tjelszómódosítás előtt a MAX_NAPOK értékre\n"
-"  -W, --warndays FIGYELM_NAPOK\ta lejáratra figyelmeztetés napjai számának\n"
-"\t\t\t\tbeállítása FIGYELM_NAPOK-ra\n"
+"  -d, --lastday UTOLSÓ_NAP         utolsó jelszómódosítás beállítása az\n"
+"                                   UTOLSÓ_NAPRA\n"
+"  -E, --expiredate LEJÁRATI_DÁTUM  fiók lejárati dátumának beállítása a\n"
+"                                   LEJÁRATI_DÁTUMRA\n"
+"  -h, --help                       ezen súgószöveg megjelenítése és kilépés\n"
+"  -I, --inactive INAKTÍV           a jelszó inaktívvá tétele lejárat után\n"
+"                                   az INAKTÍV értékre\n"
+"  -l, --list                       fiókelévülési információk megjelenítése\n"
+"  -m, --mindays MIN_NAPOK          napok minimális számának beállítása\n"
+"                                   jelszómódosítás előtt a MIN_NAPOK "
+"értékre\n"
+"  -M, --maxdays MAX_NAPOK          napok maximális számának beállítása\n"
+"                                   jelszómódosítás előtt a MAX_NAPOK "
+"értékre\n"
+"  -W, --warndays FIGYELM_NAPOK     a lejáratra figyelmeztetés napjai\n"
+"                                   számának beállítása FIGYELM_NAPOK-ra\n"
 "\n"
 
 #, c-format
@@ -463,23 +465,25 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
+"  -e, --encrypted               supplied passwords are encrypted\n"
+"  -h, --help                    display this help message and exit\n"
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
 "%s\n"
 msgstr ""
 "Használat: chpasswd [kapcsolók]\n"
 "\n"
 "Kapcsolók:\n"
-"  -e, --encrypted\ta megadott jelszavak titkosítottak\n"
-"  -h, --help\t\tezen súgó megjelenítése és kilépés\n"
-"  -m, --md5\t\tMD5 titkosítás használata DES helyett,ha a megadott\n"
-"\t\t\tjelszavak nem titkosítottak\n"
+"  -e, --encrypted               a megadott jelszavak titkosítottak\n"
+"  -h, --help                    ezen súgó megjelenítése és kilépés\n"
+"  -m, --md5                     MD5 titkosítás használata DES helyett,ha a\n"
+"                                megadott jelszavak nem titkosítottak\n"
 "\n"
 
 msgid ""
-"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+"  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+"                                crypt algorithms\n"
 msgstr ""
 
 #, c-format
@@ -559,15 +563,15 @@
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -h, --help\t\t\t\tdisplay this help message and exit\n"
-"  -s, --shell SHELL\t\t\tnew login shell for the user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
 "\n"
 msgstr ""
 "Használat: chsh [kapcsolók] NÉV\n"
 "\n"
 "Kapcsolók:\n"
-"  -h, --help\t\t\tkiírja e súgót és kilép\n"
-"  -s, --shell\t\t\túj bejelentkező héj a felhasználói fiókhoz\n"
+"  -h, --help                    kiírja e súgót és kilép\n"
+"  -s, --shell                   új bejelentkező héj a felhasználói fiókhoz\n"
 "\n"
 
 msgid "Login Shell"
@@ -602,34 +606,40 @@
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\tdisplay faillog records for all users\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n"
-"  -m, --maximum MAX\t\tset maximum failed login counters to MAX\n"
-"  -r, --reset\t\t\treset the counters of login failures\n"
-"  -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n"
-"  -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n"
-"\t\t\t\tand limits (if used with -r, -m or -l options) only\n"
-"\t\t\t\tfor user with LOGIN\n"
+"  -a, --all                     display faillog records for all users\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"seconds\n"
+"  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+"  -r, --reset                   reset the counters of login failures\n"
+"  -t, --time DAYS               display faillog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m or -"
+"l\n"
+"                                options) only for user with LOGIN\n"
 "\n"
 msgstr ""
 "Használat: faillog [kapcsolók]\n"
 "\n"
 "Kapcsolók:\n"
-"  -a, --all\t\t\taz összes felhasználó faillog bejegyzésének\n"
-"\t\t\t\tmegjelenítése\n"
-"  -h, --help\t\t\tezen súgószöveg megjelenítése és kilépés\n"
-"  -l, --lock-time MP\t\ta sikertelen bejelentkezés után a fiók zárolása\n"
-"\t\t\t\tMP másodpercre\n"
-"  -m, --maximum MAX\t\ta sikertelen bejelentkezések számlálójának\n"
-"\t\t\t\tbeállítása a MAX értékre\n"
-"  -r, --reset\t\t\ta bejelentkezési hibák számának visszaállítása\n"
-"  -t, --time NAPOK\t\taz adott NAPOK számánál régebbi faillog\n"
-"\t\t\t\trekordok megjelenítése\n"
-"  -u, --user NÉV\t\tfaillog rekord megjelenítése, vagy csak\n"
-"\t\t\t\t(ha a -r, -m vagy -l kapcsolókkal használja) a\n"
-"\t\t\t\tNÉV bejelentkezési nevű felhasználó számára\n"
-"\t\t\t\tkarbantartja a hibaszámlálókat és értékeket.\n"
+"  -a, --all                     az összes felhasználó faillog bejegyzésének\n"
+"                                megjelenítése\n"
+"  -h, --help                    ezen súgószöveg megjelenítése és kilépés\n"
+"  -l, --lock-time MP            a sikertelen bejelentkezés után a fiók\n"
+"                                zárolása MP másodpercre\n"
+"  -m, --maximum MAX             a sikertelen bejelentkezések számlálójának\n"
+"                                beállítása a MAX értékre\n"
+"  -r, --reset                   a bejelentkezési hibák számának "
+"visszaállítása\n"
+"  -t, --time NAPOK              az adott NAPOK számánál régebbi faillog\n"
+"                                rekordok megjelenítése\n"
+"  -u, --user NÉV                faillog rekord megjelenítése, vagy csak\n"
+"                                (ha a -r, -m vagy -l kapcsolókkal használja) "
+"a\n"
+"                                NÉV bejelentkezési nevű felhasználó számára\n"
+"                                karbantartja a hibaszámlálókat és "
+"értékeket.\n"
 "\n"
 
 #, c-format
@@ -758,26 +768,26 @@
 "Usage: groupadd [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce exit with success status if the specified\n"
-"\t\t\t\tgroup already exists\n"
-"  -g, --gid GID\t\t\tuse GID for the new group\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -o, --non-unique\t\tallow create group with duplicate\n"
-"\t\t\t\t(non-unique) GID\n"
+"  -f, --force                   force exit with success status if the\n"
+"                                specified group already exists\n"
+"  -g, --gid GID                 use GID for the new group\n"
+"  -h, --help                    display this help message and exit\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -o, --non-unique              allow create group with duplicate\n"
+"                                (non-unique) GID\n"
 "\n"
 msgstr ""
 "Használat: groupadd [kapcsolók] CSOPORT\n"
 "\n"
 "Kapcsolók:\n"
-"  -f, --force\t\tkilépés kényszerítése sikeres állapottal, ha a\n"
-"\t\t\t\tmegadott csoport már létezik\n"
-"  -g, --gid GID\t\ta GID használata az új csoporthoz\n"
-"  -h, --help\t\t\tkiírja e súgót és kilép\n"
-"  -K, --key KULCS=ÉRTÉK\t\tfelülbírálja az /etc/login.defs\n"
-"\t\t\t\talapértelmezéseit\n"
-"  -o, --non-unique\t\tengedélyezi a csoport létrehozását többször\n"
-"\t\t\t\tszereplő (nem egyedi) GID értékkel\n"
+"  -f, --force                   kilépés kényszerítése sikeres állapottal,\n"
+"                                ha a megadott csoport már létezik\n"
+"  -g, --gid GID                 a GID használata az új csoporthoz\n"
+"  -h, --help                    kiírja e súgót és kilép\n"
+"  -K, --key KULCS=ÉRTÉK         felülbírálja az /etc/login.defs\n"
+"                                alapértelmezéseit\n"
+"  -o, --non-unique              engedélyezi a csoport létrehozását többször\n"
+"                                szereplő (nem egyedi) GID értékkel\n"
 "\n"
 
 #, c-format
@@ -907,20 +917,21 @@
 "Usage: groupmod [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -g, --gid GID\t\t\tforce use new GID by GROUP\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -n, --new-name NEW_GROUP\tforce use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) GID by GROUP\n"
+"  -g, --gid GID                 force use new GID by GROUP\n"
+"  -h, --help                    display this help message and exit\n"
+"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+"  -o, --non-unique              allow using duplicate (non-unique) GID by "
+"GROUP\n"
 "\n"
 msgstr ""
 "Használat: groupmod [kapcsolók] CSOPORT\n"
 "\n"
 "Kapcsolók:\n"
-"  -g, --gid GID\t\ta GID használata az új csoporthoz\n"
-"  -h, --help\t\t\tkiírja e súgót és kilép\n"
-"  -n, --new-name Új_CSOPORT\ta CSOPORTot az ÚJ_CSOPORT névre bírja\n"
-"  -o, --non-unique\t\tengedélyezi a CSOPORT létrehozását többször\n"
-"\t\t\t\tszereplő (nem egyedi) GID értékkel\n"
+"  -g, --gid GID                 a GID használata az új csoporthoz\n"
+"  -h, --help                    kiírja e súgót és kilép\n"
+"  -n, --new-name Új_CSOPORT     a CSOPORTot az ÚJ_CSOPORT névre bírja\n"
+"  -o, --non-unique              engedélyezi a CSOPORT létrehozását többször\n"
+"                                szereplő (nem egyedi) GID értékkel\n"
 "\n"
 
 #, c-format
@@ -1072,20 +1083,23 @@
 "Usage: lastlog [options]\n"
 "\n"
 "Options:\n"
-"  -b, --before DAYS\tprint only lastlog records older than DAYS\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -t, --time DAYS\tprint only lastlog records more recent than DAYS\n"
-"  -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n"
+"  -b, --before DAYS             print only lastlog records older than DAYS\n"
+"  -h, --help                    display this help message and exit\n"
+"  -t, --time DAYS               print only lastlog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 "\n"
 msgstr ""
 "Használat: lastlog [kapcsolók]\n"
 "\n"
 "Kapcsolók:\n"
-"  -b, --before NAP\tcsak a NAPOK számánál régebbi lastlog rekordok\n"
-"\t\t\tmegjelenítése\n"
-"  -h, --help\t\tezen súgószöveg megjelenítése és kilépés\n"
-"  -t, --time NAP\tcsak a megadott NAPNÁL újabb lastlog rekordok kiírása\n"
-"  -u, --user NÉV\ta megadott NEVŰ felhasználó lastlog rekordjainak kiírása\n"
+"  -b, --before NAP              csak a NAPOK számánál régebbi lastlog\n"
+"                                rekordok megjelenítése\n"
+"  -h, --help                    ezen súgószöveg megjelenítése és kilépés\n"
+"  -t, --time NAP                csak a megadott NAPNÁL újabb lastlog\n"
+"                                rekordok kiírása\n"
+"  -u, --user NÉV                a megadott NEVŰ felhasználó lastlog\n"
+"                                rekordjainak kiírása\n"
 "\n"
 
 #, c-format
@@ -1236,14 +1250,10 @@
 msgid ""
 "Usage: %s [options] [input]\n"
 "\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
 "%s\n"
 msgstr ""
 
-msgid ""
-"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
-msgstr ""
-
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: nem tudom zárolni a /etc/passwd fájlt.\n"
@@ -1297,45 +1307,47 @@
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\treport password status on all accounts\n"
-"  -d, --delete\t\t\tdelete the password for the named account\n"
-"  -e, --expire\t\t\tforce expire the password for the named account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --keep-tokens\t\tchange password only if expired\n"
-"  -i, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --lock\t\t\tlock the named account\n"
-"  -n, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -r, --repository REPOSITORY\tchange password in REPOSITORY repository\n"
-"  -S, --status\t\t\treport password status on the named account\n"
-"  -u, --unlock\t\t\tunlock the named account\n"
-"  -w, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
+"  -a, --all                     report password status on all accounts\n"
+"  -d, --delete                  delete the password for the named account\n"
+"  -e, --expire                  force expire the password for the named "
+"account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --keep-tokens             change password only if expired\n"
+"  -i, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --lock                    lock the named account\n"
+"  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -q, --quiet                   quiet mode\n"
+"  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+"  -S, --status                  report password status on the named account\n"
+"  -u, --unlock                  unlock the named account\n"
+"  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
 "Használat: passwd [kapcsolók] [NÉV]\n"
 "\n"
 "Kapcsolók:\n"
-"  -a, --all\t\t\tjelszóállapot jelentés az összes fiókon\n"
-"  -d, --delete\t\t\ta megadott fiók jelszavának törlése\n"
-"  -e, --expire\t\t\ta megadott fiók jelszava lejáratának kényszerítése\n"
-"  -h, --help\t\t\tkiírja e súgót és kilép\n"
-"  -k, --keep-tokens\t\ta jelszót csak annak lejáratakor módosítsa\n"
-"  -i, --inactive INAKTÍV\ta jelszó inaktívvá tétele lejárat után\n"
-"\t\t\t\taz INAKTÍV értékre\n"
-"  -l, --lock\t\t\ta megadott fiók zárolása\n"
-"  -n, --mindays MIN_NAPOK\tnapok minimális számának beállítása\n"
-"\t\t\t\tjelszómódosítás előtt a MIN_NAPOK értékre\n"
-"  -q, --quiet\t\t\tcsendes mód\n"
-"  -r, --repository LERAKAT\tjelszó módosítása a LERAKAT lerakatban\n"
-"  -S, --status\t\t\tjelentés a megadott fiók jelszóállapotáról\n"
-"  -u, --unlock\t\t\ta megadott fiók zárolásának feloldása\n"
-"  -w, --warndays FIGYELEM_NAPOK\ta lejáratra figyelmeztetés napjai számának\n"
-"  -x, --maxdays MAX_NAPOK\tnapok maximális számának beállítása\n"
-"\t\t\t\tjelszómódosítás előtt a MAX_NAPOK értékre\n"
+"  -a, --all                     jelszóállapot jelentés az összes fiókon\n"
+"  -d, --delete                  a megadott fiók jelszavának törlése\n"
+"  -e, --expire                  a megadott fiók jelszava lejáratának\n"
+"                                kényszerítése\n"
+"  -h, --help                    kiírja e súgót és kilép\n"
+"  -k, --keep-tokens             a jelszót csak annak lejáratakor módosítsa\n"
+"  -i, --inactive INAKTÍV        a jelszó inaktívvá tétele lejárat után\n"
+"                                az INAKTÍV értékre\n"
+"  -l, --lock                    a megadott fiók zárolása\n"
+"  -n, --mindays MIN_NAPOK       napok minimális számának beállítása\n"
+"                                jelszómódosítás előtt a MIN_NAPOK értékre\n"
+"  -q, --quiet                   csendes mód\n"
+"  -r, --repository LERAKAT      jelszó módosítása a LERAKAT lerakatban\n"
+"  -S, --status                  jelentés a megadott fiók jelszóállapotáról\n"
+"  -u, --unlock                  a megadott fiók zárolásának feloldása\n"
+"  -w, --warndays FIGYELEM_NAPOK a lejáratra figyelmeztetés napjai számának\n"
+"  -x, --maxdays MAX_NAPOK       napok maximális számának beállítása\n"
+"                                jelszómódosítás előtt a MAX_NAPOK értékre\n"
 "\n"
 
 msgid "Old password: "
@@ -1520,26 +1532,26 @@
 "Usage: su [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -, -l, --login\t\tmake the shell a login shell\n"
+"  -c, --command COMMAND         pass COMMAND to the invoked shell\n"
+"  -h, --help                    display this help message and exit\n"
+"  -, -l, --login                make the shell a login shell\n"
 "  -m, -p,\n"
-"  --preserve-environment\tdo not reset environment variables, and keep\n"
-"\t\t\t\tthe same shell\n"
-"  -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n"
+"  --preserve-environment        do not reset environment variables, and\n"
+"                                keep the same shell\n"
+"  -s, --shell SHELL             use SHELL instead of the default in passwd\n"
 "\n"
 msgstr ""
 "Használat: su [kapcsolók] [NÉV]\n"
 "\n"
 "Kapcsolók:\n"
-"  -c, --command PARANCS\t\ta PARANCS átadása a meghívott héjnak\n"
-"  -h, --help\t\t\tkiírja e súgót és kilép\n"
-"  -, -l, --login\t\ta héj bejelentkezési héjjá tétele\n"
+"  -c, --command PARANCS         a PARANCS átadása a meghívott héjnak\n"
+"  -h, --help                    kiírja e súgót és kilép\n"
+"  -, -l, --login                a héj bejelentkezési héjjá tétele\n"
 "  -m, -p,\n"
-"  --preserve-environment\tnem állítja vissza a környezeti változókat és\n"
-"\t\t\t\tmegtartja ugyanazt a héjat\n"
-"  -s, --shell HÉJ\t\ta HÉJ használata a\n"
-"\t\t\t\tpasswd-ben megadott alapértelmezett helyett\n"
+"  --preserve-environment        nem állítja vissza a környezeti változókat\n"
+"                                és megtartja ugyanazt a héjat\n"
+"  -s, --shell HÉJ               a HÉJ használata a\n"
+"                                passwd-ben megadott alapértelmezett helyett\n"
 "\n"
 
 #, c-format
@@ -1626,62 +1638,64 @@
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR\tbase directory for the new user account\n"
-"\t\t\t\thome directory\n"
-"  -c, --comment COMMENT\t\tset the GECOS field for the new user account\n"
-"  -d, --home-dir HOME_DIR\thome directory for the new user account\n"
-"  -D, --defaults\t\tprint or save modified default useradd\n"
-"\t\t\t\tconfiguration\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP for the new user account\n"
-"  -G, --groups GROUPS\t\tlist of supplementary groups for the new\n"
-"\t\t\t\tuser account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --skel SKEL_DIR\t\tspecify an alternative skel directory\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -m, --create-home\t\tcreate home directory for the new user\n"
-"\t\t\t\taccount\n"
-"  -o, --non-unique\t\tallow create user with duplicate\n"
-"\t\t\t\t(non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new user\n"
-"\t\t\t\taccount\n"
-"  -s, --shell SHELL\t\tthe login shell for the new user account\n"
-"  -u, --uid UID\t\t\tforce use the UID for the new user account\n"
+"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+"                                home directory\n"
+"  -c, --comment COMMENT         set the GECOS field for the new user "
+"account\n"
+"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+"  -D, --defaults                print or save modified default useradd\n"
+"                                configuration\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP for the new user account\n"
+"  -G, --groups GROUPS           list of supplementary groups for the new\n"
+"                                user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -m, --create-home             create home directory for the new user\n"
+"                                account\n"
+"  -o, --non-unique              allow create user with duplicate\n"
+"                                (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new user\n"
+"                                account\n"
+"  -s, --shell SHELL             the login shell for the new user account\n"
+"  -u, --uid UID                 force use the UID for the new user account\n"
 "\n"
 msgstr ""
 "Használat: useradd [kapcsolók] NÉV\n"
 "\n"
 "Kapcsolók:\n"
-"  -b, --base-dir ALAP_KVT\taz új felhasználói fiók saját könyvtárának\n"
-"\t\t\t\talapkönyvtára\n"
-"  -c, --comment MEGJEGYZÉS\t\taz új felhasználói fiók GECOS mezőjének\n"
-"\t\t\t\tbeállítása\n"
-"  -d, --home-dir SAJÁT_KVT\taz új felhasználói fiók saját könyvtára\n"
-"  -D, --defaults\t\taz alapértelmezett useradd beállítások kiírása\n"
-"\t\t\t\tvagy mentése\n"
-"  -e, --expiredate LEJÁRATI_DÁTUM\ta fiók lejárati dátumának beállítása\n"
-"  -f, --inactive INAKTÍV\ta jelszó inaktívvá tétele lejárat után\n"
-"\t\t\t\taz INAKTÍV értékre\n"
-"  -g, --gid CSOPORT\t\ta CSOPORT használatának kényszerítése az új\n"
-"\t\t\t\tfelhasználói fiókhoz\n"
-"  -G, --groups CSOPORTOK\t\tkiegészítő csoportok felsorolása az új\n"
-"\t\t\t\tfelhasználói fiókhoz\n"
-"  -h, --help\t\t\tezen súgószöveg megjelenítése és kilépés\n"
-"  -k, --skel VÁZ_KVT\t\talternatív vázkönyvtár megadása\n"
-"  -K, --key KULCS=ÉRTÉK\t\tfelülbírálja az /etc/login.defs\n"
-"\t\t\t\talapértelmezéseit\n"
-"  -m, --create-home\t\taz új felhasználói fiók saját könyvtárának\n"
-"\t\t\t\tlétrehozása\n"
-"  -o, --non-unique\t\tengedélyezi a csoport létrehozását többször\n"
-" \t\t\t\tszereplő (nem egyedi) GID értékkel\n"
-"  -p, --password JELSZÓ\ttitkosított jelszó használata az új felhasználói\n"
-"\t\t\t\tfiókhoz\n"
-"  -s, --shell PARANCSÉRTELMEZŐ\t\ta bejelentkezési parancsértelmező az\n"
-"\t\t\t\túj felhasználói fiókhoz\n"
-"  -u, --uid UID\t\t\taz UID használatának kényszerítése az új\n"
-"\t\t\t\tfelhasználói fiókhoz\n"
+"  -b, --base-dir ALAP_KVT          az új felhasználói fiók saját\n"
+"                                   könyvtárának alapkönyvtára\n"
+"  -c, --comment MEGJEGYZÉS         az új felhasználói fiók GECOS mezőjének\n"
+"                                   beállítása\n"
+"  -d, --home-dir SAJÁT_KVT         az új felhasználói fiók saját könyvtára\n"
+"  -D, --defaults                   az alapértelmezett useradd beállítások\n"
+"                                   kiírása vagy mentése\n"
+"  -e, --expiredate LEJÁRATI_DÁTUM  a fiók lejárati dátumának beállítása\n"
+"  -f, --inactive INAKTÍV           a jelszó inaktívvá tétele lejárat után\n"
+"                                   az INAKTÍV értékre\n"
+"  -g, --gid CSOPORT                a CSOPORT használatának kényszerítése\n"
+"                                   az új felhasználói fiókhoz\n"
+"  -G, --groups CSOPORTOK           kiegészítő csoportok felsorolása az új\n"
+"                                   felhasználói fiókhoz\n"
+"  -h, --help                       ezen súgószöveg megjelenítése és kilépés\n"
+"  -k, --skel VÁZ_KVT               alternatív vázkönyvtár megadása\n"
+"  -K, --key KULCS=ÉRTÉK            felülbírálja az /etc/login.defs\n"
+"                                   alapértelmezéseit\n"
+"  -m, --create-home                az új felhasználói fiók saját\n"
+"                                   könyvtárának létrehozása\n"
+"  -o, --non-unique                 engedélyezi a csoport létrehozását "
+"többször\n"
+"                                   szereplő (nem egyedi) GID értékkel\n"
+"  -p, --password JELSZÓ            titkosított jelszó használata az új\n"
+"                                   felhasználói fiókhoz\n"
+"  -s, --shell PARANCSÉRTELMEZŐ     a bejelentkezési parancsértelmező az\n"
+"                                   új felhasználói fiókhoz\n"
+"  -u, --uid UID                    az UID használatának kényszerítése az új\n"
+"                                   felhasználói fiókhoz\n"
 "\n"
 
 #, fuzzy, c-format
@@ -1830,18 +1844,20 @@
 "Usage: userdel [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce removal of files, even if not owned by user\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -r, --remove\t\t\tremove home directory and mail spool\n"
+"  -f, --force                   force removal of files,\n"
+"                                even if not owned by user\n"
+"  -h, --help                    display this help message and exit\n"
+"  -r, --remove                  remove home directory and mail spool\n"
 "\n"
 msgstr ""
 "Használat: userdel [kapcsolók] NÉV\n"
 "\n"
 "Kapcsolók:\n"
-"  -f, --force\t\t\tfájlok eltávolításának kényszerítése, még ha nem a\n"
-"\t\t\t\tfelhasználó a tulajdonos is\n"
-"  -h, --help\t\t\tezen súgószöveg megjelenítése és kilépés\n"
-"  -r, --remove\t\t\tsaját könyvtár és levelezési sor eltávolítása\n"
+"  -f, --force                   fájlok eltávolításának kényszerítése, még\n"
+"                                ha nem a felhasználó a tulajdonos is\n"
+"  -h, --help                    ezen súgószöveg megjelenítése és kilépés\n"
+"  -r, --remove                  saját könyvtár és levelezési sor "
+"eltávolítása\n"
 "\n"
 
 #, c-format
@@ -1908,55 +1924,62 @@
 "Usage: usermod [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -c, --comment COMMENT\t\tnew value of the GECOS field\n"
-"  -d, --home HOME_DIR\t\tnew home directory for the user account\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP as new primary group\n"
-"  -G, --groups GROUPS\t\tnew list of supplementary GROUPS\n"
-"  -a, --append\t\tappend the user to the supplemental GROUPS\n"
-"\t\t\t\tmentioned by the -G option without removing\n"
-"\t\t\t\thim/her from other groups\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --login NEW_LOGIN\t\tnew value of the login name\n"
-"  -L, --lock\t\t\tlock the user account\n"
-"  -m, --move-home\t\tmove contents of the home directory to the new\n"
-"\t\t\t\tlocation (use only with -d)\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new password\n"
-"  -s, --shell SHELL\t\tnew login shell for the user account\n"
-"  -u, --uid UID\t\t\tnew UID for the user account\n"
-"  -U, --unlock\t\t\tunlock the user account\n"
+"  -c, --comment COMMENT         new value of the GECOS field\n"
+"  -d, --home HOME_DIR           new home directory for the user account\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP as new primary group\n"
+"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+"  -a, --append                  append the user to the supplemental GROUPS\n"
+"                                mentioned by the -G option without removing\n"
+"                                him/her from other groups\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --login NEW_LOGIN         new value of the login name\n"
+"  -L, --lock                    lock the user account\n"
+"  -m, --move-home               move contents of the home directory to the\n"
+"                                new location (use only with -d)\n"
+"  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
+"  -u, --uid UID                 new UID for the user account\n"
+"  -U, --unlock                  unlock the user account\n"
 "\n"
 msgstr ""
 "Használat: usermod [kapcsolók] NÉV\n"
 "\n"
 "Kapcsolók:\n"
-"  -a, --append\t\t felhasználó adása a kiegészítő CSOPORTHOZ\n"
-"\t\t\t\t(csak -G-vel használd)\n"
-"  -c, --comment MEGJEGYZÉS\t\ta GECOS mező új értéke\n"
-"  -d, --home SAJÁT_KVT\t\túj bejelentkezési könyvtár az új felhasználói\n"
-"  -e, --expiredate LEJÁRATI_DÁTUM\tfiók lejárati dátumának beállítása a\n"
-"\t\t\t\tLEJÁRATI_DÁTUMRA\n"
-"  -f, --inactive INAKTÍV\ta jelszó inaktívvá tétele lejárat után\n"
-"\t\t\t\taz INAKTÍV értékre\n"
-"  -g, --gid CSOPORT\t\ta CSOPORT használatának kényszerítése az új\n"
-"\t\t\t\tfelhasználói fiókhoz\n"
-"  -G, --groups CSOPORTOK\t\tkiegészítő csoportok felsorolása az új\n"
-"\t\t\t\tfelhasználói fiókhoz\n"
-"  -h, --help\t\t\tezen súgószöveg megjelenítése és kilépés\n"
-"  -l, --login NÉV\t\ta bejelentkezési név új értéke\n"
-"  -L, --lock\t\t\ta megadott fiók zárolása\n"
-"  -m, --move-home\t\ta saját könyvtár tartalmának áthelyezése az új\n"
-"\t\t\t\thelyre (csak a -d kapcsolóval használd)\n"
-"  -o, --non-unique\t\tengedélyezi a csoport létrehozását többször\n"
-" \t\t\t\tszereplő (nem egyedi) GID értékkel\n"
-"  -p, --password JELSZÓ\taz új jelszó titkosított\n"
-"  -s, --shell PARANCSÉRTELMEZŐ\t\ta PARANCSÉRTELMEZŐ használata a\n"
-"\t\t\t\tpasswd-ben megadott alapértelmezett helyett\n"
-"  -u, --uid UID\t\t\túj UID a felhasználó fiókjához\n"
-"  -U, --unlock\t\t\ta felhasználói fiók zárolásának feloldása\n"
+"  -a, --append                     felhasználó adása a kiegészítő "
+"CSOPORTHOZ\n"
+"                                   (csak -G-vel használd)\n"
+"  -c, --comment MEGJEGYZÉS         a GECOS mező új értéke\n"
+"  -d, --home SAJÁT_KVT             új bejelentkezési könyvtár az új\n"
+"                                   felhasználói\n"
+"  -e, --expiredate LEJÁRATI_DÁTUM  fiók lejárati dátumának beállítása a\n"
+"                                   LEJÁRATI_DÁTUMRA\n"
+"  -f, --inactive INAKTÍV           a jelszó inaktívvá tétele lejárat után\n"
+"                                   az INAKTÍV értékre\n"
+"  -g, --gid CSOPORT                a CSOPORT használatának kényszerítése\n"
+"                                   az új felhasználói fiókhoz\n"
+"  -G, --groups CSOPORTOK           kiegészítő csoportok felsorolása az új\n"
+"                                   felhasználói fiókhoz\n"
+"  -h, --help                       ezen súgószöveg megjelenítése és kilépés\n"
+"  -l, --login NÉV                  a bejelentkezési név új értéke\n"
+"  -L, --lock                       a megadott fiók zárolása\n"
+"  -m, --move-home                  a saját könyvtár tartalmának áthelyezése "
+"az\n"
+"                                   új helyre (csak a -d kapcsolóval "
+"használd)\n"
+"  -o, --non-unique                 engedélyezi a csoport létrehozását "
+"többször\n"
+"                                   szereplő (nem egyedi) GID értékkel\n"
+"  -p, --password JELSZÓ            az új jelszó titkosított\n"
+"  -s, --shell PARANCSÉRTELMEZŐ     a PARANCSÉRTELMEZŐ használata a\n"
+"                                   passwd-ben megadott alapértelmezett "
+"helyett\n"
+"  -u, --uid UID                    új UID a felhasználó fiókjához\n"
+"  -U, --unlock                     a felhasználói fiók zárolásának "
+"feloldása\n"
 "\n"
 
 #, fuzzy, c-format
@@ -2026,21 +2049,22 @@
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
-"  -g, --group\t\t\tedit group database\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -p, --passwd\t\t\tedit passwd database\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -s, --shadow\t\t\tedit shadow or gshadow database\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
 "\n"
 msgstr ""
 "Használat: vipw [kapcsolók]\n"
 "\n"
 "Kapcsolók:\n"
-"  -g, --group\t\t\tcsoportadatbázis szerkesztése\n"
-"  -h, --help\t\t\tezen súgószöveg megjelenítése\n"
-"  -p, --passwd\t\t\ta passwd adatbázis szerkesztése\n"
-"  -q, --quiet\t\t\tcsendes mód\n"
-"  -s, --shadow\t\t\ta shadow vagy gshadow adatbázis szerkesztése\n"
+"  -g, --group                   csoportadatbázis szerkesztése\n"
+"  -h, --help                    ezen súgószöveg megjelenítése\n"
+"  -p, --passwd                  a passwd adatbázis szerkesztése\n"
+"  -q, --quiet                   csendes mód\n"
+"  -s, --shadow                  a shadow vagy gshadow adatbázis "
+"szerkesztése\n"
 "\n"
 
 #, c-format

Modified: upstream/trunk/po/id.po
===================================================================
--- upstream/trunk/po/id.po	2007-11-24 22:41:24 UTC (rev 1460)
+++ upstream/trunk/po/id.po	2007-11-25 20:21:53 UTC (rev 1461)
@@ -5,8 +5,8 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.15\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 12:26+0100\n"
-"PO-Revision-Date: 2006-04-07 11:45+0700\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"PO-Revision-Date: 2007-11-25 20:58+0100\n"
 "Last-Translator: Parlin Imanuel Toh <parlin_i at yahoo.com>\n"
 "Language-Team: Debian Indonesia <debid at yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -194,35 +194,37 @@
 "Usage: chage [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -d, --lastday LAST_DAY\tset last password change to LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -I, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --list\t\t\tshow account aging information\n"
-"  -m, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
+"  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+"  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -h, --help                    display this help message and exit\n"
+"  -I, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --list                    show account aging information\n"
+"  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
+"  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 "\n"
 msgstr ""
 "Penggunaan: chage [pilihan-pilihan] [NAMA-LOGIN]\n"
 "\n"
 "Pilihan-pilihan:\n"
-"  -d, --lastday LAST_DAY\tatur pergantian password terakhir pada LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\tatur kadaluarsa akun pada tanggal\n"
-"\t\t\t\tEXPIRE_DATE\n"
-"  -h, --help\t\t\ttampilkan pesan bantuan ini dan keluar\n"
-"  -I, --inactive INACTIVE\tatur masa inaktif kata sandi setelah kadaluarsa\n"
-"\t\t\t\tpada INACTIVE\n"
-"  -l, --list\t\t\ttampilkan informasi umur akun\n"
-"  -m, --mindays MIN_DAYS\tatur jumlah hari minimum sebelum kata sandi\n"
-"\t\t\t\tdiganti menjadi MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS\tatur jumlah hari maksimum sebelum kata sandi\n"
-"\t\t\t\tdiganti menjadi MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS\tatur hari peringatan kadaluarsa menjadi\n"
-"\t\t\t\tWARN_DAYS\n"
+"  -d, --lastday LAST_DAY        atur pergantian password terakhir pada "
+"LAST_DAY\n"
+"  -E, --expiredate EXPIRE_DATE  atur kadaluarsa akun pada tanggal\n"
+"                                EXPIRE_DATE\n"
+"  -h, --help                    tampilkan pesan bantuan ini dan keluar\n"
+"  -I, --inactive INACTIVE       atur masa inaktif kata sandi setelah\n"
+"                                kadaluarsa pada INACTIVE\n"
+"  -l, --list                    tampilkan informasi umur akun\n"
+"  -m, --mindays MIN_DAYS        atur jumlah hari minimum sebelum kata sandi\n"
+"                                diganti menjadi MIN_DAYS\n"
+"  -M, --maxdays MAX_DAYS        atur jumlah hari maksimum sebelum kata "
+"sandi\n"
+"                                diganti menjadi MAX_DAYS\n"
+"  -W, --warndays WARN_DAYS      atur hari peringatan kadaluarsa menjadi\n"
+"                                WARN_DAYS\n"
 "\n"
 
 #, c-format
@@ -460,22 +462,24 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
+"  -e, --encrypted               supplied passwords are encrypted\n"
+"  -h, --help                    display this help message and exit\n"
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
 "%s\n"
 msgstr ""
 "Penggunaan: chpasswd [pilihan-pilihan]\n"
 "\n"
 "Pilihan-pilihan:\n"
-"  -e, --encrypted\tkata sandi yang diberikan telah terenkripsi\n"
-"  -h, --help\t\ttampilkan pesan bantuan ini dan keluar\n"
-"  -m, --md5\t\tgunakan enkripsi MD5 daripada DES bila kata sandi\n"
-"\t\t\tyang diberikan tak terenkripsi\n"
+"  -e, --encrypted               kata sandi yang diberikan telah terenkripsi\n"
+"  -h, --help                    tampilkan pesan bantuan ini dan keluar\n"
+"  -m, --md5                     gunakan enkripsi MD5 daripada DES bila kata\n"
+"                                sandi yang diberikan tak terenkripsi\n"
 
 msgid ""
-"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+"  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+"                                crypt algorithms\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -555,8 +559,8 @@
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -h, --help\t\t\t\tdisplay this help message and exit\n"
-"  -s, --shell SHELL\t\t\tnew login shell for the user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
 "\n"
 msgstr ""
 
@@ -592,29 +596,37 @@
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\tdisplay faillog records for all users\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n"
-"  -m, --maximum MAX\t\tset maximum failed login counters to MAX\n"
-"  -r, --reset\t\t\treset the counters of login failures\n"
-"  -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n"
-"  -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n"
-"\t\t\t\tand limits (if used with -r, -m or -l options) only\n"
-"\t\t\t\tfor user with LOGIN\n"
+"  -a, --all                     display faillog records for all users\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"seconds\n"
+"  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+"  -r, --reset                   reset the counters of login failures\n"
+"  -t, --time DAYS               display faillog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m or -"
+"l\n"
+"                                options) only for user with LOGIN\n"
 "\n"
 msgstr ""
 "Penggunaan: faillog [pilihan-pilihan]\n"
 "\n"
 "Pilihan-pilihan:\n"
-"  -a, --all\t\t\ttampilkan record faillog records untuk semua pengguna\n"
-"  -h, --help\t\t\ttampilkan pesan bantuan ini dan keluar\n"
-"  -l, --lock-time DTK\t\tsetelah kegagalan login blok akun selama DTK detik\n"
-"  -m, --maximum MAX\t\tatur penghitung kegagalan login maksimum pada MAX\n"
-"  -r, --reset\t\t\treset penghitung kegagalan login\n"
-"  -t, --time HARI\t\ttampilkan record faillog yang lebih baru dari HARI\n"
-"  -u, --user NAMA\t\ttampilkan record faillog atau atur penghitung\n"
-"\t\t\t\tkegagalan dan batasnya (bila digunakan dengan -r, -m atau -l) hanya\n"
-"\t\t\t\tuntuk pengguna dengan nama NAMA\n"
+"  -a, --all                     tampilkan record faillog records untuk\n"
+"                                semua pengguna\n"
+"  -h, --help                    tampilkan pesan bantuan ini dan keluar\n"
+"  -l, --lock-time DTK           setelah kegagalan login blok akun selama\n"
+"                                DTK detik\n"
+"  -m, --maximum MAX             atur penghitung kegagalan login maksimum\n"
+"                                pada MAX\n"
+"  -r, --reset                   reset penghitung kegagalan login\n"
+"  -t, --time HARI               tampilkan record faillog yang lebih baru\n"
+"                                dari HARI\n"
+"  -u, --user NAMA               tampilkan record faillog atau atur\n"
+"                                penghitung kegagalan dan batasnya (bila\n"
+"                                digunakan dengan -r, -m atau -l) hanya\n"
+"                                untuk pengguna dengan nama NAMA\n"
 "\n"
 
 #, c-format
@@ -743,24 +755,25 @@
 "Usage: groupadd [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce exit with success status if the specified\n"
-"\t\t\t\tgroup already exists\n"
-"  -g, --gid GID\t\t\tuse GID for the new group\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -o, --non-unique\t\tallow create group with duplicate\n"
-"\t\t\t\t(non-unique) GID\n"
+"  -f, --force                   force exit with success status if the\n"
+"                                specified group already exists\n"
+"  -g, --gid GID                 use GID for the new group\n"
+"  -h, --help                    display this help message and exit\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -o, --non-unique              allow create group with duplicate\n"
+"                                (non-unique) GID\n"
 "\n"
 msgstr ""
 "Usage: groupadd [pilihan-pilihan] namagroup\n"
 "\n"
 "Pilihan-pilihan:\n"
-"  -f, --force\t\tpaksa status sukses saat keluar bila grup telah ada\n"
-"  -g, --gid GID\t\tgunakan GID untuk grup yang baru ini\n"
-"  -h, --help\t\t\ttampilkan pesan bantuan ini dan keluar\n"
-"  -K, --key KEY=VALUE\t\tganti nilai bawaan pada /etc/login.defs\n"
-"  -o, --non-unique\t\tperbolehkan pembuatan grup dengan GID terduplikasi\n"
-"\t\t\t\t(tak-unik)\n"
+"  -f, --force                   paksa status sukses saat keluar bila grup\n"
+"                                telah ada\n"
+"  -g, --gid GID                 gunakan GID untuk grup yang baru ini\n"
+"  -h, --help                    tampilkan pesan bantuan ini dan keluar\n"
+"  -K, --key KEY=VALUE           ganti nilai bawaan pada /etc/login.defs\n"
+"  -o, --non-unique              perbolehkan pembuatan grup dengan GID\n"
+"                                terduplikasi (tak-unik)\n"
 "\n"
 
 #, c-format
@@ -888,21 +901,23 @@
 "Usage: groupmod [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -g, --gid GID\t\t\tforce use new GID by GROUP\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -n, --new-name NEW_GROUP\tforce use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) GID by GROUP\n"
+"  -g, --gid GID                 force use new GID by GROUP\n"
+"  -h, --help                    display this help message and exit\n"
+"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+"  -o, --non-unique              allow using duplicate (non-unique) GID by "
+"GROUP\n"
 "\n"
 msgstr ""
 "Usage: groupadd [pilihan-pilihan] namagroup\n"
 "\n"
 "Pilihan-pilihan:\n"
-"  -f, --force\t\tpaksa status sukses saat keluar bila grup telah ada\n"
-"  -g, --gid GID\t\tgunakan GID untuk grup yang baru ini\n"
-"  -h, --help\t\t\ttampilkan pesan bantuan ini dan keluar\n"
-"  -K, --key KEY=VALUE\t\tganti nilai bawaan pada /etc/login.defs\n"
-"  -o, --non-unique\t\tperbolehkan pembuatan grup dengan GID terduplikasi\n"
-"\t\t\t\t(tak-unik)\n"
+"  -f, --force                   paksa status sukses saat keluar bila grup\n"
+"                                telah ada\n"
+"  -g, --gid GID                 gunakan GID untuk grup yang baru ini\n"
+"  -h, --help                    tampilkan pesan bantuan ini dan keluar\n"
+"  -K, --key KEY=VALUE           ganti nilai bawaan pada /etc/login.defs\n"
+"  -o, --non-unique              perbolehkan pembuatan grup dengan GID\n"
+"                                terduplikasi (tak-unik)\n"
 "\n"
 
 #, c-format
@@ -1054,19 +1069,22 @@
 "Usage: lastlog [options]\n"
 "\n"
 "Options:\n"
-"  -b, --before DAYS\tprint only lastlog records older than DAYS\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -t, --time DAYS\tprint only lastlog records more recent than DAYS\n"
-"  -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n"
+"  -b, --before DAYS             print only lastlog records older than DAYS\n"
+"  -h, --help                    display this help message and exit\n"
+"  -t, --time DAYS               print only lastlog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 "\n"
 msgstr ""
 "Penggunaan: lastlog [pilihan-pilihan]\n"
 "\n"
 "Pilihan-pilihan:\n"
-"  -b, --before HARI\tcetak hanya record lastlog yang lebih tua dari HARI\n"
-"  -h, --help\t\ttampilkan pesan bantuan ini dan keluar\n"
-"  -t, --time HARI\tcetak hanya record lastlog yang lebih baru dari HARI\n"
-"  -u, --user NAMA\tcetak record lastlog untuk pengguna dengan nama NAMA\n"
+"  -b, --before HARI     cetak hanya record lastlog yang lebih tua dari HARI\n"
+"  -h, --help            tampilkan pesan bantuan ini dan keluar\n"
+"  -t, --time HARI       cetak hanya record lastlog yang lebih baru dari "
+"HARI\n"
+"  -u, --user NAMA       cetak record lastlog untuk pengguna dengan nama "
+"NAMA\n"
 "\n"
 
 #, c-format
@@ -1217,14 +1235,10 @@
 msgid ""
 "Usage: %s [options] [input]\n"
 "\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
 "%s\n"
 msgstr ""
 
-msgid ""
-"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
-msgstr ""
-
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: tidak dapat mengunci /etc/passwd.\n"
@@ -1278,45 +1292,51 @@
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\treport password status on all accounts\n"
-"  -d, --delete\t\t\tdelete the password for the named account\n"
-"  -e, --expire\t\t\tforce expire the password for the named account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --keep-tokens\t\tchange password only if expired\n"
-"  -i, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --lock\t\t\tlock the named account\n"
-"  -n, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -r, --repository REPOSITORY\tchange password in REPOSITORY repository\n"
-"  -S, --status\t\t\treport password status on the named account\n"
-"  -u, --unlock\t\t\tunlock the named account\n"
-"  -w, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
+"  -a, --all                     report password status on all accounts\n"
+"  -d, --delete                  delete the password for the named account\n"
+"  -e, --expire                  force expire the password for the named "
+"account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --keep-tokens             change password only if expired\n"
+"  -i, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --lock                    lock the named account\n"
+"  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -q, --quiet                   quiet mode\n"
+"  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+"  -S, --status                  report password status on the named account\n"
+"  -u, --unlock                  unlock the named account\n"
+"  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
 "Penggunaan: passwd [pilihan-pilihan] [nama-pengguna]\n"
 "\n"
 "Pilihan-pilihan:\n"
-"  -a, --all\t\t\tlaporkan status kata sandi untuk semua akun\n"
-"  -d, --delete\t\t\thapus password untuk pengguna yang diberikan\n"
-"  -e, --expire\t\t\tpaksakan kadaluarsa kata sandi untuk akun pengguna\n"
-"  -h, --help\t\t\ttampilkan pesan bantuan ini dan keluar\n"
-"  -k, --keep-tokens\t\tganti kata sandi hanya bila telah kadaluarsa\n"
-"  -i, --inactive INAKTIF\tatur masa inaktif kata sandi setelah kadaluarsa\n"
-"\t\t\t\tpada INAKTIF\n"
-"  -l, --lock\t\t\tblok akun pengguna\n"
-"  -n, --mindays HARI_MIN\tatur jumlah hari minimum sebelum kata sandi\n"
-"\t\t\t\tdiganti pada HARI_MIN\n"
-"  -q, --quiet\t\t\tmode tenang\n"
-"  -r, --repository REPOSITORI\tubah kata sandi pada repositori REPOSITORI\n"
-"  -S, --status\t\t\tlaporkan status kata sandi dari akun pengguna\n"
-"  -u, --unlock\t\t\tbuka bloking akun pengguna\n"
-"  -w, --warndays HARI\tatur hari peringatan kadaluarsa pada HARI\n"
-"  -x, --maxdays HARI_MAKS\tatur jumlah hari maksimum sebelum kata sandi\n"
-"\t\t\t\tdiganti pada HARI_MAKS\n"
+"  -a, --all                     laporkan status kata sandi untuk semua akun\n"
+"  -d, --delete                  hapus password untuk pengguna yang "
+"diberikan\n"
+"  -e, --expire                  paksakan kadaluarsa kata sandi untuk akun\n"
+"                                pengguna\n"
+"  -h, --help                    tampilkan pesan bantuan ini dan keluar\n"
+"  -k, --keep-tokens             ganti kata sandi hanya bila telah "
+"kadaluarsa\n"
+"  -i, --inactive INAKTIF        atur masa inaktif kata sandi setelah\n"
+"                                kadaluarsa pada INAKTIF\n"
+"  -l, --lock                    blok akun pengguna\n"
+"  -n, --mindays HARI_MIN        atur jumlah hari minimum sebelum kata sandi\n"
+"                                diganti pada HARI_MIN\n"
+"  -q, --quiet                   mode tenang\n"
+"  -r, --repository REPOSITORI   ubah kata sandi pada repositori REPOSITORI\n"
+"  -S, --status                  laporkan status kata sandi dari akun "
+"pengguna\n"
+"  -u, --unlock                  buka bloking akun pengguna\n"
+"  -w, --warndays HARI           atur hari peringatan kadaluarsa pada HARI\n"
+"  -x, --maxdays HARI_MAKS       atur jumlah hari maksimum sebelum kata "
+"sandi\n"
+"                                diganti pada HARI_MAKS\n"
 "\n"
 
 msgid "Old password: "
@@ -1500,26 +1520,27 @@
 "Usage: su [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -, -l, --login\t\tmake the shell a login shell\n"
+"  -c, --command COMMAND         pass COMMAND to the invoked shell\n"
+"  -h, --help                    display this help message and exit\n"
+"  -, -l, --login                make the shell a login shell\n"
 "  -m, -p,\n"
-"  --preserve-environment\tdo not reset environment variables, and keep\n"
-"\t\t\t\tthe same shell\n"
-"  -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n"
+"  --preserve-environment        do not reset environment variables, and\n"
+"                                keep the same shell\n"
+"  -s, --shell SHELL             use SHELL instead of the default in passwd\n"
 "\n"
 msgstr ""
 "Penggunaan: su [pilihan-pilihan] [login]\n"
 "\n"
 "Pilihan-pilihan:\n"
-"  -c, --command PERINTAH\t\tberikan PERINTAH yang akan diberikan pada shell\n"
-"  -h, --help\t\t\ttampilkan pesan bantuan ini dan keluar\n"
-"  -, -l, --login\t\tbuat shell menjadi shell login\n"
+"  -c, --command PERINTAH        berikan PERINTAH yang akan diberikan\n"
+"                                pada shell\n"
+"  -h, --help                    tampilkan pesan bantuan ini dan keluar\n"
+"  -, -l, --login                buat shell menjadi shell login\n"
 "  -m, -p,\n"
-"  --preserve-environment\tjangan reset  variabel lingkungan, dan\n"
-"\t\t\t\tpertahankan\n"
-"\t\t\t\tshell yang sama\n"
-"  -s, --shell SHELL\t\tgunakan shell SHELL daripada bawaan di passwd\n"
+"  --preserve-environment        jangan reset  variabel lingkungan, dan\n"
+"                                pertahankan shell yang sama\n"
+"  -s, --shell SHELL             gunakan shell SHELL daripada bawaan\n"
+"                                di passwd\n"
 "\n"
 
 #, c-format
@@ -1606,55 +1627,58 @@
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR\tbase directory for the new user account\n"
-"\t\t\t\thome directory\n"
-"  -c, --comment COMMENT\t\tset the GECOS field for the new user account\n"
-"  -d, --home-dir HOME_DIR\thome directory for the new user account\n"
-"  -D, --defaults\t\tprint or save modified default useradd\n"
-"\t\t\t\tconfiguration\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP for the new user account\n"
-"  -G, --groups GROUPS\t\tlist of supplementary groups for the new\n"
-"\t\t\t\tuser account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --skel SKEL_DIR\t\tspecify an alternative skel directory\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -m, --create-home\t\tcreate home directory for the new user\n"
-"\t\t\t\taccount\n"
-"  -o, --non-unique\t\tallow create user with duplicate\n"
-"\t\t\t\t(non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new user\n"
-"\t\t\t\taccount\n"
-"  -s, --shell SHELL\t\tthe login shell for the new user account\n"
-"  -u, --uid UID\t\t\tforce use the UID for the new user account\n"
+"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+"                                home directory\n"
+"  -c, --comment COMMENT         set the GECOS field for the new user "
+"account\n"
+"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+"  -D, --defaults                print or save modified default useradd\n"
+"                                configuration\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP for the new user account\n"
+"  -G, --groups GROUPS           list of supplementary groups for the new\n"
+"                                user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -m, --create-home             create home directory for the new user\n"
+"                                account\n"
+"  -o, --non-unique              allow create user with duplicate\n"
+"                                (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new user\n"
+"                                account\n"
+"  -s, --shell SHELL             the login shell for the new user account\n"
+"  -u, --uid UID                 force use the UID for the new user account\n"
 "\n"
 msgstr ""
 "Penggunaan: useradd [pilihan-pilihan] NAMA-LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR\tdirektori awal untuk direktori rumah dari\n"
-"\t\t\t\tpengguna baru\n"
-"  -c, --comment KOMENTAR\t\tatur ruas GECOS untuk pengguna baru\n"
-"  -d, --home-dir DIR_RUMAH\tdirektori rumah untuk pengguna baru\n"
-"  -D, --defaults\t\tcetak atau simpan konfigurasi bawaan useradd\n"
-"  -e, --expiredate KADALUARSA\tatur tanggal kadaluarsa pada KADALUARSA\n"
-"  -f, --inactive INAKTIF\tatur masa inaktif kata sandi setelah\n"
-"\t\t\t\tkadaluarsa menjadi INAKTIF\n"
-"  -g, --gid GRUP\t\tpaksakan grup GRUP untuk pengguna baru\n"
-"  -G, --groups GRUP-GRUP\t\tdaftar grup-grup tambahan untuk\n"
-"\t\t\t\tpengguna baru\n"
-"  -h, --help\t\t\ttampilkan pesan bantuan ini dan keluar\n"
-"  -k, --skel SKEL_DIR\t\tberikan direktori skel alternatif\n"
-"  -K, --key KEY=VALUE\t\tganti nilai-nilai bawaan pada /etc/login.defs\n"
-"  -m, --create-home\t\tbuat direktori rumah untuk pengguna baru\n"
-"  -o, --non-unique\t\tperbolehkan pembuatan pengguna dengan\n"
-"\t\t\t\tUID terduplikasi (tak-unik)\n"
-"  -p, --password PASSWORD\tgunakan kata sandi terenkripsi untuk\n"
-"\t\t\t\tpengguna baru\n"
-"  -s, --shell SHELL\t\tshell login untuk pengguna baru\n"
-"  -u, --uid UID\t\t\tpaksakan uid UID untuk pengguna baru\n"
+"  -b, --base-dir BASE_DIR       direktori awal untuk direktori rumah dari\n"
+"                                pengguna baru\n"
+"  -c, --comment KOMENTAR        atur ruas GECOS untuk pengguna baru\n"
+"  -d, --home-dir DIR_RUMAH      direktori rumah untuk pengguna baru\n"
+"  -D, --defaults                cetak atau simpan konfigurasi bawaan "
+"useradd\n"
+"  -e, --expiredate KADALUARSA   atur tanggal kadaluarsa pada KADALUARSA\n"
+"  -f, --inactive INAKTIF        atur masa inaktif kata sandi setelah\n"
+"                                kadaluarsa menjadi INAKTIF\n"
+"  -g, --gid GRUP                paksakan grup GRUP untuk pengguna baru\n"
+"  -G, --groups GRUP-GRUP        daftar grup-grup tambahan untuk\n"
+"                                pengguna baru\n"
+"  -h, --help                    tampilkan pesan bantuan ini dan keluar\n"
+"  -k, --skel SKEL_DIR           berikan direktori skel alternatif\n"
+"  -K, --key KEY=VALUE           ganti nilai-nilai bawaan pada /etc/login."
+"defs\n"
+"  -m, --create-home             buat direktori rumah untuk pengguna baru\n"
+"  -o, --non-unique              perbolehkan pembuatan pengguna dengan\n"
+"                                UID terduplikasi (tak-unik)\n"
+"  -p, --password PASSWORD       gunakan kata sandi terenkripsi untuk\n"
+"                                pengguna baru\n"
+"  -s, --shell SHELL             shell login untuk pengguna baru\n"
+"  -u, --uid UID                 paksakan uid UID untuk pengguna baru\n"
 "\n"
 
 #, fuzzy, c-format
@@ -1799,9 +1823,10 @@
 "Usage: userdel [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce removal of files, even if not owned by user\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -r, --remove\t\t\tremove home directory and mail spool\n"
+"  -f, --force                   force removal of files,\n"
+"                                even if not owned by user\n"
+"  -h, --help                    display this help message and exit\n"
+"  -r, --remove                  remove home directory and mail spool\n"
 "\n"
 msgstr ""
 
@@ -1868,48 +1893,50 @@
 "Usage: usermod [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -c, --comment COMMENT\t\tnew value of the GECOS field\n"
-"  -d, --home HOME_DIR\t\tnew home directory for the user account\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP as new primary group\n"
-"  -G, --groups GROUPS\t\tnew list of supplementary GROUPS\n"
-"  -a, --append\t\tappend the user to the supplemental GROUPS\n"
-"\t\t\t\tmentioned by the -G option without removing\n"
-"\t\t\t\thim/her from other groups\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --login NEW_LOGIN\t\tnew value of the login name\n"
-"  -L, --lock\t\t\tlock the user account\n"
-"  -m, --move-home\t\tmove contents of the home directory to the new\n"
-"\t\t\t\tlocation (use only with -d)\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new password\n"
-"  -s, --shell SHELL\t\tnew login shell for the user account\n"
-"  -u, --uid UID\t\t\tnew UID for the user account\n"
-"  -U, --unlock\t\t\tunlock the user account\n"
+"  -c, --comment COMMENT         new value of the GECOS field\n"
+"  -d, --home HOME_DIR           new home directory for the user account\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP as new primary group\n"
+"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+"  -a, --append                  append the user to the supplemental GROUPS\n"
+"                                mentioned by the -G option without removing\n"
+"                                him/her from other groups\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --login NEW_LOGIN         new value of the login name\n"
+"  -L, --lock                    lock the user account\n"
+"  -m, --move-home               move contents of the home directory to the\n"
+"                                new location (use only with -d)\n"
+"  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
+"  -u, --uid UID                 new UID for the user account\n"
+"  -U, --unlock                  unlock the user account\n"
 "\n"
 msgstr ""
 "Penggunaan: usermod [pilihan-pilihan] NAMA-LOGIN\n"
 "\n"
 "Pilihan-pilihan:\n"
-"  -a, --append GRUP\t\ttambahkan pengguna ke grup tambahan GRUP\n"
-"  -c, --comment KOMENTAR\tnilai baru dari ruas GECOS\n"
-"  -d, --home DIR_RUMAH\t\tdirektori rumah baru dari pengguna baru\n"
-"  -e, --expiredate TANGGAL\tatur tanggal kadaluarsa akun pada TANGGAL\n"
-"  -f, --inactive INAKTIF\tatur masa inaktif setelah kadaluarsa pada INAKTIF\n"
-"  -g, --gid GRUP\t\tpaksakan GRUP sebagai grup login awalan\n"
-"  -G, --groups GRUP-GRUP\tdaftar grup-grup tambahan\n"
-"  -h, --help\t\t\ttampilkan pesan bantuan ini dan keluar\n"
-"  -l, --login LOGIN\t\tnilai baru dari nama pengguna\n"
-"  -L, --lock\t\t\tblok akun pengguna\n"
-"  -m, --move-home\t\tpindahkan isi direktori rumah ke lokasi baru\n"
-"\t\t\t\t(hanya gunakan dengan -d)\n"
-"  -o, --non-unique\t\tperbolehkan UID terduplikasi (tak-unik)\n"
-"  -p, --password PASSWORD\tgunakan kata sandi baru yang terenkripsi\n"
-"  -s, --shell SHELL\t\tshell login baru bagi pengguna\n"
-"  -u, --uid UID\t\t\tUID baru untuk pengguna\n"
-"  -U, --unlock\t\t\tbuka bloking pengguna\n"
+"  -a, --append GRUP             tambahkan pengguna ke grup tambahan GRUP\n"
+"  -c, --comment KOMENTAR        nilai baru dari ruas GECOS\n"
+"  -d, --home DIR_RUMAH          direktori rumah baru dari pengguna baru\n"
+"  -e, --expiredate TANGGAL      atur tanggal kadaluarsa akun pada TANGGAL\n"
+"  -f, --inactive INAKTIF        atur masa inaktif setelah kadaluarsa\n"
+"                                pada INAKTIF\n"
+"  -g, --gid GRUP                paksakan GRUP sebagai grup login awalan\n"
+"  -G, --groups GRUP-GRUP        daftar grup-grup tambahan\n"
+"  -h, --help                    tampilkan pesan bantuan ini dan keluar\n"
+"  -l, --login LOGIN             nilai baru dari nama pengguna\n"
+"  -L, --lock                    blok akun pengguna\n"
+"  -m, --move-home               pindahkan isi direktori rumah ke lokasi "
+"baru\n"
+"                                (hanya gunakan dengan -d)\n"
+"  -o, --non-unique              perbolehkan UID terduplikasi (tak-unik)\n"
+"  -p, --password PASSWORD       gunakan kata sandi baru yang terenkripsi\n"
+"  -s, --shell SHELL             shell login baru bagi pengguna\n"
+"  -u, --uid UID                 UID baru untuk pengguna\n"
+"  -U, --unlock                  buka bloking pengguna\n"
 "\n"
 
 #, fuzzy, c-format
@@ -1979,21 +2006,21 @@
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
-"  -g, --group\t\t\tedit group database\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -p, --passwd\t\t\tedit passwd database\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -s, --shadow\t\t\tedit shadow or gshadow database\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
 "\n"
 msgstr ""
 "Penggunaan: vipw [pilihan-pilihan]\n"
 "\n"
 "Pilihan-pilihan:\n"
-"  -g, --group\t\t\tsunting basisdata grup\n"
-"  -h, --help\t\t\ttampilkan pesan bantuan ini dan keluar\n"
-"  -p, --passwd\t\t\tsunting basisdata kata sandi\n"
-"  -q, --quiet\t\t\tmode tenang\n"
-"  -s, --shadow\t\t\tsunting basisdata shadow atau gshadow\n"
+"  -g, --group                   sunting basisdata grup\n"
+"  -h, --help                    tampilkan pesan bantuan ini dan keluar\n"
+"  -p, --passwd                  sunting basisdata kata sandi\n"
+"  -q, --quiet                   mode tenang\n"
+"  -s, --shadow                  sunting basisdata shadow atau gshadow\n"
 "\n"
 
 #, c-format

Modified: upstream/trunk/po/it.po
===================================================================
--- upstream/trunk/po/it.po	2007-11-24 22:41:24 UTC (rev 1460)
+++ upstream/trunk/po/it.po	2007-11-25 20:21:53 UTC (rev 1461)
@@ -25,8 +25,8 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.15\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 12:26+0100\n"
-"PO-Revision-Date: 2006-03-06 21:13+0100\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"PO-Revision-Date: 2007-11-25 21:01+0100\n"
 "Last-Translator: Danilo Piazzalunga <danilopiazza at gmail.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -218,36 +218,36 @@
 "Usage: chage [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -d, --lastday LAST_DAY\tset last password change to LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -I, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --list\t\t\tshow account aging information\n"
-"  -m, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
+"  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+"  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -h, --help                    display this help message and exit\n"
+"  -I, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --list                    show account aging information\n"
+"  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
+"  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 "\n"
 msgstr ""
 "Uso: chage [OPZIONI] [LOGIN]\n"
 "\n"
 "Opzioni:\n"
-"  -d, --lastday ULTIMO_CAMBIO\timposta la data dell'ULTIMO_CAMBIO della\n"
-"\t\t\t\tpassword\n"
-"  -E, --expiredate SCADENZA\timposta la data di SCADENZA dell'account\n"
-"  -h, --help\t\t\tmostra questo messaggio di aiuto ed esce\n"
-"  -i, --inactive INATTIVITÀ\timposta il numero di giorni di INATTIVITÀ\n"
-"\t\t\t\tdella password oltre la sua scadenza\n"
-"  -l, --list\t\t\tmostra le informazioni sulla durata\n"
-"\t\t\t\tdell'account\n"
-"  -m, --mindays MINIMO\t\timposta a il numero MINIMO di giorni tra i\n"
-"\t\t\t\tcambi di password\n"
-"  -M, --maxdays MASSIMO\t\timposta il numero MASSIMO di giorni tra i\n"
-"\t\t\t\tcambi di password\n"
-"  -w, --warndays PREAVVISO\timposta il numero di giorni di PREAVVISO\n"
-"\t\t\t\tprima della scadenza della password\n"
+"  -d, --lastday ULTIMO_CAMBIO   imposta la data dell'ULTIMO_CAMBIO della\n"
+"                                password\n"
+"  -E, --expiredate SCADENZA     imposta la data di SCADENZA dell'account\n"
+"  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
+"  -i, --inactive INATTIVITÀ     imposta il numero di giorni di INATTIVITÀ\n"
+"                                della password oltre la sua scadenza\n"
+"  -l, --list                    mostra le informazioni sulla durata\n"
+"                                dell'account\n"
+"  -m, --mindays MINIMO          imposta a il numero MINIMO di giorni tra i\n"
+"                                cambi di password\n"
+"  -M, --maxdays MASSIMO         imposta il numero MASSIMO di giorni tra i\n"
+"                                cambi di password\n"
+"  -w, --warndays PREAVVISO      imposta il numero di giorni di PREAVVISO\n"
+"                                prima della scadenza della password\n"
 "\n"
 
 #, c-format
@@ -487,22 +487,24 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
+"  -e, --encrypted               supplied passwords are encrypted\n"
+"  -h, --help                    display this help message and exit\n"
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
 "%s\n"
 msgstr ""
 "Uso: chpasswd [OPZIONI]\n"
 "\n"
 "Opzioni:\n"
-"  -e, --encrypted\tle password fornite sono cifrate\n"
-"  -h, --help\t\tmostra questo messaggio di aiuto ed esce\n"
-"  -m, --md5\t\tusa la cifratura MD5 anziché DES quando le\n"
-"\t\t\tpassword fornite non sono cifrate\n"
+"  -e, --encrypted               le password fornite sono cifrate\n"
+"  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
+"  -m, --md5                     usa la cifratura MD5 anziché DES quando le\n"
+"                                password fornite non sono cifrate\n"
 
 msgid ""
-"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+"  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+"                                crypt algorithms\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -582,8 +584,8 @@
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -h, --help\t\t\t\tdisplay this help message and exit\n"
-"  -s, --shell SHELL\t\t\tnew login shell for the user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
 "\n"
 msgstr ""
 
@@ -619,34 +621,37 @@
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\tdisplay faillog records for all users\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n"
-"  -m, --maximum MAX\t\tset maximum failed login counters to MAX\n"
-"  -r, --reset\t\t\treset the counters of login failures\n"
-"  -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n"
-"  -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n"
-"\t\t\t\tand limits (if used with -r, -m or -l options) only\n"
-"\t\t\t\tfor user with LOGIN\n"
+"  -a, --all                     display faillog records for all users\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"seconds\n"
+"  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+"  -r, --reset                   reset the counters of login failures\n"
+"  -t, --time DAYS               display faillog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m or -"
+"l\n"
+"                                options) only for user with LOGIN\n"
 "\n"
 msgstr ""
 "Uso: faillog [OPZIONI]\n"
 "\n"
 "Opzioni:\n"
-"  -a, --all\t\tmostra i record degli accessi falliti per tutti\n"
-"\t\t\tgli utenti\n"
-"  -h, --help\t\tmostra questo messaggio di aiuto ed esce\n"
-"  -l, --lock-time SEC\tblocca l'account per SEC secondi dopo un tentativo\n"
-"\t\t\tdi accesso fallito\n"
-"  -m, --maximum MAX\timposta a MAX il numero massimo di tentativi di\n"
-"\t\t\taccesso falliti\n"
-"  -r, --reset\t\tazzera i conteggi degli accessi falliti\n"
-"  -t, --time GIORNI\tmostra i record degli accessi falliti più recenti\n"
-"\t\t\tdi un numero di GIORNI\n"
-"  -u, --user LOGIN\tmostra il record degli accessi falliti o, se sono\n"
-"\t\t\tstate usate con le opzioni -r, -m o -l, imposta\n"
-"\t\t\tconteggi e limiti solo per l'utente specificato\n"
-"\t\t\tda LOGIN\n"
+"  -a, --all                     mostra i record degli accessi falliti per\n"
+"                                tutti gli utenti\n"
+"  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
+"  -l, --lock-time SEC           blocca l'account per SEC secondi dopo un\n"
+"                                tentativo di accesso fallito\n"
+"  -m, --maximum MAX             imposta a MAX il numero massimo di\n"
+"                                tentativi di accesso falliti\n"
+"  -r, --reset                   azzera i conteggi degli accessi falliti\n"
+"  -t, --time GIORNI             mostra i record degli accessi falliti più\n"
+"                                recenti di un numero di GIORNI\n"
+"  -u, --user LOGIN              mostra il record degli accessi falliti o,\n"
+"                                se sono state usate con le opzioni -r, -m\n"
+"                                o -l, imposta conteggi e limiti solo per\n"
+"                                l'utente specificato da LOGIN\n"
 "\n"
 
 # NdT: Vedere faillog(5) per il significato dei campi. Il campo "On"
@@ -779,26 +784,26 @@
 "Usage: groupadd [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce exit with success status if the specified\n"
-"\t\t\t\tgroup already exists\n"
-"  -g, --gid GID\t\t\tuse GID for the new group\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -o, --non-unique\t\tallow create group with duplicate\n"
-"\t\t\t\t(non-unique) GID\n"
+"  -f, --force                   force exit with success status if the\n"
+"                                specified group already exists\n"
+"  -g, --gid GID                 use GID for the new group\n"
+"  -h, --help                    display this help message and exit\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -o, --non-unique              allow create group with duplicate\n"
+"                                (non-unique) GID\n"
 "\n"
 msgstr ""
 "Uso: groupadd [OPZIONI] GRUPPO\n"
 "\n"
 "Opzioni:\n"
-"  -f, --force\t\t\ttermina con successo anche se il gruppo\n"
-"\t\t\t\tspecificato esiste già\n"
-"  -g, --gid GID\t\t\tusa GID per il nuovo gruppo\n"
-"  -h, --help\t\t\tmostra questo messaggio di aiuto ed esce\n"
-"  -K, --key CHIAVE=VALORE\tspecifica un valore diverso da quello\n"
-"\t\t\t\tpredefinito in /etc/login.defs\n"
-"  -o, --non-unique\t\tpermette di creare un gruppo con un GID\n"
-"\t\t\t\tduplicato (non univoco)\n"
+"  -f, --force                   termina con successo anche se il gruppo\n"
+"                                specificato esiste già\n"
+"  -g, --gid GID                 usa GID per il nuovo gruppo\n"
+"  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
+"  -K, --key CHIAVE=VALORE       specifica un valore diverso da quello\n"
+"                                predefinito in /etc/login.defs\n"
+"  -o, --non-unique              permette di creare un gruppo con un GID\n"
+"                                duplicato (non univoco)\n"
 "\n"
 
 #, c-format
@@ -926,23 +931,24 @@
 "Usage: groupmod [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -g, --gid GID\t\t\tforce use new GID by GROUP\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -n, --new-name NEW_GROUP\tforce use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) GID by GROUP\n"
+"  -g, --gid GID                 force use new GID by GROUP\n"
+"  -h, --help                    display this help message and exit\n"
+"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+"  -o, --non-unique              allow using duplicate (non-unique) GID by "
+"GROUP\n"
 "\n"
 msgstr ""
 "Uso: groupadd [OPZIONI] GRUPPO\n"
 "\n"
 "Opzioni:\n"
-"  -f, --force\t\t\ttermina con successo anche se il gruppo\n"
-"\t\t\t\tspecificato esiste già\n"
-"  -g, --gid GID\t\t\tusa GID per il nuovo gruppo\n"
-"  -h, --help\t\t\tmostra questo messaggio di aiuto ed esce\n"
-"  -K, --key CHIAVE=VALORE\tspecifica un valore diverso da quello\n"
-"\t\t\t\tpredefinito in /etc/login.defs\n"
-"  -o, --non-unique\t\tpermette di creare un gruppo con un GID\n"
-"\t\t\t\tduplicato (non univoco)\n"
+"  -f, --force                   termina con successo anche se il gruppo\n"
+"                                specificato esiste già\n"
+"  -g, --gid GID                 usa GID per il nuovo gruppo\n"
+"  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
+"  -K, --key CHIAVE=VALORE       specifica un valore diverso da quello\n"
+"                                predefinito in /etc/login.defs\n"
+"  -o, --non-unique              permette di creare un gruppo con un GID\n"
+"                                duplicato (non univoco)\n"
 "\n"
 
 #, c-format
@@ -1094,22 +1100,23 @@
 "Usage: lastlog [options]\n"
 "\n"
 "Options:\n"
-"  -b, --before DAYS\tprint only lastlog records older than DAYS\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -t, --time DAYS\tprint only lastlog records more recent than DAYS\n"
-"  -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n"
+"  -b, --before DAYS             print only lastlog records older than DAYS\n"
+"  -h, --help                    display this help message and exit\n"
+"  -t, --time DAYS               print only lastlog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 "\n"
 msgstr ""
 "Uso: lastlog [OPZIONI]\n"
 "\n"
 "Opzioni:\n"
-"  -b, --before GIORNI\tmostra solo i record di ultimo accesso più vecchi\n"
-"\t\t\tdi un numero di GIORNI\n"
-"  -h, --help\t\tmostra questo messaggio di aiuto ed esce\n"
-"  -t, --time GIORNI\tmostra solo i record di ultimo accesso più recenti\n"
-"\t\t\tdi un numero di GIORNI\n"
-"  -u, --user LOGIN\tmostra il record di ultimo accesso per l'utente\n"
-"\t\t\tspecificato da LOGIN\n"
+"  -b, --before GIORNI           mostra solo i record di ultimo accesso più\n"
+"                                vecchi di un numero di GIORNI\n"
+"  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
+"  -t, --time GIORNI             mostra solo i record di ultimo accesso più\n"
+"                                recenti di un numero di GIORNI\n"
+"  -u, --user LOGIN              mostra il record di ultimo accesso per\n"
+"                                l'utente specificato da LOGIN\n"
 "\n"
 
 #, c-format
@@ -1262,14 +1269,10 @@
 msgid ""
 "Usage: %s [options] [input]\n"
 "\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
 "%s\n"
 msgstr ""
 
-msgid ""
-"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
-msgstr ""
-
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: impossibile fare il lock di /etc/passwd.\n"
@@ -1323,50 +1326,52 @@
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\treport password status on all accounts\n"
-"  -d, --delete\t\t\tdelete the password for the named account\n"
-"  -e, --expire\t\t\tforce expire the password for the named account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --keep-tokens\t\tchange password only if expired\n"
-"  -i, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --lock\t\t\tlock the named account\n"
-"  -n, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -r, --repository REPOSITORY\tchange password in REPOSITORY repository\n"
-"  -S, --status\t\t\treport password status on the named account\n"
-"  -u, --unlock\t\t\tunlock the named account\n"
-"  -w, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
+"  -a, --all                     report password status on all accounts\n"
+"  -d, --delete                  delete the password for the named account\n"
+"  -e, --expire                  force expire the password for the named "
+"account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --keep-tokens             change password only if expired\n"
+"  -i, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --lock                    lock the named account\n"
+"  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -q, --quiet                   quiet mode\n"
+"  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+"  -S, --status                  report password status on the named account\n"
+"  -u, --unlock                  unlock the named account\n"
+"  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
 "Uso: passwd [OPZIONI] [LOGIN]\n"
 "\n"
 "Opzioni:\n"
-"  -a, --all\t\t\tmostra lo stato delle password di tutti gli\n"
-"\t\t\t\taccount\n"
-"  -d, --delete\t\t\telimina la password dell'account specificato\n"
-"  -e, --expire\t\t\tsegna come scaduta la password dell'account\n"
-"\t\t\t\tspecificato\n"
-"  -h, --help\t\t\tmostra questo messaggio di aiuto ed esce\n"
-"  -k, --keep-tokens\t\tcambia la password solo se è scaduta\n"
-"  -i, --inactive INATTIVITÀ\timposta il numero di giorni di INATTIVITÀ\n"
-"\t\t\t\tdella password oltre la sua scadenza\n"
-"  -l, --lock\t\t\tblocca l'account specificato\n"
-"  -n, --mindays MINIMO\t\timposta a il numero MINIMO di giorni tra i\n"
-"\t\t\t\tcambi di password\n"
-"  -q, --quiet\t\t\topera in modalità silenziosa\n"
-"  -r, --repository REPOSITORY\tcambia la password nel REPOSITORY\n"
-"\t\t\t\tspecificato\n"
-"  -S, --status\t\t\tmostra lo stato della password dell'account\n"
-"\t\t\t\tspecificato\n"
-"  -u, --unlock\t\t\tsblocca l'account specificato\n"
-"  -w, --warndays PREAVVISO\timposta il numero di giorni di PREAVVISO\n"
-"\t\t\t\tprima della scadenza della password\n"
-"  -x, --maxdays MASSIMO\t\timposta il numero MASSIMO di giorni tra i\n"
-"\t\t\t\tcambi di password\n"
+"  -a, --all                     mostra lo stato delle password di tutti gli\n"
+"                                account\n"
+"  -d, --delete                  elimina la password dell'account "
+"specificato\n"
+"  -e, --expire                  segna come scaduta la password dell'account\n"
+"                                specificato\n"
+"  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
+"  -k, --keep-tokens             cambia la password solo se è scaduta\n"
+"  -i, --inactive INATTIVITÀ     imposta il numero di giorni di INATTIVITÀ\n"
+"                                della password oltre la sua scadenza\n"
+"  -l, --lock                    blocca l'account specificato\n"
+"  -n, --mindays MINIMO          imposta a il numero MINIMO di giorni tra i\n"
+"                                cambi di password\n"
+"  -q, --quiet                   opera in modalità silenziosa\n"
+"  -r, --repository REPOSITORY   cambia la password nel REPOSITORY\n"
+"                                specificato\n"
+"  -S, --status                  mostra lo stato della password dell'account\n"
+"                                specificato\n"
+"  -u, --unlock                  sblocca l'account specificato\n"
+"  -w, --warndays PREAVVISO      imposta il numero di giorni di PREAVVISO\n"
+"                                prima della scadenza della password\n"
+"  -x, --maxdays MASSIMO         imposta il numero MASSIMO di giorni tra i\n"
+"                                cambi di password\n"
 "\n"
 
 msgid "Old password: "
@@ -1552,26 +1557,26 @@
 "Usage: su [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -, -l, --login\t\tmake the shell a login shell\n"
+"  -c, --command COMMAND         pass COMMAND to the invoked shell\n"
+"  -h, --help                    display this help message and exit\n"
+"  -, -l, --login                make the shell a login shell\n"
 "  -m, -p,\n"
-"  --preserve-environment\tdo not reset environment variables, and keep\n"
-"\t\t\t\tthe same shell\n"
-"  -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n"
+"  --preserve-environment        do not reset environment variables, and\n"
+"                                keep the same shell\n"
+"  -s, --shell SHELL             use SHELL instead of the default in passwd\n"
 "\n"
 msgstr ""
 "Uso: su [OPZIONI] [LOGIN]\n"
 "\n"
 "Opzioni:\n"
-"  -c, --command COMANDO\t\tpassa il COMANDO alla shell invocata\n"
-"  -h, --help\t\t\tmostra questo messaggio di aiuto ed esce\n"
-"  -, -l, --login\t\trende la shell una shell di login\n"
+"  -c, --command COMANDO         passa il COMANDO alla shell invocata\n"
+"  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
+"  -, -l, --login                rende la shell una shell di login\n"
 "  -m, -p,\n"
-"  --preserve-environment\tnon azzera le variabili d'ambiente e mantiene\n"
-"\t\t\t\tla stessa shell\n"
-"  -s, --shell SHELL\t\tusa la SHELL specificata anziché quella\n"
-"\t\t\t\tpredefinita in passwd\n"
+"  --preserve-environment        non azzera le variabili d'ambiente e\n"
+"                                mantiene la stessa shell\n"
+"  -s, --shell SHELL             usa la SHELL specificata anziché quella\n"
+"                                predefinita in passwd\n"
 "\n"
 
 #, c-format
@@ -1658,57 +1663,60 @@
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR\tbase directory for the new user account\n"
-"\t\t\t\thome directory\n"
-"  -c, --comment COMMENT\t\tset the GECOS field for the new user account\n"
-"  -d, --home-dir HOME_DIR\thome directory for the new user account\n"
-"  -D, --defaults\t\tprint or save modified default useradd\n"
-"\t\t\t\tconfiguration\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP for the new user account\n"
-"  -G, --groups GROUPS\t\tlist of supplementary groups for the new\n"
-"\t\t\t\tuser account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --skel SKEL_DIR\t\tspecify an alternative skel directory\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -m, --create-home\t\tcreate home directory for the new user\n"
-"\t\t\t\taccount\n"
-"  -o, --non-unique\t\tallow create user with duplicate\n"
-"\t\t\t\t(non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new user\n"
-"\t\t\t\taccount\n"
-"  -s, --shell SHELL\t\tthe login shell for the new user account\n"
-"  -u, --uid UID\t\t\tforce use the UID for the new user account\n"
+"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+"                                home directory\n"
+"  -c, --comment COMMENT         set the GECOS field for the new user "
+"account\n"
+"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+"  -D, --defaults                print or save modified default useradd\n"
+"                                configuration\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP for the new user account\n"
+"  -G, --groups GROUPS           list of supplementary groups for the new\n"
+"                                user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -m, --create-home             create home directory for the new user\n"
+"                                account\n"
+"  -o, --non-unique              allow create user with duplicate\n"
+"                                (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new user\n"
+"                                account\n"
+"  -s, --shell SHELL             the login shell for the new user account\n"
+"  -u, --uid UID                 force use the UID for the new user account\n"
 "\n"
 msgstr ""
 "Uso: useradd [OPZIONI] LOGIN\n"
 "\n"
 "Opzioni:\n"
-"  -b, --base-dir DIR_BASE\tspecifica la directory di base in cui creare\n"
-"\t\t\t\tla directory home per il nuovo account\n"
-"  -c, --comment COMMENTO\timposta il campo GECOS per il nuovo account\n"
-"  -d, --home-dir DIR_HOME\tspecifica la directory home per il nuovo\n"
-"\t\t\t\taccount\n"
-"  -D, --defaults\t\tmostra o imposta i valori predefiniti della\n"
-"\t\t\t\tconfigurazione di useradd\n"
-"  -e, --expiredate SCADENZA\timposta la data di SCADENZA dell'account\n"
-"  -f, --inactive INATTIVITÀ\timposta il numero di giorni di INATTIVITÀ\n"
-"\t\t\t\tdella password oltre la sua scadenza\n"
-"  -g, --gid GRUPPO\t\timpone l'uso di GRUPPO per il nuovo account\n"
-"  -G, --groups GRUPPI\t\telenco di GRUPPI aggiuntivi per il nuovo\n"
-"\t\t\t\taccount\n"
-"  -h, --help\t\t\tmostra questo messaggio di aiuto ed esce\n"
-"  -k, --skel DIR_SKEL\t\tspecifica una directory skel alternativa\n"
-"  -K, --key CHIAVE=VALORE\tspecifica un valore diverso da quello\n"
-"\t\t\t\tpredefinito in /etc/login.defs\n"
-"  -m, --create-home\t\tcrea la directory home per il nuovo account\n"
-"  -o, --non-unique\t\tpermette di creare un utente con un UID\n"
-"\t\t\t\tduplicato (non univoco)\n"
-"  -p, --password PASSWORD\tusa la PASSWORD cifrata per il nuovo account\n"
-"  -s, --shell SHELL\t\tla shell di login per il nuovo account\n"
-"  -u, --uid UID\t\t\timpone l'uso di UID per il nuovo account\n"
+"  -b, --base-dir DIR_BASE       specifica la directory di base in cui "
+"creare\n"
+"                                la directory home per il nuovo account\n"
+"  -c, --comment COMMENTO        imposta il campo GECOS per il nuovo account\n"
+"  -d, --home-dir DIR_HOME       specifica la directory home per il nuovo\n"
+"                                account\n"
+"  -D, --defaults                mostra o imposta i valori predefiniti della\n"
+"                                configurazione di useradd\n"
+"  -e, --expiredate SCADENZA     imposta la data di SCADENZA dell'account\n"
+"  -f, --inactive INATTIVITÀ     imposta il numero di giorni di INATTIVITÀ\n"
+"                                della password oltre la sua scadenza\n"
+"  -g, --gid GRUPPO              impone l'uso di GRUPPO per il nuovo account\n"
+"  -G, --groups GRUPPI           elenco di GRUPPI aggiuntivi per il nuovo\n"
+"                                account\n"
+"  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
+"  -k, --skel DIR_SKEL           specifica una directory skel alternativa\n"
+"  -K, --key CHIAVE=VALORE       specifica un valore diverso da quello\n"
+"                                predefinito in /etc/login.defs\n"
+"  -m, --create-home             crea la directory home per il nuovo account\n"
+"  -o, --non-unique              permette di creare un utente con un UID\n"
+"                                duplicato (non univoco)\n"
+"  -p, --password PASSWORD       usa la PASSWORD cifrata per il nuovo "
+"account\n"
+"  -s, --shell SHELL             la shell di login per il nuovo account\n"
+"  -u, --uid UID                 impone l'uso di UID per il nuovo account\n"
 "\n"
 
 #, fuzzy, c-format
@@ -1855,9 +1863,10 @@
 "Usage: userdel [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce removal of files, even if not owned by user\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -r, --remove\t\t\tremove home directory and mail spool\n"
+"  -f, --force                   force removal of files,\n"
+"                                even if not owned by user\n"
+"  -h, --help                    display this help message and exit\n"
+"  -r, --remove                  remove home directory and mail spool\n"
 "\n"
 msgstr ""
 
@@ -1926,50 +1935,50 @@
 "Usage: usermod [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -c, --comment COMMENT\t\tnew value of the GECOS field\n"
-"  -d, --home HOME_DIR\t\tnew home directory for the user account\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP as new primary group\n"
-"  -G, --groups GROUPS\t\tnew list of supplementary GROUPS\n"
-"  -a, --append\t\tappend the user to the supplemental GROUPS\n"
-"\t\t\t\tmentioned by the -G option without removing\n"
-"\t\t\t\thim/her from other groups\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --login NEW_LOGIN\t\tnew value of the login name\n"
-"  -L, --lock\t\t\tlock the user account\n"
-"  -m, --move-home\t\tmove contents of the home directory to the new\n"
-"\t\t\t\tlocation (use only with -d)\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new password\n"
-"  -s, --shell SHELL\t\tnew login shell for the user account\n"
-"  -u, --uid UID\t\t\tnew UID for the user account\n"
-"  -U, --unlock\t\t\tunlock the user account\n"
+"  -c, --comment COMMENT         new value of the GECOS field\n"
+"  -d, --home HOME_DIR           new home directory for the user account\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP as new primary group\n"
+"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+"  -a, --append                  append the user to the supplemental GROUPS\n"
+"                                mentioned by the -G option without removing\n"
+"                                him/her from other groups\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --login NEW_LOGIN         new value of the login name\n"
+"  -L, --lock                    lock the user account\n"
+"  -m, --move-home               move contents of the home directory to the\n"
+"                                new location (use only with -d)\n"
+"  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
+"  -u, --uid UID                 new UID for the user account\n"
+"  -U, --unlock                  unlock the user account\n"
 "\n"
 msgstr ""
 "Uso: usermod [OPZIONI] LOGIN\n"
 "\n"
 "Opzioni:\n"
-"  -a, --append GRUPPO\t\taggiunge l'utente a un ulteriore GRUPPO\n"
-"  -c, --comment COMMENTO\timposta il nuovo valore del campo GECOS\n"
-"  -d, --home DIR_HOME\t\timposta la nuova directory home dell'utente\n"
-"  -e, --expiredate SCADENZA\timposta la data di SCADENZA dell'account\n"
-"  -f, --inactive INATTIVITÀ\timposta il numero di giorni di INATTIVITÀ\n"
-"\t\t\t\tdella password oltre la sua scadenza\n"
-"  -g, --gid GRUPPO\t\timpone l'uso di GRUPPO come gruppo iniziale\n"
-"  -G, --groups GRUPPI\t\telenco di GRUPPI aggiuntivi\n"
-"  -h, --help\t\t\tmostra questo messaggio di aiuto ed esce\n"
-"  -l, --login LOGIN\t\timposta il nuovo nome di login dell'utente\n"
-"  -L, --lock\t\t\tblocca l'account dell'utente\n"
-"  -m, --move-home\t\tsposta il contenuto della directory home\n"
-"\t\t\t\tnella nuova posizione (usare solo con -d)\n"
-"  -o, --non-unique\t\tpermette di usare un UID duplicato (non\n"
-"\t\t\t\tunivoco)\n"
-"  -p, --password PASSWORD\timposta la nuova PASSWORD cifrata\n"
-"  -s, --shell SHELL\t\tla nuova shell di login dell'utente\n"
-"  -u, --uid UID\t\t\timposta il nuovo UID dell'utente\n"
-"  -U, --unlock\t\t\tsblocca l'account dell'utente\n"
+"  -a, --append GRUPPO           aggiunge l'utente a un ulteriore GRUPPO\n"
+"  -c, --comment COMMENTO        imposta il nuovo valore del campo GECOS\n"
+"  -d, --home DIR_HOME           imposta la nuova directory home dell'utente\n"
+"  -e, --expiredate SCADENZA     imposta la data di SCADENZA dell'account\n"
+"  -f, --inactive INATTIVITÀ     imposta il numero di giorni di INATTIVITÀ\n"
+"                                della password oltre la sua scadenza\n"
+"  -g, --gid GRUPPO              impone l'uso di GRUPPO come gruppo iniziale\n"
+"  -G, --groups GRUPPI           elenco di GRUPPI aggiuntivi\n"
+"  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
+"  -l, --login LOGIN             imposta il nuovo nome di login dell'utente\n"
+"  -L, --lock                    blocca l'account dell'utente\n"
+"  -m, --move-home               sposta il contenuto della directory home\n"
+"                                nella nuova posizione (usare solo con -d)\n"
+"  -o, --non-unique              permette di usare un UID duplicato (non\n"
+"                                univoco)\n"
+"  -p, --password PASSWORD       imposta la nuova PASSWORD cifrata\n"
+"  -s, --shell SHELL             la nuova shell di login dell'utente\n"
+"  -u, --uid UID                 imposta il nuovo UID dell'utente\n"
+"  -U, --unlock                  sblocca l'account dell'utente\n"
 "\n"
 
 #, fuzzy, c-format
@@ -2041,21 +2050,21 @@
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
-"  -g, --group\t\t\tedit group database\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -p, --passwd\t\t\tedit passwd database\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -s, --shadow\t\t\tedit shadow or gshadow database\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
 "\n"
 msgstr ""
 "Uso: vipw [OPZIONI]\n"
 "\n"
 "Opzioni:\n"
-"  -g, --group\t\t\tmodifica il database dei gruppi\n"
-"  -h, --help\t\t\tmostra questo messaggio di aiuto ed esce\n"
-"  -p, --passwd\t\t\tmodifica il database delle password\n"
-"  -q, --quiet\t\t\topera in modalità silenziosa\n"
-"  -s, --shadow\t\t\tmodifica il database shadow o gshadow\n"
+"  -g, --group                   modifica il database dei gruppi\n"
+"  -h, --help                    mostra questo messaggio di aiuto ed esce\n"
+"  -p, --passwd                  modifica il database delle password\n"
+"  -q, --quiet                   opera in modalità silenziosa\n"
+"  -s, --shadow                  modifica il database shadow o gshadow\n"
 "\n"
 
 #, c-format

Modified: upstream/trunk/po/ja.po
===================================================================
--- upstream/trunk/po/ja.po	2007-11-24 22:41:24 UTC (rev 1460)
+++ upstream/trunk/po/ja.po	2007-11-25 20:21:53 UTC (rev 1461)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 12:26+0100\n"
-"PO-Revision-Date: 2006-08-07 23:22+0900\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"PO-Revision-Date: 2007-11-25 21:03+0100\n"
 "Last-Translator: NAKANO Takeo <nakano at webmasters.gr.jp>\n"
 "Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"
@@ -196,33 +196,33 @@
 "Usage: chage [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -d, --lastday LAST_DAY\tset last password change to LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -I, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --list\t\t\tshow account aging information\n"
-"  -m, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
+"  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+"  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -h, --help                    display this help message and exit\n"
+"  -I, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --list                    show account aging information\n"
+"  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
+"  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 "\n"
 msgstr ""
 "使い方: chage [オプション] [ログイン名]\n"
 "\n"
 "オプション\n"
-"  -d, --lastday LAST_DAY\tパスワードの最終変更日を LAST_DAY にする\n"
-"  -E, --expiredate EXPIRE_DATE\tアカウント期限切れの日を EXPIRE_DATE にする\n"
-"  -h, --help\t\t\tこのヘルプを表示して終了する\n"
-"  -I, --inactive INACTIVE\tパスワードを期限切れ後に無効化する日数を\n"
-"\t\t\t\tINACTIVEにする\n"
-"  -l, --list\t\t\tアカウントの経時情報を表示する\n"
-"  -m, --mindays MIN_DAYS\tパスワードが変更できるまでの最短日数を\n"
-"\t\t\t\tMIN_DAYS に変更する\n"
-"  -M, --maxdays MAX_DAYS\tパスワードが変更できる期間の最長日数を\n"
-"\t\t\t\tMAX_DAYS に変更する\n"
-"  -W, --warndays WARN_DAYS\t期限切れ警告の日数を WARN_DAYS にする\n"
+"  -d, --lastday LAST_DAY        パスワードの最終変更日を LAST_DAY にする\n"
+"  -E, --expiredate EXPIRE_DATE  アカウント期限切れの日を EXPIRE_DATE にする\n"
+"  -h, --help                    このヘルプを表示して終了する\n"
+"  -I, --inactive INACTIVE       パスワードを期限切れ後に無効化する日数を\n"
+"                                INACTIVEにする\n"
+"  -l, --list                    アカウントの経時情報を表示する\n"
+"  -m, --mindays MIN_DAYS        パスワードが変更できるまでの最短日数を\n"
+"                                MIN_DAYS に変更する\n"
+"  -M, --maxdays MAX_DAYS        パスワードが変更できる期間の最長日数を\n"
+"                                MAX_DAYS に変更する\n"
+"  -W, --warndays WARN_DAYS      期限切れ警告の日数を WARN_DAYS にする\n"
 "\n"
 
 #, c-format
@@ -460,23 +460,25 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
+"  -e, --encrypted               supplied passwords are encrypted\n"
+"  -h, --help                    display this help message and exit\n"
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
 "%s\n"
 msgstr ""
 "使い方: chpasswd [オプション]\n"
 "\n"
 "オプション:\n"
-"  -e, --encrypted\tパスワードを暗号化した状態で渡す\n"
-"  -h, --help\t\tこのヘルプメッセージを表示して終了する\n"
-"  -m, --md5\t\t与えたパスワードが暗号化されていない場合、\n"
-"\t\t\tDES の代わりに MD5 を用いる\n"
+"  -e, --encrypted               パスワードを暗号化した状態で渡す\n"
+"  -h, --help                    このヘルプメッセージを表示して終了する\n"
+"  -m, --md5                     与えたパスワードが暗号化されていない場合、\n"
+"                                DES の代わりに MD5 を用いる\n"
 "\n"
 
 msgid ""
-"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+"  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+"                                crypt algorithms\n"
 msgstr ""
 
 #, c-format
@@ -556,15 +558,15 @@
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -h, --help\t\t\t\tdisplay this help message and exit\n"
-"  -s, --shell SHELL\t\t\tnew login shell for the user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
 "\n"
 msgstr ""
 "使い方: chsh [オプション]\n"
 "\n"
 "オプション:\n"
-"  -h, --help\t\tこのヘルプメッセージを表示して終了する\n"
-"  -s, --shell SHELL\tユーザのシェルを新たに SHELL にする\n"
+"  -h, --help                    このヘルプメッセージを表示して終了する\n"
+"  -s, --shell SHELL             ユーザのシェルを新たに SHELL にする\n"
 "\n"
 
 msgid "Login Shell"
@@ -599,29 +601,33 @@
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\tdisplay faillog records for all users\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n"
-"  -m, --maximum MAX\t\tset maximum failed login counters to MAX\n"
-"  -r, --reset\t\t\treset the counters of login failures\n"
-"  -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n"
-"  -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n"
-"\t\t\t\tand limits (if used with -r, -m or -l options) only\n"
-"\t\t\t\tfor user with LOGIN\n"
+"  -a, --all                     display faillog records for all users\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"seconds\n"
+"  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+"  -r, --reset                   reset the counters of login failures\n"
+"  -t, --time DAYS               display faillog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m or -"
+"l\n"
+"                                options) only for user with LOGIN\n"
 "\n"
 msgstr ""
 "使い方: faillog [オプション]\n"
 "\n"
 "オプション:\n"
-"  -a, --all\t\t全ユーザの faillog 記録を表示する\n"
-"  -h, --help\t\tこのヘルプメッセージを表示して終了する\n"
-"  -l, --lock-time SEC\tログイン失敗後 SEC 秒アカウントをロックする\n"
-"  -m, --maximum MAX\tログインの失敗が許される回数を MAX にする\n"
-"  -r, --reset\t\tログイン失敗のカウンタをリセットする\n"
-"  -t, --time DAYS\t最近 DAYS 日分の faillog 記録を表示する\n"
-"  -u, --user LOGIN\tユーザ LOGIN の faillog 記録を表示する。\n"
-"\t\t\tあるいは -r, -m, -l が同時に指定された場合は\n"
-"\t\t\tこのユーザの失敗カウンタを操作する\n"
+"  -a, --all                     全ユーザの faillog 記録を表示する\n"
+"  -h, --help                    このヘルプメッセージを表示して終了する\n"
+"  -l, --lock-time SEC           ログイン失敗後 SEC 秒アカウントをロックする\n"
+"  -m, --maximum MAX             ログインの失敗が許される回数を MAX にする\n"
+"  -r, --reset                   ログイン失敗のカウンタをリセットする\n"
+"  -t, --time DAYS               最近 DAYS 日分の faillog 記録を表示する\n"
+"  -u, --user LOGIN              ユーザ LOGIN の faillog 記録を表示する。\n"
+"                                あるいは -r, -m, -l が同時に指定された場合"
+"は\n"
+"                                このユーザの失敗カウンタを操作する\n"
 "\n"
 
 #, c-format
@@ -750,25 +756,27 @@
 "Usage: groupadd [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce exit with success status if the specified\n"
-"\t\t\t\tgroup already exists\n"
-"  -g, --gid GID\t\t\tuse GID for the new group\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -o, --non-unique\t\tallow create group with duplicate\n"
-"\t\t\t\t(non-unique) GID\n"
+"  -f, --force                   force exit with success status if the\n"
+"                                specified group already exists\n"
+"  -g, --gid GID                 use GID for the new group\n"
+"  -h, --help                    display this help message and exit\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -o, --non-unique              allow create group with duplicate\n"
+"                                (non-unique) GID\n"
 "\n"
 msgstr ""
 "使い方: groupadd [オプション] グループ名\n"
 "\n"
 "オプション:\n"
-"  -f, --force\t\t\t指定グループが存在していた場合、終了ステータス\n"
-"\t\t\t\tsuccess で強制的に終了する\n"
-"  -g, --gid GID\t\t\t新グループの GID\n"
-"  -h, --help\t\t\tこのヘルプメッセージを表示して終了する\n"
-"  -K, --key KEY=VALUE\t\t/etc/login.defs のデフォルトを変更する\n"
-"  -o, --non-unique\t\t一意でないグループ (GID の重なるグループ) の\n"
-"\t\t\t\t作成を許可する\n"
+"  -f, --force                   指定グループが存在していた場合、終了ステータ"
+"ス\n"
+"                                success で強制的に終了する\n"
+"  -g, --gid GID                 新グループの GID\n"
+"  -h, --help                    このヘルプメッセージを表示して終了する\n"
+"  -K, --key KEY=VALUE           /etc/login.defs のデフォルトを変更する\n"
+"  -o, --non-unique              一意でないグループ (GID の重なるグループ) "
+"の\n"
+"                                作成を許可する\n"
 "\n"
 
 #, c-format
@@ -897,20 +905,22 @@
 "Usage: groupmod [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -g, --gid GID\t\t\tforce use new GID by GROUP\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -n, --new-name NEW_GROUP\tforce use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) GID by GROUP\n"
+"  -g, --gid GID                 force use new GID by GROUP\n"
+"  -h, --help                    display this help message and exit\n"
+"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+"  -o, --non-unique              allow using duplicate (non-unique) GID by "
+"GROUP\n"
 "\n"
 msgstr ""
 "使い方: groupmod [オプション] グループ名\n"
 "\n"
 "オプション:\n"
-"  -g, --gid GID\t\t\tグループの新 GID を設定する\n"
-"  -h, --help\t\t\tこのヘルプメッセージを表示して終了する\n"
-"  -n, --new-name NEW_GROUP\tグループの新グループ名を設定する\n"
-"  -o, --non-unique\t\t一意でないグループ (GID の重なるグループ) の\n"
-"\t\t\t\t使用を許可する\n"
+"  -g, --gid GID                 グループの新 GID を設定する\n"
+"  -h, --help                    このヘルプメッセージを表示して終了する\n"
+"  -n, --new-name NEW_GROUP      グループの新グループ名を設定する\n"
+"  -o, --non-unique              一意でないグループ (GID の重なるグループ) "
+"の\n"
+"                                使用を許可する\n"
 "\n"
 
 #, c-format
@@ -1062,19 +1072,21 @@
 "Usage: lastlog [options]\n"
 "\n"
 "Options:\n"
-"  -b, --before DAYS\tprint only lastlog records older than DAYS\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -t, --time DAYS\tprint only lastlog records more recent than DAYS\n"
-"  -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n"
+"  -b, --before DAYS             print only lastlog records older than DAYS\n"
+"  -h, --help                    display this help message and exit\n"
+"  -t, --time DAYS               print only lastlog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 "\n"
 msgstr ""
 "使い方: lastlog [オプション]\n"
 "\n"
 "オプション:\n"
-"  -b, --before DAYS\tDAYS 日より以前の lastlog 記録だけを表示する\n"
-"  -h, --help\t\tこのヘルプメッセージを表示して終了する\n"
-"  -t, --time DAYS\tDAYS 日前以降の lastlog 記録だけを表示する\n"
-"  -u, --user LOGIN\t指定ユーザ LOGIN の lastlog 記録を表示する\n"
+"  -b, --before DAYS             DAYS 日より以前の lastlog 記録だけを表示す"
+"る\n"
+"  -h, --help                    このヘルプメッセージを表示して終了する\n"
+"  -t, --time DAYS               DAYS 日前以降の lastlog 記録だけを表示する\n"
+"  -u, --user LOGIN              指定ユーザ LOGIN の lastlog 記録を表示する\n"
 "\n"
 
 #, c-format
@@ -1226,14 +1238,10 @@
 msgid ""
 "Usage: %s [options] [input]\n"
 "\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
 "%s\n"
 msgstr ""
 
-msgid ""
-"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
-msgstr ""
-
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: /etc/passwd をロックできません。\n"
@@ -1287,45 +1295,47 @@
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\treport password status on all accounts\n"
-"  -d, --delete\t\t\tdelete the password for the named account\n"
-"  -e, --expire\t\t\tforce expire the password for the named account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --keep-tokens\t\tchange password only if expired\n"
-"  -i, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --lock\t\t\tlock the named account\n"
-"  -n, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -r, --repository REPOSITORY\tchange password in REPOSITORY repository\n"
-"  -S, --status\t\t\treport password status on the named account\n"
-"  -u, --unlock\t\t\tunlock the named account\n"
-"  -w, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
+"  -a, --all                     report password status on all accounts\n"
+"  -d, --delete                  delete the password for the named account\n"
+"  -e, --expire                  force expire the password for the named "
+"account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --keep-tokens             change password only if expired\n"
+"  -i, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --lock                    lock the named account\n"
+"  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -q, --quiet                   quiet mode\n"
+"  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+"  -S, --status                  report password status on the named account\n"
+"  -u, --unlock                  unlock the named account\n"
+"  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
 "使い方: passwd [オプション] [ログイン名]\n"
 "\n"
 "オプション:\n"
-"  -a, --all\t\t\t全アカウントのパスワード状態をレポートする\n"
-"  -d, --delete\t\t\t指定アカウントのパスワードを削除する\n"
-"  -e, --expire\t\t\t指定アカウントのパスワードを期限切れにする\n"
-"  -h, --help\t\t\tこのヘルプメッセージを表示して終了する\n"
-"  -k, --keep-tokens\t\t期限切れの場合にのみパスワードを変更する\n"
-"  -i, --inactive INACTIVE\t期限切れ後のパスワード無効化日数を\n"
-"\t\t\t\tINACTIVE にする\n"
-"  -l, --lock\t\t\t指定アカウントをロックする\n"
-"  -n, --mindays MIN_DAYS\tパスワードが変更できるまでの最短日数を\n"
-"\t\t\t\tMIN_DAYS に変更する\n"
-"  -q, --quiet\t\t\t表示抑制モード\n"
-"  -r, --repository REPOSITORY\tリポジトリ REPOSITORY のパスワードを変更する\n"
-"  -S, --status\t\t\t指定アカウントのパスワードの状態を報告する\n"
-"  -u, --unlock\t\t\t指定アカウントのロックを解除する\n"
-"  -w, --warndays WARN_DAYS\t期限切れ警告の日数を WARN_DAYS にする\n"
-"  -x, --maxdays MAX_DAYS\tパスワードが変更できる期間の最長日数を\n"
-"\t\t\t\tMAX_DAYS に変更する\n"
+"  -a, --all                     全アカウントのパスワード状態をレポートする\n"
+"  -d, --delete                  指定アカウントのパスワードを削除する\n"
+"  -e, --expire                  指定アカウントのパスワードを期限切れにする\n"
+"  -h, --help                    このヘルプメッセージを表示して終了する\n"
+"  -k, --keep-tokens             期限切れの場合にのみパスワードを変更する\n"
+"  -i, --inactive INACTIVE       期限切れ後のパスワード無効化日数を\n"
+"                                INACTIVE にする\n"
+"  -l, --lock                    指定アカウントをロックする\n"
+"  -n, --mindays MIN_DAYS        パスワードが変更できるまでの最短日数を\n"
+"                                MIN_DAYS に変更する\n"
+"  -q, --quiet                   表示抑制モード\n"
+"  -r, --repository REPOSITORY   リポジトリ REPOSITORY のパスワードを変更す"
+"る\n"
+"  -S, --status                  指定アカウントのパスワードの状態を報告する\n"
+"  -u, --unlock                  指定アカウントのロックを解除する\n"
+"  -w, --warndays WARN_DAYS      期限切れ警告の日数を WARN_DAYS にする\n"
+"  -x, --maxdays MAX_DAYS        パスワードが変更できる期間の最長日数を\n"
+"                                MAX_DAYS に変更する\n"
 "\n"
 
 msgid "Old password: "
@@ -1509,24 +1519,25 @@
 "Usage: su [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -, -l, --login\t\tmake the shell a login shell\n"
+"  -c, --command COMMAND         pass COMMAND to the invoked shell\n"
+"  -h, --help                    display this help message and exit\n"
+"  -, -l, --login                make the shell a login shell\n"
 "  -m, -p,\n"
-"  --preserve-environment\tdo not reset environment variables, and keep\n"
-"\t\t\t\tthe same shell\n"
-"  -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n"
+"  --preserve-environment        do not reset environment variables, and\n"
+"                                keep the same shell\n"
+"  -s, --shell SHELL             use SHELL instead of the default in passwd\n"
 "\n"
 msgstr ""
 "使用法: su [オプション] [ユーザ名]\n"
 "\n"
 "オプション:\n"
-"  -c, --command COMMAND\t\t起動したシェルにコマンド COMMAND を渡す\n"
-"  -h, --help\t\t\tこのヘルプを表示して終了する\n"
-"  -, -l, --login\t\tそのシェルをログインシェルにする\n"
+"  -c, --command COMMAND   起動したシェルにコマンド COMMAND を渡す\n"
+"  -h, --help              このヘルプを表示して終了する\n"
+"  -, -l, --login          そのシェルをログインシェルにする\n"
 "  -m, -p,\n"
-"  --preserve-environment\t環境変数をリセットせず、シェルも同じものを使う\n"
-"  -s, --shell SHELL\t\tpasswd にあるデフォルト値でなくシェル SHELL を使う\n"
+"  --preserve-environment  環境変数をリセットせず、シェルも同じものを使う\n"
+"  -s, --shell SHELL       passwd にあるデフォルト値でなくシェル SHELL を使"
+"う\n"
 "\n"
 
 #, c-format
@@ -1613,57 +1624,58 @@
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR\tbase directory for the new user account\n"
-"\t\t\t\thome directory\n"
-"  -c, --comment COMMENT\t\tset the GECOS field for the new user account\n"
-"  -d, --home-dir HOME_DIR\thome directory for the new user account\n"
-"  -D, --defaults\t\tprint or save modified default useradd\n"
-"\t\t\t\tconfiguration\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP for the new user account\n"
-"  -G, --groups GROUPS\t\tlist of supplementary groups for the new\n"
-"\t\t\t\tuser account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --skel SKEL_DIR\t\tspecify an alternative skel directory\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -m, --create-home\t\tcreate home directory for the new user\n"
-"\t\t\t\taccount\n"
-"  -o, --non-unique\t\tallow create user with duplicate\n"
-"\t\t\t\t(non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new user\n"
-"\t\t\t\taccount\n"
-"  -s, --shell SHELL\t\tthe login shell for the new user account\n"
-"  -u, --uid UID\t\t\tforce use the UID for the new user account\n"
+"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+"                                home directory\n"
+"  -c, --comment COMMENT         set the GECOS field for the new user "
+"account\n"
+"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+"  -D, --defaults                print or save modified default useradd\n"
+"                                configuration\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP for the new user account\n"
+"  -G, --groups GROUPS           list of supplementary groups for the new\n"
+"                                user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -m, --create-home             create home directory for the new user\n"
+"                                account\n"
+"  -o, --non-unique              allow create user with duplicate\n"
+"                                (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new user\n"
+"                                account\n"
+"  -s, --shell SHELL             the login shell for the new user account\n"
+"  -u, --uid UID                 force use the UID for the new user account\n"
 "\n"
 msgstr ""
 "使い方: useradd [オプション] ログイン名\n"
 "\n"
 "オプション:\n"
-"  -b, --base-dir BASE_DIR\t新ユーザアカウントのホームディレクトリの\n"
-"\t\t\t\tベースディレクトリを指定する\n"
-"  -c, --comment COMMENT\t\t新ユーザアカウントの GECOS フィールド\n"
-"  -d, --home-dir HOME_DIR\t新ユーザアカウントのホームディレクトリ\n"
-"  -D, --defaults\t\t変更された useradd のデフォルト設定を\n"
-"\t\t\t\t保存または表示する\n"
-"  -e, --expiredate EXPIRE_DATE\tアカウント期限切れの日を EXPIRE_DATE にする\n"
-"  -f, --inactive INACTIVE\tパスワードを期限切れ後に無効化する日数を\n"
-"\t\t\t\tINACTIVEにする\n"
-"  -g, --gid GROUP\t\t新ユーザアカウントのグループを GROUP にする\n"
-"  -G, --groups GROUPS\t\t新ユーザアカウントの補助グループの\n"
-"\t\t\t\tリストを与える\n"
-"  -h, --help\t\t\tこのヘルプを表示して終了する\n"
-"  -k, --skel SKEL_DIR\t\tskel ディレクトリを指定する\n"
-"  -K, --key KEY=VALUE\t\t/etc/login.defs のデフォルトを変更する\n"
-"  -m, --create-home\t\t新ユーザアカウントのホームディレクトリを\n"
-"\t\t\t\t作成する\n"
-"  -o, --non-unique\t\t一意でないユーザ (UID の重なるユーザ) の\n"
-"\t\t\t\t作成を許可する\n"
-"  -p, --password PASSWORD\t新ユーザアカウントの暗号化済みパスワードを\n"
-"\t\t\t\t与える\n"
-"  -s, --shell SHELL\t\t新ユーザアカウントのログインシェル\n"
-"  -u, --uid UID\t\t\t新ユーザアカウントのユーザ ID を指定する\n"
+"  -b, --base-dir BASE_DIR       新ユーザアカウントのホームディレクトリの\n"
+"                                ベースディレクトリを指定する\n"
+"  -c, --comment COMMENT         新ユーザアカウントの GECOS フィールド\n"
+"  -d, --home-dir HOME_DIR       新ユーザアカウントのホームディレクトリ\n"
+"  -D, --defaults                変更された useradd のデフォルト設定を\n"
+"                                保存または表示する\n"
+"  -e, --expiredate EXPIRE_DATE  アカウント期限切れの日を EXPIRE_DATE にする\n"
+"  -f, --inactive INACTIVE       パスワードを期限切れ後に無効化する日数を\n"
+"                                INACTIVEにする\n"
+"  -g, --gid GROUP               新ユーザアカウントのグループを GROUP にする\n"
+"  -G, --groups GROUPS           新ユーザアカウントの補助グループの\n"
+"                                リストを与える\n"
+"  -h, --help                    このヘルプを表示して終了する\n"
+"  -k, --skel SKEL_DIR           skel ディレクトリを指定する\n"
+"  -K, --key KEY=VALUE           /etc/login.defs のデフォルトを変更する\n"
+"  -m, --create-home             新ユーザアカウントのホームディレクトリを\n"
+"                                作成する\n"
+"  -o, --non-unique              一意でないユーザ (UID の重なるユーザ) の\n"
+"                                作成を許可する\n"
+"  -p, --password PASSWORD       新ユーザアカウントの暗号化済みパスワードを\n"
+"                                与える\n"
+"  -s, --shell SHELL             新ユーザアカウントのログインシェル\n"
+"  -u, --uid UID                 新ユーザアカウントのユーザ ID を指定する\n"
 "\n"
 
 #, fuzzy, c-format
@@ -1812,17 +1824,19 @@
 "Usage: userdel [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce removal of files, even if not owned by user\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -r, --remove\t\t\tremove home directory and mail spool\n"
+"  -f, --force                   force removal of files,\n"
+"                                even if not owned by user\n"
+"  -h, --help                    display this help message and exit\n"
+"  -r, --remove                  remove home directory and mail spool\n"
 "\n"
 msgstr ""
 "使い方: userdel [オプション] ログイン名\n"
 "\n"
 "オプション:\n"
-"  -f, --force\t\t\t当該ユーザの所有でないファイルも削除する\n"
-"  -h, --help\t\t\tこのヘルプを表示して終了する\n"
-"  -r, --remove\t\t\tホームディレクトリとメールスプールを削除する\n"
+"  -f, --force                   当該ユーザの所有でないファイルも削除する\n"
+"  -h, --help                    このヘルプを表示して終了する\n"
+"  -r, --remove                  ホームディレクトリとメールスプールを削除す"
+"る\n"
 "\n"
 
 #, c-format
@@ -1888,52 +1902,52 @@
 "Usage: usermod [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -c, --comment COMMENT\t\tnew value of the GECOS field\n"
-"  -d, --home HOME_DIR\t\tnew home directory for the user account\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP as new primary group\n"
-"  -G, --groups GROUPS\t\tnew list of supplementary GROUPS\n"
-"  -a, --append\t\tappend the user to the supplemental GROUPS\n"
-"\t\t\t\tmentioned by the -G option without removing\n"
-"\t\t\t\thim/her from other groups\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --login NEW_LOGIN\t\tnew value of the login name\n"
-"  -L, --lock\t\t\tlock the user account\n"
-"  -m, --move-home\t\tmove contents of the home directory to the new\n"
-"\t\t\t\tlocation (use only with -d)\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new password\n"
-"  -s, --shell SHELL\t\tnew login shell for the user account\n"
-"  -u, --uid UID\t\t\tnew UID for the user account\n"
-"  -U, --unlock\t\t\tunlock the user account\n"
+"  -c, --comment COMMENT         new value of the GECOS field\n"
+"  -d, --home HOME_DIR           new home directory for the user account\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP as new primary group\n"
+"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+"  -a, --append                  append the user to the supplemental GROUPS\n"
+"                                mentioned by the -G option without removing\n"
+"                                him/her from other groups\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --login NEW_LOGIN         new value of the login name\n"
+"  -L, --lock                    lock the user account\n"
+"  -m, --move-home               move contents of the home directory to the\n"
+"                                new location (use only with -d)\n"
+"  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
+"  -u, --uid UID                 new UID for the user account\n"
+"  -U, --unlock                  unlock the user account\n"
 "\n"
 msgstr ""
 "使い方: usermod [オプション] ログイン名\n"
 "\n"
 "オプション:\n"
-"  -a, --append\t\t\tユーザを補助グループ GROUPS に追加する\n"
-"\t\t\t\t(-G が指定された場合のみ)\n"
-"  -c, --comment COMMENT\t\tGECOS フィールドの値を再設定する\n"
-"  -d, --home HOME_DIR\t\tユーザアカウントのホームディレクトリを\n"
-"\t\t\t\t再設定する\n"
-"  -e, --expiredate EXPIRE_DATE\tアカウント期限切れの日を EXPIRE_DATE にする\n"
-"  -f, --inactive INACTIVE\tパスワードを期限切れ後に無効化する日数を\n"
-"\t\t\t\tINACTIVEにする\n"
-"  -g, --gid GROUP\t\t主グループを GROUP に変更する\n"
-"  -G, --groups GROUPS\t\t新たな補助グループのリストを与える\n"
-"  -h, --help\t\t\tこのヘルプを表示して終了する\n"
-"  -l, --login NEW_LOGIN\t\tログイン名を変更する\n"
-"  -L, --lock\t\t\tこのユーザアカウントをロックする\n"
-"  -m, --move-home\t\t現ホームディレクトリの内容を新たな場所に\n"
-"\t\t\t\t移動する (-d が指定された場合のみ)\n"
-"  -o, --non-unique\t\t一意でないユーザ (UID の重なるユーザ) を\n"
-"\t\t\t\t許可する\n"
-"  -p, --password PASSWORD\t新たな暗号化済みパスワードを与える\n"
-"  -s, --shell SHELL\t\tこのユーザのログインシェルを変更する\n"
-"  -u, --uid UID\t\t\tこのユーザの UID を変更する\n"
-"  -U, --unlock\t\t\tこのユーザアカウントのロックを解除する\n"
+"  -a, --append                  ユーザを補助グループ GROUPS に追加する\n"
+"                                (-G が指定された場合のみ)\n"
+"  -c, --comment COMMENT         GECOS フィールドの値を再設定する\n"
+"  -d, --home HOME_DIR           ユーザアカウントのホームディレクトリを\n"
+"                                再設定する\n"
+"  -e, --expiredate EXPIRE_DATE  アカウント期限切れの日を EXPIRE_DATE にする\n"
+"  -f, --inactive INACTIVE       パスワードを期限切れ後に無効化する日数を\n"
+"                                INACTIVEにする\n"
+"  -g, --gid GROUP               主グループを GROUP に変更する\n"
+"  -G, --groups GROUPS           新たな補助グループのリストを与える\n"
+"  -h, --help                    このヘルプを表示して終了する\n"
+"  -l, --login NEW_LOGIN         ログイン名を変更する\n"
+"  -L, --lock                    このユーザアカウントをロックする\n"
+"  -m, --move-home               現ホームディレクトリの内容を新たな場所に\n"
+"                                移動する (-d が指定された場合のみ)\n"
+"  -o, --non-unique              一意でないユーザ (UID の重なるユーザ) を\n"
+"                                許可する\n"
+"  -p, --password PASSWORD       新たな暗号化済みパスワードを与える\n"
+"  -s, --shell SHELL             このユーザのログインシェルを変更する\n"
+"  -u, --uid UID                 このユーザの UID を変更する\n"
+"  -U, --unlock                  このユーザアカウントのロックを解除する\n"
 "\n"
 
 #, fuzzy, c-format
@@ -2003,21 +2017,22 @@
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
-"  -g, --group\t\t\tedit group database\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -p, --passwd\t\t\tedit passwd database\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -s, --shadow\t\t\tedit shadow or gshadow database\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
 "\n"
 msgstr ""
 "使い方: vipw [オプション]\n"
 "\n"
 "オプション:\n"
-"  -g, --group\t\t\tgroup データベースを編集する\n"
-"  -h, --help\t\t\tこのヘルプを表示して終了する\n"
-"  -p, --passwd\t\t\tpasswd データベースを編集する\n"
-"  -q, --quiet\t\t\t表示抑制モード\n"
-"  -s, --shadow\t\t\tshadow ないし gshadow データベースを編集する\n"
+"  -g, --group                   group データベースを編集する\n"
+"  -h, --help                    このヘルプを表示して終了する\n"
+"  -p, --passwd                  passwd データベースを編集する\n"
+"  -q, --quiet                   表示抑制モード\n"
+"  -s, --shadow                  shadow ないし gshadow データベースを編集す"
+"る\n"
 "\n"
 
 #, c-format

Modified: upstream/trunk/po/km.po
===================================================================
--- upstream/trunk/po/km.po	2007-11-24 22:41:24 UTC (rev 1460)
+++ upstream/trunk/po/km.po	2007-11-25 20:21:53 UTC (rev 1461)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: shadow_po_km\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 12:26+0100\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
 "PO-Revision-Date: 2006-06-28 10:08+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem at khmeros.info>\n"
 "Language-Team: Khmer <support at khmeros.info>\n"
@@ -197,22 +197,22 @@
 msgid "%s's Password: "
 msgstr "ពាក្យសម្ងាត់​របស់ %sសម្ងាត់ ៖ "
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -d, --lastday LAST_DAY\tset last password change to LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -I, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --list\t\t\tshow account aging information\n"
-"  -m, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
+"  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+"  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -h, --help                    display this help message and exit\n"
+"  -I, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --list                    show account aging information\n"
+"  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
+"  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 "\n"
 msgstr ""
 "ការ​ប្រើប្រាស់​ ៖ ប្តូរ​អ្នកប្រើ​ [options]​\n"
@@ -465,10 +465,11 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
+"  -e, --encrypted               supplied passwords are encrypted\n"
+"  -h, --help                    display this help message and exit\n"
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
 "%s\n"
 msgstr ""
 "របៀបប្រើ ៖ chpasswd [ជម្រើស]\n"
@@ -481,7 +482,8 @@
 "\n"
 
 msgid ""
-"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+"  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+"                                crypt algorithms\n"
 msgstr ""
 
 #, c-format
@@ -561,8 +563,8 @@
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -h, --help\t\t\t\tdisplay this help message and exit\n"
-"  -s, --shell SHELL\t\t\tnew login shell for the user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
 "\n"
 msgstr ""
 "របៀបប្រើ ៖ userdel [ជម្រើស] LOGIN\n"
@@ -600,20 +602,23 @@
 msgid "%s: unknown user\n"
 msgstr "%s  ៖ មិន​ស្គាល់​អ្នក​ប្រើ​\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\tdisplay faillog records for all users\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n"
-"  -m, --maximum MAX\t\tset maximum failed login counters to MAX\n"
-"  -r, --reset\t\t\treset the counters of login failures\n"
-"  -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n"
-"  -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n"
-"\t\t\t\tand limits (if used with -r, -m or -l options) only\n"
-"\t\t\t\tfor user with LOGIN\n"
+"  -a, --all                     display faillog records for all users\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"seconds\n"
+"  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+"  -r, --reset                   reset the counters of login failures\n"
+"  -t, --time DAYS               display faillog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m or -"
+"l\n"
+"                                options) only for user with LOGIN\n"
 "\n"
 msgstr ""
 "របៀប​ប្រើ ៖ faillog [ជម្រើស]\n"
@@ -756,13 +761,13 @@
 "Usage: groupadd [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce exit with success status if the specified\n"
-"\t\t\t\tgroup already exists\n"
-"  -g, --gid GID\t\t\tuse GID for the new group\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -o, --non-unique\t\tallow create group with duplicate\n"
-"\t\t\t\t(non-unique) GID\n"
+"  -f, --force                   force exit with success status if the\n"
+"                                specified group already exists\n"
+"  -g, --gid GID                 use GID for the new group\n"
+"  -h, --help                    display this help message and exit\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -o, --non-unique              allow create group with duplicate\n"
+"                                (non-unique) GID\n"
 "\n"
 msgstr ""
 "របៀបប្រើ ៖ groupadd [ជម្រើស] ក្រុម\n"
@@ -902,10 +907,11 @@
 "Usage: groupmod [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -g, --gid GID\t\t\tforce use new GID by GROUP\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -n, --new-name NEW_GROUP\tforce use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) GID by GROUP\n"
+"  -g, --gid GID                 force use new GID by GROUP\n"
+"  -h, --help                    display this help message and exit\n"
+"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+"  -o, --non-unique              allow using duplicate (non-unique) GID by "
+"GROUP\n"
 "\n"
 msgstr ""
 "របៀបប្រើ ៖ groupadd ក្រុម [options]​\n"
@@ -1064,15 +1070,16 @@
 msgid " groups="
 msgstr " ក្រុម​="
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
 "Options:\n"
-"  -b, --before DAYS\tprint only lastlog records older than DAYS\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -t, --time DAYS\tprint only lastlog records more recent than DAYS\n"
-"  -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n"
+"  -b, --before DAYS             print only lastlog records older than DAYS\n"
+"  -h, --help                    display this help message and exit\n"
+"  -t, --time DAYS               print only lastlog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 "\n"
 msgstr ""
 "របៀបប្រើ ៖ lastlog [ជម្រើស]\n"
@@ -1233,14 +1240,10 @@
 msgid ""
 "Usage: %s [options] [input]\n"
 "\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
 "%s\n"
 msgstr ""
 
-msgid ""
-"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
-msgstr ""
-
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s ៖ មិន​អាច​ចាក់​សោ​ /etc/passwd បានឡើយ ។\n"
@@ -1289,28 +1292,29 @@
 msgid "%s: error updating files\n"
 msgstr "%s ៖ មានកំហុសក្នុងការ​ធ្វើឲ្យ​ឯកសារទាន់សម័យ\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\treport password status on all accounts\n"
-"  -d, --delete\t\t\tdelete the password for the named account\n"
-"  -e, --expire\t\t\tforce expire the password for the named account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --keep-tokens\t\tchange password only if expired\n"
-"  -i, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --lock\t\t\tlock the named account\n"
-"  -n, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -r, --repository REPOSITORY\tchange password in REPOSITORY repository\n"
-"  -S, --status\t\t\treport password status on the named account\n"
-"  -u, --unlock\t\t\tunlock the named account\n"
-"  -w, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
+"  -a, --all                     report password status on all accounts\n"
+"  -d, --delete                  delete the password for the named account\n"
+"  -e, --expire                  force expire the password for the named "
+"account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --keep-tokens             change password only if expired\n"
+"  -i, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --lock                    lock the named account\n"
+"  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -q, --quiet                   quiet mode\n"
+"  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+"  -S, --status                  report password status on the named account\n"
+"  -u, --unlock                  unlock the named account\n"
+"  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
 "របៀបប្រើ ៖ passwd [ជម្រើស] [ការចូល]\n"
@@ -1516,13 +1520,13 @@
 "Usage: su [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -, -l, --login\t\tmake the shell a login shell\n"
+"  -c, --command COMMAND         pass COMMAND to the invoked shell\n"
+"  -h, --help                    display this help message and exit\n"
+"  -, -l, --login                make the shell a login shell\n"
 "  -m, -p,\n"
-"  --preserve-environment\tdo not reset environment variables, and keep\n"
-"\t\t\t\tthe same shell\n"
-"  -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n"
+"  --preserve-environment        do not reset environment variables, and\n"
+"                                keep the same shell\n"
+"  -s, --shell SHELL             use SHELL instead of the default in passwd\n"
 "\n"
 msgstr ""
 "របៀបប្រើ ៖ su [ជម្រើស] [ការចូល]\n"
@@ -1616,34 +1620,35 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s ៖ ក្រុម​ដែលបានបញ្ជាក់​ច្រើនពេក​ (អតិ​ %d) ។\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR\tbase directory for the new user account\n"
-"\t\t\t\thome directory\n"
-"  -c, --comment COMMENT\t\tset the GECOS field for the new user account\n"
-"  -d, --home-dir HOME_DIR\thome directory for the new user account\n"
-"  -D, --defaults\t\tprint or save modified default useradd\n"
-"\t\t\t\tconfiguration\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP for the new user account\n"
-"  -G, --groups GROUPS\t\tlist of supplementary groups for the new\n"
-"\t\t\t\tuser account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --skel SKEL_DIR\t\tspecify an alternative skel directory\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -m, --create-home\t\tcreate home directory for the new user\n"
-"\t\t\t\taccount\n"
-"  -o, --non-unique\t\tallow create user with duplicate\n"
-"\t\t\t\t(non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new user\n"
-"\t\t\t\taccount\n"
-"  -s, --shell SHELL\t\tthe login shell for the new user account\n"
-"  -u, --uid UID\t\t\tforce use the UID for the new user account\n"
+"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+"                                home directory\n"
+"  -c, --comment COMMENT         set the GECOS field for the new user "
+"account\n"
+"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+"  -D, --defaults                print or save modified default useradd\n"
+"                                configuration\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP for the new user account\n"
+"  -G, --groups GROUPS           list of supplementary groups for the new\n"
+"                                user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -m, --create-home             create home directory for the new user\n"
+"                                account\n"
+"  -o, --non-unique              allow create user with duplicate\n"
+"                                (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new user\n"
+"                                account\n"
+"  -s, --shell SHELL             the login shell for the new user account\n"
+"  -u, --uid UID                 force use the UID for the new user account\n"
 "\n"
 msgstr ""
 "របៀបប្រើ ៖ useradd [ជម្រើស] LOGIN\n"
@@ -1810,14 +1815,15 @@
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s ៖ ការព្រមាន ៖ CREATE_HOME មិន​បាន​គាំទ្រទេ​ សូម​ប្រើ​ -m ជំនួសវិញ ។\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce removal of files, even if not owned by user\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -r, --remove\t\t\tremove home directory and mail spool\n"
+"  -f, --force                   force removal of files,\n"
+"                                even if not owned by user\n"
+"  -h, --help                    display this help message and exit\n"
+"  -r, --remove                  remove home directory and mail spool\n"
 "\n"
 msgstr ""
 "របៀបប្រើ ៖ userdel [ជម្រើស] LOGIN\n"
@@ -1889,26 +1895,26 @@
 "Usage: usermod [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -c, --comment COMMENT\t\tnew value of the GECOS field\n"
-"  -d, --home HOME_DIR\t\tnew home directory for the user account\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP as new primary group\n"
-"  -G, --groups GROUPS\t\tnew list of supplementary GROUPS\n"
-"  -a, --append\t\tappend the user to the supplemental GROUPS\n"
-"\t\t\t\tmentioned by the -G option without removing\n"
-"\t\t\t\thim/her from other groups\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --login NEW_LOGIN\t\tnew value of the login name\n"
-"  -L, --lock\t\t\tlock the user account\n"
-"  -m, --move-home\t\tmove contents of the home directory to the new\n"
-"\t\t\t\tlocation (use only with -d)\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new password\n"
-"  -s, --shell SHELL\t\tnew login shell for the user account\n"
-"  -u, --uid UID\t\t\tnew UID for the user account\n"
-"  -U, --unlock\t\t\tunlock the user account\n"
+"  -c, --comment COMMENT         new value of the GECOS field\n"
+"  -d, --home HOME_DIR           new home directory for the user account\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP as new primary group\n"
+"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+"  -a, --append                  append the user to the supplemental GROUPS\n"
+"                                mentioned by the -G option without removing\n"
+"                                him/her from other groups\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --login NEW_LOGIN         new value of the login name\n"
+"  -L, --lock                    lock the user account\n"
+"  -m, --move-home               move contents of the home directory to the\n"
+"                                new location (use only with -d)\n"
+"  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
+"  -u, --uid UID                 new UID for the user account\n"
+"  -U, --unlock                  unlock the user account\n"
 "\n"
 msgstr ""
 "របៀបប្រើ ៖ usermod [ជម្រើស] LOGIN\n"
@@ -1996,16 +2002,16 @@
 msgid "failed to rename mailbox"
 msgstr "​បរាជ័យ​ក្នុងការប្ដូរឈ្មោះប្រអប់"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
-"  -g, --group\t\t\tedit group database\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -p, --passwd\t\t\tedit passwd database\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -s, --shadow\t\t\tedit shadow or gshadow database\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
 "\n"
 msgstr ""
 "របៀបប្រើ ៖ vipw [ជម្រើស]\n"

Modified: upstream/trunk/po/ko.po
===================================================================
--- upstream/trunk/po/ko.po	2007-11-24 22:41:24 UTC (rev 1460)
+++ upstream/trunk/po/ko.po	2007-11-25 20:21:53 UTC (rev 1461)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 12:26+0100\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
 "PO-Revision-Date: 2006-07-22 00:05+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu at debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean at lists.debian.org>\n"
@@ -190,22 +190,22 @@
 msgid "%s's Password: "
 msgstr "%s의 열쇠글: "
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: chage [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -d, --lastday LAST_DAY\tset last password change to LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -I, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --list\t\t\tshow account aging information\n"
-"  -m, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
+"  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+"  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -h, --help                    display this help message and exit\n"
+"  -I, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --list                    show account aging information\n"
+"  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
+"  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 "\n"
 msgstr ""
 "사용법: chage [옵션] [로그인]\n"
@@ -460,10 +460,11 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
+"  -e, --encrypted               supplied passwords are encrypted\n"
+"  -h, --help                    display this help message and exit\n"
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
 "%s\n"
 msgstr ""
 "사용법: chpasswd [옵션]\n"
@@ -476,7 +477,8 @@
 "\n"
 
 msgid ""
-"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+"  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+"                                crypt algorithms\n"
 msgstr ""
 
 #, c-format
@@ -551,13 +553,13 @@
 msgid "%s: line %d: unknown user %s\n"
 msgstr "%s: line %d: 알 수 없는 사용자 %s\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -h, --help\t\t\t\tdisplay this help message and exit\n"
-"  -s, --shell SHELL\t\t\tnew login shell for the user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
 "\n"
 msgstr ""
 "사용법: chsh [옵션] [로그인]\n"
@@ -594,20 +596,23 @@
 msgid "%s: unknown user\n"
 msgstr "%s: 알 수 없는 사용자\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\tdisplay faillog records for all users\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n"
-"  -m, --maximum MAX\t\tset maximum failed login counters to MAX\n"
-"  -r, --reset\t\t\treset the counters of login failures\n"
-"  -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n"
-"  -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n"
-"\t\t\t\tand limits (if used with -r, -m or -l options) only\n"
-"\t\t\t\tfor user with LOGIN\n"
+"  -a, --all                     display faillog records for all users\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"seconds\n"
+"  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+"  -r, --reset                   reset the counters of login failures\n"
+"  -t, --time DAYS               display faillog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m or -"
+"l\n"
+"                                options) only for user with LOGIN\n"
 "\n"
 msgstr ""
 "사용법: faillog [옵션]\n"
@@ -745,18 +750,18 @@
 msgid "%s: can't unlock file\n"
 msgstr "%s: 파일 잠금을 해제할 수 없습니다\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: groupadd [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce exit with success status if the specified\n"
-"\t\t\t\tgroup already exists\n"
-"  -g, --gid GID\t\t\tuse GID for the new group\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -o, --non-unique\t\tallow create group with duplicate\n"
-"\t\t\t\t(non-unique) GID\n"
+"  -f, --force                   force exit with success status if the\n"
+"                                specified group already exists\n"
+"  -g, --gid GID                 use GID for the new group\n"
+"  -h, --help                    display this help message and exit\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -o, --non-unique              allow create group with duplicate\n"
+"                                (non-unique) GID\n"
 "\n"
 msgstr ""
 "사용법: groupadd [옵션] <그룹>\n"
@@ -893,15 +898,16 @@
 msgid "Cannot close group file\n"
 msgstr "그룹 파일을 닫을 수 없습니다\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: groupmod [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -g, --gid GID\t\t\tforce use new GID by GROUP\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -n, --new-name NEW_GROUP\tforce use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) GID by GROUP\n"
+"  -g, --gid GID                 force use new GID by GROUP\n"
+"  -h, --help                    display this help message and exit\n"
+"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+"  -o, --non-unique              allow using duplicate (non-unique) GID by "
+"GROUP\n"
 "\n"
 msgstr ""
 "사용법: groupmod [옵션] <그룹>\n"
@@ -1058,15 +1064,16 @@
 msgid " groups="
 msgstr " 그룹 목록="
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
 "Options:\n"
-"  -b, --before DAYS\tprint only lastlog records older than DAYS\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -t, --time DAYS\tprint only lastlog records more recent than DAYS\n"
-"  -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n"
+"  -b, --before DAYS             print only lastlog records older than DAYS\n"
+"  -h, --help                    display this help message and exit\n"
+"  -t, --time DAYS               print only lastlog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 "\n"
 msgstr ""
 "사용법: lastlog [옵션]\n"
@@ -1226,14 +1233,10 @@
 msgid ""
 "Usage: %s [options] [input]\n"
 "\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
 "%s\n"
 msgstr ""
 
-msgid ""
-"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
-msgstr ""
-
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: /etc/passwd를 잠글 수 없습니다.\n"
@@ -1282,28 +1285,29 @@
 msgid "%s: error updating files\n"
 msgstr "%s: 파일을 업데이트 하는 데 오류가 발생했습니다\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\treport password status on all accounts\n"
-"  -d, --delete\t\t\tdelete the password for the named account\n"
-"  -e, --expire\t\t\tforce expire the password for the named account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --keep-tokens\t\tchange password only if expired\n"
-"  -i, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --lock\t\t\tlock the named account\n"
-"  -n, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -r, --repository REPOSITORY\tchange password in REPOSITORY repository\n"
-"  -S, --status\t\t\treport password status on the named account\n"
-"  -u, --unlock\t\t\tunlock the named account\n"
-"  -w, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
+"  -a, --all                     report password status on all accounts\n"
+"  -d, --delete                  delete the password for the named account\n"
+"  -e, --expire                  force expire the password for the named "
+"account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --keep-tokens             change password only if expired\n"
+"  -i, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --lock                    lock the named account\n"
+"  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -q, --quiet                   quiet mode\n"
+"  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+"  -S, --status                  report password status on the named account\n"
+"  -u, --unlock                  unlock the named account\n"
+"  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
 "사용법: passwd [옵션] [로그인]\n"
@@ -1504,18 +1508,18 @@
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: su [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -, -l, --login\t\tmake the shell a login shell\n"
+"  -c, --command COMMAND         pass COMMAND to the invoked shell\n"
+"  -h, --help                    display this help message and exit\n"
+"  -, -l, --login                make the shell a login shell\n"
 "  -m, -p,\n"
-"  --preserve-environment\tdo not reset environment variables, and keep\n"
-"\t\t\t\tthe same shell\n"
-"  -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n"
+"  --preserve-environment        do not reset environment variables, and\n"
+"                                keep the same shell\n"
+"  -s, --shell SHELL             use SHELL instead of the default in passwd\n"
 "\n"
 msgstr ""
 "사용법: su [옵션] [로그인]\n"
@@ -1609,34 +1613,35 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: 그룹이 너무 많이 명시되었습니다 (최대 %d).\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR\tbase directory for the new user account\n"
-"\t\t\t\thome directory\n"
-"  -c, --comment COMMENT\t\tset the GECOS field for the new user account\n"
-"  -d, --home-dir HOME_DIR\thome directory for the new user account\n"
-"  -D, --defaults\t\tprint or save modified default useradd\n"
-"\t\t\t\tconfiguration\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP for the new user account\n"
-"  -G, --groups GROUPS\t\tlist of supplementary groups for the new\n"
-"\t\t\t\tuser account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --skel SKEL_DIR\t\tspecify an alternative skel directory\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -m, --create-home\t\tcreate home directory for the new user\n"
-"\t\t\t\taccount\n"
-"  -o, --non-unique\t\tallow create user with duplicate\n"
-"\t\t\t\t(non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new user\n"
-"\t\t\t\taccount\n"
-"  -s, --shell SHELL\t\tthe login shell for the new user account\n"
-"  -u, --uid UID\t\t\tforce use the UID for the new user account\n"
+"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+"                                home directory\n"
+"  -c, --comment COMMENT         set the GECOS field for the new user "
+"account\n"
+"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+"  -D, --defaults                print or save modified default useradd\n"
+"                                configuration\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP for the new user account\n"
+"  -G, --groups GROUPS           list of supplementary groups for the new\n"
+"                                user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -m, --create-home             create home directory for the new user\n"
+"                                account\n"
+"  -o, --non-unique              allow create user with duplicate\n"
+"                                (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new user\n"
+"                                account\n"
+"  -s, --shell SHELL             the login shell for the new user account\n"
+"  -u, --uid UID                 force use the UID for the new user account\n"
 "\n"
 msgstr ""
 "사용법: useradd [옵션] 로그인\n"
@@ -1801,14 +1806,15 @@
 msgstr ""
 "%s:경고: CREATE_HOME은 지원하지 않습니다. -m 옵션을 대신 사용하십시오.\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce removal of files, even if not owned by user\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -r, --remove\t\t\tremove home directory and mail spool\n"
+"  -f, --force                   force removal of files,\n"
+"                                even if not owned by user\n"
+"  -h, --help                    display this help message and exit\n"
+"  -r, --remove                  remove home directory and mail spool\n"
 "\n"
 msgstr ""
 "사용법: userdel [옵션] <로그인>\n"
@@ -1882,26 +1888,26 @@
 "Usage: usermod [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -c, --comment COMMENT\t\tnew value of the GECOS field\n"
-"  -d, --home HOME_DIR\t\tnew home directory for the user account\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP as new primary group\n"
-"  -G, --groups GROUPS\t\tnew list of supplementary GROUPS\n"
-"  -a, --append\t\tappend the user to the supplemental GROUPS\n"
-"\t\t\t\tmentioned by the -G option without removing\n"
-"\t\t\t\thim/her from other groups\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --login NEW_LOGIN\t\tnew value of the login name\n"
-"  -L, --lock\t\t\tlock the user account\n"
-"  -m, --move-home\t\tmove contents of the home directory to the new\n"
-"\t\t\t\tlocation (use only with -d)\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new password\n"
-"  -s, --shell SHELL\t\tnew login shell for the user account\n"
-"  -u, --uid UID\t\t\tnew UID for the user account\n"
-"  -U, --unlock\t\t\tunlock the user account\n"
+"  -c, --comment COMMENT         new value of the GECOS field\n"
+"  -d, --home HOME_DIR           new home directory for the user account\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP as new primary group\n"
+"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+"  -a, --append                  append the user to the supplemental GROUPS\n"
+"                                mentioned by the -G option without removing\n"
+"                                him/her from other groups\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --login NEW_LOGIN         new value of the login name\n"
+"  -L, --lock                    lock the user account\n"
+"  -m, --move-home               move contents of the home directory to the\n"
+"                                new location (use only with -d)\n"
+"  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
+"  -u, --uid UID                 new UID for the user account\n"
+"  -U, --unlock                  unlock the user account\n"
 "\n"
 msgstr ""
 "사용법: usermod [옵션] <로그인>\n"
@@ -1991,16 +1997,16 @@
 msgid "failed to rename mailbox"
 msgstr "메일함의 이름을 바꾸는 데 실패했습니다"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
-"  -g, --group\t\t\tedit group database\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -p, --passwd\t\t\tedit passwd database\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -s, --shadow\t\t\tedit shadow or gshadow database\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
 "\n"
 msgstr ""
 "사용법: vipw [옵션]\n"

Modified: upstream/trunk/po/nb.po
===================================================================
--- upstream/trunk/po/nb.po	2007-11-24 22:41:24 UTC (rev 1460)
+++ upstream/trunk/po/nb.po	2007-11-25 20:21:53 UTC (rev 1461)
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.17\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 12:26+0100\n"
-"PO-Revision-Date: 2006-06-23 09:01+0200\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"PO-Revision-Date: 2007-11-25 21:07+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst at powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -201,33 +201,36 @@
 "Usage: chage [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -d, --lastday LAST_DAY\tset last password change to LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -I, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --list\t\t\tshow account aging information\n"
-"  -m, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
+"  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+"  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -h, --help                    display this help message and exit\n"
+"  -I, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --list                    show account aging information\n"
+"  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
+"  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 "\n"
 msgstr ""
 "Bruk: chage [valg] bruker\n"
 "\n"
-"Valg:   -d, --lastday SISTE_DAG\tangi at siste passord-endring skjedde "
+"Valg:\n"
+"  -d, --lastday SISTE_DAG       angi at siste passord-endring skjedde "
 "SISTE_DAG\n"
-"  -E, --expiredate UTLØPSDATO\tangi at kontoen utløper UTLØPSDATO\n"
-"  -h, .--help\t\t\tvis denne hjelpeteksten og avslutt\n"
-"  -I, --inaktive INAKTIV\tangi at passordet settes til INAKTIV etter utløp\n"
-"  -l, --list\t\t\tvis informasjon om kontoens aldring og utløp\n"
-"  m, --mindays MIN_DAGER\toppgir at passordet først kan endres etter\n"
-"\t\t\t\tMIN_DAGER\n"
-"  M, --maxdays MAKS_DAGER\toppgir at passordet må endres før det er\n"
-"\t\t\t\tgått MAKS_DAGER\n"
-"  -W, --warndats VARSLDAGER\tetter VARSLDAGER varsles bruker om at\n"
-"\t\t\t\tpassordet snart utløper\n"
+"  -E, --expiredate UTLØPSDATO   angi at kontoen utløper UTLØPSDATO\n"
+"  -h, .--help                   vis denne hjelpeteksten og avslutt\n"
+"  -I, --inaktive INAKTIV        angi at passordet settes til INAKTIV etter "
+"utløp\n"
+"  -l, --list                    vis informasjon om kontoens aldring og "
+"utløp\n"
+"  m, --mindays MIN_DAGER        oppgir at passordet først kan endres etter\n"
+"                                MIN_DAGER\n"
+"  M, --maxdays MAKS_DAGER       oppgir at passordet må endres før det er\n"
+"                                gått MAKS_DAGER\n"
+"  -W, --warndats VARSLDAGER     etter VARSLDAGER varsles bruker om at\n"
+"                                passordet snart utløper\n"
 "\n"
 
 #, c-format
@@ -465,22 +468,24 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
+"  -e, --encrypted               supplied passwords are encrypted\n"
+"  -h, --help                    display this help message and exit\n"
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
 "%s\n"
 msgstr ""
 "Bruk: chpasswd [valg]\n"
 "\n"
 "Valg:\n"
-"  -e, --encrypted\toppgitte passord er krypterte\n"
-"  h, --help\t\tvis denne hjelpeteksten og avslutt\n"
-"  -m, --md5\t\tbruk MD5-kryptering i stedet for DES når de oppgitte\n"
-"\t\t\tpassordene ikke er krypterte\n"
+"  -e, --encrypted               oppgitte passord er krypterte\n"
+"  h, --help                     vis denne hjelpeteksten og avslutt\n"
+"  -m, --md5                     bruk MD5-kryptering i stedet for DES når de\n"
+"                                oppgitte passordene ikke er krypterte\n"
 
 msgid ""
-"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+"  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+"                                crypt algorithms\n"
 msgstr ""
 
 #, c-format
@@ -560,16 +565,16 @@
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -h, --help\t\t\t\tdisplay this help message and exit\n"
-"  -s, --shell SHELL\t\t\tnew login shell for the user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
 "\n"
 msgstr ""
 "Bruk: userdel [valg] LOGIN\n"
 "\n"
 "Valg:\n"
-"  -f, --force\t\t\tslett filer, selv om det ikke er brukeren som eier dem\n"
-"  -h, --help\t\t\tvis denne meldingen og avslutt\n"
-"  -r, --remove\t\t\tslett hjemmemappa og postkassa\n"
+"  -f, --force       slett filer, selv om det ikke er brukeren som eier dem\n"
+"  -h, --help        vis denne meldingen og avslutt\n"
+"  -r, --remove      slett hjemmemappa og postkassa\n"
 "\n"
 
 msgid "Login Shell"
@@ -604,29 +609,35 @@
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\tdisplay faillog records for all users\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n"
-"  -m, --maximum MAX\t\tset maximum failed login counters to MAX\n"
-"  -r, --reset\t\t\treset the counters of login failures\n"
-"  -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n"
-"  -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n"
-"\t\t\t\tand limits (if used with -r, -m or -l options) only\n"
-"\t\t\t\tfor user with LOGIN\n"
+"  -a, --all                     display faillog records for all users\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"seconds\n"
+"  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+"  -r, --reset                   reset the counters of login failures\n"
+"  -t, --time DAYS               display faillog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m or -"
+"l\n"
+"                                options) only for user with LOGIN\n"
 "\n"
 msgstr ""
 "Bruk: faillog [valg]\n"
 "\n"
 "Valg:\n"
-"  -a, --all\t\t\tvis faillog-oppføringer for alle brukere\n"
-"  -h, --help\t\t\tvis denne hjelpeteksten og avslutt\n"
-"  -l, --lock-time SEK\t\tetter mislykket innlogging, lås kontoen i SEK\n"
-"\t\t\t\t\tsekunder\n"
-"  -m, --maximum MAX\t\tsett største antall mislykte innlogginger til MAX\n"
-"  -r, --reset\t\t\tnullstill tellerne for mislykte innlogginger\n"
-"  -t, --time DAGER\t\tvis mislykte innlogginger nyere enn DAGER\n"
-"  -u, --user BRUKER\t\tvis mislykte innlogginger eller styr tellene og\n"
-"\t\t\t\tgrenseverdiene (med -r, -m eller -l) bare for bruker BRUKER\n"
+"  -a, --all                     vis faillog-oppføringer for alle brukere\n"
+"  -h, --help                    vis denne hjelpeteksten og avslutt\n"
+"  -l, --lock-time SEK           etter mislykket innlogging, lås kontoen\n"
+"                                i SEK sekunder\n"
+"  -m, --maximum MAX             sett største antall mislykte innlogginger\n"
+"                                til MAX\n"
+"  -r, --reset                   nullstill tellerne for mislykte "
+"innlogginger\n"
+"  -t, --time DAGER              vis mislykte innlogginger nyere enn DAGER\n"
+"  -u, --user BRUKER             vis mislykte innlogginger eller styr\n"
+"                                tellene og grenseverdiene (med -r, -m\n"
+"                                eller -l) bare for bruker BRUKER\n"
 "\n"
 
 #, c-format
@@ -755,26 +766,26 @@
 "Usage: groupadd [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce exit with success status if the specified\n"
-"\t\t\t\tgroup already exists\n"
-"  -g, --gid GID\t\t\tuse GID for the new group\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -o, --non-unique\t\tallow create group with duplicate\n"
-"\t\t\t\t(non-unique) GID\n"
+"  -f, --force                   force exit with success status if the\n"
+"                                specified group already exists\n"
+"  -g, --gid GID                 use GID for the new group\n"
+"  -h, --help                    display this help message and exit\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -o, --non-unique              allow create group with duplicate\n"
+"                                (non-unique) GID\n"
 "\n"
 msgstr ""
 "Bruk: groupadd [valg] gruppe\n"
 "\n"
 "Valg:\n"
-"  -f, --force\t\ttving fram normal avslutning hvis den oppgitte\n"
-"\t\t\t\tgruppa finnes fra før\n"
-"  -g, --gid GID\t\tbruk GID for den nye gruppa\n"
-"  -h, --help\t\t\tvis denne hjelpeteksten og avslutt\n"
-"  -K, --key NØKKEL=VERDI\t\toverstyrer standardverdier\n"
-"\t\t\t\tfra /etc/login.defs\n"
-"  -o, --non-unique\t\ttillat å opprette en gruppe med duplisert\n"
-"\t\t\t\tGID\n"
+"  -f, --force                   tving fram normal avslutning hvis den\n"
+"                                oppgitte gruppa finnes fra før\n"
+"  -g, --gid GID                 bruk GID for den nye gruppa\n"
+"  -h, --help                    vis denne hjelpeteksten og avslutt\n"
+"  -K, --key NØKKEL=VERDI        overstyrer standardverdier\n"
+"                                fra /etc/login.defs\n"
+"  -o, --non-unique              tillat å opprette en gruppe med duplisert\n"
+"                                GID\n"
 "\n"
 
 #, c-format
@@ -902,23 +913,24 @@
 "Usage: groupmod [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -g, --gid GID\t\t\tforce use new GID by GROUP\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -n, --new-name NEW_GROUP\tforce use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) GID by GROUP\n"
+"  -g, --gid GID                 force use new GID by GROUP\n"
+"  -h, --help                    display this help message and exit\n"
+"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+"  -o, --non-unique              allow using duplicate (non-unique) GID by "
+"GROUP\n"
 "\n"
 msgstr ""
 "Bruk: groupadd [valg] gruppe\n"
 "\n"
 "Valg:\n"
-"  -f, --force\t\ttving fram normal avslutning hvis den oppgitte\n"
-"\t\t\t\tgruppa finnes fra før\n"
-"  -g, --gid GID\t\tbruk GID for den nye gruppa\n"
-"  -h, --help\t\t\tvis denne hjelpeteksten og avslutt\n"
-"  -K, --key NØKKEL=VERDI\t\toverstyrer standardverdier\n"
-"\t\t\t\tfra /etc/login.defs\n"
-"  -o, --non-unique\t\ttillat å opprette en gruppe med duplisert\n"
-"\t\t\t\tGID\n"
+"  -f, --force                   tving fram normal avslutning hvis den\n"
+"                                oppgitte gruppa finnes fra før\n"
+"  -g, --gid GID                 bruk GID for den nye gruppa\n"
+"  -h, --help                    vis denne hjelpeteksten og avslutt\n"
+"  -K, --key NØKKEL=VERDI        overstyrer standardverdier\n"
+"                                fra /etc/login.defs\n"
+"  -o, --non-unique              tillat å opprette en gruppe med duplisert\n"
+"                                GID\n"
 "\n"
 
 #, c-format
@@ -1070,19 +1082,20 @@
 "Usage: lastlog [options]\n"
 "\n"
 "Options:\n"
-"  -b, --before DAYS\tprint only lastlog records older than DAYS\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -t, --time DAYS\tprint only lastlog records more recent than DAYS\n"
-"  -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n"
+"  -b, --before DAYS             print only lastlog records older than DAYS\n"
+"  -h, --help                    display this help message and exit\n"
+"  -t, --time DAYS               print only lastlog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 "\n"
 msgstr ""
 "Bruk: lastlog [valg]\n"
 "\n"
 "Valg:\n"
-"  -b, --before DAGER\tskriv bare oppføringer eldre enn DAGER\n"
-"  -h, --help\t\tvis denne hjelpeteksten og avslutt\n"
-"  -t, --time DAGER\tskriv bare oppføringer nyere enn DAGER\n"
-"  -u, --user BRUKER\tskriv oppføringer for bruker BRUKER\n"
+"  -b, --before DAGER            skriv bare oppføringer eldre enn DAGER\n"
+"  -h, --help                    vis denne hjelpeteksten og avslutt\n"
+"  -t, --time DAGER              skriv bare oppføringer nyere enn DAGER\n"
+"  -u, --user BRUKER             skriv oppføringer for bruker BRUKER\n"
 "\n"
 
 #, c-format
@@ -1233,14 +1246,10 @@
 msgid ""
 "Usage: %s [options] [input]\n"
 "\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
 "%s\n"
 msgstr ""
 
-msgid ""
-"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
-msgstr ""
-
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: kan ikke låse /etc/passwd.\n"
@@ -1294,43 +1303,45 @@
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\treport password status on all accounts\n"
-"  -d, --delete\t\t\tdelete the password for the named account\n"
-"  -e, --expire\t\t\tforce expire the password for the named account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --keep-tokens\t\tchange password only if expired\n"
-"  -i, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --lock\t\t\tlock the named account\n"
-"  -n, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -r, --repository REPOSITORY\tchange password in REPOSITORY repository\n"
-"  -S, --status\t\t\treport password status on the named account\n"
-"  -u, --unlock\t\t\tunlock the named account\n"
-"  -w, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
+"  -a, --all                     report password status on all accounts\n"
+"  -d, --delete                  delete the password for the named account\n"
+"  -e, --expire                  force expire the password for the named "
+"account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --keep-tokens             change password only if expired\n"
+"  -i, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --lock                    lock the named account\n"
+"  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -q, --quiet                   quiet mode\n"
+"  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+"  -S, --status                  report password status on the named account\n"
+"  -u, --unlock                  unlock the named account\n"
+"  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
 "Bruk: passwd [valg] [bruker]\n"
 "\n"
 "Valg:\n"
-"  -a, --all\t\t\trapporter passordstatus for alle kontoer\n"
-"  -d, --delete\t\t\tslett passordet for oppgitt konto\n"
-"  -e, --expire\t\t\tangi at passordet for konten er utgått\n"
-"  -h, --help\t\t\tvis denne hjelpeteksten og avslutt\n"
-"  -k, --keep-tokens\t\tendre passord bare hvis utgått\n"
-"  -i, --inactive INAKTIV\tset passord inaktivt etter utløp til INAKTIV\n"
-"  -l, --lock\t\t\tlås oppgitt konto\n"
-"  -n, --mindays MIN_DAGER\tangi at passord ikke kan endres før etter\n"
-"\t\t\t\tIN_DAGER\n"
-"  -q, --quiet\t\t\tordknapp kjøremåte\n"
-"  -r, --repository LAGER\tendre passord i lageret LAGER\n"
-"  -S, --status\t\t\trapporter passordstatus på oppgitt konto\n"
-"  -u, .--unlock\t\t\tlås opp oppgitt konto\n"
-"  -w, --warndays DAGER\tvarsle om utgått passord DAGER før utløp\n"
-"  -x, --maxdays DAGER\tpassordet må endres før det er gått DAGER\n"
+"  -a, --all                     rapporter passordstatus for alle kontoer\n"
+"  -d, --delete                  slett passordet for oppgitt konto\n"
+"  -e, --expire                  angi at passordet for konten er utgått\n"
+"  -h, --help                    vis denne hjelpeteksten og avslutt\n"
+"  -k, --keep-tokens             endre passord bare hvis utgått\n"
+"  -i, --inactive INAKTIV        set passord inaktivt etter utløp til "
+"INAKTIV\n"
+"  -l, --lock                    lås oppgitt konto\n"
+"  -n, --mindays MIN_DAGER       angi at passord ikke kan endres før etter\n"
+"                                IN_DAGER\n"
+"  -q, --quiet                   ordknapp kjøremåte\n"
+"  -r, --repository LAGER        endre passord i lageret LAGER\n"
+"  -S, --status                  rapporter passordstatus på oppgitt konto\n"
+"  -u, .--unlock                 lås opp oppgitt konto\n"
+"  -w, --warndays DAGER          varsle om utgått passord DAGER før utløp\n"
+"  -x, --maxdays DAGER           passordet må endres før det er gått DAGER\n"
 "\n"
 
 msgid "Old password: "
@@ -1514,26 +1525,25 @@
 "Usage: su [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -, -l, --login\t\tmake the shell a login shell\n"
+"  -c, --command COMMAND         pass COMMAND to the invoked shell\n"
+"  -h, --help                    display this help message and exit\n"
+"  -, -l, --login                make the shell a login shell\n"
 "  -m, -p,\n"
-"  --preserve-environment\tdo not reset environment variables, and keep\n"
-"\t\t\t\tthe same shell\n"
-"  -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n"
+"  --preserve-environment        do not reset environment variables, and\n"
+"                                keep the same shell\n"
+"  -s, --shell SHELL             use SHELL instead of the default in passwd\n"
 "\n"
 msgstr ""
 "Bruk: su [valg] [konto]\n"
 "\n"
 "Valg:\n"
-"  -c, --command KOMMANDO\t\tsend KOMMANDO til det skallet\n"
-"\t\t\t\tsom startes\n"
-"  -h, --help\t\t\tvis denne hjelpeteksten og avslutt\n"
-"  -, --login\t\tgjør det nye skallet til en login-skall\n"
+"  -c, --command KOMMANDO        send KOMMANDO til det skallet som startes\n"
+"  -h, --help                    vis denne hjelpeteksten og avslutt\n"
+"  -, -l, --login                gjør det nye skallet til en login-skall\n"
 "  -m, -p,\n"
-" --preserve-environment\tikke endre miljøvariabler, og behold\n"
-"\t\t\t\tdet samme skalletn   -s, --shell SKALL\t\tbruk SKALL i stedet for\n"
-"\t\t\t\tdet i /etc/passwd\n"
+"  --preserve-environment        ikke endre miljøvariabler, og behold\n"
+"                                det samme skalletn\n"
+"  -s, --shell SKALL             bruk SKALL i stedet for det i /etc/passwd\n"
 "\n"
 
 #, c-format
@@ -1620,52 +1630,55 @@
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR\tbase directory for the new user account\n"
-"\t\t\t\thome directory\n"
-"  -c, --comment COMMENT\t\tset the GECOS field for the new user account\n"
-"  -d, --home-dir HOME_DIR\thome directory for the new user account\n"
-"  -D, --defaults\t\tprint or save modified default useradd\n"
-"\t\t\t\tconfiguration\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP for the new user account\n"
-"  -G, --groups GROUPS\t\tlist of supplementary groups for the new\n"
-"\t\t\t\tuser account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --skel SKEL_DIR\t\tspecify an alternative skel directory\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -m, --create-home\t\tcreate home directory for the new user\n"
-"\t\t\t\taccount\n"
-"  -o, --non-unique\t\tallow create user with duplicate\n"
-"\t\t\t\t(non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new user\n"
-"\t\t\t\taccount\n"
-"  -s, --shell SHELL\t\tthe login shell for the new user account\n"
-"  -u, --uid UID\t\t\tforce use the UID for the new user account\n"
+"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+"                                home directory\n"
+"  -c, --comment COMMENT         set the GECOS field for the new user "
+"account\n"
+"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+"  -D, --defaults                print or save modified default useradd\n"
+"                                configuration\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP for the new user account\n"
+"  -G, --groups GROUPS           list of supplementary groups for the new\n"
+"                                user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -m, --create-home             create home directory for the new user\n"
+"                                account\n"
+"  -o, --non-unique              allow create user with duplicate\n"
+"                                (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new user\n"
+"                                account\n"
+"  -s, --shell SHELL             the login shell for the new user account\n"
+"  -u, --uid UID                 force use the UID for the new user account\n"
 "\n"
 msgstr ""
 "Bruk: useradd [valg] KONTO\n"
 "\n"
 "Valg:\n"
-"  -b, --base-dir BASIS\tbasis-mappe for hjemmemappa til den nye\n"
-"\t\t\t\tbrukerkontoen\n"
-"  -c, --comment KOMMENTAR\tsett i GECOS-feltet for den nye \t\t\t"
-"\tbrukerkontoen\n"
-"  -d, --home-dir HJEMME\thjemmemappe for den nye brukerkontoen\n"
-"  -D, --defaults\t\tskriv ut eller lagre endret standardoppsett for useradd\n"
-"  -e, --expiredate DATO\tangi at kontoen utgår på DATO\n"
-"  -f, --inactive INAKTIV\tsett passordet inaktivt etter utløp\n"
-"  -g, --gid GRUPPE\tangi GRUPPE for den nye brukerkontoen\n"
-"  -h, --help\t\t\tvis denne hjelpeteksten og avslutt\n"
-"  -k, --skel SKJELETT\toppgi en annen skel-mappe\n"
-"  -K, --key NØKKEL=VERDI\toverstyrer oppsett fra /etc/login.defs\n"
-"  -m, --create-home\t\topprett hjemmemappe for den nye brukerkontoen\n"
-"  -o, --non-unique\t\ttillat å opprette bruker med duplisert UID\n"
-"  -p, --password PASSORD\tbruk dette krypterte passordet for\n"
-"\t\t\t\tden nye brukerkontoen\n"
-"  -s, --shell SKALL\t\tinnloggingsskall for den nye brukerkontoen\n"
-"  -u, --uid UID\t\t\tbruk UID for den nye brukerkontoen\n"
+"  -b, --base-dir BASIS          basis-mappe for hjemmemappa til den nye\n"
+"                                brukerkontoen\n"
+"  -c, --comment KOMMENTAR       sett i GECOS-feltet for den nye\n"
+"                                brukerkontoen\n"
+"  -d, --home-dir HJEMME         hjemmemappe for den nye brukerkontoen\n"
+"  -D, --defaults                skriv ut eller lagre endret standardoppsett\n"
+"                                for useradd\n"
+"  -e, --expiredate DATO         angi at kontoen utgår på DATO\n"
+"  -f, --inactive INAKTIV        sett passordet inaktivt etter utløp\n"
+"  -g, --gid GRUPPE              angi GRUPPE for den nye brukerkontoen\n"
+"  -h, --help                    vis denne hjelpeteksten og avslutt\n"
+"  -k, --skel SKJELETT           oppgi en annen skel-mappe\n"
+"  -K, --key NØKKEL=VERDI        overstyrer oppsett fra /etc/login.defs\n"
+"  -m, --create-home             opprett hjemmemappe for den nye "
+"brukerkontoen\n"
+"  -o, --non-unique              tillat å opprette bruker med duplisert UID\n"
+"  -p, --password PASSORD        bruk dette krypterte passordet for\n"
+"                                den nye brukerkontoen\n"
+"  -s, --shell SKALL             innloggingsskall for den nye brukerkontoen\n"
+"  -u, --uid UID                 bruk UID for den nye brukerkontoen\n"
 "\n"
 
 #, fuzzy, c-format
@@ -1813,17 +1826,19 @@
 "Usage: userdel [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce removal of files, even if not owned by user\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -r, --remove\t\t\tremove home directory and mail spool\n"
+"  -f, --force                   force removal of files,\n"
+"                                even if not owned by user\n"
+"  -h, --help                    display this help message and exit\n"
+"  -r, --remove                  remove home directory and mail spool\n"
 "\n"
 msgstr ""
 "Bruk: userdel [valg] LOGIN\n"
 "\n"
 "Valg:\n"
-"  -f, --force\t\t\tslett filer, selv om det ikke er brukeren som eier dem\n"
-"  -h, --help\t\t\tvis denne meldingen og avslutt\n"
-"  -r, --remove\t\t\tslett hjemmemappa og postkassa\n"
+"  -f, --force                   slett filer, selv om det ikke er\n"
+"                                brukeren som eier dem\n"
+"  -h, --help                    vis denne meldingen og avslutt\n"
+"  -r, --remove                  slett hjemmemappa og postkassa\n"
 "\n"
 
 #, c-format
@@ -1889,36 +1904,36 @@
 "Usage: usermod [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -c, --comment COMMENT\t\tnew value of the GECOS field\n"
-"  -d, --home HOME_DIR\t\tnew home directory for the user account\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP as new primary group\n"
-"  -G, --groups GROUPS\t\tnew list of supplementary GROUPS\n"
-"  -a, --append\t\tappend the user to the supplemental GROUPS\n"
-"\t\t\t\tmentioned by the -G option without removing\n"
-"\t\t\t\thim/her from other groups\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --login NEW_LOGIN\t\tnew value of the login name\n"
-"  -L, --lock\t\t\tlock the user account\n"
-"  -m, --move-home\t\tmove contents of the home directory to the new\n"
-"\t\t\t\tlocation (use only with -d)\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new password\n"
-"  -s, --shell SHELL\t\tnew login shell for the user account\n"
-"  -u, --uid UID\t\t\tnew UID for the user account\n"
-"  -U, --unlock\t\t\tunlock the user account\n"
+"  -c, --comment COMMENT         new value of the GECOS field\n"
+"  -d, --home HOME_DIR           new home directory for the user account\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP as new primary group\n"
+"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+"  -a, --append                  append the user to the supplemental GROUPS\n"
+"                                mentioned by the -G option without removing\n"
+"                                him/her from other groups\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --login NEW_LOGIN         new value of the login name\n"
+"  -L, --lock                    lock the user account\n"
+"  -m, --move-home               move contents of the home directory to the\n"
+"                                new location (use only with -d)\n"
+"  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
+"  -u, --uid UID                 new UID for the user account\n"
+"  -U, --unlock                  unlock the user account\n"
 "\n"
 msgstr ""
 "Bruk: usermod [valg] konto\n"
 "\n"
 "Valg:\n"
-"  -a, --append GRUPPE\t\tlegg til bruker i tilleggsgruppa GRUPPE\n"
-"  -c, --comment KOMMENTAR\tny verdi i GECOS-feltet\n"
-"  -d, --home HJEMME\t\thjemmemappe for den nye kontoen\n"
-"  -e, --expiredate DATOt\tkontoen utgår på datoen DATE\n"
-"  -f, --inactive INAKTIV\tpassordet settes inaktivt etter utløp\n"
+"  -a, --append GRUPPE           legg til bruker i tilleggsgruppa GRUPPE\n"
+"  -c, --comment KOMMENTAR       ny verdi i GECOS-feltet\n"
+"  -d, --home HJEMME             hjemmemappe for den nye kontoen\n"
+"  -e, --expiredate DATOt        kontoen utgår på datoen DATE\n"
+"  -f, --inactive INAKTIV        passordet settes inaktivt etter utløp\n"
 "\n"
 
 #, fuzzy, c-format
@@ -1989,21 +2004,21 @@
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
-"  -g, --group\t\t\tedit group database\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -p, --passwd\t\t\tedit passwd database\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -s, --shadow\t\t\tedit shadow or gshadow database\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
 "\n"
 msgstr ""
 "Bruk: vipw [valg]\n"
 "\n"
 "Valg:\n"
-"  -g, --group\t\t\trediger gruppedatabasen\n"
-"  -h, --help\t\t\tvis denne hjelpeteksten og avslutt\n"
-"  -p, --passwd\t\t\trediger passwd-databasen\n"
-"  -q., --quiet\t\t\tordknapp kjøremåte\n"
-"  -s, --shadow \t\t\trediger shadow- eller gshadow-databasen\n"
+"  -g, --group                   rediger gruppedatabasen\n"
+"  -h, --help                    vis denne hjelpeteksten og avslutt\n"
+"  -p, --passwd                  rediger passwd-databasen\n"
+"  -q., --quiet                  ordknapp kjøremåte\n"
+"  -s, --shadow                  rediger shadow- eller gshadow-databasen\n"
 "\n"
 
 #, c-format

Modified: upstream/trunk/po/ne.po
===================================================================
--- upstream/trunk/po/ne.po	2007-11-24 22:41:24 UTC (rev 1460)
+++ upstream/trunk/po/ne.po	2007-11-25 20:21:53 UTC (rev 1461)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.17\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 12:26+0100\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
 "PO-Revision-Date: 2006-06-16 14:30+0545\n"
 "Last-Translator: Shiva Pokharel <pokharelshiva at hotmail.com>\n"
 "Language-Team: Nepali <info at mpp.org.np>\n"
@@ -201,17 +201,17 @@
 "Usage: chage [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -d, --lastday LAST_DAY\tset last password change to LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -I, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --list\t\t\tshow account aging information\n"
-"  -m, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
+"  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+"  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -h, --help                    display this help message and exit\n"
+"  -I, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --list                    show account aging information\n"
+"  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
+"  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 "\n"
 msgstr ""
 "उपयोग:प्रयोगकर्ता [विकल्पहरू] परिवर्तन गर्नुहोस्\n"
@@ -466,10 +466,11 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
+"  -e, --encrypted               supplied passwords are encrypted\n"
+"  -h, --help                    display this help message and exit\n"
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
 "%s\n"
 msgstr ""
 "उपयोग: पासवर्ड परिवर्तन गर्नुहोस् [options]\n"
@@ -482,7 +483,8 @@
 "\n"
 
 msgid ""
-"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+"  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+"                                crypt algorithms\n"
 msgstr ""
 
 #, c-format
@@ -562,8 +564,8 @@
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -h, --help\t\t\t\tdisplay this help message and exit\n"
-"  -s, --shell SHELL\t\t\tnew login shell for the user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
 "\n"
 msgstr ""
 "उपयोग: userdel [options] LOGIN\n"
@@ -601,20 +603,23 @@
 msgid "%s: unknown user\n"
 msgstr "%s: अज्ञात प्रयोगकर्ता\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\tdisplay faillog records for all users\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n"
-"  -m, --maximum MAX\t\tset maximum failed login counters to MAX\n"
-"  -r, --reset\t\t\treset the counters of login failures\n"
-"  -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n"
-"  -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n"
-"\t\t\t\tand limits (if used with -r, -m or -l options) only\n"
-"\t\t\t\tfor user with LOGIN\n"
+"  -a, --all                     display faillog records for all users\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"seconds\n"
+"  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+"  -r, --reset                   reset the counters of login failures\n"
+"  -t, --time DAYS               display faillog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m or -"
+"l\n"
+"                                options) only for user with LOGIN\n"
 "\n"
 msgstr ""
 "उपयोग: असफल लग [options]\n"
@@ -757,13 +762,13 @@
 "Usage: groupadd [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce exit with success status if the specified\n"
-"\t\t\t\tgroup already exists\n"
-"  -g, --gid GID\t\t\tuse GID for the new group\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -o, --non-unique\t\tallow create group with duplicate\n"
-"\t\t\t\t(non-unique) GID\n"
+"  -f, --force                   force exit with success status if the\n"
+"                                specified group already exists\n"
+"  -g, --gid GID                 use GID for the new group\n"
+"  -h, --help                    display this help message and exit\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -o, --non-unique              allow create group with duplicate\n"
+"                                (non-unique) GID\n"
 "\n"
 msgstr ""
 "उपयोग: groupadd [विकल्प] समूह\n"
@@ -903,10 +908,11 @@
 "Usage: groupmod [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -g, --gid GID\t\t\tforce use new GID by GROUP\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -n, --new-name NEW_GROUP\tforce use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) GID by GROUP\n"
+"  -g, --gid GID                 force use new GID by GROUP\n"
+"  -h, --help                    display this help message and exit\n"
+"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+"  -o, --non-unique              allow using duplicate (non-unique) GID by "
+"GROUP\n"
 "\n"
 msgstr ""
 "उपयोग: groupadd [विकल्प] समूह\n"
@@ -1065,15 +1071,16 @@
 msgid " groups="
 msgstr " समूहहरू="
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: lastlog [options]\n"
 "\n"
 "Options:\n"
-"  -b, --before DAYS\tprint only lastlog records older than DAYS\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -t, --time DAYS\tprint only lastlog records more recent than DAYS\n"
-"  -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n"
+"  -b, --before DAYS             print only lastlog records older than DAYS\n"
+"  -h, --help                    display this help message and exit\n"
+"  -t, --time DAYS               print only lastlog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 "\n"
 msgstr ""
 "उपयोग: lastlog [options]\n"
@@ -1233,14 +1240,10 @@
 msgid ""
 "Usage: %s [options] [input]\n"
 "\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
 "%s\n"
 msgstr ""
 
-msgid ""
-"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
-msgstr ""
-
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: /etc/passwd ताल्चा मार्न सकिएन ।\n"
@@ -1294,23 +1297,24 @@
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\treport password status on all accounts\n"
-"  -d, --delete\t\t\tdelete the password for the named account\n"
-"  -e, --expire\t\t\tforce expire the password for the named account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --keep-tokens\t\tchange password only if expired\n"
-"  -i, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --lock\t\t\tlock the named account\n"
-"  -n, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -r, --repository REPOSITORY\tchange password in REPOSITORY repository\n"
-"  -S, --status\t\t\treport password status on the named account\n"
-"  -u, --unlock\t\t\tunlock the named account\n"
-"  -w, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
+"  -a, --all                     report password status on all accounts\n"
+"  -d, --delete                  delete the password for the named account\n"
+"  -e, --expire                  force expire the password for the named "
+"account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --keep-tokens             change password only if expired\n"
+"  -i, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --lock                    lock the named account\n"
+"  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -q, --quiet                   quiet mode\n"
+"  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+"  -S, --status                  report password status on the named account\n"
+"  -u, --unlock                  unlock the named account\n"
+"  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
 "उपयोग: पासवर्ड [विकल्पहरू] [लगइन]\n"
@@ -1517,13 +1521,13 @@
 "Usage: su [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -, -l, --login\t\tmake the shell a login shell\n"
+"  -c, --command COMMAND         pass COMMAND to the invoked shell\n"
+"  -h, --help                    display this help message and exit\n"
+"  -, -l, --login                make the shell a login shell\n"
 "  -m, -p,\n"
-"  --preserve-environment\tdo not reset environment variables, and keep\n"
-"\t\t\t\tthe same shell\n"
-"  -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n"
+"  --preserve-environment        do not reset environment variables, and\n"
+"                                keep the same shell\n"
+"  -s, --shell SHELL             use SHELL instead of the default in passwd\n"
 "\n"
 msgstr ""
 "उपयोग: su [options] [login]\n"
@@ -1617,34 +1621,35 @@
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: अति धेरै समूहरू निर्दिष्ट गरिएको छ (max %d) ।\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR\tbase directory for the new user account\n"
-"\t\t\t\thome directory\n"
-"  -c, --comment COMMENT\t\tset the GECOS field for the new user account\n"
-"  -d, --home-dir HOME_DIR\thome directory for the new user account\n"
-"  -D, --defaults\t\tprint or save modified default useradd\n"
-"\t\t\t\tconfiguration\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP for the new user account\n"
-"  -G, --groups GROUPS\t\tlist of supplementary groups for the new\n"
-"\t\t\t\tuser account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --skel SKEL_DIR\t\tspecify an alternative skel directory\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -m, --create-home\t\tcreate home directory for the new user\n"
-"\t\t\t\taccount\n"
-"  -o, --non-unique\t\tallow create user with duplicate\n"
-"\t\t\t\t(non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new user\n"
-"\t\t\t\taccount\n"
-"  -s, --shell SHELL\t\tthe login shell for the new user account\n"
-"  -u, --uid UID\t\t\tforce use the UID for the new user account\n"
+"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+"                                home directory\n"
+"  -c, --comment COMMENT         set the GECOS field for the new user "
+"account\n"
+"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+"  -D, --defaults                print or save modified default useradd\n"
+"                                configuration\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP for the new user account\n"
+"  -G, --groups GROUPS           list of supplementary groups for the new\n"
+"                                user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -m, --create-home             create home directory for the new user\n"
+"                                account\n"
+"  -o, --non-unique              allow create user with duplicate\n"
+"                                (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new user\n"
+"                                account\n"
+"  -s, --shell SHELL             the login shell for the new user account\n"
+"  -u, --uid UID                 force use the UID for the new user account\n"
 "\n"
 msgstr ""
 "उपयोग: useradd [options] LOGIN\n"
@@ -1812,14 +1817,15 @@
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: चेतावनी: CREATE_HOME समर्थित छैन, कृपया सट्टामा -m प्रयोग गर्नुहोस् ।\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: userdel [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce removal of files, even if not owned by user\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -r, --remove\t\t\tremove home directory and mail spool\n"
+"  -f, --force                   force removal of files,\n"
+"                                even if not owned by user\n"
+"  -h, --help                    display this help message and exit\n"
+"  -r, --remove                  remove home directory and mail spool\n"
 "\n"
 msgstr ""
 "उपयोग: userdel [options] LOGIN\n"
@@ -1891,26 +1897,26 @@
 "Usage: usermod [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -c, --comment COMMENT\t\tnew value of the GECOS field\n"
-"  -d, --home HOME_DIR\t\tnew home directory for the user account\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP as new primary group\n"
-"  -G, --groups GROUPS\t\tnew list of supplementary GROUPS\n"
-"  -a, --append\t\tappend the user to the supplemental GROUPS\n"
-"\t\t\t\tmentioned by the -G option without removing\n"
-"\t\t\t\thim/her from other groups\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --login NEW_LOGIN\t\tnew value of the login name\n"
-"  -L, --lock\t\t\tlock the user account\n"
-"  -m, --move-home\t\tmove contents of the home directory to the new\n"
-"\t\t\t\tlocation (use only with -d)\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new password\n"
-"  -s, --shell SHELL\t\tnew login shell for the user account\n"
-"  -u, --uid UID\t\t\tnew UID for the user account\n"
-"  -U, --unlock\t\t\tunlock the user account\n"
+"  -c, --comment COMMENT         new value of the GECOS field\n"
+"  -d, --home HOME_DIR           new home directory for the user account\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP as new primary group\n"
+"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+"  -a, --append                  append the user to the supplemental GROUPS\n"
+"                                mentioned by the -G option without removing\n"
+"                                him/her from other groups\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --login NEW_LOGIN         new value of the login name\n"
+"  -L, --lock                    lock the user account\n"
+"  -m, --move-home               move contents of the home directory to the\n"
+"                                new location (use only with -d)\n"
+"  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
+"  -u, --uid UID                 new UID for the user account\n"
+"  -U, --unlock                  unlock the user account\n"
 "\n"
 msgstr ""
 "उपयोगिता: usermod [options] LOGIN\n"
@@ -1999,16 +2005,16 @@
 msgid "failed to rename mailbox"
 msgstr "मेल बक्सलाई पुन:नामकरण गर्न असफल भयो"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
-"  -g, --group\t\t\tedit group database\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -p, --passwd\t\t\tedit passwd database\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -s, --shadow\t\t\tedit shadow or gshadow database\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
 "\n"
 msgstr ""
 "उपयोग: vipw [options]\n"

Modified: upstream/trunk/po/nl.po
===================================================================
--- upstream/trunk/po/nl.po	2007-11-24 22:41:24 UTC (rev 1460)
+++ upstream/trunk/po/nl.po	2007-11-25 20:21:53 UTC (rev 1461)
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 12:26+0100\n"
-"PO-Revision-Date: 2006-11-03 12:21+0100\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"PO-Revision-Date: 2007-11-25 21:11+0100\n"
 "Last-Translator: Bart Cornelis <cobaco at skolelinux.no>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -200,35 +200,35 @@
 "Usage: chage [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -d, --lastday LAST_DAY\tset last password change to LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -I, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --list\t\t\tshow account aging information\n"
-"  -m, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
+"  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+"  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -h, --help                    display this help message and exit\n"
+"  -I, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --list                    show account aging information\n"
+"  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
+"  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 "\n"
 msgstr ""
 "Gebruik: chage [opties] [GEBRUIKERSNAAM]\n"
 "\n"
 "Opties:\n"
-"  -d, --lastday LAATSTE_DAG\tstel 'laatste wachtwoordaanpassing' in op\n"
-"\t\t\t\tLAATSTE_DAG\n"
-"  -E, --expiredate VERVALDATUM\tstel account-vervaldatum in op VERVALDATUM\n"
-"  -h, --help\t\t\tgeef deze boodschap weer en sluit af\n"
-"  -I, --inactive INACTIEF\tstel 'wachtwoord inactief na vervaldatum' in op\n"
-"\t\t\t\tINACTIEF\n"
-"  -l, --list\t\t\tgeef account-verouderingsinformatie weer\n"
-"  -m, --mindays MIN_DAGEN\tstel minimum aantal dagen tussen\n"
-"\t\t\t\twachtwoordaanpassingen in op MIN_DAGEN\n"
-"  -M, --maxdays MAX_DAGEN\tstel maximum aantal dagen tussen\n"
-"\t\t\t\twachtwoordaanpassingen in op MAX_DAGEN\n"
-"  -W, --warndays WAARSCH_DAGEN\tstel aantal dagen met waarschuwing voor\n"
-"\t\t\t\tvervallen account in op WAARSCH_DAGEN\n"
+"  -d, --lastday LAATSTE_DAG     stel 'laatste wachtwoordaanpassing' in op\n"
+"                                LAATSTE_DAG\n"
+"  -E, --expiredate VERVALDATUM  stel account-vervaldatum in op VERVALDATUM\n"
+"  -h, --help                    geef deze boodschap weer en sluit af\n"
+"  -I, --inactive INACTIEF       stel 'wachtwoord inactief na vervaldatum'\n"
+"                                in op INACTIEF\n"
+"  -l, --list                    geef account-verouderingsinformatie weer\n"
+"  -m, --mindays MIN_DAGEN       stel minimum aantal dagen tussen\n"
+"                                wachtwoordaanpassingen in op MIN_DAGEN\n"
+"  -M, --maxdays MAX_DAGEN       stel maximum aantal dagen tussen\n"
+"                                wachtwoordaanpassingen in op MAX_DAGEN\n"
+"  -W, --warndays WAARSCH_DAGEN  stel aantal dagen met waarschuwing voor\n"
+"                                vervallen account in op WAARSCH_DAGEN\n"
 "\n"
 
 #, c-format
@@ -467,22 +467,24 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
+"  -e, --encrypted               supplied passwords are encrypted\n"
+"  -h, --help                    display this help message and exit\n"
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
 "%s\n"
 msgstr ""
 "Gebruik: chpasswd [opties]\n"
 "\n"
 "Opties:\n"
-"  -e, --encrypted\topgegeven wachtwoorden zijn versleuteld\n"
-"  -h, --help\t\ttoon dit bericht en sluit af\n"
-"  -m, --md5\t\tmaak gebruik van MD5-versleuteling i.p.v. DES wanneer\n"
-"\t\t\topgegeven wachtwoorden niet versleuteld zijn\n"
+"  -e, --encrypted     opgegeven wachtwoorden zijn versleuteld\n"
+"  -h, --help          toon dit bericht en sluit af\n"
+"  -m, --md5           maak gebruik van MD5-versleuteling i.p.v. DES wanneer\n"
+"                      opgegeven wachtwoorden niet versleuteld zijn\n"
 
 msgid ""
-"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+"  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+"                                crypt algorithms\n"
 msgstr ""
 
 #, c-format
@@ -562,15 +564,15 @@
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -h, --help\t\t\t\tdisplay this help message and exit\n"
-"  -s, --shell SHELL\t\t\tnew login shell for the user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
 "\n"
 msgstr ""
 "Gebruik: chsh [opties] GEBRUIKERSNAAM\n"
 "\n"
 "Opties:\n"
-"  -h, --help\t\t\t\ttoon deze boodschap en sluit af\n"
-"  -r, --shell SHELL\t\t\tnieuwe aanmeld-shell voor gebruikersaccount\n"
+"  -h, --help                    toon deze boodschap en sluit af\n"
+"  -r, --shell SHELL             nieuwe aanmeld-shell voor gebruikersaccount\n"
 "\n"
 
 msgid "Login Shell"
@@ -605,31 +607,34 @@
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\tdisplay faillog records for all users\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n"
-"  -m, --maximum MAX\t\tset maximum failed login counters to MAX\n"
-"  -r, --reset\t\t\treset the counters of login failures\n"
-"  -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n"
-"  -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n"
-"\t\t\t\tand limits (if used with -r, -m or -l options) only\n"
-"\t\t\t\tfor user with LOGIN\n"
+"  -a, --all                     display faillog records for all users\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"seconds\n"
+"  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+"  -r, --reset                   reset the counters of login failures\n"
+"  -t, --time DAYS               display faillog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m or -"
+"l\n"
+"                                options) only for user with LOGIN\n"
 "\n"
 msgstr ""
 "Gebruik: faillog [opties]\n"
 "\n"
 "Opties:\n"
-"  -a, --all\t\t\ttoon de faillog-records van alle gebruikers\n"
-"  -h, --help\t\t\ttoon dit bericht en sluit af\n"
-"  -l, --lock-time SEC\t\tBevries accounts SEC seconden na mislukt aanmelden\n"
-"  -m, --maximum MAX\t\tstel maximaal aantal mislukte aanmeldingen in op MAX\n"
-"  -r, --reset\t\t\therbegin de tellers voor mislukte aanmeldingen\n"
-"  -t, --time AANTAL\t\t\tgeef alle faillog records van de laatste AANTAL\n"
-"\t\t\t\tdagen weer\n"
-"   -u, --user LOGIN\t\tgeef faillog-record weer en onderhoud mislukking-\n"
-"\t\t\t\ttellers en limieten (indien de -r, -m or -l opties gebruikt "
-"worden),\n"
-"\t\t\t\tmaar enkel voor gebruiker LOGIN\n"
+"  -a, --all             toon de faillog-records van alle gebruikers\n"
+"  -h, --help            toon dit bericht en sluit af\n"
+"  -l, --lock-time SEC   Bevries accounts SEC seconden na mislukt aanmelden\n"
+"  -m, --maximum MAX     stel maximaal aantal mislukte aanmeldingen in op "
+"MAX\n"
+"  -r, --reset           herbegin de tellers voor mislukte aanmeldingen\n"
+"  -t, --time AANTAL     geef alle faillog records van de laatste AANTAL\n"
+"                        dagen weer\n"
+"   -u, --user LOGIN     geef faillog-record weer en onderhoud mislukking-\n"
+"                        tellers en limieten (indien de -r, -m or -l opties\n"
+"                        gebruikt worden), maar enkel voor gebruiker LOGIN\n"
 "\n"
 
 #, c-format
@@ -758,26 +763,26 @@
 "Usage: groupadd [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce exit with success status if the specified\n"
-"\t\t\t\tgroup already exists\n"
-"  -g, --gid GID\t\t\tuse GID for the new group\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -o, --non-unique\t\tallow create group with duplicate\n"
-"\t\t\t\t(non-unique) GID\n"
+"  -f, --force                   force exit with success status if the\n"
+"                                specified group already exists\n"
+"  -g, --gid GID                 use GID for the new group\n"
+"  -h, --help                    display this help message and exit\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -o, --non-unique              allow create group with duplicate\n"
+"                                (non-unique) GID\n"
 "\n"
 msgstr ""
 "Gebruik: groupadd [opties] GROEP\n"
 "\n"
 "Opties:\n"
-"  -f, --force\t\t\tsuccesvolle afsluitstatus afdwingen ook als de\n"
-"\t\t\t\topgegeven groep reeds bestaat\n"
-"  -g, --gid GID\t\t\tnieuwe groep krijgt de opgegeven GID\n"
-"  -h, --help\t\t\tgeef deze boodschap weer en sluit af\n"
-"  -K, --key SLEUTEL=WAARDE\toverstijgt standaardwaarden\n"
-"\t\t\t\tuit /etc/login.defs\n"
-"  -o, --non-unique\t\tlaat aanmaken van groep met dubbele\n"
-"\t\t\t\t(niet-unieke) GID toe\n"
+"  -f, --force                   succesvolle afsluitstatus afdwingen ook\n"
+"                                als de opgegeven groep reeds bestaat\n"
+"  -g, --gid GID                 nieuwe groep krijgt de opgegeven GID\n"
+"  -h, --help                    geef deze boodschap weer en sluit af\n"
+"  -K, --key SLEUTEL=WAARDE      overstijgt standaardwaarden\n"
+"                                uit /etc/login.defs\n"
+"  -o, --non-unique              laat aanmaken van groep met dubbele\n"
+"                                (niet-unieke) GID toe\n"
 "\n"
 
 #, c-format
@@ -907,20 +912,21 @@
 "Usage: groupmod [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -g, --gid GID\t\t\tforce use new GID by GROUP\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -n, --new-name NEW_GROUP\tforce use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) GID by GROUP\n"
+"  -g, --gid GID                 force use new GID by GROUP\n"
+"  -h, --help                    display this help message and exit\n"
+"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+"  -o, --non-unique              allow using duplicate (non-unique) GID by "
+"GROUP\n"
 "\n"
 msgstr ""
 "Gebruik: groupmod [opties] GROEP\n"
 "\n"
 "Opties:\n"
-"  -g, --gid GID\t\t\tgroep krijgt deze nieuwe GID\n"
-"  -h, --help\t\t\tgeef deze boodschap weer en sluit af\n"
-"  -n, --new-name NIEUWE_NAAM\tgroep krijgt deze nieuwe naam\n"
-"  -o, --non-unique\t\tlaat aanmaken van groep met dubbele\n"
-"\t\t\t\t(niet-unieke) GID toe\n"
+"  -g, --gid GID                 groep krijgt deze nieuwe GID\n"
+"  -h, --help                    geef deze boodschap weer en sluit af\n"
+"  -n, --new-name NIEUWE_NAAM    groep krijgt deze nieuwe naam\n"
+"  -o, --non-unique              laat aanmaken van groep met dubbele\n"
+"                                (niet-unieke) GID toe\n"
 "\n"
 
 #, c-format
@@ -1072,20 +1078,22 @@
 "Usage: lastlog [options]\n"
 "\n"
 "Options:\n"
-"  -b, --before DAYS\tprint only lastlog records older than DAYS\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -t, --time DAYS\tprint only lastlog records more recent than DAYS\n"
-"  -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n"
+"  -b, --before DAYS             print only lastlog records older than DAYS\n"
+"  -h, --help                    display this help message and exit\n"
+"  -t, --time DAYS               print only lastlog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 "\n"
 msgstr ""
 "Gebruik: lastlog [opties]\n"
 "\n"
 "Opties:\n"
-"  -b, --before DAGEN\ttoon enkel de lastlog-ingangen die ouder zijn dan\n"
-"\t\t\t\tDAGEN\n"
-"  -h, --help\t\ttoon dit bericht en sluit af\n"
-"  -t, --time DAGEN\tprint enkel lastlog-records van de laatste DAGEN dagen\n"
-"  -u, --user LOGIN\tprint het lastlog-record van de gebruiker LOGIN\n"
+"  -b, --before DAGEN  toon enkel de lastlog-ingangen die ouder zijn dan\n"
+"                      DAGEN\n"
+"  -h, --help          toon dit bericht en sluit af\n"
+"  -t, --time DAGEN    print enkel lastlog-records van de laatste DAGEN "
+"dagen\n"
+"  -u, --user LOGIN    print het lastlog-record van de gebruiker LOGIN\n"
 "\n"
 
 #, c-format
@@ -1237,14 +1245,10 @@
 msgid ""
 "Usage: %s [options] [input]\n"
 "\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
 "%s\n"
 msgstr ""
 
-msgid ""
-"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
-msgstr ""
-
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: kan /etc/passwd niet vergrendelen.\n"
@@ -1298,47 +1302,53 @@
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\treport password status on all accounts\n"
-"  -d, --delete\t\t\tdelete the password for the named account\n"
-"  -e, --expire\t\t\tforce expire the password for the named account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --keep-tokens\t\tchange password only if expired\n"
-"  -i, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --lock\t\t\tlock the named account\n"
-"  -n, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -r, --repository REPOSITORY\tchange password in REPOSITORY repository\n"
-"  -S, --status\t\t\treport password status on the named account\n"
-"  -u, --unlock\t\t\tunlock the named account\n"
-"  -w, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
+"  -a, --all                     report password status on all accounts\n"
+"  -d, --delete                  delete the password for the named account\n"
+"  -e, --expire                  force expire the password for the named "
+"account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --keep-tokens             change password only if expired\n"
+"  -i, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --lock                    lock the named account\n"
+"  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -q, --quiet                   quiet mode\n"
+"  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+"  -S, --status                  report password status on the named account\n"
+"  -u, --unlock                  unlock the named account\n"
+"  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
 "Gebruik: passwd [opties] [GEBRUIKERSNAAM]\n"
 "\n"
 "Opties:\n"
-"  -a, --all\t\t\tgeef wachtwoordstatus van alle accounts weer\n"
-"  -d, --delete\t\t\tverwijder het wachtwoord voor de genoemde account\n"
-"  -e, --expire\t\t\tdoe het wachtwoord vervallen voor de genoemde account\n"
-"  -h, --help\t\t\ttoon deze boodschap en sluit af\n"
-"  -k, --keep-tokens\t\tverander wachtwoord indien het vervallen is\n"
-"  -i, --inactive INACTIEF\tmaak wachtwoord inactief als INACTIEF wanneer\n"
-"\t\t\t\thet vervalt\n"
-"  -l, --lock\t\t\tvergrendel de genoemde account\n"
-"  -n, --mindays MIN_DAGEN\tstel het minimum aantal dagen voor\n"
-"\t\t\t\tveranderen van het wachtwoord in op MIN_DAGEN\n"
-"  -q, --quiet\t\t\tstille modus\n"
-"  -r, --repository REPOSITORY\tverander wachtwoord in REPOSITORY "
+"  -a, --all                     geef wachtwoordstatus van alle accounts "
+"weer\n"
+"  -d, --delete                  verwijder het wachtwoord voor de\n"
+"                                genoemde account\n"
+"  -e, --expire                  doe het wachtwoord vervallen voor de\n"
+"                                genoemde account\n"
+"  -h, --help                    toon deze boodschap en sluit af\n"
+"  -k, --keep-tokens             verander wachtwoord indien het vervallen is\n"
+"  -i, --inactive INACTIEF       maak wachtwoord inactief als INACTIEF\n"
+"                                wanneer het vervalt\n"
+"  -l, --lock                    vergrendel de genoemde account\n"
+"  -n, --mindays MIN_DAGEN       stel het minimum aantal dagen voor\n"
+"                                veranderen van het wachtwoord in op "
+"MIN_DAGEN\n"
+"  -q, --quiet                   stille modus\n"
+"  -r, --repository REPOSITORY   verander wachtwoord in REPOSITORY "
 "opslagplaats\n"
-"  -S, --status\t\t\tgeef de wachtwoordstatus van de genoemde account weer\n"
-"  -u, --unlock\t\t\tontgrendel de genoemde account\n"
-"  -w, --warndays WAARSCH_DAGEN\tstel het aantal dagen met waarschuwing in\n"
-"\t\t\t\top WAARSCH_DAGEN\n"
-"  -x, --maxdays MAX_DAGEN\tstel het maximum aantal dagen voor\n"
-"\t\t\t\twachtwoordverandering in op MAX_DAGEN\n"
+"  -S, --status                  geef de wachtwoordstatus van de genoemde\n"
+"                                account weer\n"
+"  -u, --unlock                  ontgrendel de genoemde account\n"
+"  -w, --warndays WAARSCH_DAGEN  stel het aantal dagen met waarschuwing in\n"
+"                                op WAARSCH_DAGEN\n"
+"  -x, --maxdays MAX_DAGEN       stel het maximum aantal dagen voor\n"
+"                                wachtwoordverandering in op MAX_DAGEN\n"
 "\n"
 
 msgid "Old password: "
@@ -1525,26 +1535,26 @@
 "Usage: su [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -, -l, --login\t\tmake the shell a login shell\n"
+"  -c, --command COMMAND         pass COMMAND to the invoked shell\n"
+"  -h, --help                    display this help message and exit\n"
+"  -, -l, --login                make the shell a login shell\n"
 "  -m, -p,\n"
-"  --preserve-environment\tdo not reset environment variables, and keep\n"
-"\t\t\t\tthe same shell\n"
-"  -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n"
+"  --preserve-environment        do not reset environment variables, and\n"
+"                                keep the same shell\n"
+"  -s, --shell SHELL             use SHELL instead of the default in passwd\n"
 "\n"
 msgstr ""
 "Gebruik: su [opties] [gebruikersnaam]\n"
 "\n"
 "Opties:\n"
-"  -c, --command COMMANDO\tgeef COMMANDO mee aan de aangeroepen shell\n"
-"  -h, --help\t\t\ttoon deze boodschap en sluit af\n"
-"  -, -l, --login\t\tmaak de shell een aanmeld-shell\n"
+"  -c, --command COMMANDO        geef COMMANDO mee aan de aangeroepen shell\n"
+"  -h, --help                    toon deze boodschap en sluit af\n"
+"  -, -l, --login                maak de shell een aanmeld-shell\n"
 "  -m, -p,\n"
-"  --preserve-environment\tstel de omgevingsvariabelen niet opnieuw in, en\n"
-"\t\t\t\tbehoud dezelfde shell\n"
-"  -s, --shell SHELL\t\tgebruik SHELL i.p.v. de standaardshell opgegeven in\n"
-"\t\t\t\t/etc/passwd\n"
+"  --preserve-environment        stel de omgevingsvariabelen niet opnieuw\n"
+"                                in, en behoud dezelfde shell\n"
+"  -s, --shell SHELL             gebruik SHELL i.p.v. de standaardshell\n"
+"                                opgegeven in /etc/passwd\n"
 "\n"
 
 #, c-format
@@ -1631,61 +1641,64 @@
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR\tbase directory for the new user account\n"
-"\t\t\t\thome directory\n"
-"  -c, --comment COMMENT\t\tset the GECOS field for the new user account\n"
-"  -d, --home-dir HOME_DIR\thome directory for the new user account\n"
-"  -D, --defaults\t\tprint or save modified default useradd\n"
-"\t\t\t\tconfiguration\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP for the new user account\n"
-"  -G, --groups GROUPS\t\tlist of supplementary groups for the new\n"
-"\t\t\t\tuser account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --skel SKEL_DIR\t\tspecify an alternative skel directory\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -m, --create-home\t\tcreate home directory for the new user\n"
-"\t\t\t\taccount\n"
-"  -o, --non-unique\t\tallow create user with duplicate\n"
-"\t\t\t\t(non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new user\n"
-"\t\t\t\taccount\n"
-"  -s, --shell SHELL\t\tthe login shell for the new user account\n"
-"  -u, --uid UID\t\t\tforce use the UID for the new user account\n"
+"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+"                                home directory\n"
+"  -c, --comment COMMENT         set the GECOS field for the new user "
+"account\n"
+"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+"  -D, --defaults                print or save modified default useradd\n"
+"                                configuration\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP for the new user account\n"
+"  -G, --groups GROUPS           list of supplementary groups for the new\n"
+"                                user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -m, --create-home             create home directory for the new user\n"
+"                                account\n"
+"  -o, --non-unique              allow create user with duplicate\n"
+"                                (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new user\n"
+"                                account\n"
+"  -s, --shell SHELL             the login shell for the new user account\n"
+"  -u, --uid UID                 force use the UID for the new user account\n"
 "\n"
 msgstr ""
 "Gebruik: useradd [opties] GEBRUIKERSNAAM\n"
 "\n"
 "Opties:\n"
-"  -b, --base-dir BASIS_MAP\tbasismap voor de thuismap van de nieuwe\n"
-"\t\t\t\tgebruikersaccount\n"
-"  -c, --comment OPMERKING\tstel het GECOS-veld voor de nieuwe\n"
-"\t\t\t\tgebruikersaccount in\n"
-"  -d, --home-dir THUIS_MAP\tthuismap voor de nieuwe gebruikersaccount\n"
-"  -D, --defaults\t\tprint de aangepaste useradd-configuratie, of sla\n"
-"\t\t\t\tdeze op\n"
-"  -e, --expiredate VERVALDATUM\tstel de vervaldatum in op VERVALDATUM\n"
-"  -f, --inactive INACTIVE\tstel het 'wachtwoord inactief na verval' in op\n"
-"\t\t\t\tINACTIEF\n"
-"  -g, --gid GROEP\t\tdwing gebruik van GROEP voor de nieuwe\n"
-"\t\t\t\tgebruikersaccount af\n"
-"  -G, --groups GROEPEN\t\tlijst met aanvullende groepen voor de\n"
-"\t\t\t\tgebruikersaccount\n"
-"  -h, --help\t\t\tgeef deze boodschap weer en sluit af\n"
-"  -k, --skel SKEL_MAP\t\tgebruik een alternatief map-skelet\n"
-"  -K, --key SLEUTEL=WAARDE\toverstijg de standaardwaarden uit\n"
-"\t\t\t\t/etc/login.defs\n"
-"  -m, --create-home\t\tmaak een thuismap aan voor de nieuwe\n"
-"\t\t\t\tgebruikersaccount\n"
-"  -o, --non-unique\t\tlaat het aanmaken van gebruikersaccounts met een\n"
-"\t\t\t\tdubbele (niet-unieke) UID toe\n"
-"  -p, --password WACHTWOORD\tgebruik versleuteld wachtwoord voor de nieuwe\n"
-"\t\t\t\tgebruikersaccount\n"
-"  -s, --shell SHELL\t\tgebruik gegeven shell als aanmeld-shell voor de\n"
-"\t\t\t\tgebruikersaccount\n"
-"  -u, --uid UID\t\t\tgebruik UID voor de nieuwe gebruikersaccount\n"
+"  -b, --base-dir BASIS_MAP      basismap voor de thuismap van de nieuwe\n"
+"                                gebruikersaccount\n"
+"  -c, --comment OPMERKING       stel het GECOS-veld voor de nieuwe\n"
+"                                gebruikersaccount in\n"
+"  -d, --home-dir THUIS_MAP      thuismap voor de nieuwe gebruikersaccount\n"
+"  -D, --defaults                print de aangepaste useradd-configuratie,\n"
+"                                of sla deze op\n"
+"  -e, --expiredate VERVALDATUM  stel de vervaldatum in op VERVALDATUM\n"
+"  -f, --inactive INACTIVE       stel het 'wachtwoord inactief na verval'\n"
+"                                in op INACTIEF\n"
+"  -g, --gid GROEP               dwing gebruik van GROEP voor de nieuwe\n"
+"                                gebruikersaccount af\n"
+"  -G, --groups GROEPEN          lijst met aanvullende groepen voor de\n"
+"                                gebruikersaccount\n"
+"  -h, --help                    geef deze boodschap weer en sluit af\n"
+"  -k, --skel SKEL_MAP           gebruik een alternatief map-skelet\n"
+"  -K, --key SLEUTEL=WAARDE      overstijg de standaardwaarden uit\n"
+"                                /etc/login.defs\n"
+"  -m, --create-home             maak een thuismap aan voor de nieuwe\n"
+"                                gebruikersaccount\n"
+"  -o, --non-unique              laat het aanmaken van gebruikersaccounts\n"
+"                                met een dubbele (niet-unieke) UID toe\n"
+"  -p, --password WACHTWOORD     gebruik versleuteld wachtwoord voor de\n"
+"                                nieuwe gebruikersaccount\n"
+"  -s, --shell SHELL             gebruik gegeven shell als aanmeld-shell\n"
+"                                voor de gebruikersaccount\n"
+"  -u, --uid UID                 gebruik UID voor de nieuwe "
+"gebruikersaccount\n"
+"\n"
 
 #, fuzzy, c-format
 msgid "%s: Out of memory. Cannot update the group database.\n"
@@ -1834,18 +1847,21 @@
 "Usage: userdel [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce removal of files, even if not owned by user\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -r, --remove\t\t\tremove home directory and mail spool\n"
+"  -f, --force                   force removal of files,\n"
+"                                even if not owned by user\n"
+"  -h, --help                    display this help message and exit\n"
+"  -r, --remove                  remove home directory and mail spool\n"
 "\n"
 msgstr ""
 "Gebruik: userdel [opties] GEBRUIKERSNAAM\n"
 "\n"
 "Opties:\n"
-"  -f, --force\t\t\tdwing verwijderen van bestanden af,\n"
-"\t\t\t\took wanneer de gebruiker niet de eigenaar is\n"
-"  -h, --help\t\t\ttoon deze helbboodschap en sluit af\n"
-"  -r, --remove\t\t\tverwijder de thuismap en het mailbox-bestand\n"
+"  -f, --force                   dwing verwijderen van bestanden af,\n"
+"                                ook wanneer de gebruiker niet de eigenaar "
+"is\n"
+"  -h, --help                    toon deze helbboodschap en sluit af\n"
+"  -r, --remove                  verwijder de thuismap en het mailbox-"
+"bestand\n"
 "\n"
 
 #, c-format
@@ -1913,51 +1929,54 @@
 "Usage: usermod [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -c, --comment COMMENT\t\tnew value of the GECOS field\n"
-"  -d, --home HOME_DIR\t\tnew home directory for the user account\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP as new primary group\n"
-"  -G, --groups GROUPS\t\tnew list of supplementary GROUPS\n"
-"  -a, --append\t\tappend the user to the supplemental GROUPS\n"
-"\t\t\t\tmentioned by the -G option without removing\n"
-"\t\t\t\thim/her from other groups\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --login NEW_LOGIN\t\tnew value of the login name\n"
-"  -L, --lock\t\t\tlock the user account\n"
-"  -m, --move-home\t\tmove contents of the home directory to the new\n"
-"\t\t\t\tlocation (use only with -d)\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new password\n"
-"  -s, --shell SHELL\t\tnew login shell for the user account\n"
-"  -u, --uid UID\t\t\tnew UID for the user account\n"
-"  -U, --unlock\t\t\tunlock the user account\n"
+"  -c, --comment COMMENT         new value of the GECOS field\n"
+"  -d, --home HOME_DIR           new home directory for the user account\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP as new primary group\n"
+"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+"  -a, --append                  append the user to the supplemental GROUPS\n"
+"                                mentioned by the -G option without removing\n"
+"                                him/her from other groups\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --login NEW_LOGIN         new value of the login name\n"
+"  -L, --lock                    lock the user account\n"
+"  -m, --move-home               move contents of the home directory to the\n"
+"                                new location (use only with -d)\n"
+"  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
+"  -u, --uid UID                 new UID for the user account\n"
+"  -U, --unlock                  unlock the user account\n"
 "\n"
 msgstr ""
 "Gebruik: usermod [opties] GEBRUIKERSNAAM\n"
 "\n"
 "Opties:\n"
-"  -a, --append GROEP\t\tvoeg gebruiker toe aan de extra groep GROEP\n"
-"  -c, --comment OPMERKING\tde nieuwe waarde voor het GECOS-veld\n"
-"  -d, --home-dir THUIS_MAP\tnieuwe thuismap voor de gebruikersaccount\n"
-"  -e, --expiredate VERVALDATUM\tstel de vervaldatum in op VERVALDATUM\n"
-"  -f, --inactive INACTIEF\tstel het 'wachtwoord inactief na verval' in op\n"
-"\t\t\t\tINACTIEF\n"
-"  -g, --gid GROEP\t\tdwing gebruik van GROEP af als de nieuwe aanmeldgroep\n"
-"  -G, --groups GROEPEN\t\tlijst met aanvullende groepen\n"
-"  -h, --help\t\t\tgeef deze boodschap weer en sluit af\n"
-"  -l, --login GEBRUIKERSNAAM\tnieuwe gebruikersnaam\n"
-"  -L, --lock\t\t\tvergrendel de gebruikersaccount\n"
-"  -m, --move-home\t\tverplaats de thuismap naar een nieuwe locatie\n"
-"\t\t\t\t(enkel gebruiken in combinatie met optie -d)\n"
-"  -o, --non-unique\t\tlaat dubbele (niet-unieke) UID toe\n"
-"  -p, --password WACHTWOORD\tgebruik versleuteld wachtwoord als het nieuwe\n"
-"\t\t\t\twachtwoord\n"
-"  -s, --shell SHELL\t\tgebruik gegeven shell als aanmeld-shell voor de\n"
-"\t\t\t\tgebruikersaccount\n"
-"  -u, --uid UID\t\t\tnieuwe UID voor de gebruikersaccount\n"
-"  -U, --unlock\t\t\tontgrendel de gebruikersaccount\n"
+"  -a, --append GROEP            voeg gebruiker toe aan de extra groep GROEP\n"
+"  -c, --comment OPMERKING       de nieuwe waarde voor het GECOS-veld\n"
+"  -d, --home-dir THUIS_MAP      nieuwe thuismap voor de gebruikersaccount\n"
+"  -e, --expiredate VERVALDATUM  stel de vervaldatum in op VERVALDATUM\n"
+"  -f, --inactive INACTIEF       stel het 'wachtwoord inactief na verval'\n"
+"                                in op INACTIEF\n"
+"  -g, --gid GROEP               dwing gebruik van GROEP af als de nieuwe\n"
+"                                aanmeldgroep\n"
+"  -G, --groups GROEPEN          lijst met aanvullende groepen\n"
+"  -h, --help                    geef deze boodschap weer en sluit af\n"
+"  -l, --login GEBRUIKERSNAAM    nieuwe gebruikersnaam\n"
+"  -L, --lock                    vergrendel de gebruikersaccount\n"
+"  -m, --move-home               verplaats de thuismap naar een nieuwe "
+"locatie\n"
+"                                (enkel gebruiken in combinatie met optie -"
+"d)\n"
+"  -o, --non-unique              laat dubbele (niet-unieke) UID toe\n"
+"  -p, --password WACHTWOORD     gebruik versleuteld wachtwoord als het\n"
+"                                nieuwe wachtwoord\n"
+"  -s, --shell SHELL             gebruik gegeven shell als aanmeld-shell\n"
+"                                voor de gebruikersaccount\n"
+"  -u, --uid UID                 nieuwe UID voor de gebruikersaccount\n"
+"  -U, --unlock                  ontgrendel de gebruikersaccount\n"
 "\n"
 
 #, fuzzy, c-format
@@ -2028,21 +2047,22 @@
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
-"  -g, --group\t\t\tedit group database\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -p, --passwd\t\t\tedit passwd database\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -s, --shadow\t\t\tedit shadow or gshadow database\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
 "\n"
 msgstr ""
 "Gebruik: vipw [opties]\n"
 "\n"
 "Opties:\n"
-"  -g, --group\t\t\tde groepdatabase bewerken\n"
-"  -h, --help\t\t\ttoon deze boodschap en sluit af\n"
-"  -p, --passwd\t\t\tpasswd-database bewerken\n"
-"  -q, --quiet\t\t\tstille modus\n"
-"  -s, --shadow\t\t\tshadow- of gshadow-database bewerken\n"
+"  -g, --group                   de groepdatabase bewerken\n"
+"  -h, --help                    toon deze boodschap en sluit af\n"
+"  -p, --passwd                  passwd-database bewerken\n"
+"  -q, --quiet                   stille modus\n"
+"  -s, --shadow                  shadow- of gshadow-database bewerken\n"
+"\n"
 
 #, c-format
 msgid ""

Modified: upstream/trunk/po/nn.po
===================================================================
--- upstream/trunk/po/nn.po	2007-11-24 22:41:24 UTC (rev 1460)
+++ upstream/trunk/po/nn.po	2007-11-25 20:21:53 UTC (rev 1461)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: shadow\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 12:26+0100\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
 "PO-Revision-Date: 2004-06-03 21:41+0200\n"
 "Last-Translator: Håvard Korsvoll <korsvoll at skulelinux.no>\n"
 "Language-Team: Norwegian (Nynorsk) <i18n-nn at lister.ping.uio.no>\n"
@@ -195,17 +195,17 @@
 "Usage: chage [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -d, --lastday LAST_DAY\tset last password change to LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -I, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --list\t\t\tshow account aging information\n"
-"  -m, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
+"  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+"  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -h, --help                    display this help message and exit\n"
+"  -I, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --list                    show account aging information\n"
+"  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
+"  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 "\n"
 msgstr ""
 
@@ -443,15 +443,17 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
+"  -e, --encrypted               supplied passwords are encrypted\n"
+"  -h, --help                    display this help message and exit\n"
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
 "%s\n"
 msgstr ""
 
 msgid ""
-"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+"  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+"                                crypt algorithms\n"
 msgstr ""
 
 #, fuzzy, c-format
@@ -531,8 +533,8 @@
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -h, --help\t\t\t\tdisplay this help message and exit\n"
-"  -s, --shell SHELL\t\t\tnew login shell for the user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
 "\n"
 msgstr ""
 
@@ -568,15 +570,18 @@
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\tdisplay faillog records for all users\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n"
-"  -m, --maximum MAX\t\tset maximum failed login counters to MAX\n"
-"  -r, --reset\t\t\treset the counters of login failures\n"
-"  -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n"
-"  -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n"
-"\t\t\t\tand limits (if used with -r, -m or -l options) only\n"
-"\t\t\t\tfor user with LOGIN\n"
+"  -a, --all                     display faillog records for all users\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"seconds\n"
+"  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+"  -r, --reset                   reset the counters of login failures\n"
+"  -t, --time DAYS               display faillog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m or -"
+"l\n"
+"                                options) only for user with LOGIN\n"
 "\n"
 msgstr ""
 
@@ -706,13 +711,13 @@
 "Usage: groupadd [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce exit with success status if the specified\n"
-"\t\t\t\tgroup already exists\n"
-"  -g, --gid GID\t\t\tuse GID for the new group\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -o, --non-unique\t\tallow create group with duplicate\n"
-"\t\t\t\t(non-unique) GID\n"
+"  -f, --force                   force exit with success status if the\n"
+"                                specified group already exists\n"
+"  -g, --gid GID                 use GID for the new group\n"
+"  -h, --help                    display this help message and exit\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -o, --non-unique              allow create group with duplicate\n"
+"                                (non-unique) GID\n"
 "\n"
 msgstr ""
 
@@ -841,10 +846,11 @@
 "Usage: groupmod [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -g, --gid GID\t\t\tforce use new GID by GROUP\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -n, --new-name NEW_GROUP\tforce use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) GID by GROUP\n"
+"  -g, --gid GID                 force use new GID by GROUP\n"
+"  -h, --help                    display this help message and exit\n"
+"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+"  -o, --non-unique              allow using duplicate (non-unique) GID by "
+"GROUP\n"
 "\n"
 msgstr ""
 
@@ -997,10 +1003,11 @@
 "Usage: lastlog [options]\n"
 "\n"
 "Options:\n"
-"  -b, --before DAYS\tprint only lastlog records older than DAYS\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -t, --time DAYS\tprint only lastlog records more recent than DAYS\n"
-"  -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n"
+"  -b, --before DAYS             print only lastlog records older than DAYS\n"
+"  -h, --help                    display this help message and exit\n"
+"  -t, --time DAYS               print only lastlog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 "\n"
 msgstr ""
 
@@ -1155,14 +1162,10 @@
 msgid ""
 "Usage: %s [options] [input]\n"
 "\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
 "%s\n"
 msgstr ""
 
-msgid ""
-"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
-msgstr ""
-
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: klarer ikkje låsa /etc/passwd.\n"
@@ -1216,23 +1219,24 @@
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\treport password status on all accounts\n"
-"  -d, --delete\t\t\tdelete the password for the named account\n"
-"  -e, --expire\t\t\tforce expire the password for the named account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --keep-tokens\t\tchange password only if expired\n"
-"  -i, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --lock\t\t\tlock the named account\n"
-"  -n, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -r, --repository REPOSITORY\tchange password in REPOSITORY repository\n"
-"  -S, --status\t\t\treport password status on the named account\n"
-"  -u, --unlock\t\t\tunlock the named account\n"
-"  -w, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
+"  -a, --all                     report password status on all accounts\n"
+"  -d, --delete                  delete the password for the named account\n"
+"  -e, --expire                  force expire the password for the named "
+"account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --keep-tokens             change password only if expired\n"
+"  -i, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --lock                    lock the named account\n"
+"  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -q, --quiet                   quiet mode\n"
+"  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+"  -S, --status                  report password status on the named account\n"
+"  -u, --unlock                  unlock the named account\n"
+"  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
 
@@ -1418,13 +1422,13 @@
 "Usage: su [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -, -l, --login\t\tmake the shell a login shell\n"
+"  -c, --command COMMAND         pass COMMAND to the invoked shell\n"
+"  -h, --help                    display this help message and exit\n"
+"  -, -l, --login                make the shell a login shell\n"
 "  -m, -p,\n"
-"  --preserve-environment\tdo not reset environment variables, and keep\n"
-"\t\t\t\tthe same shell\n"
-"  -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n"
+"  --preserve-environment        do not reset environment variables, and\n"
+"                                keep the same shell\n"
+"  -s, --shell SHELL             use SHELL instead of the default in passwd\n"
 "\n"
 msgstr ""
 
@@ -1512,29 +1516,30 @@
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR\tbase directory for the new user account\n"
-"\t\t\t\thome directory\n"
-"  -c, --comment COMMENT\t\tset the GECOS field for the new user account\n"
-"  -d, --home-dir HOME_DIR\thome directory for the new user account\n"
-"  -D, --defaults\t\tprint or save modified default useradd\n"
-"\t\t\t\tconfiguration\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP for the new user account\n"
-"  -G, --groups GROUPS\t\tlist of supplementary groups for the new\n"
-"\t\t\t\tuser account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --skel SKEL_DIR\t\tspecify an alternative skel directory\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -m, --create-home\t\tcreate home directory for the new user\n"
-"\t\t\t\taccount\n"
-"  -o, --non-unique\t\tallow create user with duplicate\n"
-"\t\t\t\t(non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new user\n"
-"\t\t\t\taccount\n"
-"  -s, --shell SHELL\t\tthe login shell for the new user account\n"
-"  -u, --uid UID\t\t\tforce use the UID for the new user account\n"
+"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+"                                home directory\n"
+"  -c, --comment COMMENT         set the GECOS field for the new user "
+"account\n"
+"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+"  -D, --defaults                print or save modified default useradd\n"
+"                                configuration\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP for the new user account\n"
+"  -G, --groups GROUPS           list of supplementary groups for the new\n"
+"                                user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -m, --create-home             create home directory for the new user\n"
+"                                account\n"
+"  -o, --non-unique              allow create user with duplicate\n"
+"                                (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new user\n"
+"                                account\n"
+"  -s, --shell SHELL             the login shell for the new user account\n"
+"  -u, --uid UID                 force use the UID for the new user account\n"
 "\n"
 msgstr ""
 
@@ -1679,9 +1684,10 @@
 "Usage: userdel [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce removal of files, even if not owned by user\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -r, --remove\t\t\tremove home directory and mail spool\n"
+"  -f, --force                   force removal of files,\n"
+"                                even if not owned by user\n"
+"  -h, --help                    display this help message and exit\n"
+"  -r, --remove                  remove home directory and mail spool\n"
 "\n"
 msgstr ""
 
@@ -1747,26 +1753,26 @@
 "Usage: usermod [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -c, --comment COMMENT\t\tnew value of the GECOS field\n"
-"  -d, --home HOME_DIR\t\tnew home directory for the user account\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP as new primary group\n"
-"  -G, --groups GROUPS\t\tnew list of supplementary GROUPS\n"
-"  -a, --append\t\tappend the user to the supplemental GROUPS\n"
-"\t\t\t\tmentioned by the -G option without removing\n"
-"\t\t\t\thim/her from other groups\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --login NEW_LOGIN\t\tnew value of the login name\n"
-"  -L, --lock\t\t\tlock the user account\n"
-"  -m, --move-home\t\tmove contents of the home directory to the new\n"
-"\t\t\t\tlocation (use only with -d)\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new password\n"
-"  -s, --shell SHELL\t\tnew login shell for the user account\n"
-"  -u, --uid UID\t\t\tnew UID for the user account\n"
-"  -U, --unlock\t\t\tunlock the user account\n"
+"  -c, --comment COMMENT         new value of the GECOS field\n"
+"  -d, --home HOME_DIR           new home directory for the user account\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP as new primary group\n"
+"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+"  -a, --append                  append the user to the supplemental GROUPS\n"
+"                                mentioned by the -G option without removing\n"
+"                                him/her from other groups\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --login NEW_LOGIN         new value of the login name\n"
+"  -L, --lock                    lock the user account\n"
+"  -m, --move-home               move contents of the home directory to the\n"
+"                                new location (use only with -d)\n"
+"  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
+"  -u, --uid UID                 new UID for the user account\n"
+"  -U, --unlock                  unlock the user account\n"
 "\n"
 msgstr ""
 
@@ -1837,11 +1843,11 @@
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
-"  -g, --group\t\t\tedit group database\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -p, --passwd\t\t\tedit passwd database\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -s, --shadow\t\t\tedit shadow or gshadow database\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
 "\n"
 msgstr ""
 

Modified: upstream/trunk/po/pl.po
===================================================================
--- upstream/trunk/po/pl.po	2007-11-24 22:41:24 UTC (rev 1460)
+++ upstream/trunk/po/pl.po	2007-11-25 20:21:53 UTC (rev 1461)
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-11-24 12:26+0100\n"
-"PO-Revision-Date: 2005-09-05 13:05+0200\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"PO-Revision-Date: 2007-11-25 20:53+0100\n"
 "Last-Translator: Tomasz Kłoczko <kloczek at pld.org.pl>\n"
 "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -204,35 +204,38 @@
 "Usage: chage [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -d, --lastday LAST_DAY\tset last password change to LAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -I, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --list\t\t\tshow account aging information\n"
-"  -m, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
+"  -d, --lastday LAST_DAY        set last password change to LAST_DAY\n"
+"  -E, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -h, --help                    display this help message and exit\n"
+"  -I, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --list                    show account aging information\n"
+"  -m, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -M, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
+"  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 "\n"
 msgstr ""
 "Użycie: chage [opcje] [LOGIN]\n"
 "\n"
 "Opcje:\n"
-"  -d, --lastday OSTATNI\t\tustawia date ostatniej zmiany hasła na OSTATNI\n"
-"  -E, --expiredate DATA_WAŻN\tustawia datę ważności konta na DATA_WAŻN\n"
-"  -h, --help\t\t\twyświetlenie tego opisu i zakończenie działania\n"
-"  -I, --inactive NIEAKTYWNE\tustwia liczbę dni nieaktywności konta po\n"
-"\t\t\t\tktórych konta jest blokowane na NIEAKTYWNE\n"
-"  -l, --list\t\t\twyświetlenie informacji o terminach ważności konta i\n"
-"\t\t\t\thasła\n"
-"  -m, --mindays MIN_DNI\t\tustawia minimalną liczbę dni pomiędzy zmianami\n"
-"\t\t\t\thasła na wartość MIN_DNI\n"
-"  -M, --maxdays MAX_DNI\t\tustawia maksymalną liczbę dni, przez jakie hasło\n"
-"\t\t\t\tjest ważne na wartość MAX_DNI\n"
-"  -W, --warndays DNI_OSTRZ\tustawia na DNI_OSTRZ liczbę dni przed\n"
-"\t\t\t\tupływem ważności hasła\n"
+"  -d, --lastday OSTATNI         ustawia date ostatniej zmiany hasła na "
+"OSTATNI\n"
+"  -E, --expiredate DATA_WAŻN    ustawia datę ważności konta na DATA_WAŻN\n"
+"  -h, --help                    wyświetlenie tego opisu i zakończenie "
+"działania\n"
+"  -I, --inactive NIEAKTYWNE     ustwia liczbę dni nieaktywności konta po\n"
+"                                których konta jest blokowane na NIEAKTYWNE\n"
+"  -l, --list                    wyświetlenie informacji o terminach "
+"ważności\n"
+"                                konta i hasła\n"
+"  -m, --mindays MIN_DNI         ustawia minimalną liczbę dni pomiędzy\n"
+"                                zmianami hasła na wartość MIN_DNI\n"
+"  -M, --maxdays MAX_DNI         ustawia maksymalną liczbę dni, przez jakie\n"
+"                                hasło jest ważne na wartość MAX_DNI\n"
+"  -W, --warndays DNI_OSTRZ      ustawia na DNI_OSTRZ liczbę dni przed\n"
+"                                upływem ważności hasła\n"
 "\n"
 
 #, c-format
@@ -470,23 +473,25 @@
 "Usage: %s [options]\n"
 "\n"
 "Options:\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
-"  -e, --encrypted\tsupplied passwords are encrypted\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -m, --md5\t\tencrypt the clear text password using the MD5 algorithm\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
+"  -e, --encrypted               supplied passwords are encrypted\n"
+"  -h, --help                    display this help message and exit\n"
+"  -m, --md5                     encrypt the clear text password using\n"
+"                                the MD5 algorithm\n"
 "%s\n"
 msgstr ""
 "Użycie: chpasswd [opcje]\n"
 "\n"
 "Opcje:\n"
-"  -e, --encrypted\tprzekazywane hasła są w postaci zakodowane\n"
-"  -h, --help\t\twyświetlenie tego opisu i zakończenie działania\n"
-"  -m, --md5\t\tużyj kodowania MD5 zamiast DES w przypadku kiedy\n"
-"\t\t\tprzekazywane hasła nie są zakodowane\n"
+"  -e, --encrypted       przekazywane hasła są w postaci zakodowane\n"
+"  -h, --help            wyświetlenie tego opisu i zakończenie działania\n"
+"  -m, --md5             użyj kodowania MD5 zamiast DES w przypadku kiedy\n"
+"                        przekazywane hasła nie są zakodowane\n"
 "\n"
 
 msgid ""
-"  -s, --sha-rounds\tnumber of SHA rounds for the SHA* crypt algorithms\n"
+"  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+"                                crypt algorithms\n"
 msgstr ""
 
 #, c-format
@@ -566,15 +571,15 @@
 "Usage: chsh [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -h, --help\t\t\t\tdisplay this help message and exit\n"
-"  -s, --shell SHELL\t\t\tnew login shell for the user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
 "\n"
 msgstr ""
 "Użycie: chsh [opcje] [LOGIN]\n"
 "\n"
 "Opcje:\n"
-"  -h, --help\t\t\twyświetlenie tego opisu i zakończenie działania\n"
-"  -s, --shell SHELL\t\tnowy SHELL dla użytkownika LOGIN\n"
+"  -h, --help            wyświetlenie tego opisu i zakończenie działania\n"
+"  -s, --shell SHELL     nowy SHELL dla użytkownika LOGIN\n"
 "\n"
 
 msgid "Login Shell"
@@ -609,30 +614,34 @@
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\tdisplay faillog records for all users\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n"
-"  -m, --maximum MAX\t\tset maximum failed login counters to MAX\n"
-"  -r, --reset\t\t\treset the counters of login failures\n"
-"  -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n"
-"  -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n"
-"\t\t\t\tand limits (if used with -r, -m or -l options) only\n"
-"\t\t\t\tfor user with LOGIN\n"
+"  -a, --all                     display faillog records for all users\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --lock-time SEC           after failed login lock accout to SEC "
+"seconds\n"
+"  -m, --maximum MAX             set maximum failed login counters to MAX\n"
+"  -r, --reset                   reset the counters of login failures\n"
+"  -t, --time DAYS               display faillog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              display faillog record or maintains failure\n"
+"                                counters and limits (if used with -r, -m or -"
+"l\n"
+"                                options) only for user with LOGIN\n"
 "\n"
 msgstr ""
 "Użycie: faillog [opcje]\n"
 "\n"
 "Opcje:\n"
-"  -a, --all\t\t\twyświetlaj rekordy failloga dla wszystkich użytkowników\n"
-"  -h, --help\t\t\twyświetlenie tego opisu i zakończenie działania\n"
-"  -l, --lock-time SEK\t\tustaw na SEK sekund blokadę konta po nieudanym "
-"logowaniu\n"
-"  -m, --maximum MAX\t\tustaw maksymalną ilość niepoprawnych logowań na MAX\n"
-"  -r, --reset\t\t\twyzeruj licznik niepoprawnych logowań\n"
-"  -t, --time DNI\t\twyświetlaj rekordy nie starsze niż DNI\n"
-"  -u, --user LOGIN\t\twyświetlaj rekordy lub zarządzaj licznikami\n"
-"\t\t\t\ti limitami faillog (w połaczeniu z opcjami -r, -m lub -l) tylko\n"
-"\t\t\t\tdla użytkownika o loginie LOGIN\n"
+"  -a, --all             wyświetlaj rekordy failloga dla wszystkich "
+"użytkowników\n"
+"  -h, --help            wyświetlenie tego opisu i zakończenie działania\n"
+"  -l, --lock-time SEK   ustaw na SEK sekund blokadę konta po nieudanym\n"
+"                        logowaniu\n"
+"  -m, --maximum MAX     ustaw maksymalną ilość niepoprawnych logowań na MAX\n"
+"  -r, --reset           wyzeruj licznik niepoprawnych logowań\n"
+"  -t, --time DNI        wyświetlaj rekordy nie starsze niż DNI\n"
+"  -u, --user LOGIN      wyświetlaj rekordy lub zarządzaj licznikami\n"
+"                        i limitami faillog (w połaczeniu z opcjami -r,\n"
+"                        -m lub -l) tylko dla użytkownika o loginie LOGIN\n"
 "\n"
 
 #, c-format
@@ -761,24 +770,25 @@
 "Usage: groupadd [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce exit with success status if the specified\n"
-"\t\t\t\tgroup already exists\n"
-"  -g, --gid GID\t\t\tuse GID for the new group\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -o, --non-unique\t\tallow create group with duplicate\n"
-"\t\t\t\t(non-unique) GID\n"
+"  -f, --force                   force exit with success status if the\n"
+"                                specified group already exists\n"
+"  -g, --gid GID                 use GID for the new group\n"
+"  -h, --help                    display this help message and exit\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -o, --non-unique              allow create group with duplicate\n"
+"                                (non-unique) GID\n"
 "\n"
 msgstr ""
 "Użycie: groupadd [opcje] GRUPA\n"
 "\n"
 "Opcje:\n"
-"  -f, --force\t\twymyś zakończenie programu z poprawnym statusem\n"
-"\t\t\t\tjeżeli grupa już istnieje\n"
-"  -g, --gid GID\t\tużyj GID dla tworzonej grupy\n"
-"  -h, --help\t\t\twyświetlenie tego opisu i zakończenie działania\n"
-"  -K, --key KLUCZ=WARTOŚĆ\t\tprzysłoń wartość domyślną z /etc/login.defs\n"
-"  -o, --non-unique\t\tpozwól na utworzenie grupy z nieunikalnym GID\n"
+"  -f, --force                wymyś zakończenie programu z poprawnym\n"
+"                             statusem jeżeli grupa już istnieje\n"
+"  -g, --gid GID              użyj GID dla tworzonej grupy\n"
+"  -h, --help                 wyświetlenie tego opisu i zakończenie "
+"działania\n"
+"  -K, --key KLUCZ=WARTOŚĆ    przysłoń wartość domyślną z /etc/login.defs\n"
+"  -o, --non-unique           pozwól na utworzenie grupy z nieunikalnym GID\n"
 "\n"
 
 #, c-format
@@ -906,20 +916,23 @@
 "Usage: groupmod [options] GROUP\n"
 "\n"
 "Options:\n"
-"  -g, --gid GID\t\t\tforce use new GID by GROUP\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -n, --new-name NEW_GROUP\tforce use NEW_GROUP name by GROUP\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) GID by GROUP\n"
+"  -g, --gid GID                 force use new GID by GROUP\n"
+"  -h, --help                    display this help message and exit\n"
+"  -n, --new-name NEW_GROUP      force use NEW_GROUP name by GROUP\n"
+"  -o, --non-unique              allow using duplicate (non-unique) GID by "
+"GROUP\n"
 "\n"
 msgstr ""
 "Użycie: groupmod [opcje] GRUPA\n"
 "\n"
 "Opcje:\n"
-"  -g, --gid GID\t\t\twymuś użycie nowego GID dla grupy GRUPA\n"
-"  -h, --help\t\t\twyświetlenie tego opisu i zakończenie działania\n"
-"  -n, --new-name NOWA_GRUPA\twymuś użycie nazwy grupy NOWA_GRUPA zamiast\n"
-"\t\t\t\tGRUPA\n"
-"  -o, --non-unique\t\tpozwól na utworzenie grupy z nieunikalnym GID\n"
+"  -g, --gid GID                 wymuś użycie nowego GID dla grupy GRUPA\n"
+"  -h, --help                    wyświetlenie tego opisu i zakończenie "
+"działania\n"
+"  -n, --new-name NOWA_GRUPA     wymuś użycie nazwy grupy NOWA_GRUPA zamiast\n"
+"                                GRUPA\n"
+"  -o, --non-unique              pozwól na utworzenie grupy z nieunikalnym "
+"GID\n"
 "\n"
 
 #, c-format
@@ -1073,20 +1086,21 @@
 "Usage: lastlog [options]\n"
 "\n"
 "Options:\n"
-"  -b, --before DAYS\tprint only lastlog records older than DAYS\n"
-"  -h, --help\t\tdisplay this help message and exit\n"
-"  -t, --time DAYS\tprint only lastlog records more recent than DAYS\n"
-"  -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n"
+"  -b, --before DAYS             print only lastlog records older than DAYS\n"
+"  -h, --help                    display this help message and exit\n"
+"  -t, --time DAYS               print only lastlog records more recent than "
+"DAYS\n"
+"  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 "\n"
 msgstr ""
 "Użycie: lastlog [opcje]\n"
 "\n"
 "Opcje:\n"
-"  -b, --before DNI\t\twyświetl tylko rekordy lastlog starsze niż DNI\n"
-"  -h, --help\t\t\twyświetlenie tego opisu i zakończenie działania\n"
-"  -t, --time DNI\t\twyświetl tylko rekordy lastlog nie starsze niż DNI\n"
-"  -u, --user LOGIN\t\twyświetl rekord lastlog tylko dla użytkownika\n"
-"\t\t\t\to loginie LOGIN\n"
+"  -b, --before DNI      wyświetl tylko rekordy lastlog starsze niż DNI\n"
+"  -h, --help            wyświetlenie tego opisu i zakończenie działania\n"
+"  -t, --time DNI        wyświetl tylko rekordy lastlog nie starsze niż DNI\n"
+"  -u, --user LOGIN      wyświetl rekord lastlog tylko dla użytkownika\n"
+"                        o loginie LOGIN\n"
 "\n"
 
 #, c-format
@@ -1237,14 +1251,10 @@
 msgid ""
 "Usage: %s [options] [input]\n"
 "\n"
-"  -c, --crypt-method\tthe crypt method (one of %s)\n"
+"  -c, --crypt-method            the crypt method (one of %s)\n"
 "%s\n"
 msgstr ""
 
-msgid ""
-"  -s, --sha-rounds\t\tnumber of SHA rounds for the SHA* crypt algorithms\n"
-msgstr ""
-
 #, c-format
 msgid "%s: can't lock /etc/passwd.\n"
 msgstr "%s: nie można zablokować /etc/passwd.\n"
@@ -1298,49 +1308,51 @@
 "Usage: passwd [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\treport password status on all accounts\n"
-"  -d, --delete\t\t\tdelete the password for the named account\n"
-"  -e, --expire\t\t\tforce expire the password for the named account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --keep-tokens\t\tchange password only if expired\n"
-"  -i, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -l, --lock\t\t\tlock the named account\n"
-"  -n, --mindays MIN_DAYS\tset minimum number of days before password\n"
-"\t\t\t\tchange to MIN_DAYS\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -r, --repository REPOSITORY\tchange password in REPOSITORY repository\n"
-"  -S, --status\t\t\treport password status on the named account\n"
-"  -u, --unlock\t\t\tunlock the named account\n"
-"  -w, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS\tset maximim number of days before password\n"
-"\t\t\t\tchange to MAX_DAYS\n"
+"  -a, --all                     report password status on all accounts\n"
+"  -d, --delete                  delete the password for the named account\n"
+"  -e, --expire                  force expire the password for the named "
+"account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --keep-tokens             change password only if expired\n"
+"  -i, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -l, --lock                    lock the named account\n"
+"  -n, --mindays MIN_DAYS        set minimum number of days before password\n"
+"                                change to MIN_DAYS\n"
+"  -q, --quiet                   quiet mode\n"
+"  -r, --repository REPOSITORY   change password in REPOSITORY repository\n"
+"  -S, --status                  report password status on the named account\n"
+"  -u, --unlock                  unlock the named account\n"
+"  -w, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
+"  -x, --maxdays MAX_DAYS        set maximim number of days before password\n"
+"                                change to MAX_DAYS\n"
 "\n"
 msgstr ""
 "Użycie: passwd [opcje] [LOGIN]\n"
 "\n"
 "Opcje:\n"
-"  -a, --all\t\t\traportuj status hasła dla wszystkich kont\n"
-"  -d, --delete\t\t\tkasuje hasło użytkowanika\n"
-"  -e, --expire\t\t\twymuś przeterminowanie hasła\n"
-"  -h, --help\t\t\twyświetlenie tego opisu i zakończenie działania\n"
-"  -k, --keep-tokens\t\tzmiana hasła tylko w przypadku kiedy\n"
-"\t\t\t\tjest przeterminowane\n"
-"  -i, --inactive NIEAKTYWNE\tkonto przeterminowane po upływie NIEAKTYWNE\n"
-"\t\t\t\tdni po wygaśnięciu hasła\n"
-"  -l, --lock\t\t\tzablokuj konto\n"
-"  -n, --mindays MIN_DNI\t\tustaw minimalną ilość dni prezed kolejną zmianą\n"
-"\t\t\t\thasła na MIN_DNI\n"
-"  -n, --mindays MIN_DNI\t\tustawia minimalną liczbę dni pomiędzy zmianami\n"
-"\t\t\t\thasła na MIN_DNI\n"
-"  -q, --quiet\t\t\tcichy tryb pracy\n"
-"  -r, --repository REPOZYTORIUM\tzmień hasło w repozytorium REPOZYTORIUM\n"
-"  -S, --status\t\t\traportuj status hasła\n"
-"  -u, --unlock\t\t\todblokuj konto\n"
-"  -w, --warndays DNI_OSTRZ\tustawia na DNI_OSTRZ liczbę dni przed\n"
-"\t\t\t\tupływem ważności hasła\n"
-"  -x, --maxdays MAX_DNI\t\tustawia maksymalną liczbę dni, przez jakie hasło\n"
-"\t\t\t\tjest ważne na wartość MAX_DNI\n"
+"  -a, --all                     raportuj status hasła dla wszystkich kont\n"
+"  -d, --delete                  kasuje hasło użytkowanika\n"
+"  -e, --expire                  wymuś przeterminowanie hasła\n"
+"  -h, --help                    wyświetlenie tego opisu i zakończenie "
+"działania\n"
+"  -k, --keep-tokens             zmiana hasła tylko w przypadku kiedy\n"
+"                                jest przeterminowane\n"
+"  -i, --inactive NIEAKTYWNE     konto przeterminowane po upływie NIEAKTYWNE\n"
+"                                dni po wygaśnięciu hasła\n"
+"  -l, --lock                    zablokuj konto\n"
+"  -n, --mindays MIN_DNI         ustaw minimalną ilość dni prezed kolejną\n"
+"                                zmianą hasła na MIN_DNI\n"
+"  -n, --mindays MIN_DNI         ustawia minimalną liczbę dni pomiędzy\n"
+"                                zmianami hasła na MIN_DNI\n"
+"  -q, --quiet                   cichy tryb pracy\n"
+"  -r, --repository REPOZYTORIUM zmień hasło w repozytorium REPOZYTORIUM\n"
+"  -S, --status                  raportuj status hasła\n"
+"  -u, --unlock                  odblokuj konto\n"
+"  -w, --warndays DNI_OSTRZ      ustawia na DNI_OSTRZ liczbę dni przed\n"
+"                                upływem ważności hasła\n"
+"  -x, --maxdays MAX_DNI         ustawia maksymalną liczbę dni, przez jakie\n"
+"                                hasło jest ważne na wartość MAX_DNI\n"
 "\n"
 
 msgid "Old password: "
@@ -1524,24 +1536,24 @@
 "Usage: su [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -, -l, --login\t\tmake the shell a login shell\n"
+"  -c, --command COMMAND         pass COMMAND to the invoked shell\n"
+"  -h, --help                    display this help message and exit\n"
+"  -, -l, --login                make the shell a login shell\n"
 "  -m, -p,\n"
-"  --preserve-environment\tdo not reset environment variables, and keep\n"
-"\t\t\t\tthe same shell\n"
-"  -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n"
+"  --preserve-environment        do not reset environment variables, and\n"
+"                                keep the same shell\n"
+"  -s, --shell SHELL             use SHELL instead of the default in passwd\n"
 "\n"
 msgstr ""
 "Użycie: su [opcje] [LOGIN]\n"
 "\n"
 "Opcje:\n"
-"  -c, --command POLECENIE\t\turuchom POLECENIE w to wywoływanym shellu\n"
-"  -h, --help\t\t\twyświetlenie tego opisu i zakończenie działania\n"
-"  -, -l, --login\turuchom z  powłoką z powłoką zgłoszeniową\n"
+"  -c, --command POLECENIE   uruchom POLECENIE w to wywoływanym shellu\n"
+"  -h, --help                wyświetlenie tego opisu i zakończenie działania\n"
+"  -, -l, --login            uruchom z  powłoką z powłoką zgłoszeniową\n"
 "  -m, -p,\n"
-"  --preserve-environment\turuchomienie z zachowaniem zmiennych środowiska\n"
-"  -s, --shell SHELL\t\tużyj SHELL zamiast domyślny shell z passwd\n"
+"  --preserve-environment    uruchomienie z zachowaniem zmiennych środowiska\n"
+"  -s, --shell SHELL         użyj SHELL zamiast domyślny shell z passwd\n"
 "\n"
 
 #, c-format
@@ -1628,57 +1640,62 @@
 "Usage: useradd [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR\tbase directory for the new user account\n"
-"\t\t\t\thome directory\n"
-"  -c, --comment COMMENT\t\tset the GECOS field for the new user account\n"
-"  -d, --home-dir HOME_DIR\thome directory for the new user account\n"
-"  -D, --defaults\t\tprint or save modified default useradd\n"
-"\t\t\t\tconfiguration\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP for the new user account\n"
-"  -G, --groups GROUPS\t\tlist of supplementary groups for the new\n"
-"\t\t\t\tuser account\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -k, --skel SKEL_DIR\t\tspecify an alternative skel directory\n"
-"  -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n"
-"  -m, --create-home\t\tcreate home directory for the new user\n"
-"\t\t\t\taccount\n"
-"  -o, --non-unique\t\tallow create user with duplicate\n"
-"\t\t\t\t(non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new user\n"
-"\t\t\t\taccount\n"
-"  -s, --shell SHELL\t\tthe login shell for the new user account\n"
-"  -u, --uid UID\t\t\tforce use the UID for the new user account\n"
+"  -b, --base-dir BASE_DIR       base directory for the new user account\n"
+"                                home directory\n"
+"  -c, --comment COMMENT         set the GECOS field for the new user "
+"account\n"
+"  -d, --home-dir HOME_DIR       home directory for the new user account\n"
+"  -D, --defaults                print or save modified default useradd\n"
+"                                configuration\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP for the new user account\n"
+"  -G, --groups GROUPS           list of supplementary groups for the new\n"
+"                                user account\n"
+"  -h, --help                    display this help message and exit\n"
+"  -k, --skel SKEL_DIR           specify an alternative skel directory\n"
+"  -K, --key KEY=VALUE           overrides /etc/login.defs defaults\n"
+"  -m, --create-home             create home directory for the new user\n"
+"                                account\n"
+"  -o, --non-unique              allow create user with duplicate\n"
+"                                (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new user\n"
+"                                account\n"
+"  -s, --shell SHELL             the login shell for the new user account\n"
+"  -u, --uid UID                 force use the UID for the new user account\n"
 "\n"
 msgstr ""
 "Użycie: useradd [opcje] LOGIN\n"
 "\n"
 "Opcje:\n"
-"  -b, --base-dir KAT_BAZOWY\tkatalog bazowy dla katalogu domowego nowo\n"
-"\t\t\t\ttworzonego konta\n"
-"  -c, --comment COMMENT\t\tustaw pole komentarza (GECOS) dla nowo\n"
-"\t\t\t\ttworzonego konta\n"
-"  -d, --home-dir KAT_DOMOWY\tkatalog domowy dla nowo tworzonego konta\n"
-"  -D, --defaults\t\twypisz lub zapisz domyślną konfigurację programu\n"
-"\t\t\t\tuseradd\n"
-"  -e, --expiredate DATA_WAŻN.\tustawia datę wazności dla nowo tworzonego\n"
-"\t\t\t\tkonta na DATA_WAŻN.\n"
-"  -f, --inactive NIEAKTYWNE\tustwia liczbę dni po których konto jest\n"
-"\t\t\t\tblokowane na NIEAKTYWNE\n"
-"  -h, --help\t\t\twyświetlenie tego opisu i zakończenie działania\n"
-"  -g, --gid GROUP\t\twymuś użycie konkretnej grupy dla nowo tworzonego\n"
-"\t\t\t\tkonta\n"
-"  -G, --groups GROUPS\t\tlista dodatkowych grup dla nowo tworzonego konta\n"
-"  -k, --skel SKEL_DIR\t\tpodaj alternatywną ścieżkę do katalogu skel\n"
-"  -K, --key KLUCZ=WARTOŚĆ\t\tprzysłoń wartość domyślną z /etc/login.defs\n"
-"  -m, --create-home\t\ttwórz katalog domowy dla nowego użytkownika\n"
-"  -o, --non-unique\t\tpozwól na utworzenie konta z nieunikalnym UID\n"
-"  -p, --password PASSWORD\tużyj zakodowane hasło dla nowego tworzonego\n"
-"\t\t\t\tkonta\n"
-"  -s, --shell SHELL\t\ttshell dla nowo tworzonego konta\n"
-"  -u, --uid UID\t\t\twymuś użycie konkretnego UID dla nowo tworzonego konta\n"
+"  -b, --base-dir KAT_BAZOWY     katalog bazowy dla katalogu domowego nowo\n"
+"                                tworzonego konta\n"
+"  -c, --comment COMMENT         ustaw pole komentarza (GECOS) dla nowo\n"
+"                                tworzonego konta\n"
+"  -d, --home-dir KAT_DOMOWY     katalog domowy dla nowo tworzonego konta\n"
+"  -D, --defaults                wypisz lub zapisz domyślną konfigurację\n"
+"                                programu useradd\n"
+"  -e, --expiredate DATA_WAŻN.   ustawia datę wazności dla nowo tworzonego\n"
+"                                konta na DATA_WAŻN.\n"
+"  -f, --inactive NIEAKTYWNE     ustwia liczbę dni po których konto jest\n"
+"                                blokowane na NIEAKTYWNE\n"
+"  -h, --help                    wyświetlenie tego opisu i zakończenie\n"
+"                                działania\n"
+"  -g, --gid GROUP               wymuś użycie konkretnej grupy dla nowo\n"
+"                                tworzonego konta\n"
+"  -G, --groups GROUPS           lista dodatkowych grup dla nowo tworzonego\n"
+"                                konta\n"
+"  -k, --skel SKEL_DIR           podaj alternatywną ścieżkę do katalogu skel\n"
+"  -K, --key KLUCZ=WARTOŚĆ       przysłoń wartość domyślną z /etc/login.defs\n"
+"  -m, --create-home             twórz katalog domowy dla nowego użytkownika\n"
+"  -o, --non-unique              pozwól na utworzenie konta z nieunikalnym "
+"UID\n"
+"  -p, --password PASSWORD       użyj zakodowane hasło dla nowego tworzonego\n"
+"                                konta\n"
+"  -s, --shell SHELL             tshell dla nowo tworzonego konta\n"
+"  -u, --uid UID                 wymuś użycie konkretnego UID dla nowo\n"
+"                                tworzonego konta\n"
 "\n"
 
 #, fuzzy, c-format
@@ -1825,18 +1842,19 @@
 "Usage: userdel [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -f, --force\t\t\tforce removal of files, even if not owned by user\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -r, --remove\t\t\tremove home directory and mail spool\n"
+"  -f, --force                   force removal of files,\n"
+"                                even if not owned by user\n"
+"  -h, --help                    display this help message and exit\n"
+"  -r, --remove                  remove home directory and mail spool\n"
 "\n"
 msgstr ""
 "Użycie: userdel [opcje] LOGIN\n"
 "\n"
 "Opcje:\n"
-"  -f, --force\t\t\twymuś usunięcie plików nawet jeżeli nie należą\n"
-"\t\t\t\tdo usuwanego użytkownika\n"
-"  -h, --help\t\t\twyświetlenie tego opisu i zakończenie działania\n"
-"  -r, --remove\t\t\tusuń katalog domowy i spool pocztowy\n"
+"  -f, --force               wymuś usunięcie plików nawet jeżeli nie należą\n"
+"                            do usuwanego użytkownika\n"
+"  -h, --help                wyświetlenie tego opisu i zakończenie działania\n"
+"  -r, --remove              usuń katalog domowy i spool pocztowy\n"
 "\n"
 
 #, c-format
@@ -1903,49 +1921,51 @@
 "Usage: usermod [options] LOGIN\n"
 "\n"
 "Options:\n"
-"  -c, --comment COMMENT\t\tnew value of the GECOS field\n"
-"  -d, --home HOME_DIR\t\tnew home directory for the user account\n"
-"  -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid GROUP\t\tforce use GROUP as new primary group\n"
-"  -G, --groups GROUPS\t\tnew list of supplementary GROUPS\n"
-"  -a, --append\t\tappend the user to the supplemental GROUPS\n"
-"\t\t\t\tmentioned by the -G option without removing\n"
-"\t\t\t\thim/her from other groups\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -l, --login NEW_LOGIN\t\tnew value of the login name\n"
-"  -L, --lock\t\t\tlock the user account\n"
-"  -m, --move-home\t\tmove contents of the home directory to the new\n"
-"\t\t\t\tlocation (use only with -d)\n"
-"  -o, --non-unique\t\tallow using duplicate (non-unique) UID\n"
-"  -p, --password PASSWORD\tuse encrypted password for the new password\n"
-"  -s, --shell SHELL\t\tnew login shell for the user account\n"
-"  -u, --uid UID\t\t\tnew UID for the user account\n"
-"  -U, --unlock\t\t\tunlock the user account\n"
+"  -c, --comment COMMENT         new value of the GECOS field\n"
+"  -d, --home HOME_DIR           new home directory for the user account\n"
+"  -e, --expiredate EXPIRE_DATE  set account expiration date to EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid GROUP               force use GROUP as new primary group\n"
+"  -G, --groups GROUPS           new list of supplementary GROUPS\n"
+"  -a, --append                  append the user to the supplemental GROUPS\n"
+"                                mentioned by the -G option without removing\n"
+"                                him/her from other groups\n"
+"  -h, --help                    display this help message and exit\n"
+"  -l, --login NEW_LOGIN         new value of the login name\n"
+"  -L, --lock                    lock the user account\n"
+"  -m, --move-home               move contents of the home directory to the\n"
+"                                new location (use only with -d)\n"
+"  -o, --non-unique              allow using duplicate (non-unique) UID\n"
+"  -p, --password PASSWORD       use encrypted password for the new password\n"
+"  -s, --shell SHELL             new login shell for the user account\n"
+"  -u, --uid UID                 new UID for the user account\n"
+"  -U, --unlock                  unlock the user account\n"
 "\n"
 msgstr ""
 "Użycie: usermod [opcje] LOGIN\n"
 "\n"
 "Opcje:\n"
-"  -a, --append GRUPA\t\tdołącz użytkownika do do dodatkowej grupy GRUPA\n"
-"  -c, --comment KOMENTARZ\tustaw pole komentarza (GECOS) dla konta\n"
-"  -d, --home-dir KAT_DOMOWY\tnowy katalog domowy użytkownika\n"
-"  -e, --expiredate DATA_WAŻN\tustawia datę wazności dla konta na DATA_WAŻN\n"
-"  -f, --inactive NIEAKTYWNE\tustwia liczbę dni po których konto jest\n"
-"\t\t\t\tblokowane na NIEAKTYWNE\n"
-"  -g, --gid GRUPA\t\twymuś użycie grupy GRUPA jako grupy podstawowej\n"
-"\t\t\t\tużytkownika\n"
-"  -G, --groups GRUPY\t\tlista dodatkowych grup uzytkownika\n"
-"  -h, --help\t\t\twyświetlenie tego opisu i zakończenie działania\n"
-"  -l, --login NOWY_LOGIN\tnowa nawana logina użytkownika\n"
-"  -L, --lock\t\t\tblokuj konto użytkowqnika\n"
-"  -m, --move-home\t\tprzenieś zawartość katalogu domowego użytkownika\n"
-"\t\t\t\t(może być użyte tylko z opcją -d)\n"
-"  -o, --non-unique\t\tpozwól na użycie nieunikalnego UID dla konta\n"
-"  -p, --password HASŁO\tużyj nowe zakodowane HASŁO dla użytkonta\n"
-"  -s, --shell SHELL\t\tnowy SHELL dla użytkownika LOGIN\n"
-"  -U, --unlock\t\t\todblokuj konto użytkownika\n"
+"  -a, --append GRUPA          dołącz użytkownika do do dodatkowej grupy "
+"GRUPA\n"
+"  -c, --comment KOMENTARZ     ustaw pole komentarza (GECOS) dla konta\n"
+"  -d, --home-dir KAT_DOMOWY   nowy katalog domowy użytkownika\n"
+"  -e, --expiredate DATA_WAŻN  ustawia datę wazności dla konta na DATA_WAŻN\n"
+"  -f, --inactive NIEAKTYWNE   ustwia liczbę dni po których konto jest\n"
+"                              blokowane na NIEAKTYWNE\n"
+"  -g, --gid GRUPA             wymuś użycie grupy GRUPA jako grupy\n"
+"                              podstawowej użytkownika\n"
+"  -G, --groups GRUPY          lista dodatkowych grup uzytkownika\n"
+"  -h, --help                  wyświetlenie tego opisu i zakończenie "
+"działania\n"
+"  -l, --login NOWY_LOGIN      nowa nawana logina użytkownika\n"
+"  -L, --lock                  blokuj konto użytkowqnika\n"
+"  -m, --move-home             przenieś zawartość katalogu domowego\n"
+"                              użytkownika (może być użyte tylko z opcją -d)\n"
+"  -o, --non-unique            pozwól na użycie nieunikalnego UID dla konta\n"
+"  -p, --password HASŁO        użyj nowe zakodowane HASŁO dla użytkonta\n"
+"  -s, --shell SHELL           nowy SHELL dla użytkownika LOGIN\n"
+"  -U, --unlock                odblokuj konto użytkownika\n"
 "\n"
 
 #, fuzzy, c-format
@@ -2016,21 +2036,21 @@
 "Usage: vipw [options]\n"
 "\n"
 "Options:\n"
-"  -g, --group\t\t\tedit group database\n"
-"  -h, --help\t\t\tdisplay this help message and exit\n"
-"  -p, --passwd\t\t\tedit passwd database\n"
-"  -q, --quiet\t\t\tquiet mode\n"
-"  -s, --shadow\t\t\tedit shadow or gshadow database\n"
+"  -g, --group                   edit group database\n"
+"  -h, --help                    display this help message and exit\n"
+"  -p, --passwd                  edit passwd database\n"
+"  -q, --quiet                   quiet mode\n"
+"  -s, --shadow                  edit shadow or gshadow database\n"
 "\n"
 msgstr ""
 "Użycie: vipw [opcje]\n"
 "\n"
 "Opcje:\n"
-"  -g, --group\t\t\tedycja bazy group\n"
-"  -h, --help\t\t\twyświetlenie tego opisu i zakończenie działania\n"
-"  -p, --passwd\t\t\tedycja bazy passwd\n"
-"  -q, --quiet\t\t\tcichy tryb pracy\n"
-"  -s, --shadow\t\t\tedycja bazy shadow lub gshadow\n"
+"  -g, --group           edycja bazy group\n"
+"  -h, --help            wyświetlenie tego opisu i zakończenie działania\n"
+"  -p, --passwd          edycja bazy passwd\n"
+"  -q, --quiet           cichy tryb pracy\n"
+"  -s, --shadow          edycja bazy shadow lub gshadow\n"
 "\n"
 
 #, c-format




More information about the Pkg-shadow-commits mailing list