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

nekral-guest at alioth.debian.org nekral-guest at alioth.debian.org
Sat Nov 24 22:41:24 UTC 2007


Author: nekral-guest
Date: 2007-11-24 22:41:24 +0000 (Sat, 24 Nov 2007)
New Revision: 1460

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/po/bs.po
   upstream/trunk/po/ca.po
   upstream/trunk/po/cs.po
   upstream/trunk/po/da.po
   upstream/trunk/po/de.po
   upstream/trunk/po/dz.po
   upstream/trunk/po/el.po
   upstream/trunk/po/es.po
   upstream/trunk/po/eu.po
   upstream/trunk/po/fi.po
   upstream/trunk/po/fr.po
   upstream/trunk/src/chage.c
   upstream/trunk/src/chgpasswd.c
   upstream/trunk/src/chpasswd.c
   upstream/trunk/src/chsh.c
   upstream/trunk/src/faillog.c
   upstream/trunk/src/groupadd.c
   upstream/trunk/src/groupmod.c
   upstream/trunk/src/lastlog.c
   upstream/trunk/src/newusers.c
   upstream/trunk/src/passwd.c
   upstream/trunk/src/su.c
   upstream/trunk/src/useradd.c
   upstream/trunk/src/userdel.c
   upstream/trunk/src/usermod.c
   upstream/trunk/src/vipw.c
Log:
Do not use tabulations in Usage strings.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2007-11-24 14:02:10 UTC (rev 1459)
+++ upstream/trunk/ChangeLog	2007-11-24 22:41:24 UTC (rev 1460)
@@ -1,5 +1,19 @@
 2007-11-24  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/userdel.c, src/lastlog.c, src/newusers.c, src/chpasswd.c,
+	src/usermod.c, src/chgpasswd.c, src/vipw.c, src/useradd.c,
+	src/su.c, src/groupmod.c, src/passwd.c, src/groupadd.c,
+	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:
+	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.
+
+2007-11-24  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* po/ne.po, po/bs.po, po/cs.po, po/pt_BR.po, po/km.po, po/es.po,
 	po/eu.po, po/ko.po, po/hu.po, po/sk.po, po/vi.po, po/uk.po,
 	po/ro.po, po/sq.po, po/ru.po, po/id.po, po/nb.po, po/el.po,

Modified: upstream/trunk/po/bs.po
===================================================================
--- upstream/trunk/po/bs.po	2007-11-24 14:02:10 UTC (rev 1459)
+++ upstream/trunk/po/bs.po	2007-11-24 22:41:24 UTC (rev 1460)
@@ -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-05-09 12:03+0100\n"
 "Last-Translator: Safir Šećerović <sapphire at linux.org.ba>\n"
 "Language-Team: Bosnian <lokal at lugbih.org>\n"
@@ -193,17 +193,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 ""
 
@@ -439,15 +439,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 ""
 
 #, c-format
@@ -527,8 +529,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 ""
 
@@ -564,15 +566,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 ""
 
@@ -702,13 +707,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 ""
 
@@ -837,10 +842,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 ""
 
@@ -993,10 +999,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 ""
 
@@ -1138,14 +1145,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 ""
@@ -1199,23 +1202,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 ""
 
@@ -1486,29 +1490,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 ""
 
@@ -1651,9 +1656,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 ""
 
@@ -1718,26 +1724,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 ""
 
@@ -1808,11 +1814,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/ca.po
===================================================================
--- upstream/trunk/po/ca.po	2007-11-24 14:02:10 UTC (rev 1459)
+++ upstream/trunk/po/ca.po	2007-11-24 22:41:24 UTC (rev 1460)
@@ -5,8 +5,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-07-19 04:40+0300\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"PO-Revision-Date: 2007-11-24 17:34+0100\n"
 "Last-Translator: Guillem Jover <guillem at debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -198,36 +198,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 ""
 "Forma d'ús: chage [opcions] [USUARI]\n"
 "\n"
 "Opcions:\n"
-"  -d, --lastday ÚLTIM_DIA\testableix l'últim canvi de contrasenya\n"
-"\t\t\t\ta ÚLTIM_DIA\n"
-"  -E, --expiredate DATA_EXPIRACIÓ\testableix la data d'expiració del\n"
-"\t\t\t\tcompte a DATA_EXPIRACIÓ\n"
-"  -h, --help\t\t\tmostra aquesta ajuda i acaba\n"
-"  -I, --inactive INACTIVA\testableix la contrasenya inactiva després\n"
-"\t\t\t\td'expiració a INACTIVA\n"
-"  -l, --list\t\t\tmostra informació d'envelliment del compte\n"
-"  -m, --mindays DIES_MÍN\testableix el número mínim de dies abans\n"
-"\t\t\t\tde canvi de contrasenya a DIES_MÍN\n"
-"  -M, --maxdays DIES_MÀX\testableix el número màxim de dies abans\n"
-"\t\t\t\tde canvi de contrasenya a DIES_MÀX\n"
-"  -W, --warndays DIES_AVÍS\testableix els dies d'avís d'expiració\n"
-"\t\t\t\ta DIES_AVÍS\n"
+"  -d, --lastday ÚLTIM_DIA          estableix l'últim canvi de contrasenya\n"
+"                                   a ÚLTIM_DIA\n"
+"  -E, --expiredate DATA_EXPIRACIÓ  estableix la data d'expiració del\n"
+"                                   compte a DATA_EXPIRACIÓ\n"
+"  -h, --help                       mostra aquesta ajuda i acaba\n"
+"  -I, --inactive INACTIVA          estableix la contrasenya inactiva\n"
+"                                   després d'expiració a INACTIVA\n"
+"  -l, --list                       mostra informació d'envelliment del\n"
+"                                   compte\n"
+"  -m, --mindays DIES_MÍN           estableix el número mínim de dies abans\n"
+"                                   de canvi de contrasenya a DIES_MÍN\n"
+"  -M, --maxdays DIES_MÀX           estableix el número màxim de dies abans\n"
+"                                   de canvi de contrasenya a DIES_MÀX\n"
+"  -W, --warndays DIES_AVÍS         estableix els dies d'avís d'expiració\n"
+"                                   a DIES_AVÍS\n"
 "\n"
 
 #, c-format
@@ -466,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 ""
 "Forma d'ús: chpasswd [opcions]\n"
 "\n"
 "Opcions:\n"
-"  -e, --encrypted\tles contrasenyes proveïdes estan xifrades\n"
-"  -h, --help\t\tmostra aquest missatge d'ajuda i acaba\n"
-"  -m, --md5\t\tusa xifrat MD5 en comptes de DES quan les contrasenyes\n"
-"\t\t\tproveïdes no estan xifrades\n"
+"  -e, --encrypted               les contrasenyes proveïdes estan xifrades\n"
+"  -h, --help                    mostra aquest missatge d'ajuda i acaba\n"
+"  -m, --md5                     usa xifrat MD5 en comptes de DES quan les\n"
+"                                contrasenyes proveïdes no estan xifrades\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 +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 ""
 "Forma d'ús: chsh [opcions] [USUARI]\n"
 "\n"
 "Ocions:\n"
-"  -h, --help\t\t\t\tmostra aquest missatge d'ajuda i acaba\n"
-"  -s, --shell INTÈRPRET\t\t\tnou intèrpret d'accés per al compte d'usuari\n"
+"  -h, --help                    mostra aquest missatge d'ajuda i acaba\n"
+"  -s, --shell INTÈRPRET         nou intèrpret d'accés per al compte "
+"d'usuari\n"
 "\n"
 
 msgid "Login Shell"
@@ -605,31 +609,38 @@
 "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 ""
 "Forma d'ús: faillog [opcions]\n"
 "\n"
 "Opcions:\n"
-"  -a, --all\t\t\tmostra els registres de faillog de tots els usuaris\n"
-"  -h, --help\t\t\tmostra aquest missatge d'ajuda i acaba\n"
-"  -l, --lock-time SEG\t\tbloca durant SEG segons després d'una fallada\n"
-"\t\t\t\td'accés\n"
-"  -m, --maximum MÀX\t\tespecifica els comptadors màxims de fallades\n"
-"\t\t\t\td'accés a MÀX\n"
-"  -r, --reset\t\t\treinicialitza els comptadors de fallades d'accés\n"
-"  -t, --time DIES\t\tmostra registres de faillog més recents que DIES\n"
-"  -u, --user USUARI\t\tmostra registre de faillog o manté comptadors de\n"
-"\t\t\t\tfallades i límits (si es fa servir amb les opcions -r, -m o -l)\n"
-"\t\t\t\tnomés per a l'usuari amb USUARI\n"
+"  -a, --all                     mostra els registres de faillog de tots els\n"
+"                                usuaris\n"
+"  -h, --help                    mostra aquest missatge d'ajuda i acaba\n"
+"  -l, --lock-time SEG           bloca durant SEG segons després d'una\n"
+"                                fallada d'accés\n"
+"  -m, --maximum MÀX             especifica els comptadors màxims de\n"
+"                                fallades d'accés a MÀX\n"
+"  -r, --reset                   reinicialitza els comptadors de fallades\n"
+"                                d'accés\n"
+"  -t, --time DIES               mostra registres de faillog més recents que\n"
+"                                DIES\n"
+"  -u, --user USUARI             mostra registre de faillog o manté\n"
+"                                comptadors de fallades i límits (si es fa\n"
+"                                servir amb les opcions -r, -m o -l) només\n"
+"                                per a l'usuari amb USUARI\n"
 "\n"
 
 #, c-format
@@ -758,26 +769,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 ""
 "Forma d'ús: groupadd [opcions] GRUP\n"
 "\n"
 "Opcions:\n"
-"  -f, --force\t\tforça la sortida amb un estat d'èxit si el grup\n"
-"\t\t\t\tespecificat ja existeix\n"
-"  -g, --gid GID\t\tusa GID per al nou grup\n"
-"  -h, --help\t\t\tmostra aquest missatge d'ajuda i acaba\n"
-"  -K, --key CLAU=VALOR\t\tsubstitueix els valors predeterminats de\n"
-"\t\t\t\t/etc/login.defs\n"
-"  -o, --non-unique\t\tpermet crear grups amb GID duplicats\n"
-"\t\t\t\t(no únics)\n"
+"  -f, --force                   força la sortida amb un estat d'èxit si el\n"
+"                                grup especificat ja existeix\n"
+"  -g, --gid GID                 usa GID per al nou grup\n"
+"  -h, --help                    mostra aquest missatge d'ajuda i acaba\n"
+"  -K, --key CLAU=VALOR          substitueix els valors predeterminats de\n"
+"                                /etc/login.defs\n"
+"  -o, --non-unique              permet crear grups amb GID duplicats\n"
+"                                (no únics)\n"
 "\n"
 
 #, c-format
@@ -905,19 +916,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 ""
 "Forma d'ús: groupmod [opcions] GRUP\n"
 "\n"
 "Opcions:\n"
-"  -g, --gid GID\t\tforça l'ús del nou GID per a GRUP\n"
-"  -h, --help\t\t\tmostra aquest missatge d'ajuda i acaba\n"
-"  -n, --new-name NOU_GRUP\tforça l'ús del nom NOU_GRUP per a GRUP\n"
-"  -o, --non-unique\t\tpermet usar GID duplicats (no únics) per a GRUP\n"
+"  -g, --gid GID                 força l'ús del nou GID per a GRUP\n"
+"  -h, --help                    mostra aquest missatge d'ajuda i acaba\n"
+"  -n, --new-name NOU_GRUP       força l'ús del nom NOU_GRUP per a GRUP\n"
+"  -o, --non-unique              permet usar GID duplicats (no únics) per\n"
+"                                a GRUP\n"
 "\n"
 
 #, c-format
@@ -1069,22 +1082,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 ""
 "Forma d'ús: lastlog [opcions]\n"
 "\n"
 "Opcions:\n"
-"  -b, --before DIES\tmostra només els registres de lastlog més antics\n"
-"\t\t\t\tque DIES\n"
-"  -h, --help\t\tmostra aquest missatge d'ajuda i acaba\n"
-"  -t, --time DIES\tmostra només els registres de lastlog més recents\n"
-"\t\t\t\tque DIES\n"
-"  -u, --user USUARI\tmostra el registre de lastlog per a l'usuari amb\n"
-"\t\t\t\tUSUARI especific\n"
+"  -b, --before DIES             mostra només els registres de lastlog més\n"
+"                                antics que DIES\n"
+"  -h, --help                    mostra aquest missatge d'ajuda i acaba\n"
+"  -t, --time DIES               mostra només els registres de lastlog més\n"
+"                                recents que DIES\n"
+"  -u, --user USUARI             mostra el registre de lastlog per a\n"
+"                                l'usuari amb USUARI especific\n"
 "\n"
 
 #, c-format
@@ -1235,14 +1249,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: no es pot blocar «/etc/passwd».\n"
@@ -1296,49 +1306,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 ""
 "Forma d'ús: passwd [opcions] [USUARI]\n"
 "\n"
 "Opcions:\n"
-"  -a, --all\t\t\tinforma de l'estat de la contrasenya per a tots els\n"
-"\t\t\t\tcomptes\n"
-"  -d, --delete\t\t\tesborra la contrasenya per al compte anomenat\n"
-"  -e, --expire\t\t\tforça la caducitat de la contrasenya per al compte\n"
-"\t\t\t\tanomenat\n"
-"  -h, --help\t\t\tmostra aquest missatge d'ajuda i acaba\n"
-"  -k, --keep-tokens\t\tcanvia la contrasenya només si ha caducat\n"
-"  -i, --inactive INACTIU\testableix la contrasenya a inactiva després\n"
-"\t\t\t\td'INACTIU dies de caducitat\n"
-"  -l, --lock\t\t\tbloca el compte anomenat\n"
-"  -n, --mindays DIES_MÍN\testableix els dies mínims abans del canvi de\n"
-"\t\t\t\tcontrasenya a DIES_MÍN\n"
-"  -q, --quiet\t\t\tmode silenciós\n"
-"  -r, --repository REPOSITORI\tcanvia la contrasenya en el REPOSITORI\n"
-"  -S, --status\t\t\tinforma de l'estat de la contrasenya per al compte\n"
-"\t\t\t\tanomenat\n"
-"  -u, --unlock\t\t\tdesbloca el compte anomenat\n"
-"  -w, --warndays DIES_AVÍS\testableix els dies d'avís de caducitat\n"
-"\t\t\t\ta DIES_AVÍS\n"
-"  -x, --maxdays DIES_MÀX\testableix els dies màxims abans del canvi de\n"
-"\t\t\t\tcontrasenya a DIES_MÀX\n"
+"  -a, --all                     informa de l'estat de la contrasenya\n"
+"                                per a tots els comptes\n"
+"  -d, --delete                  esborra la contrasenya per al compte\n"
+"                                anomenat\n"
+"  -e, --expire                  força la caducitat de la contrasenya per\n"
+"                                al compte anomenat\n"
+"  -h, --help                    mostra aquest missatge d'ajuda i acaba\n"
+"  -k, --keep-tokens             canvia la contrasenya només si ha caducat\n"
+"  -i, --inactive INACTIU        estableix la contrasenya a inactiva després\n"
+"                                d'INACTIU dies de caducitat\n"
+"  -l, --lock                    bloca el compte anomenat\n"
+"  -n, --mindays DIES_MÍN        estableix els dies mínims abans del canvi\n"
+"                                de contrasenya a DIES_MÍN\n"
+"  -q, --quiet                   mode silenciós\n"
+"  -r, --repository REPOSITORI   canvia la contrasenya en el REPOSITORI\n"
+"  -S, --status                  informa de l'estat de la contrasenya per\n"
+"                                al compte anomenat\n"
+"  -u, --unlock                  desbloca el compte anomenat\n"
+"  -w, --warndays DIES_AVÍS      estableix els dies d'avís de caducitat\n"
+"                                a DIES_AVÍS\n"
+"  -x, --maxdays DIES_MÀX        estableix els dies màxims abans del canvi\n"
+"                                de contrasenya a DIES_MÀX\n"
 "\n"
 
 msgid "Old password: "
@@ -1524,26 +1536,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 ""
 "Forma d'ús: su [opcions] [USUARI]\n"
 "\n"
 "Opcions:\n"
-"  -c, --command ORDRE\t\tpassa l'ORDRE a l'intèrpret d'ordres invocat\n"
-"  -h, --help\t\t\tmostra aquest missatge d'ajuda i acaba\n"
-"  -, -l, --login\t\tfes de l'intèrpret d'ordres un d'accés\n"
+"  -c, --command ORDRE           passa l'ORDRE a l'intèrpret d'ordres\n"
+"                                invocat\n"
+"  -h, --help                    mostra aquest missatge d'ajuda i acaba\n"
+"  -, -l, --login                fes de l'intèrpret d'ordres un d'accés\n"
 "  -m, -p,\n"
-"  --preserve-environment\tno reinicialitza les variables d'entorn, i manté\n"
-"\t\t\t\tel mateix intèrpret d'ordres\n"
-"  -s, --shell INTÈRPRET\tfa servir INTÈRPRET en comptes del predeterminat\n"
-"\t\t\t\ta passwd\n"
+"  --preserve-environment        no reinicialitza les variables d'entorn,\n"
+"                                i manté el mateix intèrpret d'ordres\n"
+"  -s, --shell INTÈRPRET         fa servir INTÈRPRET en comptes del\n"
+"                                predeterminat a passwd\n"
 "\n"
 
 #, c-format
@@ -1630,60 +1643,66 @@
 "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 ""
 "Forma d'ús: useradd [opcions] USUARI\n"
 "\n"
 "Opcions:\n"
-"  -b, --base-dir DIR_BASE\tdirectori base per al directori personal del\n"
-"\t\t\t\tnou compte d'usuari\n"
-"  -c, --comment COMENTARI\testableix el camp GECOS per al nou compte\n"
-"\t\t\t\td'usuari\n"
-"  -d, --home-dir DIR_PERSONAL\tdirectori personal per al nou compte\n"
-"  -D, --defaults\t\tmostra o guarda les modificacions a les\n"
-"\t\t\t\td'usuari configuracions predeterminades de useradd\n"
-"  -e, --expiredate DATA_CADUCITAT\testableix la data de caducitat del\n"
-"\t\t\t\tcompte a DATA_CADUCITAT\n"
-"  -f, --inactive INACTIU\testableix la contrasenya a inactiva després\n"
-"\t\t\t\td'INACTIU dies de caducitat\n"
-"  -g, --gid GRUP\t\tforça l'ús del GRUP per al nou compte creat\n"
-"  -G, --groups GRUPS\t\tllista de grups suplementaris per al nou\n"
-"\t\t\t\tcompte d'usuari\n"
-"  -h, --help\t\t\tmostra aquest missatge d'ajuda i acaba\n"
-"  -k, --skel DIR_SKEL\t\tespecifica un directori skel alternatiu\n"
-"  -K, --key CLAU=VALOR\t\tsubstitueix els valors predeterminats de\n"
-"\t\t\t\t/etc/login.defs\n"
-"  -m, --create-home\t\tcrea el directori personal per al nou compte\n"
-"\t\t\t\td'usuari\n"
-"  -o, --non-unique\t\tpermet crear usuaris amb UID duplicats\n"
-"\t\t\t\t(no únics)\n"
-"  -p, --password CONTRASENYA\tusa contrasenya xifrada per al nou compte\n"
-"\t\t\t\td'usuari\n"
-"  -s, --shell INTÈRPRET\t\tl'intèrpret d'accés per al nou compte d'usuari\n"
-"  -u, --uid UID\t\t\tforça l'ús de UID per al nou compte d'usuari\n"
+"  -b, --base-dir DIR_BASE          directori base per al directori personal\n"
+"                                   del nou compte d'usuari\n"
+"  -c, --comment COMENTARI          estableix el camp GECOS per al nou\n"
+"                                   compte d'usuari\n"
+"  -d, --home-dir DIR_PERSONAL      directori personal per al nou compte\n"
+"  -D, --defaults                   mostra o guarda les modificacions a les\n"
+"                                   d'usuari configuracions predeterminades\n"
+"                                   de useradd\n"
+"  -e, --expiredate DATA_CADUCITAT  estableix la data de caducitat del\n"
+"                                   compte a DATA_CADUCITAT\n"
+"  -f, --inactive INACTIU           estableix la contrasenya a inactiva\n"
+"                                   després\n"
+"                                   d'INACTIU dies de caducitat\n"
+"  -g, --gid GRUP                   força l'ús del GRUP per al nou compte\n"
+"                                   creat\n"
+"  -G, --groups GRUPS               llista de grups suplementaris per al nou\n"
+"                                   compte d'usuari\n"
+"  -h, --help                       mostra aquest missatge d'ajuda i acaba\n"
+"  -k, --skel DIR_SKEL              especifica un directori skel alternatiu\n"
+"  -K, --key CLAU=VALOR             substitueix els valors predeterminats de\n"
+"                                   /etc/login.defs\n"
+"  -m, --create-home                crea el directori personal per al nou\n"
+"                                   compte d'usuari\n"
+"  -o, --non-unique                 permet crear usuaris amb UID duplicats\n"
+"                                   (no únics)\n"
+"  -p, --password CONTRASENYA       usa contrasenya xifrada per al nou\n"
+"                                   compte d'usuari\n"
+"  -s, --shell INTÈRPRET            l'intèrpret d'accés per al nou compte\n"
+"                                   d'usuari\n"
+"  -u, --uid UID                    força l'ús de UID per al nou compte\n"
+"                                   d'usuari\n"
 "\n"
 
 #, fuzzy, c-format
@@ -1834,18 +1853,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 ""
 "Forma d'ús: userdel [opcions] USUARI\n"
 "\n"
 "Opcions:\n"
-"  -f, --force\t\t\tforça l'eliminació de fitxers, encara que no siguin\n"
-"\t\t\tpropietat de l'usuari\n"
-"  -h, --help\t\t\tmostra aquesta ajuda i acaba\n"
-"  -r, --remove\t\t\telimina el directori personal i la cua de correu\n"
+"  -f, --force                   força l'eliminació de fitxers, encara que\n"
+"                                no siguin propietat de l'usuari\n"
+"  -h, --help                    mostra aquesta ajuda i acaba\n"
+"  -r, --remove                  elimina el directori personal i la cua\n"
+"                                de correu\n"
 "\n"
 
 #, c-format
@@ -1913,53 +1934,55 @@
 "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 ""
 "Forma d'ús: usermod [opcions] USUARI\n"
 "\n"
 "Opcions:\n"
-"  -a, --append\t\t\tafegeix l'usuari als GRUPS addicionals (usar només\n"
-"\t\t\t\tamb -G)\n"
-"  -c, --comment COMENTARI\t\tnou valor per al camp GECOS\n"
-"  -d, --home DIR_PERSONAL\t\tnou directori personal per al nou compte\n"
-"\t\t\t\td'usuari\n"
-"  -e, --expiredate DATA_CADUCIT\testableix la data de caducitat del compte\n"
-"\t\t\t\ta DATA_CADUCITAT\n"
-"  -f, --inactive INACTIU\testableix la contrasenya a inactiva després\n"
-"\t\t\t\td'INACTIU dies de caducitat\n"
-"  -g, --gid GRUP\t\tforça l'ús de GRUP com a nou grup inicial d'accés\n"
-"  -G, --groups GRUPS\t\tllista de GRUPS addicionals\n"
-"  -h, --help\t\t\tmostra aquest missatge d'ajuda i surt\n"
-"  -l, --login USUARI\t\tnou valor per al nom d'usuari\n"
-"  -L, --lock\t\t\tbloca el compte d'usuari\n"
-"  -m, --move-home\t\tmou els continguts del directori personal a la nova\n"
-"\t\t\t\tubicació (usar només amb -d)\n"
-"  -o, --non-unique\t\tpermet usar UID duplicats (no únics)\n"
-"  -p, --password CONTRASENYA\tusa contrasenya xifrada per a la nova\n"
-"\t\t\t\tcontrasenya\n"
-"  -s, --shell INTÈRPRET\t\tnou intèrpret d'accés per al compte d'usuari\n"
-"  -u, --uid UID\t\t\tnou UID per al compte d'usuari\n"
-"  -U, --unlock\t\t\tdesbloca el compte d'usuari\n"
+"  -a, --append                  afegeix l'usuari als GRUPS addicionals\n"
+"                                (usar només amb -G)\n"
+"  -c, --comment COMENTARI       nou valor per al camp GECOS\n"
+"  -d, --home DIR_PERSONAL       nou directori personal per al nou compte\n"
+"                                d'usuari\n"
+"  -e, --expiredate DATA_CADUCIT estableix la data de caducitat del compte\n"
+"                                a DATA_CADUCITAT\n"
+"  -f, --inactive INACTIU        estableix la contrasenya a inactiva després\n"
+"                                d'INACTIU dies de caducitat\n"
+"  -g, --gid GRUP                força l'ús de GRUP com a nou grup inicial\n"
+"                                d'accés\n"
+"  -G, --groups GRUPS            llista de GRUPS addicionals\n"
+"  -h, --help                    mostra aquest missatge d'ajuda i surt\n"
+"  -l, --login USUARI            nou valor per al nom d'usuari\n"
+"  -L, --lock                    bloca el compte d'usuari\n"
+"  -m, --move-home               mou els continguts del directori personal\n"
+"                                a la nova ubicació (usar només amb -d)\n"
+"  -o, --non-unique              permet usar UID duplicats (no únics)\n"
+"  -p, --password CONTRASENYA    usa contrasenya xifrada per a la nova\n"
+"                                contrasenya\n"
+"  -s, --shell INTÈRPRET         nou intèrpret d'accés per al compte "
+"d'usuari\n"
+"  -u, --uid UID                 nou UID per al compte d'usuari\n"
+"  -U, --unlock                  desbloca el compte d'usuari\n"
 "\n"
 
 #, fuzzy, c-format
@@ -2030,21 +2053,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 ""
 "Forma d'ús: vipw [opcions]\n"
 "\n"
 "Opcions:\n"
-"  -g, --group\t\t\tedita la base de dades de grup\n"
-"  -h, --help\t\t\tmostra aquest missatge d'ajuda i acaba\n"
-"  -p, --passwd\t\t\tedita la base de dades de passwd\n"
-"  -q, --quiet\t\t\tmode silenciós\n"
-"  -s, --shadow\t\t\tedita la base de dades de shadow o gshadow\n"
+"  -g, --group                   edita la base de dades de grup\n"
+"  -h, --help                    mostra aquest missatge d'ajuda i acaba\n"
+"  -p, --passwd                  edita la base de dades de passwd\n"
+"  -q, --quiet                   mode silenciós\n"
+"  -s, --shadow                  edita la base de dades de shadow o gshadow\n"
 "\n"
 
 #, c-format

Modified: upstream/trunk/po/cs.po
===================================================================
--- upstream/trunk/po/cs.po	2007-11-24 14:02:10 UTC (rev 1459)
+++ upstream/trunk/po/cs.po	2007-11-24 22:41:24 UTC (rev 1460)
@@ -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-07-19 13:49+0200\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"PO-Revision-Date: 2007-11-24 18:00+0100\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -201,33 +201,34 @@
 "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 ""
 "Použití: chage [volby] ÚČET\n"
 "\n"
 "Volby:\n"
-"  -d, --lastday POSL_DEN\tnastaví datum poslední změny hesla na POSL_DEN\n"
-"  -E, --expiredate EXP_DATUM\tnastaví datum vypršení účtu na EXP_DATUM\n"
-"  -h, --help\t\t\tzobrazí tuto nápovědu a skončí\n"
-"  -I, --inactive NEAKTIV\tzablokuje účet po NEAKTIV dnech od vypršení\n"
-"\t\t\t\tplatnosti hesla\n"
-"  -l, --list\t\t\tzobrazí informace o účtu\n"
-"  -m, --mindays MIN_DNŮ\tnastaví minimální počet dnů před změnou\n"
-"\t\t\t\thesla na MIN_DNŮ\n"
-"  -M, --maxdays MAX_DNŮ\tnastaví maximální počet dnů před změnou\n"
-"\t\t\t\thesla na MAX_DNŮ\n"
-"  -W, --warndays VAR_DNŮ\tnastaví varování o expiraci na VAR_DNŮ\n"
+"  -d, --lastday POSL_DEN        nastaví datum poslední změny hesla na "
+"POSL_DEN\n"
+"  -E, --expiredate EXP_DATUM    nastaví datum vypršení účtu na EXP_DATUM\n"
+"  -h, --help                    zobrazí tuto nápovědu a skončí\n"
+"  -I, --inactive NEAKTIV        zablokuje účet po NEAKTIV dnech od vypršení\n"
+"                                platnosti hesla\n"
+"  -l, --list                    zobrazí informace o účtu\n"
+"  -m, --mindays MIN_DNŮ         nastaví minimální počet dnů před změnou\n"
+"                                hesla na MIN_DNŮ\n"
+"  -M, --maxdays MAX_DNŮ         nastaví maximální počet dnů před změnou\n"
+"                                hesla na MAX_DNŮ\n"
+"  -W, --warndays VAR_DNŮ        nastaví varování o expiraci na VAR_DNŮ\n"
 "\n"
 
 #, c-format
@@ -467,23 +468,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 ""
 "Použití: chpasswd [volby]\n"
 "\n"
 "Volby:\n"
-"  -e, --encrypted\tzadaná hesla jsou zašifrovaná\n"
-"  -h, --help\t\tzobrazí tuto nápovědu a skončí\n"
-"  -m, --md5\t\tpokud zadaná hesla nejsou zašifrovaná,\n"
-"\t\t\tpoužije místo DES algoritmus MD5\n"
+"  -e, --encrypted               zadaná hesla jsou zašifrovaná\n"
+"  -h, --help                    zobrazí tuto nápovědu a skončí\n"
+"  -m, --md5                     pokud zadaná hesla nejsou zašifrovaná,\n"
+"                                použije místo DES algoritmus 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
@@ -563,15 +566,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 ""
 "Použití: chsh [volby] [ÚČET]\n"
 "\n"
 "Volby:\n"
-"  -h, --help\t\tzobrazí tuto nápovědu a skončí\n"
-"  -s, --shell SHELL\tnový přihlašovací shell uživatele\n"
+"  -h, --help                    zobrazí tuto nápovědu a skončí\n"
+"  -s, --shell SHELL             nový přihlašovací shell uživatele\n"
 "\n"
 
 msgid "Login Shell"
@@ -606,29 +609,36 @@
 "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 ""
 "Použití: faillog [volby]\n"
 "\n"
 "Volby:\n"
-"  -a, --all\t\t\tzobrazí záznamy faillogu o všech uživatelích\n"
-"  -h, --help\t\t\tzobrazí tuto nápovědu a skončí\n"
-"  -l, --lock-time SEK\t\tpo neúspěšném přihlášení zamkne účet na SEC sekund\n"
-"  -m, --maximum MAX\t\tnastaví maximální počet chybných přihlášení na MAX\n"
-"  -r, --reset\t\t\tvynuluje počitadlo chybných přihlášení\n"
-"  -t, --time DNŮ\t\tzobrazí záznamy faillogu novější než DNŮ\n"
-"  -u, --user ÚČET\t\tzobrazí záznamy faillogu nebo upraví počitadla\n"
-"\t\t\t\ta limity chybných přihlášení pouze pro uživatele ÚČET\n"
-"\t\t\t\t(s volbami -r, -m nebo -l)\n"
+"  -a, --all                     zobrazí záznamy faillogu o všech "
+"uživatelích\n"
+"  -h, --help                    zobrazí tuto nápovědu a skončí\n"
+"  -l, --lock-time SEK           po neúspěšném přihlášení zamkne účet na SEC\n"
+"                                sekund\n"
+"  -m, --maximum MAX             nastaví maximální počet chybných přihlášení\n"
+"                                na MAX\n"
+"  -r, --reset                   vynuluje počitadlo chybných přihlášení\n"
+"  -t, --time DNŮ                zobrazí záznamy faillogu novější než DNŮ\n"
+"  -u, --user ÚČET               zobrazí záznamy faillogu nebo upraví\n"
+"                                počitadla a limity chybných přihlášení\n"
+"                                pouze pro uživatele ÚČET (s volbami -r, -m\n"
+"                                nebo -l)\n"
 "\n"
 
 #, c-format
@@ -757,25 +767,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 ""
 "Použití: groupadd [volby] SKUPINA\n"
 "\n"
 "Volby:\n"
-"  -f, --force\t\t\tvynutí úspěšný návratový kód i když\n"
-"\t\t\t\tzadaná skupina existuje\n"
-"  -g, --gid GID\t\t\tpro novou skupinu použije GID\n"
-"  -h, --help\t\t\tzobrazí tuto nápovědu a skončí\n"
-"  -K, --key KLÍČ=HODNOTA\tpřebije výchozí nastavení /etc/login.defs\n"
-"  -o, --non-unique\t\tpovolí vytvoření skupiny s duplicitním\n"
-"\t\t\t\t(nejedinečným) GID\n"
+"  -f, --force                   vynutí úspěšný návratový kód i když\n"
+"                                zadaná skupina existuje\n"
+"  -g, --gid GID                 pro novou skupinu použije GID\n"
+"  -h, --help                    zobrazí tuto nápovědu a skončí\n"
+"  -K, --key KLÍČ=HODNOTA        přebije výchozí nastavení /etc/login.defs\n"
+"  -o, --non-unique              povolí vytvoření skupiny s duplicitním\n"
+"                                (nejedinečným) GID\n"
 "\n"
 
 #, c-format
@@ -903,20 +913,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 ""
 "Použití: groupmod [volby] SKUPINA\n"
 "\n"
 "Volby:\n"
-"  -g, --gid GID\t\t\tpro SKUPINU vynutí nové GID\n"
-"  -h, --help\t\t\tzobrazí tuto nápovědu a skončí\n"
-"  -n, --new-name NOVÁ_SKUPINA\tvnutí SKUPINĚ jméno NOVÁ_SKUPINA\n"
-"  -o, --non-unique\t\tpovolí skupině použít duplicitní\n"
-"\t\t\t\t(nejedinečné) GID\n"
+"  -g, --gid GID                 pro SKUPINU vynutí nové GID\n"
+"  -h, --help                    zobrazí tuto nápovědu a skončí\n"
+"  -n, --new-name NOVÁ_SKUPINA   vnutí SKUPINĚ jméno NOVÁ_SKUPINA\n"
+"  -o, --non-unique              povolí skupině použít duplicitní\n"
+"                                (nejedinečné) GID\n"
 "\n"
 
 #, c-format
@@ -1069,19 +1080,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 ""
 "Použití: lastlog [volby]\n"
 "\n"
 "Volby:\n"
-"  -b, --before DNŮ\tzobrazí záznamy lastlogu starší než DNŮ\n"
-"  -h, --help\t\tzobrazí tuto nápovědu a skončí\n"
-"  -t, --time DNŮ\tzobrazí záznamy lastlogu novější než DNŮ\n"
-"  -u, --user ÚČET\tzobrazí záznamy lastlogu pro uživatele ÚČET\n"
+"  -b, --before DNŮ              zobrazí záznamy lastlogu starší než DNŮ\n"
+"  -h, --help                    zobrazí tuto nápovědu a skončí\n"
+"  -t, --time DNŮ                zobrazí záznamy lastlogu novější než DNŮ\n"
+"  -u, --user ÚČET               zobrazí záznamy lastlogu pro uživatele ÚČET\n"
 "\n"
 
 #, c-format
@@ -1232,14 +1244,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: soubor /etc/passwd nelze zamknout.\n"
@@ -1293,46 +1301,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 ""
 "Použití: passwd [volby] [ÚČET]\n"
 "\n"
 "Volby:\n"
-"  -a, --all\t\t\tvypíše stav hesel na všech účtech\n"
-"  -d, --delete\t\t\tpro zadaný účet smaže heslo\n"
-"  -e, --expire\t\t\tpro zadaný účet vynutí expiraci hesla\n"
-"  -h, --help\t\t\tzobrazí tuto nápovědu a skončí\n"
-"  -k, --keep-tokens\t\tzmění heslo pouze pokud mu vypršela\n"
-"\t\t\t\tplatnost\n"
-"  -i, --inactive NEAKTIV\tzablokuje účet po NEAKTIV dnech od\n"
-"\t\t\t\tvypršení platnosti hesla\n"
-"  -l, --lock\t\t\tzamkne zadaný účet\n"
-"  -n, --mindays MIN_DNŮ\t\tnastaví minimální počet dnů před změnou\n"
-"\t\t\t\thesla na MIN_DNŮ\n"
-"  -q, --quiet\t\t\ttichý režim\n"
-"  -r, --repository REPOSITÁŘ\tzmění heslo v repositáři REPOSITÁŘ\n"
-"  -S, --status\t\t\tpro zadaný účet vypíše stav hesla\n"
-"  -u, --unlock\t\t\todemkne zadaný účet\n"
-"  -w, --warndays VAR_DNŮ\tnastaví varování o expiraci na VAR_DNŮ\n"
-"  -x, --maxdays MAX_DNŮ\t\tnastaví maximální počet dnů před změnou\n"
-"\t\t\t\thesla na MAX_DNŮ\n"
+"  -a, --all                     vypíše stav hesel na všech účtech\n"
+"  -d, --delete                  pro zadaný účet smaže heslo\n"
+"  -e, --expire                  pro zadaný účet vynutí expiraci hesla\n"
+"  -h, --help                    zobrazí tuto nápovědu a skončí\n"
+"  -k, --keep-tokens             změní heslo pouze pokud mu vypršela\n"
+"                                platnost\n"
+"  -i, --inactive NEAKTIV        zablokuje účet po NEAKTIV dnech od\n"
+"                                vypršení platnosti hesla\n"
+"  -l, --lock                    zamkne zadaný účet\n"
+"  -n, --mindays MIN_DNŮ         nastaví minimální počet dnů před změnou\n"
+"                                hesla na MIN_DNŮ\n"
+"  -q, --quiet                   tichý režim\n"
+"  -r, --repository REPOSITÁŘ    změní heslo v repositáři REPOSITÁŘ\n"
+"  -S, --status                  pro zadaný účet vypíše stav hesla\n"
+"  -u, --unlock                  odemkne zadaný účet\n"
+"  -w, --warndays VAR_DNŮ        nastaví varování o expiraci na VAR_DNŮ\n"
+"  -x, --maxdays MAX_DNŮ         nastaví maximální počet dnů před změnou\n"
+"                                hesla na MAX_DNŮ\n"
 "\n"
 
 msgid "Old password: "
@@ -1517,26 +1526,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 ""
 "Použití: su [volby] [ÚČET]\n"
 "\n"
 "Volby:\n"
-"  -c, --command PŘÍKAZ\t\tvyvolanému shellu předá PŘÍKAZ\n"
-"  -h, --help\t\t\tzobrazí tuto nápovědu a skončí\n"
-"  -, -l, --login\t\tnastaví shell jako přihlašovací\n"
+"  -c, --command PŘÍKAZ          vyvolanému shellu předá PŘÍKAZ\n"
+"  -h, --help                    zobrazí tuto nápovědu a skončí\n"
+"  -, -l, --login                nastaví shell jako přihlašovací\n"
 "  -m, -p,\n"
-"  --preserve-environment\tzachová proměnné prostředí a ponechá\n"
-"\t\t\t\tsoučasný shell\n"
-"  -s, --shell SHELL\t\tmísto výchozího shellu definovaného\n"
-"\t\t\t\tv passwd použije SHELL\n"
+"  --preserve-environment        zachová proměnné prostředí a ponechá\n"
+"                                současný shell\n"
+"  -s, --shell SHELL             místo výchozího shellu definovaného\n"
+"                                v passwd použije SHELL\n"
 "\n"
 
 #, c-format
@@ -1623,56 +1632,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 ""
 "Použití: useradd [volby] ÚČET\n"
 "\n"
 "Volby:\n"
-"  -b, --base-dir ZÁKL_ADR\tzákladní adresář domovského adresáře nového\n"
-"\t\t\t\tuživatelského účtu\n"
-"  -c, --comment KOMENTÁŘ\tnastaví pole GECOS nového účtu\n"
-"  -d, --home-dir DOMOV_ADR\tdomovský adresář nového účtu\n"
-"  -D, --defaults\t\tvypíše nebo nastaví výchozí nastavení\n"
-"\t\t\t\tprogramu useradd\n"
-"  -e, --expiredate EXP_DATUM\tnastaví vypršení platnosti účtu na EXP_DATUM\n"
-"  -f, --inactive NEAKTIV\tzablokuje účet po NEAKTIV dnech od vypršení\n"
-"  -g, --gid SKUPINA\t\tvynutí použití této skupiny pro nový účet\n"
-"  -G, --groups SKUPINY\t\tseznam dodatečných skupin, do kterých\n"
-"\t\t\t\tmá nový účet patřit\n"
-"  -h, --help\t\t\tzobrazí tuto nápovědu a skončí\n"
-"  -k, --skel VZOR_ADR\t\tzadá alternativní vzorový adresář\n"
-"  -K, --key KLÍČ=HODNOTA\tpřebije výchozí nastavení /etc/login.defs\n"
-"  -m, --create-home\t\tvytvoří domovský adresář pro nový\n"
-"\t\t\t\tuživatelský účet\n"
-"  -o, --non-unique\t\tpovolí vytvoření uživatele s duplicitním\n"
-"\t\t\t\t(nejedinečným) UID\n"
-"  -p, --password HESLO\t\tpoužije pro nový účet zadané zašifrované\n"
-"\t\t\t\theslo\n"
-"  -s, --shell SHELL\t\tpřihlašovací shell nového účtu\n"
-"  -u, --uid UID\t\t\tvynutí použití tohoto UID pro nový účet\n"
+"  -b, --base-dir ZÁKL_ADR       základní adresář domovského adresáře nového\n"
+"                                uživatelského účtu\n"
+"  -c, --comment KOMENTÁŘ        nastaví pole GECOS nového účtu\n"
+"  -d, --home-dir DOMOV_ADR      domovský adresář nového účtu\n"
+"  -D, --defaults                vypíše nebo nastaví výchozí nastavení\n"
+"                                programu useradd\n"
+"  -e, --expiredate EXP_DATUM    nastaví vypršení platnosti účtu na "
+"EXP_DATUM\n"
+"  -f, --inactive NEAKTIV        zablokuje účet po NEAKTIV dnech od vypršení\n"
+"  -g, --gid SKUPINA             vynutí použití této skupiny pro nový účet\n"
+"  -G, --groups SKUPINY          seznam dodatečných skupin, do kterých\n"
+"                                má nový účet patřit\n"
+"  -h, --help                    zobrazí tuto nápovědu a skončí\n"
+"  -k, --skel VZOR_ADR           zadá alternativní vzorový adresář\n"
+"  -K, --key KLÍČ=HODNOTA        přebije výchozí nastavení /etc/login.defs\n"
+"  -m, --create-home             vytvoří domovský adresář pro nový\n"
+"                                uživatelský účet\n"
+"  -o, --non-unique              povolí vytvoření uživatele s duplicitním\n"
+"                                (nejedinečným) UID\n"
+"  -p, --password HESLO          použije pro nový účet zadané zašifrované\n"
+"                                heslo\n"
+"  -s, --shell SHELL             přihlašovací shell nového účtu\n"
+"  -u, --uid UID                 vynutí použití tohoto UID pro nový účet\n"
 "\n"
 
 #, fuzzy, c-format
@@ -1820,17 +1831,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 ""
 "Použití: userdel [volby] ÚČET\n"
 "\n"
 "VOLBY:\n"
-"  -f, --force\t\tvynutí odstranění souborů, i když je uživatel nevlastní\n"
-"  -h, --help\t\tzobrazí tuto nápovědu a skončí\n"
-"  -r, --remove\t\todstraní domovský adresář a poštovní schránku\n"
+"  -f, --force                   vynutí odstranění souborů,\n"
+"                                i když je uživatel nevlastní\n"
+"  -h, --help                    zobrazí tuto nápovědu a skončí\n"
+"  -r, --remove                  odstraní domovský adresář a poštovní\n"
+"                                schránku\n"
 "\n"
 
 #, c-format
@@ -1896,51 +1910,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 ""
 "Použití: usermod [volby] ÚČET\n"
 "\n"
 "Volby:\n"
-"  -a, --append\t\t\tpřidá uživatele do dalších SKUPIN\n"
-"\t\t\t\t(používejte jen s volbou -G)\n"
-"  -c, --comment KOMENTÁŘ\tnová hodnota pole GECOS\n"
-"  -d, --home-dir DOMOV_ADR\tnový domovský adresář uživatele\n"
-"  -e, --expiredate EXP_DATUM\tnastaví vypršení platnosti účtu na EXP_DATUM\n"
-"  -f, --inactive NEAKTIV\tzablokuje účet po NEAKTIV dnech od vypršení\n"
-"  -g, --gid SKUPINA\t\tnastaví novou primární SKUPINU\n"
-"  -G, --groups SKUPINY\t\tnový seznam dodatečných skupin, do kterých\n"
-"\t\t\t\tmá účet patřit\n"
-"  -h, --help\t\t\tzobrazí tuto nápovědu a skončí\n"
-"  -l, --login NOVÝ_ÚČET\t\tnová hodnota přihlašovacího jména\n"
-"  -L, --lock\t\t\tzamkne uživatelský účet\n"
-"  -m, --move-home\t\tpřesune obsah původního domovského adresáře\n"
-"\t\t\t\tdo nového umístění (používejte pouze s -d)\n"
-"  -o, --non-unique\t\tpovolí vytvoření uživatele s duplicitním\n"
-"\t\t\t\t(nejedinečným) UID\n"
-"  -p, --password HESLO\t\tpoužije nové zašifrované heslo\n"
-"  -s, --shell SHELL\t\tnový přihlašovací shell uživatele\n"
-"  -u, --uid UID\t\t\tnové UID pro uživatelský účet\n"
-"  -U, --unlock\t\t\todemkne uživatelský účet\n"
+"  -a, --append                  přidá uživatele do dalších SKUPIN\n"
+"                                (používejte jen s volbou -G)\n"
+"  -c, --comment KOMENTÁŘ        nová hodnota pole GECOS\n"
+"  -d, --home-dir DOMOV_ADR      nový domovský adresář uživatele\n"
+"  -e, --expiredate EXP_DATUM    nastaví vypršení platnosti účtu na "
+"EXP_DATUM\n"
+"  -f, --inactive NEAKTIV        zablokuje účet po NEAKTIV dnech od vypršení\n"
+"  -g, --gid SKUPINA             nastaví novou primární SKUPINU\n"
+"  -G, --groups SKUPINY          nový seznam dodatečných skupin, do kterých\n"
+"                                má účet patřit\n"
+"  -h, --help                    zobrazí tuto nápovědu a skončí\n"
+"  -l, --login NOVÝ_ÚČET         nová hodnota přihlašovacího jména\n"
+"  -L, --lock                    zamkne uživatelský účet\n"
+"  -m, --move-home               přesune obsah původního domovského adresáře\n"
+"                                do nového umístění (používejte pouze s -d)\n"
+"  -o, --non-unique              povolí vytvoření uživatele s duplicitním\n"
+"                                (nejedinečným) UID\n"
+"  -p, --password HESLO          použije nové zašifrované heslo\n"
+"  -s, --shell SHELL             nový přihlašovací shell uživatele\n"
+"  -u, --uid UID                 nové UID pro uživatelský účet\n"
+"  -U, --unlock                  odemkne uživatelský účet\n"
 "\n"
 
 #, fuzzy, c-format
@@ -2010,21 +2025,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 ""
 "Použití: vipw [volby]\n"
 "\n"
 "Volby:\n"
-"  -g, --group\t\t\tupraví databázi skupin\n"
-"  -h, --help\t\t\tzobrazí tuto nápovědu a skončí\n"
-"  -p, --passwd\t\t\tupraví databázi hesel\n"
-"  -q, --quiet\t\t\ttichý režim\n"
-"  -s, --shadow\t\t\tupraví databázi shadow nebo gshadow\n"
+"  -g, --group                   upraví databázi skupin\n"
+"  -h, --help                    zobrazí tuto nápovědu a skončí\n"
+"  -p, --passwd                  upraví databázi hesel\n"
+"  -q, --quiet                   tichý režim\n"
+"  -s, --shadow                  upraví databázi shadow nebo gshadow\n"
 "\n"
 
 #, c-format

Modified: upstream/trunk/po/da.po
===================================================================
--- upstream/trunk/po/da.po	2007-11-24 14:02:10 UTC (rev 1459)
+++ upstream/trunk/po/da.po	2007-11-24 22:41:24 UTC (rev 1460)
@@ -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: 2006-07-18 21:31+0200\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"PO-Revision-Date: 2007-11-24 18:50+0100\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul at gmail.com>\n"
 "Language-Team: Danish\n"
 "MIME-Version: 1.0\n"
@@ -199,34 +199,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 ""
 "Brug: chage [tilvalg] [LOGIND]\n"
 "\n"
 "Tilvalg:\n"
-"  -d, --lastday SIDSTE_DAG\tsæt seneste adgangskodeændring til SIDSTE_DAG\n"
-"  -E, --expiredate UDLØBSDATO\tsæt kontoens udløbsdato til UDLØBSDATO\n"
-"  -h, --help\t\t\tvis denne hjælpebesked og afslut\n"
-"  -I, --inactive INAKTIVT\tsæt inaktiv adgangskode efter udløb til INAKTIVT\n"
-"  -l, --list\t\t\tvis forældelsesoplysninger for konto\n"
-"  -m, --mindays MIN_DAGE\tsæt minimalt antal dage inden adgangskodeændring\n"
-"\t\t\t\ttil MIN_DAGE\n"
-"  -M, --maxdays MAKS_DAGE\tsæt maksimalt antal dage inden\n"
-"\t\t\t\tadgangskodeændring\n"
-"\t\t\t\ttil MAKS_DAGE\n"
-"  -W, --warndays VARSELSDAGE\tsæt antallet af udløbsvarselsdage til\n"
-"\t\t\t\tVARSELSDAGE\n"
+"  -d, --lastday SIDSTE_DAG      sæt seneste adgangskodeændring til "
+"SIDSTE_DAG\n"
+"  -E, --expiredate UDLØBSDATO   sæt kontoens udløbsdato til UDLØBSDATO\n"
+"  -h, --help                    vis denne hjælpebesked og afslut\n"
+"  -I, --inactive INAKTIVT       sæt inaktiv adgangskode efter udløb til "
+"INAKTIVT\n"
+"  -l, --list                    vis forældelsesoplysninger for konto\n"
+"  -m, --mindays MIN_DAGE        sæt minimalt antal dage inden "
+"adgangskodeændring\n"
+"                                til MIN_DAGE\n"
+"  -M, --maxdays MAKS_DAGE       sæt maksimalt antal dage inden\n"
+"                                adgangskodeændring\n"
+"                                til MAKS_DAGE\n"
+"  -W, --warndays VARSELSDAGE    sæt antallet af udløbsvarselsdage til\n"
+"                                VARSELSDAGE\n"
 "\n"
 
 #, c-format
@@ -464,23 +467,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 ""
 "Brug: chpasswd [tilvalg]\n"
 "\n"
 "Tilvalg:\n"
-"  -e, --encrypted\tde angivne adgangskoder er krypterede\n"
-"  -h, --help\t\tvis denne hjælpetekst og afslut\n"
-"  -m, --md5\t\tbrug MD5-kryptering i stedet for DES, når de angivne\n"
-"\t\t\tadgangskoder ikke er krypterede\n"
+"  -e, --encrypted               de angivne adgangskoder er krypterede\n"
+"  -h, --help                    vis denne hjælpetekst og afslut\n"
+"  -m, --md5                     brug MD5-kryptering i stedet for DES, når\n"
+"                                de angivne adgangskoder ikke er krypterede\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
@@ -560,17 +565,17 @@
 "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 ""
 "Brug: chsh [tilvalg] [LOGIND]\n"
 "\n"
 "Tilvalg:\n"
-"  -f, --force\t\t\tgennemtving fjernelse af filer, selvom de ikke ejers af "
-"brugeren\n"
-"  -h, --help\t\t\tvis denne hjælpebesked og afslut\n"
-"  -s, --shell SKAL\t\t\tny logind-skal for brugerkontoen\n"
+"  -f, --force                   gennemtving fjernelse af filer, selvom\n"
+"                                de ikke ejers af brugeren\n"
+"  -h, --help                    vis denne hjælpebesked og afslut\n"
+"  -s, --shell SKAL              ny logind-skal for brugerkontoen\n"
 "\n"
 
 msgid "Login Shell"
@@ -605,30 +610,36 @@
 "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 ""
 "Brug: faillog [tilvalg]\n"
 "\n"
 "Tilvalg:\n"
-"  -a, --all\t\t\tvis fejllog-optegnelser for alle brugere\n"
-"  -h, --help\t\t\tvis denne hjælpetekst og afslut\n"
-"  -l, --lock-time SEK\t\tlås konto i SEK sekunder efter mislykket logind\n"
-"  -m, -- maximum MAKS\t\tsæt det maksimale antal mislykkede logind til MAKS\n"
-"  -r, --reset\t\t\tnulstil optællingen af mislykkede logind\n"
-"  -r, --time DAGE\t\tvis fejllog-optegnelser, der er nyere end DAGE\n"
-"  -u, --user LOGIND\t\tvis fejllog-optegnelser eller vedligehold kun\n"
-"\t\t\t\tfejltællere\n"
-"\t\t\t\tog grænser (hvis den bruges sammen med tilvalgene -r, -m eller -l)\n"
-"\t\t\t\tfor brugeren med LOGIND\n"
+"  -a, --all                     vis fejllog-optegnelser for alle brugere\n"
+"  -h, --help                    vis denne hjælpetekst og afslut\n"
+"  -l, --lock-time SEK           lås konto i SEK sekunder efter mislykket\n"
+"                                logind\n"
+"  -m, -- maximum MAKS           sæt det maksimale antal mislykkede logind\n"
+"                                til MAKS\n"
+"  -r, --reset                   nulstil optællingen af mislykkede logind\n"
+"  -r, --time DAGE               vis fejllog-optegnelser, der er nyere end\n"
+"                                DAGE\n"
+"  -u, --user LOGIND             vis fejllog-optegnelser eller vedligehold\n"
+"                                kun fejltællere og grænser (hvis den bruges\n"
+"                                sammen med tilvalgene -r, -m eller -l) for\n"
+"                                brugeren med LOGIND\n"
 "\n"
 
 #, c-format
@@ -757,25 +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 ""
 "Brug: groupadd [tilvalg] GRUPPE\n"
 "\n"
 "Tilvalg:\n"
-"  -f, --force\t\tgennemtving success-afslutningsstatus hvis den\n"
-"\t\t\t\tangivne gruppe eksisterer i forvejen\n"
-"  -g, --gid GID\t\tbenyt GID til den nye gruppe\n"
-"  -h, --help\t\t\tvis denne hjælpebesked og afslut\n"
-"  -K, --key NØGLE=VÆRDI\t\ttilsidesætter standardværdier i/etc/login.defs\n"
-"  -o, --non-unique\t\ttillad gruppe med dupleret\n"
-"\t\t\t\t(ikke-unikt) GID\n"
+"  -f, --force                   gennemtving success-afslutningsstatus hvis\n"
+"                                den angivne gruppe eksisterer i forvejen\n"
+"  -g, --gid GID                 benyt GID til den nye gruppe\n"
+"  -h, --help                    vis denne hjælpebesked og afslut\n"
+"  -K, --key NØGLE=VÆRDI         tilsidesætter standardværdier i\n"
+"                                /etc/login.defs\n"
+"  -o, --non-unique              tillad gruppe med dupleret\n"
+"                                (ikke-unikt) GID\n"
 "\n"
 
 #, c-format
@@ -904,20 +916,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 ""
 "Brug: groupmod [tilvalg] GRUPPE\n"
 "\n"
 "Tilvalg:\n"
-"  -g, --gid GID\t\tgennemtving GID til den nye gruppe\n"
-"  -h, --help\t\t\tvis denne hjælpebesked og afslut\n"
-"  -n, --new-name NY_GRUPPE\tgennemtving NY_GRUPPE-navn efter GRUPPE\n"
-"  -o, --non-unique\t\ttillad gruppe med dupleret (ikke-unikt) GID efter\n"
-"\t\t\t\tGRUPPE\n"
+"  -g, --gid GID                 gennemtving GID til den nye gruppe\n"
+"  -h, --help                    vis denne hjælpebesked og afslut\n"
+"  -n, --new-name NY_GRUPPE      gennemtving NY_GRUPPE-navn efter GRUPPE\n"
+"  -o, --non-unique              tillad gruppe med dupleret (ikke-unikt) GID\n"
+"                                efter GRUPPE\n"
 "\n"
 
 #, c-format
@@ -1069,20 +1082,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 ""
 "Brug: lastlog [tilvalg]\n"
 "\n"
 "Tilvalg:\n"
-"  -b, --before DAGE\tvis kun lastlog-optegnelser, der er ældre end DAGE\n"
-"  -h, --help\t\tvis denne hjælpebesked og afslut\n"
-"  -t, --time DAGE\tvis kun lastlog-optegnelser, der er nyere end DAGE\n"
-"  -u, --user LOGIND\tvis lastlog-optegnelser for brugeren med det angivne\n"
-"\t\t\tLOGIND\n"
+"  -b, --before DAGE             vis kun lastlog-optegnelser, der er ældre\n"
+"                                end DAGE\n"
+"  -h, --help                    vis denne hjælpebesked og afslut\n"
+"  -t, --time DAGE               vis kun lastlog-optegnelser, der er nyere\n"
+"                                end DAGE\n"
+"  -u, --user LOGIND             vis lastlog-optegnelser for brugeren med\n"
+"                                det angivne LOGIND\n"
 "\n"
 
 #, c-format
@@ -1233,14 +1249,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,45 +1306,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 ""
 "Brug: passwd [tilvalg] [LOGIND]\n"
 "\n"
 "Tilvalg:\n"
-"  -a, --all\t\t\trapportér alle kontis adgangskodestatus\n"
-"  -d, --delete\t\t\tslet den navngivne kontos adgangskode\n"
-"  -e, --expire\t\t\tgennemtving udløb af den navngivne kontos adgangskode\n"
-"  -h, --help\t\t\tvis denne hjælpebesked og afslut\n"
-"  -k, --keep-tokens\t\tskift kun adgangskode, hvis den er udløbet\n"
-"  -i, --inactive INAKTIVT\tset udløbne adgangskoder til\n"
-"\t\t\t\tto INAKTIVT\n"
-"  -l, --lock\t\t\tlæs den navngivne konto\n"
-"  -n, --mindays MIN_DAGE\tangiv minimale antal dage inden skift af\n"
-"\t\t\t\tadgangskode til MIN_DAGE\n"
-"  -q, --quiet\t\t\ttavs tilstand\n"
-"  -r, --repository SAMLING\tskift adgangskode i samlingen SAMLING\n"
-"  -S, --status\t\t\traportér den navngivne kontos adgangskodestatus\n"
-"  -u, --unlock\t\t\tåbn den navngivne konto\n"
-"  -w, --warndays ADVAR_DAGE\tadvar om udløb i ADVAR_DAGE dage\n"
-"  -x, --maxdays MAKS_DAGE\tsæt det maksimale antal dage inden skift af\n"
-"\t\t\t\tadgangskode til MAKS_DAGE\n"
+"  -a, --all                     rapportér alle kontis adgangskodestatus\n"
+"  -d, --delete                  slet den navngivne kontos adgangskode\n"
+"  -e, --expire                  gennemtving udløb af den navngivne kontos\n"
+"                                adgangskode\n"
+"  -h, --help                    vis denne hjælpebesked og afslut\n"
+"  -k, --keep-tokens             skift kun adgangskode, hvis den er udløbet\n"
+"  -i, --inactive INAKTIVT       set udløbne adgangskoder til to INAKTIVT\n"
+"  -l, --lock                    læs den navngivne konto\n"
+"  -n, --mindays MIN_DAGE        angiv minimale antal dage inden skift af\n"
+"                                adgangskode til MIN_DAGE\n"
+"  -q, --quiet                   tavs tilstand\n"
+"  -r, --repository SAMLING      skift adgangskode i samlingen SAMLING\n"
+"  -S, --status                  raportér den navngivne kontos\n"
+"                                adgangskodestatus\n"
+"  -u, --unlock                  åbn den navngivne konto\n"
+"  -w, --warndays ADVAR_DAGE     advar om udløb i ADVAR_DAGE dage\n"
+"  -x, --maxdays MAKS_DAGE       sæt det maksimale antal dage inden skift af\n"
+"                                adgangskode til MAKS_DAGE\n"
 "\n"
 
 msgid "Old password: "
@@ -1516,25 +1530,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 ""
 "Brug: su [tilvalg] [LOGIND]\n"
 "\n"
 "Tilvalg:\n"
-"  -c, --command KOMMANDO\t\tvideregiv KOMMANDO til den startede skal\n"
-"  -h, --help\t\t\tvis denne hjælpebesked og afslut\n"
-"  -, -l, --login\t\tgør skallen til en logind-skal\n"
+"  -c, --command KOMMANDO        videregiv KOMMANDO til den startede skal\n"
+"  -h, --help                    vis denne hjælpebesked og afslut\n"
+"  -, -l, --login                gør skallen til en logind-skal\n"
 "  -m, -p,\n"
-"  --preserve-environment\tnulstil ikke miljøvariable, og behold\n"
-"\t\t\t\tden samme skal\n"
-"  -s, --shell SKAL\t\tbenyt SKAL i stedet for standard-skallen i passwd\n"
+"  --preserve-environment        nulstil ikke miljøvariable, og behold\n"
+"                                den samme skal\n"
+"  -s, --shell SKAL              benyt SKAL i stedet for standard-skallen\n"
+"                                i passwd\n"
 "\n"
 
 #, c-format
@@ -1621,54 +1636,59 @@
 "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 ""
 "Brug: useradd [tilvalg] LOGIND\n"
 "\n"
 "Tilvalg:\n"
-"  -b, --base-dir GRUNDMAPPE\tGrundmappe for den nye brugerkontos\n"
-"\t\t\t\thjemmebibliotek\n"
-"  -c, --comment KOMMENTAR\t\tsæt den nye brugerkontos GECOS-felt\n"
-"  -d, --home-dir HJEMMEMAPPE\tden nye brugerkontos hjemmemappe\n"
-"  -D, --defaults\t\tvis skal gem ændret standard useradd-opsætning\n"
-"  -e, --expiredate UDLØBSDATO\tsæt kontoens udløbsdatur til UDLØBSDATO\n"
-"  -f, --inactive INAKTIV\tsæt inaktiv adgangskode efter udløb til INAKTIV\n"
-"  -g, --gid GRUPPE\t\tgennemtving brugen af GRUPPE til den nye brugerkonto\n"
-"  -G, --groups GRUPPER\t\tvis den nye brugerkontos supplerende grupper\n"
-"  -h, --help\t\t\tvis denne hjælp og afslut\n"
-"  -k, --skel SKELETMAPPE\t\tangiv en alternativ skeletmappe\n"
-"  -K, --key NØGLE=VÆRDI\t\ttilsidesætter standardindstillingerne\n"
-"\t\t\t\ti /etc/login.defs\n"
-"  -m, --create-home\t\topret hjemmemappe til den nye brugerkonto\n"
-"  -o, --non-unique\t\ttillad oprettelse af ens (ikke-unikke) UID\n"
-"  -p, --password ADGANGSKODE\tbrug krypteret adgangskode til den nye\n"
-"\t\t\t\tbrugerkonto\n"
-"  -s, --shell SKAL\t\tden nye brugerkontos logind-skal\n"
-"  -u, --uid UID\t\t\tgennemtving brugen af bruger-ID'en UID til den nye\n"
-"\t\t\t\tbrugerkonto\n"
+"  -b, --base-dir GRUNDMAPPE     Grundmappe for den nye brugerkontos\n"
+"                                hjemmebibliotek\n"
+"  -c, --comment KOMMENTAR       sæt den nye brugerkontos GECOS-felt\n"
+"  -d, --home-dir HJEMMEMAPPE    den nye brugerkontos hjemmemappe\n"
+"  -D, --defaults                vis skal gem ændret standard\n"
+"                                useradd-opsætning\n"
+"  -e, --expiredate UDLØBSDATO   sæt kontoens udløbsdatur til UDLØBSDATO\n"
+"  -f, --inactive INAKTIV        sæt inaktiv adgangskode efter udløb til\n"
+"                                INAKTIV\n"
+"  -g, --gid GRUPPE              gennemtving brugen af GRUPPE til den nye\n"
+"                                brugerkonto\n"
+"  -G, --groups GRUPPER          vis den nye brugerkontos supplerende "
+"grupper\n"
+"  -h, --help                    vis denne hjælp og afslut\n"
+"  -k, --skel SKELETMAPPE        angiv en alternativ skeletmappe\n"
+"  -K, --key NØGLE=VÆRDI         tilsidesætter standardindstillingerne\n"
+"                                i /etc/login.defs\n"
+"  -m, --create-home             opret hjemmemappe til den nye brugerkonto\n"
+"  -o, --non-unique              tillad oprettelse af ens (ikke-unikke) UID\n"
+"  -p, --password ADGANGSKODE    brug krypteret adgangskode til den nye\n"
+"                                brugerkonto\n"
+"  -s, --shell SKAL              den nye brugerkontos logind-skal\n"
+"  -u, --uid UID                 gennemtving brugen af bruger-ID'en UID til\n"
+"                                den nye brugerkonto\n"
 "\n"
 
 #, fuzzy, c-format
@@ -1816,18 +1836,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 ""
 "Brug: userdel [tilvalg] LOGIND\n"
 "\n"
 "Tilvalg:\n"
-"  -f, --force\t\t\tgennemtving fjernelse af filer, selvom de ikke ejers af\n"
-"\t\t\t\tbrugeren\n"
-"  -h, --help\t\t\tvis denne hjælpebesked og afslut\n"
-"  -r, --remove\t\t\tfjern home-mappen og postkøen\n"
+"  -f, --force                   gennemtving fjernelse af filer,\n"
+"                                selvom de ikke ejers af brugeren\n"
+"  -h, --help                    vis denne hjælpebesked og afslut\n"
+"  -r, --remove                  fjern home-mappen og postkøen\n"
 "\n"
 
 #, c-format
@@ -1893,50 +1914,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 ""
 "Brug: usermod [tilvalg] LOGIND\n"
 "\n"
 "Tilvalg:\n"
-"  -a, --append GRUPPE\t\ttilføj brugeren til en supplerende GRUPPE\n"
-"  -c, --comment KOMMENTAR\tny værdi til GECOS-feltet\n"
-"  -d, --home-dir HJEMMEMAPPE\tden nye brugerkontos hjemmemappe\n"
-"  -e, --expiredate UDLØBSDATO\tsæt kontoens udløbsdato til UDLØBSDATO\n"
-"  -f, --inactive INAKTIV\tsæt inaktiv adgangskode  til INAKTIV efter udløb\n"
-"  -g, --gid GRUPPE\t\tgennemtving brugen af GRUPPE til den nye primære\n"
-"\t\t\t\tgruppe\n"
-"  -G, --groups GRUPPER\t\tny liste med supplerende grupper\n"
-"  -h, --help\t\t\tvis denne hjælpebesked og afslut\n"
-"  -l, --login NYT_LOGIND\t\tny værdi til logind-navnet\n"
-"  -L, --lock\t\t\tlås brugerkontoen\n"
-"  -m, --move-home\t\tflyt indholdet af hjemmemappen til den nye\n"
-"\t\t\t\tplacering (brug kun sammen med -d)\n"
-"  -o, --non-unique\t\ttillad oprettelse af ens (ikke-unikke) UID\n"
-"  -p, --password ADGANGSKODE\tbrug krypteret adgangskode til den nye\n"
-"\t\t\t\tadgangskode\n"
-"  -s, --shell SKAL\t\tden nye brugerkontos logind-skal\n"
-"  -u, --uid UID\t\t\tny UID til brugerkontoen\n"
-"  -U, --unlock\t\t\tfjern lås fra brugerkontoen\n"
+"  -a, --append GRUPPE           tilføj brugeren til en supplerende GRUPPE\n"
+"  -c, --comment KOMMENTAR       ny værdi til GECOS-feltet\n"
+"  -d, --home-dir HJEMMEMAPPE    den nye brugerkontos hjemmemappe\n"
+"  -e, --expiredate UDLØBSDATO   sæt kontoens udløbsdato til UDLØBSDATO\n"
+"  -f, --inactive INAKTIV        sæt inaktiv adgangskode til INAKTIV efter\n"
+"                                udløb\n"
+"  -g, --gid GRUPPE              gennemtving brugen af GRUPPE til den nye\n"
+"                                primære gruppe\n"
+"  -G, --groups GRUPPER          ny liste med supplerende grupper\n"
+"  -h, --help                    vis denne hjælpebesked og afslut\n"
+"  -l, --login NYT_LOGIND        ny værdi til logind-navnet\n"
+"  -L, --lock                    lås brugerkontoen\n"
+"  -m, --move-home               flyt indholdet af hjemmemappen til den nye\n"
+"                                placering (brug kun sammen med -d)\n"
+"  -o, --non-unique              tillad oprettelse af ens (ikke-unikke) UID\n"
+"  -p, --password ADGANGSKODE    brug krypteret adgangskode til den nye\n"
+"                                adgangskode\n"
+"  -s, --shell SKAL              den nye brugerkontos logind-skal\n"
+"  -u, --uid UID                 ny UID til brugerkontoen\n"
+"  -U, --unlock                  fjern lås fra brugerkontoen\n"
 "\n"
 
 #, fuzzy, c-format
@@ -2006,21 +2028,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 ""
 "Brug: vipw [tilvalg]\n"
 "\n"
 "Options:\n"
-"  -g, --group\t\t\tret gruppedatabasen\n"
-"  -h, --help\t\t\tvis denne hjælpebesked og afslut\n"
-"  -p, --passwd\t\t\tredigér passwd-databasen\n"
-"  -q, --quiet\t\t\tstille tilstand\n"
-"  -s, --shadow\t\t\tret shadow- eller gshadow-databasen\n"
+"  -g, --group                   ret gruppedatabasen\n"
+"  -h, --help                    vis denne hjælpebesked og afslut\n"
+"  -p, --passwd                  redigér passwd-databasen\n"
+"  -q, --quiet                   stille tilstand\n"
+"  -s, --shadow                  ret shadow- eller gshadow-databasen\n"
 "\n"
 
 #, c-format

Modified: upstream/trunk/po/de.po
===================================================================
--- upstream/trunk/po/de.po	2007-11-24 14:02:10 UTC (rev 1459)
+++ upstream/trunk/po/de.po	2007-11-24 22:41:24 UTC (rev 1460)
@@ -8,8 +8,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 21:03+0200\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"PO-Revision-Date: 2007-11-24 16:48+0100\n"
 "Last-Translator: Holger Wansing <linux at wansing-online.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -200,35 +200,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 ""
 "Aufruf: chage [Optionen] Benutzer\n"
 "\n"
 "Optionen:\n"
-"  -d, --lastday LAST_DAY\tTag der letzten Kennwortänderung auf LAST_DAY\n"
-"\t\t\t\tsetzen\n"
-"  -E, --expiredate EXPIRE_DATE\tAblaufdatum des Benutzerkontos auf\n"
-"\t\t\t\tEXPIRE_DATE setzen\n"
-"  -h, --help\t\t\tDiese Hilfe anzeigen, sonst nichts\n"
-"  -I, --inactive INACTIVE\tKennwort nach Ablauf von INACTIVE deaktivieren\n"
-"  -l, --list\t\t\tInformationen zu Ablaufdaten usw. anzeigen\n"
-"  -m, --mindays MIN_DAYS\tMinimale Anzahl der Tage vor Kennwortänderung\n"
-"\t\t\t\tauf MIN_DAYS setzen\n"
-"  -M, --maxdays MAX_DAYS\tMaximale Anzahl der Tage vor Kennwortänderung\n"
-"\t\t\t\tauf MAX_DAYS setzen\n"
-"  -W, --warndays WARN_DAYS\tAnzahl der Tage für Ablaufwarnung auf WARN_DAYS\n"
-"\t\t\t\tsetzen\n"
+"  -d, --lastday LAST_DAY        Tag der letzten Kennwortänderung auf\n"
+"                                LAST_DAY setzen\n"
+"  -E, --expiredate EXPIRE_DATE  Ablaufdatum des Benutzerkontos auf\n"
+"                                EXPIRE_DATE setzen\n"
+"  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
+"  -I, --inactive INACTIVE       Kennwort nach Ablauf von INACTIVE\n"
+"                                deaktivieren\n"
+"  -l, --list                    Informationen zu Ablaufdaten usw. anzeigen\n"
+"  -m, --mindays MIN_DAYS        Minimale Anzahl der Tage vor\n"
+"                                Kennwortänderung auf MIN_DAYS setzen\n"
+"  -M, --maxdays MAX_DAYS        Maximale Anzahl der Tage vor\n"
+"                                Kennwortänderung auf MAX_DAYS setzen\n"
+"  -W, --warndays WARN_DAYS      Anzahl der Tage für Ablaufwarnung auf\n"
+"                                WARN_DAYS setzen\n"
 "\n"
 
 #, c-format
@@ -466,23 +467,26 @@
 "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 ""
 "Aufruf: chpasswd [Optionen]\n"
 "\n"
 "Optionen:\n"
-"  -e, --encrypted\tAngegebene Kennwörter sind verschlüsselt\n"
-"  -h, --help\t\tDiese Hilfe anzeigen, sonst nichts\n"
-"  -m, --md5\t\tMD5-Verschlüsselung statt DES verwenden, wenn\n"
-"\t\t\tdie angegebenen Kennwörter nicht verschlüsselt sind\n"
+"  -e, --encrypted               Angegebene Kennwörter sind verschlüsselt\n"
+"  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
+"  -m, --md5                     MD5-Verschlüsselung statt DES verwenden,\n"
+"                                wenn die angegebenen Kennwörter nicht\n"
+"                                verschlüsselt sind\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
@@ -562,17 +566,18 @@
 "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 ""
 "Aufruf: userdel [Optionen] LOGIN\n"
 "\n"
 "Optionen:\n"
-"  -f, --force\t\t\tEntfernen von Dateien erzwingen, auch wenn sie\n"
-"\t\t\t\tnicht Eigentum des zu löschenden Benutzers sind\n"
-"  -h, --help\t\t\tDiese Hilfe anzeigen, sonst nichts\n"
-"  -r, --remove\t\t\tEntferne Home- und Mail-Spool-Verzeichnis\n"
+"  -f, --force                   Entfernen von Dateien erzwingen, auch wenn\n"
+"                                sie nicht Eigentum des zu löschenden\n"
+"                                Benutzers sind\n"
+"  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
+"  -r, --remove                  Entferne Home- und Mail-Spool-Verzeichnis\n"
 "\n"
 
 msgid "Login Shell"
@@ -607,31 +612,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 ""
 "Aufruf: faillog [Optionen]\n"
 "\n"
 "Optionen:\n"
-"  -a, --all\t\t\tDatensätze für alle Benutzer anzeigen\n"
-"  -h, --help\t\t\tDiese Hilfe anzeigen, sonst nichts\n"
-"  -l, --lock-time SEC\t\tDas Benutzerkonto nach fehlgeschlagener\n"
-"\t\t\t\tAnmeldung für SEC Sekunden sperren\n"
-"  -m, --maximum MAX\t\tMaximal mögliche Anzahl fehlgeschlagener Anmeldungen\n"
-"\t\t\t\tauf MAX setzen\n"
-"  -r, --reset\t\t\tZähler fehlgeschlagener Anmeldungen zurücksetzen\n"
-"  -t, --time DAYS\t\tDatensätze anzeigen, die jünger sind als DAYS Tage\n"
-"  -u, --user LOGIN\t\tAnzeigen von Datensätzen bzw. Verwalten von Zählern\n"
-"\t\t\t\tund Grenzen (falls mit Optionen -r, -m oder -l aufgerufen) nur\n"
-"\t\t\t\tfür das Benutzerkonto LOGIN\n"
+"  -a, --all                     Datensätze für alle Benutzer anzeigen\n"
+"  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
+"  -l, --lock-time SEC           Das Benutzerkonto nach fehlgeschlagener\n"
+"                                Anmeldung für SEC Sekunden sperren\n"
+"  -m, --maximum MAX             Maximal mögliche Anzahl fehlgeschlagener\n"
+"                                Anmeldungen auf MAX setzen\n"
+"  -r, --reset                   Zähler fehlgeschlagener Anmeldungen\n"
+"                                zurücksetzen\n"
+"  -t, --time DAYS               Datensätze anzeigen, die jünger sind als\n"
+"                                DAYS Tage\n"
+"  -u, --user LOGIN              Anzeigen von Datensätzen bzw. Verwalten von\n"
+"                                Zählern und Grenzen (falls mit Optionen -r,\n"
+"                                -m oder -l aufgerufen) nur für das\n"
+"                                Benutzerkonto LOGIN\n"
 "\n"
 
 #, c-format
@@ -760,24 +771,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 ""
 "Aufruf: groupadd [Optionen] Gruppe\n"
 "\n"
 "Optionen:\n"
-"  -f, --force\t\tErfolgreich beenden, wenn die Gruppe bereits existiert\n"
-"  -g, --gid GID\t\tdiese GID für die neue Gruppe benutzen\n"
-"  -h, --help\t\t\tDiese Hilfe anzeigen, sonst nichts\n"
-"  -K, --key KEY=WERT\t\tDie Standards in /etc/login.defs überschreiben\n"
-"  -o, --non-unique\t\tDas Erstellen einer Gruppe mit einer nicht\n"
-"\t\t\t\teinmaligen (doppelten) GID erlauben\n"
+"  -f, --force                   Erfolgreich beenden, wenn die Gruppe\n"
+"                                bereits existiert\n"
+"  -g, --gid GID                 diese GID für die neue Gruppe benutzen\n"
+"  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
+"  -K, --key KEY=WERT            Die Standards in /etc/login.defs\n"
+"                                überschreiben\n"
+"  -o, --non-unique              Das Erstellen einer Gruppe mit einer nicht\n"
+"                                einmaligen (doppelten) GID erlauben\n"
 "\n"
 
 #, c-format
@@ -905,21 +918,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 ""
 "Aufruf: groupadd [Optionen] Gruppe\n"
 "\n"
 "Optionen:\n"
-"  -f, --force\t\tErfolgreich beenden, wenn die Gruppe bereits existiert\n"
-"  -g, --gid GID\t\tdiese GID für die neue Gruppe benutzen\n"
-"  -h, --help\t\t\tDiese Hilfe anzeigen, sonst nichts\n"
-"  -K, --key KEY=WERT\t\tDie Standards in /etc/login.defs überschreiben\n"
-"  -o, --non-unique\t\tDas Erstellen einer Gruppe mit einer nicht\n"
-"\t\t\t\teinmaligen (doppelten) GID erlauben\n"
+"  -f, --force                   Erfolgreich beenden, wenn die Gruppe\n"
+"                                bereits existiert\n"
+"  -g, --gid GID                 diese GID für die neue Gruppe benutzen\n"
+"  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
+"  -K, --key KEY=WERT            Die Standards in /etc/login.defs\n"
+"                                überschreiben\n"
+"  -o, --non-unique              Das Erstellen einer Gruppe mit einer nicht\n"
+"                                einmaligen (doppelten) GID erlauben\n"
 "\n"
 
 #, c-format
@@ -1071,19 +1087,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 ""
 "Aufruf: lastlog [Optionen]\n"
 "\n"
 "Optionen:\n"
-"  -b, --before DAYS\tNur Einträge zeigen, die älter sind als DAYS Tage\n"
-"  -h, --help\t\tDiese Hilfe anzeigen, sonst nichts\n"
-"  -t, --time DAYS\tNur Einträge zeigen, die jünger sind als DAYS Tage\n"
-"  -u, --user LOGIN\tEintrag für Benutzer LOGIN anzeigen\n"
+"  -b, --before DAYS             Nur Einträge zeigen, die älter sind als\n"
+"                                DAYS Tage\n"
+"  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
+"  -t, --time DAYS               Nur Einträge zeigen, die jünger sind als\n"
+"                                DAYS Tage\n"
+"  -u, --user LOGIN              Eintrag für Benutzer LOGIN anzeigen\n"
 "\n"
 
 #, c-format
@@ -1234,14 +1253,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: Kann /etc/passwd nicht sperren.\n"
@@ -1295,46 +1310,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 ""
 "Aufruf: passwd [Optionen] [Login]\n"
 "\n"
 "Optionen:\n"
-"  -a, --all\t\t\tKennwort-Status für alle Benutzerkonten anzeigen\n"
-"  -d, --delete\t\t\tKennwort für angegebenes Benutzerkonto löschen\n"
-"  -e, --expire\t\t\tAblauf des Kennworts für angegebenes Benutzerkonto\n"
-"\t\t\t\terzwingen\n"
-"  -h, --help\t\t\tDiese Hilfe anzeigen, sonst nichts\n"
-"  -k, --keep tokens\t\tKennwort nur ändern falls abgelaufen\n"
-"  -i, --inactive INACTIVE\tKennwort nach Ablauf von INACTIVE deaktivieren\n"
-"  -l, --lock\t\t\tAngegebenes Benutzerkonto sperren\n"
-"  -n, --mindays MIN_DAYS\tMinimale Anzahl der Tage vor Kennwortänderung\n"
-"\t\t\t\tauf MIN_DAYS setzen\n"
-"  -q, --quiet\t\t\tKeine Meldungen anzeigen\n"
-"  -r, --repository REPOSITORY\tKennwort ändern in REPOSITORY\n"
-"  -S, --status\t\t\tKennwort-Status von angegebenem Benutzerkonto anzeigen\n"
-"  -u, --unlock\t\t\tAngegebenes Benutzerkonto entsperren\n"
-"  -w, --warndays WARN_DAYS\tAnzahl der Tage für Ablaufwarnung auf\n"
-"\t\t\t\tWARN_DAYS setzen\n"
-"  -x, --maxdays MAX_DAYS\tMaximale Anzahl der Tage vor Kennwortänderung\n"
-"\t\t\t\tauf MAX_DAYS setzen\n"
+"  -a, --all                     Kennwort-Status für alle Benutzerkonten\n"
+"                                anzeigen\n"
+"  -d, --delete                  Kennwort für angegebenes Benutzerkonto\n"
+"                                löschen\n"
+"  -e, --expire                  Ablauf des Kennworts für angegebenes\n"
+"                                Benutzerkonto erzwingen\n"
+"  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
+"  -k, --keep tokens             Kennwort nur ändern falls abgelaufen\n"
+"  -i, --inactive INACTIVE       Kennwort nach Ablauf von INACTIVE\n"
+"                                deaktivieren\n"
+"  -l, --lock                    Angegebenes Benutzerkonto sperren\n"
+"  -n, --mindays MIN_DAYS        Minimale Anzahl der Tage vor\n"
+"                                Kennwortänderung auf MIN_DAYS setzen\n"
+"  -q, --quiet                   Keine Meldungen anzeigen\n"
+"  -r, --repository REPOSITORY   Kennwort ändern in REPOSITORY\n"
+"  -S, --status                  Kennwort-Status von angegebenem\n"
+"                                Benutzerkonto anzeigen\n"
+"  -u, --unlock                  Angegebenes Benutzerkonto entsperren\n"
+"  -w, --warndays WARN_DAYS      Anzahl der Tage für Ablaufwarnung auf\n"
+"                                WARN_DAYS setzen\n"
+"  -x, --maxdays MAX_DAYS        Maximale Anzahl der Tage vor\n"
+"                                Kennwortänderung auf MAX_DAYS setzen\n"
 "\n"
 
 msgid "Old password: "
@@ -1522,25 +1542,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 ""
 "Aufruf: su [Optionen] [Login]\n"
 "\n"
 "Optionen:\n"
-"  -c, --command KOMMANDO\t\tKOMMANDO an aufgerufene Shell weiterleiten\n"
-"  -h, --help\t\t\tDiese Hilfe anzeigen, sonst nichts\n"
-"  -, -l, --login\t\tDie Shell als Login-Shell aufrufen\n"
+"  -c, --command KOMMANDO        KOMMANDO an aufgerufene Shell weiterleiten\n"
+"  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
+"  -, -l, --login                Die Shell als Login-Shell aufrufen\n"
 "  -m, -p,\n"
-"  --preserve-environment\tUmgebungsvariablen nicht zurücksetzen und die\n"
-"\t\t\t\tgleiche Shell verwenden\n"
-"  -s, --shell SHELL\t\tSHELL anstatt dem Standard aus passwd benutzen\n"
+"  --preserve-environment        Umgebungsvariablen nicht zurücksetzen und\n"
+"                                die gleiche Shell verwenden\n"
+"  -s, --shell SHELL             SHELL anstatt dem Standard aus passwd\n"
+"                                benutzen\n"
 "\n"
 
 #, c-format
@@ -1627,56 +1648,61 @@
 "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 ""
 "Aufruf: useradd [Optionen] LOGIN\n"
 "\n"
 "Optionen:\n"
-"  -b, --base-dir BASE_DIR\tStandardverzeichnis für das Home-Verzeichnis\n"
-"\t\t\t\tvon neuen Benutzern\n"
-"  -c, --comment COMMENT\t\tKommentar für das GECOS-Feld für den Benutzer\n"
-"  -d, --home-dir HOME_DIR\tHomeverzeichnis des neuen Benutzers\n"
-"  -D, --defaults\t\tDrucken oder Speichern der modifizierten Standard-\n"
-"\t\t\t\tkonfiguration für useradd\n"
-"  -e, --expiredate EXPIRE_DATE\tDas Ablaufdatum auf EXPIRE_DATE setzen\n"
-"  -f, --inactive INACTIVE\tKennwort nach Ablauf von INACTIVE deaktivieren\n"
-"  -g, --gid GROUP\t\tGruppe GROUP für neuen Benutzer erzwingen\n"
-"  -G, --groups GROUPS\t\tListe der zusätzlichen Gruppen für den neuen\n"
-"\t\t\t\tBenutzer\n"
-"  -h, --help\t\t\tDiese Hilfe anzeigen, sonst nichts\n"
-"  -k, --skel SKEL_DIR\t\tEin alternatives skel-Verzeichnis\n"
-"\t\t\t\t(Vorlagenverzeichnis) angeben\n"
-"  -K, --key KEY=WERT\t\tDie Standards in /etc/login.defs überschreiben\n"
-"  -m, --create-home\t\tHome-Verzeichnis des neuen Benutzers erstellen\n"
-"  -o, --non-unique\t\tBenutzer mit doppelter (nicht einmaliger) UID\n"
-"\t\t\t\terlauben\n"
-"  -p, --password PASSWORD\tBenutzt ein verschlüsseltes Kennwort für das\n"
-"\t\t\t\tBenutzerkonto\n"
-"  -s, --shell SHELL\t\tDie Login-Shell des neuen Benutzers\n"
-"  -u, --uid UID\t\t\tLegt eine bestimmte UID fest\n"
+"  -b, --base-dir BASE_DIR       Standardverzeichnis für das\n"
+"                                Home-Verzeichnis von neuen Benutzern\n"
+"  -c, --comment COMMENT         Kommentar für das GECOS-Feld für den\n"
+"                                Benutzer\n"
+"  -d, --home-dir HOME_DIR       Homeverzeichnis des neuen Benutzers\n"
+"  -D, --defaults                Drucken oder Speichern der modifizierten\n"
+"                                Standard-konfiguration für useradd\n"
+"  -e, --expiredate EXPIRE_DATE  Das Ablaufdatum auf EXPIRE_DATE setzen\n"
+"  -f, --inactive INACTIVE       Kennwort nach Ablauf von INACTIVE\n"
+"                                deaktivieren\n"
+"  -g, --gid GROUP               Gruppe GROUP für neuen Benutzer erzwingen\n"
+"  -G, --groups GROUPS           Liste der zusätzlichen Gruppen für den\n"
+"                                neuen Benutzer\n"
+"  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
+"  -k, --skel SKEL_DIR           Ein alternatives skel-Verzeichnis\n"
+"                                (Vorlagenverzeichnis) angeben\n"
+"  -K, --key KEY=WERT            Die Standards in /etc/login.defs\n"
+"                                überschreiben\n"
+"  -m, --create-home             Home-Verzeichnis des neuen Benutzers\n"
+"                                erstellen\n"
+"  -o, --non-unique              Benutzer mit doppelter (nicht einmaliger)\n"
+"                                UID erlauben\n"
+"  -p, --password PASSWORD       Benutzt ein verschlüsseltes Kennwort für\n"
+"                                das Benutzerkonto\n"
+"  -s, --shell SHELL             Die Login-Shell des neuen Benutzers\n"
+"  -u, --uid UID                 Legt eine bestimmte UID fest\n"
 "\n"
 
 #, fuzzy, c-format
@@ -1826,18 +1852,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 ""
 "Aufruf: userdel [Optionen] LOGIN\n"
 "\n"
 "Optionen:\n"
-"  -f, --force\t\t\tEntfernen von Dateien erzwingen, auch wenn sie\n"
-"\t\t\t\tnicht Eigentum des zu löschenden Benutzers sind\n"
-"  -h, --help\t\t\tDiese Hilfe anzeigen, sonst nichts\n"
-"  -r, --remove\t\t\tEntferne Home- und Mail-Spool-Verzeichnis\n"
+"  -f, --force                   Entfernen von Dateien erzwingen, auch wenn\n"
+"                                sie nicht Eigentum des zu löschenden\n"
+"                                Benutzers sind\n"
+"  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
+"  -r, --remove                  Entferne Home- und Mail-Spool-Verzeichnis\n"
 "\n"
 
 #, c-format
@@ -1905,50 +1933,53 @@
 "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 ""
 "Aufruf: usermod [Optionen] LOGIN\n"
 "\n"
 "Optionen:\n"
-"  -a, --append GROUP\t\tBenutzer zur ergänzenden Gruppe GROUP hinzufügen\n"
-"  -c, --comment COMMENT\t\tNeuer Wert für das GECOS-Feld\n"
-"  -d, --home HOME_DIR\t\tNeues Home-Verzeichnis für den Benutzer\n"
-"  -e, --expiredate EXPIRE_DATE\tAblaufdatum auf EXPIRE_DATE setzen\n"
-"  -f, --inactive INACTIVE\tKennwort nach Ablauf von INACTIVE deaktivieren\n"
-"  -g, --gid GROUP\t\tBenutzung von GROUP als neue primäre Gruppe erzwingen\n"
-"  -G, --groups GROUPS\t\tNeue Liste ergänzender Gruppen\n"
-"  -h, --help\t\t\tDiese Hilfe anzeigen, sonst nichts\n"
-"  -l, --login NEW_LOGIN\t\tNeuer Login-Name\n"
-"  -L, --lock\t\t\tDas Benutzerkonto sperren\n"
-"  -m, --move-home\t\tDen Inhalt des Home-Verzeichnisses an den neuen Ort\n"
-"\t\t\t\tverschieben (nur mit -d benutzen)\n"
-"  -o, --non-unique\t\tBenutzung von doppelter (nicht einmaliger) UID\n"
-"\t\t\t\terlauben\n"
-"  -p, --password PASSWORD\tEin verschlüsseltes Kennwort als neues\n"
-"\t\t\t\tKennwort verwenden\n"
-"  -s, --shell SHELL\t\tNeue Login-Shell des Benutzers\n"
-"  -u, --uid UID\t\t\tNeue UID des Benutzers\n"
-"  -U, --unlock\t\t\tDas Benutzerkonto entsperren\n"
+"  -a, --append GROUP            Benutzer zur ergänzenden Gruppe GROUP\n"
+"                                hinzufügen\n"
+"  -c, --comment COMMENT         Neuer Wert für das GECOS-Feld\n"
+"  -d, --home HOME_DIR           Neues Home-Verzeichnis für den Benutzer\n"
+"  -e, --expiredate EXPIRE_DATE  Ablaufdatum auf EXPIRE_DATE setzen\n"
+"  -f, --inactive INACTIVE       Kennwort nach Ablauf von INACTIVE\n"
+"                                deaktivieren\n"
+"  -g, --gid GROUP               Benutzung von GROUP als neue primäre\n"
+"                                Gruppe erzwingen\n"
+"  -G, --groups GROUPS           Neue Liste ergänzender Gruppen\n"
+"  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
+"  -l, --login NEW_LOGIN         Neuer Login-Name\n"
+"  -L, --lock                    Das Benutzerkonto sperren\n"
+"  -m, --move-home               Den Inhalt des Home-Verzeichnisses an den\n"
+"                                neuen Ort verschieben (nur mit -d benutzen)\n"
+"  -o, --non-unique              Benutzung von doppelter (nicht einmaliger)\n"
+"                                UID erlauben\n"
+"  -p, --password PASSWORD       Ein verschlüsseltes Kennwort als neues\n"
+"                                Kennwort verwenden\n"
+"  -s, --shell SHELL             Neue Login-Shell des Benutzers\n"
+"  -u, --uid UID                 Neue UID des Benutzers\n"
+"  -U, --unlock                  Das Benutzerkonto entsperren\n"
 "\n"
 
 #, fuzzy, c-format
@@ -2018,21 +2049,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 ""
 "Aufruf: vipw [Optionen]\n"
 "\n"
 "Optionen:\n"
-"  -g, --group\t\t\tGruppen-Datenbank editieren\n"
-"  -h, --help\t\t\tDiese Hilfe anzeigen, sonst nichts\n"
-"  -p, --passwd\t\t\tpasswd-Datenbank editieren\n"
-"  -q, --quiet\t\t\tKeine Meldungen ausgeben\n"
-"  -s, --shadow\t\t\tshadow- oder gshadow-Datenbank editieren\n"
+"  -g, --group                   Gruppen-Datenbank editieren\n"
+"  -h, --help                    Diese Hilfe anzeigen, sonst nichts\n"
+"  -p, --passwd                  passwd-Datenbank editieren\n"
+"  -q, --quiet                   Keine Meldungen ausgeben\n"
+"  -s, --shadow                  shadow- oder gshadow-Datenbank editieren\n"
 "\n"
 
 #, c-format

Modified: upstream/trunk/po/dz.po
===================================================================
--- upstream/trunk/po/dz.po	2007-11-24 14:02:10 UTC (rev 1459)
+++ upstream/trunk/po/dz.po	2007-11-24 22:41:24 UTC (rev 1460)
@@ -7,7 +7,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-01 15:28+0530\n"
 "Last-Translator: Jurmey Rabgay <jur_gay at yahoo.com>\n"
 "Language-Team: dzongkha <pgeyleg at dit.gov.bt>\n"
@@ -203,17 +203,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 ""
 "ལག་ལེན་:chage[གདམ་ཁ་ཚུ་]user\n"
@@ -468,10 +468,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"
@@ -484,7 +485,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
@@ -564,8 +566,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 [གདམ་ཁ་ཚུ་] ནང་བསྐྱོད་\n"
@@ -604,20 +606,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"
@@ -762,13 +767,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"
@@ -909,10 +914,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"
@@ -1072,15 +1078,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"
@@ -1242,14 +1249,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"
@@ -1303,23 +1306,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 ""
 "ལག་ལེན་: passwd [གདམ་ཁ་ཚུ་] [ནང་བསྐྱོད་]\n"
@@ -1521,13 +1525,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 ""
 "ལག་ལེན་: ཟླ་ [གདམ་ཁ་ཚུ་] [ནང་བསྐྱོད་]\n"
@@ -1621,34 +1625,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"
@@ -1822,14 +1827,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 [གདམ་ཁ་ཚུ་] ནང་བསྐྱོད་\n"
@@ -1903,26 +1909,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"
@@ -2013,16 +2019,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/el.po
===================================================================
--- upstream/trunk/po/el.po	2007-11-24 14:02:10 UTC (rev 1459)
+++ upstream/trunk/po/el.po	2007-11-24 22:41:24 UTC (rev 1460)
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: shadow_po_el\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-01-18 16:16+0200\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"PO-Revision-Date: 2007-11-24 21:44+0100\n"
 "Last-Translator: Konstantinos Margaritis <markos at debian.org>\n"
 "Language-Team: Greek <debian-l10n-greek at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -203,36 +203,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 ""
 "Χρήση: change [options] [LOGIN]\n"
 "\n"
 "Options:\n"
-"  -d, --lastday LAST_DAY\tρύθμιση τελευταίας αλλαγής συνθηματικού σε\n"
-"\t\t\t\tLAST_DAY\n"
-"  -E, --expiredate EXPIRE_DATE\tρύθμιση ημερομηνίας λήξης λογαριασμού σε\n"
-"\t\t\t\tEXPIRE_DATE\n"
-"  -h, --help\t\t\tπροβολή αυτού του μηνύματος βοήθειας και έξοδος\n"
-"  -I, --inactive INACTIVE\tρύθμιση ανενεργού κωδικού μετά από τη λήξη του\n"
-"\t\t\t\tσε INACTIVE\n"
-"  -l, --list\t\t\tπροβολή πληροφοριών ηλικίας λογαριασμού\n"
-"  -m, --mindays MIN_DAYS\tρύθμιση ελάχιστου αριθμού ημερών πριν την αλλαγή \t"
-"\t\t\tσυνθηματικού σε MIN_DAYS\n"
-"  -M, --maxdays MAX_DAYS\tρύθμιση μέγιστου αριθμού ημερών πριν την αλλαγή\n"
-"\t\t\t\tσυνθηματικού σε MAX_DAYS\n"
-"  -W, --warndays WARN_DAYS\tρύθμιση προειδοποιήσεων ημερών λήξης σε\n"
-"\t\t\t\tWARN_DAYS\n"
+"  -d, --lastday LAST_DAY        ρύθμιση τελευταίας αλλαγής συνθηματικού σε\n"
+"                                LAST_DAY\n"
+"  -E, --expiredate EXPIRE_DATE  ρύθμιση ημερομηνίας λήξης λογαριασμού σε\n"
+"                                EXPIRE_DATE\n"
+"  -h, --help                    προβολή αυτού του μηνύματος βοήθειας και\n"
+"                                έξοδος\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      ρύθμιση προειδοποιήσεων ημερών λήξης σε\n"
+"                                WARN_DAYS\n"
 "\n"
 
 #, c-format
@@ -471,23 +472,28 @@
 "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 [options]\n"
 "\n"
 "Επιλογές:\n"
-"  -e, --encrypted\tτα παρεχόμενα συνθηματικά είναι κρυπτογραφημένα\n"
-"  -h, --help\t\tπροβολή αυτού του μηνύματος βοήθειας και έξοδος\n"
-"  -m, --md5\t\tχρήση κρυπτογράφησης MD5 αντί για DES όταν τα παρεχόμενα\n"
-"\t\t\tσυνθηματικά δεν είναι κρυπτογραφημένα\n"
+"  -e, --encrypted               τα παρεχόμενα συνθηματικά είναι\n"
+"                                κρυπτογραφημένα\n"
+"  -h, --help                    προβολή αυτού του μηνύματος βοήθειας και\n"
+"                                έξοδος\n"
+"  -m, --md5                     χρήση κρυπτογράφησης MD5 αντί για DES όταν\n"
+"                                τα παρεχόμενα συνθηματικά δεν είναι\n"
+"                                κρυπτογραφημένα\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 ""
 
 #, fuzzy, c-format
@@ -568,8 +574,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 ""
 
@@ -605,34 +611,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 ""
 "Usage: faillog [options]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\tπροβολή καταγραφής faillog για όλους τους χρήστες\n"
-"  -h, --help\t\t\tπροβολή αυτού του μηνύματος βοήθειας και έξοδος\n"
-"  -l, --lock-time SEC\t\tμετά από αποτυχημένη είσοδο κλείδωμα λογαριασμού\n"
-"\t\t\t\tγια SEC δευτερόλεπτα\n"
-"  -m, --maximum MAX\t\tρύθμιση μέγιστου αριθμού καταμέτρησης αποτυχημένων\n"
-"\t\t\t\tπροσπαθειών εισόδου σε MAX\n"
-"  -r, --reset\t\t\tαρχικοποίηση της καταμέτρησης αποτυχημένων προσπαθειών\n"
-"\t\t\t\tεισόδου\n"
-"  -t, --time DAYS\t\tπροβολή εγγραφών faillog πιο πρόσφατων από DAYS\n"
-"  -u, --user LOGIN\t\tπροβάλλει τις εγγραφές faillog ή διαχειρίζεται τα "
-"όρια\n"
-"\t\t\t\tκαταμέτρησης αποτυχημένων εισόδων\n"
-"\t\t\t\t(αν χρησιμοποιηθεί με τις επιλογές -r, -m ή -l ) μόνο\n"
-"\t\t\t\tγια το χρήστη με LOGIN\n"
+"  -a, --all                     προβολή καταγραφής faillog για όλους τους\n"
+"                                χρήστες\n"
+"  -h, --help                    προβολή αυτού του μηνύματος βοήθειας και\n"
+"                                έξοδος\n"
+"  -l, --lock-time SEC           μετά από αποτυχημένη είσοδο κλείδωμα\n"
+"                                λογαριασμού για SEC δευτερόλεπτα\n"
+"  -m, --maximum MAX             ρύθμιση μέγιστου αριθμού καταμέτρησης\n"
+"                                αποτυχημένων προσπαθειών εισόδου σε MAX\n"
+"  -r, --reset                   αρχικοποίηση της καταμέτρησης αποτυχημένων\n"
+"                                προσπαθειών εισόδου\n"
+"  -t, --time DAYS               προβολή εγγραφών faillog πιο πρόσφατων από "
+"DAYS\n"
+"  -u, --user LOGIN              προβάλλει τις εγγραφές faillog ή\n"
+"                                διαχειρίζεται τα όρια καταμέτρησης\n"
+"                                αποτυχημένων εισόδων (αν χρησιμοποιηθεί\n"
+"                                με τις επιλογές -r, -m ή -l) μόνο\n"
+"                                για το χρήστη με LOGIN\n"
 "\n"
 
 #, c-format
@@ -762,26 +774,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 ""
 "Χρήση: groupadd [options] group\n"
 "\n"
 "Επιλογές:\n"
-"  -f, --force\t\tεξαναγκασμός εξόδου με κατάσταση επιτυχίας αν η "
-"καθορισμένη\n"
-"\t\t\t\tομάδα υπάρχει ήδη\n"
-"  -g, --gid GID\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επιτρέπει τη δημιουργία ομάδας με διπλότυπο\n"
-"\t\t\t\t(μη-μοναδικό) GID\n"
+"  -f, --force                   εξαναγκασμός εξόδου με κατάσταση επιτυχίας\n"
+"                                αν η καθορισμένη ομάδα υπάρχει ήδη\n"
+"  -g, --gid GID                 χρήση GID για τη νέα ομάδα\n"
+"  -h, --help                    προβολή αυτού του μηνύματος βοήθειας και\n"
+"                                έξοδος\n"
+"  -K, --key KEY=VALUE           παράκαμψη προεπιλογών /etc/login.defs\n"
+"  -o, --non-unique              επιτρέπει τη δημιουργία ομάδας με διπλότυπο\n"
+"                                (μη-μοναδικό) GID\n"
 "\n"
 
 #, c-format
@@ -911,23 +923,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 ""
 "Χρήση: groupadd [options] group\n"
 "\n"
 "Επιλογές:\n"
-"  -f, --force\t\tεξαναγκασμός εξόδου με κατάσταση επιτυχίας αν η καθορισμένη "
-"ομάδα\n"
-"\t\t\t\tυπάρχει ήδη\n"
-"  -g, --gid GID\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επιτρέπει τη δημιουργία ομάδας με διπλότυπο\n"
-"\t\t\t\t(μη-μοναδικό) GID\n"
+"  -f, --force                   εξαναγκασμός εξόδου με κατάσταση επιτυχίας\n"
+"                                αν η καθορισμένη ομάδα υπάρχει ήδη\n"
+"  -g, --gid GID                 χρήση GID για τη νέα ομάδα\n"
+"  -h, --help                    προβολή αυτού του μηνύματος βοήθειας και\n"
+"                                έξοδος\n"
+"  -K, --key KEY=VALUE           παράκαμψη προεπιλογών /etc/login.defs\n"
+"  -o, --non-unique              επιτρέπει τη δημιουργία ομάδας με διπλότυπο\n"
+"                                (μη-μοναδικό) GID\n"
 "\n"
 
 #, c-format
@@ -1084,22 +1097,24 @@
 "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"
 "\n"
 "Επιλογές:\n"
-"  -b, --before DAYS\tεκτύπωση μόνο των τελευταίων εγγραφών lastlog\n"
-"\t\t\tπαλαιότερων από DAYS\n"
-"  -h, --help\t\tπροβολή αυτού του μηνύματος βοήθειας και έξοδος\n"
-"  -t, --time DAYS\tεκτύπωση μόνο των τελευταίων εγγραφών lastlog πιο\n"
-"\t\t\tπρόσφατων από από DAYS\n"
-"  -u, --user LOGIN\tεκτύπωση τελευταίας εγγραφής lastlog για χρήστη με\n"
-"\t\t\tκαθορισμένο LOGIN\n"
+"  -b, --before DAYS             εκτύπωση μόνο των τελευταίων εγγραφών\n"
+"                                lastlog παλαιότερων από DAYS\n"
+"  -h, --help                    προβολή αυτού του μηνύματος βοήθειας και\n"
+"                                έξοδος\n"
+"  -t, --time DAYS               εκτύπωση μόνο των τελευταίων εγγραφών\n"
+"                                lastlog πιο πρόσφατων από από DAYS\n"
+"  -u, --user LOGIN              εκτύπωση τελευταίας εγγραφής lastlog για\n"
+"                                χρήστη με καθορισμένο LOGIN\n"
 "\n"
 
 #, c-format
@@ -1251,14 +1266,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"
@@ -1312,50 +1323,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 ""
 "Χρήση: passwd [options] [login]\n"
 "\n"
 "Επιλογές:\n"
-"  -a, --all\t\t\tαναφορά κατάστασης συνθηματικών για όλους τους\n"
-"\t\t\t\tλογαριασμούς\n"
-"  -d, --delete\t\t\tδιαγραφή συνθηματικού για το συγκεκριμένο λογαριασμό\n"
-"  -e, --expire\t\t\tεξαναγκασμός λήξης του συνθηματικού για το συγκεκριμένο\n"
-"\t\t\t\tλογαριασμό\n"
-"  -h, --help\t\t\tπροβολή αυτού του μηνύματος βοήθειας και έξοδος\n"
-"  -k, --keep-tokens\t\tαλλαγή συνθηματικού μόνο αν αυτό έχει λήξει\n"
-"  -i, --inactive INACTIVE\tρύθμιση ανενεργού συνθηματικού μετά τη λήξη του\n"
-"\t\t\t\tσε ΑΝΕΝΕΡΓΟ\n"
-"  -l, --lock\t\t\tκλείδωμα του συγκεκριμένου λογαριασμού\n"
-"  -n, --mindays MIN_DAYS\tρύθμιση ελάχιστου αριθμού ημερών πριν την αλλαγή\n"
-"\t\t\t\tσυνθηματικού σε MIN_DAYS\n"
-"  -q, --quiet\t\t\tσιωπηρή λειτουργία\n"
-"  -r, --repository REPOSITORY\tαλλαγή συνθηματικού στο REPOSITORY\n"
-"\t\t\t\trepository\n"
-"  -S, --status\t\t\tαναφορά κατάστασης συνθηματικού για το συγκεκριμένο\n"
-"\t\t\t\tλογαριασμό\n"
-"  -u, --unlock\t\t\tξεκλείδωμα του συγκεκριμένου λογαριασμού\n"
-"  -w, --warndays WARN_DAYS\tρύθμιση ημερών προειδοποίησης λήξης σε\n"
-"\t\t\t\tWARN_DAYS\n"
-"  -x, --maxdays MAX_DAYS\tρύθμιση μέγιστου αριθμού ημερών πριν την αλλαγή\n"
-"\t\t\t\tσυνθηματικού σε MAX_DAYS\n"
+"  -a, --all                     αναφορά κατάστασης συνθηματικών για όλους\n"
+"                                τους λογαριασμούς\n"
+"  -d, --delete                  διαγραφή συνθηματικού για το συγκεκριμένο\n"
+"                                λογαριασμό\n"
+"  -e, --expire                  εξαναγκασμός λήξης του συνθηματικού για το\n"
+"                                συγκεκριμένο λογαριασμό\n"
+"  -h, --help                    προβολή αυτού του μηνύματος βοήθειας και\n"
+"                                έξοδος\n"
+"  -k, --keep-tokens             αλλαγή συνθηματικού μόνο αν αυτό έχει λήξει\n"
+"  -i, --inactive INACTIVE       ρύθμιση ανενεργού συνθηματικού μετά τη λήξη\n"
+"                                του σε ΑΝΕΝΕΡΓΟ\n"
+"  -l, --lock                    κλείδωμα του συγκεκριμένου λογαριασμού\n"
+"  -n, --mindays MIN_DAYS        ρύθμιση ελάχιστου αριθμού ημερών πριν την\n"
+"                                αλλαγή συνθηματικού σε MIN_DAYS\n"
+"  -q, --quiet                   σιωπηρή λειτουργία\n"
+"  -r, --repository REPOSITORY   αλλαγή συνθηματικού στο REPOSITORY\n"
+"                                repository\n"
+"  -S, --status                  αναφορά κατάστασης συνθηματικού για το\n"
+"                                συγκεκριμένο λογαριασμό\n"
+"  -u, --unlock                  ξεκλείδωμα του συγκεκριμένου λογαριασμού\n"
+"  -w, --warndays WARN_DAYS      ρύθμιση ημερών προειδοποίησης λήξης σε\n"
+"                                WARN_DAYS\n"
+"  -x, --maxdays MAX_DAYS        ρύθμιση μέγιστου αριθμού ημερών πριν την\n"
+"                                αλλαγή συνθηματικού σε MAX_DAYS\n"
 "\n"
 
 msgid "Old password: "
@@ -1542,27 +1556,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 ""
 "Χρήση: su [options] [login]\n"
 "\n"
 "Επιλογές:\n"
-"  -c, --command ΕΝΤΟΛΗ\t\tεκτέλεση της ΕΝΤΟΛΗΣ στο καλούμενο κέλυφος\n"
-"  -h, --help\t\t\tπροβολή αυτού του μηνύματος βοήθειας και έξοδος\n"
-"  -, -l, --login\t\tκάνει το κέλυφος ένα κέλυφος εισόδου\n"
+"  -c, --command ΕΝΤΟΛΗ          εκτέλεση της ΕΝΤΟΛΗΣ στο καλούμενο κέλυφος\n"
+"  -h, --help                    προβολή αυτού του μηνύματος βοήθειας και\n"
+"                                έξοδος\n"
+"  -, -l, --login                κάνει το κέλυφος ένα κέλυφος εισόδου\n"
 "  -m, -p,\n"
-"  --preserve-environment\tδεν γίνεται αρχικοποίηση μεταβλητών "
-"περιβάλλοντος,\n"
-"\t\t\t\tκαι διατηρεί\n"
-"\t\t\t\tτο ίδιο κέλυφος\n"
-"  -s, --shell SHELL\t\tχρήση SHELL αντί του προεπιλεγμένου στο passwd\n"
+"  --preserve-environment        δεν γίνεται αρχικοποίηση μεταβλητών\n"
+"                                περιβάλλοντος, και διατηρεί το ίδιο κέλυφος\n"
+"  -s, --shell SHELL             χρήση SHELL αντί του προεπιλεγμένου στο\n"
+"                                passwd\n"
 "\n"
 
 #, c-format
@@ -1649,63 +1663,65 @@
 "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"
 "\n"
 "Επιλογές:\n"
-"  -b, --base-dir BASE_DIR\tο βασικός κατάλογος για τον αρχικό κατάλογο\n"
-"\t\t\t\tλογαριασμού\n"
-"\t\t\t\tνέου χρήστη\n"
-"  -c, --comment COMMENT\t\tρύθμιση του πεδίου GECOS για το λογαριασμό νέου\n"
-"\t\t\t\tχρήστη\n"
-"  -d, --home-dir HOME_DIR\tο αρχικός κατάλογος για το λογαριασμό νέου\n"
-"\t\t\t\tχρήστη\n"
-"  -D, --defaults\t\tεκτύπωση ή αποθήκευση τροποποιημένης προεπιλεγμένης\n"
-"\t\t\t\tρύθμισης tπροσθήκης χρήστη\n"
-"  -e, --expiredate EXPIRE_DATE\tρύθμιση ημερομηνίας λήξης λογαριασμού σε\n"
-"\t\t\t\tEXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tρύθμιση ανενεργού συνθηματικού μετά τη λήξη\n"
-"\t\t\t\tσε ΑΝΕΝΕΡΓΟ\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\tκαθορισμός ενός εναλλακτικού κατάλογου skel\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επιτρέπει τη δημιουργία χρήστη με διπλότυπο\n"
-"\t\t\t\t(μη μοναδικό) UID\n"
-"  -p, --password PASSWORD\tχρήση κρυπτογραφημένου κωδικού για το νέο\n"
-"\t\t\t\tλογαριασμό\n"
-"\t\t\t\tχρήστη\n"
-"  -s, --shell SHELL\t\ttτο κέλυφος σύνδεσης για το νέο λογαριασμό χρήστη\n"
-"  -u, --uid UID\t\t\tεξαναγκασμός χρήσης του UID για το νέο λογαριασμό\n"
-"\t\t\t\tχρήστη\n"
+"  -b, --base-dir BASE_DIR       ο βασικός κατάλογος για τον αρχικό κατάλογο\n"
+"                                λογαριασμού νέου χρήστη\n"
+"  -c, --comment COMMENT         ρύθμιση του πεδίου GECOS για το λογαριασμό\n"
+"                                νέου χρήστη\n"
+"  -d, --home-dir HOME_DIR       ο αρχικός κατάλογος για το λογαριασμό νέου\n"
+"                                χρήστη\n"
+"  -D, --defaults                εκτύπωση ή αποθήκευση τροποποιημένης\n"
+"                                προεπιλεγμένης ρύθμισης tπροσθήκης χρήστη\n"
+"  -e, --expiredate EXPIRE_DATE  ρύθμιση ημερομηνίας λήξης λογαριασμού σε\n"
+"                                EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       ρύθμιση ανενεργού συνθηματικού μετά τη λήξη\n"
+"                                σε ΑΝΕΝΕΡΓΟ\n"
+"  -g, --gid GROUP               εξαναγκασμός χρήσης GROUP για το νέο\n"
+"                                λογαριασμό χρήστη\n"
+"  -G, --groups GROUPS           προβολή λίστας συμπληρωματικών ομάδων για\n"
+"                                το νέο λογαριασμό χρήστη\n"
+"  -h, --help                    προβολή αυτού του μηνύματος βοήθειας και\n"
+"                                έξοδος\n"
+"  -k, --skel SKEL_DIR           καθορισμός ενός εναλλακτικού κατάλογου skel\n"
+"  -K, --key KEY=VALUE           παράκαμψη προεπιλογών /etc/login.defs\n"
+"  -m, --create-home             δημιουργία αρχικού καταλόγου για το νέο\n"
+"                                λογαριασμό χρήστη\n"
+"  -o, --non-unique              επιτρέπει τη δημιουργία χρήστη με διπλότυπο\n"
+"                                (μη μοναδικό) UID\n"
+"  -p, --password PASSWORD       χρήση κρυπτογραφημένου κωδικού για το νέο\n"
+"                                λογαριασμό χρήστη\n"
+"  -s, --shell SHELL             το κέλυφος σύνδεσης για το νέο λογαριασμό\n"
+"                                χρήστη\n"
+"  -u, --uid UID                 εξαναγκασμός χρήσης του UID για το νέο\n"
+"                                λογαριασμό χρήστη\n"
 "\n"
 
 #, fuzzy, c-format
@@ -1856,9 +1872,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 ""
 
@@ -1928,54 +1945,56 @@
 "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"
 "\n"
 "Επιλογές:\n"
-"  -a, --append GROUP\t\tπροσθήκη του χρήστη σε συμπληρωματική ΟΜΑΔΑ\n"
-"  -c, --comment COMMENT\t\tνέα τιμή του πεδίου GECOS\n"
-"  -d, --home HOME_DIR\t\tνλεος κατάλογος εισόδου για το νέο λογαριασμό "
+"  -a, --append GROUP            προσθήκη του χρήστη σε συμπληρωματική ΟΜΑΔΑ\n"
+"  -c, --comment COMMENT         νέα τιμή του πεδίου GECOS\n"
+"  -d, --home HOME_DIR           νλεος κατάλογος εισόδου για το νέο\n"
+"                                λογαριασμό χρήστη\n"
+"  -e, --expiredate EXPIRE_DATE  ρύθμιση ημερομηνίας λήξης λογαριασμού σε\n"
+"                                EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE       ρύθμιση συνθηματικού ως ανενεργού μετά από\n"
+"                                τη λήξη του σε ΑΝΕΝΕΡΓΟ\n"
+"  -g, --gid GROUP               εξαναγκασμός χρήσης ΟΜΑΔΑΣ ως τη νέα αρχική\n"
+"                                ομάδα εισόδου\n"
+"  -G, --groups GROUPS           λίστα των συμπληρωματικών ΟΜΑΔΩΝ\n"
+"  -h, --help                    προβολή του μηνύματος βοήθειας και έξοδος\n"
+"  -l, --login LOGIN             νέα τιμή του ονόματος εισόδου\n"
+"  -L, --lock                    κλείδωμα του λογαριασμού χρήστη\n"
+"  -m, --move-home               μετακινεί τα περιεχόμενα του αρχικού\n"
+"                                καταλόγου στη νέατοποθεσία (χρήση μόνο με -"
+"d)\n"
+"  -o, --non-unique              επιτρέπει τη χρήση διπλότυπου (μη μοναδικού) "
+"UID\n"
+"  -p, --password PASSWORD       χρήση κρυπτογραφημένου συνθηματικού για το\n"
+"                                νέο συνθηματικό\n"
+"  -s, --shell SHELL             νέο κέλυφος εισόδου για το λογαριασμό "
 "χρήστη\n"
-"  -e, --expiredate EXPIRE_DATE\tρύθμιση ημερομηνίας λήξης λογαριασμού σε "
-"EXPIRE_DATE\n"
-"  -f, --inactive INACTIVE\tρύθμιση συνθηματικού ως ανενεργού μετά από τη "
-"λήξη του\n"
-"\t\t\t\tσε ΑΝΕΝΕΡΓΟ\n"
-"  -g, --gid GROUP\t\tεξαναγκασμός χρήσης ΟΜΑΔΑΣ ως τη νέα αρχική ομάδα "
-"εισόδου\n"
-"  -G, --groups GROUPS\t\tλίστα των συμπληρωματικών ΟΜΑΔΩΝ\n"
-"  -h, --help\t\t\tπροβολή του μηνύματος βοήθειας και έξοδος\n"
-"  -l, --login 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"
-"  -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"
+"  -u, --uid UID                 νέο UID για το λογαριασμό χρήστη\n"
+"  -U, --unlock                  ξεκλείδωμα του λογαριασμού χρήστη\n"
 "\n"
 
 #, fuzzy, c-format
@@ -2048,21 +2067,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 [options]\n"
 "\n"
 "Επιλογές:\n"
-"  -g, --group\t\t\tεπεξεργασία βάσης δεδομένων ομάδας\n"
-"  -h, --help\t\t\tπροβολή κειμένου βοήθειας και έξοδος\n"
-"  -p, --passwd\t\t\ttεπεξεργασία βάσης δεδομένων κωδικών\n"
-"  -q, --quiet\t\t\tσιωπηλή λειτουργία\n"
-"  -s, --shadow\t\t\ttεπεξεργασία βάσης δεδομένων shadow ή gshadow\n"
+"  -g, --group                   επεξεργασία βάσης δεδομένων ομάδας\n"
+"  -h, --help                    προβολή κειμένου βοήθειας και έξοδος\n"
+"  -p, --passwd                  επεξεργασία βάσης δεδομένων κωδικών\n"
+"  -q, --quiet                   σιωπηλή λειτουργία\n"
+"  -s, --shadow                  επεξεργασία βάσης δεδομένων shadow ή "
+"gshadow\n"
 "\n"
 
 #, c-format

Modified: upstream/trunk/po/es.po
===================================================================
--- upstream/trunk/po/es.po	2007-11-24 14:02:10 UTC (rev 1459)
+++ upstream/trunk/po/es.po	2007-11-24 22:41:24 UTC (rev 1460)
@@ -7,7 +7,7 @@
 "Project-Id-Version: shadow 4.0.16\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-04 19:59+0200\n"
+"PO-Revision-Date: 2007-11-24 23:29+0100\n"
 "Last-Translator: Rubén Porras Campo <nahoo at inicia.es>\n"
 "Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -198,36 +198,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 ""
 "Modo de uso: chage [opciones] [USUARIO]\n"
 "\n"
 "Opciones:\n"
-"  -d, --lastday ULTIMO_DÍA\testablecer el último cambio de clave a\n"
-"\t\t\t\tULTIMO_DÍA\n"
-"  -E, --expiredate FECHA_EXP\testablecer la fecha de expiración de la "
-"cuenta\n"
-"\t\t\t\ta FECHA_EXP\n"
-"  -h, --help\t\t\tmostrar este mensaje de ayuda y terminar\n"
-"  -I, --inactive INACTIV\tdeshabilitar la cuenta después de INACTIV días de\n"
-"\t\t\t\tla fecha de expiración\n"
-"  -l, --list\t\t\tmostrar la información de envejecimiento de la cuenta\n"
-"  -m, --mindays DÍAS_MIN\testablecer el número mínimo de días antes de\n"
-"\t\t\t\tcambiar la clave a DÍAS_MIN\n"
-"  -M, --maxdays DÍAS_MAXS\testablecer el número máximo de días antes de\n"
-"\t\t\t\tcambiar la clave a DÍAS_MAX\n"
-"  -W, --warndays DÍAS_AVISO\tset expiration warning days to WARN_DAYS\n"
+"  -d, --lastday ULTIMO_DÍA      establecer el último cambio de clave a\n"
+"                                ULTIMO_DÍA\n"
+"  -E, --expiredate FECHA_EXP    establecer la fecha de expiración de la\n"
+"                                cuenta a FECHA_EXP\n"
+"  -h, --help                    mostrar este mensaje de ayuda y terminar\n"
+"  -I, --inactive INACTIV        deshabilitar la cuenta después de INACTIV\n"
+"                                días de la fecha de expiración\n"
+"  -l, --list                    mostrar la información de envejecimiento\n"
+"                                de la cuenta\n"
+"  -m, --mindays DÍAS_MIN        establecer el número mínimo de días antes\n"
+"                                de cambiar la clave a DÍAS_MIN\n"
+"  -M, --maxdays DÍAS_MAXS       establecer el número máximo de días antes\n"
+"                                de cambiar la clave a DÍAS_MAX\n"
+"  -W, --warndays DÍAS_AVISO     set expiration warning days to WARN_DAYS\n"
 "\n"
 
 #, c-format
@@ -466,22 +466,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 ""
 "Modo de uso: chpasswd [opciones]\n"
 "\n"
 "Opciones:\n"
-"  -e, --encrypted\tlas contraseñas proporcionadas están cifradas\n"
-"  -h, --help\t\tmuestra este mensaje de ayuda y termina\n"
-"  -m, --md5\t\tusa cifrado MD5 en vez de DES cuando las\n"
-"                        contraseñas proporcionadas no estén cifradas\n"
+"  -e, --encrypted               las contraseñas proporcionadas están cifradas\n"
+"  -h, --help                    muestra este mensaje de ayuda y termina\n"
+"  -m, --md5                     usa cifrado MD5 en vez de DES cuando las\n"
+"                                contraseñas proporcionadas no estén cifradas\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,17 +563,17 @@
 "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 ""
 "Modo de uso: userdel [opciones] USUARIO\n"
 "\n"
 "Opciones:\n"
-"  -f, --force\t\t\tforzar la eliminación de los ficheros,\n"
-"\t\t\t\tincluso si no pertenecen al usuario\n"
-"  -h, --help\t\t\tmuestra este mensaje y termina\n"
-"  -r, --remove\t\t\telimina el directorio y el buzón de correo\n"
+"  -f, --force                   forzar la eliminación de los ficheros,\n"
+"                                incluso si no pertenecen al usuario\n"
+"  -h, --help                    muestra este mensaje y termina\n"
+"  -r, --remove                  elimina el directorio y el buzón de correo\n"
 "\n"
 
 msgid "Login Shell"
@@ -606,34 +608,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 ""
 "Modo de uso: faillog [opciones]\n"
 "\n"
 "Opciones:\n"
-"  -a, --all\t\t\tmuestra los registros de faillog para todos los\n"
-"\t\t\t\tusuarios\n"
-"  -h, --help\t\t\tmuestra este mensaje de ayuda y termina\n"
-"  -l, --lock-time SEC\t\tdespués de un fallo de acceso bloquea la cuenta\n"
-"\t\t\t\tSEC segundos\n"
-"  -m, --maximum MAX\t\testablece el número máximo de accesos fallidos\n"
-"\t\t\t\ta MAX\n"
-"  -r, --reset\t\t\treinicia los contadores de accesos fallidos\n"
-"  -t, --time ND\t\tmuestra los registros de faillog para los\n"
-"\t\t\t\túltimos ND días\n"
-"  -u, --user USUARIO\t\tmuestra el registro de faillog o mantiene los\n"
-"\t\t\t\tcontadores de fallos y los límites (si se\n"
-"\t\t\t\tusan las opciones -r, -m o -l) para el usuario\n"
-"\t\t\t\tUSUARIO\n"
+"  -a, --all                     muestra los registros de faillog para\n"
+"                                todos los usuarios\n"
+"  -h, --help                    muestra este mensaje de ayuda y termina\n"
+"  -l, --lock-time SEC           después de un fallo de acceso bloquea\n"
+"                                la cuenta SEC segundos\n"
+"  -m, --maximum MAX             establece el número máximo de accesos\n"
+"                                fallidos a MAX\n"
+"  -r, --reset                   reinicia los contadores de accesos fallidos\n"
+"  -t, --time ND                 muestra los registros de faillog para los\n"
+"                                últimos ND días\n"
+"  -u, --user USUARIO            muestra el registro de faillog o mantiene\n"
+"                                los contadores de fallos y los límites\n"
+"                                (si se usan las opciones -r, -m o -l)\n"
+"                                para el usuario USUARIO\n"
 "\n"
 
 #, c-format
@@ -762,26 +764,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 ""
 "Modo de uso: groupadd [opciones] grupo\n"
 "\n"
 "Opciones:\n"
-"  -f, --force\t\tfuerza una salida con un estado de éxito si el grupo\n"
-"\t\t\t\tespecificado existe\n"
-"  -g, --gid GID\t\tusa GID para el nuevo grupo\n"
-"  -h, --help\t\tmuestra esta ayuda y termina\n"
-"  -K, --key NOMBRE=VALOR prevalece sobre el valor predeterminado de\n"
-"\t\t\t\t/etc/login.defs\n"
-"  -o, --non-unique\tpermite crear grupos con un GID duplicado (que no es\n"
-"\t\t\t\túnico)\n"
+"  -f, --force                   fuerza una salida con un estado de éxito\n"
+"                                si el grupo especificado existe\n"
+"  -g, --gid GID                 usa GID para el nuevo grupo\n"
+"  -h, --help                    muestra esta ayuda y termina\n"
+"  -K, --key NOMBRE=VALOR        prevalece sobre el valor predeterminado de\n"
+"                                /etc/login.defs\n"
+"  -o, --non-unique              permite crear grupos con un GID duplicado\n"
+"                                (que no es único)\n"
 "\n"
 
 #, c-format
@@ -909,23 +911,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 ""
 "Modo de uso: groupadd [opciones] grupo\n"
 "\n"
 "Opciones:\n"
-"  -f, --force\t\tfuerza una salida con un estado de éxito si el grupo\n"
-"\t\t\t\tespecificado existe\n"
-"  -g, --gid GID\t\tusa GID para el nuevo grupo\n"
-"  -h, --help\t\tmuestra esta ayuda y termina\n"
-"  -K, --key NOMBRE=VALOR prevalece sobre el valor predeterminado de\n"
-"\t\t\t\t/etc/login.defs\n"
-"  -o, --non-unique\tpermite crear grupos con un GID duplicado (que no es\n"
-"\t\t\t\túnico)\n"
+"  -f, --force                   fuerza una salida con un estado de éxito\n"
+"                                si el grupo especificado existe\n"
+"  -g, --gid GID                 usa GID para el nuevo grupo\n"
+"  -h, --help                    muestra esta ayuda y termina\n"
+"  -K, --key NOMBRE=VALOR        prevalece sobre el valor predeterminado de\n"
+"                                /etc/login.defs\n"
+"  -o, --non-unique              permite crear grupos con un GID duplicado\n"
+"                                (que no es único)\n"
 "\n"
 
 #, c-format
@@ -1077,20 +1079,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 for user with specified LOGIN\n"
 "\n"
 msgstr ""
 "Modo de uso: lastlog [opciones]\n"
 "\n"
 "Opciones:\n"
-"  -b, --before DÍAS\tmuestra los registros lastlog anteriores a DÍAS\n"
-"  -h, --help\t\tmuestra este mensaje de ayuda y termina\n"
-"  -t, --time DÍAS\tmuestra sólo los registros lastlog más recientes\n"
-"\t\t\tque DÍAS\n"
-"  -u, --user USUARIO\tmuestra el registro lastlog para el usuario\n"
+"  -b, --before DÍAS             muestra los registros lastlog anteriores a DÍAS\n"
+"  -h, --help                    muestra este mensaje de ayuda y termina\n"
+"  -t, --time DÍAS               muestra sólo los registros lastlog más\n"
+"                                recientes que DÍAS\n"
+"  -u, --user USUARIO            muestra el registro lastlog para el usuario\n"
 "\n"
 
 #, c-format
@@ -1241,14 +1243,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: no se puede bloquear /etc/passwd.\n"
@@ -1304,46 +1302,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 ""
 "Modo de uso: passwd [opciones] [nombre usuario]\n"
 "\n"
 "Options:\n"
-"  -a, --all\t\t\tinforma del estado de las contraseñas de todas\n"
-"\t\t\t\tlas cuentas\n"
-"  -d, --delete\t\t\tborra la contraseña para la cuenta\n"
-"  -e, --expire\t\t\tfuerza a que la contraseña de la cuenta caduque\n"
-"  -h, --help\t\t\tmuestra esta ayuda y termina\n"
-"  -k, --keep-tokens\t\tcambia la contraseña sólo si a caducado\n"
-"  -i, --inactive INACTIVO\testablece la contraseña inactiva después de\n"
-"\t\t\t\tcaducar a INACTIVO\n"
-"  -l, --lock\t\t\tbloquea la cuenta\n"
-"  -n, --mindays DÍAS_MIN\testablece el número mínimo de días antes de que\n"
-"\t\t\t\tse cambie la contraseña a DÍAS_MIN\n"
-"  -q, --quiet\t\t\tmodo silencioso\n"
-"  -r, --repository REP\t\tcambia la contraseña en el repositorio REP\n"
-"  -S, --status\t\t\tindica el estado de la contraseña la cuenta\n"
-"  -u, --unlock\t\t\tdesbloquea la cuenta\n"
-"  -w, --warndays DÍAS_AVISO\testablece el aviso de caducidad a DÍAS_AVISO\n"
-"  -x, --maxdays DÍAS_MAX\testablece el número máximo de días antes de\n"
-"\t\t\t\tcambiar la contraseña a DÍAS_MAX\n"
+"  -a, --all                     informa del estado de las contraseñas de\n"
+"                                todas las cuentas\n"
+"  -d, --delete                  borra la contraseña para la cuenta\n"
+"  -e, --expire                  fuerza a que la contraseña de la cuenta\n"
+"                                caduque\n"
+"  -h, --help                    muestra esta ayuda y termina\n"
+"  -k, --keep-tokens             cambia la contraseña sólo si a caducado\n"
+"  -i, --inactive INACTIVO       establece la contraseña inactiva después de\n"
+"                                caducar a INACTIVO\n"
+"  -l, --lock                    bloquea la cuenta\n"
+"  -n, --mindays DÍAS_MIN        establece el número mínimo de días antes\n"
+"                                de que se cambie la contraseña a DÍAS_MIN\n"
+"  -q, --quiet                   modo silencioso\n"
+"  -r, --repository REP          cambia la contraseña en el repositorio REP\n"
+"  -S, --status                  indica el estado de la contraseña la cuenta\n"
+"  -u, --unlock                  desbloquea la cuenta\n"
+"  -w, --warndays DÍAS_AVISO     establece el aviso de caducidad a DÍAS_AVISO\n"
+"  -x, --maxdays DÍAS_MAX        establece el número máximo de días antes de\n"
+"                                cambiar la contraseña a DÍAS_MAX\n"
 "\n"
 
 msgid "Old password: "
@@ -1528,25 +1527,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 ""
 "Modo de uso: su [opciones] [nombre]\n"
 "\n"
 "Opciones:\n"
-"  -c, --command ORDEN\t\tpasa la ORDEN a la shell invocada\n"
-"  -h, --help\t\t\tmuestra este mensaje de ayuda y termina\n"
-"  -, -l, --login\t\thace que la shell sea una shell de acceso\n"
+"  -c, --command ORDEN           pasa la ORDEN a la shell invocada\n"
+"  -h, --help                    muestra este mensaje de ayuda y termina\n"
+"  -, -l, --login                hace que la shell sea una shell de acceso\n"
 "  -m, -p,\n"
-"  --preserve-environment\tno restablece las variables de entorno a su\n"
-"\t\t\t\tvalor original, y conserva la misma shell\n"
-"  -s, --shell SHELL\t\tusa SHELL en vez de la predeterminada en passwd\n"
+"  --preserve-environment        no restablece las variables de entorno a su\n"
+"                                valor original, y conserva la misma shell\n"
+"  -s, --shell SHELL             usa SHELL en vez de la predeterminada en passwd\n"
 "\n"
 
 #, c-format
@@ -1635,59 +1634,61 @@
 "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 ""
 "Modo de uso: useradd [opciones] USUARIO\n"
 "\n"
 "Opciones:\n"
-"  -b, --base-dir DIR_BASE\tdirectorio base para el nuevo directorio\n"
-"\t\t\t\tpersonal\n"
-"  -c, --comment COMENTARIO\tcomentarios para el nuevo usuario (campo GECOS)\n"
-"  -d, --home-dir DIR_PERSONAL\tdirectorio personal para el nuevo usuario\n"
-"  -D, --defaults\t\tmuestra o salva la configuración predeterminada\n"
-"\t\t\t\tmodificada para useradd\n"
-"  -e, --expiredate FECHA_EXPIR\testablece la fecha de caducidad de la \t\t\t"
-"\tcuenta a FECHA_EXPIR\n"
-"  -f, --inactive INACTIVO\testablece el tiempo de inactividad después de\n"
-"\t\t\t\tque caduque la cuenta a INACTIVO\n"
-"  -g, --gid GRUPO\t\tforzar el uso de GRUPO para la nueva cuenta de\n"
-"\t\t\t\tusuario\n"
-"  -G, --groups GRUPOS\t\tlista de grupos suplementarios para la nueva\n"
-"\t\t\t\tcuenta de usuario\n"
-"  -h, --help\t\t\tmuestra esta ayuda y termina\n"
-"  -k, --skel DIR_SKEL\t\tespecifica un directorio skel alternativo\n"
-"  -K, --key LLAVE=VALOR\tmodifica los valores predeterminados de\n"
-"\t\t\t\t/etc/login.defs\n"
-"  -m, --create-home\t\tcrea el directorio personal para la nueva cuenta\n"
-"\t\t\t\tde usuario\n"
-"  -o, --non-unique\t\tpermitir crear usuarios con UIDs duplicadas\n"
-"  -p, --password CONTRASEÑA\tusar la contraseña cifrada CONTRASEÑA para la\n"
-"\t\t\t\tnueva cuenta\n"
-"  -s, --shell SHELL\t\tla shell de entrada para la nueva cuenta de usuario\n"
-"  -u, --uid UID\t\tforzar el uso del UID para la nueva cuenta de usuario\n"
+"  -b, --base-dir DIR_BASE       directorio base para el nuevo directorio\n"
+"                                personal\n"
+"  -c, --comment COMENTARIO      comentarios para el nuevo usuario (campo GECOS)\n"
+"  -d, --home-dir DIR_PERSONAL   directorio personal para el nuevo usuario\n"
+"  -D, --defaults                muestra o salva la configuración\n"
+"                                predeterminada modificada para useradd\n"
+"  -e, --expiredate FECHA_EXPIR  establece la fecha de caducidad de la\n"
+"                                cuenta a FECHA_EXPIR\n"
+"  -f, --inactive INACTIVO       establece el tiempo de inactividad después\n"
+"                                de que caduque la cuenta a INACTIVO\n"
+"  -g, --gid GRUPO               forzar el uso de GRUPO para la nueva cuenta\n"
+"                                de usuario\n"
+"  -G, --groups GRUPOS           lista de grupos suplementarios para la nueva\n"
+"                                cuenta de usuario\n"
+"  -h, --help                    muestra esta ayuda y termina\n"
+"  -k, --skel DIR_SKEL           especifica un directorio skel alternativo\n"
+"  -K, --key LLAVE=VALOR         modifica los valores predeterminados de\n"
+"                                /etc/login.defs\n"
+"  -m, --create-home             crea el directorio personal para la nueva\n"
+"                                cuenta de usuario\n"
+"  -o, --non-unique              permitir crear usuarios con UIDs duplicadas\n"
+"  -p, --password CONTRASEÑA     usar la contraseña cifrada CONTRASEÑA para\n"
+"                                la nueva cuenta\n"
+"  -s, --shell SHELL             la shell de entrada para la nueva cuenta\n"
+"                                de usuario\n"
+"  -u, --uid UID                 forzar el uso del UID para la nueva cuenta\n"
+"                                de usuario\n"
 "\n"
 
 #, fuzzy, c-format
@@ -1836,18 +1837,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 ""
 "Modo de uso: userdel [opciones] USUARIO\n"
 "\n"
 "Opciones:\n"
-"  -f, --force\t\t\tforzar la eliminación de los ficheros,\n"
-"\t\t\t\tincluso si no pertenecen al usuario\n"
-"  -h, --help\t\t\tmuestra este mensaje y termina\n"
-"  -r, --remove\t\t\telimina el directorio y el buzón de correo\n"
+"  -f, --force                   forzar la eliminación de los ficheros,\n"
+"                                incluso si no pertenecen al usuario\n"
+"  -h, --help                    muestra este mensaje y termina\n"
+"  -r, --remove                  elimina el directorio y el buzón de correo\n"
 "\n"
 
 #, c-format
@@ -1915,56 +1917,56 @@
 "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 ""
 "Modo de uso: usermod [opciones] USUARIO\n"
 "\n"
 "Opciones:\n"
-"  -a, --append GRUPO\t\tañade al usuario al GRUPO\n"
-"  -c, --comment COMENTARIO\tnuevo valor del campo GECOS\n"
-"  -d, --home-dir DIR_PERSONAL\tnuevo directorio personal del nuevo usuario\n"
-"  -e, --expiredate FECHA_EXPIR\testablece la fecha de caducidad de la \t\t\t"
-"\tcuenta a FECHA_EXPIR\n"
-"  -f, --inactive INACTIVO\testablece el tiempo de inactividad después de\n"
-"\t\t\t\tque caduque la cuenta a INACTIVO\n"
-"  -g, --gid GRUPO\t\tfuerza el uso de GRUPO para la nueva cuenta de\n"
-"\t\t\t\tusuario\n"
-"  -G, --groups GRUPOS\t\tlista de grupos suplementarios\n"
-"  -h, --help\t\t\tmuestra esta ayuda y termina\n"
-"  -l, --login NOMBRE\t\tnuevo nombre para el usuario\n"
-"  -L, --lock\t\t\tbloquea la cuenta de usuario\n"
-"  -m, --move-home\t\tmueve los contenidos del directorio\n"
-"\t\t\t\tpersonal al directorio nuevo (usar sólo junto\n"
-"\t\t\t\tcon -d)\n"
-"  -o, --non-unique\t\tpermite usar UID (identificadores de\n"
-"\t\t\t\tusuario) duplicados (no únicos)\n"
-"  -p, --password CONTRASEÑA\tusar la contraseña cifrada CONTRASEÑA para la\n"
-"\t\t\t\tnueva cuenta\n"
-"  -s, --shell SHELL\t\tla shell de entrada para la nueva cuenta de\n"
-"\t\t\t\tusuario\n"
-"  -u, --uid UID\t\t\tfuerza el uso del UID para la nueva cuenta\n"
-"\t\t\t\tde usuario\n"
-"  -U, --unlock\t\t\tdesbloque la cuenta de usuario\n"
+"  -a, --append GRUPO            añade al usuario al GRUPO\n"
+"  -c, --comment COMENTARIO      nuevo valor del campo GECOS\n"
+"  -d, --home-dir DIR_PERSONAL   nuevo directorio personal del nuevo usuario\n"
+"  -e, --expiredate FECHA_EXPIR  establece la fecha de caducidad de la\n"
+"                                cuenta a FECHA_EXPIR\n"
+"  -f, --inactive INACTIVO       establece el tiempo de inactividad después\n"
+"                                de que caduque la cuenta a INACTIVO\n"
+"  -g, --gid GRUPO               fuerza el uso de GRUPO para la nueva cuenta\n"
+"                                de usuario\n"
+"  -G, --groups GRUPOS           lista de grupos suplementarios\n"
+"  -h, --help                    muestra esta ayuda y termina\n"
+"  -l, --login NOMBRE            nuevo nombre para el usuario\n"
+"  -L, --lock                    bloquea la cuenta de usuario\n"
+"  -m, --move-home               mueve los contenidos del directorio\n"
+"                                personal al directorio nuevo (usar sólo\n"
+"                                junto con -d)\n"
+"  -o, --non-unique              permite usar UID (identificadores de\n"
+"                                usuario) duplicados (no únicos)\n"
+"  -p, --password CONTRASEÑA     usar la contraseña cifrada CONTRASEÑA para\n"
+"                                la nueva cuenta\n"
+"  -s, --shell SHELL             la shell de entrada para la nueva cuenta de\n"
+"                                usuario\n"
+"  -u, --uid UID                 fuerza el uso del UID para la nueva cuenta\n"
+"                                de usuario\n"
+"  -U, --unlock                  desbloque la cuenta de usuario\n"
 "\n"
 
 #, fuzzy, c-format
@@ -2035,21 +2037,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 ""
 "Modo de uso: vipw [opciones]\n"
 "\n"
 "Opciones:\n"
-"  -g, --group\t\t\tedita la base de datos con los grupos\n"
-"  -h, --help\t\t\tmuestra este mensaje de ayuda y termina\n"
-"  -p, --passwd\t\t\tedita la base de datos con las contraseñas\n"
-"  -q, --quiet\t\t\tmodo silencioso\n"
-"  -s, --shadow\t\t\tedita la base de datos shadow o gshadow\n"
+"  -g, --group                   edita la base de datos con los grupos\n"
+"  -h, --help                    muestra este mensaje de ayuda y termina\n"
+"  -p, --passwd                  edita la base de datos con las contraseñas\n"
+"  -q, --quiet                   modo silencioso\n"
+"  -s, --shadow                  edita la base de datos shadow o gshadow\n"
 "\n"
 
 #, c-format

Modified: upstream/trunk/po/eu.po
===================================================================
--- upstream/trunk/po/eu.po	2007-11-24 14:02:10 UTC (rev 1459)
+++ upstream/trunk/po/eu.po	2007-11-24 22:41:24 UTC (rev 1460)
@@ -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-06-12 23:00+0200\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"PO-Revision-Date: 2007-11-24 22:20+0100\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: librezale <librezale at librezale.org>\n"
 "MIME-Version: 1.0\n"
@@ -202,34 +202,34 @@
 "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 ""
 "Erabilera: chage [aukerak] [IZENA]\n"
 "\n"
 "Options:\n"
-"  -d, --lastday AZKEN_EGUNA\tezarri pasahitz aldaketa AZKEN_EGUNA\n"
-"  -E, --expiredate IRAUNGITZE_DATA\tezarri kontu iraungitze data\n"
-"\t\t\t\tIRAUNGITZE_DATA-ra\n"
-"  -h, --help\t\t\tlaguntza mezu hau bistarazi eta  irten\n"
-"  -I, --inactive INACTIVE\tezarri pasahitza ezgaitua bezala -INACTIVE\n"
-"\t\t\t\tiraungitzean\n"
-"  -l, --list\t\t\tkontu denbora informazioa bistarazi\n"
-"  -m, --mindays GUTXI_EGUN\tpasahitz aldaketa gutxieneko data\n"
-"\t\t\t\tGUTXI_EGUN-era aldatu\n"
-"  -M, --maxdays GEHI_EGUN\tpasashitz aldaketa gehienezko data GEHI_EGUN-era\n"
-"\t\t\t\taldatu\n"
-"  -W, --warndays ABISU_EGUN\tiraungitze abisua ABISU_EGUN-era ezarri\n"
+"  -d, --lastday AZKEN_EGUNA         ezarri pasahitz aldaketa AZKEN_EGUNA\n"
+"  -E, --expiredate IRAUNGITZE_DATA  ezarri kontu iraungitze data\n"
+"                                    IRAUNGITZE_DATA-ra\n"
+"  -h, --help                        laguntza mezu hau bistarazi eta  irten\n"
+"  -I, --inactive INACTIVE           ezarri pasahitza ezgaitua bezala\n"
+"                                    -INACTIVE iraungitzean\n"
+"  -l, --list                        kontu denbora informazioa bistarazi\n"
+"  -m, --mindays GUTXI_EGUN          pasahitz aldaketa gutxieneko data\n"
+"                                    GUTXI_EGUN-era aldatu\n"
+"  -M, --maxdays GEHI_EGUN           pasashitz aldaketa gehienezko data\n"
+"                                    GEHI_EGUN-era aldatu\n"
+"  -W, --warndays ABISU_EGUN         iraungitze abisua ABISU_EGUN-era ezarri\n"
 "\n"
 
 #, c-format
@@ -466,23 +466,27 @@
 "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 ""
 "Erabilera: chpasswd [aukerak]\n"
 "\n"
 "Aukerak:\n"
-"  -e, .- encrypted\temandako pasahitzak enkripatzen dira\n"
-"  -h, --help\t\tlaguntzako mezu hau erakutsi eta irten egiten da\n"
-"  -m, --md5\t\terabili MD5 enkriptatze mota (DES-en ordez),\n"
-"\t\t\tpasahitzak enkriptatuta ez daudenean\n"
+"  -e, .- encrypted              emandako pasahitzak enkripatzen dira\n"
+"  -h, --help                    laguntzako mezu hau erakutsi eta irten\n"
+"                                egiten da\n"
+"  -m, --md5                     erabili MD5 enkriptatze mota (DES-en "
+"ordez),\n"
+"                                pasahitzak enkriptatuta ez daudenean\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
@@ -562,15 +566,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 ""
 "Erabilera: chsh [aukerak] [IZENA]\n"
 "\n"
 "Aukerak:\n"
-"  -h, --help\t\t\tlaguntza testu hau bistarazi eta irten\n"
-"  -r, --shell IZENA\t\t\terabiltzaile kontukoaren shell berria\n"
+"  -h, --help                    laguntza testu hau bistarazi eta irten\n"
+"  -r, --shell IZENA             erabiltzaile kontukoaren shell berria\n"
 "\n"
 
 msgid "Login Shell"
@@ -605,34 +609,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 ""
 "Erabilera: faillog [aukerak]\n"
 "\n"
 "Aukerak:\n"
-"  -a, --all\t\t\terabiltzaile guztien faillog-en erregistroak bistaratzen\n"
-"\t\t\t\tditu\n"
-"  -h, --help\t\t\tlaguntzako mezu hau bistarazi eta irten egiten da\n"
-"  -l, --lock-time SEG\t\tsaio-hasieran hutsegin ondoren kontua zenbat\n"
-"\t\t\t\tsegundutan blokeatuta egongo den\n"
-"  -m, --maximum GEH\t\tsaio-hasierako GEHiengo hutsegite kopurua ezartzeko\n"
-"  -r, --reset\t\t\tsaio-hasierako hutsegiteen kontatzailea\n"
-"\t\t\t\tberrezartzeko\n"
-"  -t, --time EGUNAK\t\tEGUNAK baino berriagoak diren faillog-en\n"
-"\t\t\t\terregistroak bistaratzeko\n"
-"  -u, --user SAIOA\t\tfaillog-en erregistroak bistaratzeko edo\n"
-"\t\t\t\thutsegiteen kontatzailea eta ERABILTZAILEA\n"
-"\t\t\t\tizeneko erabiltzailearen(-r, -m edo -l aukerekin\n"
-"\t\t\t\terabiltzen bada) mantentzeko.\n"
+"  -a, --all                     erabiltzaile guztien faillog-en\n"
+"                                erregistroak bistaratzen ditu\n"
+"  -h, --help                    laguntzako mezu hau bistarazi eta irten\n"
+"                                egiten da\n"
+"  -l, --lock-time SEG           saio-hasieran hutsegin ondoren kontua "
+"zenbat\n"
+"                                segundutan blokeatuta egongo den\n"
+"  -m, --maximum GEH             saio-hasierako GEHiengo hutsegite kopurua\n"
+"                                ezartzeko\n"
+"  -r, --reset                   saio-hasierako hutsegiteen kontatzailea\n"
+"                                berrezartzeko\n"
+"  -t, --time EGUNAK             EGUNAK baino berriagoak diren faillog-en\n"
+"                                erregistroak bistaratzeko\n"
+"  -u, --user SAIOA              faillog-en erregistroak bistaratzeko edo\n"
+"                                hutsegiteen kontatzailea eta ERABILTZAILEA\n"
+"                                izeneko erabiltzailearen(-r, -m edo -l\n"
+"                                aukerekin erabiltzen bada) mantentzeko.\n"
 "\n"
 
 #, c-format
@@ -761,25 +771,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 ""
 "Erabilera: groupadd [aukerak] TALDEA\n"
 "\n"
 "Aukerak:\n"
-"  -f, --force\t\tIndartu arrakastatsuki amaitzea nahiz ezarritako\n"
-"\t\t\t\ttaldea aurretik egon\n"
-"  -g, --gid GID\t\tGID erabili talde berrirako\n"
-"  -h, --help\t\t\tlaguntza hau bistarazi eta irten\n"
-"  -K, --key KEY=BALIO\t\t/etc/login.defs lehenespenak gainidatzi\n"
-"  -o, --non-unique\t\tonartu bikoizutiko (ez bakarra) GID-a duen\n"
-"\t\t\t\ttaldea sortzea\n"
+"  -f, --force                   Indartu arrakastatsuki amaitzea nahiz\n"
+"                                ezarritako taldea aurretik egon\n"
+"  -g, --gid GID                 GID erabili talde berrirako\n"
+"  -h, --help                    laguntza hau bistarazi eta irten\n"
+"  -K, --key KEY=BALIO           /etc/login.defs lehenespenak gainidatzi\n"
+"  -o, --non-unique              onartu bikoizutiko (ez bakarra) GID-a duen\n"
+"                                taldea sortzea\n"
 "\n"
 
 #, c-format
@@ -909,21 +919,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 ""
 "Erabilera: groupmod [aukerak] TALDEA\n"
 "\n"
 "Aukerak::\n"
-"  -g, --gid GID\t\ttaldearentzat GID berria erabiltzea indartu\n"
-"  -h, --help\t\t\tlaguntza hau bistarazi eta irten\n"
-"  -K, --new-name TALDE_BERRIA\tTalderarentzat TALDE_BERRI izena\n"
-"\t\t\t\terabiltzea indartu\n"
-"  -o, --non-unique\t\tonartu bikoizutiko (ez bakarra) GID-a erabiltzea\n"
-"\t\t\t\ttaldearentzat\n"
+"  -g, --gid GID                 taldearentzat GID berria erabiltzea indartu\n"
+"  -h, --help                    laguntza hau bistarazi eta irten\n"
+"  -K, --new-name TALDE_BERRIA   Talderarentzat TALDE_BERRI izena\n"
+"                                erabiltzea indartu\n"
+"  -o, --non-unique              onartu bikoizutiko (ez bakarra) GID-a\n"
+"                                erabiltzea taldearentzat\n"
 "\n"
 
 #, c-format
@@ -1075,21 +1086,24 @@
 "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 ""
 "Erabilera: lastlog [aukerak]\n"
 "\n"
 "Aukerak:\n"
-"  -b, --before EGUN\tEGUN kopurua baino zaharragoak diren erregistroak\n"
-"  -h, --help\t\tlaguntzako mezu hau bistaratu eta irten egiten da\n"
-"  -t, --time EGUNAK\tEGUNAK baino berriagoak diren erregistroak\n"
-"\t\t\t\tbakarrik bistaratzen ditu\n"
-"  -u, --user IZENA\tIZENA duen erabiltzailearen lastlog erregistroa\n"
-"\t\t\t\tbistaratzen du\n"
+"  -b, --before EGUN             EGUN kopurua baino zaharragoak diren\n"
+"                                erregistroak\n"
+"  -h, --help                    laguntzako mezu hau bistaratu eta irten\n"
+"                                egiten da\n"
+"  -t, --time EGUNAK             EGUNAK baino berriagoak diren erregistroak\n"
+"                                bakarrik bistaratzen ditu\n"
+"  -u, --user IZENA              IZENA duen erabiltzailearen lastlog\n"
+"                                erregistroa bistaratzen du\n"
 "\n"
 
 #, c-format
@@ -1242,14 +1256,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: ezin da '/etc/passwd' blokeatu.\n"
@@ -1303,46 +1313,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 ""
 "Erabilera: passwd [aukerak] [IZENA]\n"
 "\n"
 "Aukerak:\n"
-"  -a, --all\t\t\tkontu guztien pasahitzen egoera erreportea\n"
-"  -d, --delete\t\t\temandako kontuaren pasahitza ezabatu\n"
-"  -e, --expire\t\t\temandako kontuaren pasahitzaren iraungitzea behartu\n"
-"  -h, --help\t\t\tlaguntza mezu hau bistarazi eta irten\n"
-"  -k, --keep-tokens\t\tpasahitza iraungirik bakarrik badago aldatu\n"
-"  -i, --inactive INAKTIBO\tezarri iraungiriko pasahitz ezgaitzea\n"
-"\t\t\t\tINAKTIBO-ra\n"
-"  -l, --lock\t\t\temandako kontua blokeatu\n"
-"  -n, --mindays GUTXI_EGUN\tezarri pasahitz aldaketa gutxieneko data\n"
-"\t\t\t\tGUTXI_EGUN-ra\n"
-"  -q, --quiet\t\t\tixilik modua\n"
-"  -r, --repository ERREPOSITORIOA\tERREPOSITORIOA errepositorioko pashitza\n"
-"\t\t\t\taldatu\n"
-"  -S, --status\t\t\temandako kontuaren pasahitz egoera erreportea egin\n"
-"  -u, --unlock\t\t\temandako kontuaren blokeoa kendu\n"
-"  -w, --warndays ABISU_EGUN\tezarri iraungitze abisu data ABISU_EGUN-era\n"
-"  -x, --maxdays GEHI_EGUN\tezarri pashitz aldatu aurretik gehinezko egun\n"
-"\t\t\t\tkopurua GEHI_EGUN-era\n"
+"  -a, --all                        kontu guztien pasahitzen egoera "
+"erreportea\n"
+"  -d, --delete                     emandako kontuaren pasahitza ezabatu\n"
+"  -e, --expire                     emandako kontuaren pasahitzaren\n"
+"                                   iraungitzea behartu\n"
+"  -h, --help                       laguntza mezu hau bistarazi eta irten\n"
+"  -k, --keep-tokens                pasahitza iraungirik bakarrik badago\n"
+"                                   aldatu\n"
+"  -i, --inactive INAKTIBO          ezarri iraungiriko pasahitz ezgaitzea\n"
+"                                   INAKTIBO-ra\n"
+"  -l, --lock                       emandako kontua blokeatu\n"
+"  -n, --mindays GUTXI_EGUN         ezarri pasahitz aldaketa gutxieneko data\n"
+"                                   GUTXI_EGUN-ra\n"
+"  -q, --quiet                      ixilik modua\n"
+"  -r, --repository ERREPOSITORIOA  ERREPOSITORIOA errepositorioko pashitza\n"
+"                                   aldatu\n"
+"  -S, --status                     emandako kontuaren pasahitz egoera\n"
+"                                   erreportea egin\n"
+"  -u, --unlock                     emandako kontuaren blokeoa kendu\n"
+"  -w, --warndays ABISU_EGUN        ezarri iraungitze abisu data ABISU_EGUN-"
+"era\n"
+"  -x, --maxdays GEHI_EGUN          ezarri pashitz aldatu aurretik gehinezko\n"
+"                                   egun kopurua GEHI_EGUN-era\n"
 "\n"
 
 msgid "Old password: "
@@ -1526,25 +1542,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 ""
 "Erabilera: su [aukerak] [IZENA]\n"
 "\n"
 "Aukerak:\n"
-"  -c, --command KOMANDOA\t\tdeituriko shell-ari KOMANDOA pasa\n"
-"  -h, --help\t\t\tlaguntza testu hau bistarazi eta irten\n"
-"  -, -l, --login\t\tshell-a saio shell bihurtu\n"
+"  -c, --command KOMANDOA        deituriko shell-ari KOMANDOA pasa\n"
+"  -h, --help                    laguntza testu hau bistarazi eta irten\n"
+"  -, -l, --login                shell-a saio shell bihurtu\n"
 "  -m, -p,\n"
-"  --preserve-environment\tez ingurune aldagaiak berezarri eta mantendu\n"
-"\t\t\t\tshell berdina\n"
-"  -s, --shell SHELL\t\tSHELL erabili lehentsiaren ordez\n"
+"  --preserve-environment        ez ingurune aldagaiak berezarri eta "
+"mantendu\n"
+"                                shell berdina\n"
+"  -s, --shell SHELL             SHELL erabili lehentsiaren ordez\n"
 "\n"
 
 #, c-format
@@ -1631,52 +1648,54 @@
 "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 ""
 "Erabilera: useradd [aukerak] IZENA\n"
 "\n"
 "Options:\n"
-"  -b, --base-dir BASE_DIR\tErabiltzaile kontu berriaren etxe direktorioaren\n"
-"\t\t\t\toinarri direktorioa\n"
-"  -c, --comment IRUZKINA\terabiltzaile kontu berriaren GECOS ezarri\n"
-"  -d, --home-dir HOME_DIR\terabiltzaile kontu berriaren etxe direktorioa\n"
-"  -D, --defaults\t\tbistarazi edo gorde aldaturiko lehenetsiriko useradd\n"
-"\t\t\t\tkonfigurazioa\n"
-"  -e, --expiredate IRAUNG_DATA\tkontu iraungitze data ezarri\n"
-"  -f, --inactive INACTIVE\tset password inactive after expiration\n"
-"\t\t\t\tto INACTIVE\n"
-"  -g, --gid TALDE\t\terabiltzaile kontu berriarekin TALDE erabiltzea\n"
-"\t\t\t\tbehartu\n"
-"  -G, --groups TALDEAK\t\terabiltzaile kontu berriaren talde gehiarriak\n"
-"\t\t\t\tbistarazi\n"
-"  -h, --help\t\t\tlaguntza mezu hai bistarazi eta irten\n"
-"  -k, --skel SKEL_DIR\t\tbeste skel direktorio bat ezarri\n"
-"  -K, --key KEY=VALUE\t\tlehenetsiriko /etc/login.defs gainidatzi\n"
-"  -m, --create-home\t\terabiltzaile kontu berriarentzar etxe direktorioa\n"
-"\t\t\t\tsortu\n"
+"  -b, --base-dir BASE_DIR       Erabiltzaile kontu berriaren etxe\n"
+"                                direktorioaren oinarri direktorioa\n"
+"  -c, --comment IRUZKINA        erabiltzaile kontu berriaren GECOS ezarri\n"
+"  -d, --home-dir HOME_DIR       erabiltzaile kontu berriaren etxe\n"
+"                                direktorioa\n"
+"  -D, --defaults                bistarazi edo gorde aldaturiko\n"
+"                                lehenetsiriko useradd konfigurazioa\n"
+"  -e, --expiredate IRAUNG_DATA  kontu iraungitze data ezarri\n"
+"  -f, --inactive INACTIVE       set password inactive after expiration\n"
+"                                to INACTIVE\n"
+"  -g, --gid TALDE               erabiltzaile kontu berriarekin TALDE\n"
+"                                erabiltzea behartu\n"
+"  -G, --groups TALDEAK          erabiltzaile kontu berriaren talde\n"
+"                                gehiarriak bistarazi\n"
+"  -h, --help                    laguntza mezu hai bistarazi eta irten\n"
+"  -k, --skel SKEL_DIR           beste skel direktorio bat ezarri\n"
+"  -K, --key KEY=VALUE           lehenetsiriko /etc/login.defs gainidatzi\n"
+"  -m, --create-home             erabiltzaile kontu berriarentzar etxe\n"
+"                                direktorioa sortu\n"
 "\n"
 
 #, fuzzy, c-format
@@ -1823,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 ""
 "Erabilera: userdel [aukerak] IZENA\n"
 "\n"
 "Aukerak:\n"
-"  -f, --force\t\t\tfitxategien ezabatzea indartu nahiz ez\n"
-"\t\t\t\terabiltzailearenak izan\n"
-"  -h, --help\t\t\tlaguntza testu hau bistarazi eta irten\n"
-"  -r, --remove\t\t\tetxe direktorioa eta posta hilara ezabatu\n"
+"  -f, --force                   fitxategien ezabatzea indartu nahiz ez\n"
+"                                erabiltzailearenak izan\n"
+"  -h, --help                    laguntza testu hau bistarazi eta irten\n"
+"  -r, --remove                  etxe direktorioa eta posta hilara ezabatu\n"
 "\n"
 
 #, c-format
@@ -1900,53 +1920,55 @@
 "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 ""
 "Erabilera: usermod [aukerak] IZENA\n"
 "\n"
 "Aukerak:\n"
-"  -a, --append TALDEA\t\tgehitu erabiltzailea TALDE gehigarrietara\n"
-"\t\t\t\t(-G-rekin bakarrik erabili)\n"
-"  -c, --comment COMMENT\t\tGECOS eremuaren balio berria\n"
-"  -d, --home-dir HOME_DIR\terabiltzaile kontu berriaren etxe direktorioa\n"
-"  -e, --expiredate IRAUNG_DATA\tkontu iraungitze data ezarri\n"
-"  -f, --inactive INAKTIBO\tiraungitze ondorengo pasahitz ezgaitzea\n"
-"\t\t\t\tto INAKTIBO-ra ezarri\n"
-"  -g, --gid TALDE\t\terabiltzaile kontu berriarekin TALDE erabiltzea\n"
-"\t\t\t\tbehartu\n"
-"  -G, --groups TALDEAK\t\terabiltzaile kontu berriaren talde gehigarriak\n"
-"\t\t\t\tbistarazi\n"
-"  -h, --help\t\t\tlaguntza mezu hai bistarazi eta irten\n"
-"  -l, --login IZENA\t\tsaio hasiera izenaren balio berria\n"
-"  -L, --lock\t\t\terabiltzaile kontua blokeatu\n"
-"  -m, --move-home\t\tetxe direktorioaren edukia kokapen berrira\n"
-"\t\t\t\tmugitu (--d-rekin bakarrik erabilgarri)\n"
-"  -o, --non-unique\t\tonartu UID bikoiztuak (ez bakarrak) erabiltzea\n"
-"  -p, --password PASAHITZA\tEnkriptaturiko pasahitza erabili pasahitz\n"
-"\t\t\t\tberriarentzat\n"
-"  -s, --shell SHELL\t\terabiltzaile kontuaren saio shell berria\n"
-"  -u, --uid UID\t\t\terabiltzaile kontuaren UID berria\n"
-"  -U, --unlock\t\t\terabiltzaile kontua desblokeatu\n"
+"  -a, --append TALDEA           gehitu erabiltzailea TALDE gehigarrietara\n"
+"                                (-G-rekin bakarrik erabili)\n"
+"  -c, --comment COMMENT         GECOS eremuaren balio berria\n"
+"  -d, --home-dir HOME_DIR       erabiltzaile kontu berriaren etxe "
+"direktorioa\n"
+"  -e, --expiredate IRAUNG_DATA  kontu iraungitze data ezarri\n"
+"  -f, --inactive INAKTIBO       iraungitze ondorengo pasahitz ezgaitzea\n"
+"                                to INAKTIBO-ra ezarri\n"
+"  -g, --gid TALDE               erabiltzaile kontu berriarekin TALDE\n"
+"                                erabiltzea behartu\n"
+"  -G, --groups TALDEAK          erabiltzaile kontu berriaren talde\n"
+"                                gehigarriak bistarazi\n"
+"  -h, --help                    laguntza mezu hai bistarazi eta irten\n"
+"  -l, --login IZENA             saio hasiera izenaren balio berria\n"
+"  -L, --lock                    erabiltzaile kontua blokeatu\n"
+"  -m, --move-home               etxe direktorioaren edukia kokapen berrira\n"
+"                                mugitu (--d-rekin bakarrik erabilgarri)\n"
+"  -o, --non-unique              onartu UID bikoiztuak (ez bakarrak) "
+"erabiltzea\n"
+"  -p, --password PASAHITZA      Enkriptaturiko pasahitza erabili pasahitz\n"
+"                                berriarentzat\n"
+"  -s, --shell SHELL             erabiltzaile kontuaren saio shell berria\n"
+"  -u, --uid UID                 erabiltzaile kontuaren UID berria\n"
+"  -U, --unlock                  erabiltzaile kontua desblokeatu\n"
 "\n"
 
 #, fuzzy, c-format
@@ -2016,21 +2038,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 ""
 "Erabilera: vipw [aukerak]\n"
 "\n"
 "Aukerak:\n"
-"  -g, --group\t\t\ttalde datu-basea editatu\n"
-"  -h, --help\t\t\tlaguntza testu hau bistarazi eta irten\n"
-"  -p, --passwd\t\t\tpasahitz datu-basea editatu\n"
-"  -q, --quiet\t\t\tixiltasun modua\n"
-"  -s, --shadow\t\t\tshadow edo gshadow datubasea editatu\n"
+"  -g, --group                   talde datu-basea editatu\n"
+"  -h, --help                    laguntza testu hau bistarazi eta irten\n"
+"  -p, --passwd                  pasahitz datu-basea editatu\n"
+"  -q, --quiet                   ixiltasun modua\n"
+"  -s, --shadow                  shadow edo gshadow datubasea editatu\n"
 "\n"
 
 #, c-format

Modified: upstream/trunk/po/fi.po
===================================================================
--- upstream/trunk/po/fi.po	2007-11-24 14:02:10 UTC (rev 1459)
+++ upstream/trunk/po/fi.po	2007-11-24 22:41:24 UTC (rev 1460)
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: shadow 4.0.18.1\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: 2007-10-27 14:31+0300\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"PO-Revision-Date: 2007-11-24 22:54+0100\n"
 "Last-Translator: Tommi Vainikainen <thv+debian at iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -196,34 +196,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 ""
 "Käyttö: chage [valitsimet] [TUNNUS]\n"
 "\n"
 "Valitsimet:\n"
-"  -d, --lastday VIIM_PVM\tAseta edelliseksi salasanan vaihtopäiväksi\n"
-"\t\t\t\tVIIM_PVM\n"
-"  -E, --expiredate VANH_PVM\tAseta tilin vanhenemispäiväykseksi VANH_PVM\n"
-"  -h, --help\t\t\tNäytä tämä ohje ja lopeta\n"
-"  -I, --inactive POISKÄYTÖSTÄ\tOta salasana pois käytöstä POISKÄYTÖSTÄ\n"
-"\t\t\t\tpäivää vanhenemisen jälkeen\n"
-"  -l, --list\t\t\tNäytä tilin vanhenemistiedot\n"
-"  -m, --mindays MIN_PÄIVIÄ\tAseta pienimmäksi sallittuksi määräksi päiviä\n"
-"\t\t\t\tennen salasanan vaihtamista MIN_PÄIVIÄ\n"
-"  -M, --maxdays MAX_PÄIVIÄ\tAseta suurimmaksi sallituksi määräksi päiviä\n"
-"\t\t\t\tennen salasanan vaihtamista MAX_PÄIVIÄ\n"
-"  -W, --warndays VAR_PÄIVIÄ\tAseta vanhenemisen varoitusajaksi VAR_PÄIVIÄ\n"
+"  -d, --lastday VIIM_PVM        Aseta edelliseksi salasanan vaihtopäiväksi\n"
+"                                VIIM_PVM\n"
+"  -E, --expiredate VANH_PVM     Aseta tilin vanhenemispäiväykseksi VANH_PVM\n"
+"  -h, --help                    Näytä tämä ohje ja lopeta\n"
+"  -I, --inactive POISKÄYTÖSTÄ   Ota salasana pois käytöstä POISKÄYTÖSTÄ\n"
+"                                päivää vanhenemisen jälkeen\n"
+"  -l, --list                    Näytä tilin vanhenemistiedot\n"
+"  -m, --mindays MIN_PÄIVIÄ      Aseta pienimmäksi sallittuksi määräksi\n"
+"                                päiviä ennen salasanan vaihtamista "
+"MIN_PÄIVIÄ\n"
+"  -M, --maxdays MAX_PÄIVIÄ      Aseta suurimmaksi sallituksi määräksi "
+"päiviä\n"
+"                                ennen salasanan vaihtamista MAX_PÄIVIÄ\n"
+"  -W, --warndays VAR_PÄIVIÄ     Aseta vanhenemisen varoitusajaksi "
+"VAR_PÄIVIÄ\n"
 "\n"
 
 #, c-format
@@ -460,22 +463,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 ""
 "Käyttö: chpasswd [valitsimet]\n"
 "\n"
 "Valitsimet:\n"
-"  -e, --encrypted\tAnnetut salasanat ovat salakirjoitettuja\n"
-"  -h, --help\t\tNäytä tämä ohje ja lopeta\n"
-"  -m, --md5\t\tKäytä MD5:tä eikä DES:iä kun annetut salasanat\n"
-"\t\t\teivät ole salakirjoitettuja\n"
+"  -e, --encrypted               Annetut salasanat ovat salakirjoitettuja\n"
+"  -h, --help                    Näytä tämä ohje ja lopeta\n"
+"  -m, --md5                     Käytä MD5:tä eikä DES:iä kun annetut\n"
+"                                salasanat eivät ole salakirjoitettuja\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
@@ -555,15 +560,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 ""
 "Käyttö: chsh [valitsimet] [TUNNUS]\n"
 "\n"
 "Valitsimet:\n"
-"  -h, --help\t\t\tNäytä tämä ohje ja poistu\n"
-"  -s, --shell KUORI\t\tAseta uusi sisäänkirjautumiskuori käyttäjälle\n"
+"  -h, --help                    Näytä tämä ohje ja poistu\n"
+"  -s, --shell KUORI             Aseta uusi sisäänkirjautumiskuori "
+"käyttäjälle\n"
 "\n"
 
 msgid "Login Shell"
@@ -598,32 +604,36 @@
 "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 ""
 "Käyttö: faillog [valitsimet]\n"
 "\n"
 "Valitsimet:\n"
-"  -a, --all\t\t\tNäytä faillog-tietueet kaikille käyttäjille\n"
-"  -h, --help\t\t\tNäytä tämä ohje ja lopeta\n"
-"  -l, --lock-time SEK\t\tLukitse epäonnistuneen kirjautumisen jälkeen\n"
-"\t\t\t\ttunnus SEK sekunniksi\n"
-"  -m, --maximum MAX\t\tAseta sallittujen kirjautumisyritysten\n"
-"\t\t\t\tlaskureiksi MAX\n"
-"  -r, --reset\t\t\tNollaa kirjautumisyrityslaskurit\n"
-"  -t, --time PÄIVIÄ\t\tNäytä PÄIVIÄ uudemmat faillog-tietueet\n"
-"  -u, --user TUNNUS\t\tNäytä faillog-tietue tai muuta\n"
-"\t\t\t\tkirjautumisyrityslaskureita (kun\n"
-"\t\t\t\tkäytetään -r, -m tai -l-valitsimilla)\n"
-"\t\t\t\tvain käyttäjälle TUNNUS\n"
+"  -a, --all                     Näytä faillog-tietueet kaikille käyttäjille\n"
+"  -h, --help                    Näytä tämä ohje ja lopeta\n"
+"  -l, --lock-time SEK           Lukitse epäonnistuneen kirjautumisen "
+"jälkeen\n"
+"                                tunnus SEK sekunniksi\n"
+"  -m, --maximum MAX             Aseta sallittujen kirjautumisyritysten\n"
+"                                laskureiksi MAX\n"
+"  -r, --reset                   Nollaa kirjautumisyrityslaskurit\n"
+"  -t, --time PÄIVIÄ             Näytä PÄIVIÄ uudemmat faillog-tietueet\n"
+"  -u, --user TUNNUS             Näytä faillog-tietue tai muuta\n"
+"                                kirjautumisyrityslaskureita (kun\n"
+"                                käytetään -r, -m tai -l-valitsimilla)\n"
+"                                vain käyttäjälle TUNNUS\n"
 "\n"
 
 #, c-format
@@ -752,25 +762,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 ""
 "Käyttö: groupadd [valitsimet] RYHMÄ\n"
 "\n"
 "Valitsimet:\n"
-"  -f, --force\t\t\tpoistu onnistuneella arvolla vaikka annettu\n"
-"\t\t\t\tryhmä olisikin jo olemassa\n"
-"  -g, --gid RYHMÄID\t\tkäytä RYHMÄID:tä uudelle ryhmälle\n"
-"  -h, --help\t\t\tnäytä tämä ohjeviesti ja poistu\n"
-"  -K, --key AVAIN=ARVO\t\tohita /etc/login.defs:n oletusarvot\n"
-"  -o, --non-unique\t\tsalli ryhmän luominen (ei-uniikilla)\n"
-"\t\t\t\tkopio-RYHMÄID:llä\n"
+"  -f, --force                   poistu onnistuneella arvolla vaikka annettu\n"
+"                                ryhmä olisikin jo olemassa\n"
+"  -g, --gid RYHMÄID             käytä RYHMÄID:tä uudelle ryhmälle\n"
+"  -h, --help                    näytä tämä ohjeviesti ja poistu\n"
+"  -K, --key AVAIN=ARVO          ohita /etc/login.defs:n oletusarvot\n"
+"  -o, --non-unique              salli ryhmän luominen (ei-uniikilla)\n"
+"                                kopio-RYHMÄID:llä\n"
 "\n"
 
 #, c-format
@@ -898,19 +908,20 @@
 "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 ""
 "Käyttö: groupmod [valitsimet] RYHMÄ\n"
 "\n"
 "Valitsimet:\n"
-"  -g, --gid RYHMÄID\t\tkäytä RYHMÄID:tä tälle ryhmälle\n"
-"  -h, --help\t\t\tnäytä tämä ohjeviesti ja poistu\n"
-"  -n, --new-name UUSI_RYHMÄ\taseta UUSI_RYHMÄ nimeksi RYHMÄlle\n"
-"  -o, --non-unique\t\tsalli saman RYHMÄID:n käyttäminen RYHMÄlle\n"
+"  -g, --gid RYHMÄID             käytä RYHMÄID:tä tälle ryhmälle\n"
+"  -h, --help                    näytä tämä ohjeviesti ja poistu\n"
+"  -n, --new-name UUSI_RYHMÄ     aseta UUSI_RYHMÄ nimeksi RYHMÄlle\n"
+"  -o, --non-unique              salli saman RYHMÄID:n käyttäminen RYHMÄlle\n"
 "\n"
 
 #, c-format
@@ -1057,24 +1068,26 @@
 msgid " groups="
 msgstr " ryhmät="
 
-#, 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 ""
 "Käyttö: lastlog [valitsimet]\n"
 "\n"
 "Valitsimet:\n"
-"  -b, --before PÄIVÄÄ\tTulosta vain PÄIVÄÄ vanhemmat lastlog-tietueet\n"
-"  -t, --time PÄIVÄÄ\tTulosta vain PÄIVÄÄ tuoreemmat lastlog-tietueet\n"
-"  -u, --login TUNNUS\tTulosta lastlog-tietue käyttäjälle TUNNUS\n"
-"  -h, --help\t\tNäytä tämä ohje ja lopeta\n"
+"  -b, --before PÄIVÄÄ        Tulosta vain PÄIVÄÄ vanhemmat lastlog-tietueet\n"
+"  -t, --time PÄIVÄÄ          Tulosta vain PÄIVÄÄ tuoreemmat lastlog-"
+"tietueet\n"
+"  -u, --login TUNNUS         Tulosta lastlog-tietue käyttäjälle TUNNUS\n"
+"  -h, --help                 Näytä tämä ohje ja lopeta\n"
 "\n"
 
 #, c-format
@@ -1226,14 +1239,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: tiedostoa /etc/passwd ei voi lukita.\n"
@@ -1287,46 +1296,48 @@
 "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 ""
 "Käyttö: passwd [valitsimet] [TUNNUS]\n"
 "\n"
 "Valitsimet:\n"
-"  -a, --all\t\t\tIlmoita jokaisen tunnuksen salasanatilanne\n"
-"  -d, --delete\t\t\tPoista annetun tunnuksen salasana\n"
-"  -e, --expire\t\t\tAseta annetun tunnuksen salasana vanhentuneeksi\n"
-"  -h, --help\t\t\tNäytä tämä ohje ja lopeta\n"
-"  -k, --keep-tokens\t\tVaihda vain vanhentunut salasana\n"
-"  -i, --inactive POISKÄYTÖSTÄ\tOta salasana pois käytöstä POISKÄYTÖSTÄ\n"
-"\t\t\t\tpäivää vanhenemisen jälkeen\n"
-"  -l, --lock\t\t\tLukitse annettu tunnus\n"
-"  -n, --mindays VÄH_PÄIVÄ\tAseta vähin määrä päiviä ennen kuin salasanan\n"
-"\t\t\t\tvoi vaihtaa VÄH_PÄIVÄksi\n"
-"  -q, --quiet\t\t\tHiljainen toiminta\n"
-"  -r, --repository TIETOLÄHDE\tVaihda salasana tietolähteessä TIETOLÄHDE\n"
-"  -S, --status\t\t\tIlmoita annetun tunnuksen salasanan tila\n"
-"  -u, --unlock\t\t\tAvaa annetun tunnuksen lukitus\n"
-"  -w, --warndays VAR_PÄIVÄÄ\tAseta varoituspäiviksi VAR_PÄIVÄÄ ennen\n"
-"\t\t\t\tvanhentumista\n"
-"  -x, --maxdays KORK_PÄIVÄ\tAseta korkein määrä päivä ennen kuin salasana\n"
-"\t\t\t\ttäytyy vaihtaa KORK_PÄIVÄksi\n"
+"  -a, --all                     Ilmoita jokaisen tunnuksen salasanatilanne\n"
+"  -d, --delete                  Poista annetun tunnuksen salasana\n"
+"  -e, --expire                  Aseta annetun tunnuksen salasana\n"
+"                                vanhentuneeksi\n"
+"  -h, --help                    Näytä tämä ohje ja lopeta\n"
+"  -k, --keep-tokens             Vaihda vain vanhentunut salasana\n"
+"  -i, --inactive POISKÄYTÖSTÄ   Ota salasana pois käytöstä POISKÄYTÖSTÄ\n"
+"                                päivää vanhenemisen jälkeen\n"
+"  -l, --lock                    Lukitse annettu tunnus\n"
+"  -n, --mindays VÄH_PÄIVÄ       Aseta vähin määrä päiviä ennen kuin\n"
+"                                salasanan voi vaihtaa VÄH_PÄIVÄksi\n"
+"  -q, --quiet                   Hiljainen toiminta\n"
+"  -r, --repository TIETOLÄHDE   Vaihda salasana tietolähteessä TIETOLÄHDE\n"
+"  -S, --status                  Ilmoita annetun tunnuksen salasanan tila\n"
+"  -u, --unlock                  Avaa annetun tunnuksen lukitus\n"
+"  -w, --warndays VAR_PÄIVÄÄ     Aseta varoituspäiviksi VAR_PÄIVÄÄ ennen\n"
+"                                vanhentumista\n"
+"  -x, --maxdays KORK_PÄIVÄ      Aseta korkein määrä päivä ennen kuin\n"
+"                                salasana täytyy vaihtaa KORK_PÄIVÄksi\n"
 "\n"
 
 msgid "Old password: "
@@ -1510,25 +1521,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 ""
 "Käyttö: su [valitsimet] [TUNNUS]\n"
 "\n"
 "Valitsimet:\n"
-"  -c, --command KOMENTO\tVälitä KOMENTO käynnistyvälle kuorelle\n"
-"  -h, --help\t\t\tNäytä tämä ohje ja lopeta\n"
-"  -, -l, --login\t\tTee kuoresta sisäänkirjautumiskuori\n"
+"  -c, --command KOMENTO         Välitä KOMENTO käynnistyvälle kuorelle\n"
+"  -h, --help                    Näytä tämä ohje ja lopeta\n"
+"  -, -l, --login                Tee kuoresta sisäänkirjautumiskuori\n"
 "  -m, -p,\n"
-"  --preserve-environment\tÄlä tyhjää ympäristömuuttujia ja säilytä\n"
-"\t\t\t\tsama kuori\n"
-"  -s, --shell KUORI\t\tKäytä kuorta KUORI passwd:n oletuksen sijaan\n"
+"  --preserve-environment        Älä tyhjää ympäristömuuttujia ja säilytä\n"
+"                                sama kuori\n"
+"  -s, --shell KUORI             Käytä kuorta KUORI passwd:n oletuksen "
+"sijaan\n"
 "\n"
 
 #, c-format
@@ -1616,56 +1628,63 @@
 "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 ""
 "Käyttö: useradd [valitsimet] TUNNUS\n"
 "\n"
 "Valitsimet:\n"
-"  -b, --base-dir YLÄHAK\tYlähakemisto uuden käyttäjätunnuksen\n"
-"\t\t\t\tkotihakemistolle\n"
-"  -c, --comment KOMMENTTI\tAseta GECOS-kenttä uudelle käyttäjätunnukselle\n"
-"  -d, --home-dir KOTIHAK\tUuden käyttäjätunnuksen kotihakemisto\n"
-"  -D, --defaults\t\tTulosta tai tallenna useradd-työkalun\n"
-"\t\t\t\toletusasetukset\n"
-"  -e, --expiredate VANH_PVM\tAseta tilin vanhenemispäiväykseksi VANH_PVM\n"
-"  -f, --inactive POISKÄYTÖSTÄ\tOta salasana pois käytöstä POISKÄYTÖSTÄ\n"
-"\t\t\t\tpäivää vanhenemisen jälkeen\n"
-"  -g, --gid RYHMÄ\t\tValitse itse RYHMÄ uudelle käyttäjätunnukselle\n"
-"  -G, --groups RYHMÄT\t\tLuettelo lisäryhmistä uudelle\n"
-"\t\t\t\tkäyttäjätunnukselle\n"
-"  -h, --help\t\t\tNäytä tämä ohje ja lopeta\n"
-"  -k, --skel MALLIHAK\t\tMääritä vaihtoehtoinen mallihakemisto\n"
-"  -K, --key AVAIN=ARVO\t\tKumoa /etc/login.defs-oletusarvot\n"
-"  -m, --create-home\t\tLuo kotihakemisto uudelle käyttäjätunnukselle\n"
-"  -o, --non-unique\t\tSalli UID:n uudelleenkäyttö (ei-uniikki UID)\n"
-"\t\t\t\tluotaessa käyttäjätunnus\n"
-"  -p, --password SALASANA\tKäytä salakirjoitettua salasanaa uudelle\n"
-"\t\t\t\tkäyttäjätunnukselle\n"
-"  -s, --shell KUORI\t\tUuden käyttäjätunnuksen sisäänkirjautumiskuori\n"
-"  -u, --uid UID\t\tValitse itse UID uudelle käyttäjätunnukselle\n"
+"  -b, --base-dir YLÄHAK         Ylähakemisto uuden käyttäjätunnuksen\n"
+"                                kotihakemistolle\n"
+"  -c, --comment KOMMENTTI       Aseta GECOS-kenttä uudelle "
+"käyttäjätunnukselle\n"
+"  -d, --home-dir KOTIHAK        Uuden käyttäjätunnuksen kotihakemisto\n"
+"  -D, --defaults                Tulosta tai tallenna useradd-työkalun\n"
+"                                oletusasetukset\n"
+"  -e, --expiredate VANH_PVM     Aseta tilin vanhenemispäiväykseksi VANH_PVM\n"
+"  -f, --inactive POISKÄYTÖSTÄ   Ota salasana pois käytöstä POISKÄYTÖSTÄ\n"
+"                                päivää vanhenemisen jälkeen\n"
+"  -g, --gid RYHMÄ               Valitse itse RYHMÄ uudelle "
+"käyttäjätunnukselle\n"
+"  -G, --groups RYHMÄT           Luettelo lisäryhmistä uudelle\n"
+"                                käyttäjätunnukselle\n"
+"  -h, --help                    Näytä tämä ohje ja lopeta\n"
+"  -k, --skel MALLIHAK           Määritä vaihtoehtoinen mallihakemisto\n"
+"  -K, --key AVAIN=ARVO          Kumoa /etc/login.defs-oletusarvot\n"
+"  -m, --create-home             Luo kotihakemisto uudelle "
+"käyttäjätunnukselle\n"
+"  -o, --non-unique              Salli UID:n uudelleenkäyttö (ei-uniikki "
+"UID)\n"
+"                                luotaessa käyttäjätunnus\n"
+"  -p, --password SALASANA       Käytä salakirjoitettua salasanaa uudelle\n"
+"                                käyttäjätunnukselle\n"
+"  -s, --shell KUORI             Uuden käyttäjätunnuksen "
+"sisäänkirjautumiskuori\n"
+"  -u, --uid UID                 Valitse itse UID uudelle "
+"käyttäjätunnukselle\n"
 "\n"
 
 #, fuzzy, c-format
@@ -1808,23 +1827,24 @@
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: varoitus: CREATE_HOME ei tuettu, käytä -m sen sijaan.\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 ""
 "Käyttö: userdel [valitsimet] TUNNUS\n"
 "\n"
 "Valitsimet:\n"
-"  -f, --force\t\t\tPakota tiedostojen poisto vaikkei niitä\n"
-"\t\t\t\tomistaisikaan käyttäjä\n"
-"  -h, --help\t\t\tNäytä tämä ohje ja poistu\n"
-"  -r, --remove\t\t\tPoista kotihakemistoja ja postilaatikko\n"
+"  -f, --force                   Pakota tiedostojen poisto vaikkei niitä\n"
+"                                omistaisikaan käyttäjä\n"
+"  -h, --help                    Näytä tämä ohje ja poistu\n"
+"  -r, --remove                  Poista kotihakemistoja ja postilaatikko\n"
 "\n"
 
 #, c-format
@@ -1891,50 +1911,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 ""
 "Käyttö: usermod [valitsimet] TUNNUS\n"
 "\n"
 "Valitsimet:\n"
-"  -a, --append RYHMÄ\t\tLisää käyttäjä ryhmään RYHMÄ\n"
+"  -a, --append RYHMÄ            Lisää käyttäjä ryhmään RYHMÄ\n"
 "                                (käytetään vain valitsimen -G kanssa)\n"
-"  -c, --comment KOMMENTTI\tAseta GECOS-kenttään uusi arvo\n"
-"  -d, --home KOTIHAK\t\tKäyttäjätunnuksen uusi kotihakemisto\n"
-"  -e, --expiredate VANH_PVM\tAseta tilin vanhenemispäiväykseksi VANH_PVM\n"
-"  -f, --inactive POISKÄYTÖSTÄ\tOta salasana pois käytöstä POISKÄYTÖSTÄ\n"
-"\t\t\t\tpäivää vanhenemisen jälkeen\n"
-"  -g, --gid RYHMÄ\t\tAseta RYHMÄ uudeksi sisäänkirjautumisryhmäksi\n"
-"  -G, --groups RYHMÄT\t\tLuettelo lisäryhmistä\n"
-"  -h, --help\t\t\tNäytä tämä ohje ja lopeta\n"
-"  -l, --login TUNNUS\t\tUusi arvo tunnukseksi\n"
-"  -L, --lock\t\t\tLukitse annettu tunnus\n"
-"  -m, --move-home\t\tSiirrä kotihakemiston sisältö uuteen\n"
-"\t\t\t\tsijaintiin (käytä vain yhdessä valitsimen -d kanssa)\n"
-"  -o, --non-unique\t\tSalli UID:n uudelleenkäyttö (ei-uniikki UID)\n"
-"  -p, --password SALASANA\tKäytä salakirjoitettua salasanaa\n"
-"  -s, --shell KUORI\t\tKäyttäjätunnuksen uusi sisäänkirjautumiskuori\n"
-"  -u, --uid UID\t\tUusi UID käyttäjätunnukselle\n"
-"  -U, --unlock\t\t\tAvaa annetun tunnuksen lukitus\n"
+"  -c, --comment KOMMENTTI       Aseta GECOS-kenttään uusi arvo\n"
+"  -d, --home KOTIHAK            Käyttäjätunnuksen uusi kotihakemisto\n"
+"  -e, --expiredate VANH_PVM     Aseta tilin vanhenemispäiväykseksi VANH_PVM\n"
+"  -f, --inactive POISKÄYTÖSTÄ   Ota salasana pois käytöstä POISKÄYTÖSTÄ\n"
+"                                päivää vanhenemisen jälkeen\n"
+"  -g, --gid RYHMÄ               Aseta RYHMÄ uudeksi "
+"sisäänkirjautumisryhmäksi\n"
+"  -G, --groups RYHMÄT           Luettelo lisäryhmistä\n"
+"  -h, --help                    Näytä tämä ohje ja lopeta\n"
+"  -l, --login TUNNUS            Uusi arvo tunnukseksi\n"
+"  -L, --lock                    Lukitse annettu tunnus\n"
+"  -m, --move-home               Siirrä kotihakemiston sisältö uuteen\n"
+"                                sijaintiin (käytä vain yhdessä valitsimen\n"
+"                                -d kanssa)\n"
+"  -o, --non-unique              Salli UID:n uudelleenkäyttö (ei-uniikki "
+"UID)\n"
+"  -p, --password SALASANA       Käytä salakirjoitettua salasanaa\n"
+"  -s, --shell KUORI             Käyttäjätunnuksen uusi "
+"sisäänkirjautumiskuori\n"
+"  -u, --uid UID                 Uusi UID käyttäjätunnukselle\n"
+"  -U, --unlock                  Avaa annetun tunnuksen lukitus\n"
 "\n"
 
 #, fuzzy, c-format
@@ -2005,21 +2029,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 ""
 "Käyttö: vipw [valitsimet]\n"
 "\n"
 "Valitsimet:\n"
-"  -g, --group\t\t\tMuokkaa ryhmätietokantaa\n"
-"  -h, --help\t\t\tNäytä tämä ohje ja lopeta\n"
-"  -p, --passwd\t\t\tMuokkaa passwd-tietokantaa\n"
-"  -q, --quiet\t\t\tHiljainen toiminta\n"
-"  -s, --shadow\t\t\tMuokkaa shadow- tai gshadow-tietokantaa\n"
+"  -g, --group                   Muokkaa ryhmätietokantaa\n"
+"  -h, --help                    Näytä tämä ohje ja lopeta\n"
+"  -p, --passwd                  Muokkaa passwd-tietokantaa\n"
+"  -q, --quiet                   Hiljainen toiminta\n"
+"  -s, --shadow                  Muokkaa shadow- tai gshadow-tietokantaa\n"
 "\n"
 
 #, c-format

Modified: upstream/trunk/po/fr.po
===================================================================
--- upstream/trunk/po/fr.po	2007-11-24 14:02:10 UTC (rev 1459)
+++ upstream/trunk/po/fr.po	2007-11-24 22:41:24 UTC (rev 1460)
@@ -9,8 +9,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-07-20 07:39+0200\n"
+"POT-Creation-Date: 2007-11-24 16:15+0100\n"
+"PO-Revision-Date: 2007-11-24 16:16+0100\n"
 "Last-Translator: Jean-Luc Coulon (f5ibh) <jean-luc.coulon at wanadoo.fr>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -204,37 +204,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 ""
 "Syntaxe : chage [options] [IDENTIFIANT]\n"
 "\n"
 "Options :\n"
-"  -d, --lastday DERNIER_JOUR\tfixer la dernière modification du mot de\n"
-"\t\t\t\tpasse à DERNIER_JOUR\n"
-"  -E, --expiredate FIN_VALIDITÉ\tfixer la date de fin de validité du compte\n"
-"\t\t\t\tà FIN_VALIDITÉ\n"
-"  -h, --help\t\t\tafficher ce message d'aide et quitter\n"
-"  -I, --inactive INACTIF\tfixer la durée d'inactivité du mot de\n"
-"\t\t\t\tpasse après sa fin de validité à INACTIF\n"
-"  -l, --list\t\t\tafficher les informations concernant la\n"
-"\t\t\t\tvalidité du compte au cours du temps\n"
-"  -m, --mindays JOURS_MIN\tfixer le nombre minimum de jours avant la\n"
-"\t\t\t\tmodification du mot de passe à JOURS_MIN\n"
-"  -M, --maxdays JOURS_MAX\tfixer le nombre maximum de jours avant la\n"
-"\t\t\t\tmodification du mot de passe à JOURS_MAX\n"
-"  -W, --warndays JOURS_AVERT\tfixer le nombre de jours d'avertissement\n"
-"\t\t\t\tde fin de validité à JOURS_AVERT\n"
+"  -d, --lastday DERNIER_JOUR    fixer la dernière modification du mot de\n"
+"                                passe à DERNIER_JOUR\n"
+"  -E, --expiredate FIN_VALIDITÉ fixer la date de fin de validité du compte\n"
+"                                à FIN_VALIDITÉ\n"
+"  -h, --help                    afficher ce message d'aide et quitter\n"
+"  -I, --inactive INACTIF        fixer la durée d'inactivité du mot de\n"
+"                                passe après sa fin de validité à INACTIF\n"
+"  -l, --list                    afficher les informations concernant la\n"
+"                                validité du compte au cours du temps\n"
+"  -m, --mindays JOURS_MIN       fixer le nombre minimum de jours avant la\n"
+"                                modification du mot de passe à JOURS_MIN\n"
+"  -M, --maxdays JOURS_MAX       fixer le nombre maximum de jours avant la\n"
+"                                modification du mot de passe à JOURS_MAX\n"
+"  -W, --warndays JOURS_AVERT    fixer le nombre de jours d'avertissement\n"
+"                                de fin de validité à JOURS_AVERT\n"
 "\n"
 
 #, c-format
@@ -489,23 +489,27 @@
 "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 ""
 "Syntaxe : chpasswd [options]\n"
 "\n"
 "Options :\n"
-"  -e, --encrypted\tles mots de passe fournis sont chiffrés\n"
-"  -h, --help\t\tafficher ce message d'aide et quitter\n"
-"  -m, --md5\t\tutiliser le chiffrage MD5 à la place de DES lorsque\n"
-"\t\t\tles mots de passe fournis ne sont pas chiffrés\n"
+"  -e, --encrypted               les mots de passe fournis sont chiffrés\n"
+"  -h, --help                    afficher ce message d'aide et quitter\n"
+"  -m, --md5                     utiliser le chiffrage MD5 à la place de DES "
+"lorsque\n"
+"                                les mots de passe fournis ne sont pas "
+"chiffrés\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
@@ -594,16 +598,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 ""
 "Syntaxe : chsh [options] [IDENTIFIANT]\n"
 "\n"
 "Options :\n"
-"  -h, --help    afficher cette page d'aide et quitter\n"
-"  -s, --shell INTERPRÉTEUR  nouvel interpréteur de commandes initial\n"
-"                            pour le compte de l'utilisateur\n"
+"  -h, --help                    afficher cette page d'aide et quitter\n"
+"  -s, --shell INTERPRÉTEUR      nouvel interpréteur de commandes initial\n"
+"                                pour le compte de l'utilisateur\n"
 "\n"
 
 msgid "Login Shell"
@@ -638,34 +642,39 @@
 "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 ""
 "Syntaxe : faillog [options]\n"
 "\n"
 "Options :\n"
-"  -a, --all\t\t\tafficher les enregistrements « faillog » pour tous\n"
-"\t\t\t\tles utilisateurs\n"
-"  -h, --help\t\t\tafficher ce message d'aide et quitter\n"
-"  -l, --lock-time SEC\t\taprès une connexion refusée, verrouiller le compte\n"
-"\t\t\t\tpendant SEC secondes\n"
-"  -m, --maximum MAX\t\tpositionner les compteurs de connexions refusées à\n"
-"\t\t\t\tMAX\n"
-"  -r, --reset\t\t\tremettre à zéro les compteurs de connexions refusées\n"
-"  -t, --time NB_JOURS\t\tafficher les échecs de connexions datant de moins\n"
-"\t\t\t\tde NB_JOURS jours\n"
-"  -u, --user LOGIN\t\tafficher l'enregistrement « faillog » ou gérer les\n"
-"\t\t\t\tcompteurs et les limites (si utilisé conjointement aux\n"
-"\t\t\t\toptions -r, -m ou -l) d'échecs uniquement pour\n"
-"\t\t\t\tl'utilisateur dont le compte est LOGIN\n"
+"  -a, --all                     afficher les enregistrements « faillog »\n"
+"                                pour tous les utilisateurs\n"
+"  -h, --help                    afficher ce message d'aide et quitter\n"
+"  -l, --lock-time SEC           après une connexion refusée, verrouiller le\n"
+"                                compte pendant SEC secondes\n"
+"  -m, --maximum MAX             positionner les compteurs de connexions\n"
+"                                refusées à MAX\n"
+"  -r, --reset                   remettre à zéro les compteurs de connexions\n"
+"                                refusées\n"
+"  -t, --time NB_JOURS           afficher les échecs de connexions datant de\n"
+"                                moins de NB_JOURS jours\n"
+"  -u, --user LOGIN              afficher l'enregistrement « faillog » ou\n"
+"                                gérer les compteurs et les limites (si\n"
+"                                utilisé conjointement aux options -r, -m ou\n"
+"                                -l) d'échecs uniquement pour l'utilisateur\n"
+"                                dont le compte est LOGIN\n"
 "\n"
 
 #, c-format
@@ -800,26 +809,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 ""
 "Syntaxe : groupadd [option] GROUPE\n"
 "\n"
 "Options :\n"
-"  -f, --force           forcer la sortie avec un code de retour de succès\n"
-"                        si le groupe indiqué existe déjà\n"
-"  -g, --gid GID         utiliser GID pour le nouveau groupe\n"
-"  -h, --help            afficher ce message d'aide et quitter\n"
-"  -K, --key CLÉ=VALEUR  remplacer les valeurs par défaut de\n"
-"                        /etc/login.defs\n"
-"  -o, --non-unique      permettre de créer un groupe avec un GID dupliqué\n"
-"                        (non unique)\n"
+"  -f, --force                   forcer la sortie avec un code de retour de\n"
+"                                succès si le groupe indiqué existe déjà\n"
+"  -g, --gid GID                 utiliser GID pour le nouveau groupe\n"
+"  -h, --help                    afficher ce message d'aide et quitter\n"
+"  -K, --key CLÉ=VALEUR          remplacer les valeurs par défaut de\n"
+"                                /etc/login.defs\n"
+"  -o, --non-unique              permettre de créer un groupe avec un GID\n"
+"                                dupliqué (non unique)\n"
 "\n"
 
 #, c-format
@@ -957,10 +966,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 ""
 "Syntaxe : groupmod [option] GROUPE\n"
@@ -1135,22 +1145,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 ""
 "Syntaxe : lastlog [options]\n"
 "\n"
 "Options :\n"
-"   b, --before JOURS\tn'afficher que les enregistrements de « lastlog »\n"
-"\t\t\tplus anciens que JOURS\n"
-"  -h, --help\t\tafficher ce message d'aide et quitter\n"
-"  -t, --time NB_JOURS\tafficher uniquement les enregistrements de\n"
-"\t\t\t« lastlog » plus récents que NB_JOURS jours\n"
-"  -u, --user LOGIN\tafficher l'enregistrement « lastlog » pour\n"
-"\t\t\tl'utilisateur dont le compte est LOGIN\n"
+"   b, --before JOURS            n'afficher que les enregistrements de\n"
+"                                « lastlog » plus anciens que JOURS\n"
+"  -h, --help                    afficher ce message d'aide et quitter\n"
+"  -t, --time NB_JOURS           afficher uniquement les enregistrements de\n"
+"                                « lastlog » plus récents que NB_JOURS jours\n"
+"  -u, --user LOGIN              afficher l'enregistrement « lastlog » pour\n"
+"                                l'utilisateur dont le compte est LOGIN\n"
 "\n"
 
 #, c-format
@@ -1303,14 +1314,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 : impossible de verrouiller /etc/passwd.\n"
@@ -1365,49 +1372,50 @@
 "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 ""
 "Syntaxe : passwd [options] [IDENTIFIANT]\n"
 "\n"
 "Options :\n"
-"  -a, --all               afficher l'état des mots de passe de tous les\n"
-"                          comptes\n"
-"  -d, --delete            supprimer le mot de passe du compte indiqué\n"
-"  -e, --expire            forcer la fin de validité du compte indiqué\n"
-"  -h, --help              afficher ce message d'aide et quitter\n"
-"  -k, --keep-tokens       ne changer le mot de passe que s'il\n"
-"                          est arrivé en fin de validité\n"
-"  -i, --inactive INACTIF  fixer la durée d'inactivation du mot de passe\n"
-"                          après sa fin de validité à INACTIF\n"
-"  -l, --lock              bloquer le compte indiqué\n"
-"  -n, --mindays JOURS_MIN fixer le nombre minimum de jours avant le\n"
-"                          changement de mot de passe à JOURS_MIN\n"
-"  -q, --quiet             mode silencieux\n"
-"  -r, --repository DÉPÔT  changer le mot de passe dans le dépôt DÉPÔT\n"
-"  -S, --status            afficher l'état du mot de passe du compte\n"
-"                          indiqué\n"
-"  -u, --unlock            déverrouiller le compte indiqué\n"
-"  -w, --warndays JOURS_AVERT  fixer le nombre de jours d'avertissement\n"
-"                              de fin de validité à JOURS_AVERT\n"
-"  -x, --maxdays JOURS_MAX fixer le nombre maximum de jours avant le\n"
-"                          changement de mot de passe à JOURS_MAX\n"
+"  -a, --all                     afficher l'état des mots de passe de tous\n"
+"                                les comptes\n"
+"  -d, --delete                  supprimer le mot de passe du compte indiqué\n"
+"  -e, --expire                  forcer la fin de validité du compte indiqué\n"
+"  -h, --help                    afficher ce message d'aide et quitter\n"
+"  -k, --keep-tokens             ne changer le mot de passe que s'il\n"
+"                                est arrivé en fin de validité\n"
+"  -i, --inactive INACTIF        fixer la durée d'inactivation du mot de\n"
+"                                passe après sa fin de validité à INACTIF\n"
+"  -l, --lock                    bloquer le compte indiqué\n"
+"  -n, --mindays JOURS_MIN       fixer le nombre minimum de jours avant le\n"
+"                                changement de mot de passe à JOURS_MIN\n"
+"  -q, --quiet                   mode silencieux\n"
+"  -r, --repository DÉPÔT        changer le mot de passe dans le dépôt DÉPÔT\n"
+"  -S, --status                  afficher l'état du mot de passe du compte\n"
+"                                indiqué\n"
+"  -u, --unlock                  déverrouiller le compte indiqué\n"
+"  -w, --warndays JOURS_AVERT    fixer le nombre de jours d'avertissement\n"
+"                                de fin de validité à JOURS_AVERT\n"
+"  -x, --maxdays JOURS_MAX       fixer le nombre maximum de jours avant le\n"
+"                                changement de mot de passe à JOURS_MAX\n"
 "\n"
 
 msgid "Old password: "
@@ -1603,30 +1611,30 @@
 "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 ""
 "Syntaxe : su [options] [IDENTIFIANT]\n"
 "\n"
 "Options :\n"
-"  -c, --command COMMANDE passer la commande COMMANDE à\n"
-"                         l'interpréteur de commande appelé ;\n"
-"  -h, --help             afficher ce message d'aide et quitter ;\n"
-"  -, -l, --login         utiliser un interpréteur de commandes\n"
-"                         initial (« login shell ») ;\n"
+"  -c, --command COMMANDE        passer la commande COMMANDE à\n"
+"                                l'interpréteur de commande appelé ;\n"
+"  -h, --help                    afficher ce message d'aide et quitter ;\n"
+"  -, -l, --login                utiliser un interpréteur de commandes\n"
+"                                initial (« login shell ») ;\n"
 "  -m, -p,\n"
-"  --preserve-environment ne pas réinitialiser les variables\n"
-"                         d'environnement et conserver le même\n"
-"                         interpréteur de commandes ;\n"
-"  -s, --shell SHELL      utiliser SHELL comme interpréteur de\n"
-"                         commandes à la place de celui défini\n"
-"                         par défaut dans le fichier passwd.\n"
+"  --preserve-environment        ne pas réinitialiser les variables\n"
+"                                d'environnement et conserver le même\n"
+"                                interpréteur de commandes ;\n"
+"  -s, --shell SHELL             utiliser SHELL comme interpréteur de\n"
+"                                commandes à la place de celui défini\n"
+"                                par défaut dans le fichier passwd.\n"
 "\n"
 
 #, c-format
@@ -1714,65 +1722,67 @@
 "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 ""
 "Syntaxe : useradd [options] IDENTIFIANT\n"
 "\n"
 "Options :\n"
-"  -b, --base-dir REP_BASE\trépertoire de base pour le répertoire\n"
-"\t\t\t\tpersonnel du compte du nouvel utilisateur\n"
-"  -c, --comment COMMENT\tdéfinir le champ « GECOS » du compte du\n"
-"\t\t\t\tnouvel utilisateur\n"
-"  -d, --home-dir REP_PERS\trépertoire personnel pour le compte du\n"
-"\t\t\t\tnouvel utilisateur\n"
-"  -D, --defaults\t\tafficher ou enregistrer la configuration par\n"
-"\t\t\t\tdéfaut modifiée de « useradd »\n"
-"  -e, --expiredate DATE_EXPIR\tfixer la date de fin de validité du\n"
-"\t\t\t\tcompte à DATE_EXPIR\n"
-"  -f, --inactive INACTIF\tfixer la durée d'inactivité du mot de passe\n"
-"\t\t\t\taprès sa fin de validité à INACTIF\n"
-"  -g, --gid GROUPE\t\tforcer l'utilisation de GROUPE pour le compte\n"
-"\t\t\t\tdu nouvel utilisateur\n"
-"  -G, --groups GROUPS\t\tliste des groupes supplémentaires pour le\n"
-"\t\t\t\tcompte du nouvel utilisateur\n"
-"  -h, --help\t\t\tafficher ce message d'aide et quitter\n"
-"  -k, --skel REP_SQEL\t\tdéfinir un autre répertoire « skel »\n"
-"  -K, --key CLÉ=VALEUR\t\tremplacer les valeurs par défaut de\n"
-"\t\t\t\t/etc/login.defs\n"
-"  -m, --create-home\t\tcréer le répertoire personnel pour le compte\n"
-"\t\t\t\tdu nouvel utilisateur\n"
-"  -o, --non-unique\t\tautoriser la création d'un utilisateur\n"
-"\t\t\t\tavec un identifiant d'utilisateur (UID)\n"
-"\t\t\t\tdupliqué (non unique)\n"
-"  -p, --password MOT_DE_PASSE\tutiliser un mot de passe chiffré pour le\n"
-"\t\t\t\tcompte du nouvel utilisateur\n"
-"  -s, --shell INTERPRÉTEUR\tinterpréteur de commandes initial pour le\n"
-"\t\t\t\tcompte du nouvel utilisateur\n"
-"  -u, --uid UID\t\tforcer l'utilisation de l'identifiant « UID »\n"
-"\t\t\t\tpour le compte du nouvel utilisateur\n"
+"  -b, --base-dir REP_BASE       répertoire de base pour le répertoire\n"
+"                                personnel du compte du nouvel utilisateur\n"
+"  -c, --comment COMMENT         définir le champ « GECOS » du compte du\n"
+"                                nouvel utilisateur\n"
+"  -d, --home-dir REP_PERS       répertoire personnel pour le compte du\n"
+"                                nouvel utilisateur\n"
+"  -D, --defaults                afficher ou enregistrer la configuration\n"
+"                                par défaut modifiée de « useradd »\n"
+"  -e, --expiredate DATE_EXPIR   fixer la date de fin de validité du\n"
+"                                compte à DATE_EXPIR\n"
+"  -f, --inactive INACTIF        fixer la durée d'inactivité du mot de passe\n"
+"                                après sa fin de validité à INACTIF\n"
+"  -g, --gid GROUPE              forcer l'utilisation de GROUPE pour le\n"
+"                                compte du nouvel utilisateur\n"
+"  -G, --groups GROUPS           liste des groupes supplémentaires pour le\n"
+"                                compte du nouvel utilisateur\n"
+"  -h, --help                    afficher ce message d'aide et quitter\n"
+"  -k, --skel REP_SQEL           définir un autre répertoire « skel »\n"
+"  -K, --key CLÉ=VALEUR          remplacer les valeurs par défaut de\n"
+"                                /etc/login.defs\n"
+"  -m, --create-home             créer le répertoire personnel pour le\n"
+"                                compte du nouvel utilisateur\n"
+"  -o, --non-unique              autoriser la création d'un utilisateur\n"
+"                                avec un identifiant d'utilisateur (UID)\n"
+"                                dupliqué (non unique)\n"
+"  -p, --password MOT_DE_PASSE   utiliser un mot de passe chiffré pour le\n"
+"                                compte du nouvel utilisateur\n"
+"  -s, --shell INTERPRÉTEUR      interpréteur de commandes initial pour le\n"
+"                                compte du nouvel utilisateur\n"
+"  -u, --uid UID                 forcer l'utilisation de l'identifiant\n"
+"                                « UID » pour le compte du nouvel "
+"utilisateur\n"
 "\n"
 
 #, fuzzy, c-format
@@ -1931,19 +1941,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 ""
 "Syntaxe : userdel [options] IDENTIFIANT\n"
 "\n"
 "Options :\n"
-"  -f, --force\t\t\tforcer la suppression des fichiers, même s'ils\n"
-"\t\t\t\tn'appartiennent pas à l'utilisateur\n"
-"  -h, --help\t\t\tafficher cette page d'aide et quitter\n"
-"  -r, --remove\t\t\tsupprimer le répertoire personnel et le spool du\n"
-"\t\t\t\tcourrier\n"
+"  -f, --force                   forcer la suppression des fichiers, même\n"
+"                                s'ils n'appartiennent pas à l'utilisateur\n"
+"  -h, --help                    afficher cette page d'aide et quitter\n"
+"  -r, --remove                  supprimer le répertoire personnel et le\n"
+"                                spool du courrier\n"
 "\n"
 
 #, c-format
@@ -2012,60 +2023,60 @@
 "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 ""
 "Syntaxe : usermod [options] IDENTIFIANT\n"
 "\n"
 "Options :\n"
-"  -a, --append GROUPE          ajouter l'utilisateur au groupe GROUPE\n"
-"                               supplémentaire (à n'utiliser qu'avec -G)\n"
-"  -c, --comment COMMENT        définir une nouvelle valeur pour le champ\n"
-"                               « GECOS »\n"
-"  -d, --home REP_PERS          définir un nouveau répertoire personnel pour\n"
-"                               le compte de l'utilisateur\n"
-"  -e, --expiredate DATE_EXPIR  fixer la date de fin de validité du compte\n"
-"                               à DATE_EXPIR\n"
-"  -f, --inactive INACTIF       fixer la durée d'inactivité du mot de masse\n"
-"                               après sa fin de validité à INACTIF\n"
-"  -g, --gid GROUPE             forcer l'utilisation de GROUPE comme groupe\n"
+"  -a, --append GROUPE           ajouter l'utilisateur au groupe GROUPE\n"
+"                                supplémentaire (à n'utiliser qu'avec -G)\n"
+"  -c, --comment COMMENT         définir une nouvelle valeur pour le champ\n"
+"                                « GECOS »\n"
+"  -d, --home REP_PERS           définir un nouveau répertoire personnel\n"
+"                                pour le compte de l'utilisateur\n"
+"  -e, --expiredate DATE_EXPIR   fixer la date de fin de validité du compte\n"
+"                                à DATE_EXPIR\n"
+"  -f, --inactive INACTIF        fixer la durée d'inactivité du mot de masse\n"
+"                                après sa fin de validité à INACTIF\n"
+"  -g, --gid GROUPE              forcer l'utilisation de GROUPE comme groupe\n"
 "\t\t\t\tprimaire\n"
-"  -G, --groups GROUPES         définir la liste des groupes supplémentaires\n"
-"  -h, --help                   afficher ce message d'aide et quitter\n"
-"  -l, --login IDENTIFIANT      définir un nouveau nom pour le compte\n"
-"  -L, --lock                   bloquer le compte de l'utilisateur\n"
-"  -m, --move-home              déplacer le contenu du répertoire personnel\n"
-"                               vers le nouvel emplacement (à n'utiliser\n"
-"                               qu'avec -d)\n"
-"  -o, --non-unique             autoriser l'utilisation d'un identifiant\n"
-"                               d'utilisateur (UID) dupliqué (non unique)\n"
-"  -p, --password MOT_DE_PASSE  utiliser un mot de passe chiffré pour le\n"
-"                               nouveau mot de passe\n"
-"  -s, --shell INTERPRÉTEUR     définir un nouvel interpréteur de commandes\n"
-"                               initial pour le compte de l'utilisateur\n"
-"  -u, --uid UID                définir un nouvel identifiant (UID) pour le\n"
-"                               compte de l'utilisateur\n"
-"                               pour le compte de l'utilisateur\n"
-"  -U, --unlock                 déverrouiller le compte de l'utilisateur\n"
+"  -G, --groups GROUPES          définir la liste des groupes "
+"supplémentaires\n"
+"  -h, --help                    afficher ce message d'aide et quitter\n"
+"  -l, --login IDENTIFIANT       définir un nouveau nom pour le compte\n"
+"  -L, --lock                    bloquer le compte de l'utilisateur\n"
+"  -m, --move-home               déplacer le contenu du répertoire personnel\n"
+"                                vers le nouvel emplacement (à n'utiliser\n"
+"                                qu'avec -d)\n"
+"  -o, --non-unique              autoriser l'utilisation d'un identifiant\n"
+"                                d'utilisateur (UID) dupliqué (non unique)\n"
+"  -p, --password MOT_DE_PASSE   utiliser un mot de passe chiffré pour le\n"
+"                                nouveau mot de passe\n"
+"  -s, --shell INTERPRÉTEUR      définir un nouvel interpréteur de commandes\n"
+"                                initial pour le compte de l'utilisateur\n"
+"  -u, --uid UID                 définir un nouvel identifiant (UID) pour le\n"
+"                                compte de l'utilisateur\n"
+"  -U, --unlock                  déverrouiller le compte de l'utilisateur\n"
 "\n"
 
 #, fuzzy, c-format
@@ -2136,24 +2147,25 @@
 "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 ""
 "Syntaxe : vipw [options]\n"
 "\n"
 "Options :\n"
-"  -g, --group\t\t\tmodifier la base de données des groupes\n"
-"\t\t\t\t(/etc/group)\n"
-"  -h, --help\t\t\ttafficher ce message d'aide et quitter\n"
-"  -p, --passwd\t\t\ttmodifier la base de données des comptes\n"
-"\t\t\t\t(/etc/passwd)\n"
-"  -p, --quiet\t\t\tmode silencieux\n"
-"  -s, --shadow\t\t\tmodifier la base de données des mots de passe\n"
-"\t\t\t\tcachés (« shadow passwords ») : shadow ou gshadow\n"
+"  -g, --group                   modifier la base de données des groupes\n"
+"                                (/etc/group)\n"
+"  -h, --help                    afficher ce message d'aide et quitter\n"
+"  -p, --passwd                  modifier la base de données des comptes\n"
+"                                (/etc/passwd)\n"
+"  -p, --quiet                   mode silencieux\n"
+"  -s, --shadow                  modifier la base de données des mots de\n"
+"                                passe cachés (« shadow passwords ») :\n"
+"                                shadow ou gshadow\n"
 "\n"
 
 #, c-format

Modified: upstream/trunk/src/chage.c
===================================================================
--- upstream/trunk/src/chage.c	2007-11-24 14:02:10 UTC (rev 1459)
+++ upstream/trunk/src/chage.c	2007-11-24 22:41:24 UTC (rev 1460)
@@ -105,17 +105,17 @@
 	fprintf (stderr, _("Usage: chage [options] [LOGIN]\n"
 			   "\n"
 			   "Options:\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"
+			   "  -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"));
 	exit (E_USAGE);
 }

Modified: upstream/trunk/src/chgpasswd.c
===================================================================
--- upstream/trunk/src/chgpasswd.c	2007-11-24 14:02:10 UTC (rev 1459)
+++ upstream/trunk/src/chgpasswd.c	2007-11-24 22:41:24 UTC (rev 1460)
@@ -73,10 +73,11 @@
 	fprintf (stderr, _("Usage: %s [options]\n"
 			   "\n"
 			   "Options:\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 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"),
 			 Prog,
@@ -84,7 +85,8 @@
 			 "NONE DES MD5", ""
 #else
 			 "NONE DES MD5 SHA256 SHA512",
-			 _("  -s, --sha-rounds	number of SHA rounds for the SHA* crypt algorithms\n")
+			 _("  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+			   "                                crypt algorithms\n")
 #endif
 			 );
 	exit (1);

Modified: upstream/trunk/src/chpasswd.c
===================================================================
--- upstream/trunk/src/chpasswd.c	2007-11-24 14:02:10 UTC (rev 1459)
+++ upstream/trunk/src/chpasswd.c	2007-11-24 22:41:24 UTC (rev 1460)
@@ -70,10 +70,11 @@
 	fprintf (stderr, _("Usage: %s [options]\n"
 			   "\n"
 			   "Options:\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 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"),
 			 Prog,
@@ -81,7 +82,8 @@
 			 "NONE DES MD5", ""
 #else
 			 "NONE DES MD5 SHA256 SHA512",
-			 _("  -s, --sha-rounds	number of SHA rounds for the SHA* crypt algorithms\n")
+			 _("  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+			   "                                crypt algorithms\n")
 #endif
 			 );
 	exit (E_USAGE);

Modified: upstream/trunk/src/chsh.c
===================================================================
--- upstream/trunk/src/chsh.c	2007-11-24 14:02:10 UTC (rev 1459)
+++ upstream/trunk/src/chsh.c	2007-11-24 22:41:24 UTC (rev 1460)
@@ -80,8 +80,8 @@
 	fprintf (stderr, _("Usage: chsh [options] [LOGIN]\n"
 			   "\n"
 			   "Options:\n"
-			   "  -h, --help				display this help message and exit\n"
-			   "  -s, --shell SHELL			new 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"));
 	exit (E_USAGE);
 }

Modified: upstream/trunk/src/faillog.c
===================================================================
--- upstream/trunk/src/faillog.c	2007-11-24 14:02:10 UTC (rev 1459)
+++ upstream/trunk/src/faillog.c	2007-11-24 22:41:24 UTC (rev 1460)
@@ -63,15 +63,15 @@
 	fprintf (stderr, _("Usage: faillog [options]\n"
 			   "\n"
 			   "Options:\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 counters\n"
-			   "				and limits (if used with -r, -m or -l options) only\n"
-			   "				for 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"));
 	exit (E_USAGE);
 }

Modified: upstream/trunk/src/groupadd.c
===================================================================
--- upstream/trunk/src/groupadd.c	2007-11-24 14:02:10 UTC (rev 1459)
+++ upstream/trunk/src/groupadd.c	2007-11-24 22:41:24 UTC (rev 1460)
@@ -98,13 +98,13 @@
 	fprintf (stderr, _("Usage: groupadd [options] GROUP\n"
 			   "\n"
 			   "Options:\n"
-			   "  -f, --force			force exit with success status if the specified\n"
-			   "				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"
+			   "  -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"));
 	exit (E_USAGE);
 }

Modified: upstream/trunk/src/groupmod.c
===================================================================
--- upstream/trunk/src/groupmod.c	2007-11-24 14:02:10 UTC (rev 1459)
+++ upstream/trunk/src/groupmod.c	2007-11-24 22:41:24 UTC (rev 1460)
@@ -101,10 +101,10 @@
 	fprintf (stderr, _("Usage: groupmod [options] GROUP\n"
 			   "\n"
 			   "Options:\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"
+			   "  -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"));
 	exit (E_USAGE);
 }

Modified: upstream/trunk/src/lastlog.c
===================================================================
--- upstream/trunk/src/lastlog.c	2007-11-24 14:02:10 UTC (rev 1459)
+++ upstream/trunk/src/lastlog.c	2007-11-24 22:41:24 UTC (rev 1460)
@@ -71,10 +71,10 @@
 	fprintf (stdout, _("Usage: lastlog [options]\n"
 			   "\n"
 			   "Options:\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 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"));
 	exit (1);
 }

Modified: upstream/trunk/src/newusers.c
===================================================================
--- upstream/trunk/src/newusers.c	2007-11-24 14:02:10 UTC (rev 1459)
+++ upstream/trunk/src/newusers.c	2007-11-24 22:41:24 UTC (rev 1460)
@@ -80,7 +80,7 @@
 {
 	fprintf (stderr, _("Usage: %s [options] [input]\n"
 	                   "\n"
-			   "  -c, --crypt-method	the crypt method (one of %s)\n"
+			   "  -c, --crypt-method            the crypt method (one of %s)\n"
 			   "%s"
 			   "\n"),
 			 Prog,
@@ -88,7 +88,8 @@
 			 "NONE DES MD5", ""
 #else
 			 "NONE DES MD5 SHA256 SHA512",
-			 _("  -s, --sha-rounds		number of SHA rounds for the SHA* crypt algorithms\n")
+			 _("  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
+			   "                                crypt algorithms\n")
 #endif
 			 );
 	exit (1);

Modified: upstream/trunk/src/passwd.c
===================================================================
--- upstream/trunk/src/passwd.c	2007-11-24 14:02:10 UTC (rev 1459)
+++ upstream/trunk/src/passwd.c	2007-11-24 22:41:24 UTC (rev 1460)
@@ -146,23 +146,23 @@
 	fprintf (stderr, _("Usage: passwd [options] [LOGIN]\n"
 			   "\n"
 			   "Options:\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"
+			   "  -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"));
 	exit (status);
 }

Modified: upstream/trunk/src/su.c
===================================================================
--- upstream/trunk/src/su.c	2007-11-24 14:02:10 UTC (rev 1459)
+++ upstream/trunk/src/su.c	2007-11-24 22:41:24 UTC (rev 1460)
@@ -277,13 +277,13 @@
 	fprintf (stderr, _("Usage: su [options] [LOGIN]\n"
 			   "\n"
 			   "Options:\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"
+			   "  -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	do not reset environment variables, and keep\n"
-			   "				the same shell\n"
-			   "  -s, --shell SHELL		use 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"));
 	exit (E_USAGE);
 }

Modified: upstream/trunk/src/useradd.c
===================================================================
--- upstream/trunk/src/useradd.c	2007-11-24 14:02:10 UTC (rev 1459)
+++ upstream/trunk/src/useradd.c	2007-11-24 22:41:24 UTC (rev 1460)
@@ -615,29 +615,29 @@
 	fprintf (stderr, _("Usage: useradd [options] LOGIN\n"
 			   "\n"
 			   "Options:\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"
+			   "  -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"));
 	exit (E_USAGE);
 }

Modified: upstream/trunk/src/userdel.c
===================================================================
--- upstream/trunk/src/userdel.c	2007-11-24 14:02:10 UTC (rev 1459)
+++ upstream/trunk/src/userdel.c	2007-11-24 22:41:24 UTC (rev 1460)
@@ -102,9 +102,10 @@
 	fprintf (stderr, _("Usage: userdel [options] LOGIN\n"
 			   "\n"
 			   "Options:\n"
-			   "  -f, --force			force removal of files, 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"
+			   "  -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"));
 	exit (E_USAGE);
 }

Modified: upstream/trunk/src/usermod.c
===================================================================
--- upstream/trunk/src/usermod.c	2007-11-24 14:02:10 UTC (rev 1459)
+++ upstream/trunk/src/usermod.c	2007-11-24 22:41:24 UTC (rev 1460)
@@ -282,26 +282,26 @@
 	fprintf (stderr, _("Usage: usermod [options] LOGIN\n"
 			   "\n"
 			   "Options:\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 new\n"
-			   "				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"
+			   "  -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"));
 	exit (E_USAGE);
 }

Modified: upstream/trunk/src/vipw.c
===================================================================
--- upstream/trunk/src/vipw.c	2007-11-24 14:02:10 UTC (rev 1459)
+++ upstream/trunk/src/vipw.c	2007-11-24 22:41:24 UTC (rev 1460)
@@ -63,11 +63,11 @@
 	fprintf (stderr, _("Usage: vipw [options]\n"
 			   "\n"
 			   "Options:\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"
+			   "  -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"));
 	exit (E_USAGE);
 }




More information about the Pkg-shadow-commits mailing list