diff --git a/ChangeLog b/ChangeLog index bdaf118c..733f4fc1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,271 @@ +2005-07-18 Tomasz K這czko + + * libmisc/pwdcheck.c: + added missing "#include " (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這czko + + * NEWS, po/sk.po: + updated for 4.0.11 (by Peter Mann ). + +2005-07-16 Tomasz K這czko + + * NEWS, po/cs.po: + updated for 4.0.11 (by Miroslav Kure ). + +2005-07-15 Tomasz K這czko + + * po/de.po, NEWS: + updated for 4.0.11 (by Frank Schmid ). + +2005-07-14 Tomasz K這czko + + * NEWS, po/pt.po: + updated for 4.0.11 (by Miguel Figueiredo ). + +2005-07-13 Tomasz K這czko + + * po/stats: reorder gsub(). + + * po/ru.po: cleanups. + + * po/ru.po, NEWS: + updated for 4.0.11 (by Yuri Kozlov ). + +2005-07-12 Tomasz K這czko + + * 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 ). + + * 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 ). + + * po/ro.po: - updated Project-Id-Version field. + + * NEWS, po/ro.po: + - updated for 4.0.11 (by Sorin B. ). + +2005-07-11 Tomasz K這czko + + * 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 ). + + * 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這czko + + * 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這czko + + * 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 + + * 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 ) + + * 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這czko + + * po/stats: improved. + + * man/groupadd.8, man/groupadd.8.xml, NEWS: + document -o option in groupadd(8). + + * configure.in: s/'"$" != "no"'/'"$" = "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 . + + * 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 ) + + * 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這czko + + * 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 for -D description and remove using tags from + . + + * 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 ) + +2005-07-05 Tomasz K這czko + + * 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這czko + + * src/login_nopam.c: fixed use SYSLOG macro. + +2005-07-01 Tomasz K這czko + + * 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這czko + + * 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 ). + + * 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 ) + + * NEWS, configure.in: start work on 4.0.11. + 2005-06-28 Tomasz K這czko * 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這czko @@ -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這czko - * 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 by . * 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 User Commands in . - * 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這czko - * 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 ). - * 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這czko @@ -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這czko - * 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這czko - * 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 ). @@ -1780,7 +2048,7 @@ 2003-05-01 Tomasz K這czko - * 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這czko - * 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 - * 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 @@ -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 @@ -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趾iewicz - * 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趾iewicz @@ -2954,7 +3222,7 @@ 1998-01-30 Marek Micha趾iewicz - * 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趾iewicz @@ -2968,7 +3236,7 @@ 1997-12-08 Marek Micha趾iewicz - * 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趾iewicz @@ -2993,12 +3261,12 @@ 1997-06-01 Marek Micha趾iewicz - * 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趾iewicz - * 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趾iewicz @@ -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 ) +- 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 ) +- 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 ) +- 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 ), +- 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 ). +- 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 ). 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 ), - 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 header file. */ #undef HAVE_LIMITS_H +/* Define if struct lastlog has ll_host */ +#undef HAVE_LL_HOST + /* Define to 1 if you have the header file. */ #undef HAVE_LOCALE_H @@ -225,6 +165,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SGTTY_H +/* Have working shadow group support in libc */ +#undef HAVE_SHADOWGRP + /* Define to 1 if you have the header file. */ #undef HAVE_SHADOW_H @@ -326,6 +269,15 @@ /* Define to 1 if you have the 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 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 and . */ #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 doesn't define. */ #undef gid_t @@ -405,3 +390,6 @@ /* Define to `int' if 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 #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 - 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 + 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 - 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 + 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 #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 @@ -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 #include #include @@ -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 +#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 , 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 #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 #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 #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 +#include #include "prototypes.h" #include "defines.h" -#include #include "pwauth.h" #ifdef HAVE_SHADOW_H #include 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 #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 #include #include @@ -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 #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 +#include #include #include "prototypes.h" #include "defines.h" -#include #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 #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 #include #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 #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 @@ - + groupadd 8 @@ -20,6 +20,7 @@ -o -f + -K KEY=VALUE group @@ -68,6 +69,33 @@ + + + + + + + Overrides /etc/login.defs defaults (GID_MIN, GID_MAX and others). Multiple + options can be specified, e.g.: + GID_MIN=100 + GID_MAX=499 + + + Note: GID_MIN=10,GID_MAX=499 + doesn't work yet. + + + + + + + + + + Allow add group wit non-unique GID. + + + @@ -129,6 +157,9 @@ passwd1 , + + gpasswd8 + , groupdel8 , 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 @@ - + groupdel 8 @@ -28,7 +28,7 @@ remap='I'>group. The named group must exist. - You must manually check all filesystems to insure that no files + You must manually check all file systems to insure that no files remain with the named group as the file group ID. @@ -90,6 +90,9 @@ passwd1 , + + gpasswd8 + , groupadd8 , 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 @@ - + groupmod 8 @@ -126,6 +126,9 @@ passwd1 , + + gpasswd8 + , groupadd8 , 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 -.\" Modified Sun 22 Sep 2002 by NAKANO Takeo -.\" -.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 @@ - + lastlog 8 @@ -92,6 +92,18 @@ + + NOTE + + The lastlog 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 + ls -l (which can indicate a really big file if + you have an high UID). You can display its real size with + ls -s. + + + FILES 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 @@ - + LOGIN 1 @@ -96,6 +96,17 @@ used as the root of a new file system which the user is actually logged into. + + The login program is NOT responsible for + removing users from the utmp file. It is the responsibility of + getty8 and + init8 to clean + up apparent ownership of a terminal session. If you use + login from the shell prompt without + exec, the user you use will continue to appear to + be logged in even after you log out of the "subsession". + + 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ｘDNIA -.B "shadowconfig" -.IR on " | " off -.SH OPIS -.PP -.B shadowconfig on -w陰cza ochron hase i grup przez dodatkowe, przes豉niane pliki (shadow); -.B shadowconfig off -wy陰cza dodatkowe pliki hase i grup. -.B shadowconfig -wy鈍ietla komunikat o b喚dzie i ko鎍zy prac z niezerowym kodem je郵i -znajdzie co nieprawid這wego. 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鏒kie wprowadzenie do ochrony hase z u篡ciem dodatkowych -plik闚 hase przes豉nianych (shadow passwords) i zwi您anych temat闚. 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 @@ - + pwck 8 @@ -15,7 +15,20 @@ pwck - -sr + -q + -s + + + passwd + + + shadow + + + + + pwck + -r passwd @@ -78,19 +91,50 @@ OPTIONS + + The options which apply to the pwck command are: + + + + + + + + + Report errors only. Using this option will not require an action + from the user. + + + + + + + + + + Execute the pwck command in read-only mode. + + + + + + + + + + Sort entries in /etc/passwd and + /etc/shadow by UID. + + + + + By default, pwck operates on the files /etc/passwd and /etc/shadow. The user may select alternate files with the passwd and shadow - parameters. Additionally, the user may execute the command in - read-only mode by specifying the flag. This causes - all questions regarding changes to be answered no without user intervention. - pwck can also sort entries in - /etc/passwd and /etc/shadow - by UID. To run it in sort mode pass it flag. No - checks are performed then, it just sorts. + parameters. 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 @@ - - - - - - 19 Apr 1997 - - - shadowconfig - 8 - 19 Apr 1997 - Debian GNU/Linux - - - shadowconfig - toggle shadow passwords on and off - - - - - shadowconfig - - on - off - - - - - - DESCRIPTION - shadowconfig on will turn shadow passwords on; - shadowconfig off will turn shadow - passwords off. shadowconfig 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. - - - - Read /usr/share/doc/passwd/README.debian for a - brief introduction - to shadow passwords and related features. - - - Note that turning shadow passwords off and on again will lose all - password - aging information. - - - 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 @@ - + su 1 @@ -58,9 +58,9 @@ /etc/login.defs. - A subsystem login is indicated by the presense of a "*" as the + 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. 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 @@ - + useradd 8 @@ -14,45 +14,21 @@ useradd - -c comment - -d home_dir - -e expire_date - -f inactive_days - - -g initial_group - -G group1 - - - ,group2, - - - , - - - groupN - - + options - - - -M -m - -k skeleton_dir - - -o - -p passwd - -s shell - - -u uid - login - useradd + LOGIN + + + useradd -D - -g group - -b home_dir - -e expire_date - - -f inactive_days - -s shell + + + useradd + -D + + options + @@ -78,29 +54,49 @@ - comment + , + COMMENT - The new user's password file comment field. + + 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. + - home_dir + , + BASE_DIR + + + The default base directory for the system if + dir is not specified. + BASE_DIR is concatenated with the + account name to define the home directory. If the + option is not used, base_dir must exist. + + + + + + , + HOME_DIR - The new user will be created using home_dir - as the value for the user's login directory. The - default is to append the login - name to home and use that as the - login directory name. + The new user will be created using HOME_DIR + as the value for the user's login directory. The default is to append + the LOGIN name to + BASE_DIR and use that as the login directory name. - expire_date + , + EXPIRE_DATE The date on which the user account will be disabled. The @@ -111,7 +107,8 @@ - inactive_days + , + INACTIVE The number of days after a password expires until the @@ -123,7 +120,8 @@ - initial_group + , + GROUP The group name or number of the user's initial login group. @@ -136,10 +134,8 @@ - group1[ - ,group2,..., - - [groupN]]] + , + GROUP1[,GROUP2,...[,GROUPN]]] A list of supplementary groups which the user is also a @@ -152,22 +148,14 @@ - - - - - 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. - - + , + + Display help message and exit. + - + , The user's home directory will be created if it does not @@ -186,27 +174,52 @@ - + , + KEY=VALUE - Allow create user with duplicate (non-unique) UID. + + Overrides /etc/login.defs defaults (UID_MIN, UID_MAX, UMASK, PASS_MAX_DAYS and + others). For example: + PASS_MAX_DAYS=-1 can be + used when creating system account to turn off password ageing, even though + system account has no password at all. Multiple options can + be specified, e.g.: + UID_MIN=100 + UID_MAX=499 + + + Note: + UID_MIN=10,UID_MAX=499 + doesn't work yet. + - passwd + , + + + Allow create user account with duplicate (non-unique) UID. + + + + + , + PASSWORD The encrypted password, as returned by - crypt3 + crypt3 . The default is to disable the account. - shell + , + SHELL The name of the user's login shell. The default is to @@ -218,7 +231,8 @@ - uid + , + UID The numerical value of the user's ID. This value must be @@ -274,7 +288,8 @@ - group + , + GROUP The group name or ID for a new user's initial group. The @@ -285,7 +300,8 @@ - shell + , + SHELL 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 @@ - + USERDEL 8 @@ -127,6 +127,9 @@ passwd1 , + + gpasswd8 + , groupadd8 , 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 @@ - + usermod 8 @@ -29,6 +29,7 @@ ,group2, , groupN + -a -l login_name @@ -134,7 +135,8 @@ same restrictions as the group given with the 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, + which appends user to the current supplementary group list. @@ -271,6 +273,9 @@ crypt3 , + + gpasswd8 + , groupadd8 , 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 + + * 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 eerovi \n" "Language-Team: Bosnian \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 rauna (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 \n" "Language-Team: Catalan \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 vlid\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_AVS\testableix els dies d'av穩s d'expiraci籀\n" "\t\t\t\ta DIES_AVS\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籀 mxima 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 mxim 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 vlid\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 vlid\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 (mx 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 vlid\n" -#: src/useradd.c:946 +#: src/useradd.c:988 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "%s: el comentari 竄%s罈 no 矇s vlid\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 vlid\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 vlida\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 vlid\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 vlid\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 vlid\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 \n" "Language-Team: Czech \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羸 koenov羸 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 koenov羸 adres獺 na \"%s\"\n" @@ -173,16 +173,16 @@ msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "" "konfiguran穩 chyba - nezn獺m羸 pedmt '%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 stisknte 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穩 zmna 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穩 zmna 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穩 poet dn轡 mezi zmnami 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穩 poet dn轡 mezi zmnami 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 "Poet varovn羸ch dn轡 ped 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: oven穩 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 "Mn穩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 pi zmn 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 pepsat\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 pepsat\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 pozdji.\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: pep穩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 pi pid獺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穩 jedinen矇\n" @@ -803,24 +803,24 @@ msgstr "%s: nelze z穩skat jedinen矇 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: pep穩na -O vy鱉aduje argument typu JMNO=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 pepsat\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 pepsat\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穩 peskoeno -- u鱉ivatel root sm穩 b羸t pihl獺禳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 vtein) pro pihl獺禳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" "Pihla禳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矇 pihl獺禳en穩" -#: src/login.c:1032 +#: src/login.c:1038 msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "Varov獺n穩: po doasn矇m z獺kazu je pihla禳ov獺n穩 opt povoleno.\n" -#: src/login.c:1046 +#: src/login.c:1052 #, c-format msgid "Last login: %s on %s" msgstr "Posledn穩 pihl獺禳en穩: %s na %s" -#: src/login.c:1049 +#: src/login.c:1055 #, c-format msgid "Last login: %.19s on %s" msgstr "Posledn穩 pihl獺禳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禳tno 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獺vnn 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 oven穩 zadejte VAE 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 "" "Stisknte control-d pro norm獺ln穩 spu禳tn穩 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 vytvoit 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 vytvoit 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: pejmenovat: %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 ZKL_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 dodaten羸ch skupin, do kter羸ch\n" +"\t\t\t\tm獺 nov羸 繳et patit\n" +" -h, --help\t\t\tzobraz穩 tuto n獺povdu a skon穩\n" +" -k, --skel VZOR_ADR \t\tzad獺 alternativn穩 vzorov羸 adres獺\n" +" -K, --key KL=HODNOTA\tpebije 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穩 vytvoen穩 u鱉ivatele s duplicitn穩m\n" +"\t\t\t\t(nejedinen羸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\tpihla禳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 pi 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 pi 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 pi 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 pi 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穩 jedinen矇\n" -#: src/useradd.c:905 +#: src/useradd.c:921 #, c-format msgid "%s: can't get unique UID\n" msgstr "%s: nelze z穩skat jedinen矇 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: pep穩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: pep穩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 pepsat\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 pepsat\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 pi 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 pi 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 vytvoit\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 vytvoit 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 pidat 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 pep穩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 pi 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 pamti 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 pamti v update_gshadow\n" -#: src/usermod.c:867 +#: src/usermod.c:870 #, c-format msgid "%s: no flags given\n" msgstr "%s: 鱉獺dn矇 pep穩nae\n" -#: src/usermod.c:873 +#: src/usermod.c:876 #, c-format msgid "%s: shadow passwords required for -e and -f\n" msgstr "%s: pep穩nae -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: pep穩na -a je povolen POUZE s pep穩naem -G\n" + +#: src/usermod.c:904 #, c-format msgid "%s: uid %lu is not unique\n" -msgstr "%s uid %lu nen穩 jedinen矇\n" +msgstr "%s: uid %lu nen穩 jedinen矇\n" -#: src/usermod.c:1004 +#: src/usermod.c:1015 #, c-format msgid "%s: error changing password entry\n" msgstr "%s: chyba pi zmn 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 pi odstraov獺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 pi odstraov獺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 vytvoit\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矇 odstrann穩 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 pejmenovat\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 pi zmn vlastn穩ka po禳tovn穩 schr獺nky" -#: src/usermod.c:1197 +#: src/usermod.c:1208 msgid "failed to rename mailbox" msgstr "chyba pi pejmenov獺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 \n" "Language-Team: Danish \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=VRDI\n" +msgid "%s: -K requires KEY=VALUE\n" +msgstr "%s: -K kr疆ver NAVN=VRDI\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 UDLBSDATO\ts疆t kontoens udl繪bsdatur til UDLBSDATO\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 NGLE=VRDI\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=VRDI\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 \n" "Language-Team: Frank Schmid \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\tberschreibt 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 \n" "Language-Team: Hellenic \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 , 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 \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 \n" "Language-Team: Spanish \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_DA\testablecer el 繳ltimo cambio de clave a " +"ULTIMO_DA\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 DAS_MIN\testablecer el n繳mero m穩nimo de d穩as antes de " +"cambiar la clave a DAS_MIN\n" +" -M, --maxdays DAS_MAXS\testablecer el n繳mero m獺ximo de d穩as antes de " +"cambiar la clave a DAS_MAX\n" +" -W, --warndays DAS_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 CONTRASEA\tusar la contrase簽a cifrada CONTRASEA 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: SLO 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 \n" "Language-Team: \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 \n" "Language-Team: Finnish \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 POISKYTST Aseta salasana pois k瓣yt繹st瓣 POISKYTST\n" +" -h, --help N瓣yt瓣 t瓣m瓣 ohje ja lopeta\n" +" -I, --inactive POISKYTST Ota salasana pois k瓣yt繹st瓣 POISKYTST\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_PIVI Aseta pienimm瓣ksi sallittuksi m瓣瓣r瓣ksi " "p瓣ivi瓣\n" " ennen salasanan vaihtamista MIN_PIVI\n" @@ -214,147 +214,147 @@ msgstr "" " -W, --warndays VAR_PIVI Aseta vanhenemisen varoitusajaksi " "VAR_PIVI\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 YLHAK 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 POISKYTST Ota salasana pois k瓣yt繹st瓣 POISKYTST\n" +" p瓣iv瓣瓣 vanhenemisen j瓣lkeen\n" +" -g, --gid RYHM Valitse itse RYHM uudelle " +"k瓣ytt瓣j瓣tunnukselle\n" +" -G, --groups RYHMT 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) \n" "Language-Team: French \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 \n" "Language-Team: Hebrew \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 \n" "Language-Team: Debian Indonesia \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 \n" "Language-Team: Italian \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 invariati perch矇 la riga sotto 癡 indentata # con due . -#: 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 invariati perch矇 la riga sotto 癡 indentata # con due . -#: 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 . -#: 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 \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 艾潦貂D [-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: 艾潦貂D %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 艾潦貂D [-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: 艾潦貂D %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: %schown扼整\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 艾潦貂D [-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 "銝芥艾潦貂D扼: %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 \n" "Language-Team: Korean \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 \n" "Language-Team: Norwegian (Nynorsk) \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 \n" "Language-Team: debian-l10n-dutch \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 \n" "Language-Team: Norwegian (Nynorsk) \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 Koczko \n" "Language-Team: Polish \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 "Nieprawidowy 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 "" "bd 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 "Haso: " -#: lib/pwauth.c:47 +#: lib/pwauth.c:50 #, c-format msgid "%s's Password: " msgstr "Haso 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\tupywem wa髒noci hasa\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 wcinij ENTER by przyj warto domyln\n" -#: src/chage.c:159 +#: src/chage.c:164 msgid "Minimum Password Age" msgstr "Minimalny wiek hasa" -#: src/chage.c:165 +#: src/chage.c:170 msgid "Maximum Password Age" msgstr "Maksymalny wiek hasa" -#: src/chage.c:172 +#: src/chage.c:177 msgid "Last Password Change (YYYY-MM-DD)" msgstr "Ostatnia zmiana hasa (RRRR-MM-DD)" -#: src/chage.c:180 +#: src/chage.c:185 msgid "Password Expiration Warning" msgstr "Ostrze髒enie o utracie wa髒noci hasa" -#: src/chage.c:186 +#: src/chage.c:191 msgid "Password Inactive" msgstr "Haso nieaktywne" -#: src/chage.c:194 +#: src/chage.c:199 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Data utraty wa髒noci 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 hasa\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 "Haso 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 "Haso 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 pomidzy zmianami hasa\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 pomidzy zmianami hasa\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 hasa upynie\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: bd 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 hasami\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 hasami" +msgid "%s: can't lock shadow password file\n" +msgstr "%s: nie mo髒na zablokowa pliku z ukrytymi hasami\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 hasami" +msgid "%s: can't open shadow password file\n" +msgstr "%s: nie mo髒na otworzy pliku z ukrytymi hasami\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: bd 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 hasami\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 hasami\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 hasami\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 hasami\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 powiodo si\n" @@ -471,7 +471,7 @@ msgstr "Nie mo髒na zablokowa pliku z hasami; spr籀buj p籀驕niej.\n" msgid "Cannot open the password file.\n" msgstr "Nie mo髒na otworzy pliku z hasami.\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 hasami 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: bd 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 prawidow 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: nieprawidowa 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 hasami 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" "[Rozczenie pominite -- 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 "Nieprawidowe 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 pamici\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 obsugiwane\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 hasami\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: bd %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 wasne haso.)" -#: 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 powoki\n" @@ -1551,12 +1551,12 @@ msgstr "Prosz wpisz swoje WASNE haso jako haso uwierzytelniajce.\n" msgid "No password file\n" msgstr "Brak pliku z hasami\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 "" "Nacinij control-d by kontynuowa normalny start\n" "(lub podaj haso 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: nieprawidowy 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 domylnymi\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 domylnymi\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 powoka] [-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 domyln konfiguracj programu " +"useradd\n" +" -e, --expiredate DATA_WA驍NOSCI\tustawia dat waznoci dla nowo tworzonego\n" +"\t\t\t\tkonta na DATA_WA驍NOSCI\n" +" -f, --inactive NIEAKTYWNE\tustwia liczb dni nieaktywnoci konta po\n" +"\t\t\t\tkt籀rych konta jest blokowane na NIEAKTYWNE\n" +" -h, --help\t\t\twywietlenie tego opisu i zakoczenie\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\tprzyso warto domyln 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 haso 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髒noci]\n" - -#: src/useradd.c:640 -#, c-format -msgid " [-p passwd] name\n" -msgstr " [-p haso] 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 powoka]\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: bd 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: bd 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: bd podczas blokowania pliku z ukrytymi hasami 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: bd podczas otwierania pliku z ukrytymi hasami 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: nieprawidowy katalog bazowy `%s'\n" -#: src/useradd.c:946 +#: src/useradd.c:988 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "%s: nieprawidowy komentarz `%s'\n" -#: src/useradd.c:957 +#: src/useradd.c:1000 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "%s: nieprawidowy 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: nieprawidowa data `%s'\n" -#: src/useradd.c:988 +#: src/useradd.c:1031 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "%s: ukryte hasa 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 hasa 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: nieprawidowe pole `%s'\n" -#: src/useradd.c:1081 +#: src/useradd.c:1126 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "%s: nieprawidowa powoka `%s'\n" -#: src/useradd.c:1122 +#: src/useradd.c:1169 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "%s: nieprawidowa 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 hasami\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 hasami\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 hasami\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 hasami\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 hasami\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 hasami\n" -#: src/useradd.c:1300 +#: src/useradd.c:1347 #, c-format msgid "%s: error adding new password entry\n" msgstr "%s: bd podczas dodawania nowego wpisu do pliku z hasami\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: bd podczas dodawania nowego wpisu do pliku z ukrytymi hasami\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 obsugiwane, u髒yj opcji -m.\n" @@ -1831,12 +1862,12 @@ msgstr "%s: wacicielem %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: bd 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 powoka] [-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髒noci] " -#: src/usermod.c:286 +#: src/usermod.c:285 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p haso] [-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: zabrako pamici 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: zabrako pamici 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 hasa 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: bd podczas zmiany wpisu w pliku z hasami\n" -#: src/usermod.c:1010 +#: src/usermod.c:1021 #, c-format msgid "%s: error removing password entry\n" msgstr "%s: bd podczas usuwania wpisu z pliku z hasami\n" -#: src/usermod.c:1026 +#: src/usermod.c:1037 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "%s: bd podczas usuwania wpisu z pliku z ukrytymi hasami\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 waciciela %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 powiodo si cakowite 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: wacicielem %s nie jest %s\n" -#: src/usermod.c:1189 +#: src/usermod.c:1200 msgid "failed to change mailbox owner" msgstr "zmiana waciciela skrzynki pocztowej nie powioda si" -#: src/usermod.c:1197 +#: src/usermod.c:1208 msgid "failed to rename mailbox" msgstr "zmiana nazwy skrzynki pocztowej nie powioda 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 powoka] [-c komentarz] [-m [-k wz籀r]]\n" + +#~ msgid " [-f inactive] [-e expire]\n" +#~ msgstr " [-f nieaktywne] [-e utrata_wa髒noci]\n" + +#~ msgid " [-p passwd] [-K KEY=VALUE] name\n" +#~ msgstr " [-p haso] [-K KLUCZ=WARTO] nazwa\n" + +#~ msgid " useradd -D [-g group] [-b base] [-s shell]\n" +#~ msgstr " useradd -D [-g grupa] [-b baza] [-s powoka]\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 , 2004 +# # 18-04-2005 - Miguel Figueiredo - 5f1u +# 12-07-2005 - Miguel Figueiredo - 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 \n" "Language-Team: Portuguese \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 COMENTRIO\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 \n" "Language-Team: Debian-BR Project \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 PRPRIA 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 \n" -"Language-Team: Romanian \n" +"Language-Team: Romanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -146,12 +145,12 @@ msgstr "Fr 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 rdcin 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 rdcin 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 expirrii contului la " +"DATA_EXPIRARE\n" +" -h, --help\t\t\tafieaz acest mesaj de ajutor i iei\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 numrul minim de zile 簾nainde de " +"schimbarea\n" +"\t\t\t\tparolei to MIN_ZILE\n" +" -M, --maxdays MAX_ZILE\tseteaz numrul 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 apsa籟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 expirrii 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 "Numrul minim de zile dintre modificrile 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 "Numrul maxim de zile dintre modificrile 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 "Numrul de zile de avertizri dinaintea expirrii 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 euat\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 fiierul 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 fiierul de parole criptate" +msgid "%s: can't lock shadow password file\n" +msgstr "%s nu pot 簾ncuia fiierul 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 fiierul de parole criptate" +msgid "%s: can't open shadow password file\n" +msgstr "%s: nu pot deschide fiierul 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 fiierul 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 fiierul 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 fiierul 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 fiierul 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: euare chauthtok PAM\n" @@ -451,7 +468,7 @@ msgstr "Nu pot 簾ncuia fiierul de conturi utilizatori; 簾ncerca籟i mai t璽rziu msgid "Cannot open the password file.\n" msgstr "Nu pot deschide fiierul 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 gsit %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 adugarea unei noi intrri 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 fiierul 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 fiierul 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 stp璽n NIS\n" @@ -887,9 +904,9 @@ msgid "%s: %s not found in /etc/group\n" msgstr "%s: %s nu s-a gsit 簾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 fiierul 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 "Fr consol\n" @@ -1537,12 +1554,12 @@ msgstr "V rog introduce籟i PROPRIA parol pentru autentificare.\n" msgid "No password file\n" msgstr "Fr fiier de conturi utilizatori passwd\n" -#: src/sulogin.c:160 +#: src/sulogin.c:164 #, c-format msgid "No password entry for 'root'\n" msgstr "Fr 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 "" "Apsa籟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 fiiere 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 fiiere 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\tafieaz sau salveaz configura籟ia useradd implicit\n" +"\t\t\t\tmodificat\n" +" -e, --expiredate DATA_EXPIRRII\tseteaz data expirrii contului la " +"DATA_EXPIRRII\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\tafieaz grupurile suplimentare pentru noul\n" +"\t\t\t\tcont utilizator\n" +" -h, --help\t\t\tafieaz acest mesaj de ajutor i iei\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\tfolosete 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 fiierului 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 fiierului 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 fiierului 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 fiierului 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: fiier 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 fiierul 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 fiierul 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 fiierul 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 fiierul 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 fiierul 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 fiierul 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 adugarea unei noi intrri 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 adugarea unei noi intrri 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 pot " "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 pot 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 aduga籟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 intrrii 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 intrrii 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 intrrii 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: euare 簾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 ctre %s\n" -#: src/usermod.c:1189 +#: src/usermod.c:1200 msgid "failed to change mailbox owner" msgstr "euare 簾n schimbarea proprietarului csu籟ei potale" -#: src/usermod.c:1197 +#: src/usermod.c:1208 msgid "failed to rename mailbox" msgstr "euare 簾n redenumirea csu籟ei potale" @@ -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 , 2004. # Eugene Konev , 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 \n" "Language-Team: Russian \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 \n" "Language-Team: LANGUAGE \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 \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 \n" "Language-Team: Slovak \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羸 koreov羸 adres獺r \"%s\"\n" -#: libmisc/sub.c:67 +#: libmisc/sub.c:68 #, c-format msgid "Can't change root directory to \"%s\"\n" msgstr "Koreov羸 adres獺r sa ned獺 zmeni聽 na \"%s\".\n" @@ -170,16 +170,16 @@ msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "" "konfiguran獺 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 stlate 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 "Neinn矇 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 "Neinn矇 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 poet 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 poet 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 "Poet 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 tieov羸mi heslami sa ned獺 zamkn繳聽" +msgid "%s: can't lock shadow password file\n" +msgstr "%s: s繳bor s tieov羸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 tieov羸mi heslami sa ned獺 otvori聽" +msgid "%s: can't open shadow password file\n" +msgstr "%s: s繳bor s tieov羸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 tieov羸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 tieov羸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 tieov羸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 jedinen矇\n" @@ -805,24 +805,24 @@ msgstr "%s: ned獺 sa vytvori聽 jedinen羸 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 tieov羸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 doasnom 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 tieov羸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 VAE 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 "" "Stlate 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 ZKL_ADR\tz獺kladn羸 adres獺r dom獺ceho adres獺ra nov矇ho\n" +"\t\t\t\tpou鱉穩vate躂sk矇ho 繳tu\n" +" -c, --comment KOMENTR\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 doch 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 dodaton羸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(nejedinen羸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 neinnos聽] [-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 tieov羸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 tieov羸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 jedinen羸\n" -#: src/useradd.c:905 +#: src/useradd.c:921 #, c-format msgid "%s: can't get unique UID\n" msgstr "%s: ned獺 sa vytvori聽 jedinen羸 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 tieov矇 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 tieov矇 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 tieov羸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 tieov羸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 tieov羸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 tieov羸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 neinnos聽] [-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穩nae\n" -#: src/usermod.c:873 +#: src/usermod.c:876 #, c-format msgid "%s: shadow passwords required for -e and -f\n" msgstr "%s: prep穩nae -e a -f vy鱉aduj繳 tieov矇 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穩naom -G\n" + +#: src/usermod.c:904 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "%s uid %lu nie je jedinen羸\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 odstraovan穩 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 odstraovan穩 polo鱉ky zo s繳boru s tieov羸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 odstraovan穩 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 neinnos聽] [-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 \n" "Language-Team: Albanian \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 \n" "Language-Team: sv \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=VRDE\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=VRDE\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 \n" "Language-Team: Tagalog \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 \n" "Language-Team: Turkish \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 deitirilemiyor\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 deeri girin, veya varsay覺lan deer 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 Deiimi (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 Deiimi (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: dier 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 baar覺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 deitiriliyor\n" -#: src/chage.c:620 +#: src/chage.c:625 #, c-format msgid "%s: error changing fields\n" msgstr "%s: alanlar覺 deitirirken hata olutu\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 baar覺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 olutu\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 deil\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覺 deil\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癟enei ISIM=DEER 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 deil\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" "[Balant覺 kesilmesi atland覺 -- root girii 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 urad覺.\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 deilsiniz\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 balang覺癟 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覺 oluturulamad覺\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 deil\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 - eer 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 deil, 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 deil\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 olutu\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 deil\n" -#: src/usermod.c:1004 +#: src/usermod.c:1015 #, c-format msgid "%s: error changing password entry\n" msgstr "%s: parola kayd覺 deitirilirken hata olutu\n" -#: src/usermod.c:1010 +#: src/usermod.c:1021 #, c-format msgid "%s: error removing password entry\n" msgstr "%s: parola kayd覺 silinirken hata olutu\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 olutu\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癟ekletirilemiyor\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 deil\n" -#: src/usermod.c:1189 +#: src/usermod.c:1200 msgid "failed to change mailbox owner" msgstr "postakutusu sahibi deitirilmedi" -#: src/usermod.c:1197 +#: src/usermod.c:1208 msgid "failed to rename mailbox" msgstr "postakutusu isim deiiklii baar覺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癟enei ISIM=DEER 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 \n" "Language-Team: \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 \n" "Language-Team: Vietnamese \n" @@ -139,12 +139,12 @@ msgstr "Kh繫ng c籀 thが m廙卉 th穫 ng nh廕計 v廙i HOME=/" msgid "Cannot execute %s" msgstr "Kh繫ng th廙 th廙帷 hi廙n %s." -#: libmisc/sub.c:55 +#: libmisc/sub.c:56 #, c-format msgid "Invalid root directory \"%s\"\n" msgstr "Thが m廙卉 g廙c kh繫ng h廙φ 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廙卉 g廙c thnh \"%s\".\n" @@ -164,16 +164,16 @@ msgstr "Kh繫ng th廙 ph璽n chia ch廙 cho th繫ng tin c廕只 h穫nh.\n" msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "l廙i c廕只 h穫nh - kh繫ng bi廕篙 m廙卉 '%s' (h瓊y b獺o qu廕τ tr廙).\n" -#: lib/pwauth.c:45 src/newgrp.c:338 +#: lib/pwauth.c:48 src/newgrp.c:384 msgid "Password: " msgstr "M廕負 kh廕季:" -#: lib/pwauth.c:47 +#: lib/pwauth.c:50 #, c-format msgid "%s's Password: " msgstr "M廕負 kh廕季 c廙吧 %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廕計 gi獺 tr廙 m廙i, ho廕︷ b廕叮 ph穩m Enter 廙 ch廙n m廕搾 廙nh.\n" -#: src/chage.c:159 +#: src/chage.c:164 msgid "Minimum Password Age" msgstr "Ph廕《 v廙 th廙i gian t廙i thi廙u cho m廕負 kh廕季" -#: src/chage.c:165 +#: src/chage.c:170 msgid "Maximum Password Age" msgstr "Ph廕《 v廙 th廙i gian t廙i a cho m廕負 kh廕季" -#: src/chage.c:172 +#: src/chage.c:177 msgid "Last Password Change (YYYY-MM-DD)" msgstr "Thay 廙i m廕暗 kh廕季 cu廙i c羅ng (NNNN-TT-NN)" -#: src/chage.c:180 +#: src/chage.c:185 msgid "Password Expiration Warning" msgstr "C廕τh b獺o h廕篙 h廕》 d羅ng m廕負 kh廕季" -#: src/chage.c:186 +#: src/chage.c:191 msgid "Password Inactive" msgstr "M廕負 kh廕季 kh繫ng ho廕﹀ 廙ng" -#: src/chage.c:194 +#: src/chage.c:199 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Ngy h廕篙 h廕》 d羅ng ti kho廕τ (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廕暗 kh廕季 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廕負 kh廕季 h廕篙 h廕》 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廕負 kh廕季 kh繫ng ho廕﹀ 廙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 "Ti kho廕τ h廕篙 h廕》 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廙 ngy t廙i thi廙u gi廙畝 hai l廕吵 thay 廙i m廕負 kh廕季\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廙 ngy t廙i a gi廙畝 hai l廕吵 thay 廙i m廕負 kh廕季\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廙 ngy c廕τh b獺o trが廙c khi m廕負 kh廕季 h廕篙 h廕》\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: 廙南g bao g廙m \"l\" c羅ng v廙i nh廙疸g 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廙妾 ki廙u PAM th廕另 b廕【\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廙 が廙θ t廕計 tin m廕負 kh廕季.\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 が廙θ t廕計 tin m廕負 kh廕季 b籀ng." +msgid "%s: can't lock shadow password file\n" +msgstr "%s: kh繫ng kh籀a が廙θ t廕計 tin m廕負 kh廕季 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廙 が廙θ t廕計 tin m廕負 kh廕季 b籀ng." +msgid "%s: can't open shadow password file\n" +msgstr "%s: kh繫ng m廙 が廙θ t廕計 tin m廕負 kh廕季 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廕《 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廕搆 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廕計 nh廕負 が廙θ t廕計 tin m廕負 kh廕季.\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廕計 nh廕負 が廙θ t廕計 tin m廕負 kh廕季 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廕【 t廕計 tin m廕負 kh廕季 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廕【 t廕計 tin m廕負 kh廕季.\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 bi x獺c th廙妾) 瓊 th廕另 b廕【.\n" @@ -444,7 +444,7 @@ msgstr "Kh繫ng kh籀a が廙θ t廕計 tin m廕負 kh廕季; h瓊y th廙 l廕【 sau.\n" msgid "Cannot open the password file.\n" msgstr "Kh繫ng m廙 が廙θ t廕計 tin m廕負 kh廕季.\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廕句 %s trong /etc/passwd\n" @@ -669,7 +669,7 @@ msgstr "%s: c廕吵 thi廕篙 m廕負 kh廕季 nh籀m b籀ng cho -A\n" msgid "Who are you?\n" msgstr "B廕》 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廕搆 l廙i khi th礙m m廙卉 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廕ξ 廙c nh廕另.\n" @@ -789,24 +789,24 @@ msgstr "%s: kh繫ng g廙i が廙θ gid 廙c nh廕另.\n" msgid "%s: %s is not a valid group name\n" msgstr "%s: %s kh繫ng ph廕ξ l t礙n nh籀m h廙φ 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廙φ 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廕吵 廕積 TN=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廕【 が廙θ t廕計 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廕【 が廙θ t廕計 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廕篙 n廙i b廙 ng廕眩 -- cho ph矇p ngが廙i ch廙 ng nh廕計.]\n" -#: src/login.c:297 +#: src/login.c:302 #, c-format msgid "" "\n" @@ -1143,17 +1143,17 @@ msgstr "" "\n" "ng nh廕計 瓊 qu獺 gi廙 sau %d gi璽y.\n" -#: src/login.c:570 +#: src/login.c:576 #, c-format msgid " on `%.100s' from `%.200s'" msgstr " vo `%.100s' t廙 `%.200s'" -#: src/login.c:573 +#: src/login.c:579 #, c-format msgid " on `%.100s'" msgstr " vo `%.100s'" -#: src/login.c:730 +#: src/login.c:736 #, c-format msgid "" "\n" @@ -1162,25 +1162,25 @@ msgstr "" "\n" "%s ng nh廕計: " -#: src/login.c:885 src/sulogin.c:203 +#: src/login.c:891 src/sulogin.c:207 msgid "Login incorrect" msgstr "ng nh廕計 kh繫ng 繳ng" -#: src/login.c:1032 +#: src/login.c:1038 msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "C廕τh b獺o: 瓊 hi廙u l廙帷 l廕【 ng nh廕計 sau b廙 kh籀a ra t廕《 th廙i.\n" -#: src/login.c:1046 +#: src/login.c:1052 #, c-format msgid "Last login: %s on %s" msgstr "ang nh廕計 cu廙i c羅ng: %s vo %s" -#: src/login.c:1049 +#: src/login.c:1055 #, c-format msgid "Last login: %.19s on %s" msgstr "ang nh廕計 cu廙i c羅ng: %.19s vo %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廙叩g: 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廕盧 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廕篙 b廙 nh廙\n" msgid "%s: Cannot execute %s" msgstr "%s: kh繫ng th廙帷 hi廙n が廙θ %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廕計 nh廕負 が廙θ m廙卉 ghi cho ngが廙i d羅ng %s.\n" msgid "%s: can't delete shadow password file\n" msgstr "%s: kh繫ng x籀a b廙 が廙θ t廕計 tin m廕負 kh廕季 b籀ng.\n" -#: src/su.c:132 +#: src/su.c:129 msgid "Sorry." msgstr "Ti廕盧 l..." -#: src/su.c:319 +#: src/su.c:315 #, c-format msgid "%s: must be run from a terminal\n" msgstr "%s: ph廕ξ ch廕『 n籀 t廙 thi廕篙 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廕眩 廕吟) 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廕》 kh繫ng 廙 quy廙n s廙 d廙叩g l廙nh su v廙i %s.\n" -#: src/su.c:490 +#: src/su.c:486 msgid "(Enter your own password.)" msgstr "(H瓊y nh廕計 m廕負 kh廕季 c廙吧 b廕》.)" -#: 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廕計 m廕負 kh廕季 c廙吧 B廕N 廙 x獺c th廙妾.\n" msgid "No password file\n" msgstr "Kh繫ng c籀 t廕計 tin m廕負 kh廕季.\n" -#: src/sulogin.c:160 +#: src/sulogin.c:164 #, c-format msgid "No password entry for 'root'\n" msgstr "Kh繫ng c籀 m廙卉 ghi m廕負 kh廕季 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廕穆 t廙卉 kh廙i 廙ng c獺ch thが廙ng,\n" "(ho廕搾 nh廕計 m廕負 kh廕季 ch廙 廙 b廕υ dが廙》g h廙 th廙ng:" -#: src/sulogin.c:210 +#: src/sulogin.c:214 msgid "Entering System Maintenance Mode\n" msgstr "ang vo ch廕 廙 b廕υ dが廙》g 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廙φ 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廕︽ が廙θ t廕計 tin m廕搾 廙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廙 が廙θ t廕計 tin m廕搾 廙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廕ξ 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廙叩g: 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廕哎]]\n" - -#: src/useradd.c:639 src/useradd.c:643 -#, c-format -msgid " [-f inactive] [-e expire]\n" -msgstr "\t\t[-f kh繫ng_ho廕﹀_廙ng] [-e h廕篙_h廕》 ]\n" - -#: src/useradd.c:640 -#, c-format -msgid " [-p passwd] name\n" -msgstr "\t\t[-p m廕負_kh廕季] 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廕τ] [-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廕搆 l廙i khi kh籀a t廕計 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廕搆 l廙i khi m廙 t廕計 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廕搆 l廙i khi kh籀a t廕計 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廕搆 l廙i khi m廙 t廕計 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廕ξ 廙c nh廕另.\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 が廙θ gid 廙c nh廕另.\n" -#: src/useradd.c:936 +#: src/useradd.c:977 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "%s: thが m廙卉 cヾ ban kh繫ng h廙φ 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廙φ l廙 `%s'\n" -#: src/useradd.c:957 +#: src/useradd.c:1000 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "%s: thが m廙卉 ch穩nh kh繫ng h廙φ 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: ngy kh繫ng h廙φ l廙 `%s'\n" -#: src/useradd.c:988 +#: src/useradd.c:1031 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "%s: c廕吵 廕積 m廕負 kh廕季 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廕吵 廕積 m廕負 kh廕季 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廙φ 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廙φ 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廙φ 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廕【 が廙θ t廕計 tin m廕負 kh廕季\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廕【 が廙θ t廕計 tin m廕負 kh廕季 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 が廙θ t廕計 tin m廕負 kh廕季\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廙 が廙θ t廕計 tin m廕負 kh廕季\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 が廙θ t廕計 tin m廕負 kh廕季 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廙 が廙θ t廕計 tin m廕負 kh廕季 b籀ng\n" -#: src/useradd.c:1300 +#: src/useradd.c:1347 #, c-format msgid "%s: error adding new password entry\n" msgstr "%s: g廕搆 l廙i khi th礙m m廙卉 ghi m廕負 kh廕季 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廕搆 l廙i khi th礙m m廙卉 ghi m廕負 kh廕季 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廕︽ が廙θ thが m廙卉 %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廕︽ 廙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廕︽ が廙θ 廙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廕簑 b廕》 mu廙n th礙m ngが廙i d羅ng ny vo nh籀m 廕句\n" "\t\t\t\t\tth穫 h瓊y s廙 d廙叩g 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廙真 %2$s th穫 s廕 kh繫ng lo廕【 b廙 n籀.\n" msgid "%s: warning: can't remove " msgstr "%s: c廕τh b獺o: kh繫ng th廙 lo廕【 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廕搆 l廙i khi lo廕【 b廙 thが m廙卉 %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廙叩g: %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廕﹀_廙ng] [-e h廕篙_h廕》 ] " -#: src/usermod.c:286 +#: src/usermod.c:285 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p m廕負_kh廕季] [-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廕篙 b廙 nh廙 trong update_group (c廕計 nh廕負 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廕篙 b廙 nh廙 trong update_shadow (c廕計 nh廕負 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廕吵 廕積 m廕負 kh廕季 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廕ξ 廙c nh廕另.\n" -#: src/usermod.c:1004 +#: src/usermod.c:1015 #, c-format msgid "%s: error changing password entry\n" msgstr "%s: g廕搆 l廙i khi thay 廙i m廙卉 ghi m廕負 kh廕季.\n" -#: src/usermod.c:1010 +#: src/usermod.c:1021 #, c-format msgid "%s: error removing password entry\n" msgstr "%s: g廕搆 l廙i khi lo廕【 b廙 m廙卉 ghi m廕負 kh廕季.\n" -#: src/usermod.c:1026 +#: src/usermod.c:1037 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "%s: g廕搆 l廙i khi lo廕【 b廙 m廙卉 ghi m廕負 kh廕季 b籀ng.\n" -#: src/usermod.c:1053 +#: src/usermod.c:1064 #, c-format msgid "%s: directory %s exists\n" msgstr "%s: c籀 thが m廙卉 %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廕︽ が廙θ %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廙真) が廙θ %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廕【 thが m廙卉 %s thnh %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廕τh b獺o: %3$s kh繫ng s廙 h廙真 %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廙真 h廙p thが が廙θ" -#: src/usermod.c:1197 +#: src/usermod.c:1208 msgid "failed to rename mailbox" msgstr "kh繫ng thay 廙i t礙n h廙p thが が廙θ" @@ -1981,6 +1988,31 @@ msgstr "" "`vipw' th穫 s廙苔 廙i /etc/passwd `vipw -s' th穫 s廙苔 廙i /etc/shadow\n" "`vigr' th穫 s廙苔 廙i /etc/group `vigr -s' th穫 s廙苔 廙i /etc/gshadow\n" +#, fuzzy +#~ msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n" +#~ msgstr "" +#~ "C獺ch s廙 d廙叩g: 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廕哎]]\n" + +#~ msgid " [-f inactive] [-e expire]\n" +#~ msgstr "\t\t[-f kh繫ng_ho廕﹀_廙ng] [-e h廕篙_h廕》 ]\n" + +#, fuzzy +#~ msgid " [-p passwd] [-K KEY=VALUE] name\n" +#~ msgstr "\t\t[-p m廕負_kh廕季] t礙n\n" + +#~ msgid " useradd -D [-g group] [-b base] [-s shell]\n" +#~ msgstr "" +#~ " useradd -D [-g nh籀m] [-b cヾ_b廕τ] [-s h廙_v廙]\n" +#~ "(useradd: th礙m ngが廙i d羅ng)\n" + +#~ msgid "%s: -O requires NAME=VALUE\n" +#~ msgstr "%s: -O c廕吵 廕積 TN=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 \n" "Language-Team: Chinese (simplified) \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 \n" "Language-Team: Chinese (traditional) \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嚗⊥湔酒hadow撖蝣潭獢\n" -#: src/chage.c:680 +#: src/chage.c:685 #, c-format msgid "%s: can't rewrite shadow password file\n" msgstr "%s嚗⊥撖哀hadow撖蝣潭獢\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嚗⊥撖哀hadow蝢斤瑼獢\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嚗⊥芷山hadow撖蝣潭獢\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嚗⊥撖哀hadow撖蝣潭獢\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嚗交酒hadow撖蝣潮粹珮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嚗芷山hadow撖蝣潮格粹珮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 #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 #include #include @@ -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 #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 #include #include @@ -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 #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 #include #include 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 #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 #include #include @@ -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 #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 #include #include #include #include +#ifdef USE_PAM +#include +#include +#include +#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 -#include -#include -#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 #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 #include #include @@ -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 #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 @@ -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 #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 #include #include @@ -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 #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 #include #include @@ -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 #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 @@ -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 #include "rcsid.h" -RCSID (PKG_VER "$Id: su.c,v 1.34 2005/06/20 10:17:08 kloczek Exp $") -#include +RCSID (PKG_VER "$Id: su.c,v 1.39 2005/07/18 10:14:39 kloczek Exp $") +#include +#include +#include #include +#include +#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 -#include -#include -#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 #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 #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 -#include -#include -#include -#include -#include +RCSID (PKG_VER "$Id: useradd.c,v 1.67 2005/07/11 11:58:00 kloczek Exp $") #include +#include #include -#include +#include +#include +#include +#include #ifdef USE_PAM #include #include #include #endif /* USE_PAM */ +#include +#include +#include +#include +#include "prototypes.h" +#include "defines.h" +#include "chkname.h" #include "pwauth.h" -#include #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 #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 #include #include @@ -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 #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 #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 #include @@ -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\