diff --git a/ChangeLog b/ChangeLog
index bdaf118c..733f4fc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,271 @@
+2005-07-18  Tomasz K�oczko  <kloczek@pld.org.pl>
+
+	* libmisc/pwdcheck.c:
+	added missing "#include <stdio.h>" (fix compilation with PAM disabled).
+
+	* po/ro.po, po/sq.po, po/sv.po, po/tl.po, po/tr.po, po/uk.po, po/vi.po, po/zh_CN.po, po/zh_TW.po, po/pl.po, po/pt_BR.po, po/nl.po, po/nn.po, po/nb.po, po/ko.po, po/ja.po, po/it.po, po/he.po, po/id.po, po/fr.po, po/bs.po, po/ca.po, po/da.po, po/el.po, po/es.po, po/eu.po, po/fi.po:
+	run "make update-po".
+
+	* src/su.c:
+	move declaration of pamh nad caught variables to #ifdef USE_PAM .. #endif.
+
+	* po/pl.po, NEWS: updated pl translation.
+
+2005-07-17  Tomasz K�oczko  <kloczek@pld.org.pl>
+
+	* NEWS, po/sk.po:
+	updated for 4.0.11 (by Peter Mann <Peter.Mann@tuke.sk>).
+
+2005-07-16  Tomasz K�oczko  <kloczek@pld.org.pl>
+
+	* NEWS, po/cs.po:
+	updated for 4.0.11 (by Miroslav Kure <kurem@upcase.inf.upol.cz>).
+
+2005-07-15  Tomasz K�oczko  <kloczek@pld.org.pl>
+
+	* po/de.po, NEWS:
+	updated for 4.0.11 (by Frank Schmid <frank@cs-schmid.de>).
+
+2005-07-14  Tomasz K�oczko  <kloczek@pld.org.pl>
+
+	* NEWS, po/pt.po:
+	updated for 4.0.11 (by Miguel Figueiredo <elmig@debianpt.org>).
+
+2005-07-13  Tomasz K�oczko  <kloczek@pld.org.pl>
+
+	* po/stats: reorder gsub().
+
+	* po/ru.po: cleanups.
+
+	* po/ru.po, NEWS:
+	updated for 4.0.11 (by Yuri Kozlov <yucoz@yandex.ru>).
+
+2005-07-12  Tomasz K�oczko  <kloczek@pld.org.pl>
+
+	* lib/getdef.c:
+	move MAIL_DIR variable from def_table[] to part independent to USE_PAM
+	(still used in userdel/usermod).
+
+	* NEWS, man/pwck.8, man/pwck.8.xml:
+	document -q option (based on Debian patch for fix http://bugs.debian.org/309408)
+	Rewrited OPTIONS section and better SYNOPSIS.
+
+	* NEWS, po/da.po:
+	- updated for 4.0.11 (by Claus Hindsgaul <claus_h@image.dk>).
+
+	* NEWS, src/su.c:
+	ignore SIGINT while authenticating. A ^C could defeat the waiting period and
+	permit brute-force attacks. Also ignore SIGQUIT.
+	Fixed: http://bugs.debian.org/52372 and http://bugs.debian.org/288827
+
+	* po/fi.po, NEWS:
+	- updated for 4.0.11 (by Tommi Vainikainen <thv+debian@iki.fi>).
+
+	* po/ro.po: - updated Project-Id-Version field.
+
+	* NEWS, po/ro.po:
+	- updated for 4.0.11 (by Sorin B. <sorin@bonbon.net>).
+
+2005-07-11  Tomasz K�oczko  <kloczek@pld.org.pl>
+
+	* NEWS, man/lastlog.8, man/lastlog.8.xml:
+	document that lastlog is a sparse file, and don't need to be rotated.
+	http://bugs.debian.org/219321
+
+	* src/chage.c: use E_USAGE=2 as usage() exit code.
+
+	* NEWS, po/es.po:
+	updated for 4.0.11 (by Ruben Porras <nahoo82@telefonica.net>).
+
+	* src/useradd.c: cleanups in usage() oyput.
+
+	* po/zh_TW.po, po/vi.po, po/zh_CN.po, po/uk.po, po/tl.po, po/tr.po, po/sv.po, po/sq.po, po/sk.po, po/ro.po, po/ru.po, po/pt.po, po/pt_BR.po, po/pl.po, po/nb.po, po/nl.po, po/nn.po, po/ko.po, po/it.po, po/ja.po, po/he.po, po/id.po, po/fr.po, po/eu.po, po/fi.po, po/es.po, po/da.po, po/de.po, po/el.po, po/bs.po, po/ca.po, po/cs.po:
+	cleanups in usage() output.
+
+	* NEWS: release 4.0.11 is sheduled to 18-06-2005.
+
+2005-07-10  Tomasz K�oczko  <kloczek@pld.org.pl>
+
+	* man/login.1, man/login.1.xml, NEWS:
+	better explain the respective roles of login, init and getty with regards
+	to the utmp file (based on 441_manpages-shadow.5 Debian patch)
+
+	* man/groupdel.8.xml, man/su.1, man/su.1.xml, man/groupdel.8:
+	s/presense/presence/; s/filesystem/file system/
+	(sed on 440_manpages-login.1 Debian patch)
+
+	* man/pl/shadowconfig.8, man/pl/Makefile.am, man/ja/shadowconfig.8, man/ja/Makefile.am, man/it/shadowconfig.8, man/shadowconfig.8, man/shadowconfig.8.xml, man/Makefile.am, NEWS:
+	removed shadowconfig(8) man page (will be maintained in Debian shadow pkg repository).
+
+	* man/it/sg.1: added.
+
+	* man/it/Makefile.am: more files in man_MANS.
+
+	* man/it/Makefile.am: move pwunconv.8 to man_MANS.
+
+	* man/useradd.8.xml, man/useradd.8:
+	updated after rewrite for for getopt_long() in useradd (-D and -k options
+	idescription must be finished).
+
+	* src/useradd.c, po/ro.po, po/ru.po, po/sk.po, po/sq.po, po/sv.po, po/tl.po, po/tr.po, po/uk.po, po/vi.po, po/zh_CN.po, po/zh_TW.po, po/bs.po, po/ca.po, po/cs.po, po/da.po, po/de.po, po/el.po, po/es.po, po/eu.po, po/fi.po, po/fr.po, po/he.po, po/id.po, po/it.po, po/ja.po, po/ko.po, po/nb.po, po/nl.po, po/nn.po, po/pl.po, po/pt.po, po/pt_BR.po, NEWS:
+	rewrited for use getopt_long().
+
+	* po/stats: more gsub().
+
+2005-07-08  Tomasz K�oczko  <kloczek@pld.org.pl>
+
+	* src/newgrp.c:
+	indent source code and use fix for handle splitted groups unconditionaly.
+
+	* lib/nscd.c: indent.
+
+	* NEWS, src/newgrp.c:
+	add fix for handle splitted NIS groups: extends the functionality that,
+	if the requested group is given, all groups of the same GID are tested for
+	membership of the requesting user.
+	(fix by Christian Mudra <C.Mudra@science-computing.de>
+
+	* lib/nscd.c, NEWS:
+	for some reason doing the INVALIDATE call with two write()'s fails.
+	Do one writev() call instead. http://bugs.gentoo.org/show_bug.cgi?id=80413
+	(submited by Martin Schlemmer <azarah@gentoo.org>)
+
+	* NEWS, lib/nscd.c:
+	merge nscd-socket-path patch from Fedora: newer glibc's have a different nscd socket
+	location (/var/run/nscd/socket instead /var/run/.nscd_socket).
+
+2005-07-07  Tomasz K�oczko  <kloczek@pld.org.pl>
+
+	* po/stats: improved.
+
+	* man/groupadd.8, man/groupadd.8.xml, NEWS:
+	document -o option in groupadd(8).
+
+	* configure.in: s/'"$<foo>" != "no"'/'"$<foo>" = "yes"'/
+
+	* NEWS, configure.in, lib/Makefile.am, lib/pwauth.c:
+	S/Key support is back.
+
+	* po/cs.po, po/da.po, po/de.po, po/el.po, po/es.po, po/eu.po, po/fi.po, po/fr.po, po/he.po, po/id.po, po/it.po, po/ja.po, po/ko.po, po/nb.po, po/nl.po, po/nn.po, po/pl.po, po/pt.po, po/pt_BR.po, po/ro.po, po/ru.po, po/sk.po, po/sq.po, po/sv.po, po/tl.po, po/tr.po, po/uk.po, po/vi.po, po/zh_CN.po, po/zh_TW.po, po/bs.po, po/ca.po:
+	run "make update-po".
+
+	* po/pl.po: updated.
+
+	* src/useradd.c: s,key=value,KEY=VALUE,
+
+	* src/groupadd.c, NEWS, man/groupadd.8, man/groupadd.8.xml:
+	change -O option to -K and document it in man page.
+
+	* man/useradd.8, man/useradd.8.xml, src/useradd.c:
+	s/NAME=VALUE/KEY=VALUE/; s/key=value/KEY=VALUE/
+
+	* src/chfn.c, src/groupadd.c, src/groupmems.c, src/login.c, src/passwd.c, src/vipw.c:
+	sort cases in switch (flag) {}.
+
+	* src/gpasswd.c, src/groupadd.c, src/groupmems.c, src/groupmod.c, src/passwd.c, src/useradd.c, src/usermod.c:
+	sort getopt() optstring.
+
+	* src/useradd.c:
+	remove A: from getopt() optstring (the same bug as in usermod).
+
+	* src/usermod.c:
+	remove A: from getopt() optstring (it was for handle AUTH_METHODS code but now
+	it is not used option). Catched by Thorsten Kukuk <kukuk@suse.de>.
+
+	* src/usermod.c, po/sv.po, po/tl.po, po/tr.po, po/uk.po, po/vi.po, po/zh_CN.po, po/zh_TW.po, po/bs.po, po/ca.po, po/cs.po, po/da.po, po/de.po, po/el.po, po/es.po, po/eu.po, po/fi.po, po/fr.po, po/he.po, po/id.po, po/it.po, po/ja.po, po/ko.po, po/nb.po, po/nl.po, po/nn.po, po/pl.po, po/pt.po, po/pt_BR.po, po/ro.po, po/ru.po, po/sk.po, po/sq.po:
+	indent source code. Added usermod error message about -a option usage to translated messages.
+
+	* po/POTFILES.in: mistake s,chage_chkshell.c,chsh_chkshell.c,
+
+	* po/POTFILES.in: s,libmisc/chkshell.c,src/chage_chkshell.c,
+
+	* man/usermod.8, man/usermod.8.xml, src/usermod.c, NEWS:
+	added -a option. This flag can only be used in conjunction with the -G
+	option. It cause usermod to append user to the current supplementary group list.
+	(patch by Peter Vrabec <pvrabec@redhat.com>)
+
+	* libmisc/chkshell.c, libmisc/Makefile.am, src/Makefile.am, src/chsh_chkshell.c:
+	move libmisc/chkshell.c to src/chsh_chkshell.c. check_shell() is used only by chsh.
+
+2005-07-06  Tomasz K�oczko  <kloczek@pld.org.pl>
+
+	* acconfig.h, NEWS, configure.in:
+	finish move all autoheader templates from acconfig.h to configure.in.
+
+	* src/chage.c, po/bs.po, po/ca.po, po/cs.po, po/da.po, po/de.po, po/el.po, po/es.po, po/eu.po, po/fi.po, po/fr.po, po/he.po, po/id.po, po/it.po, po/ja.po, po/ko.po, po/nb.po, po/nl.po, po/nn.po, po/pl.po, po/pt.po, po/pt_BR.po, po/ro.po, po/ru.po, po/sk.po, po/sq.po, po/sv.po, po/tl.po, po/tr.po, po/uk.po, po/vi.po, po/zh_CN.po, po/zh_TW.po, NEWS:
+	added missing \n in chage error messages.
+
+	* po/sv.po, po/tl.po, po/tr.po, po/uk.po, po/vi.po, po/zh_CN.po, po/zh_TW.po, po/ca.po, po/cs.po, po/da.po, po/de.po, po/el.po, po/es.po, po/eu.po, po/fi.po, po/fr.po, po/he.po, po/id.po, po/it.po, po/ja.po, po/ko.po, po/nb.po, po/nl.po, po/nn.po, po/pl.po, po/pt.po, po/pt_BR.po, po/ro.po, po/ru.po, po/sk.po, po/sq.po, po/bs.po:
+	run "make update-po".
+
+	* src/usermod.c: move all #include in one place.
+
+	* src/useradd.c: s/-O/-K/
+
+	* man/useradd.8, man/useradd.8.xml:
+	cleanups in Note: in -K description.
+
+	* NEWS, man/useradd.8, man/useradd.8.xml, src/useradd.c:
+	change -O option to -K and document it in man page.
+
+	* man/useradd.8, man/useradd.8.xml:
+	added separated <cmdsynopsis></cmdsynopsis> for -D description and remove using </srb> tags from
+	<refsynopsisdiv id='synopsis'>.
+
+	* src/login.c:
+	replace #ifdef USE_PAM .. #endif #ifndef USE_PAN .. #endif by
+	#ifdef USE_PAM .. #else .. #endif.
+
+	* src/su.c: conditiona code reorganization.
+
+	* src/login.c: remove one #ifndef USE_PAM .. #endif.
+
+	* libmisc/setupenv.c: move setup $MAIL to !USE_PAM.
+
+	* libmisc/setupenv.c, src/su.c:
+	consolidate two sections of code #ifndef USE_PAM to one.
+
+	* src/su.c, src/sulogin.c, libmisc/setupenv.c, libmisc/tz.c, src/login.c, NEWS:
+	fixed erroneous warning messages about some login.defs variables when used with PAM
+	(fix by DJ Lucas <dj@linuxfromscratch.org>)
+
+2005-07-05  Tomasz K�oczko  <kloczek@pld.org.pl>
+
+	* configure.in, libmisc/getdate.y, libmisc/utmp.c, src/logoutd.c:
+	remove non-USG code.
+
+	* acconfig.h, configure.in:
+	start moving all autoheader templates from acconfig.h to configure.in.
+
+	* configure.in: remove not used AC_DEFINE(HAVE_LIBCRYPT).
+
+	* acconfig.h, NEWS, configure.in:
+	stop with error message if crypt() not found. Remove --with{,out}-libcrypt switch.
+
+	* src/login.c: fixed use SYSLOG macro.
+
+2005-07-02  Tomasz K�oczko  <kloczek@pld.org.pl>
+
+	* src/login_nopam.c: fixed use SYSLOG macro.
+
+2005-07-01  Tomasz K�oczko  <kloczek@pld.org.pl>
+
+	* NEWS, src/login.c:
+	setup limits and umask (using login.defs ULIMITS and UMASK variables) only when
+	PAM support is disabled (it is task for pam_limits and pam_umask modules).
+
+2005-06-30  Tomasz K�oczko  <kloczek@pld.org.pl>
+
+	* src/sulogin.c, src/login.c, src/login_nopam.c, NEWS:
+	use SYSLOG macro instead syslog() which saves the locale, sets the locale to C,
+	sends the message and restores the locale (fix by Nicolas François <nicolas.francois@centraliens.net>).
+
+	* NEWS, man/groupadd.8, man/groupadd.8.xml, man/groupdel.8, man/groupdel.8.xml, man/groupmod.8, man/groupmod.8.xml, man/userdel.8, man/userdel.8.xml, man/usermod.8, man/usermod.8.xml:
+	in SEE ALLSO section added refer to gpasswd(8)
+	(suggested by Mike Frysinger <vapier@gentoo.org>)
+
+	* NEWS, configure.in: start work on 4.0.11.
+
 2005-06-28  Tomasz K�oczko  <kloczek@pld.org.pl>
 
 	* NEWS: +1 day release 4.0.10 date.
@@ -150,7 +418,7 @@
 
 	* src/login.c: indent.
 
-	* man/chage.1.xml, man/faillog.8.xml, man/groupmems.8.xml, man/gshadow.5.xml, man/login.1.xml, man/login.defs.5.xml, man/logoutd.8.xml, man/newusers.8.xml, man/passwd.1.xml, man/passwd.5.xml, man/pw_auth.3.xml, man/pwck.8.xml, man/pwconv.8.xml, man/shadow.3.xml, man/shadow.5.xml, man/shadowconfig.8.xml, man/su.1.xml, man/suauth.5.xml, man/sulogin.8.xml, man/useradd.8.xml, man/userdel.8.xml, man/usermod.8.xml, man/vipw.8.xml:
+	* man/shadowconfig.8.xml, man/chage.1.xml, man/faillog.8.xml, man/groupmems.8.xml, man/gshadow.5.xml, man/login.1.xml, man/login.defs.5.xml, man/logoutd.8.xml, man/newusers.8.xml, man/passwd.1.xml, man/passwd.5.xml, man/pw_auth.3.xml, man/pwck.8.xml, man/pwconv.8.xml, man/shadow.3.xml, man/shadow.5.xml, man/su.1.xml, man/suauth.5.xml, man/sulogin.8.xml, man/useradd.8.xml, man/userdel.8.xml, man/usermod.8.xml, man/vipw.8.xml:
 	cleanups.
 
 2005-06-14  Tomasz K�oczko  <kloczek@pld.org.pl>
@@ -242,7 +510,7 @@
 	* src/mkpasswd.c, src/chpasswd.c, src/faillog.c, src/groupadd.c, src/groupdel.c, src/groupmod.c, src/newgrp.c, src/newusers.c, src/passwd.c, src/su.c, src/useradd.c, src/userdel.c, src/usermod.c, lib/encrypt.c, lib/getdef.c, lib/gshadow.c, lib/pwauth.h, lib/shadow.c, libmisc/failure.c, libmisc/isexpired.c, libmisc/salt.c:
 	indent all.
 
-	* src/chage.c, src/chpasswd.c, src/expiry.c, src/login.c, src/newgrp.c, src/newusers.c, src/passwd.c, src/pwck.c, src/pwconv.c, src/pwunconv.c, src/su.c, src/useradd.c, src/userdel.c, src/usermod.c, src/vipw.c, po/tr.po, po/uk.po, po/vi.po, po/zh_CN.po, po/zh_TW.po, po/el.po, po/es.po, po/eu.po, po/fi.po, po/fr.po, po/he.po, po/id.po, po/it.po, po/ja.po, po/ko.po, po/nb.po, po/nl.po, po/nn.po, po/pl.po, po/pt.po, po/pt_BR.po, po/ro.po, po/ru.po, po/sk.po, po/sq.po, po/sv.po, po/tl.po, lib/defines.h, lib/lockpw.c, lib/prototypes.h, lib/sgetspent.c, lib/shadow.c, lib/shadowio.c, lib/sppack.c, libmisc/age.c, libmisc/entry.c, libmisc/isexpired.c, libmisc/pwd2spwd.c, libmisc/pwdcheck.c, po/bs.po, po/ca.po, po/cs.po, po/da.po, po/de.po, NEWS, acconfig.h, configure.in:
+	* src/chage.c, src/chpasswd.c, src/expiry.c, src/login.c, src/newgrp.c, src/newusers.c, src/passwd.c, src/pwck.c, src/pwconv.c, src/pwunconv.c, src/su.c, src/useradd.c, src/userdel.c, src/usermod.c, src/vipw.c, po/tr.po, po/uk.po, po/vi.po, po/zh_CN.po, po/zh_TW.po, po/el.po, po/es.po, po/eu.po, po/fi.po, po/fr.po, po/he.po, po/id.po, po/it.po, po/ja.po, po/ko.po, po/nb.po, po/nl.po, po/nn.po, po/pl.po, po/pt.po, po/pt_BR.po, po/ro.po, po/ru.po, po/sk.po, po/sq.po, po/sv.po, po/tl.po, lib/defines.h, lib/lockpw.c, lib/prototypes.h, lib/sgetspent.c, lib/shadow.c, lib/shadowio.c, lib/sppack.c, libmisc/age.c, libmisc/entry.c, libmisc/isexpired.c, libmisc/pwd2spwd.c, libmisc/pwdcheck.c, po/bs.po, po/ca.po, po/cs.po, po/da.po, po/de.po, acconfig.h, NEWS, configure.in:
 	remove using SHADOWPWD #define so now shadow is allways builded with shadow
 	password support.
 
@@ -306,7 +574,7 @@
 
 2005-04-27  Tomasz K�oczko  <kloczek@pld.org.pl>
 
-	* man/gpasswd.1.xml, man/groups.1.xml, man/grpck.8.xml, man/login.defs.5.xml, man/passwd.1.xml, man/pwck.8.xml, man/shadowconfig.8.xml, man/sulogin.8.xml, man/useradd.8.xml:
+	* man/shadowconfig.8.xml, man/gpasswd.1.xml, man/groups.1.xml, man/grpck.8.xml, man/login.defs.5.xml, man/passwd.1.xml, man/pwck.8.xml, man/sulogin.8.xml, man/useradd.8.xml:
 	replace <emphasis remap='B'></emphasis> by <command></command>.
 
 	* po/ko.po, po/nb.po, po/nl.po, po/nn.po, po/pl.po, po/pt.po, po/pt_BR.po, po/ro.po, po/ru.po, po/sk.po, po/sq.po, po/sv.po, po/tl.po, po/tr.po, po/uk.po, po/zh_CN.po, po/zh_TW.po, NEWS, po/bs.po, po/ca.po, po/cs.po, po/da.po, po/de.po, po/el.po, po/es.po, po/eu.po, po/fi.po, po/fr.po, po/he.po, po/id.po, po/it.po, po/ja.po, src/lastlog.c:
@@ -384,15 +652,15 @@
 	* man/chage.1.xml, man/chfn.1.xml, man/chsh.1.xml, man/expiry.1.xml, man/gpasswd.1.xml, man/groups.1.xml, man/id.1.xml, man/login.1.xml, man/passwd.1.xml, man/su.1.xml:
 	added <refmiscinfo class="sectdesc">User Commands</refmiscinfo> in <refmeta></refmeta>.
 
-	* man/mkpasswd.8.xml, man/chfn.1.xml, man/chpasswd.8.xml, man/chsh.1.xml, man/expiry.1.xml, man/faillog.5.xml, man/faillog.8.xml, man/gpasswd.1.xml, man/groupadd.8.xml, man/groupdel.8.xml, man/groupmems.8.xml, man/groupmod.8.xml, man/groups.1.xml, man/grpck.8.xml, man/gshadow.5.xml, man/id.1.xml, man/lastlog.8.xml, man/limits.5.xml, man/login.1.xml, man/login.access.5.xml, man/login.defs.5.xml, man/logoutd.8.xml, man/newusers.8.xml, man/passwd.1.xml, man/passwd.5.xml, man/porttime.5.xml, man/pw_auth.3.xml, man/pwck.8.xml, man/pwconv.8.xml, man/shadow.3.xml, man/shadow.5.xml, man/shadowconfig.8.xml, man/su.1.xml, man/suauth.5.xml, man/sulogin.8.xml, man/useradd.8.xml, man/userdel.8.xml, man/vigr.8.xml:
+	* man/mkpasswd.8.xml, man/shadowconfig.8.xml, man/chfn.1.xml, man/chpasswd.8.xml, man/chsh.1.xml, man/expiry.1.xml, man/faillog.5.xml, man/faillog.8.xml, man/gpasswd.1.xml, man/groupadd.8.xml, man/groupdel.8.xml, man/groupmems.8.xml, man/groupmod.8.xml, man/groups.1.xml, man/grpck.8.xml, man/gshadow.5.xml, man/id.1.xml, man/lastlog.8.xml, man/limits.5.xml, man/login.1.xml, man/login.access.5.xml, man/login.defs.5.xml, man/logoutd.8.xml, man/newusers.8.xml, man/passwd.1.xml, man/passwd.5.xml, man/porttime.5.xml, man/pw_auth.3.xml, man/pwck.8.xml, man/pwconv.8.xml, man/shadow.3.xml, man/shadow.5.xml, man/su.1.xml, man/suauth.5.xml, man/sulogin.8.xml, man/useradd.8.xml, man/userdel.8.xml, man/vigr.8.xml:
 	Use encoding="UTF-8" and DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN".
 
-	* man/userdel.8.xml, man/usermod.8.xml, man/vigr.8.xml, man/vipw.8.xml, man/mkpasswd.8.xml, man/chage.1.xml, man/chfn.1.xml, man/chpasswd.8.xml, man/chsh.1.xml, man/expiry.1.xml, man/faillog.5.xml, man/faillog.8.xml, man/gpasswd.1.xml, man/groupadd.8.xml, man/groupdel.8.xml, man/groupmems.8.xml, man/groupmod.8.xml, man/groups.1.xml, man/grpck.8.xml, man/gshadow.5.xml, man/id.1.xml, man/lastlog.8.xml, man/limits.5.xml, man/login.1.xml, man/login.access.5.xml, man/login.defs.5.xml, man/logoutd.8.xml, man/newusers.8.xml, man/passwd.1.xml, man/passwd.5.xml, man/porttime.5.xml, man/pw_auth.3.xml, man/pwck.8.xml, man/pwconv.8.xml, man/shadow.3.xml, man/shadow.5.xml, man/shadowconfig.8.xml, man/su.1.xml, man/suauth.5.xml, man/sulogin.8.xml, man/useradd.8.xml:
+	* man/userdel.8.xml, man/usermod.8.xml, man/vigr.8.xml, man/vipw.8.xml, man/mkpasswd.8.xml, man/shadowconfig.8.xml, man/chage.1.xml, man/chfn.1.xml, man/chpasswd.8.xml, man/chsh.1.xml, man/expiry.1.xml, man/faillog.5.xml, man/faillog.8.xml, man/gpasswd.1.xml, man/groupadd.8.xml, man/groupdel.8.xml, man/groupmems.8.xml, man/groupmod.8.xml, man/groups.1.xml, man/grpck.8.xml, man/gshadow.5.xml, man/id.1.xml, man/lastlog.8.xml, man/limits.5.xml, man/login.1.xml, man/login.access.5.xml, man/login.defs.5.xml, man/logoutd.8.xml, man/newusers.8.xml, man/passwd.1.xml, man/passwd.5.xml, man/porttime.5.xml, man/pw_auth.3.xml, man/pwck.8.xml, man/pwconv.8.xml, man/shadow.3.xml, man/shadow.5.xml, man/su.1.xml, man/suauth.5.xml, man/sulogin.8.xml, man/useradd.8.xml:
 	better formation using "xmlindent -l 80 -d 2".
 
 2005-04-21  Tomasz K�oczko  <kloczek@pld.org.pl>
 
-	* man/it/chsh.1, man/it/expiry.1, man/it/faillog.5, man/it/faillog.8, man/it/getspnam.3, man/it/groups.1, man/it/grpck.8, man/it/grpconv.8, man/it/grpunconv.8, man/it/id.1, man/it/lastlog.8, man/it/login.1, man/it/logoutd.8, man/it/newgrp.1, man/it/porttime.5, man/it/pwck.8, man/it/shadow.3, man/it/shadow.5, man/it/shadowconfig.8, man/it/su.1, man/it/vipw.8, NEWS, man/it/Makefile.am, man/it/chage.1, man/it/chfn.1, man/it/chpasswd.8:
+	* man/it/shadowconfig.8, man/it/chsh.1, man/it/expiry.1, man/it/faillog.5, man/it/faillog.8, man/it/getspnam.3, man/it/groups.1, man/it/grpck.8, man/it/grpconv.8, man/it/grpunconv.8, man/it/id.1, man/it/lastlog.8, man/it/login.1, man/it/logoutd.8, man/it/newgrp.1, man/it/porttime.5, man/it/pwck.8, man/it/shadow.3, man/it/shadow.5, man/it/su.1, man/it/vipw.8, NEWS, man/it/Makefile.am, man/it/chage.1, man/it/chfn.1, man/it/chpasswd.8:
 	updated it man pages: chfn.1, chsh.1, groups.1, grpck.8, grpconv.8, grpunconv.8,
 	id.1, lastlog.8, login.1, newgrp.1, pwunconv.8, shadow.5, vigr.8, vipw.8.
 	new it man pages: chage.1, chpasswd.8, expiry.1, faillog.5, faillog.8,
@@ -402,7 +670,7 @@
 	* po/uk.po:
 	cleanups in plural forms (by Roman Festchook <roma@polesye.net>).
 
-	* man/mkpasswd.8.xml, man/chage.1, man/chfn.1.xml, man/chpasswd.8.xml, man/chsh.1.xml, man/expiry.1.xml, man/faillog.5.xml, man/faillog.8.xml, man/gpasswd.1.xml, man/groupadd.8.xml, man/groupdel.8.xml, man/groupmems.8.xml, man/groupmod.8.xml, man/groups.1.xml, man/grpck.8.xml, man/gshadow.5.xml, man/id.1.xml, man/lastlog.8.xml, man/limits.5.xml, man/login.1.xml, man/login.access.5.xml, man/login.defs.5.xml, man/logoutd.8.xml, man/newusers.8.xml, man/passwd.1.xml, man/passwd.5.xml, man/porttime.5.xml, man/pw_auth.3.xml, man/pwck.8.xml, man/pwconv.8.xml, man/shadow.3.xml, man/shadow.5.xml, man/shadowconfig.8.xml, man/su.1.xml, man/suauth.5.xml, man/sulogin.8.xml, man/useradd.8.xml, man/userdel.8.xml, man/usermod.8.xml, man/vipw.8.xml:
+	* man/mkpasswd.8.xml, man/shadowconfig.8.xml, man/chage.1, man/chfn.1.xml, man/chpasswd.8.xml, man/chsh.1.xml, man/expiry.1.xml, man/faillog.5.xml, man/faillog.8.xml, man/gpasswd.1.xml, man/groupadd.8.xml, man/groupdel.8.xml, man/groupmems.8.xml, man/groupmod.8.xml, man/groups.1.xml, man/grpck.8.xml, man/gshadow.5.xml, man/id.1.xml, man/lastlog.8.xml, man/limits.5.xml, man/login.1.xml, man/login.access.5.xml, man/login.defs.5.xml, man/logoutd.8.xml, man/newusers.8.xml, man/passwd.1.xml, man/passwd.5.xml, man/porttime.5.xml, man/pw_auth.3.xml, man/pwck.8.xml, man/pwconv.8.xml, man/shadow.3.xml, man/shadow.5.xml, man/su.1.xml, man/suauth.5.xml, man/sulogin.8.xml, man/useradd.8.xml, man/userdel.8.xml, man/usermod.8.xml, man/vipw.8.xml:
 	reformated using xemacs.
 
 2005-04-20  Tomasz K�oczko  <kloczek@pld.org.pl>
@@ -444,7 +712,7 @@
 	* man/useradd.8:
 	fixed typos in useadd syntax (in SYNOPSIS section) catched using doclifter.
 
-	* man/mkpasswd.8.xml, man/chfn.1.xml, man/chpasswd.8.xml, man/chsh.1.xml, man/expiry.1.xml, man/faillog.5.xml, man/faillog.8.xml, man/getspnam.3.xml, man/gpasswd.1.xml, man/groupadd.8.xml, man/groupdel.8.xml, man/groupmems.8.xml, man/groupmod.8.xml, man/groups.1.xml, man/grpck.8.xml, man/grpconv.8.xml, man/grpunconv.8.xml, man/gshadow.5.xml, man/id.1.xml, man/lastlog.8.xml, man/limits.5.xml, man/login.1.xml, man/login.access.5.xml, man/login.defs.5.xml, man/logoutd.8.xml, man/newusers.8.xml, man/passwd.1.xml, man/passwd.5.xml, man/porttime.5.xml, man/pw_auth.3.xml, man/pwck.8.xml, man/pwconv.8.xml, man/pwunconv.8.xml, man/sg.1.xml, man/shadow.3.xml, man/shadow.5.xml, man/shadowconfig.8.xml, man/su.1.xml, man/suauth.5.xml, man/sulogin.8.xml, man/useradd.8.xml, man/userdel.8.xml, man/usermod.8.xml, man/vigr.8.xml, man/vipw.8.xml:
+	* man/mkpasswd.8.xml, man/shadowconfig.8.xml, man/chfn.1.xml, man/chpasswd.8.xml, man/chsh.1.xml, man/expiry.1.xml, man/faillog.5.xml, man/faillog.8.xml, man/getspnam.3.xml, man/gpasswd.1.xml, man/groupadd.8.xml, man/groupdel.8.xml, man/groupmems.8.xml, man/groupmod.8.xml, man/groups.1.xml, man/grpck.8.xml, man/grpconv.8.xml, man/grpunconv.8.xml, man/gshadow.5.xml, man/id.1.xml, man/lastlog.8.xml, man/limits.5.xml, man/login.1.xml, man/login.access.5.xml, man/login.defs.5.xml, man/logoutd.8.xml, man/newusers.8.xml, man/passwd.1.xml, man/passwd.5.xml, man/porttime.5.xml, man/pw_auth.3.xml, man/pwck.8.xml, man/pwconv.8.xml, man/pwunconv.8.xml, man/sg.1.xml, man/shadow.3.xml, man/shadow.5.xml, man/su.1.xml, man/suauth.5.xml, man/sulogin.8.xml, man/useradd.8.xml, man/userdel.8.xml, man/usermod.8.xml, man/vigr.8.xml, man/vipw.8.xml:
 	raw version converted using doclifter.
 
 	* configure.in: remove handle --with-lib{opie,skey}.
@@ -661,7 +929,7 @@
 
 2005-04-05  Tomasz K�oczko  <kloczek@pld.org.pl>
 
-	* man/ru/passwd.5, man/zh_CN/chfn.1, man/zh_CN/chpasswd.8, man/zh_CN/chsh.1, man/zh_CN/groupadd.8, man/zh_CN/groupdel.8, man/zh_CN/groupmod.8, man/zh_CN/useradd.8, man/zh_CN/userdel.8, man/zh_CN/usermod.8, man/zh_TW/chfn.1, man/zh_TW/chsh.1, man/zh_TW/groupadd.8, man/zh_TW/groupdel.8, man/zh_TW/groupmod.8, man/zh_TW/useradd.8, man/zh_TW/userdel.8, man/zh_TW/usermod.8, man/ko/chfn.1, man/ko/chsh.1, man/ko/groups.1, man/ko/id.1, man/ko/login.1, man/ko/passwd.5, man/ko/su.1, man/pt_BR/gpasswd.1, man/pt_BR/groupadd.8, man/pt_BR/groupdel.8, man/pt_BR/groupmod.8, man/pt_BR/shadow.5, man/ja/mkpasswd.8, man/ja/chage.1, man/ja/chfn.1, man/ja/chpasswd.8, man/ja/chsh.1, man/ja/expiry.1, man/ja/faillog.8, man/ja/gpasswd.1, man/ja/groupadd.8, man/ja/groupmod.8, man/ja/groups.1, man/ja/grpck.8, man/ja/id.1, man/ja/lastlog.8, man/ja/limits.5, man/ja/login.1, man/ja/login.access.5, man/ja/login.defs.5, man/ja/newgrp.1, man/ja/passwd.1, man/ja/porttime.5, man/ja/pw_auth.3, man/ja/pwck.8, man/ja/shadow.3, man/ja/su.1, man/ja/suauth.5, man/ja/sulogin.8, man/ja/useradd.8, man/ja/userdel.8, man/ja/usermod.8, man/ja/vipw.8, man/hu/chfn.1, man/hu/chsh.1, man/hu/gpasswd.1, man/hu/groups.1, man/hu/id.1, man/hu/login.1, man/hu/newgrp.1, man/hu/passwd.1, man/hu/su.1, man/id/chsh.1, man/id/login.1, man/id/useradd.8, man/it/chfn.1, man/it/chsh.1, man/it/gpasswd.1, man/it/groupadd.8, man/it/groupdel.8, man/it/groupmod.8, man/it/groups.1, man/it/grpck.8, man/it/id.1, man/it/lastlog.8, man/it/login.1, man/it/passwd.5, man/it/shadow.5, man/it/useradd.8, man/it/userdel.8, man/it/usermod.8, man/it/vipw.8, man/de/chfn.1, man/de/chsh.1, man/de/login.1, man/de/passwd.1, man/de/passwd.5, man/de/su.1, man/de/vipw.8, man/es/login.1, man/es/passwd.1, man/es/su.1, man/fr/chage.1, man/fr/chpasswd.8, man/fr/chsh.1, man/fr/faillog.5, man/fr/gpasswd.1, man/fr/groups.1, man/fr/id.1, man/fr/passwd.1, man/fr/passwd.5, man/fr/shadow.5, man/fr/su.1, man/fr/useradd.8, man/fr/userdel.8, man/fr/usermod.8, man/cs/groups.1, man/cs/id.1, man/cs/lastlog.8, man/cs/passwd.5, man/cs/shadow.5, man/cs/su.1, man/pl/mkpasswd.8, man/pl/chage.1, man/pl/chfn.1, man/pl/chpasswd.8, man/pl/chsh.1, man/pl/expiry.1, man/pl/faillog.5, man/pl/faillog.8, man/pl/gpasswd.1, man/pl/groupadd.8, man/pl/groupdel.8, man/pl/groupmems.8, man/pl/groupmod.8, man/pl/groups.1, man/pl/grpck.8, man/pl/id.1, man/pl/lastlog.8, man/pl/limits.5, man/pl/login.1, man/pl/login.access.5, man/pl/login.defs.5, man/pl/logoutd.8, man/pl/newgrp.1, man/pl/newusers.8, man/pl/passwd.1, man/pl/passwd.5, man/pl/porttime.5, man/pl/pw_auth.3, man/pl/pwck.8, man/pl/pwconv.8, man/pl/shadow.3, man/pl/shadow.5, man/pl/shadowconfig.8, man/pl/su.1, man/pl/suauth.5, man/pl/sulogin.8, man/pl/useradd.8, man/pl/userdel.8, man/pl/vipw.8, man/chage.1, man/chfn.1, man/expiry.1, man/faillog.8, man/gpasswd.1, man/groupadd.8, man/groupmems.8, man/groupmod.8, man/grpck.8, man/lastlog.8, man/limits.5, man/login.1, man/login.defs.5, man/newgrp.1, man/passwd.1, man/porttime.5, man/pwck.8, man/shadow.3, man/su.1, man/suauth.5, man/sulogin.8, man/useradd.8, man/usermod.8, man/vipw.8:
+	* man/ru/passwd.5, man/zh_CN/chfn.1, man/zh_CN/chpasswd.8, man/zh_CN/chsh.1, man/zh_CN/groupadd.8, man/zh_CN/groupdel.8, man/zh_CN/groupmod.8, man/zh_CN/useradd.8, man/zh_CN/userdel.8, man/zh_CN/usermod.8, man/zh_TW/chfn.1, man/zh_TW/chsh.1, man/zh_TW/groupadd.8, man/zh_TW/groupdel.8, man/zh_TW/groupmod.8, man/zh_TW/useradd.8, man/zh_TW/userdel.8, man/zh_TW/usermod.8, man/ko/chfn.1, man/ko/chsh.1, man/ko/groups.1, man/ko/id.1, man/ko/login.1, man/ko/passwd.5, man/ko/su.1, man/pt_BR/gpasswd.1, man/pt_BR/groupadd.8, man/pt_BR/groupdel.8, man/pt_BR/groupmod.8, man/pt_BR/shadow.5, man/ja/mkpasswd.8, man/ja/chage.1, man/ja/chfn.1, man/ja/chpasswd.8, man/ja/chsh.1, man/ja/expiry.1, man/ja/faillog.8, man/ja/gpasswd.1, man/ja/groupadd.8, man/ja/groupmod.8, man/ja/groups.1, man/ja/grpck.8, man/ja/id.1, man/ja/lastlog.8, man/ja/limits.5, man/ja/login.1, man/ja/login.access.5, man/ja/login.defs.5, man/ja/newgrp.1, man/ja/passwd.1, man/ja/porttime.5, man/ja/pw_auth.3, man/ja/pwck.8, man/ja/shadow.3, man/ja/su.1, man/ja/suauth.5, man/ja/sulogin.8, man/ja/useradd.8, man/ja/userdel.8, man/ja/usermod.8, man/ja/vipw.8, man/hu/chfn.1, man/hu/chsh.1, man/hu/gpasswd.1, man/hu/groups.1, man/hu/id.1, man/hu/login.1, man/hu/newgrp.1, man/hu/passwd.1, man/hu/su.1, man/id/chsh.1, man/id/login.1, man/id/useradd.8, man/it/chfn.1, man/it/chsh.1, man/it/gpasswd.1, man/it/groupadd.8, man/it/groupdel.8, man/it/groupmod.8, man/it/groups.1, man/it/grpck.8, man/it/id.1, man/it/lastlog.8, man/it/login.1, man/it/passwd.5, man/it/shadow.5, man/it/useradd.8, man/it/userdel.8, man/it/usermod.8, man/it/vipw.8, man/de/chfn.1, man/de/chsh.1, man/de/login.1, man/de/passwd.1, man/de/passwd.5, man/de/su.1, man/de/vipw.8, man/es/login.1, man/es/passwd.1, man/es/su.1, man/fr/chage.1, man/fr/chpasswd.8, man/fr/chsh.1, man/fr/faillog.5, man/fr/gpasswd.1, man/fr/groups.1, man/fr/id.1, man/fr/passwd.1, man/fr/passwd.5, man/fr/shadow.5, man/fr/su.1, man/fr/useradd.8, man/fr/userdel.8, man/fr/usermod.8, man/cs/groups.1, man/cs/id.1, man/cs/lastlog.8, man/cs/passwd.5, man/cs/shadow.5, man/cs/su.1, man/pl/mkpasswd.8, man/pl/shadowconfig.8, man/pl/chage.1, man/pl/chfn.1, man/pl/chpasswd.8, man/pl/chsh.1, man/pl/expiry.1, man/pl/faillog.5, man/pl/faillog.8, man/pl/gpasswd.1, man/pl/groupadd.8, man/pl/groupdel.8, man/pl/groupmems.8, man/pl/groupmod.8, man/pl/groups.1, man/pl/grpck.8, man/pl/id.1, man/pl/lastlog.8, man/pl/limits.5, man/pl/login.1, man/pl/login.access.5, man/pl/login.defs.5, man/pl/logoutd.8, man/pl/newgrp.1, man/pl/newusers.8, man/pl/passwd.1, man/pl/passwd.5, man/pl/porttime.5, man/pl/pw_auth.3, man/pl/pwck.8, man/pl/pwconv.8, man/pl/shadow.3, man/pl/shadow.5, man/pl/su.1, man/pl/suauth.5, man/pl/sulogin.8, man/pl/useradd.8, man/pl/userdel.8, man/pl/vipw.8, man/chage.1, man/chfn.1, man/expiry.1, man/faillog.8, man/gpasswd.1, man/groupadd.8, man/groupmems.8, man/groupmod.8, man/grpck.8, man/lastlog.8, man/limits.5, man/login.1, man/login.defs.5, man/newgrp.1, man/passwd.1, man/porttime.5, man/pwck.8, man/shadow.3, man/su.1, man/suauth.5, man/sulogin.8, man/useradd.8, man/usermod.8, man/vipw.8:
 	more replaces "-" by "\-" (s,\\-,-,g; s,-,\\-,g).
 
 	* man/pl/usermod.8: finish sync with english version.
@@ -1079,7 +1347,7 @@
 
 2004-12-11  Tomasz K�oczko  <kloczek@pld.org.pl>
 
-	* man/chage.1, man/chfn.1, man/grpck.8, man/id.1, man/lastlog.8, man/login.1, man/newgrp.1, man/newusers.8, man/passwd.5, man/pw_auth.3, man/pwck.8, man/pwconv.8, man/shadowconfig.8, man/suauth.5, man/useradd.8:
+	* man/shadowconfig.8, man/chage.1, man/chfn.1, man/grpck.8, man/id.1, man/lastlog.8, man/login.1, man/newgrp.1, man/newusers.8, man/passwd.5, man/pw_auth.3, man/pwck.8, man/pwconv.8, man/suauth.5, man/useradd.8:
 	Fixed varoiuse typos and misspeling based partialy on patch from Bug#141322
 	from Debian (submited by Christian Perrier <bubulle@debian.org>).
 
@@ -1780,7 +2048,7 @@
 
 2003-05-01  Tomasz K�oczko  <kloczek@pld.org.pl>
 
-	* man/dpasswd.8, man/mkpasswd.8, man/pwauth.8, man/chage.1, man/chfn.1, man/chpasswd.8, man/chsh.1, man/expiry.1, man/faillog.5, man/faillog.8, man/gpasswd.1, man/groupadd.8, man/groupdel.8, man/groupmems.8, man/groupmod.8, man/groups.1, man/grpck.8, man/id.1, man/lastlog.8, man/limits.5, man/login.1, man/login.access.5, man/login.defs.5, man/logoutd.8, man/newgrp.1, man/newusers.8, man/passwd.1, man/passwd.5, man/porttime.5, man/pwck.8, man/pwconv.8, man/shadow.3, man/shadow.5, man/shadowconfig.8, man/su.1, man/sulogin.8, man/useradd.8, man/userdel.8, man/usermod.8, man/vipw.8:
+	* man/dpasswd.8, man/mkpasswd.8, man/pwauth.8, man/shadowconfig.8, man/chage.1, man/chfn.1, man/chpasswd.8, man/chsh.1, man/expiry.1, man/faillog.5, man/faillog.8, man/gpasswd.1, man/groupadd.8, man/groupdel.8, man/groupmems.8, man/groupmod.8, man/groups.1, man/grpck.8, man/id.1, man/lastlog.8, man/limits.5, man/login.1, man/login.access.5, man/login.defs.5, man/logoutd.8, man/newgrp.1, man/newusers.8, man/passwd.1, man/passwd.5, man/porttime.5, man/pwck.8, man/pwconv.8, man/shadow.3, man/shadow.5, man/su.1, man/sulogin.8, man/useradd.8, man/userdel.8, man/usermod.8, man/vipw.8:
 	Reformated.
 
 	* etc/login.defs:
@@ -1800,7 +2068,7 @@
 
 	* man/ko/passwd.5: Remove ^M from end of line.
 
-	* src/chage.c, src/chpasswd.c, src/login.c, src/newusers.c, src/passwd.c, src/pwunconv.c, src/su.c, src/useradd.c, NEWS, acconfig.h, configure.in:
+	* src/chage.c, src/chpasswd.c, src/login.c, src/newusers.c, src/passwd.c, src/pwunconv.c, src/su.c, src/useradd.c, acconfig.h, NEWS, configure.in:
 	Removed old ATT_AGE (account ageing in passwd file) dependent code.
 
 	* po/pl.po: Fix chage and lastlog messages.
@@ -1857,7 +2125,7 @@
 	* NEWS, configure.in, man/Makefile.am, man/ru/Makefile.am, man/ru/passwd.5:
 	Added ru passwd(1) man page from KSI resources.
 
-	* man/zh_CN/Makefile.am, man/zh_CN/chfn.1, man/zh_CN/chsh.1, man/zh_TW/Makefile.am, man/zh_TW/chfn.1, man/zh_TW/chsh.1, man/ja/dpasswd.8, man/ja/mkpasswd.8, man/ja/pwauth.8, man/ja/Makefile.am, man/ja/chage.1, man/ja/chfn.1, man/ja/chpasswd.8, man/ja/chsh.1, man/ja/expiry.1, man/ja/faillog.5, man/ja/faillog.8, man/ja/gpasswd.1, man/ja/groupadd.8, man/ja/groupdel.8, man/ja/groupmod.8, man/ja/groups.1, man/ja/grpck.8, man/ja/id.1, man/ja/lastlog.8, man/ja/limits.5, man/ja/login.1, man/ja/login.access.5, man/ja/login.defs.5, man/ja/logoutd.8, man/ja/newgrp.1, man/ja/newusers.8, man/ja/passwd.1, man/ja/passwd.5, man/ja/porttime.5, man/ja/pw_auth.3, man/ja/pwck.8, man/ja/pwconv.8, man/ja/shadow.3, man/ja/shadow.5, man/ja/shadowconfig.8, man/ja/su.1, man/ja/suauth.5, man/ja/sulogin.8, man/ja/useradd.8, man/ja/userdel.8, man/ja/usermod.8, man/ja/vipw.8, NEWS, man/cs/Makefile.am, man/cs/id.1:
+	* man/zh_CN/Makefile.am, man/zh_CN/chfn.1, man/zh_CN/chsh.1, man/zh_TW/Makefile.am, man/zh_TW/chfn.1, man/zh_TW/chsh.1, man/ja/dpasswd.8, man/ja/mkpasswd.8, man/ja/pwauth.8, man/ja/shadowconfig.8, man/ja/Makefile.am, man/ja/chage.1, man/ja/chfn.1, man/ja/chpasswd.8, man/ja/chsh.1, man/ja/expiry.1, man/ja/faillog.5, man/ja/faillog.8, man/ja/gpasswd.1, man/ja/groupadd.8, man/ja/groupdel.8, man/ja/groupmod.8, man/ja/groups.1, man/ja/grpck.8, man/ja/id.1, man/ja/lastlog.8, man/ja/limits.5, man/ja/login.1, man/ja/login.access.5, man/ja/login.defs.5, man/ja/logoutd.8, man/ja/newgrp.1, man/ja/newusers.8, man/ja/passwd.1, man/ja/passwd.5, man/ja/porttime.5, man/ja/pw_auth.3, man/ja/pwck.8, man/ja/pwconv.8, man/ja/shadow.3, man/ja/shadow.5, man/ja/su.1, man/ja/suauth.5, man/ja/sulogin.8, man/ja/useradd.8, man/ja/userdel.8, man/ja/usermod.8, man/ja/vipw.8, NEWS, man/cs/Makefile.am, man/cs/id.1:
 	Added chch(1), chfn(1) man pages from chinese man pages translation
 	project.
 	Added id(1) man page czech man pages translation project.
@@ -1911,7 +2179,7 @@
 
 2003-04-22  Tomasz K�oczko  <kloczek@pld.org.pl>
 
-	* libmisc/getdate.c, libmisc/login_access.c, libmisc/login_desrpc.c, libmisc/login_krb.c, libmisc/nscd.c, libmisc/setup.c, libmisc/entry.c, libmisc/env.c, libmisc/failure.c, libmisc/fields.c, libmisc/hushed.c, libmisc/isexpired.c, libmisc/limits.c, libmisc/list.c, libmisc/log.c, libmisc/loginprompt.c, libmisc/mail.c, libmisc/motd.c, libmisc/myname.c, libmisc/obscure.c, libmisc/pam_pass.c, libmisc/pwd2spwd.c, libmisc/pwd_init.c, libmisc/pwdcheck.c, libmisc/rlogin.c, libmisc/salt.c, libmisc/setugid.c, libmisc/setupenv.c, libmisc/shell.c, libmisc/strtoday.c, libmisc/sub.c, libmisc/sulog.c, libmisc/ttytype.c, libmisc/tz.c, libmisc/ulimit.c, libmisc/utmp.c, libmisc/valid.c, libmisc/xmalloc.c, libmisc/addgrps.c, libmisc/age.c, libmisc/basename.c, libmisc/chkname.c, libmisc/chkshell.c, libmisc/chowndir.c, libmisc/chowntty.c, libmisc/console.c, libmisc/copydir.c:
+	* libmisc/getdate.c, libmisc/login_access.c, libmisc/login_desrpc.c, libmisc/login_krb.c, libmisc/nscd.c, libmisc/setup.c, libmisc/entry.c, libmisc/env.c, libmisc/failure.c, libmisc/fields.c, libmisc/hushed.c, libmisc/isexpired.c, libmisc/limits.c, libmisc/list.c, libmisc/log.c, libmisc/loginprompt.c, libmisc/mail.c, libmisc/motd.c, libmisc/myname.c, libmisc/obscure.c, libmisc/pam_pass.c, libmisc/pwd2spwd.c, libmisc/pwd_init.c, libmisc/pwdcheck.c, libmisc/rlogin.c, libmisc/salt.c, libmisc/setugid.c, libmisc/setupenv.c, libmisc/shell.c, libmisc/strtoday.c, libmisc/sub.c, libmisc/sulog.c, libmisc/ttytype.c, libmisc/tz.c, libmisc/ulimit.c, libmisc/utmp.c, libmisc/valid.c, libmisc/xmalloc.c, libmisc/chkshell.c, libmisc/addgrps.c, libmisc/age.c, libmisc/basename.c, libmisc/chkname.c, libmisc/chowndir.c, libmisc/chowntty.c, libmisc/console.c, libmisc/copydir.c:
 	Indent all using current .indent.pro settings.
 
 	* po/Makevars: New file neccessary for gettext >=0.11.5.
@@ -1994,7 +2262,7 @@
 
 2002-03-18  Andrzej Krzysztofowicz  <ankry@pld.org.pl>
 
-	* man/ja/dpasswd.8, man/ja/chpasswd.8, man/ja/faillog.8, man/ja/groupadd.8, man/ja/groupdel.8, man/ja/groupmod.8, man/ja/id.1, man/ja/lastlog.8, man/ja/login.defs.5, man/ja/newusers.8, man/ja/shadowconfig.8, man/ja/su.1, man/ja/useradd.8, man/ja/userdel.8, man/ja/usermod.8, man/ja/vipw.8:
+	* man/ja/dpasswd.8, man/ja/shadowconfig.8, man/ja/chpasswd.8, man/ja/faillog.8, man/ja/groupadd.8, man/ja/groupdel.8, man/ja/groupmod.8, man/ja/id.1, man/ja/lastlog.8, man/ja/login.defs.5, man/ja/newusers.8, man/ja/su.1, man/ja/useradd.8, man/ja/userdel.8, man/ja/usermod.8, man/ja/vipw.8:
 	- updated to man-pages-ja-20020315 (except cvs tags)
 
 2002-03-15  Andrzej Krzysztofowicz  <ankry@pld.org.pl>
@@ -2101,7 +2369,7 @@
 
 	* man/hu/passwd.1: missing "-"
 
-	* man/ja/passwd.5, man/ja/shadow.5, man/ja/shadowconfig.8:
+	* man/ja/shadowconfig.8, man/ja/passwd.5, man/ja/shadow.5:
 	- updated to man-pages-ja-20020215
 
 2002-02-23  Andrzej Krzysztofowicz  <ankry@pld.org.pl>
@@ -2658,7 +2926,7 @@
 
 	* autogen.sh: add to conf_flags --disable-shared.
 
-	* man/pl/d_passwd.5, man/pl/dialups.5, man/pl/dpasswd.8, man/pl/mkpasswd.8, man/pl/pwauth.8, man/pl/chage.1, man/pl/chfn.1, man/pl/chpasswd.8, man/pl/chsh.1, man/pl/faillog.5, man/pl/faillog.8, man/pl/gpasswd.1, man/pl/groupadd.8, man/pl/groupdel.8, man/pl/groupmod.8, man/pl/groups.1, man/pl/grpck.8, man/pl/id.1, man/pl/lastlog.8, man/pl/limits.5, man/pl/login.1, man/pl/login.access.5, man/pl/login.defs.5, man/pl/logoutd.8, man/pl/newgrp.1, man/pl/newusers.8, man/pl/passwd.1, man/pl/passwd.5, man/pl/porttime.5, man/pl/pw_auth.3, man/pl/pwck.8, man/pl/pwconv.8, man/pl/shadow.3, man/pl/shadow.5, man/pl/shadowconfig.8, man/pl/su.1, man/pl/suauth.5, man/pl/sulogin.8, man/pl/useradd.8, man/pl/userdel.8, man/pl/usermod.8, man/pl/vipw.8, man/mkpasswd.8, man/pwauth.8, man/newgrp.1, man/newusers.8, man/passwd.1, man/passwd.5, man/porttime.5, man/pw_auth.3, man/pwck.8, man/pwconv.8, man/shadow.3, man/shadow.5, man/shadowconfig.8, man/su.1, man/suauth.5, man/sulogin.8, man/useradd.8, man/userdel.8, man/usermod.8, man/vipw.8, man/dpasswd.8, man/chage.1, man/chfn.1, man/chpasswd.8, man/chsh.1, man/expiry.1, man/faillog.5, man/faillog.8, man/gpasswd.1, man/groupadd.8, man/groupdel.8, man/groupmems.8, man/groupmod.8, man/groups.1, man/grpck.8, man/id.1, man/lastlog.8, man/limits.5, man/login.1, man/login.access.5, man/login.defs.5, man/logoutd.8:
+	* man/pl/d_passwd.5, man/pl/dialups.5, man/pl/dpasswd.8, man/pl/mkpasswd.8, man/pl/pwauth.8, man/pl/shadowconfig.8, man/pl/chage.1, man/pl/chfn.1, man/pl/chpasswd.8, man/pl/chsh.1, man/pl/faillog.5, man/pl/faillog.8, man/pl/gpasswd.1, man/pl/groupadd.8, man/pl/groupdel.8, man/pl/groupmod.8, man/pl/groups.1, man/pl/grpck.8, man/pl/id.1, man/pl/lastlog.8, man/pl/limits.5, man/pl/login.1, man/pl/login.access.5, man/pl/login.defs.5, man/pl/logoutd.8, man/pl/newgrp.1, man/pl/newusers.8, man/pl/passwd.1, man/pl/passwd.5, man/pl/porttime.5, man/pl/pw_auth.3, man/pl/pwck.8, man/pl/pwconv.8, man/pl/shadow.3, man/pl/shadow.5, man/pl/su.1, man/pl/suauth.5, man/pl/sulogin.8, man/pl/useradd.8, man/pl/userdel.8, man/pl/usermod.8, man/pl/vipw.8, man/mkpasswd.8, man/pwauth.8, man/shadowconfig.8, man/newgrp.1, man/newusers.8, man/passwd.1, man/passwd.5, man/porttime.5, man/pw_auth.3, man/pwck.8, man/pwconv.8, man/shadow.3, man/shadow.5, man/su.1, man/suauth.5, man/sulogin.8, man/useradd.8, man/userdel.8, man/usermod.8, man/vipw.8, man/dpasswd.8, man/chage.1, man/chfn.1, man/chpasswd.8, man/chsh.1, man/expiry.1, man/faillog.5, man/faillog.8, man/gpasswd.1, man/groupadd.8, man/groupdel.8, man/groupmems.8, man/groupmod.8, man/groups.1, man/grpck.8, man/id.1, man/lastlog.8, man/limits.5, man/login.1, man/login.access.5, man/login.defs.5, man/logoutd.8:
 	put or move to top cemmented Id cvs keyword,
 	(passwd.1): documment -e option (patch from Debian),
 	(userdel.1): remove commented obsoleted options.
@@ -2889,7 +3157,7 @@
 
 2000-09-05  Marek Micha�kiewicz  <marekm@pld.org.pl>
 
-	* man/pl/sulogin.8, man/pl/vipw.8, po/el.po, po/fr.po, po/pl.po, po/sv.po, man/pl/d_passwd.5, man/pl/dialups.5, man/pl/dpasswd.8, man/pl/mkpasswd.8, man/pl/pwauth.8, man/pl/chage.1, man/pl/chfn.1, man/pl/chpasswd.8, man/pl/chsh.1, man/pl/faillog.5, man/pl/faillog.8, man/pl/gpasswd.1, man/pl/groups.1, man/pl/grpck.8, man/pl/id.1, man/pl/lastlog.8, man/pl/limits.5, man/pl/login.1, man/pl/login.access.5, man/pl/login.defs.5, man/pl/logoutd.8, man/pl/newgrp.1, man/pl/newusers.8, man/pl/passwd.1, man/pl/passwd.5, man/pl/porttime.5, man/pl/pw_auth.3, man/pl/pwck.8, man/pl/pwconv.8, man/pl/shadow.3, man/pl/shadow.5, man/pl/shadowconfig.8, man/pl/su.1, man/pl/suauth.5:
+	* man/pl/sulogin.8, man/pl/vipw.8, po/el.po, po/fr.po, po/pl.po, po/sv.po, man/pl/d_passwd.5, man/pl/dialups.5, man/pl/dpasswd.8, man/pl/mkpasswd.8, man/pl/pwauth.8, man/pl/shadowconfig.8, man/pl/chage.1, man/pl/chfn.1, man/pl/chpasswd.8, man/pl/chsh.1, man/pl/faillog.5, man/pl/faillog.8, man/pl/gpasswd.1, man/pl/groups.1, man/pl/grpck.8, man/pl/id.1, man/pl/lastlog.8, man/pl/limits.5, man/pl/login.1, man/pl/login.access.5, man/pl/login.defs.5, man/pl/logoutd.8, man/pl/newgrp.1, man/pl/newusers.8, man/pl/passwd.1, man/pl/passwd.5, man/pl/porttime.5, man/pl/pw_auth.3, man/pl/pwck.8, man/pl/pwconv.8, man/pl/shadow.3, man/pl/shadow.5, man/pl/su.1, man/pl/suauth.5:
 	*** empty log message ***
 
 2000-09-02  Marek Micha�kiewicz  <marekm@pld.org.pl>
@@ -2954,7 +3222,7 @@
 
 1998-01-30  Marek Micha�kiewicz  <marekm@pld.org.pl>
 
-	* install-sh, src/userdel.c, src/usermod.c, src/pwconv.c, src/pwunconv.c, src/su.c, src/useradd.c, src/newgrp.c, src/newusers.c, src/passwd.c, src/pwck.c, src/groupmod.c, src/login.c, src/logoutd.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c, src/chfn.c, src/chpasswd.c, src/chsh.c, src/expiry.c, redhat/README, redhat/shadow-utils.spec.in, src/Makefile.am, src/chage.c, man/login.defs.5, man/useradd.8, man/usermod.8, redhat/Makefile.am, libmisc/pam_pass.c, libmisc/strtoday.c, libmisc/tz.c, libmisc/login_access.c, libmisc/login_desrpc.c, libmisc/login_krb.c, libmisc/obscure.c, libmisc/age.c, libmisc/env.c, libmisc/limits.c, lib/strstr.c, lib/shadow.c, lib/shadowio.c, lib/shadowio.h, lib/utent.c, lib/rmdir.c, lib/pwio.c, lib/pwio.h, lib/sgetspent.c, lib/sgroupio.c, lib/mkdir.c, lib/putgrent.c, lib/prototypes.h, lib/pwauth.c, lib/md5crypt.c, lib/getpass.c, lib/groupio.c, lib/gshadow.c, lib/lockpw.c, lib/commonio.h, lib/defines.h, lib/encrypt.c, lib/getdef.c, lib/getdef.h, doc/README.mirrors, doc/automake-1.0.diff, doc/WISHLIST, lib/Makefile.am, lib/commonio.c, doc/ANNOUNCE, doc/CHANGES, doc/Makefile.am, doc/README.limits, doc/README.linux, debian/Makefile.am, debian/changelog, debian/login.copyright, debian/rules, mkinstalldirs, shadow-utils.spec, contrib/README, aclocal.m4, acconfig.h, configure.in, Makefile.am:
+	* install-sh, src/userdel.c, src/usermod.c, src/pwconv.c, src/pwunconv.c, src/su.c, src/useradd.c, src/newgrp.c, src/newusers.c, src/passwd.c, src/pwck.c, src/groupmod.c, src/login.c, src/logoutd.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c, src/chfn.c, src/chpasswd.c, src/chsh.c, src/expiry.c, redhat/README, redhat/shadow-utils.spec.in, src/Makefile.am, src/chage.c, man/login.defs.5, man/useradd.8, man/usermod.8, redhat/Makefile.am, libmisc/pam_pass.c, libmisc/strtoday.c, libmisc/tz.c, libmisc/login_access.c, libmisc/login_desrpc.c, libmisc/login_krb.c, libmisc/obscure.c, libmisc/age.c, libmisc/env.c, libmisc/limits.c, lib/strstr.c, lib/shadow.c, lib/shadowio.c, lib/shadowio.h, lib/utent.c, lib/rmdir.c, lib/pwio.c, lib/pwio.h, lib/sgetspent.c, lib/sgroupio.c, lib/mkdir.c, lib/putgrent.c, lib/prototypes.h, lib/pwauth.c, lib/md5crypt.c, lib/getpass.c, lib/groupio.c, lib/gshadow.c, lib/lockpw.c, lib/commonio.h, lib/defines.h, lib/encrypt.c, lib/getdef.c, lib/getdef.h, doc/README.mirrors, doc/automake-1.0.diff, doc/WISHLIST, lib/Makefile.am, lib/commonio.c, doc/ANNOUNCE, doc/CHANGES, doc/Makefile.am, doc/README.limits, doc/README.linux, debian/Makefile.am, debian/changelog, debian/login.copyright, debian/rules, mkinstalldirs, shadow-utils.spec, contrib/README, acconfig.h, aclocal.m4, configure.in, Makefile.am:
 	*** empty log message ***
 
 1998-01-25  Marek Micha�kiewicz  <marekm@pld.org.pl>
@@ -2968,7 +3236,7 @@
 
 1997-12-08  Marek Micha�kiewicz  <marekm@pld.org.pl>
 
-	* src/userdel.c, src/usermod.c, src/shadowconfig.sh, src/su.c, src/sulogin.c, src/useradd.c, src/passwd.c, src/pwck.c, src/pwconv.c, src/pwunconv.c, src/newgrp.c, src/newusers.c, src/mkpasswd.c, src/logoutd.c, src/grpconv.c, src/grpunconv.c, src/id.c, src/lastlog.c, src/login.c, src/groupadd.c, src/groupdel.c, src/groupmod.c, src/groups.c, src/grpck.c, src/dpasswd.c, src/chsh.c, src/expiry.c, src/faillog.c, src/gpasswd.c, src/Makefile.am, src/chage.c, src/chfn.c, src/chpasswd.c, old/Makefile.am, old/pwconv.8, old/vipw.8, man/Makefile.am, man/limits.5, man/pwconv.8, man/shadowconfig.8, man/vipw.8, libmisc/tz.c, libmisc/ulimit.c, libmisc/utmp.c, libmisc/valid.c, libmisc/xmalloc.c, libmisc/suauth.c, libmisc/strtoday.c, libmisc/sub.c, libmisc/sulog.c, libmisc/ttytype.c, libmisc/setup.c, libmisc/salt.c, libmisc/setugid.c, libmisc/setupenv.c, libmisc/shell.c, libmisc/rlogin.c, libmisc/motd.c, libmisc/myname.c, libmisc/obscure.c, libmisc/pam_pass.c, libmisc/pwd2spwd.c, libmisc/pwd_init.c, libmisc/login_access.c, libmisc/login_desrpc.c, libmisc/login_krb.c, libmisc/loginprompt.c, libmisc/mail.c, libmisc/hushed.c, libmisc/isexpired.c, libmisc/limits.c, libmisc/list.c, libmisc/log.c, libmisc/getdate.c, libmisc/failure.h, libmisc/fields.c, libmisc/getdate.h, libmisc/getdate.y, libmisc/entry.c, libmisc/env.c, libmisc/failure.c, libmisc/chowndir.c, libmisc/chowntty.c, libmisc/console.c, libmisc/copydir.c, libmisc/age.c, libmisc/basename.c, libmisc/chkname.c, libmisc/chkname.h, libmisc/chkshell.c, lib/strdup.c, lib/strerror.c, lib/strstr.c, lib/utent.c, libmisc/Makefile.am, libmisc/addgrps.c, lib/spdbm.c, lib/sgroupio.c, lib/shadow.c, lib/shadowio.c, lib/sppack.c, lib/rename.c, lib/rmdir.c, lib/sgetgrent.c, lib/sgetpwent.c, lib/sgetspent.c, lib/rad64.c, lib/pwdbm.c, lib/pwent.c, lib/pwauth.c, lib/pwio.c, lib/pwpack.c, lib/mkdir.c, lib/putgrent.c, lib/putpwent.c, lib/putspent.c, lib/port.c, lib/prototypes.h, lib/gsdbm.c, lib/md5.c, lib/md5crypt.c, lib/gshadow.c, lib/gspack.c, lib/lockpw.c, lib/grdbm.c, lib/grent.c, lib/groupio.c, lib/grpack.c, lib/getpass.c, lib/dialup.c, lib/encrypt.c, lib/fputsx.c, lib/getdef.c, lib/dialchk.c, lib/dialchk.h, lib/commonio.c, lib/commonio.h, lib/defines.h, doc/automake-1.0.diff, etc/limits, etc/login.defs.linux, lib/Makefile.am, doc/CHANGES, doc/README.mirrors, doc/README.linux, doc/WISHLIST, debian/login.conffiles, debian/login.postinst, debian/passwd.postinst, debian/porttime, debian/rules, debian/secure-su.README, debian/securetty, contrib/pwdauth.c, debian/changelog, debian/control, aclocal.m4, shadow-utils.spec, acconfig.h, configure.in, Makefile.am:
+	* src/userdel.c, src/usermod.c, src/shadowconfig.sh, src/su.c, src/sulogin.c, src/useradd.c, src/passwd.c, src/pwck.c, src/pwconv.c, src/pwunconv.c, src/newgrp.c, src/newusers.c, src/mkpasswd.c, src/logoutd.c, src/grpconv.c, src/grpunconv.c, src/id.c, src/lastlog.c, src/login.c, src/groupadd.c, src/groupdel.c, src/groupmod.c, src/groups.c, src/grpck.c, src/dpasswd.c, src/chsh.c, src/expiry.c, src/faillog.c, src/gpasswd.c, src/Makefile.am, src/chage.c, src/chfn.c, src/chpasswd.c, old/Makefile.am, old/pwconv.8, old/vipw.8, man/shadowconfig.8, man/Makefile.am, man/limits.5, man/pwconv.8, man/vipw.8, libmisc/tz.c, libmisc/ulimit.c, libmisc/utmp.c, libmisc/valid.c, libmisc/xmalloc.c, libmisc/suauth.c, libmisc/strtoday.c, libmisc/sub.c, libmisc/sulog.c, libmisc/ttytype.c, libmisc/setup.c, libmisc/salt.c, libmisc/setugid.c, libmisc/setupenv.c, libmisc/shell.c, libmisc/rlogin.c, libmisc/motd.c, libmisc/myname.c, libmisc/obscure.c, libmisc/pam_pass.c, libmisc/pwd2spwd.c, libmisc/pwd_init.c, libmisc/login_access.c, libmisc/login_desrpc.c, libmisc/login_krb.c, libmisc/loginprompt.c, libmisc/mail.c, libmisc/hushed.c, libmisc/isexpired.c, libmisc/limits.c, libmisc/list.c, libmisc/log.c, libmisc/getdate.c, libmisc/failure.h, libmisc/fields.c, libmisc/getdate.h, libmisc/getdate.y, libmisc/entry.c, libmisc/env.c, libmisc/failure.c, libmisc/chowndir.c, libmisc/chowntty.c, libmisc/console.c, libmisc/copydir.c, libmisc/chkshell.c, libmisc/age.c, libmisc/basename.c, libmisc/chkname.c, libmisc/chkname.h, lib/strdup.c, lib/strerror.c, lib/strstr.c, lib/utent.c, libmisc/Makefile.am, libmisc/addgrps.c, lib/spdbm.c, lib/sgroupio.c, lib/shadow.c, lib/shadowio.c, lib/sppack.c, lib/rename.c, lib/rmdir.c, lib/sgetgrent.c, lib/sgetpwent.c, lib/sgetspent.c, lib/rad64.c, lib/pwdbm.c, lib/pwent.c, lib/pwauth.c, lib/pwio.c, lib/pwpack.c, lib/mkdir.c, lib/putgrent.c, lib/putpwent.c, lib/putspent.c, lib/port.c, lib/prototypes.h, lib/gsdbm.c, lib/md5.c, lib/md5crypt.c, lib/gshadow.c, lib/gspack.c, lib/lockpw.c, lib/grdbm.c, lib/grent.c, lib/groupio.c, lib/grpack.c, lib/getpass.c, lib/dialup.c, lib/encrypt.c, lib/fputsx.c, lib/getdef.c, lib/dialchk.c, lib/dialchk.h, lib/commonio.c, lib/commonio.h, lib/defines.h, doc/automake-1.0.diff, etc/limits, etc/login.defs.linux, lib/Makefile.am, doc/CHANGES, doc/README.mirrors, doc/README.linux, doc/WISHLIST, debian/login.conffiles, debian/login.postinst, debian/passwd.postinst, debian/porttime, debian/rules, debian/secure-su.README, debian/securetty, contrib/pwdauth.c, debian/changelog, debian/control, acconfig.h, aclocal.m4, shadow-utils.spec, configure.in, Makefile.am:
 	*** empty log message ***
 
 1997-10-01  Marek Micha�kiewicz  <marekm@pld.org.pl>
@@ -2993,12 +3261,12 @@
 
 1997-06-01  Marek Micha�kiewicz  <marekm@pld.org.pl>
 
-	* debian/changelog, src/userdel.c, src/usermod.c, src/pwck.c, src/pwunconv.c, src/useradd.c, src/grpunconv.c, src/newusers.c, src/passwd.c, src/expiry.c, src/grpconv.c, src/chage.c, src/chfn.c, src/chpasswd.c, src/chsh.c, src/Makefile.am, redhat/Makefile.am, redhat/README, redhat/shadow-970502-config.patch, redhat/shadow-utils.spec, libmisc/mail.c, libmisc/login_desrpc.c, lib/pwio.h, lib/shadowio.c, lib/shadowio.h, lib/prototypes.h, lib/pwauth.c, lib/pwio.c, lib/commonio.c, lib/defines.h, doc/README.linux, doc/WISHLIST, doc/CHANGES, doc/INSTALL, install-sh, mkinstalldirs, Makefile.am, acconfig.h, configure.in:
+	* debian/changelog, src/userdel.c, src/usermod.c, src/pwck.c, src/pwunconv.c, src/useradd.c, src/grpunconv.c, src/newusers.c, src/passwd.c, src/expiry.c, src/grpconv.c, src/chage.c, src/chfn.c, src/chpasswd.c, src/chsh.c, src/Makefile.am, redhat/Makefile.am, redhat/README, redhat/shadow-970502-config.patch, redhat/shadow-utils.spec, libmisc/mail.c, libmisc/login_desrpc.c, lib/pwio.h, lib/shadowio.c, lib/shadowio.h, lib/prototypes.h, lib/pwauth.c, lib/pwio.c, lib/commonio.c, lib/defines.h, doc/README.linux, doc/WISHLIST, doc/CHANGES, doc/INSTALL, install-sh, mkinstalldirs, acconfig.h, Makefile.am, configure.in:
 	*** empty log message ***
 
 1997-05-02  Marek Micha�kiewicz  <marekm@pld.org.pl>
 
-	* src/shadowconfig.sh, src/Makefile.am, man/Makefile.am, libmisc/mail.c, libmisc/salt.c, lib/sgroupio.c, lib/shadowio.c, lib/groupio.c, lib/pwio.c, etc/Makefile.am, doc/WISHLIST, doc/CHANGES, debian/shadowconfig, debian/Makefile.am, debian/changelog, debian/control, debian/rules, configure.in, configure, shlib/Makefile.in, man/Makefile.in, libmisc/Makefile.in, lib/Makefile.in, etc/Makefile.in, doc/Makefile.in, contrib/Makefile.in, Makefile.in, man/userdel.8, man/usermod.8, man/shadow.5, man/su.1, man/sulogin.8, man/useradd.8, man/pwauth.8, man/pw_auth.3, man/pwck.8, man/pwconv.8, man/pwunconv.8, man/shadow.3, man/newusers.8, man/passwd.1, man/passwd.5, man/porttime.5, man/mkpasswd.8, man/login.defs.5, man/logoutd.8, man/newgrp.1, man/limits.5, man/login.1, man/groups.1, man/grpck.8, man/id.1, man/lastlog.8, man/faillog.5, man/faillog.8, man/groupadd.8, man/groupdel.8, man/groupmod.8, man/dpasswd.8, man/chage.1, man/chfn.1, man/chpasswd.8, man/chsh.1, libmisc/valid.c, libmisc/sulog.c, libmisc/ttytype.c, libmisc/tz.c, libmisc/utmp.c, libmisc/setup.c, libmisc/setupenv.c, libmisc/shell.c, libmisc/strtoday.c, libmisc/sub.c, libmisc/setugid.c, libmisc/obscure.c, libmisc/pwd2spwd.c, libmisc/rlogin.c, libmisc/login_access.c, libmisc/loginprompt.c, libmisc/motd.c, libmisc/hushed.c, libmisc/isexpired.c, libmisc/limits.c, libmisc/list.c, libmisc/log.c, libmisc/copydir.c, libmisc/entry.c, libmisc/env.c, libmisc/failure.c, libmisc/fields.c, libmisc/age.c, libmisc/chowndir.c, libmisc/chowntty.c, libmisc/console.c, lib/utent.c, lib/shadow_.h, lib/spdbm.c, lib/strstr.c, lib/sppack.c, lib/shadow.c, lib/sgetpwent.c, lib/sgetspent.c, lib/rad64.c, lib/rename.c, lib/rmdir.c, lib/pwpack.c, lib/sgetgrent.c, lib/pwdbm.c, lib/pwent.c, lib/pwauth.h, lib/putgrent.c, lib/putpwent.c, lib/putspent.c, lib/port.h, lib/pwauth.c, lib/lastlog_.h, lib/mkdir.c, lib/lockpw.c, lib/port.c, lib/gsdbm.c, lib/grpack.c, lib/gshadow.c, lib/gshadow_.h, lib/gspack.c, lib/grdbm.c, lib/grent.c, lib/getdef.c, lib/getpass.c, lib/dialup.h, lib/encrypt.c, lib/faillog.h, lib/fputsx.c, lib/dialchk.c, lib/dialup.c, lib/commonio.c, lib/defines.h, etc/login.defs, etc/login.defs.linux, doc/README.linux, doc/LICENSE, doc/Makefile.am, doc/README, doc/HOWTO, doc/ANNOUNCE, debian/secure-su.README, debian/secure-su.conffiles, debian/secure-su.copyright, debian/secure-su.postrm, debian/secure-su.preinst, debian/securetty, debian/passwd.conffiles, debian/passwd.copyright, debian/passwd.postinst, debian/porttime, debian/login.conffiles, debian/login.copyright, debian/login.postinst, debian/login.postrm, debian/login.preinst, debian/login.prerm, debian/logoutd, config.h.in, acconfig.h, Makefile.am, old/Makefile.in, old/scologin.c, old/orig-config.h, old/pwconv-old.c, old/pwd.h.m4, old/pwunconv-old.c, old/config.h.sun4, old/config.h.svr4, old/config.h.xenix, old/config.h.linux, old/Makefile.sun4, old/Makefile.svr4, old/Makefile.xenix, old/Makefile.am, old/Makefile.linux, src/Makefile.in, src/pwconv.c, src/userdel.c, src/usermod.c, src/useradd.c, src/su.c, src/sulogin.c, src/pwconv5.c, src/scologin.c, src/pwck.c, src/pwunconv.c, src/patchlevel.h, src/newusers.c, src/passwd.c, src/mkpasswd.c, src/logoutd.c, src/newgrp.c, src/grpunconv.c, src/id.c, src/lastlog.c, src/login.c, src/grpck.c, src/grpconv.c, src/groupdel.c, src/groupmod.c, src/groups.c, src/faillog.c, src/gpasswd.c, src/groupadd.c, src/dpasswd.c, src/chsh.c, src/expiry.c, src/chfn.c, src/chpasswd.c, src/chage.c:
+	* src/shadowconfig.sh, src/Makefile.am, man/Makefile.am, libmisc/mail.c, libmisc/salt.c, lib/sgroupio.c, lib/shadowio.c, lib/groupio.c, lib/pwio.c, etc/Makefile.am, doc/WISHLIST, doc/CHANGES, debian/shadowconfig, debian/Makefile.am, debian/changelog, debian/control, debian/rules, configure.in, configure, shlib/Makefile.in, man/Makefile.in, libmisc/Makefile.in, lib/Makefile.in, etc/Makefile.in, doc/Makefile.in, contrib/Makefile.in, Makefile.in, man/userdel.8, man/usermod.8, man/shadow.5, man/su.1, man/sulogin.8, man/useradd.8, man/pwauth.8, man/pw_auth.3, man/pwck.8, man/pwconv.8, man/pwunconv.8, man/shadow.3, man/newusers.8, man/passwd.1, man/passwd.5, man/porttime.5, man/mkpasswd.8, man/login.defs.5, man/logoutd.8, man/newgrp.1, man/limits.5, man/login.1, man/groups.1, man/grpck.8, man/id.1, man/lastlog.8, man/faillog.5, man/faillog.8, man/groupadd.8, man/groupdel.8, man/groupmod.8, man/dpasswd.8, man/chage.1, man/chfn.1, man/chpasswd.8, man/chsh.1, libmisc/valid.c, libmisc/sulog.c, libmisc/ttytype.c, libmisc/tz.c, libmisc/utmp.c, libmisc/setup.c, libmisc/setupenv.c, libmisc/shell.c, libmisc/strtoday.c, libmisc/sub.c, libmisc/setugid.c, libmisc/obscure.c, libmisc/pwd2spwd.c, libmisc/rlogin.c, libmisc/login_access.c, libmisc/loginprompt.c, libmisc/motd.c, libmisc/hushed.c, libmisc/isexpired.c, libmisc/limits.c, libmisc/list.c, libmisc/log.c, libmisc/copydir.c, libmisc/entry.c, libmisc/env.c, libmisc/failure.c, libmisc/fields.c, libmisc/age.c, libmisc/chowndir.c, libmisc/chowntty.c, libmisc/console.c, lib/utent.c, lib/shadow_.h, lib/spdbm.c, lib/strstr.c, lib/sppack.c, lib/shadow.c, lib/sgetpwent.c, lib/sgetspent.c, lib/rad64.c, lib/rename.c, lib/rmdir.c, lib/pwpack.c, lib/sgetgrent.c, lib/pwdbm.c, lib/pwent.c, lib/pwauth.h, lib/putgrent.c, lib/putpwent.c, lib/putspent.c, lib/port.h, lib/pwauth.c, lib/lastlog_.h, lib/mkdir.c, lib/lockpw.c, lib/port.c, lib/gsdbm.c, lib/grpack.c, lib/gshadow.c, lib/gshadow_.h, lib/gspack.c, lib/grdbm.c, lib/grent.c, lib/getdef.c, lib/getpass.c, lib/dialup.h, lib/encrypt.c, lib/faillog.h, lib/fputsx.c, lib/dialchk.c, lib/dialup.c, lib/commonio.c, lib/defines.h, etc/login.defs, etc/login.defs.linux, doc/README.linux, doc/LICENSE, doc/Makefile.am, doc/README, doc/HOWTO, doc/ANNOUNCE, debian/secure-su.README, debian/secure-su.conffiles, debian/secure-su.copyright, debian/secure-su.postrm, debian/secure-su.preinst, debian/securetty, debian/passwd.conffiles, debian/passwd.copyright, debian/passwd.postinst, debian/porttime, debian/login.conffiles, debian/login.copyright, debian/login.postinst, debian/login.postrm, debian/login.preinst, debian/login.prerm, debian/logoutd, acconfig.h, config.h.in, Makefile.am, old/Makefile.in, old/scologin.c, old/orig-config.h, old/pwconv-old.c, old/pwd.h.m4, old/pwunconv-old.c, old/config.h.sun4, old/config.h.svr4, old/config.h.xenix, old/config.h.linux, old/Makefile.sun4, old/Makefile.svr4, old/Makefile.xenix, old/Makefile.am, old/Makefile.linux, src/Makefile.in, src/pwconv.c, src/userdel.c, src/usermod.c, src/useradd.c, src/su.c, src/sulogin.c, src/pwconv5.c, src/scologin.c, src/pwck.c, src/pwunconv.c, src/patchlevel.h, src/newusers.c, src/passwd.c, src/mkpasswd.c, src/logoutd.c, src/newgrp.c, src/grpunconv.c, src/id.c, src/lastlog.c, src/login.c, src/grpck.c, src/grpconv.c, src/groupdel.c, src/groupmod.c, src/groups.c, src/faillog.c, src/gpasswd.c, src/groupadd.c, src/dpasswd.c, src/chsh.c, src/expiry.c, src/chfn.c, src/chpasswd.c, src/chage.c:
 	*** empty log message ***
 
 1997-02-11  Marek Micha�kiewicz  <marekm@pld.org.pl>
@@ -3039,6 +3307,6 @@
 	* contrib/adduser-old.c, contrib/adduser.sh, contrib/adduser2.sh, contrib/atudel:
 	960810 - first version under cvs
 
-	* contrib/Makefile.in, contrib/Makefile.am, contrib/README, contrib/adduser.c, contrib/pwdauth.c, doc/ANNOUNCE, doc/CHANGES, doc/Makefile.in, doc/README.sun4, doc/automake-1.0.diff, doc/console.c.spec, doc/HOWTO, doc/LICENSE, doc/Makefile.am, doc/README, doc/README.limits, doc/README.linux, doc/WISHLIST, etc/Makefile.in, etc/Makefile.am, etc/login.access, etc/login.defs, etc/login.defs.linux, old/Makefile.in, src/patchlevel.h, src/pwconv5.c, src/scologin.c, src/chage.c, src/chfn.c, src/chsh.c, src/expiry.c, src/gpasswd.c, src/groups.c, src/grpconv.c, src/id.c, src/login.c, src/newgrp.c, src/passwd.c, src/pwconv.c, src/pwunconv.c, src/su.c, src/sulogin.c, lib/dialup.h, lib/grdbm.c, lib/grent.c, lib/gsdbm.c, lib/lastlog_.h, lib/md5.c, lib/md5.h, lib/md5crypt.c, lib/mkdir.c, lib/putgrent.c, lib/putpwent.c, lib/putspent.c, lib/pwdbm.c, lib/pwent.c, lib/rename.c, lib/rmdir.c, lib/shadow_.h, lib/spdbm.c, lib/strdup.c, lib/strstr.c, lib/defines.h, lib/faillog.h, lib/getdef.h, lib/groupio.h, lib/grpack.c, lib/gshadow_.h, lib/gspack.c, lib/port.h, lib/prototypes.h, lib/pwauth.h, lib/pwio.h, lib/pwpack.c, lib/rcsid.h, lib/sgetgrent.c, lib/sgetpwent.c, lib/sgetspent.c, lib/sgroupio.h, lib/shadow.c, lib/shadowio.c, lib/shadowio.h, lib/sppack.c, lib/utent.c, src/Makefile.in, src/dpasswd.c, src/mkpasswd.c, src/Makefile.am, src/chpasswd.c, src/faillog.c, src/groupadd.c, src/groupdel.c, src/groupmod.c, src/grpck.c, src/lastlog.c, src/logoutd.c, src/newusers.c, src/pwck.c, src/useradd.c, src/userdel.c, src/usermod.c, lib/Makefile.in, lib/dialchk.c, lib/dialup.c, lib/rad64.c, lib/Makefile.am, lib/commonio.c, lib/encrypt.c, lib/fputsx.c, lib/getdef.c, lib/getpass.c, lib/groupio.c, lib/gshadow.c, lib/lockpw.c, lib/port.c, lib/pwauth.c, lib/pwio.c, lib/sgroupio.c, libmisc/login_access.c, libmisc/login_desrpc.c, libmisc/login_krb.c, libmisc/setup.c, libmisc/suauth.c, libmisc/age.c, libmisc/basename.c, libmisc/chkname.c, libmisc/chowndir.c, libmisc/chowntty.c, libmisc/console.c, libmisc/copydir.c, libmisc/entry.c, libmisc/env.c, libmisc/failure.c, libmisc/fields.c, libmisc/hushed.c, libmisc/isexpired.c, libmisc/limits.c, libmisc/list.c, libmisc/log.c, libmisc/loginprompt.c, libmisc/mail.c, libmisc/motd.c, libmisc/obscure.c, libmisc/pwd2spwd.c, libmisc/rlogin.c, libmisc/salt.c, libmisc/setugid.c, libmisc/setupenv.c, libmisc/shell.c, libmisc/strtoday.c, libmisc/sub.c, libmisc/sulog.c, libmisc/ttytype.c, libmisc/tz.c, libmisc/ulimit.c, libmisc/utmp.c, libmisc/valid.c, libmisc/xmalloc.c, man/Makefile.in, man/dpasswd.8, man/mkpasswd.8, man/pwauth.8, man/Makefile.am, man/chage.1, man/chfn.1, man/chpasswd.8, man/chsh.1, man/faillog.5, man/faillog.8, man/gpasswd.1, man/groupadd.8, man/groupdel.8, man/groupmod.8, man/groups.1, man/grpck.8, man/id.1, man/lastlog.8, man/login.1, man/login.access.5, man/login.defs.5, man/logoutd.8, man/newgrp.1, man/newusers.8, man/passwd.1, man/passwd.5, man/porttime.5, man/pw_auth.3, man/pwck.8, man/pwconv.8, man/pwunconv.8, man/shadow.3, man/shadow.5, man/su.1, man/suauth.5, man/sulogin.8, man/useradd.8, man/userdel.8, man/usermod.8, Makefile.in, aclocal.m4, config.h.in, configure, install-sh, mkinstalldirs, stamp-h.in, Makefile.am, README, acconfig.h, configure.in, libmisc/Makefile.in, libmisc/Makefile.am, libmisc/addgrps.c:
+	* contrib/Makefile.in, contrib/Makefile.am, contrib/README, contrib/adduser.c, contrib/pwdauth.c, doc/ANNOUNCE, doc/CHANGES, doc/Makefile.in, doc/README.sun4, doc/automake-1.0.diff, doc/console.c.spec, doc/HOWTO, doc/LICENSE, doc/Makefile.am, doc/README, doc/README.limits, doc/README.linux, doc/WISHLIST, etc/Makefile.in, etc/Makefile.am, etc/login.access, etc/login.defs, etc/login.defs.linux, old/Makefile.in, src/patchlevel.h, src/pwconv5.c, src/scologin.c, src/chage.c, src/chfn.c, src/chsh.c, src/expiry.c, src/gpasswd.c, src/groups.c, src/grpconv.c, src/id.c, src/login.c, src/newgrp.c, src/passwd.c, src/pwconv.c, src/pwunconv.c, src/su.c, src/sulogin.c, lib/dialup.h, lib/grdbm.c, lib/grent.c, lib/gsdbm.c, lib/lastlog_.h, lib/md5.c, lib/md5.h, lib/md5crypt.c, lib/mkdir.c, lib/putgrent.c, lib/putpwent.c, lib/putspent.c, lib/pwdbm.c, lib/pwent.c, lib/rename.c, lib/rmdir.c, lib/shadow_.h, lib/spdbm.c, lib/strdup.c, lib/strstr.c, lib/defines.h, lib/faillog.h, lib/getdef.h, lib/groupio.h, lib/grpack.c, lib/gshadow_.h, lib/gspack.c, lib/port.h, lib/prototypes.h, lib/pwauth.h, lib/pwio.h, lib/pwpack.c, lib/rcsid.h, lib/sgetgrent.c, lib/sgetpwent.c, lib/sgetspent.c, lib/sgroupio.h, lib/shadow.c, lib/shadowio.c, lib/shadowio.h, lib/sppack.c, lib/utent.c, src/Makefile.in, src/dpasswd.c, src/mkpasswd.c, src/Makefile.am, src/chpasswd.c, src/faillog.c, src/groupadd.c, src/groupdel.c, src/groupmod.c, src/grpck.c, src/lastlog.c, src/logoutd.c, src/newusers.c, src/pwck.c, src/useradd.c, src/userdel.c, src/usermod.c, lib/Makefile.in, lib/dialchk.c, lib/dialup.c, lib/rad64.c, lib/Makefile.am, lib/commonio.c, lib/encrypt.c, lib/fputsx.c, lib/getdef.c, lib/getpass.c, lib/groupio.c, lib/gshadow.c, lib/lockpw.c, lib/port.c, lib/pwauth.c, lib/pwio.c, lib/sgroupio.c, libmisc/login_access.c, libmisc/login_desrpc.c, libmisc/login_krb.c, libmisc/setup.c, libmisc/suauth.c, libmisc/age.c, libmisc/basename.c, libmisc/chkname.c, libmisc/chowndir.c, libmisc/chowntty.c, libmisc/console.c, libmisc/copydir.c, libmisc/entry.c, libmisc/env.c, libmisc/failure.c, libmisc/fields.c, libmisc/hushed.c, libmisc/isexpired.c, libmisc/limits.c, libmisc/list.c, libmisc/log.c, libmisc/loginprompt.c, libmisc/mail.c, libmisc/motd.c, libmisc/obscure.c, libmisc/pwd2spwd.c, libmisc/rlogin.c, libmisc/salt.c, libmisc/setugid.c, libmisc/setupenv.c, libmisc/shell.c, libmisc/strtoday.c, libmisc/sub.c, libmisc/sulog.c, libmisc/ttytype.c, libmisc/tz.c, libmisc/ulimit.c, libmisc/utmp.c, libmisc/valid.c, libmisc/xmalloc.c, man/Makefile.in, man/dpasswd.8, man/mkpasswd.8, man/pwauth.8, man/Makefile.am, man/chage.1, man/chfn.1, man/chpasswd.8, man/chsh.1, man/faillog.5, man/faillog.8, man/gpasswd.1, man/groupadd.8, man/groupdel.8, man/groupmod.8, man/groups.1, man/grpck.8, man/id.1, man/lastlog.8, man/login.1, man/login.access.5, man/login.defs.5, man/logoutd.8, man/newgrp.1, man/newusers.8, man/passwd.1, man/passwd.5, man/porttime.5, man/pw_auth.3, man/pwck.8, man/pwconv.8, man/pwunconv.8, man/shadow.3, man/shadow.5, man/su.1, man/suauth.5, man/sulogin.8, man/useradd.8, man/userdel.8, man/usermod.8, Makefile.in, acconfig.h, aclocal.m4, config.h.in, configure, install-sh, mkinstalldirs, stamp-h.in, Makefile.am, README, configure.in, libmisc/Makefile.in, libmisc/Makefile.am, libmisc/addgrps.c:
 	New file.
 
diff --git a/Makefile.in b/Makefile.in
index 513096cf..cd315adc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -38,8 +38,8 @@ host_triplet = @host@
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(srcdir)/shadow.spec.in $(top_srcdir)/configure ABOUT-NLS \
-	ChangeLog NEWS TODO acconfig.h config.guess config.rpath \
-	config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
+	ChangeLog NEWS TODO config.guess config.rpath config.sub \
+	depcomp install-sh ltmain.sh missing mkinstalldirs
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -113,10 +113,12 @@ LIBCRACK = @LIBCRACK@
 LIBCRYPT = @LIBCRYPT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBMD = @LIBMD@
 LIBOBJS = @LIBOBJS@
 LIBPAM = @LIBPAM@
 LIBS = @LIBS@
 LIBSELINUX = @LIBSELINUX@
+LIBSKEY = @LIBSKEY@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
@@ -242,7 +244,7 @@ config.h: stamp-h1
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(top_srcdir)/acconfig.h
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
 	cd $(top_srcdir) && $(AUTOHEADER)
 	rm -f stamp-h1
 	touch $@
diff --git a/NEWS b/NEWS
index 62294806..9438a5f4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,51 @@
-$Id: NEWS,v 1.178 2005/06/28 14:28:19 kloczek Exp $
+$Id: NEWS,v 1.211 2005/07/18 09:53:57 kloczek Exp $
+
+shadow-4.0.10 -> shadow-4.0.11						18-07-2005
+
+*** general:
+- su: ignore SIGINT while authenticating. A ^C could defeat the waiting period and
+  permit brute-force attacks. Also ignore SIGQUIT.
+  Fixed: http://bugs.debian.org/52372 and http://bugs.debian.org/288827
+- useradd: rewrited for use getopt_long(),
+- newgrp: add fix for handle splitted NIS groups: extends the functionality that,
+  if the requested group is given, all groups of the same GID are tested for
+  membership of the requesting user.
+  (fix by Christian Mudra <C.Mudra@science-computing.de>)
+- fix nscd_flush_cache(): for some reason doing the INVALIDATE call with two
+  write()'s fails. Do one writev() call instead.
+  http://bugs.gentoo.org/show_bug.cgi?id=80413
+  (submited by Martin Schlemmer <azarah@gentoo.org>)
+- merge nscd-socket-path patch from Fedora: newer glibc's have a different nscd socket
+  location (/var/run/nscd/socket instead /var/run/.nscd_socket),
+- S/Key support is back,
+- usermod: added -a option. This flag can only be used in conjunction with the -G
+  option. It cause usermod to append user to the current supplementary group list.
+  (patch by Peter Vrabec <pvrabec@redhat.com>) 
+- chage: added missing \n in error messages,
+- useradd, groupadd: change -O option to -K and document it in man page,
+- su, sulogin, login: fixed erroneous warning messages when used with PAM about some
+  login.defs variables (fix by DJ Lucas <dj@linuxfromscratch.org>),
+- autoconf:
+-- stop with error message if crypt() not found,
+-- remove --with{,out}-libcrypt switch,
+-- move all autoheader templates from acconfig.h to configure.in,
+- login: setup limits and umask (using login.defs ULIMITS and UMASK variables) only when
+  PAM support is disabled (it is task for pam_limits and pam_umask modules),
+- sulogin, login: use SYSLOG macro instead syslog() which saves the locale, sets the
+  locale to C, sends the message and restores the locale
+  (fix by Nicolas François <nicolas.francois@centraliens.net>).
+- updated translations: cs, da, de, es, fi, pl, pt, ro, ru, sk.
+*** documentation:
+- pwck(8): document -q option (based on Debian patch for fix http://bugs.debian.org/309408)
+- pwck(8): rewrited OPTIONS section and better SYNOPSIS,
+- lastlog(8): document that lastlog is a sparse file, and don't need to be rotated
+  http://bugs.debian.org/219321
+- login(8): better explain the respective roles of login, init and getty with regards
+  to the utmp file (based on 441_manpages-shadow.5 Debian patch),
+- shadowconfig(8): removed (will be maintained in Debian shadow pkg repository),
+- groupadd(8): document -o option,
+- in SEE ALLSO section in groupadd(8), groupdel(8), groupmod(8), userdel(8), usermod(8)
+  added refer to gpasswd(8) (suggested by Mike Frysinger <vapier@gentoo.org>).
 
 shadow-4.0.9 -> shadow-4.0.10						28-06-2005
 
@@ -30,7 +77,7 @@ shadow-4.0.9 -> shadow-4.0.10						28-06-2005
   when it should have used pam_user) http://bugs.debian.org/47819
 - remove using SHADOWPWD #define so now shadow is allways builded with shadow
   passwowd support,
-- chage: rewrite for use getopt_long(),
+- chage: rewrited for use getopt_long(),
 - updated translations: ca, cs, da, fi, pl, ru, zh_TW.
 *** documentation:
 - most of the man pages now are generated from XML files so in case submiting any
@@ -104,7 +151,7 @@ shadow-4.0.7 -> shadow-4.0.8						26-04-2005
 - newgrp(1): fix #251926, #166173, #113191 Debian bugs: explain why editing /etc/group   
   (without gshadow) doesn't permit to use newgrp,
 - newgrp(1): newgrp uses /bin/sh (not bash),
-- faillog(8): updated after rewrite faillog command for use getopt_long(),
+- faillog(8): updated after rewrited faillog command for use getopt_long(),
 - login(1): removed fragment about abilities pass enviroment variables in login prompt,
 - gshadow(5): new file (by Nicolas Nicolas François <nicolas.francois@centraliens.net>),
 - usermod(8): fixed #302388 Debian bug: added separated -o option description,
diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644
index ed18b417..00000000
--- a/acconfig.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* $Id: acconfig.h,v 1.23 2005/06/16 18:39:30 kloczek Exp $ */
-
-
-
-/* Path for faillog file.  */
-#undef FAILLOG_FILE
-
-/* Defined if you have libcrack.  */
-#undef HAVE_LIBCRACK
-
-/* Defined if you have the ts&szs cracklib.  */
-#undef HAVE_LIBCRACK_HIST
-
-/* Defined if it includes *Pw functions.  */
-#undef HAVE_LIBCRACK_PW
-
-/* Defined if you have libcrypt.  */
-#undef HAVE_LIBCRYPT
-
-/* Define if struct lastlog has ll_host */
-#undef HAVE_LL_HOST
-
-/* Working shadow group support in libc?  */
-#undef HAVE_SHADOWGRP
-
-/* Path for lastlog file.  */
-#undef LASTLOG_FILE
-
-/* Define to support /etc/login.access login access control.  */
-#undef LOGIN_ACCESS
-
-/* Location of system mail spool directory.  */
-#undef MAIL_SPOOL_DIR
-
-/* Name of user's mail spool file if stored in user's home directory.  */
-#undef MAIL_SPOOL_FILE
-
-/* Path to passwd program.  */
-#undef PASSWD_PROGRAM
-
-/* Define if login should support the -r flag for rlogind.  */
-#undef RLOGIN
-
-/* Define to the ruserok() "success" return value (0 or 1).  */
-#undef RUSEROK
-
-/* Define to support the shadow group file.  */
-#undef SHADOWGRP
-
-/* Define to support S/Key logins.  */
-#undef SKEY
-
-/* Define to support /etc/suauth su access control.  */
-#undef SU_ACCESS
-
-/* Define to use syslog().  */
-#undef USE_SYSLOG
-
-/* Define to support USG (Unix Systems Group?) behavior. */
-#undef USG
-
-/* Define if you have ut_host in struct utmp.  */
-#undef UT_HOST
-
-/* Path for utmp file.  */
-#undef _UTMP_FILE
-
-/* Path for wtmp file.  */
-#undef _WTMP_FILE
-
-/* Define to libshadow_getpass to use our own version of getpass().  */
-#undef getpass
-
-/* Define to ut_name if struct utmp has ut_name (not ut_user).  */
-#undef ut_user
diff --git a/config.h.in b/config.h.in
index 1865a3b9..70fb75e4 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,84 +1,12 @@
 /* config.h.in.  Generated from configure.in by autoheader.  */
-/* $Id: acconfig.h,v 1.23 2005/06/16 18:39:30 kloczek Exp $ */
-
-
-
-/* Path for faillog file.  */
-#undef FAILLOG_FILE
-
-/* Defined if you have libcrack.  */
-#undef HAVE_LIBCRACK
-
-/* Defined if you have the ts&szs cracklib.  */
-#undef HAVE_LIBCRACK_HIST
-
-/* Defined if it includes *Pw functions.  */
-#undef HAVE_LIBCRACK_PW
-
-/* Defined if you have libcrypt.  */
-#undef HAVE_LIBCRYPT
-
-/* Define if struct lastlog has ll_host */
-#undef HAVE_LL_HOST
-
-/* Working shadow group support in libc?  */
-#undef HAVE_SHADOWGRP
-
-/* Path for lastlog file.  */
-#undef LASTLOG_FILE
-
-/* Define to support /etc/login.access login access control.  */
-#undef LOGIN_ACCESS
-
-/* Location of system mail spool directory.  */
-#undef MAIL_SPOOL_DIR
-
-/* Name of user's mail spool file if stored in user's home directory.  */
-#undef MAIL_SPOOL_FILE
-
-/* Path to passwd program.  */
-#undef PASSWD_PROGRAM
-
-/* Define if login should support the -r flag for rlogind.  */
-#undef RLOGIN
-
-/* Define to the ruserok() "success" return value (0 or 1).  */
-#undef RUSEROK
-
-/* Define to support the shadow group file.  */
-#undef SHADOWGRP
-
-/* Define to support S/Key logins.  */
-#undef SKEY
-
-/* Define to support /etc/suauth su access control.  */
-#undef SU_ACCESS
-
-/* Define to use syslog().  */
-#undef USE_SYSLOG
-
-/* Define to support USG (Unix Systems Group?) behavior. */
-#undef USG
-
-/* Define if you have ut_host in struct utmp.  */
-#undef UT_HOST
-
-/* Path for utmp file.  */
-#undef _UTMP_FILE
-
-/* Path for wtmp file.  */
-#undef _WTMP_FILE
-
-/* Define to libshadow_getpass to use our own version of getpass().  */
-#undef getpass
-
-/* Define to ut_name if struct utmp has ut_name (not ut_user).  */
-#undef ut_user
 
 /* Define to 1 if translation of program messages to the user's native
    language is requested. */
 #undef ENABLE_NLS
 
+/* Path for faillog file. */
+#undef FAILLOG_FILE
+
 /* Define to the type of elements in the array set by `getgroups'. Usually
    this is either `int' or `gid_t'. */
 #undef GETGROUPS_T
@@ -162,9 +90,21 @@
 /* Define to 1 if you have the `lckpwdf' function. */
 #undef HAVE_LCKPWDF
 
+/* Defined if you have libcrack. */
+#undef HAVE_LIBCRACK
+
+/* Defined if you have the ts&szs cracklib. */
+#undef HAVE_LIBCRACK_HIST
+
+/* Defined if it includes *Pw functions. */
+#undef HAVE_LIBCRACK_PW
+
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
 
+/* Define if struct lastlog has ll_host */
+#undef HAVE_LL_HOST
+
 /* Define to 1 if you have the <locale.h> header file. */
 #undef HAVE_LOCALE_H
 
@@ -225,6 +165,9 @@
 /* Define to 1 if you have the <sgtty.h> header file. */
 #undef HAVE_SGTTY_H
 
+/* Have working shadow group support in libc */
+#undef HAVE_SHADOWGRP
+
 /* Define to 1 if you have the <shadow.h> header file. */
 #undef HAVE_SHADOW_H
 
@@ -326,6 +269,15 @@
 /* Define to 1 if you have the <utmp.h> header file. */
 #undef HAVE_UTMP_H
 
+/* Path for lastlog file. */
+#undef LASTLOG_FILE
+
+/* Location of system mail spool directory. */
+#undef MAIL_SPOOL_DIR
+
+/* Name of user's mail spool file if stored in user's home directory. */
+#undef MAIL_SPOOL_FILE
+
 /* Name of package */
 #undef PACKAGE
 
@@ -344,21 +296,39 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* Path to passwd program. */
+#undef PASSWD_PROGRAM
+
 /* Define to 1 if the C compiler supports function prototypes. */
 #undef PROTOTYPES
 
 /* Define as the return type of signal handlers (`int' or `void'). */
 #undef RETSIGTYPE
 
+/* Define if login should support the -r flag for rlogind. */
+#undef RLOGIN
+
+/* Define to the ruserok() "success" return value (0 or 1). */
+#undef RUSEROK
+
 /* Define to 1 if the `setpgrp' function takes no argument. */
 #undef SETPGRP_VOID
 
+/* Define to support the shadow group file. */
+#undef SHADOWGRP
+
+/* Define to support S/Key logins. */
+#undef SKEY
+
 /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
 #undef STAT_MACROS_BROKEN
 
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
+/* Define to support /etc/suauth su access control. */
+#undef SU_ACCESS
+
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #undef TIME_WITH_SYS_TIME
 
@@ -368,6 +338,12 @@
 /* Define to support Pluggable Authentication Modules */
 #undef USE_PAM
 
+/* Define to use syslog(). */
+#undef USE_SYSLOG
+
+/* Define if you have ut_host in struct utmp. */
+#undef UT_HOST
+
 /* Version number of package */
 #undef VERSION
 
@@ -385,12 +361,21 @@
 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
 
+/* Path for utmp file. */
+#undef _UTMP_FILE
+
+/* Path for wtmp file. */
+#undef _WTMP_FILE
+
 /* Define like PROTOTYPES; this can be used by system headers. */
 #undef __PROTOTYPES
 
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
+/* Define to libshadow_getpass to use our own version of getpass(). */
+#undef getpass
+
 /* Define to `int' if <sys/types.h> doesn't define. */
 #undef gid_t
 
@@ -405,3 +390,6 @@
 
 /* Define to `int' if <sys/types.h> doesn't define. */
 #undef uid_t
+
+/* Define to ut_name if struct utmp has ut_name (not ut_user). */
+#undef ut_user
diff --git a/configure b/configure
index 9cdcaec6..93cddbd3 100755
--- a/configure
+++ b/configure
@@ -462,7 +462,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S YACC CPP EGREP U ANSI2KNR build build_cpu build_vendor build_os host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS LIBCRYPT LIBCRACK LIBSELINUX LIBPAM MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S YACC CPP EGREP U ANSI2KNR build build_cpu build_vendor build_os host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS LIBCRYPT LIBCRACK LIBSELINUX LIBPAM LIBSKEY LIBMD MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1047,9 +1047,9 @@ Optional Packages:
   --with-tags[=TAGS]
                           include additional configurations [automatic]
   --with-libcrack	try to use libcrack (default if found)
-  --with-libcrypt	try to use libcrypt (default if found)
   --with-libpam 		use libpam for PAM support
   --with-selinux		use SELinux support
+  --with-skey		use S/Key support
   --with-gnu-ld           assume the C compiler uses GNU ld default=no
   --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
@@ -1815,7 +1815,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=shadow
- VERSION=4.0.10
+ VERSION=4.0.11
 
 
 cat >>confdefs.h <<_ACEOF
@@ -21954,7 +21954,8 @@ echo "$as_me:$LINENO: result: $ac_cv_struct_utmp_ut_host" >&5
 echo "${ECHO_T}$ac_cv_struct_utmp_ut_host" >&6
 
 	if test "$ac_cv_struct_utmp_ut_host" = "yes"; then
-		cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define UT_HOST 1
 _ACEOF
 
@@ -22018,7 +22019,8 @@ echo "$as_me:$LINENO: result: $ac_cv_struct_utmp_ut_user" >&5
 echo "${ECHO_T}$ac_cv_struct_utmp_ut_user" >&6
 
 	if test "$ac_cv_struct_utmp_ut_user" = "no"; then
-		cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define ut_user ut_name
 _ACEOF
 
@@ -22084,7 +22086,8 @@ echo "$as_me:$LINENO: result: $ac_cv_struct_lastlog_ll_host" >&5
 echo "${ECHO_T}$ac_cv_struct_lastlog_ll_host" >&6
 
 	if test "$ac_cv_struct_lastlog_ll_host" = "yes"; then
-		cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_LL_HOST 1
 _ACEOF
 
@@ -22993,7 +22996,7 @@ fi
 
 
 if test "$ac_cv_header_shadow_h" = "yes"; then
-echo "$as_me:$LINENO: checking for working shadow group support" >&5
+	echo "$as_me:$LINENO: checking for working shadow group support" >&5
 echo $ECHO_N "checking for working shadow group support... $ECHO_C" >&6
 if test "${ac_cv_libc_shadowgrp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23009,13 +23012,13 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-			#include <shadow.h>
-			main()
-			{
-				struct sgrp *sg = sgetsgent("test:x::");
-				/* NYS libc on Red Hat 3.0.3 has broken shadow group support */
-				return !sg || !sg->sg_adm || !sg->sg_mem;
-			}
+				#include <shadow.h>
+				main()
+				{
+					struct sgrp *sg = sgetsgent("test:x::");
+					/* NYS libc on Red Hat 3.0.3 has broken shadow group support */
+					return !sg || !sg->sg_adm || !sg->sg_mem;
+				}
 
 _ACEOF
 rm -f conftest$ac_exeext
@@ -23045,12 +23048,13 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_libc_shadowgrp" >&5
 echo "${ECHO_T}$ac_cv_libc_shadowgrp" >&6
 
-if test "$ac_cv_libc_shadowgrp" = "yes"; then
-	cat >>confdefs.h <<\_ACEOF
+	if test "$ac_cv_libc_shadowgrp" = "yes"; then
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_SHADOWGRP 1
 _ACEOF
 
-fi
+	fi
 fi
 
 echo "$as_me:$LINENO: checking location of shared mail directory" >&5
@@ -23067,7 +23071,8 @@ fi
 echo "$as_me:$LINENO: result: $shadow_cv_maildir" >&5
 echo "${ECHO_T}$shadow_cv_maildir" >&6
 if test $shadow_cv_maildir != none; then
-	cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<_ACEOF
 #define MAIL_SPOOL_DIR "$shadow_cv_maildir"
 _ACEOF
 
@@ -23087,7 +23092,8 @@ fi
 echo "$as_me:$LINENO: result: $shadow_cv_mailfile" >&5
 echo "${ECHO_T}$shadow_cv_mailfile" >&6
 if test $shadow_cv_mailfile != none; then
-	cat >>confdefs.h <<_ACEOF
+
+cat >>confdefs.h <<_ACEOF
 #define MAIL_SPOOL_FILE "$shadow_cv_mailfile"
 _ACEOF
 
@@ -23110,6 +23116,7 @@ if test "$shadow_cv_utmpdir" = "none"; then
 	{ echo "$as_me:$LINENO: WARNING: utmp file not found" >&5
 echo "$as_me: WARNING: utmp file not found" >&2;}
 fi
+
 cat >>confdefs.h <<_ACEOF
 #define _UTMP_FILE "$shadow_cv_utmpdir/utmp"
 _ACEOF
@@ -23128,14 +23135,17 @@ done
 fi
 echo "$as_me:$LINENO: result: $shadow_cv_logdir" >&5
 echo "${ECHO_T}$shadow_cv_logdir" >&6
+
 cat >>confdefs.h <<_ACEOF
 #define _WTMP_FILE "$shadow_cv_logdir/wtmp"
 _ACEOF
 
+
 cat >>confdefs.h <<_ACEOF
 #define LASTLOG_FILE "$shadow_cv_logdir/lastlog"
 _ACEOF
 
+
 cat >>confdefs.h <<_ACEOF
 #define FAILLOG_FILE "$shadow_cv_logdir/faillog"
 _ACEOF
@@ -23154,28 +23164,29 @@ fi
 fi
 echo "$as_me:$LINENO: result: $shadow_cv_passwd_dir" >&5
 echo "${ECHO_T}$shadow_cv_passwd_dir" >&6
+
 cat >>confdefs.h <<_ACEOF
 #define PASSWD_PROGRAM "$shadow_cv_passwd_dir/passwd"
 _ACEOF
 
 
-cat >>confdefs.h <<\_ACEOF
-#define USG 1
-_ACEOF
 
 cat >>confdefs.h <<\_ACEOF
 #define USE_SYSLOG 1
 _ACEOF
 
+
 cat >>confdefs.h <<\_ACEOF
 #define RLOGIN 1
 _ACEOF
 
+
 cat >>confdefs.h <<\_ACEOF
 #define RUSEROK 0
 _ACEOF
 
 
+
 cat >>confdefs.h <<\_ACEOF
 #define getpass libshadow_getpass
 _ACEOF
@@ -23194,12 +23205,6 @@ if test "${with_libcrack+set}" = set; then
 
 fi;
 
-# Check whether --with-libcrypt or --without-libcrypt was given.
-if test "${with_libcrypt+set}" = set; then
-  withval="$with_libcrypt"
-
-fi;
-
 # Check whether --with-libpam or --without-libpam was given.
 if test "${with_libpam+set}" = set; then
   withval="$with_libpam"
@@ -23212,6 +23217,12 @@ if test "${with_selinux+set}" = set; then
 
 fi;
 
+# Check whether --with-skey or --without-skey was given.
+if test "${with_skey+set}" = set; then
+  withval="$with_skey"
+
+fi;
+
 
 echo "$as_me:$LINENO: checking for library containing inet_ntoa" >&5
 echo $ECHO_N "checking for library containing inet_ntoa... $ECHO_C" >&6
@@ -23592,16 +23603,16 @@ if test "$ac_cv_search_gethostbyname" != no; then
 fi
 
 
-if test "$enable_shadowgrp" != "no"; then
-	cat >>confdefs.h <<\_ACEOF
+if test "$enable_shadowgrp" = "yes"; then
+
+cat >>confdefs.h <<\_ACEOF
 #define SHADOWGRP 1
 _ACEOF
 
 fi
 
 
-if test "$with_libcrypt" != "no"; then
-	echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
+echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
 echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
 if test "${ac_cv_lib_crypt_crypt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23666,16 +23677,16 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
 echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
 if test $ac_cv_lib_crypt_crypt = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBCRYPT 1
-_ACEOF
- LIBCRYPT=-lcrypt
-fi
-
+  LIBCRYPT=-lcrypt
+else
+  { { echo "$as_me:$LINENO: error: crypt() not found" >&5
+echo "$as_me: error: crypt() not found" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
-if test "$with_libcrack" != "no"; then
+
+if test "$with_libcrack" = "yes"; then
 	echo "checking cracklib flavour, don't be surprised by the results"
 	echo "$as_me:$LINENO: checking for FascistCheck in -lcrack" >&5
 echo $ECHO_N "checking for FascistCheck in -lcrack... $ECHO_C" >&6
@@ -23742,10 +23753,11 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_crack_FascistCheck" >&5
 echo "${ECHO_T}$ac_cv_lib_crack_FascistCheck" >&6
 if test $ac_cv_lib_crack_FascistCheck = yes; then
-  cat >>confdefs.h <<\_ACEOF
+  LIBCRACK=-lcrack
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_LIBCRACK 1
 _ACEOF
- LIBCRACK=-lcrack
+
 fi
 
 	echo "$as_me:$LINENO: checking for FascistHistory in -lcrack" >&5
@@ -23813,7 +23825,8 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_crack_FascistHistory" >&5
 echo "${ECHO_T}$ac_cv_lib_crack_FascistHistory" >&6
 if test $ac_cv_lib_crack_FascistHistory = yes; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_LIBCRACK_HIST 1
 _ACEOF
 
@@ -23884,7 +23897,8 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_crack_FascistHistoryPw" >&5
 echo "${ECHO_T}$ac_cv_lib_crack_FascistHistoryPw" >&6
 if test $ac_cv_lib_crack_FascistHistoryPw = yes; then
-  cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_LIBCRACK_PW 1
 _ACEOF
 
@@ -24278,7 +24292,8 @@ echo "${ECHO_T}no" >&6
 else
 	echo "$as_me:$LINENO: checking use login and su access checking if PAM not used" >&5
 echo $ECHO_N "checking use login and su access checking if PAM not used... $ECHO_C" >&6
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define SU_ACCESS 1
 _ACEOF
 
@@ -24288,6 +24303,156 @@ fi
 
 
 
+if test "$with_libskey" = "yes"; then
+	echo "$as_me:$LINENO: checking for MD5Init in -lmd" >&5
+echo $ECHO_N "checking for MD5Init in -lmd... $ECHO_C" >&6
+if test "${ac_cv_lib_md_MD5Init+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lmd  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char MD5Init ();
+int
+main ()
+{
+MD5Init ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_md_MD5Init=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_md_MD5Init=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_md_MD5Init" >&5
+echo "${ECHO_T}$ac_cv_lib_md_MD5Init" >&6
+if test $ac_cv_lib_md_MD5Init = yes; then
+  LIBMD=-lmd
+fi
+
+	echo "$as_me:$LINENO: checking for skeychallenge in -lskey" >&5
+echo $ECHO_N "checking for skeychallenge in -lskey... $ECHO_C" >&6
+if test "${ac_cv_lib_skey_skeychallenge+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lskey  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char skeychallenge ();
+int
+main ()
+{
+skeychallenge ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_skey_skeychallenge=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_skey_skeychallenge=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_skey_skeychallenge" >&5
+echo "${ECHO_T}$ac_cv_lib_skey_skeychallenge" >&6
+if test $ac_cv_lib_skey_skeychallenge = yes; then
+  LIBSKEY=-lskey
+else
+  { { echo "$as_me:$LINENO: error: liskey missing. You can download S/Key source code from http://rsync1.it.gentoo.org/gentoo/distfiles/skey-1.1.5.tar.bz2" >&5
+echo "$as_me: error: liskey missing. You can download S/Key source code from http://rsync1.it.gentoo.org/gentoo/distfiles/skey-1.1.5.tar.bz2" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+cat >>confdefs.h <<\_ACEOF
+#define SKEY 1
+_ACEOF
+
+fi
+
+
+
 
         MKINSTALLDIRS=
   if test -n "$ac_aux_dir"; then
@@ -26930,6 +27095,8 @@ s,@LIBCRYPT@,$LIBCRYPT,;t t
 s,@LIBCRACK@,$LIBCRACK,;t t
 s,@LIBSELINUX@,$LIBSELINUX,;t t
 s,@LIBPAM@,$LIBPAM,;t t
+s,@LIBSKEY@,$LIBSKEY,;t t
+s,@LIBMD@,$LIBMD,;t t
 s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
 s,@USE_NLS@,$USE_NLS,;t t
 s,@MSGFMT@,$MSGFMT,;t t
diff --git a/configure.in b/configure.in
index fe98d846..06ec6c93 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT
-AM_INIT_AUTOMAKE(shadow, 4.0.10)
+AM_INIT_AUTOMAKE(shadow, 4.0.11)
 AC_CONFIG_HEADERS([config.h])
 
 dnl Some hacks...
@@ -63,7 +63,7 @@ if test "$ac_cv_header_utmp_h" = "yes"; then
 	)
 
 	if test "$ac_cv_struct_utmp_ut_host" = "yes"; then
-		AC_DEFINE(UT_HOST)
+		AC_DEFINE(UT_HOST, 1, [Define if you have ut_host in struct utmp.])
 	fi
 
 	AC_CACHE_CHECK(for ut_user in struct utmp,
@@ -77,7 +77,8 @@ if test "$ac_cv_header_utmp_h" = "yes"; then
 	)
 
 	if test "$ac_cv_struct_utmp_ut_user" = "no"; then
-		AC_DEFINE(ut_user, ut_name)
+		AC_DEFINE(ut_user, ut_name,
+			[Define to ut_name if struct utmp has ut_name (not ut_user).])
 	fi
 fi
 
@@ -93,7 +94,8 @@ if test "$ac_cv_header_lastlog_h" = "yes"; then
 	)
 
 	if test "$ac_cv_struct_lastlog_ll_host" = "yes"; then
-		AC_DEFINE(HAVE_LL_HOST)
+		AC_DEFINE(HAVE_LL_HOST, 1,
+			[Define if struct lastlog has ll_host])
 	fi
 fi
 
@@ -110,26 +112,26 @@ AC_CHECK_FUNC(setpgrp)
 AC_FUNC_SETPGRP
 
 if test "$ac_cv_header_shadow_h" = "yes"; then
-AC_CACHE_CHECK(for working shadow group support,
-	ac_cv_libc_shadowgrp,
-	AC_RUN_IFELSE([AC_LANG_SOURCE([
-			#include <shadow.h>
-			main()
-			{
-				struct sgrp *sg = sgetsgent("test:x::");
-				/* NYS libc on Red Hat 3.0.3 has broken shadow group support */
-				return !sg || !sg->sg_adm || !sg->sg_mem;
-			}]
-		)],
-		[ac_cv_libc_shadowgrp=yes],
-		[ac_cv_libc_shadowgrp=no],
-		[ac_cv_libc_shadowgrp=no]
+	AC_CACHE_CHECK(for working shadow group support,
+		ac_cv_libc_shadowgrp,
+		AC_RUN_IFELSE([AC_LANG_SOURCE([
+				#include <shadow.h>
+				main()
+				{
+					struct sgrp *sg = sgetsgent("test:x::");
+					/* NYS libc on Red Hat 3.0.3 has broken shadow group support */
+					return !sg || !sg->sg_adm || !sg->sg_mem;
+				}]
+			)],
+			[ac_cv_libc_shadowgrp=yes],
+			[ac_cv_libc_shadowgrp=no],
+			[ac_cv_libc_shadowgrp=no]
+		)
 	)
-)
 
-if test "$ac_cv_libc_shadowgrp" = "yes"; then
-	AC_DEFINE(HAVE_SHADOWGRP)
-fi
+	if test "$ac_cv_libc_shadowgrp" = "yes"; then
+		AC_DEFINE(HAVE_SHADOWGRP, 1, [Have working shadow group support in libc])
+	fi
 fi
 
 AC_CACHE_CHECK([location of shared mail directory], shadow_cv_maildir,
@@ -139,7 +141,8 @@ AC_CACHE_CHECK([location of shared mail directory], shadow_cv_maildir,
 	fi
 done])
 if test $shadow_cv_maildir != none; then
-	AC_DEFINE_UNQUOTED(MAIL_SPOOL_DIR, "$shadow_cv_maildir")
+	AC_DEFINE_UNQUOTED(MAIL_SPOOL_DIR, "$shadow_cv_maildir",
+		[Location of system mail spool directory.])
 fi
 
 AC_CACHE_CHECK([location of user mail file], shadow_cv_mailfile,
@@ -149,7 +152,8 @@ AC_CACHE_CHECK([location of user mail file], shadow_cv_mailfile,
 	fi
 done])
 if test $shadow_cv_mailfile != none; then
-	AC_DEFINE_UNQUOTED(MAIL_SPOOL_FILE, "$shadow_cv_mailfile")
+	AC_DEFINE_UNQUOTED(MAIL_SPOOL_FILE, "$shadow_cv_mailfile",
+		[Name of user's mail spool file if stored in user's home directory.])
 fi
 
 AC_CACHE_CHECK([location of utmp], shadow_cv_utmpdir,
@@ -161,7 +165,8 @@ done])
 if test "$shadow_cv_utmpdir" = "none"; then
 	AC_MSG_WARN(utmp file not found)
 fi
-AC_DEFINE_UNQUOTED(_UTMP_FILE, "$shadow_cv_utmpdir/utmp")
+AC_DEFINE_UNQUOTED(_UTMP_FILE, "$shadow_cv_utmpdir/utmp",
+	[Path for utmp file.])
 
 AC_CACHE_CHECK([location of faillog/lastlog/wtmp], shadow_cv_logdir,
 [for shadow_cv_logdir in /var/log /var/adm /usr/adm /etc; do
@@ -169,9 +174,12 @@ AC_CACHE_CHECK([location of faillog/lastlog/wtmp], shadow_cv_logdir,
 		break
 	fi
 done])
-AC_DEFINE_UNQUOTED(_WTMP_FILE, "$shadow_cv_logdir/wtmp")
-AC_DEFINE_UNQUOTED(LASTLOG_FILE, "$shadow_cv_logdir/lastlog")
-AC_DEFINE_UNQUOTED(FAILLOG_FILE, "$shadow_cv_logdir/faillog")
+AC_DEFINE_UNQUOTED(_WTMP_FILE, "$shadow_cv_logdir/wtmp",
+	[Path for wtmp file.])
+AC_DEFINE_UNQUOTED(LASTLOG_FILE, "$shadow_cv_logdir/lastlog",
+	[Path for lastlog file.])
+AC_DEFINE_UNQUOTED(FAILLOG_FILE, "$shadow_cv_logdir/faillog",
+	[Path for faillog file.])
 
 AC_CACHE_CHECK([location of the passwd program], shadow_cv_passwd_dir,
 [if test -f /usr/bin/passwd; then
@@ -179,25 +187,26 @@ AC_CACHE_CHECK([location of the passwd program], shadow_cv_passwd_dir,
 else
 	shadow_cv_passwd_dir=/bin
 fi])
-AC_DEFINE_UNQUOTED(PASSWD_PROGRAM, "$shadow_cv_passwd_dir/passwd")
+AC_DEFINE_UNQUOTED(PASSWD_PROGRAM, "$shadow_cv_passwd_dir/passwd",
+	[Path to passwd program.])
 
 dnl XXX - quick hack, should disappear before anyone notices :).
-AC_DEFINE(USG)
-AC_DEFINE(USE_SYSLOG)
-AC_DEFINE(RLOGIN)
-AC_DEFINE(RUSEROK, 0)
+AC_DEFINE(USE_SYSLOG, 1, [Define to use syslog().])
+AC_DEFINE(RLOGIN, 1, [Define if login should support the -r flag for rlogind.])
+AC_DEFINE(RUSEROK, 0, [Define to the ruserok() "success" return value (0 or 1).])
 
 dnl Use our own version of getpass(), which handles long passwords
 dnl (unlike many systems which have a limit of 8 characters), and can
 dnl be interrupted with Ctrl-C (unlike Linux libc).
-AC_DEFINE(getpass, libshadow_getpass)
+AC_DEFINE(getpass, libshadow_getpass,
+	[Define to libshadow_getpass to use our own version of getpass().])
 
 AC_ARG_ENABLE(shadowgrp, [  --enable-shadowgrp      enable shadow group support [default=yes]])
 
 AC_ARG_WITH(libcrack, [  --with-libcrack	try to use libcrack (default if found)])
-AC_ARG_WITH(libcrypt, [  --with-libcrypt	try to use libcrypt (default if found)])
 AC_ARG_WITH(libpam,   [  --with-libpam 		use libpam for PAM support])
 AC_ARG_WITH(selinux,  [  --with-selinux		use SELinux support])
+AC_ARG_WITH(skey,     [  --with-skey		use S/Key support])
 
 dnl Check for some functions in libc first, only if not found check for
 dnl other libraries.  This should prevent linking libnsl if not really
@@ -207,21 +216,23 @@ AC_SEARCH_LIBS(inet_ntoa, inet)
 AC_SEARCH_LIBS(socket, socket)
 AC_SEARCH_LIBS(gethostbyname, nsl)
 
-if test "$enable_shadowgrp" != "no"; then
-	AC_DEFINE(SHADOWGRP)
+if test "$enable_shadowgrp" = "yes"; then
+	AC_DEFINE(SHADOWGRP, 1, [Define to support the shadow group file.])
 fi
 
 AC_SUBST(LIBCRYPT)
-if test "$with_libcrypt" != "no"; then
-	AC_CHECK_LIB(crypt, crypt, [AC_DEFINE(HAVE_LIBCRYPT) LIBCRYPT=-lcrypt])
-fi
+AC_CHECK_LIB(crypt, crypt, [LIBCRYPT=-lcrypt],
+	[AC_MSG_ERROR([crypt() not found])])
 
 AC_SUBST(LIBCRACK)
-if test "$with_libcrack" != "no"; then
+if test "$with_libcrack" = "yes"; then
 	echo "checking cracklib flavour, don't be surprised by the results"
-	AC_CHECK_LIB(crack, FascistCheck, AC_DEFINE(HAVE_LIBCRACK) LIBCRACK=-lcrack)
-	AC_CHECK_LIB(crack, FascistHistory, AC_DEFINE(HAVE_LIBCRACK_HIST))
-	AC_CHECK_LIB(crack, FascistHistoryPw, AC_DEFINE(HAVE_LIBCRACK_PW))
+	AC_CHECK_LIB(crack, FascistCheck,
+		[LIBCRACK=-lcrack AC_DEFINE(HAVE_LIBCRACK, 1, [Defined if you have libcrack.])])
+	AC_CHECK_LIB(crack, FascistHistory,
+		AC_DEFINE(HAVE_LIBCRACK_HIST, 1, [Defined if you have the ts&szs cracklib.]))
+	AC_CHECK_LIB(crack, FascistHistoryPw,
+		AC_DEFINE(HAVE_LIBCRACK_PW, 1, [Defined if it includes *Pw functions.]))
 fi
 
 if test "$with_selinux" = "yes"; then
@@ -247,10 +258,19 @@ if test "$with_libpam" = "yes"; then
 	AC_MSG_RESULT(no)
 else
 	AC_MSG_CHECKING(use login and su access checking if PAM not used)
-	AC_DEFINE(SU_ACCESS)
+	AC_DEFINE(SU_ACCESS, 1, [Define to support /etc/suauth su access control.])
 	AC_MSG_RESULT(yes)
 fi
 
+AC_SUBST(LIBSKEY)
+AC_SUBST(LIBMD)
+if test "$with_libskey" = "yes"; then
+	AC_CHECK_LIB(md, MD5Init, [LIBMD=-lmd])
+	AC_CHECK_LIB(skey, skeychallenge, [LIBSKEY=-lskey],
+		[AC_MSG_ERROR([liskey missing. You can download S/Key source code from http://rsync1.it.gentoo.org/gentoo/distfiles/skey-1.1.5.tar.bz2])])
+	AC_DEFINE(SKEY, 1, [Define to support S/Key logins.])
+fi
+
 AM_GNU_GETTEXT_VERSION(0.12.1)
 AM_GNU_GETTEXT([external])
 
diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index ee272680..122ebac5 100644
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -91,10 +91,12 @@ LIBCRACK = @LIBCRACK@
 LIBCRYPT = @LIBCRYPT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBMD = @LIBMD@
 LIBOBJS = @LIBOBJS@
 LIBPAM = @LIBPAM@
 LIBS = @LIBS@
 LIBSELINUX = @LIBSELINUX@
+LIBSKEY = @LIBSKEY@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
diff --git a/doc/Makefile.in b/doc/Makefile.in
index a8757331..fc8b52dc 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -91,10 +91,12 @@ LIBCRACK = @LIBCRACK@
 LIBCRYPT = @LIBCRYPT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBMD = @LIBMD@
 LIBOBJS = @LIBOBJS@
 LIBPAM = @LIBPAM@
 LIBS = @LIBS@
 LIBSELINUX = @LIBSELINUX@
+LIBSKEY = @LIBSKEY@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
diff --git a/etc/Makefile.in b/etc/Makefile.in
index 7ae93169..ed9f3443 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -100,10 +100,12 @@ LIBCRACK = @LIBCRACK@
 LIBCRYPT = @LIBCRYPT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBMD = @LIBMD@
 LIBOBJS = @LIBOBJS@
 LIBPAM = @LIBPAM@
 LIBS = @LIBS@
 LIBSELINUX = @LIBSELINUX@
+LIBSKEY = @LIBSKEY@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
diff --git a/etc/pam.d/Makefile.in b/etc/pam.d/Makefile.in
index b72a1bf2..7a98bb06 100644
--- a/etc/pam.d/Makefile.in
+++ b/etc/pam.d/Makefile.in
@@ -91,10 +91,12 @@ LIBCRACK = @LIBCRACK@
 LIBCRYPT = @LIBCRYPT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBMD = @LIBMD@
 LIBOBJS = @LIBOBJS@
 LIBPAM = @LIBPAM@
 LIBS = @LIBS@
 LIBSELINUX = @LIBSELINUX@
+LIBSKEY = @LIBSKEY@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5a5b6dc3..f224b478 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -6,7 +6,7 @@ DEFS =
 lib_LTLIBRARIES = libshadow.la
 
 libshadow_la_LDFLAGS = -version-info 0:0:0
-libshadow_la_LIBADD = $(INTLLIBS) $(LIBCRYPT) $(LIBSELINUX)
+libshadow_la_LIBADD = $(INTLLIBS) $(LIBCRYPT) $(LIBSKEY) $(LIBMD) $(LIBSELINUX)
 
 libshadow_la_SOURCES = \
 	commonio.c \
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 1453db0f..6bf902cb 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -58,6 +58,7 @@ libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libshadow_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libshadow_la_OBJECTS = commonio.lo encrypt.lo fputsx.lo getdef.lo \
 	getpass.lo groupio.lo gshadow.lo lockpw.lo nscd.lo port.lo \
@@ -121,10 +122,12 @@ LIBCRACK = @LIBCRACK@
 LIBCRYPT = @LIBCRYPT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBMD = @LIBMD@
 LIBOBJS = @LIBOBJS@
 LIBPAM = @LIBPAM@
 LIBS = @LIBS@
 LIBSELINUX = @LIBSELINUX@
+LIBSKEY = @LIBSKEY@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
@@ -201,7 +204,7 @@ target_alias = @target_alias@
 AUTOMAKE_OPTIONS = 1.0 foreign
 lib_LTLIBRARIES = libshadow.la
 libshadow_la_LDFLAGS = -version-info 0:0:0
-libshadow_la_LIBADD = $(INTLLIBS) $(LIBCRYPT) $(LIBSELINUX)
+libshadow_la_LIBADD = $(INTLLIBS) $(LIBCRYPT) $(LIBSKEY) $(LIBMD) $(LIBSELINUX)
 libshadow_la_SOURCES = \
 	commonio.c \
 	commonio.h \
diff --git a/lib/getdef.c b/lib/getdef.c
index 94d2b4c2..edab1b5a 100644
--- a/lib/getdef.c
+++ b/lib/getdef.c
@@ -30,7 +30,7 @@
 #include <config.h>
 
 #include "rcsid.h"
-RCSID ("$Id: getdef.c,v 1.30 2005/05/25 19:31:50 kloczek Exp $")
+RCSID ("$Id: getdef.c,v 1.31 2005/07/12 18:54:39 kloczek Exp $")
 #include "prototypes.h"
 #include "defines.h"
 #include <stdio.h>
@@ -72,7 +72,6 @@ static struct itemdef def_table[] = {
 	{"LASTLOG_ENAB", NULL},
 	{"LOGIN_STRING", NULL},
 	{"MAIL_CHECK_ENAB", NULL},
-	{"MAIL_DIR", NULL},
 	{"MAIL_FILE", NULL},
 	{"MD5_CRYPT_ENAB", NULL},
 	{"MOTD_FILE", NULL},
@@ -88,8 +87,8 @@ static struct itemdef def_table[] = {
 	{"QUOTAS_ENAB", NULL},
 	{"ULIMIT", NULL},
 #endif
-	{"CONSOLE", NULL},
 	{"CONSOLE_GROUPS", NULL},
+	{"CONSOLE", NULL},
 	{"CREATE_HOME", NULL},
 	{"ERASECHAR", NULL},
 	{"FAKE_SHELL", NULL},
@@ -102,6 +101,7 @@ static struct itemdef def_table[] = {
 	{"LOGIN_TIMEOUT", NULL},
 	{"LOG_OK_LOGINS", NULL},
 	{"LOG_UNKFAIL_ENAB", NULL},
+	{"MAIL_DIR", NULL},
 	{"SULOG_FILE", NULL},
 	{"SU_NAME", NULL},
 #ifdef USE_SYSLOG
diff --git a/lib/nscd.c b/lib/nscd.c
index 69a4ba10..3a59299e 100644
--- a/lib/nscd.c
+++ b/lib/nscd.c
@@ -13,7 +13,8 @@
 /* Version number of the daemon interface */
 #define NSCD_VERSION 2
 /* Path for the Unix domain socket.  */
-#define _PATH_NSCDSOCKET "/var/run/.nscd_socket"
+#define _PATH_NSCDSOCKET "/var/run/nscd/socket"
+#define _PATH_NSCDSOCKET_OLD "/var/run/.nscd_socket"
 
 /* Available services.  */
 typedef enum {
@@ -57,8 +58,15 @@ static int nscd_open_socket (void)
 	assert (sizeof (addr.sun_path) >= sizeof (_PATH_NSCDSOCKET));
 	strcpy (addr.sun_path, _PATH_NSCDSOCKET);
 	if (connect (sock, (struct sockaddr *) &addr, sizeof (addr)) < 0) {
-		close (sock);
-		return -1;
+		addr.sun_family = AF_UNIX;
+		assert (sizeof (addr.sun_path) >=
+			sizeof (_PATH_NSCDSOCKET_OLD));
+		strcpy (addr.sun_path, _PATH_NSCDSOCKET_OLD);
+		if (connect (sock, (struct sockaddr *) &addr, sizeof (addr)) <
+		    0) {
+			close (sock);
+			return -1;
+		}
 	}
 
 	return sock;
@@ -71,6 +79,7 @@ int nscd_flush_cache (char *service)
 {
 	int sock = nscd_open_socket ();
 	request_header req;
+	struct iovec iov[2];
 	ssize_t nbytes;
 
 	if (sock == -1)
@@ -78,15 +87,15 @@ int nscd_flush_cache (char *service)
 
 	req.version = NSCD_VERSION;
 	req.type = INVALIDATE;
-	req.key_len = strlen (service) + 1;
-	nbytes = write (sock, &req, sizeof (request_header));
-	if (nbytes != sizeof (request_header)) {
-		close (sock);
-		return -1;
-	}
+	req.key_len = strlen (service);
 
-	nbytes = write (sock, (void *) service, req.key_len);
+	iov[0].iov_base = &req;
+	iov[0].iov_len = sizeof (req);
+	iov[1].iov_base = service;
+	iov[1].iov_len = req.key_len;
+
+	nbytes = writev (sock, iov, 2);
 
 	close (sock);
-	return (nbytes != req.key_len ? (-1) : 0);
+	return (nbytes != iov[0].iov_len + iov[1].iov_len ? (-1) : 0);
 }
diff --git a/lib/pwauth.c b/lib/pwauth.c
index 962e585b..e7b741a1 100644
--- a/lib/pwauth.c
+++ b/lib/pwauth.c
@@ -31,7 +31,7 @@
 
 #ifndef USE_PAM
 #include "rcsid.h"
-RCSID ("$Id: pwauth.c,v 1.17 2005/04/17 15:21:42 kloczek Exp $")
+RCSID ("$Id: pwauth.c,v 1.18 2005/07/07 18:53:14 kloczek Exp $")
 #include <sys/types.h>
 #include <signal.h>
 #include <fcntl.h>
@@ -41,6 +41,9 @@ RCSID ("$Id: pwauth.c,v 1.17 2005/04/17 15:21:42 kloczek Exp $")
 #include "defines.h"
 #include "pwauth.h"
 #include "getdef.h"
+#ifdef SKEY
+#include <skey.h>
+#endif
 #ifdef __linux__		/* standard password prompt by default */
 static const char *PROMPT = gettext_noop ("Password: ");
 #else
@@ -69,6 +72,12 @@ pw_auth (const char *cipher, const char *user, int reason, const char *input)
 	const char *cp;
 	int retval;
 
+#ifdef	SKEY
+	int use_skey = 0;
+	char challenge_info[40];
+	struct skey skey;
+#endif
+
 	/*
 	 * There are programs for adding and deleting authentication data.
 	 */
@@ -79,6 +88,7 @@ pw_auth (const char *cipher, const char *user, int reason, const char *input)
 	/*
 	 * There are even programs for changing the user name ...
 	 */
+
 	if (reason == PW_CHANGE && input != (char *) 0)
 		return 0;
 
@@ -90,6 +100,7 @@ pw_auth (const char *cipher, const char *user, int reason, const char *input)
 	 * know it.  This is a policy decision that might have to be
 	 * revisited.
 	 */
+
 	if (reason == PW_CHANGE && getuid () == 0)
 		return 0;
 
@@ -101,16 +112,34 @@ pw_auth (const char *cipher, const char *user, int reason, const char *input)
 	 * the user could just hit <ENTER>, so it doesn't really
 	 * matter.
 	 */
+
 	if (cipher == (char *) 0 || *cipher == '\0')
 		return 0;
 
+#ifdef	SKEY
+	/*
+	 * If the user has an S/KEY entry show them the pertinent info
+	 * and then we can try validating the created cyphertext and the SKEY.
+	 * If there is no SKEY information we default to not using SKEY.
+	 */
+
+	if (skeychallenge (&skey, user, challenge_info) == 0)
+		use_skey = 1;
+#endif
+
 	/*
 	 * Prompt for the password as required.  FTPD and REXECD both
 	 * get the cleartext password for us.
 	 */
+
 	if (reason != PW_FTP && reason != PW_REXEC && !input) {
 		if (!(cp = getdef_str ("LOGIN_STRING")))
 			cp = _(PROMPT);
+#ifdef	SKEY
+		if (use_skey)
+			printf ("[%s]\n", challenge_info);
+#endif
+
 		snprintf (prompt, sizeof prompt, cp, user);
 		clear = getpass (prompt);
 		if (!clear) {
@@ -125,16 +154,50 @@ pw_auth (const char *cipher, const char *user, int reason, const char *input)
 	/*
 	 * Convert the cleartext password into a ciphertext string.
 	 * If the two match, the return value will be zero, which is
-	 * SUCCESS.
+	 * SUCCESS. Otherwise we see if SKEY is being used and check
+	 * the results there as well.
 	 */
+
 	retval = strcmp (pw_encrypt (input, cipher), cipher);
 
+#ifdef  SKEY
+	/*
+	 * If (1) The password fails to match, and
+	 * (2) The password is empty and
+	 * (3) We are using OPIE or S/Key, then
+	 * ...Re-prompt, with echo on.
+	 * -- AR 8/22/1999
+	 */
+	if (retval && !input[0] && (use_skey)) {
+		strncat (prompt, "(Echo on) ",
+			 (sizeof (prompt) - strlen (prompt)));
+		clear = getpass_with_echo (prompt);
+		if (!clear) {
+			static char c[1];
+
+			c[0] = '\0';
+			clear = c;
+		}
+		input = clear;
+	}
+
+	if (retval && use_skey) {
+		int passcheck = -1;
+
+		if (skeyverify (&skey, input) == 0)
+			passcheck = skey.n;
+		if (passcheck > 0)
+			retval = 0;
+	}
+#endif
+
 	/*
 	 * Things like RADIUS authentication may need the password -
 	 * if the external variable wipe_clear_pass is zero, we will
 	 * not wipe it (the caller should wipe clear_pass when it is
 	 * no longer needed).  --marekm
 	 */
+
 	clear_pass = clear;
 	if (wipe_clear_pass && clear && *clear)
 		strzero (clear);
diff --git a/libmisc/Makefile.am b/libmisc/Makefile.am
index da994bde..f7ac91ea 100644
--- a/libmisc/Makefile.am
+++ b/libmisc/Makefile.am
@@ -11,7 +11,6 @@ libmisc_a_SOURCES = \
 	basename.c \
 	chkname.c \
 	chkname.h \
-	chkshell.c \
 	chowndir.c \
 	chowntty.c \
 	console.c \
diff --git a/libmisc/Makefile.in b/libmisc/Makefile.in
index 5f16d846..06dcb1ce 100644
--- a/libmisc/Makefile.in
+++ b/libmisc/Makefile.in
@@ -52,20 +52,19 @@ ARFLAGS = cru
 libmisc_a_AR = $(AR) $(ARFLAGS)
 libmisc_a_LIBADD =
 am_libmisc_a_OBJECTS = addgrps.$(OBJEXT) age.$(OBJEXT) \
-	basename.$(OBJEXT) chkname.$(OBJEXT) chkshell.$(OBJEXT) \
-	chowndir.$(OBJEXT) chowntty.$(OBJEXT) console.$(OBJEXT) \
-	copydir.$(OBJEXT) entry.$(OBJEXT) env.$(OBJEXT) \
-	failure.$(OBJEXT) fields.$(OBJEXT) getdate.$(OBJEXT) \
-	hushed.$(OBJEXT) isexpired.$(OBJEXT) limits.$(OBJEXT) \
-	list.$(OBJEXT) log.$(OBJEXT) loginprompt.$(OBJEXT) \
-	mail.$(OBJEXT) motd.$(OBJEXT) myname.$(OBJEXT) \
-	obscure.$(OBJEXT) pam_pass.$(OBJEXT) pwd2spwd.$(OBJEXT) \
-	pwdcheck.$(OBJEXT) pwd_init.$(OBJEXT) rlogin.$(OBJEXT) \
-	salt.$(OBJEXT) setugid.$(OBJEXT) setupenv.$(OBJEXT) \
-	shell.$(OBJEXT) strtoday.$(OBJEXT) sub.$(OBJEXT) \
-	sulog.$(OBJEXT) ttytype.$(OBJEXT) tz.$(OBJEXT) \
-	ulimit.$(OBJEXT) utmp.$(OBJEXT) valid.$(OBJEXT) \
-	xmalloc.$(OBJEXT)
+	basename.$(OBJEXT) chkname.$(OBJEXT) chowndir.$(OBJEXT) \
+	chowntty.$(OBJEXT) console.$(OBJEXT) copydir.$(OBJEXT) \
+	entry.$(OBJEXT) env.$(OBJEXT) failure.$(OBJEXT) \
+	fields.$(OBJEXT) getdate.$(OBJEXT) hushed.$(OBJEXT) \
+	isexpired.$(OBJEXT) limits.$(OBJEXT) list.$(OBJEXT) \
+	log.$(OBJEXT) loginprompt.$(OBJEXT) mail.$(OBJEXT) \
+	motd.$(OBJEXT) myname.$(OBJEXT) obscure.$(OBJEXT) \
+	pam_pass.$(OBJEXT) pwd2spwd.$(OBJEXT) pwdcheck.$(OBJEXT) \
+	pwd_init.$(OBJEXT) rlogin.$(OBJEXT) salt.$(OBJEXT) \
+	setugid.$(OBJEXT) setupenv.$(OBJEXT) shell.$(OBJEXT) \
+	strtoday.$(OBJEXT) sub.$(OBJEXT) sulog.$(OBJEXT) \
+	ttytype.$(OBJEXT) tz.$(OBJEXT) ulimit.$(OBJEXT) utmp.$(OBJEXT) \
+	valid.$(OBJEXT) xmalloc.$(OBJEXT)
 libmisc_a_OBJECTS = $(am_libmisc_a_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -127,10 +126,12 @@ LIBCRACK = @LIBCRACK@
 LIBCRYPT = @LIBCRYPT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBMD = @LIBMD@
 LIBOBJS = @LIBOBJS@
 LIBPAM = @LIBPAM@
 LIBS = @LIBS@
 LIBSELINUX = @LIBSELINUX@
+LIBSKEY = @LIBSKEY@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
@@ -213,7 +214,6 @@ libmisc_a_SOURCES = \
 	basename.c \
 	chkname.c \
 	chkname.h \
-	chkshell.c \
 	chowndir.c \
 	chowntty.c \
 	console.c \
@@ -304,7 +304,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/age.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basename.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chkname.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chkshell.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chowndir.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chowntty.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/console.Po@am__quote@
diff --git a/libmisc/getdate.c b/libmisc/getdate.c
index 8251776c..50134c88 100644
--- a/libmisc/getdate.c
+++ b/libmisc/getdate.c
@@ -149,7 +149,7 @@
 
 #include "getdate.h"
 
-#if defined (STDC_HEADERS) || defined (USG)
+#if defined (STDC_HEADERS)
 # include <string.h>
 #endif
 
diff --git a/libmisc/getdate.y b/libmisc/getdate.y
index 82c7f563..b8bd565e 100644
--- a/libmisc/getdate.y
+++ b/libmisc/getdate.y
@@ -54,7 +54,7 @@
 
 #include "getdate.h"
 
-#if defined (STDC_HEADERS) || defined (USG)
+#if defined (STDC_HEADERS)
 # include <string.h>
 #endif
 
diff --git a/libmisc/pwdcheck.c b/libmisc/pwdcheck.c
index 1451c43b..706188bd 100644
--- a/libmisc/pwdcheck.c
+++ b/libmisc/pwdcheck.c
@@ -1,10 +1,11 @@
 #include <config.h>
 
 #include "rcsid.h"
-RCSID ("$Id: pwdcheck.c,v 1.6 2005/05/25 18:20:22 kloczek Exp $")
+RCSID ("$Id: pwdcheck.c,v 1.7 2005/07/18 12:55:36 kloczek Exp $")
+#include <pwd.h>
+#include <stdio.h>
 #include "prototypes.h"
 #include "defines.h"
-#include <pwd.h>
 #include "pwauth.h"
 #ifdef HAVE_SHADOW_H
 #include <shadow.h>
diff --git a/libmisc/setupenv.c b/libmisc/setupenv.c
index 6b7e97bd..b731ca2f 100644
--- a/libmisc/setupenv.c
+++ b/libmisc/setupenv.c
@@ -34,7 +34,7 @@
 #include <config.h>
 
 #include "rcsid.h"
-RCSID ("$Id: setupenv.c,v 1.14 2005/03/31 05:14:50 kloczek Exp $")
+RCSID ("$Id: setupenv.c,v 1.17 2005/07/06 11:49:21 kloczek Exp $")
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
@@ -238,7 +238,17 @@ void setup_env (struct passwd *info)
 	 * Create the PATH environmental variable and export it.
 	 */
 
+	/*
+	 * Export the user name.  For BSD derived systems, it's "USER", for
+	 * all others it's "LOGNAME".  We set both of them.
+	 */
+
+	addenv ("USER", info->pw_name);
+	addenv ("LOGNAME", info->pw_name);
+
+#ifndef USE_PAM
 	cp = getdef_str ((info->pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH");
+
 	if (!cp) {
 		/* not specified, use a minimal default */
 		addenv ("PATH=/bin:/usr/bin", NULL);
@@ -250,14 +260,6 @@ void setup_env (struct passwd *info)
 		addenv ("PATH", cp);
 	}
 
-	/*
-	 * Export the user name.  For BSD derived systems, it's "USER", for
-	 * all others it's "LOGNAME".  We set both of them.
-	 */
-
-	addenv ("USER", info->pw_name);
-	addenv ("LOGNAME", info->pw_name);
-
 	/*
 	 * MAILDIR environment variable for Qmail
 	 */
@@ -281,11 +283,10 @@ void setup_env (struct passwd *info)
 #endif
 	}
 
-#ifndef USE_PAM
 	/*
 	 * Read environment from optional config file.  --marekm
 	 */
 	if ((envf = getdef_str ("ENVIRON_FILE")))
 		read_env_file (envf);
-#endif
+#endif				/* !USE_PAM */
 }
diff --git a/libmisc/sub.c b/libmisc/sub.c
index 57c7a574..87e82170 100644
--- a/libmisc/sub.c
+++ b/libmisc/sub.c
@@ -30,11 +30,12 @@
 #include <config.h>
 
 #include "rcsid.h"
-RCSID ("$Id: sub.c,v 1.7 2003/04/22 10:59:22 kloczek Exp $")
+RCSID ("$Id: sub.c,v 1.8 2005/07/18 13:19:05 kloczek Exp $")
+#include <pwd.h>
+#include <stdio.h>
 #include <sys/types.h>
 #include "prototypes.h"
 #include "defines.h"
-#include <pwd.h>
 #define	BAD_SUBROOT2	"invalid root `%s' for user `%s'\n"
 #define	NO_SUBROOT2	"no subsystem root `%s' for user `%s'\n"
 /*
diff --git a/libmisc/tz.c b/libmisc/tz.c
index 668339fe..43605f16 100644
--- a/libmisc/tz.c
+++ b/libmisc/tz.c
@@ -30,7 +30,7 @@
 #include <config.h>
 
 #include "rcsid.h"
-RCSID ("$Id: tz.c,v 1.5 2003/04/22 10:59:22 kloczek Exp $")
+RCSID ("$Id: tz.c,v 1.6 2005/07/06 11:33:05 kloczek Exp $")
 #include <stdio.h>
 #include <string.h>
 #include "defines.h"
@@ -49,8 +49,10 @@ char *tz (const char *fname)
 
 	if ((fp = fopen (fname, "r")) == NULL ||
 	    fgets (tzbuf, sizeof (tzbuf), fp) == NULL) {
+#ifndef USE_PAM
 		if (!(def_tz = getdef_str ("ENV_TZ")) || def_tz[0] == '/')
 			def_tz = "TZ=CST6CDT";
+#endif				/* !USE_PAM */
 
 		strcpy (tzbuf, def_tz);
 	} else
diff --git a/libmisc/utmp.c b/libmisc/utmp.c
index da810dd9..eb832da3 100644
--- a/libmisc/utmp.c
+++ b/libmisc/utmp.c
@@ -41,7 +41,7 @@
 #include <stdio.h>
 
 #include "rcsid.h"
-RCSID ("$Id: utmp.c,v 1.15 2005/03/31 05:14:50 kloczek Exp $")
+RCSID ("$Id: utmp.c,v 1.16 2005/07/05 20:17:51 kloczek Exp $")
 #if HAVE_UTMPX_H
 struct utmpx utxent;
 #endif
@@ -217,29 +217,7 @@ void checkutmp (int picky)
 	}
 }
 
-#else				/* !USG */
-
-void checkutmp (int picky)
-{
-	char *line;
-
-	/*
-	 * Hand-craft a new utmp entry.
-	 */
-
-	memzero (&utent, sizeof utent);
-	if (!(line = ttyname (0))) {
-		puts (NO_TTY);
-		exit (1);
-	}
-	if (strncmp (line, "/dev/", 5) == 0)
-		line += 5;
-
-	(void) strncpy (utent.ut_line, line, sizeof utent.ut_line);
-	utent.ut_time = time (NULL);
-}
-
-#endif				/* !USG */
+#endif
 
 
 /*
diff --git a/man/Makefile.am b/man/Makefile.am
index 94c42b6d..92c45ad1 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -88,8 +88,6 @@ EXTRA_DIST = $(man_MANS) \
 	id.1.xml \
 	pw_auth.3 \
 	pw_auth.3.xml \
-	shadowconfig.8 \
-	shadowconfig.8.xml \
 	sulogin.8 \
 	sulogin.8.xml \
 	sulogin.8.xml
diff --git a/man/Makefile.in b/man/Makefile.in
index df822793..7c883560 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -105,10 +105,12 @@ LIBCRACK = @LIBCRACK@
 LIBCRYPT = @LIBCRYPT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBMD = @LIBMD@
 LIBOBJS = @LIBOBJS@
 LIBPAM = @LIBPAM@
 LIBS = @LIBS@
 LIBSELINUX = @LIBSELINUX@
+LIBSKEY = @LIBSKEY@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
@@ -271,8 +273,6 @@ EXTRA_DIST = $(man_MANS) \
 	id.1.xml \
 	pw_auth.3 \
 	pw_auth.3.xml \
-	shadowconfig.8 \
-	shadowconfig.8.xml \
 	sulogin.8 \
 	sulogin.8.xml \
 	sulogin.8.xml
diff --git a/man/cs/Makefile.in b/man/cs/Makefile.in
index 4bbce112..c8624bd4 100644
--- a/man/cs/Makefile.in
+++ b/man/cs/Makefile.in
@@ -95,10 +95,12 @@ LIBCRACK = @LIBCRACK@
 LIBCRYPT = @LIBCRYPT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBMD = @LIBMD@
 LIBOBJS = @LIBOBJS@
 LIBPAM = @LIBPAM@
 LIBS = @LIBS@
 LIBSELINUX = @LIBSELINUX@
+LIBSKEY = @LIBSKEY@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
diff --git a/man/de/Makefile.in b/man/de/Makefile.in
index fda50ba4..731f5191 100644
--- a/man/de/Makefile.in
+++ b/man/de/Makefile.in
@@ -95,10 +95,12 @@ LIBCRACK = @LIBCRACK@
 LIBCRYPT = @LIBCRYPT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBMD = @LIBMD@
 LIBOBJS = @LIBOBJS@
 LIBPAM = @LIBPAM@
 LIBS = @LIBS@
 LIBSELINUX = @LIBSELINUX@
+LIBSKEY = @LIBSKEY@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
diff --git a/man/es/Makefile.in b/man/es/Makefile.in
index b40864eb..91dfc5a1 100644
--- a/man/es/Makefile.in
+++ b/man/es/Makefile.in
@@ -92,10 +92,12 @@ LIBCRACK = @LIBCRACK@
 LIBCRYPT = @LIBCRYPT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBMD = @LIBMD@
 LIBOBJS = @LIBOBJS@
 LIBPAM = @LIBPAM@
 LIBS = @LIBS@
 LIBSELINUX = @LIBSELINUX@
+LIBSKEY = @LIBSKEY@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
diff --git a/man/fr/Makefile.in b/man/fr/Makefile.in
index ccca4355..dc71c551 100644
--- a/man/fr/Makefile.in
+++ b/man/fr/Makefile.in
@@ -95,10 +95,12 @@ LIBCRACK = @LIBCRACK@
 LIBCRYPT = @LIBCRYPT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBMD = @LIBMD@
 LIBOBJS = @LIBOBJS@
 LIBPAM = @LIBPAM@
 LIBS = @LIBS@
 LIBSELINUX = @LIBSELINUX@
+LIBSKEY = @LIBSKEY@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
diff --git a/man/groupadd.8 b/man/groupadd.8
index 654d6247..7aaf8a93 100644
--- a/man/groupadd.8
+++ b/man/groupadd.8
@@ -24,7 +24,7 @@ groupadd \- Create a new group
 .ad l
 .hy 0
 .HP 9
-\fBgroupadd\fR [\-g\ \fIgid\fR\ [\-o]] [\-f] \fIgroup\fR
+\fBgroupadd\fR [\-g\ \fIgid\fR\ [\-o]] [\-f] [\-K\ \fIKEY\fR=\fIVALUE\fR] \fIgroup\fR
 .ad
 .hy
 
@@ -46,6 +46,16 @@ This option causes to just exit with success status if the specified group alrea
 \fB\-g\fR \fIgid\fR
 The numerical value of the group's ID\&. This value must be unique, unless the \fB\-o\fR option is used\&. The value must be non\-negative\&. The default is to use the smallest ID value greater than 999 and greater than every other group\&. Values between 0 and 999 are typically reserved for system accounts\&.
 
+.TP
+\fB\-K \fIKEY\fR=\fIVALUE\fR\fR
+Overrides /etc/login\&.defs defaults (GID_MIN, GID_MAX and others)\&. Multiple \fB\-K\fR options can be specified, e\&.g\&.: \fB\-K\fR  \fIGID_MIN\fR=\fI100\fR  \fB\-K\fR  \fIGID_MAX\fR=\fI499\fR 
+
+Note: \fB\-K\fR  \fIGID_MIN\fR=\fI10\fR,\fIGID_MAX\fR=\fI499\fR doesn't work yet\&.
+
+.TP
+\fB\-o\fR
+Allow add group wit non\-unique GID\&.
+
 .SH "FILES"
 
 .TP
@@ -81,7 +91,7 @@ can't update group file
 .SH "SEE ALSO"
 
 .PP
-\fBchfn\fR(1), \fBchsh\fR(1), \fBpasswd\fR(1), \fBgroupdel\fR(8), \fBgroupmod\fR(8), \fBuseradd\fR(8), \fBuserdel\fR(8), \fBusermod\fR(8) 
+\fBchfn\fR(1), \fBchsh\fR(1), \fBpasswd\fR(1), \fBgpasswd\fR(8), \fBgroupdel\fR(8), \fBgroupmod\fR(8), \fBuseradd\fR(8), \fBuserdel\fR(8), \fBusermod\fR(8) 
 
 .SH "AUTHOR"
 
diff --git a/man/groupadd.8.xml b/man/groupadd.8.xml
index ebeaa26e..5b03a78a 100644
--- a/man/groupadd.8.xml
+++ b/man/groupadd.8.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 		"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
 <refentry id='groupadd.8'>
-  <!-- $Id: groupadd.8.xml,v 1.8 2005/06/16 16:18:27 kloczek Exp $ -->
+  <!-- $Id: groupadd.8.xml,v 1.11 2005/07/07 19:25:36 kloczek Exp $ -->
   <refmeta>
     <refentrytitle>groupadd</refentrytitle>
     <manvolnum>8</manvolnum>
@@ -20,6 +20,7 @@
         <arg choice='opt'>-o </arg>
       </arg>
       <arg choice='opt'>-f </arg>
+      <arg choice='opt'>-K <replaceable>KEY</replaceable>=<replaceable>VALUE</replaceable></arg>
       <arg choice='plain'>
         <replaceable>group</replaceable>
       </arg>
@@ -68,6 +69,33 @@
           </para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>
+          <option>-K <replaceable>KEY</replaceable>=<replaceable>VALUE</replaceable></option>
+        </term>
+        <listitem>
+	  <para>
+	    Overrides /etc/login.defs defaults (GID_MIN, GID_MAX and others). Multiple
+	    <option>-K</option> options can be specified, e.g.: <option>-K</option>
+	    <replaceable>GID_MIN</replaceable>=<replaceable>100</replaceable>
+	    <option>-K</option> <replaceable>GID_MAX</replaceable>=<replaceable>499</replaceable>
+	  </para>
+	  <para>
+	    Note: <option>-K</option> <replaceable>GID_MIN</replaceable>=<replaceable>10</replaceable>,<replaceable>GID_MAX</replaceable>=<replaceable>499</replaceable>
+	    doesn't work yet.
+	  </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <option>-o</option>
+        </term>
+        <listitem>
+          <para>
+	    Allow add group wit non-unique GID.
+	  </para>
+        </listitem>
+      </varlistentry>
     </variablelist>
   </refsect1>
   
@@ -129,6 +157,9 @@
       <citerefentry>
         <refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum>
       </citerefentry>,
+      <citerefentry>
+        <refentrytitle>gpasswd</refentrytitle><manvolnum>8</manvolnum>
+      </citerefentry>,
       <citerefentry>
         <refentrytitle>groupdel</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>,
diff --git a/man/groupdel.8 b/man/groupdel.8
index 7388630d..d3cb5350 100644
--- a/man/groupdel.8
+++ b/man/groupdel.8
@@ -34,7 +34,7 @@ groupdel \- Delete a group
 The \fBgroupdel\fR command modifies the system account files, deleting all entries that refer to \fIgroup\fR\&. The named group must exist\&.
 
 .PP
-You must manually check all filesystems to insure that no files remain with the named group as the file group ID\&.
+You must manually check all file systems to insure that no files remain with the named group as the file group ID\&.
 
 .SH "CAVEATS"
 
@@ -70,7 +70,7 @@ can't update group file
 .SH "SEE ALSO"
 
 .PP
-\fBchfn\fR(1), \fBchsh\fR(1), \fBpasswd\fR(1), \fBgroupadd\fR(8), \fBgroupmod\fR(8), \fBuseradd\fR(8), \fBuserdel\fR(8), \fBusermod\fR(8) 
+\fBchfn\fR(1), \fBchsh\fR(1), \fBpasswd\fR(1), \fBgpasswd\fR(8), \fBgroupadd\fR(8), \fBgroupmod\fR(8), \fBuseradd\fR(8), \fBuserdel\fR(8), \fBusermod\fR(8) 
 
 .SH "AUTHOR"
 
diff --git a/man/groupdel.8.xml b/man/groupdel.8.xml
index 25c0259e..9b4f5eae 100644
--- a/man/groupdel.8.xml
+++ b/man/groupdel.8.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 		"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
 <refentry id='groupdel.8'>
-  <!-- $Id: groupdel.8.xml,v 1.7 2005/06/16 16:26:19 kloczek Exp $ -->
+  <!-- $Id: groupdel.8.xml,v 1.9 2005/07/10 20:00:21 kloczek Exp $ -->
   <refmeta>
     <refentrytitle>groupdel</refentrytitle>
     <manvolnum>8</manvolnum>
@@ -28,7 +28,7 @@
       remap='I'>group</emphasis>. The named group must exist.
     </para>
     
-    <para>You must manually check all filesystems to insure that no files
+    <para>You must manually check all file systems to insure that no files
       remain with the named group as the file group ID.
     </para>
   </refsect1>
@@ -90,6 +90,9 @@
       <citerefentry>
         <refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum>
       </citerefentry>,
+      <citerefentry>
+        <refentrytitle>gpasswd</refentrytitle><manvolnum>8</manvolnum>
+      </citerefentry>,
       <citerefentry>
         <refentrytitle>groupadd</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>,
diff --git a/man/groupmod.8 b/man/groupmod.8
index 598b926f..48411699 100644
--- a/man/groupmod.8
+++ b/man/groupmod.8
@@ -84,7 +84,7 @@ can't update group file
 .SH "SEE ALSO"
 
 .PP
-\fBchfn\fR(1), \fBchsh\fR(1), \fBpasswd\fR(1), \fBgroupadd\fR(8), \fBgroupdel\fR(8), \fBuseradd\fR(8), \fBuserdel\fR(8), \fBusermod\fR(8) 
+\fBchfn\fR(1), \fBchsh\fR(1), \fBpasswd\fR(1), \fBgpasswd\fR(8), \fBgroupadd\fR(8), \fBgroupdel\fR(8), \fBuseradd\fR(8), \fBuserdel\fR(8), \fBusermod\fR(8) 
 
 .SH "AUTHOR"
 
diff --git a/man/groupmod.8.xml b/man/groupmod.8.xml
index 3bc0bdad..316f207a 100644
--- a/man/groupmod.8.xml
+++ b/man/groupmod.8.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 		"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
 <refentry id='groupmod.8'>
-  <!-- $Id: groupmod.8.xml,v 1.7 2005/06/16 16:26:19 kloczek Exp $ -->
+  <!-- $Id: groupmod.8.xml,v 1.8 2005/06/30 19:26:08 kloczek Exp $ -->
   <refmeta>
     <refentrytitle>groupmod</refentrytitle>
     <manvolnum>8</manvolnum>
@@ -126,6 +126,9 @@
       <citerefentry>
         <refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum>
       </citerefentry>,
+      <citerefentry>
+        <refentrytitle>gpasswd</refentrytitle><manvolnum>8</manvolnum>
+      </citerefentry>,
       <citerefentry>
         <refentrytitle>groupadd</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>,
diff --git a/man/hu/Makefile.in b/man/hu/Makefile.in
index db429b1d..b0cb228e 100644
--- a/man/hu/Makefile.in
+++ b/man/hu/Makefile.in
@@ -92,10 +92,12 @@ LIBCRACK = @LIBCRACK@
 LIBCRYPT = @LIBCRYPT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBMD = @LIBMD@
 LIBOBJS = @LIBOBJS@
 LIBPAM = @LIBPAM@
 LIBS = @LIBS@
 LIBSELINUX = @LIBSELINUX@
+LIBSKEY = @LIBSKEY@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
diff --git a/man/id/Makefile.in b/man/id/Makefile.in
index bc3caa90..1bbed641 100644
--- a/man/id/Makefile.in
+++ b/man/id/Makefile.in
@@ -93,10 +93,12 @@ LIBCRACK = @LIBCRACK@
 LIBCRYPT = @LIBCRYPT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBMD = @LIBMD@
 LIBOBJS = @LIBOBJS@
 LIBPAM = @LIBPAM@
 LIBS = @LIBS@
 LIBSELINUX = @LIBSELINUX@
+LIBSKEY = @LIBSKEY@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
diff --git a/man/it/Makefile.am b/man/it/Makefile.am
index b04c36f1..f206820a 100644
--- a/man/it/Makefile.am
+++ b/man/it/Makefile.am
@@ -4,7 +4,6 @@ mandir = @mandir@/it
 # Links to missing pages:
 #	grpconv.8 \
 #	grpunconv.8 \
-#	pwunconv.8 \
 man_MANS = \
 	chage.1 \
 	chfn.1 \
@@ -14,20 +13,31 @@ man_MANS = \
 	faillog.5 \
 	faillog.8 \
 	getspnam.3 \
+	gpasswd.1 \
+	groupadd.8 \
+	groupdel.8 \
+	groupmod.8 \
 	groups.1 \
 	grpck.8 \
+	grpconv.8 \
+	grpunconv.8 \
 	id.1 \
 	lastlog.8 \
 	login.1 \
-	logoutd.8 \
 	newgrp.1 \
+	passwd.1 \
+	passwd.5 \
 	porttime.5 \
 	pwck.8 \
+	pwconv.8 \
+	pwunconv.8 \
 	sg.1 \
 	shadow.3 \
 	shadow.5 \
-	shadowconfig.8 \
 	su.1 \
+	useradd.8 \
+	userdel.8 \
+	usermod.8 \
 	vigr.8 \
 	vipw.8
 
diff --git a/man/it/Makefile.in b/man/it/Makefile.in
index 6fb59570..2b5c7820 100644
--- a/man/it/Makefile.in
+++ b/man/it/Makefile.in
@@ -88,10 +88,12 @@ LIBCRACK = @LIBCRACK@
 LIBCRYPT = @LIBCRYPT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBMD = @LIBMD@
 LIBOBJS = @LIBOBJS@
 LIBPAM = @LIBPAM@
 LIBS = @LIBS@
 LIBSELINUX = @LIBSELINUX@
+LIBSKEY = @LIBSKEY@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
@@ -169,7 +171,6 @@ target_alias = @target_alias@
 # Links to missing pages:
 #	grpconv.8 \
 #	grpunconv.8 \
-#	pwunconv.8 \
 #man_MANS = \
 #	chage.1 \
 #	chfn.1 \
@@ -179,20 +180,31 @@ target_alias = @target_alias@
 #	faillog.5 \
 #	faillog.8 \
 #	getspnam.3 \
+#	gpasswd.1 \
+#	groupadd.8 \
+#	groupdel.8 \
+#	groupmod.8 \
 #	groups.1 \
 #	grpck.8 \
+#	grpconv.8 \
+#	grpunconv.8 \
 #	id.1 \
 #	lastlog.8 \
 #	login.1 \
-#	logoutd.8 \
 #	newgrp.1 \
+#	passwd.1 \
+#	passwd.5 \
 #	porttime.5 \
 #	pwck.8 \
+#	pwconv.8 \
+#	pwunconv.8 \
 #	sg.1 \
 #	shadow.3 \
 #	shadow.5 \
-#	shadowconfig.8 \
 #	su.1 \
+#	useradd.8 \
+#	userdel.8 \
+#	usermod.8 \
 #	vigr.8 \
 #	vipw.8
 EXTRA_DIST = $(man_MANS)
diff --git a/man/ja/Makefile.am b/man/ja/Makefile.am
index 1fc6eab6..b0c6bf16 100644
--- a/man/ja/Makefile.am
+++ b/man/ja/Makefile.am
@@ -45,5 +45,4 @@ EXTRA_DIST = $(man_MANS) \
 	id.1 \
 	pw_auth.3 \
 	shadow.3 \
-	shadowconfig.8 \
 	sulogin.8
diff --git a/man/ja/Makefile.in b/man/ja/Makefile.in
index 92b9e2a8..da9fea52 100644
--- a/man/ja/Makefile.in
+++ b/man/ja/Makefile.in
@@ -95,10 +95,12 @@ LIBCRACK = @LIBCRACK@
 LIBCRYPT = @LIBCRYPT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBMD = @LIBMD@
 LIBOBJS = @LIBOBJS@
 LIBPAM = @LIBPAM@
 LIBS = @LIBS@
 LIBSELINUX = @LIBSELINUX@
+LIBSKEY = @LIBSKEY@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
@@ -216,7 +218,6 @@ EXTRA_DIST = $(man_MANS) \
 	id.1 \
 	pw_auth.3 \
 	shadow.3 \
-	shadowconfig.8 \
 	sulogin.8
 
 all: all-am
diff --git a/man/ja/shadowconfig.8 b/man/ja/shadowconfig.8
deleted file mode 100644
index 91f48ea1..00000000
--- a/man/ja/shadowconfig.8
+++ /dev/null
@@ -1,31 +0,0 @@
-.\"$Id: shadowconfig.8,v 1.4 2003/04/28 02:14:00 kloczek Exp $
-.\"
-.\" Japanese Version Copyright (c) 2001 Maki KURODA
-.\"     all right reserved,
-.\" Translated Tue Oct 30 11:59:11 JST 2001
-.\"     by Maki KURODA <mkuroda@aisys-jp.com>
-.\" Modified Sun 22 Sep 2002 by NAKANO Takeo <nakano@apm.seikei.ac.jp>
-.\"
-.TH SHADOWCONFIG 8 "19 Apr 1997" "Debian GNU/Linux"
-.SH ̾��
-shadowconfig \- shadow �ѥ���ɤ�ͭ����̵���ˤ���
-.SH ��
-.B "shadowconfig"
-.IR on " | " off
-.SH ����
-.B shadowconfig on
-�� shadow �ѥ���ɤ�ͭ���ˤ��롣
-.B shadowconfig off
-�� shadow �ѥ���ɤ�̵���ˤ��롣
-�����ְ㤤������ȡ�
-.B shadowconfig
-�ϥ��顼��å�������ɽ�����������ʳ����֤��ͤ��֤���
-���Τ褦�ʤ��Ȥ������ä����ϡ�
-���顼�������ƺ��ټ¹Ԥ��ʤ���Фʤ�ʤ���
-
-shadow �ѥ���ɤ����Ǥ�ͭ���ˤʤäƤ���Ȥ��˺���ͭ���ˤ����ꡢ
-̵���ˤʤäƤ���Ȥ��˺���̵���ˤ��Ƥ⡢���αƶ���ʤ���
-
-\fI/usr/share/doc/passwd/README.debian.gz\fR
-�ˤ� shadow �ѥ���ɤ��Ϣ��ǽ�˴ؤ���
-��ñ���������񤫤�Ƥ��롣
diff --git a/man/ko/Makefile.in b/man/ko/Makefile.in
index 924d4328..204a48ac 100644
--- a/man/ko/Makefile.in
+++ b/man/ko/Makefile.in
@@ -93,10 +93,12 @@ LIBCRACK = @LIBCRACK@
 LIBCRYPT = @LIBCRYPT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBMD = @LIBMD@
 LIBOBJS = @LIBOBJS@
 LIBPAM = @LIBPAM@
 LIBS = @LIBS@
 LIBSELINUX = @LIBSELINUX@
+LIBSKEY = @LIBSKEY@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
diff --git a/man/lastlog.8 b/man/lastlog.8
index 34a1aabc..b3f9a4ef 100644
--- a/man/lastlog.8
+++ b/man/lastlog.8
@@ -56,6 +56,11 @@ The \fB\-t\fR flag overrides the use of \fB\-u\fR\&.
 .PP
 If the user has never logged in the message \fI **Never logged in**\fR will be displayed instead of the port and time\&.
 
+.SH "NOTE"
+
+.PP
+The \fBlastlog\fR file is a database which contains info on the last login of each user\&. You should not rotate it\&. It is a sparse file, so its size on the disk is much smaller than the one shown by \fBls \-l\fR (which can indicate a really big file if you have an high UID)\&. You can display its real size with \fBls \-s\fR\&.
+
 .SH "FILES"
 
 .TP
diff --git a/man/lastlog.8.xml b/man/lastlog.8.xml
index ccc0a374..ce383f2d 100644
--- a/man/lastlog.8.xml
+++ b/man/lastlog.8.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 		"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
 <refentry id='lastlog.8'>
-  <!-- $Id: lastlog.8.xml,v 1.6 2005/06/14 16:54:20 kloczek Exp $ -->
+  <!-- $Id: lastlog.8.xml,v 1.7 2005/07/11 16:33:21 kloczek Exp $ -->
   <refmeta>
     <refentrytitle>lastlog</refentrytitle>
     <manvolnum>8</manvolnum>
@@ -92,6 +92,18 @@
     </para>
   </refsect1>
   
+  <refsect1 id='note'>
+    <title>NOTE</title>
+    <para>
+      The <command>lastlog</command> file is a database which contains info
+      on the last login of each user. You should not rotate it. It is a sparse
+      file, so its size on the disk is much smaller than the one shown by
+      <command>ls -l</command> (which can indicate a really big file if
+      you have an high UID). You can display its real size with
+      <command>ls -s</command>.
+    </para>
+  </refsect1>
+
   <refsect1 id='files'>
     <title>FILES</title>
     <variablelist>
diff --git a/man/login.1 b/man/login.1
index 2dbe82d6..5dd88255 100644
--- a/man/login.1
+++ b/man/login.1
@@ -66,6 +66,9 @@ An initialization script for your command interpreter may also be executed\&. Pl
 .PP
 A subsystem login is indicated by the presence of a "*" as the first character of the login shell\&. The given home directory will be used as the root of a new file system which the user is actually logged into\&.
 
+.PP
+The \fBlogin\fR program is NOT responsible for removing users from the utmp file\&. It is the responsibility of getty(8) and init(8) to clean up apparent ownership of a terminal session\&. If you use \fBlogin\fR from the shell prompt without \fBexec\fR, the user you use will continue to appear to be logged in even after you log out of the "subsession"\&.
+
 .SH "OPTIONS"
 
 .TP
diff --git a/man/login.1.xml b/man/login.1.xml
index 196480d3..ec2087dc 100644
--- a/man/login.1.xml
+++ b/man/login.1.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 		"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
 <refentry id='login.1'>
-  <!--  $Id: login.1.xml,v 1.9 2005/06/15 12:39:27 kloczek Exp $ -->
+  <!--  $Id: login.1.xml,v 1.10 2005/07/10 20:10:09 kloczek Exp $ -->
   <refmeta>
     <refentrytitle>LOGIN</refentrytitle>
     <manvolnum>1</manvolnum>
@@ -96,6 +96,17 @@
       used as the root of a new file system which the user is actually
       logged into.
     </para>
+
+    <para>The <command>login</command> program is NOT responsible for
+      removing users from the utmp file. It is the responsibility of
+      <refentrytitle>getty</refentrytitle><manvolnum>8</manvolnum> and
+      <refentrytitle>init</refentrytitle><manvolnum>8</manvolnum> to clean
+      up apparent ownership of a terminal session. If you use
+      <command>login</command> from the shell prompt without
+      <command>exec</command>, the user you use will continue to appear to
+      be logged in even after you log out of the "subsession".
+    </para>
+
   </refsect1>
   
   <refsect1 id='options'>
diff --git a/man/pl/Makefile.am b/man/pl/Makefile.am
index df56de8e..6e7cca67 100644
--- a/man/pl/Makefile.am
+++ b/man/pl/Makefile.am
@@ -45,5 +45,4 @@ EXTRA_DIST = $(man_MANS) \
 	id.1 \
 	pw_auth.3 \
 	shadow.3 \
-	shadowconfig.8 \
 	sulogin.8
diff --git a/man/pl/Makefile.in b/man/pl/Makefile.in
index d6f8137d..222e28bb 100644
--- a/man/pl/Makefile.in
+++ b/man/pl/Makefile.in
@@ -95,10 +95,12 @@ LIBCRACK = @LIBCRACK@
 LIBCRYPT = @LIBCRYPT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBMD = @LIBMD@
 LIBOBJS = @LIBOBJS@
 LIBPAM = @LIBPAM@
 LIBS = @LIBS@
 LIBSELINUX = @LIBSELINUX@
+LIBSKEY = @LIBSKEY@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
@@ -216,7 +218,6 @@ EXTRA_DIST = $(man_MANS) \
 	id.1 \
 	pw_auth.3 \
 	shadow.3 \
-	shadowconfig.8 \
 	sulogin.8
 
 all: all-am
diff --git a/man/pl/shadowconfig.8 b/man/pl/shadowconfig.8
deleted file mode 100644
index 8ed4074c..00000000
--- a/man/pl/shadowconfig.8
+++ /dev/null
@@ -1,26 +0,0 @@
-.\" $Id: shadowconfig.8,v 1.4 2005/04/05 18:47:51 kloczek Exp $
-.TH SHADOWCONFIG 8 "19 kwietnia 1997" "Debian GNU/Linux"
-.SH NAZWA
-shadowconfig \- prze��cza ochron� hase� i grup przez pliki shadow
-.SH SK�ADNIA
-.B "shadowconfig"
-.IR on " | " off
-.SH OPIS
-.PP
-.B shadowconfig on
-w��cza ochron� hase� i grup przez dodatkowe, przes�aniane pliki (shadow);
-.B shadowconfig off
-wy��cza dodatkowe pliki hase� i grup.
-.B shadowconfig
-wy�wietla komunikat o b��dzie i ko�czy prac� z niezerowym kodem je�li
-znajdzie co� nieprawid�owego. W takim wypadku powiniene� poprawi� b��d
-.\" if it finds anything awry.
-i uruchomi� program ponownie.
-
-W��czenie ochrony hase�, gdy jest ona ju� w��czona lub jej wy��czenie,
-gdy jest wy��czona jest nieszkodliwe.
-
-Przeczytaj
-.IR /usr/share/doc/passwd/README.debian.gz ,
-gdzie znajdziesz kr�tkie wprowadzenie do ochrony hase� z u�yciem dodatkowych
-plik�w hase� przes�anianych (shadow passwords) i zwi�zanych temat�w.
diff --git a/man/pt_BR/Makefile.in b/man/pt_BR/Makefile.in
index 8621e419..e02f08ac 100644
--- a/man/pt_BR/Makefile.in
+++ b/man/pt_BR/Makefile.in
@@ -95,10 +95,12 @@ LIBCRACK = @LIBCRACK@
 LIBCRYPT = @LIBCRYPT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBMD = @LIBMD@
 LIBOBJS = @LIBOBJS@
 LIBPAM = @LIBPAM@
 LIBS = @LIBS@
 LIBSELINUX = @LIBSELINUX@
+LIBSKEY = @LIBSKEY@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
diff --git a/man/pwck.8 b/man/pwck.8
index e2d33326..10d1bb35 100644
--- a/man/pwck.8
+++ b/man/pwck.8
@@ -24,7 +24,13 @@ pwck \- verify integrity of password files
 .ad l
 .hy 0
 .HP 5
-\fBpwck\fR [\-sr] [\fIpasswd\fR\ \fIshadow\fR]
+\fBpwck\fR [\-q] [\-s] [\fIpasswd\fR\ \fIshadow\fR]
+.ad
+.hy
+.ad l
+.hy 0
+.HP 5
+\fBpwck\fR [\-r] [\fIpasswd\fR\ \fIshadow\fR]
 .ad
 .hy
 
@@ -65,7 +71,22 @@ The commands which operate on the \fI/etc/passwd\fR file are not able to alter c
 .SH "OPTIONS"
 
 .PP
-By default, \fBpwck\fR operates on the files \fI/etc/passwd\fR and \fI/etc/shadow\fR\&. The user may select alternate files with the \fIpasswd\fR and \fIshadow\fR parameters\&. Additionally, the user may execute the command in read\-only mode by specifying the \fB\-r\fR flag\&. This causes all questions regarding changes to be answered \fIno\fR without user intervention\&. \fBpwck\fR can also sort entries in \fI/etc/passwd\fR and \fI/etc/shadow\fR by UID\&. To run it in sort mode pass it \fB\-s\fR flag\&. No checks are performed then, it just sorts\&.
+The options which apply to the \fBpwck\fR command are:
+
+.TP
+\fB\-q\fR
+Report errors only\&. Using this option will not require an action from the user\&.
+
+.TP
+\fB\-r\fR
+Execute the \fBpwck\fR command in read\-only mode\&.
+
+.TP
+\fB\-s\fR
+Sort entries in \fI/etc/passwd\fR and \fI/etc/shadow\fR by UID\&.
+
+.PP
+By default, \fBpwck\fR operates on the files \fI/etc/passwd\fR and \fI/etc/shadow\fR\&. The user may select alternate files with the \fIpasswd\fR and \fIshadow\fR parameters\&.
 
 .SH "FILES"
 
diff --git a/man/pwck.8.xml b/man/pwck.8.xml
index 33f83518..53a1f9e4 100644
--- a/man/pwck.8.xml
+++ b/man/pwck.8.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 		"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
 <refentry id='pwck.8'>
-  <!-- $Id: pwck.8.xml,v 1.8 2005/06/16 20:09:08 kloczek Exp $ -->
+  <!-- $Id: pwck.8.xml,v 1.9 2005/07/12 16:28:14 kloczek Exp $ -->
   <refmeta>
     <refentrytitle>pwck</refentrytitle>
     <manvolnum>8</manvolnum>
@@ -15,7 +15,20 @@
   <refsynopsisdiv id='synopsis'>
     <cmdsynopsis>
       <command>pwck</command>
-      <arg choice='opt'>-sr </arg>
+      <arg choice='opt'>-q </arg>
+      <arg choice='opt'>-s </arg>
+      <arg choice='opt'>
+        <arg choice='plain'>
+          <replaceable>passwd</replaceable>
+        </arg>
+        <arg choice='plain'>
+          <replaceable>shadow</replaceable>
+        </arg>
+      </arg>
+    </cmdsynopsis>
+    <cmdsynopsis>
+      <command>pwck</command>
+      <arg choice='opt'>-r </arg>
       <arg choice='opt'>
         <arg choice='plain'>
           <replaceable>passwd</replaceable>
@@ -78,19 +91,50 @@
   
   <refsect1 id='options'>
     <title>OPTIONS</title>
+    <para>
+      The options which apply to the <command>pwck</command> command are:
+    </para>
+    <variablelist remap='IP'>
+      <varlistentry>
+        <term>
+          <option>-q</option>
+        </term>
+        <listitem>
+          <para>
+	    Report errors only. Using this option will not require an action
+	    from the user.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <option>-r</option>
+        </term>
+        <listitem>
+          <para>
+	    Execute the <command>pwck</command> command in read-only mode.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <option>-s</option>
+        </term>
+        <listitem>
+          <para>
+	    Sort entries in <filename>/etc/passwd</filename> and
+	    <filename>/etc/shadow</filename> by UID.
+          </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
     <para>
       By default, <command>pwck</command> operates on the files
       <filename>/etc/passwd</filename> and <filename>/etc/shadow</filename>. 
       The user may select alternate files with the <emphasis
       remap='I'>passwd</emphasis> and <emphasis remap='I'>shadow</emphasis>
-      parameters. Additionally, the user may execute the command in
-      read-only mode by specifying the <option>-r</option> flag. This causes
-      all questions regarding changes to be answered <emphasis
-      remap='B'>no</emphasis> without user intervention. 
-      <command>pwck</command> can also sort entries in
-      <filename>/etc/passwd</filename> and <filename>/etc/shadow</filename>
-      by UID. To run it in sort mode pass it <option>-s</option> flag. No
-      checks are performed then, it just sorts.
+      parameters.
     </para>
   </refsect1>
   
diff --git a/man/ru/Makefile.in b/man/ru/Makefile.in
index 5ec8ffde..68a1d816 100644
--- a/man/ru/Makefile.in
+++ b/man/ru/Makefile.in
@@ -92,10 +92,12 @@ LIBCRACK = @LIBCRACK@
 LIBCRYPT = @LIBCRYPT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBMD = @LIBMD@
 LIBOBJS = @LIBOBJS@
 LIBPAM = @LIBPAM@
 LIBS = @LIBS@
 LIBSELINUX = @LIBSELINUX@
+LIBSKEY = @LIBSKEY@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
diff --git a/man/shadowconfig.8 b/man/shadowconfig.8
deleted file mode 100644
index e4daee21..00000000
--- a/man/shadowconfig.8
+++ /dev/null
@@ -1,41 +0,0 @@
-.\"Generated by db2man.xsl. Don't modify this, modify the source.
-.de Sh \" Subsection
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Ip \" List item
-.br
-.ie \\n(.$>=3 .ne \\$3
-.el .ne 3
-.IP "\\$1" \\$2
-..
-.TH "SHADOWCONFIG" 8 "19 Apr 1997" "" ""
-.SH NAME
-shadowconfig \- toggle shadow passwords on and off
-.SH "SYNOPSIS"
-.ad l
-.hy 0
-.HP 13
-\fBshadowconfig\fR \fB\fIon\fR\fR | \fB\fIoff\fR\fR 
-.ad
-.hy
-
-.SH "DESCRIPTION"
-
-.PP
-\fBshadowconfig\fR on will turn shadow passwords on; \fIshadowconfig off\fR will turn shadow passwords off\&. \fBshadowconfig\fR will print an error message and exit with a nonzero code if it finds anything awry\&. If that happens, you should correct the error and run it again\&. Turning shadow passwords on when they are already on, or off when they are already off, is harmless\&.
-
-.PP
-Read \fI/usr/share/doc/passwd/README\&.debian\fR for a brief introduction to shadow passwords and related features\&.
-
-.PP
-Note that turning shadow passwords off and on again will lose all password aging information\&.
-
diff --git a/man/shadowconfig.8.xml b/man/shadowconfig.8.xml
deleted file mode 100644
index 9c25f17e..00000000
--- a/man/shadowconfig.8.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-		"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
-<refentry id='shadowconfig.8'>
-  <!-- $Id: shadowconfig.8.xml,v 1.6 2005/06/15 12:39:27 kloczek Exp $ -->
-  <refentryinfo>
-    <date>19 Apr 1997</date>
-  </refentryinfo>
-  <refmeta>
-    <refentrytitle>shadowconfig</refentrytitle>
-    <manvolnum>8</manvolnum>
-    <refmiscinfo class='date'>19 Apr 1997</refmiscinfo>
-    <refmiscinfo class='source'>Debian GNU/Linux</refmiscinfo>
-  </refmeta>
-  <refnamediv id='name'>
-    <refname>shadowconfig</refname>
-    <refpurpose>toggle shadow passwords on and off</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv id='synopsis'>
-    <cmdsynopsis>
-      <command>shadowconfig</command>    
-      <group choice='plain'>
-        <arg choice='plain'><replaceable>on</replaceable></arg>
-        <arg choice='plain'><replaceable>off</replaceable></arg>
-      </group>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  
-  <refsect1 id='description'>
-    <title>DESCRIPTION</title>
-    <para><command>shadowconfig</command> on will turn shadow passwords on;
-      <emphasis remap='B'>shadowconfig off</emphasis> will turn shadow
-      passwords off. <command>shadowconfig</command> will print an error
-      message and exit with a nonzero code if it finds anything awry. If
-      that happens, you should correct the error and run it again. Turning
-      shadow passwords on when they are already on, or off when they are
-      already off, is harmless.
-    </para>
-    
-    <para>
-      Read <filename>/usr/share/doc/passwd/README.debian</filename> for a
-      brief introduction
-      to shadow passwords and related features.
-    </para>
-    
-    <para>Note that turning shadow passwords off and on again will lose all
-      password
-      aging information.
-    </para>
-  </refsect1>
-</refentry>
diff --git a/man/su.1 b/man/su.1
index 4533ed4c..98fc2acc 100644
--- a/man/su.1
+++ b/man/su.1
@@ -43,7 +43,7 @@ The user will be prompted for a password, if appropriate\&. Invalid passwords wi
 The current environment is passed to the new shell\&. The value of \fI$PATH\fR is reset to \fI/bin:/usr/bin\fR for normal users, or \fI/sbin:/bin:/usr/sbin:/usr/bin\fR for the super user\&. This may be changed with the \fIENV_PATH\fR and \fIENV_SUPATH\fR definitions in \fI/etc/login\&.defs\fR\&.
 
 .PP
-A subsystem login is indicated by the presense of a "*" as the first character of the login shell\&. The given home directory will be used as the root of a new filesystem which the user is actually logged into\&.
+A subsystem login is indicated by the presence of a "*" as the first character of the login shell\&. The given home directory will be used as the root of a new file system which the user is actually logged into\&.
 
 .SH "CAVEATS"
 
diff --git a/man/su.1.xml b/man/su.1.xml
index cb077397..af457cf6 100644
--- a/man/su.1.xml
+++ b/man/su.1.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 		"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
 <refentry id='su.1'>
-  <!--  $Id: su.1.xml,v 1.9 2005/06/15 12:39:27 kloczek Exp $ -->
+  <!--  $Id: su.1.xml,v 1.10 2005/07/10 20:00:21 kloczek Exp $ -->
   <refmeta>
     <refentrytitle>su</refentrytitle>
     <manvolnum>1</manvolnum>
@@ -58,9 +58,9 @@
       <filename>/etc/login.defs</filename>.
     </para>
     
-    <para>A subsystem login is indicated by the presense of a "*" as the
+    <para>A subsystem login is indicated by the presence of a "*" as the
       first character of the login shell. The given home directory will be
-      used as the root of a new filesystem which the user is actually logged
+      used as the root of a new file system which the user is actually logged
       into.
     </para>
   </refsect1>
diff --git a/man/useradd.8 b/man/useradd.8
index 1f6cf388..7349fac8 100644
--- a/man/useradd.8
+++ b/man/useradd.8
@@ -24,15 +24,19 @@ useradd \- Create a new user or update default new user information
 .ad l
 .hy 0
 .HP 8
-\fBuseradd\fR [\-c\ \fIcomment\fR] [\-d\ \fIhome_dir\fR] [\-e\ \fIexpire_date\fR] [\-f\ \fIinactive_days\fR]
-.br
- [\-g\ \fIinitial_group\fR] [\-G\ \fIgroup1\fR\ [\fI,group2,\fR...\ \fI,\fR\ [\fIgroupN\fR]]]
-.br
- [[\-M]\ \-m\ [\-k\ \fIskeleton_dir\fR]] [\-o] [\-p\ \fIpasswd\fR] [\-s\ \fIshell\fR]
-.br
- [\-u\ \fIuid\fR] \fIlogin\fR \fIuseradd\fR \-D [\-g\ \fIgroup\fR] [\-b\ \fIhome_dir\fR] [\-e\ \fIexpire_date\fR]
-.br
- [\-f\ \fIinactive_days\fR] [\-s\ \fIshell\fR]
+\fBuseradd\fR [\fIoptions\fR] \fILOGIN\fR
+.ad
+.hy
+.ad l
+.hy 0
+.HP 8
+\fBuseradd\fR \-D
+.ad
+.hy
+.ad l
+.hy 0
+.HP 8
+\fBuseradd\fR \-D [\fIoptions\fR]
 .ad
 .hy
 
@@ -49,51 +53,61 @@ When invoked without the \fB\-D\fR option, the \fBuseradd\fR command creates a n
 The options which apply to the \fBuseradd\fR command are:
 
 .TP
-\fB\-c\fR \fIcomment\fR
-The new user's password file comment field\&.
+\fB\-c\fR, \fB\-\-comment\fR \fICOMMENT\fR
+Any text string\&. It is generally a short description of the login, and is currently used as the field for the user's full name\&.
 
 .TP
-\fB\-d\fR \fIhome_dir\fR
-The new user will be created using \fI home_dir \fRas the value for the user's login directory\&. The default is to append the \fIlogin\fR name to \fIhome\fR and use that as the login directory name\&.
+\fB\-b\fR, \fB\-\-base\-dir\fR \fIBASE_DIR\fR
+The default base directory for the system if \fB\-d\fR dir is not specified\&. \fIBASE_DIR\fR is concatenated with the account name to define the home directory\&. If the \fB\-m\fR option is not used, base_dir must exist\&.
 
 .TP
-\fB\-e\fR \fIexpire_date\fR
+\fB\-d\fR, \fB\-\-home\fR \fIHOME_DIR\fR
+The new user will be created using \fIHOME_DIR\fR as the value for the user's login directory\&. The default is to append the \fILOGIN\fR name to \fIBASE_DIR\fR and use that as the login directory name\&.
+
+.TP
+\fB\-e\fR, \fB\-\-expiredate\fR \fIEXPIRE_DATE\fR
 The date on which the user account will be disabled\&. The date is specified in the format \fIYYYY\-MM\-DD\fR\&.
 
 .TP
-\fB\-f\fR \fIinactive_days\fR
+\fB\-f\fR, \fB\-\-inactive\fR \fIINACTIVE\fR
 The number of days after a password expires until the account is permanently disabled\&. A value of 0 disables the account as soon as the password has expired, and a value of \-1 disables the feature\&. The default value is \-1\&.
 
 .TP
-\fB\-g\fR \fIinitial_group\fR
+\fB\-g\fR, \fB\-\-gid\fR \fIGROUP\fR
 The group name or number of the user's initial login group\&. The group name must exist\&. A group number must refer to an already existing group\&. The default group number is 1 or whatever is specified in \fI/etc/default/useradd\fR\&.
 
 .TP
-\fB\-G\fR \fIgroup1\fR[\fI ,group2,\&.\&.\&., \fR [\fIgroupN\fR]]]
+\fB\-G\fR, \fB\-\-groups\fR \fIGROUP1\fR[\fI,GROUP2,\&.\&.\&.\fR[\fI,GROUPN\fR]]]
 A list of supplementary groups which the user is also a member of\&. Each group is separated from the next by a comma, with no intervening whitespace\&. The groups are subject to the same restrictions as the group given with the \fB\-g\fR option\&. The default is for the user to belong only to the initial group\&.
 
 .TP
-\fB\-M\fR
-RedHat added the CREATE_HOME option in login\&.defs in their version of shadow\-utils (which makes \-m the default, with new \-M option to turn it off)\&. Unfortunately, this changes the way useradd works (it can be run by scripts expecting some standard behaviour), compared to other Unices and other Linux distributions, and also adds a lot of confusion\&.
+\fB\-h\fR, \fB\-\-help\fR
+Display help message and exit\&.
 
 .TP
-\fB\-m\fR
+\fB\-m\fR, \fB\-\-create\-home\fR
 The user's home directory will be created if it does not exist\&. The files contained in \fIskeleton_dir\fR will be copied to the home directory if the \fB\-k\fR option is used, otherwise the files contained in \fI/etc/skel\fR will be used instead\&. Any directories contained in \fI skeleton_dir\fR or \fI/etc/skel\fR will be created in the user's home directory as well\&. The \fB\-k\fR option is only valid in conjunction with the \fB\-m\fR option\&. The default is to not create the directory and to not copy any files\&.
 
 .TP
-\fB\-o\fR
-Allow create user with duplicate (non\-unique) UID\&.
+\fB\-K\fR, \fB\-\-key\fR \fIKEY\fR=\fIVALUE\fR
+Overrides /etc/login\&.defs defaults (UID_MIN, UID_MAX, UMASK, PASS_MAX_DAYS and others)\&. For example: \fB\-K\fR  \fIPASS_MAX_DAYS\fR=\fI\-1\fR can be used when creating system account to turn off password ageing, even though system account has no password at all\&. Multiple \fB\-K\fR options can be specified, e\&.g\&.: \fB\-K\fR  \fIUID_MIN\fR=\fI100\fR  \fB\-K\fR  \fIUID_MAX\fR=\fI499\fR 
+
+Note: \fB\-K\fR  \fIUID_MIN\fR=\fI10\fR,\fIUID_MAX\fR=\fI499\fR doesn't work yet\&.
 
 .TP
-\fB\-p\fR \fIpasswd\fR
+\fB\-o\fR, \fB\-\-non\-unique\fR
+Allow create user account with duplicate (non\-unique) UID\&.
+
+.TP
+\fB\-p\fR, \fB\-\-password\fR \fIPASSWORD\fR
 The encrypted password, as returned by \fBcrypt\fR(3)\&. The default is to disable the account\&.
 
 .TP
-\fB\-s\fR \fIshell\fR
+\fB\-s\fR, \fB\-\-shell\fR \fISHELL\fR
 The name of the user's login shell\&. The default is to leave this field blank, which causes the system to select the default login shell\&.
 
 .TP
-\fB\-u\fR \fIuid\fR
+\fB\-u\fR, \fB\-\-uid\fR \fIUID\fR
 The numerical value of the user's ID\&. This value must be unique, unless the \fB\-o\fR option is used\&. The value must be non\-negative\&. The default is to use the smallest ID value greater than 999 and greater than every other user\&. Values between 0 and 999 are typically reserved for system accounts\&.
 
 .SS "Changing the default values"
@@ -114,11 +128,11 @@ The date on which the user account is disabled\&.
 The number of days after a password has expired before the account will be disabled\&.
 
 .TP
-\fB\-g\fR \fIgroup\fR
+\fB\-g\fR, \fB\-\-gid\fR \fIGROUP\fR
 The group name or ID for a new user's initial group\&. The named group must exist, and a numerical group ID must have an existing entry \&.
 
 .TP
-\fB\-s\fR \fIshell\fR
+\fB\-s\fR, \fB\-\-shell\fR \fISHELL\fR
 The name of the new user's login shell\&. The named program will be used for all future new user accounts\&.
 
 .PP
diff --git a/man/useradd.8.xml b/man/useradd.8.xml
index 71c8cf03..4f76f620 100644
--- a/man/useradd.8.xml
+++ b/man/useradd.8.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 		"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
 <refentry id='useradd.8'>
-  <!--  $Id: useradd.8.xml,v 1.8 2005/06/16 18:58:43 kloczek Exp $ -->
+  <!--  $Id: useradd.8.xml,v 1.13 2005/07/10 17:17:38 kloczek Exp $ -->
   <refmeta>
     <refentrytitle>useradd</refentrytitle>
     <manvolnum>8</manvolnum>
@@ -14,45 +14,21 @@
   <refsynopsisdiv id='synopsis'>
     <cmdsynopsis>
       <command>useradd</command>    
-      <arg choice='opt'>-c <replaceable>comment</replaceable></arg>
-      <arg choice='opt'>-d <replaceable>home_dir</replaceable></arg>
-      <arg choice='opt'>-e <replaceable>expire_date</replaceable></arg>
-      <arg choice='opt'>-f <replaceable>inactive_days</replaceable></arg>
-      <sbr/>
-      <arg choice='opt'>-g <replaceable>initial_group</replaceable></arg>
       <arg choice='opt'>
-        <arg choice='plain'>-G <replaceable>group1</replaceable></arg>
-        <arg choice='opt'>
-	  <arg choice='plain' rep='repeat'>
-	    <replaceable>,group2,</replaceable>
-          </arg>
-          <arg choice='plain'>
-            <replaceable>,</replaceable>
-          </arg>
-          <arg choice='opt'>
-            <replaceable>groupN</replaceable>
-          </arg>
-        </arg>
+        <replaceable>options</replaceable>
       </arg>
-      <sbr/>
-      <arg choice='opt'>
-        <arg choice='opt'>-M </arg><arg choice='plain'>-m </arg>
-        <arg choice='opt'>-k <replaceable>skeleton_dir</replaceable></arg>
-      </arg>
-      <arg choice='opt'>-o </arg>
-      <arg choice='opt'>-p <replaceable>passwd</replaceable></arg>
-      <arg choice='opt'>-s <replaceable>shell</replaceable></arg>
-      <sbr/>
-      <arg choice='opt'>-u <replaceable>uid</replaceable></arg>
-      <arg choice='plain'><replaceable>login</replaceable></arg>
-      <arg choice='plain'><replaceable>useradd</replaceable></arg>
+      <arg choice='plain'><replaceable>LOGIN</replaceable></arg>
+    </cmdsynopsis>
+    <cmdsynopsis>
+      <command>useradd</command>    
       <arg choice='plain'>-D </arg>
-      <arg choice='opt'>-g <replaceable>group</replaceable></arg>
-      <arg choice='opt'>-b <replaceable>home_dir</replaceable></arg>
-      <arg choice='opt'>-e <replaceable>expire_date</replaceable></arg>
-      <sbr/>
-      <arg choice='opt'>-f <replaceable>inactive_days</replaceable></arg>
-      <arg choice='opt'>-s <replaceable>shell</replaceable></arg>
+    </cmdsynopsis>
+    <cmdsynopsis>
+      <command>useradd</command>    
+      <arg choice='plain'>-D </arg>
+      <arg choice='opt'>
+        <replaceable>options</replaceable>
+      </arg>
     </cmdsynopsis>
   </refsynopsisdiv>
   
@@ -78,29 +54,49 @@
     <variablelist remap='IP'>
       <varlistentry>
         <term>
-          <option>-c</option> <replaceable>comment</replaceable>
+          <option>-c</option>, <option>--comment</option>
+	  <replaceable>COMMENT</replaceable>
         </term>
         <listitem>
-          <para>The new user's password file comment field.</para>
+          <para>
+	    Any text string. It is generally a short description of the
+	    login, and is currently used as the field for the user's full
+	    name.
+	  </para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term>
-          <option>-d</option> <replaceable>home_dir</replaceable>
+          <option>-b</option>, <option>--base-dir</option>
+	  <replaceable>BASE_DIR</replaceable>
+        </term>
+        <listitem>
+          <para>The default base directory for the system if
+	    <option>-d</option> dir is not specified.
+	    <replaceable>BASE_DIR</replaceable> is concatenated with the
+	    account name to define the home directory. If the
+	    <option>-m</option> option is not used, base_dir must exist.
+	  </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <option>-d</option>, <option>--home</option>
+	  <replaceable>HOME_DIR</replaceable>
         </term>
         <listitem>
           <para>
-            The new user will be created using <emphasis remap='I'> home_dir
-            </emphasis>as the value for the user's login directory. The
-            default is to append the <emphasis remap='I'>login</emphasis>
-            name to <emphasis remap='I'>home</emphasis> and use that as the
-            login directory name.
+            The new user will be created using <emphasis remap='I'>HOME_DIR</emphasis>
+	    as the value for the user's login directory. The default is to append
+	    the <emphasis remap='I'>LOGIN</emphasis> name to
+	    <emphasis remap='I'>BASE_DIR</emphasis> and use that as the login directory name.
           </para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term>
-          <option>-e</option> <replaceable>expire_date</replaceable>
+          <option>-e</option>, <option>--expiredate</option>
+	  <replaceable>EXPIRE_DATE</replaceable>
         </term>
         <listitem>
           <para>The date on which the user account will be disabled. The
@@ -111,7 +107,8 @@
       </varlistentry>
       <varlistentry>
         <term>
-          <option>-f</option> <replaceable>inactive_days</replaceable>
+          <option>-f</option>, <option>--inactive</option>
+	  <replaceable>INACTIVE</replaceable>
         </term>
         <listitem>
           <para>The number of days after a password expires until the
@@ -123,7 +120,8 @@
       </varlistentry>
       <varlistentry>
         <term>
-          <option>-g</option> <replaceable>initial_group</replaceable>
+          <option>-g</option>, <option>--gid</option>
+	  <replaceable>GROUP</replaceable>
         </term>
         <listitem>
           <para>The group name or number of the user's initial login group.
@@ -136,10 +134,8 @@
       </varlistentry>
       <varlistentry>
         <term>
-          <option>-G</option> <replaceable>group1</replaceable>[<emphasis remap='I'>
-            ,group2,...,
-          </emphasis>
-          [<emphasis remap='I'>groupN</emphasis>]]]
+          <option>-G</option>, <option>--groups</option>
+	  <replaceable>GROUP1</replaceable>[<emphasis remap='I'>,GROUP2,...</emphasis>[<emphasis remap='I'>,GROUPN</emphasis>]]]
         </term>
         <listitem>
           <para>A list of supplementary groups which the user is also a
@@ -152,22 +148,14 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <option>-M</option>
-        </term>
-        <listitem>
-          <para>RedHat added the CREATE_HOME option in login.defs in their
-            version of shadow-utils (which makes -m the default, with new -M
-            option to turn it off). Unfortunately, this changes the way
-            useradd works (it can be run by scripts expecting some standard
-            behaviour), compared to other Unices and other Linux
-            distributions, and also adds a lot of confusion.
-          </para>
-        </listitem>
+	<term><option>-h</option>, <option>--help</option></term>
+	<listitem>
+	  <para>Display help message and exit.</para>
+	</listitem>
       </varlistentry>
       <varlistentry>
         <term>
-          <option>-m</option>
+          <option>-m</option>, <option>--create-home</option>
         </term>
         <listitem>
           <para>The user's home directory will be created if it does not
@@ -186,27 +174,52 @@
       </varlistentry>
       <varlistentry>
         <term>
-          <option>-o</option>
+          <option>-K</option>, <option>--key</option>
+	  <replaceable>KEY</replaceable>=<replaceable>VALUE</replaceable>
         </term>
         <listitem>
-          <para>Allow create user with duplicate (non-unique) UID.</para>
+	  <para>
+	    Overrides /etc/login.defs defaults (UID_MIN, UID_MAX, UMASK, PASS_MAX_DAYS and
+            others). For example: <option>-K</option>
+	    <replaceable>PASS_MAX_DAYS</replaceable>=<replaceable>-1</replaceable> can be
+	    used when creating system account to turn off password ageing, even though
+	    system account has no password at all. Multiple <option>-K</option> options can
+	    be specified, e.g.: <option>-K</option>
+	    <replaceable>UID_MIN</replaceable>=<replaceable>100</replaceable>
+	    <option>-K</option> <replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable>
+	  </para>
+	  <para>
+	    Note: <option>-K</option>
+	    <replaceable>UID_MIN</replaceable>=<replaceable>10</replaceable>,<replaceable>UID_MAX</replaceable>=<replaceable>499</replaceable>
+	    doesn't work yet.
+	  </para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term>
-          <option>-p</option> <replaceable>passwd</replaceable>
+          <option>-o</option>, <option>--non-unique</option>
+        </term>
+        <listitem>
+          <para>Allow create user account with duplicate (non-unique) UID.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <option>-p</option>, <option>--password</option>
+	  <replaceable>PASSWORD</replaceable>
         </term>
         <listitem>
           <para>
             The encrypted password, as returned by <citerefentry>
-              <refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum>
+            <refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum>
             </citerefentry>. The default is to disable the account.
           </para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term>
-          <option>-s</option> <replaceable>shell</replaceable>
+          <option>-s</option>, <option>--shell</option>
+	  <replaceable>SHELL</replaceable>
         </term>
         <listitem>
           <para>The name of the user's login shell. The default is to
@@ -218,7 +231,8 @@
       </varlistentry>
       <varlistentry>
         <term>
-          <option>-u</option> <replaceable>uid</replaceable>
+          <option>-u</option>, <option>--uid</option>
+	  <replaceable>UID</replaceable>
         </term>
         <listitem>
           <para>The numerical value of the user's ID. This value must be
@@ -274,7 +288,8 @@
         </varlistentry>
         <varlistentry>
           <term>
-            <option>-g</option> <replaceable>group</replaceable>
+            <option>-g</option>, <option>--gid</option>
+	    <replaceable>GROUP</replaceable>
           </term>
           <listitem>
             <para>The group name or ID for a new user's initial group. The
@@ -285,7 +300,8 @@
         </varlistentry>
         <varlistentry>
           <term>
-            <option>-s</option> <replaceable>shell</replaceable>
+            <option>-s</option>, <option>--shell</option>
+	    <replaceable>SHELL</replaceable>
           </term>
           <listitem>
             <para>The name of the new user's login shell. The named program
diff --git a/man/userdel.8 b/man/userdel.8
index c95b0975..89401c24 100644
--- a/man/userdel.8
+++ b/man/userdel.8
@@ -88,7 +88,7 @@ can't remove home directory
 .SH "SEE ALSO"
 
 .PP
-\fBchfn\fR(1), \fBchsh\fR(1), \fBpasswd\fR(1), \fBgroupadd\fR(8), \fBgroupdel\fR(8), \fBgroupmod\fR(8), \fBuseradd\fR(8), \fBusermod\fR(8) 
+\fBchfn\fR(1), \fBchsh\fR(1), \fBpasswd\fR(1), \fBgpasswd\fR(8), \fBgroupadd\fR(8), \fBgroupdel\fR(8), \fBgroupmod\fR(8), \fBuseradd\fR(8), \fBusermod\fR(8) 
 
 .SH "AUTHOR"
 
diff --git a/man/userdel.8.xml b/man/userdel.8.xml
index 80c03169..c8144d65 100644
--- a/man/userdel.8.xml
+++ b/man/userdel.8.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 		"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
 <refentry id='userdel.8'>
-  <!-- $Id: userdel.8.xml,v 1.7 2005/06/16 18:58:43 kloczek Exp $ -->
+  <!-- $Id: userdel.8.xml,v 1.8 2005/06/30 19:26:08 kloczek Exp $ -->
   <refmeta>
     <refentrytitle>USERDEL</refentrytitle>
     <manvolnum>8</manvolnum>
@@ -127,6 +127,9 @@
       <citerefentry>
         <refentrytitle>passwd</refentrytitle><manvolnum>1</manvolnum>
       </citerefentry>,
+      <citerefentry>
+        <refentrytitle>gpasswd</refentrytitle><manvolnum>8</manvolnum>
+      </citerefentry>,
       <citerefentry>
         <refentrytitle>groupadd</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>,
diff --git a/man/usermod.8 b/man/usermod.8
index 9e252b41..64b867cd 100644
--- a/man/usermod.8
+++ b/man/usermod.8
@@ -24,7 +24,7 @@ usermod \- Modify a user account
 .ad l
 .hy 0
 .HP 8
-\fBusermod\fR [\-c\ \fIcomment\fR] [\-d\ \fIhome_dir\fR\ [\-m]] [\-e\ \fIexpire_date\fR] [\-f\ \fIinactive_days\fR] [\-g\ \fIinitial_group\fR] [\-G\ \fIgroup1\fR\ [\fI,group2,\fR...\ \fI,\fR\ [\fIgroupN\fR]]] [\-l\ \fIlogin_name\fR] [\-p\ \fIpasswd\fR] [\-s\ \fIshell\fR] [\-u\ \fIuid\fR\ [\-o]] [\fB\-L\fR | \fB\-U\fR] \fIlogin\fR
+\fBusermod\fR [\-c\ \fIcomment\fR] [\-d\ \fIhome_dir\fR\ [\-m]] [\-e\ \fIexpire_date\fR] [\-f\ \fIinactive_days\fR] [\-g\ \fIinitial_group\fR] [\-G\ \fIgroup1\fR\ [\fI,group2,\fR...\ \fI,\fR\ [\fIgroupN\fR]\ [\-a]]] [\-l\ \fIlogin_name\fR] [\-p\ \fIpasswd\fR] [\-s\ \fIshell\fR] [\-u\ \fIuid\fR\ [\-o]] [\fB\-L\fR | \fB\-U\fR] \fIlogin\fR
 .ad
 .hy
 
@@ -60,7 +60,7 @@ The group name or number of the user's new initial login group\&. The group name
 
 .TP
 \fB\-G\fR \fIgroup1\fR[\fI ,group2,\&.\&.\&., \fR [\fIgroupN\fR]]]
-A list of supplementary groups which the user is also a member of\&. Each group is separated from the next by a comma, with no intervening whitespace\&. The groups are subject to the same restrictions as the group given with the \fB\-g\fR option\&. If the user is currently a member of a group which is not listed, the user will be removed from the group\&.
+A list of supplementary groups which the user is also a member of\&. Each group is separated from the next by a comma, with no intervening whitespace\&. The groups are subject to the same restrictions as the group given with the \fB\-g\fR option\&. If the user is currently a member of a group which is not listed, the user will be removed from the group\&. This behaviour can be changed via \fB\-a\fR option, which appends user to the current supplementary group list\&.
 
 .TP
 \fB\-l\fR \fIlogin_name\fR
@@ -109,7 +109,7 @@ group account information
 .SH "SEE ALSO"
 
 .PP
-\fBchfn\fR(1), \fBchsh\fR(1), \fBpasswd\fR(1), \fBcrypt\fR(3), \fBgroupadd\fR(8), \fBgroupdel\fR(8), \fBgroupmod\fR(8), \fBuseradd\fR(8), \fBuserdel\fR(8)\&.
+\fBchfn\fR(1), \fBchsh\fR(1), \fBpasswd\fR(1), \fBcrypt\fR(3), \fBgpasswd\fR(8), \fBgroupadd\fR(8), \fBgroupdel\fR(8), \fBgroupmod\fR(8), \fBuseradd\fR(8), \fBuserdel\fR(8)\&.
 
 .SH "AUTHOR"
 
diff --git a/man/usermod.8.xml b/man/usermod.8.xml
index 5c0818f4..fc3c5bf9 100644
--- a/man/usermod.8.xml
+++ b/man/usermod.8.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
 		"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
 <refentry id='usermod.8'>
-  <!--  $Id: usermod.8.xml,v 1.9 2005/06/16 16:01:21 kloczek Exp $  -->
+  <!--  $Id: usermod.8.xml,v 1.11 2005/07/07 14:25:48 kloczek Exp $  -->
   <refmeta>
     <refentrytitle>usermod</refentrytitle>
     <manvolnum>8</manvolnum>
@@ -29,6 +29,7 @@
           <arg choice='plain' rep='repeat'><replaceable>,group2,</replaceable></arg>
           <arg choice='plain'><replaceable>,</replaceable></arg>
           <arg choice='opt'><replaceable>groupN</replaceable></arg>
+	  <arg choice='opt'>-a</arg>
         </arg>
       </arg>
       <arg choice='opt'>-l <replaceable>login_name</replaceable></arg>
@@ -134,7 +135,8 @@
             same restrictions as the group given with the
             <option>-g</option> option. If the user is currently a member of
             a group which is not listed, the user will be removed from the
-            group.
+            group. This behaviour can be changed via <option>-a</option> option,
+            which appends user to the current supplementary group list.
           </para>
         </listitem>
       </varlistentry>
@@ -271,6 +273,9 @@
       <citerefentry>
         <refentrytitle>crypt</refentrytitle><manvolnum>3</manvolnum>
       </citerefentry>,
+      <citerefentry>
+        <refentrytitle>gpasswd</refentrytitle><manvolnum>8</manvolnum>
+      </citerefentry>,
       <citerefentry>
         <refentrytitle>groupadd</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>,
diff --git a/man/zh_CN/Makefile.in b/man/zh_CN/Makefile.in
index bd05f733..9c5e8208 100644
--- a/man/zh_CN/Makefile.in
+++ b/man/zh_CN/Makefile.in
@@ -93,10 +93,12 @@ LIBCRACK = @LIBCRACK@
 LIBCRYPT = @LIBCRYPT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBMD = @LIBMD@
 LIBOBJS = @LIBOBJS@
 LIBPAM = @LIBPAM@
 LIBS = @LIBS@
 LIBSELINUX = @LIBSELINUX@
+LIBSKEY = @LIBSKEY@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
diff --git a/man/zh_TW/Makefile.in b/man/zh_TW/Makefile.in
index 8ba6e5ab..0c4656c5 100644
--- a/man/zh_TW/Makefile.in
+++ b/man/zh_TW/Makefile.in
@@ -93,10 +93,12 @@ LIBCRACK = @LIBCRACK@
 LIBCRYPT = @LIBCRYPT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBMD = @LIBMD@
 LIBOBJS = @LIBOBJS@
 LIBPAM = @LIBPAM@
 LIBS = @LIBS@
 LIBSELINUX = @LIBSELINUX@
+LIBSKEY = @LIBSKEY@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
diff --git a/po/ChangeLog b/po/ChangeLog
new file mode 100644
index 00000000..dafc3804
--- /dev/null
+++ b/po/ChangeLog
@@ -0,0 +1,5 @@
+2005-05-04  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.14.3.
+	* Rules-quot: Upgrade to gettext-0.14.3.
+
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0f92baaf..01903549 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,7 +4,6 @@ libmisc/addgrps.c
 libmisc/age.c
 libmisc/basename.c
 libmisc/chkname.c
-libmisc/chkshell.c
 libmisc/chowndir.c
 libmisc/chowntty.c
 libmisc/console.c
@@ -65,6 +64,7 @@ src/chage.c
 src/chfn.c
 src/chpasswd.c
 src/chsh.c
+src/chsh_chkshell.c
 src/expiry.c
 src/faillog.c
 src/gpasswd.c
diff --git a/po/bs.gmo b/po/bs.gmo
index 0ad7c76b..9bf51cba 100644
Binary files a/po/bs.gmo and b/po/bs.gmo differ
diff --git a/po/bs.po b/po/bs.po
index 5853e553..a8246186 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
 "PO-Revision-Date: 2004-05-09 12:03+0100\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -140,12 +140,12 @@ msgstr ""
 msgid "Cannot execute %s"
 msgstr ""
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr ""
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr ""
@@ -165,16 +165,16 @@ msgstr ""
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr ""
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "Šifra:"
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "%s's Šifra: "
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -193,147 +193,147 @@ msgid ""
 "  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
 msgstr ""
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr ""
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "Minimalna trajnost šifre"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "Maskimalna trajnost šifre"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr ""
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "Upozorenje o isteku šifre"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "Šifra neaktivna"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Datum isteka računa (GGGG-MM-DD)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr ""
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, fuzzy, c-format
 msgid "never\n"
 msgstr "Nikad\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, fuzzy, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Šifra:"
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, fuzzy, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Šifra neaktivna"
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr ""
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr ""
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, c-format
 msgid "%s: Permission denied.\n"
 msgstr ""
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr ""
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr ""
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr ""
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
+msgid "%s: can't lock shadow password file\n"
 msgstr ""
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
+msgid "%s: can't open shadow password file\n"
 msgstr ""
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr ""
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr ""
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr ""
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr ""
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr ""
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr ""
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr ""
@@ -440,7 +440,7 @@ msgstr ""
 msgid "Cannot open the password file.\n"
 msgstr ""
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr ""
@@ -639,7 +639,7 @@ msgstr ""
 msgid "Who are you?\n"
 msgstr ""
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "nepoznata grupa: %s\n"
@@ -732,12 +732,12 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr ""
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr ""
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr ""
@@ -757,24 +757,24 @@ msgstr ""
 msgid "%s: %s is not a valid group name\n"
 msgstr ""
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr ""
 
-#: src/groupadd.c:325 src/useradd.c:1058
+#: src/groupadd.c:332 src/useradd.c:1094
 #, c-format
-msgid "%s: -O requires NAME=VALUE\n"
+msgid "%s: -K requires KEY=VALUE\n"
 msgstr ""
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr ""
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr ""
@@ -834,7 +834,7 @@ msgstr ""
 msgid "%s: group %s is a NIS group\n"
 msgstr ""
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr ""
@@ -1086,49 +1086,49 @@ msgid ""
 "[Disconnect bypassed -- root login allowed.]\n"
 msgstr ""
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
 "Login timed out after %d seconds.\n"
 msgstr ""
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr ""
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr ""
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
 "%s login: "
 msgstr ""
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr ""
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr ""
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr ""
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr ""
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr ""
@@ -1143,21 +1143,21 @@ msgstr ""
 msgid "Usage: sg group [[-c] command]\n"
 msgstr ""
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, fuzzy, c-format
 msgid "unknown UID: %u\n"
 msgstr "nepoznata grupa: %s\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, fuzzy, c-format
 msgid "unknown GID: %lu\n"
 msgstr "nepoznata grupa: %s\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr ""
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr ""
@@ -1301,7 +1301,7 @@ msgstr ""
 msgid "%s: Cannot execute %s"
 msgstr ""
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr ""
@@ -1418,42 +1418,42 @@ msgstr ""
 msgid "%s: can't delete shadow password file\n"
 msgstr ""
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr "Žalim."
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr ""
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr ""
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr ""
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr ""
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr ""
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
 "(Ignored)\n"
 msgstr ""
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr ""
@@ -1478,231 +1478,237 @@ msgstr ""
 msgid "No password file\n"
 msgstr ""
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr ""
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
 "(or give root password for system maintenance):"
 msgstr ""
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr ""
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr ""
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, fuzzy, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s: nepoznat član %s\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr ""
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr ""
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr ""
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr ""
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr ""
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr ""
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
 msgstr ""
 
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
-msgstr ""
-
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr ""
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr ""
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr ""
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr ""
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr ""
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr ""
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr ""
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr ""
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, c-format
 msgid "%s: can't get unique UID\n"
 msgstr ""
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr ""
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr ""
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr ""
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr ""
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr ""
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr ""
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr ""
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr ""
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr ""
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr ""
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr ""
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr ""
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr ""
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr ""
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr ""
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr ""
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr ""
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr ""
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr ""
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr ""
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr ""
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
 msgstr ""
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr ""
@@ -1752,12 +1758,12 @@ msgstr ""
 msgid "%s: warning: can't remove "
 msgstr ""
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr ""
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr ""
@@ -1772,101 +1778,106 @@ msgstr ""
 msgid "%s: error removing directory %s\n"
 msgstr ""
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr ""
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr ""
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr ""
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr ""
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr ""
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr ""
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr ""
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr ""
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr ""
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr ""
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr ""
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr ""
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr ""
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr ""
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr ""
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr ""
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr ""
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr ""
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr ""
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr ""
 
diff --git a/po/ca.gmo b/po/ca.gmo
index 646b0ca5..e50231c1 100644
Binary files a/po/ca.gmo and b/po/ca.gmo differ
diff --git a/po/ca.po b/po/ca.po
index d396d907..e5e5d428 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
 "PO-Revision-Date: 2005-06-21 01:22+0300\n"
 "Last-Translator: Guillem Jover <guillem@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -142,12 +142,12 @@ msgstr "No hi ha directori, entrant amb HOME=/"
 msgid "Cannot execute %s"
 msgstr "No es pot executar %s"
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "El directori arrel «%s» no és vàlid\n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "No s'ha pogut canviar el directori arrel a «%s»\n"
@@ -169,16 +169,16 @@ msgstr ""
 "error de configuració - element «%s» desconegut (notifiqueu-ho a "
 "l'administrador)\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "Contrasenya: "
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "Contrasenya de l'usuari %s: "
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -214,147 +214,147 @@ msgstr ""
 "  -W, --warndays DIES_AVÍS\testableix els dies d'avís d'expiració\n"
 "\t\t\t\ta DIES_AVÍS\n"
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Introduïu el nou valor, o premeu ENTER per al predeterminat\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "Duració mínima de la contrasenya"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "Duració màxima de la contrasenya"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "Últim canvi de contrasenya (AAAA-MM-DD)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "Avís de caducitat de la contrasenya"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "Contrasenya inactiva"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Data de caducitat per al compte (AAAA-MM-YY)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Últim canvi de contrasenya\t\t\t\t: "
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, c-format
 msgid "never\n"
 msgstr "mai\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "La contrasenya caduca\t\t\t\t\t: "
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Contrasenya inactiva\t\t\t\t\t: "
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "El compte caduca\t\t\t\t\t: "
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr "Número mínim de dies entre canvi de contrasenya\t\t: %ld\n"
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr "Número màxim de dies entre canvi de contrasenya\t\t: %ld\n"
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr "Número de dies d'avís abans que la contrasenya expiri\t: %ld\n"
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s: no inclogueu «l» amb altres senyaladors\n"
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: Permís denegat.\n"
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: l'autenticació PAM ha fallat\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: no es pot obrir el fitxer de contrasenyes\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s: l'usuari %s desconegut\n"
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
-msgstr "%s: no es pot bloquejar el fitxer de contrasenyes ombra"
+msgid "%s: can't lock shadow password file\n"
+msgstr "%s: no es pot bloquejar el fitxer de contrasenyes ombra\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
-msgstr "%s: no es pot obrir el fitxer de contrasenyes ombra"
+msgid "%s: can't open shadow password file\n"
+msgstr "%s: no es pot obrir el fitxer de contrasenyes ombra\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "S'està canviant la informació de caducitat per a %s\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: s'ha produït un error en canviar els camps\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: no es pot actualitzar el fitxer de contrasenyes\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: no es pot actualitzar el fitxer de contrasenyes ombra\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s: no es pot reescriure el fitxer de contrasenyes ombra\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: no es pot reescriure el fitxer de contrasenyes\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr "%s: PAM chauthok ha fallat\n"
@@ -466,7 +466,7 @@ msgstr ""
 msgid "Cannot open the password file.\n"
 msgstr "No s'ha pogut obrir el fitxer de contrasenyes.\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: no s'ha trobat %s a «/etc/passwd»\n"
@@ -687,7 +687,7 @@ msgstr "%s: contrasenyes ombra de grups requerides per a «-A»\n"
 msgid "Who are you?\n"
 msgstr "Qui sou?\n"
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "El grup és desconegut: %s\n"
@@ -780,12 +780,12 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr "Forma d'ús: groupadd [-g gid [-o]] [-f] grup\n"
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s: s'ha produït un error en afegir la nova entrada de grup\n"
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr "%s: el nom %s no és únic\n"
@@ -805,24 +805,24 @@ msgstr "%s: no es pot obtenir un GID únic\n"
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s: %s no és un nom de grup valid\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr "%s: el grup %s no és vàlid\n"
 
-#: src/groupadd.c:325 src/useradd.c:1058
-#, c-format
-msgid "%s: -O requires NAME=VALUE\n"
+#: src/groupadd.c:332 src/useradd.c:1094
+#, fuzzy, c-format
+msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: «-O» requereix NOM=VALOR\n"
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s: no es pot reescriure el fitxer de grup\n"
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s: no es pot reescriure el fitxer de grups ombra\n"
@@ -882,7 +882,7 @@ msgstr "%s: el grup %s no existeix\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s: el grup %s no és un grup NIS\n"
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s és el mestre NIS\n"
@@ -1146,7 +1146,7 @@ msgstr ""
 "\n"
 "[S'ha evitat la desconnexió -- l'accés de root està permès.]\n"
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
@@ -1155,17 +1155,17 @@ msgstr ""
 "\n"
 "L'accés ha caducat després de %d segons.\n"
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr " a «%.100s» des de «%.200s»"
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr " a «%.100s»"
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
@@ -1174,25 +1174,25 @@ msgstr ""
 "\n"
 "%s accés: "
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr "Accés incorrecte"
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Avís: accés reactivat després d'un bloqueig temporal.\n"
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr "Últim accés: %s a %s"
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr "Última accés: %.19s a %s"
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr " des de %.*s"
@@ -1207,21 +1207,21 @@ msgstr "Forma d'ús: newgrp [-] [grup]\n"
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Forma d'ús: sg grup [[-c] ordre]\n"
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "El UID és desconegut: %u\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr "El GID és desconegut: %lu\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr "Disculpeu.\n"
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr "hi ha massa grups\n"
@@ -1368,7 +1368,7 @@ msgstr "%s: sense memòria\n"
 msgid "%s: Cannot execute %s"
 msgstr "%s: No es pot executar %s"
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: el repositori %s no està suportat\n"
@@ -1485,35 +1485,35 @@ msgstr "%s: no es pot actualitzar l'entrada per a l'usuari %s\n"
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: no es pot eliminar el fitxer de contrasenyes ombra\n"
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr "Disculpeu."
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s: s'ha d'executar des d'una terminal\n"
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr "%s: pam_start: s'ha produït un error %d\n"
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr "L'id és desconegut: %s\n"
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "No esteu autoritzats a usar «su %s»\n"
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr "(Introduïu la vostra pròpia contrasenya)."
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -1522,7 +1522,7 @@ msgstr ""
 "%s: %s\n"
 "(Ignorat)\n"
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr "No hi ha intèrpret\n"
@@ -1548,12 +1548,12 @@ msgstr ""
 msgid "No password file\n"
 msgstr "No hi ha fitxer de contrasenyes\n"
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr "No hi ha entrada de contrasenya per a «root»\n"
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
@@ -1563,216 +1563,221 @@ msgstr ""
 "Pitgeu «control-d» per a continuar amb l'inici normal de sistema,\n"
 "(o introduïu la contrasenya de «root» per a manteniment del sistema):"
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr "S'està entrant en mode de manteniment del sistema\n"
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s: l'argument numèric «%s» no és vàlid\n"
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s: el GID %s és desconegut\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s: el grup %s és desconegut\n"
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: no es pot crear un fitxer nou de preferències predeterminades\n"
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr "%s: no es pot obrir un fitxer nou de preferències predeterminades\n"
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr "%s: renombra: %s"
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s: el grup «%s» és un grup NIS.\n"
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: s'han especificat massa grups (màx de %d).\n"
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
-msgstr "Forma d'ús: useradd [-u uid [-o]] [-g grup] [-G grup,...] \n"
-
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
 msgstr ""
-"                    [-d home] [-s intèrpret] [-c ordre] [-m [-k plantilla]]\n"
 
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr "                    [-f inactiu] [-e caduca]\n"
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr "                    [-p contrasenya] nom\n"
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr "            useradd -D [-g grup] [-b base] [-s intèrpret]\n"
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s: s'ha produït un error en bloquejar el fitxer de grups\n"
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s: s'ha produït un error en obrir el fitxer de grups\n"
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s: s'ha produït un error en bloquejar el fitxer de grups ombra\n"
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s: s'ha produït un error en obrir el fitxer de grups ombra\n"
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: el UID %u no és únic\n"
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, c-format
 msgid "%s: can't get unique UID\n"
 msgstr "%s: no es pot obtenir un UID únic\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr "%s: el directori base «%s» no és vàlid\n"
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr "%s: el comentari «%s» no és vàlid\n"
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s: el directori home «%s» no és vàlid\n"
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s: la data «%s» no és vàlida\n"
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr "%s: les contrasenyes ombra són requerides per a «-e»\n"
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr "%s: les contrasenyes ombra són requerides per a «-f»\n"
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s: el camp «%s» no és vàlid\n"
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr "%s: l'intèrpret «%s» no és vàlid\n"
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr "%s: el nom d'usuari «%s» no és vàlid\n"
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s: no es pot reescriure el fitxer de contrasenyes\n"
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s: no es pot reescriure el fitxer de contrasenyes ombra\n"
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s: no es pot bloquejar el fitxer de contrasenyes\n"
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s: no es pot d'obrir el fitxer de contrasenyes\n"
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s: no es pot bloquejar el fitxer de contrasenyes ombra\n"
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s: no es pot obrir el fitxer de contrasenyes ombra\n"
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr "%s: s'ha produït un error en afegir la nova entrada de contrasenya\n"
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr ""
 "%s: s'ha produït un error en afegir la nova entrada de contrasenya ombra\n"
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: no es pot crear el directori %s\n"
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr ""
 "No existeix el grup «mail», s'està creant la cua de correu amb mode 0600.\n"
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr "No es pot crear la cua de correu per a l'usuari %s.\n"
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s: l'usuari %s existeix\n"
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
@@ -1780,7 +1785,7 @@ msgstr ""
 "%s: el grup %s existeix, si voleu afegir aquest usuari a aquest grup, useu «-"
 "g».\n"
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr ""
@@ -1832,12 +1837,12 @@ msgstr "%s: %s no és propietat de %s, no s'elimina\n"
 msgid "%s: warning: can't remove "
 msgstr "%s: avís: no es pot eliminar "
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s: l'usuari %s no existeix\n"
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: l'usuari %s és un usuari NIS\n"
@@ -1852,102 +1857,107 @@ msgstr "%s: no s'elimina el directori %s (eliminaria el home de l'usuari %s)\n"
 msgid "%s: error removing directory %s\n"
 msgstr "%s: s'ha produït un error en eliminar el directori %s\n"
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr "Forma d'ús: %s\t[-u uid [-o]] [-g grup] [-G grup,...]\n"
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr "\t\t[-d home [-m]] [-s intèrpret] [-c comentari] [-l nom_nou]\n"
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr "[-f inactiu] [-e caduca] "
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr "[-p contrasenya] [-L|-U] nom\n"
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s: sense memòria a update_group\n"
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s: sense memòria a update_gshadow\n"
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: no s'han especificat senyaladors\n"
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: les contrasenyes ombra són requerides per a «-e» i «-f»\n"
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr ""
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr "%s: l'UID %lu no és únic\n"
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s: s'ha produït un error en canviar l'entrada de contrasenya\n"
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s: s'ha produït un error en eliminar l'entrada de contrasenya\n"
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr "%s: s'ha produït un error en eliminar l'entrada de contrasenya ombra\n"
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: el directori %s ja existeix\n"
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s: no es pot crear %s\n"
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s: no es pot fer canviar el propietari a %s\n"
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
 "%s: avís: no s'ha pogut eliminar completament l'antic directori home %s"
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s: no es pot renombrar el directori %s a %s\n"
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: avís: %s no és propietat de %s\n"
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr "no s'ha pogut canviar el propietari de la bústia de correu"
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr "no s'ha pogut renombrar la bústia de correu"
 
@@ -1983,3 +1993,26 @@ msgstr ""
 "Forma d'ús:\n"
 "«vipw» edita /etc/passwd        «vipw -s» edita /etc/shadow\n"
 "«vigr» edita /etc/group         «vigr -s» edita /etc/gshadow\n"
+
+#, fuzzy
+#~ msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
+#~ msgstr "Forma d'ús: useradd [-u uid [-o]] [-g grup] [-G grup,...] \n"
+
+#~ msgid ""
+#~ "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+#~ msgstr ""
+#~ "                    [-d home] [-s intèrpret] [-c ordre] [-m [-k "
+#~ "plantilla]]\n"
+
+#~ msgid "               [-f inactive] [-e expire]\n"
+#~ msgstr "                    [-f inactiu] [-e caduca]\n"
+
+#, fuzzy
+#~ msgid "               [-p passwd] [-K KEY=VALUE] name\n"
+#~ msgstr "                    [-p contrasenya] nom\n"
+
+#~ msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
+#~ msgstr "            useradd -D [-g grup] [-b base] [-s intèrpret]\n"
+
+#~ msgid "%s: -O requires NAME=VALUE\n"
+#~ msgstr "%s: «-O» requereix NOM=VALOR\n"
diff --git a/po/cs.gmo b/po/cs.gmo
index 4606d4dc..36fe7ec5 100644
Binary files a/po/cs.gmo and b/po/cs.gmo differ
diff --git a/po/cs.po b/po/cs.po
index 127426ce..925cdc6c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: shadow 4.0.10\n"
+"Project-Id-Version: shadow 4.0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
-"PO-Revision-Date: 2005-06-21 10:11+0200\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
+"PO-Revision-Date: 2005-07-16 10:43+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -147,12 +147,12 @@ msgstr "Žádný adresář, nastavuji HOME na /"
 msgid "Cannot execute %s"
 msgstr "%s nelze spustit"
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "Chybný kořenový adresář \"%s\"\n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "Nelze nastavit kořenový adresář na \"%s\"\n"
@@ -173,16 +173,16 @@ msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr ""
 "konfigurační chyba - neznámý předmět '%s' (informujte správce systému)\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "Heslo: "
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "Heslo uživatele %s:"
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -215,148 +215,148 @@ msgstr ""
 "\t\t\t\thesla na MAX_DNŮ\n"
 "  -W, --warndays VAR_DNŮ\tnastaví varování o expiraci na VAR_DNŮ\n"
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr ""
 "Zadejte novou hodnotu, nebo stiskněte ENTER pro použití implicitní hodnoty\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "Minimální stáří hesla"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "Maximální stáří hesla"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "Poslední změna hesla (RRRR-MM-DD)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "Varování o vypršení platnosti hesla"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "Vypnuté heslo"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Vypršení platnosti účtu (RRRR-MM-DD)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Poslední změna hesla\t\t\t\t\t: "
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, c-format
 msgid "never\n"
 msgstr "nikdy\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Platnost hesla vyprší\t\t\t\t\t: "
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Vypnuté heslo\t\t\t\t\t: "
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Platnost účtu vyprší\t\t\t\t\t\t: "
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr "Minimální počet dnů mezi změnami hesla\t\t: %ld\n"
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr "Maximální počet dnů mezi změnami hesla\t\t: %ld\n"
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr "Počet varovných dnů před vypršením platnosti hesla\t: %ld\n"
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s: nepoužívejte \"l\" s ostatními příznaky\n"
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: Přístup odmítnut.\n"
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: ověření pomocí PAM selhalo\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: soubor s hesly nelze otevřít\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s: neznámý uživatel %s\n"
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
-msgstr "%s: soubor se stínovými hesly nelze zamknout"
+msgid "%s: can't lock shadow password file\n"
+msgstr "%s: soubor se stínovými hesly nelze zamknout\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
-msgstr "%s: soubor se stínovými hesly nelze otevřít"
+msgid "%s: can't open shadow password file\n"
+msgstr "%s: soubor se stínovými hesly nelze otevřít\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "Měním informace o uživateli %s\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: chyba při změně položek\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: soubor s hesly nelze aktualizovat\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: soubor se stínovými hesly nelze aktualizovat\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s: soubor se stínovými hesly nelze přepsat\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: soubor s hesly nelze přepsat\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr "%s: PAM chauthtok selhal\n"
@@ -467,7 +467,7 @@ msgstr "Nelze zamknout soubor s hesly; zkuste to později.\n"
 msgid "Cannot open the password file.\n"
 msgstr "Soubor s hesly nelze otevřít.\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: %s se v /etc/passwd nenalézá\n"
@@ -685,7 +685,7 @@ msgstr "%s: přepínač -A funguje pouze se stínovými hesly skupin\n"
 msgid "Who are you?\n"
 msgstr "Kdo jste?\n"
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "neznámá skupina %s\n"
@@ -778,12 +778,12 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr "Použití: groupadd [-g gid [-o]] [-f] skupina\n"
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s: chyba při přidávání položky souboru se skupinami\n"
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr "%s: jméno %s není jedinečné\n"
@@ -803,24 +803,24 @@ msgstr "%s: nelze získat jedinečné GID\n"
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s: %s není platným jménem skupiny\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr "%s: chybná skupina %s\n"
 
-#: src/groupadd.c:325 src/useradd.c:1058
+#: src/groupadd.c:332 src/useradd.c:1094
 #, c-format
-msgid "%s: -O requires NAME=VALUE\n"
-msgstr "%s: přepínač -O vyžaduje argument typu JMÉNO=HODNOTA\n"
+msgid "%s: -K requires KEY=VALUE\n"
+msgstr "%s: parametr -K vyžaduje argument typu KLÍČ=HODNOTA\n"
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s: soubor se skupinami nelze přepsat\n"
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s: soubor se stínovými skupinami nelze přepsat\n"
@@ -880,7 +880,7 @@ msgstr "%s: skupina %s neexistuje\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s: skupina %s je NIS skupinou\n"
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s je hlavním NIS serverem\n"
@@ -914,7 +914,7 @@ msgstr ""
 #: src/grpck.c:89
 #, c-format
 msgid "Usage: %s [-r] [-s] [group]\n"
-msgstr "Usage: %s [-r] [-s] [soubor se skupinami]\n"
+msgstr "Použití: %s [-r] [-s] [soubor se skupinami]\n"
 
 #: src/grpck.c:107 src/pwck.c:100
 msgid "No"
@@ -1143,7 +1143,7 @@ msgstr ""
 "\n"
 "[Odpojení přeskočeno -- uživatel root smí být přihlášen.]\n"
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
@@ -1152,17 +1152,17 @@ msgstr ""
 "\n"
 "Vypršel časový limit (%d vteřin) pro přihlášení.\n"
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr " na `%.100s' z `%.200s'"
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr " na `%.100s'"
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
@@ -1171,25 +1171,25 @@ msgstr ""
 "\n"
 "Přihlašovací jméno na %s: "
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr "Chybné přihlášení"
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Varování: po dočasném zákazu je přihlašování opět povoleno.\n"
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr "Poslední přihlášení: %s na %s"
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr "Poslední přihlášení: %.19s na %s"
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr " z %.*s"
@@ -1204,21 +1204,21 @@ msgstr "Použití: newgrp [-] [skupina]\n"
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Použití: sg skupina [[-c] příkaz]\n"
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "neznámé UID: %u\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr "neznámé GID: %lu\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr "Lituji.\n"
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr "příliš mnoho skupin\n"
@@ -1364,7 +1364,7 @@ msgstr "%s: došla paměť\n"
 msgid "%s: Cannot execute %s"
 msgstr "%s: %s nelze spustit"
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: úložna %s není podporována\n"
@@ -1482,35 +1482,35 @@ msgstr "%s: položku pro uživatele %s nelze aktualizovat\n"
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: nemůžete smazat soubor se stínovými hesly\n"
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr "Lituji."
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s: musí být spuštěno z terminálu\n"
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr "%s: pam_start: chyba %d\n"
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr "Neznámé id: %s\n"
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Nejste oprávněn používat su %s\n"
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr "(Zadejte své heslo.)"
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -1519,7 +1519,7 @@ msgstr ""
 "%s: %s\n"
 "(Ignoruji)\n"
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr "Žádný shell\n"
@@ -1544,12 +1544,12 @@ msgstr "Pro ověření zadejte VAŠE vlastní heslo.\n"
 msgid "No password file\n"
 msgstr "Soubor s hesly neexistuje\n"
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr "V databázi není položka pro uživatele 'root'\n"
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
@@ -1559,215 +1559,244 @@ msgstr ""
 "Stiskněte control-d pro normální spuštění systému,\n"
 "(nebo zadejte heslo uživatele root pro údržbu systému):"
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr "Vstupuji do režimu údržby systému\n"
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s: chybný numerický argument `%s'\n"
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s: neznámé GID %s\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s: neznámá skupina %s\n"
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: nemohu vytvořit nový soubor s implicitními hodnotami\n"
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr "%s: nemohu vytvořit nový soubor s implicitními hodnotami\n"
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr "%s: přejmenovat: %s"
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s: skupina `%s' je NIS skupinou\n"
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: zadáno příliš mnoho skupin (max %d).\n"
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
-msgstr "Použití: useradd [-u uid [-o]] [-g skupina [-G skupina,...] \n"
-
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
 msgstr ""
-"                 [-d domácí adr.] [-s shell] [-c komentář]\n"
-"                 [-m [-k šablona]]\n"
+"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"
 
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr "                 [-f vypnutí] [-e vypršení]\n"
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr "                 [-p heslo] jméno\n"
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr "         useradd -D [-g skupina [-b základní adr.] [-s shell]\n"
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s: chyba při zamykání souboru se skupinami\n"
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s: chyba při otevírání souboru se skupinami\n"
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s: chyba při zamykání souboru se stínovými hesly\n"
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s: chyba při otevírání souboru se stínovými hesly\n"
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: UID %u není jedinečné\n"
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, c-format
 msgid "%s: can't get unique UID\n"
 msgstr "%s: nelze získat jedinečné UID\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr "%s: chybný základní adresář `%s'\n"
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr "%s: chybný komentář `%s'\n"
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s: chybný domácí adresář `%s'\n"
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s: chybné datum `%s'\n"
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr "%s: přepínač -e vyžaduje stínová hesla\n"
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr "%s: přepínač -f vyžaduje stínová hesla\n"
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s: chybná položka `%s'\n"
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr "%s: chybný shell `%s'\n"
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr "%s: chybné uživatelské jméno `%s'\n"
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s: soubor s hesly nelze přepsat\n"
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s: soubor se stínovými hesly nelze přepsat\n"
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s: soubor s hesly nelze zamknout\n"
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s: soubor s hesly nelze otevřít\n"
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s: soubor se stínovými hesly nelze zamknout\n"
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s: soubor se stínovými hesly nelze otevřít\n"
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr "%s: chyba při vytváření nové položky v souboru s hesly\n"
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr "%s: chyba při vytváření nové položky v souboru se stínovými hesly\n"
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: adresář %s nelze vytvořit\n"
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr "Skupina \"mail\" neexistuje, vytvářím soubor s poštou s právy 0600.\n"
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr "Nemohu vytvořit soubor s příchozí poštou pro uživatele %s.\n"
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s: uživatel %s již existuje\n"
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
@@ -1775,7 +1804,7 @@ msgstr ""
 "%s: skupina %s existuje - chcete-li přidat uživatele do této skupiny, "
 "použijte -g.\n"
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: varování: CREATE_HOME není podporováno, použijte přepínač -m\n"
@@ -1825,12 +1854,12 @@ msgstr "%s: vlastníkem %s není %s, nemažu jej\n"
 msgid "%s: warning: can't remove "
 msgstr "%s: varování: nemohu smazat "
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s: uživatel %s neexistuje\n"
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: uživatel %s je NIS uživatelem\n"
@@ -1845,101 +1874,106 @@ msgstr "%s: adresář %s nebudu mazat (je to domácí adresář uživatele %s)\n
 msgid "%s: error removing directory %s\n"
 msgstr "%s: chyba při mazání adresáře %s\n"
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr "Použití: %s [-u uid [-o]] [-g skupina [-G skupina,...] \n"
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr "\t\t[-d domácí adr. [-m]] [-s shell] [-c komentář] [-l nové jméno]\n"
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr "[-f vypnutí] [-e vypršení] "
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr "[-p heslo] [-L|-U] jméno\n"
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s nedostatek paměti v update_group\n"
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s: nedostatek paměti v update_gshadow\n"
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: žádné přepínače\n"
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: přepínače -e a -f vyžadují stínová hesla\n"
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr "%s: přepínač -a je povolen POUZE s přepínačem -G\n"
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
-msgstr "%s uid %lu není jedinečné\n"
+msgstr "%s: uid %lu není jedinečné\n"
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s: chyba při změně položky v souboru s hesly\n"
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s: chyba při odstraňování položky ze souboru s hesly\n"
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr "%s: chyba při odstraňování položky ze souboru se stínovými hesly\n"
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: adresář %s již existuje\n"
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s: %s nelze vytvořit\n"
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s: volání chown pro %s selhalo\n"
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr "%s: varování: selhalo úplné odstranění domovského adresáře %s"
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s: adresář %s nelze na %s přejmenovat\n"
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: varování: vlastníkem %s není %s\n"
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr "chyba při změně vlastníka poštovní schránky"
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr "chyba při přejmenovávání poštovní schránky"
 
diff --git a/po/da.gmo b/po/da.gmo
index 14df44b9..bf733ec8 100644
Binary files a/po/da.gmo and b/po/da.gmo differ
diff --git a/po/da.po b/po/da.po
index 2309172e..68a75c13 100644
--- a/po/da.po
+++ b/po/da.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: shadow 4.0.10\n"
+"Project-Id-Version: shadow 4.0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
-"PO-Revision-Date: 2005-06-20 22:27+0200\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
+"PO-Revision-Date: 2005-07-11 21:49+0200\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
 "MIME-Version: 1.0\n"
@@ -145,12 +145,12 @@ msgstr "Ingen mappe, logger på med HOME=/"
 msgid "Cannot execute %s"
 msgstr "Kan ikke udføre %s"
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "Ugyldig rodmappe \"%s\"\n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "Kan ikke ændre rodmappen til \"%s\"\n"
@@ -170,16 +170,16 @@ msgstr "Kunne ikke frigøre plads til opsætningsoplysninger.\n"
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr "opsætningsfejl - ukendt punkt %s (informér administrator)\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "Adgangskode: "
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "%s's adgangskode: "
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -213,147 +213,147 @@ msgstr ""
 "  -W, --warndays VARSELSDAGE\tsæt antallet af udløbsvarselsdage til "
 "VARSELSDAGE\n"
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Angiv ny værdi eller tryk RETUR for standardværdien\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "Minimal adgangskode-alder"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "Maksimal adgangskode-alder"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "Sidste ændring af adgangskode (ÅÅÅÅ-MM-DD)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "Advarsel om udløb af adgangskode"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "Adgangskode inaktiv"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Konto-udløbsdato (ÅÅÅÅ-MM-DD)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Sidste ændring af adgangskode\t\t\t\t\t: "
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, c-format
 msgid "never\n"
 msgstr "aldrig\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Adgangskode udløber\t\t\t\t\t: "
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Adgangskode inaktiv\t\t\t\t\t: "
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Konto udløber\t\t\t\t\t\t: "
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr "Minimalt antal dage mellem ændring af adgangskoden\t\t: %ld\n"
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr "Maksimalt antal dage mellem ændring af adgangskoden\t\t: %ld\n"
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr "Antal dages forvarsel om adgangskodens udløb\t: %ld\n"
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s: medtag ikke \"l\" med andre flag\n"
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: Adgang nægtet.\n"
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM-autentifikation mislykkedes\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: kan ikke åbne adgangskodefil\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s: ukendt bruger %s\n"
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
-msgstr "%s: kan ikke låse skyggeadgangskodefil"
+msgid "%s: can't lock shadow password file\n"
+msgstr "%s: kan ikke låse skyggeadgangskodefil\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
-msgstr "%s: kan ikke åbne skyggeadgangskodefil"
+msgid "%s: can't open shadow password file\n"
+msgstr "%s: kan ikke åbne skyggeadgangskodefil\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "Ændrer forældelsesoplysninger for %s\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: fejl ved ændring af felter\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: kan ikke opdatere adgangskodefil\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: kan ikke opdatere skyggeadgangskodefil\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s: kan ikke genskrive skyggeadgangskodefilen\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: kan ikke genskrive adgangskodefilen\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr "%s: PAM chauthtok fejlede\n"
@@ -463,7 +463,7 @@ msgstr "Kan ikke låse adgangskodefilen; forsøg igen senere.\n"
 msgid "Cannot open the password file.\n"
 msgstr "Kan ikke åbne adgangskodefilen.\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: %s ikke fundet i /etc/passwd\n"
@@ -682,7 +682,7 @@ msgstr "%s: der kræves skyggeadgangskoder for -A\n"
 msgid "Who are you?\n"
 msgstr "Hvem er du?\n"
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "ukendt gruppe: %s\n"
@@ -775,12 +775,12 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr "Brug: groupadd [-g gid [-o]] [-f] gruppe\n"
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s: fejl under tilføjelse af gruppelinje\n"
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr "%s: navnet %s er ikke unikt\n"
@@ -800,24 +800,24 @@ msgstr "%s: kan ikke få unik GID\n"
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s: %s er ikke et gyldigt gruppenavn\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr "%s: ugyldig gruppe %s\n"
 
-#: src/groupadd.c:325 src/useradd.c:1058
+#: src/groupadd.c:332 src/useradd.c:1094
 #, c-format
-msgid "%s: -O requires NAME=VALUE\n"
-msgstr "%s: -O kræver NAVN=VÆRDI\n"
+msgid "%s: -K requires KEY=VALUE\n"
+msgstr "%s: -K kræver NAVN=VÆRDI\n"
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s: kan ikke genskrive gruppefil\n"
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s: kan ikke genskrive skyggegruppefil\n"
@@ -877,7 +877,7 @@ msgstr "%s: gruppen %s eksisterer ikke\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s: gruppen %s er en NIS-gruppe\n"
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s er NIS-masteren\n"
@@ -1140,7 +1140,7 @@ msgstr ""
 "\n"
 "[Afbrød ikke forbindelsen -- root-login er tilladt.]\n"
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
@@ -1149,17 +1149,17 @@ msgstr ""
 "\n"
 "Login udløb efter %d sekunder.\n"
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr " på `%.100s' fra `%.200s'"
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr " på `%.100s'"
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
@@ -1168,25 +1168,25 @@ msgstr ""
 "\n"
 "%s login: "
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr "Forkert login"
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Advarsel: login genetableret efter midlertidig udelukkelse.\n"
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr "Sidst logget på: %s på %s"
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr "Sidst logget på: %.19s på %s"
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr " fra %.*s"
@@ -1201,21 +1201,21 @@ msgstr "Brug: newgrp [-] [gruppe]\n"
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Brug: sg gruppe [[-c] kommando]\n"
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "ukendt UID: %u\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr "ukendt GID: %lu\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr "Beklager.\n"
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr "for mange grupper\n"
@@ -1361,7 +1361,7 @@ msgstr "%s: hukommelse opbrugt\n"
 msgid "%s: Cannot execute %s"
 msgstr "%s: Kan ikke udføre %s"
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: samlingen %s understøttes ikke\n"
@@ -1478,35 +1478,35 @@ msgstr "%s: kan ikke opdatere linje for brugeren %s\n"
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: kan ikke slette skyggeadgangskodefilen\n"
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr "Beklager."
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s: skal køres fra en terminal\n"
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr "%s: pam_start: fejl %d\n"
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr "Ukendt id: %s\n"
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Du er ikke autoriseret til at 'su %s'\n"
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr "(Angiv din adgangskode.)"
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -1515,7 +1515,7 @@ msgstr ""
 "%s: %s\n"
 "(Ignoreret)\n"
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr "Ingen skal\n"
@@ -1540,12 +1540,12 @@ msgstr "Angiv din EGEN adgangskode som autentifikation.\n"
 msgid "No password file\n"
 msgstr "Ingen adgangskodefil\n"
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr "Ingen adgangskodelinje for 'root'\n"
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
@@ -1555,216 +1555,244 @@ msgstr ""
 "Tryk control-d for at fortsætte den normale opstart,\n"
 "(eller angiv root-adgangskoden for systemvedligehold):"
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr "Går i systemvedligeholdelses-tilstand\n"
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s: ugyldigt numerisk parameter`%s'\n"
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s: ukendt GID %s\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s: ukendt gruppe %s\n"
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: kan ikke oprette ny standardværdi-fil\n"
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr "%s: kan ikke åbne ny standardværdi-fil\n"
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr "%s: omdøb: %s"
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s: gruppen`%s' er en NIS-gruppe.\n"
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
-msgstr "%s: der er angivet for mange grupper (maks %d).\n"
+msgstr "%s: der er angivet for mange grupper (højst %d).\n"
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
-msgstr "Brug: useradd [-u uid [-o]] [-g gruppe] [-G gruppe,...] \n"
-
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
 msgstr ""
-"              [-d hjemmemappe] [-s skal] [-c kommentar] [-m [-k skabelon]]\n"
+"Brug: useradd [tilvalg] LOGIND\n"
+"\n"
+"Tilvalg:\n"
+"  -b, --base-dir GRUNDMAPPE\tGrundmappe for den nye brugerkontos "
+"hjemmebibliotek\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 i /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 "
+"brugerkonto\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 "
+"brugerkonto\n"
 
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr "              [-f inaktiv] [-e udløb ]\n"
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr "              [-p adgangskode] navn\n"
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr "      useradd -D [-g gruppe] [-b grundmappe] [-s skal]\n"
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s: fejl under låsning af gruppefil\n"
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s: fejl under åbning af gruppefil\n"
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s: fejl under låsning af skyggegruppefil\n"
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s: fejl under åbning af skyggegruppefil\n"
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: UID %u er ikke unikt\n"
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, c-format
 msgid "%s: can't get unique UID\n"
 msgstr "%s: kan ikke få unik UID\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr "%s: ugyldig grundmappe '%s'\n"
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr "%s: ugyldig kommentar '%s'\n"
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s: ugyldig hjemmemappe '%s'\n"
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s: ugyldig dato '%s'\n"
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr "%s: der kræves skyggeadgangskoder for -e\n"
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr "%s: der kræves skyggeadgangskoder for -f\n"
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s: ugyldigt felt ''%s'\n"
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr "%s: ugyldig skal '%s'\n"
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr "%s: ugyldigt brugernavn '%s'\n"
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s: kan ikke genskrive adgangskodefilen\n"
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s: kan ikke genskrive skyggeadgangskodefilen\n"
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s: kunne ikke låse adgangskodefilen\n"
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s: kunne ikke åbne adgangskodefilen\n"
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s: kunne ikke låse skyggeadgangskodefilen\n"
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s: kunne ikke åbne skyggeadgangskodefilen\n"
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr "%s: fejl under tilføjelse af ny adgangskodelinje\n"
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr "%s: fejl under tilføjelse af ny skyggeadgangskode-linje\n"
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: kan ikke oprette mappen %s\n"
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr ""
 "Der er ingen gruppe med navnet \"mail\", opretter postkø med "
 "filrettighederne 0600.\n"
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr "Kan ikke oprette postkø for brugeren %s.\n"
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s: brugeren %s eksisterer\n"
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
@@ -1772,7 +1800,7 @@ msgstr ""
 "%s: gruppen %s eksisterer - brug -g hvis du vil tilføje denne bruger til den "
 "gruppe.\n"
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: advarsel: CREATE_HOME understøttes ikke, brug i stedet -m.\n"
@@ -1822,12 +1850,12 @@ msgstr "%s: %s ejes ikke af %s, fjerner ikke\n"
 msgid "%s: warning: can't remove "
 msgstr "%s: advarsel: kan ikke fjerne "
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s: brugeren %s eksisterer ikke\n"
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: brugeren %s er en NIS-bruger\n"
@@ -1843,101 +1871,106 @@ msgstr ""
 msgid "%s: error removing directory %s\n"
 msgstr "%s: fejl under fjernelse af mappen %s\n"
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr "Brug: %s\t[-u uid [-o]] [-g gruppe] [-G gruppe,...] \n"
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr "\t\t[-d hjemmemappe [-m]] [-s skal] [-c kommentar] [-l nyt_navn]\n"
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr "[-f inaktiv] [-e udløb ] "
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr "[-p adgangskode] [-L|-U] navn\n"
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s: løbet tør for hukommelse i update_group\n"
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s: løbet tør for hukommelse i update_gshadow\n"
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: ingen flag angivet\n"
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: skyggeadgangskoder kræves for e og -f\n"
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr "%s: flaget -a er KUN tilladt sammen med -G\n"
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr "%s: uid %lu er ikke unik\n"
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s: fejl under ændring af adgangskodelinje\n"
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s: fejl under fjernelse af adgangskodelinje\n"
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr "%s: fejl under fjernelse af skyggeadgangskodelinje\n"
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: mappen %s eksisterer\n"
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s: kan ikke oprette %s\n"
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s: kan ikke chown %s\n"
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr "%s: advarsel: kunne ikke fjerne den gamle hjemmemappe %s fuldstændigt"
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s: kan ikke omdøbe mappen %s til %s\n"
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: advarsel: %s ejes ikke af %s\n"
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr "kunne ikke ændre postkassens ejer"
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr "kunne ikke omdøbe postkasse"
 
@@ -1974,6 +2007,29 @@ msgstr ""
 "'vipw' redigerer /etc/passwd    `vipw -s' redigerer /etc/shadow\n"
 "'vigr' redigerer /etc/group     `vigr -s' redigerer /etc/gshadow\n"
 
+#, fuzzy
+#~ msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
+#~ msgstr "Brug: useradd [-u uid [-o]] [-g gruppe] [-G gruppe,...] \n"
+
+#~ msgid ""
+#~ "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+#~ msgstr ""
+#~ "              [-d hjemmemappe] [-s skal] [-c kommentar] [-m [-k "
+#~ "skabelon]]\n"
+
+#~ msgid "               [-f inactive] [-e expire]\n"
+#~ msgstr "              [-f inaktiv] [-e udløb ]\n"
+
+#, fuzzy
+#~ msgid "               [-p passwd] [-K KEY=VALUE] name\n"
+#~ msgstr "              [-p adgangskode] navn\n"
+
+#~ msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
+#~ msgstr "      useradd -D [-g gruppe] [-b grundmappe] [-s skal]\n"
+
+#~ msgid "%s: -O requires NAME=VALUE\n"
+#~ msgstr "%s: -O kræver NAVN=VÆRDI\n"
+
 #~ msgid "unknown uid: %u\n"
 #~ msgstr "ukendt uid: %u\n"
 
diff --git a/po/de.gmo b/po/de.gmo
index e57ba480..2e9d06e9 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 6b0ff7a7..d56e3a7f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: shadow 4.0.10\n"
+"Project-Id-Version: shadow 4.0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
 "PO-Revision-Date: 2002-03-11 12:02-0100\n"
 "Last-Translator: Frank Schmid <frank@cs-schmid.de>\n"
 "Language-Team: Frank Schmid <frank@cs-schmid.de>\n"
@@ -144,12 +144,12 @@ msgstr "Kein Verzeichnis, Anmeldung mit HOME=/"
 msgid "Cannot execute %s"
 msgstr "Kann %s nicht ausführen"
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "Ungültiges Basisverzeichnis \"%s\"\n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "Kann Basisverzeichnis nicht nach \"%s\" ändern\n"
@@ -170,16 +170,16 @@ msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr ""
 "Konfigurationsfehler - Element '%s' unbekannt (Administrator verständigen)\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "Kennwort: "
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "Kennwort von %s: "
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -211,147 +211,147 @@ msgstr ""
 "\t\t\t\tgeändert werden kann auf MAX_DAYS setzen\n"
 "  -W, --warndays WARN_DAYS\tAblaufwarnung aif WARN_DAYS setzen\n"
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Geben Sie einen neuen Wert an oder ENTER für den Standardwert\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "Minimales Kennwortalter"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "Maximales Kennwortalter"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "Letzte Kennwortänderung (JJJJ-MM-TT)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "Warnung falls das Kennwort abläuft"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "Kennwort inaktiv"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Ablaufdatum des Accounts (JJJJ-MM-TT)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Letzte Kennwortänderung\t\t\t\t\t: "
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, c-format
 msgid "never\n"
 msgstr "Nie\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Kennwort läuft ab\t\t\t\t\t: "
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Kennwort inaktiv\t\t\t\t\t: "
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Account läuft ab\t\t\t\t\t\t: "
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr "Minimale Anzahl der Tage zwischen Kennwortänderungen\t: %ld\n"
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr "Maximale Anzahl der Tage zwischen Kennwortänderungen\t: %ld\n"
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr "Anzahl der Tage an denen vor dem Kennwortablauf gewarnt wird\t: %ld\n"
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s: benutzen Sie \"l\" nicht mit anderen Optionen\n"
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: Zugriff verweigert\n"
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM-Authentifizierung fehlgeschlagen\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: Kann Kennwortdatei nicht öffnen\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s: Benutzer %s unbekannt\n"
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
-msgstr "%s: Kann Shadow-Datei nicht sperren"
+msgid "%s: can't lock shadow password file\n"
+msgstr "%s: Kann Shadow-Datei nicht sperren\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
-msgstr "%s: Kann Shadow-Datei nicht öffnen"
+msgid "%s: can't open shadow password file\n"
+msgstr "%s: Kann Shadow-Datei nicht öffnen\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "Ändere die Kennwortalterung für %s\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: Fehler beim ändern der Felder\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: Kann Kennwortdatei nicht aktualisieren\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: Kann Shadow-Datei nicht aktualisieren\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s: Kann die Shadow-Datei nicht neu erstellen\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: Kann die Kennwortdatei nicht neu erstellen\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr "%s: PAM chauthtok fehlgeschlagen\n"
@@ -461,7 +461,7 @@ msgstr ""
 msgid "Cannot open the password file.\n"
 msgstr "Kann die Kennwortdatei nicht öffnen.\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: %s nicht in /etc/passwd gefunden\n"
@@ -678,7 +678,7 @@ msgstr "%s: Shadow-Gruppen-Kennwörter für -A benötigt\n"
 msgid "Who are you?\n"
 msgstr "Wer sind Sie?\n"
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "Unbekannte Gruppe: %s\n"
@@ -771,12 +771,12 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr "Syntax: groupadd [-g gid [-o]] [-f] Gruppe\n"
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s: Fehler beim Hinzufügen eines neuen Gruppeneintrags\n"
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr "%s: Name %s ist nicht eindeutig\n"
@@ -796,24 +796,24 @@ msgstr "%s: Kann keine eindeutige GID feststellen\n"
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s: %s ist kein gültiger Gruppenname\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr "%s: Ungültige Gruppe %s\n"
 
-#: src/groupadd.c:325 src/useradd.c:1058
+#: src/groupadd.c:332 src/useradd.c:1094
 #, c-format
-msgid "%s: -O requires NAME=VALUE\n"
-msgstr "%s: -O benötigt NAME=WERT\n"
+msgid "%s: -K requires KEY=VALUE\n"
+msgstr "%s: -K benötigt NAME=WERT\n"
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s: Kann Gruppendatei nicht neu erstellen\n"
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s: Kann Shadow-Gruppendatei nicht neu erstellen\n"
@@ -873,7 +873,7 @@ msgstr "%s: Gruppe %s existiert nicht\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s: Gruppe %s ist eine NIS-Gruppe\n"
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s ist der NIS-Master\n"
@@ -1135,7 +1135,7 @@ msgstr ""
 "\n"
 "[Trennung abgebrochen -- root-Login erlaubt.]\n"
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
@@ -1144,17 +1144,17 @@ msgstr ""
 "\n"
 "Login: Timeout nach %d Sekunden.\n"
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr " an `%.100s' von `%.200s'"
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr " an `%.100s'"
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
@@ -1163,25 +1163,25 @@ msgstr ""
 "\n"
 "%s login: "
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr "Login fehlerhaft"
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Warnung: Login reaktiviert nach temporärer Sperre.\n"
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr "Letzte Verbindung: %s an %s"
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr "Letzte Verbindung: %.19s an %s"
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr " von %.*s"
@@ -1196,21 +1196,21 @@ msgstr "Syntax: newgrp [-] [Gruppe]\n"
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Syntax: sg Gruppe [[-c] Befehl]\n"
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "Unbekannte GID: %u\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr "Unbekannte GID: %lu\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr "Entschuldigung.\n"
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr "zu viele Gruppen\n"
@@ -1358,7 +1358,7 @@ msgstr "%s: Zu wenig Speicher\n"
 msgid "%s: Cannot execute %s"
 msgstr "%s: Kann %s nicht ausführen"
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: Speicher %s nicht unterstützt\n"
@@ -1475,35 +1475,35 @@ msgstr "%s: Kann Eintrag für Benutzer %s nicht aktualisieren\n"
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: Kann Shadow-Datei nicht löschen\n"
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr "Entschuldigung."
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s: Muss von einem Terminal gestartet werden\n"
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr "%s: pam_start: Fehler %d\n"
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr "Unbekannte ID: %s\n"
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Sie dürfen su %s nicht\n"
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr "(Geben Sie Ihr eigenes Kennwort an.)"
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -1512,7 +1512,7 @@ msgstr ""
 "%s: %s\n"
 "(Ignoriert)\n"
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr "Keine Shell\n"
@@ -1537,12 +1537,12 @@ msgstr "Bitte geben Sie Ihr EIGENES Kennwort als Authentifizierung an.\n"
 msgid "No password file\n"
 msgstr "Keine Kennwortdatei\n"
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr "Kein Kennworteintrag für 'root'\n"
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
@@ -1552,214 +1552,244 @@ msgstr ""
 "Geben Sie Strg-D ein, um normal zu starten\n"
 "(oder geben Sie das root-Kennwort ein zur Systemwartung): "
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr "Starte im Systemwartungs-Modus\n"
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s: Ungültiges nummerisches Argument `%s'\n"
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s: GID %s unbekannt\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s: Gruppe %s unbekannt\n"
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: Kann keine neue Datei mit Standardwerten erstellen\n"
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr "%s: Kann die neue Datei mit Standardwerten nicht öffnen\n"
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr "%s: Umbenennen: %s"
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s: Die Gruppe `%s' ist eine NIS-Gruppe.\n"
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: Zu viele Gruppen angegeben (max %d).\n"
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
-msgstr "Syntax: useradd [-u uid [-o]] [-g Gruppe] [-G Gruppe,...] \n"
-
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
 msgstr ""
-"                [-d home] [-s Shell] [-c Kommentar] [-m [-k Vorlage]]\n"
+"Syntax: useradd [Optionen] LOGIN\n"
+"\n"
+"Optionen:\n"
+"  -b, --base-dir BASE_DIR\tBasisverzeichnis für das Homeverzeichnis des\n"
+"\t\t\t\tneuen Benutzers\n"
+"  -c, --comment COMMENT\t\tSetzt 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 useradd-\n"
+"\t\t\t\tKonfiguration\n"
+"  -e, --expiredate EXPIRE_DATE\tSetzt das Ablaufdatum auf EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE\tDeaktiviert das Kennwort nach Ablauf auf\n"
+"\t\t\t\tINACTIVE\n"
+"  -g, --gid GROUP\t\tBenutzer der Gruppe GROUP zuordnen\n"
+"  -G, --groups GROUPS\t\tListe von zusätzlichen Gruppen für den neuen\n"
+"\t\t\t\tBenutzer\n"
+"  -h, --help\t\t\tZeigt diese Hilfe, sonst nichts\n"
+"  -k, --skel SKEL_DIR \t\tGibt ein alternatives Vorlagenverzeichnis an\n"
+"  -K, --key NAME=WERT\t\tÜberschreibt die Standards in /etc/login.defs\n"
+"  -m, --create-home\t\tErstellt das Homeverzeichnis des neuen Benutzers\n"
+"  -o, --non-unique\t\tBenutzer mit doppelter (nicht eindeutiger) UID\n"
+"\t\t\t\terlauben\n"
+"  -p, --password PASSWORD\tBenutzt ein verschlüsseltes Kennwort für den\n"
+"\t\t\t\tBenutzer\n"
+"  -s, --shell SHELL\t\tDie Shell des neuen Benutzers\n"
+"  -u, --uid UID\t\t\tLegt eine bestimmte UID fest\n"
 
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr "                [-f inaktiv] [-e Ablauf]\n"
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr "                [-p Kennwort] Name\n"
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr "        useradd -D [-g Gruppe] [-b Basis] [-s Shell]\n"
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s: Kann Gruppendatei nicht sperren\n"
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s: Kann Gruppendatei nicht öffnen\n"
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s: Kann Shadow-Gruppendatei nicht sperren\n"
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s: Kann Shadow-Gruppendatei nicht öffnen\n"
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: UID %u ist nicht eindeutig\n"
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, c-format
 msgid "%s: can't get unique UID\n"
 msgstr "%s: Kann keine eindeutige UID erzeugen\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr "%s: Ungültiges Basisverzeichnis `%s'\n"
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr "%s: Kommentar `%s' ungültig\n"
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s: Homeverzeichnis `%s' ungültig\n"
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s: Datum `%s' ungültig\n"
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr "%s: Shadow-Kennwörter für -e benötigt\n"
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr "%s: Shadow-Kennwörter für -f benötigt\n"
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s: Feld `%s' ungültig\n"
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr "%s: Shell `%s' ist ungültig\n"
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr "%s: Benutzername `%s' ungültig\n"
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s: Kann Kennwortdatei nicht neu erstellen\n"
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s: Kann Shadow-Kennwortdatei nicht neu erstellen\n"
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s: Kann Kennwortdatei nicht sperren\n"
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s: Kann Kennwortdatei nicht öffnen\n"
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s: Kann Shadow-Kennwortdatei nicht sperren\n"
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s: Kann Shadow-Kennwortdatei nicht öffnen\n"
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr "%s: Fehler beim Hinzufügen eines neuen Kennworteintrags\n"
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr "%s: Fehler beim Hinzufügen des neuen Shadow-Kennworteintrags\n"
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: Kann Verzeichnis %s nicht erstellen\n"
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr "Gruppe \"mail\" existiert nicht. Erzeuge Mail-Spool mit Mode 0600.\n"
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr "Kann Eintrag für Benutzer %s nicht aktualisieren\n"
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s: Benutzer %s vorhanden\n"
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
@@ -1767,7 +1797,7 @@ msgstr ""
 "%s: Gruppe %s vorhanden - Wenn Sie den Benutzer zur Gruppe\n"
 "hinzufügen wollen, benutzen Sie -g.\n"
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr ""
@@ -1818,12 +1848,12 @@ msgstr "%s: %s nicht im Besitz von %s, Löschen abgebrochen\n"
 msgid "%s: warning: can't remove "
 msgstr "%s: Warnung: Kann nicht löschen "
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s: Benutzer %s nicht vorhanden\n"
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: Benutzer %s ist ein NIS-Benutzer\n"
@@ -1840,101 +1870,106 @@ msgstr ""
 msgid "%s: error removing directory %s\n"
 msgstr "%s: Fehler beim Löschen des Verzeichnisses %s\n"
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr "Syntax: %s\t[-u uid [-o]] [-g Gruppe] [-G Gruppe,...] \n"
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr "\t\t[-d Home [-m]] [-s Shell] [-c Kommentar] [-l Neuer_Name]\n"
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr "[-f inaktiv] [-e Ablauf] "
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr "[-p Kennwort] [-L|-U] Name\n"
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s: Zu wenig Speicher in update_group\n"
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s: Zu wenig Speicher in update_gshadow\n"
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: Keine Optionen angegeben\n"
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: Shadow-Kennwörter für -e und -f benötigt\n"
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr "%s: -a ist NUR zusammen mit -G erlaubt\n"
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr "%s: UID %lu ist nicht eindeutig\n"
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s: Fehler beim Ändern des Kennworteintrags\n"
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s: Fehler beim Löschen des Kennworteintrags\n"
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr "%s: Fehler beim Löschen des Shadow-Kennworteintrags\n"
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: Verzeichnis %s vorhanden\n"
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s: Kann %s nicht erstellen\n"
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s: Kann den Besitzer von %s nicht ändern\n"
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
-msgstr ""
+msgstr "%s: Warnung: Konnte altes Homeverzeichnis %s nicht komplett löschen"
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s: Kann das Verzeichnis %s nicht nach %s umbenennen\n"
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: Warnung: %s nicht im Besitz von %s\n"
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr "Fehler beim Ändern des Postfach-Besitzers"
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr "Fehler beim Umbenennen des Postfachs"
 
diff --git a/po/el.gmo b/po/el.gmo
index 22daf7fa..bde591bf 100644
Binary files a/po/el.gmo and b/po/el.gmo differ
diff --git a/po/el.po b/po/el.po
index 2d69367c..4a03eb1b 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Shadow 980726\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
 "PO-Revision-Date: 1998-12-28 20:35:31+0100\n"
 "Last-Translator: Nikos Mavroyanopoulos <nmav@i-net.paiko.gr>\n"
 "Language-Team: Hellenic <el@li.org>\n"
@@ -139,12 +139,12 @@ msgstr "Χωρίς κατάλογο, εισαγωγή με ΜΗΤΡΙΚΟ_ΚΑΤ
 msgid "Cannot execute %s"
 msgstr "Αδυναμία εκτέλεσης %s"
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "Μη έγκυρος πρωταρχικός κατάλογος \"%s\"\n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "Αδυναμία αλλαγής του πρωταρχικού καταλόγου σε \"%s\"\n"
@@ -166,16 +166,16 @@ msgstr ""
 "σφάλμα διαμόρφωσης - άγνωστο αντικείμενο '%s' (ειδοποιείστε τον "
 "διαχειριστή)\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "Συνθηματικό: "
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "Του %s το Συνθηματικό: "
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -194,147 +194,147 @@ msgid ""
 "  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
 msgstr ""
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Εισάγετε την νέα τιμή, ή πιέστε ENTER για την προκαθορισμένη\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "Μικρότερη διάρκεια συνθηματικού"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "Μέγιστη διάρκεια συνθηματικού"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "Τελευταία αλλαγή συνθηματικού (ΧΧΧΧ-ΜΜ-ΗΗ)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "Προειδοποίηση λήξης συνθηματικού"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "Ανενεργό συνθηματικό"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Ημερομηνία Λήξης Λογαριασμού (ΧΧΧΧ-ΜΜ-ΗΗ)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, fuzzy, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Τελευταία αλλαγή συνθηματικού (ΧΧΧΧ-ΜΜ-ΗΗ)"
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, fuzzy, c-format
 msgid "never\n"
 msgstr "Ποτέ\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, fuzzy, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Το συνθηματικό λήγει:\t"
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, fuzzy, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Ανενεργό συνθηματικό:\t"
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, fuzzy, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Το συνθηματικό λήγει:\t"
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s: Να μην συμπεριλαμβάνετε το \"l\" με τις άλλες ενδείξεις\n"
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, fuzzy, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: άδεια απορρίφθηκε\n"
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, fuzzy, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: Σφάλμα κατά την προσθήκη μεθόδου εξακρίβωσης\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: αδυναμία ανοίγματος του αρχείου συνθηματικών\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s: άγνωστος χρήστης %s\n"
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, fuzzy, c-format
-msgid "%s: can't lock shadow password file"
+msgid "%s: can't lock shadow password file\n"
 msgstr "%s: αδυναμία κλειδώματος του αρχείου σκιωδών συνθηματικών\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, fuzzy, c-format
-msgid "%s: can't open shadow password file"
+msgid "%s: can't open shadow password file\n"
 msgstr "%s: αδυναμία ανοίγματος του αρχείου σκιωδών συνθηματικών\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "Αλλαγή πληροφοριών χρόνου για τον %s\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: Σφάλμα κατά την αλλαγή πεδίων\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: αδυναμία ανανέωσης αρχείου συνθηματικών\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: αδυναμία ανανέωσης του αρχείου σκιωδών συνθηματικών\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s: αδυναμία επανεγγραφής αρχείου σκιωδών συνθηματικών\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: αδυναμία επανεγγραφής αρχείου συνθηματικών\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, fuzzy, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr "%s: αδυναμία ξεκλειδώματος αρχείου\n"
@@ -445,7 +445,7 @@ msgstr "Αδυναμία κλειδώματος του αρχείου συνθη
 msgid "Cannot open the password file.\n"
 msgstr "Αδυναμία ανοίγματος του αρχείου συνθηματικών.\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: Ο %s δεν βρέθηκε στο /etc/passwd\n"
@@ -646,7 +646,7 @@ msgstr "%s: σκιώδη συνθηματικά ομάδων απαιτούντ
 msgid "Who are you?\n"
 msgstr "Ποιος είσαι;\n"
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "άγνωστη ομάδα: %s\n"
@@ -740,12 +740,12 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr "Χρήση: groupadd [-g gid [-o]] [-f] ομάδα\n"
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s: Σφάλμα κατά την προσθήκη νέας καταχώρησης στο αρχείο ομάδων\n"
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr "%s: Το όνομα %s δεν είναι μοναδικό\n"
@@ -765,24 +765,24 @@ msgstr "%s: αδυναμία εύρεσης μοναδικού gid\n"
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s: Το %s δεν είναι έγκυρο όνομα ομάδας\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr "%s: Μη έγκυρη ομάδα `%s'\n"
 
-#: src/groupadd.c:325 src/useradd.c:1058
-#, c-format
-msgid "%s: -O requires NAME=VALUE\n"
+#: src/groupadd.c:332 src/useradd.c:1094
+#, fuzzy, c-format
+msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -O απαιτεί ΌΝΟΜΑ=ΤΙΜΗ\n"
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s: αδυναμία επανεγγραφής του αρχείου ομάδων\n"
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s: αδυναμία επανεγγραφής του αρχείου σκιωδών συνθηματικών ομάδων\n"
@@ -844,7 +844,7 @@ msgstr "%s: Η ομάδα %s δεν υπάρχει\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s: Η ομάδα %s είναι NIS ομάδα\n"
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: Ο %s είναι ο κύριος διακομιστής NIS\n"
@@ -1105,7 +1105,7 @@ msgstr ""
 "\n"
 "[Παράκαμψη αποσύνδεσης -- Η είσοδος του root επετράπη.]\n"
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
@@ -1114,17 +1114,17 @@ msgstr ""
 "\n"
 "Η διαδικασία εισόδου τερματίστηκε μετά από %d δευτερόλεπτα.\n"
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr " στο `%.100s' από `%.200s'"
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr " στο `%.100s'"
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
@@ -1133,26 +1133,26 @@ msgstr ""
 "\n"
 "%s login: "
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr "Διαδικασία εισόδου απέτυχε"
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr ""
 "Προειδοποίηση: Η είσοδος επανενεργοποιήθηκε μετά από προσωρινό αποκλεισμό.\n"
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr "Τελευταία είσοδος: %s στο %s"
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr "Τελευταία είσοδος: %.19s στο %s"
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr " από %.*s"
@@ -1167,21 +1167,21 @@ msgstr "Χρήση: newgrp [-] [ομάδα]\n"
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Χρήση: sg ομάδα [[-c] εντολή]\n"
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, fuzzy, c-format
 msgid "unknown UID: %u\n"
 msgstr "άγνωστο GID: %lu\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr "άγνωστο GID: %lu\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr "Λυπάμαι.\n"
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr "πάρα πολλές ομάδες\n"
@@ -1328,7 +1328,7 @@ msgstr "%s: δεν υπάρχει ελεύθερη μνήμη\n"
 msgid "%s: Cannot execute %s"
 msgstr "%s: Αδυναμία εκτέλεσης του %s"
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: η αποθήκη %s δεν υποστηρίζεται\n"
@@ -1447,35 +1447,35 @@ msgstr "%s: αδυναμία ανανέωσης καταχώρησης για τ
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: Δεν είναι δυνατόν να διαγραφεί το αρχείο σκιωδών συνθηματικών\n"
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr "Λυπάμαι."
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s: πρέπει να εκτελεστεί από τερματικό\n"
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr "%s: pam_start: σφάλμα %d\n"
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr "Αγνωστη ταυτότητα: %s\n"
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Δεν έχετε άδεια για su %s\n"
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr "(Εισάγετε το δικό σας συνθηματικό.)"
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -1484,7 +1484,7 @@ msgstr ""
 "%s: %s\n"
 "(Αγνοήθηκε)\n"
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr "Δεν υπάρχει φλοιός\n"
@@ -1509,12 +1509,12 @@ msgstr "Παρακαλώ εισάγετε το ΔΙΚΟ σας συνθηματ
 msgid "No password file\n"
 msgstr "Δεν υπάρχει αρχείο συνθηματικών\n"
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr "Δεν υπάρχει καταχώρηση συνθηματικού για τον 'root'\n"
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
@@ -1524,224 +1524,228 @@ msgstr ""
 "Πληκτρολογήστε control-d για να συνεχίσετε με την κανονική έναρξη,\n"
 "(ή δώστε το συνθηματικό του root για συντήρηση του συστήματος):"
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr "Έναρξη Κατάστασης Συντήρησης Συστήματος\n"
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s: Μη έγκυρη αριθμητική παράμετρος `%s'\n"
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s: άγνωστο GID %s\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s: άγνωστη ομάδα %s\n"
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: αδυναμία δημιουργίας νέου αρχείου προκαθορισμένων ρυθμίσεων\n"
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, fuzzy, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr "%s: αδυναμία δημιουργίας νέου αρχείου προκαθορισμένων ρυθμίσεων\n"
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr "%s: μετονομασία: %s"
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s: Η ομάδα `%s' είναι NIS ομάδα.\n"
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: Προσδιορίστηκαν υπερβολικές ομάδες (μεγ. %d).\n"
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
-msgstr "Χρήση: useradd [-u uid [-o]] [-g ομάδα] [-G ομάδα,...] \n"
-
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
 msgstr ""
-"               [-d μητρικός_κατάλογος] [-s φλοιός] [-c σχόλιο]\n"
-"               [-m [-k κανόνας]]\n"
 
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr "               [-f ανενεργό] [-e λήξη]\n"
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr "               [-p συνθηματικό] όνομα\n"
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr "       useradd -D [-g ομάδα] [-b βάση] [-s φλοιός]\n"
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s: Σφάλμα κατά το κλείδωμα του αρχείου ομάδων\n"
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s: Σφάλμα κατά το άνοιγμα του αρχείου ομάδων\n"
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s: Σφάλμα κατά το κλείδωμα του αρχείου σκιωδών συνθηματικών ομάδων\n"
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s: Σφάλμα κατά το άνοιγμα του αρχείου σκιωδών συνθηματικών ομάδων\n"
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, fuzzy, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: Το uid %u δεν είναι μοναδικό\n"
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, fuzzy, c-format
 msgid "%s: can't get unique UID\n"
 msgstr "%s: αδυναμία εύρεσης μοναδικού gid\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr "%s: Μη έγκυρος κατάλογος βάσης `%s'\n"
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr "%s: Μη έγκυρο σχόλιο `%s'\n"
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s: Μη έγκυρος μητρικός κατάλογος χρήστη `%s'\n"
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s: Μη έγκυρη ημερομηνία `%s'\n"
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr "%s: σκιώδη συνθηματικά απαιτούνται για το -e\n"
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr "%s: σκιώδη συνθηματικά απαιτούνται για -f\n"
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s: Μη έγκυρο πεδίο `%s'\n"
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr "%s: Μη έγκυρος φλοιός `%s'\n"
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr "%s: Μη έγκυρο όνομα χρήστη `%s'\n"
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s: αδυναμία επανεγγραφής του αρχείου συνθηματικών\n"
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s: αδυναμία επανεγγραφής του αρχείου σκιωδών συνθηματικών\n"
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s: Αδυναμία κλειδώματος του αρχείου συνθηματικών\n"
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s: Αδυναμία ανοίγματος του αρχείου συνθηματικών\n"
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s: αδυναμία κλειδώματος του αρχείου σκιωδών συνθηματικών\n"
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s: αδυναμία ανοίγματος αρχείου σκιωδών συνθηματικών\n"
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr ""
 "%s: Σφάλμα κατά την προσθήκη νέας καταχώρησης στο αρχείο συνθηματικών\n"
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr ""
 "%s: Σφάλμα κατά την προσθήκη νέας καταχώρησης στο αρχείο σκιωδών "
 "συνθηματικών\n"
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: αδυναμία δημιουργίας καταλόγου %s\n"
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr ""
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, fuzzy, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr "%s: αδυναμία ανανέωσης καταχώρησης για τον χρήστη %s\n"
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s: Ο χρήστης %s υπάρχει\n"
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
 msgstr ""
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr ""
@@ -1792,12 +1796,12 @@ msgstr "%s: Το %s δεν ανήκει στον %s, δεν αφαιρείται
 msgid "%s: warning: can't remove "
 msgstr "%s: προειδοποίηση: αδυναμία διαγραφής "
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s: Ο χρήστης %s δεν υπάρχει\n"
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: Ο χρήστης %s είναι NIS χρήστης\n"
@@ -1814,104 +1818,109 @@ msgstr ""
 msgid "%s: error removing directory %s\n"
 msgstr "%s: Σφάλμα κατά την διαγραφή του καταλόγου %s\n"
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr "Χρήση: %s\t[-u uid [-o]] [-g ομάδα] [-G ομάδα,...] \n"
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr ""
 "\t\t[-d μητρικός_κατάλογος [-m]] [-s φλοιός] [-c σχόλιο]\n"
 "\t\t[-l νέο_όνομα]\n"
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr "[-f ανενεργό] [-e λήξη] "
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr "[-p συνθηματικό] [-L|-U] όνομα\n"
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s: δεν υπάρχει ελεύθερη μνήμη στο update_group\n"
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s:  στο update_gshadow\n"
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: Δεν δόθηκαν ενδείξεις\n"
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: σκιώδη συνθηματικά απαιτούνται για το -e και -f\n"
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr ""
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr "%s: Το uid %lu δεν είναι μοναδικό\n"
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s: Σφάλμα κατά την αλλαγή καταχώρησης συνθηματικού\n"
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s: Σφάλμα κατά την αφαίρεση καταχώρησης στο αρχείο συνθηματικών\n"
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr ""
 "%s: Σφάλμα κατά την αφαίρεση καταχώρησης στο αρχείο σκιωδών συνθηματικών\n"
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: ο κατάλογος %s υπάρχει\n"
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s: αδυναμία δημιουργίας του %s\n"
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s: Αδυναμία αλλαγής ιδιοκτήτη(chown) του %s\n"
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s: αδυναμία μετονομασίας του καταλόγου %s σε %s\n"
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: προειδοποίηση: Το %s δεν ανήκει στον %s\n"
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr "αποτυχία αλλαγής του ιδιοκτήτη του γραμματοκιβωτίου"
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr "αποτυχία μετονομασίας γραμματοκιβωτίου"
 
@@ -1949,6 +1958,29 @@ msgstr ""
 "`vipw' σύντασει το /etc/passwd        `vipw -s' συντάσσει το /etc/shadow\n"
 "`vigr' σύντασει το /etc/group         `vigr -s' συντάσσει το /etc/gshadow\n"
 
+#, fuzzy
+#~ msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
+#~ msgstr "Χρήση: useradd [-u uid [-o]] [-g ομάδα] [-G ομάδα,...] \n"
+
+#~ msgid ""
+#~ "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+#~ msgstr ""
+#~ "               [-d μητρικός_κατάλογος] [-s φλοιός] [-c σχόλιο]\n"
+#~ "               [-m [-k κανόνας]]\n"
+
+#~ msgid "               [-f inactive] [-e expire]\n"
+#~ msgstr "               [-f ανενεργό] [-e λήξη]\n"
+
+#, fuzzy
+#~ msgid "               [-p passwd] [-K KEY=VALUE] name\n"
+#~ msgstr "               [-p συνθηματικό] όνομα\n"
+
+#~ msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
+#~ msgstr "       useradd -D [-g ομάδα] [-b βάση] [-s φλοιός]\n"
+
+#~ msgid "%s: -O requires NAME=VALUE\n"
+#~ msgstr "%s: -O απαιτεί ΌΝΟΜΑ=ΤΙΜΗ\n"
+
 #~ msgid "unknown uid: %u\n"
 #~ msgstr "άγνωστο uid: %u\n"
 
diff --git a/po/es.gmo b/po/es.gmo
index ed2dc538..dce0afd8 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index 360a5115..bf9964c4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -4,11 +4,11 @@
 # Reviewed by Ricardo Mones <ricardo.mones@hispalinux.es>, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: shadow 4.0.8\n"
+"Project-Id-Version: shadow 4.0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
-"PO-Revision-Date: 2005-04-18 23:39+0200\n"
-"Last-Translator:  Rubén Porras Campo <nahoo@inicia.es>\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
+"PO-Revision-Date: 2005-07-11 17:00+0200\n"
+"Last-Translator: Rubén Porras Campo <nahoo@inicia.es>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -143,12 +143,12 @@ msgstr "Sin directorio, entrando con HOME=/"
 msgid "Cannot execute %s"
 msgstr "No puedo ejecutar %s"
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "Directorio raíz \"%s\" inválido\n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "No puedo cambiar el directorio raíz a \"%s\"\n"
@@ -170,16 +170,16 @@ msgstr ""
 "error de configuración - elemento '%s' desconocido (notifíquelo al "
 "administrador)\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "Contraseña: "
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "Contraseña de %s: "
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -197,149 +197,165 @@ msgid ""
 "\t\t\t\tchange to MAX_DAYS\n"
 "  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
 msgstr ""
+"Modo de uso: chage [opciones] usuario\n"
+"\n"
+"Opciones:\n"
+"  -d, --lastday ULTIMO_DÍA\testablecer el último cambio de clave a "
+"ULTIMO_DÍA\n"
+"  -E, --expiredate FECHA_EXP\testablecer la fecha de expiración de la cuenta "
+"a 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 "
+"la 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 "
+"cambiar la clave a DÍAS_MIN\n"
+"  -M, --maxdays DÍAS_MAXS\testablecer el número máximo de días antes de "
+"cambiar la clave a DÍAS_MAX\n"
+"  -W, --warndays DÍAS_AVISO\tset expiration warning days to WARN_DAYS\n"
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Introduzca el nuevo valor, o presione ENTER para el predeterminado\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "Duración mínima de la contraseña"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "Duración máxima de la contraseña"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "Último cambio de contraseña (AAAA-MM-DD)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "Aviso de caducidad de la contraseña"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "Contraseña inactiva"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Fecha de caducidad de la cuenta (AAAA-MM-DD)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Último cambio de contraseña\t\t\t\t\t:"
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, c-format
 msgid "never\n"
 msgstr "nunca\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "La contraseña caduca\t\t\t\t\t: "
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Contraseña inactiva\t\t\t\t\t: "
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "La cuenta caduca\t\t\t\t\t\t: "
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr "Número de días mínimo entre cambio de contraseña\t\t: %ld\n"
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr "Número de días máximo entre cambio de contraseñas\t\t: %ld\n"
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr "Número de días de aviso antes de que expire la contraseña\t: %ld\n"
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s: no incluya \"l\" con otras banderas\n"
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: Permiso denegado.\n"
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: Autenticación PAM fallida\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: no puedo abrir el fichero de contraseñas\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s: usuario desconocido %s\n"
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
-msgstr "%s: no puedo bloquear el fichero de contraseñas ocultas (shadow)"
+msgid "%s: can't lock shadow password file\n"
+msgstr "%s: no puedo bloquear el fichero de contraseñas ocultas (shadow)\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
-msgstr "%s: no puedo abrir el fichero de contraseñas ocultas (shadow)"
+msgid "%s: can't open shadow password file\n"
+msgstr "%s: no puedo abrir el fichero de contraseñas ocultas (shadow)\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "Cambiando la información de la edad para %s\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: error cambiando los campos\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: no puedo actualizar el fichero de contraseñas\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: no puedo actualizar el fichero de contraseñas ocultas (shadow)\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr ""
 "%s: no se puede reescribir el fichero de contraseñas ocultas (shadow)\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: no se puede reescribir el fichero de contraseñas\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr "%s: PAM chauthtok falló\n"
@@ -450,7 +466,7 @@ msgstr "No se puede bloquear el fichero de contraseñas, inténtelo más tarde.\
 msgid "Cannot open the password file.\n"
 msgstr "No se puede abrir el fichero de contraseñas.\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: no se encontró %s en /etc/passwd\n"
@@ -675,7 +691,7 @@ msgstr "%s: se requieren contraseñas de grupo ocultas (shadow) para -A\n"
 msgid "Who are you?\n"
 msgstr "¿Quién es?\n"
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "grupo desconocido: %s\n"
@@ -768,49 +784,49 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr "Modo de uso: groupadd [-g gid [-o]] [-f] grupo\n"
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s: error añadiendo entrada nueva de grupo\n"
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr "%s: el nombre %s no es único\n"
 
 #: src/groupadd.c:233
-#, fuzzy, c-format
+#, c-format
 msgid "%s: GID %u is not unique\n"
-msgstr "%s: el gid %u no es único\n"
+msgstr "%s: el GID %u no es único\n"
 
 #: src/groupadd.c:257
-#, fuzzy, c-format
+#, c-format
 msgid "%s: can't get unique GID\n"
-msgstr "%s: no se puede obtener un gid único\n"
+msgstr "%s: no se puede obtener un GID único\n"
 
 #: src/groupadd.c:279 src/groupmod.c:282
 #, c-format
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s: %s no es un nombre de grupo válido\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr "%s: grupo %s inválido\n"
 
-#: src/groupadd.c:325 src/useradd.c:1058
+#: src/groupadd.c:332 src/useradd.c:1094
 #, c-format
-msgid "%s: -O requires NAME=VALUE\n"
-msgstr "%s: -O requiere NOMBRE=VALOR\n"
+msgid "%s: -K requires KEY=VALUE\n"
+msgstr "%s: -K requiere NOMBRE=VALOR\n"
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s: no se puede reescribir el fichero grupos\n"
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s: no se puede reescribir el fichero de grupos oculto (shadow)\n"
@@ -870,7 +886,7 @@ msgstr "%s: el grupo %s no existe\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s: el grupo %s es un grupo NIS\n"
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s es el maestro NIS\n"
@@ -886,9 +902,9 @@ msgid "%s: %s not found in /etc/group\n"
 msgstr "%s: no se encontró %s en /etc/group\n"
 
 #: src/groupmod.c:241
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %u is not a unique GID\n"
-msgstr "%s: %u no es un gid único\n"
+msgstr "%s: %u no es un GID único\n"
 
 #: src/groupmod.c:271
 #, c-format
@@ -1134,7 +1150,7 @@ msgstr ""
 "\n"
 "[Desconexión evitada -- acceso del superusuario permitido.]\n"
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
@@ -1143,17 +1159,17 @@ msgstr ""
 "\n"
 "El acceso caducó después de %d segundos.\n"
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr " en `%.100s' desde `%.200s'"
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr " en `%.100s'"
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
@@ -1162,25 +1178,25 @@ msgstr ""
 "\n"
 "%s login: "
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr "Login incorrecto"
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Aviso: acceso reestablecido después de un lockout temporal.\n"
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr "Última entrada: %s en %s"
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr "Última entrada: %.19s en %s"
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr " desde %.*s"
@@ -1195,21 +1211,21 @@ msgstr "Modo de uso: newgrp [-] [grupo]\n"
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Modo de uso: sg grupo [[-c] orden]\n"
 
-#: src/newgrp.c:130
-#, fuzzy, c-format
+#: src/newgrp.c:159
+#, c-format
 msgid "unknown UID: %u\n"
-msgstr "GID desconocido: %lu\n"
+msgstr "UID desconocido: %u\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr "GID desconocido: %lu\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr "Disculpe.\n"
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr "demasiados grupos\n"
@@ -1357,7 +1373,7 @@ msgstr "%s: sin memoria\n"
 msgid "%s: Cannot execute %s"
 msgstr "%s: no se puede ejecutar %s"
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: repositorio %s no soportado\n"
@@ -1475,35 +1491,35 @@ msgstr "%s: no se puede actualizar la entrada para el usuario %s\n"
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: no se puede eliminar el fichero de contraseñas ocultas (shadow)\n"
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr "Disculpe."
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s: debe ejecutarse desde un terminal\n"
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr "%s: pam_start: error %d\n"
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr "Id desconocido: %s\n"
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "No está autorizado a usar su %s\n"
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr "(Introduzca su propia contraseña)."
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -1512,7 +1528,7 @@ msgstr ""
 "%s: %s\n"
 "(Ignorado)\n"
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr "Sin shell\n"
@@ -1537,12 +1553,12 @@ msgstr "Por favor, introduzca su PROPIA contraseña como autenticación.\n"
 msgid "No password file\n"
 msgstr "No hay fichero de contraseñas\n"
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr "No hay entrada de contraseña para 'root'\n"
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
@@ -1552,227 +1568,262 @@ msgstr ""
 "Teclee control-d para continuar con un arranque normal del sistema,\n"
 "(o introduzca la contraseña del superusuario para mantenimiento del sistema):"
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr "Entrando en el Modo de Mantenimiento del Sistema\n"
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s: argumento numérico inválido `%s'\n"
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s: GID %s desconocido\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s: grupo %s desconocido\n"
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr ""
 "%s: no se puede crear un nuevo fichero de preferencias predeterminadas\n"
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr ""
 "%s: no se puede abrir un nuevo fichero de preferencias predeterminadas\n"
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr "%s: renombra: %s"
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s: el grupo `%s' es un grupo NIS.\n"
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: demasiados grupos especificados (máx de %d).\n"
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
-msgstr "Modo de uso: useradd [-u uid [-o]] [-g grupo] [-G grupo,...] \n"
-
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
 msgstr ""
-"                     [-d home] [-s shell] [-c comentario] [-m [-k "
-"plantilla]]\n"
+"Modo de uso: useradd [opciones] nombre\n"
+"\n"
+"Opciones:\n"
+"  -b, --base-dir DIR_BASE\tdirectorio base para el nuevo directorio "
+"personal\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"
+"                                modificada para useradd\n"
+"  -e, --expiredate FECHA_EXPIR\testablece la fecha de expiración de la "
+"cuenta a\n"
+"                                FECHA_EXPIR\n"
+"  -f, --inactive INACTIVO\testablece el tiempo de inactividad después del\n"
+"                                que expira la cuenta a INACTIVO\n"
+"  -g, --gid GRUPO\t\tforzar el uso de GRUPO para la nueva cuenta de \n"
+"                                usuario\n"
+"  -G, --groups GRUPOS\t\tlista de grupos suplementarios para la nueva "
+"cuenta\n"
+"                                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\t\tmodifica los valores predeterminados de \n"
+"                                /etc/login.defs\n"
+"  -m, --create-home\t\tcrea el directorio personal para la nueva cuenta \n"
+"                                de 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 "
+"nueva \n"
+"                                cuenta\n"
+"  -s, --shell SHELL\t\tla shell de entrada para la nueva cuenta de usuario\n"
+"  -u, --uid UID\t\t\tforzar el uso del UID para la nueva cuenta de usuario\n"
 
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr "                     [-f inactivo] [-e caduca]\n"
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr "                     [-p contraseña] nombre\n"
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr "             useradd -D [-g grupo] [-b base] [-s shell]\n"
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s: error bloqueando el fichero de grupos\n"
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s: error abriendo el fichero de grupos\n"
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s: error bloqueando el fichero de grupos oculto (shadow)\n"
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s: error abriendo el fichero de grupos oculto (shadow)\n"
 
-#: src/useradd.c:875
-#, fuzzy, c-format
+#: src/useradd.c:891
+#, c-format
 msgid "%s: UID %u is not unique\n"
-msgstr "%s: el gid %u no es único\n"
+msgstr "%s: el UID %u no es único\n"
 
-#: src/useradd.c:905
-#, fuzzy, c-format
+#: src/useradd.c:921
+#, c-format
 msgid "%s: can't get unique UID\n"
-msgstr "%s: no se puede obtener un gid único\n"
+msgstr "%s: no se puede obtener un UID único\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr "%s: directorio base `%s' inválido\n"
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr "%s: comentario `%s' inválido\n"
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s: directorio home `%s' inválido\n"
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s: fecha `%s' inválida\n"
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr "%s: se requiere contraseñas ocultas (shadow) para -e\n"
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr "%s: se requiere contraseñas ocultas (shadow) para -f\n"
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s: campo `%s' inválido\n"
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr "%s: shell `%s' inválida\n"
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr "%s: nombre de usuario `%s' inválido\n"
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s: no se puede reescribir el fichero de contraseñas\n"
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr ""
 "%s: no se puede reescribir el fichero de contraseñas ocultas (shadow)\n"
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s: incapaz de bloquear el fichero de contraseñas\n"
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s: incapaz de abrir el fichero de contraseñas\n"
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s: no se puede bloquear el fichero de contraseñas ocultas (shadow)\n"
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s: no se puede abrir el fichero de contraseñas ocultas (shadow)\n"
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr "%s: error añadiendo entrada de contraseña nueva\n"
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr "%s: error añadiendo entrada de contraseña oculta (shadow) nueva\n"
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: no se puede crear el directorio %s\n"
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr ""
 "No existe ningún grupo llamado \"mail\", creando la cola de correo con modo "
 "0600.\n"
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr "No se puede crear la cola de correo para el usuario %s.\n"
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s: el usuario %s existe\n"
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
 msgstr ""
 "%s: el grupo %s existe - si quiere añadir este usuario a ese grupo, use -g.\n"
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr ""
@@ -1823,12 +1874,12 @@ msgstr "%s: %s no pertenece a %s, no se elimina\n"
 msgid "%s: warning: can't remove "
 msgstr "%s: aviso: no se puede eliminar "
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s: el usuario %s no existe\n"
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: el usuario %s es un usuario NIS\n"
@@ -1845,101 +1896,107 @@ msgstr ""
 msgid "%s: error removing directory %s\n"
 msgstr "%s: error eliminando el directorio %s\n"
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr "Modo de uso: %s\t[-u uid [-o]] [-g grupo] [-G grupo,...] \n"
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr "\t\t[-d home [-m]] [-s shell] [-c comentario] [-l nuevo_nombre]\n"
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr "[-f inactivo] [-e caduca] "
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr "[-p contraseña] [-L|-U] nombre\n"
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s: sin memoria en update_group\n"
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s: sin memoria en update_gshadow\n"
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: no se ha dado ninguna opción\n"
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: se necesitan contraseñas ocultas (shadow) para -e y -f\n"
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr "%s: SÓLO se puede usar la opción -a junto con la opción -G\n"
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr "%s: el uid %lu no es único\n"
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s: error cambiando la entrada de la contraseña\n"
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s: error eliminando la entrada de la contraseña\n"
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr "%s: error eliminando entrada de contraseña oculta (shadow)\n"
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: el directorio %s existe\n"
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s: no se puede crear %s\n"
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s: no se puede chown %s\n"
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
+"%s: aviso: no se pudo eliminar completamente el directorio personal previo %s"
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s: no se puede renombrar el directorio %s a %s\n"
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: aviso: %s no pertenece a %s\n"
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr "falló el cambio de propietario del buzón de correo"
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr "falló el cambio de nombre del buzón de correo"
 
@@ -1975,12 +2032,3 @@ msgstr ""
 "Modo de uso\n"
 "`vipw' edita /etc/passwd        `vipw -s' edita /etc/shadow\n"
 "`vigr' edita /etc/group         `vigr -s' edita /etc/gshadow\n"
-
-#~ msgid "unknown uid: %u\n"
-#~ msgstr "uid desconocido: %u\n"
-
-#~ msgid "%s: uid %u is not unique\n"
-#~ msgstr "%s: el uid %u no es único\n"
-
-#~ msgid "%s: can't get unique uid\n"
-#~ msgstr "%s: no se puede obtener un uid único\n"
diff --git a/po/eu.gmo b/po/eu.gmo
index f19f6c09..19e8ad6b 100644
Binary files a/po/eu.gmo and b/po/eu.gmo differ
diff --git a/po/eu.po b/po/eu.po
index 9c7e01aa..6335cbeb 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
 "PO-Revision-Date: 2005-04-19 21:28+0200\n"
 "Last-Translator: Iaki Larraaga Murgoitio <dooteo@euskalgnu.org>\n"
 "Language-Team:  <itzulpena@euskalgnu.org>\n"
@@ -149,12 +149,12 @@ msgstr "Direktoriorik ez dago, HOME=/ erabiliz saioa hasiko da"
 msgid "Cannot execute %s"
 msgstr "Ezin izan da %s exekutatu"
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "Baliogabeko erro direktorioa \"%s\"\n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "Ezin da erro direktorioa  \"%s\"-ra aldatu.\n"
@@ -176,16 +176,16 @@ msgstr ""
 "konfigurazio errorea - %s item ezezaguna (eman honen  berri "
 "administratzaileari)\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "Pasahitza: "
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "%s (r)en pasahitza: "
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -204,147 +204,147 @@ msgid ""
 "  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
 msgstr ""
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Idatzi balio berria, edo sakatu 'Sartu' tekla lehentsirako\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "Pasahitzaren gutxiengo iraupena"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "Pasahitzaren gehienezko iraupena"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "Azken pasahitz-aldaketa (UUUU-HH-EE)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "Pasahitza iraungitzearen abisua"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "Pasahitza ez-aktiboa"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Kontuaren iraungitze data (UUUU-HH-EE)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Azken pasahitz-aldaketa\t\t\t\t\t: "
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, c-format
 msgid "never\n"
 msgstr "Inoiz ere ez\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Pasahitza iraungitzeko data\t\t\t\t\t:"
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Pasahitza ez-aktiboa jarriko da\t\t\t\t\t: "
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Kontua iraungitzeko data\t\t\t\t\t: "
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr "Gutxiengo egunak, pasahitza aldatzeko\t\t: %ld\n"
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr "Gehienezko egunak, pasahitza aldatzeko\t\t: %ld\n"
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr "Abisuen egun kopurua, pasahitza iraungi aurretik\t: %ld\n"
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s: ez erabili \"l\" beste bandera batzuekin\n"
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: baimena ukatuta.\n"
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM autentifikazioak huts egin du\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: ezin da pasahitzen fitxategia ireki\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s: %s erabiltzaile ezezaguna\n"
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
-msgstr "%s: ezin da itzalpeko (shadow) pasahitz-fitxategia blokeatu"
+msgid "%s: can't lock shadow password file\n"
+msgstr "%s: ezin da itzalpeko (shadow) pasahitz-fitxategia blokeatu\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
-msgstr "%s: ezin da itzalpeko (shadow) pasahitz-fitxategia ireki"
+msgid "%s: can't open shadow password file\n"
+msgstr "%s: ezin da itzalpeko (shadow) pasahitz-fitxategia ireki\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "%s(r)en data-informazioa aldatzen\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: errorea eremuak aldatzean\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: ezin da pasahitzen fitxategia eguneratu\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: ezin da itzalpeko (shadow) pasahitz-fitxategia eguneratu\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s:ezin da itzalpeko pasahitz-fitxategia berridatzi\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: ezin da pasahitzen fitxategia berridatzi\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr "%s: PAM chauthtok-ek huts egin du\n"
@@ -453,7 +453,7 @@ msgstr "Ezin izan da pasahitzen fitxategia blokeatu; saiatu geroago.\n"
 msgid "Cannot open the password file.\n"
 msgstr "Ezin izan da pasahitzen fitxategia ireki.\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: %s ez da '/etc/paswd'-en aurkitu\n"
@@ -676,7 +676,7 @@ msgstr "%s: -A erabiltzeko itzalpeko talde-pasahitza eskatzen da\n"
 msgid "Who are you?\n"
 msgstr "Zer moduz zaude?\n"
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "talde ezezaguna: %s\n"
@@ -769,12 +769,12 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr "Erabilera: groupadd [-g gid [-o]] [-f] taldea\n"
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s: errorea talde sarrera berria gehitzean\n"
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr "%s: %s izena ez da bakarra\n"
@@ -794,24 +794,24 @@ msgstr "%s: ezin da gid bakarra lortu\n"
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s: %s ez da baliozko talde-izena\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr "%s: %s talde baliogabea\n"
 
-#: src/groupadd.c:325 src/useradd.c:1058
-#, c-format
-msgid "%s: -O requires NAME=VALUE\n"
+#: src/groupadd.c:332 src/useradd.c:1094
+#, fuzzy, c-format
+msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -O-k NAME=BALIOA eskatzen du\n"
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s: ezin da 'group' fitxategia berridatzi\n"
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s: ezin da itzalpeko talde-fitxategia berridatzi\n"
@@ -871,7 +871,7 @@ msgstr "%s: %s taldea ez da existitzen\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s: %s taldea NIS talde bat da\n"
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s NIS nagusia da\n"
@@ -1135,7 +1135,7 @@ msgstr ""
 "\n"
 "[Deskonexioa saltatuta -- root-ek saio-hastea baimenduta.]\n"
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
@@ -1144,17 +1144,17 @@ msgstr ""
 "\n"
 "Saio-hasiera denboraz kanpo %d segundo igarotakoan.\n"
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr "`%.100s'(e)tik `%.200s'(e)ra"
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr "`%.100s'(e)n"
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
@@ -1163,27 +1163,27 @@ msgstr ""
 "\n"
 "%s izena: "
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr "Izen okerra"
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr ""
 "Abisua: saio-hasiera berriru gaitu egingo da aldi bateko blokeoaren "
 "ondoren.\n"
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr "Azken saio-hasiera: %s %s(e)n"
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr "Azken saio-hasiera: %.19s  %s(e)n"
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr "%.*s(e)tik"
@@ -1198,21 +1198,21 @@ msgstr "Erabilera: newgrp [-] [taldea]\n"
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Erabilera: sg taldea [[-c] komandoa]\n"
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, fuzzy, c-format
 msgid "unknown UID: %u\n"
 msgstr "GID ezezaguna: %lu\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr "GID ezezaguna: %lu\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr "Barkatu.\n"
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr "talde gehiegi\n"
@@ -1358,7 +1358,7 @@ msgstr "%s: memoriarik ez\n"
 msgid "%s: Cannot execute %s"
 msgstr "%s: Ezin da %s exekutatu"
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: %s biltegia ez da onartzen\n"
@@ -1475,35 +1475,35 @@ msgstr "%s: ezin da %s erabiltzailearen sarrera eguneratu\n"
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: ezin da itzalpeko pasahitz-fitxategia ezabatu\n"
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr "Barkatu."
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s: terminal batetik exekutatu behar da\n"
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr "%s: pam_start: %d errorea\n"
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr "ID ezezaguna: %s\n"
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Ez duzu 'su %s' exekutatzeko baimenik\n"
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr "(sartu zure pasahitza.)"
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -1512,7 +1512,7 @@ msgstr ""
 "%s: %s\n"
 "(Ez ikusi egin zaio)\n"
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr "Ez dago shell-a\n"
@@ -1537,12 +1537,12 @@ msgstr "Sartu zure pasahitz PROPIOA autentifikazio gisa\n"
 msgid "No password file\n"
 msgstr "Ez dago pasahitz-fitxategirik\n"
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr "Ez dago 'root'-en pasahitzik\n"
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
@@ -1552,221 +1552,226 @@ msgstr ""
 "Sakatu Kontrol+d teklak hasiera arrunta erabiltzeko,\n"
 "(edo idatzi root-en pasahitza sistemaren mantentze-lanetarako):"
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr "Sistemaren mantentze-lanetako moduan sartzen\n"
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s:baliogabeko zenbakizko '%s' argumentoa\n"
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s: %s GID ezezaguna \n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s: %s talde ezezaguna\n"
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: ezin da lehenespen fitxategi berria sortu\n"
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr "%s: ezin da lehenespen fitxategi berria ireki\n"
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr "%s: berrizendatu: %s"
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s: taldea `%s' NIS talde bat da.\n"
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: talde gehiegi zehaztu dira (geh. %d).\n"
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
-msgstr "Erabilera: useradd [-u uid [-o]] [-g taldea] [-G taldea,...] \n"
-
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
 msgstr ""
-"                   [-d etxea] [-s shell] [-c iruzkina] [-m [-k txantiloia]]\n"
 
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr "              [-f ez-aktiboa] [-e iraungitu]\n"
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr "              [-p pasahitza] izena\n"
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr "           useradd -D [-g taldea] [-b base] [-s shell]\n"
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s: errorea talde-fitxategia blokeatzean\n"
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s: errorea talde-fitxategia irekitzean\n"
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s: errorea itzalpeko talde-fitxategia blokeatzean\n"
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s: errorea itzalpeko talde-fitxategia irekitzean\n"
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, fuzzy, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: %u gid-a ez da bakarra\n"
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, fuzzy, c-format
 msgid "%s: can't get unique UID\n"
 msgstr "%s: ezin da gid bakarra lortu\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr "%s: oinarrizko '%s' direktorio baliogabea\n"
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr "%s: `%s' iruzkin baliogabea\n"
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s: `%s' etxe-direktorio baliogabea\n"
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s: `%s' data baliogabea\n"
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr "%s: -e itzalpeko pasahitza eskatzen du\n"
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr "%s: -f itzalpeko pasahitza eskatzen du\n"
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s: `%s' eremu baliogabea\n"
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr "%s: '%s' shell baliogabea\n"
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr "%s: '%s' erabiltzaile-izen baliogabea\n"
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s: ezin da pasahitz-fitxategia berridatzi\n"
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s: ezin da itzalpeko pasahitz-fitxategia berridatzi\n"
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s: ezin da pasahitz-fitxategia blokeatu\n"
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s: ezin da pasahitz-fitxategia ireki\n"
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s: ezin da itzalpeko pasahitz-fitxategia blokeatu\n"
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s: ezin da itzalpeko pasahitz-fitxategia ireki\n"
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr "%s: errorea pasahitzaren sarrera berria gehitzean\n"
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr "%s: errorea itzalpeko pasahitzaren sarrera berria gehitzean\n"
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: ezin da %s direktorioa sortu\n"
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr "Ez dago \"mail\" izeneko talderik, posta ilara sortzen (0600 moduan)\n"
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr "Ezin da %s erabiltzailearen posta ilara sortu.\n"
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s: %s erabiltzailea badago dagoeneko\n"
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
 msgstr ""
 "%s: %s taldea badago - erabiltzaile hau talde honetan gehiteko erabili '-g'\n"
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: abisua: CREATE_HOME ez da onartzen, erabili '-m' aukera.\n"
@@ -1816,12 +1821,12 @@ msgstr "%s: %s ez dago %s(r)en jabetzan. ez da ezabatuko\n"
 msgid "%s: warning: can't remove "
 msgstr "%s: abisua: ezin da ezabatu "
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s: %s erabiltzailea ez da existitzen\n"
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s:  %s erabiltzailea NIS erabiltzaile bat da\n"
@@ -1836,101 +1841,106 @@ msgstr "%s: ez da %s direktorioa ezabatuko (%s(r)en etxea ezabatuko luke)\n"
 msgid "%s: error removing directory %s\n"
 msgstr "%s: errorea %s direktorioa ezabatzean\n"
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr "Erabilera: %s\t[-u uid [-o]] [-g taldea] [-G taldea,...] \n"
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr "\t\t[-d etxea [-m]] [-s shell] [-c iruzkina] [-l izen_berria]\n"
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr "[-f ez-aktiboa] [-e iraungitu] "
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr "[-p pasahitza] [-L|-U] izena\n"
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s: memoriarik ez 'update_group'en\n"
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s: memoriarik ez 'update_gshadow'-en\n"
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: ez da banderarik eman\n"
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s:  -e eta -f aukerek itzalpeko pasahitzak eskatzen dute\n"
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr ""
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr "%s:  %lu ez da uid bakarra\n"
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s: errorea pasahitzaren sarrera aldatzean\n"
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s: errorea pasahitzaren sarrera ezabatzean\n"
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr "%s: errorea itzalpeko pasahitzaren sarrera ezabatzean\n"
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: %s direktorioa badago\n"
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s: ezin da %s sortu\n"
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s:ezin da %s jabez aldatu\n"
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s: ezin da %s direktorioa %s gisa izenez aldatu\n"
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: abisua: %s ez dago %s(r)en jabegoan\n"
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr "huts egin du postontzia jabez aldatzean"
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr "huts egin du postontzia izenez aldatzean"
 
@@ -1969,6 +1979,29 @@ msgstr ""
 "`vigr' -k /etc/group editatzen du         `vigr -s' -k /etc/gshadow "
 "editatzen du\n"
 
+#, fuzzy
+#~ msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
+#~ msgstr "Erabilera: useradd [-u uid [-o]] [-g taldea] [-G taldea,...] \n"
+
+#~ msgid ""
+#~ "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+#~ msgstr ""
+#~ "                   [-d etxea] [-s shell] [-c iruzkina] [-m [-k "
+#~ "txantiloia]]\n"
+
+#~ msgid "               [-f inactive] [-e expire]\n"
+#~ msgstr "              [-f ez-aktiboa] [-e iraungitu]\n"
+
+#, fuzzy
+#~ msgid "               [-p passwd] [-K KEY=VALUE] name\n"
+#~ msgstr "              [-p pasahitza] izena\n"
+
+#~ msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
+#~ msgstr "           useradd -D [-g taldea] [-b base] [-s shell]\n"
+
+#~ msgid "%s: -O requires NAME=VALUE\n"
+#~ msgstr "%s: -O-k NAME=BALIOA eskatzen du\n"
+
 #~ msgid "unknown uid: %u\n"
 #~ msgstr "uid ezezaguna: %u\n"
 
diff --git a/po/fi.gmo b/po/fi.gmo
index 870f744c..5b2a26ed 100644
Binary files a/po/fi.gmo and b/po/fi.gmo differ
diff --git a/po/fi.po b/po/fi.po
index 34ea9cb1..998b9fbc 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: shadow 4.0.10\n"
+"Project-Id-Version: shadow 4.0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
-"PO-Revision-Date: 2005-06-21 00:28+0300\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
+"PO-Revision-Date: 2005-07-12 11:20+0300\n"
 "Last-Translator: Tommi Vainikainen <thv+debian@iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -143,12 +143,12 @@ msgstr "Ei hakemistoa, sisäänkirjaudutaan siten, että HOME=/"
 msgid "Cannot execute %s"
 msgstr "Ei voi suorittaa %s"
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "Virheellinen juurihakemisto \"%s\"\n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "Ei voi vaihtaa juurihakemistoksi \"%s\"\n"
@@ -168,16 +168,16 @@ msgstr "Asetustiedoille ei voi varata tilaa.\n"
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr "asetusvirhe - tuntematon kohta \"%s\" (kerro ylläpidolle)\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "Salasana: "
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "Käyttäjän %s salasana: "
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -201,10 +201,10 @@ msgstr ""
 "  -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\t\t\tNäytä tämä ohje ja lopeta\n"
-"  -I, --inactive POISKÄYTÖSTÄ   Aseta salasana pois käytöstä POISKÄYTÖSTÄ\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\t\t\tNäytä tilin vanhenemistiedot\n"
+"  -l, --list                    Näytä tilin vanhenemistiedot\n"
 "  -m, --mindays MIN_PÄIVIÄ      Aseta pienimmäksi sallittuksi määräksi "
 "päiviä\n"
 "                                ennen salasanan vaihtamista MIN_PÄIVIÄ\n"
@@ -214,147 +214,147 @@ msgstr ""
 "  -W, --warndays VAR_PÄIVIÄ     Aseta vanhenemisen varoitusajaksi "
 "VAR_PÄIVIÄ\n"
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Syötä uusi arvo tai paina ENTER jättääksesi oletuksen\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "Salasanan ikä vähintään"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "Salasanan ikä korkeintaan"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "Viimeisin salasanan vaihto (VVVV-KK-PP)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "Salasanan vanhenemisvaroitus"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "Salasana pois käytöstä"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Tunnuksen vanhenemispäiväys (VVVV-KK-PP)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Edellinen salasanan vaihto\t\t\t\t\t: "
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, c-format
 msgid "never\n"
 msgstr "ei koskaan\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Salasana vanhenee\t\t\t\t\t: "
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Salasana pois käytöstä\t\t\t\t\t:"
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Tunnus vanhenee\t\t\t\t\t:"
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr "Salasanan vaihtamisten välillä vähintään päiviä\t\t: %ld\n"
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr "Salasanan vaihtamisten välillä korkeintaan päiviä\t\t: %ld\n"
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr "Montako päivää varoitetaan ennen salasanan vanhenemista\t\t: %ld\n"
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s: älä sisällytä \"l\" muiden lippujen kanssa\n"
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: Lupa evätty.\n"
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM-todennus epäonnistui\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: salasanatiedostoa ei voi avata\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s: Tuntematon käyttäjä %s\n"
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
-msgstr "%s: varjosalasanatiedostoa ei voi lukita"
+msgid "%s: can't lock shadow password file\n"
+msgstr "%s: varjosalasanatiedostoa ei voi lukita\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
-msgstr "%s: varjosalasanatiedostoa ei voi avata"
+msgid "%s: can't open shadow password file\n"
+msgstr "%s: varjosalasanatiedostoa ei voi avata\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "Muutetaan käyttäjän %s vanhenemistietoja\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: virhe muutettaessa kenttiä\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: salasanatiedostoa ei voi päivittää\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: varjosalasanatiedostoa ei voi päivittää\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s: varjosalasanatiedostoa ei voi uudelleenkirjoittaa\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: salasanatiedostoa ei voi uudelleenkirjoittaa\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr "%s: PAM-chauthtok epäonnistui\n"
@@ -463,7 +463,7 @@ msgstr "Salasanatiedostoa ei voi lukita. Yritä myöhemmin uudelleen.\n"
 msgid "Cannot open the password file.\n"
 msgstr "Salasanatiedostoa ei voi avata.\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: Käyttäjää %s ei löydy tiedostosta /etc/passwd\n"
@@ -685,7 +685,7 @@ msgstr "%s: varjoryhmäsalanat vaaditaan valitsimelle -A\n"
 msgid "Who are you?\n"
 msgstr "Kuka olet?\n"
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "tuntematon ryhmä: %s\n"
@@ -778,12 +778,12 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr "Käyttö: groupadd [-g gid [-o]] [-f] ryhmä\n"
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s: virhe lisättäessä uutta ryhmätietuetta\n"
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr "%s: nimi %s ei ole ainutkertainen\n"
@@ -803,24 +803,24 @@ msgstr "%s: ei saa ainutkertaista GID:iä\n"
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s: %s ei ole kelpo ryhmänimi\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr "%s: virheellinen ryhmä %s\n"
 
-#: src/groupadd.c:325 src/useradd.c:1058
+#: src/groupadd.c:332 src/useradd.c:1094
 #, c-format
-msgid "%s: -O requires NAME=VALUE\n"
-msgstr "%s: -O vaatii NIMI=ARVO\n"
+msgid "%s: -K requires KEY=VALUE\n"
+msgstr "%s: -K vaatii AVAIN=ARVO\n"
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s: ryhmätiedostoa ei voi uudelleenkirjoittaa\n"
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s: varjoryhmätiedostoa ei voi uudelleenkirjoittaa\n"
@@ -880,7 +880,7 @@ msgstr "%s: ryhmää %s ei ole olemassa\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s: ryhmä %s on NIS-ryhmä\n"
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: isäntä %s on NIS-palvelin\n"
@@ -1142,7 +1142,7 @@ msgstr ""
 "\n"
 "[Yhteydenkatkaisu ohitettu -- pääkäyttäjän kirjautuminen sallittu.]\n"
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
@@ -1151,17 +1151,17 @@ msgstr ""
 "\n"
 "Sisäänkirjautuminen keskeytetty %d sekunnin jälkeen.\n"
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr " päätteeltä \"%.100s\" osoitteesta \"%.200s\""
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr " päätteeltä \"%.100s\""
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
@@ -1170,26 +1170,26 @@ msgstr ""
 "\n"
 "%s-tunnus: "
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr "Sisäänkirjautuminen epäonnistui"
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr ""
 "Varoitus: sisäänkirjautuminen uudelleen käytössä hetkellisen eston jälkeen.\n"
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr "Edellinen kirjautuminen: %s päätteellä %s"
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr "Edellinen kirjautuminen: %.19s päätteellä %s"
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr " osoitteesta %.*s"
@@ -1204,21 +1204,21 @@ msgstr "Käyttö: newgrp [-] [ryhmä]\n"
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Käyttö: sg ryhmä [[-c] komento]\n"
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "tuntematon UID: %u\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr "tuntematon GID: %lu\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr "Pahoittelen.\n"
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr "liian monta ryhmää\n"
@@ -1364,7 +1364,7 @@ msgstr "%s: muisti loppui\n"
 msgid "%s: Cannot execute %s"
 msgstr "%s: Komento %s ei voi suorittaa"
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: tietolähdettä %s ei tueta\n"
@@ -1481,35 +1481,35 @@ msgstr "%s: käyttäjän %s tietuetta ei voi päivittää\n"
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: varjosalasanatiedostoa ei voi poistaa\n"
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr "Pahoittelen."
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s: täytyy suorittaa päätteessä\n"
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr "%s: pam_start: virhe %d\n"
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr "Tuntematon id: %s\n"
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Sinulla ei ole lupaa asettua käyttäjäksi %s\n"
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr "(Syötä oma salasanasi.)"
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -1518,7 +1518,7 @@ msgstr ""
 "%s: %s\n"
 "(Ohitettu)\n"
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr "Ei kuorta\n"
@@ -1543,12 +1543,12 @@ msgstr "Syötä OMA salasanasi todennukseksi.\n"
 msgid "No password file\n"
 msgstr "Ei salasanatiedosto\n"
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr "Ei salasanatietuetta pääkäyttäjälle (\"root\")\n"
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
@@ -1558,216 +1558,253 @@ msgstr ""
 "Paina ctrl-d jatkaaksesi normaalia käynnistystä,\n"
 "(tai syötä pääkäyttäjän salasana järjestelmän ylläpitämiseksi):"
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr "Siirrytään järjestelmän ylläpitotilaan\n"
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s: virheellinen numeroargumentti \"%s\"\n"
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s: tuntematon GID %s\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s: tuntematon ryhmä %s\n"
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: uutta defaults-tiedostoa ei voi luoda\n"
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr "%s: uutta defaults-tiedostoa ei voi avata\n"
 
 # Kannattaako tuota kääntää, siinä viitataan rename()-funktioon...
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr "%s: rename: %s"
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s: ryhmä \"%s\" ei ole NIS-ryhmä.\n"
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: liian monta ryhmää määritelty (korkeintaan %d).\n"
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
-msgstr "Käyttö: useradd [-u uid [-o]] [-g ryhmä] [-G ryhmä,...] \n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
+msgstr ""
+"Käyttö: useradd [valitsimet] TUNNUS\n"
+"\n"
+"Valitsimet:\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"
 
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
-msgstr "               [-d koti] [-s kuori] [-c komento] [-m [-k malli]]\n"
-
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr "               [-f poiskäytöstä] [-e vanhenee]\n"
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr "               [-p salansana] nimi\n"
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr "       useradd -D [-g ryhmä] [-b perus] [-s kuori]\n"
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s: virhe lukittaessa ryhmätiedostoa\n"
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s: virhe avattaessa ryhmätiedostoa\n"
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s: virhe lukittaessa varjoryhmätiedostoa\n"
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s: virhe avattaessa varjoryhmätiedostoa\n"
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: UID %u ei ole ainutkertainen\n"
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, c-format
 msgid "%s: can't get unique UID\n"
 msgstr "%s: ei saa ainutkertaista UID:tä\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr "%s: virheellinen perushakemisto \"%s\"\n"
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr "%s: virheellinen kommentti \"%s\"\n"
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s: virheellinen kotihakemisto \"%s\"\n"
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s: virheellinen päiväys \"%s\"\n"
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr "%s: varjosalasanat vaaditaan valitsimelle -e\n"
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr "%s: varjosalasanat vaaditaan valitsimelle -f\n"
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s: virheellinen kenttä \"%s\"\n"
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr "%s: virheellinen kuori \"%s\"\n"
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr "%s: virheellinen käyttäjätunnus \"%s\"\n"
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s: salasanatiedostoa ei voi uudelleenkirjoittaa\n"
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s: varjosalasanatiedostoa ei voi uudelleenkirjoittaa\n"
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s: salasanatiedostoa ei voi lukita\n"
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s: salasanatiedostoa ei voi avata\n"
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s: varjosalasanatiedostoa ei voi lukita\n"
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s: varjosalasanatiedostoa ei voi avata\n"
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr "%s: virhe lisättäessä uutta salasanatietuetta\n"
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr "%s: virhe lisättäessä uutta varjosalasanatietuetta\n"
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: hakemistoa %s ei voi luoda\n"
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr ""
 "Ryhmää nimeltä \"mail\" ei ole olemassa, luodaan postilaatikko oikeuksilla "
 "0600.\n"
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr "Käyttäjälle %s ei voi luoda postilaatikkoa.\n"
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s: käyttäjä %s on olemassa\n"
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
@@ -1775,7 +1812,7 @@ msgstr ""
 "%s: ryhmä %s on olemassa - jos haluat lisätä tämän käyttäjän ryhmään, käytä "
 "valitsinta -g.\n"
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 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"
@@ -1825,12 +1862,12 @@ msgstr "%s: tiedoston %s omistaja ei ole %s, ei poisteta\n"
 msgid "%s: warning: can't remove "
 msgstr "%s: varoitus: ei voi poistaa tiedostoa "
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s: käyttäjää %s ei ole olemassa\n"
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: käyttäjä %s on NIS-käyttäjä\n"
@@ -1846,102 +1883,107 @@ msgstr ""
 msgid "%s: error removing directory %s\n"
 msgstr "%s: virhe poistettaessa hakemistoa %s\n"
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
-msgstr "Käyttö: %s\t[-u uid [-o]] [-g ryhmä] [-G ryhmä,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
+msgstr "Käyttö: %s\t[-u uid [-o]] [-g ryhmä] [[-G ryhmä,...] [-a]]\n"
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr "\t\t[-d koti [-m]] [-s kuori] [-c kommentti] [-l uusi_nimi]\n"
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr "[-f poiskäytöstä] [-e vanhenee] "
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr "[-p passwd] [-L|-U] nimi\n"
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s: muisti loppui funktiossa update_group\n"
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s: muisti loppui funktiossa update_gshadow\n"
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: lippuja ei annettu\n"
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: varjosalasanat vaaditaan valitsimille -e ja -f\n"
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr "%s: Valitsinta -a voi käyttää VAIN yhdessä valitsimen -G kanssa\n"
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr "%s: uid %lu ei ole ainutkertainen\n"
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s: virhe muutettaessa salasanatietuetta\n"
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s: virhe poistettaessa salasanatietuetta\n"
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr "%s: virhe poistettaessa varjosalasanatietuetta\n"
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: hakemisto %s on olemassa\n"
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s: tiedostoa %s ei voi luoda\n"
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s: tiedoston %s omistajaa ei voi asettaa\n"
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
 "%s: varoitus: vanhan kotihakemiston %s täydellinen poistaminen epäonnistui"
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s: hakemistoa %s ei voi uudelleennimetä hakemistoksi %s\n"
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: varoitus: tiedoston %s omistaja ei ole %s\n"
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr "postilaatikon omistajan vaihtaminen epäonnistui"
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr "postilaatikon uudelleennimeäminen epäonnistui"
 
diff --git a/po/fr.gmo b/po/fr.gmo
index 13d9dec3..e5bfb4ab 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 1d7c8bf7..2c27b79b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
 "PO-Revision-Date: 2005-04-20 22:39+0200\n"
 "Last-Translator: Jean-Luc Coulon (f5ibh) <jean-luc.coulon@wanadoo.fr>\n"
 "Language-Team:  French <debian-l10n-french@lists.debian.org>\n"
@@ -146,12 +146,12 @@ msgstr "Pas de répertoire, connexion avec HOME=/"
 msgid "Cannot execute %s"
 msgstr "Impossible d'exécuter %s"
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "Répertoire racine « %s » incorrect\n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "Impossible de changer le répertoire racine en « %s »\n"
@@ -174,16 +174,16 @@ msgstr ""
 "erreur de configuration - élément « %s » inconnu (prévenez "
 "l'administrateur)\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "Mot de passe: "
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "Mot de passe de %s: "
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -202,152 +202,152 @@ msgid ""
 "  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
 msgstr ""
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr ""
 "Entrez la nouvelle valeur ou « Entrée » pour conserver la valeur proposée\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "Durée minimale de validité du mot de passe"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "Durée maximale de validité du mot de passe"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "Dernier changement de mot de passe (AAAA-MM-JJ)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "Avertissement de fin de validité du mot de passe"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "Mot de passe désactivé"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Date de fin de validité du compte (AAAA-MM-JJ)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Dernier changement de mot de passe\t\t\t\t\t: "
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, c-format
 msgid "never\n"
 msgstr "jamais\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Fin de validité du mot de passe\t\t\t\t\t: "
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Mot de passe désactivé\t\t\t\t\t: "
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Fin de validité du compte\t\t\t\t\t: "
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr ""
 "Nombre minimum de jours entre les changements de mot de passe\t\t: %ld\n"
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr ""
 "Nombre maximum de jours entre les changements de mot de passe\t\t: %ld\n"
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr ""
 "Nombre de jours d'avertissement avant la fin de validité du mot de passe\t: %"
 "ld\n"
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s: ne pas mélanger « l » avec les autres indicateurs\n"
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: permission refusée.\n"
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: échec de la méthode d'authentification PAM\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: impossible d'ouvrir le fichier des mots de passe\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s: utilisateur %s inconnu\n"
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
-msgstr "%s: impossible de verrouiller le fichier des mots de passe cachés"
+msgid "%s: can't lock shadow password file\n"
+msgstr "%s: impossible de verrouiller le fichier des mots de passe cachés\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
-msgstr "%s: impossible d'ouvrir le fichier des mots de passe cachés"
+msgid "%s: can't open shadow password file\n"
+msgstr "%s: impossible d'ouvrir le fichier des mots de passe cachés\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "Changement des informations sur la limite de validité pour %s\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: erreur lors de la modification des champs\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: impossible de mettre à jour le fichier des mots de passe\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: impossible de mettre à jour le fichier des mots de passe cachés\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s: impossible de réécrire le fichier des mots de passe cachés\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: impossible de réécrire le fichier des mots de passe\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr "%s: erreur de PAM chauthtok\n"
@@ -459,7 +459,7 @@ msgstr ""
 msgid "Cannot open the password file.\n"
 msgstr "Impossible d'ouvrir le fichier des mots de passe.\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: %s non trouvé dans /etc/passwd\n"
@@ -684,7 +684,7 @@ msgstr "%s: mots de passe de groupe cachés nécessaires pour -A\n"
 msgid "Who are you?\n"
 msgstr "Qui êtes-vous ?\n"
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "groupe inconnu: %s\n"
@@ -777,12 +777,12 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr "Usage: groupadd [-g gid [-o]] [-f] groupe\n"
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s: erreur lors de l'ajout du nouveau groupe\n"
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr "%s: le nom %s n'est pas unique\n"
@@ -802,24 +802,24 @@ msgstr "%s: impossible d'obtenir un gid unique\n"
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s: %s n'est pas un nom de groupe valide\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr "%s: groupe %s non valable\n"
 
-#: src/groupadd.c:325 src/useradd.c:1058
-#, c-format
-msgid "%s: -O requires NAME=VALUE\n"
+#: src/groupadd.c:332 src/useradd.c:1094
+#, fuzzy, c-format
+msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -O requiert NAME=VALEUR\n"
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s: impossible de réécrire le fichier group\n"
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s: impossible de réécrire le fichier des groupes cachés\n"
@@ -879,7 +879,7 @@ msgstr "%s: le groupe %s n'existe pas\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s: le groupe %s est un groupe NIS\n"
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s est le maître NIS\n"
@@ -1143,7 +1143,7 @@ msgstr ""
 "\n"
 "[Déconnexion court-circuitée -- accès superutilisateur autorisé].\n"
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
@@ -1152,17 +1152,17 @@ msgstr ""
 "\n"
 "Tentative de connexion: délai de %d secondes dépassé.\n"
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr " sur « %.100s » à partir de « %.200s »"
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr " sur « %.100s »"
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
@@ -1171,25 +1171,25 @@ msgstr ""
 "\n"
 "%s login: "
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr "Identifiant incorrect"
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Attention: identifiant réactivé après une désactivation temporaire.\n"
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr "Dernière connexion: le %s sur %s"
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr "Dernière connexion: le %.19s sur %s"
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr " à partir de %.*s"
@@ -1204,21 +1204,21 @@ msgstr "Usage: newgrp [-] [groupe]\n"
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Usage: sg groupe [[-c] commande]\n"
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, fuzzy, c-format
 msgid "unknown UID: %u\n"
 msgstr "GID inconnu: %lu\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr "GID inconnu: %lu\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr " \n"
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr "trop de groupes\n"
@@ -1366,7 +1366,7 @@ msgstr "%s: plus de mémoire\n"
 msgid "%s: Cannot execute %s"
 msgstr "%s: Impossible d'exécuter %s"
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: le dépôt %s n'est pas géré\n"
@@ -1485,35 +1485,35 @@ msgstr "%s: impossible de mettre à jour l'entrée pour l'utilisateur %s\n"
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: impossible d'effacer le fichier des mots de passe cachés\n"
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr " "
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s: doit être lancé à partir d'un terminal\n"
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr "%s: pam_start: erreur %d\n"
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr "ID inconnue: %s\n"
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Vous n'êtes pas autorisé à utiliser « su » %s\n"
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr "(Entrez votre propre mot de passe)."
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -1522,7 +1522,7 @@ msgstr ""
 "%s: %s\n"
 "(Ignoré)\n"
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr "Pas d'interpréteur de commandes\n"
@@ -1547,12 +1547,12 @@ msgstr "Entrez votre PROPRE mot de passe pour vous authentifier.\n"
 msgid "No password file\n"
 msgstr "Pas de fichier des mots de passe\n"
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr "Pas de mot de passe pour « root »\n"
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
@@ -1563,219 +1563,224 @@ msgstr ""
 "(ou donnez le mot de passe du superutilisateur pour la maintenance du "
 "système): "
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr "Entrée dans le mode de maintenance du système\n"
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s: argument numérique « %s » incorrect\n"
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s: GID %s inconnu\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s: groupe %s inconnu\n"
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: impossible de créer le nouveau fichier des valeurs par défaut\n"
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr "%s: impossible d'ouvrir le nouveau fichier des valeurs par défaut\n"
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr "%s: renomme: %s"
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s: le groupe « %s » est un groupe NIS.\n"
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: trop de groupes spécifiés (max %d).\n"
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
-msgstr "Usage: useradd [-u uid [-o]] [-g groupe] [-G groupe,...]\n"
-
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
 msgstr ""
-"               [-d home] [-s shell] [-c commentaire] [-m [-k template]]\n"
 
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr "               [-f inactif] [-e expire]\n"
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr "               [-p mot-de-passe] nom\n"
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr "       useradd -D [-g groupe] [-b base] [-s shell]\n"
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s: erreur lors du verrouillage du fichier de groupe\n"
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s: erreur lors d'ouverture du fichier de groupe\n"
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s: erreur lors du verrouillage du fichier des groupes cachés\n"
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s: erreur lors de l'ouverture du fichier des groupes cachés\n"
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, fuzzy, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: le gid %u n'est pas unique\n"
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, fuzzy, c-format
 msgid "%s: can't get unique UID\n"
 msgstr "%s: impossible d'obtenir un gid unique\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr "%s: répertoire de base non valable « %s »\n"
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr "%s: commentaire « %s » non valable\n"
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s: répertoire personnel « %s » non valable\n"
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s: date « %s » non valable\n"
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr "%s: mots de passe cachés nécessaires pour -e\n"
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr "%s: mots de passe cachés nécessaires pour -f\n"
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s: champ « %s » non valable\n"
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr "%s: interpréteur de commandes « %s » non valable\n"
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr "%s: nom d'utilisateur « %s » non valable\n"
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s: impossible de réécrire le fichier des mots de passe\n"
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s: impossible de réécrire le fichier des mots de passe cachés\n"
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s: impossible de verrouiller le fichier des mots de passe\n"
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s: impossible d'ouvrir le fichier des mots de passe\n"
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s: impossible de verrouiller le fichier des mots de passe cachés\n"
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s: impossible d'ouvrir le fichier des mots de passe cachés\n"
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr "%s: erreur lors de l'ajout de la nouvelle entrée\n"
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr ""
 "%s: erreur lors de l'ajout de la nouvelle entrée du mot de passe caché\n"
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: impossible de créer le répertoire %s\n"
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr ""
 "Il n'y a pas de groupe dont le nom est « mail », création du répertoire de "
 "dépôt de courrier avec le mode 0600.\n"
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr ""
 "Impossible de créer le répertoire de dépôt de courrier pour l'utilisateur %"
 "s.\n"
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s: l'utilisateur %s existe\n"
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
@@ -1783,7 +1788,7 @@ msgstr ""
 "%s: le groupe %s existe - si vous voulez ajouter cet utilisateur à ce "
 "groupe, utilisez -g.\n"
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: attention: CREATE_HOME n'est pas supporté, veuillez utiliser -m.\n"
@@ -1833,12 +1838,12 @@ msgstr "%s: %s n'appartient pas à %s, non supprimé\n"
 msgid "%s: warning: can't remove "
 msgstr "%s: attention: suppression impossible "
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s: l'utilisateur %s n'existe pas\n"
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: le compte %s est un compte NIS\n"
@@ -1855,101 +1860,106 @@ msgstr ""
 msgid "%s: error removing directory %s\n"
 msgstr "%s: erreur lors de l'effacement du répertoire %s\n"
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr "Usage: %s\t[-u uid [-o]] [-g groupe] [-G groupe,...]\n"
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr "\t\t[-d home [-m]] [-s shell] [-c commentaire] [-l nouveau_nom]\n"
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr "[-f inactif] [-e expire] "
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr "[-p mot-de-passe] [-L|-U] nom\n"
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s: plus de mémoire pour update_group\n"
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s: plus de mémoire pour update_gshadow\n"
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: aucun indicateur n'a été précisé\n"
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: mots de passe shadow nécessaires pour -e ou -f\n"
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr ""
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr "%s: l'uid %lu n'est pas unique\n"
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s: erreur lors du changement de l'entrée dans /etc/passwd\n"
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s: erreur lors de l'effacement du mot de passe\n"
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr "%s: erreur lors de la suppression de l'entrée cachée du mot de passe\n"
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: le répertoire %s existe\n"
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s: impossible de créer %s\n"
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s: impossible de changer le propriétaire de %s\n"
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s: impossible de renommer le répertoire %s en %s\n"
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: attention: %s n'appartient pas à %s\n"
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr "échec du changement de propriétaire de la boîte à lettres"
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr "échec du changement de nom de la boîte à lettres"
 
@@ -1986,6 +1996,28 @@ msgstr ""
 "« vipw » édite /etc/passwd        « vipw -s » édite /etc/shadow\n"
 "« vigr » édite /etc/group         « vigr -s » édite /etc/gshadow\n"
 
+#, fuzzy
+#~ msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
+#~ msgstr "Usage: useradd [-u uid [-o]] [-g groupe] [-G groupe,...]\n"
+
+#~ msgid ""
+#~ "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+#~ msgstr ""
+#~ "               [-d home] [-s shell] [-c commentaire] [-m [-k template]]\n"
+
+#~ msgid "               [-f inactive] [-e expire]\n"
+#~ msgstr "               [-f inactif] [-e expire]\n"
+
+#, fuzzy
+#~ msgid "               [-p passwd] [-K KEY=VALUE] name\n"
+#~ msgstr "               [-p mot-de-passe] nom\n"
+
+#~ msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
+#~ msgstr "       useradd -D [-g groupe] [-b base] [-s shell]\n"
+
+#~ msgid "%s: -O requires NAME=VALUE\n"
+#~ msgstr "%s: -O requiert NAME=VALEUR\n"
+
 #~ msgid "unknown uid: %u\n"
 #~ msgstr "uid inconnu: %u\n"
 
diff --git a/po/he.gmo b/po/he.gmo
index bfe9c061..4ec13168 100644
Binary files a/po/he.gmo and b/po/he.gmo differ
diff --git a/po/he.po b/po/he.po
index 11a9ebad..d961f1fc 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
 "PO-Revision-Date: 2004-07-21 23:59+0300\n"
 "Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n"
 "Language-Team: Hebrew <en@li.org>\n"
@@ -141,12 +141,12 @@ msgstr "אין ספריה, נכנס למערכת עם HOME=/"
 msgid "Cannot execute %s"
 msgstr "לא יכול להריץ %s"
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "ספרית שורש לא חוקית \"%s\"\n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "לא יכול לשנות ספרית שורש ל-\"%s\"\n"
@@ -166,16 +166,16 @@ msgstr "לא יכול להקצות מקום בשביל מידע על הקונפ
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr "שגיאת הגדרות - רכיב לא ידוע '%s' (הודע למנהל)\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "סיסמה: "
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "הסיסמה של %s: "
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -194,147 +194,147 @@ msgid ""
 "  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
 msgstr ""
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "הכנס ערך חדש, או לחץ ENTER לברירת המחדל\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "גיל סיסמה מינימלי"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "גיל סיסמה מקסימלי"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "שינוי סיסמה אחרון (YYYY-MM-DD)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "אזהרת תוקף סיסמה"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "סיסמה לא פעילה"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "תאריך תוקף חשבון (YYYY-MM-DD)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, fuzzy, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "שינוי סיסמה אחרון (YYYY-MM-DD)"
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, fuzzy, c-format
 msgid "never\n"
 msgstr "אף פעם\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, fuzzy, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "תוקף סיסמה:\t"
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, fuzzy, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "חסור פעילות סיסמה:\t"
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, fuzzy, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "תוקף חשבון:\t"
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr ""
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, fuzzy, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: הגישה נאסרה\n"
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: זיהוי PAM נכשל\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: לא יכול לפתוח קובץ סיסמאות\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr ""
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
-msgstr "%s: לא יכול לנעול קובץ סיסמאות צל"
+msgid "%s: can't lock shadow password file\n"
+msgstr "%s: לא יכול לנעול קובץ סיסמאות צל\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
-msgstr "%s: לא יכול לפתוח קובץ סיסמאות צל"
+msgid "%s: can't open shadow password file\n"
+msgstr "%s: לא יכול לפתוח קובץ סיסמאות צל\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "שנה מידע הזדקות בשביל %s\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: שגיאה בשינוי שדות\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: לא יכול לעדכן קובץ סיסמאות\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: לא יכול לעדכן קובץ סיסמאות צל\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s: לא יכול לכתוב מחדש קובץ סיסמאות צל\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: לא יכול לכתוב מחדש קובץ סיסמאות\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr ""
@@ -441,7 +441,7 @@ msgstr "לא יכול לנעול קובץ סיסמאות; נסה שוב מאוח
 msgid "Cannot open the password file.\n"
 msgstr "לא יכול לפתוח את קובץ הסיסמאות.\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr ""
@@ -640,7 +640,7 @@ msgstr ""
 msgid "Who are you?\n"
 msgstr ""
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr ""
@@ -733,12 +733,12 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr ""
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr ""
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr ""
@@ -758,24 +758,24 @@ msgstr ""
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s: שם לא חוקי: \"%s\"\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr ""
 
-#: src/groupadd.c:325 src/useradd.c:1058
+#: src/groupadd.c:332 src/useradd.c:1094
 #, c-format
-msgid "%s: -O requires NAME=VALUE\n"
+msgid "%s: -K requires KEY=VALUE\n"
 msgstr ""
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr ""
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr ""
@@ -835,7 +835,7 @@ msgstr ""
 msgid "%s: group %s is a NIS group\n"
 msgstr ""
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr ""
@@ -1087,49 +1087,49 @@ msgid ""
 "[Disconnect bypassed -- root login allowed.]\n"
 msgstr ""
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
 "Login timed out after %d seconds.\n"
 msgstr ""
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr ""
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr ""
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
 "%s login: "
 msgstr ""
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr ""
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr ""
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr ""
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr ""
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr ""
@@ -1144,21 +1144,21 @@ msgstr ""
 msgid "Usage: sg group [[-c] command]\n"
 msgstr ""
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, fuzzy, c-format
 msgid "unknown UID: %u\n"
 msgstr "%s: שורה %d: משתמש לא מוכר %s\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr ""
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr ""
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr ""
@@ -1300,7 +1300,7 @@ msgstr ""
 msgid "%s: Cannot execute %s"
 msgstr ""
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr ""
@@ -1417,42 +1417,42 @@ msgstr ""
 msgid "%s: can't delete shadow password file\n"
 msgstr ""
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr ""
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr ""
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr ""
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr ""
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr ""
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr ""
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
 "(Ignored)\n"
 msgstr ""
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr ""
@@ -1477,231 +1477,237 @@ msgstr ""
 msgid "No password file\n"
 msgstr ""
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr ""
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
 "(or give root password for system maintenance):"
 msgstr ""
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr ""
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr ""
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, fuzzy, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s: שורה %d: משתמש לא מוכר %s\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr ""
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr ""
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr ""
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr ""
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr ""
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr ""
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
 msgstr ""
 
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
-msgstr ""
-
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr ""
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr ""
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr ""
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr ""
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr ""
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr ""
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr ""
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, fuzzy, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: שם לא חוקי: \"%s\"\n"
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, fuzzy, c-format
 msgid "%s: can't get unique UID\n"
 msgstr "%s: שם לא חוקי: \"%s\"\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr ""
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr ""
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr ""
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr ""
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr ""
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr ""
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr ""
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr ""
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr ""
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr ""
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr ""
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr ""
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr ""
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr ""
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr ""
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr ""
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr ""
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr ""
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr ""
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr ""
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr ""
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
 msgstr ""
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr ""
@@ -1751,12 +1757,12 @@ msgstr ""
 msgid "%s: warning: can't remove "
 msgstr ""
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr ""
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr ""
@@ -1771,101 +1777,106 @@ msgstr ""
 msgid "%s: error removing directory %s\n"
 msgstr ""
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr ""
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr ""
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr ""
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr ""
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr ""
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr ""
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr ""
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr ""
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr ""
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr ""
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr ""
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr ""
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr ""
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr ""
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr ""
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr ""
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr ""
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr ""
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr ""
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr ""
 
diff --git a/po/id.gmo b/po/id.gmo
index 3246da9b..0fe3e139 100644
Binary files a/po/id.gmo and b/po/id.gmo differ
diff --git a/po/id.po b/po/id.po
index 01084cd9..91128fb2 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
 "PO-Revision-Date: 2004-04-09 00:12+0700\n"
 "Last-Translator: Parlin Imanuel Toh <parlin@ui.edu>\n"
 "Language-Team: Debian Indonesia <debid@yahoogroups.com>\n"
@@ -137,12 +137,12 @@ msgstr "Tidak terdapat direktori, masuk dengan HOME=/"
 msgid "Cannot execute %s"
 msgstr "Tidak dapat menjalankan %s"
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "Direktori root tidak sah \"%s\"\n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "Tidak dapat mengubah direktori root ke \"%s\"\n"
@@ -163,16 +163,16 @@ msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr ""
 "Kesalahan konfigurasi - item tidak dikenal '%s' (beritahu administrator)\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "Kata sandi:"
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "Kata sandi dari %s:"
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -191,147 +191,147 @@ msgid ""
 "  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
 msgstr ""
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Masukkan nilai baru atau tekan ENTER untuk nilai bawaan\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "Umur Kata Sandi Minimal"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "Umur Kata Sandi Maksimal"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "Penggantian Kata Sandi Terakhir (TTTT-MM-HH)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "Peringatan Kadaluarsanya Kata Sandi"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "Kata Sandi Tak-aktif"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Waktu Kadaluarsa Akun (TTTT-MM-HH)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, fuzzy, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Penggantian Kata Sandi Terakhir (TTTT-MM-HH)"
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, fuzzy, c-format
 msgid "never\n"
 msgstr "Tidak Pernah\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, fuzzy, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Kata Sandi Kadaluarsa:\t"
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, fuzzy, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Kata Sandi Tidak Aktif:\t"
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, fuzzy, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Akun Kadaluarsa:\t"
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s: jangan gabungkan \"l\" dengan flag lain\n"
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, fuzzy, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: ijin ditolak\n"
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: Otentikasi PAM gagal\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: tidak dapat membuka berkas kata sandi\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s: pengguna %s tak dikenal\n"
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
-msgstr "%s: tidak dapat mengunci berkas kata sandi bayangan"
+msgid "%s: can't lock shadow password file\n"
+msgstr "%s: tidak dapat mengunci berkas kata sandi bayangan\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
-msgstr "%s: tidak dapat membuka berkas kata sandi bayangan"
+msgid "%s: can't open shadow password file\n"
+msgstr "%s: tidak dapat membuka berkas kata sandi bayangan\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "Mengubah informasi umur akun untuk %s\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: kesalahan saat mengubah ruas-ruas isian\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: tidak dapat memperbaharui berkas kata sandi\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: tidak dapat memperbaharui berkas kata sandi bayangan\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s: tidak dapat menulis kembali berkas kata sandi bayangan\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: tidak dapat menulis kembali berkas kata sandi\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr "%s: chauthok PAM gagal\n"
@@ -441,7 +441,7 @@ msgstr "Tidak dapat mengunci berkas kata sandi; coba lagi nanti.\n"
 msgid "Cannot open the password file.\n"
 msgstr "Tidak dapat membuka berkas kata sandi.\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: %s tidak ditemukan pada /etc/passwd\n"
@@ -640,7 +640,7 @@ msgstr "%s: kata sandi bayangan grup diperlukan untuk -A\n"
 msgid "Who are you?\n"
 msgstr "Anda siapa?\n"
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "grup tak dikenal: %s\n"
@@ -733,12 +733,12 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr "Penggunaan: groupadd [-g gid [-o]] [-f] grup\n"
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s: kesalahan saat menambahkan entri grup yang baru\n"
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr "%s: nama %s tidak unik\n"
@@ -758,24 +758,24 @@ msgstr "%s: tidak mendapatkan gid yang unik\n"
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s: nama grup %s tidak sah\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr "%s: grup %s tidak sah\n"
 
-#: src/groupadd.c:325 src/useradd.c:1058
-#, c-format
-msgid "%s: -O requires NAME=VALUE\n"
+#: src/groupadd.c:332 src/useradd.c:1094
+#, fuzzy, c-format
+msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -O memerlukan NAMA=NILAI\n"
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s: tidak dapat menuliskan kembali berkas grup\n"
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s: tidak dapat menuliskan kembali berkas grup bayangan\n"
@@ -835,7 +835,7 @@ msgstr "%s: grup %s tidak ada\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s: grup %s merupakan sebuah grup NIS\n"
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s merupakan master NIS\n"
@@ -1091,7 +1091,7 @@ msgstr ""
 "\n"
 "[Pemutusan hubungan diabaikan -- login root diperbolehkan.]\n"
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
@@ -1100,17 +1100,17 @@ msgstr ""
 "\n"
 "Login time out setelah %d detik.\n"
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr " pada `%.100s' dari `%.200s'"
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr " pada `%.100s'"
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
@@ -1119,25 +1119,25 @@ msgstr ""
 "\n"
 "%s login: "
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr "Login tidak tepat"
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Perhatian: login dibolehkan setelah penguncian sementara.\n"
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr "Login terakhir: %s pada %s"
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr "Login terakhir: %.19s pada %s"
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr " dari %.*s"
@@ -1152,21 +1152,21 @@ msgstr "Penggunaan: newgrp [-] [grup]\n"
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Penggunaan: sg grup [[-c] perintah]\n"
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, fuzzy, c-format
 msgid "unknown UID: %u\n"
 msgstr "GID tidak dikenal: %lu\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr "GID tidak dikenal: %lu\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr "Maaf.\n"
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr "terlalu banyak grup\n"
@@ -1313,7 +1313,7 @@ msgstr "%s: kehabisan memori\n"
 msgid "%s: Cannot execute %s"
 msgstr "%s: Tidak dapat menjalankan %s"
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: repositori %s tidak didukung\n"
@@ -1430,35 +1430,35 @@ msgstr ""
 msgid "%s: can't delete shadow password file\n"
 msgstr ""
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr "Maaf."
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s: mesti dijalankan dari sebuah terminal\n"
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr "%s: pam_start: kesalahan %d\n"
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr "Id tidak dikenal: %s\n"
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Anda tidak diperbolehkan untuk su %s\n"
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr "(Masukkan password anda sendiri.)"
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -1467,7 +1467,7 @@ msgstr ""
 "%s: %s\n"
 "(Diabaikan)\n"
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr "Tak ada shell\n"
@@ -1492,12 +1492,12 @@ msgstr "Silakan masukkan kata sandi anda SENDIRI sebagai otentikasi.\n"
 msgid "No password file\n"
 msgstr "Tak ada berkas kata sandi\n"
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr "Tak ada entri kata sandi untuk 'root'\n"
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
@@ -1507,220 +1507,225 @@ msgstr ""
 "Ketikkan control-d untuk melanjutkan startup normal,\n"
 "(ata berikan kata sandi root untuk pengelolaan sistem):"
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr "Memasuki Mode Pengelolaan Sistem\n"
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr ""
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, fuzzy, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s: pengguna %s tak dikenal\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr ""
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr ""
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr ""
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr ""
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr ""
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr ""
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
-msgstr "Penggunaan: useradd [-u uid [-o]] [-g grup] [-G grup,...] \n"
-
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
 msgstr ""
-"                    [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
 
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr "                    [-f tidak_aktif] [-e kadaluarsa]\n"
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr "                    [-p kata_sandi] nama\n"
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr "            useradd -D [-g grup] [-b base] [-s shell]\n"
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr ""
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr ""
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr ""
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr ""
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, fuzzy, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: gid %u tidak unik\n"
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, fuzzy, c-format
 msgid "%s: can't get unique UID\n"
 msgstr "%s: tidak mendapatkan gid yang unik\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr ""
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr ""
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr ""
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr ""
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr ""
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr ""
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr ""
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr ""
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr ""
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr ""
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr ""
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr ""
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr ""
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr ""
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr ""
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr ""
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr ""
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr ""
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr ""
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr ""
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr ""
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
 msgstr ""
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr ""
@@ -1770,12 +1775,12 @@ msgstr ""
 msgid "%s: warning: can't remove "
 msgstr ""
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr ""
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr ""
@@ -1790,101 +1795,106 @@ msgstr ""
 msgid "%s: error removing directory %s\n"
 msgstr ""
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr "Penggunaan: %s\t[-u uid [-o]] [-g grup] [-G grup,...] \n"
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr "\t\t[-d home [-m]] [-s shell] [-c comment] [-l nama_baru]\n"
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr "[-f tidak_aktif] [-e kadaluarsa] "
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr "[-p kata_sandi] [-L|-U] nama\n"
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr ""
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr ""
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr ""
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr ""
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr ""
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr ""
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr ""
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr ""
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr ""
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr ""
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr ""
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr ""
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr ""
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr ""
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr ""
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr ""
 
@@ -1921,5 +1931,27 @@ msgstr ""
 "`vipw' mengedit /etc/passwd     `vipw -s' mengedit /etc/shadow\n"
 "`vigr' mengedit /etc/group      `vigr -s' mengedit /etc/gshadow\n"
 
+#, fuzzy
+#~ msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
+#~ msgstr "Penggunaan: useradd [-u uid [-o]] [-g grup] [-G grup,...] \n"
+
+#~ msgid ""
+#~ "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+#~ msgstr ""
+#~ "                    [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+
+#~ msgid "               [-f inactive] [-e expire]\n"
+#~ msgstr "                    [-f tidak_aktif] [-e kadaluarsa]\n"
+
+#, fuzzy
+#~ msgid "               [-p passwd] [-K KEY=VALUE] name\n"
+#~ msgstr "                    [-p kata_sandi] nama\n"
+
+#~ msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
+#~ msgstr "            useradd -D [-g grup] [-b base] [-s shell]\n"
+
+#~ msgid "%s: -O requires NAME=VALUE\n"
+#~ msgstr "%s: -O memerlukan NAMA=NILAI\n"
+
 #~ msgid "unknown uid: %u\n"
 #~ msgstr "uid tidak dikenal: %u\n"
diff --git a/po/it.gmo b/po/it.gmo
index f2b52322..173202b1 100644
Binary files a/po/it.gmo and b/po/it.gmo differ
diff --git a/po/it.po b/po/it.po
index 4cdccdab..fbd784df 100644
--- a/po/it.po
+++ b/po/it.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
 "PO-Revision-Date: 2005-04-17 21:57+0200\n"
 "Last-Translator: Danilo Piazzalunga <danilopiazza@libero.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -161,12 +161,12 @@ msgstr "Directory non presente, accesso con HOME=/"
 msgid "Cannot execute %s"
 msgstr "Impossibile eseguire %s"
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "Directory root «%s» non valida\n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "Impossibile cambiare la directory root in «%s»\n"
@@ -188,16 +188,16 @@ msgstr ""
 "errore di configurazione: oggetto «%s» sconosciuto (avvisare "
 "l'amministratore)\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "Password: "
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "Password di %s: "
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -216,154 +216,154 @@ msgid ""
 "  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
 msgstr ""
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Inserire il nuovo valore o premere INVIO per quello predefinito\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "Durata minima della password"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "Durata massima della password"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "Ultimo cambio della password (AAAA-MM-GG)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "Avviso di scadenza della password"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "Inattività della password"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Data di scadenza dell'account (AAAA-MM-GG)"
 
 #      "Last password change	.	.	.	.	: "
-#: src/chage.c:241
+#: src/chage.c:246
 #, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Ultimo cambio della password                            : "
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, c-format
 msgid "never\n"
 msgstr "mai\n"
 
 #      "Password expires	.	.	.	.	: "
-#: src/chage.c:254
+#: src/chage.c:259
 #, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Scadenza della password                                 : "
 
 #      "Password inactive	.	.	.	.	: "
-#: src/chage.c:270
+#: src/chage.c:275
 #, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Inattività della password                               : "
 
 #      "Account expires	.	.	.	.	.	: "
-#: src/chage.c:284
+#: src/chage.c:289
 #, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Scadenza dell'account                                   : "
 
 #      "Minimum number of days between password change	.	: %ld\n"
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr "Numero minimo di giorni tra i cambi di password         : %ld\n"
 
 #      "Maximum number of days between password change	.	: %ld\n"
-#: src/chage.c:302
+#: src/chage.c:307
 #, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr "Numero massimo di giorni tra i cambi di password        : %ld\n"
 
 #      "Number of days of warning before password expires	: %ld\n"
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr "Giorni di preavviso prima della scadenza della password : %ld\n"
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s: non includere «l» con altri flag\n"
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: Permesso negato.\n"
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: autenticazione PAM non riuscita\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: impossibile aprire il file delle password\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s: utente «%s» sconosciuto\n"
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
-msgstr "%s: impossibile fare il lock del file delle shadow password"
+msgid "%s: can't lock shadow password file\n"
+msgstr "%s: impossibile fare il lock del file delle shadow password\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
-msgstr "%s: impossibile aprire il file delle shadow password"
+msgid "%s: can't open shadow password file\n"
+msgstr "%s: impossibile aprire il file delle shadow password\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "Modifica delle informazioni sulla durata dell'account di %s\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: errore nel cambiare i campi\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: impossibile aggiornare il file delle password\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: impossibile aggiornare il file delle shadow password\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s: impossibile riscrivere il file delle shadow password\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: impossibile riscrivere il file delle password\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr "%s: la chiamata PAM chauthok ha restituito un errore\n"
@@ -475,7 +475,7 @@ msgstr ""
 msgid "Cannot open the password file.\n"
 msgstr "Impossibile aprire il file delle password.\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: impossibile trovare «%s» in /etc/passwd\n"
@@ -701,7 +701,7 @@ msgstr "%s: l'opzione -A richiede le shadow password per i gruppi\n"
 msgid "Who are you?\n"
 msgstr "Chi sei?\n"
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "gruppo «%s» sconosciuto\n"
@@ -794,12 +794,12 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr "Uso: groupadd [-g GID [-o]] [-f] GRUPPO\n"
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s: errore nell'aggiungere la nuova voce al file dei gruppi\n"
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr "%s: il nome «%s» non è univoco\n"
@@ -819,24 +819,24 @@ msgstr "%s: impossibile ottenere un gid univoco\n"
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s: %s non è un nome di gruppo valido\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr "%s: gruppo «%s» non valido\n"
 
-#: src/groupadd.c:325 src/useradd.c:1058
-#, c-format
-msgid "%s: -O requires NAME=VALUE\n"
+#: src/groupadd.c:332 src/useradd.c:1094
+#, fuzzy, c-format
+msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -O richiede NOME=VALORE\n"
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s: impossibile riscrivere il file dei gruppi\n"
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s: impossibile riscrivere il file dei gruppi shadow\n"
@@ -896,7 +896,7 @@ msgstr "%s: gruppo «%s» inesistente\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s: il gruppo «%s» è un gruppo NIS\n"
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s è il NIS master\n"
@@ -1161,7 +1161,7 @@ msgstr ""
 "\n"
 "[Disconnessione obbligatoria evitata: root può accedere.]\n"
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
@@ -1170,17 +1170,17 @@ msgstr ""
 "\n"
 "Login scaduto dopo %d secondi.\n"
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr " su «%.100s» da «%.200s»"
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr " su «%.100s»"
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
@@ -1189,28 +1189,28 @@ msgstr ""
 "\n"
 "%s login: "
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr "Login non corretto"
 
 # NdT: Non è chiaro se login sia da tradurre con "accesso abilitato" o
 # "utente abilitato": il significato comunque è lo stesso.
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr ""
 "Attenzione: accesso di nuovo abilitato dopo una proibizione temporanea.\n"
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr "Ultimo accesso: %s su %s"
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr "Ultimo accesso: %.19s su %s"
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr " da %.*s"
@@ -1225,21 +1225,21 @@ msgstr "Uso: newgrp [-] [GRUPPO]\n"
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Uso: sg GRUPPO [[-c] COMANDO]\n"
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, fuzzy, c-format
 msgid "unknown UID: %u\n"
 msgstr "GID «%lu» sconosciuto\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr "GID «%lu» sconosciuto\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr "Spiacente.\n"
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr "troppi gruppi\n"
@@ -1386,7 +1386,7 @@ msgstr "%s: memoria esaurita\n"
 msgid "%s: Cannot execute %s"
 msgstr "%s: impossibile eseguire %s"
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: repository %s non supportato\n"
@@ -1504,35 +1504,35 @@ msgstr "%s: impossibile aggiornare la voce relativa all'utente %s\n"
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: impossibile eliminare il file delle shadow password\n"
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr "Spiacente."
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s: si deve avviare da un terminale\n"
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr "%s: pam_start: errore %d\n"
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr "Id «%s» sconosciuto\n"
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Non si è autorizzati a diventare %s\n"
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr "(Immettere la propria password)"
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -1541,7 +1541,7 @@ msgstr ""
 "%s: %s\n"
 "(Ignorato)\n"
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr "Nessuna shell\n"
@@ -1566,12 +1566,12 @@ msgstr "Inserire la PROPRIA password per autenticarsi.\n"
 msgid "No password file\n"
 msgstr "Manca il file delle password\n"
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr "Manca una voce per «root» nel file delle password\n"
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
@@ -1581,215 +1581,221 @@ msgstr ""
 "Premere Ctrl-D per procedere con l'avvio regolare, oppure\n"
 "inserire la password di root per la manutenzione del sistema:"
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr "Avvio modalità manutenzione del sistema\n"
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s: argomento numerico «%s» non valido\n"
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s: GID «%s» sconosciuto\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s: gruppo «%s» sconosciuto\n"
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: impossibile creare il nuovo file dei valori predefiniti\n"
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr "%s: impossibile aprire il nuovo file dei valori predefiniti\n"
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr "%s: rename: %s"
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s: il gruppo «%s» è un gruppo NIS.\n"
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: troppi gruppi specificati (max %d).\n"
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
-msgstr "Uso: useradd [-u UID [-o]] [-g GRUPPO] [-G GRUPPO,...] \n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
+msgstr ""
 
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
-msgstr "             [-d HOME] [-s SHELL] [-c COMMENTO] [-m [-k MODELLO]]\n"
-
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr "             [-f INATTIVITÀ] [-e SCADENZA]\n"
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr "             [-p PASSWORD] NOME\n"
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr "     useradd -D [-g GRUPPO] [-b BASE] [-s SHELL]\n"
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s: errore nel fare il lock del file dei gruppi\n"
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s: errore nell'aprire il file dei gruppi\n"
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s: errore nel fare il lock del file dei gruppi shadow\n"
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s: errore nell'aprire il file dei gruppi shadow\n"
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, fuzzy, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: gid «%u» non univoco\n"
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, fuzzy, c-format
 msgid "%s: can't get unique UID\n"
 msgstr "%s: impossibile ottenere un gid univoco\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr "%s: directory di base «%s» non valida\n"
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr "%s: commento «%s» non valido\n"
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s: home directory «%s» non valida\n"
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s: data «%s» non valida\n"
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr "%s: le shadow password sono necessarie per -e\n"
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr "%s: le shadow password sono necessarie per -f\n"
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s: campo «%s» non valido\n"
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr "%s: shell «%s» non valida\n"
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr "%s: nome utente «%s» non valido\n"
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s: impossibile riscrivere il file delle password\n"
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s: impossibile riscrivere il file delle shadow password\n"
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s: impossibile fare il lock del file delle password\n"
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s: impossibile aprire il file delle password\n"
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s: impossibile fare il lock del file delle shadow password\n"
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s: impossibile aprire il file delle shadow password\n"
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr "%s: errore nell'aggiungere la nuova voce al file delle password\n"
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr ""
 "%s: errore nell'aggiungere la nuova voce al file delle shadow password\n"
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: impossibile creare la directory %s\n"
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr ""
 "Il gruppo «mail» non esiste; lo spool di posta verrà creato con modo 0600.\n"
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr "Impossibile creare lo spool di posta dell'utente %s.\n"
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s: l'utente «%s» esiste già\n"
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
@@ -1797,7 +1803,7 @@ msgstr ""
 "%s: il gruppo «%s» esiste già; usare -g per aggiungere questo utente a tale "
 "gruppo.\n"
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: attenzione: CREATE_HOME non è supportata; usare -m.\n"
@@ -1847,12 +1853,12 @@ msgstr "%s: %s non appartiene a %s, quindi non viene rimosso\n"
 msgid "%s: warning: can't remove "
 msgstr "%s: attenzione: impossibile rimuovere "
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s: l'utente %s non esiste\n"
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: l'utente %s è un utente NIS\n"
@@ -1871,104 +1877,109 @@ msgstr "%s: errore nel rimuovere la directory %s\n"
 
 # NdT: Lasicare i <Tab> invariati perché la riga sotto è indentata
 # con due <Tab>.
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr "Uso: %s\t[-u UID [-o]] [-g GRUPPO] [-G GRUPPO,...] \n"
 
 # NdT: Lasicare i <Tab> invariati perché la riga sotto è indentata
 # con due <Tab>.
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr "\t\t[-d HOME [-m]] [-s SHELL] [-c COMMENTO] [-l NUOVO_NOME]\n"
 
 # NdT: Questa riga viene indentata di due <Tab>.
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr "[-f INATTIVITÀ] [-e SCADENZA] "
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr "[-p PASSWORD] [-L|-U] NOME\n"
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s: memoria esaurita in update_group\n"
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s: memoria esaurita in update_gshadow\n"
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: non è stata fornita nessuna opzione\n"
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: le shadow password sono necessarie per le opzioni -e e -f\n"
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr ""
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr "%s: uid «%lu» non univoco\n"
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s: errore nel cambio della voce nel file delle password\n"
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s: errore nel rimuovere la voce dal file delle password\n"
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr "%s: errore nel rimuovere la voce dal file delle shadow password\n"
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: la directory %s esiste già\n"
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s: impossibile creare %s\n"
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s: chown di %s non riuscito\n"
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s: impossibile rinominare la directory %s in %s\n"
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: attenzione: %s non appartiene a %s\n"
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr "impossibile cambiare il proprietario della casella di posta"
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr "impossibile rinominare la casella di posta"
 
@@ -2006,6 +2017,27 @@ msgstr ""
 "«vipw» per modificare /etc/passwd    «vipw -s» per modificare /etc/shadow\n"
 "«vigr» per modificare /etc/group     «vigr -s» per modificare /etc/gshadow\n"
 
+#, fuzzy
+#~ msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
+#~ msgstr "Uso: useradd [-u UID [-o]] [-g GRUPPO] [-G GRUPPO,...] \n"
+
+#~ msgid ""
+#~ "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+#~ msgstr "             [-d HOME] [-s SHELL] [-c COMMENTO] [-m [-k MODELLO]]\n"
+
+#~ msgid "               [-f inactive] [-e expire]\n"
+#~ msgstr "             [-f INATTIVITÀ] [-e SCADENZA]\n"
+
+#, fuzzy
+#~ msgid "               [-p passwd] [-K KEY=VALUE] name\n"
+#~ msgstr "             [-p PASSWORD] NOME\n"
+
+#~ msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
+#~ msgstr "     useradd -D [-g GRUPPO] [-b BASE] [-s SHELL]\n"
+
+#~ msgid "%s: -O requires NAME=VALUE\n"
+#~ msgstr "%s: -O richiede NOME=VALORE\n"
+
 #~ msgid "unknown uid: %u\n"
 #~ msgstr "uid «%u» sconosciuto\n"
 
diff --git a/po/ja.gmo b/po/ja.gmo
index afb6a96d..d7928b39 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index 830796f2..264b029f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 1990827\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
 "PO-Revision-Date: 2000-06-18 120:22+0900\n"
 "Last-Translator: Yasuyuki Furukawa <furukawa@vinelinux.org>\n"
 "Language-Team: Japanese\n"
@@ -138,12 +138,12 @@ msgstr "ディレクトリがありません. HOME=/ としてログインしま
 msgid "Cannot execute %s"
 msgstr "%sを実行できません"
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "不正なルートディレクトリ  \"%s\" です \n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "ルートディレクトリを \"%s\"へ変更できません\n"
@@ -163,16 +163,16 @@ msgstr "設定情報用の空き容量が確保できませんでした.\n"
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr "設定エラー - 不明なアイテム '%s'です  (notify administrator)\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "パスワード: "
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "%sのパスワード: "
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -191,149 +191,149 @@ msgid ""
 "  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
 msgstr ""
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr ""
 "新しい値を入力してください, 標準設定値を利用するには リターンを押してくださ"
 "い.\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "最小パスワード変更不可能日数"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "最大パスワード変更可能日数"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "最後パスワード変更日付 (YYYY-MM-DD)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "パスワード期限切れ警告日数"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "パスワード無効日数"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "アカウント期限切れ日付 (YYYY-MM-DD)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, fuzzy, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "最後パスワード変更日付 (YYYY-MM-DD)"
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, fuzzy, c-format
 msgid "never\n"
 msgstr "なし:\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, fuzzy, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "パスワード期限:\t"
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, fuzzy, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "パスワード無効:\t"
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, fuzzy, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "アカウント期限切れ:\t"
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s: 他のフラグのため \"l\" オプションは含ませることができません\n"
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, fuzzy, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: 権限がありません\n"
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, fuzzy, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "バイバスによってパスワードを認証します.\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: パスワードファイルが開けません\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s: 不明なユーザ %s です\n"
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, fuzzy, c-format
-msgid "%s: can't lock shadow password file"
+msgid "%s: can't lock shadow password file\n"
 msgstr "シャドウ・パスワード・ファイルをロックできません\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, fuzzy, c-format
-msgid "%s: can't open shadow password file"
+msgid "%s: can't open shadow password file\n"
 msgstr "%s: シャドウ・パスワード・ファイルを開けません\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "%sの期限情報を変更中\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: 項目変更でエラーが起こりました\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: パスワード・ファイルを更新しません\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: シャドウ・パスワード・ファイルを更新しません\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, fuzzy, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s: シャドウ・パスワード・ファイルを削除できません\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: パスワード・ファイルを上書きできません\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, fuzzy, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr "%s: ファイルをロックできません\n"
@@ -442,7 +442,7 @@ msgstr "パスワード・ファイルをロックできません; 後でもう
 msgid "Cannot open the password file.\n"
 msgstr "パスワード・ファイルを開けません.\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: %sは /etc/passwd中に見付かりません\n"
@@ -641,7 +641,7 @@ msgstr "%s: シャドウ・グループ・パスワードが -Aに対して必
 msgid "Who are you?\n"
 msgstr "あなたは誰?\n"
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "不明なグループです: %s\n"
@@ -734,12 +734,12 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr "使用法: groupadd [-g グループID [-o]] [-f] グループ\n"
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s: 新規グループエントリへ追加のエラーです\n"
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr "%s: 名前 %s は重複しています\n"
@@ -759,24 +759,24 @@ msgstr "%s: 一意のグループIDを取得できません\n"
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s: %s は名前が重複しています\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr "%s: グループ %s は不適切です\n"
 
-#: src/groupadd.c:325 src/useradd.c:1058
+#: src/groupadd.c:332 src/useradd.c:1094
 #, c-format
-msgid "%s: -O requires NAME=VALUE\n"
+msgid "%s: -K requires KEY=VALUE\n"
 msgstr ""
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s: グループ・ファイルを開けません\n"
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s: シャドウ・グループ・ファイルが開けません\n"
@@ -836,7 +836,7 @@ msgstr "%s: %sグループ は存在しません\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s: %sグループは NIS のグループです\n"
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s は NIS マスターです\n"
@@ -1090,24 +1090,24 @@ msgid ""
 "[Disconnect bypassed -- root login allowed.]\n"
 msgstr ""
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
 "Login timed out after %d seconds.\n"
 msgstr ""
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr ""
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr ""
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
@@ -1116,25 +1116,25 @@ msgstr ""
 "\n"
 "%s ログイン: "
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr "ログインが違います"
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr ""
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr "最近のログイン: %s on %s"
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr "最近のログイン: %.19s on %s"
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr " 場所 %.*s"
@@ -1149,21 +1149,21 @@ msgstr "使用法: newgrp [-] [グループ]\n"
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "使用法: sg グループ [[-c] コマンド]\n"
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, fuzzy, c-format
 msgid "unknown UID: %u\n"
 msgstr "不明なグループIDです: %lu\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, fuzzy, c-format
 msgid "unknown GID: %lu\n"
 msgstr "不明なグループIDです: %lu\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr "申し訳ございません.\n"
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr "グループが多すぎます\n"
@@ -1308,7 +1308,7 @@ msgstr "%s: メモリがたりません\n"
 msgid "%s: Cannot execute %s"
 msgstr "%s: %sを実行できません"
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: レポジトリ %s はサポートしていません\n"
@@ -1425,35 +1425,35 @@ msgstr "%s: ユーザ %s のエントリを更新できません\n"
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: シャドウ・パスワード・ファイルを削除できません\n"
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr "申し訳ございません."
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s: 端末上から実行してください\n"
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr "%s: pam_start: エラー %d\n"
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr "不明な IDです: %s\n"
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "あなたは su %s に認証できませんでした\n"
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr "(あなた自身のパスワードを入力してください.)"
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -1462,7 +1462,7 @@ msgstr ""
 "%s: %s\n"
 "(無効)\n"
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr "シェルがありません\n"
@@ -1487,227 +1487,231 @@ msgstr "認証として, あなた所有のパスワードを入力してくだ
 msgid "No password file\n"
 msgstr "パスワードファイルがありません\n"
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr "'root'のパスワードエントリがありません\n"
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
 "(or give root password for system maintenance):"
 msgstr ""
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr "システムメンテナンスモードへ入ります\n"
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, fuzzy, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s: コメント `%s' は不正です\n"
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, fuzzy, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s: 不明なグループID %s\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s: 不明なグループ %s\n"
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, fuzzy, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: グループ・ファイルを開けません\n"
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, fuzzy, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr "%s: グループ・ファイルを開けません\n"
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, fuzzy, c-format
 msgid "%s: rename: %s"
 msgstr "%s: %sを作成できません"
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, fuzzy, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s: %sグループは NIS のグループです\n"
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr ""
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
-msgstr "使用法: useradd [-u ユーザID [-o]] [-g グループ] [-G グループ,...] \n"
-
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
 msgstr ""
-"                [-d ホーム] [-s シェル] [-c コメント]\n"
-"                [-m [-k テンプレート]]\n"
 
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr "                [-f 無効日数] [-e 期限切れ日]\n"
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr "                [-p パスワード] ユーザ名\n"
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr "        useradd -D [-g グループ] [-b ベース] [-s シェル]\n"
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, fuzzy, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s: グループ・ファイルをロックできません\n"
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, fuzzy, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s: グループ・ファイルを開けません\n"
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, fuzzy, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s: シャドウ・グループ・ファイルをロックできません\n"
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, fuzzy, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s: シャドウ・グループ・ファイルが開けません\n"
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, fuzzy, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: ユーザID %u が重複しています\n"
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, fuzzy, c-format
 msgid "%s: can't get unique UID\n"
 msgstr "%s: 一意のグループIDを取得できません\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr "%s: ベースディレクトリ `%s' は不正です\n"
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr "%s: コメント `%s' は不正です\n"
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s: ホームディレクトリ `%s' は不正です\n"
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s: 日付 `%s' は不正です\n"
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, fuzzy, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr "%s: シャドウ・パスワードには -e および -e が必要です\n"
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, fuzzy, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr "%s: シャドウ・パスワードには -e および -e が必要です\n"
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, fuzzy, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s: シェル `%s' は不正です\n"
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr "%s: シェル `%s' は不正です\n"
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, fuzzy, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr "不正なユーザ名'%s' です\n"
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, fuzzy, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s: パスワード・ファイルを上書きできません\n"
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, fuzzy, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s: シャドウ・パスワード・ファイルを削除できません\n"
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, fuzzy, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s: パスワードファイルをロックできません\n"
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, fuzzy, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s: パスワードファイルが開けません\n"
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, fuzzy, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "シャドウ・パスワード・ファイルをロックできません\n"
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, fuzzy, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s: シャドウ・パスワード・ファイルを開けません\n"
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, fuzzy, c-format
 msgid "%s: error adding new password entry\n"
 msgstr "%s: パスワードDBMエントリ追加のエラーです\n"
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, fuzzy, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr "%s: シャドウ・パスワード・エントリ削除のエラーです\n"
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, fuzzy, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: ディレクトリ%sを %sへ名前変更できません\n"
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr ""
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, fuzzy, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr "%s: ユーザ %s のエントリを更新できません\n"
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s: ユーザ %s は存在します\n"
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
@@ -1715,7 +1719,7 @@ msgstr ""
 "%s: グループ %s は存在します − もしこのユーザをそのグループへ追加するには, -"
 "g を利用してください.\n"
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr ""
@@ -1765,12 +1769,12 @@ msgstr "%s: %sは %sの所有ではありません, 削除は行いません\n"
 msgid "%s: warning: can't remove "
 msgstr "%s: 警告: %s は%sの所有ではありません\n"
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s: ユーザ %s は存在しません\n"
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: ユーザ %s は NIS ユーザです\n"
@@ -1785,101 +1789,106 @@ msgstr "%s: ディレクトリ%s の削除は行いません (would remove home
 msgid "%s: error removing directory %s\n"
 msgstr "%s: ディレクトリ %s の削除のエラーです\n"
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr "使用法: %s\t[-u ユーザID [-o]] [-g グループ] [-G グループ,...] \n"
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr "\t\t[-d ホーム [-m]] [-s シェル] [-c コメント] [-l 新規ユーザ名]\n"
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr "[-f 無効日数] [-e 期限切れ日] "
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr "[-p パスワード] [-L|-U] ユーザ名\n"
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s: update_group 中にメモリが不足しました\n"
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s: update_shdow 中にメモリが不足しました\n"
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: ひとつもフラグが指定されていません\n"
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: シャドウ・パスワードには -e および -e が必要です\n"
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr ""
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr "%s: ユーザID %lu が重複しています\n"
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s: パスワード・エントリ変更のエラーです\n"
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s: パスワード・エントリ削除のエラーです\n"
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr "%s: シャドウ・パスワード・エントリ削除のエラーです\n"
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: ディレクトリ %sは存在します\n"
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s: %sを 作成できません\n"
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s: %sをchownできません\n"
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s: ディレクトリ%sを %sへ名前変更できません\n"
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: 警告: %s は%sの所有ではありません\n"
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr "mailboxの所有者の変更に失敗しました"
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr "mailboxの名前変更に失敗しました"
 
@@ -1916,6 +1925,27 @@ msgstr ""
 "`vipw' /etc/passwd を編集       `vipw -s' /etc/shadowを編集\n"
 "`vigr' /etc/groupを編集         `vigr -s' /etc/gshadowを編集\n"
 
+#, fuzzy
+#~ msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
+#~ msgstr ""
+#~ "使用法: useradd [-u ユーザID [-o]] [-g グループ] [-G グループ,...] \n"
+
+#~ msgid ""
+#~ "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+#~ msgstr ""
+#~ "                [-d ホーム] [-s シェル] [-c コメント]\n"
+#~ "                [-m [-k テンプレート]]\n"
+
+#~ msgid "               [-f inactive] [-e expire]\n"
+#~ msgstr "                [-f 無効日数] [-e 期限切れ日]\n"
+
+#, fuzzy
+#~ msgid "               [-p passwd] [-K KEY=VALUE] name\n"
+#~ msgstr "                [-p パスワード] ユーザ名\n"
+
+#~ msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
+#~ msgstr "        useradd -D [-g グループ] [-b ベース] [-s シェル]\n"
+
 #~ msgid "unknown uid: %u\n"
 #~ msgstr "不明なユーザIDです: %u\n"
 
diff --git a/po/ko.gmo b/po/ko.gmo
index 18573674..4849d515 100644
Binary files a/po/ko.gmo and b/po/ko.gmo differ
diff --git a/po/ko.po b/po/ko.po
index 4f90f9de..408d9bdf 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
 "PO-Revision-Date: 2005-04-19 16:02+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <ko@li.org>\n"
@@ -140,12 +140,12 @@ msgstr "디렉토리가 없음, 루트 디렉토리(/)로 로그인합니다"
 msgid "Cannot execute %s"
 msgstr "%s을(를) 실행할 수 없습니다"
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "루트 디렉토리 \"%s\"이(가) 잘못되었습니다\n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "루트 디렉토리를 \"%s\"(으)로 바꿀 수 없습니다\n"
@@ -167,16 +167,16 @@ msgstr ""
 "설정 오류 - 알 수 없는 항목 '%s'이(가) 있습니다 (관리자에게 알리기 바랍니"
 "다)\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "열쇠글: "
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "%s의 열쇠글: "
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -195,147 +195,147 @@ msgid ""
 "  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
 msgstr ""
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "새로운 값을 넣거나, 디폴트를 원하면 엔터를 치세요\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "최소 열쇠글 유효 기간"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "최대 열쇠글 유효 기간"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "마지막으로 열쇠글 바꾼 날 (YYYY-MM-DD)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "열쇠글 사용만기일 초과 경고"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "열쇠글이 유효하지 않음"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "계정 사용일 만기 일(YYYY-MM-DD)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "마지막으로 열쇠글 바꾼 날\t\t\t\t\t:"
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, c-format
 msgid "never\n"
 msgstr "불가\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "열쇠글 만기:\t\t\t\t\t:"
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "열쇠글이 유효하지 않음\t\t\t\t\t:"
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "계정 만기\t\t\t\t\t\t:"
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr "열쇠글 바꿔야 할 최소 날\t\t: %ld\n"
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr "열쇠글 바꿔야 할 최대 날\t\t: %ld\n"
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr "열쇠글이 만료되기 전에 경고하는 날\t\t: %ld\n"
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s: \"l\" 와 함께 다른 flags를 포함하지 말것\n"
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: 접근권한 거부됨.\n"
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM 인증이 실패했습니다\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: 열쇠글 파일을 열 수 없습니다\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s: 알 수 없는 사용자 %s\n"
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
-msgstr "%s: 셰도우 열쇠글 파일을 잠글 수 없습니다"
+msgid "%s: can't lock shadow password file\n"
+msgstr "%s: 셰도우 열쇠글 파일을 잠글 수 없습니다\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
-msgstr "%s: 셰도우 열쇠글 파일을 열 수가 없습니다"
+msgid "%s: can't open shadow password file\n"
+msgstr "%s: 셰도우 열쇠글 파일을 열 수가 없습니다\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "%s의 유효 기간 정보를 바꿉니다\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: 항목을 바꾸는 도중 오류가 발생했습니다\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: 열쇠글 파일을 업데이트 할 수 없습니다\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: 셰도우 열쇠글 파일을 업데이트 할 수 없습니다\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s: 셰도우 열쇠글 파일을 다시 작성할 수 없습니다\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: 열쇠글 파일을 다시 작성할 수 없습니다\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr "%s: PAM chauthtok가 실패했습니다\n"
@@ -445,7 +445,7 @@ msgstr "열쇠글 파일을 lock할 수 없습니다;  나중에 다시 시도
 msgid "Cannot open the password file.\n"
 msgstr "열쇠글 파일을 열 수가 없습니다.\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: %s이(가) /etc/passwd에 없습니다\n"
@@ -664,7 +664,7 @@ msgstr "%s: -A에 대하여 셰도우 그룹 열쇠글이 필요합니다\n"
 msgid "Who are you?\n"
 msgstr "당신은 누구십니까?\n"
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "알 수 없는 그룹: %s\n"
@@ -757,12 +757,12 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr "사용법: groupadd [-g GID [-o]] [-f] 그룹명\n"
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s: 새로운 그룹을 더하는 데 오류가 발생했습니다\n"
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr "%s: %s 란 이름은 적절하지 않습니다\n"
@@ -782,24 +782,24 @@ msgstr "%s: 유일한 GID를 얻을 수 없습니다\n"
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s: %s은(는) 쓸 수 있는 그룹 이름이 아닙니다\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr "%s: 유효하지 않은 그룹 %s\n"
 
-#: src/groupadd.c:325 src/useradd.c:1058
-#, c-format
-msgid "%s: -O requires NAME=VALUE\n"
+#: src/groupadd.c:332 src/useradd.c:1094
+#, fuzzy, c-format
+msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: NAME=VALUE를 위해서는 -O 옵션이 필요합니다\n"
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s: 그룹파일을 다시 쓸 수 없습니다\n"
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s: 셰도우 그룹 파일을 다시 쓸 수 없습니다\n"
@@ -859,7 +859,7 @@ msgstr "%s: %s 그룹은 없습니다\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s: %s 그룹은 NIS 그룹입니다\n"
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s은(는) NIS 마스터입니다\n"
@@ -1121,7 +1121,7 @@ msgstr ""
 "\n"
 "[접속해제가 무시되었습니다 -- 루트만 로그인을 할 수 있습니다]\n"
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
@@ -1130,17 +1130,17 @@ msgstr ""
 "\n"
 "%d 초 후에 로그인 시간이 완료됩니다.\n"
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr " on `%.100s' from `%.200s'"
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr " on `%.100s'"
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
@@ -1149,25 +1149,25 @@ msgstr ""
 "\n"
 "%s 로그인: "
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr "로그인이 맞지 않습니다"
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "경고: 일시적으로 페쇄된뒤 다시 로그인할 수 있습니다.\n"
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr "마지막 로그인: %s on %s"
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr "마지막 로그인: %.19s on %s"
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr " from %.*s"
@@ -1182,21 +1182,21 @@ msgstr "사용법: newgrp [-] [그룹]\n"
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "사용법: sg group [[-c] 명령]\n"
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, fuzzy, c-format
 msgid "unknown UID: %u\n"
 msgstr "알 수 없는 GID: %lu\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr "알 수 없는 GID: %lu\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr "죄송합니다.\n"
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr "그룹들이 너무나 많습니다\n"
@@ -1342,7 +1342,7 @@ msgstr "%s: 메모리 부족\n"
 msgid "%s: Cannot execute %s"
 msgstr "%s: %s을(를) 실행할 수 없습니다"
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: %s 저장소는 지원하지 않습니다\n"
@@ -1459,35 +1459,35 @@ msgstr "%s: 사용자 %s에 대한 입력값을 업데이트 할 수 없습니
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: 셰도우 열쇠글 파일을 지울 수 없습니다\n"
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr "죄송합니다."
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s: 터미널에서 받드시 실행이 되어져야 합니다\n"
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr "%s: pam_start: 오류 %d\n"
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr "알 수 없는 아이디: %s\n"
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "당신은 su %s 에게 인증이 되지 않았습니다\n"
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr "(자신의 열쇠글을 입력하세요.)"
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -1496,7 +1496,7 @@ msgstr ""
 "%s: %s\n"
 "(무시됨)\n"
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr "쉘이 없음\n"
@@ -1521,12 +1521,12 @@ msgstr "사용자 자신의 열쇠글을 인증으로써 입력을 하십시오.
 msgid "No password file\n"
 msgstr "열쇠글 파일 없음\n"
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr "'루트'에 대한 열쇠글 파일 입력값 없음\n"
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
@@ -1536,214 +1536,220 @@ msgstr ""
 "일반적으로 시작(normal startup)을 하려면 control-d를 입력하세요,\n"
 "(그렇지 않으면 시스템 정비를 위하여 루트 열쇠글을 입력하세요)"
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr "시스템 정비 모드로 들어가고 있습니다\n"
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s: 유효하지 않은 숫자 입력값 `%s'\n"
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s: 알 수 없는 GID %s\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s: 알 수 없는 그룹 %s\n"
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: 새로운 디폴트 파일을 만들 수 없습니다\n"
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr "%s: 새로운 디폴트 파일을 만들 수 없습니다\n"
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr "%s: 이름 재 설정: %s"
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s: `%s' 그룹은 NIS 그룹입니다.\n"
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: 너무나 많은 그룹이 명시되었습니다 (최대 %d).\n"
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
-msgstr "사용법: useradd [-u UID [-o]] [-g 그룹명] [-G 그룹,...]\n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
+msgstr ""
 
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
-msgstr "               [-d 홈디렉토리] [-s 쉘] [-c 주석] [-m [-k template]]\n"
-
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr "               [-f 비활성화] [-e 만기]\n"
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr "               [-p 열쇠글] 이름\n"
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr "       useradd -D [-g 그룹명] [-b 초기디렉토리] [-s 쉘]\n"
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s: 그룹 파일 잠금을 하는 데 오류가 발생했습니다\n"
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s: 그룹 파일을 여는 데 오류가 발생했습니다\n"
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s: 셰도우 그룹을 잠그는 데 오류가 발생했습니다\n"
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s: 그룹 파일을 여는 데 오류가 발생했습니다\n"
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, fuzzy, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: GID %u은(는) 유일한 아이디가 아닙니다\n"
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, fuzzy, c-format
 msgid "%s: can't get unique UID\n"
 msgstr "%s: 유일한 GID를 얻을 수 없습니다\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr "%s: 기본 디렉토리 `%s'은(는) 잘못되었습니다\n"
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr "%s: 주석 `%s'이(가) 틀렸습니다\n"
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s: 홈 디렉토리 `%s'은(는) 잘못되었습니다\n"
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s: 날짜 `%s'은(는) 잘못되었습니다\n"
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr "%s: 셰도우 열쇠글이 -e 옵션을 요구합니다\n"
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr "%s: 셰도우 열쇠글이 -f 옵션을 요구합니다\n"
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s: `%s' 부분은 유효하지 않습니다\n"
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr "%s: 유효하지 않은 쉘 `%s'\n"
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr "%s: 유효하지 않은 사용자명 `%s'\n"
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s: 열쇠글 파일을 다시 쓸 수가 없습니다\n"
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s: 셰도우 열쇠글 파일을 다시 쓸 수가 없습니다\n"
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s: 열쇠글 파일 잠금을 할 수 없습니다\n"
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s: 열쇠글 파일을 열 수 없습니다\n"
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s: 셰도우 열쇠글 파일을 잠글 수 없습니다\n"
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s: 셰도우 열쇠글 파일을 열 수 없습니다\n"
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr "%s: 새로운 열쇠글 입력값을 더하는 데 오류가 발생했습니다\n"
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr "%s: 새로운 셰도우 열쇠글 입력값을 더하는 데 오류가 발생했습니다\n"
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: 디렉토리 %s을(를) 만들 수 없습니다\n"
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr ""
 "\"mail\"이라는 이름의 그룹이 있습니다. 메일 스풀을 모드 0600으로 만듭니다.\n"
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr "사용자 %s의 메일 스풀을 만들 수 없습니다.\n"
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s: 사용자 %s이(가) 있습니다\n"
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
@@ -1751,7 +1757,7 @@ msgstr ""
 "%s: %s 그룹이 있습니다 - 이 사용자를 이 그룹에 더하려면, -g 옵션을 사용하십시"
 "오.\n"
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s:경고: CREATE_HOME은 지원되지 않습니다, -m 옵션을 대신 사용하세요.\n"
@@ -1801,12 +1807,12 @@ msgstr "%s: %s은(는) %s의 소유가 아닙니다, 지우지 않습니다\n"
 msgid "%s: warning: can't remove "
 msgstr "%s: 경고: 지울 수 없습니다 "
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s: 사용자 %s은(는) 없습니다\n"
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: 사용자 %s은(는) NIS 사용자 입니다\n"
@@ -1823,101 +1829,106 @@ msgstr ""
 msgid "%s: error removing directory %s\n"
 msgstr "%s: 디렉토리 %s을(를) 지우는 데 오류가 발생했습니다\n"
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr "사용법: %s\t[-u UID [-o]] [-g 그룹이름][-G 그룹,...]\n"
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr "\t\t[-d 홈 디렉토리 [-m]] [-s 쉘] [-c 주석] [-l 새_이름]\n"
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr "[-f 비활성화] [-e 만기] "
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr "[-p 열쇠글] [-L|-U] 이름\n"
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s: 업데이트_그룹에 메모리 부족\n"
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s: 업데이트_그룹셰도우에 메모리 부족\n"
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: 주어진 flag가 없습니다\n"
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: 셰도우 열쇠글이 -e 옵션과 -f 옵션을 요구합니다\n"
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr ""
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr "%s: UID %lu은(는) 유일하지 않습니다\n"
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s: 열쇠글 입력값을 변경하는 데 오류가 발생했습니다\n"
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s: 열쇠글 입력값을 제거하는 데 오류가 발생했습니다\n"
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr "%s: 셰도우 열쇠글 입력값을 제거하는 데 오류가 발생했습니다\n"
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: 디렉토리 %s은(는) 있습니다\n"
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s: %s을(를) 만들 수 없습니다\n"
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s: %s을(를) chown할 수 없습니다\n"
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s: 디렉토리 %s에서 %s(으)로 이름을 바꿀 수 없습니다\n"
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: 경고: %s은(는) %s에 소유되어 있지 않습니다\n"
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr "메일박스 소유자를 바꾸는 데 실패했습니다"
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr "메일박스의 이름을 바꾸는 데 실패했습니다"
 
@@ -1955,6 +1966,28 @@ msgstr ""
 "`vipw'는 /etc/passwd를 편집합니다   `vipw -s'는 /etc/shadow를 편집합니다\n"
 "`vigr'은 /etc/group을 편집합니다    `vigr -s'는 /etc/gshadow를 편집합니다\n"
 
+#, fuzzy
+#~ msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
+#~ msgstr "사용법: useradd [-u UID [-o]] [-g 그룹명] [-G 그룹,...]\n"
+
+#~ msgid ""
+#~ "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+#~ msgstr ""
+#~ "               [-d 홈디렉토리] [-s 쉘] [-c 주석] [-m [-k template]]\n"
+
+#~ msgid "               [-f inactive] [-e expire]\n"
+#~ msgstr "               [-f 비활성화] [-e 만기]\n"
+
+#, fuzzy
+#~ msgid "               [-p passwd] [-K KEY=VALUE] name\n"
+#~ msgstr "               [-p 열쇠글] 이름\n"
+
+#~ msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
+#~ msgstr "       useradd -D [-g 그룹명] [-b 초기디렉토리] [-s 쉘]\n"
+
+#~ msgid "%s: -O requires NAME=VALUE\n"
+#~ msgstr "%s: NAME=VALUE를 위해서는 -O 옵션이 필요합니다\n"
+
 #~ msgid "unknown uid: %u\n"
 #~ msgstr "알 수 없는 UID: %u\n"
 
diff --git a/po/nb.gmo b/po/nb.gmo
index 9f46690a..44519ffa 100644
Binary files a/po/nb.gmo and b/po/nb.gmo differ
diff --git a/po/nb.po b/po/nb.po
index fc7a4be5..770510b4 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
 "PO-Revision-Date: 2004-06-03 21:42+0200\n"
 "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian (Nynorsk) <i18n-nn@lister.ping.uio.no>\n"
@@ -147,12 +147,12 @@ msgstr "Ingen hjemmemappe, logger inn med HOME=/"
 msgid "Cannot execute %s"
 msgstr "Kan ikke utføre %s"
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "Ugyldig rot mappe \"%s\"\n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "Kan ikke endre rot mappa til \"%s\"\n"
@@ -172,16 +172,16 @@ msgstr "Fant ikke plass til config-info.\n"
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr "feil med oppsettet - ukjent element «%s» (kontakt administrator)\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "Passord: "
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "%s's Passord: "
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -200,148 +200,148 @@ msgid ""
 "  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
 msgstr ""
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr ""
 "Skriv inn de nye verdiene, eller trykk RETUR for å bruke forvalgte verdier\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "Minimum gyldighetsperiode på passord"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "Maksimum gyldighetsperiode på passord"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "Siste endring av passord (YYYY-MM-DD)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "Varsel når passordet er utgått på dato"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "Inaktivt passord"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Konto utløper (YYYY-MM-DD)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, fuzzy, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Siste endring av passord (YYYY-MM-DD)"
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, fuzzy, c-format
 msgid "never\n"
 msgstr "Aldri\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, fuzzy, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Passord utløper:\t"
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, fuzzy, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Passord er inaktivt:\t"
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, fuzzy, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Kontoen utløper:\t"
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s: ikke inkluder \"l\" sammen med andre opsjoner\n"
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, fuzzy, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: ikke tillatelse\n"
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM autentifisering feilet\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: kan ikke åpne passordfila\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s: ukjent bruker %s\n"
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
-msgstr "%s: kan ikke låse skyggepassordfila"
+msgid "%s: can't lock shadow password file\n"
+msgstr "%s: kan ikke låse skyggepassordfila\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
-msgstr "%s: kan ikke åpne skyggepassordfila"
+msgid "%s: can't open shadow password file\n"
+msgstr "%s: kan ikke åpne skyggepassordfila\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "Endre utløpsinformasjon for %s\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: feil ved endring i feltene\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: kan ikke oppdatere passordfila\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: kan ikke oppdatere skyggepassordfila\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s: kan ikke gjenskrive skyggepassordfila\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: kan ikke gjenskrive passordfila\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr "%s: PAM chauthtok feilet\n"
@@ -450,7 +450,7 @@ msgstr "Kan ikke låse passordfila; forsøk senere.\n"
 msgid "Cannot open the password file.\n"
 msgstr "Kan ikke åpne passordfila.\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: %s ikke funnet i /etc/passwd\n"
@@ -649,7 +649,7 @@ msgstr "%s: shadow gruppepassord kreves for -A\n"
 msgid "Who are you?\n"
 msgstr "Hvem er du?\n"
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "ukjent gruppe: %s\n"
@@ -742,12 +742,12 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr "Bruk: groupadd [-g gid [-o]] [-f] gruppe\n"
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s: feil ved oppretting av ny gruppeoppføring\n"
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr "%s: navn %s er ikke unikt\n"
@@ -767,24 +767,24 @@ msgstr "%s: klarer ikke å få unik gid\n"
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s: %s er ikke et gyldig gruppenavn\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr "%s: ugyldig gruppe %s\n"
 
-#: src/groupadd.c:325 src/useradd.c:1058
-#, c-format
-msgid "%s: -O requires NAME=VALUE\n"
+#: src/groupadd.c:332 src/useradd.c:1094
+#, fuzzy, c-format
+msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -O krever NAME=VALUE\n"
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s: klarer ikke å omskrive gruppefila\n"
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s: klarer ikke å omskrive shadow-fila\n"
@@ -844,7 +844,7 @@ msgstr "%s: gruppen %s finnes ikke\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s: gruppen %s er en NIS gruppe\n"
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s er NIS sjefen\n"
@@ -1100,7 +1100,7 @@ msgstr ""
 "\n"
 "[Frakobling omgått - root-innlogging tillatt.]\n"
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
@@ -1109,17 +1109,17 @@ msgstr ""
 "\n"
 "Innlogging avbrutt på tid etter %d sekunder.\n"
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr " på `%.100s' fra `%.200s'"
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr " på `%.100s'"
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
@@ -1128,25 +1128,25 @@ msgstr ""
 "\n"
 "%s login: "
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr "Ugyldig innlogging"
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Advarsel: innlogging reaktivert etter midlertidig stenging.\n"
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr "Forrige login: %s på %s"
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr "Forrige login: %.19s på %s"
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr " fra %.*s"
@@ -1161,21 +1161,21 @@ msgstr "Bruk: newgrp [-] [gruppe]\n"
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Bruk: sg group [[-c] command]\n"
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, fuzzy, c-format
 msgid "unknown UID: %u\n"
 msgstr "ukjent GID: %lu\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr "ukjent GID: %lu\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr "Beklager.\n"
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr "For mange grupper\n"
@@ -1321,7 +1321,7 @@ msgstr "%s: slapp opp for minne\n"
 msgid "%s: Cannot execute %s"
 msgstr "%s: Kan ikke utføre %s"
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: ikke støtte for lager %s\n"
@@ -1438,35 +1438,35 @@ msgstr "%s: klarer ikke å oppdatere oppføring for bruker %s\n"
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: kan ikke slette shadow-passordfila\n"
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr "Beklager."
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s: må kjøres fra en terminal\n"
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr "%s: pam_start: feil %d\n"
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr "Ukjent id: %s\n"
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Du har ikke adgang til å su %s\n"
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr "(Oppgi ditt eget passord.)"
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -1475,7 +1475,7 @@ msgstr ""
 "%s: %s\n"
 "(Ignorert)\n"
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr "Mangler skall\n"
@@ -1500,12 +1500,12 @@ msgstr "Oppgi ditt EGET passord som autentisering.\n"
 msgid "No password file\n"
 msgstr "Ingen passordfil.\n"
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr "Ingen oppføring for «root» i passordfila\n"
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
@@ -1515,213 +1515,219 @@ msgstr ""
 "Bruk control-d for å fortsette med normal oppstart,\n"
 "(eller skriv inn root passordet for å starte maskinen i vedlikeholdsmodus):"
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr "Starter systemvedlikeholds-modus\n"
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s: ugyldig numerisk argument `%s'\n"
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s: ukjent GID %s\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s: ukjent gruppe %s\n"
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: klarer ikke å opprette ny «defaults»-fil\n"
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr "%s: klarer ikke å åpne ny «defaults»-fil\n"
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr "%s: gi nytt navn: %s"
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s: gruppe `%s' er en NIS gruppe.\n"
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: for mange grupper spesifisert (maks %d).\n"
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
-msgstr "Bruk: useradd [-u uid [-o]] [-g gruppe] [-G gruppe,...] \n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
+msgstr ""
 
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
-msgstr "              [-d hjem] [-s skall] [-c kommentar] [-m [-k mal]]\n"
-
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr "              [-f inaktiv] [-e utgå ]\n"
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr "              [-p passord] navn\n"
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr "      useradd -D [-g gruppe] [-b base] [-s skall]\n"
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s: feil ved låsing av gruppefila\n"
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s: feil ved åpning av gruppefila\n"
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s: feil ved låsing av shadow-gruppefila\n"
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s: feil ved åpning av shadow-gruppefila\n"
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, fuzzy, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: gid %u er ikke unikt\n"
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, fuzzy, c-format
 msgid "%s: can't get unique UID\n"
 msgstr "%s: klarer ikke å få unik gid\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr "%s: ugyldig basismappe `%s'\n"
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr "%s: ugyldig kommentar `%s'\n"
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s: ugyldig hjemmemappe `%s'\n"
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s: ugyldig dato `%s'\n"
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr "%s: shadow-passord kreves for -e\n"
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr "%s: shadow-passord kreves for -f\n"
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s: ugyldig felt `%s'\n"
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr "%s: ugyldig skall `%s'\n"
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr "%s: ugyldig brukernavn '%s'\n"
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s: kan ikke skrive passordfila på nytt\n"
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s: kan ikke skrive shadow-passordfila på nytt\n"
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s: klarte ikke å låse passordfila\n"
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s: klarte ikke å åpne passordfila\n"
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s: klarte ikke å låse shadow-passordfila\n"
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s: klarte ikke å åpne shadow-passordfila\n"
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr "%s: feil ved innlegging av ny passord-oppføring\n"
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr "%s: feil ved innlegging av ny shadow passord-oppføring\n"
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: kan ikke opprette mappa %s\n"
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr ""
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, fuzzy, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr "%s: klarer ikke å oppdatere oppføring for bruker %s\n"
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s: bruker %s finnes\n"
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
@@ -1729,7 +1735,7 @@ msgstr ""
 "%s: gruppen %s finnes - hvis du ønsker å legge til denne brukeren til denne "
 "gruppen, bruk -g.\n"
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: advarsel: CREATE_HOME ikke støttet, bruk -m istedenfor.\n"
@@ -1779,12 +1785,12 @@ msgstr "%s: %s ikke eid av %s, ikke fjernet\n"
 msgid "%s: warning: can't remove "
 msgstr "%s: advarsel: kan ikke fjerne "
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s: bruker %s finnes ikke\n"
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: bruker %s er ikke en NIS bruker\n"
@@ -1800,101 +1806,106 @@ msgstr ""
 msgid "%s: error removing directory %s\n"
 msgstr "%s: feil ved fjerning av mappe %s\n"
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr "Bruk: %s\t[-u uid [-o]] [-g gruppe] [-G gruppe,...] \n"
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr "\t\t[-d hjem [-m]] [-s skall] [-c kommentar] [-l nytt_navn]\n"
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, fuzzy, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr "[-f inaktiv] [-e utgå ] "
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr "[-p passord] [-L|-U] navn\n"
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s: slapp opp for minne i update_group\n"
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s: slapp opp for minne i update_gshadow\n"
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: ingen flagg oppgitt\n"
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: shadow-passord kreves for -e og -f\n"
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr ""
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr "%s: uid %lu er ikke unik\n"
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s: feil ved endring av passordoppføring\n"
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s: feil ved sletting av passordoppføring\n"
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr "%s: feil ved sletting av shadow passord-oppføring\n"
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: mappa %s finnes\n"
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s: kan ikke lage %s\n"
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s: kan ikke chown %s\n"
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s: kunne ikke endre navn på mappa %s til %s\n"
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: advarsel: %s er ikke eid av %s\n"
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr "klarte ikke å endre eier av mailbox"
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr "klarte ikke å endre navn på mailbox"
 
@@ -1931,6 +1942,27 @@ msgstr ""
 "«vipw» redigerer /etc/passwd        «vipw -s» redigerer /etc/shadow\n"
 "«vigr» redigerer /etc/group         «vigr -s» redigerer /etc/gshadow\n"
 
+#, fuzzy
+#~ msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
+#~ msgstr "Bruk: useradd [-u uid [-o]] [-g gruppe] [-G gruppe,...] \n"
+
+#~ msgid ""
+#~ "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+#~ msgstr "              [-d hjem] [-s skall] [-c kommentar] [-m [-k mal]]\n"
+
+#~ msgid "               [-f inactive] [-e expire]\n"
+#~ msgstr "              [-f inaktiv] [-e utgå ]\n"
+
+#, fuzzy
+#~ msgid "               [-p passwd] [-K KEY=VALUE] name\n"
+#~ msgstr "              [-p passord] navn\n"
+
+#~ msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
+#~ msgstr "      useradd -D [-g gruppe] [-b base] [-s skall]\n"
+
+#~ msgid "%s: -O requires NAME=VALUE\n"
+#~ msgstr "%s: -O krever NAME=VALUE\n"
+
 #~ msgid "unknown uid: %u\n"
 #~ msgstr "ukjent uid: %u\n"
 
diff --git a/po/nl.gmo b/po/nl.gmo
index ee51413a..60bca64a 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index ec6b7860..1951089e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
 "PO-Revision-Date: 2005-04-24 15:38+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -142,12 +142,12 @@ msgstr "Geen thuismap, er wordt aangemeld met HOME=/"
 msgid "Cannot execute %s"
 msgstr "Kan %s niet uitvoeren"
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "Ongeldige hoofdmap '%s'\n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "Kan de hoofdmap niet veranderen naar '%s'\n"
@@ -168,16 +168,16 @@ msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr ""
 "configuratiefout - onbekend item '%s' (waarschuw een systeembeheerder)\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "Wachtwoord: "
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "Wachtwoord van %s:"
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -196,150 +196,150 @@ msgid ""
 "  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
 msgstr ""
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr ""
 "U dient de nieuwe waarde in te voeren, druk 'enter' voor de standaardwaarde\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "Minimumleeftijd voor wachtwoord"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "Maximumleeftijd voor wachtwoord"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "Laatste wachtwoordverandering (JJJJ-MM-DD)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "Waarschuwing voor wachtwoordverval"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "Wachtwoord niet actief"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Vervaldatum van account (JJJJ-MM-DD)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Laatste wachtwoord-verandering\t\t\t\t\t: "
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, c-format
 msgid "never\n"
 msgstr "nooit\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Wachtwoord vervalt\t\t\t\t\t:"
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Wachtwoord niet actief\t\t\t\t\t:"
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Account vervalt\t\t\t\t\t\t:"
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr "Minimaal aantal dagen tussen wachtwoord-wijzigingen\t\t: %ld\n"
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr "Maximale aantal dagen tussen wachtwoordwijzigingen\t\t: %ld\n"
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr ""
 "Aantal dagen voor gewaarschuwd wordt dat het wachtwoord dreigt te vervallen"
 "\t: %ld\n"
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s: gebruik 'l' niet samen met andere vlaggen\n"
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: toegang geweigerd.\n"
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM-authenticatie is mislukt\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: kan wachtwoordbestand niet openen\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s: onbekende gebruiker %s\n"
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
-msgstr "%s: kan schaduw-wachtwoordenbestand niet vergrendelen"
+msgid "%s: can't lock shadow password file\n"
+msgstr "%s: kan schaduw-wachtwoordenbestand niet vergrendelen\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
-msgstr "%s: kan schaduw-wachtwoordenbestand niet openen"
+msgid "%s: can't open shadow password file\n"
+msgstr "%s: kan schaduw-wachtwoordenbestand niet openen\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "Verouderingsinformatie voor %s wordt aangepast\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: fout bij het aanpassen van de velden\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: kan wachtwoordbestand niet bijwerken\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: kan schaduwwachtwoordbestand niet bijwerken\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s: kan het schaduwwachtwoordbestand niet herschrijven\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: kan het wachtwoordbestand niet herschrijven\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr "%s: PAM-chauthtok is mislukt\n"
@@ -451,7 +451,7 @@ msgstr ""
 msgid "Cannot open the password file.\n"
 msgstr "Kan het wachtwoordbestand niet openen.\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: %s is niet gevonden in /etc/passwd\n"
@@ -672,7 +672,7 @@ msgstr "%s: schaduw groepwachtwoorden zijn vereist voor -A\n"
 msgid "Who are you?\n"
 msgstr "Wie bent u?\n"
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "onbekende groep: %s\n"
@@ -765,12 +765,12 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr "Gebruik: groupadd [-g gid [-o]] [-f] groep\n"
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s: fout tijdens toevoegen nieuwe groepingang\n"
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr "%s: naam %s is niet uniek\n"
@@ -790,24 +790,24 @@ msgstr "%s: kan geen unieke gid verkrijgen\n"
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s: %s is geen geldige groepsnaam\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr "%s: ongeldige groep %s\n"
 
-#: src/groupadd.c:325 src/useradd.c:1058
-#, c-format
-msgid "%s: -O requires NAME=VALUE\n"
+#: src/groupadd.c:332 src/useradd.c:1094
+#, fuzzy, c-format
+msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -O vereist NAAM=WAARDE\n"
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s: kan groepbestand niet herschrijven\n"
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s: kan schaduwgroepbestand niet herschrijven\n"
@@ -867,7 +867,7 @@ msgstr "%s: groep %s bestaan niet\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s: groep %s is een NIS-groep\n"
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s is de NIS-master\n"
@@ -1129,7 +1129,7 @@ msgstr ""
 "\n"
 "[Verbinding verbreken omzeild -- aanmelden van root is toegelaten.]\n"
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
@@ -1138,17 +1138,17 @@ msgstr ""
 "\n"
 "Aanmelding is na %d seconden verlopen.\n"
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr " om `%.100s' vanaf `%.200s'"
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr " om `%.100s'"
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
@@ -1157,25 +1157,25 @@ msgstr ""
 "\n"
 "%s gebruikersnaam: "
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr "Gebruikersnaam onjuist"
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Waarschuwing: aanmelden gereactiveerd na tijdelijke buitensluiting.\n"
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr "Laatst aangemeld: %s om %s"
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr "Laatst aangemeld: %.19s om %s"
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr " vanaf %.*s"
@@ -1190,21 +1190,21 @@ msgstr "Gebruik: newgrp [-] [groep]\n"
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Gebruik: sg groep [[-c] commando]\n"
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, fuzzy, c-format
 msgid "unknown UID: %u\n"
 msgstr "onbekende GID: %lu\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr "onbekende GID: %lu\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr "Sorry.\n"
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr "teveel groepen\n"
@@ -1352,7 +1352,7 @@ msgstr "%s: geen geheugen over\n"
 msgid "%s: Cannot execute %s"
 msgstr "%s: Kan %s niet uitvoeren"
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: opslagplaats %s wordt niet ondersteund\n"
@@ -1469,35 +1469,35 @@ msgstr "%s: kan ingang voor gebruiker %s niet bijwerken\n"
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: kan schaduwwachtwoordbestand niet verwijderen\n"
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr "Sorry."
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s: dient uitgevoerd te worden vanaf een terminal\n"
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr "%s: pam_start: fout %d\n"
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr "Onbekende id: %s\n"
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "U heeft geen authorisatie om su %s uit te voeren\n"
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr "(U dient uw eigen wachtwoord in te voeren)"
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -1506,7 +1506,7 @@ msgstr ""
 "%s: %s\n"
 "(Genegeerd)\n"
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr "Geen shell\n"
@@ -1531,12 +1531,12 @@ msgstr "Gelieve uw EIGEN wachtwoord in te voeren voor authenticatie.\n"
 msgid "No password file\n"
 msgstr "Geen wachtwoordbestand\n"
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr "Geen wachtwoordingang voor 'root'\n"
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
@@ -1546,217 +1546,221 @@ msgstr ""
 "U dient control-d in te tikken om op de normale manier op te starten,\n"
 "(of het beheerderswachtwoord om de systeemonderhoudsmodus in te gaan):"
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr "Systeemonderhoudsmodus wordt opgestart\n"
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s: ongeldig numeriek argument '%s'\n"
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s: onbekende GID %s\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s: onbekende groep %s\n"
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: kan geen nieuw standaardwaardenbestand aanmaken\n"
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr "%s: kan het nieuwe standaardwaardenbestand niet openen\n"
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr "%s: hernoemen: %s"
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s: groep '%s' is een NIS-groep.\n"
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: teveel groepen gespecificeerd (max %d).\n"
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
-msgstr "Gebruik: useradd [-u uid [-o]] [-g groep] [-G groep,...] \n"
-
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
 msgstr ""
-"                 [-d thuismap] [-s shell] [-c commentaar] [-m [-k "
-"sjabloon]]\n"
 
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr "                 [-f niet actief] [-e vervalt ]\n"
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr "                 [-p wachtwoord] naam\n"
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr "         useradd -D [-g groep] [-b basis] [-s shell]\n"
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s: fout tijdens vergrendelen groepbestand\n"
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s: fout tijdens openen groepbestand\n"
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s: fout tijdens vergrendelen schaduwgroepbestand\n"
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s: fout tijdens openen schaduwgroepbestand\n"
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, fuzzy, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: gid %u is niet uniek\n"
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, fuzzy, c-format
 msgid "%s: can't get unique UID\n"
 msgstr "%s: kan geen unieke gid verkrijgen\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr "%s: ongeldige basismap '%s'\n"
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr "%s: ongeldige commentaar '%s'\n"
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s: ongeldige thuismap '%s'\n"
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s: ongeldige datum '%s'\n"
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr "%s: schaduwwachtwoorden zijn vereist voor -e\n"
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr "%s: schaduwwachtwoorden zijn vereist voor -f\n"
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s: ongeldig veld `%s'\n"
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr "%s: ongeldige shell '%s'\n"
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr "%s: ongeldige gebruikersnaam '%s'\n"
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s: kan wachtwoordbestand niet herschrijven\n"
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s: kan schaduwwachtwoordbestand niet herschrijven\n"
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s: kan wachtwoordbestand niet vergrendelen\n"
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s; kan wachtwoordbestand niet openen\n"
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s: kan schaduwwachtwoordbestand niet vergrendelen\n"
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s: kan schaduwwachtwoordbestand niet openen\n"
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr "%s: fout tijdens toevoegen nieuwe wachtwoordingang\n"
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr "%s: fout tijdens toevoegen schaduwwachtwoordingang\n"
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: kan map %s niet aanmaken\n"
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr ""
 "Er bestaat geen groep met de naam 'mail', bijgevolg wordt de mailspool "
 "aangemaakt met modus 0600.\n"
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr "Kan geen mailspool aanmaken voor gebruiker %s.\n"
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s: gebruiker %s bestaat\n"
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
@@ -1764,7 +1768,7 @@ msgstr ""
 "%s: groep %s bestaat - om deze gebruiker aan die groep toe te voegen dient u "
 "-g te gebruiken.\n"
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr ""
@@ -1816,12 +1820,12 @@ msgstr "%s: %s is niet van %s, wordt niet verwijderd\n"
 msgid "%s: warning: can't remove "
 msgstr "%s: waarschuwing: kan niet verwijderen "
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s: gebruiker %s bestaat niet\n"
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: gebruiker %s is een NIS-gebruiker\n"
@@ -1838,101 +1842,106 @@ msgstr ""
 msgid "%s: error removing directory %s\n"
 msgstr "%s: fout tijdens verwijderen van map %s\n"
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr "Gebruik: %s\t[-u uid [-o]] [-g groep] [-G groep,...] \n"
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr "\t\t[-d thuismap [-m]] [-s shell] [-c commentaar] [-l nieuwe_naam]\n"
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr "[-f inactierf] [-e vervalt] "
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr "[-p wachtwoord] [-L|-U] naam\n"
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s: geheugen is op in update_group\n"
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s: geheugen is op in update_gshadow\n"
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: geen vlaggen gegeven\n"
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: schaduwwachtwoorden zijn vereist voor -e en -f\n"
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr ""
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr "%s: uid %lu is niet uniek\n"
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s: fout tijdens aanpassen wachtwoordingang\n"
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s: fout tijdens verwijderen wachtwoordingang\n"
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr "%s: fout tijdens verwijderen schaduwwachtwoordingang\n"
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: map %s bestaat\n"
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s: kan %s niet aanmaken\n"
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s: kan chown %s niet uitvoeren\n"
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s: kan map %s niet hernoemen naar %s\n"
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: waarschuwing: %s is niet van %s\n"
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr "aanpassen van de eigenaar van de e-mailbox is mislukt"
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr "hernoemen van de e-mailbox is mislukt"
 
@@ -1969,6 +1978,29 @@ msgstr ""
 "`vipw' bewerkt /etc/passwd        `vipw -s' bewerkt /etc/shadow\n"
 "`vigr' bewerkt /etc/group         `vigr -s' bewerkt /etc/gshadow\n"
 
+#, fuzzy
+#~ msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
+#~ msgstr "Gebruik: useradd [-u uid [-o]] [-g groep] [-G groep,...] \n"
+
+#~ msgid ""
+#~ "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+#~ msgstr ""
+#~ "                 [-d thuismap] [-s shell] [-c commentaar] [-m [-k "
+#~ "sjabloon]]\n"
+
+#~ msgid "               [-f inactive] [-e expire]\n"
+#~ msgstr "                 [-f niet actief] [-e vervalt ]\n"
+
+#, fuzzy
+#~ msgid "               [-p passwd] [-K KEY=VALUE] name\n"
+#~ msgstr "                 [-p wachtwoord] naam\n"
+
+#~ msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
+#~ msgstr "         useradd -D [-g groep] [-b basis] [-s shell]\n"
+
+#~ msgid "%s: -O requires NAME=VALUE\n"
+#~ msgstr "%s: -O vereist NAAM=WAARDE\n"
+
 #~ msgid "unknown uid: %u\n"
 #~ msgstr "onbekende uid: %u\n"
 
diff --git a/po/nn.gmo b/po/nn.gmo
index 8bb5f582..63f43bad 100644
Binary files a/po/nn.gmo and b/po/nn.gmo differ
diff --git a/po/nn.po b/po/nn.po
index 881caeaa..2e61a42a 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
 "PO-Revision-Date: 2004-06-03 21:41+0200\n"
 "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian (Nynorsk) <i18n-nn@lister.ping.uio.no>\n"
@@ -140,12 +140,12 @@ msgstr "Inga mappe, loggar inn med HOME=/"
 msgid "Cannot execute %s"
 msgstr "Klarer ikkje køyra %s"
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "Ugyldig rotmappe «%s»\n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "Klarer ikkje endra rotmappe til «%s»\n"
@@ -165,16 +165,16 @@ msgstr "Klarte ikkje finna plass for oppsettsinformasjon.\n"
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr "oppsettsfeil - ukjent element «%s» (gje melding til administrator)\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "Passord: "
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "%s sitt passord: "
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -193,147 +193,147 @@ msgid ""
 "  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
 msgstr ""
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Skriv inn den nye verdien eller trykk Enter for standard\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "Minimum alder på passord"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "Maksimum alder på passord"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "Førre passordendring (ÅÅÅÅ-MM-DD)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "Åtvaring for utgått passord"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "Passord inaktivt"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Dato for når kontoen utgår (ÅÅÅÅ-MM-DD)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, fuzzy, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Førre passordendring (ÅÅÅÅ-MM-DD)"
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, fuzzy, c-format
 msgid "never\n"
 msgstr "Aldri\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, fuzzy, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Passord utgår:\t"
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, fuzzy, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Passord inaktiv:\t"
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, fuzzy, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Konto utgår:\t"
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s: ta ikkje med «l» med andre flagg\n"
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, fuzzy, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: nekta tilgang\n"
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM-autentisering feila\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: klarer ikkje opna passordfil\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s: ukjend brukar %s\n"
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
-msgstr "%s: klarer ikkje låsa skuggepassordfila"
+msgid "%s: can't lock shadow password file\n"
+msgstr "%s: klarer ikkje låsa skuggepassordfila\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
-msgstr "%s: klarer ikkje opna skuggepassordfila"
+msgid "%s: can't open shadow password file\n"
+msgstr "%s: klarer ikkje opna skuggepassordfila\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "Endrar aldringsformasjonen for %s\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: feil ved endring av felt\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: klarer ikkje oppdatere passordfil\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: klarer ikkje oppdatere skuggepassordfil\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s: klarer ikkje skriva ny skuggepassordfil\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: klarer ikkje skriva ny passordfil\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr "%s: PAM chauthtok feila\n"
@@ -442,7 +442,7 @@ msgstr "Klarer ikkje låsa passordfila, prøv igjen seinare.\n"
 msgid "Cannot open the password file.\n"
 msgstr "Klarer ikkje opna passordfila.\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: %s ikkje funne i /etc/passwd\n"
@@ -641,7 +641,7 @@ msgstr "%s: skuggepassord for gruppe krevst for -A\n"
 msgid "Who are you?\n"
 msgstr "Kven er du?\n"
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "ukjent gruppe: %s\n"
@@ -734,12 +734,12 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr "Bruk: groupadd [-g gid [-o]] [-f] gruppe\n"
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s: feil ved oppretting av ny gruppeoppføring\n"
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr "%s: namn %s er ikkje unikt\n"
@@ -759,24 +759,24 @@ msgstr "%s: klarer ikkje få unikt gid\n"
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s: %s er ikkje eit gyldig gruppenamn\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr "%s: ugyldig gruppe %s\n"
 
-#: src/groupadd.c:325 src/useradd.c:1058
-#, c-format
-msgid "%s: -O requires NAME=VALUE\n"
+#: src/groupadd.c:332 src/useradd.c:1094
+#, fuzzy, c-format
+msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -O krev NAME=VERDI\n"
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s: klarer ikkje skriva ny gruppefil\n"
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s: klarer ikkje skriva ny skuggegruppefil\n"
@@ -836,7 +836,7 @@ msgstr "%s: gruppe %s eksisterer ikkje\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s: gruppe %s er ei NIS-gruppe\n"
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s er NIS-hovudet\n"
@@ -1092,7 +1092,7 @@ msgstr ""
 "\n"
 "[Fråkopling omgått -- innlogging av root er tillete.]\n"
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
@@ -1101,17 +1101,17 @@ msgstr ""
 "\n"
 "Innlogging gjekk ut på tid etter %d sekund.\n"
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr " på «%.100s» frå «%.200s»"
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr " på «%.100s»"
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
@@ -1120,26 +1120,26 @@ msgstr ""
 "\n"
 "%s brukarnamn: "
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr "Feil innlogging"
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr ""
 "Åtvaring: innlogging gjort mogeleg igjen etter mellombels utestenging.\n"
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr "Førre innlogging: %s på %s"
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr "Førre inlogging: %.19s på %s"
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr " frå %.*s"
@@ -1154,21 +1154,21 @@ msgstr "Bruk: newgrp [-] [gruppe]\n"
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Bruk: sg gruppe [[-c] kommando]\n"
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, fuzzy, c-format
 msgid "unknown UID: %u\n"
 msgstr "ukjent GID: %lu\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr "ukjent GID: %lu\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr "Årsak.\n"
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr "for mange grupper\n"
@@ -1315,7 +1315,7 @@ msgstr "%s: tomt for minne\n"
 msgid "%s: Cannot execute %s"
 msgstr "%s: Kan ikkje køyre %s"
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: arkiv %s er ikkje støtta\n"
@@ -1432,35 +1432,35 @@ msgstr "%s: klarer ikkje oppdatere oppføring for brukar %s\n"
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: klarer ikkje sletta skuggepassordfil\n"
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr "Årsak."
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s: må køyrast frå ein terminal\n"
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr "%s: pam_start: feil %d\n"
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr "Ukjent id: %s\n"
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Du er ikkje autorisert til su %s\n"
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr "(Skriv inn ditt eige passord.)"
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -1469,7 +1469,7 @@ msgstr ""
 "%s: %s\n"
 "(Ignorert)\n"
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr "Ingen skal\n"
@@ -1494,12 +1494,12 @@ msgstr "Oppgje ditt EIGE passord for autentisering.\n"
 msgid "No password file\n"
 msgstr "Inga passordfil\n"
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr "Inga passordoppføring for «root»\n"
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
@@ -1509,213 +1509,219 @@ msgstr ""
 "Trykk Ctrl-d for å halda fram med normal oppstart,\n"
 "(eller oppgje root-passord for systemvedlikehald):"
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr "Startar modus for systemvedlikehald\n"
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s: ugyldig nummerisk argument «%s»\n"
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s: ukjent GID %s\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s: ukjent gruppe %s\n"
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: klarer ikkje opprette fil for standardverdiar\n"
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr "%s: klarer ikkje opna fil for standardverdiar\n"
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr "%s: gje nytt namn: %s"
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s: gruppe «%s» er ei NIS-gruppe.\n"
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: for mange grupper spesifisert (maks %d).\n"
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
-msgstr "Bruk: useradd [-u uid [-o]] [-g gruppe] [-G gruppe,...] \n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
+msgstr ""
 
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
-msgstr "              [-d heim] [-s skal] [-c kommentar] [-m [-k mal]]\n"
-
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr "              [-f inaktiv] [-e utgår]\n"
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr "              [-p passord] namn\n"
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr "      useradd -D [-g gruppe] [-b startmappe] [-s skal]\n"
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s: feil ved låsing av gruppefil\n"
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s: feil ved opning av gruppefil\n"
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s: feil ved låsing av skuggegruppefil\n"
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s: feil ved opning av skuggegruppefil\n"
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, fuzzy, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: gid %u er ikkje unikt\n"
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, fuzzy, c-format
 msgid "%s: can't get unique UID\n"
 msgstr "%s: klarer ikkje få unikt gid\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr "%s: ugyldig startmappe «%s»\n"
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr "%s: ugyldig kommentar «%s»\n"
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s: ugyldig heimemappe «%s»\n"
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s: ugyldig dato «%s»\n"
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr "%s: skuggepassord krevst for -e\n"
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr "%s: skuggepassord krevst for -f\n"
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s: ugyldig felt «%s»\n"
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr "%s: ugyldig skal «%s»\n"
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr "%s: ugyldig brukarnamn «%s»\n"
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s: klarer ikkje skriva ny passordfil\n"
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s: klarer ikkje skriva ny skuggepassordfil\n"
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s: klarer ikkje låsa passordfil\n"
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s: klarer ikkje opna passordfil\n"
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s: klarer ikkje låsa skuggepassordfil\n"
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s: klarer ikkje opna skuggepassordfil\n"
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr "%s: feil når passordoppføring blei lagt til\n"
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr "%s: feil når oppføring av skuggepassord blei lag til\n"
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: kan ikkje oppretta mappa %s\n"
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr ""
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, fuzzy, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr "%s: klarer ikkje oppdatere oppføring for brukar %s\n"
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s: brukar %s finst\n"
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
@@ -1723,7 +1729,7 @@ msgstr ""
 "%s: gruppa %s finst - viss du ønskjer å leggja brukaren til denne gruppa, "
 "bruk -g.\n"
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: åtvaring: CREATE_HOME ikkje støtta, bruk -m istaden.\n"
@@ -1773,12 +1779,12 @@ msgstr "%s: %s ikkje eigd av %s, ikkje fjerna\n"
 msgid "%s: warning: can't remove "
 msgstr "%s: åtvaring: kan ikkje fjerna "
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s: brukar %s finst ikkje\n"
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: brukar %s er ikkje ein NIS brukar\n"
@@ -1794,101 +1800,106 @@ msgstr ""
 msgid "%s: error removing directory %s\n"
 msgstr "%s: feil ved fjerning av mappe %s\n"
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr "Bruk: %s\t[-u uid [-o]] [-g gruppe] [-G gruppe,...] \n"
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr "\t\t[-d heim [-m]] [-s skal] [-c kommentar] [-l nytt_namn]\n"
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr "[-f inaktiv] [-e utgår] "
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr "[-p passord] [-L|-U] namn\n"
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s: slapp opp for minne i update_group\n"
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s: slapp opp for minne i update_gshadow\n"
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: ingen flagg oppgjeve\n"
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: skuggepassord krevst for -e og -f\n"
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr ""
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr "%s: uid %lu er ikkje unik\n"
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s: feil ved endring av passordoppføring\n"
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s: feil ved sletting av passordoppføring\n"
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr "%s: feil ved sletting av oppføring for skuggepassord\n"
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: mappa %s finst\n"
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s: kan ikkje oppretta %s\n"
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s: kan ikkje chown %s\n"
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s: klarte ikkje endra namn på mappa %s til %s\n"
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: åtvaring: %s er ikkje eigd av %s\n"
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr "klarte ikke å endra eigar av mailbox"
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr "klarte ikkje endra namn på mailbox"
 
@@ -1925,6 +1936,27 @@ msgstr ""
 "«vipw» redigerer /etc/passwd        «vipw -s» redigerer /etc/shadow\n"
 "«vigr» redigerer /etc/group         «vigr -s» redigerer /etc/gshadow\n"
 
+#, fuzzy
+#~ msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
+#~ msgstr "Bruk: useradd [-u uid [-o]] [-g gruppe] [-G gruppe,...] \n"
+
+#~ msgid ""
+#~ "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+#~ msgstr "              [-d heim] [-s skal] [-c kommentar] [-m [-k mal]]\n"
+
+#~ msgid "               [-f inactive] [-e expire]\n"
+#~ msgstr "              [-f inaktiv] [-e utgår]\n"
+
+#, fuzzy
+#~ msgid "               [-p passwd] [-K KEY=VALUE] name\n"
+#~ msgstr "              [-p passord] namn\n"
+
+#~ msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
+#~ msgstr "      useradd -D [-g gruppe] [-b startmappe] [-s skal]\n"
+
+#~ msgid "%s: -O requires NAME=VALUE\n"
+#~ msgstr "%s: -O krev NAME=VERDI\n"
+
 #~ msgid "unknown uid: %u\n"
 #~ msgstr "ukjent uid: %u\n"
 
diff --git a/po/pl.gmo b/po/pl.gmo
index d1c00566..3d7c62ef 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index 06a24fc7..93f9ae1f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: shadow-4.0.10\n"
+"Project-Id-Version: shadow-4.0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
 "PO-Revision-Date: 2004-02-29 00:27+01:00\n"
 "Last-Translator: Tomasz Kłoczko <kloczek@pld.org.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -148,12 +148,12 @@ msgstr "Brak katalogu, loguję z HOME=/"
 msgid "Cannot execute %s"
 msgstr "Nie można uruchomić %s"
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "Nieprawidłowy katalog główny \"%s\"\n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "Nie można zmienić głównego katalogu na \"%s\"\n"
@@ -174,16 +174,16 @@ msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr ""
 "błąd w konfiguracji - nieznana pozycja '%s' (powiadom administratora)\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "Hasło: "
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "Hasło użytkownika %s: "
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -221,147 +221,147 @@ msgstr ""
 "przed\n"
 "\t\t\t\tupływem ważności hasła\n"
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Wpisz nową wartość lub wciśnij ENTER by przyjąć wartość domyślną\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "Minimalny wiek hasła"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "Maksymalny wiek hasła"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "Ostatnia zmiana hasła (RRRR-MM-DD)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "Ostrzeżenie o utracie ważności hasła"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "Hasło nieaktywne"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Data utraty ważności konta (RRRR-MM-DD)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Ostatnia zmiana hasła\t\t\t\t\t: "
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, c-format
 msgid "never\n"
 msgstr "nigdy\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Hasło traci ważność\t\t\t\t\t: "
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Hasło nieaktywne\t\t\t\t\t: "
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Konto traci ważność\t\t\t\t\t: "
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr "Minimalna ilość dni pomiędzy zmianami hasła\t\t: %ld\n"
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr "Maksymalna ilość dni pomiędzy zmianami hasła\t\t: %ld\n"
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr "Liczba dni ostrzeżenia, zanim ważność hasła upłynie\t: %ld\n"
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s: nie łącz \"l\" z innymi flagami\n"
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: Operacja niedozwolona.\n"
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: błąd podczas uwierzytelniania przez PAM\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: nie można otworzyć pliku z hasłami\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s: nieznany użytkownik %s\n"
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
-msgstr "%s: nie można zablokować pliku z ukrytymi hasłami"
+msgid "%s: can't lock shadow password file\n"
+msgstr "%s: nie można zablokować pliku z ukrytymi hasłami\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
-msgstr "%s: nie można otworzyć pliku z ukrytymi hasłami"
+msgid "%s: can't open shadow password file\n"
+msgstr "%s: nie można otworzyć pliku z ukrytymi hasłami\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "Zmieniam informację o użytkowniku %s\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: błąd podczas zmieniania pól\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: nie można zaktualizować pliku z hasłami\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: nie można zaktualizować pliku z ukrytymi hasłami\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s: nie można przepisać pliku z ukrytymi hasłami\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: nie można przepisać pliku z hasłami\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr "%s: PAM chauthtok nie powiodło się\n"
@@ -471,7 +471,7 @@ msgstr "Nie można zablokować pliku z hasłami; spróbuj później.\n"
 msgid "Cannot open the password file.\n"
 msgstr "Nie można otworzyć pliku z hasłami.\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: nie znaleziono %s w /etc/passwd\n"
@@ -691,7 +691,7 @@ msgstr "%s: plik z ukrytymi hasłami grup wymagany dla -A\n"
 msgid "Who are you?\n"
 msgstr "Kim jesteś?\n"
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "nieznana grupa: %s\n"
@@ -784,12 +784,12 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr "Użycie: groupadd [-g gid [-o]] [-f] grupa\n"
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s: błąd podczas dodawania nowej grupy\n"
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr "%s: nazwa %s nie jest niepowtarzalny\n"
@@ -809,24 +809,24 @@ msgstr "%s: nie można uzyskać niepowtarzalnego GID\n"
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s: %s: nie jest prawidłową nazwą grupy\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr "%s: nieprawidłowa grupa %s\n"
 
-#: src/groupadd.c:325 src/useradd.c:1058
+#: src/groupadd.c:332 src/useradd.c:1094
 #, c-format
-msgid "%s: -O requires NAME=VALUE\n"
-msgstr "%s: -O wymaga ZMIENNA=WARTOŚĆ\n"
+msgid "%s: -K requires KEY=VALUE\n"
+msgstr "%s: -K wymaga KLUCZ=WARTOŚĆ\n"
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s: nie można przepisać pliku z grupami\n"
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s: nie można przepisać pliku z ukrytymi hasłami grup\n"
@@ -886,7 +886,7 @@ msgstr "%s: grupa %s nie istnieje\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s: grupa %s jest grupą NIS\n"
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s jest głównym serwerem NIS\n"
@@ -1151,7 +1151,7 @@ msgstr ""
 "\n"
 "[Rozłączenie pominięte -- zezwolenie na logowanie się roota.]\n"
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
@@ -1160,17 +1160,17 @@ msgstr ""
 "\n"
 "Limit czasu logowania przekroczony po %d sekundach.\n"
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr " na `%.100s' z `%.200s'"
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr " na `%.100s'"
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
@@ -1179,25 +1179,25 @@ msgstr ""
 "\n"
 "%s login: "
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr "Nieprawidłowe logowanie"
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Ostrzeżenie: logowanie ponownie odblokowanie po czasowej blokadzie.\n"
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr "Ostatnie logowanie: %s na %s"
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr "Ostatnie logowanie: %s na %s"
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr " z %.*s"
@@ -1212,21 +1212,21 @@ msgstr "Użycie: newgrp [-] [grupa]\n"
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Użycie: sg grupa [[-c] polecenie]\n"
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "nieznany UID: %u\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr "nieznany GID: %lu\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr "Wybacz.\n"
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr "zbyt wiele grup\n"
@@ -1372,7 +1372,7 @@ msgstr "%s: brak pamięci\n"
 msgid "%s: Cannot execute %s"
 msgstr "%s: Nie można wykonać %s"
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: repozytorium %s nie jest obsługiwane\n"
@@ -1489,35 +1489,35 @@ msgstr "%s: nie można zaktualizować wpisu dla użytkownika %s\n"
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: nie można skasować pliku z ukrytymi hasłami\n"
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr "Wybacz."
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s: musisz uruchamiać z terminala\n"
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr "%s: pam_start: błąd %d\n"
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr "Nieznany id: %s\n"
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Nie masz autoryzacji by używać su %s\n"
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr "(Wpisz swoje własne hasło.)"
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -1526,7 +1526,7 @@ msgstr ""
 "%s: %s\n"
 "(Zignorowano)\n"
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr "Brak powłoki\n"
@@ -1551,12 +1551,12 @@ msgstr "Proszę wpisz swoje WŁASNE hasło jako hasło uwierzytelniające.\n"
 msgid "No password file\n"
 msgstr "Brak pliku z hasłami\n"
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr "Brak wpisu do bazy haseł dla 'root'\n"
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
@@ -1566,222 +1566,253 @@ msgstr ""
 "Naciśnij control-d by kontynuować normalny start\n"
 "(lub podaj hasło roota by przejść do trybu konserwacji systemu):"
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr "Wchodzę w tryb konserwacji systemu\n"
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s: nieprawidłowy argument numeryczny `%s'\n"
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s: nieznany GID %s\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s: nieznana grupa %s\n"
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: nie można utworzyć nowego pliku z ustawieniami domyślnymi\n"
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr "%s: nie można otworzyć nowego pliku z ustawieniami domyślnymi\n"
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr "%s: zmiana nazwy: %s"
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s: grupa `%s' jest grupą NIS.\n"
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: podano zbyt wiele grup (maks %d).\n"
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
-msgstr "Użycie: useradd [-u uid [-o]] [-g grupa] [-G grupa,...] \n"
-
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
 msgstr ""
-"                [-d kat_dom] [-s powłoka] [-c komentarz] [-m [-k wzór]]\n"
+"Użycie: useradd [opcje] LOGIN\n"
+"\n"
+"Opcje:\n"
+"  -b, --base-dir KAT_BAZOWY\tkatalog bazowy dla katalogu domowego nowo\n"
+"\t\t\t\ttworzonego konta\n"
+"  -c, --comment COMMENT\t\tustaw pole komentarza (GECOS) dla nowo\n"
+"\t\t\t\ttworzonego konta\n"
+"  -d, --home-dir HOME_DIR\tkatalog domowy dla nowo tworzonego konta\n"
+"  -D, --defaults\t\twypisz lub zapisz domyślną konfigurację programu "
+"useradd\n"
+"  -e, --expiredate DATA_WAŻNOSCI\tustawia datę wazności dla nowo tworzonego\n"
+"\t\t\t\tkonta na DATA_WAŻNOSCI\n"
+"  -f, --inactive NIEAKTYWNE\tustwia liczbę dni nieaktywności konta po\n"
+"\t\t\t\tktórych konta jest blokowane na NIEAKTYWNE\n"
+"  -h, --help\t\t\twyświetlenie tego opisu i zakończenie\n"
+"  -g, --gid GROUP\t\twymuś użycie konkretnej grupy dla nowo tworzonego "
+"konta\n"
+"  -G, --groups GROUPS\t\tlista dodatkowych grup dla nowo tworzonego konta\n"
+"  -k, --skel SKEL_DIR\t\tpodaj alternatywną ścieżkę do katalogu skel\n"
+"  -K, --key KEY=VALUE\t\tprzysłoń wartość domyślną z /etc/login.defs\n"
+"  -m, --create-home\t\ttwóż katalog domowy dla nowego użytkownika\n"
+"  -o, --non-unique\t\tpozwól na utwożenie konta z nieunikalnym UID\n"
+"  -p, --password PASSWORD\tużyj zakodowane hasło dla nowego tworzonego "
+"konta\n"
+"  -s, --shell SHELL\t\ttshell dla nowo tworzonego konta\n"
+"  -u, --uid UID\t\t\twymuś użycie konkretnego UID dla nowo tworzonego konta\n"
 
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr "                [-f nieaktywne] [-e utrata_ważności]\n"
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr "                [-p hasło] nazwa\n"
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr "        useradd -D [-g grupa] [-b baza] [-s powłoka]\n"
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s: błąd podczas blokowania pliku z grupami\n"
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s: błąd podczas otwierania pliku z grupami\n"
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s: błąd podczas blokowania pliku z ukrytymi hasłami grup\n"
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s: błąd podczas otwierania pliku z ukrytymi hasłami grup\n"
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: UID %u nie jest niepowtarzalny\n"
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, c-format
 msgid "%s: can't get unique UID\n"
 msgstr "%s: nie można uzyskać niepowtarzalnego UID\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr "%s: nieprawidłowy katalog bazowy `%s'\n"
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr "%s: nieprawidłowy komentarz `%s'\n"
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s: nieprawidłowy katalog domowy `%s'\n"
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s: nieprawidłowa data `%s'\n"
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr "%s: ukryte hasła wymagane dla -e\n"
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr "%s: ukryte hasła wymagane dla -f\n"
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s: nieprawidłowe pole `%s'\n"
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr "%s: nieprawidłowa powłoka `%s'\n"
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr "%s: nieprawidłowa nazwa użytkownika '%s'\n"
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s: nie można przepisać pliku z hasłami\n"
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s: nie można przepisać pliku z ukrytymi hasłami\n"
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s: nie można zablokować pliku z hasłami\n"
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s: nie można otworzyć pliku z hasłami\n"
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s: nie można zablokować pliku z ukrytymi hasłami\n"
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s: nie można otworzyć pliku z ukrytymi hasłami\n"
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr "%s: błąd podczas dodawania nowego wpisu do pliku z hasłami\n"
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr "%s: błąd podczas dodawania nowego wpisu do pliku z ukrytymi hasłami\n"
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: nie można utworzyć katalogu %s\n"
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr ""
 "Nie istnieje grupa \"mail\", tworzenie skrzynki z uprawnieniami 0600.\n"
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr "Nie można utworzyć skrzynki pocztowej dla użytkownika %s.\n"
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s: użytkownik %s istnieje\n"
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
 msgstr ""
 "%s: grupa %s istnieje - aby dodać tego użytkownika do tej grupy, użyj -g.\n"
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: uwaga: CREATE_HOME nie jest obsługiwane, użyj opcji -m.\n"
@@ -1831,12 +1862,12 @@ msgstr "%s: właścicielem %s nie jest %s, nie usuwam\n"
 msgid "%s: warning: can't remove "
 msgstr "%s: ostrzeżenie: nie można usunąć "
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s: użytkownik %s nie istnieje\n"
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: użytkownik %s jest użytkownikiem NIS\n"
@@ -1852,102 +1883,107 @@ msgstr ""
 msgid "%s: error removing directory %s\n"
 msgstr "%s: błąd podczas usuwania katalogu %s\n"
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
-msgstr "Użycie: %s\t[-u uid [-o]] [-g grupa] [-G grupa,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
+msgstr "Użycie: %s\t[-u uid [-o]] [-g grupa] [[-G grupa,...] [-a]] \n"
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr "\t\t[-d kat_dom [-m]] [-s powłoka] [-c komentarz] [-l nowa_nazwa]\n"
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr "[-f nieaktywne] [-e utrata_ważności] "
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr "[-p hasło] [-L|-U] nazwa\n"
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s: zabrakło pamięci w update_group\n"
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s: zabrakło pamięci w update_gshadow\n"
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: nie podano flag\n"
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: ukryte hasła wymagane dla -e i -f\n"
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr "%s: opcja -a można użyć TYLKO z pcją -G\n"
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr "%s: uid %lu nie jest niepowtarzalny\n"
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s: błąd podczas zmiany wpisu w pliku z hasłami\n"
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s: błąd podczas usuwania wpisu z pliku z hasłami\n"
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr "%s: błąd podczas usuwania wpisu z pliku z ukrytymi hasłami\n"
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: katalog %s istnieje\n"
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s: nie można utworzyć %s\n"
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s: nie można zmienić właściciela %s\n"
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
 "%s: uwaga: nie powiodło się całkowite usuniecie starego katalogu domovego %s"
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s: nie można zmienić nazwy katalogu z %s na %s\n"
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: ostrzeżenie: właścicielem %s nie jest %s\n"
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr "zmiana właściciela skrzynki pocztowej nie powiodła się"
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr "zmiana nazwy skrzynki pocztowej nie powiodła się"
 
@@ -1983,3 +2019,20 @@ msgstr ""
 "Użycie:\n"
 "`vipw' edytuje /etc/passwd      `vipw -s' edytuje /etc/shadow\n"
 "`vigr' edytuje /etc/group       `vigr -s' edytuje /etc/gshadow\n"
+
+#~ msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
+#~ msgstr "Użycie: useradd [-u uid [-o]] [-g grupa] [-G grupa,...] \n"
+
+#~ msgid ""
+#~ "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+#~ msgstr ""
+#~ "                [-d kat_dom] [-s powłoka] [-c komentarz] [-m [-k wzór]]\n"
+
+#~ msgid "               [-f inactive] [-e expire]\n"
+#~ msgstr "                [-f nieaktywne] [-e utrata_ważności]\n"
+
+#~ msgid "               [-p passwd] [-K KEY=VALUE] name\n"
+#~ msgstr "                [-p hasło] [-K KLUCZ=WARTOŚĆ] nazwa\n"
+
+#~ msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
+#~ msgstr "        useradd -D [-g grupa] [-b baza] [-s powłoka]\n"
diff --git a/po/pt.gmo b/po/pt.gmo
index 0332e7da..91304f1a 100644
Binary files a/po/pt.gmo and b/po/pt.gmo differ
diff --git a/po/pt.po b/po/pt.po
index a31f2a7c..cd56802a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,12 +1,15 @@
 # Portuguese (Portugal) Translation Project (traduz@debianpt.org)
 # Nuno Sénica <njs@av.it.pt>, 2004
+#
 # 18-04-2005 - Miguel Figueiredo <elmig@debianpt.org> - 5f1u
+# 12-07-2005 - Miguel Figueiredo <elmig@debianpt.org> - 7u4f
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: shadow 4.0.8\n"
+"Project-Id-Version: shadow 4.0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
-"PO-Revision-Date: 2005-04-17 22:55+0000\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
+"PO-Revision-Date: 2005-07-12 19:45+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
 "MIME-Version: 1.0\n"
@@ -138,12 +141,12 @@ msgstr "Directoria não encontrada, a entrar para HOME=/"
 msgid "Cannot execute %s"
 msgstr "Não foi possível executar %s"
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "Directoria de raíz inválida \"%s\"\n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "Não é possível mudar a directoria de raiz para \"%s\"\n"
@@ -164,16 +167,16 @@ msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr ""
 "erro de configuração - item '%s' desconhecido (notifique o administrador)\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "Password: "
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "Password de %s: "
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -191,149 +194,165 @@ msgid ""
 "\t\t\t\tchange to MAX_DAYS\n"
 "  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
 msgstr ""
+"Utilização: chage [opções] utilizador\n"
+"  -d, --lastday ÚLTIMO_DIA\t define para ÚLTIMO_DIA a última alteração de "
+"password\n"
+"  -E, --expiredate DATA_EXPIRA\tdefine para DATA_EXPIRA a data em que a "
+"conta expira\n"
+"  -h, --help\t\t\tmostra esta mensagem de ajuda e termina\n"
+"  -I, --inactive INACTIVO\tdefine para INACTIVO a password inactiva após "
+"expirar\n"
+"\t\t\t\tpara INACTIVO\n"
+"  -l, --list\t\t\tmostra informação de envelhecimento da conta\n"
+"  -m, --mindays MIN_DIAS\tdefine para MIN_DIAS o número minimo de dias para "
+"alterar a password\n"
+"  -M, --maxdays MAX_DIAS\tdefine para MAX_DIAS o número máximo de dias para "
+"alterar a password\n"
+"  -W, --warndays DIAS_AVISO\tdefina para DIAS_AVISO o número de dias para "
+"aviso de expirar\n"
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Introduza o novo valor, ou pressione ENTER para o valor por defeito\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "Idade Mínima da Password"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "Idade Máxima da Password"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "Última Alteração da Password (YYYY-MM-DD)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "Aviso de Caducidade da Password"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "Password Inactiva"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Data de Caducidade da Conta (YYYY-MM-DD)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Última alteração da password\t\t\t\t\t: "
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, c-format
 msgid "never\n"
 msgstr "nunca\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "A password caduca em\t\t\t\t\t: "
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Password inactiva\t\t\t\t\t: "
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "A conta caduca em\t\t\t\t\t\t: "
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr "Número mínimo de dias entre alterações de password\t\t: %ld\n"
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr "Número máximo de dias entre alterações de password\t\t: %ld\n"
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr "Número de dias de aviso antes da password expirar\t: %ld\n"
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s: não incluir \"l\" com outras flags\n"
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: acesso negado.\n"
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: A autenticação PAM falhou\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: não é possível abrir o ficheiro de passwords\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s: utilizador desconhecido %s\n"
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
+msgid "%s: can't lock shadow password file\n"
 msgstr ""
-"%s: não é possível obter acesso exclusivo ao ficheiro de passwords shadow"
+"%s: não é possível obter acesso exclusivo ao ficheiro de passwords shadow\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
-msgstr "%s: não é possível abrir o ficheiro de passwords shadow"
+msgid "%s: can't open shadow password file\n"
+msgstr "%s: não é possível abrir o ficheiro de passwords shadow\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "A alterar a informação de envelhecimento de %s\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: erro na alteração de campos\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: não é possível actualizar o ficheiro de passwords\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: não é possível actualizar o ficheiro de passwords shadow\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s: não é possível reescrever o ficheiro de passwords shadow\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: não é possível reescrever o ficheiro de passwords\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr "%s: falhou chauthtok de PAM\n"
@@ -446,7 +465,7 @@ msgstr ""
 msgid "Cannot open the password file.\n"
 msgstr "Não é possível abrir o ficheiro de passwords.\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: %s não foi encontrado em /etc/passwd\n"
@@ -666,7 +685,7 @@ msgstr "%s: passwords shadow de grupo necessárias para -A\n"
 msgid "Who are you?\n"
 msgstr "Quem é você?\n"
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "grupo desconhecido: %s\n"
@@ -759,49 +778,49 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr "Utilização: groupadd [-g gid [-o]] [-f] grupo\n"
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s: erro a adicionar o registo do novo grupo\n"
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr "%s: o nome %s não é único\n"
 
 #: src/groupadd.c:233
-#, fuzzy, c-format
+#, c-format
 msgid "%s: GID %u is not unique\n"
-msgstr "%s: gid %u não é único\n"
+msgstr "%s: GID %u não é único\n"
 
 #: src/groupadd.c:257
-#, fuzzy, c-format
+#, c-format
 msgid "%s: can't get unique GID\n"
-msgstr "%s: não é possível obter um gid único\n"
+msgstr "%s: não é possível obter um GID único\n"
 
 #: src/groupadd.c:279 src/groupmod.c:282
 #, c-format
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s: %s não é um nome válido para o grupo\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr "%s: grupo %s inválido\n"
 
-#: src/groupadd.c:325 src/useradd.c:1058
+#: src/groupadd.c:332 src/useradd.c:1094
 #, c-format
-msgid "%s: -O requires NAME=VALUE\n"
-msgstr "%s: -O necessita de NAME=VALUE\n"
+msgid "%s: -K requires KEY=VALUE\n"
+msgstr "%s: -K necessita de KEY=VALUE\n"
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s: não é possível reescrever o ficheiro dos grupos\n"
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s: não é possível reescrever o ficheiro de shadow dos grupos\n"
@@ -862,7 +881,7 @@ msgstr "%s: o grupo %s não existe.\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s: o grupo %s é um grupo NIS\n"
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s é o NIS master\n"
@@ -878,9 +897,9 @@ msgid "%s: %s not found in /etc/group\n"
 msgstr "%s: %s não foi encontrado em /etc/group\n"
 
 #: src/groupmod.c:241
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %u is not a unique GID\n"
-msgstr "%s: %u não é um gid único\n"
+msgstr "%s: %u não é um GID único\n"
 
 #: src/groupmod.c:271
 #, c-format
@@ -1125,7 +1144,7 @@ msgstr ""
 "\n"
 "[Encerramento ultrapassado -- entrada de root permitida.]\n"
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
@@ -1134,17 +1153,17 @@ msgstr ""
 "\n"
 "Tempo de login caducou após %d segundos de inactividade.\n"
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr " em `%.100s' de `%.200s'"
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr " em `%.100s'"
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
@@ -1153,25 +1172,25 @@ msgstr ""
 "\n"
 "%s login: "
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr "Login incorrecto"
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Aviso: o login foi novamente permitido após um tempo de bloqueio.\n"
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr "Última entrada no sistema: %s em %s"
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr "Última entrada no sistema: %.19s em %s"
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr " de %.*s"
@@ -1186,21 +1205,21 @@ msgstr "Utilização: newgrp [-] [grupo]\n"
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Utilização: sg grupo [[-c] comando]\n"
 
-#: src/newgrp.c:130
-#, fuzzy, c-format
+#: src/newgrp.c:159
+#, c-format
 msgid "unknown UID: %u\n"
-msgstr "GID desconhecido: %lu\n"
+msgstr "GID desconhecido: %u\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr "GID desconhecido: %lu\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr "Desculpe.\n"
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr "demasiados grupos\n"
@@ -1348,7 +1367,7 @@ msgstr "%s: falta de memória\n"
 msgid "%s: Cannot execute %s"
 msgstr "%s: Não é possível executar %s"
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: o repositório %s não é suportado\n"
@@ -1465,35 +1484,35 @@ msgstr "%s: não é possível actualizar o registo do utilizador %s\n"
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: não é possível apagar o ficheiro de shadow de passwords\n"
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr "Desculpe."
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s: deve ser executado a partir de um terminal\n"
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr "%s: pam_start: erro %d\n"
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr "Id desconhecido: %s\n"
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Não está autorizado a fazer su %s\n"
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr "(Introduza a sua password.)"
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -1502,7 +1521,7 @@ msgstr ""
 "%s: %s\n"
 "(Ignorado)\n"
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr "Sem shell\n"
@@ -1527,12 +1546,12 @@ msgstr "Por favor introduza a SUA password como autenticação.\n"
 msgid "No password file\n"
 msgstr "Ficheiro de passwords não existe\n"
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr "Não está definida nenhuma password para 'root'\n"
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
@@ -1542,219 +1561,254 @@ msgstr ""
 "Pressione control-d para continuar com o arranque normal,\n"
 "(ou introduza a password de root para manutenção do sistema):"
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr "A Entrar no Modo de Manutenção do Sistema\n"
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s: argumento numérico inválido `%s'\n"
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s: GID %s desconhecido\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s: grupo %s desconhecido\n"
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: não é possível criar ficheiro de configurações por defeito\n"
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr "%s: não é possível abrir ficheiro de configurações por defeito\n"
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr "%s: renomear: %s"
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s: o grupo `%s' é um grupo NIS.\n"
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: estão especificados demasiados grupos (max %d).\n"
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
-msgstr "Utilização: useradd [-u uid [-o]] [-g grupo] [-G grupo,...] \n"
-
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
 msgstr ""
-"                    [-d home] [-s shell] [-c comentário] [-m [-k template]]\n"
+"Utilização: useradd [opções] LOGIN\n"
+"\n"
+"Opções:\n"
+"  -b, --base-dir BASE_DIR\tdirectório base para o directório home \n"
+"\t\t\t\tda conta do novo utilizador\n"
+"  -c, --comment COMENTÁRIO\t\tdefine o campo GECOS para a conta\n"
+"\t\t\t\tdo novo utilizador  -d, --home-dir HOME_DIR\tdirectório home para a "
+"conta do novo utilizador\n"
+"  -D, --defaults\t\tmostra ou grava a alterada configuração \n"
+"\t\t\t\tpor omissão do useradd\n"
+"  -e, --expiredate EXPIRE_DATE\tdefine para EXPIRE_DATE a data em\n"
+"\t\t\t\tque a conta expira\n"
+"  -f, --inactive INACTIVE\tdefine a password inactiva após expirar\n"
+"\t\t\t\tapós INACTIVE\n"
+"  -g, --gid GRUPO\t\tforça a utilização do GRUPO para a conta do \n"
+"\t\t\t\tnovo utilizador\n"
+"  -G, --groups GRUPOS\t\tlista de grupos adicionais para a conta\n"
+"\t\t\t\tdo novo utilizador\n"
+"  -h, --help\t\t\tmostra esta mensagem e termina\n"
+"  -k, --skel SKEL_DIR\t\tespecifica um directório SKEL alternativo\n"
+"  -K, --key KEY=VALUE\t\tultrapassa os valores padrão de /etc/login.defs\n"
+"  -m, --create-home\t\tcriar directório home para a conta\n"
+"\t\t\t\tdo novo utilizador\n"
+"  -o, --non-unique\t\tpermite criar utilizador com UID duplicado\n"
+"\t\t\t\t(não-único)\n"
+"  -p, --password PASSWORD\tutilizar password encriptada para a\n"
+"\t\t\t\tconta do novo utilizador\n"
+"  -s, --shell SHELL\t\tshell de login para a conta do novo utilizador\n"
+"  -u, --uid UID\t\t\tforça a utilização do UID para a conta\t\t\t\tdo novo "
+"utilizador\n"
 
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr "                    [-f inactivo] [-e caduca]\n"
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr "                    [-p passwd] nome\n"
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr "            useradd -D [-g grupo] [-b base] [-s shell]\n"
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s: erro ao tentar obter acesso exclusivo ao ficheiro dos grupos\n"
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s: erro ao tentar abrir o ficheiro dos grupos\n"
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr ""
 "%s: erro ao tentar obter acesso exclusivo ao ficheiro de shadow dos grupos\n"
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s: erro ao tentar abrir o ficheiro de shadow dos grupos\n"
 
-#: src/useradd.c:875
-#, fuzzy, c-format
+#: src/useradd.c:891
+#, c-format
 msgid "%s: UID %u is not unique\n"
-msgstr "%s: gid %u não é único\n"
+msgstr "%s: UID %u não é único\n"
 
-#: src/useradd.c:905
-#, fuzzy, c-format
+#: src/useradd.c:921
+#, c-format
 msgid "%s: can't get unique UID\n"
-msgstr "%s: não é possível obter um gid único\n"
+msgstr "%s: não é possível obter um UID único\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr "%s: a directoria base `%s' é inválida\n"
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr "%s: o comentário `%s' é inválido\n"
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s: a directoria home `%s' é inválida\n"
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s: a data `%s' é inválida\n"
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr "%s: é necessário shadow passwords para -e\n"
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr "%s: é necessário shadow passwords para -f\n"
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s: o campo `%s' é inválido\n"
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr "%s: a shell `%s' é inválida\n"
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr "%s: o nome de utilizador '%s' é inválido\n"
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s: não foi possível reescrever o ficheiro de passwords\n"
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s: não foi possível reescrever o ficheiro de shadow de passwords\n"
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s: não foi possível obter acesso exclusivo ao ficheiro de passwords\n"
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s: não foi possível abrir o ficheiro de passwords\n"
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr ""
 "%s: não é possível obter acesso exclusivo ao ficheiro de shadow de "
 "passwords\n"
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s: não é possível abrir o ficheiro de shadow de passwords\n"
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr "%s: erro ao adicionar o registo da nova password\n"
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr "%s: erro ao adicionar o registo da nova password de shadow\n"
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: não é possível criar a directoria %s\n"
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr ""
 "Não existe nenhum grupo chamado \"mail\", criando spool de mail com modo "
 "0600.\n"
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr "Não foi possível criar spool de mail para o utilizador %s.\n"
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s: o utilizador %s existe\n"
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
@@ -1762,7 +1816,7 @@ msgstr ""
 "%s: o grupo %s existe - se pretende adicionar este utilizador a esse grupo, "
 "utilize -g.\n"
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr ""
@@ -1813,12 +1867,12 @@ msgstr "%s: o %s não pertence a %s, não será removido\n"
 msgid "%s: warning: can't remove "
 msgstr "%s: aviso: não é possível remover "
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s: o utilizador %s não existe\n"
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: o utilizador %s é um utilizador NIS\n"
@@ -1835,101 +1889,107 @@ msgstr ""
 msgid "%s: error removing directory %s\n"
 msgstr "%s: erro ao remover a directoria %s\n"
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr "Utilização: %s\t[-u uid [-o]] [-g grupo] [-G grupo,...] \n"
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr "\t\t[-d home [-m]] [-s shell] [-c comentário] [-l novo_nome]\n"
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr "[-f inactivo] [-e caduca] "
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr "[-p passwd] [-L|-U] nome\n"
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s: falta de memória em update_group\n"
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s: falta de memória em update_gshadow\n"
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: não foram especificadas flags\n"
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: é necessária passwords shadow para -e e -f\n"
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr "%s: -a flag é permitida APENAS com a flag -G\n"
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr "%s: o uid %lu não é único\n"
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s: erro ao alterar o registo de password\n"
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s: erro ao remover o registo de password\n"
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr "%s: erro ao remover o registo de password de shadow\n"
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: a directoria %s existe\n"
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s: não é possível criar %s\n"
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s: não é possível efectuar o chown a %s\n"
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
+"%s: aviso: falhou remover completamente remover o antigo directório home %s"
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s: não é possível renomear a directoria %s para %s\n"
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: aviso: o %s não pertence a %s\n"
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr "a alteração do dono da caixa de correio falhou"
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr "falha ao renomear a caixa do correio"
 
@@ -1965,12 +2025,3 @@ msgstr ""
 "Uso:\n"
 "`vipw' edita /etc/passwd        `vipw -s' edita /etc/shadow\n"
 "`vigr' edita /etc/group         `vigr -s' edita /etc/gshadow\n"
-
-#~ msgid "unknown uid: %u\n"
-#~ msgstr "uid desconhecido: %u\n"
-
-#~ msgid "%s: uid %u is not unique\n"
-#~ msgstr "%s: uid %u não é único\n"
-
-#~ msgid "%s: can't get unique uid\n"
-#~ msgstr "%s: não é possível obter um uid único\n"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index fa914f05..acab6889 100644
Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c65dcd1b..8d4e9e81 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
 "PO-Revision-Date: 2004-06-12 17:16-0300\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -139,12 +139,12 @@ msgstr "Sem diretório pessoal, logando com HOME=/"
 msgid "Cannot execute %s"
 msgstr "Não foi possível executar %s"
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "Diretório raíz \"%s\" inválido\n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "Não foi possível mudar o diretório raíz para \"%s\"\n"
@@ -165,16 +165,16 @@ msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr ""
 "erro de configuração - item '%s' desconhecido (notifique o administrador)\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "Senha : "
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "Senha de %s : "
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -193,147 +193,147 @@ msgid ""
 "  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
 msgstr ""
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Informe o novo valor ou pressione ENTER para aceitar o padrão\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "Idade Mínima da Senha"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "Idade Máxima da Senha"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "Última Mudança de Senha (YYYY-MM-DD)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "Aviso de Expiração de Senha"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "Senha Inativa"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Data de Expiração de Senha (YYYY-MM-DD)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, fuzzy, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Última Mudança de Senha (YYYY-MM-DD)"
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, fuzzy, c-format
 msgid "never\n"
 msgstr "Nunca\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, fuzzy, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Senha Expira :\t"
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, fuzzy, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Senha Inativa :\t"
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, fuzzy, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Conta Expira :\t"
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, fuzzy, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr "Número máximo de tentativas excedido (%d)\n"
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s : não inclua \"l\" com outras flags\n"
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, fuzzy, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s : permissão negada\n"
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s : autenticação PAM falhou\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s : não foi possível abrir o arquivo de senhas\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s : usuário %s desconhecido\n"
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
-msgstr "%s : não foi possível obter lock em arquivos de senhas shadow"
+msgid "%s: can't lock shadow password file\n"
+msgstr "%s : não foi possível obter lock em arquivos de senhas shadow\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
-msgstr "%s : não foi possível abrir arquivo de senhas shadow"
+msgid "%s: can't open shadow password file\n"
+msgstr "%s : não foi possível abrir arquivo de senhas shadow\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "Mudando a informação de idade para %s\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s : erro modificando campos\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s : não foi possível atualizar arquivo de senhas\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s : não foi possível atualizar arquivos de senhas shadow\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s : não foi possível reescrever arquivo de senhas shadow\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s : não foi possível reescrever arquivo de senhas\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr "%s : chauthok PAM falhou\n"
@@ -446,7 +446,7 @@ msgstr ""
 msgid "Cannot open the password file.\n"
 msgstr "Não foi possível abrir arquivo de senhas.\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s : %s não encontrado em /etc/passwd\n"
@@ -645,7 +645,7 @@ msgstr "%s : senhas de grupo shadow requeridas para -A\n"
 msgid "Who are you?\n"
 msgstr "Quem é você ?\n"
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "grupo desconhecido : %s\n"
@@ -738,12 +738,12 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr "Uso : groupadd [-g gid [-o]] [-f] grupo\n"
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s : erro adicionando nova entrada de grupo\n"
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr "%s : o nome %s não é único\n"
@@ -763,24 +763,24 @@ msgstr "%s : não foi possível obter gid único\n"
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s : %s não é um nome de grupo válido\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr "%s : grupo %s inválido\n"
 
-#: src/groupadd.c:325 src/useradd.c:1058
-#, c-format
-msgid "%s: -O requires NAME=VALUE\n"
+#: src/groupadd.c:332 src/useradd.c:1094
+#, fuzzy, c-format
+msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s : -O requer NOME=VALOR\n"
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s : não foi possível regravar arquivo de grupo\n"
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s : não foi possível regravar arquivo de grupo shadow\n"
@@ -840,7 +840,7 @@ msgstr "%s : grupo %s não existe\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s : grupo %s é um grupo NIS\n"
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s : %s é o mestre NIS\n"
@@ -1096,7 +1096,7 @@ msgstr ""
 "\n"
 "[Disconexão contornada -- login de root permitido.]\n"
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
@@ -1105,17 +1105,17 @@ msgstr ""
 "\n"
 "Login falhou após %d segundos de espera.\n"
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr " em `%.100s' de `%.200s'"
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr " em `%.100s'"
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
@@ -1124,25 +1124,25 @@ msgstr ""
 "\n"
 "%s login : "
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr "Login incorreto"
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Aviso : login rehabilitado após travamento temporário.\n"
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr "Último login : %s em %s"
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr "Último login : %.19s em %s"
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr " de %.*s"
@@ -1157,21 +1157,21 @@ msgstr "Uso : newgrp [-] [grupo]\n"
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Uso : sg group [[-c] comando]\n"
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, fuzzy, c-format
 msgid "unknown UID: %u\n"
 msgstr "GID desconhecido : %lu\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr "GID desconhecido : %lu\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr "Desculpe.\n"
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr "muitos grupos\n"
@@ -1319,7 +1319,7 @@ msgstr "%s : sem memória\n"
 msgid "%s: Cannot execute %s"
 msgstr "%s : Não foi possível executar %s"
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s : repositório %s não suportado\n"
@@ -1436,35 +1436,35 @@ msgstr "%s : não foi possível atualizar entrada para usuário %s\n"
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s : não foi possível remover arquivo de senhas shadow\n"
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr "Desculpe."
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s : deve ser executado a partir de um terminal\n"
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr "%s : pam_start : erro %d\n"
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr "Id desconhecido : %s\n"
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Você não está autorizado a usar o su para %s\n"
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr "{Informe sua própria senha.)"
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -1473,7 +1473,7 @@ msgstr ""
 "%s : %s\n"
 "(Ignorado)\n"
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr "Sem shell\n"
@@ -1498,12 +1498,12 @@ msgstr "Por favor, informe sua PRÓPRIA senha como autenticação.\n"
 msgid "No password file\n"
 msgstr "Sem arquivo de senhas\n"
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr "Nenhuma entrada de senha para 'root'\n"
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
@@ -1513,214 +1513,219 @@ msgstr ""
 "Digite Control-D para continuar com a inicialização normal, \n"
 "(ou forneça a senha de root para administração do sistema) :"
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr "Entrando em Modo de Manutenção do Sistema\n"
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s : argumento numérico `%s' inválido\n"
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s : GID %s desconhecido\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s : grupo %s desconhecido\n"
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s : não foi possível criar novo arquivo de padrões\n"
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr "%s : não foi possível abrir novo arquivo de padrões\n"
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr "%s : rename : %s"
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s : grupo `%s' é um grupo NIS.\n"
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s : muitos grupos especificados *máimo %d).\n"
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
-msgstr "Uso : useradd [-u uid [-o]] [-g grupo] [-G grupo,...] \n"
-
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
 msgstr ""
-"              [-d home] [-s shell] [-c comentário] [-m [-k template]]\n"
 
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr "              [-f inativo] [-e expira ]\n"
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr "              [-p passwd] nome\n"
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr "      useradd -D [-g grupo] [-b base] [-s shell]\n"
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s : erro obtendo lock em arquivo de grupo\n"
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s : erro abrindo arquivo de grupo\n"
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s : erro obtendo lock em arquivo de grupo shadow\n"
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s : erro abrindo arquivo de grupo shadow\n"
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, fuzzy, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s : o gid %u não é único\n"
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, fuzzy, c-format
 msgid "%s: can't get unique UID\n"
 msgstr "%s : não foi possível obter gid único\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr "%s : diretório base `%s'inválido\n"
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr "%s : comentário `%s' inválido\n"
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s : diretório home `%s' inválido\n"
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s : data `%s' inválida\n"
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr "%s : senhas shadow necessárias para -e\n"
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr "%s : senhas shadow necessárias para -f\n"
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s : campo `%s' inválido\n"
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr "%s : shell `%s' inválida\n"
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr "%s : nome de usuário '%s' inválido\n"
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s : não foi possível reescrever arquivo de senhas\n"
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s : não foi possível reescrever arquivo de senhas shadow\n"
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s : não foi possível obter lock em arquivo de senhas\n"
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s : não foi possível abrir arquivo de senhas\n"
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s : não foi possível obter lock em arquivo de senhas shadow\n"
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s : não foi possível abrir arquivo de senhas shadow\n"
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr "%s : erro adicionando nova entrada de senha\n"
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr "%s : erro adicionando nova entrada de senha shadow\n"
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s : não foi possível criar diretório %s\n"
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr ""
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, fuzzy, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr "%s : não foi possível atualizar entrada para usuário %s\n"
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s : usuário %s existe\n"
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
@@ -1728,7 +1733,7 @@ msgstr ""
 "%s : grupo %s existe - caso você ueira adicionar esse usuário a esse \n"
 "grupo, utilize -g.\n"
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s : aviso CREATE_HOME não é suportado, por favor, utilize -m.\n"
@@ -1778,12 +1783,12 @@ msgstr "%s : %s não é propriedade de %s, não removendo\n"
 msgid "%s: warning: can't remove "
 msgstr "%s : aviso : não foi possível remover "
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s : usuário %s não existe\n"
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s : usuário %s é um usuário NIS\n"
@@ -1798,101 +1803,106 @@ msgstr "%s : não removendo diretório %s (removeria o home do usuário %s)\n"
 msgid "%s: error removing directory %s\n"
 msgstr "%s : erro removendo diretório %s\n"
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr "Uso : %s\t[-u uid [-o]] [-g grupo] [-G grupo,...] \n"
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr "\t\t[-d home [-m]] [-s shell] [-c comentário] [-l novo_nome]\n"
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr "[-f inativo] [-e expira] "
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr "[-p passwd] [-L|-U] nome\n"
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s : sem memória em update_group\n"
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s : sem memória em update_gshadow\n"
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s : nenhuma flag informada\n"
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s : senhas shadow necessárias para -e e -f\n"
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr ""
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr "%s : o uid %lu não é único\n"
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s : erro modificando entrada de senha\n"
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s : erro removendo entrada de senha\n"
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr "%s erro removendo entrada de senha shadow\n"
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s : diretório %s existe\n"
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s : não foi possível criar %s\n"
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s : não foi possível executar chown %s\n"
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s : não foi possível renomear diretório %s para %s\n"
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s : aviso : %s não é propriedade de %s\n"
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr "falha au mudar o dono da caixa-postal"
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr "falha ao renomear caixa-postal"
 
@@ -1929,6 +1939,28 @@ msgstr ""
 "`vipw' edita /etc/passwd        `vipw -s' edita /etc/shadow\n"
 "`vigr' edita /etc/group         `vigr -s' edita /etc/gshadow\n"
 
+#, fuzzy
+#~ msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
+#~ msgstr "Uso : useradd [-u uid [-o]] [-g grupo] [-G grupo,...] \n"
+
+#~ msgid ""
+#~ "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+#~ msgstr ""
+#~ "              [-d home] [-s shell] [-c comentário] [-m [-k template]]\n"
+
+#~ msgid "               [-f inactive] [-e expire]\n"
+#~ msgstr "              [-f inativo] [-e expira ]\n"
+
+#, fuzzy
+#~ msgid "               [-p passwd] [-K KEY=VALUE] name\n"
+#~ msgstr "              [-p passwd] nome\n"
+
+#~ msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
+#~ msgstr "      useradd -D [-g grupo] [-b base] [-s shell]\n"
+
+#~ msgid "%s: -O requires NAME=VALUE\n"
+#~ msgstr "%s : -O requer NOME=VALOR\n"
+
 #~ msgid "unknown uid: %u\n"
 #~ msgstr "uid desconhecido : %u\n"
 
diff --git a/po/ro.gmo b/po/ro.gmo
index 5a8138b7..24315a8f 100644
Binary files a/po/ro.gmo and b/po/ro.gmo differ
diff --git a/po/ro.po b/po/ro.po
index 03f061a3..29986fff 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,4 +1,3 @@
-# translation of ro.po to Romanian
 # translation of shadow_ro.po to Romanian
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
@@ -6,12 +5,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: shadow 4.0.8\n"
+"Project-Id-Version: shadow 4.0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
-"PO-Revision-Date: 2005-05-14 02:20+0300\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
+"PO-Revision-Date: 2005-07-11 17:35+0300\n"
 "Last-Translator: Sorin Batariuc <sorin@bonbon.net>\n"
-"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
+"Language-Team: Romanian <debian-l10-romanian@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -146,12 +145,12 @@ msgstr "Fără director personal, autentificat cu HOME=/"
 msgid "Cannot execute %s"
 msgstr "Nu pot executa %s"
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "Director rădăcină invalid \"%s\"\n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "Nu pot schimba directorul rădăcină la \"%s\"\n"
@@ -172,16 +171,16 @@ msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr ""
 "eroare de configurare - articol necunoscut '%s' (anunţaţi administratorul)\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "Parola: "
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "Parola %s: "
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -199,148 +198,166 @@ msgid ""
 "\t\t\t\tchange to MAX_DAYS\n"
 "  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
 msgstr ""
+"Folosire: chage [opţiuni] utilizator\n"
+"\n"
+"Opţiuni:\n"
+"  -d, --lastday ULTIMA_ZI\tsetează ultima schimbare de parolă la ULTIMA_ZI\n"
+"  -E, --expiredate DATA_EXPIRARE\tsetează data expirării contului la "
+"DATA_EXPIRARE\n"
+"  -h, --help\t\t\tafişează acest mesaj de ajutor şi ieşi\n"
+"  -I, --inactive INACTIVĂ\tsetează parolă inactivă după expirare\n"
+"\t\t\t\tla INACTIVĂ\n"
+"  -l, --list\t\t\tarată informaţiile de temporalitate ale contului\n"
+"  -m, --mindays MIN_ZILE\tsetează numărul minim de zile înainde de "
+"schimbarea\n"
+"\t\t\t\tparolei to MIN_ZILE\n"
+"  -M, --maxdays MAX_ZILE\tsetează numărul maxim de zile înainte de "
+"schimbarea\n"
+"\t\t\t\tparolei la MAX_ZILE\n"
+"  -W, --warndays AVERTIZ_ZILE\tsetează zilele de avertisment pentru expirare "
+"la AVERTIZ_ZILE\n"
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Introduceţi noua valoare, sau apăsaţi ENTER pentru cea implicită\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "Vârsta minimă a parolei"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "Vârsta maximă a parolei"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "Ultima schimbare de parolă (AAAA-LL-ZZ)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "Avertisment de expirare a parolei"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "Parolă inactivă"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Data expirării contului (AAAA-LL-ZZ)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Ultima schimbare de parolă\t\t\t\t\t: "
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, c-format
 msgid "never\n"
 msgstr "niciodată\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Parola expiră:\t\t\t\t\t\t: "
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Parolă inactivă\t\t\t\t\t\t: "
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Contul expiră\t\t\t\t\t\t: "
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr "Numărul minim de zile dintre modificările de parolă\t\t: %ld\n"
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr "Numărul maxim de zile dintre modificările de parolă\t\t: %ld\n"
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr "Numărul de zile de avertizări dinaintea expirării parolei\t: %ld\n"
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s: nu include \"l\" cu alte semnalizatoare\n"
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: permisiune refuzată.\n"
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: autentificare PAM eşuată\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s; nu pot deschide fişierul de conturi utilizatori\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s: utilizator necunoscut %s\n"
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
-msgstr "%s nu pot încuia fişierul de parole criptate"
+msgid "%s: can't lock shadow password file\n"
+msgstr "%s nu pot încuia fişierul de parole criptate\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
-msgstr "%s: nu pot deschide fişierul de parole criptate"
+msgid "%s: can't open shadow password file\n"
+msgstr "%s: nu pot deschide fişierul de parole criptate\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "Modific informaţia de temporalitate pentru %s\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: eroare la modificarea câmpurilor\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: nu pot actualiza fişierul de conturi utilizatori\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: nu pot actualiza fişierul de parole criptate\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s: nu pot rescrie fişierul de parole criptate\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: nu pot rescrie fişierul de conturi utilizatori\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr "%s: eşuare chauthtok PAM\n"
@@ -451,7 +468,7 @@ msgstr "Nu pot încuia fişierul de conturi utilizatori; încercaţi mai târziu
 msgid "Cannot open the password file.\n"
 msgstr "Nu pot deschide fişierul de conturi utilizatori.\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: nu s-a găsit %s în /etc/passwd\n"
@@ -676,7 +693,7 @@ msgstr "%s: sunt cerute parole criptate de grup pentru -A\n"
 msgid "Who are you?\n"
 msgstr "Cine sunteţi?\n"
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "grup necunoscut: %s\n"
@@ -769,49 +786,49 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr "Utilizare: groupadd [-g id_grup [-o]] [-f] grup\n"
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s: eroare la adăugarea unei noi intrări de grup\n"
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr "%s: numele %s nu este unic\n"
 
 #: src/groupadd.c:233
-#, fuzzy, c-format
+#, c-format
 msgid "%s: GID %u is not unique\n"
-msgstr "%s: id grup %u nu este unic\n"
+msgstr "%s: GID %u nu este unic\n"
 
 #: src/groupadd.c:257
-#, fuzzy, c-format
+#, c-format
 msgid "%s: can't get unique GID\n"
-msgstr "%s: nu pot prelua id unic de grup\n"
+msgstr "%s: nu pot prelua GID unic\n"
 
 #: src/groupadd.c:279 src/groupmod.c:282
 #, c-format
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s: %s nu este un nume de grup valid\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr "%s: grup nevalid %s\n"
 
-#: src/groupadd.c:325 src/useradd.c:1058
+#: src/groupadd.c:332 src/useradd.c:1094
 #, c-format
-msgid "%s: -O requires NAME=VALUE\n"
-msgstr "%s: -O cere NAME=VALUE\n"
+msgid "%s: -K requires KEY=VALUE\n"
+msgstr "%s: -K cere KEY=VALUE\n"
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s: nu pot rescrie fişierul de grupuri\n"
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s: nu pot rescrie fişierul de parole criptate pentru grupuri\n"
@@ -871,7 +888,7 @@ msgstr "%s: grupul %s nu există\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s: grupul %s este un grup NIS\n"
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s este stăpân NIS\n"
@@ -887,9 +904,9 @@ msgid "%s: %s not found in /etc/group\n"
 msgstr "%s: %s nu s-a găsit în /etc/group\n"
 
 #: src/groupmod.c:241
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %u is not a unique GID\n"
-msgstr "%s: %u nu este un id unic de grup\n"
+msgstr "%s: %u nu este un GID unic\n"
 
 #: src/groupmod.c:271
 #, c-format
@@ -1135,7 +1152,7 @@ msgstr ""
 "\n"
 "[Fază de deconectare trecută -- autentificare permisă pentru root.]\n"
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
@@ -1144,17 +1161,17 @@ msgstr ""
 "\n"
 "Timp expirat pentru autentificare după %d secunde.\n"
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr " în `%.100s' din `%.200s'"
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr " în `%.100s'"
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
@@ -1163,25 +1180,25 @@ msgstr ""
 "\n"
 "%s autentificat: "
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr "autentificare incorectă"
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Avertisment: autentificare reactivată după închiderea temporară.\n"
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr "Ultima autentificare: %s în %s"
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr "Ultima autentificare: %.19s în %s"
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr " de la %.*s"
@@ -1196,21 +1213,21 @@ msgstr "Utilizare: newgrp [-] [grup]\n"
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Utilizare: sg grup [[-c] comanda]\n"
 
-#: src/newgrp.c:130
-#, fuzzy, c-format
+#: src/newgrp.c:159
+#, c-format
 msgid "unknown UID: %u\n"
-msgstr "id grup necunoscut: %lu\n"
+msgstr "UID necunoscut: %u\n"
 
-#: src/newgrp.c:212
-#, fuzzy, c-format
+#: src/newgrp.c:241
+#, c-format
 msgid "unknown GID: %lu\n"
-msgstr "id grup necunoscut: %lu\n"
+msgstr "GID necunoscut: %lu\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr "Scuze.\n"
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr "prea multe grupuri\n"
@@ -1357,7 +1374,7 @@ msgstr "%s: nu mai este memorie\n"
 msgid "%s: Cannot execute %s"
 msgstr "%s: nu pot executa %s"
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: depozitul %s nu este suportat\n"
@@ -1475,35 +1492,35 @@ msgstr "%s: nu pot actualiza intrarea pentru utilizatorul %s\n"
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: nu pot şterge fişierul de parole criptate shadow\n"
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr "Scuze."
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s: trebuie pornit de la un terminal\n"
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr "%s: pam_start: eroare %d\n"
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr "Identificator necunoscut: %s\n"
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Nu sunteţi autorizat pentru su %s\n"
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr "(Introduceţi propria parolă.)"
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -1512,7 +1529,7 @@ msgstr ""
 "%s: %s\n"
 "(Ignorat)\n"
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr "Fără consolă\n"
@@ -1537,12 +1554,12 @@ msgstr "Vă rog introduceţi PROPRIA parolă pentru autentificare.\n"
 msgid "No password file\n"
 msgstr "Fără fişier de conturi utilizatori passwd\n"
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr "Fără intrare de parolă pentru 'root'\n"
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
@@ -1552,218 +1569,252 @@ msgstr ""
 "Apăsaţi ctrl-d pentru pornire normală,\n"
 "(sau daţi parola de root pentru depanarea sistemului):"
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr "Intrare în modul de întreţinere sistem\n"
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s: argument numeric nevalid `%s'\n"
 
-#: src/useradd.c:289
-#, fuzzy, c-format
+#: src/useradd.c:290
+#, c-format
 msgid "%s: unknown GID %s\n"
-msgstr "%s: id grup necunoscut %s\n"
+msgstr "%s: GID necunoscut %s\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s: grup necunoscut %s\n"
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: nu pot crea noile fişiere implicite\n"
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr "%s: nu pot deschide noile fişiere implicite\n"
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr "%s: redenumesc: %s"
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s: grupul `%s' este un grup NIS.\n"
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: prea multe grupuri specificate (maximum %d).\n"
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
-msgstr "Utilizare: useradd [-u id_utilizator [-o]] [-g grup] [-G grup,...] \n"
-
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
 msgstr ""
-"                 [-d acasă] [-s consolă] [-c comentariu] [-m [-k şablon]]\n"
+"Folosire: useradd [opţiuni] LOGIN\n"
+"\n"
+"Opţiuni:\n"
+"  -b, --base-dir DIR_BAZA\tbaza directorului personal pentru noul cont de\n"
+"\t\t\t\tutilizator\n"
+"  -c, --comment COMENTARIU\t\tsetează câmpul GECOS pentru noul cont "
+"utilizator\n"
+"  -d, --home-dir DIR_ACASA\tdirectorul personal pentru noul cont urilizator\n"
+"  -D, --defaults\t\tafişează sau salvează configuraţia useradd implicită\n"
+"\t\t\t\tmodificată\n"
+"  -e, --expiredate DATA_EXPIRĂRII\tsetează data expirării contului la "
+"DATA_EXPIRĂRII\n"
+"  -f, --inactive INACTIVĂ\tsetează parola inactivă după expirare\n"
+"\t\t\t\tla INACTIVĂ\n"
+"  -g, --gid GRUP\t\tforţează folosirea GRUPULUI pentru noul cont utilizator\n"
+"  -G, --groups GRUPURI\t\tafişează grupurile suplimentare pentru noul\n"
+"\t\t\t\tcont utilizator\n"
+"  -h, --help\t\t\tafişează acest mesaj de ajutor şi ieşi\n"
+"  -k, --skel DIR_SKELET \t\tspecifică un schelet director alternativ\n"
+"  -K, --key KEY=VALOARE\t\tsuprascrie valorile implicite ale /etc/login."
+"defs\n"
+"  -m, --create-home\t\tcrează directorul personal pentru noul cont\n"
+"\t\t\t\tutilizator\n"
+"  -o, --non-unique\t\tpermite creare unui utilizator cu un UID\n"
+"\t\t\t\tduplicat (non-unic)\n"
+"  -p, --password PAROLA\tfoloseşte parola criptată pentru noul cont\n"
+"\t\t\t\tutilizator\n"
+"  -s, --shell SHELL\t\tmediul de autentificare pentru noul cont utilizator\n"
+"  -u, --uid UID\t\t\tforţează utilizarea UID pentru noul cont utilizator\n"
 
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr "                [-f inactivă] [-e expiră ]\n"
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr "                [-p passwd] nume\n"
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr "       useradd -D [-g grup] [-b baza] [-s consolă]\n"
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s: eroare la închiderea fişierului de grupuri\n"
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s: eroare la deschiderea fişierului de grupuri\n"
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr ""
 "%s: eroare la închiderea fişierului de parole criptate pentru grupuri\n"
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr ""
 "%s: eroare la deschiderea fişierului de parole criptate pentru grupuri\n"
 
-#: src/useradd.c:875
-#, fuzzy, c-format
+#: src/useradd.c:891
+#, c-format
 msgid "%s: UID %u is not unique\n"
-msgstr "%s: id grup %u nu este unic\n"
+msgstr "%s: UID %u nu este unic\n"
 
-#: src/useradd.c:905
-#, fuzzy, c-format
+#: src/useradd.c:921
+#, c-format
 msgid "%s: can't get unique UID\n"
-msgstr "%s: nu pot prelua id unic de grup\n"
+msgstr "%s: nu pot prelua UID unic\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr "%s: director de bază nevalid `%s'\n"
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr "%s: comentariu nevalid `%s'\n"
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s: director personal nevalid `%s'\n"
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s: dată nevalidă `%s'\n"
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr "%s: parole criptate cerute pentru -e\n"
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr "%s; parole criptate cerute pentru -f\n"
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s: fişier nevalid `%s'\n"
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr "%s: consolă nevalidă `%s'\n"
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr "%s: nume utilizator nevalid '%s'\n"
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s: nu pot rescrie fişierul de conturi utilizator\n"
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s: nu pot rescrie fişierul de parole criptate\n"
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s: nu pot încuia fişierul de conturi utilizatori\n"
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s: nu pot deschide fişierul de conturi utilizatori\n"
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s: nu pot încuia fişierul de parole criptate\n"
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s: nu pot deschide fişierul de parole criptate\n"
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr "%s: eroare la adăugarea unei noi intrări de cont utilizator\n"
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr "%s: eroare la adăugarea unei noi intrări de parolă criptată\n"
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: nu pot crea directorul %s\n"
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr ""
 "Nu există nici un grup cu numele de \"mail\", se crează directorul de poştă "
 "cu modul 0600.\n"
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr "Nu pot crea directorul de poştă pentru utilizatorul %s.\n"
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s: utilizatorul %s există\n"
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
@@ -1771,7 +1822,7 @@ msgstr ""
 "%s: grupul %s există - dacă vreţi să adăugaţi un utilizator la acest grup, "
 "folosiţi -g.\n"
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: avertisment: CREATE_HOME nu este suportat, vă rog folosiţi -m.\n"
@@ -1821,12 +1872,12 @@ msgstr "%s: %s nu aparţine de %s, nu se şterge\n"
 msgid "%s: warning: can't remove "
 msgstr "%s: avertisment: nu pot şterge "
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s: utilizatorul %s nu există\n"
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: utilizatorul %s este un utilizator NIS\n"
@@ -1843,101 +1894,107 @@ msgstr ""
 msgid "%s: error removing directory %s\n"
 msgstr "%s: eroare la ştergerea directorului %s\n"
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr "Utilizare: %s\t[-u id_utilizator [-o]] [-g grup] [-G grup,...] \n"
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr "\t\t[-d acasă [-m]] [-s consolă] [-c comentariu] [-l nume_nou]\n"
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr "[-f inactivă] [-e expiră ] "
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr "[-p passwd] [-L|-U] nume\n"
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s: nu mai este memorie pentru update_group\n"
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s: nu mai este memorie pentru update_gshadow\n"
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: nu s-au dat semnalizatoare\n"
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: parole criptate necesare pentru -e şi -f\n"
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr "%s: semnalizatorul -a este permis DOAR împreună cu -G\n"
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr "%s: id utilizator %lu nu este unic\n"
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s: eroare la schimbarea intrării contului utilizator\n"
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s: eroare la ştergerea intrării contului utilizator\n"
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr "%s: eroare la ştergerea intrării parolei criptate\n"
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: directorul %s există\n"
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s: nu pot crea %s\n"
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s: nu pot schimba proprietarul %s\n"
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
+"%s: avertisment: eşuare în a şterge complet vechiul director personal %s"
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s: nu pot redenumi directorul %s în %s\n"
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: avertisment: %s nu este deţinut de către %s\n"
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr "eşuare în schimbarea proprietarului căsuţei poştale"
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr "eşuare în redenumirea căsuţei poştale"
 
@@ -1973,12 +2030,3 @@ msgstr ""
 "Utilizare:\n"
 "`vipw' editează /etc/passwd        `vipw -s' editează /etc/shadow\n"
 "`vigr' editează /etc/group         `vigr -s' editează /etc/gshadow\n"
-
-#~ msgid "unknown uid: %u\n"
-#~ msgstr "id utilizator necunoscut: %u\n"
-
-#~ msgid "%s: uid %u is not unique\n"
-#~ msgstr "%s; id utilizator %u nu este unic\n"
-
-#~ msgid "%s: can't get unique uid\n"
-#~ msgstr "%s: nu pot aloca un id utilizator unic\n"
diff --git a/po/ru.gmo b/po/ru.gmo
index c5746fbc..62e4f176 100644
Binary files a/po/ru.gmo and b/po/ru.gmo differ
diff --git a/po/ru.po b/po/ru.po
index cf9b920d..36003f04 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,3 @@
-# translation of shadow_ru.po to Russian
-# translation of ru.po to Russian
-# translation of po_ru.po to Russian
 # Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 # Nikolai Prokoschenko <nikolai@prokoschenko.de>, 2004.
 # Eugene Konev <ejka@imfi.kspu.ru>, 2004.
@@ -8,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: shadow 4.0.10\n"
+"Project-Id-Version: shadow 4.0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
-"PO-Revision-Date: 2005-06-21 21:26+0400\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
+"PO-Revision-Date: 2005-07-13 20:38+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@id.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -151,12 +148,12 @@ msgstr ""
 msgid "Cannot execute %s"
 msgstr "Не удалось выполнить %s"
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "Неверный корневой каталог \"%s\"\n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "Не удалось изменить корневой каталог на \"%s\"\n"
@@ -177,16 +174,16 @@ msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr ""
 "Ошибка конфигурации: неизвестный элемент '%s' (сообщите администратору)\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "Пароль: "
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "Пароль пользователя %s: "
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -224,149 +221,149 @@ msgstr ""
 "  -W, --warndays WARN_DAYS\tустановить количество дней с выдачей\n"
 "\t\t\t\tпредупреждения в WARN_DAYS\n"
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr ""
 "Введите новое значение или нажмите ВВОД для выбора значения по умолчанию\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "Минимальный срок действия пароля (дней)"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "Максимальный срок действия пароля (дней)"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "Последний раз пароль был изменён (ГГГГ-ММ-ДД)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "Предупреждать об истечении срока действия пароля за (дней)"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "Деактивировать учётную запись через (дней)"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Дата истечения срока действия учётной записи (ГГГГ-ММ-ДД)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Последний раз пароль был изменён\t\t\t\t\t: "
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, c-format
 msgid "never\n"
 msgstr "никогда\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Срок действия пароля истекает\t\t\t\t\t: "
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Пароль будет деактивирован через (дней)\t\t\t\t\t: "
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Срок действия учётной записи истекает\t\t\t\t\t\t: "
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr "Минимальное количество дней между сменой пароля\t\t: %ld\n"
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr "Максимальное количество дней между сменой пароля\t\t: %ld\n"
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr ""
 "Количество дней с предупреждением перед деактивированием пароля\t: %ld\n"
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s: не используйте \"l\" совместно с другими ключами\n"
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: Доступ запрещён.\n"
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: проверка подлинности PAM завершилась неудачно\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: не удалось открыть файл паролей\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s: неизвестный пользователь %s\n"
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
-msgstr "%s: не удалось заблокировать теневой файл паролей"
+msgid "%s: can't lock shadow password file\n"
+msgstr "%s: не удалось заблокировать теневой файл паролей\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
-msgstr "%s: не удалось открыть теневой файл паролей"
+msgid "%s: can't open shadow password file\n"
+msgstr "%s: не удалось открыть теневой файл паролей\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "Изменение информации о сроках действия для %s\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: ошибка при изменении полей\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: не удалось обновить файл паролей\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: не удалось обновить теневой файл паролей\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s: не удалось перезаписать теневой файл паролей\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: не удалось перезаписать файл паролей\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr "%s: проверка подлинности (chauthtok) PAM завершилась неудачно\n"
@@ -477,7 +474,7 @@ msgstr "Не удалось заблокировать файл паролей,
 msgid "Cannot open the password file.\n"
 msgstr "Не удалось открыть файл паролей.\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: %s не найден в /etc/passwd\n"
@@ -701,7 +698,7 @@ msgstr "%s: для -A требуется поддержка теневого ф
 msgid "Who are you?\n"
 msgstr "Вы кто?\n"
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "неизвестная группа: %s\n"
@@ -794,12 +791,12 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr "Использование: groupadd [-g gid [-o]] группа\n"
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s: не удалось добавить новую группу\n"
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr "%s: имя %s уже существует\n"
@@ -819,24 +816,24 @@ msgstr "%s: не удалось найти уникальный GID\n"
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s: %s не может быть именем группы\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr "%s: неверная группа %s\n"
 
-#: src/groupadd.c:325 src/useradd.c:1058
+#: src/groupadd.c:332 src/useradd.c:1094
 #, c-format
-msgid "%s: -O requires NAME=VALUE\n"
-msgstr "%s: для -O необходимо ИМЯ=ЗНАЧЕНИЕ\n"
+msgid "%s: -K requires KEY=VALUE\n"
+msgstr "%s: для -К необходимо ИМЯ=ЗНАЧЕНИЕ\n"
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s: не удалось переписать файл групп\n"
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s: не удалось переписать теневой файл групп\n"
@@ -896,7 +893,7 @@ msgstr "%s: группа %s не существует\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s: группа %s является группой NIS\n"
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s -- сервер NIS\n"
@@ -1158,7 +1155,7 @@ msgstr ""
 "\n"
 "[Отключение не выполнено -- вход в систему для суперпользователя разрешён.]\n"
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
@@ -1167,17 +1164,17 @@ msgstr ""
 "\n"
 "Время на выполнение входа в систему истекло после %d секунд.\n"
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr " на `%.100s' с `%.200s'"
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr " на `%.100s'"
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
@@ -1186,25 +1183,25 @@ msgstr ""
 "\n"
 "Имя пользователя %s: "
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr "Неверное имя пользователя"
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Внимание: вход в систему снова возможен.\n"
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr "Последний вход в систему: %s на %s"
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr "Последний вход в систему: %.19s на %s"
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr " с %.*s"
@@ -1219,21 +1216,21 @@ msgstr "Использование: newgrp [-] [группа]\n"
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Использование: sg группа [[-c] команда]\n"
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "неизвестный GID: %u\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr "неизвестный GID: %lu\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr "Извините.\n"
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr "слишком много групп\n"
@@ -1383,7 +1380,7 @@ msgstr "%s: нехватка памяти\n"
 msgid "%s: Cannot execute %s"
 msgstr "%s: Не удалось выполнить %s"
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: хранилище %s не поддерживается\n"
@@ -1501,35 +1498,35 @@ msgstr "%s: не удалось обновить запись для польз
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: не удалось удалить теневой файл паролей\n"
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr "Извините."
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s: должен выполняться из терминала\n"
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr "%s: pam_start: ошибка %d\n"
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr "Неизвестный id: %s\n"
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "У вас нет права переключать учётную запись %s\n"
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr "(Введите ваш собственный пароль.)"
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -1538,7 +1535,7 @@ msgstr ""
 "%s: %s\n"
 "(Игнорировано)\n"
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr "Отсутствует командная оболочка\n"
@@ -1563,12 +1560,12 @@ msgstr "Введите ваш СОБСТВЕННЫЙ пароль.\n"
 msgid "No password file\n"
 msgstr "Отсутствует файл паролей\n"
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr "Отсутствует запись для суперпользователя в файле паролей\n"
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
@@ -1579,219 +1576,250 @@ msgstr ""
 "(или введите пароль суперпользователя для выполнения системного "
 "обслуживания):"
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr "Вход в режим системного обслуживания\n"
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s: неверный числовой параметр `%s'\n"
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s: неизвестный GID %s\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s: неизвестная группа %s\n"
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: не удалось создать новый файл значений по умолчанию\n"
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr "%s: не удалось открыть новый файл значений по умолчанию\n"
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr "%s: переименовать: %s"
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s: группа `%s' является группой NIS.\n"
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: указано слишком много групп (максимум %d).\n"
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
 msgstr ""
-"Использование: useradd [-u uid [-o]] [-g основная группа] [-G группа,...] \n"
+"Использование: useradd [параметры] LOGIN\n"
+"\n"
+"Параметры:\n"
+"  -b, --base-dir BASE_DIR\tбазовый каталог для домашнего каталога\n"
+"\t\t\t\tновой учётной записи\n"
+"  -c, --comment COMMENT\t\tзаполнить поле GECOS новой учётной записи\n"
+"  -d, --home-dir HOME_DIR\tдомашний каталог новой учётной записи\n"
+"  -D, --defaults\t\tпоказать или сохранить изменнённые настройки useradd\n"
+"\t\t\t\tпо умолчанию useradd\n"
+"  -e, --expiredate EXPIRE_DATE\tустановить дату окончания действия\n"
+"\t\t\t\tучётной записи до EXPIRE_DATE\n"
+"  -f, --inactive INACTIVE\tустановить пароль для устаревших учётных записей\n"
+"\t\t\t\tв INACTIVE\n"
+"  -g, --gid GROUP\t\tпринудительно назначить группу GROUP\n"
+"\t\t\t\tдля новой учётной записи\n"
+"  -G, --groups GROUPS\t\tзадать список групп для новой\n"
+"\t\t\t\tучётной записи\n"
+"  -h, --help\t\t\tпоказать данное сообщение и закончить работу\n"
+"  -k, --skel SKEL_DIR \t\tуказать альтернативный каталог с шаблонами\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"
+"  -s, --shell SHELL\t\tзадать командную оболочку для новой\n"
+"\t\t\t\tучётной записи\n"
+"  -u, --uid UID\t\t\tпринудительно назначить UID для новой\n"
+"\t\t\t\tучётной записи\n"
 
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
-msgstr ""
-"               [-d домашний каталог] [-s командная оболочка] [-c "
-"комментарий] [-m [-k шаблон]]\n"
-
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr "               [-f деактивация] [-e срок действия учётной записи ]\n"
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr "               [-p пароль] имя пользователя\n"
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr ""
-"       useradd -D [-g основная группа] [-b базовый каталог] [-s командная "
-"оболочка]\n"
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s: не удалось заблокировать файл групп\n"
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s: не удалось открыть файл групп\n"
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s: не удалось заблокировать теневой файл групп\n"
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s: не удалось открыть теневой файл групп\n"
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: UID %u уже существует\n"
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, c-format
 msgid "%s: can't get unique UID\n"
 msgstr "%s: не удалось найти уникальный UID\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr "%s: неверный базовый каталог `%s'\n"
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr "%s: неверный комментарий `%s'\n"
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s: неверный домашний каталог `%s'\n"
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s: неверная дата `%s'\n"
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr "%s: для -e необходима поддержка теневых паролей\n"
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr "%s: для -f необходима поддержка теневых паролей\n"
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s: неверное поле `%s'\n"
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr "%s: неверная командная оболочка `%s'\n"
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr "%s: неверное имя пользователя '%s'\n"
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s: не удалось перезаписать файл паролей\n"
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s: не удалось перезаписать теневой файл паролей\n"
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s: не удалось заблокировать файл паролей\n"
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s: не удалось открыть файл паролей\n"
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s: не удалось заблокировать теневой файл паролей\n"
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s: не удалось открыть теневой файл паролей\n"
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr "%s: не удалось добавить запись в файл паролей\n"
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr "%s: не удалось добавить запись в теневой файл паролей\n"
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: не удалось создать каталог %s\n"
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr ""
 "Группа \"mail\" не существует, создаётся хранилище почты с правами 0600.\n"
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr "Не удалось создать хранилище почты для пользователя %s.\n"
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s: пользователь %s существует\n"
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
@@ -1799,7 +1827,7 @@ msgstr ""
 "%s: группа %s существует -- если вы хотите добавите в неё этого "
 "пользователя, используйте -g.\n"
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: внимание: CREATE_HOME не поддерживается, используйте -m.\n"
@@ -1849,12 +1877,12 @@ msgstr "%s: %s не принадлежит %s, удаление не выпол
 msgid "%s: warning: can't remove "
 msgstr "%s: внимание: не удалось удалить "
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s: пользователь %s не существует\n"
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: пользователь %s является пользователем NIS\n"
@@ -1870,104 +1898,109 @@ msgstr ""
 msgid "%s: error removing directory %s\n"
 msgstr "%s: не удалось удалить каталог %s\n"
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr ""
 "Использование: %s\t[-u uid [-o]] [-g основная группа] [-G группа,...] \n"
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr ""
 "\t\t[-d домашний каталог [-m]] [-s командная оболочка] [-c комментарий] [-l "
 "новое имя пользователя]\n"
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr "[-f деактивация] [-e срок действия учётной записи ] "
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr "[-p пароль] [-L|-U] имя пользователя\n"
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s: недостаточно памяти в update_group\n"
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s: недостаточно памяти в update_gshadow\n"
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: на заданы ключи\n"
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: для -e и -f требуется поддержка теневых файлов паролей\n"
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr "%s: флаг -a используется ТОЛЬКО вместе с флагом -G\n"
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr "%s: uid %lu уже существует\n"
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s: не удалось изменить запись в файле паролей\n"
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s: не удалось удалить запись из файла паролей\n"
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr "%s: не удалось удалить запись из теневого файла паролей\n"
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: каталог %s существует\n"
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s: не удалось создать %s\n"
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s: не удалось сменить владельца %s\n"
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr "%s: внимание: не удалось полностью удалить старый домашний каталог %s"
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s: не удалось переименовать каталог %s в %s\n"
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: внимание: %s не принадлежит %s\n"
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr "не удалось сменить владельца почтового ящика"
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr "не удалось переименовать почтовый ящик"
 
diff --git a/po/shadow.pot b/po/shadow.pot
index f8ab8811..47e4a5d4 100644
--- a/po/shadow.pot
+++ b/po/shadow.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -141,12 +141,12 @@ msgstr ""
 msgid "Cannot execute %s"
 msgstr ""
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr ""
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr ""
@@ -166,16 +166,16 @@ msgstr ""
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr ""
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr ""
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr ""
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -194,147 +194,147 @@ msgid ""
 "  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
 msgstr ""
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr ""
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr ""
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr ""
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr ""
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr ""
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr ""
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr ""
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr ""
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, c-format
 msgid "never\n"
 msgstr ""
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr ""
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr ""
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr ""
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr ""
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, c-format
 msgid "%s: Permission denied.\n"
 msgstr ""
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr ""
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr ""
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr ""
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
+msgid "%s: can't lock shadow password file\n"
 msgstr ""
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
+msgid "%s: can't open shadow password file\n"
 msgstr ""
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr ""
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr ""
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr ""
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr ""
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr ""
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr ""
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr ""
@@ -441,7 +441,7 @@ msgstr ""
 msgid "Cannot open the password file.\n"
 msgstr ""
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr ""
@@ -640,7 +640,7 @@ msgstr ""
 msgid "Who are you?\n"
 msgstr ""
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr ""
@@ -733,12 +733,12 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr ""
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr ""
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr ""
@@ -758,24 +758,24 @@ msgstr ""
 msgid "%s: %s is not a valid group name\n"
 msgstr ""
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr ""
 
-#: src/groupadd.c:325 src/useradd.c:1058
+#: src/groupadd.c:332 src/useradd.c:1094
 #, c-format
-msgid "%s: -O requires NAME=VALUE\n"
+msgid "%s: -K requires KEY=VALUE\n"
 msgstr ""
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr ""
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr ""
@@ -835,7 +835,7 @@ msgstr ""
 msgid "%s: group %s is a NIS group\n"
 msgstr ""
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr ""
@@ -1087,49 +1087,49 @@ msgid ""
 "[Disconnect bypassed -- root login allowed.]\n"
 msgstr ""
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
 "Login timed out after %d seconds.\n"
 msgstr ""
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr ""
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr ""
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
 "%s login: "
 msgstr ""
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr ""
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr ""
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr ""
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr ""
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr ""
@@ -1144,21 +1144,21 @@ msgstr ""
 msgid "Usage: sg group [[-c] command]\n"
 msgstr ""
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr ""
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr ""
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr ""
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr ""
@@ -1300,7 +1300,7 @@ msgstr ""
 msgid "%s: Cannot execute %s"
 msgstr ""
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr ""
@@ -1417,42 +1417,42 @@ msgstr ""
 msgid "%s: can't delete shadow password file\n"
 msgstr ""
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr ""
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr ""
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr ""
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr ""
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr ""
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr ""
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
 "(Ignored)\n"
 msgstr ""
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr ""
@@ -1477,231 +1477,237 @@ msgstr ""
 msgid "No password file\n"
 msgstr ""
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr ""
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
 "(or give root password for system maintenance):"
 msgstr ""
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr ""
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr ""
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, c-format
 msgid "%s: unknown GID %s\n"
 msgstr ""
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr ""
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr ""
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr ""
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr ""
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr ""
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr ""
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
 msgstr ""
 
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
-msgstr ""
-
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr ""
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr ""
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr ""
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr ""
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr ""
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr ""
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr ""
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr ""
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, c-format
 msgid "%s: can't get unique UID\n"
 msgstr ""
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr ""
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr ""
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr ""
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr ""
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr ""
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr ""
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr ""
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr ""
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr ""
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr ""
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr ""
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr ""
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr ""
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr ""
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr ""
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr ""
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr ""
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr ""
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr ""
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr ""
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr ""
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
 msgstr ""
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr ""
@@ -1751,12 +1757,12 @@ msgstr ""
 msgid "%s: warning: can't remove "
 msgstr ""
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr ""
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr ""
@@ -1771,101 +1777,106 @@ msgstr ""
 msgid "%s: error removing directory %s\n"
 msgstr ""
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr ""
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr ""
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr ""
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr ""
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr ""
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr ""
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr ""
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr ""
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr ""
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr ""
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr ""
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr ""
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr ""
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr ""
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr ""
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr ""
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr ""
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr ""
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr ""
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr ""
 
diff --git a/po/sk.gmo b/po/sk.gmo
index 51812840..815a4735 100644
Binary files a/po/sk.gmo and b/po/sk.gmo differ
diff --git a/po/sk.po b/po/sk.po
index ecd8ee91..aff3ac75 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -2,11 +2,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: shadow 4.0.10\n"
+"Project-Id-Version: shadow 4.0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
-"PO-Revision-Date: 2005-06-25 18:08+0200\n"
-"Last-Translator: Peter KLFMANiK Mann <Peter.Mann@tuke.sk>\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
+"PO-Revision-Date: 2005-07-17 16:34+0200\n"
+"Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -144,12 +144,12 @@ msgstr "Žiadny adresár, nastavujem HOME na /"
 msgid "Cannot execute %s"
 msgstr "%s sa nedá spustiť."
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "Chybný koreňový adresár \"%s\"\n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "Koreňový adresár sa nedá zmeniť na \"%s\".\n"
@@ -170,16 +170,16 @@ msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr ""
 "konfiguračná chyba - neznámy predmet '%s' (informujte správcu systému)\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "Heslo: "
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "Heslo používateľa %s:"
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -213,149 +213,149 @@ msgstr ""
 "\t\t\t\thesla na MAX_DNÍ\n"
 "  -W, --warndays UPOZ_DNÍ\tnastaví upozornenie o platnosti účtu na UPOZ_DNÍ\n"
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr ""
 "Zadajte novú hodnotu alebo stlačte ENTER pre použitie predvolenej hodnoty\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "Minimálna doba platnosti hesla"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "Maximálna doba platnosti hesla"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "Posledná zmena hesla (YYYY-MM-DD)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "Varovanie o uplynutí doby platnosti hesla"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "Nečinné heslo"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Uplynutie platnosti účtu (YYYY-MM-DD)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Posledná zmena hesla\t\t\t\t\t: "
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, c-format
 msgid "never\n"
 msgstr "nikdy\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Platnosť hesla uplynie\t\t\t\t\t: "
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Nečinné heslo\t\t\t\t\t: "
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Platnosť účtu uplynie\t\t\t\t\t\t: "
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr "Minimálny počet dní medzi zmenami hesla\t\t: %ld\n"
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr "Maximálny počet dní medzi zmenami hesla\t\t: %ld\n"
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr "Počet dní upozornenia pred vypršaním platnosti hesla\t: %ld\n"
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s: nepoužívajte \"l\" s ostatnými príznakmi\n"
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: Odmietnutý prístup.\n"
 
 #  c-format
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM autentifikácia zlyhala\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: súbor s heslami sa nedá otvoriť\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s: používateľ %s je neznámy\n"
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
-msgstr "%s: súbor s tieňovými heslami sa nedá zamknúť"
+msgid "%s: can't lock shadow password file\n"
+msgstr "%s: súbor s tieňovými heslami sa nedá zamknúť\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
-msgstr "%s: súbor s tieňovými heslami sa nedá otvoriť"
+msgid "%s: can't open shadow password file\n"
+msgstr "%s: súbor s tieňovými heslami sa nedá otvoriť\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "Mením časové informácie pre používateľa %s\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: chyba pri zmene položiek\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: súbor s heslami sa nedá aktualizovaťt\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: súbor s tieňovými heslami sa nedá aktualizovať\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s: súbor s tieňovými heslami sa nedá prepísať\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: súbor s heslami sa nedá prepísať\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr "%s: PAM metóda chauthok zlyhala\n"
@@ -468,7 +468,7 @@ msgstr "Nedá sa zamknúť súbor s heslami; skúste to neskôr.\n"
 msgid "Cannot open the password file.\n"
 msgstr "Súbor s heslami sa nedá otvoriť.\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: %s sa nenachádza v /etc/passwd\n"
@@ -687,7 +687,7 @@ msgstr "%s: prepínač -A funguje iba s tieňovými heslami skupín\n"
 msgid "Who are you?\n"
 msgstr "Kto ste?\n"
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "skupina %s je neznáma\n"
@@ -780,12 +780,12 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr "Použitie: groupadd [-g gid [-o]] [-f] skupina\n"
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s: chyba pri pridávaní položky do súboru so skupinami\n"
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr "%s: meno %s nie je jedinečné\n"
@@ -805,24 +805,24 @@ msgstr "%s: nedá sa vytvoriť jedinečný GID\n"
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s: %s nie je platným názvom skupiny\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr "%s: chybná skupina %s\n"
 
-#: src/groupadd.c:325 src/useradd.c:1058
+#: src/groupadd.c:332 src/useradd.c:1094
 #, c-format
-msgid "%s: -O requires NAME=VALUE\n"
-msgstr "%s: prepínač -O vyžaduje argument typu MENO=HODNOTA\n"
+msgid "%s: -K requires KEY=VALUE\n"
+msgstr "%s: prepínač -K vyžaduje argument typu MENO=HODNOTA\n"
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s: súbor so skupinami sa nedá prepísať\n"
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s: súbor s tieňovými skupinami sa nedá prepísať\n"
@@ -882,7 +882,7 @@ msgstr "%s: skupina %s neexistuje\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s: skupina %s je NIS skupinou\n"
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s je hlavným NIS serverom\n"
@@ -1146,7 +1146,7 @@ msgstr ""
 "\n"
 "[Odpojenie vynechané -- používateľ root sa môže prihlásiť.]\n"
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
@@ -1155,17 +1155,17 @@ msgstr ""
 "\n"
 "Uplynul časový limit (%d sekúnd) na prihlásenie.\n"
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr " na `%.100s' z `%.200s'"
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr " na `%.100s'"
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
@@ -1174,25 +1174,25 @@ msgstr ""
 "\n"
 "Prihlasovacie meno na %s: "
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr "Chybné prihlásenie"
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Varovanie: po dočasnom zákaze je prihlasovánie opäť povolené.\n"
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr "Posledné prihlásenie: %s na %s"
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr "Posledné prihlásenie: %.19s na %s"
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr " z %.*s"
@@ -1207,21 +1207,21 @@ msgstr "Použitie: newgrp [-] [skupina]\n"
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Použitie: sg skupina [[-c] príkaz]\n"
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, c-format
 msgid "unknown UID: %u\n"
 msgstr "neznámy UID: %u\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr "neznámy GID %lu\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr "Ľutujem.\n"
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr "príliš mnoho skupín\n"
@@ -1367,7 +1367,7 @@ msgstr "%s: nedostatok pamäti\n"
 msgid "%s: Cannot execute %s"
 msgstr "%s: %s sa nedá spustiť"
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: skladisko %s nie je podporované\n"
@@ -1485,35 +1485,35 @@ msgstr "%s: položka pre používateľa %s sa nedá aktualizovať\n"
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: nemôžete zmazať súbor s tieňovými heslami\n"
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr "Ľutujem."
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s: musí byť spustené z terminálu\n"
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr "%s: pam_start: chyba %d\n"
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr "Id %s je neznáme.\n"
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Nie ste oprávnení používať su %s\n"
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr "(Zadajte vaše heslo.)"
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -1522,7 +1522,7 @@ msgstr ""
 "%s: %s\n"
 "(Ignorujem)\n"
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr "Žiadny shell\n"
@@ -1547,12 +1547,12 @@ msgstr "Pre overenie zadajte VAŠE vlastné heslo.\n"
 msgid "No password file\n"
 msgstr "Súbor s heslami neexistuje\n"
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr "V databáze nie je položka pre používateľa 'root'\n"
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
@@ -1562,215 +1562,246 @@ msgstr ""
 "Stlačte control-d pre normálne spustenie systému,\n"
 "(alebo zadajte heslo používateľa root pre údržbu systému):"
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr "Vstupujem do režimu údržby systému\n"
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s: chybný číselný argument `%s'\n"
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s: neznámy GID %s\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s: neznáma skupina %s\n"
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: nedá sa vytvoriť nový súbor s predvolenými hodnotami\n"
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr "%s: nedá sa otvoriť nový súbor s predvolenými hodnotami\n"
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr "%s: premenovať: %s"
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s: skupina `%s' je NIS skupinou.\n"
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: bolo zadaných príliš veľa skupín (max %d).\n"
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
-msgstr "Použitie: useradd [-u uid [-o]] [-g skupina [-G skupina,...] \n"
-
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
 msgstr ""
-"                  [-d domáci_adresár] [-s shell] [-c komentár] [-m [-k "
-"šablóna]]\n"
+"Použitie: useradd [voľby] účet\n"
+"\n"
+"Voľby:\n"
+"  -b, --base-dir ZÁKL_ADR\tzákladný adresár domáceho adresára nového\n"
+"\t\t\t\tpoužívateľského účtu\n"
+"  -c, --comment KOMENTÁR\tnastaví pole GECOS nového účtu\n"
+"  -d, --home-dir DOM_ADR\tdomáci adresár nového účtu\n"
+"  -D, --defaults\t\tvypíše alebo nastaví predvolené nastavenia\n"
+"\t\t\t\tprogramu useradd\n"
+"  -e, --expiredate EXP_DATUM\tnastaví čas vypršania platnosti účtu na "
+"EXP_DATUM\n"
+"  -f, --inactive NEAKTIV\tzablokuje účet po NEAKTIV dňoch od času vypršania "
+"platnosti\n"
+"  -g, --gid SKUPINA\t\tvynúti použitie tejto skupiny pre nový účet\n"
+"  -G, --groups SKUPINY\t\tzoznam dodatočných skupín, do ktorých\n"
+"\t\t\t\tmá patriť nový účet\n"
+"  -h, --help\t\t\tzobrazí túto nápovedu a skončí\n"
+"  -k, --skel VZOR_ADR \t\tzadá alternatívny vzorový adresár\n"
+"  -K, --key KĽÚČ=HODNOTA\tnahradí predvolené nastavenia /etc/login.defs\n"
+"  -m, --create-home\t\tvytvorí domáci adresár pre nový\n"
+"\t\t\t\tpoužívateľský účet\n"
+"  -o, --non-unique\t\tpovolí vytvorenie používateľa s duplicitným\n"
+"\t\t\t\t(nejedinečným) UID\n"
+"  -p, --password HESLO\t\tpre nový účet použije zadané zašifrované\n"
+"\t\t\t\theslo\n"
+"  -s, --shell SHELL\t\tprihlasovací shell nového účtu\n"
+"  -u, --uid UID\t\t\tvynúti použitie tohto UID pre nový účet\n"
 
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr "                  [-f nečinnosť] [-e uplynutie_lehoty]\n"
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr "                  [-p heslo] meno\n"
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr "          useradd -D [-g skupina] [-b základný_adresár] [-s shell]\n"
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s: chyba pri zamykaní súboru so skupinami\n"
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s: chyba pri otváraní súboru so skupinami\n"
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s: chyba pri zamykaní súboru s tieňovými heslami\n"
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s: chyba pri otváraní súboru s tieňovými heslami\n"
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: UID %u nie je jedinečný\n"
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, c-format
 msgid "%s: can't get unique UID\n"
 msgstr "%s: nedá sa vytvoriť jedinečný UID\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr "%s: chybný základný adresár `%s'\n"
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr "%s: chybný komentár `%s'\n"
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s: chybný domáci adresár `%s'\n"
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s: chybný dátum `%s'\n"
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr "%s: prepínač -e vyžaduje tieňové heslá\n"
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr "%s: prepínač -f vyžaduje tieňové heslá\n"
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s: chybná položka `%s'\n"
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr "%s: chybný shell `%s'\n"
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr "%s: chybné používateľské meno `%s'\n"
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s: súbor s heslami sa nedá prepísať\n"
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s: súbor s tieňovými heslami sa nedá prepísať\n"
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s: súbor s heslami sa nedá zamknúť\n"
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s: súbor s heslami sa nedá otvoriť\n"
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s: súbor s tieňovými heslami sa nedá zamknúť\n"
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s: súbor s tieňovými heslami sa nedá otvoriť\n"
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr "%s: chyba pri vytváraní novej položky v súbore s heslami\n"
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr "%s: chyba pri vytváraní novej položky v súbore s tieňovými heslami\n"
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: nedá sa vytvoriť adresár %s\n"
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr "Skupina \"mail\" nejestvuje, vytvára sa mail spool s právami 0600.\n"
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr "Nedá sa vytvoriť mail spool pre používateľa %s.\n"
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s: používateľ %s už existuje\n"
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
@@ -1778,7 +1809,7 @@ msgstr ""
 "%s: skupina %s už existuje - ak chcete pridať tohto používateľa do tejto "
 "skupiny, použijte -g.\n"
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: varovanie: CREATE_HOME nie je podporované, použijte prepínač -m.\n"
@@ -1828,12 +1859,12 @@ msgstr "%s: vlastníkom %s nie je %s, nemažem ho\n"
 msgid "%s: warning: can't remove "
 msgstr "%s: varovanie: nemôžem zmazať "
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s: používateľ %s neexistuje\n"
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: používateľ %s je NIS používateľom\n"
@@ -1848,102 +1879,107 @@ msgstr "%s: adresár %s nebudem mazať (je to domáci adresár používateľa %s
 msgid "%s: error removing directory %s\n"
 msgstr "%s: chyba pri mazaní adresára %s\n"
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr "Použitie: %s\t[-u uid [-o]] [-g skupina [-G skupina,...] \n"
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr "\t\t[-d domáci_adresár [-m]] [-s shell] [-c komentár] [-l nové_meno]\n"
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr "[-f nečinnosť] [-e uplynutie_lehoty] "
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr "[-p heslo] [-L|-U] meno\n"
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s nedostatok pamäti v update_group\n"
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s: nedostatok pamäti v update_gshadow\n"
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: žiadne prepínače\n"
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: prepínače -e a -f vyžadujú tieňové heslá\n"
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr "%s: prepínač -a je dovolený IBA s prepínačom -G\n"
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr "%s uid %lu nie je jedinečný\n"
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s: chyba pri zmene položky v súbore s heslami\n"
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s: chyba pri odstraňovaní položky zo súboru s heslami\n"
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr "%s: chyba pri odstraňovaní položky zo súboru s tieňovými heslami\n"
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: adresár %s už existuje\n"
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s: %s sa nedá vytvoriť\n"
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s: volanie chown pre %s zlyhalo\n"
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
 "%s: varovanie: chyba pri úplnom odstraňovaní starého domáceho adresára %s"
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s: adresár %s sa nedá premenovať na %s\n"
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: varovanie: vlastníkom %s nie je %s\n"
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr "chyba pri zmene vlastníka schránky"
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr "chyba pri premenovaní schránky"
 
@@ -1979,3 +2015,27 @@ msgstr ""
 "Použitie:\n"
 "`vipw' edituje /etc/passwd      `vipw -s' edituje /etc/shadow\n"
 "`vigr' edituje /etc/group       `vigr -s' edituje /etc/gshadow\n"
+
+#, fuzzy
+#~ msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
+#~ msgstr "Použitie: useradd [-u uid [-o]] [-g skupina [-G skupina,...] \n"
+
+#~ msgid ""
+#~ "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+#~ msgstr ""
+#~ "                  [-d domáci_adresár] [-s shell] [-c komentár] [-m [-k "
+#~ "šablóna]]\n"
+
+#~ msgid "               [-f inactive] [-e expire]\n"
+#~ msgstr "                  [-f nečinnosť] [-e uplynutie_lehoty]\n"
+
+#, fuzzy
+#~ msgid "               [-p passwd] [-K KEY=VALUE] name\n"
+#~ msgstr "                  [-p heslo] meno\n"
+
+#~ msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
+#~ msgstr ""
+#~ "          useradd -D [-g skupina] [-b základný_adresár] [-s shell]\n"
+
+#~ msgid "%s: -O requires NAME=VALUE\n"
+#~ msgstr "%s: prepínač -O vyžaduje argument typu MENO=HODNOTA\n"
diff --git a/po/sq.gmo b/po/sq.gmo
index 845c012f..b2898c66 100644
Binary files a/po/sq.gmo and b/po/sq.gmo differ
diff --git a/po/sq.po b/po/sq.po
index c7faafbd..6dc0a173 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
 "PO-Revision-Date: 2004-11-20 03:28+0100\n"
 "Last-Translator: Elian Myftiu <pinguini AT fastwebnet DOT it>\n"
 "Language-Team: Albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
@@ -141,12 +141,12 @@ msgstr ""
 msgid "Cannot execute %s"
 msgstr ""
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr ""
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr ""
@@ -166,16 +166,16 @@ msgstr ""
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr ""
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr ""
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr ""
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -194,147 +194,147 @@ msgid ""
 "  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
 msgstr ""
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr ""
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr ""
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr ""
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr ""
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr ""
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr ""
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr ""
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr ""
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, c-format
 msgid "never\n"
 msgstr ""
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr ""
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, fuzzy, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Fjalëkalimi yt nuk është aktiv."
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr ""
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr ""
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, c-format
 msgid "%s: Permission denied.\n"
 msgstr ""
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr ""
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr ""
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr ""
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
+msgid "%s: can't lock shadow password file\n"
 msgstr ""
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
+msgid "%s: can't open shadow password file\n"
 msgstr ""
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr ""
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr ""
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr ""
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr ""
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr ""
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr ""
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr ""
@@ -441,7 +441,7 @@ msgstr ""
 msgid "Cannot open the password file.\n"
 msgstr ""
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr ""
@@ -640,7 +640,7 @@ msgstr ""
 msgid "Who are you?\n"
 msgstr ""
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr ""
@@ -733,12 +733,12 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr ""
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr ""
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr ""
@@ -758,24 +758,24 @@ msgstr ""
 msgid "%s: %s is not a valid group name\n"
 msgstr ""
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr ""
 
-#: src/groupadd.c:325 src/useradd.c:1058
+#: src/groupadd.c:332 src/useradd.c:1094
 #, c-format
-msgid "%s: -O requires NAME=VALUE\n"
+msgid "%s: -K requires KEY=VALUE\n"
 msgstr ""
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr ""
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr ""
@@ -835,7 +835,7 @@ msgstr ""
 msgid "%s: group %s is a NIS group\n"
 msgstr ""
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr ""
@@ -1087,49 +1087,49 @@ msgid ""
 "[Disconnect bypassed -- root login allowed.]\n"
 msgstr ""
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
 "Login timed out after %d seconds.\n"
 msgstr ""
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr ""
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr ""
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
 "%s login: "
 msgstr ""
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr ""
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr ""
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr ""
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr ""
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr ""
@@ -1144,21 +1144,21 @@ msgstr ""
 msgid "Usage: sg group [[-c] command]\n"
 msgstr ""
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, fuzzy, c-format
 msgid "unknown UID: %u\n"
 msgstr "Kujdes: grup i panjohur %s\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr ""
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr ""
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr ""
@@ -1300,7 +1300,7 @@ msgstr ""
 msgid "%s: Cannot execute %s"
 msgstr ""
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr ""
@@ -1417,42 +1417,42 @@ msgstr ""
 msgid "%s: can't delete shadow password file\n"
 msgstr ""
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr ""
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr ""
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr ""
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr ""
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr ""
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr ""
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
 "(Ignored)\n"
 msgstr ""
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr ""
@@ -1477,231 +1477,237 @@ msgstr ""
 msgid "No password file\n"
 msgstr ""
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr ""
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
 "(or give root password for system maintenance):"
 msgstr ""
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr ""
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr ""
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, fuzzy, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "Kujdes: grup i panjohur %s\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr ""
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr ""
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr ""
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr ""
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr ""
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr ""
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
 msgstr ""
 
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
-msgstr ""
-
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr ""
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr ""
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr ""
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr ""
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr ""
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr ""
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr ""
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr ""
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, c-format
 msgid "%s: can't get unique UID\n"
 msgstr ""
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr ""
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr ""
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr ""
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr ""
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr ""
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr ""
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr ""
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr ""
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr ""
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr ""
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr ""
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr ""
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr ""
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr ""
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr ""
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr ""
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr ""
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr ""
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr ""
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr ""
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr ""
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
 msgstr ""
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr ""
@@ -1751,12 +1757,12 @@ msgstr ""
 msgid "%s: warning: can't remove "
 msgstr ""
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr ""
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr ""
@@ -1771,101 +1777,106 @@ msgstr ""
 msgid "%s: error removing directory %s\n"
 msgstr ""
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr ""
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr ""
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr ""
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr ""
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr ""
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr ""
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr ""
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr ""
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr ""
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr ""
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr ""
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr ""
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr ""
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr ""
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr ""
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr ""
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr ""
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr ""
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr ""
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr ""
 
diff --git a/po/sv.gmo b/po/sv.gmo
index 2edc80c7..5c6c1e88 100644
Binary files a/po/sv.gmo and b/po/sv.gmo differ
diff --git a/po/sv.po b/po/sv.po
index 9e3098b5..4a3376df 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 19990709\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
 "PO-Revision-Date: 2004-12-14 18:21+0100\n"
 "Last-Translator: Per Olofsson <pelle@dsv.su.se>\n"
 "Language-Team: sv <sv@li.org>\n"
@@ -139,12 +139,12 @@ msgstr "Ingen hemkatalog, loggar in med HOME=/"
 msgid "Cannot execute %s"
 msgstr "Kan inte starta %s"
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "Felaktig rotkatalog \"%s\"\n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "Kan inte byta rotkatalog till \"%s\"\n"
@@ -164,16 +164,16 @@ msgstr "Kunde inte allokera utrymme för konfigureringsinformation.\n"
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr "konfigurationsfel - okänt object \"%s\" (meddela systemoperatören)\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "Lösenord: "
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "Lösenord för %s: "
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -192,147 +192,147 @@ msgid ""
 "  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
 msgstr ""
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Skriv in det nya värdet, eller tryck ENTER för standardvärdet\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "Minsta lösenordsålder"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "Högsta lösenordsålder"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "Senaste lösenordsändring (ÅÅÅÅ-MM-DD)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "Lösenords upphörningsvarning"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "Lösenord inaktivt"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Kontot upphör (ÅÅÅÅ-MM-DD)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, fuzzy, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Senaste lösenordsändring (ÅÅÅÅ-MM-DD)"
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, fuzzy, c-format
 msgid "never\n"
 msgstr "Aldrig\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, fuzzy, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Lösenordet upphör:\t"
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, fuzzy, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Lösenord inaktiv:\t"
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, fuzzy, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Lösenordet upphör:\t"
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, fuzzy, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr "Maximala antalet försök överskridna (%d)\n"
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s: inkludera inte \"l\" tillsammands med andra flaggor\n"
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: Tillåtelse nekas.\n"
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM-autentisering misslyckades\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: kan inte öppna lösenordsfilen\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s: okänd användare %s\n"
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
-msgstr "%s: kan inte låsa skugglösenordsfilen"
+msgid "%s: can't lock shadow password file\n"
+msgstr "%s: kan inte låsa skugglösenordsfilen\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
-msgstr "%s: kan inte öppna skugglösenordsfilen"
+msgid "%s: can't open shadow password file\n"
+msgstr "%s: kan inte öppna skugglösenordsfilen\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "Ändrar åldringsinformation för %s\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: fel uppstod under byte av fält\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: kan inte uppdatera lösenordsfilen\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: kan inte uppdatera skugglösenordsfilen\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s: kan inte skriva om skugglösenordsfilen\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: kan inte skriva om lösenordsfilen\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr "%s: PAM-funktionen chauthtok misslyckades\n"
@@ -443,7 +443,7 @@ msgstr "Kan inte låsa lösenordsfilen; försök igen senare.\n"
 msgid "Cannot open the password file.\n"
 msgstr "Kan inte öppna lösenordsfilen.\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: %s hittades inte i /etc/passwd\n"
@@ -649,7 +649,7 @@ msgstr "%s: skuggrupplösenord krävs för -A\n"
 msgid "Who are you?\n"
 msgstr "Vem är du?\n"
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "okänd grupp: %s\n"
@@ -742,12 +742,12 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr "Användning: groupadd [-g gid [-o]] grupp\n"
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s: gick inte att lägga till en ny gruppnotering\n"
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr "%s: namnet %s är inte unikt\n"
@@ -767,24 +767,24 @@ msgstr "%s: kan inte hitta ett unikt gid\n"
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s: %s är inte ett giltigt gruppnamn\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr "%s: ogiltig grupp %s\n"
 
-#: src/groupadd.c:325 src/useradd.c:1058
-#, c-format
-msgid "%s: -O requires NAME=VALUE\n"
+#: src/groupadd.c:332 src/useradd.c:1094
+#, fuzzy, c-format
+msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -O kräver NAME=VÄRDE\n"
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s: kan inte skriva om gruppfilen\n"
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s: kan inte skriva om skuggruppfilen\n"
@@ -844,7 +844,7 @@ msgstr "%s: grupp %s existerar inte\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s: grupp %s är en NIS-grupp\n"
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s är NIS-mästeren\n"
@@ -1107,7 +1107,7 @@ msgstr ""
 "\n"
 "[Nerkoppling kringgicks -- root inloggning tillåten.]\n"
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
@@ -1116,17 +1116,17 @@ msgstr ""
 "\n"
 "Inloggningen avbröts efter %d sekunders inaktivitet.\n"
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr " på \"%.100s\" från \"%.200s\""
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr " på \"%.100s\""
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
@@ -1135,26 +1135,26 @@ msgstr ""
 "\n"
 "%s användare: "
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr "Felaktig inloggning"
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr ""
 "Varning: inloggning på nytt aktiv efter den temporära utelåsningen.\n"
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr "Senaste inloggning: %s på %s"
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr "Senaste inloggning: %.19s på %s"
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr " från %.*s"
@@ -1169,21 +1169,21 @@ msgstr "Användning: newgrp [-] [grupp]\n"
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Användning: sg grupp [[-c] kommando]\n"
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, fuzzy, c-format
 msgid "unknown UID: %u\n"
 msgstr "okänt GID: %lu\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr "okänt GID: %lu\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr "Tyvärr.\n"
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr "för många grupper\n"
@@ -1329,7 +1329,7 @@ msgstr "%s: slut på minne\n"
 msgid "%s: Cannot execute %s"
 msgstr "%s: Kan inte starta %s"
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: förvaringsplatsen %s stöds ej\n"
@@ -1446,35 +1446,35 @@ msgstr "%s: kan inte uppdatera noteringen för användaren %s\n"
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: kan inte ta bort skugglösenordsfilen\n"
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr "Tyvärr."
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s: måste köras från en terminal\n"
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr "%s: pam_start: fel %d\n"
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr "Okänt id: %s\n"
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Du har inte tillåtelse att köra su till %s\n"
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr "(Skriv in ditt eget lösenord.)"
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -1483,7 +1483,7 @@ msgstr ""
 "%s: %s\n"
 "(Ignorerad)\n"
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr "Inget skal\n"
@@ -1508,12 +1508,12 @@ msgstr "Var god skriv in ditt EGET lösenord som äkthetsbevis.\n"
 msgid "No password file\n"
 msgstr "Ingen lösenordsfil\n"
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr "Ingen lösenordsnotering för \"root\"\n"
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
@@ -1523,220 +1523,226 @@ msgstr ""
 "Skriv control-d för att fortsätta med den normala uppstarten,\n"
 "(eller skriv in lösenordet för root för systemunderhåll):"
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr "Går in i systemunderhållsläge\n"
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s: ogiltigt numeriskt argument \"%s\"\n"
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s: okänt GID %s\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s: okänd grupp %s\n"
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: kan inte skapa en ny defaults-fil\n"
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr "%s: kan inte öppna den nya defaults-filen\n"
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr "%s: rename: %s"
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s: grupp \"%s\" är en NIS-grupp.\n"
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: för många grupper speciferade (max %d).\n"
 
-#: src/useradd.c:635
-#, fuzzy, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
-msgstr "Användning: %s [-u uid [-o]] [-g grupp] [-G grupp,...] \n"
+#: src/useradd.c:634
+#, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
+msgstr ""
 
-#: src/useradd.c:638
-#, fuzzy, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
-msgstr "\t\t    [-d hem] [-s skal] [-c kommentar] [-m [-k mall]]\n"
-
-#: src/useradd.c:639 src/useradd.c:643
-#, fuzzy, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr "\t\t[-f inaktiv] [-e utgång]\n"
-
-#: src/useradd.c:640
-#, fuzzy, c-format
-msgid "               [-p passwd] name\n"
-msgstr "[-p passwd] namn\n"
-
-#: src/useradd.c:642
-#, fuzzy, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr "            %s -D [-g grupp] [-b bas] [-s skal]\n"
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s: fel under låsning av gruppfilen\n"
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s: fel under öppning av gruppfilen\n"
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s: fel under låsning av skuggruppfilen\n"
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s: fel under öppning av skuggruppfilen\n"
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, fuzzy, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: gid %u är inte unikt\n"
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, fuzzy, c-format
 msgid "%s: can't get unique UID\n"
 msgstr "%s: kan inte hitta ett unikt gid\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr "%s: felaktig baskatalog \"%s\"\n"
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr "%s: felaktig kommentar \"%s\"\n"
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s: felaktig hemkatalog \"%s\"\n"
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s: felaktigt datum \"%s\"\n"
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr "%s: skugglösenord krävs för -e\n"
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr "%s: skugglösenord krävs för -f\n"
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s: felaktigt fält \"%s\"\n"
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr "%s: felaktigt skal \"%s\"\n"
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr "%s: felaktigt användar namn '%s'\n"
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s: kan inte skriva om lösenordsfilen\n"
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s: kan inte skriva om skugglösenordsfilen\n"
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s: kan inte låsa lösenordsfilen\n"
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s: kan inte öppna lösenordsfilen\n"
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s: kan inte låsa skugglösenordsfilen\n"
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s: kan inte öppna skugglösenordsfilen\n"
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr "%s: fel under tilläggning av ny lösenordsnotering\n"
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr "%s: fel under tilläggning av ny skugglösenordsnotering\n"
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: kan inte skapa katalog %s\n"
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr ""
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, fuzzy, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr "%s: kan inte uppdatera noteringen för användaren %s\n"
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s: användare %s existerar\n"
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
 msgstr ""
 "%s: gruppen %s finns redan - vill du lägga till en användare, använd -g.\n"
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: varning: CREATE_HOME stöds inte, använd -m istället.\n"
@@ -1786,12 +1792,12 @@ msgstr "%s: %s ägs inte av %s, tar inte bort\n"
 msgid "%s: warning: can't remove "
 msgstr "%s: varning: kan inte ta bort "
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s: användare %s finns inte\n"
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: användare %s är en NIS-användare\n"
@@ -1806,101 +1812,106 @@ msgstr "%s: tar inte bort katalogen %s (skulle ta bort hemkatalogen för %s)\n
 msgid "%s: error removing directory %s\n"
 msgstr "%s: fel under borttagning av katalogen %s\n"
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, fuzzy, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr "Användning: %s [-u uid [-o]] [-g grupp] [-G grupp,...] \n"
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr "\t\t[-d hem [-m]] [-s skal] [-c kommentar] [-l nytt_namn]\n"
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, fuzzy, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr "[-f inaktiv] [-e utgång] "
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr "[-p passwd] [-L|-U] namn\n"
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s: slut på minne i update_group\n"
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s: slut på minne i update_gshadow\n"
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: inga flaggor givna\n"
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: skugglösenord krävs för -e och -f\n"
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr ""
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr "%s: uid %lu är inte unikt\n"
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s: fel under ändring av lösenordsnotering\n"
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s: fel under borttagning av lösenordsnotering\n"
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr "%s: fel under borttagning av skugglösenordsnotering\n"
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: katalogen %s existerar\n"
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s: kan inte skapa %s\n"
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s: kan inte byta ägare på %s\n"
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s: kan inte byta namn på katalogen %s till %s\n"
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: varning: %s ägs inte av %s\n"
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr "kunde inte byta ägare av brevlådan"
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr "kunde inte byta namn på brevlådan"
 
@@ -1937,6 +1948,30 @@ msgstr ""
 "\"vipw\" redigerar /etc/passwd   \"vipw -w\" redigerar /etc/shadow\n"
 "\"vipg\" redigerar /etc/group    \"vipg -w\" redigerar /etc/gshadow\n"
 
+#, fuzzy
+#~ msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
+#~ msgstr "Användning: %s [-u uid [-o]] [-g grupp] [-G grupp,...] \n"
+
+#, fuzzy
+#~ msgid ""
+#~ "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+#~ msgstr "\t\t    [-d hem] [-s skal] [-c kommentar] [-m [-k mall]]\n"
+
+#, fuzzy
+#~ msgid "               [-f inactive] [-e expire]\n"
+#~ msgstr "\t\t[-f inaktiv] [-e utgång]\n"
+
+#, fuzzy
+#~ msgid "               [-p passwd] [-K KEY=VALUE] name\n"
+#~ msgstr "[-p passwd] namn\n"
+
+#, fuzzy
+#~ msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
+#~ msgstr "            %s -D [-g grupp] [-b bas] [-s skal]\n"
+
+#~ msgid "%s: -O requires NAME=VALUE\n"
+#~ msgstr "%s: -O kräver NAME=VÄRDE\n"
+
 #~ msgid "unknown uid: %u\n"
 #~ msgstr "okänt uid: %u\n"
 
diff --git a/po/tl.gmo b/po/tl.gmo
index 35900a17..98eaf249 100644
Binary files a/po/tl.gmo and b/po/tl.gmo differ
diff --git a/po/tl.po b/po/tl.po
index c18a64f7..ddee409f 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
 "PO-Revision-Date: 2005-01-26 22:00+0800\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -143,12 +143,12 @@ msgstr "Walang directory, pumapasok na ang HOME=/"
 msgid "Cannot execute %s"
 msgstr "Hindi mapatakbo ang %s"
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "Hindi tanggap na root directory \"%s\"\n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "Hindi mapalitan ang root directory sa \"%s\"\n"
@@ -170,16 +170,16 @@ msgstr ""
 "may mali sa pagsasaayos - hindi kilalang item '%s' (ipaalam sa "
 "tagapangasiwa)\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "Password: "
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "Password ni %s: "
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -198,147 +198,147 @@ msgid ""
 "  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
 msgstr ""
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Ibigay ang bagong halaga, o pindutin ang ENTER para sa default\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "Pinakamaliit na Tanda ng Password"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "Pinakamalaking Tanda ng Password"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "Huling Pagpalit ng Password (YYYY-MM-DD)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "Babala ng Paglipas ng Taning ng Password"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "Inaktibo ang Password"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Hangganan ng Account (YYYY-MM-DD)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, fuzzy, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Huling Pagpalit ng Password (YYYY-MM-DD)"
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, fuzzy, c-format
 msgid "never\n"
 msgstr "Hindi kailanman\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, fuzzy, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Taning ng Password:\t"
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, fuzzy, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Inaktibong Password:\t"
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, fuzzy, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Mapapaso ang Account:\t"
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, fuzzy, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr "Labis ang pagsubok na pumasok (%d)\n"
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s: huwag isama ang \"l\" sa ibang mga flag\n"
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: Walang pahintulot.\n"
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: sawi ang pagpapakilalang PAM\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: hindi mabuksan ang tipunang password\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s: di kilalang gumagamit %s\n"
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
-msgstr "%s: hindi maaldaba ang tipunang shadow password"
+msgid "%s: can't lock shadow password file\n"
+msgstr "%s: hindi maaldaba ang tipunang shadow password\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
-msgstr "%s: hindi mabuksan ang tipunang shadow password"
+msgid "%s: can't open shadow password file\n"
+msgstr "%s: hindi mabuksan ang tipunang shadow password\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "Pinapalitan ang impormasyong pagtanda para kay %s\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: error sa pagbabago ng mga field\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: hindi maapdeyt ang tipunang password\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: hindi maapdeyt ang tipunang shadow password\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s: hindi maisulat-muli ang tipunang shadow password\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: hindi maisulat-muli ang tipunang password\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr "%s: sawi ang PAM chauthtok\n"
@@ -450,7 +450,7 @@ msgstr "Hindi maaldaba ang tipunang password; subukan muli mamaya.\n"
 msgid "Cannot open the password file.\n"
 msgstr "Hindi mabuksan ang tipunang password\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: hindi nahanap ang %s sa /etc/passwd\n"
@@ -656,7 +656,7 @@ msgstr "%s: kailangan ng password ng grupong shadow para sa -A\n"
 msgid "Who are you?\n"
 msgstr "Sino ka?\n"
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "di kilalang grupo: %s\n"
@@ -749,12 +749,12 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr "pag-gamit: groupadd [-g gid [-o]] grupo\n"
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s: error sa pagdagdag ng entry ng bagong grupo\n"
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr "%s: hindi kakaiba ang pangalang %s\n"
@@ -774,24 +774,24 @@ msgstr "%s: hindi makakuha ng kakaibang gid\n"
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s: %s ay hindi tanggap na pangalan ng grupo\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr "%s: hindi tanggap na grupo %s\n"
 
-#: src/groupadd.c:325 src/useradd.c:1058
-#, c-format
-msgid "%s: -O requires NAME=VALUE\n"
+#: src/groupadd.c:332 src/useradd.c:1094
+#, fuzzy, c-format
+msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: kinakailangan ng -O ang PANGALAN=HALAGA\n"
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s: hindi maisulat muli ang tipunang grupo\n"
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s: hindi maisulat muli ang tipunang grupo ng shadow\n"
@@ -851,7 +851,7 @@ msgstr "%s: walang grupong %s\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s: ang grupong %s ay grupong NIS\n"
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s ay ang NIS master\n"
@@ -1114,7 +1114,7 @@ msgstr ""
 "\n"
 "[Nilaktawan ang pag-diskonek -- pinayagang makapasok ang root.]\n"
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
@@ -1123,17 +1123,17 @@ msgstr ""
 "\n"
 "Lumipas ang taning ng pagpasok ng %d segundo.\n"
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr " ng `%.100s' mula `%.200s'"
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr " ng `%.100s'"
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
@@ -1142,25 +1142,25 @@ msgstr ""
 "\n"
 "%s login: "
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr "Maling pagpasok"
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Babala: pagpasok ay enabled muli matapos ng panandalian pagbawal.\n"
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr "Huling pagpasok: %s sa %s"
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr "Huling pagpasok: %.19s sa %s"
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr " mula %.*s"
@@ -1175,21 +1175,21 @@ msgstr "pag-gamit: newgrp [-] [grupo]\n"
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "pag-gamit: sg grupo [[-c] utos]\n"
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, fuzzy, c-format
 msgid "unknown UID: %u\n"
 msgstr "di kilalang GID: %lu\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr "di kilalang GID: %lu\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr "Ipagpaumanhin.\n"
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr "labis ang dami ng mga grupo\n"
@@ -1335,7 +1335,7 @@ msgstr "%s: nagkulang ng memory\n"
 msgid "%s: Cannot execute %s"
 msgstr "%s: Hindi mapatakbo ang %s"
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: hindi suportado ang repositoryong %s\n"
@@ -1452,35 +1452,35 @@ msgstr "%s: hindi maapdeyt ang ipinasok para kay %s\n"
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: hindi matanggal ang tipunang password ng shadow\n"
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr "Ipagpaumanhin."
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s: kinakailangang patakbuhin mula sa isang terminal\n"
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr "%s: pam_start: error %d\n"
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr "Di kilalang id: %s\n"
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Hindi kayo awtorisadong gumamit ng su %s\n"
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr "(Ibigay ang sarili niyong password.)"
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -1489,7 +1489,7 @@ msgstr ""
 "%s: %s\n"
 "(Di pinansin)\n"
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr "Walang shell\n"
@@ -1514,12 +1514,12 @@ msgstr "Ibigay ang inyong SARILING password bilang authentication.\n"
 msgid "No password file\n"
 msgstr "Walang tipunang password\n"
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr "Walang ipinasok sa password para sa 'root'\n"
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
@@ -1529,213 +1529,219 @@ msgstr ""
 "Itiklado ang control-d upang magpatuloy ng normal na startup,\n"
 "(o ibigay ang password ng root para sa pagtataguyod ng sistema):"
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr "Pumapasok sa Modang Pagtataguyod ng Sistema\n"
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s: hindi tanggap na argumentong numero `%s'\n"
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s: di kilalang GID %s\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s: di kilalang grupo %s\n"
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: hindi malikha ang bagong tipunan ng mga default\n"
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr "%s: hindi mabuksan ang bagong tipunan ng mga default\n"
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr "%s: baguhin ang pangalan: %s"
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s: ang grupong `%s' ay grupong NIS.\n"
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: sobrang dami ng grupo ang nakatakda (max %d).\n"
 
-#: src/useradd.c:635
-#, fuzzy, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
-msgstr "pag-gamit: %s\t[-u uid [-o]] [-g grupo] [-G grupo,...] \n"
+#: src/useradd.c:634
+#, c-format
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
+msgstr ""
 
-#: src/useradd.c:638
-#, fuzzy, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
-msgstr "\t\t[-d bahay] [-s shell] [-c comment] [-m [-k template]]\n"
-
-#: src/useradd.c:639 src/useradd.c:643
-#, fuzzy, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr "\t\t[-f inaktibo] [-e paso ]\n"
-
-#: src/useradd.c:640
-#, fuzzy, c-format
-msgid "               [-p passwd] name\n"
-msgstr "[-p passwd] pangalan\n"
-
-#: src/useradd.c:642
-#, fuzzy, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr "       %s\t-D [-g grupo] [-b base] [-s shell]\n"
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s: error sa pagaldaba ng tipunang grupo\n"
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s: error sa pagbukas ng tipunang grupo\n"
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s: error sa pagaldaba ng tipunang grupo ng shadow\n"
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s: error sa pagbukas ng tipunang grupo ng shadow\n"
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, fuzzy, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: hindi kakaiba ang gid na %u\n"
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, fuzzy, c-format
 msgid "%s: can't get unique UID\n"
 msgstr "%s: hindi makakuha ng kakaibang gid\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr "%s: hindi tanggap na batayang directory `%s'\n"
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr "%s: hindi tanggap na komento `%s'\n"
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s: hindi tanggap na bahay directory `%s'\n"
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s: hindi tanggap na petsa `%s'\n"
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr "%s: kailangan ng shadow password para sa -e\n"
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr "%s: kailangan ng shadow password para sa -f\n"
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s: hindi tanggap na field `%s'\n"
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr "%s: hindi tanggap na shell `%s'\n"
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr "%s: hindi tanggap na pangalan `%s'\n"
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s: hindi maisulat muli ang tipunang password\n"
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s: hindi maisulat muli ang tipunang password na shadow\n"
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s: hindi maaldaba ang tipunang password\n"
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s: hindi mabuksan ang tipunang password\n"
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s: hindi maaldaba ang tipunang password ng shadow\n"
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s: hindi mabuksan ang tipunang password ng shadow\n"
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr "%s: error sa pagdagdag ng bagong ipapasok sa password\n"
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr "%s: error sa pagdagdag ng bagong ipinasok na password sa shadow\n"
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: hindi malikha ang directory %s\n"
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr ""
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, fuzzy, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr "%s: hindi maapdeyt ang ipinasok para kay %s\n"
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s: mayroon nang gumagamit na %s\n"
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
@@ -1743,7 +1749,7 @@ msgstr ""
 "%s: mayroon nang grupong %s - kung nais niyong idagdag ang gumagamit na ito "
 "sa grupong iyon, gamitin ang -g.\n"
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: babala: CREATE_HOME hindi suportado, gamitin na lamang ang -m.\n"
@@ -1793,12 +1799,12 @@ msgstr "%s: %s ay hindi pag-aari ni %s, hindi tatanggalin\n"
 msgid "%s: warning: can't remove "
 msgstr "%s: babala: hindi matanggal "
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s: walang gumagamit na nagngangalang %s\n"
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: ang gumagamit na %s ay nasa NIS\n"
@@ -1813,101 +1819,106 @@ msgstr "%s: hindi tatanggalin ang directory %s (mawawalan ng bahay si %s)\n"
 msgid "%s: error removing directory %s\n"
 msgstr "%s: error sa pagtanggal ng directory %s\n"
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, fuzzy, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr "pag-gamit: %s\t[-u uid [-o]] [-g grupo] [-G grupo,...] \n"
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr "\t\t[-d bahay [-m]] [-s shell] [-c comment] [-| bagong_pangalan]\n"
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, fuzzy, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr "[-f inaktibo] [-e paso ] "
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr "[-p passwd] [-L|-U] pangalan\n"
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s: naubos ang memory sa update_group\n"
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s: naubos ang memory sa update_gshadow\n"
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: walang binigay na mga flag\n"
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: kailangan ang shadow password para sa -e at -f\n"
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr ""
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr "%s: uid %lu ay hindi kakaiba\n"
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s: error sa pagpalit ng ipinasok na password\n"
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s: error sa pagtanggal ng ipinasok na password\n"
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr "%s: error sa pagtanggal ng ipinasok na shadow password\n"
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: mayroon nang directory na %s\n"
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s: hindi malikha ang %s\n"
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s: hindi ma-chown %s\n"
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s: hindi mapalitan ng pangalan ang directory %s sa %s\n"
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: babala: %s ay hindi pag-aari ni %s\n"
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr "sawi sa pagpalit ng may-ari ng mailbox"
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr "sawi sa pagpalit ng pangalan ng mailbox"
 
@@ -1944,6 +1955,30 @@ msgstr ""
 "`vipw' ine-edit /etc/passwd     `vipw -s' ine-edit /etc/shadow\n"
 "`vigr' ine-edit /etc/group      `vigr -s' ine-edit /etc/gshadow\n"
 
+#, fuzzy
+#~ msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
+#~ msgstr "pag-gamit: %s\t[-u uid [-o]] [-g grupo] [-G grupo,...] \n"
+
+#, fuzzy
+#~ msgid ""
+#~ "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+#~ msgstr "\t\t[-d bahay] [-s shell] [-c comment] [-m [-k template]]\n"
+
+#, fuzzy
+#~ msgid "               [-f inactive] [-e expire]\n"
+#~ msgstr "\t\t[-f inaktibo] [-e paso ]\n"
+
+#, fuzzy
+#~ msgid "               [-p passwd] [-K KEY=VALUE] name\n"
+#~ msgstr "[-p passwd] pangalan\n"
+
+#, fuzzy
+#~ msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
+#~ msgstr "       %s\t-D [-g grupo] [-b base] [-s shell]\n"
+
+#~ msgid "%s: -O requires NAME=VALUE\n"
+#~ msgstr "%s: kinakailangan ng -O ang PANGALAN=HALAGA\n"
+
 #~ msgid "unknown uid: %u\n"
 #~ msgstr "di kilalang uid: %u\n"
 
diff --git a/po/tr.gmo b/po/tr.gmo
index ba091eda..29f409a7 100644
Binary files a/po/tr.gmo and b/po/tr.gmo differ
diff --git a/po/tr.po b/po/tr.po
index 8d421f46..eaf02f56 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
 "PO-Revision-Date: 2004-06-13 10:27+0300\n"
 "Last-Translator: Mehmet Türker <mturker@innova.com.tr>\n"
 "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -139,12 +139,12 @@ msgstr "Dizin yok, HOME=/ ile giriş yapılıyor"
 msgid "Cannot execute %s"
 msgstr "%s çalıştırılamıyor"
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "Geçersiz kök dizin \"%s\"\n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "Kök dizin \"%s\" olarak değiştirilemiyor\n"
@@ -165,16 +165,16 @@ msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr ""
 "yapılandırma hatası - bilinmeyen öğe '%s' (sistem yöneticisine bildirin)\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "Parola: "
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "%s kullanıcı parolası: "
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -193,147 +193,147 @@ msgid ""
 "  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
 msgstr ""
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Yeni değeri girin, veya varsayılan değer için ENTER'a basın\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "Asgari Parola Ömrü"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "Azami Parola Ömrü"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "Son Parola Değişimi (YYYY-AA-GG)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "Parola Kullanım Süresi Bitti Uyarısı"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "Parola Pasif"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Hesap Bitimi Tarihi (YYYY-AA-GG)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, fuzzy, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Son Parola Değişimi (YYYY-AA-GG)"
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, fuzzy, c-format
 msgid "never\n"
 msgstr "Hiçbir zaman\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, fuzzy, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Parola Kullanım Süresi Dolumu:\t"
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, fuzzy, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Parola Pasif:\t"
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, fuzzy, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Hesap Bitimi:\t"
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, fuzzy, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr "Maksimum giriş denemesi sayısı aşıldı (%d)\n"
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s: diğer bayraklarla beraber \"l\" yi kullanmayınız\n"
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, fuzzy, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: müsaade edilmedi\n"
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM yetkilendirmesi başarısız oldu\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: parola dosyası açılamadı\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s: bilinmeyen kullanıcı %s\n"
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
-msgstr "%s: gölge parola dosyası kilitlenemedi"
+msgid "%s: can't lock shadow password file\n"
+msgstr "%s: gölge parola dosyası kilitlenemedi\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
-msgstr "%s: gölge parola dosyası açılamadı"
+msgid "%s: can't open shadow password file\n"
+msgstr "%s: gölge parola dosyası açılamadı\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "%s için ömür bilgisi değiştiriliyor\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: alanları değiştirirken hata oluştu\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: parola dosyası güncellenemedi\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: gölge parola dosyası güncellenemedi\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s: gölge parola dosyasının üzerine yazılamadı\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: parola dosyasına yazılamadı\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr "%s: PAM chauthok başarısız oldu\n"
@@ -442,7 +442,7 @@ msgstr "Parola dosyası kilitlenemiyor, daha sonra tekrar deneyin.\n"
 msgid "Cannot open the password file.\n"
 msgstr "Parola dosyası açılamıyor.\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: %s /etc/passwd içinde bulunamadı\n"
@@ -641,7 +641,7 @@ msgstr "%s: -A için gölge grup parolaları gerekli\n"
 msgid "Who are you?\n"
 msgstr "Siz kimsiniz?\n"
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "bilinmeyen grup: %s\n"
@@ -734,12 +734,12 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr "Kullanım: groupadd [-g gid [-o]] [-f] grup\n"
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s: yeni grup kaydı eklenirken hata oluştu\n"
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr "%s: %s ismi tek değil\n"
@@ -759,24 +759,24 @@ msgstr "%s: tek (benzersiz) bir gid alınamadı\n"
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s: %s geçerli bir grup adı değil\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr "%s: geçersiz grup %s\n"
 
-#: src/groupadd.c:325 src/useradd.c:1058
-#, c-format
-msgid "%s: -O requires NAME=VALUE\n"
+#: src/groupadd.c:332 src/useradd.c:1094
+#, fuzzy, c-format
+msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -O seçeneği ISIM=DEĞER gerektirir\n"
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s: grup dosyasına yazılamıyor\n"
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s: gölge grup dosyasına yazılamıyor\n"
@@ -836,7 +836,7 @@ msgstr "%s: grup %s mevcut değil\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s: grup %s bir NIS grubudur\n"
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s NIS efendisidir\n"
@@ -1092,7 +1092,7 @@ msgstr ""
 "\n"
 "[Bağlantı kesilmesi atlandı -- root girişi olanaklı.]\n"
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
@@ -1101,17 +1101,17 @@ msgstr ""
 "\n"
 "Giriş %d saniye sonra zaman aşımına uğradı.\n"
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr " `%.200s'den `%.100s' üzerinde"
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr " `%.100s' üzerinde"
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
@@ -1120,26 +1120,26 @@ msgstr ""
 "\n"
 "%s giriş: "
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr "Giriş geçersiz"
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr ""
 "Uyarı: geçici bir kilitlenme sonrasında giriş tekrar olanaklı kılındı.\n"
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr "Son giriş: %s üzerinden %s"
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr "Son giriş: %s üzerinden %.19s"
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr "%.*s'den"
@@ -1154,21 +1154,21 @@ msgstr "Kullanım: newgrp [-] [grup]\n"
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Kullanım: sg grup [[-c] komut]\n"
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, fuzzy, c-format
 msgid "unknown UID: %u\n"
 msgstr "bilinmeyen GID: %lu\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr "bilinmeyen GID: %lu\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr "Üzgünüm.\n"
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr "çok fazla grup\n"
@@ -1314,7 +1314,7 @@ msgstr "%s: yetersiz bellek\n"
 msgid "%s: Cannot execute %s"
 msgstr "%s: %s çalıştırılamıyor"
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: depo %s desteklenmiyor\n"
@@ -1431,35 +1431,35 @@ msgstr "%s: kullanıcı %s için kayıt güncellenemiyor\n"
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: gölge parola dosyası silinemiyor\n"
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr "Üzgünüm."
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s: bir terminalden çalıştırılmalı\n"
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr "%s: pam_start: hata %d\n"
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr "Bilinmeyen id: %s\n"
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "su %s için yetkili değilsiniz\n"
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr "(Kendi parolanızı girin.)"
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -1468,7 +1468,7 @@ msgstr ""
 "%s: %s\n"
 "(Dikkate alınmadı)\n"
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr "Kabuk yok\n"
@@ -1493,12 +1493,12 @@ msgstr "Lütfen yetkilendirme için KENDİ parolanızı girin.\n"
 msgid "No password file\n"
 msgstr "Parola dosyası yok\n"
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr "'root' için parola kaydı yok\n"
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
@@ -1508,214 +1508,219 @@ msgstr ""
 "Normal başlangıç için control-d ye basın,\n"
 "(ya da sistem bakımı için root parolasını verin):"
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr "Sistem Bakımı Kipine Giriliyor\n"
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s: geçersiz sayısal argüman `%s'\n"
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s: bilinmeyen GID %s\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s: bilinmeyen grup %s\n"
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: yeni varsayılanlar dosyası oluşturulamadı\n"
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr "%s: yeni varsayılanlar dosyası açılamadı\n"
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr "%s: yeniden adlandırma: %s"
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s: grup `%s' bir NIS grubu.\n"
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: çok fazla grup verildi (azami %d).\n"
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
-msgstr "kullanım: useradd [-u uid [-o]] [-g grup] [-G grup,...] \n"
-
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
 msgstr ""
-"                  [-d ev_dizini] [-s kabuk] [-c açıklama] [-m [-k şablon]]\n"
 
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr "                  [-f pasif] [-e hesap_bitimi ]\n"
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr "                  [-p parola] isim\n"
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr "          useradd -D [-g grup] [-b taban] [-s kabuk]\n"
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s: grup dosyası kilitlenmesinde hata\n"
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s: grup dosyası açılırken hata\n"
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s: gölge grup dosyası kilitlenirken hata\n"
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s: gölge grup dosyası açılırken hata\n"
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, fuzzy, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: %u gid tek değil\n"
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, fuzzy, c-format
 msgid "%s: can't get unique UID\n"
 msgstr "%s: tek (benzersiz) bir gid alınamadı\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr "%s: geçersiz ana dizin `%s'\n"
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr "%s: geçersiz açıklama `%s'\n"
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s: geçersiz ev dizini `%s'\n"
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s: geçersiz tarih `%s'\n"
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr "%s: -e için gölge parolalar gerekli\n"
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr "%s: -f için gölge parolalar gerekli\n"
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s: geçersiz alan `%s'\n"
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr "%s: geçersiz kabuk `%s'\n"
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr "%s: geçersiz kullanıcı adı '%s'\n"
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s: parola dosyası yazılamıyor\n"
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s: gölge parola dosyası yazılamıyor\n"
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s: parola dosyası kilitlenemiyor\n"
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s: parola dosyası açılamıyor\n"
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s: gölge parola dosyası kilitlenemiyor\n"
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s: gölge parola dosyası açılamıyor\n"
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr "%s: yeni parola kaydı eklenirken hata\n"
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr "%s: yeni gölge parola kaydı eklenirken hata\n"
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: %s dizini yaratılamıyor\n"
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr ""
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, fuzzy, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr "%s: kullanıcı %s için kayıt güncellenemiyor\n"
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s: kullanıcı %s mevcut\n"
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
@@ -1723,7 +1728,7 @@ msgstr ""
 "%s: grup %s mevcut - eğer bu kullanıcıyı bu gruba eklemek istiyorsanız, -g "
 "kullanın.\n"
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr ""
@@ -1774,12 +1779,12 @@ msgstr "%s: %s %s kullanıcısına ait değil, silinmiyor\n"
 msgid "%s: warning: can't remove "
 msgstr "%s: uyarı: silinemiyor "
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s: kullanıcı %s mevcut değil\n"
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: kullanıcı %s bir NIS kullanıcısı\n"
@@ -1794,101 +1799,106 @@ msgstr "%s: %s dizini silinmiyor (%s kullanıcısının ev dizinini silecekti)\n
 msgid "%s: error removing directory %s\n"
 msgstr "%s: %s dizini silinirken hata oluştu\n"
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr "Kullanım: %s\t[-u uid [-o]] [-g grup] [-G grup,...] \n"
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr "\t\t[-d ev_dizini [-m]] [-s kabuk] [-c açıklama] [-l yeni_isim]\n"
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr "[-f pasif] [-e hesap_bitimi] "
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr "[-p parola] [-L|-U] isim\n"
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s: update_group için bellek yetersiz\n"
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s: update_gshadow için bellek yetersiz\n"
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: herhangi bir bayrak verilmedi\n"
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: -e ve -f için gölge parolalar gerekli\n"
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr ""
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr "%s: uid %lu benzersiz değil\n"
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s: parola kaydı değiştirilirken hata oluştu\n"
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s: parola kaydı silinirken hata oluştu\n"
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr "%s: gölge parola kaydı silinirken hata oluştu\n"
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: %s dizini mevcut\n"
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s: %s yaratılamıyor\n"
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s: chown %s gerçekleştirilemiyor\n"
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s: %s dizini %s olarak yeniden adlandırılamıyor\n"
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: uyarı: %s %s kullanıcısına ait değil\n"
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr "postakutusu sahibi değiştirilmedi"
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr "postakutusu isim değişikliği başarısız"
 
@@ -1925,6 +1935,29 @@ msgstr ""
 "`vipw' /etc/passwd'ü düzenler        `vipw -s' /etc/shadow'u düzenler\n"
 "`vigr' /etc/group'u düzenler         `vigr -s' /etc/gshadow'u düzenler\n"
 
+#, fuzzy
+#~ msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
+#~ msgstr "kullanım: useradd [-u uid [-o]] [-g grup] [-G grup,...] \n"
+
+#~ msgid ""
+#~ "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+#~ msgstr ""
+#~ "                  [-d ev_dizini] [-s kabuk] [-c açıklama] [-m [-k "
+#~ "şablon]]\n"
+
+#~ msgid "               [-f inactive] [-e expire]\n"
+#~ msgstr "                  [-f pasif] [-e hesap_bitimi ]\n"
+
+#, fuzzy
+#~ msgid "               [-p passwd] [-K KEY=VALUE] name\n"
+#~ msgstr "                  [-p parola] isim\n"
+
+#~ msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
+#~ msgstr "          useradd -D [-g grup] [-b taban] [-s kabuk]\n"
+
+#~ msgid "%s: -O requires NAME=VALUE\n"
+#~ msgstr "%s: -O seçeneği ISIM=DEĞER gerektirir\n"
+
 #~ msgid "unknown uid: %u\n"
 #~ msgstr "bilinmeyen uid: %u\n"
 
diff --git a/po/uk.gmo b/po/uk.gmo
index 0aa0d325..efe2d5f4 100644
Binary files a/po/uk.gmo and b/po/uk.gmo differ
diff --git a/po/uk.po b/po/uk.po
index 636999da..2058a333 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow-4.0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
 "PO-Revision-Date: 2005-04-19 23:22+0300\n"
 "Last-Translator: Roman Festchook <linux@polesye.net>\n"
 "Language-Team:  <linux@polesye.net>\n"
@@ -142,12 +142,12 @@ msgstr "Немає теки, входимо з HOME=/"
 msgid "Cannot execute %s"
 msgstr "Не можу виконати %s"
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "Невірна коренева тека \"%s\"\n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "Не можу змінити кореневу теку на \"%s\"\n"
@@ -168,16 +168,16 @@ msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr ""
 "помилка у конфігурації - невідома позиція '%s' (повідомте адміністратора)\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "Пароль: "
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "Пароль користувача %s: "
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -196,147 +196,147 @@ msgid ""
 "  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
 msgstr ""
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Введіть нове значення або нажміть ENTER для значення по замовчуванню\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "Мінімальний вік пароля"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "Максимальний вік пароля"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "Остання зміна пароля (РРРР-ММ-ДД)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "Застереження про прострочення пароля"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "Пароль неактивний"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Дата прострочення рахунку (РРРР-ММ-ДД)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Остання зміна пароля\t\t\t\t\t: "
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, c-format
 msgid "never\n"
 msgstr "ніколи\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Пароль стає простроченим\t\t\t\t\t: "
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Пароль неактивний\t\t\t\t\t: "
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Рахунок стає простроченим\t\t\t\t\t\t: "
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr "Мінімальна кількість днів між змінами паролю\t\t: %ld\n"
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr "Максимальна кількість днів між змінами паролю\t\t: %ld\n"
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr "Кількість днів для застереження про прострочення паролю\t: %ld\n"
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s: не використовуйте \"l\" з іншіми флагами\n"
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: У доступі відмовлено.\n"
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: PAM аутентифікація не пройшла\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: не можу відкрити файл паролей\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s: невідомий користувач %s\n"
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
-msgstr "%s: не можу заблокувати файл прихованих паролей"
+msgid "%s: can't lock shadow password file\n"
+msgstr "%s: не можу заблокувати файл прихованих паролей\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
-msgstr "%s: не можу відкрити файл прихованих паролей"
+msgid "%s: can't open shadow password file\n"
+msgstr "%s: не можу відкрити файл прихованих паролей\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "Змінюю вікову інформацію для %s\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: помилка заміни поля\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: не можу оновити файл паролей\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: не можу оновити файл прихованих паролей\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s: не можу переписати файл прихованих паролей\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: не можу переписати файл паролей\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr "%s: помилка PAM chauthtok\n"
@@ -447,7 +447,7 @@ msgstr "Не можу блокувати файл паролей; спробуй
 msgid "Cannot open the password file.\n"
 msgstr "Не можу відкрити файл паролей.\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: %s не знайдено у /etc/passwd\n"
@@ -667,7 +667,7 @@ msgstr "%s: приховані паролі груп потрібні для -A\
 msgid "Who are you?\n"
 msgstr "Ви хто?\n"
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "невідома група: %s\n"
@@ -760,12 +760,12 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr "Використовуйте: groupadd [-g gid [-o]] [-f] група\n"
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s: помилка додання нового запису у файл груп\n"
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr "%s: ім'я %s не є унікальним\n"
@@ -785,24 +785,24 @@ msgstr "%s: не можу отримати унікальний gid\n"
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s: %s: то не є вірне ім'я групи\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr "%s: невірна група %s\n"
 
-#: src/groupadd.c:325 src/useradd.c:1058
-#, c-format
-msgid "%s: -O requires NAME=VALUE\n"
+#: src/groupadd.c:332 src/useradd.c:1094
+#, fuzzy, c-format
+msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -O вимагає ЗМІННА=ЗНАЧЕННЯ\n"
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s: не можу переписати файл груп\n"
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s: не можу переписати файл прихованих груп\n"
@@ -862,7 +862,7 @@ msgstr "%s: група %s не існує\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s: група %s є групою NIS\n"
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s є сервер NIS\n"
@@ -1125,7 +1125,7 @@ msgstr ""
 "\n"
 "[Сталося відключення -- дозволено лише вхід root-a.]\n"
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
@@ -1134,17 +1134,17 @@ msgstr ""
 "\n"
 "Час логіну буде вичерпано за %d секунд.\n"
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr " на `%.100s' з `%.200s'"
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr " на `%.100s'"
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
@@ -1153,25 +1153,25 @@ msgstr ""
 "\n"
 "%s логін: "
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr "Невірний логін"
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Застереження: login поновлено після тимчасового блокування.\n"
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr "Останній вхід в систему: %s на %s"
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr "Останній вхід в систему: %.19s на %s"
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr " з %.*s"
@@ -1186,21 +1186,21 @@ msgstr "Використовуйте: newgrp [-] [група]\n"
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Використовуйте: sg група [[-c] команда]\n"
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, fuzzy, c-format
 msgid "unknown UID: %u\n"
 msgstr "невідомий GID: %lu\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr "невідомий GID: %lu\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr "Вибачте.\n"
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr "занадто багато груп\n"
@@ -1347,7 +1347,7 @@ msgstr "%s: брак пам'яті\n"
 msgid "%s: Cannot execute %s"
 msgstr "%s: Не можу виконати %s"
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s: репозиторій %s не підтримується\n"
@@ -1464,35 +1464,35 @@ msgstr "%s: не можу оновити запис для користувач
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: не можу видалити файл прихованих паролей\n"
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr "Вибачте."
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s: повино бути запущено з терміналу\n"
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr "%s: pam_start: помилка %d\n"
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr "Невідомий id: %s\n"
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Ви не авторизовані для su %s\n"
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr "(Введіть ваш пароль.)"
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -1501,7 +1501,7 @@ msgstr ""
 "%s: %s\n"
 "(Ігнорую)\n"
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr "Немає оболонки\n"
@@ -1526,12 +1526,12 @@ msgstr "Будьласка введіть Ваш власний пароль д
 msgid "No password file\n"
 msgstr "Немає файлу паролей\n"
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr "Бракує запису у базі паролей для 'root'\n"
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
@@ -1541,213 +1541,219 @@ msgstr ""
 "Натисніть control-d для виконання звичайного завантаження,\n"
 "(або введіть пароль адміністратора для відновлення системи):"
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr "Входимо у режим відновлення системи\n"
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s: невірний числовий аргумент `%s'\n"
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s: невідомий GID %s\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s: невідома група %s\n"
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: не можу створити новий файл із значеннями по замовчуванню\n"
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr "%s: не можу відкрити новий файл із значеннями по замовчуванню\n"
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr "%s: перейменування: %s"
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s: група `%s' є групою NIS.\n"
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: вказано забагато груп (макс %d).\n"
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
-msgstr "Використовуйте: useradd [-u uid [-o]] [-g група] [-G група,...] \n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
+msgstr ""
 
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
-msgstr "      [-d домашня_тека] [-s shell] [-c коментар] [-m [-k шаблон]]\n"
-
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr "              [-f неактивний] [-e прострочений]\n"
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr "             [-p пароль] ім'я\n"
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr "         useradd -D [-g група] [-b базова_тека] [-s оболонка]\n"
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s: не можу заблокувати файл груп\n"
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s: не можу відкрити файл груп\n"
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s: не можу заблокувати файл прихованих груп\n"
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s: не можу відкрити файл прихованих груп\n"
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, fuzzy, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: uid %u не є унікальним\n"
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, fuzzy, c-format
 msgid "%s: can't get unique UID\n"
 msgstr "%s: не можу отримати унікальний gid\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr "%s: невірна базова тека `%s'\n"
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr "%s: невірний коментар `%s'\n"
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s: невірна домашня тека `%s'\n"
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s: невірна дата `%s'\n"
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr "%s: приховані паролі потрібні для -e\n"
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr "%s: приховані паролі потрібні для -f\n"
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s: невірне поле `%s'\n"
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr "%s: невірна оболонка `%s'\n"
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr "%s: невірне ім'я користувача '%s'\n"
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s: не можу переписати файл паролей\n"
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s: не можу переписати файл прихованих паролей\n"
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s: не можу блокувати файл паролей\n"
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s: не можу відкрити файл паролей\n"
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s: не можу блокувати файл прихованих паролей\n"
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s: не можу відкрити файл прихованих паролей\n"
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr "%s: помилка додання нового запису у базу паролей\n"
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr "%s: помилка додання нового запису у базу прихованих паролей\n"
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: не можу створити теку %s\n"
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr "Немає групи \"mail\", створюю поштовий спул з правами 600.\n"
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr "Не можу створити поштовій спул для користувача %s.\n"
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s: користувач %s існує\n"
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
@@ -1755,7 +1761,7 @@ msgstr ""
 "%s: група %s існує - якщо ви бажаєте додати користувача до цієї групи, "
 "використовуйте -g.\n"
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s: застереження: CREATE_HOME не підтримується, користуйтесь -m.\n"
@@ -1805,12 +1811,12 @@ msgstr "%s: %s не належить %s, не видалено\n"
 msgid "%s: warning: can't remove "
 msgstr "%s: застереження: не можу видалити "
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s: користувач %s не існує\n"
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: користувач %s є користувачем NIS\n"
@@ -1825,102 +1831,107 @@ msgstr "%s: не видалено теку %s (можна видалити до
 msgid "%s: error removing directory %s\n"
 msgstr "%s: помилка видалення теки %s\n"
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr "використовуйте: %s\t[-u uid [-o]] [-g група] [-G група,...] \n"
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr ""
 "\t\t[-d домашня_тека [-m]] [-s оболонка] [-c коментар] [-l нове_ім'я]\n"
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr "[-f неактивний] [-e прострочений] "
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr "[-p пароль] [-L|-U] ім'я\n"
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s: бракує памяті у update_group\n"
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s: бракує памяті у update_gshadow\n"
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: не подано флагів\n"
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: приховані паролі потрібні для -e і -f\n"
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr ""
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr "%s: uid %lu не є унікальним\n"
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s: помилка зміни запису в базі паролей\n"
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s: помилка видалення запису з бази паролей\n"
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr "%s: помилка видалення запису з бази прихованих паролей\n"
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: тека %s існує\n"
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s: не можу створити %s\n"
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s: не можу змінити власника %s\n"
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s: не можу перейменувати теку з %s на %s\n"
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s: застереження: %s не належить %s\n"
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr "не можу змінити власника поштової скриньки"
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr "не можу перейменувати поштову скриньку"
 
@@ -1957,6 +1968,27 @@ msgstr ""
 "`vipw' редагує /etc/passwd      `vipw -s' редагує /etc/shadow\n"
 "`vigr' редагує /etc/group       `vigr -s' редагує /etc/gshadow\n"
 
+#, fuzzy
+#~ msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
+#~ msgstr "Використовуйте: useradd [-u uid [-o]] [-g група] [-G група,...] \n"
+
+#~ msgid ""
+#~ "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+#~ msgstr "      [-d домашня_тека] [-s shell] [-c коментар] [-m [-k шаблон]]\n"
+
+#~ msgid "               [-f inactive] [-e expire]\n"
+#~ msgstr "              [-f неактивний] [-e прострочений]\n"
+
+#, fuzzy
+#~ msgid "               [-p passwd] [-K KEY=VALUE] name\n"
+#~ msgstr "             [-p пароль] ім'я\n"
+
+#~ msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
+#~ msgstr "         useradd -D [-g група] [-b базова_тека] [-s оболонка]\n"
+
+#~ msgid "%s: -O requires NAME=VALUE\n"
+#~ msgstr "%s: -O вимагає ЗМІННА=ЗНАЧЕННЯ\n"
+
 #~ msgid "unknown uid: %u\n"
 #~ msgstr "невідомий uid: %u\n"
 
diff --git a/po/vi.gmo b/po/vi.gmo
index 3267d587..0754505e 100644
Binary files a/po/vi.gmo and b/po/vi.gmo differ
diff --git a/po/vi.po b/po/vi.po
index 5eeffc68..d395d204 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
 "PO-Revision-Date: 2005-05-10 22:33+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -139,12 +139,12 @@ msgstr "Không có thư mục thì đăng nhập với HOME=/"
 msgid "Cannot execute %s"
 msgstr "Không thể thực hiện %s."
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "Thư mục gốc không hợp lệ \"%s\".\n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "Không thể thay đổi thư mục gốc thành \"%s\".\n"
@@ -164,16 +164,16 @@ msgstr "Không thể phân chia chỗ cho thông tin cấu hình.\n"
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr "lỗi cấu hình - không biết mục '%s' (hãy báo quản trị).\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "Mật khẩu:"
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "Mật khẩu của %s:"
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -192,147 +192,147 @@ msgid ""
 "  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
 msgstr ""
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "Hãy nhập giá trị mới, hoạc bấm phím Enter để chọn mặc định.\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "Phạm vị thời gian tối thiểu cho mật khẩu"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "Phạm vị thời gian tối đa cho mật khẩu"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "Thay đổi mặt khẩu cuối cùng (NNNN-TT-NN)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "Cảnh báo hết hạn dùng mật khẩu"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "Mật khẩu không hoạt động"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "Ngày hết hạn dùng tài khoản (NNNN-TT-NN)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Thay đổi mặt khẩu cuối cùng\t\t\t\t\t: "
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, c-format
 msgid "never\n"
 msgstr "không bao giờ\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "Mật khẩu hết hạn dùng:\t\t\t\t\t: "
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "Mật khẩu không hoạt động\t\t\t\t\t:"
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "Tài khoản hết hạn dùng\t\t\t\t\t\t"
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr "Số ngày tối thiểu giữa hai lần thay đổi mật khẩu\t\t: %ld\n"
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr "Số ngày tối đa giữa hai lần thay đổi mật khẩu\t\t: %ld\n"
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr "Số ngày cảnh báo trước khi mật khẩu hết hạn\t: %ld\n"
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s: đừng bao gồm \"l\" cùng với những cờ khác\n"
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s: không đủ quyền.\n"
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s: xác thức kiểu PAM thất bại\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s: không mở được tập tin mật khẩu.\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s: người dùng lạ %s\n"
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
-msgstr "%s: không khóa được tập tin mật khẩu bóng."
+msgid "%s: can't lock shadow password file\n"
+msgstr "%s: không khóa được tập tin mật khẩu bóng\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
-msgstr "%s: không mở được tập tin mật khẩu bóng."
+msgid "%s: can't open shadow password file\n"
+msgstr "%s: không mở được tập tin mật khẩu bóng\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "Đang thay đổi thông tin phạm vị thời gian cho %s.\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s: gặp lỗi khi chuyển đổi trường.\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s: không cập nhật được tập tin mật khẩu.\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s: không cập nhật được tập tin mật khẩu bóng.\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s: không thể ghi lại tập tin mật khẩu bóng.\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s: không thể ghi lại tập tin mật khẩu.\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr "%s: chauthtok PAM (thay đổi hiệu bài xác thức) đã thất bại.\n"
@@ -444,7 +444,7 @@ msgstr "Không khóa được tập tin mật khẩu; hãy thử lại sau.\n"
 msgid "Cannot open the password file.\n"
 msgstr "Không mở được tập tin mật khẩu.\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s: không tìm thấy %s trong /etc/passwd\n"
@@ -669,7 +669,7 @@ msgstr "%s: cần thiết mật khẩu nhóm bóng cho -A\n"
 msgid "Who are you?\n"
 msgstr "Bạn là ai?\n"
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "nhóm lạ: %s\n"
@@ -764,12 +764,12 @@ msgstr ""
 "(groupadd: thêm nhóm)\n"
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s: gặp lỗi khi thêm mục ghi nhóm mới.\n"
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr "%s: tên %s không phải độc nhất.\n"
@@ -789,24 +789,24 @@ msgstr "%s: không gọi được gid độc nhất.\n"
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s: %s không phải là tên nhóm hợp lệ\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr "%s: nhóm không hợp lệ %s.\n"
 
-#: src/groupadd.c:325 src/useradd.c:1058
-#, c-format
-msgid "%s: -O requires NAME=VALUE\n"
+#: src/groupadd.c:332 src/useradd.c:1094
+#, fuzzy, c-format
+msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s: -O cần đến TÊN=GIÁ_TRỊ\n"
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s: không ghi lại được tập tin nhóm.\n"
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s: không ghi lại được tập tin nhóm bóng.\n"
@@ -868,7 +868,7 @@ msgstr "%s: chưa có nhóm %s.\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s: nhóm %s là nhóm NIS.\n"
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s: %s là NIS cái.\n"
@@ -1134,7 +1134,7 @@ msgstr ""
 "\n"
 "[Đã đi vòng sự kết nối bị ngắt -- cho phép người chủ đăng nhập.]\n"
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
@@ -1143,17 +1143,17 @@ msgstr ""
 "\n"
 "Đăng nhập đã quá giờ sau %d giây.\n"
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr " vào `%.100s' từ `%.200s'"
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr " vào `%.100s'"
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
@@ -1162,25 +1162,25 @@ msgstr ""
 "\n"
 "%s đăng nhập: "
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr "Đăng nhập không đúng"
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "Cảnh báo: đã hiệu lực lại đăng nhập sau bị khóa ra tạm thời.\n"
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr "Đang nhập cuối cùng: %s vào %s"
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr "Đang nhập cuối cùng: %.19s vào %s"
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr " từ %.*s"
@@ -1199,21 +1199,21 @@ msgstr ""
 "Cách sử dụng: sg group [[-c] lệnh]\n"
 "(group: nhóm)\n"
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, fuzzy, c-format
 msgid "unknown UID: %u\n"
 msgstr "GID lạ: %lu\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr "GID lạ: %lu\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr "Tiếc là\n"
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr "có quá nhiều nhóm.\n"
@@ -1361,7 +1361,7 @@ msgstr "%s: hết bộ nhớ\n"
 msgid "%s: Cannot execute %s"
 msgstr "%s: không thực hiện được %s."
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s chưa hỗ trợ kho %s.\n"
@@ -1481,35 +1481,35 @@ msgstr "%s: không cập nhật được mục ghi cho người dùng %s.\n"
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s: không xóa bỏ được tập tin mật khẩu bóng.\n"
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr "Tiếc là..."
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s: phải chạy nó từ thiết bị cuối.\n"
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr "%s: pam_start: (pam bắt đầu) lỗi %d\n"
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr "ID lạ: %s\n"
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "Bạn không đủ quyền sử dụng lệnh su với %s.\n"
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr "(Hãy nhập mật khẩu của bạn.)"
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -1518,7 +1518,7 @@ msgstr ""
 "%s: %s\n"
 "(Đã bo qua)\n"
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr "Không có hệ vỏ\n"
@@ -1543,12 +1543,12 @@ msgstr "Hãy nhập mật khẩu của BẠN để xác thức.\n"
 msgid "No password file\n"
 msgstr "Không có tập tin mật khẩu.\n"
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr "Không có mục ghi mật khẩu cho 'root' (người chủ).\n"
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
@@ -1558,217 +1558,219 @@ msgstr ""
 "Hãy gõ hai phím control-d để tiếp tục khởi động cách thường,\n"
 "(hoặc nhập mật khẩu chủ để bảo dưỡng hệ thống:"
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr "Đang vào chế độ bảo dưỡng hệ thống\n"
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s: đối số thuộc số không hợp lệ `%s'\n"
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s: GID lạ %s\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s: nhóm lạ %s\n"
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s: không tạo được tập tin mặc định mới.\n"
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr "%s: không mở được tập tin mặc định mới.\n"
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr "%s: đổi tên: %s"
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s: nhóm `%s' không phải là nhóm NIS.\n"
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: đã ghi rõ quá nhiều nhóm (tối đa %d).\n"
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
 msgstr ""
-"Cách sử dụng: useradd [-u uid [-o]] [-g nhóm] [-G nhóm,...] \n"
-"(useradd: thêm người dùng)\n"
 
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
-msgstr "\t\t[-d chính] [-s hệ_vỏ] [-c ghi_chú] [-m [-k mẫu]]\n"
-
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr "\t\t[-f không_hoạt_động] [-e hết_hạn ]\n"
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr "\t\t[-p mật_khẩu] tên\n"
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr ""
-"       useradd -D [-g nhóm] [-b cơ_bản] [-s hệ_vỏ]\n"
-"(useradd: thêm người dùng)\n"
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s: gặp lỗi khi khóa tập tin nhóm.\n"
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s: gặp lỗi khi mở tập tin nhóm.\n"
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s: gặp lỗi khi khóa tập tin nhóm bóng.\n"
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s: gặp lỗi khi mở tập tin nhóm bóng.\n"
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, fuzzy, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s: gid %u không phải độc nhất.\n"
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, fuzzy, c-format
 msgid "%s: can't get unique UID\n"
 msgstr "%s: không gọi được gid độc nhất.\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr "%s: thư mục cơ ban không hợp lệ `%s'\n"
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr "%s: ghi chú không hợp lệ `%s'\n"
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s: thư mục chính không hợp lê `%s'\n"
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s: ngày không hợp lệ `%s'\n"
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr "%s: cần đến mật khẩu bóng cho tùy chọn -e\n"
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr "%s: cần đến mật khẩu bóng cho tùy chọn -f\n"
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s: trường không hợp lệ`%s'\n"
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr "%s: hệ vỏ không hợp lệ `%s'\n"
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr "%s: tên dùng không hợp lệ '%s'\n"
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s: không ghi lại được tập tin mật khẩu\n"
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s: không ghi lại được tập tin mật khẩu bóng\n"
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s: không khóa được tập tin mật khẩu\n"
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s: không mở được tập tin mật khẩu\n"
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s: không khóa được tập tin mật khẩu bóng\n"
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s: không mở được tập tin mật khẩu bóng\n"
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr "%s: gặp lỗi khi thêm mục ghi mật khẩu mới.\n"
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr "%s: gặp lỗi khi thêm mục ghi mật khẩu bóng mới.\n"
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: không tạo được thư mục %s.\n"
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr "Không có nhóm tên \"mail\" thì đang tạo ống chỉ với chế độ 0600.\n"
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr "Không tạo được ống chỉ thư cho người dùng %s.\n"
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s: có người dùng %s rồi.\n"
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
@@ -1776,7 +1778,7 @@ msgstr ""
 "%s: có nhóm %s rồi.  Nếu bạn muốn thêm người dùng này vào nhóm ấy\n"
 "\t\t\t\t\tthì hãy sử dụng tùy chọn -g.\n"
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr ""
@@ -1828,12 +1830,12 @@ msgstr "%1$s: %3$s không sở hữu %2$s thì sẽ không loại bỏ nó.\n"
 msgid "%s: warning: can't remove "
 msgstr "%s: cảnh báo: không thể loại bỏ"
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s: không có người dùng %s\n"
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s: người dùng %s là người dùng NIS.\n"
@@ -1850,101 +1852,106 @@ msgstr ""
 msgid "%s: error removing directory %s\n"
 msgstr "%s: gặp lỗi khi loại bỏ thư mục %s.\n"
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr "Cách sử dụng: %s\t[-u uid [-o]] [-g nhóm] [-G nhóm,...] \n"
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr "\t\t[-d chính [-m]] [-s hệ_vỏ] [-c ghi_chú] [-l tên_mới]\n"
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr "[-f không_hoạt_động] [-e hết_hạn ] "
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr "[-p mật_khẩu] [-L|-U] tên\n"
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s: hết bộ nhớ trong update_group (cập nhật nhóm).\n"
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s: hết bộ nhớ trong update_shadow (cập nhật bóng).\n"
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s: chưa gõ cờ\n"
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s: cần đến mật khẩu bóng cho hai tùy chọn -e và -f\n"
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr ""
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr "%s: UID %lu không phải độc nhất.\n"
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s: gặp lỗi khi thay đổi mục ghi mật khẩu.\n"
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s: gặp lỗi khi loại bỏ mục ghi mật khẩu.\n"
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr "%s: gặp lỗi khi loại bỏ mục ghi mật khẩu bóng.\n"
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s: có thư mục %s rồi.\n"
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s: không tạo được %s.\n"
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s: không chown (thay đổi quyền sở hữu) được %s.\n"
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s: không thể thay đổi lại thư mục %s thành %s.\n"
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%1$s: cảnh báo: %3$s không sở hữu %2$s.\n"
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr "không thay đổi người sở hữu hộp thư được"
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr "không thay đổi tên hộp thư được"
 
@@ -1981,6 +1988,31 @@ msgstr ""
 "`vipw' thì sửa đổi /etc/passwd        `vipw -s' thì sửa đổi /etc/shadow\n"
 "`vigr' thì sửa đổi /etc/group         `vigr -s' thì sửa đổi /etc/gshadow\n"
 
+#, fuzzy
+#~ msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
+#~ msgstr ""
+#~ "Cách sử dụng: useradd [-u uid [-o]] [-g nhóm] [-G nhóm,...] \n"
+#~ "(useradd: thêm người dùng)\n"
+
+#~ msgid ""
+#~ "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+#~ msgstr "\t\t[-d chính] [-s hệ_vỏ] [-c ghi_chú] [-m [-k mẫu]]\n"
+
+#~ msgid "               [-f inactive] [-e expire]\n"
+#~ msgstr "\t\t[-f không_hoạt_động] [-e hết_hạn ]\n"
+
+#, fuzzy
+#~ msgid "               [-p passwd] [-K KEY=VALUE] name\n"
+#~ msgstr "\t\t[-p mật_khẩu] tên\n"
+
+#~ msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
+#~ msgstr ""
+#~ "       useradd -D [-g nhóm] [-b cơ_bản] [-s hệ_vỏ]\n"
+#~ "(useradd: thêm người dùng)\n"
+
+#~ msgid "%s: -O requires NAME=VALUE\n"
+#~ msgstr "%s: -O cần đến TÊN=GIÁ_TRỊ\n"
+
 #~ msgid "unknown uid: %u\n"
 #~ msgstr "uid lạ: %u\n"
 
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 95020c31..99c796c5 100644
Binary files a/po/zh_CN.gmo and b/po/zh_CN.gmo differ
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e2c97f82..915aa1cd 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
 "PO-Revision-Date: 2004-05-14 10:26+1200\n"
 "Last-Translator: Carlos Z.F. Liu <carlos_liu@yahoo.com>\n"
 "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
@@ -138,12 +138,12 @@ msgstr "没有目录，将以 HOME=/ 登录"
 msgid "Cannot execute %s"
 msgstr "无法执行 %s"
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "无效的根目录“%s”\n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "无法将根目录改变为“%s”\n"
@@ -163,16 +163,16 @@ msgstr "无法为配置信息分配空间。\n"
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr "配置错误 - 未知项目“%s”(请通知管理员)\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "密码："
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "%s 的密码："
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -191,147 +191,147 @@ msgid ""
 "  -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n"
 msgstr ""
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "请输入新值，或直接敲回车键以使用默认值\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "最小密码年龄"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "最大密码年龄"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "最近一次密码修改时间 (YYYY-MM-DD)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "密码过期警告"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "密码失效"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "帐户过期时间 (YYYY-MM-DD)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, fuzzy, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "最近一次密码修改时间 (YYYY-MM-DD)"
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, fuzzy, c-format
 msgid "never\n"
 msgstr "从不\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, fuzzy, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "密码过期：\t"
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, fuzzy, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "密码失效：\t"
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, fuzzy, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "帐户过期：\t"
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr ""
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s：请不要与其它标志一同使用“l”\n"
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, fuzzy, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s：没有权限\n"
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s：PAM 验证失败\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s：无法打开密码文件\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s：未知用户：%s\n"
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
-msgstr "%s：无法锁定影子密码文件"
+msgid "%s: can't lock shadow password file\n"
+msgstr "%s：无法锁定影子密码文件\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
-msgstr "%s：无法打开影子密码文件"
+msgid "%s: can't open shadow password file\n"
+msgstr "%s：无法打开影子密码文件\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "正在为 %s 修改年龄信息\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s：改变字段时出错\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s：无法更新密码文件\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s：无法更新影子密码文件\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s：无法重写影子密码文件\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s：无法重写密码文件\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr "%s：PAM chauthtok 失败\n"
@@ -440,7 +440,7 @@ msgstr "无法锁定密码文件；稍后再试。\n"
 msgid "Cannot open the password file.\n"
 msgstr "无法打开密码文件。\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s：未在 /etc/passwd 中找到 %s\n"
@@ -639,7 +639,7 @@ msgstr "%s：-A 需要影子组密码\n"
 msgid "Who are you?\n"
 msgstr "你是谁？\n"
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "未知组：%s\n"
@@ -732,12 +732,12 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr "用法：groupadd [-g gid [-o]] [-f] 组\n"
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s：增加新组条目时出错\n"
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr "%s：名称 %s 并不唯一\n"
@@ -757,24 +757,24 @@ msgstr "%s：无法获取独有的 gid\n"
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s：%s 不是有效的组名\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr "%s：无效组名 %s\n"
 
-#: src/groupadd.c:325 src/useradd.c:1058
-#, c-format
-msgid "%s: -O requires NAME=VALUE\n"
+#: src/groupadd.c:332 src/useradd.c:1094
+#, fuzzy, c-format
+msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s：-O 需要 NAME=VALUE\n"
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s：无法重写组文件\n"
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s：无法重写影子组文件\n"
@@ -834,7 +834,7 @@ msgstr "%s：%s 组不存在\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s：%s 组是一个 NIS 组\n"
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s：%s 是 NIS 管理员\n"
@@ -1090,7 +1090,7 @@ msgstr ""
 "\n"
 "[忽略断线要求 -- 允许 root 登录。]\n"
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
@@ -1099,17 +1099,17 @@ msgstr ""
 "\n"
 "登录超时 %d 秒\n"
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr " 在“%.100s”上，来自“%.200s”"
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr "在“%.100s”上"
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
@@ -1118,25 +1118,25 @@ msgstr ""
 "\n"
 "%s 用户名："
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr "登录错误"
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "警告：在短暂的锁定后将恢复登录。\n"
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr "上次登录：%s 在 %s 上"
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr "上次登录：%.19s 在 %s 上"
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr " 来自 %.*s"
@@ -1151,21 +1151,21 @@ msgstr "用法：newgrp [-] [组]\n"
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "用法：sg 组 [[-c] 命令]\n"
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, fuzzy, c-format
 msgid "unknown UID: %u\n"
 msgstr "未知的 GID：%lu\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr "未知的 GID：%lu\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr "抱歉。\n"
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr "用户组过多\n"
@@ -1311,7 +1311,7 @@ msgstr "%s：内存溢出\n"
 msgid "%s: Cannot execute %s"
 msgstr "%s：无法执行 %s"
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s：不支持 %s 存储。\n"
@@ -1428,35 +1428,35 @@ msgstr "%s：不能更新用户 %s 的条目\n"
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s：无法删除影子密码文件\n"
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr "抱歉"
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s：必须从终端中执行\n"
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr "%s：pam_start：错误 %d\n"
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr "未知 id：%s\n"
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "您没有被授权 su %s\n"
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr "(请输入您自己的密码)"
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -1465,7 +1465,7 @@ msgstr ""
 "%s：%s\n"
 "(忽略)\n"
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr "没有 shell\n"
@@ -1490,12 +1490,12 @@ msgstr "请输入您自己的密码作为验证。\n"
 msgid "No password file\n"
 msgstr "没有密码文件\n"
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr "没有“root”的密码项\n"
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
@@ -1505,219 +1505,225 @@ msgstr ""
 "敲击 control-d 即可继续使用普通帐户环境，\n"
 "(或者输入 root 密码以进行系统维护)："
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr "正在进入系统维护模式\n"
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s：无效的数字参数“%s”\n"
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s：未知的 GID %s\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s：未知的组 %s\n"
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s：无法创建新的默认文件\n"
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr "%s：无法打开新的默认文件\n"
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr "%s：改名：%s"
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s：“%s”组是一个 NIS 组。\n"
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s：指定了过多组(最多 %d)。\n"
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
-msgstr "用法：useradd [-u uid [-o]] [-g 组] [-G 组,...] \n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
+msgstr ""
 
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
-msgstr "               [-d 主目录] [-s shell] [-c 注释] [-m [-k 模板]]\n"
-
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr "               [-f 失效日] [-e 过期日 ]\n"
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr "               [-p 密码] 名称\n"
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr "       useradd -D [-g 组] [-b 主目录] [-s shell]\n"
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s：锁定组文件时出错\n"
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s：打开组文件时出错\n"
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s：锁定影子组文件时出错\n"
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s：打开影子组文件时出错\n"
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, fuzzy, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s：gid %u 并不唯一\n"
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, fuzzy, c-format
 msgid "%s: can't get unique UID\n"
 msgstr "%s：无法获取独有的 gid\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr "%s：无效的主目录“%s”\n"
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr "%s：无效注释“%s”\n"
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s：无效的主目录“%s”\n"
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s：无效日期“%s”\n"
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr "%s：-e 参数需要有影子密码\n"
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr "%s：-f 参数需要有影子密码\n"
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s：无效字段 “%s”\n"
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr "%s：无效 shell“%s”\n"
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr "%s：无效用户名“%s”\n"
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s：无法重写密码文件\n"
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s：无法重写影子密码文件\n"
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s：无法锁定密码文件\n"
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s：无法打开密码文件\n"
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s：无法锁定影子密码文件\n"
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s：无法打开影子密码文件\n"
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr "%s：加入新密码项时出错\n"
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr "%s：加入新影子密码项时出错\n"
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s：无法创建目录 %s\n"
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr ""
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, fuzzy, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr "%s：不能更新用户 %s 的条目\n"
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s：用户 %s 已存在\n"
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
 msgstr "%s：%s 组已经存在 - 如果您想将此用户加入到该组，请使用 -g 参数。\n"
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s：警告：CREATE_HOME 未被支持，请使用 -m 参数。\n"
@@ -1767,12 +1773,12 @@ msgstr "%s：%s 并不属于 %s，所以不会删除\n"
 msgid "%s: warning: can't remove "
 msgstr "%s：警告：无法删除"
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s：用户 %s 不存在\n"
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s：用户 %s 是 NIS 用户\n"
@@ -1787,101 +1793,106 @@ msgstr "%s：不能删除目录 %s (因为这将删除用户 %s 的主目录)\n"
 msgid "%s: error removing directory %s\n"
 msgstr "%s：删除目录 %s 时出错\n"
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, fuzzy, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr "用法：%s\t[-u uid [-o]] [-g 组] [-G 组,...] \n"
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr "\t\t[-d 主目录 [-m]] [-s shell] [-c 注释] [-l 新名称]\n"
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr "[-f 失效日] [-e 过期日] "
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr "[-p 密码] [-L|-U] 名称\n"
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s：update_group 内存溢出\n"
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s：update_gshadow 内存溢出\n"
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s：没有指定标志\n"
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s：-e 和 -f 参数需要影子密码\n"
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr ""
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr "%s：uid %lu 不唯一\n"
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s：改变密码项时出错\n"
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s：删除密码项时出错\n"
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr "%s：删除影子密码项时出错\n"
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s：目录 %s 不存在\n"
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s：无法创建 %s\n"
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s：无法改变 %s 的所有者和组别\n"
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s：无法将目录 %s 改名为 %s\n"
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s：警告：%s 不属于 %s\n"
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr "改变信箱所有者失败"
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr "无法为信箱改名"
 
@@ -1918,6 +1929,27 @@ msgstr ""
 "“vipw” 编辑 /etc/passwd      “vipw -s” 编辑 /etc/shadow\n"
 "“vigr” 编辑 /etc/group       “vigr -s” 编辑 /etc/gshadow\n"
 
+#, fuzzy
+#~ msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
+#~ msgstr "用法：useradd [-u uid [-o]] [-g 组] [-G 组,...] \n"
+
+#~ msgid ""
+#~ "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+#~ msgstr "               [-d 主目录] [-s shell] [-c 注释] [-m [-k 模板]]\n"
+
+#~ msgid "               [-f inactive] [-e expire]\n"
+#~ msgstr "               [-f 失效日] [-e 过期日 ]\n"
+
+#, fuzzy
+#~ msgid "               [-p passwd] [-K KEY=VALUE] name\n"
+#~ msgstr "               [-p 密码] 名称\n"
+
+#~ msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
+#~ msgstr "       useradd -D [-g 组] [-b 主目录] [-s shell]\n"
+
+#~ msgid "%s: -O requires NAME=VALUE\n"
+#~ msgstr "%s：-O 需要 NAME=VALUE\n"
+
 #~ msgid "unknown uid: %u\n"
 #~ msgstr "未知的 uid：%u\n"
 
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index 5014f858..f1f5b353 100644
Binary files a/po/zh_TW.gmo and b/po/zh_TW.gmo differ
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 397bfe87..2507edd3 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 17:48+0200\n"
+"POT-Creation-Date: 2005-07-18 16:02+0200\n"
 "PO-Revision-Date: 2005-06-02 22:20+0800\n"
 "Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -144,12 +144,12 @@ msgstr "沒有目錄，將以 HOME=/ 登入"
 msgid "Cannot execute %s"
 msgstr "無法執行 %s"
 
-#: libmisc/sub.c:55
+#: libmisc/sub.c:56
 #, c-format
 msgid "Invalid root directory \"%s\"\n"
 msgstr "無效的根目錄“%s”\n"
 
-#: libmisc/sub.c:67
+#: libmisc/sub.c:68
 #, c-format
 msgid "Can't change root directory to \"%s\"\n"
 msgstr "無法將根目錄改變為“%s”\n"
@@ -169,16 +169,16 @@ msgstr "無法為設定訊息配置空間。\n"
 msgid "configuration error - unknown item '%s' (notify administrator)\n"
 msgstr "配置錯誤 - 未知項目“%s”(請通知管理員)\n"
 
-#: lib/pwauth.c:45 src/newgrp.c:338
+#: lib/pwauth.c:48 src/newgrp.c:384
 msgid "Password: "
 msgstr "密碼："
 
-#: lib/pwauth.c:47
+#: lib/pwauth.c:50
 #, c-format
 msgid "%s's Password: "
 msgstr "%s 的密碼："
 
-#: src/chage.c:110
+#: src/chage.c:115
 #, fuzzy, c-format
 msgid ""
 "Usage: chage [options] user\n"
@@ -208,147 +208,147 @@ msgstr ""
 "  -M, --maxdays MAX_DAYS\t最多必須相隔 MIN_DAYS 天才能改變密碼\n"
 "  -W, --warndays WARN_DAYS\t密碼在過期前 WARN_DAYS 天會發出警告\n"
 
-#: src/chage.c:155 src/chfn.c:139 src/chsh.c:89
+#: src/chage.c:160 src/chfn.c:139 src/chsh.c:89
 #, c-format
 msgid "Enter the new value, or press ENTER for the default\n"
 msgstr "請輸入新值，或直接按 ENTER 鍵以使用預設值\n"
 
-#: src/chage.c:159
+#: src/chage.c:164
 msgid "Minimum Password Age"
 msgstr "密碼期限最小值"
 
-#: src/chage.c:165
+#: src/chage.c:170
 msgid "Maximum Password Age"
 msgstr "密碼期限最大值"
 
-#: src/chage.c:172
+#: src/chage.c:177
 msgid "Last Password Change (YYYY-MM-DD)"
 msgstr "最近一次密碼修改時間 (YYYY-MM-DD)"
 
-#: src/chage.c:180
+#: src/chage.c:185
 msgid "Password Expiration Warning"
 msgstr "密碼過期警告"
 
-#: src/chage.c:186
+#: src/chage.c:191
 msgid "Password Inactive"
 msgstr "密碼失效"
 
-#: src/chage.c:194
+#: src/chage.c:199
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "帳戶過期時間 (YYYY-MM-DD)"
 
-#: src/chage.c:241
+#: src/chage.c:246
 #, c-format
 msgid "Last password change\t\t\t\t\t: "
 msgstr "最近一次密碼修改時間\t\t\t\t\t："
 
-#: src/chage.c:243 src/chage.c:257 src/chage.c:273 src/chage.c:286
+#: src/chage.c:248 src/chage.c:262 src/chage.c:278 src/chage.c:291
 #, c-format
 msgid "never\n"
 msgstr "從不\n"
 
-#: src/chage.c:254
+#: src/chage.c:259
 #, c-format
 msgid "Password expires\t\t\t\t\t: "
 msgstr "密碼過期\t\t\t\t\t："
 
-#: src/chage.c:270
+#: src/chage.c:275
 #, c-format
 msgid "Password inactive\t\t\t\t\t: "
 msgstr "密碼失效\t\t\t\t\t："
 
-#: src/chage.c:284
+#: src/chage.c:289
 #, c-format
 msgid "Account expires\t\t\t\t\t\t: "
 msgstr "帳戶過期\t\t\t\t\t："
 
-#: src/chage.c:300
+#: src/chage.c:305
 #, c-format
 msgid "Minimum number of days between password change\t\t: %ld\n"
 msgstr "最少必須相隔幾天才能改變密碼\t\t\t\t：%ld\n"
 
-#: src/chage.c:302
+#: src/chage.c:307
 #, c-format
 msgid "Maximum number of days between password change\t\t: %ld\n"
 msgstr "最多必須相隔幾天才能改變密碼\t\t\t\t：%ld\n"
 
-#: src/chage.c:304
+#: src/chage.c:309
 #, c-format
 msgid "Number of days of warning before password expires\t: %ld\n"
 msgstr "在密碼將要過期之前多少天會發出警告\t\t\t\t：%ld\n"
 
-#: src/chage.c:462
+#: src/chage.c:467
 #, c-format
 msgid "%s: do not include \"l\" with other flags\n"
 msgstr "%s：請不要與其它標誌一同使用“l”\n"
 
-#: src/chage.c:474 src/chage.c:602 src/chfn.c:268 src/chfn.c:277
+#: src/chage.c:479 src/chage.c:607 src/chfn.c:268 src/chfn.c:277
 #: src/chfn.c:286 src/chfn.c:295 src/chfn.c:304 src/chfn.c:370 src/chfn.c:382
-#: src/gpasswd.c:150 src/login.c:426 src/passwd.c:769 src/passwd.c:805
+#: src/gpasswd.c:150 src/login.c:430 src/passwd.c:769 src/passwd.c:805
 #, c-format
 msgid "%s: Permission denied.\n"
 msgstr "%s：權限被拒。\n"
 
-#: src/chage.c:507 src/chage.c:713 src/chpasswd.c:173 src/groupadd.c:488
-#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1469
-#: src/userdel.c:567 src/usermod.c:1272 src/usermod.c:1326
+#: src/chage.c:512 src/chage.c:718 src/chpasswd.c:173 src/groupadd.c:488
+#: src/groupdel.c:274 src/groupmod.c:456 src/newusers.c:355 src/useradd.c:1518
+#: src/userdel.c:567 src/usermod.c:1283 src/usermod.c:1337
 #, c-format
 msgid "%s: PAM authentication failed\n"
 msgstr "%s：PAM 驗証失敗\n"
 
-#: src/chage.c:525 src/chpasswd.c:188
+#: src/chage.c:530 src/chpasswd.c:188
 #, c-format
 msgid "%s: can't open password file\n"
 msgstr "%s：無法打開密碼文件\n"
 
-#: src/chage.c:532 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
+#: src/chage.c:537 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139
 #: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:811
 #, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s：未知使用者：%s\n"
 
-#: src/chage.c:550
+#: src/chage.c:555
 #, c-format
-msgid "%s: can't lock shadow password file"
-msgstr "%s：無法鎖定shadow密碼文件"
+msgid "%s: can't lock shadow password file\n"
+msgstr "%s：無法鎖定shadow密碼文件\n"
 
-#: src/chage.c:558
+#: src/chage.c:563
 #, c-format
-msgid "%s: can't open shadow password file"
-msgstr "%s：無法打開影子密碼文件"
+msgid "%s: can't open shadow password file\n"
+msgstr "%s：無法打開影子密碼文件\n"
 
-#: src/chage.c:618
+#: src/chage.c:623
 #, c-format
 msgid "Changing the aging information for %s\n"
 msgstr "正在為 %s 修改年齡訊息\n"
 
-#: src/chage.c:620
+#: src/chage.c:625
 #, c-format
 msgid "%s: error changing fields\n"
 msgstr "%s：改變字段時出錯\n"
 
-#: src/chage.c:644 src/pwunconv.c:136
+#: src/chage.c:649 src/pwunconv.c:136
 #, c-format
 msgid "%s: can't update password file\n"
 msgstr "%s：無法更新密碼檔案\n"
 
-#: src/chage.c:667 src/pwunconv.c:131
+#: src/chage.c:672 src/pwunconv.c:131
 #, c-format
 msgid "%s: can't update shadow password file\n"
 msgstr "%s：無法更新shadow密碼檔案\n"
 
-#: src/chage.c:680
+#: src/chage.c:685
 #, c-format
 msgid "%s: can't rewrite shadow password file\n"
 msgstr "%s：無法重寫shadow密碼檔案\n"
 
-#: src/chage.c:724
+#: src/chage.c:729
 #, c-format
 msgid "%s: can't rewrite password file\n"
 msgstr "%s：無法重寫密碼檔案\n"
 
-#: src/chage.c:743 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
-#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1564 src/userdel.c:689
+#: src/chage.c:748 src/chpasswd.c:357 src/groupadd.c:534 src/groupdel.c:339
+#: src/groupmod.c:523 src/newusers.c:570 src/useradd.c:1613 src/userdel.c:689
 #, c-format
 msgid "%s: PAM chauthtok failed\n"
 msgstr "%s：PAM chauthtok 失敗\n"
@@ -457,7 +457,7 @@ msgstr "無法鎖定密碼檔案﹔稍後再試。\n"
 msgid "Cannot open the password file.\n"
 msgstr "無法打開密碼檔案。\n"
 
-#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:982
+#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:477 src/usermod.c:993
 #, c-format
 msgid "%s: %s not found in /etc/passwd\n"
 msgstr "%s：未在 /etc/passwd 中找到 %s\n"
@@ -674,7 +674,7 @@ msgstr "%s：-A 需要shadow群組密碼\n"
 msgid "Who are you?\n"
 msgstr "你是誰？\n"
 
-#: src/gpasswd.c:299 src/newgrp.c:289
+#: src/gpasswd.c:299 src/newgrp.c:318
 #, c-format
 msgid "unknown group: %s\n"
 msgstr "未知群組：%s\n"
@@ -767,12 +767,12 @@ msgid "Usage: groupadd [-g gid [-o]] [-f] group\n"
 msgstr "用法：groupadd [-g gid [-o]] [-f] 群組\n"
 
 #: src/groupadd.c:161 src/groupadd.c:169 src/groupmod.c:174 src/groupmod.c:196
-#: src/useradd.c:823 src/usermod.c:496 src/usermod.c:618
+#: src/useradd.c:839 src/usermod.c:495 src/usermod.c:617
 #, c-format
 msgid "%s: error adding new group entry\n"
 msgstr "%s：增加新群組項目時出錯\n"
 
-#: src/groupadd.c:218 src/useradd.c:870
+#: src/groupadd.c:218 src/useradd.c:886
 #, c-format
 msgid "%s: name %s is not unique\n"
 msgstr "%s：名稱 %s 並不唯一\n"
@@ -792,24 +792,24 @@ msgstr "%s：無法獲取獨有的 gid\n"
 msgid "%s: %s is not a valid group name\n"
 msgstr "%s：%s 不是有效的群組名\n"
 
-#: src/groupadd.c:308 src/groupmod.c:307
+#: src/groupadd.c:318 src/groupmod.c:307
 #, c-format
 msgid "%s: invalid group %s\n"
 msgstr "%s：無效群組名 %s\n"
 
-#: src/groupadd.c:325 src/useradd.c:1058
-#, c-format
-msgid "%s: -O requires NAME=VALUE\n"
+#: src/groupadd.c:332 src/useradd.c:1094
+#, fuzzy, c-format
+msgid "%s: -K requires KEY=VALUE\n"
 msgstr "%s：-O 需要 NAME=VALUE\n"
 
-#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1167
-#: src/userdel.c:247 src/usermod.c:504
+#: src/groupadd.c:369 src/groupdel.c:123 src/groupmod.c:342 src/useradd.c:1214
+#: src/userdel.c:247 src/usermod.c:503
 #, c-format
 msgid "%s: cannot rewrite group file\n"
 msgstr "%s：無法重寫群組檔案\n"
 
-#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1175
-#: src/userdel.c:253 src/usermod.c:627
+#: src/groupadd.c:376 src/groupdel.c:130 src/groupmod.c:349 src/useradd.c:1222
+#: src/userdel.c:253 src/usermod.c:626
 #, c-format
 msgid "%s: cannot rewrite shadow group file\n"
 msgstr "%s：無法重寫shadow群組檔案\n"
@@ -869,7 +869,7 @@ msgstr "%s：%s 群組不存在\n"
 msgid "%s: group %s is a NIS group\n"
 msgstr "%s：%s 群組是一個 NIS 群組\n"
 
-#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:723
+#: src/groupdel.c:306 src/groupmod.c:489 src/userdel.c:603 src/usermod.c:722
 #, c-format
 msgid "%s: %s is the NIS master\n"
 msgstr "%s：%s 是 NIS 管理員\n"
@@ -1131,7 +1131,7 @@ msgstr ""
 "\n"
 "[忽略斷線要求 -- 允許 root 登入。]\n"
 
-#: src/login.c:297
+#: src/login.c:302
 #, c-format
 msgid ""
 "\n"
@@ -1140,17 +1140,17 @@ msgstr ""
 "\n"
 "登入逾時 %d 秒\n"
 
-#: src/login.c:570
+#: src/login.c:576
 #, c-format
 msgid " on `%.100s' from `%.200s'"
 msgstr " 在“%.100s”上，來自“%.200s”"
 
-#: src/login.c:573
+#: src/login.c:579
 #, c-format
 msgid " on `%.100s'"
 msgstr "在“%.100s”上"
 
-#: src/login.c:730
+#: src/login.c:736
 #, c-format
 msgid ""
 "\n"
@@ -1159,25 +1159,25 @@ msgstr ""
 "\n"
 " %s 使用者名稱："
 
-#: src/login.c:885 src/sulogin.c:203
+#: src/login.c:891 src/sulogin.c:207
 msgid "Login incorrect"
 msgstr "登入錯誤"
 
-#: src/login.c:1032
+#: src/login.c:1038
 msgid "Warning: login re-enabled after temporary lockout.\n"
 msgstr "警告：在短暫的鎖定後將恢復登入。\n"
 
-#: src/login.c:1046
+#: src/login.c:1052
 #, c-format
 msgid "Last login: %s on %s"
 msgstr "上次登入：%s 在 %s 上"
 
-#: src/login.c:1049
+#: src/login.c:1055
 #, c-format
 msgid "Last login: %.19s on %s"
 msgstr "上次登入：%.19s 在 %s 上"
 
-#: src/login.c:1054
+#: src/login.c:1060
 #, c-format
 msgid " from %.*s"
 msgstr " 來自 %.*s"
@@ -1192,21 +1192,21 @@ msgstr "用法：newgrp [-] [群組]\n"
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "用法：sg 群組 [[-c] 命令]\n"
 
-#: src/newgrp.c:130
+#: src/newgrp.c:159
 #, fuzzy, c-format
 msgid "unknown UID: %u\n"
 msgstr "未知的 GID：%lu\n"
 
-#: src/newgrp.c:212
+#: src/newgrp.c:241
 #, c-format
 msgid "unknown GID: %lu\n"
 msgstr "未知的 GID：%lu\n"
 
-#: src/newgrp.c:355 src/newgrp.c:364
+#: src/newgrp.c:401 src/newgrp.c:410
 msgid "Sorry.\n"
 msgstr "抱歉。\n"
 
-#: src/newgrp.c:469
+#: src/newgrp.c:515
 #, c-format
 msgid "too many groups\n"
 msgstr "使用者群組過多\n"
@@ -1352,7 +1352,7 @@ msgstr "%s：記憶體不足\n"
 msgid "%s: Cannot execute %s"
 msgstr "%s：無法執行 %s"
 
-#: src/passwd.c:732
+#: src/passwd.c:727
 #, c-format
 msgid "%s: repository %s not supported\n"
 msgstr "%s：不支持 %s 套件存庫。\n"
@@ -1469,35 +1469,35 @@ msgstr "%s：不能更新使用者 %s 的項目\n"
 msgid "%s: can't delete shadow password file\n"
 msgstr "%s：無法刪除shadow密碼檔案\n"
 
-#: src/su.c:132
+#: src/su.c:129
 msgid "Sorry."
 msgstr "抱歉"
 
-#: src/su.c:319
+#: src/su.c:315
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s：必須從終端中執行\n"
 
-#: src/su.c:416
+#: src/su.c:412
 #, c-format
 msgid "%s: pam_start: error %d\n"
 msgstr "%s：pam_start：錯誤 %d\n"
 
-#: src/su.c:444
+#: src/su.c:440
 #, c-format
 msgid "Unknown id: %s\n"
 msgstr "未知 id：%s\n"
 
-#: src/su.c:479 src/su.c:495
+#: src/su.c:475 src/su.c:491
 #, c-format
 msgid "You are not authorized to su %s\n"
 msgstr "您沒有被授權 su %s\n"
 
-#: src/su.c:490
+#: src/su.c:486
 msgid "(Enter your own password.)"
 msgstr "(請輸入您自己的密碼)"
 
-#: src/su.c:522
+#: src/su.c:520
 #, c-format
 msgid ""
 "%s: %s\n"
@@ -1506,7 +1506,7 @@ msgstr ""
 "%s：%s\n"
 "(忽略)\n"
 
-#: src/su.c:730
+#: src/su.c:727
 #, c-format
 msgid "No shell\n"
 msgstr "沒有 shell\n"
@@ -1531,12 +1531,12 @@ msgstr "請輸入您自己的密碼作為驗証。\n"
 msgid "No password file\n"
 msgstr "沒有密碼檔案\n"
 
-#: src/sulogin.c:160
+#: src/sulogin.c:164
 #, c-format
 msgid "No password entry for 'root'\n"
 msgstr "沒有“root”的密碼項目\n"
 
-#: src/sulogin.c:175
+#: src/sulogin.c:179
 msgid ""
 "\n"
 "Type control-d to proceed with normal startup,\n"
@@ -1546,220 +1546,226 @@ msgstr ""
 "按下 control-d 即可繼續使用普通帳戶環境，\n"
 "(或者輸入 root 密碼以進行系統維護)："
 
-#: src/sulogin.c:210
+#: src/sulogin.c:214
 msgid "Entering System Maintenance Mode\n"
 msgstr "正在進入系統維護模式\n"
 
-#: src/useradd.c:221 src/useradd.c:234 src/usermod.c:664 src/usermod.c:677
+#: src/useradd.c:222 src/useradd.c:235 src/usermod.c:663 src/usermod.c:676
 #, c-format
 msgid "%s: invalid numeric argument `%s'\n"
 msgstr "%s：無效的數字參數“%s”\n"
 
-#: src/useradd.c:289
+#: src/useradd.c:290
 #, c-format
 msgid "%s: unknown GID %s\n"
 msgstr "%s：未知的 GID %s\n"
 
-#: src/useradd.c:297 src/useradd.c:573 src/useradd.c:1014 src/usermod.c:217
-#: src/usermod.c:785
+#: src/useradd.c:298 src/useradd.c:574 src/useradd.c:1058 src/usermod.c:216
+#: src/usermod.c:788
 #, c-format
 msgid "%s: unknown group %s\n"
 msgstr "%s：未知的群組 %s\n"
 
-#: src/useradd.c:405
+#: src/useradd.c:406
 #, c-format
 msgid "%s: cannot create new defaults file\n"
 msgstr "%s：無法建立新的預設檔案\n"
 
-#: src/useradd.c:410
+#: src/useradd.c:411
 #, c-format
 msgid "%s: cannot open new defaults file\n"
 msgstr "%s：無法打開新的預設檔案\n"
 
-#: src/useradd.c:498 src/useradd.c:509
+#: src/useradd.c:499 src/useradd.c:510
 #, c-format
 msgid "%s: rename: %s"
 msgstr "%s：更名：%s"
 
-#: src/useradd.c:594 src/usermod.c:238
+#: src/useradd.c:595 src/usermod.c:237
 #, c-format
 msgid "%s: group `%s' is a NIS group.\n"
 msgstr "%s：“%s”群組是一個 NIS 群組。\n"
 
-#: src/useradd.c:603 src/usermod.c:247
+#: src/useradd.c:604 src/usermod.c:246
 #, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s：指定了過多群組(最多 %d)。\n"
 
-#: src/useradd.c:635
+#: src/useradd.c:634
 #, c-format
-msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
-msgstr "用法：useradd [-u uid [-o]] [-g 群組] [-G 群組,...] \n"
+msgid ""
+"Usage: useradd [options] LOGIN\n"
+"\n"
+"Options:\n"
+"  -b, --base-dir BASE_DIR\tbase directory for the 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"
+msgstr ""
 
-#: src/useradd.c:638
-#, c-format
-msgid "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
-msgstr "               [-d 主目錄] [-s shell] [-c 注釋] [-m [-k 模板]]\n"
-
-#: src/useradd.c:639 src/useradd.c:643
-#, c-format
-msgid "               [-f inactive] [-e expire]\n"
-msgstr "               [-f 失效日] [-e 過期日 ]\n"
-
-#: src/useradd.c:640
-#, c-format
-msgid "               [-p passwd] name\n"
-msgstr "               [-p 密碼] 名稱\n"
-
-#: src/useradd.c:642
-#, c-format
-msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
-msgstr "       useradd -D [-g 群組] [-b 主目錄] [-s shell]\n"
-
-#: src/useradd.c:722 src/usermod.c:426
+#: src/useradd.c:738 src/usermod.c:425
 #, c-format
 msgid "%s: error locking group file\n"
 msgstr "%s：鎖定群組檔案時出錯\n"
 
-#: src/useradd.c:726 src/usermod.c:431
+#: src/useradd.c:742 src/usermod.c:430
 #, c-format
 msgid "%s: error opening group file\n"
 msgstr "%s：打開群組檔案時出錯\n"
 
-#: src/useradd.c:732 src/usermod.c:524
+#: src/useradd.c:748 src/usermod.c:523
 #, c-format
 msgid "%s: error locking shadow group file\n"
 msgstr "%s：鎖定shadow群組檔案時出錯\n"
 
-#: src/useradd.c:737 src/usermod.c:530
+#: src/useradd.c:753 src/usermod.c:529
 #, c-format
 msgid "%s: error opening shadow group file\n"
 msgstr "%s：打開shadow群組檔案時出錯\n"
 
-#: src/useradd.c:875
+#: src/useradd.c:891
 #, fuzzy, c-format
 msgid "%s: UID %u is not unique\n"
 msgstr "%s：gid %u 並不唯一\n"
 
-#: src/useradd.c:905
+#: src/useradd.c:921
 #, fuzzy, c-format
 msgid "%s: can't get unique UID\n"
 msgstr "%s：無法獲取獨有的 gid\n"
 
-#: src/useradd.c:936
+#: src/useradd.c:977
 #, c-format
 msgid "%s: invalid base directory `%s'\n"
 msgstr "%s：無效的主目錄“%s”\n"
 
-#: src/useradd.c:946
+#: src/useradd.c:988
 #, c-format
 msgid "%s: invalid comment `%s'\n"
 msgstr "%s：無效注釋“%s”\n"
 
-#: src/useradd.c:957
+#: src/useradd.c:1000
 #, c-format
 msgid "%s: invalid home directory `%s'\n"
 msgstr "%s：無效的主目錄“%s”\n"
 
-#: src/useradd.c:975 src/usermod.c:768
+#: src/useradd.c:1018 src/usermod.c:771
 #, c-format
 msgid "%s: invalid date `%s'\n"
 msgstr "%s：無效日期“%s”\n"
 
-#: src/useradd.c:988
+#: src/useradd.c:1031
 #, c-format
 msgid "%s: shadow passwords required for -e\n"
 msgstr "%s：-e 參數需要有shadow密碼\n"
 
-#: src/useradd.c:1004
+#: src/useradd.c:1047
 #, c-format
 msgid "%s: shadow passwords required for -f\n"
 msgstr "%s：-f 參數需要有shadow密碼\n"
 
-#: src/useradd.c:1070 src/usermod.c:745 src/usermod.c:755 src/usermod.c:800
-#: src/usermod.c:844
+#: src/useradd.c:1113 src/usermod.c:748 src/usermod.c:758 src/usermod.c:803
+#: src/usermod.c:847
 #, c-format
 msgid "%s: invalid field `%s'\n"
 msgstr "%s：無效字段 “%s”\n"
 
-#: src/useradd.c:1081
+#: src/useradd.c:1126
 #, c-format
 msgid "%s: invalid shell `%s'\n"
 msgstr "%s：無效 shell“%s”\n"
 
-#: src/useradd.c:1122
+#: src/useradd.c:1169
 #, c-format
 msgid "%s: invalid user name '%s'\n"
 msgstr "%s：無效使用者名稱“%s”\n"
 
-#: src/useradd.c:1156 src/userdel.c:242 src/usermod.c:909
+#: src/useradd.c:1203 src/userdel.c:242 src/usermod.c:920
 #, c-format
 msgid "%s: cannot rewrite password file\n"
 msgstr "%s：無法重寫密碼檔案\n"
 
-#: src/useradd.c:1161 src/userdel.c:245 src/usermod.c:914
+#: src/useradd.c:1208 src/userdel.c:245 src/usermod.c:925
 #, c-format
 msgid "%s: cannot rewrite shadow password file\n"
 msgstr "%s：無法重寫shadow密碼檔案\n"
 
-#: src/useradd.c:1197 src/userdel.c:289 src/usermod.c:942
+#: src/useradd.c:1244 src/userdel.c:289 src/usermod.c:953
 #, c-format
 msgid "%s: unable to lock password file\n"
 msgstr "%s：無法鎖定密碼檔案\n"
 
-#: src/useradd.c:1201 src/userdel.c:293 src/usermod.c:946
+#: src/useradd.c:1248 src/userdel.c:293 src/usermod.c:957
 #, c-format
 msgid "%s: unable to open password file\n"
 msgstr "%s：無法打開密碼檔案\n"
 
-#: src/useradd.c:1207 src/userdel.c:298 src/usermod.c:951
+#: src/useradd.c:1254 src/userdel.c:298 src/usermod.c:962
 #, c-format
 msgid "%s: cannot lock shadow password file\n"
 msgstr "%s：無法鎖定shadow密碼檔案\n"
 
-#: src/useradd.c:1213 src/userdel.c:303 src/usermod.c:956
+#: src/useradd.c:1260 src/userdel.c:303 src/usermod.c:967
 #, c-format
 msgid "%s: cannot open shadow password file\n"
 msgstr "%s：無法打開shadow密碼檔案\n"
 
-#: src/useradd.c:1300
+#: src/useradd.c:1347
 #, c-format
 msgid "%s: error adding new password entry\n"
 msgstr "%s：加入新密碼項目時出錯\n"
 
-#: src/useradd.c:1310 src/usermod.c:1019
+#: src/useradd.c:1358 src/usermod.c:1030
 #, c-format
 msgid "%s: error adding new shadow password entry\n"
 msgstr "%s：加入新shadow密碼項時出錯\n"
 
-#: src/useradd.c:1337
+#: src/useradd.c:1386
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s：無法建立目錄 %s\n"
 
-#: src/useradd.c:1367
+#: src/useradd.c:1416
 #, c-format
 msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n"
 msgstr "找不到名為 \"mail\" 的群組，以 0600 模式來建立郵件暫存檔。\n"
 
-#: src/useradd.c:1390
+#: src/useradd.c:1439
 #, c-format
 msgid "Can't create mail spool for user %s.\n"
 msgstr "無法替使用者 %s 建立郵件暫存檔。\n"
 
-#: src/useradd.c:1492 src/usermod.c:888
+#: src/useradd.c:1541 src/usermod.c:899
 #, c-format
 msgid "%s: user %s exists\n"
 msgstr "%s：使用者 %s 已存在\n"
 
-#: src/useradd.c:1506
+#: src/useradd.c:1555
 #, c-format
 msgid ""
 "%s: group %s exists - if you want to add this user to that group, use -g.\n"
 msgstr ""
 "%s：%s 群組已經存在 - 如果您想將此使用者加入到該群組，請使用 -g 參數。\n"
 
-#: src/useradd.c:1544
+#: src/useradd.c:1593
 #, c-format
 msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n"
 msgstr "%s：警告：CREATE_HOME 不支援，請使用 -m 參數。\n"
@@ -1809,12 +1815,12 @@ msgstr "%s：%s 並不屬於 %s，所以不會刪除\n"
 msgid "%s: warning: can't remove "
 msgstr "%s：警告：無法刪除"
 
-#: src/userdel.c:584 src/usermod.c:702
+#: src/userdel.c:584 src/usermod.c:701
 #, c-format
 msgid "%s: user %s does not exist\n"
 msgstr "%s：使用者 %s 不存在\n"
 
-#: src/userdel.c:599 src/usermod.c:718
+#: src/userdel.c:599 src/usermod.c:717
 #, c-format
 msgid "%s: user %s is a NIS user\n"
 msgstr "%s：使用者 %s 是 NIS 使用者\n"
@@ -1829,101 +1835,106 @@ msgstr "%s：不能刪除目錄 %s (因為這將刪除使用者 %s 的主目錄)
 msgid "%s: error removing directory %s\n"
 msgstr "%s：刪除目錄 %s 時出錯\n"
 
-#: src/usermod.c:279
+#: src/usermod.c:278
 #, c-format
-msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"
+msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"
 msgstr "用法：%s\t[-u uid [-o]] [-g 群組] [-G 群組,...] \n"
 
-#: src/usermod.c:283
+#: src/usermod.c:282
 #, c-format
 msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n"
 msgstr "\t\t[-d 家目錄 [-m]] [-s shell] [-c 注釋] [-l 新名稱]\n"
 
-#: src/usermod.c:285
+#: src/usermod.c:284
 #, c-format
 msgid "[-f inactive] [-e expire] "
 msgstr "[-f 失效日] [-e 過期日 ] "
 
-#: src/usermod.c:286
+#: src/usermod.c:285
 #, c-format
 msgid "[-p passwd] [-L|-U] name\n"
 msgstr "[-p 密碼] [-L|-U] 名稱\n"
 
-#: src/usermod.c:458
+#: src/usermod.c:457
 #, c-format
 msgid "%s: out of memory in update_group\n"
 msgstr "%s：update_group 時記憶體不足\n"
 
-#: src/usermod.c:567
+#: src/usermod.c:566
 #, c-format
 msgid "%s: out of memory in update_gshadow\n"
 msgstr "%s：update_gshadow 時記憶體不足\n"
 
-#: src/usermod.c:867
+#: src/usermod.c:870
 #, c-format
 msgid "%s: no flags given\n"
 msgstr "%s：沒有指定標誌\n"
 
-#: src/usermod.c:873
+#: src/usermod.c:876
 #, c-format
 msgid "%s: shadow passwords required for -e and -f\n"
 msgstr "%s：-e 和 -f 參數需要shadow密碼\n"
 
-#: src/usermod.c:893
+#: src/usermod.c:886
+#, c-format
+msgid "%s: -a flag is ONLY allowed with the -G flag\n"
+msgstr ""
+
+#: src/usermod.c:904
 #, c-format
 msgid "%s: uid %lu is not unique\n"
 msgstr "%s：uid %lu 不唯一\n"
 
-#: src/usermod.c:1004
+#: src/usermod.c:1015
 #, c-format
 msgid "%s: error changing password entry\n"
 msgstr "%s：改變密碼項目時出錯\n"
 
-#: src/usermod.c:1010
+#: src/usermod.c:1021
 #, c-format
 msgid "%s: error removing password entry\n"
 msgstr "%s：移除密碼項時出錯\n"
 
-#: src/usermod.c:1026
+#: src/usermod.c:1037
 #, c-format
 msgid "%s: error removing shadow password entry\n"
 msgstr "%s：刪除shadow密碼項目時出錯\n"
 
-#: src/usermod.c:1053
+#: src/usermod.c:1064
 #, c-format
 msgid "%s: directory %s exists\n"
 msgstr "%s：目錄 %s 不存在\n"
 
-#: src/usermod.c:1061
+#: src/usermod.c:1072
 #, c-format
 msgid "%s: can't create %s\n"
 msgstr "%s：無法建立 %s\n"
 
-#: src/usermod.c:1066
+#: src/usermod.c:1077
 #, c-format
 msgid "%s: can't chown %s\n"
 msgstr "%s：無法改變 %s 的所有者和群組\n"
 
-#: src/usermod.c:1078
+#: src/usermod.c:1089
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
 msgstr ""
 
-#: src/usermod.c:1088
+#: src/usermod.c:1099
 #, c-format
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s：無法將目錄 %s 改名為 %s\n"
 
-#: src/usermod.c:1183
+#: src/usermod.c:1194
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s：警告：%s 不屬於 %s\n"
 
-#: src/usermod.c:1189
+#: src/usermod.c:1200
 msgid "failed to change mailbox owner"
 msgstr "改變信箱所有者失敗"
 
-#: src/usermod.c:1197
+#: src/usermod.c:1208
 msgid "failed to rename mailbox"
 msgstr "無法為信箱改名"
 
@@ -1960,6 +1971,27 @@ msgstr ""
 "“vipw” 編輯 /etc/passwd      “vipw -s” 編輯 /etc/shadow\n"
 "“vigr” 編輯 /etc/group       “vigr -s” 編輯 /etc/gshadow\n"
 
+#, fuzzy
+#~ msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"
+#~ msgstr "用法：useradd [-u uid [-o]] [-g 群組] [-G 群組,...] \n"
+
+#~ msgid ""
+#~ "               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"
+#~ msgstr "               [-d 主目錄] [-s shell] [-c 注釋] [-m [-k 模板]]\n"
+
+#~ msgid "               [-f inactive] [-e expire]\n"
+#~ msgstr "               [-f 失效日] [-e 過期日 ]\n"
+
+#, fuzzy
+#~ msgid "               [-p passwd] [-K KEY=VALUE] name\n"
+#~ msgstr "               [-p 密碼] 名稱\n"
+
+#~ msgid "       useradd -D [-g group] [-b base] [-s shell]\n"
+#~ msgstr "       useradd -D [-g 群組] [-b 主目錄] [-s shell]\n"
+
+#~ msgid "%s: -O requires NAME=VALUE\n"
+#~ msgstr "%s：-O 需要 NAME=VALUE\n"
+
 #~ msgid "unknown uid: %u\n"
 #~ msgstr "未知的 uid：%u\n"
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 5ae2c321..ac580c0e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,8 +20,8 @@ INCLUDES = \
 # and installation would be much simpler (just two directories,
 # $prefix/bin and $prefix/sbin, no install-data hacks...)
 
-bin_PROGRAMS = groups login su
-ubin_PROGRAMS = faillog lastlog chage chfn chsh expiry gpasswd newgrp passwd
+bin_PROGRAMS   = groups login su
+ubin_PROGRAMS  = faillog lastlog chage chfn chsh expiry gpasswd newgrp passwd
 usbin_PROGRAMS = \
 	chpasswd \
 	groupadd \
@@ -40,38 +40,40 @@ usbin_PROGRAMS = \
 	usermod \
 	vipw
 
-login_SOURCES = \
-	login.c \
-	login_nopam.c
-
+# id and groups are from gnu, sulogin from sysvinit
 noinst_PROGRAMS = id sulogin
 
-# id and groups are from gnu, sulogin from sysvinit
+suidbins       = su
+suidubins      = chage chfn chsh expiry gpasswd newgrp passwd
 
-suidbins = su
-suidubins = chage chfn chsh expiry gpasswd newgrp passwd
-
-LDADD = $(top_builddir)/libmisc/libmisc.a \
-	$(top_builddir)/lib/libshadow.la
+LDADD 	       = $(top_builddir)/libmisc/libmisc.a \
+		 $(top_builddir)/lib/libshadow.la
+AM_CPPFLAGS    = -DLOCALEDIR=\"$(datadir)/locale\"
 
 chpasswd_LDADD = $(LDADD) $(LIBPAM)
 chage_LDADD    = $(LDADD) $(LIBPAM)
 chfn_LDADD     = $(LDADD) $(LIBPAM)
+chsh_SOURCES   = \
+	chsh.c \
+	chsh_chkshell.c
 chsh_LDADD     = $(LDADD) $(LIBPAM)
 groupadd_LDADD = $(LDADD) $(LIBPAM)
 groupdel_LDADD = $(LDADD) $(LIBPAM)
 groupmod_LDADD = $(LDADD) $(LIBPAM)
+login_SOURCES  = \
+	login.c \
+	login_nopam.c
 login_LDADD    = $(LDADD) $(LIBPAM)
 newusers_LDADD = $(LDADD) $(LIBPAM)
 passwd_LDADD   = $(LDADD) $(LIBPAM) $(LIBCRACK)
-su_SOURCES     = su.c suauth.c
+su_SOURCES     = \
+	su.c \
+	suauth.c
 su_LDADD       = $(LDADD) $(LIBPAM)
 useradd_LDADD  = $(LDADD) $(LIBPAM)
 userdel_LDADD  = $(LDADD) $(LIBPAM)
 usermod_LDADD  = $(LDADD) $(LIBPAM)
 
-AM_CPPFLAGS    = -DLOCALEDIR=\"$(datadir)/locale\"
-
 install-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 	ln -sf newgrp	$(DESTDIR)$(ubindir)/sg
diff --git a/src/Makefile.in b/src/Makefile.in
index 1b7649b3..506d2faa 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-SOURCES = chage.c chfn.c chpasswd.c chsh.c expiry.c faillog.c gpasswd.c groupadd.c groupdel.c groupmod.c groups.c grpck.c grpconv.c grpunconv.c id.c lastlog.c $(login_SOURCES) logoutd.c newgrp.c newusers.c passwd.c pwck.c pwconv.c pwunconv.c $(su_SOURCES) sulogin.c useradd.c userdel.c usermod.c vipw.c
+SOURCES = chage.c chfn.c chpasswd.c $(chsh_SOURCES) expiry.c faillog.c gpasswd.c groupadd.c groupdel.c groupmod.c groups.c grpck.c grpconv.c grpunconv.c id.c lastlog.c $(login_SOURCES) logoutd.c newgrp.c newusers.c passwd.c pwck.c pwconv.c pwunconv.c $(su_SOURCES) sulogin.c useradd.c userdel.c usermod.c vipw.c
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -77,8 +77,8 @@ chfn_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
 chpasswd_SOURCES = chpasswd.c
 chpasswd_OBJECTS = chpasswd.$(OBJEXT)
 chpasswd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
-chsh_SOURCES = chsh.c
-chsh_OBJECTS = chsh.$(OBJEXT)
+am_chsh_OBJECTS = chsh.$(OBJEXT) chsh_chkshell.$(OBJEXT)
+chsh_OBJECTS = $(am_chsh_OBJECTS)
 chsh_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
 expiry_SOURCES = expiry.c
 expiry_OBJECTS = expiry.$(OBJEXT)
@@ -202,15 +202,15 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = chage.c chfn.c chpasswd.c chsh.c expiry.c faillog.c \
+SOURCES = chage.c chfn.c chpasswd.c $(chsh_SOURCES) expiry.c faillog.c \
 	gpasswd.c groupadd.c groupdel.c groupmod.c groups.c grpck.c \
 	grpconv.c grpunconv.c id.c lastlog.c $(login_SOURCES) \
 	logoutd.c newgrp.c newusers.c passwd.c pwck.c pwconv.c \
 	pwunconv.c $(su_SOURCES) sulogin.c useradd.c userdel.c \
 	usermod.c vipw.c
-DIST_SOURCES = chage.c chfn.c chpasswd.c chsh.c expiry.c faillog.c \
-	gpasswd.c groupadd.c groupdel.c groupmod.c groups.c grpck.c \
-	grpconv.c grpunconv.c id.c lastlog.c $(login_SOURCES) \
+DIST_SOURCES = chage.c chfn.c chpasswd.c $(chsh_SOURCES) expiry.c \
+	faillog.c gpasswd.c groupadd.c groupdel.c groupmod.c groups.c \
+	grpck.c grpconv.c grpunconv.c id.c lastlog.c $(login_SOURCES) \
 	logoutd.c newgrp.c newusers.c passwd.c pwck.c pwconv.c \
 	pwunconv.c $(su_SOURCES) sulogin.c useradd.c userdel.c \
 	usermod.c vipw.c
@@ -258,10 +258,12 @@ LIBCRACK = @LIBCRACK@
 LIBCRYPT = @LIBCRYPT@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
+LIBMD = @LIBMD@
 LIBOBJS = @LIBOBJS@
 LIBPAM = @LIBPAM@
 LIBS = @LIBS@
 LIBSELINUX = @LIBSELINUX@
+LIBSKEY = @LIBSKEY@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
@@ -344,33 +346,38 @@ INCLUDES = \
 	-I${top_srcdir}/lib \
 	-I$(top_srcdir)/libmisc
 
-login_SOURCES = \
-	login.c \
-	login_nopam.c
-
-
-# id and groups are from gnu, sulogin from sysvinit
 suidbins = su
 suidubins = chage chfn chsh expiry gpasswd newgrp passwd
 LDADD = $(top_builddir)/libmisc/libmisc.a \
-	$(top_builddir)/lib/libshadow.la
+		 $(top_builddir)/lib/libshadow.la
 
+AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\"
 chpasswd_LDADD = $(LDADD) $(LIBPAM)
 chage_LDADD = $(LDADD) $(LIBPAM)
 chfn_LDADD = $(LDADD) $(LIBPAM)
+chsh_SOURCES = \
+	chsh.c \
+	chsh_chkshell.c
+
 chsh_LDADD = $(LDADD) $(LIBPAM)
 groupadd_LDADD = $(LDADD) $(LIBPAM)
 groupdel_LDADD = $(LDADD) $(LIBPAM)
 groupmod_LDADD = $(LDADD) $(LIBPAM)
+login_SOURCES = \
+	login.c \
+	login_nopam.c
+
 login_LDADD = $(LDADD) $(LIBPAM)
 newusers_LDADD = $(LDADD) $(LIBPAM)
 passwd_LDADD = $(LDADD) $(LIBPAM) $(LIBCRACK)
-su_SOURCES = su.c suauth.c
+su_SOURCES = \
+	su.c \
+	suauth.c
+
 su_LDADD = $(LDADD) $(LIBPAM)
 useradd_LDADD = $(LDADD) $(LIBPAM)
 userdel_LDADD = $(LDADD) $(LIBPAM)
 usermod_LDADD = $(LDADD) $(LIBPAM)
-AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\"
 all: all-am
 
 .SUFFIXES:
@@ -596,6 +603,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chfn.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chpasswd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chsh.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chsh_chkshell.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expiry.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/faillog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpasswd.Po@am__quote@
diff --git a/src/chage.c b/src/chage.c
index 5d5d4e87..b0c84715 100644
--- a/src/chage.c
+++ b/src/chage.c
@@ -30,7 +30,7 @@
 #include <config.h>
 
 #include "rcsid.h"
-RCSID (PKG_VER "$Id: chage.c,v 1.47 2005/06/20 15:43:09 kloczek Exp $")
+RCSID (PKG_VER "$Id: chage.c,v 1.49 2005/07/11 16:12:38 kloczek Exp $")
 #include <ctype.h>
 #include <fcntl.h>
 #include <getopt.h>
@@ -77,8 +77,13 @@ static long expdays;
 
 #define	EPOCH		"1969-12-31"
 
+
+/*
+ * exit status values
+ */
 #define E_SUCCESS	0	/* success */
 #define E_NOPERM	1	/* permission denied */
+#define E_USAGE 	2	/* invalid command syntax */
 
 /* local function prototypes */
 static void usage (void);
@@ -121,7 +126,7 @@ static void usage (void)
 			   "  -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"));
-	exit (1);
+	exit (E_USAGE);
 }
 
 static void date_to_str (char *buf, size_t maxsize, time_t date)
@@ -547,7 +552,7 @@ int main (int argc, char **argv)
 	 */
 	if (locks && !spw_lock ()) {
 		fprintf (stderr,
-			 _("%s: can't lock shadow password file"), Prog);
+			 _("%s: can't lock shadow password file\n"), Prog);
 		cleanup (1);
 		SYSLOG ((LOG_ERR, "failed locking %s", SHADOW_FILE));
 		closelog ();
@@ -555,7 +560,7 @@ int main (int argc, char **argv)
 	}
 	if (!spw_open (locks ? O_RDWR : O_RDONLY)) {
 		fprintf (stderr,
-			 _("%s: can't open shadow password file"), Prog);
+			 _("%s: can't open shadow password file\n"), Prog);
 		cleanup (2);
 		SYSLOG ((LOG_ERR, "failed opening %s", SHADOW_FILE));
 		closelog ();
@@ -752,5 +757,4 @@ int main (int argc, char **argv)
 
 	closelog ();
 	exit (E_SUCCESS);
-	/* NOTREACHED */
 }
diff --git a/src/chfn.c b/src/chfn.c
index 95ea29c6..fdc94469 100644
--- a/src/chfn.c
+++ b/src/chfn.c
@@ -30,7 +30,7 @@
 #include <config.h>
 
 #include "rcsid.h"
-RCSID (PKG_VER "$Id: chfn.c,v 1.28 2005/06/20 09:36:26 kloczek Exp $")
+RCSID (PKG_VER "$Id: chfn.c,v 1.29 2005/07/07 15:32:50 kloczek Exp $")
 #include <sys/types.h>
 #include <stdio.h>
 #include <fcntl.h>
@@ -271,24 +271,6 @@ int main (int argc, char **argv)
 			fflg++;
 			STRFCPY (fullnm, optarg);
 			break;
-		case 'r':
-			if (!may_change_field ('r')) {
-				fprintf (stderr,
-					 _("%s: Permission denied.\n"), Prog);
-				exit (1);
-			}
-			rflg++;
-			STRFCPY (roomno, optarg);
-			break;
-		case 'w':
-			if (!may_change_field ('w')) {
-				fprintf (stderr,
-					 _("%s: Permission denied.\n"), Prog);
-				exit (1);
-			}
-			wflg++;
-			STRFCPY (workph, optarg);
-			break;
 		case 'h':
 			if (!may_change_field ('h')) {
 				fprintf (stderr,
@@ -298,6 +280,15 @@ int main (int argc, char **argv)
 			hflg++;
 			STRFCPY (homeph, optarg);
 			break;
+		case 'r':
+			if (!may_change_field ('r')) {
+				fprintf (stderr,
+					 _("%s: Permission denied.\n"), Prog);
+				exit (1);
+			}
+			rflg++;
+			STRFCPY (roomno, optarg);
+			break;
 		case 'o':
 			if (!amroot) {
 				fprintf (stderr,
@@ -307,6 +298,15 @@ int main (int argc, char **argv)
 			oflg++;
 			STRFCPY (slop, optarg);
 			break;
+		case 'w':
+			if (!may_change_field ('w')) {
+				fprintf (stderr,
+					 _("%s: Permission denied.\n"), Prog);
+				exit (1);
+			}
+			wflg++;
+			STRFCPY (workph, optarg);
+			break;
 		default:
 			usage ();
 		}
diff --git a/libmisc/chkshell.c b/src/chsh_chkshell.c
similarity index 97%
rename from libmisc/chkshell.c
rename to src/chsh_chkshell.c
index da8c60e8..7e162db4 100644
--- a/libmisc/chkshell.c
+++ b/src/chsh_chkshell.c
@@ -30,7 +30,7 @@
 #include <config.h>
 
 #include "rcsid.h"
-RCSID ("$Id: chkshell.c,v 1.2 2003/04/22 10:59:21 kloczek Exp $")
+RCSID ("$Id: chsh_chkshell.c,v 1.1 2005/07/07 08:40:27 kloczek Exp $")
 #include <sys/types.h>
 #include <stdio.h>
 #include <fcntl.h>
diff --git a/src/gpasswd.c b/src/gpasswd.c
index 8ab9ccdc..708df7b8 100644
--- a/src/gpasswd.c
+++ b/src/gpasswd.c
@@ -30,7 +30,7 @@
 #include <config.h>
 
 #include "rcsid.h"
-RCSID (PKG_VER "$Id: gpasswd.c,v 1.25 2005/06/20 09:36:27 kloczek Exp $")
+RCSID (PKG_VER "$Id: gpasswd.c,v 1.26 2005/07/07 15:11:48 kloczek Exp $")
 #include <sys/types.h>
 #include <stdio.h>
 #include <pwd.h>
@@ -207,7 +207,7 @@ int main (int argc, char **argv)
 #ifdef SHADOWGRP
 	is_shadowgrp = sgr_file_present ();
 #endif
-	while ((flag = getopt (argc, argv, "a:d:grRA:M:")) != EOF) {
+	while ((flag = getopt (argc, argv, "a:A:d:gM:rR")) != EOF) {
 		switch (flag) {
 		case 'a':	/* add a user */
 			user = optarg;
diff --git a/src/groupadd.c b/src/groupadd.c
index 2c3fc597..d913b177 100644
--- a/src/groupadd.c
+++ b/src/groupadd.c
@@ -30,12 +30,17 @@
 #include <config.h>
 
 #include "rcsid.h"
-RCSID (PKG_VER "$Id: groupadd.c,v 1.33 2005/06/20 09:57:51 kloczek Exp $")
+RCSID (PKG_VER "$Id: groupadd.c,v 1.37 2005/07/18 13:17:45 kloczek Exp $")
 #include <sys/types.h>
 #include <stdio.h>
 #include <grp.h>
 #include <ctype.h>
 #include <fcntl.h>
+#ifdef USE_PAM
+#include <security/pam_appl.h>
+#include <security/pam_misc.h>
+#include <pwd.h>
+#endif				/* USE_PAM */
 #include "defines.h"
 #include "prototypes.h"
 #include "chkname.h"
@@ -44,11 +49,6 @@ RCSID (PKG_VER "$Id: groupadd.c,v 1.33 2005/06/20 09:57:51 kloczek Exp $")
 #include "nscd.h"
 #ifdef	SHADOWGRP
 #include "sgroupio.h"
-#ifdef USE_PAM
-#include <security/pam_appl.h>
-#include <security/pam_misc.h>
-#include <pwd.h>
-#endif				/* USE_PAM */
 static int is_shadow_grp;
 #endif
 
@@ -295,8 +295,18 @@ static void process_flags (int argc, char **argv)
 	char *cp;
 	int arg;
 
-	while ((arg = getopt (argc, argv, "og:O:f")) != EOF) {
+	while ((arg = getopt (argc, argv, "fg:K:o")) != EOF) {
 		switch (arg) {
+		case 'f':
+			/*
+			 * "force" - do nothing, just exit(0), if the
+			 * specified group already exists. With -g, if
+			 * specified gid already exists, choose another
+			 * (unique) gid (turn off -g). Based on the RedHat's
+			 * patch from shadow-utils-970616-9.
+			 */
+			fflg++;
+			break;
 		case 'g':
 			gflg++;
 			if (!isdigit (optarg[0]))
@@ -310,19 +320,16 @@ static void process_flags (int argc, char **argv)
 				fail_exit (E_BAD_ARG);
 			}
 			break;
-		case 'o':
-			oflg++;
-			break;
-		case 'O':
+		case 'K':
 			/*
-			 * override login.defs defaults (-O name=value)
-			 * example: -O GID_MIN=100 -O GID_MAX=499
-			 * note: -O GID_MIN=10,GID_MAX=499 doesn't work yet
+			 * override login.defs defaults (-K name=value)
+			 * example: -K GID_MIN=100 -K GID_MAX=499
+			 * note: -K GID_MIN=10,GID_MAX=499 doesn't work yet
 			 */
 			cp = strchr (optarg, '=');
 			if (!cp) {
 				fprintf (stderr,
-					 _("%s: -O requires NAME=VALUE\n"),
+					 _("%s: -K requires KEY=VALUE\n"),
 					 Prog);
 				exit (E_BAD_ARG);
 			}
@@ -331,15 +338,8 @@ static void process_flags (int argc, char **argv)
 			if (putdef_str (optarg, cp) < 0)
 				exit (E_BAD_ARG);
 			break;
-		case 'f':
-			/*
-			 * "force" - do nothing, just exit(0), if the
-			 * specified group already exists. With -g, if
-			 * specified gid already exists, choose another
-			 * (unique) gid (turn off -g). Based on the RedHat's
-			 * patch from shadow-utils-970616-9.
-			 */
-			fflg++;
+		case 'o':
+			oflg++;
 			break;
 		default:
 			usage ();
diff --git a/src/groupmod.c b/src/groupmod.c
index 54f93023..a03a9393 100644
--- a/src/groupmod.c
+++ b/src/groupmod.c
@@ -30,7 +30,7 @@
 #include <config.h>
 
 #include "rcsid.h"
-RCSID (PKG_VER "$Id: groupmod.c,v 1.28 2005/06/20 09:57:51 kloczek Exp $")
+RCSID (PKG_VER "$Id: groupmod.c,v 1.29 2005/07/07 15:11:48 kloczek Exp $")
 #include <sys/types.h>
 #include <stdio.h>
 #include <grp.h>
@@ -297,7 +297,7 @@ static void process_flags (int argc, char **argv)
 	char *end;
 	int arg;
 
-	while ((arg = getopt (argc, argv, "og:n:")) != EOF) {
+	while ((arg = getopt (argc, argv, "g:n:o")) != EOF) {
 		switch (arg) {
 		case 'g':
 			gflg++;
diff --git a/src/login.c b/src/login.c
index 7b1b5ad1..4d8c2893 100644
--- a/src/login.c
+++ b/src/login.c
@@ -30,7 +30,7 @@
 #include <config.h>
 
 #include "rcsid.h"
-RCSID (PKG_VER "$Id: login.c,v 1.59 2005/06/20 09:36:27 kloczek Exp $")
+RCSID (PKG_VER "$Id: login.c,v 1.66 2005/07/07 15:32:50 kloczek Exp $")
 #include "prototypes.h"
 #include "defines.h"
 #include <sys/stat.h>
@@ -58,7 +58,7 @@ static pam_handle_t *pamh = NULL;
 
 #define PAM_FAIL_CHECK if (retcode != PAM_SUCCESS) { \
 	fprintf(stderr,"\n%s\n",pam_strerror(pamh, retcode)); \
-	syslog(LOG_ERR,"%s",pam_strerror(pamh, retcode)); \
+	SYSLOG((LOG_ERR,"%s",pam_strerror(pamh, retcode))); \
 	pam_end(pamh, retcode); exit(1); \
    }
 #define PAM_END { retcode = pam_close_session(pamh,0); \
@@ -277,9 +277,11 @@ static void init_env (void)
 
 	if ((tmp = getenv ("TZ"))) {
 		addenv ("TZ", tmp);
-	} else if ((cp = getdef_str ("ENV_TZ")))
+	} 
+#ifndef USE_PAM
+		else if ((cp = getdef_str ("ENV_TZ")))
 		addenv (*cp == '/' ? tz (cp) : cp, NULL);
-
+#endif /* !USE_PAM */
 	/* 
 	 * Add the clock frequency so that profiling commands work
 	 * correctly.
@@ -287,8 +289,11 @@ static void init_env (void)
 
 	if ((tmp = getenv ("HZ"))) {
 		addenv ("HZ", tmp);
-	} else if ((cp = getdef_str ("ENV_HZ")))
+	} 
+#ifndef USE_PAM
+		else if ((cp = getdef_str ("ENV_HZ")))
 		addenv (cp, NULL);
+#endif /* !USE_PAM */
 }
 
 
@@ -347,8 +352,7 @@ int main (int argc, char **argv)
 	int retcode;
 	pid_t child;
 	char *pam_user;
-#endif				/* USE_PAM */
-#ifndef USE_PAM
+#else
 	struct spwd *spwd = NULL;
 #endif
 	/*
@@ -371,8 +375,8 @@ int main (int argc, char **argv)
 
 	while ((flag = getopt (argc, argv, "d:f::h:pr:")) != EOF) {
 		switch (flag) {
-		case 'p':
-			pflg++;
+		case 'd':
+			/* "-d device" ignored for compatibility */
 			break;
 		case 'f':
 			/*
@@ -389,6 +393,11 @@ int main (int argc, char **argv)
 			if (optarg)
 				STRFCPY (username, optarg);
 			break;
+		case 'h':
+			hflg++;
+			hostname = optarg;
+			reason = PW_TELNET;
+			break;
 #ifdef	RLOGIN
 		case 'r':
 			rflg++;
@@ -396,13 +405,8 @@ int main (int argc, char **argv)
 			reason = PW_RLOGIN;
 			break;
 #endif
-		case 'h':
-			hflg++;
-			hostname = optarg;
-			reason = PW_TELNET;
-			break;
-		case 'd':
-			/* "-d device" ignored for compatibility */
+		case 'p':
+			pflg++;
 			break;
 		default:
 			usage ();
@@ -503,6 +507,7 @@ int main (int argc, char **argv)
 
 		setup_tty ();
 
+#ifndef USE_PAM
 		umask (getdef_num ("UMASK", 077));
 
 		{
@@ -519,6 +524,7 @@ int main (int argc, char **argv)
 				set_filesize_limit (limit);
 		}
 
+#endif
 		/*
 		 * The entire environment will be preserved if the -p flag
 		 * is used.
@@ -589,8 +595,8 @@ int main (int argc, char **argv)
 			fprintf (stderr,
 				 "login: PAM Failure, aborting: %s\n",
 				 pam_strerror (pamh, retcode));
-			syslog (LOG_ERR, "Couldn't initialize PAM: %s",
-				pam_strerror (pamh, retcode));
+			SYSLOG ((LOG_ERR, "Couldn't initialize PAM: %s",
+				pam_strerror (pamh, retcode)));
 			exit (99);
 		}
 		/*
@@ -649,10 +655,10 @@ int main (int argc, char **argv)
 				(retcode == PAM_AUTHINFO_UNAVAIL))) {
 				pam_get_item (pamh, PAM_USER,
 					      (const void **) &pam_user);
-				syslog (LOG_NOTICE,
+				SYSLOG ((LOG_NOTICE,
 					"FAILED LOGIN %d FROM %s FOR %s, %s",
 					failcount, hostname, pam_user,
-					pam_strerror (pamh, retcode));
+					pam_strerror (pamh, retcode)));
 #ifdef HAVE_PAM_FAIL_DELAY
 				pam_fail_delay (pamh, 1000000 * delay);
 #endif
@@ -666,16 +672,16 @@ int main (int argc, char **argv)
 					      (const void **) &pam_user);
 
 				if (retcode == PAM_MAXTRIES)
-					syslog (LOG_NOTICE,
+					SYSLOG ((LOG_NOTICE,
 						"TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s",
 						failcount, hostname,
 						pam_user,
-						pam_strerror (pamh, retcode));
+						pam_strerror (pamh, retcode)));
 				else
-					syslog (LOG_NOTICE,
+					SYSLOG ((LOG_NOTICE,
 						"FAILED LOGIN SESSION FROM %s FOR %s, %s",
 						hostname, pam_user,
-						pam_strerror (pamh, retcode));
+						pam_strerror (pamh, retcode)));
 
 				fprintf (stderr, "\nLogin incorrect\n");
 				pam_end (pamh, retcode);
diff --git a/src/login_nopam.c b/src/login_nopam.c
index 8f124fb2..8425285f 100644
--- a/src/login_nopam.c
+++ b/src/login_nopam.c
@@ -23,7 +23,7 @@
 
 #ifndef USE_PAM
 #include "rcsid.h"
-RCSID ("$Id: login_nopam.c,v 1.3 2005/04/17 15:38:56 kloczek Exp $")
+RCSID ("$Id: login_nopam.c,v 1.5 2005/07/02 17:53:06 kloczek Exp $")
 #include "prototypes.h"
     /*
      * This module implements a simple but effective form of login access
@@ -103,9 +103,9 @@ int login_access (const char *user, const char *from)
 		while (!match && fgets (line, sizeof (line), fp)) {
 			lineno++;
 			if (line[end = strlen (line) - 1] != '\n') {
-				syslog (LOG_ERR,
+				SYSLOG ((LOG_ERR,
 					"%s: line %d: missing newline or line too long",
-					TABLE, lineno);
+					TABLE, lineno));
 				continue;
 			}
 			if (line[0] == '#')
@@ -119,15 +119,15 @@ int login_access (const char *user, const char *from)
 			    || !(users = strtok ((char *) 0, fs))
 			    || !(froms = strtok ((char *) 0, fs))
 			    || strtok ((char *) 0, fs)) {
-				syslog (LOG_ERR,
+				SYSLOG ((LOG_ERR,
 					"%s: line %d: bad field count",
-					TABLE, lineno);
+					TABLE, lineno));
 				continue;
 			}
 			if (perm[0] != '+' && perm[0] != '-') {
-				syslog (LOG_ERR,
+				SYSLOG ((LOG_ERR,
 					"%s: line %d: bad first field",
-					TABLE, lineno);
+					TABLE, lineno));
 				continue;
 			}
 			match = (list_match (froms, from, from_match)
@@ -135,7 +135,7 @@ int login_access (const char *user, const char *from)
 		}
 		(void) fclose (fp);
 	} else if (errno != ENOENT) {
-		syslog (LOG_ERR, "cannot open %s: %m", TABLE);
+		SYSLOG ((LOG_ERR, "cannot open %s: %m", TABLE));
 	}
 	return (match == 0 || (line[0] == '+'));
 }
@@ -262,7 +262,7 @@ char *string;
 	if (hp)
 		return inet_ntoa (*((struct in_addr *) *(hp->h_addr_list)));
 
-	syslog (LOG_ERR, "%s - unknown host", string);
+	SYSLOG ((LOG_ERR, "%s - unknown host", string));
 	return string;
 }
 
diff --git a/src/logoutd.c b/src/logoutd.c
index d5532d11..add70319 100644
--- a/src/logoutd.c
+++ b/src/logoutd.c
@@ -30,7 +30,7 @@
 #include <config.h>
 
 #include "rcsid.h"
-RCSID (PKG_VER "$Id: logoutd.c,v 1.25 2005/03/31 05:14:54 kloczek Exp $")
+RCSID (PKG_VER "$Id: logoutd.c,v 1.26 2005/07/05 20:17:51 kloczek Exp $")
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
@@ -153,15 +153,7 @@ int main (int argc, char **argv)
 #ifndef DEBUG
 	for (i = 0; close (i) == 0; i++);
 
-#ifdef HAVE_SETPGRP
-#ifdef SETPGRP_VOID
-	setpgrp ();		/* USG */
-#else
-	setpgrp (getpid (), getpid ());
-#endif
-#else				/* !HAVE_SETPGRP */
-	setpgid (getpid (), getpid ());	/* BSD || SUN || SUN4 */
-#endif				/* !HAVE_SETPGRP */
+	setpgrp ();
 
 	/*
 	 * Put this process in the background.
diff --git a/src/newgrp.c b/src/newgrp.c
index c5e1e743..c9f35c24 100644
--- a/src/newgrp.c
+++ b/src/newgrp.c
@@ -30,7 +30,7 @@
 #include <config.h>
 
 #include "rcsid.h"
-RCSID (PKG_VER "$Id: newgrp.c,v 1.32 2005/06/20 10:17:08 kloczek Exp $")
+RCSID (PKG_VER "$Id: newgrp.c,v 1.34 2005/07/08 17:58:55 kloczek Exp $")
 #include <stdio.h>
 #include <errno.h>
 #include <grp.h>
@@ -63,6 +63,35 @@ static void usage (void)
 		fprintf (stderr, _("Usage: sg group [[-c] command]\n"));
 }
 
+/*
+ * find_matching_group - search all groups of a given group id for
+ *                       membership of a given username
+ */
+
+static struct group *find_matching_group (const char *name, gid_t gid)
+{
+	struct group *gr;
+	char **look;
+	int notfound = 1;
+
+	setgrent ();
+	while ((gr = getgrent ()) != NULL) {
+		if (gr->gr_gid != gid) {
+			continue;
+		}
+		/*
+		 * A group with matching GID was found.
+		 * Test for membership of 'name'.
+		 */
+		look = gr->gr_mem;
+		while (*look && (notfound = strcmp (*look++, name)));
+		if (!notfound)
+			break;
+	}
+	endgrent ();
+	return gr;
+}
+
 /*
  * newgrp - change the invokers current real and effective group id
  */
@@ -289,6 +318,23 @@ int main (int argc, char **argv)
 		fprintf (stderr, _("unknown group: %s\n"), group);
 		goto failure;
 	}
+
+	/*
+	 * For splitted groups (due to limitations of NIS), check all 
+	 * groups of the same GID like the requested group for
+	 * membership of the current user.
+	 */
+	grp = find_matching_group (name, grp->gr_gid);
+	if (!grp) {
+		/*
+		 * No matching group found. As we already know that
+		 * the group exists, this happens only in the case
+		 * of a requested group where the user is not member.
+		 *
+		 * Re-read the group entry for further processing.
+		 */
+		grp = getgrnam (group);
+	}
 #ifdef SHADOWGRP
 	if ((sgrp = getsgnam (group))) {
 		grp->gr_passwd = sgrp->sg_passwd;
diff --git a/src/passwd.c b/src/passwd.c
index 48f59946..3ddc4989 100644
--- a/src/passwd.c
+++ b/src/passwd.c
@@ -30,7 +30,7 @@
 #include <config.h>
 
 #include "rcsid.h"
-RCSID (PKG_VER "$Id: passwd.c,v 1.39 2005/06/20 09:36:27 kloczek Exp $")
+RCSID (PKG_VER "$Id: passwd.c,v 1.41 2005/07/07 15:32:50 kloczek Exp $")
 #include "prototypes.h"
 #include "defines.h"
 #include <sys/types.h>
@@ -670,22 +670,17 @@ int main (int argc, char **argv)
 	 */
 
 
-	while ((flag = getopt (argc, argv, "adlqr:uSekn:x:i:w:")) != EOF) {
+	while ((flag = getopt (argc, argv, "adei:kln:qr:Suw:x:")) != EOF) {
 		switch (flag) {
-		case 'x':
-			age_max = getnumber (optarg);
-			xflg++;
+		case 'a':
+			aflg++;
+			break;
+		case 'd':
+			dflg++;
 			anyflag = 1;
 			break;
-		case 'n':
-			age_min = getnumber (optarg);
-			nflg++;
-			anyflag = 1;
-			break;
-		case 'w':
-			warn = getnumber (optarg);
-			if (warn >= -1)
-				wflg++;
+		case 'e':
+			eflg++;
 			anyflag = 1;
 			break;
 		case 'i':
@@ -694,16 +689,18 @@ int main (int argc, char **argv)
 				iflg++;
 			anyflag = 1;
 			break;
-		case 'e':
-			eflg++;
-			anyflag = 1;
-			break;
 		case 'k':
 			/* change only if expired, like Linux-PAM passwd -k. */
 			kflg++;	/* ok for users */
 			break;
-		case 'a':
-			aflg++;
+		case 'l':
+			lflg++;
+			anyflag = 1;
+			break;
+		case 'n':
+			age_min = getnumber (optarg);
+			nflg++;
+			anyflag = 1;
 			break;
 		case 'q':
 			qflg++;	/* ok for users */
@@ -711,18 +708,16 @@ int main (int argc, char **argv)
 		case 'S':
 			Sflg++;	/* ok for users */
 			break;
-		case 'd':
-			dflg++;
-			anyflag = 1;
-			break;
-		case 'l':
-			lflg++;
-			anyflag = 1;
-			break;
 		case 'u':
 			uflg++;
 			anyflag = 1;
 			break;
+		case 'w':
+			warn = getnumber (optarg);
+			if (warn >= -1)
+				wflg++;
+			anyflag = 1;
+			break;
 		case 'r':
 			/* -r repository (files|nis|nisplus) */
 			/* only "files" supported for now */
@@ -734,6 +729,11 @@ int main (int argc, char **argv)
 				exit (E_BAD_ARG);
 			}
 			break;
+		case 'x':
+			age_max = getnumber (optarg);
+			xflg++;
+			anyflag = 1;
+			break;
 		default:
 			usage (E_BAD_ARG);
 		}
diff --git a/src/su.c b/src/su.c
index 370a8dde..d3abe03b 100644
--- a/src/su.c
+++ b/src/su.c
@@ -30,42 +30,40 @@
 #include <config.h>
 
 #include "rcsid.h"
-RCSID (PKG_VER "$Id: su.c,v 1.34 2005/06/20 10:17:08 kloczek Exp $")
-#include <sys/types.h>
+RCSID (PKG_VER "$Id: su.c,v 1.39 2005/07/18 10:14:39 kloczek Exp $")
+#include <grp.h>
+#include <pwd.h>
+#include <signal.h>
 #include <stdio.h>
+#include <sys/types.h>
+#include "prototypes.h"
+#include "defines.h"
+#include "pwauth.h"
+#include "getdef.h"
 #ifdef USE_PAM
 #include "pam_defs.h"
+#endif
+/*
+ * Assorted #defines to control su's behavior
+ */
+/*
+ * Global variables
+ */
+/* not needed by sulog.c anymore */
+static char name[BUFSIZ];
+static char oldname[BUFSIZ];
+
+#ifdef USE_PAM
 static const struct pam_conv conv = {
 	misc_conv,
 	NULL
 };
 
 static pam_handle_t *pamh = NULL;
+static int caught = 0;
 #endif
 
-#include "prototypes.h"
-#include "defines.h"
-
-#include <grp.h>
-#include <signal.h>
-#include <pwd.h>
-#include "pwauth.h"
-#include "getdef.h"
-
-/*
- * Assorted #defines to control su's behavior
- */
-
-/*
- * Global variables
- */
-
-/* not needed by sulog.c anymore */
-static char name[BUFSIZ];
-static char oldname[BUFSIZ];
-
 static char *Prog;
-
 extern struct passwd pwent;
 
 /*
@@ -73,9 +71,8 @@ extern struct passwd pwent;
  */
 
 extern char **newenvp;
-extern size_t newenvc;
-
 extern char **environ;
+extern size_t newenvc;
 
 /* local function prototypes */
 
@@ -133,9 +130,8 @@ static void su_failure (const char *tty)
 	exit (1);
 }
 
-#ifdef USE_PAM
-static int caught = 0;
 
+#ifdef USE_PAM
 /* Signal handler for parent process later */
 static void su_catch_sig (int sig)
 {
@@ -341,13 +337,6 @@ int main (int argc, char **argv)
 	 */
 
 	if (fakelogin) {
-		if ((cp = getdef_str ("ENV_TZ")))
-			addenv (*cp == '/' ? tz (cp) : cp, NULL);
-		/*
-		 * The clock frequency will be reset to the login value if required
-		 */
-		if ((cp = getdef_str ("ENV_HZ")))
-			addenv (cp, NULL);	/* set the default $HZ, if one */
 		/*
 		 * The terminal type will be left alone if it is present in
 		 * the environment already.
@@ -355,6 +344,13 @@ int main (int argc, char **argv)
 		if ((cp = getenv ("TERM")))
 			addenv ("TERM", cp);
 #ifndef USE_PAM
+		if ((cp = getdef_str ("ENV_TZ")))
+			addenv (*cp == '/' ? tz (cp) : cp, NULL);
+		/*
+		 * The clock frequency will be reset to the login value if required
+		 */
+		if ((cp = getdef_str ("ENV_HZ")))
+			addenv (cp, NULL);	/* set the default $HZ, if one */
 		/*
 		 * Also leave DISPLAY and XAUTHORITY if present, else
 		 * pam_xauth will not work.
@@ -506,6 +502,8 @@ int main (int argc, char **argv)
 	if (pwent.pw_shell[0] == '\0')
 		pwent.pw_shell = "/bin/sh";	/* XXX warning: const */
 
+	signal (SIGINT, SIG_IGN);
+	signal (SIGQUIT, SIG_IGN);
 #ifdef USE_PAM
 	ret = pam_authenticate (pamh, 0);
 	if (ret != PAM_SUCCESS) {
@@ -586,6 +584,7 @@ int main (int argc, char **argv)
 #endif				/* !USE_PAM */
 
 	signal (SIGINT, SIG_DFL);
+#ifndef USE_PAM
 	cp = getdef_str ((pwent.pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH");
 
 	/* XXX very similar code duplicated in libmisc/setupenv.c */
@@ -597,10 +596,8 @@ int main (int argc, char **argv)
 		addenv ("PATH", cp);
 	}
 
-/* setup the environment for pam later on, else we run into auth problems */
-#ifndef USE_PAM
 	environ = newenvp;	/* make new environment active */
-#endif
+#endif				/* !USE_PAM */
 
 	if (getenv ("IFS"))	/* don't export user IFS ... */
 		addenv ("IFS= \t\n", NULL);	/* ... instead, set a safe IFS */
diff --git a/src/sulogin.c b/src/sulogin.c
index f4dfaad1..e45b649c 100644
--- a/src/sulogin.c
+++ b/src/sulogin.c
@@ -30,7 +30,7 @@
 #include <config.h>
 
 #include "rcsid.h"
-RCSID (PKG_VER "$Id: sulogin.c,v 1.18 2005/03/31 05:14:54 kloczek Exp $")
+RCSID (PKG_VER "$Id: sulogin.c,v 1.20 2005/07/06 11:33:06 kloczek Exp $")
 #include "prototypes.h"
 #include "defines.h"
 #include "getdef.h"
@@ -108,7 +108,7 @@ static RETSIGTYPE catch (int sig)
 			dup (0);
 		} else {
 #ifdef	USE_SYSLOG
-			syslog (LOG_WARN, "cannot open %s\n", argv[1]);
+			SYSLOG (LOG_WARN, "cannot open %s\n", argv[1]);
 			closelog ();
 #endif
 			exit (1);
@@ -117,7 +117,7 @@ static RETSIGTYPE catch (int sig)
 	if (access (PASSWD_FILE, F_OK) == -1) {	/* must be a password file! */
 		printf (_("No password file\n"));
 #ifdef	USE_SYSLOG
-		syslog (LOG_WARN, "No password file\n");
+		SYSLOG (LOG_WARN, "No password file\n");
 		closelog ();
 #endif
 		exit (1);
@@ -125,7 +125,7 @@ static RETSIGTYPE catch (int sig)
 #if !defined(DEBUG) && defined(SULOGIN_ONLY_INIT)
 	if (getppid () != 1) {	/* parent must be INIT */
 #ifdef	USE_SYSLOG
-		syslog (LOG_WARN, "Pid == %d, not 1\n", getppid ());
+		SYSLOG (LOG_WARN, "Pid == %d, not 1\n", getppid ());
 		closelog ();
 #endif
 		exit (1);
@@ -140,10 +140,14 @@ static RETSIGTYPE catch (int sig)
 	while (*envp)		/* add inherited environment, */
 		addenv (*envp++, NULL);	/* some variables change later */
 
+#ifndef USE_PAM
+
 	if ((cp = getdef_str ("ENV_TZ")))
 		addenv (*cp == '/' ? tz (cp) : cp, NULL);
 	if ((cp = getdef_str ("ENV_HZ")))
 		addenv (cp, NULL);	/* set the default $HZ, if one */
+#endif				/* !USE_PAM */
+
 	(void) strcpy (name, "root");	/* KLUDGE!!! */
 
 	signal (SIGALRM, catch);	/* exit if the timer expires */
@@ -159,7 +163,7 @@ static RETSIGTYPE catch (int sig)
 
 			printf (_("No password entry for 'root'\n"));
 #ifdef	USE_SYSLOG
-			syslog (LOG_WARN, "No password entry for 'root'\n");
+			SYSLOG (LOG_WARN, "No password entry for 'root'\n");
 			closelog ();
 #endif
 			exit (1);
@@ -181,7 +185,7 @@ static RETSIGTYPE catch (int sig)
 		 */
 		if (!cp || !*cp) {
 #ifdef	USE_SYSLOG
-			syslog (LOG_INFO, "Normal startup\n");
+			SYSLOG (LOG_INFO, "Normal startup\n");
 			closelog ();
 #endif
 			puts ("\n");
@@ -197,7 +201,7 @@ static RETSIGTYPE catch (int sig)
 			break;	/* ... encrypted passwords matched */
 
 #ifdef	USE_SYSLOG
-		syslog (LOG_WARN, "Incorrect root password\n");
+		SYSLOG (LOG_WARN, "Incorrect root password\n");
 #endif
 		sleep (2);
 		puts (_("Login incorrect"));
@@ -209,7 +213,7 @@ static RETSIGTYPE catch (int sig)
 
 	puts (_("Entering System Maintenance Mode\n"));
 #ifdef	USE_SYSLOG
-	syslog (LOG_INFO, "System Maintenance Mode\n");
+	SYSLOG (LOG_INFO, "System Maintenance Mode\n");
 #endif
 
 #ifdef	USE_SYSLOG
diff --git a/src/useradd.c b/src/useradd.c
index 7f05db39..26876375 100644
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -30,26 +30,27 @@
 #include <config.h>
 
 #include "rcsid.h"
-RCSID (PKG_VER "$Id: useradd.c,v 1.59 2005/06/20 10:17:09 kloczek Exp $")
-#include "prototypes.h"
-#include "defines.h"
-#include "chkname.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <errno.h>
-#include <pwd.h>
-#include <grp.h>
+RCSID (PKG_VER "$Id: useradd.c,v 1.67 2005/07/11 11:58:00 kloczek Exp $")
 #include <ctype.h>
+#include <errno.h>
 #include <fcntl.h>
-#include <time.h>
+#include <getopt.h>
+#include <grp.h>
+#include <lastlog.h>
+#include <pwd.h>
 #ifdef USE_PAM
 #include <security/pam_appl.h>
 #include <security/pam_misc.h>
 #include <pwd.h>
 #endif				/* USE_PAM */
+#include <stdio.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <time.h>
+#include "prototypes.h"
+#include "defines.h"
+#include "chkname.h"
 #include "pwauth.h"
-#include <lastlog.h>
 #include "faillog.h"
 #include "nscd.h"
 #ifndef SKEL_DIR
@@ -630,17 +631,32 @@ static int get_groups (char *list)
 
 static void usage (void)
 {
-	fprintf (stderr,
-		 _
-		 ("Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n"));
-	fprintf (stderr,
-		 _
-		 ("               [-d home] [-s shell] [-c comment] [-m [-k template]]\n"));
-	fprintf (stderr, _("               [-f inactive] [-e expire]\n"));
-	fprintf (stderr, _("               [-p passwd] name\n"));
-	fprintf (stderr,
-		 _("       useradd -D [-g group] [-b base] [-s shell]\n"));
-	fprintf (stderr, _("               [-f inactive] [-e expire]\n"));
+	fprintf (stderr, _("Usage: useradd [options] LOGIN\n"
+			   "\n"
+			   "Options:\n"
+			   "  -b, --base-dir BASE_DIR	base directory for the 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"));
 	exit (E_USAGE);
 }
 
@@ -920,182 +936,211 @@ static void process_flags (int argc, char **argv)
 {
 	const struct group *grp;
 	int anyflag = 0;
-	int arg;
 	char *cp;
 
-	while ((arg =
-		getopt (argc, argv, "A:Du:og:G:d:s:c:mk:p:f:e:b:O:M")) != EOF) {
-		switch (arg) {
-		case 'b':
-			if (!Dflg)
-				usage ();
+	{
+		/*
+		 * Parse the command line options.
+		 */
+		int c;
+		static struct option long_options[] = {
+			{"base-dir", required_argument, NULL, 'b'},
+			{"comment", required_argument, NULL, 'c'},
+			{"home-dir", required_argument, NULL, 'd'},
+			{"defaults", required_argument, NULL, 'D'},
+			{"expiredate", required_argument, NULL, 'e'},
+			{"inactive", required_argument, NULL, 'f'},
+			{"gid", required_argument, NULL, 'g'},
+			{"groups", required_argument, NULL, 'G'},
+			{"help", no_argument, NULL, 'h'},
+			{"skel", required_argument, NULL, 'k'},
+			{"key", required_argument, NULL, 'K'},
+			{"create-home", no_argument, NULL, 'm'},
+			{"non-unique", no_argument, NULL, 'o'},
+			{"password", required_argument, NULL, 'p'},
+			{"shell", required_argument, NULL, 's'},
+			{"uid", required_argument, NULL, 'u'},
+			{NULL, 0, NULL, '\0'}
+		};
+		while ((c =
+			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMop:s:u:",
+				     long_options, NULL)) != -1) {
+			switch (c) {
+			case 'b':
+				if (!Dflg)
+					usage ();
 
-			if (!VALID (optarg) || optarg[0] != '/') {
-				fprintf (stderr,
-					 _
-					 ("%s: invalid base directory `%s'\n"),
-					 Prog, optarg);
-				exit (E_BAD_ARG);
-			}
-			def_home = optarg;
-			bflg++;
-			break;
-		case 'c':
-			if (!VALID (optarg)) {
-				fprintf (stderr,
-					 _("%s: invalid comment `%s'\n"),
-					 Prog, optarg);
-				exit (E_BAD_ARG);
-			}
-			user_comment = optarg;
-			cflg++;
-			break;
-		case 'd':
-			if (!VALID (optarg) || optarg[0] != '/') {
-				fprintf (stderr,
-					 _
-					 ("%s: invalid home directory `%s'\n"),
-					 Prog, optarg);
-				exit (E_BAD_ARG);
-			}
-			user_home = optarg;
-			dflg++;
-			break;
-		case 'D':
-			if (anyflag)
-				usage ();
-			Dflg++;
-			break;
-		case 'e':
-			if (*optarg) {
-				user_expire = strtoday (optarg);
-				if (user_expire == -1) {
+				if (!VALID (optarg)
+				    || optarg[0] != '/') {
 					fprintf (stderr,
 						 _
-						 ("%s: invalid date `%s'\n"),
+						 ("%s: invalid base directory `%s'\n"),
 						 Prog, optarg);
 					exit (E_BAD_ARG);
 				}
-			} else
-				user_expire = -1;
+				def_home = optarg;
+				bflg++;
+				break;
+			case 'c':
+				if (!VALID (optarg)) {
+					fprintf (stderr,
+						 _
+						 ("%s: invalid comment `%s'\n"),
+						 Prog, optarg);
+					exit (E_BAD_ARG);
+				}
+				user_comment = optarg;
+				cflg++;
+				break;
+			case 'd':
+				if (!VALID (optarg)
+				    || optarg[0] != '/') {
+					fprintf (stderr,
+						 _
+						 ("%s: invalid home directory `%s'\n"),
+						 Prog, optarg);
+					exit (E_BAD_ARG);
+				}
+				user_home = optarg;
+				dflg++;
+				break;
+			case 'D':
+				if (anyflag)
+					usage ();
+				Dflg++;
+				break;
+			case 'e':
+				if (*optarg) {
+					user_expire = strtoday (optarg);
+					if (user_expire == -1) {
+						fprintf (stderr,
+							 _
+							 ("%s: invalid date `%s'\n"),
+							 Prog, optarg);
+						exit (E_BAD_ARG);
+					}
+				} else
+					user_expire = -1;
 
-			/*
-			 * -e "" is allowed - it's a no-op without /etc/shadow
-			 */
-			if (*optarg && !is_shadow_pwd) {
-				fprintf (stderr,
-					 _
-					 ("%s: shadow passwords required for -e\n"),
-					 Prog);
-				exit (E_USAGE);
+				/*
+				 * -e "" is allowed - it's a no-op without /etc/shadow
+				 */
+				if (*optarg && !is_shadow_pwd) {
+					fprintf (stderr,
+						 _
+						 ("%s: shadow passwords required for -e\n"),
+						 Prog);
+					exit (E_USAGE);
+				}
+				if (Dflg)
+					def_expire = optarg;
+				eflg++;
+				break;
+			case 'f':
+				def_inactive = get_number (optarg);
+				/*
+				 * -f -1 is allowed - it's a no-op without /etc/shadow
+				 */
+				if (def_inactive != -1 && !is_shadow_pwd) {
+					fprintf (stderr,
+						 _
+						 ("%s: shadow passwords required for -f\n"),
+						 Prog);
+					exit (E_USAGE);
+				}
+				fflg++;
+				break;
+			case 'g':
+				grp = getgr_nam_gid (optarg);
+				if (!grp) {
+					fprintf (stderr,
+						 _
+						 ("%s: unknown group %s\n"),
+						 Prog, optarg);
+					exit (E_NOTFOUND);
+				}
+				if (Dflg) {
+					def_group = grp->gr_gid;
+					def_gname = optarg;
+				} else {
+					user_gid = grp->gr_gid;
+				}
+				gflg++;
+				break;
+			case 'G':
+				if (get_groups (optarg))
+					exit (E_NOTFOUND);
+				if (user_groups[0])
+					do_grp_update++;
+				Gflg++;
+				break;
+			case 'h':
+				usage ();
+				break;
+			case 'k':
+				def_template = optarg;
+				kflg++;
+				break;
+			case 'K':
+				/*
+				 * override login.defs defaults (-K name=value)
+				 * example: -K UID_MIN=100 -K UID_MAX=499
+				 * note: -K UID_MIN=10,UID_MAX=499 doesn't work yet
+				 */
+				cp = strchr (optarg, '=');
+				if (!cp) {
+					fprintf (stderr,
+						 _
+						 ("%s: -K requires KEY=VALUE\n"),
+						 Prog);
+					exit (E_BAD_ARG);
+				}
+				/* terminate name, point to value */
+				*cp++ = '\0';
+				if (putdef_str (optarg, cp) < 0)
+					exit (E_BAD_ARG);
+				break;
+			case 'm':
+				mflg++;
+				break;
+			case 'o':
+				oflg++;
+				break;
+			case 'p':	/* set encrypted password */
+				if (!VALID (optarg)) {
+					fprintf (stderr,
+						 _
+						 ("%s: invalid field `%s'\n"),
+						 Prog, optarg);
+					exit (E_BAD_ARG);
+				}
+				user_pass = optarg;
+				break;
+			case 's':
+				if (!VALID (optarg)
+				    || (optarg[0]
+					&& (optarg[0] != '/'
+					    && optarg[0] != '*'))) {
+					fprintf (stderr,
+						 _
+						 ("%s: invalid shell `%s'\n"),
+						 Prog, optarg);
+					exit (E_BAD_ARG);
+				}
+				user_shell = optarg;
+				def_shell = optarg;
+				sflg++;
+				break;
+			case 'u':
+				user_id = get_uid (optarg);
+				uflg++;
+				break;
+			default:
+				usage ();
 			}
-			if (Dflg)
-				def_expire = optarg;
-			eflg++;
-			break;
-		case 'f':
-			def_inactive = get_number (optarg);
-			/*
-			 * -f -1 is allowed - it's a no-op without /etc/shadow
-			 */
-			if (def_inactive != -1 && !is_shadow_pwd) {
-				fprintf (stderr,
-					 _
-					 ("%s: shadow passwords required for -f\n"),
-					 Prog);
-				exit (E_USAGE);
-			}
-			fflg++;
-			break;
-		case 'g':
-			grp = getgr_nam_gid (optarg);
-			if (!grp) {
-				fprintf (stderr,
-					 _("%s: unknown group %s\n"), Prog,
-					 optarg);
-				exit (E_NOTFOUND);
-			}
-			if (Dflg) {
-				def_group = grp->gr_gid;
-				def_gname = optarg;
-			} else {
-				user_gid = grp->gr_gid;
-			}
-			gflg++;
-			break;
-		case 'G':
-			if (get_groups (optarg))
-				exit (E_NOTFOUND);
-			if (user_groups[0])
-				do_grp_update++;
-			Gflg++;
-			break;
-		case 'k':
-			def_template = optarg;
-			kflg++;
-			break;
-		case 'm':
-			mflg++;
-			break;
-		case 'M':
-			/*
-			 * don't create home dir - this is the default,
-			 * ignored for RedHat/PLD adduser compatibility.
-			 */
-			break;
-		case 'o':
-			oflg++;
-			break;
-		case 'O':
-			/*
-			 * override login.defs defaults (-O name=value)
-			 * example: -O UID_MIN=100 -O UID_MAX=499
-			 * note: -O UID_MIN=10,UID_MAX=499 doesn't work yet
-			 */
-			cp = strchr (optarg, '=');
-			if (!cp) {
-				fprintf (stderr,
-					 _("%s: -O requires NAME=VALUE\n"),
-					 Prog);
-				exit (E_BAD_ARG);
-			}
-			/* terminate name, point to value */
-			*cp++ = '\0';
-			if (putdef_str (optarg, cp) < 0)
-				exit (E_BAD_ARG);
-			break;
-		case 'p':	/* set encrypted password */
-			if (!VALID (optarg)) {
-				fprintf (stderr,
-					 _("%s: invalid field `%s'\n"),
-					 Prog, optarg);
-				exit (E_BAD_ARG);
-			}
-			user_pass = optarg;
-			break;
-		case 's':
-			if (!VALID (optarg) || (optarg[0] &&
-						(optarg[0] != '/'
-						 && optarg[0] != '*'))) {
-				fprintf (stderr,
-					 _("%s: invalid shell `%s'\n"),
-					 Prog, optarg);
-				exit (E_BAD_ARG);
-			}
-			user_shell = optarg;
-			def_shell = optarg;
-			sflg++;
-			break;
-		case 'u':
-			user_id = get_uid (optarg);
-			uflg++;
-			break;
-		default:
-			usage ();
+			anyflag++;
 		}
-		anyflag++;
 	}
-
 	/*
 	 * Certain options are only valid in combination with others.
 	 * Check it here so that they can be specified in any order.
@@ -1119,7 +1164,9 @@ static void process_flags (int argc, char **argv)
 
 		user_name = argv[optind];
 		if (!check_user_name (user_name)) {
-			fprintf (stderr, _("%s: invalid user name '%s'\n"),
+			fprintf (stderr,
+				 _
+				 ("%s: invalid user name '%s'\n"),
 				 Prog, user_name);
 			exit (E_BAD_ARG);
 		}
@@ -1307,7 +1354,8 @@ static void usr_update (void)
 
 	if (is_shadow_pwd && !spw_update (&spent)) {
 		fprintf (stderr,
-			 _("%s: error adding new shadow password entry\n"),
+			 _
+			 ("%s: error adding new shadow password entry\n"),
 			 Prog);
 		exit (E_PW_UPDATE);
 	}
@@ -1334,7 +1382,8 @@ static void create_home (void)
 		/* XXX - create missing parent directories.  --marekm */
 		if (mkdir (user_home, 0)) {
 			fprintf (stderr,
-				 _("%s: cannot create directory %s\n"),
+				 _
+				 ("%s: cannot create directory %s\n"),
 				 Prog, user_home);
 			fail_exit (E_HOMEDIR);
 		}
@@ -1377,8 +1426,8 @@ static void create_mail (void)
 			sprintf (ms, "/var/mail/%s", user_name);
 			if (access (ms, R_OK) != 0) {
 				fd = open (ms,
-					   O_CREAT | O_EXCL | O_WRONLY |
-					   O_TRUNC, 0);
+					   O_CREAT | O_EXCL |
+					   O_WRONLY | O_TRUNC, 0);
 				if (fd != -1) {
 					fchown (fd, user_id, mail_gid);
 					fchmod (fd, mode);
diff --git a/src/usermod.c b/src/usermod.c
index c86c4288..7985ee21 100644
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -30,7 +30,7 @@
 #include <config.h>
 
 #include "rcsid.h"
-RCSID (PKG_VER "$Id: usermod.c,v 1.42 2005/06/20 10:17:10 kloczek Exp $")
+RCSID (PKG_VER "$Id: usermod.c,v 1.47 2005/07/07 15:11:48 kloczek Exp $")
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
@@ -51,8 +51,14 @@ RCSID (PKG_VER "$Id: usermod.c,v 1.42 2005/06/20 10:17:10 kloczek Exp $")
 #include "faillog.h"
 #include <lastlog.h>
 #include "pwauth.h"
-#include "nscd.h"
 #include "getdef.h"
+#include "groupio.h"
+#include "nscd.h"
+#include "pwio.h"
+#ifdef	SHADOWGRP
+#include "sgroupio.h"
+#endif
+#include "shadowio.h"
 /*
  * exit status values
  * for E_GRP_UPDATE and E_NOSPACE (not used yet), other update requests
@@ -91,20 +97,21 @@ static char **user_groups;	/* NULL-terminated list */
 static char *Prog;
 
 static int
- uflg = 0,			/* specify new user ID */
-    oflg = 0,			/* permit non-unique user ID to be specified with -u */
+ aflg = 0,			/* append to existing secondary group set */
+    cflg = 0,			/* new comment (GECOS) field */
+    dflg = 0,			/* new home directory */
+    eflg = 0,			/* days since 1970-01-01 when account becomes expired */
+    fflg = 0,			/* days until account with expired password is locked */
     gflg = 0,			/* new primary group ID */
     Gflg = 0,			/* new secondary group set */
-    dflg = 0,			/* new home directory */
-    sflg = 0,			/* new shell program */
-    cflg = 0,			/* new comment (GECOS) field */
-    mflg = 0,			/* create user's home directory if it doesn't exist */
-    fflg = 0,			/* days until account with expired password is locked */
-    eflg = 0,			/* days since 1970-01-01 when account becomes expired */
     Lflg = 0,			/* lock the password */
-    Uflg = 0,			/* unlock the password */
+    lflg = 0,			/* new user name */
+    mflg = 0,			/* create user's home directory if it doesn't exist */
+    oflg = 0,			/* permit non-unique user ID to be specified with -u */
     pflg = 0,			/* new encrypted password */
-    lflg = 0;			/* new user name */
+    sflg = 0,			/* new shell program */
+    uflg = 0,			/* specify new user ID */
+    Uflg = 0;			/* unlock the password */
 
 static int is_shadow_pwd;
 
@@ -112,14 +119,6 @@ static int is_shadow_pwd;
 static int is_shadow_grp;
 #endif
 
-#include "groupio.h"
-
-#ifdef	SHADOWGRP
-#include "sgroupio.h"
-#endif
-
-#include "pwio.h"
-#include "shadowio.h"
 
 /* local function prototypes */
 static int get_groups (char *);
@@ -276,7 +275,7 @@ static void usage (void)
 {
 	fprintf (stderr,
 		 _
-		 ("Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n"),
+		 ("Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n"),
 		 Prog);
 	fprintf (stderr,
 		 _
@@ -473,7 +472,7 @@ static int update_group (void)
 					 user_name, user_newname,
 					 ngrp->gr_name));
 			}
-		} else if (was_member && Gflg && !is_member) {
+		} else if (was_member && !aflg && Gflg && !is_member) {
 			ngrp->gr_mem = del_list (ngrp->gr_mem, user_name);
 			changed = 1;
 			SYSLOG ((LOG_INFO, "delete `%s' from group `%s'",
@@ -590,7 +589,7 @@ static int update_gshadow (void)
 					 user_name, user_newname,
 					 nsgrp->sg_name));
 			}
-		} else if (was_member && Gflg && !is_member) {
+		} else if (was_member && !aflg && Gflg && !is_member) {
 			nsgrp->sg_mem = del_list (nsgrp->sg_mem, user_name);
 			changed = 1;
 			SYSLOG ((LOG_INFO,
@@ -737,8 +736,12 @@ static void process_flags (int argc, char **argv)
 		user_inactive = spwd->sp_inact;
 	}
 
-	while ((arg = getopt (argc, argv, "A:u:og:G:d:s:c:mf:e:l:p:LU")) != EOF) {
+	while ((arg =
+		getopt (argc, argv, "ac:d:e:f:g:G:l:Lmop:s:u:U")) != EOF) {
 		switch (arg) {
+		case 'a':
+			aflg++;
+			break;
 		case 'c':
 			if (!VALID (optarg)) {
 				fprintf (stderr,
@@ -878,6 +881,14 @@ static void process_flags (int argc, char **argv)
 	if (optind != argc - 1)
 		usage ();
 
+	if (aflg && (!Gflg)) {
+		fprintf (stderr,
+			 _("%s: -a flag is ONLY allowed with the -G flag\n"),
+			 Prog);
+		usage ();
+		exit (E_USAGE);
+	}
+
 	if (dflg && strcmp (user_home, user_newhome) == 0)
 		dflg = mflg = 0;
 
diff --git a/src/vipw.c b/src/vipw.c
index fa8ab557..25df96aa 100644
--- a/src/vipw.c
+++ b/src/vipw.c
@@ -23,7 +23,7 @@
 #include <config.h>
 
 #include "rcsid.h"
-RCSID (PKG_VER "$Id: vipw.c,v 1.11 2005/05/25 18:20:25 kloczek Exp $")
+RCSID (PKG_VER "$Id: vipw.c,v 1.12 2005/07/07 15:32:50 kloczek Exp $")
 #include "defines.h"
 #include <errno.h>
 #include <sys/stat.h>
@@ -219,17 +219,17 @@ int main (int argc, char **argv)
 
 	while ((flag = getopt (argc, argv, "ghps")) != EOF) {
 		switch (flag) {
-		case 'p':
-			do_vipw = 1;
-			break;
 		case 'g':
 			do_vipw = 0;
 			break;
+		case 'h':
+			e = 0;
+		case 'p':
+			do_vipw = 1;
+			break;
 		case 's':
 			editshadow = 1;
 			break;
-		case 'h':
-			e = 0;
 		default:
 			printf (_("Usage:\n\
 `vipw' edits /etc/passwd        `vipw -s' edits /etc/shadow\n\