diff --git a/ChangeLog b/ChangeLog index a86a265a..9595c3b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,563 @@ +2005-04-25 Tomasz K這czko + + * po/nl.po: kill fuzzy. + + * man/chage.1: + reverte last commit (by mistake commited experimental version generated from XML file). + + * NEWS, po/nl.po: + updated for 4.0.8 (by "cobaco (aka Bart Cornelis)" ). + + * po/tl.po, po/tr.po, po/uk.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, po/sv.po: + two typos (s,specyfied,specified,; s,maiximum,maximum,). + + * NEWS, po/sk.po: + updated for 4.0.8 (by Peter Mann ). + + * src/lastlog.c: typo (s,specyfied,specified,) + + * src/faillog.c: typo (s,maiximum,maximum,). + +2005-04-22 Tomasz K這czko + + * 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/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/mkpasswd.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: + 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/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/mkpasswd.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: + 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: + 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, + getspnam.3, logoutd.8, porttime.5, pwck.8, shadow.3, shadowconfig.8, su.1. + (by Danilo Piazzalunga ) + + * po/uk.po: + cleanups in plural forms (by Roman Festchook ). + + * 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/mkpasswd.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: + reformated using xemacs. + +2005-04-20 Tomasz K這czko + + * po/fr.po, NEWS: + updated for 4.0.8 (by Christian Perrier ). + + * NEWS, po/eu.po: updated for 4.0.8 (by ^pi^ ). + + * NEWS, po/uk.po: + updated for 4.0.8 (by Roman Festchook ). + + * po/cs.po: + updated for 4.0.8 (by Miroslav Kure ). + + * po/da.po, NEWS: + updated for 4.0.8 (by Claus Hindsgaul ). + + * po/ko.po, NEWS: + updated for 4.0.8 (by Changwoo Ryu ). + + * po/fi.po: kill one fuzzy (by Tommi Vainikainen ). + +2005-04-19 Tomasz K這czko + + * man/chpasswd.8.xml: Rewrited by hand & xemacs. + + * man/chfn.1.xml: cleanups in tag. + + * man/chfn.1.xml: Rewrited by hand & xemacs. + + * NEWS, po/pt.po: + updated for 4.0.8 (by Miguel Figueiredo ). + + * po/es.po, NEWS: updated (by Ruben Porras ). + +2005-04-18 Tomasz K這czko + + * man/useradd.8: + fixed typos in useadd syntax (in SYNOPSIS section) catched using doclifter. + + * 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/mkpasswd.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: + raw version converted using doclifter. + + * configure.in: remove handle --with-lib{opie,skey}. + + * man/de/chsh.1: + synced with english version (by Simon Brandmair ). + + * man/usermod.8: improved -o description. + + * man/de/passwd.1: + added translation EXIT VALUES section (by Simon Brandmair ). + + * NEWS, po/it.po: + updated it translation (by Danilo Piazzalunga ). + +2005-04-17 Tomasz K這czko + + * 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/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: + cleanups. + + * po/pl.po: updated. + + * src/usermod.c: + use the same error message ("%s: PAM authentication failed\n") on fail + authentication as in other tools. + + * 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, po/sv.po, po/tl.po, po/tr.po, po/uk.po: + run "make update-po". + + * src/login.c, src/login_nopam.c: + fixed build with disabled PAM support: move bad_time_notify() and check_nologin() + back to src/login.c but use this functions #ifndef USE_PAM. + + * NEWS, lib/Makefile.am, lib/pwauth.c: + remove not working OPIE and SKEY support. + + * configure.in: typo (s,SELinuux,SELinux,). + + * NEWS: typos. + + * NEWS: chage, useradd, usermod: reduce multiple OPENLOG() calls. + + * src/useradd.c, src/usermod.c: fix multiple OPENLOG() calls. + + * src/chage.c: cleanups. + + * src/chage.c: fix multiple OPENLOG() calls. + + * src/chage.c: + use E_SUCCESS/E_NOPERM #defines instead 0/1 in exit() arguments. + +2005-04-15 Tomasz K這czko + + * src/passwd.c: + adjust also syslog message on usage -S option without permission. + Consolidate SELinix and non-SELinux code. + + * 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/zh_CN.po, po/zh_TW.po, NEWS, src/passwd.c: + fix #61313 Debian bug: "passwd -S root" (as a normal user) should not + display "You may not change the password for root. + + * NEWS, man/passwd.1: + fix #160477 Debian bug: improve -S output description. + + * man/de/passwd.1: + new translation by Simon Brandmair with merged all + changes between revision 1.2 a 1.5. + +2005-04-14 Tomasz K這czko + + * man/passwd.1, man/pl/passwd.1: bold passwd and chage commands. + + * NEWS, src/vipw.c: + fixed race condition in vipw (Debian #242407 bug; fix by Alexander Gattin + ). + + * man/pl/chage.1, man/pl/chage.1.xml: synced with english version. + + * man/chage.1, man/chage.1.xml: + add info about what mean -1 passed n expiredate parameter (based on #304542 + Debian bug; submited by Federico Grau ). + +2005-04-13 Tomasz K這czko + + * po/fi.po, NEWS: + updated translation (by Tommi Vainikainen ). + + * man/hu/passwd.1, man/it/passwd.1, man/ja/passwd.1, man/pl/passwd.1, man/de/passwd.1, man/es/passwd.1, man/passwd.1: + cleanups and unifications in SEE ALSO section. + +2005-04-12 Tomasz K這czko + + * configure.in: + Info documentation says about AC_GNU_SOURCE: "should be called before any + macros that run the C compiler". So move this macro on top configure.in for + avoid autoconf warnings. + + * configure.in: + AC_SYS_LARGEFILE() performs checking is fseeko() is avalaible so "fseeko" can + be removed from AC_CHECK_FUNCS() parameters. + + * NEWS, configure.in: Remove using AC_PROG_GCC_TRADITIONAL macro. + Add using AC_GNU_SOURCE macro for kill compilation warnings about implicit + declaration of function `fseeko'. + + * po/cs.po: killed fuzzy (by Miroslav Kure ). + + * man/ja/newgrp.1, man/pl/newgrp.1, NEWS, man/hu/newgrp.1, man/newgrp.1: + newgrp uses /bin/sh (not bash). + + * man/gpasswd.1, man/groupdel.8, man/groupmems.8, man/groupmod.8, man/groups.1, man/id.1, man/mkpasswd.8, man/newgrp.1, man/pwck.8, man/useradd.8, man/userdel.8, man/usermod.8: + describe /etc/group in FILES section as "group account information". + + * man/grpck.8: + describe /etc/passwd in FILES section as "user account information". + + * po/stats: small script for generate translations statistics. + + * NEWS, po/cs.po: Updated by Miroslav Kure . + + * man/chage.1.xml, man/chage.1, man/expiry.1, man/login.1, man/mkpasswd.8, man/newgrp.1, man/passwd.1, man/pwck.8, man/shadow.3, man/shadow.5, man/su.1, man/sulogin.8: + describe /etc/shadow in FILES section as "secure user account information". + + * man/newgrp.1: Reformated paragraph. s,Bourne shell,\fBbash\fR shell, + + * NEWS, man/newgrp.1: + fix #251926, #166173, #113191 Debian bugs: explain why editing /etc/group + (without gshadow) doesn't permit to use newgrp. + + * 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, 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/pt.po, po/pt_BR.po, po/ro.po, po/ru.po: + added/fixed Plural-Forms: header entries. Run "make update-po". + + * po/pl.po: + added Plural-Forms: header entry and updated for last change in + libmisc/failure.c. + + * libmisc/failure.c: + break message text with failure login since last login. + + * libmisc/failure.c: + Use ngettext instead of string concatenation and static number of cases. + Patch by Tommi Vainikainen . + +2005-04-11 Tomasz K這czko + + * po/cs.po: + new translation maintainer: Miroslav Kure . + +2005-04-10 Tomasz K這czko + + * po/pl.po: updated for 4.0.8. + +2005-04-09 Tomasz K這czko + + * 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/zh_CN.po, po/zh_TW.po, NEWS, po/bs.po, po/ca.po, po/cs.po, po/da.po, po/de.po, src/faillog.c: + changed faillog records display format for allow fit in 80 columns all + faillog atributies. + + * 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/zh_CN.po, po/zh_TW.po, po/bs.po, po/ca.po, po/cs.po, po/da.po: + run "make update-po". Updated pl.po. + + * src/faillog.c (usage): typo (s,IDAYS,DAYS,). + + * man/faillog.8, NEWS: + updated after rewrite faillog command for use getopt_long(). + + * src/faillog.c: + Add handle -h,--help option. Show in usage output information about + -t,--time option. Remove handle -p option. + + * 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/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: + run "make update-po". + + * po/POTFILES.in: updated. + + * man/gpasswd.1: typo (s,fB,\fB,). + +2005-04-06 Tomasz K這czko + + * NEWS, man/ja/login.1: + updated ja man page for Debian #95213 bug (by Kenshi Muto ). + + * src/chage.c, src/chfn.c, src/chsh.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c, src/groupmod.c, src/grpck.c, src/passwd.c, src/pwck.c, src/useradd.c, src/userdel.c, src/usermod.c, NEWS, lib/grdbm.c, lib/gsdbm.c, lib/pwdbm.c, lib/spdbm.c, lib/Makefile.am, lib/gshadow.c, lib/shadow.c: + next round of cleanups: removed NDBM code (unused). + + * src/login.c: consilidate some !USE_PAM lines. + + * src/login.c, src/login_nopam.c: + move bad_time_notify() and check_nologin() to src/login_nopam.c. + + * lib/prototypes.h: remove not used login_desrpc() prototype. + + * lib/rad64.c, lib/encrypt.c, lib/prototypes.h, lib/Makefile.am: + remove lib/rad64 with not used c64i() and i64c() functions. + + * lib/encrypt.c: + remove "#ifdef SW_CRYPT .. #endif" and "#ifdef DOUBLESIZE .. #endif" unused code. + + * lib/encrypt.c: remove "#ifdef MD5_CRYPT .. #endif" unused code. + + * libmisc/salt.c: + remove prototypes for *l64a() and add #include . Remove unused + now code (old style random salt generator). + + * src/chage.c: cleanups. + + * src/chpasswd.c: + remove prototypes for *l64a() and add #include . + + * src/login.c: remove login_fbtab() prototype. + + * src/chage.c: + remove prototypes for a64l() and *l64a() and add #include . + +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/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/mkpasswd.8, 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/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/mkpasswd.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: + more replaces "-" by "\-" (s,\\-,-,g; s,-,\\-,g). + + * man/pl/usermod.8: finish sync with english version. + + * man/hu/login.1, man/pl/login.1, NEWS, man/de/login.1, man/login.1: + removed fragment about abilities pass enviroment variables in login prompt. + + * man/gpasswd.1, man/newgrp.1: + fixes by Nicolas Nicolas Fran癟ois (not all + commited). + +2005-04-02 Tomasz K這czko + + * man/login.1, man/login.access.5, man/login.defs.5, man/logoutd.8, man/mkpasswd.8, man/newgrp.1, man/newusers.8, man/passwd.1, man/passwd.5, man/porttime.5, man/pw_auth.3, man/pwck.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/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/groupmems.8, man/groupmod.8, man/groups.1, man/grpck.8, man/gshadow.5, man/id.1, man/lastlog.8, man/limits.5: + replace all "-" by "\-" (s,\\-,-,; s,-,\\-,). + + * man/cs/groups.1: cleanups. + + * NEWS, src/su.c: + fixed use of SU_WHEEL_ONLY in su. Now su realy is avalaible for wheel group + members. Thanks to Mike Frysinger for report: + http://bugs.gentoo.org/show_bug.cgi?id=80345 + + * man/pl/chage.1.xml: + converted from roff using doclifter. Rewrited by hand. Probably will be + removed after prepare infrastructure for translate man pages using gettext + but temporary I need this for some experiments. + + * src/login.c: remove unused #ifded LOGIN_FBTAB .. #endif code. + + * configure.in, libmisc/login_access.c, libmisc/Makefile.am, src/Makefile.am, src/login.c, src/login_nopam.c: + move libmisc/login_access.c to src/login_mopam.c. + Remove using LOGIN_ACCESS #define. Now LOGIN_ACCESS is equal to !USE_PAM. + In src/login_nopam.c will be cumulated non-PAM specyfic login code. + + * src/lastlog.c, src/login.c, src/useradd.c, src/usermod.c, libmisc/log.c: + cleanups: remove using #include "lastlog_.h". + + * src/login.c: fixed build with PAM support disabled. + + * src/login.c: remove "#ifdef HUP_MESG_FILE .. #endif" code. + + * src/login.c: reindent using -l80. + + * man/chage.1, man/chage.1.xml: s/chage/chage command/ in DESCRIPTION. + + * man/chage.1.xml: + converted from roff using doclifter. Rewrited by hand. + + * man/chage.1, man/chfn.1, man/faillog.8, man/groupmod.8, man/pwconv.8, man/useradd.8, man/usermod.8: + cleanups. + + * man/pwconv.8: fixed typo: s,fI,\fI, + + * po/POTFILES.in: remove libmisc/login_{desrpc,krb}.c. + + * lib/getdef.c, libmisc/login_desrpc.c, libmisc/login_krb.c, libmisc/Makefile.am, src/login.c, NEWS, autogen.sh, configure.in: + drop never finished kerberos and des_rpc support. + + * man/it/chfn.1: cleanups. + +2005-04-01 Tomasz K這czko + + * NEWS, configure.in: + fixed UTMP path detection (by Kelledin ). + + * man/fr/chsh.1: typo. + + * man/de/Makefile.am, man/de/passwd.5: + imported from Deutscher manpages. + + * man/cs/Makefile.am, man/cs/groups.1, man/cs/lastlog.8, man/cs/su.1: + new files imported from Czech man-pages. + + * man/pl/faillog.8, man/pl/groupmems.8, man/pl/id.1, man/pt_BR/groupadd.8, man/pt_BR/groupmod.8, man/zh_CN/groupadd.8, man/zh_CN/groupmod.8, man/zh_CN/useradd.8, man/zh_CN/usermod.8, man/zh_TW/groupadd.8, man/zh_TW/groupmod.8, man/zh_TW/useradd.8, man/zh_TW/usermod.8, man/fr/chage.1, man/fr/chpasswd.8, man/fr/passwd.1, man/hu/chsh.1, man/it/groupadd.8, man/it/groupmod.8, man/it/usermod.8, man/ja/chage.1, man/ja/chfn.1, man/ja/chsh.1, man/ja/gpasswd.1, man/ja/groupadd.8, man/ja/groupmod.8, man/ja/login.1, man/ja/passwd.1, man/ja/useradd.8, man/ja/usermod.8, man/chage.1, man/chfn.1, man/chsh.1, man/de/chfn.1, man/de/chsh.1, man/de/login.1, man/de/passwd.1, man/gpasswd.1, man/groupadd.8, man/id.1, man/login.1, man/passwd.1, man/useradd.8: + cleanups: aded missing \fR. + + * man/Makefile.am, man/gpasswd.1, man/gshadow.5, NEWS: + added new file (by Nicolas Nicolas Fran癟ois ). + +2005-03-31 Tomasz K這czko + + * man/pl/chage.1, man/pl/chfn.1, man/pl/chsh.1, man/pl/gpasswd.1: + added missing \fR. + + * man/pl/groupmod.8: typo: s,\fI,\fR, + + * man/pl/login.1, man/pl/passwd.1: cleanups: aded missing \fR. + + * man/pl/sulogin.8: cleanups. + + * man/pl/useradd.8: cleanups: aded missing \fR. + + * man/pl/usermod.8: partialy synced with english version. + + * man/usermod.8: typo. + + * NEWS, man/usermod.8: + fixed #302388 Debian bug: added separated -o option description. + + * lib/getdef.c: + FAILLOG_ENAB, LOGIN_STRING moved to code "#ifndef USE_PAM" dependent. + + * lib/pwauth.c, lib/pwauth.h: enable pw_auth() only #ifndef USE_PAM. + + * src/userdel.c, src/usermod.c, src/vipw.c, src/chage.c, src/chfn.c, src/chpasswd.c, src/chsh.c, src/expiry.c, src/faillog.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c, src/groupmems.c, src/groupmod.c, src/groups.c, src/grpck.c, src/grpconv.c, src/grpunconv.c, src/logoutd.c, src/mkpasswd.c, src/newgrp.c, src/newusers.c, src/passwd.c, src/pwck.c, src/pwconv.c, src/pwunconv.c, src/su.c, src/suauth.c, src/sulogin.c, src/useradd.c, 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/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, libmisc/login_access.c, libmisc/login_krb.c, libmisc/addgrps.c, libmisc/age.c, libmisc/chkname.h, libmisc/chowndir.c, libmisc/chowntty.c, libmisc/copydir.c, libmisc/env.c, libmisc/failure.c, libmisc/failure.h, libmisc/getdate.h, libmisc/hushed.c, libmisc/isexpired.c, libmisc/limits.c, libmisc/loginprompt.c, libmisc/motd.c, libmisc/pam_pass.c, libmisc/pwdcheck.c, libmisc/rlogin.c, libmisc/setugid.c, libmisc/setupenv.c, libmisc/shell.c, libmisc/strtoday.c, libmisc/sulog.c, libmisc/ttytype.c, libmisc/utmp.c, libmisc/xmalloc.c, NEWS, lib/grdbm.c, lib/gsdbm.c, lib/pwdbm.c, lib/rad64.c, lib/spdbm.c, lib/commonio.c, lib/commonio.h, lib/defines.h, lib/encrypt.c, lib/faillog.h, lib/fputsx.c, lib/getdef.c, lib/getdef.h, lib/getpass.c, lib/groupio.c, lib/groupio.h, lib/grpack.c, lib/gshadow.c, lib/gshadow_.h, lib/gspack.c, lib/lockpw.c, lib/port.c, lib/port.h, lib/prototypes.h, lib/pwauth.c, lib/pwauth.h, lib/pwio.c, lib/pwio.h, lib/pwpack.c, lib/rcsid.h, lib/sgetgrent.c, lib/sgetpwent.c, lib/sgetspent.c, lib/sgroupio.c, lib/sgroupio.h, lib/shadow.c, lib/shadowio.c, lib/shadowio.h, lib/sppack.c, lib/utent.c: + reindent all source code using -l80. + + * lib/gshadow.c, NEWS: + rewrited group count to dynamic (by John Newbigin ). + + * 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/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: + run "make update-po". + + * src/login.c: use allways "\n%s login: " login prompt. + + * src/login.c: removed radius support (even not compiles). + + * doc/README.mirrors, doc/Makefile.am: removed. + + * src/userdel.c (update_user): removed next redundant closing }. + + * src/userdel.c: remove using unused NO_REMOVE_MAILBOX #define. + + * src/userdel.c (update_user): removed redundant closing }. + +2005-03-30 Tomasz K這czko + + * lib/getdef.c: + move PASS_MAX_DAYS, PASS_MIN_DAYS and PASS_WARN_AGE to part PAM not dependent + (used in useradd, pwconv). + + * configure.in, src/Makefile.am: + move define LOCALEDIR using AC_DEFINE_UNQUOTED() to src/Makefile.am::AM_CPPFLAGS. + + * man/pwconv.8: typo in bold. + + * doc/INSTALL: removed. + + * doc/README.sun4, doc/Makefile.am: removed outdated README.sun4. + +2005-03-24 Tomasz K這czko + + * po/pl.po: put mine data in Last-Translator: field. + + * src/newusers.c: + use the same as in useradd default UMASK (022 instead 077) if diffrent not + defined in login.defs. + + * NEWS, libmisc/copydir.c: + added SELinux changes (based on Fedora patch). + + * NEWS: typo. + + * man/login.defs.5: typo in bold. + + * src/chfn.c, src/chsh.c, lib/getdef.c: + move CHFN_AUTH, CHSH_AUTH variables from login.defs to part !USE_PAM dependent. + Use "auth required pam_unix.so" in /etc/pam.d/{chfn,chsh} for force enter password + on use chfn/chsh. + + * lib/getdef.c: added CHSH_AUTH variable in def_table[] table. + + * src/chsh.c: s/CHFN_AUTH/CHSH_AUTH/ + + * man/shadow.5, man/passwd.5: + add more accurate information about what contains field with encrypted password in + each passwd/shadow line (reported by Mike Brodbelt). + + * autogen.sh: reorder. + + * lib/getdef.c: + CRACKLIB_DICTPATH, ENV_HZ, ENV_PATH, ENV_ROOTPATH, ENV_SUPATH, ENV_TZ, + ENVIRON_FILE, FTMP_FILE, ISSUE_FILE, LASTLOG_ENAB, MAIL_CHECK_ENAB, MAIL_DIR, + MAIL_FILE, MD5_CRYPT_ENAB, MOTD_FILE, NOLOGINS_FILE, OBSCURE_CHECKS_ENAB, + PASS_ALWAYS_WARN, PASS_CHANGE_TRIES, PASS_MAX_DAYS, PASS_MAX_LEN, PASS_MIN_DAYS, + PASS_MIN_LEN, PASS_WARN_AGE, PORTTIME_CHECKS_ENAB, SU_WHEEL_ONLY, QMAIL_DIR, + QUOTAS_ENAB, ULIMIT variables moved to code "#ifndef USE_PAM" dependent. + + * configure.in: + fix importand typo: added missing ",". Now LOGIN_ACCESS realy is defined only + when PAM is not enabled. + + * libmisc/obscure.c, libmisc/limits.c: + all functions from this file are "#ifndef USE_PAM" dependent. + + * libmisc/setugid.c (change_uid): + removed dead code depndent on "#ifdef BSD". + + * libmisc/ttytype.c (ttytype): + removed dead code depend on "defined(SUN) || defined(BSD) || defined(SUN4)". + + * src/login.c (setup_tty): remove dead code. + + * libmisc/rlogin.c: + fix compilation warning: replace #include by #include + where ruserok() is declared. + +2005-03-23 Tomasz K這czko + + * po/pl.po: kill one fuzzy entry. + +2005-03-09 Tomasz K這czko + + * NEWS, libmisc/log.c: + fixed create lastlog entry fo users never loged in on non-PAM + variant of login (fix by ). + +2005-03-07 Tomasz K這czko + + * NEWS, etc/login.defs, etc/login.defs.linux, lib/getdef.c, man/pl/login.defs.5: + remove handle login.defs::NOLOGIN_STR (never used). + +2005-02-25 Tomasz K這czko + + * man/shadow.5: + added missing '\&' in line starting with '\.', which causes groff to skip + it entirely (fix submited by Danilo Piazzalunga ). + + * TODO: cleanups. + +2005-02-23 Tomasz K這czko + + * src/useradd.c, NEWS: + useradd: fixes a potential security problem when mailbox is created in + useradd. + Patch and comment by Koblinger Egmont : + Only two arguments are passed to the open() call though it expects three + because O_CREAT is present. Hence the permission of the file first becomes + some random garbage found on the stack, and an attacker can perhaps open + this file and hold it open for reading or writing before the proper + fchmod() is executed. (Actually, we could also pass the final "mode" to + the open() call and then save the consequent fchmod().) + +2005-02-17 Tomasz K這czko + + * NEWS, po/LINGUAS, po/tl.po: + added tl translation (fron Debian resources). + +2005-02-14 Tomasz K這czko + + * NEWS, src/chage.c, src/chfn.c, src/chsh.c, src/passwd.c: + SELinux changes: added changes in chage, chfn, chsh, passwd for allow + construct more grained user password/accuunt properties on SELinux + policies level. Patch originally based on RH changes (submited by Chris + PeBenito ) + +2005-02-09 Tomasz K這czko + + * po/fr.po, NEWS: + updated translation (by Jean-Luc Coulon ) from + Debian resources. + +2005-01-26 Tomasz K這czko + + * NEWS, configure.in: open work on 4.0.8. + 2005-01-24 Tomasz K這czko * po/ru.po, po/sk.po, po/sq.po, po/sv.po, po/tr.po, po/uk.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/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: @@ -820,7 +1380,7 @@ * libmisc/shell.c (shell): do not gettexitize DEBUG message. - * src/chsh.c, src/grpconv.c, src/login.c, src/logoutd.c, src/sulogin.c, src/vipw.c, libmisc/getdate.y, libmisc/limits.c, libmisc/login_access.c, libmisc/obscure.c, libmisc/setupenv.c, lib/getpass.c, lib/pwauth.c: + * src/chsh.c, src/grpconv.c, src/login.c, src/logoutd.c, src/sulogin.c, src/vipw.c, libmisc/login_access.c, libmisc/getdate.y, libmisc/limits.c, libmisc/obscure.c, libmisc/setupenv.c, lib/getpass.c, lib/pwauth.c: Removed "#if 0 .. #endif" dead code. * libmisc/utmp.c: Fixed unterminated #if. @@ -990,7 +1550,7 @@ 2003-04-22 Tomasz K這czko - * libmisc/getdate.c, libmisc/nscd.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/login_access.c, libmisc/login_desrpc.c, libmisc/login_krb.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/setup.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/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/setup.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: Indent all using current .indent.pro settings. * po/Makevars: New file neccessary for gettext >=0.11.5. @@ -1978,7 +2538,7 @@ 2000-08-26 Marek Micha趾iewicz - * contrib/Makefile.am, contrib/groupmems.shar, doc/LSM, po/el.po, po/fr.po, po/pl.po, po/sv.po, doc/README.mirrors, src/vipw.c, src/dpasswd.c, src/Makefile.am, src/chage.c, src/chfn.c, src/chpasswd.c, src/chsh.c, src/expiry.c, src/faillog.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c, src/groupmod.c, src/groups.c, src/grpck.c, src/grpconv.c, src/grpunconv.c, src/id.c, src/lastlog.c, src/login.c, src/logoutd.c, src/mkpasswd.c, src/newgrp.c, src/newusers.c, src/passwd.c, src/pwck.c, src/pwconv.c, src/pwunconv.c, src/su.c, src/sulogin.c, src/useradd.c, src/userdel.c, src/usermod.c, lib/dialchk.h, lib/dialup.h, lib/tcfsio.h, lib/Makefile.am, lib/commonio.c, lib/commonio.h, lib/defines.h, lib/encrypt.c, lib/getdef.c, lib/getdef.h, lib/groupio.c, lib/groupio.h, lib/prototypes.h, lib/pwauth.c, lib/pwio.c, lib/pwio.h, lib/rad64.c, lib/sgroupio.c, lib/sgroupio.h, lib/shadowio.h, libmisc/suauth.c, libmisc/chkname.h, libmisc/chowndir.c, libmisc/copydir.c, libmisc/entry.c, libmisc/failure.h, libmisc/getdate.h, libmisc/hushed.c, libmisc/loginprompt.c, libmisc/setupenv.c, libmisc/sulog.c, man/dpasswd.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/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.defs.5, man/logoutd.8, man/mkpasswd.8, man/newgrp.1, man/newusers.8, man/passwd.1, man/passwd.5, man/pl/Makefile.am, man/pl/groupadd.8, man/pl/groupdel.8, man/pl/groupmod.8, man/pl/useradd.8, man/pl/userdel.8, man/pl/usermod.8, man/porttime.5, man/pw_auth.3, man/pwck.8, man/shadow.3, man/shadow.5, man/su.1, man/sulogin.8, man/useradd.8, man/userdel.8, man/usermod.8, etc/login.defs.hurd, etc/login.defs.linux, doc/ANNOUNCE, doc/CHANGES, doc/README, doc/README.linux, doc/README.pam, doc/WISHLIST, debian/login.copyright, debian/passwd.copyright, debian/secure-su.copyright, mkinstalldirs, configure.in, Makefile.am: + * contrib/Makefile.am, contrib/groupmems.shar, doc/LSM, po/el.po, po/fr.po, po/pl.po, po/sv.po, doc/README.mirrors, src/vipw.c, src/dpasswd.c, src/Makefile.am, src/chage.c, src/chfn.c, src/chpasswd.c, src/chsh.c, src/expiry.c, src/faillog.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c, src/groupmod.c, src/groups.c, src/grpck.c, src/grpconv.c, src/grpunconv.c, src/id.c, src/lastlog.c, src/login.c, src/logoutd.c, src/mkpasswd.c, src/newgrp.c, src/newusers.c, src/passwd.c, src/pwck.c, src/pwconv.c, src/pwunconv.c, src/su.c, src/sulogin.c, src/useradd.c, src/userdel.c, src/usermod.c, lib/dialchk.h, lib/dialup.h, lib/rad64.c, lib/tcfsio.h, lib/Makefile.am, lib/commonio.c, lib/commonio.h, lib/defines.h, lib/encrypt.c, lib/getdef.c, lib/getdef.h, lib/groupio.c, lib/groupio.h, lib/prototypes.h, lib/pwauth.c, lib/pwio.c, lib/pwio.h, lib/sgroupio.c, lib/sgroupio.h, lib/shadowio.h, libmisc/suauth.c, libmisc/chkname.h, libmisc/chowndir.c, libmisc/copydir.c, libmisc/entry.c, libmisc/failure.h, libmisc/getdate.h, libmisc/hushed.c, libmisc/loginprompt.c, libmisc/setupenv.c, libmisc/sulog.c, man/dpasswd.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/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.defs.5, man/logoutd.8, man/mkpasswd.8, man/newgrp.1, man/newusers.8, man/passwd.1, man/passwd.5, man/pl/Makefile.am, man/pl/groupadd.8, man/pl/groupdel.8, man/pl/groupmod.8, man/pl/useradd.8, man/pl/userdel.8, man/pl/usermod.8, man/porttime.5, man/pw_auth.3, man/pwck.8, man/shadow.3, man/shadow.5, man/su.1, man/sulogin.8, man/useradd.8, man/userdel.8, man/usermod.8, etc/login.defs.hurd, etc/login.defs.linux, doc/ANNOUNCE, doc/CHANGES, doc/README, doc/README.linux, doc/README.pam, doc/WISHLIST, debian/login.copyright, debian/passwd.copyright, debian/secure-su.copyright, mkinstalldirs, configure.in, Makefile.am: *** empty log message *** 1999-08-27 Marek Micha趾iewicz @@ -1993,7 +2553,7 @@ 1999-06-07 Marek Micha趾iewicz - * redhat/shadow-utils.spec.in, src/dpasswd.c, src/Makefile.am, src/chage.c, src/chfn.c, src/chpasswd.c, src/chsh.c, src/expiry.c, src/faillog.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c, src/groupmod.c, src/groups.c, src/grpck.c, src/grpconv.c, src/grpunconv.c, src/id.c, src/lastlog.c, src/login.c, src/logoutd.c, src/mkpasswd.c, src/newgrp.c, src/newusers.c, src/passwd.c, src/pwck.c, src/pwconv.c, src/pwunconv.c, src/su.c, src/sulogin.c, src/useradd.c, src/userdel.c, src/usermod.c, contrib/Makefile.am, contrib/README, contrib/udbachk.tgz, debian/changelog, debian/rules, doc/CHANGES, doc/LSM, doc/README.linux, doc/README.mirrors, doc/README.platforms, doc/WISHLIST, lib/Makefile.am, lib/fputsx.c, lib/getpass.c, lib/pam_defs.h, lib/prototypes.h, lib/rcsid.h, libmisc/login_desrpc.c, libmisc/pam_pass.c, libmisc/utmp.c, man/login.1, po/el.po, po/pl.po, acconfig.h, configure.in: + * redhat/shadow-utils.spec.in, src/dpasswd.c, src/Makefile.am, src/chage.c, src/chfn.c, src/chpasswd.c, src/chsh.c, src/expiry.c, src/faillog.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c, src/groupmod.c, src/groups.c, src/grpck.c, src/grpconv.c, src/grpunconv.c, src/id.c, src/lastlog.c, src/login.c, src/logoutd.c, src/mkpasswd.c, src/newgrp.c, src/newusers.c, src/passwd.c, src/pwck.c, src/pwconv.c, src/pwunconv.c, src/su.c, src/sulogin.c, src/useradd.c, src/userdel.c, src/usermod.c, contrib/Makefile.am, contrib/README, contrib/udbachk.tgz, debian/changelog, debian/rules, doc/CHANGES, doc/README.mirrors, doc/LSM, doc/README.linux, doc/README.platforms, doc/WISHLIST, lib/Makefile.am, lib/fputsx.c, lib/getpass.c, lib/pam_defs.h, lib/prototypes.h, lib/rcsid.h, libmisc/login_desrpc.c, libmisc/pam_pass.c, libmisc/utmp.c, man/login.1, po/el.po, po/pl.po, acconfig.h, configure.in: *** empty log message *** 1999-03-07 Marek Micha趾iewicz @@ -2008,12 +2568,12 @@ 1998-07-24 Marek Micha趾iewicz - * src/passwd.c, src/su.c, src/userdel.c, src/Makefile.am, src/chage.c, src/faillog.c, src/login.c, lib/tcfsio.c, lib/tcfsio.h, lib/pwauth.c, libmisc/chowntty.c, libmisc/pam_pass.c, libmisc/setugid.c, etc/pam.d/passwd, etc/pam.d/su, lib/Makefile.am, lib/commonio.c, lib/defines.h, lib/prototypes.h, doc/Makefile.am, doc/README.linux, doc/README.mirrors, doc/README.platforms, doc/WISHLIST, etc/Makefile.am, etc/pam.d/Makefile.am, doc/CHANGES, debian/changelog, configure.in, acconfig.h: + * src/passwd.c, src/su.c, src/userdel.c, src/Makefile.am, src/chage.c, src/faillog.c, src/login.c, lib/tcfsio.c, lib/tcfsio.h, lib/pwauth.c, libmisc/chowntty.c, libmisc/pam_pass.c, libmisc/setugid.c, etc/pam.d/passwd, etc/pam.d/su, lib/Makefile.am, lib/commonio.c, lib/defines.h, lib/prototypes.h, doc/README.mirrors, doc/Makefile.am, doc/README.linux, doc/README.platforms, doc/WISHLIST, etc/Makefile.am, etc/pam.d/Makefile.am, doc/CHANGES, debian/changelog, configure.in, acconfig.h: *** empty log message *** 1998-06-26 Marek Micha趾iewicz - * src/passwd.c, src/usermod.c, man/faillog.8, man/pwconv.8, src/logoutd.c, lib/getpass.c, libmisc/copydir.c, doc/README.linux, doc/README.mirrors, doc/WISHLIST, lib/commonio.c, debian/changelog, doc/CHANGES, configure.in: + * src/passwd.c, src/usermod.c, man/faillog.8, man/pwconv.8, src/logoutd.c, lib/getpass.c, libmisc/copydir.c, doc/README.mirrors, doc/README.linux, doc/WISHLIST, lib/commonio.c, debian/changelog, doc/CHANGES, configure.in: *** empty log message *** 1998-05-29 Marek Micha趾iewicz @@ -2023,17 +2583,17 @@ 1998-04-16 Marek Micha趾iewicz - * src/useradd.c, src/userdel.c, src/usermod.c, src/passwd.c, src/sulogin.c, src/groupdel.c, src/login.c, src/logoutd.c, src/newgrp.c, src/dpasswd.c, src/chage.c, src/faillog.c, src/gpasswd.c, src/groupadd.c, redhat/shadow-970616-rh.patch, redhat/shadow-970616-utuser.patch, redhat/shadow-970616.login.defs, redhat/shadow-970616.useradd, redhat/shadow-utils-970616.spec, src/Makefile.am, libmisc/utmp.c, redhat/Makefile.am, redhat/README, redhat/shadow-970616-fix.patch, redhat/shadow-970616-glibc.patch, libmisc/limits.c, libmisc/log.c, libmisc/login_desrpc.c, libmisc/loginprompt.c, libmisc/obscure.c, libmisc/strtoday.c, libmisc/chkname.c, libmisc/chowndir.c, libmisc/copydir.c, libmisc/failure.c, lib/dialchk.c, lib/defines.h, lib/pwauth.c, lib/pwpack.c, doc/CHANGES, doc/README.linux, doc/WISHLIST, doc/cracklib26.diff, lib/commonio.c, acconfig.h, configure.in, debian/tar.c: + * src/useradd.c, src/userdel.c, src/usermod.c, src/passwd.c, src/sulogin.c, src/groupdel.c, src/login.c, src/logoutd.c, src/newgrp.c, src/dpasswd.c, src/chage.c, src/faillog.c, src/gpasswd.c, src/groupadd.c, redhat/shadow-970616-rh.patch, redhat/shadow-970616-utuser.patch, redhat/shadow-970616.login.defs, redhat/shadow-970616.useradd, redhat/shadow-utils-970616.spec, src/Makefile.am, libmisc/utmp.c, redhat/Makefile.am, redhat/README, redhat/shadow-970616-fix.patch, redhat/shadow-970616-glibc.patch, libmisc/login_desrpc.c, libmisc/limits.c, libmisc/log.c, libmisc/loginprompt.c, libmisc/obscure.c, libmisc/strtoday.c, libmisc/chkname.c, libmisc/chowndir.c, libmisc/copydir.c, libmisc/failure.c, lib/dialchk.c, lib/defines.h, lib/pwauth.c, lib/pwpack.c, doc/CHANGES, doc/README.linux, doc/WISHLIST, doc/cracklib26.diff, lib/commonio.c, acconfig.h, configure.in, debian/tar.c: *** empty log message *** 1998-04-02 Marek Micha趾iewicz - * src/groupmod.c, libmisc/sulog.c, lib/sgetspent.c, lib/sgetpwent.c, lib/sgetgrent.c, lib/putgrent.c, lib/gshadow.c, lib/getdef.c, lib/fputsx.c, lib/commonio.c, doc/README.linux, doc/README.mirrors, doc/CHANGES, configure.in: + * src/groupmod.c, libmisc/sulog.c, lib/sgetspent.c, lib/sgetpwent.c, lib/sgetgrent.c, lib/putgrent.c, lib/gshadow.c, lib/getdef.c, lib/fputsx.c, lib/commonio.c, doc/README.mirrors, doc/README.linux, doc/CHANGES, configure.in: *** empty log message *** 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/automake-1.0.diff, doc/README.mirrors, 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, aclocal.m4, acconfig.h, configure.in, Makefile.am: *** empty log message *** 1998-01-25 Marek Micha趾iewicz @@ -2042,22 +2602,22 @@ 1997-12-14 Marek Micha趾iewicz - * doc/CHANGES, debian/checksums, debian/rules, debian/Makefile.am, src/Makefile.am, src/userdel.c, src/usermod.c, src/pwck.c, src/useradd.c, src/mkpasswd.c, src/gpasswd.c, src/grpck.c, src/login.c, src/chage.c, src/chfn.c, src/chsh.c, man/shadowconfig.8, man/vipw.8, old/Makefile.am, old/pwunconv.8, man/Makefile.am, man/login.defs.5, man/pwconv.8, man/pwunconv.8, libmisc/limits.c, libmisc/rlogin.c, lib/pwent.c, lib/prototypes.h, lib/pwdbm.c, lib/shadow.c, doc/LSM, doc/WISHLIST, etc/limits, lib/grent.c, shadow-utils.spec, debian/changelog, configure.in: + * doc/CHANGES, debian/checksums, debian/rules, debian/Makefile.am, src/Makefile.am, src/userdel.c, src/usermod.c, src/pwck.c, src/useradd.c, src/mkpasswd.c, src/gpasswd.c, src/grpck.c, src/login.c, src/chage.c, src/chfn.c, src/chsh.c, man/shadowconfig.8, man/vipw.8, old/Makefile.am, old/pwunconv.8, man/Makefile.am, man/login.defs.5, man/pwconv.8, man/pwunconv.8, libmisc/limits.c, libmisc/rlogin.c, lib/pwdbm.c, lib/pwent.c, lib/prototypes.h, lib/shadow.c, doc/LSM, doc/WISHLIST, etc/limits, lib/grent.c, shadow-utils.spec, debian/changelog, configure.in: *** empty log message *** 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/logoutd.c, src/mkpasswd.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/salt.c, libmisc/setugid.c, libmisc/setup.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/sgroupio.c, lib/shadow.c, lib/shadowio.c, lib/spdbm.c, lib/sppack.c, lib/rename.c, lib/rmdir.c, lib/sgetgrent.c, lib/sgetpwent.c, lib/sgetspent.c, lib/rad64.c, lib/pwent.c, lib/pwauth.c, lib/pwdbm.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/md5.c, lib/md5crypt.c, lib/gsdbm.c, lib/gshadow.c, lib/gspack.c, lib/lockpw.c, lib/grent.c, lib/grdbm.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.linux, doc/README.mirrors, 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/logoutd.c, src/mkpasswd.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/salt.c, libmisc/setugid.c, libmisc/setup.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: *** empty log message *** 1997-10-01 Marek Micha趾iewicz - * debian/changelog, src/chpasswd.c, libmisc/login_access.c, lib/commonio.h, lib/sgroupio.c, lib/shadowio.c, etc/login.defs.linux, doc/CHANGES, doc/LSM, doc/README.mirrors, doc/WISHLIST, shadow-utils.spec: + * debian/changelog, src/chpasswd.c, libmisc/login_access.c, lib/commonio.h, lib/sgroupio.c, lib/shadowio.c, etc/login.defs.linux, doc/CHANGES, doc/README.mirrors, doc/LSM, doc/WISHLIST, shadow-utils.spec: *** empty log message *** 1997-09-30 Marek Micha趾iewicz - * src/useradd.c, src/userdel.c, src/usermod.c, src/pwconv.c, src/pwunconv.c, src/su.c, src/newusers.c, src/passwd.c, src/pwck.c, src/grpck.c, src/grpconv.c, src/grpunconv.c, src/login.c, src/groupmod.c, src/dpasswd.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c, src/chage.c, src/chfn.c, src/chpasswd.c, src/chsh.c, src/Makefile.am, old/install-sh, old/pwconv-old.8, old/pwunconv-old.8, old/Makefile.am, man/pwconv.8, man/pwunconv.8, libmisc/setugid.c, libmisc/shell.c, libmisc/utmp.c, libmisc/mail.c, libmisc/obscure.c, libmisc/pam_pass.c, libmisc/salt.c, libmisc/isexpired.c, libmisc/login_access.c, libmisc/env.c, libmisc/fields.c, libmisc/addgrps.c, libmisc/chowndir.c, libmisc/chowntty.c, libmisc/console.c, libmisc/copydir.c, lib/strerror.c, lib/snprintf.c, lib/snprintf.h, lib/sgroupio.c, lib/sgroupio.h, lib/shadowio.c, lib/shadowio.h, lib/putgrent.c, lib/pwent.c, lib/pwauth.c, lib/grent.c, lib/getpass.c, lib/prototypes.h, lib/commonio.c, lib/commonio.h, lib/defines.h, lib/encrypt.c, lib/getdef.c, lib/Makefile.am, etc/login.defs.linux, doc/README.linux, doc/README.mirrors, doc/WISHLIST, doc/CHANGES, doc/LSM, doc/Makefile.am, debian/rules, debian/changelog, contrib/adduser.c, configure.in, acconfig.h: + * src/useradd.c, src/userdel.c, src/usermod.c, src/pwconv.c, src/pwunconv.c, src/su.c, src/newusers.c, src/passwd.c, src/pwck.c, src/grpck.c, src/grpconv.c, src/grpunconv.c, src/login.c, src/groupmod.c, src/dpasswd.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c, src/chage.c, src/chfn.c, src/chpasswd.c, src/chsh.c, src/Makefile.am, old/install-sh, old/pwconv-old.8, old/pwunconv-old.8, old/Makefile.am, man/pwconv.8, man/pwunconv.8, libmisc/setugid.c, libmisc/shell.c, libmisc/utmp.c, libmisc/mail.c, libmisc/obscure.c, libmisc/pam_pass.c, libmisc/salt.c, libmisc/login_access.c, libmisc/isexpired.c, libmisc/env.c, libmisc/fields.c, libmisc/addgrps.c, libmisc/chowndir.c, libmisc/chowntty.c, libmisc/console.c, libmisc/copydir.c, lib/strerror.c, lib/snprintf.c, lib/snprintf.h, lib/sgroupio.c, lib/sgroupio.h, lib/shadowio.c, lib/shadowio.h, lib/putgrent.c, lib/pwent.c, lib/pwauth.c, lib/grent.c, lib/getpass.c, lib/prototypes.h, lib/commonio.c, lib/commonio.h, lib/defines.h, lib/encrypt.c, lib/getdef.c, lib/Makefile.am, etc/login.defs.linux, doc/README.mirrors, doc/README.linux, doc/WISHLIST, doc/CHANGES, doc/LSM, doc/Makefile.am, debian/rules, debian/changelog, contrib/adduser.c, configure.in, acconfig.h: *** empty log message *** 1997-09-29 Marek Micha趾iewicz @@ -2067,7 +2627,7 @@ 1997-06-16 Marek Micha趾iewicz - * doc/console.c.spec, doc/Makefile.am, doc/WISHLIST, doc/console.c.spec.txt, doc/CHANGES, debian/changelog, src/shadowconfig.sh, redhat/Makefile.am, redhat/README, redhat/shadow-970502-config.patch, redhat/shadow-utils.spec, doc/README.shadow-paper, doc/README.mirrors, doc/README.linux, debian/login.copyright, debian/passwd.copyright, debian/secure-su.copyright, shadow-utils.spec, Makefile.am, configure.in: + * doc/console.c.spec, doc/Makefile.am, doc/WISHLIST, doc/console.c.spec.txt, doc/CHANGES, debian/changelog, src/shadowconfig.sh, redhat/Makefile.am, redhat/README, redhat/shadow-970502-config.patch, redhat/shadow-utils.spec, doc/README.mirrors, doc/README.shadow-paper, doc/README.linux, debian/login.copyright, debian/passwd.copyright, debian/secure-su.copyright, shadow-utils.spec, Makefile.am, configure.in: *** empty log message *** 1997-06-01 Marek Micha趾iewicz @@ -2077,7 +2637,7 @@ 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/login.defs.5, man/logoutd.8, man/mkpasswd.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/strstr.c, lib/spdbm.c, lib/sppack.c, lib/shadow.c, lib/sgetpwent.c, lib/sgetspent.c, lib/rename.c, lib/rmdir.c, lib/pwpack.c, lib/rad64.c, lib/sgetgrent.c, lib/pwent.c, lib/pwauth.h, lib/pwdbm.c, 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/grpack.c, lib/gsdbm.c, lib/gshadow.c, lib/gshadow_.h, lib/gspack.c, lib/grent.c, lib/getdef.c, lib/getpass.c, lib/grdbm.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/logoutd.c, src/mkpasswd.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/login.defs.5, man/logoutd.8, man/mkpasswd.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/logoutd.c, src/mkpasswd.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 @@ -2097,7 +2657,7 @@ 1996-09-25 Marek Micha趾iewicz - * src/usermod.c, src/sulogin.c, src/useradd.c, src/userdel.c, src/su.c, src/pwconv5.c, src/newgrp.c, src/passwd.c, src/pwck.c, src/grpck.c, src/login.c, src/logoutd.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c, src/groupmod.c, src/chfn.c, src/chsh.c, src/chage.c, libmisc/strtoday.c, libmisc/env.c, libmisc/fields.c, libmisc/isexpired.c, libmisc/setupenv.c, lib/getdef.c, lib/prototypes.h, lib/rad64.c, lib/defines.h, etc/login.defs.linux, doc/README.linux, doc/WISHLIST, doc/CHANGES, configure, configure.in, config.h.in: + * src/usermod.c, src/sulogin.c, src/useradd.c, src/userdel.c, src/su.c, src/pwconv5.c, src/newgrp.c, src/passwd.c, src/pwck.c, src/grpck.c, src/login.c, src/logoutd.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c, src/groupmod.c, src/chfn.c, src/chsh.c, src/chage.c, libmisc/strtoday.c, libmisc/env.c, libmisc/fields.c, libmisc/isexpired.c, libmisc/setupenv.c, lib/rad64.c, lib/getdef.c, lib/prototypes.h, lib/defines.h, etc/login.defs.linux, doc/README.linux, doc/WISHLIST, doc/CHANGES, configure, configure.in, config.h.in: *** empty log message *** 1996-09-20 Marek Micha趾iewicz @@ -2115,9 +2675,9 @@ * old/Makefile.am, old/Makefile.linux, old/Makefile.sun4, old/Makefile.svr4, old/Makefile.xenix, old/config.h.linux, old/config.h.sun4, old/config.h.svr4, old/config.h.xenix, old/install-sh, old/orig-config.h, old/pwd.h.m4, shlib/Makefile.am, shlib/Makefile.in, shlib/Makefile.in.saved: New file. - * contrib/adduser-old.c, contrib/adduser.sh, contrib/adduser2.sh, contrib/atudel, doc/README.sun4: + * 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/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/grent.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/pwent.c, lib/rename.c, lib/rmdir.c, lib/shadow_.h, lib/strdup.c, lib/strstr.c, lib/defines.h, lib/faillog.h, lib/getdef.h, lib/grdbm.c, lib/groupio.h, lib/grpack.c, lib/gsdbm.c, lib/gshadow_.h, lib/gspack.c, lib/port.h, lib/prototypes.h, lib/pwauth.h, lib/pwdbm.c, 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/spdbm.c, lib/sppack.c, lib/utent.c, src/Makefile.in, src/dpasswd.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/mkpasswd.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/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/rad64.c, lib/sgroupio.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/login_access.c, libmisc/login_desrpc.c, libmisc/login_krb.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/setup.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/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/mkpasswd.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/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/mkpasswd.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/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/setup.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/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/mkpasswd.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: New file. diff --git a/Makefile.in b/Makefile.in index 55744a9e..513096cf 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.4 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -107,17 +107,16 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ 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@ @@ -270,7 +269,13 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @set fnord $$MAKEFLAGS; amf=$$2; \ + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -282,7 +287,7 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ @@ -290,7 +295,13 @@ $(RECURSIVE_TARGETS): mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - @set fnord $$MAKEFLAGS; amf=$$2; \ + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ @@ -311,7 +322,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ diff --git a/NEWS b/NEWS index b562efda..cfd5d067 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,62 @@ -$Id: NEWS,v 1.104 2005/01/21 20:55:46 kloczek Exp $ +$Id: NEWS,v 1.147 2005/04/25 10:39:48 kloczek Exp $ + +shadow-4.0.7 -> shadow-4.0.8 + +*** general: +- remove not working OPIE and SKEY support, +- chage, useradd, usermod: reduce multiple OPENLOG() calls, +- passwd: fix #61313 Debian bug: "passwd -S root" (as a normal user) should not + display "You may not change the password for root.", +- vipw: fixed race condition (Debian #242407 bug; fix by Alexander Gattin + ), +- configure.in: add using AC_GNU_SOURCE macro for kill compilation warnings about + implicit declaration of function `fseeko', +- faillog: changed faillog record display format for allow fit in 80 columns all + faillog atributies, +- removed NDBM code (unused), +- fixed use of SU_WHEEL_ONLY in su. Now su realy is avalaible for wheel group + members. Thanks to Mike Frysinger for report: + http://bugs.gentoo.org/show_bug.cgi?id=80345 +- drop never finished kerberos and des_rpc support (for kerberos support back firs + must be prepared modularization), +- fixed UTMP path detection (by Kelledin ), +- useradd: rewrited group count to dynamic (by John Newbigin + ), +- login: fixed create lastlog entry fo users never loged in on non-PAM + variant of login (fix by ), +- remove handle login.defs::NOLOGIN_STR (never used), +- useradd: fixes a potential security problem when mailbox is created in + useradd. + Patch and comment by Koblinger Egmont : + Only two arguments are passed to the open() call though it expects three + because O_CREAT is present. Hence the permission of the file first becomes + some random garbage found on the stack, and an attacker can perhaps open + this file and hold it open for reading or writing before the proper + fchmod() is executed. (Actually, we could also pass the final "mode" to + the open() call and then save the consequent fchmod().) +- SELinux changes: added changes in chage, chfn, chsh, passwd for allow + construct more grained user password/accuunt properties on SELinux + policies level. Patch originally based on RH changes (submited by Chris + PeBenito ), +- added SELinux changes: in libmisc/copydir.c (based on Fedora patch), +- updated translations: cs, da, es, eu, fi, fr, it, ko, nl, pl, pt, sk, uk, +- added new translations: tl, +- reindent all source code using -l80, +*** documentation: +- it man pages (by Danilo Piazzalunga ): +-- updated: 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: chage.1, chpasswd.8, expiry.1, faillog.5, faillog.8, getspnam.3, + logoutd.8, porttime.5, pwck.8, shadow.3, shadowconfig.8, su.1, +- passwd(1): fix #160477 Debian bug: improve -S output description, +- 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(), +- 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, shadow-4.0.6 -> shadow-4.0.7 @@ -10,7 +68,7 @@ shadow-4.0.6 -> shadow-4.0.7 - added ro, sq translations (from Debian resources), - fixed large file support in lastlog and faillog: -- added AC_SYS_LARGEFILE macro to autoconf, --- use fseeko() instead fseek() and remove casting file ofsets to unsigned +-- use fseeko() instead fseek() and remove casting file offsets to unsigned long. - lastlog: -- rewrited source code using the same style as in chpasswd.c, diff --git a/TODO b/TODO index efa6a7a3..bb35d6f8 100644 --- a/TODO +++ b/TODO @@ -5,9 +5,9 @@ ALL: - move base passwd/shadow/group/gshadow operation to module for allow write diffrent backend modules for db, NIS, LDAP and others. Default backend it - will be choose depending on /etc/nsswitch.conf and allow overwride this by - -r options (where the can be file, db, nis - nisplus, ldap .. like on /etc/nsswitch.conf in service column). + will be goot if will be choosen depending on /etc/nsswitch.conf and allow + overwride this by -r options (where the can be + file, db, nis nisplus, ldap .. like on /etc/nsswitch.conf in service column). passwd have old piece of code with handling -r option and it will be good finish this and propagate on other shadow tools for allow operate on other user databases by well known tools. diff --git a/aclocal.m4 b/aclocal.m4 index bd30d308..287770e1 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.4 -*- Autoconf -*- +# generated automatically by aclocal 1.9.5 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,398 +11,11 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# -*- Autoconf -*- -# Copyright (C) 2002, 2003 Free Software Foundation, Inc. -# Generated from amversion.in; do not edit by hand. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION so it can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.4])]) - -# AM_AUX_DIR_EXPAND - -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. - -AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) - -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 6 - -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE]) -AC_SUBST([$1_FALSE]) -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) - -# serial 7 -*- Autoconf -*- - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 -# Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - - -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - - - -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". -# We try a few techniques and use that to set a single cache variable. -# -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl - -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) - -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) - - -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) - - -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH]) -]) - -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 -# Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -#serial 2 - -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[for mf in $CONFIG_FILES; do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done -done -])# _AM_OUTPUT_DEPENDENCY_COMMANDS - - -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) - -# gettext.m4 serial 28 (gettext-0.13) -dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. +# gettext.m4 serial 36 (gettext-0.14.3) +dnl Copyright (C) 1995-2005 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. dnl dnl This file can can be used in projects which are not available under dnl the GNU General Public License or the GNU Library General Public @@ -463,8 +76,8 @@ AC_DEFUN([AM_GNU_GETTEXT], ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT ])])])]) - define(gt_included_intl, ifelse([$1], [external], [no], [yes])) - define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], [])) + define([gt_included_intl], ifelse([$1], [external], [no], [yes])) + define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], [])) AC_REQUIRE([AM_PO_SUBDIRS])dnl ifelse(gt_included_intl, yes, [ @@ -490,6 +103,9 @@ AC_DEFUN([AM_GNU_GETTEXT], AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) ]) + dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation. + gt_INTL_MACOSX + dnl Set USE_NLS. AM_NLS @@ -570,9 +186,9 @@ extern #ifdef __cplusplus "C" #endif -const char *_nl_expand_alias ();], +const char *_nl_expand_alias (const char *);], [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], +return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")], gt_cv_func_gnugettext_libintl=yes, gt_cv_func_gnugettext_libintl=no) dnl Now see whether libintl exists and depends on libiconv. @@ -591,9 +207,9 @@ extern #ifdef __cplusplus "C" #endif -const char *_nl_expand_alias ();], +const char *_nl_expand_alias (const char *);], [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], +return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")], [LIBINTL="$LIBINTL $LIBICONV" LTLIBINTL="$LTLIBINTL $LTLIBICONV" gt_cv_func_gnugettext_libintl=yes @@ -636,6 +252,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` fi + CATOBJEXT= if test "$gt_use_preinstalled_gnugettext" = "yes" \ || test "$nls_cv_use_gnu_gettext" = "yes"; then dnl Mark actions to use GNU gettext tools. @@ -643,6 +260,15 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", fi ]) + if test -n "$INTL_MACOSX_LIBS"; then + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Some extra flags are needed during linking. + LIBINTL="$LIBINTL $INTL_MACOSX_LIBS" + LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS" + fi + fi + if test "$gt_use_preinstalled_gnugettext" = "yes" \ || test "$nls_cv_use_gnu_gettext" = "yes"; then AC_DEFINE(ENABLE_NLS, 1, @@ -718,6 +344,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", AC_SUBST(GENCAT) dnl For backward compatibility. Some Makefiles may be using this. + INTLOBJS= if test "$USE_INCLUDED_LIBINTL" = yes; then INTLOBJS="\$(GETTOBJS)" fi @@ -748,6 +375,7 @@ AC_DEFUN([AM_INTL_SUBDIR], AC_REQUIRE([AM_MKINSTALLDIRS])dnl AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl + AC_REQUIRE([gt_GLIBC2])dnl AC_REQUIRE([AC_PROG_RANLIB])dnl AC_REQUIRE([AC_ISC_POSIX])dnl AC_REQUIRE([AC_HEADER_STDC])dnl @@ -756,22 +384,23 @@ AC_DEFUN([AM_INTL_SUBDIR], AC_REQUIRE([AC_C_INLINE])dnl AC_REQUIRE([AC_TYPE_OFF_T])dnl AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([jm_AC_TYPE_LONG_LONG])dnl + AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl AC_REQUIRE([gt_TYPE_WCHAR_T])dnl AC_REQUIRE([gt_TYPE_WINT_T])dnl - AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([jm_AC_HEADER_STDINT_H]) + AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) + AC_REQUIRE([gl_AC_HEADER_STDINT_H]) AC_REQUIRE([gt_TYPE_INTMAX_T]) AC_REQUIRE([gt_PRINTF_POSIX]) AC_REQUIRE([AC_FUNC_ALLOCA])dnl AC_REQUIRE([AC_FUNC_MMAP])dnl - AC_REQUIRE([jm_GLIBC21])dnl + AC_REQUIRE([gl_GLIBC21])dnl AC_REQUIRE([gt_INTDIV0])dnl - AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl + AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl AC_REQUIRE([gt_INTTYPES_PRI])dnl AC_REQUIRE([gl_XSIZE])dnl + AC_REQUIRE([gt_INTL_MACOSX])dnl AC_CHECK_TYPE([ptrdiff_t], , [AC_DEFINE([ptrdiff_t], [long], @@ -825,7 +454,11 @@ __fsetlocking]) AM_ICONV AM_LANGINFO_CODESET if test $ac_cv_header_locale_h = yes; then - AM_LC_MESSAGES + gt_LC_MESSAGES + fi + + if test -n "$INTL_MACOSX_LIBS"; then + CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers" fi dnl intl/plural.c is generated from intl/plural.y. It requires bison, @@ -861,6 +494,50 @@ changequote([,])dnl ]) +dnl Checks for special options needed on MacOS X. +dnl Defines INTL_MACOSX_LIBS. +AC_DEFUN([gt_INTL_MACOSX], +[ + dnl Check for API introduced in MacOS X 10.2. + AC_CACHE_CHECK([for CFPreferencesCopyAppValue], + gt_cv_func_CFPreferencesCopyAppValue, + [gt_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers" + gt_save_LIBS="$LIBS" + LIBS="$LIBS -framework CoreFoundation" + AC_TRY_LINK([#include ], + [CFPreferencesCopyAppValue(NULL, NULL)], + [gt_cv_func_CFPreferencesCopyAppValue=yes], + [gt_cv_func_CFPreferencesCopyAppValue=no]) + CPPFLAGS="$gt_save_CPPFLAGS" + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then + AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1, + [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) + fi + dnl Check for API introduced in MacOS X 10.3. + AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent, + [gt_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers" + gt_save_LIBS="$LIBS" + LIBS="$LIBS -framework CoreFoundation" + AC_TRY_LINK([#include ], [CFLocaleCopyCurrent();], + [gt_cv_func_CFLocaleCopyCurrent=yes], + [gt_cv_func_CFLocaleCopyCurrent=no]) + CPPFLAGS="$gt_save_CPPFLAGS" + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFLocaleCopyCurrent = yes; then + AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1, + [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) + fi + INTL_MACOSX_LIBS= + if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" + fi + AC_SUBST([INTL_MACOSX_LIBS]) +]) + + dnl gt_CHECK_DECL(FUNC, INCLUDES) dnl Check whether a function is declared. AC_DEFUN([gt_CHECK_DECL], @@ -886,11 +563,9 @@ AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) # iconv.m4 serial AM4 (gettext-0.11.3) dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. dnl From Bruno Haible. @@ -988,197 +663,11 @@ size_t iconv(); fi ]) -# Do all the work for Automake. -*- Autoconf -*- - -# This macro actually does too much some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -# Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 11 - -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.58])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) - -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP -AC_REQUIRE([AM_PROG_MKDIR_P])dnl -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -]) -]) - - -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. - -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $1 | $1:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) - -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. - -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"$am_aux_dir/install-sh"} -AC_SUBST(install_sh)]) - -# -*- Autoconf -*- -# Copyright (C) 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 1 - -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) - # lib-ld.m4 serial 3 (gettext-0.13) dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. dnl Subroutines of libtool.m4, dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision @@ -1285,16 +774,16 @@ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) AC_LIB_PROG_LD_GNU ]) -# lib-link.m4 serial 4 (gettext-0.12) -dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. +# lib-link.m4 serial 6 (gettext-0.14.3) +dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. dnl From Bruno Haible. +AC_PREREQ(2.50) + dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and dnl the libraries corresponding to explicit and implicit dependencies. dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and @@ -1382,6 +871,8 @@ dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, dnl hardcode_direct, hardcode_minus_L. AC_DEFUN([AC_LIB_RPATH], [ + dnl Tell automake >= 1.10 to complain if config.rpath is missing. + m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])]) AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host @@ -1637,7 +1128,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], if test "X$additional_includedir" = "X/usr/local/include"; then if test -n "$GCC"; then case $host_os in - linux*) haveit=yes;; + linux* | gnu* | k*bsd*-gnu) haveit=yes;; esac fi fi @@ -1686,7 +1177,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], if test "X$additional_libdir" = "X/usr/local/lib"; then if test -n "$GCC"; then case $host_os in - linux*) haveit=yes;; + linux* | gnu* | k*bsd*-gnu) haveit=yes;; esac fi fi @@ -1837,13 +1328,11 @@ AC_DEFUN([AC_LIB_APPENDTOVAR], done ]) -# lib-prefix.m4 serial 3 (gettext-0.13) -dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. +# lib-prefix.m4 serial 4 (gettext-0.14.2) +dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. dnl From Bruno Haible. @@ -1910,7 +1399,7 @@ AC_DEFUN([AC_LIB_PREFIX], if test "X$additional_includedir" = "X/usr/local/include"; then if test -n "$GCC"; then case $host_os in - linux*) haveit=yes;; + linux* | gnu* | k*bsd*-gnu) haveit=yes;; esac fi fi @@ -2651,7 +2140,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* ) + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -2663,8 +2152,20 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl # And add a safety zone lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ;; - - *) + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + *) # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. @@ -3095,21 +2596,6 @@ if test "$GCC" = yes; then else sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi - # sanitize - new_sys_lib_search_path_spec= - for d in $sys_lib_search_path_spec ; do - # check if exists - if test -d $d -a -x $d ; then - # normalize - new_d=$(cd $d ; pwd) - # uniq - if ! echo "$new_sys_lib_search_path_spec" | grep -q -F -e " $new_d " ; then - new_sys_lib_search_path_spec="$new_sys_lib_search_path_spec $new_d " - fi - fi - done - # compress spaces - sys_lib_search_path_spec=`echo "$new_sys_lib_search_path_spec" | $SED -e 's/^ *//g;s/ \+/ /g;s/ $//g'` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi @@ -3244,7 +2730,7 @@ cygwin* | mingw* | pw32*) ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -3302,7 +2788,9 @@ kfreebsd*-gnu) dynamic_linker='GNU ld.so' ;; -freebsd*) +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat case $version_type in @@ -3321,7 +2809,7 @@ freebsd*) freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.[01]* | freebsdelf3.[01]*) + freebsd3.[[01]]* | freebsdelf3.[[01]]*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -3445,10 +2933,27 @@ linux*) # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '[#]line __oline__ "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -3677,7 +3182,7 @@ if test -f "$ltmain" && test -n "$tagnames"; then case $tagname in CXX) if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || (test "X$CXX" != "Xg++"))) ; then AC_LIBTOOL_LANG_CXX_CONFIG else @@ -4148,13 +3653,13 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu) +freebsd* | kfreebsd*-gnu | dragonfly*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; @@ -4423,7 +3928,7 @@ AC_DEFUN([_LT_AC_PROG_CXXCPP], [ AC_REQUIRE([AC_PROG_CXX]) if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || (test "X$CXX" != "Xg++"))) ; then AC_PROG_CXXCPP fi @@ -4760,7 +4265,7 @@ case $host_os in _LT_AC_TAGVAR(link_all_deplibs, $1)=yes if test "$GXX" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) + case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -4781,6 +4286,9 @@ case $host_os in fi esac shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi else # not using gcc if test "$host_cpu" = ia64; then @@ -4944,14 +4452,14 @@ case $host_os in ;; esac ;; - freebsd[12]*) + freebsd[[12]]*) # C++ shared libraries reported to be fairly broken before switch to ELF _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; freebsd-elf*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; - freebsd* | kfreebsd*-gnu) + freebsd* | kfreebsd*-gnu | dragonfly*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions _LT_AC_TAGVAR(ld_shlibs, $1)=yes @@ -4982,7 +4490,7 @@ case $host_os in # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ;; *) if test "$GXX" = yes; then @@ -5140,8 +4648,12 @@ case $host_os in _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 8.0 or newer - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + tmp_idyn= + case $host_cpu in + ia64*) tmp_idyn=' -i_dynamic';; + esac + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ;; esac _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no @@ -5149,6 +4661,14 @@ case $host_os in _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ;; + pgCC) + # Portland Group C++ compiler + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + ;; cxx) # Compaq C++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' @@ -5387,7 +4907,7 @@ case $host_os in _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The C++ compiler is used as linker so we must use $wl # flag to pass the commands to the underlying system @@ -5764,7 +5284,7 @@ _LT_AC_TAGVAR(objext, $1)=$objext lt_simple_compile_test_code="class foo {}\n" # Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n' # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER @@ -6006,6 +5526,12 @@ fast_install=$enable_fast_install # The host system. host_alias=$host_alias host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os # An echo program that does not interpret backslashes. echo=$lt_echo @@ -6356,9 +5882,6 @@ symcode='[[BCDEGRST]]' # Regexp to match symbols that can be accessed directly from C. sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' -# Transform the above into a raw symbol and a C symbol. -symxfrm='\1 \2\3 \3' - # Transform an extracted symbol line into a proper C declaration lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" @@ -6418,8 +5941,11 @@ esac # Try without a prefix undercore, then with it. for ac_symprfx in "" "_"; do + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + # Write the raw and C identifiers. - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" # Check to see that the pipe works correctly. pipe_works=no @@ -6637,7 +6163,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ;; esac ;; - freebsd* | kfreebsd*-gnu) + freebsd* | kfreebsd*-gnu | dragonfly*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -6683,12 +6209,18 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; - icpc) + icpc* | ecpc*) # Intel C++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; + pgCC) + # Portland Group C++ compiler. + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; cxx) # Compaq C++ # Make sure the PIC flag is empty. It appears that all Alpha @@ -6922,12 +6454,19 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ;; linux*) - case $CC in + case $cc_basename in icc* | ecc*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; + pgcc | pgf77 | pgf90) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; ccc*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' # All Alpha code is PIC. @@ -6972,6 +6511,11 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) fi ;; + unicos*) + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no + ;; + uts4*) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' @@ -7032,7 +6576,7 @@ ifelse([$1],[CXX],[ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" ;; cygwin* | mingw*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' ;; *) _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' @@ -7145,7 +6689,7 @@ EOF _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_AC_TAGVAR(always_export_symbols, $1)=no _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' @@ -7159,7 +6703,7 @@ EOF fi~ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' else - ld_shlibs=no + _LT_AC_TAGVAR(ld_shlibs, $1)=no fi ;; @@ -7203,11 +6747,21 @@ EOF linux*) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds" + tmp_addflag= + case $CC,$host_cpu in + pgf77* | pgf90* ) # Portland Group f77 and f90 compilers + tmp_addflag=' -fpic' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' supports_anon_versioning=no case `$LD -v 2>/dev/null` in - *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... *\ 2.11.*) ;; # other 2.11 versions @@ -7217,9 +6771,9 @@ EOF _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' else - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)=$_LT_AC_TAGVAR(archive_cmds, $1) fi else _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -7309,7 +6863,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) + case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -7330,6 +6884,9 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ fi esac shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi else # not using gcc if test "$host_cpu" = ia64; then @@ -7409,7 +6966,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' # FIXME: Should let the user specify the lib program. _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' + _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; @@ -7493,7 +7050,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu) + freebsd* | kfreebsd*-gnu | dragonfly*) _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_AC_TAGVAR(hardcode_direct, $1)=yes @@ -7682,7 +7239,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ;; esac _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ;; @@ -7943,7 +7500,7 @@ lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && break + test ! -f $lt_ac_sed && continue cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -7973,236 +7530,11 @@ SED=$lt_cv_path_SED AC_MSG_RESULT([$SED]) ]) -# Add --enable-maintainer-mode option to configure. -# From Jim Meyering - -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004 -# Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 3 - -AC_DEFUN([AM_MAINTAINER_MODE], -[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode is disabled by default - AC_ARG_ENABLE(maintainer-mode, -[ --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - USE_MAINTAINER_MODE=$enableval, - USE_MAINTAINER_MODE=no) - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST(MAINT)dnl -] -) - -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - -# Check to see how 'make' treats includes. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 2 - -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo done -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) - -# -*- Autoconf -*- - - -# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 3 - -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) - - -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) - -# AM_PROG_MKDIR_P -# --------------- -# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. - -# Copyright (C) 2003, 2004 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories -# created by `make install' are always world readable, even if the -# installer happens to have an overly restrictive umask (e.g. 077). -# This was a mistake. There are at least two reasons why we must not -# use `-m 0755': -# - it causes special bits like SGID to be ignored, -# - it may be too restrictive (some setups expect 775 directories). -# -# Do not use -m 0755 and let people choose whatever they expect by -# setting umask. -# -# We cannot accept any implementation of `mkdir' that recognizes `-p'. -# Some implementations (such as Solaris 8's) are not thread-safe: if a -# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' -# concurrently, both version can detect that a/ is missing, but only -# one can create it and the other will error out. Consequently we -# restrict ourselves to GNU make (using the --version option ensures -# this.) -AC_DEFUN([AM_PROG_MKDIR_P], -[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' - else - mkdir_p='$(install_sh) -d' - fi -fi -AC_SUBST([mkdir_p])]) - -# nls.m4 serial 1 (gettext-0.12) -dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. +# nls.m4 serial 2 (gettext-0.14.3) +dnl Copyright (C) 1995-2003, 2005 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. dnl dnl This file can can be used in projects which are not available under dnl the GNU General Public License or the GNU Library General Public @@ -8217,6 +7549,8 @@ dnl Authors: dnl Ulrich Drepper , 1995-2000. dnl Bruno Haible , 2000-2003. +AC_PREREQ(2.50) + AC_DEFUN([AM_NLS], [ AC_MSG_CHECKING([whether NLS is requested]) @@ -8230,6 +7564,8 @@ AC_DEFUN([AM_NLS], AC_DEFUN([AM_MKINSTALLDIRS], [ + dnl Tell automake >= 1.10 to complain if mkinstalldirs is missing. + m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([mkinstalldirs])]) dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly dnl find the mkinstalldirs script in another subdir but $(top_srcdir). dnl Try to locate it. @@ -8246,57 +7582,11 @@ AC_DEFUN([AM_MKINSTALLDIRS], AC_SUBST(MKINSTALLDIRS) ]) -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 2 - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - -# po.m4 serial 3 (gettext-0.14) -dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. +# po.m4 serial 7 (gettext-0.14.3) +dnl Copyright (C) 1995-2005 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. dnl dnl This file can can be used in projects which are not available under dnl the GNU General Public License or the GNU Library General Public @@ -8311,6 +7601,8 @@ dnl Authors: dnl Ulrich Drepper , 1995-2000. dnl Bruno Haible , 2000-2003. +AC_PREREQ(2.50) + dnl Checks for all prerequisites of the po subdirectory. AC_DEFUN([AM_PO_SUBDIRS], [ @@ -8326,7 +7618,7 @@ AC_DEFUN([AM_PO_SUBDIRS], dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. dnl The second test excludes FreeBSD msgfmt. AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && + [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], :) AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) @@ -8335,7 +7627,7 @@ AC_DEFUN([AM_PO_SUBDIRS], dnl The first test excludes Solaris xgettext and early GNU xgettext versions. dnl The second test excludes FreeBSD xgettext. AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && + [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], :) dnl Remove leftover from FreeBSD xgettext call. @@ -8343,7 +7635,7 @@ AC_DEFUN([AM_PO_SUBDIRS], dnl Search for GNU msgmerge 0.11 or newer in the PATH. AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, - [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :) + [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :) dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. dnl Test whether we really found GNU msgfmt. @@ -8398,6 +7690,9 @@ AC_DEFUN([AM_PO_SUBDIRS], /*) top_srcdir="$ac_given_srcdir" ;; *) top_srcdir="$ac_dots$ac_given_srcdir" ;; esac + # Treat a directory as a PO directory if and only if it has a + # POTFILES.in file. This allows packages to have multiple PO + # directories under different names or in different locations. if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then rm -f "$ac_dir/POTFILES" test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" @@ -8411,7 +7706,7 @@ AC_DEFUN([AM_PO_SUBDIRS], if test -n "$OBSOLETE_ALL_LINGUAS"; then test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" fi - ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` + ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` # Hide the ALL_LINGUAS assigment from automake. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" @@ -8590,7 +7885,7 @@ changequote([,])dnl fi if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then # The LINGUAS file contains the set of available languages. - ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` + ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" else # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS. @@ -8640,7 +7935,7 @@ changequote([,])dnl QMFILES="$QMFILES $srcdirpre$lang.qm" frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg" - frobbedlang=`echo $lang | sed -e 's/_/-/g'` + frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll" done # CATALOGS depends on both $ac_dir and the user's LINGUAS @@ -8681,7 +7976,7 @@ changequote([,])dnl QTCATALOGS="$QTCATALOGS $lang.qm" frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg" - frobbedlang=`echo $lang | sed -e 's/_/-/g'` + frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll" done fi @@ -8701,7 +7996,7 @@ EOF if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then # Add dependencies that cannot be formulated as a simple suffix rule. for lang in $ALL_LINGUAS; do - frobbedlang=`echo $lang | sed -e 's/_/-/g'` + frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` cat >> "$ac_file.tmp" <, 1996. +AC_PREREQ(2.50) + # Search path for a program which passes the given test. dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, @@ -8786,6 +8081,7 @@ AC_CACHE_VAL(ac_cv_path_$1, test -z "$ac_dir" && ac_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then + echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD if [$3]; then ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext" break 2 @@ -8809,27 +8105,705 @@ fi AC_SUBST($1)dnl ]) +# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003 +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION so it can be traced. +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], + [AM_AUTOMAKE_VERSION([1.9.5])]) + +# AM_AUX_DIR_EXPAND -*- Autoconf -*- + +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is `.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` +]) + +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 # Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# serial 7 -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE]) +AC_SUBST([$1_FALSE]) +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. + +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 8 + +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "GCJ", or "OBJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl + +ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +]) + + +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) + + +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE(dependency-tracking, +[ --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH]) +]) + +# Generate code to set up dependency tracking. -*- Autoconf -*- + +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +#serial 3 + +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[for mf in $CONFIG_FILES; do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # So let's grep whole file. + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +done +])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each `.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) + +# Do all the work for Automake. -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 12 + +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.58])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +# test to see if srcdir already configured +if test "`cd $srcdir && pwd`" != "`pwd`" && + test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) + +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_PROG_INSTALL_SH +AM_PROG_INSTALL_STRIP +AC_REQUIRE([AM_PROG_MKDIR_P])dnl +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +]) +]) + + +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $1 | $1:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) + +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +install_sh=${install_sh-"$am_aux_dir/install-sh"} +AC_SUBST(install_sh)]) + +# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) + +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering + +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 4 + +AC_DEFUN([AM_MAINTAINER_MODE], +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is disabled by default + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST(MAINT)dnl +] +) + +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + +# Check to see how 'make' treats includes. -*- Autoconf -*- + +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # serial 3 +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo done +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# We grep out `Entering directory' and `Leaving directory' +# messages which can occur if `w' ends up in MAKEFLAGS. +# In particular we don't look at `^make:' because GNU make might +# be invoked under some other name (usually "gmake"), in which +# case it prints its new name instead of `make'. +if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then + am__include=include + am__quote= + _am_result=GNU +fi +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then + am__include=.include + am__quote="\"" + _am_result=BSD + fi +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf +]) + +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 4 + +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) + + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it supports --run. +# If it does, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +else + am_missing_run= + AC_MSG_WARN([`missing' script is too old or missing]) +fi +]) + +# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_MKDIR_P +# --------------- +# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. +# +# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories +# created by `make install' are always world readable, even if the +# installer happens to have an overly restrictive umask (e.g. 077). +# This was a mistake. There are at least two reasons why we must not +# use `-m 0755': +# - it causes special bits like SGID to be ignored, +# - it may be too restrictive (some setups expect 775 directories). +# +# Do not use -m 0755 and let people choose whatever they expect by +# setting umask. +# +# We cannot accept any implementation of `mkdir' that recognizes `-p'. +# Some implementations (such as Solaris 8's) are not thread-safe: if a +# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' +# concurrently, both version can detect that a/ is missing, but only +# one can create it and the other will error out. Consequently we +# restrict ourselves to GNU make (using the --version option ensures +# this.) +AC_DEFUN([AM_PROG_MKDIR_P], +[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in + # $(mkdir_p) $(somedir) + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' +else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + for d in ./-p ./--version; + do + test -d $d && rmdir $d + done + # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. + if test -f "$ac_aux_dir/mkinstalldirs"; then + mkdir_p='$(mkinstalldirs)' + else + mkdir_p='$(install_sh) -d' + fi +fi +AC_SUBST([mkdir_p])]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 3 + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +# Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 4 + AC_DEFUN([AM_C_PROTOTYPES], [AC_REQUIRE([AC_C_PROTOTYPES]) if test "$ac_cv_prog_cc_stdc" != no; then @@ -8846,28 +8820,16 @@ AC_SUBST(ANSI2KNR)dnl AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES]) +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. # -# Check to make sure that the build environment is sane. -# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 3 +# serial 4 # AM_SANITY_CHECK # --------------- @@ -8910,25 +8872,14 @@ Check your system clock]) fi AC_MSG_RESULT(yes)]) +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + # AM_PROG_INSTALL_STRIP - -# Copyright (C) 2001, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - +# --------------------- # One issue with vendor `install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip @@ -8951,25 +8902,13 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 1 +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# serial 2 # _AM_PROG_TAR(FORMAT) # -------------------- diff --git a/config.guess b/config.guess index 82294713..7d0185e0 100755 --- a/config.guess +++ b/config.guess @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2004-11-12' +timestamp='2004-09-07' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -319,9 +319,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:OS/390:*:*) echo i370-ibm-openedition exit 0 ;; - *:z/VM:*:*) - echo s390-ibm-zvmoe - exit 0 ;; *:OS400:*:*) echo powerpc-ibm-os400 exit 0 ;; @@ -345,7 +342,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + DRS?6000:UNIX_SV:4.2*:7*) case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7 && exit 0 ;; esac ;; @@ -1250,10 +1247,7 @@ EOF A*) echo alpha-dec-vms && exit 0 ;; I*) echo ia64-dec-vms && exit 0 ;; V*) echo vax-dec-vms && exit 0 ;; - esac ;; - *:XENIX:*:SysV) - echo i386-pc-xenix - exit 0 ;; + esac esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff --git a/config.h.in b/config.h.in index 30a23b25..03974dd5 100644 --- a/config.h.in +++ b/config.h.in @@ -95,6 +95,14 @@ /* Define to 1 if you have the `a64l' function. */ #undef HAVE_A64L +/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +#undef HAVE_CFLOCALECOPYCURRENT + +/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +#undef HAVE_CFPREFERENCESCOPYAPPVALUE + /* Define if the GNU dcgettext() function is already present or preinstalled. */ #undef HAVE_DCGETTEXT @@ -118,9 +126,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_FCNTL_H -/* Define to 1 if you have the `fseeko' function. */ -#undef HAVE_FSEEKO - /* Define to 1 if you have the `fsync' function. */ #undef HAVE_FSYNC @@ -330,9 +335,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UTMP_H -/* locale directory */ -#undef LOCALEDIR - /* Name of package */ #undef PACKAGE @@ -384,6 +386,11 @@ /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif + /* Define for large files, on AIX-style hosts. */ #undef _LARGE_FILES diff --git a/config.sub b/config.sub index 8fb1dbf9..edb6b663 100755 --- a/config.sub +++ b/config.sub @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -timestamp='2004-11-30' +timestamp='2004-08-29' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -267,7 +267,7 @@ case $basic_machine in | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xscale | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -343,8 +343,8 @@ case $basic_machine in | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ + | xtensa-* \ | ymp-* \ | z8k-*) ;; @@ -489,10 +489,6 @@ case $basic_machine in basic_machine=m88k-motorola os=-sysv3 ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -1033,10 +1029,6 @@ case $basic_machine in basic_machine=hppa1.1-winbond os=-proelf ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; xps | xps100) basic_machine=xps100-honeywell ;; @@ -1110,7 +1102,7 @@ case $basic_machine in pmac | pmac-mpw) basic_machine=powerpc-apple ;; - *-unknown | noarch-*) + *-unknown) # Make sure to match an already-canonicalized machine name. ;; *) @@ -1305,9 +1297,6 @@ case $os in -kaos*) os=-kaos ;; - -zvmoe) - os=-zvmoe - ;; -none) ;; *) diff --git a/configure b/configure index 59f3d5d8..4fe8260d 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 LIBSKEY LIBMD LIBSELINUX LIBPAM MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE 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 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. @@ -1034,7 +1034,6 @@ Optional Features: optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) --disable-largefile omit support for large files - --enable-desrpc try to use secure RPC in login (default if found) --enable-shadowgrp enable shadow group support default=yes --disable-nls do not use Native Language Support --disable-rpath do not hardcode runtime library paths @@ -1049,9 +1048,7 @@ Optional Packages: include additional configurations [automatic] --with-libcrack try to use libcrack (default if found) --with-libcrypt try to use libcrypt (default if found) - --with-libopie use libopie for OPIE support --with-libpam use libpam for PAM support - --with-libskey use libskey for S/Key support --with-selinux use SELinux 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 @@ -1171,8 +1168,6 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -configure -generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -1820,7 +1815,7 @@ fi # Define the identity of the package. PACKAGE=shadow - VERSION=4.0.7 + VERSION=4.0.8 cat >>confdefs.h <<_ACEOF @@ -1956,6 +1951,13 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' test "$prefix" = "NONE" && prefix="/usr" test "$prefix" = "/usr" && exec_prefix="" + +cat >>confdefs.h <<\_ACEOF +#define _GNU_SOURCE 1 +_ACEOF + + + # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" @@ -4084,7 +4086,7 @@ lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && break + test ! -f $lt_ac_sed && continue cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -4345,13 +4347,13 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu) +freebsd* | kfreebsd*-gnu | dragonfly*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; @@ -4512,7 +4514,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4515 "configure"' > conftest.$ac_ext + echo '#line 4517 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5618,7 +5620,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5621:" \ +echo "$as_me:5623:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -5808,7 +5810,7 @@ else lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* ) + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -5820,8 +5822,20 @@ else # And add a safety zone lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ;; - - *) + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + *) # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. @@ -5872,9 +5886,6 @@ symcode='[BCDEGRST]' # Regexp to match symbols that can be accessed directly from C. sympat='\([_A-Za-z][_A-Za-z0-9]*\)' -# Transform the above into a raw symbol and a C symbol. -symxfrm='\1 \2\3 \3' - # Transform an extracted symbol line into a proper C declaration lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" @@ -5934,8 +5945,11 @@ esac # Try without a prefix undercore, then with it. for ac_symprfx in "" "_"; do + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + # Write the raw and C identifiers. - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" # Check to see that the pipe works correctly. pipe_works=no @@ -6675,11 +6689,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6678: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6692: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6682: \$? = $ac_status" >&5 + echo "$as_me:6696: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6831,12 +6845,19 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ;; linux*) - case $CC in + case $cc_basename in icc* | ecc*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-static' ;; + pgcc | pgf77 | pgf90) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-static' + ;; ccc*) lt_prog_compiler_wl='-Wl,' # All Alpha code is PIC. @@ -6881,6 +6902,11 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 fi ;; + unicos*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_can_build_shared=no + ;; + uts4*) lt_prog_compiler_pic='-pic' lt_prog_compiler_static='-Bstatic' @@ -6918,11 +6944,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6921: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6947: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6925: \$? = $ac_status" >&5 + echo "$as_me:6951: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6978,11 +7004,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6981: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7007: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6985: \$? = $ac_status" >&5 + echo "$as_me:7011: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7137,7 +7163,7 @@ EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' @@ -7195,11 +7221,21 @@ EOF linux*) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_cmds="$tmp_archive_cmds" + tmp_addflag= + case $CC,$host_cpu in + pgf77* | pgf90* ) # Portland Group f77 and f90 compilers + tmp_addflag=' -fpic' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac + archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' supports_anon_versioning=no case `$LD -v 2>/dev/null` in - *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... *\ 2.11.*) ;; # other 2.11 versions @@ -7209,9 +7245,9 @@ EOF archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' else - archive_expsym_cmds="$tmp_archive_cmds" + archive_expsym_cmds=$archive_cmds fi else ld_shlibs=no @@ -7301,7 +7337,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ link_all_deplibs=yes if test "$GCC" = yes; then - case $host_os in aix4.012|aix4.012.*) + case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -7322,6 +7358,9 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ fi esac shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi else # not using gcc if test "$host_cpu" = ia64; then @@ -7587,7 +7626,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu) + freebsd* | kfreebsd*-gnu | dragonfly*) archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -7776,7 +7815,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; + whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ;; esac link_all_deplibs=yes ;; @@ -7974,21 +8013,6 @@ if test "$GCC" = yes; then else sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi - # sanitize - new_sys_lib_search_path_spec= - for d in $sys_lib_search_path_spec ; do - # check if exists - if test -d $d -a -x $d ; then - # normalize - new_d=$(cd $d ; pwd) - # uniq - if ! echo "$new_sys_lib_search_path_spec" | grep -q -F -e " $new_d " ; then - new_sys_lib_search_path_spec="$new_sys_lib_search_path_spec $new_d " - fi - fi - done - # compress spaces - sys_lib_search_path_spec=`echo "$new_sys_lib_search_path_spec" | $SED -e 's/^ *//g;s/ \+/ /g;s/ $//g'` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi @@ -8123,7 +8147,7 @@ cygwin* | mingw* | pw32*) ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -8181,7 +8205,9 @@ kfreebsd*-gnu) dynamic_linker='GNU ld.so' ;; -freebsd*) +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat case $version_type in @@ -8200,7 +8226,7 @@ freebsd*) freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.01* | freebsdelf3.01*) + freebsd3.[01]* | freebsdelf3.[01]*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -8324,10 +8350,31 @@ linux*) # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 8357 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -9178,7 +9225,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&6 ;; esac ;; - freebsd* | kfreebsd*-gnu) + freebsd* | kfreebsd*-gnu | dragonfly*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -11328,12 +11396,18 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 lt_prog_compiler_wl_CXX='--backend -Wl,' lt_prog_compiler_pic_CXX='-fPIC' ;; - icpc) + icpc* | ecpc*) # Intel C++ lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-static' ;; + pgCC) + # Portland Group C++ compiler. + lt_prog_compiler_wl_CXX='-Wl,' + lt_prog_compiler_pic_CXX='-fpic' + lt_prog_compiler_static_CXX='-static' + ;; cxx) # Compaq C++ # Make sure the PIC flag is empty. It appears that all Alpha @@ -11469,11 +11543,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11472: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11546: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11476: \$? = $ac_status" >&5 + echo "$as_me:11550: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -11529,11 +11603,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11532: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11606: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11536: \$? = $ac_status" >&5 + echo "$as_me:11610: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11597,7 +11671,7 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar export_symbols_cmds_CXX="$ltdll_cmds" ;; cygwin* | mingw*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' @@ -11701,21 +11775,6 @@ if test "$GCC" = yes; then else sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi - # sanitize - new_sys_lib_search_path_spec= - for d in $sys_lib_search_path_spec ; do - # check if exists - if test -d $d -a -x $d ; then - # normalize - new_d=$(cd $d ; pwd) - # uniq - if ! echo "$new_sys_lib_search_path_spec" | grep -q -F -e " $new_d " ; then - new_sys_lib_search_path_spec="$new_sys_lib_search_path_spec $new_d " - fi - fi - done - # compress spaces - sys_lib_search_path_spec=`echo "$new_sys_lib_search_path_spec" | $SED -e 's/^ *//g;s/ \+/ /g;s/ $//g'` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi @@ -11850,7 +11909,7 @@ cygwin* | mingw* | pw32*) ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -11908,7 +11967,9 @@ kfreebsd*-gnu) dynamic_linker='GNU ld.so' ;; -freebsd*) +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat case $version_type in @@ -11927,7 +11988,7 @@ freebsd*) freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.01* | freebsdelf3.01*) + freebsd3.[01]* | freebsdelf3.[01]*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -12051,10 +12112,31 @@ linux*) # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 12119 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -12905,7 +12987,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&6 ;; linux*) - case $CC in + case $cc_basename in icc* | ecc*) lt_prog_compiler_wl_F77='-Wl,' lt_prog_compiler_pic_F77='-KPIC' lt_prog_compiler_static_F77='-static' ;; + pgcc | pgf77 | pgf90) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_pic_F77='-fpic' + lt_prog_compiler_static_F77='-static' + ;; ccc*) lt_prog_compiler_wl_F77='-Wl,' # All Alpha code is PIC. @@ -13803,6 +13898,11 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 fi ;; + unicos*) + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_can_build_shared_F77=no + ;; + uts4*) lt_prog_compiler_pic_F77='-pic' lt_prog_compiler_static_F77='-Bstatic' @@ -13840,11 +13940,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13843: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13943: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13847: \$? = $ac_status" >&5 + echo "$as_me:13947: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -13900,11 +14000,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13903: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14003: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13907: \$? = $ac_status" >&5 + echo "$as_me:14007: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14059,7 +14159,7 @@ EOF allow_undefined_flag_F77=unsupported always_export_symbols_F77=no enable_shared_with_static_runtimes_F77=yes - export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' @@ -14073,7 +14173,7 @@ EOF fi~ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' else - ld_shlibs=no + ld_shlibs_F77=no fi ;; @@ -14117,11 +14217,21 @@ EOF linux*) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_cmds_F77="$tmp_archive_cmds" + tmp_addflag= + case $CC,$host_cpu in + pgf77* | pgf90* ) # Portland Group f77 and f90 compilers + tmp_addflag=' -fpic' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac + archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' supports_anon_versioning=no case `$LD -v 2>/dev/null` in - *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... *\ 2.11.*) ;; # other 2.11 versions @@ -14131,9 +14241,9 @@ EOF archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' else - archive_expsym_cmds_F77="$tmp_archive_cmds" + archive_expsym_cmds_F77=$archive_cmds_F77 fi else ld_shlibs_F77=no @@ -14223,7 +14333,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ link_all_deplibs_F77=yes if test "$GCC" = yes; then - case $host_os in aix4.012|aix4.012.*) + case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -14244,6 +14354,9 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ fi esac shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi else # not using gcc if test "$host_cpu" = ia64; then @@ -14405,7 +14518,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi old_archive_From_new_cmds_F77='true' # FIXME: Should let the user specify the lib program. old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' + fix_srcfile_path_F77='`cygpath -w "$srcfile"`' enable_shared_with_static_runtimes_F77=yes ;; @@ -14489,7 +14602,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu) + freebsd* | kfreebsd*-gnu | dragonfly*) archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_F77='-R$libdir' hardcode_direct_F77=yes @@ -14678,7 +14791,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; + whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ;; esac link_all_deplibs_F77=yes ;; @@ -14876,21 +14989,6 @@ if test "$GCC" = yes; then else sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi - # sanitize - new_sys_lib_search_path_spec= - for d in $sys_lib_search_path_spec ; do - # check if exists - if test -d $d -a -x $d ; then - # normalize - new_d=$(cd $d ; pwd) - # uniq - if ! echo "$new_sys_lib_search_path_spec" | grep -q -F -e " $new_d " ; then - new_sys_lib_search_path_spec="$new_sys_lib_search_path_spec $new_d " - fi - fi - done - # compress spaces - sys_lib_search_path_spec=`echo "$new_sys_lib_search_path_spec" | $SED -e 's/^ *//g;s/ \+/ /g;s/ $//g'` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi @@ -15025,7 +15123,7 @@ cygwin* | mingw* | pw32*) ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -15083,7 +15181,9 @@ kfreebsd*-gnu) dynamic_linker='GNU ld.so' ;; -freebsd*) +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat case $version_type in @@ -15102,7 +15202,7 @@ freebsd*) freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.01* | freebsdelf3.01*) + freebsd3.[01]* | freebsdelf3.[01]*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -15226,10 +15326,31 @@ linux*) # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 15333 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -15591,6 +15712,12 @@ fast_install=$enable_fast_install # The host system. host_alias=$host_alias host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os # An echo program that does not interpret backslashes. echo=$lt_echo @@ -15905,7 +16032,7 @@ objext_GCJ=$objext lt_simple_compile_test_code="class foo {}\n" # Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n' +lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' # ltmain only uses $CC for tagged configurations so make sure $CC is set. @@ -15950,11 +16077,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15953: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16080: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15957: \$? = $ac_status" >&5 + echo "$as_me:16084: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -16106,12 +16233,19 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 ;; linux*) - case $CC in + case $cc_basename in icc* | ecc*) lt_prog_compiler_wl_GCJ='-Wl,' lt_prog_compiler_pic_GCJ='-KPIC' lt_prog_compiler_static_GCJ='-static' ;; + pgcc | pgf77 | pgf90) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_pic_GCJ='-fpic' + lt_prog_compiler_static_GCJ='-static' + ;; ccc*) lt_prog_compiler_wl_GCJ='-Wl,' # All Alpha code is PIC. @@ -16156,6 +16290,11 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 fi ;; + unicos*) + lt_prog_compiler_wl_GCJ='-Wl,' + lt_prog_compiler_can_build_shared_GCJ=no + ;; + uts4*) lt_prog_compiler_pic_GCJ='-pic' lt_prog_compiler_static_GCJ='-Bstatic' @@ -16193,11 +16332,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16196: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16335: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16200: \$? = $ac_status" >&5 + echo "$as_me:16339: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -16253,11 +16392,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16256: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16395: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16260: \$? = $ac_status" >&5 + echo "$as_me:16399: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16412,7 +16551,7 @@ EOF allow_undefined_flag_GCJ=unsupported always_export_symbols_GCJ=no enable_shared_with_static_runtimes_GCJ=yes - export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' @@ -16426,7 +16565,7 @@ EOF fi~ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' else - ld_shlibs=no + ld_shlibs_GCJ=no fi ;; @@ -16470,11 +16609,21 @@ EOF linux*) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_cmds_GCJ="$tmp_archive_cmds" + tmp_addflag= + case $CC,$host_cpu in + pgf77* | pgf90* ) # Portland Group f77 and f90 compilers + tmp_addflag=' -fpic' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + esac + archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' supports_anon_versioning=no case `$LD -v 2>/dev/null` in - *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... *\ 2.11.*) ;; # other 2.11 versions @@ -16484,9 +16633,9 @@ EOF archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' else - archive_expsym_cmds_GCJ="$tmp_archive_cmds" + archive_expsym_cmds_GCJ=$archive_cmds_GCJ fi else ld_shlibs_GCJ=no @@ -16576,7 +16725,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ link_all_deplibs_GCJ=yes if test "$GCC" = yes; then - case $host_os in aix4.012|aix4.012.*) + case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` @@ -16597,6 +16746,9 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ fi esac shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi else # not using gcc if test "$host_cpu" = ia64; then @@ -16778,7 +16930,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi old_archive_From_new_cmds_GCJ='true' # FIXME: Should let the user specify the lib program. old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' + fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' enable_shared_with_static_runtimes_GCJ=yes ;; @@ -16862,7 +17014,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | kfreebsd*-gnu) + freebsd* | kfreebsd*-gnu | dragonfly*) archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec_GCJ='-R$libdir' hardcode_direct_GCJ=yes @@ -17051,7 +17203,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; + whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ;; esac link_all_deplibs_GCJ=yes ;; @@ -17249,21 +17401,6 @@ if test "$GCC" = yes; then else sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi - # sanitize - new_sys_lib_search_path_spec= - for d in $sys_lib_search_path_spec ; do - # check if exists - if test -d $d -a -x $d ; then - # normalize - new_d=$(cd $d ; pwd) - # uniq - if ! echo "$new_sys_lib_search_path_spec" | grep -q -F -e " $new_d " ; then - new_sys_lib_search_path_spec="$new_sys_lib_search_path_spec $new_d " - fi - fi - done - # compress spaces - sys_lib_search_path_spec=`echo "$new_sys_lib_search_path_spec" | $SED -e 's/^ *//g;s/ \+/ /g;s/ $//g'` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi @@ -17398,7 +17535,7 @@ cygwin* | mingw* | pw32*) ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac ;; @@ -17456,7 +17593,9 @@ kfreebsd*-gnu) dynamic_linker='GNU ld.so' ;; -freebsd*) +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` version_type=freebsd-$objformat case $version_type in @@ -17475,7 +17614,7 @@ freebsd*) freebsd2*) shlibpath_overrides_runpath=yes ;; - freebsd3.01* | freebsdelf3.01*) + freebsd3.[01]* | freebsdelf3.[01]*) shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -17599,10 +17738,31 @@ linux*) # before this can be enabled. hardcode_into_libs=yes + # find out which ABI we are using + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) + echo '#line 17745 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + case `/usr/bin/file conftest.$ac_objext` in + *64-bit*) + libsuff=64 + sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" + ;; + esac + fi + rm -rf conftest* + ;; + esac + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -18453,7 +18613,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <>confdefs.h <<_ACEOF _ACEOF -if test $ac_cv_c_compiler_gnu = yes; then - echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5 -echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 -if test "${ac_cv_prog_gcc_traditional+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_pattern="Autoconf.*'x'" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -Autoconf TIOCGETP -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then - ac_cv_prog_gcc_traditional=yes -else - ac_cv_prog_gcc_traditional=no -fi -rm -f conftest* - - - if test $ac_cv_prog_gcc_traditional = no; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -Autoconf TCGETA -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then - ac_cv_prog_gcc_traditional=yes -fi -rm -f conftest* - - fi -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5 -echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 - if test $ac_cv_prog_gcc_traditional = yes; then - CC="$CC -traditional" - fi -fi - echo "$as_me:$LINENO: checking return type of signal handlers" >&5 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 if test "${ac_cv_type_signal+set}" = set; then @@ -22692,7 +22813,7 @@ echo $ECHO_N "checking location of utmp... $ECHO_C" >&6 if test "${shadow_cv_utmpdir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - for utmpdir in /var/run /var/adm /usr/adm /etc none; do + for shadow_cv_utmpdir in /var/run /var/adm /usr/adm /etc none; do if test -f $shadow_cv_utmpdir/utmp; then break fi @@ -22779,11 +22900,6 @@ cat >>confdefs.h <<\_ACEOF _ACEOF -# Check whether --enable-desrpc or --disable-desrpc was given. -if test "${enable_desrpc+set}" = set; then - enableval="$enable_desrpc" - -fi; # Check whether --enable-shadowgrp or --disable-shadowgrp was given. if test "${enable_shadowgrp+set}" = set; then enableval="$enable_shadowgrp" @@ -22803,24 +22919,12 @@ if test "${with_libcrypt+set}" = set; then fi; -# Check whether --with-libopie or --without-libopie was given. -if test "${with_libopie+set}" = set; then - withval="$with_libopie" - -fi; - # Check whether --with-libpam or --without-libpam was given. if test "${with_libpam+set}" = set; then withval="$with_libpam" fi; -# Check whether --with-libskey or --without-libskey was given. -if test "${with_libskey+set}" = set; then - withval="$with_libskey" - -fi; - # Check whether --with-selinux or --without-selinux was given. if test "${with_selinux+set}" = set; then withval="$with_selinux" @@ -23207,179 +23311,6 @@ if test "$ac_cv_search_gethostbyname" != no; then fi - -if test "$enable_desrpc" != "no" -a "$ac_cv_header_rpc_key_prot_h" = "yes" ; then - echo "$as_me:$LINENO: checking for getsecretkey" >&5 -echo $ECHO_N "checking for getsecretkey... $ECHO_C" >&6 -if test "${ac_cv_func_getsecretkey+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define getsecretkey to an innocuous variant, in case declares getsecretkey. - For example, HP-UX 11i declares gettimeofday. */ -#define getsecretkey innocuous_getsecretkey - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getsecretkey (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef getsecretkey - -/* 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 getsecretkey (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_getsecretkey) || defined (__stub___getsecretkey) -choke me -#else -char (*f) () = getsecretkey; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != getsecretkey; - ; - 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_func_getsecretkey=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_getsecretkey=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_getsecretkey" >&5 -echo "${ECHO_T}$ac_cv_func_getsecretkey" >&6 -if test $ac_cv_func_getsecretkey = yes; then - cat >>confdefs.h <<\_ACEOF -#define DES_RPC 1 -_ACEOF - -else - echo "$as_me:$LINENO: checking for getsecretkey in -lrpcsvc" >&5 -echo $ECHO_N "checking for getsecretkey in -lrpcsvc... $ECHO_C" >&6 -if test "${ac_cv_lib_rpcsvc_getsecretkey+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lrpcsvc $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 getsecretkey (); -int -main () -{ -getsecretkey (); - ; - 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_rpcsvc_getsecretkey=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_rpcsvc_getsecretkey=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_rpcsvc_getsecretkey" >&5 -echo "${ECHO_T}$ac_cv_lib_rpcsvc_getsecretkey" >&6 -if test $ac_cv_lib_rpcsvc_getsecretkey = yes; then - cat >>confdefs.h <<\_ACEOF -#define DES_RPC 1 -_ACEOF - -fi - -fi - -fi - if test "$enable_shadowgrp" != "no"; then cat >>confdefs.h <<\_ACEOF #define SHADOWGRP 1 @@ -23680,222 +23611,6 @@ fi 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 $LIBMD $LIBCRYPT $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 - cat >>confdefs.h <<\_ACEOF -#define SKEY 1 -_ACEOF - LIBSKEY=-lskey -fi - -elif test "$with_libopie" = "yes"; then - echo "$as_me:$LINENO: checking for opiechallenge in -lopie" >&5 -echo $ECHO_N "checking for opiechallenge in -lopie... $ECHO_C" >&6 -if test "${ac_cv_lib_opie_opiechallenge+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lopie $LIBCRYPT $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 opiechallenge (); -int -main () -{ -opiechallenge (); - ; - 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_opie_opiechallenge=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_opie_opiechallenge=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_opie_opiechallenge" >&5 -echo "${ECHO_T}$ac_cv_lib_opie_opiechallenge" >&6 -if test $ac_cv_lib_opie_opiechallenge = yes; then - cat >>confdefs.h <<\_ACEOF -#define OPIE 1 -_ACEOF - LIBSKEY=-lopie -fi - -fi - if test "$with_selinux" = "yes"; then echo "$as_me:$LINENO: checking for is_selinux_enabled in -lselinux" >&5 echo $ECHO_N "checking for is_selinux_enabled in -lselinux... $ECHO_C" >&6 @@ -23964,7 +23679,7 @@ echo "${ECHO_T}$ac_cv_lib_selinux_is_selinux_enabled" >&6 if test $ac_cv_lib_selinux_is_selinux_enabled = yes; then LIBSELINUX="-lselinux" else - SELinuux enabled but libselinux not found + SELinux enabled but libselinux not found fi @@ -24267,12 +23982,9 @@ echo "$as_me: error: libpam_misc is missing" >&2;} fi - echo "$as_me:$LINENO: checking use login access checking if PAM not used" >&5 +else + echo "$as_me:$LINENO: checking use login access checking if PAM not used" >&5 echo $ECHO_N "checking use login access checking if PAM not used... $ECHO_C" >&6 - cat >>confdefs.h <<\_ACEOF -#define LOGIN_ACCESS 1 -_ACEOF - echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 @@ -24285,10 +23997,6 @@ 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 -#define LOGIN_ACCESS 1 -_ACEOF - cat >>confdefs.h <<\_ACEOF #define SU_ACCESS 1 _ACEOF @@ -24299,6 +24007,7 @@ fi + MKINSTALLDIRS= if test -n "$ac_aux_dir"; then case "$ac_aux_dir" in @@ -24375,7 +24084,8 @@ else test -z "$ac_dir" && ac_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then - if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && + echo "$as_me: trying $ac_dir/$ac_word..." >&5 + if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 && (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext" break 2 @@ -24485,7 +24195,8 @@ else test -z "$ac_dir" && ac_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then - if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && + echo "$as_me: trying $ac_dir/$ac_word..." >&5 + if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 && (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext" break 2 @@ -24556,7 +24267,8 @@ else test -z "$ac_dir" && ac_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then - if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then + echo "$as_me: trying $ac_dir/$ac_word..." >&5 + if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext" break 2 fi @@ -24737,6 +24449,7 @@ with_gnu_ld=$acl_cv_prog_gnu_ld + echo "$as_me:$LINENO: checking for shared library run path origin" >&5 echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6 if test "${acl_cv_rpath+set}" = set; then @@ -24982,7 +24695,7 @@ fi; if test "X$additional_includedir" = "X/usr/local/include"; then if test -n "$GCC"; then case $host_os in - linux*) haveit=yes;; + linux* | gnu* | k*bsd*-gnu) haveit=yes;; esac fi fi @@ -25026,7 +24739,7 @@ fi; if test "X$additional_libdir" = "X/usr/local/lib"; then if test -n "$GCC"; then case $host_os in - linux*) haveit=yes;; + linux* | gnu* | k*bsd*-gnu) haveit=yes;; esac fi fi @@ -25166,6 +24879,148 @@ fi; + echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5 +echo $ECHO_N "checking for CFPreferencesCopyAppValue... $ECHO_C" >&6 +if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + gt_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers" + gt_save_LIBS="$LIBS" + LIBS="$LIBS -framework CoreFoundation" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +CFPreferencesCopyAppValue(NULL, NULL) + ; + 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 + gt_cv_func_CFPreferencesCopyAppValue=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +gt_cv_func_CFPreferencesCopyAppValue=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CPPFLAGS="$gt_save_CPPFLAGS" + LIBS="$gt_save_LIBS" +fi +echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 +echo "${ECHO_T}$gt_cv_func_CFPreferencesCopyAppValue" >&6 + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_CFPREFERENCESCOPYAPPVALUE 1 +_ACEOF + + fi + echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5 +echo $ECHO_N "checking for CFLocaleCopyCurrent... $ECHO_C" >&6 +if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + gt_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers" + gt_save_LIBS="$LIBS" + LIBS="$LIBS -framework CoreFoundation" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +CFLocaleCopyCurrent(); + ; + 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 + gt_cv_func_CFLocaleCopyCurrent=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +gt_cv_func_CFLocaleCopyCurrent=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CPPFLAGS="$gt_save_CPPFLAGS" + LIBS="$gt_save_LIBS" +fi +echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5 +echo "${ECHO_T}$gt_cv_func_CFLocaleCopyCurrent" >&6 + if test $gt_cv_func_CFLocaleCopyCurrent = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_CFLOCALECOPYCURRENT 1 +_ACEOF + + fi + INTL_MACOSX_LIBS= + if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" + fi + + + + echo "$as_me:$LINENO: checking whether NLS is requested" >&5 echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6 # Check whether --enable-nls or --disable-nls was given. @@ -25628,7 +25483,7 @@ fi; if test "X$additional_includedir" = "X/usr/local/include"; then if test -n "$GCC"; then case $host_os in - linux*) haveit=yes;; + linux* | gnu* | k*bsd*-gnu) haveit=yes;; esac fi fi @@ -25672,7 +25527,7 @@ fi; if test "X$additional_libdir" = "X/usr/local/lib"; then if test -n "$GCC"; then case $host_os in - linux*) haveit=yes;; + linux* | gnu* | k*bsd*-gnu) haveit=yes;; esac fi fi @@ -25816,12 +25671,12 @@ extern #ifdef __cplusplus "C" #endif -const char *_nl_expand_alias (); +const char *_nl_expand_alias (const char *); int main () { bindtextdomain ("", ""); -return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) +return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("") ; return 0; } @@ -25871,12 +25726,12 @@ extern #ifdef __cplusplus "C" #endif -const char *_nl_expand_alias (); +const char *_nl_expand_alias (const char *); int main () { bindtextdomain ("", ""); -return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) +return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("") ; return 0; } @@ -25935,6 +25790,14 @@ echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6 + if test -n "$INTL_MACOSX_LIBS"; then + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + LIBINTL="$LIBINTL $INTL_MACOSX_LIBS" + LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS" + fi + fi + if test "$gt_use_preinstalled_gnugettext" = "yes" \ || test "$nls_cv_use_gnu_gettext" = "yes"; then @@ -26025,11 +25888,6 @@ _ACEOF -cat >>confdefs.h <<_ACEOF -#define LOCALEDIR "${datadir}/locale" -_ACEOF - - ac_config_files="$ac_config_files Makefile po/Makefile.in doc/Makefile man/Makefile man/cs/Makefile man/de/Makefile man/es/Makefile man/fr/Makefile man/hu/Makefile man/id/Makefile man/it/Makefile man/ja/Makefile man/ko/Makefile man/pl/Makefile man/pt_BR/Makefile man/ru/Makefile man/zh_CN/Makefile man/zh_TW/Makefile libmisc/Makefile lib/Makefile src/Makefile contrib/Makefile etc/Makefile etc/pam.d/Makefile shadow.spec" cat >confcache <<\_ACEOF @@ -26789,8 +26647,6 @@ s,@LIBTOOL@,$LIBTOOL,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LIBCRYPT@,$LIBCRYPT,;t t s,@LIBCRACK@,$LIBCRACK,;t t -s,@LIBSKEY@,$LIBSKEY,;t t -s,@LIBMD@,$LIBMD,;t t s,@LIBSELINUX@,$LIBSELINUX,;t t s,@LIBPAM@,$LIBPAM,;t t s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t @@ -26799,6 +26655,7 @@ s,@MSGFMT@,$MSGFMT,;t t s,@GMSGFMT@,$GMSGFMT,;t t s,@XGETTEXT@,$XGETTEXT,;t t s,@MSGMERGE@,$MSGMERGE,;t t +s,@INTL_MACOSX_LIBS@,$INTL_MACOSX_LIBS,;t t s,@LIBICONV@,$LIBICONV,;t t s,@LTLIBICONV@,$LTLIBICONV,;t t s,@INTLLIBS@,$INTLLIBS,;t t @@ -27508,6 +27365,9 @@ done /*) top_srcdir="$ac_given_srcdir" ;; *) top_srcdir="$ac_dots$ac_given_srcdir" ;; esac + # Treat a directory as a PO directory if and only if it has a + # POTFILES.in file. This allows packages to have multiple PO + # directories under different names or in different locations. if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then rm -f "$ac_dir/POTFILES" test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" @@ -27521,7 +27381,7 @@ done if test -n "$OBSOLETE_ALL_LINGUAS"; then test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" fi - ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` + ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` # Hide the ALL_LINGUAS assigment from automake. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" diff --git a/configure.in b/configure.in index 142891f5..554f0eec 100644 --- a/configure.in +++ b/configure.in @@ -1,12 +1,14 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT -AM_INIT_AUTOMAKE(shadow, 4.0.7) +AM_INIT_AUTOMAKE(shadow, 4.0.8) AC_CONFIG_HEADERS([config.h]) dnl Some hacks... test "$prefix" = "NONE" && prefix="/usr" test "$prefix" = "/usr" && exec_prefix="" +AC_GNU_SOURCE + AM_DISABLE_SHARED AM_ENABLE_STATIC @@ -32,7 +34,7 @@ AC_CHECK_HEADERS(errno.h fcntl.h limits.h unistd.h sys/time.h utmp.h \ utime.h ulimit.h sys/resource.h gshadow.h shadow.h lastlog.h \ locale.h rpc/key_prot.h) -AC_CHECK_FUNCS(a64l fchmod fchown fseeko fsync getgroups gethostname getspnam \ +AC_CHECK_FUNCS(a64l fchmod fchown fsync getgroups gethostname getspnam \ gettimeofday getusershell getutent initgroups lchown lckpwdf lstat \ memcpy memset setgroups sigaction strchr updwtmp updwtmpx) AC_SYS_LARGEFILE @@ -97,7 +99,6 @@ fi dnl Checks for library functions. AC_TYPE_GETGROUPS -AC_PROG_GCC_TRADITIONAL AC_TYPE_SIGNAL AC_FUNC_UTIME_NULL AC_FUNC_STRFTIME @@ -152,7 +153,7 @@ if test $shadow_cv_mailfile != none; then fi AC_CACHE_CHECK([location of utmp], shadow_cv_utmpdir, -[for utmpdir in /var/run /var/adm /usr/adm /etc none; do +[for shadow_cv_utmpdir in /var/run /var/adm /usr/adm /etc none; do if test -f $shadow_cv_utmpdir/utmp; then break fi @@ -192,14 +193,11 @@ 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_ARG_ENABLE(desrpc, [ --enable-desrpc try to use secure RPC in login (default if found)]) 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(libopie, [ --with-libopie use libopie for OPIE support]) AC_ARG_WITH(libpam, [ --with-libpam use libpam for PAM support]) -AC_ARG_WITH(libskey, [ --with-libskey use libskey for S/Key support]) AC_ARG_WITH(selinux, [ --with-selinux use SELinux support]) dnl Check for some functions in libc first, only if not found check for @@ -210,15 +208,6 @@ AC_SEARCH_LIBS(inet_ntoa, inet) AC_SEARCH_LIBS(socket, socket) AC_SEARCH_LIBS(gethostbyname, nsl) -dnl XXX - getsecretkey() causes login to hang for 5 minutes on at least -dnl one RH 4.0 system. Use --disable-desrpc if you have this problem. -dnl Reported by Mohan Khurana . - -if test "$enable_desrpc" != "no" -a "$ac_cv_header_rpc_key_prot_h" = "yes" ; then - AC_CHECK_FUNC(getsecretkey, AC_DEFINE(DES_RPC), - AC_CHECK_LIB(rpcsvc, getsecretkey, AC_DEFINE(DES_RPC))) -fi - if test "$enable_shadowgrp" != "no"; then AC_DEFINE(SHADOWGRP) fi @@ -236,17 +225,8 @@ if test "$with_libcrack" != "no"; then AC_CHECK_LIB(crack, FascistHistoryPw, AC_DEFINE(HAVE_LIBCRACK_PW)) 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, AC_DEFINE(SKEY) LIBSKEY=-lskey, [], $LIBMD $LIBCRYPT) -elif test "$with_libopie" = "yes"; then - AC_CHECK_LIB(opie, opiechallenge, AC_DEFINE(OPIE) LIBSKEY=-lopie, [], $LIBCRYPT) -fi - if test "$with_selinux" = "yes"; then - AC_CHECK_LIB(selinux, is_selinux_enabled, [LIBSELINUX="-lselinux"], [SELinuux enabled but libselinux not found]) + AC_CHECK_LIB(selinux, is_selinux_enabled, [LIBSELINUX="-lselinux"], [SELinux enabled but libselinux not found]) AC_SUBST(LIBSELINUX) AC_CHECK_HEADERS(selinux/selinux.h, [], [selinux/selinux.h is missing]) AC_DEFINE(WITH_SELINUX, 1, [Build shadow with SELinux support]) @@ -260,23 +240,20 @@ if test "$with_libpam" = "yes"; then AC_CHECK_LIB(pam_misc, main, [LIBPAM="$LIBPAM -lpam_misc"], AC_MSG_ERROR(libpam_misc is missing) - )] + )], [AC_MSG_CHECKING(use login access checking if PAM not used) - AC_DEFINE(LOGIN_ACCESS) AC_MSG_RESULT(yes)] ) AC_MSG_CHECKING(use login and su access checking if PAM not used) AC_MSG_RESULT(no) else AC_MSG_CHECKING(use login and su access checking if PAM not used) - AC_DEFINE(LOGIN_ACCESS) AC_DEFINE(SU_ACCESS) AC_MSG_RESULT(yes) fi AM_GNU_GETTEXT_VERSION(0.12.1) AM_GNU_GETTEXT([external]) -AC_DEFINE_UNQUOTED(LOCALEDIR, "${datadir}/locale", [locale directory]) AC_CONFIG_FILES([ Makefile diff --git a/contrib/Makefile.in b/contrib/Makefile.in index 810139b2..ba1a8d9e 100644 --- a/contrib/Makefile.in +++ b/contrib/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.4 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -85,17 +85,16 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ 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@ @@ -185,9 +184,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign contrib/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu contrib/Makefile + $(AUTOMAKE) --foreign contrib/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/doc/INSTALL b/doc/INSTALL deleted file mode 100644 index 3b50ea95..00000000 --- a/doc/INSTALL +++ /dev/null @@ -1,176 +0,0 @@ -Basic Installation -================== - - These are generic installation instructions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, a file -`config.cache' that saves the results of its tests to speed up -reconfiguring, and a file `config.log' containing compiler output -(useful mainly for debugging `configure'). - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If at some point `config.cache' -contains results you don't want to keep, you may remove or edit it. - - The file `configure.in' is used to create `configure' by a program -called `autoconf'. You only need `configure.in' if you want to change -it or regenerate `configure' using a newer version of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. - - Running `configure' takes a while. While running, it prints some - messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -===================== - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. You can give `configure' -initial values for variables by setting them in the environment. Using -a Bourne-compatible shell, you can do that on the command line like -this: - CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure - -Or on systems that have the `env' program, you can do it like this: - env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure - -Compiling For Multiple Architectures -==================================== - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - If you have to use a `make' that does not supports the `VPATH' -variable, you have to compile the package for one architecture at a time -in the source code directory. After you have installed the package for -one architecture, use `make distclean' before reconfiguring for another -architecture. - -Installation Names -================== - - By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - - There may be some features `configure' can not figure out -automatically, but needs to determine by the type of host the package -will run on. Usually `configure' can figure that out, but if it prints -a message saying it can not guess the host type, give it the -`--host=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name with three fields: - CPU-COMPANY-SYSTEM - -See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the host type. - - If you are building compiler tools for cross-compiling, you can also -use the `--target=TYPE' option to select the type of system they will -produce code for and the `--build=TYPE' option to select the type of -system on which you are compiling the package. - -Sharing Defaults -================ - - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Operation Controls -================== - - `configure' recognizes the following options to control how it -operates. - -`--cache-file=FILE' - Use and save the results of the tests in FILE instead of - `./config.cache'. Set FILE to `/dev/null' to disable caching, for - debugging `configure'. - -`--help' - Print a summary of the options to `configure', and exit. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`--version' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`configure' also accepts some other, not widely useful, options. - diff --git a/doc/Makefile.am b/doc/Makefile.am index ade72e0d..ffd995b8 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -2,5 +2,5 @@ # and also cooperate to make a distribution for `make dist' EXTRA_DIST = HOWTO LICENSE LSM README \ - README.limits README.linux README.mirrors README.nls README.pam \ - README.platforms README.sun4 WISHLIST console.c.spec.txt cracklib26.diff + README.limits README.linux README.nls README.pam \ + README.platforms WISHLIST console.c.spec.txt cracklib26.diff diff --git a/doc/Makefile.in b/doc/Makefile.in index 976a4ddf..ccdc73fc 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.4 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -39,8 +39,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = doc -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - INSTALL +DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -86,17 +85,16 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ 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@ @@ -171,8 +169,8 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ EXTRA_DIST = HOWTO LICENSE LSM README \ - README.limits README.linux README.mirrors README.nls README.pam \ - README.platforms README.sun4 WISHLIST console.c.spec.txt cracklib26.diff + README.limits README.linux README.nls README.pam \ + README.platforms WISHLIST console.c.spec.txt cracklib26.diff all: all-am @@ -186,9 +184,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/Makefile + $(AUTOMAKE) --foreign doc/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/doc/README.mirrors b/doc/README.mirrors deleted file mode 100644 index ddc96115..00000000 --- a/doc/README.mirrors +++ /dev/null @@ -1,60 +0,0 @@ -Primary sites for the Shadow Password Suite for Linux: - -ftp://piast.t19.ds.pwr.wroc.pl/pub/linux/shadow/ -ftp://ftp.ists.pwr.wroc.pl/pub/linux/shadow/ -http://www.itnet.pl/amelektr/linux/shadow/ - -I upload latest versions here (and sometimes also to sunsite, but not -every new release). If you are not in Poland, these sites may be slow -for you - please use a mirror near you. - -Thanks to several people who offered to mirror this archive. Mirror -sites known to me (with addresses of people who submitted them to -this list) are listed below. If you want your site to be added here, -please let me know (specify the URL, and contact e-mail address). -If any of these sites become way out of date and should be removed, -or if they are good but the URL changes, please let me know too. - -Working mirrors that I know of, sorted by country (note: I removed -a few mirrors that didn't work when I tried to access them several -times - if any of them are still alive, please let me know): - -(XXX - list may be out of date now.) - -Brazil: - - ftp://ftp.athena.pads.ufrj.br/pub/linux/shadow/ - Rafael Jorge Csura Szendrodi - -Czech Republic: - - ftp://ftp.gts.cz/pub/linux/security/shadow/ - Martin Mares - -Greece: - - ftp://linux.forthnet.gr/pub/linux/shadow/ - http://linux.forthnet.gr/pub/linux/shadow/ - Sotiris Tsimbonis - -Poland: - - ftp://xenium.pdi.net/pub/Crypto/shadow/ - Marcin E. Bednarz - - ftp://giswitch.sggw.waw.pl/pub/Linux/shadow/ - Marek Czajko - -Romania: - - ftp://ftp.kappa.ro/pub/Linux/Security/shadow/ - Mircea Damian - -United States: - - ftp://ftp.cqc.com/pub/mirrors/linux-shadow/ - pacman@cqc.com - -Thanks, -Marek Michalkiewicz -(or marekm@piast.t19.ds.pwr.wroc.pl, or marekm@bach.ists.pwr.wroc.pl) diff --git a/doc/README.sun4 b/doc/README.sun4 deleted file mode 100644 index 8c3f037e..00000000 --- a/doc/README.sun4 +++ /dev/null @@ -1,39 +0,0 @@ -[ $Id: README.sun4,v 1.1.1.1 1996/08/10 07:59:52 marekm Exp $ ] - -You'll need to do the following to get the shadow password dist to -compile on a sun 4.1.1 system. - -copy Makefile.sun4 to Makefile, and make any system specific changes. - -copy config.h.sun4 config.h, and make any system specific changes. - -You may have to edit the pwd.h.m4 file by hand, as the sunos m4 may -not grok the pwd.h.m4 file corectly. If you have the /usr/5bin/m4, -substitute that. Be sure to delete the pwd.h file before typeing -'make' again, as there will be an empty one left from the failed attempt -to use the standard sunos m4. - -type 'make'. If everything goes well, then type 'make install' - -If using csh, then type 'rehash'. cd to the /etc directory and type -'pwconv'. This will create two files, nshadow and npasswd. -now type 'mkpasswd -f nshadow' and 'mkpasswd -f npasswd'. This will -create the shadow password file. - -Note: The shadow group stuff does not work with sunos. - -Note: ftp will still use the old password file. - -Note: if you run suns pcnfs, be aware that it will still be looking at the - old password file as well. I may work out a patch for this, as I am - fairly certain the stuff on the sun side comes with source. - -Note: I have compiled this package with the standard c compiler and - suns unbundled c compiler at an optomization level of 2 in - both casses. Haven't tried gcc yet, so I don't know wether it - works. Same goes for suns C++ compiler. - -Note: has been compiled on a sun 3/75 running sunos 4.1.1. Should compile - fine on sun 4's running 4.1.1, and may compile on suns running - 4.1. Have no idea what sort of success people will have that - are running 4.03 and older versions. diff --git a/etc/Makefile.in b/etc/Makefile.in index 38f63ad0..0c4312b8 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.4 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -94,17 +94,16 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ 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@ @@ -199,9 +198,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu etc/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign etc/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu etc/Makefile + $(AUTOMAKE) --foreign etc/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -237,7 +236,13 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @set fnord $$MAKEFLAGS; amf=$$2; \ + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -249,7 +254,7 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ @@ -257,7 +262,13 @@ $(RECURSIVE_TARGETS): mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - @set fnord $$MAKEFLAGS; amf=$$2; \ + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ @@ -278,7 +289,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ diff --git a/etc/login.defs b/etc/login.defs index 976f92bb..cc002abf 100644 --- a/etc/login.defs +++ b/etc/login.defs @@ -1,7 +1,7 @@ # # /etc/login.defs - Configuration control definitions for the login package. # -# $Id: login.defs,v 1.5 2003/05/04 20:09:43 kloczek Exp $ +# $Id: login.defs,v 1.6 2005/03/07 10:09:06 kloczek Exp $ # # Three items must be defined: MAIL_DIR, ENV_SUPATH, and ENV_PATH. # If unspecified, some arbitrary (and possibly incorrect) value will @@ -128,12 +128,6 @@ MAIL_DIR /var/mail #HUSHLOGIN_FILE .hushlogin HUSHLOGIN_FILE /etc/hushlogins -# -# If defined, the presence of this value in an /etc/passwd "shell" field will -# disable logins for that user, although "su" will still be allowed. -# -NOLOGIN_STR NOLOGIN - # # If defined, either a TZ environment parameter spec or the # fully-rooted pathname of a file containing such a spec. diff --git a/etc/login.defs.linux b/etc/login.defs.linux index 5ea0376c..ea43c1e9 100644 --- a/etc/login.defs.linux +++ b/etc/login.defs.linux @@ -1,7 +1,7 @@ # # /etc/login.defs - Configuration control definitions for the login package. # -# $Id: login.defs.linux,v 1.14 2003/05/04 20:09:43 kloczek Exp $ +# $Id: login.defs.linux,v 1.15 2005/03/07 10:09:06 kloczek Exp $ # # Three items must be defined: MAIL_DIR, ENV_SUPATH, and ENV_PATH. # If unspecified, some arbitrary (and possibly incorrect) value will @@ -138,14 +138,6 @@ MAIL_DIR /var/spool/mail HUSHLOGIN_FILE .hushlogin #HUSHLOGIN_FILE /etc/hushlogins -# -# If defined, the presence of this value in an /etc/passwd "shell" field will -# disable logins for that user, although "su" will still be allowed. -# -# XXX this does not seem to be implemented yet... --marekm -# no, it was implemented but I ripped it out ;-) -- jfh -NOLOGIN_STR NOLOGIN - # # If defined, either a TZ environment parameter spec or the # fully-rooted pathname of a file containing such a spec. diff --git a/etc/pam.d/Makefile.in b/etc/pam.d/Makefile.in index 060341b0..17c85551 100644 --- a/etc/pam.d/Makefile.in +++ b/etc/pam.d/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.4 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -85,17 +85,16 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ 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@ @@ -195,9 +194,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu etc/pam.d/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign etc/pam.d/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu etc/pam.d/Makefile + $(AUTOMAKE) --foreign etc/pam.d/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/install-sh b/install-sh index 6ebe46de..dd97db7a 100755 --- a/install-sh +++ b/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2004-12-17.09 +scriptversion=2004-09-10.20 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -213,7 +213,7 @@ do fi # This sed command emulates the dirname command. - dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` # Make sure that the destination directory exists. @@ -226,8 +226,7 @@ do oIFS=$IFS # Some sh's can't handle IFS=/ for some reason. IFS='%' - set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` - shift + set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` IFS=$oIFS pathcomp= @@ -296,7 +295,7 @@ do || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ || { echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit 1 + (exit 1); exit } else : @@ -307,12 +306,12 @@ do $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" } } - fi || { (exit 1); exit 1; } + fi || { (exit 1); exit; } done # The final little trick to "correctly" pass the exit status to the exit trap. { - (exit 0); exit 0 + (exit 0); exit } # Local variables: diff --git a/lib/.indent.pro b/lib/.indent.pro index 149066b8..fe572bb7 100644 --- a/lib/.indent.pro +++ b/lib/.indent.pro @@ -2,3 +2,4 @@ -i8 -bad -pcs +-l80 diff --git a/lib/Makefile.am b/lib/Makefile.am index 57efb17c..5a5b6dc3 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) $(LIBSKEY) $(LIBMD) $(LIBSELINUX) +libshadow_la_LIBADD = $(INTLLIBS) $(LIBCRYPT) $(LIBSELINUX) libshadow_la_SOURCES = \ commonio.c \ @@ -32,7 +32,6 @@ libshadow_la_SOURCES = \ pwauth.h \ pwio.c \ pwio.h \ - rad64.c \ rcsid.h \ sgetgrent.c \ sgetpwent.c \ @@ -50,6 +49,5 @@ libshadow_la_SOURCES = \ EXTRA_DIST = \ .indent.pro \ - grdbm.c gsdbm.c pwdbm.c spdbm.c \ grpack.c gspack.c pwpack.c sppack.c \ gshadow_.h diff --git a/lib/Makefile.in b/lib/Makefile.in index a965a9b3..1453db0f 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.4 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -58,12 +58,11 @@ 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 \ - pwauth.lo pwio.lo rad64.lo sgetgrent.lo sgetpwent.lo \ - sgroupio.lo shadow.lo shadowio.lo utent.lo + pwauth.lo pwio.lo sgetgrent.lo sgetpwent.lo sgroupio.lo \ + shadow.lo shadowio.lo utent.lo libshadow_la_OBJECTS = $(am_libshadow_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -116,17 +115,16 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ 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@ @@ -203,7 +201,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) $(LIBSKEY) $(LIBMD) $(LIBSELINUX) +libshadow_la_LIBADD = $(INTLLIBS) $(LIBCRYPT) $(LIBSELINUX) libshadow_la_SOURCES = \ commonio.c \ commonio.h \ @@ -228,7 +226,6 @@ libshadow_la_SOURCES = \ pwauth.h \ pwio.c \ pwio.h \ - rad64.c \ rcsid.h \ sgetgrent.c \ sgetpwent.c \ @@ -246,7 +243,6 @@ libshadow_la_SOURCES = \ # sources for dbm support (not yet used) EXTRA_DIST = \ .indent.pro \ - grdbm.c gsdbm.c pwdbm.c spdbm.c \ grpack.c gspack.c pwpack.c sppack.c \ gshadow_.h @@ -331,7 +327,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/port.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pwauth.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pwio.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rad64.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sgetgrent.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sgetpwent.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sgroupio.Plo@am__quote@ diff --git a/lib/commonio.c b/lib/commonio.c index 7df6a52a..5ecf7d7c 100644 --- a/lib/commonio.c +++ b/lib/commonio.c @@ -2,8 +2,7 @@ #include #include "rcsid.h" -RCSID("$Id: commonio.c,v 1.27 2004/11/02 19:01:12 kloczek Exp $") - +RCSID ("$Id: commonio.c,v 1.28 2005/03/31 05:14:49 kloczek Exp $") #include "defines.h" #include #include @@ -18,30 +17,30 @@ RCSID("$Id: commonio.c,v 1.27 2004/11/02 19:01:12 kloczek Exp $") #endif #ifdef WITH_SELINUX #include -static security_context_t old_context=NULL; +static security_context_t old_context = NULL; #endif #include "commonio.h" /* local function prototypes */ -static int check_link_count(const char *); -static int do_lock_file(const char *, const char *); -static FILE *fopen_set_perms(const char *, const char *, const struct stat *); -static int create_backup(const char *, FILE *); -static void free_linked_list(struct commonio_db *); -static void add_one_entry(struct commonio_db *, struct commonio_entry *); -static int name_is_nis(const char *); -static int write_all(const struct commonio_db *); -static struct commonio_entry *find_entry_by_name(struct commonio_db *, const char *); +static int check_link_count (const char *); +static int do_lock_file (const char *, const char *); +static FILE *fopen_set_perms (const char *, const char *, const struct stat *); +static int create_backup (const char *, FILE *); +static void free_linked_list (struct commonio_db *); +static void add_one_entry (struct commonio_db *, struct commonio_entry *); +static int name_is_nis (const char *); +static int write_all (const struct commonio_db *); +static struct commonio_entry *find_entry_by_name (struct commonio_db *, + const char *); static int lock_count = 0; static int nscd_need_reload = 0; -static int -check_link_count(const char *file) +static int check_link_count (const char *file) { struct stat sb; - if (stat(file, &sb) != 0) + if (stat (file, &sb) != 0) return 0; if (sb.st_nlink != 2) @@ -51,8 +50,7 @@ check_link_count(const char *file) } -static int -do_lock_file(const char *file, const char *lock) +static int do_lock_file (const char *file, const char *lock) { int fd; int pid; @@ -60,100 +58,99 @@ do_lock_file(const char *file, const char *lock) int retval; char buf[32]; - if ((fd = open(file, O_CREAT|O_EXCL|O_WRONLY, 0600)) == -1) + if ((fd = open (file, O_CREAT | O_EXCL | O_WRONLY, 0600)) == -1) return 0; - pid = getpid(); - snprintf(buf, sizeof buf, "%d", pid); - len = strlen(buf) + 1; - if (write(fd, buf, len) != len) { - close(fd); - unlink(file); + pid = getpid (); + snprintf (buf, sizeof buf, "%d", pid); + len = strlen (buf) + 1; + if (write (fd, buf, len) != len) { + close (fd); + unlink (file); return 0; } - close(fd); + close (fd); - if (link(file, lock) == 0) { - retval = check_link_count(file); - unlink(file); + if (link (file, lock) == 0) { + retval = check_link_count (file); + unlink (file); return retval; } - if ((fd = open(lock, O_RDWR)) == -1) { - unlink(file); + if ((fd = open (lock, O_RDWR)) == -1) { + unlink (file); errno = EINVAL; return 0; } - len = read(fd, buf, sizeof(buf) - 1); - close(fd); + len = read (fd, buf, sizeof (buf) - 1); + close (fd); if (len <= 0) { - unlink(file); + unlink (file); errno = EINVAL; return 0; } buf[len] = '\0'; - if ((pid = strtol(buf, (char **) 0, 10)) == 0) { - unlink(file); + if ((pid = strtol (buf, (char **) 0, 10)) == 0) { + unlink (file); errno = EINVAL; return 0; } - if (kill(pid, 0) == 0) { - unlink(file); + if (kill (pid, 0) == 0) { + unlink (file); errno = EEXIST; return 0; } - if (unlink(lock) != 0) { - unlink(file); + if (unlink (lock) != 0) { + unlink (file); return 0; } retval = 0; - if (link(file, lock) == 0 && check_link_count(file)) + if (link (file, lock) == 0 && check_link_count (file)) retval = 1; - unlink(file); + unlink (file); return retval; } -static FILE * -fopen_set_perms(const char *name, const char *mode, const struct stat *sb) +static FILE *fopen_set_perms (const char *name, const char *mode, + const struct stat *sb) { FILE *fp; mode_t mask; - mask = umask(0777); - fp = fopen(name, mode); - umask(mask); + mask = umask (0777); + fp = fopen (name, mode); + umask (mask); if (!fp) return NULL; #ifdef HAVE_FCHOWN - if (fchown(fileno(fp), sb->st_uid, sb->st_gid)) + if (fchown (fileno (fp), sb->st_uid, sb->st_gid)) goto fail; #else - if (chown(name, sb->st_mode)) + if (chown (name, sb->st_mode)) goto fail; #endif #ifdef HAVE_FCHMOD - if (fchmod(fileno(fp), sb->st_mode & 0664)) + if (fchmod (fileno (fp), sb->st_mode & 0664)) goto fail; #else - if (chmod(name, sb->st_mode & 0664)) + if (chmod (name, sb->st_mode & 0664)) goto fail; #endif return fp; -fail: - fclose(fp); - unlink(name); + fail: + fclose (fp); + unlink (name); return NULL; } -static int -create_backup(const char *backup, FILE *fp) +static int create_backup (const char *backup, FILE * fp) { struct stat sb; struct utimbuf ub; @@ -161,38 +158,37 @@ create_backup(const char *backup, FILE *fp) int c; mode_t mask; - if (fstat(fileno(fp), &sb)) + if (fstat (fileno (fp), &sb)) return -1; - mask = umask(077); - bkfp = fopen(backup, "w"); - umask(mask); + mask = umask (077); + bkfp = fopen (backup, "w"); + umask (mask); if (!bkfp) return -1; /* TODO: faster copy, not one-char-at-a-time. --marekm */ c = 0; - if (fseek(fp, 0, SEEK_SET) == 0) - while ((c = getc(fp)) != EOF) { - if (putc(c, bkfp) == EOF) + if (fseek (fp, 0, SEEK_SET) == 0) + while ((c = getc (fp)) != EOF) { + if (putc (c, bkfp) == EOF) break; } - if (c != EOF || ferror(fp) || fflush(bkfp)) { - fclose(bkfp); + if (c != EOF || ferror (fp) || fflush (bkfp)) { + fclose (bkfp); return -1; } - if (fclose(bkfp)) + if (fclose (bkfp)) return -1; ub.actime = sb.st_atime; ub.modtime = sb.st_mtime; - utime(backup, &ub); + utime (backup, &ub); return 0; } -static void -free_linked_list(struct commonio_db *db) +static void free_linked_list (struct commonio_db *db) { struct commonio_entry *p; @@ -201,34 +197,31 @@ free_linked_list(struct commonio_db *db) db->head = p->next; if (p->line) - free(p->line); + free (p->line); if (p->eptr) - db->ops->free(p->eptr); + db->ops->free (p->eptr); - free(p); + free (p); } db->tail = NULL; } -int -commonio_setname(struct commonio_db *db, const char *name) +int commonio_setname (struct commonio_db *db, const char *name) { - snprintf(db->filename, sizeof(db->filename), "%s", name); + snprintf (db->filename, sizeof (db->filename), "%s", name); return 1; } -int -commonio_present(const struct commonio_db *db) +int commonio_present (const struct commonio_db *db) { - return (access(db->filename, F_OK) == 0); + return (access (db->filename, F_OK) == 0); } -int -commonio_lock_nowait(struct commonio_db *db) +int commonio_lock_nowait (struct commonio_db *db) { char file[1024]; char lock[1024]; @@ -236,9 +229,9 @@ commonio_lock_nowait(struct commonio_db *db) if (db->locked) return 1; - snprintf(file, sizeof file, "%s.%ld", db->filename, (long) getpid()); - snprintf(lock, sizeof lock, "%s.lock", db->filename); - if (do_lock_file(file, lock)) { + snprintf (file, sizeof file, "%s.%ld", db->filename, (long) getpid ()); + snprintf (lock, sizeof lock, "%s.lock", db->filename); + if (do_lock_file (file, lock)) { db->locked = 1; lock_count++; return 1; @@ -247,8 +240,7 @@ commonio_lock_nowait(struct commonio_db *db) } -int -commonio_lock(struct commonio_db *db) +int commonio_lock (struct commonio_db *db) { #ifdef HAVE_LCKPWDF /* @@ -262,15 +254,15 @@ commonio_lock(struct commonio_db *db) * (no retries, it should always succeed). */ if (lock_count == 0) { - if (lckpwdf() == -1) - return 0; /* failure */ + if (lckpwdf () == -1) + return 0; /* failure */ } - if (commonio_lock_nowait(db)) - return 1; /* success */ + if (commonio_lock_nowait (db)) + return 1; /* success */ - ulckpwdf(); - return 0; /* failure */ + ulckpwdf (); + return 0; /* failure */ #else int i; @@ -286,19 +278,18 @@ commonio_lock(struct commonio_db *db) #endif for (i = 0; i < LOCK_TRIES; i++) { if (i > 0) - sleep(LOCK_SLEEP); /* delay between retries */ - if (commonio_lock_nowait(db)) - return 1; /* success */ + sleep (LOCK_SLEEP); /* delay between retries */ + if (commonio_lock_nowait (db)) + return 1; /* success */ /* no unnecessary retries on "permission denied" errors */ - if (geteuid() != 0) + if (geteuid () != 0) return 0; } - return 0; /* failure */ + return 0; /* failure */ #endif } -static void -dec_lock_count(void) +static void dec_lock_count (void) { if (lock_count > 0) { lock_count--; @@ -306,48 +297,46 @@ dec_lock_count(void) /* Tell nscd when lock count goes to zero, if any of the files were changed. */ if (nscd_need_reload) { - nscd_flush_cache("passwd"); - nscd_flush_cache("group"); + nscd_flush_cache ("passwd"); + nscd_flush_cache ("group"); nscd_need_reload = 0; } #ifdef HAVE_LCKPWDF - ulckpwdf(); + ulckpwdf (); #endif } } } -int -commonio_unlock(struct commonio_db *db) +int commonio_unlock (struct commonio_db *db) { char lock[1024]; if (db->isopen) { db->readonly = 1; - if (!commonio_close(db)) { + if (!commonio_close (db)) { if (db->locked) - dec_lock_count(); + dec_lock_count (); return 0; } } - if (db->locked) { + if (db->locked) { /* * Unlock in reverse order: remove the lock file, * then call ulckpwdf() (if used) on last unlock. */ - db->locked = 0; - snprintf(lock, sizeof lock, "%s.lock", db->filename); - unlink(lock); - dec_lock_count(); + db->locked = 0; + snprintf (lock, sizeof lock, "%s.lock", db->filename); + unlink (lock); + dec_lock_count (); return 1; } return 0; } -static void -add_one_entry(struct commonio_db *db, struct commonio_entry *p) +static void add_one_entry (struct commonio_db *db, struct commonio_entry *p) { p->next = NULL; p->prev = db->tail; @@ -359,8 +348,7 @@ add_one_entry(struct commonio_db *db, struct commonio_entry *p) } -static int -name_is_nis(const char *n) +static int name_is_nis (const char *n) { return (n[0] == '+' || n[0] == '-'); } @@ -375,15 +363,16 @@ name_is_nis(const char *n) #endif #if KEEP_NIS_AT_END -static void add_one_entry_nis(struct commonio_db *, struct commonio_entry *); +static void add_one_entry_nis (struct commonio_db *, struct commonio_entry *); static void -add_one_entry_nis(struct commonio_db *db, struct commonio_entry *newp) +add_one_entry_nis (struct commonio_db *db, struct commonio_entry *newp) { struct commonio_entry *p; for (p = db->head; p; p = p->next) { - if (name_is_nis(p->eptr ? db->ops->getname(p->eptr) : p->line)) { + if (name_is_nis + (p->eptr ? db->ops->getname (p->eptr) : p->line)) { newp->next = p; newp->prev = p->prev; if (p->prev) @@ -394,16 +383,15 @@ add_one_entry_nis(struct commonio_db *db, struct commonio_entry *newp) return; } } - add_one_entry(db, newp); + add_one_entry (db, newp); } -#endif /* KEEP_NIS_AT_END */ +#endif /* KEEP_NIS_AT_END */ /* Initial buffer size, as well as increment if not sufficient (for reading very long lines in group files). */ #define BUFLEN 4096 -int -commonio_open(struct commonio_db *db, int mode) +int commonio_open (struct commonio_db *db, int mode) { char *buf; char *cp; @@ -429,7 +417,7 @@ commonio_open(struct commonio_db *db, int mode) db->head = db->tail = db->cursor = NULL; db->changed = 0; - db->fp = fopen(db->filename, db->readonly ? "r" : "r+"); + db->fp = fopen (db->filename, db->readonly ? "r" : "r+"); /* * If O_CREAT was specified and the file didn't exist, it will be @@ -442,48 +430,47 @@ commonio_open(struct commonio_db *db, int mode) } return 0; } - #ifdef WITH_SELINUX - db->scontext=NULL; - if (is_selinux_enabled() && (! db->readonly)) { - if (fgetfilecon(fileno(db->fp),&db->scontext) < 0) { - goto cleanup_errno; - } + db->scontext = NULL; + if (is_selinux_enabled () && (!db->readonly)) { + if (fgetfilecon (fileno (db->fp), &db->scontext) < 0) { + goto cleanup_errno; + } } #endif buflen = BUFLEN; - buf = (char *) malloc(buflen); + buf = (char *) malloc (buflen); if (!buf) goto cleanup_ENOMEM; - while (db->ops->fgets(buf, buflen, db->fp)) { - while (!(cp = strrchr(buf, '\n')) && !feof(db->fp)) { + while (db->ops->fgets (buf, buflen, db->fp)) { + while (!(cp = strrchr (buf, '\n')) && !feof (db->fp)) { int len; buflen += BUFLEN; - cp = (char *) realloc(buf, buflen); + cp = (char *) realloc (buf, buflen); if (!cp) goto cleanup_buf; buf = cp; - len = strlen(buf); - db->ops->fgets(buf + len, buflen - len, db->fp); + len = strlen (buf); + db->ops->fgets (buf + len, buflen - len, db->fp); } - if ((cp = strrchr(buf, '\n'))) + if ((cp = strrchr (buf, '\n'))) *cp = '\0'; - if (!(line = strdup(buf))) + if (!(line = strdup (buf))) goto cleanup_buf; - if (name_is_nis(line)) { + if (name_is_nis (line)) { eptr = NULL; - } else if ((eptr = db->ops->parse(line))) { - eptr = db->ops->dup(eptr); + } else if ((eptr = db->ops->parse (line))) { + eptr = db->ops->dup (eptr); if (!eptr) goto cleanup_line; } - p = (struct commonio_entry *) malloc(sizeof *p); + p = (struct commonio_entry *) malloc (sizeof *p); if (!p) goto cleanup_entry; @@ -491,36 +478,36 @@ commonio_open(struct commonio_db *db, int mode) p->line = line; p->changed = 0; - add_one_entry(db, p); + add_one_entry (db, p); } - free(buf); + free (buf); - if (ferror(db->fp)) + if (ferror (db->fp)) goto cleanup_errno; db->isopen = 1; return 1; -cleanup_entry: + cleanup_entry: if (eptr) - db->ops->free(eptr); -cleanup_line: - free(line); -cleanup_buf: - free(buf); -cleanup_ENOMEM: + db->ops->free (eptr); + cleanup_line: + free (line); + cleanup_buf: + free (buf); + cleanup_ENOMEM: errno = ENOMEM; -cleanup_errno: + cleanup_errno: saved_errno = errno; - free_linked_list(db); + free_linked_list (db); #ifdef WITH_SELINUX - if (db->scontext!= NULL) { - freecon(db->scontext); - db->scontext=NULL; + if (db->scontext != NULL) { + freecon (db->scontext); + db->scontext = NULL; } #endif - fclose(db->fp); + fclose (db->fp); db->fp = NULL; errno = saved_errno; return 0; @@ -530,7 +517,7 @@ cleanup_errno: * Sort given db according to cmp function (usually compares uids) */ int -commonio_sort(struct commonio_db *db, int (*cmp)(const void *, const void *)) +commonio_sort (struct commonio_db *db, int (*cmp) (const void *, const void *)) { struct commonio_entry **entries, *ptr; int n = 0, i; @@ -540,29 +527,29 @@ commonio_sort(struct commonio_db *db, int (*cmp)(const void *, const void *)) if (n <= 1) return 0; - - entries = malloc(n * sizeof(struct commonio_entry*)); + + entries = malloc (n * sizeof (struct commonio_entry *)); if (entries == NULL) return -1; - + n = 0; for (ptr = db->head; ptr; ptr = ptr->next) entries[n++] = ptr; - qsort(entries, n, sizeof(struct commonio_entry*), cmp); - + qsort (entries, n, sizeof (struct commonio_entry *), cmp); + db->head = entries[0]; db->tail = entries[--n]; db->head->prev = NULL; db->head->next = entries[1]; - db->tail->prev = entries[n-1]; + db->tail->prev = entries[n - 1]; db->tail->next = NULL; for (i = 1; i < n; i++) { - entries[i]->prev = entries[i-1]; - entries[i]->next = entries[i+1]; + entries[i]->prev = entries[i - 1]; + entries[i]->next = entries[i + 1]; } - free(entries); + free (entries); db->changed = 1; return 0; @@ -571,8 +558,7 @@ commonio_sort(struct commonio_db *db, int (*cmp)(const void *, const void *)) /* * Sort entries in db according to order in another. */ -int -commonio_sort_wrt(struct commonio_db *shadow, struct commonio_db *passwd) +int commonio_sort_wrt (struct commonio_db *shadow, struct commonio_db *passwd) { struct commonio_entry *head = NULL, *pw_ptr, *spw_ptr; const char *name; @@ -580,34 +566,34 @@ commonio_sort_wrt(struct commonio_db *shadow, struct commonio_db *passwd) for (pw_ptr = passwd->head; pw_ptr; pw_ptr = pw_ptr->next) { if (pw_ptr->eptr == NULL) continue; - name = passwd->ops->getname(pw_ptr->eptr); + name = passwd->ops->getname (pw_ptr->eptr); for (spw_ptr = shadow->head; spw_ptr; spw_ptr = spw_ptr->next) - if (strcmp(name, shadow->ops->getname(spw_ptr->eptr)) == 0) + if (strcmp (name, shadow->ops->getname (spw_ptr->eptr)) + == 0) break; - if (spw_ptr == NULL) + if (spw_ptr == NULL) continue; - commonio_del_entry(shadow, spw_ptr); + commonio_del_entry (shadow, spw_ptr); spw_ptr->next = head; head = spw_ptr; } - + for (spw_ptr = head; spw_ptr; spw_ptr = head) { head = head->next; - + if (shadow->head) shadow->head->prev = spw_ptr; spw_ptr->next = shadow->head; shadow->head = spw_ptr; } - + shadow->head->prev = NULL; shadow->changed = 1; return 0; } -static int -write_all(const struct commonio_db *db) +static int write_all (const struct commonio_db *db) { const struct commonio_entry *p; void *eptr; @@ -615,12 +601,12 @@ write_all(const struct commonio_db *db) for (p = db->head; p; p = p->next) { if (p->changed) { eptr = p->eptr; - if (db->ops->put(eptr, db->fp)) + if (db->ops->put (eptr, db->fp)) return -1; } else if (p->line) { - if (db->ops->fputs(p->line, db->fp) == EOF) + if (db->ops->fputs (p->line, db->fp) == EOF) return -1; - if (putc('\n', db->fp) == EOF) + if (putc ('\n', db->fp) == EOF) return -1; } } @@ -628,8 +614,7 @@ write_all(const struct commonio_db *db) } -int -commonio_close(struct commonio_db *db) +int commonio_close (struct commonio_db *db) { char buf[1024]; int errors = 0; @@ -642,41 +627,41 @@ commonio_close(struct commonio_db *db) db->isopen = 0; if (!db->changed || db->readonly) { - fclose(db->fp); + fclose (db->fp); db->fp = NULL; goto success; } - memzero(&sb, sizeof sb); + memzero (&sb, sizeof sb); if (db->fp) { - if (fstat(fileno(db->fp), &sb)) { - fclose(db->fp); + if (fstat (fileno (db->fp), &sb)) { + fclose (db->fp); db->fp = NULL; goto fail; } - #ifdef WITH_SELINUX if (db->scontext != NULL) { - int stat=getfscreatecon(&old_context); - if (stat< 0) { - errors++; - goto fail; - } - if (setfscreatecon(db->scontext)<0) { - errors++; - goto fail; - } + int stat = getfscreatecon (&old_context); + + if (stat < 0) { + errors++; + goto fail; + } + if (setfscreatecon (db->scontext) < 0) { + errors++; + goto fail; + } } #endif /* * Create backup file. */ - snprintf(buf, sizeof buf, "%s-", db->filename); + snprintf (buf, sizeof buf, "%s-", db->filename); - if (create_backup(buf, db->fp)) + if (create_backup (buf, db->fp)) errors++; - if (fclose(db->fp)) + if (fclose (db->fp)) errors++; if (errors) { @@ -693,77 +678,76 @@ commonio_close(struct commonio_db *db) sb.st_gid = 0; } - snprintf(buf, sizeof buf, "%s+", db->filename); + snprintf (buf, sizeof buf, "%s+", db->filename); - db->fp = fopen_set_perms(buf, "w", &sb); + db->fp = fopen_set_perms (buf, "w", &sb); if (!db->fp) goto fail; - if (write_all(db)) + if (write_all (db)) errors++; - if (fflush(db->fp)) + if (fflush (db->fp)) errors++; #ifdef HAVE_FSYNC - if (fsync(fileno(db->fp))) + if (fsync (fileno (db->fp))) errors++; #else - sync(); + sync (); #endif - if (fclose(db->fp)) + if (fclose (db->fp)) errors++; db->fp = NULL; if (errors) { - unlink(buf); + unlink (buf); goto fail; } - if (rename(buf, db->filename)) + if (rename (buf, db->filename)) goto fail; nscd_need_reload = 1; goto success; -fail: + fail: errors++; -success: + success: #ifdef WITH_SELINUX if (db->scontext != NULL) { - if (setfscreatecon(old_context)<0) { - errors++; - } - if (old_context != NULL) { - freecon(old_context); - old_context=NULL; - } - freecon(db->scontext); - db->scontext=NULL; + if (setfscreatecon (old_context) < 0) { + errors++; + } + if (old_context != NULL) { + freecon (old_context); + old_context = NULL; + } + freecon (db->scontext); + db->scontext = NULL; } #endif - free_linked_list(db); - return errors==0; + free_linked_list (db); + return errors == 0; } -static struct commonio_entry * -find_entry_by_name(struct commonio_db *db, const char *name) +static struct commonio_entry *find_entry_by_name (struct commonio_db *db, + const char *name) { struct commonio_entry *p; void *ep; for (p = db->head; p; p = p->next) { ep = p->eptr; - if (ep && strcmp(db->ops->getname(ep), name) == 0) + if (ep && strcmp (db->ops->getname (ep), name) == 0) break; } return p; } -int -commonio_update(struct commonio_db *db, const void *eptr) +int commonio_update (struct commonio_db *db, const void *eptr) { struct commonio_entry *p; void *nentry; @@ -772,13 +756,13 @@ commonio_update(struct commonio_db *db, const void *eptr) errno = EINVAL; return 0; } - if (!(nentry = db->ops->dup(eptr))) { + if (!(nentry = db->ops->dup (eptr))) { errno = ENOMEM; return 0; } - p = find_entry_by_name(db, db->ops->getname(eptr)); + p = find_entry_by_name (db, db->ops->getname (eptr)); if (p) { - db->ops->free(p->eptr); + db->ops->free (p->eptr); p->eptr = nentry; p->changed = 1; db->cursor = p; @@ -787,9 +771,9 @@ commonio_update(struct commonio_db *db, const void *eptr) return 1; } /* not found, new entry */ - p = (struct commonio_entry *) malloc(sizeof *p); + p = (struct commonio_entry *) malloc (sizeof *p); if (!p) { - db->ops->free(nentry); + db->ops->free (nentry); errno = ENOMEM; return 0; } @@ -799,9 +783,9 @@ commonio_update(struct commonio_db *db, const void *eptr) p->changed = 1; #if KEEP_NIS_AT_END - add_one_entry_nis(db, p); + add_one_entry_nis (db, p); #else - add_one_entry(db, p); + add_one_entry (db, p); #endif db->changed = 1; @@ -809,8 +793,7 @@ commonio_update(struct commonio_db *db, const void *eptr) } -void -commonio_del_entry(struct commonio_db *db, const struct commonio_entry *p) +void commonio_del_entry (struct commonio_db *db, const struct commonio_entry *p) { if (p == db->cursor) db->cursor = p->next; @@ -829,8 +812,7 @@ commonio_del_entry(struct commonio_db *db, const struct commonio_entry *p) } -int -commonio_remove(struct commonio_db *db, const char *name) +int commonio_remove (struct commonio_db *db, const char *name) { struct commonio_entry *p; @@ -838,26 +820,25 @@ commonio_remove(struct commonio_db *db, const char *name) errno = EINVAL; return 0; } - p = find_entry_by_name(db, name); + p = find_entry_by_name (db, name); if (!p) { errno = ENOENT; return 0; } - commonio_del_entry(db, p); + commonio_del_entry (db, p); if (p->line) - free(p->line); + free (p->line); if (p->eptr) - db->ops->free(p->eptr); + db->ops->free (p->eptr); return 1; } -const void * -commonio_locate(struct commonio_db *db, const char *name) +const void *commonio_locate (struct commonio_db *db, const char *name) { struct commonio_entry *p; @@ -865,7 +846,7 @@ commonio_locate(struct commonio_db *db, const char *name) errno = EINVAL; return NULL; } - p = find_entry_by_name(db, name); + p = find_entry_by_name (db, name); if (!p) { errno = ENOENT; return NULL; @@ -875,8 +856,7 @@ commonio_locate(struct commonio_db *db, const char *name) } -int -commonio_rewind(struct commonio_db *db) +int commonio_rewind (struct commonio_db *db) { if (!db->isopen) { errno = EINVAL; @@ -887,8 +867,7 @@ commonio_rewind(struct commonio_db *db) } -const void * -commonio_next(struct commonio_db *db) +const void *commonio_next (struct commonio_db *db) { void *eptr; diff --git a/lib/commonio.h b/lib/commonio.h index c20d61ed..b1a0f487 100644 --- a/lib/commonio.h +++ b/lib/commonio.h @@ -1,4 +1,4 @@ -/* $Id: commonio.h,v 1.8 2004/10/11 04:40:29 kloczek Exp $ */ +/* $Id: commonio.h,v 1.9 2005/03/31 05:14:49 kloczek Exp $ */ #ifdef WITH_SELINUX #include @@ -8,7 +8,7 @@ */ struct commonio_entry { char *line; - void *eptr; /* struct passwd, struct spwd, ... */ + void *eptr; /* struct passwd, struct spwd, ... */ struct commonio_entry *prev, *next; int changed:1; }; @@ -21,37 +21,37 @@ struct commonio_ops { * Make a copy of the object (for example, struct passwd) * and all strings pointed by it, in malloced memory. */ - void *(*dup)(const void *); + void *(*dup) (const void *); /* * free() the object including any strings pointed by it. */ - void (*free)(void *); + void (*free) (void *); /* * Return the name of the object (for example, pw_name * for struct passwd). */ - const char *(*getname)(const void *); + const char *(*getname) (const void *); /* * Parse a string, return object (in static area - * should be copied using the dup operation above). */ - void *(*parse)(const char *); + void *(*parse) (const char *); /* * Write the object to the file (this calls putpwent() * for struct passwd, for example). */ - int (*put)(const void *, FILE *); + int (*put) (const void *, FILE *); /* * fgets and fputs (can be replaced by versions that * understand line continuation conventions). */ - char *(*fgets)(char *, int, FILE *); - int (*fputs)(const char *, FILE *); + char *(*fgets) (char *, int, FILE *); + int (*fputs) (const char *, FILE *); }; /* @@ -74,7 +74,7 @@ struct commonio_db { FILE *fp; #ifdef WITH_SELINUX - security_context_t scontext; + security_context_t scontext; #endif /* * Head, tail, current position in linked list. @@ -90,19 +90,21 @@ struct commonio_db { int readonly:1; }; -extern int commonio_setname(struct commonio_db *, const char *); -extern int commonio_present(const struct commonio_db *); -extern int commonio_lock(struct commonio_db *); -extern int commonio_lock_nowait(struct commonio_db *); -extern int commonio_open(struct commonio_db *, int); -extern const void *commonio_locate(struct commonio_db *, const char *); -extern int commonio_update(struct commonio_db *, const void *); -extern int commonio_remove(struct commonio_db *, const char *); -extern int commonio_rewind(struct commonio_db *); -extern const void *commonio_next(struct commonio_db *); -extern int commonio_close(struct commonio_db *); -extern int commonio_unlock(struct commonio_db *); -extern void commonio_del_entry(struct commonio_db *, const struct commonio_entry *); -extern int commonio_sort_wrt(struct commonio_db *shadow, struct commonio_db *passwd); -extern int commonio_sort(struct commonio_db *db, int (*cmp)(const void *, const void *)); - +extern int commonio_setname (struct commonio_db *, const char *); +extern int commonio_present (const struct commonio_db *); +extern int commonio_lock (struct commonio_db *); +extern int commonio_lock_nowait (struct commonio_db *); +extern int commonio_open (struct commonio_db *, int); +extern const void *commonio_locate (struct commonio_db *, const char *); +extern int commonio_update (struct commonio_db *, const void *); +extern int commonio_remove (struct commonio_db *, const char *); +extern int commonio_rewind (struct commonio_db *); +extern const void *commonio_next (struct commonio_db *); +extern int commonio_close (struct commonio_db *); +extern int commonio_unlock (struct commonio_db *); +extern void commonio_del_entry (struct commonio_db *, + const struct commonio_entry *); +extern int commonio_sort_wrt (struct commonio_db *shadow, + struct commonio_db *passwd); +extern int commonio_sort (struct commonio_db *db, + int (*cmp) (const void *, const void *)); diff --git a/lib/defines.h b/lib/defines.h index 447d9a90..0b6af104 100644 --- a/lib/defines.h +++ b/lib/defines.h @@ -1,4 +1,4 @@ -/* $Id: defines.h,v 1.24 2005/01/17 19:03:34 kloczek Exp $ */ +/* $Id: defines.h,v 1.25 2005/03/31 05:14:49 kloczek Exp $ */ /* some useful defines */ #ifndef _DEFINES_H_ @@ -20,25 +20,26 @@ # define _(Text) gettext (Text) #else # undef bindtextdomain -# define bindtextdomain(Domain, Directory) /* empty */ +# define bindtextdomain(Domain, Directory) /* empty */ # undef textdomain -# define textdomain(Domain) /* empty */ +# define textdomain(Domain) /* empty */ # define _(Text) Text #endif #if STDC_HEADERS # include # include -#else /* not STDC_HEADERS */ +#else /* not STDC_HEADERS */ # ifndef HAVE_STRCHR # define strchr index # define strrchr rindex # endif -char *strchr(), *strrchr(), *strtok(); +char *strchr (), *strrchr (), *strtok (); + # ifndef HAVE_MEMCPY # define memcpy(d, s, n) bcopy((s), (d), (n)) # endif -#endif /* not STDC_HEADERS */ +#endif /* not STDC_HEADERS */ #if HAVE_ERRNO_H # include @@ -63,32 +64,32 @@ char *strchr(), *strrchr(), *strtok(); #if TIME_WITH_SYS_TIME # include # include -#else /* not TIME_WITH_SYS_TIME */ +#else /* not TIME_WITH_SYS_TIME */ # if HAVE_SYS_TIME_H # include # else # include # endif -#endif /* not TIME_WITH_SYS_TIME */ +#endif /* not TIME_WITH_SYS_TIME */ #ifdef HAVE_MEMSET # define memzero(ptr, size) memset((void *)(ptr), 0, (size)) #else # define memzero(ptr, size) bzero((char *)(ptr), (size)) #endif -#define strzero(s) memzero(s, strlen(s)) /* warning: evaluates twice */ +#define strzero(s) memzero(s, strlen(s)) /* warning: evaluates twice */ -#ifdef HAVE_DIRENT_H /* DIR_SYSV */ +#ifdef HAVE_DIRENT_H /* DIR_SYSV */ # include # define DIRECT dirent #else -# ifdef HAVE_SYS_NDIR_H /* DIR_XENIX */ +# ifdef HAVE_SYS_NDIR_H /* DIR_XENIX */ # include # endif -# ifdef HAVE_SYS_DIR_H /* DIR_??? */ +# ifdef HAVE_SYS_DIR_H /* DIR_??? */ # include # endif -# ifdef HAVE_NDIR_H /* DIR_BSD */ +# ifdef HAVE_NDIR_H /* DIR_BSD */ # include # endif # define DIRECT direct @@ -106,13 +107,13 @@ char *strchr(), *strrchr(), *strtok(); #if defined(SHADOWGRP) && !defined(GSHADOW) #include "gshadow_.h" #endif -#else /* not HAVE_SHADOW_H */ +#else /* not HAVE_SHADOW_H */ #include "shadow_.h" #ifdef SHADOWGRP #include "gshadow_.h" #endif -#endif /* not HAVE_SHADOW_H */ -#endif /* SHADOWPWD */ +#endif /* not HAVE_SHADOW_H */ +#endif /* SHADOWPWD */ #include @@ -162,17 +163,17 @@ char *strchr(), *strrchr(), *strtok(); free(saved_locale); \ } \ } while (0) -#else /* !ENABLE_NLS */ +#else /* !ENABLE_NLS */ #define SYSLOG(x) syslog x -#endif /* !ENABLE_NLS */ +#endif /* !ENABLE_NLS */ -#else /* !USE_SYSLOG */ +#else /* !USE_SYSLOG */ -#define SYSLOG(x) /* empty */ -#define openlog(a,b,c) /* empty */ -#define closelog() /* empty */ +#define SYSLOG(x) /* empty */ +#define openlog(a,b,c) /* empty */ +#define closelog() /* empty */ -#endif /* !USE_SYSLOG */ +#endif /* !USE_SYSLOG */ /* The default syslog settings can now be changed here, in just one place. */ @@ -231,7 +232,7 @@ char *strchr(), *strrchr(), *strtok(); # define GTTY(fd, termio) tcgetattr(fd, termio) # define TERMIO struct termios # define USE_TERMIOS -#else /* assumed HAVE_TERMIO_H */ +#else /* assumed HAVE_TERMIO_H */ # include # include # define STTY(fd, termio) ioctl(fd, TCSETA, termio) @@ -275,7 +276,7 @@ char *strchr(), *strrchr(), *strtok(); #if defined(AIX) || defined(__linux__) #define SETXXENT_TYPE void #define SETXXENT_RET(x) return -#define SETXXENT_TEST(x) x; if (0) /* compiler should optimize this away */ +#define SETXXENT_TEST(x) x; if (0) /* compiler should optimize this away */ #else #define SETXXENT_TYPE int #define SETXXENT_RET(x) return(x) @@ -311,11 +312,11 @@ char *strchr(), *strrchr(), *strtok(); #define NULL ((void *) 0) #endif -#ifdef sun /* hacks for compiling on SunOS */ +#ifdef sun /* hacks for compiling on SunOS */ # ifndef SOLARIS -extern int fputs(); -extern char *strdup(); -extern char *strerror(); +extern int fputs (); +extern char *strdup (); +extern char *strerror (); # endif #endif @@ -332,4 +333,4 @@ extern char *strerror(); #define SHADOW_PASSWD_STRING "x" #endif -#endif /* _DEFINES_H_ */ +#endif /* _DEFINES_H_ */ diff --git a/lib/encrypt.c b/lib/encrypt.c index 51c16e7a..94b4bedf 100644 --- a/lib/encrypt.c +++ b/lib/encrypt.c @@ -30,94 +30,29 @@ #include #include "rcsid.h" -RCSID("$Id: encrypt.c,v 1.7 2000/08/26 18:27:17 marekm Exp $") - +RCSID ("$Id: encrypt.c,v 1.11 2005/04/06 02:59:22 kloczek Exp $") +#include #include "prototypes.h" #include "defines.h" -extern char *crypt(); -extern char *libshadow_md5_crypt(const char *, const char *); - -char * -pw_encrypt(const char *clear, const char *salt) +char *pw_encrypt (const char *clear, const char *salt) { - static char cipher[128]; - char *cp; -#ifdef SW_CRYPT - static int count; -#endif + static char cipher[128]; + char *cp; -#ifdef MD5_CRYPT - /* - * If the salt string from the password file or from crypt_make_salt() - * begins with the magic string, use the new algorithm. - */ - if (strncmp(salt, "$1$", 3) == 0) - return libshadow_md5_crypt(clear, salt); -#endif - -#ifdef SW_CRYPT - /* - * Copy over the salt. It is always the first two - * characters of the string. - */ - - cipher[0] = salt[0]; - cipher[1] = salt[1]; - cipher[2] = '\0'; - - /* - * Loop up to ten times on the cleartext password. - * This is because the input limit for passwords is - * 80 characters. - * - * The initial salt is that provided by the user, or the - * one generated above. The subsequent salts are gotten - * from the first two characters of the previous encrypted - * block of characters. - */ - - for (count = 0;count < 10;count++) { - cp = crypt(clear, salt); - if (!cp) { - perror("crypt"); - exit(1); - } - if (strlen(cp) != 13) - return cp; - strcat(cipher, cp + 2); - salt = cipher + 11 * count + 2; - - if (strlen(clear) > 8) - clear += 8; - else - break; - } -#else - cp = crypt(clear, salt); + crypt (clear, salt); if (!cp) { /* * Single Unix Spec: crypt() may return a null pointer, * and set errno to indicate an error. The caller doesn't * expect us to return NULL, so... */ - perror("crypt"); - exit(1); + perror ("crypt"); + exit (1); } - if (strlen(cp) != 13) - return cp; /* nonstandard crypt() in libc, better bail out */ - strcpy(cipher, cp); + if (strlen (cp) != 13) + return cp; /* nonstandard crypt() in libc, better bail out */ + strcpy (cipher, cp); -#ifdef DOUBLESIZE - if (strlen (clear) > 8) { - cp = crypt(clear + 8, salt); - if (!cp) { - perror("crypt"); - exit(1); - } - strcat(cipher, cp + 2); - } -#endif /* DOUBLESIZE */ -#endif /* SW_CRYPT */ return cipher; } diff --git a/lib/faillog.h b/lib/faillog.h index 028012c8..7998f56d 100644 --- a/lib/faillog.h +++ b/lib/faillog.h @@ -30,7 +30,7 @@ /* * faillog.h - login failure logging file format * - * $Id: faillog.h,v 1.3 1997/05/01 23:14:39 marekm Exp $ + * $Id: faillog.h,v 1.4 2005/03/31 05:14:49 kloczek Exp $ * * The login failure file is maintained by login(1) and faillog(8) * Each record in the file represents a separate UID and the file @@ -40,16 +40,16 @@ #ifndef _FAILLOG_H #define _FAILLOG_H -struct faillog { - short fail_cnt; /* failures since last success */ - short fail_max; /* failures before turning account off */ - char fail_line[12]; /* last failure occured here */ - time_t fail_time; /* last failure occured then */ +struct faillog { + short fail_cnt; /* failures since last success */ + short fail_max; /* failures before turning account off */ + char fail_line[12]; /* last failure occured here */ + time_t fail_time; /* last failure occured then */ /* * If nonzero, the account will be re-enabled if there are no * failures for fail_locktime seconds since last failure. */ - long fail_locktime; + long fail_locktime; }; #endif diff --git a/lib/fputsx.c b/lib/fputsx.c index 17846110..d3b997db 100644 --- a/lib/fputsx.c +++ b/lib/fputsx.c @@ -33,10 +33,9 @@ #include "defines.h" #include "rcsid.h" -RCSID("$Id: fputsx.c,v 1.5 1999/06/07 16:40:44 marekm Exp $") +RCSID ("$Id: fputsx.c,v 1.6 2005/03/31 05:14:49 kloczek Exp $") -char * -fgetsx(char *buf, int cnt, FILE *f) +char *fgetsx (char *buf, int cnt, FILE * f) { char *cp = buf; char *ep; @@ -57,17 +56,16 @@ fgetsx(char *buf, int cnt, FILE *f) return buf; } -int -fputsx(const char *s, FILE *stream) +int fputsx (const char *s, FILE * stream) { int i; - for (i = 0;*s;i++, s++) { + for (i = 0; *s; i++, s++) { if (putc (*s, stream) == EOF) return EOF; -#if 0 /* The standard getgr*() can't handle that. --marekm */ - if (i > (BUFSIZ/2)) { +#if 0 /* The standard getgr*() can't handle that. --marekm */ + if (i > (BUFSIZ / 2)) { if (putc ('\\', stream) == EOF || putc ('\n', stream) == EOF) return EOF; diff --git a/lib/getdef.c b/lib/getdef.c index 17848e28..4c03ea6b 100644 --- a/lib/getdef.c +++ b/lib/getdef.c @@ -30,22 +30,19 @@ #include #include "rcsid.h" -RCSID("$Id: getdef.c,v 1.20 2005/01/20 12:43:05 kloczek Exp $") - +RCSID ("$Id: getdef.c,v 1.28 2005/04/01 22:52:03 kloczek Exp $") #include "prototypes.h" #include "defines.h" #include #include #include #include "getdef.h" - /* * A configuration item definition. */ - struct itemdef { - const char *name; /* name of the item */ - char *value; /* value given, or NULL if no value */ + const char *name; /* name of the item */ + char *value; /* value given, or NULL if no value */ }; /* @@ -54,85 +51,86 @@ struct itemdef { #define NUMDEFS (sizeof(def_table)/sizeof(def_table[0])) static struct itemdef def_table[] = { - { "CHFN_AUTH", NULL }, - { "CHFN_RESTRICT", NULL }, + {"CHFN_RESTRICT", NULL}, + {"DEFAULT_HOME", NULL}, + {"FAIL_DELAY", NULL}, + {"PASS_MAX_DAYS", NULL}, + {"PASS_MIN_DAYS", NULL}, + {"PASS_WARN_AGE", NULL}, + {"USERDEL_CMD", NULL}, #ifdef USE_PAM - { "CLOSE_SESSIONS", NULL }, + {"CLOSE_SESSIONS", NULL}, +#else + {"CHFN_AUTH", NULL}, + {"CHSH_AUTH", NULL}, + {"CRACKLIB_DICTPATH", NULL}, + {"ENV_HZ", NULL}, + {"ENV_PATH", NULL}, + {"ENV_ROOTPATH", NULL}, /* SuSE compatibility? */ + {"ENV_SUPATH", NULL}, + {"ENV_TZ", NULL}, + {"ENVIRON_FILE", NULL}, + {"FAILLOG_ENAB", NULL}, + {"FTMP_FILE", NULL}, + {"ISSUE_FILE", NULL}, + {"LASTLOG_ENAB", NULL}, + {"LOGIN_STRING", NULL}, + {"MAIL_CHECK_ENAB", NULL}, + {"MAIL_DIR", NULL}, + {"MAIL_FILE", NULL}, + {"MD5_CRYPT_ENAB", NULL}, + {"MOTD_FILE", NULL}, + {"NOLOGINS_FILE", NULL}, + {"OBSCURE_CHECKS_ENAB", NULL}, + {"PASS_ALWAYS_WARN", NULL}, + {"PASS_CHANGE_TRIES", NULL}, + {"PASS_MAX_LEN", NULL}, + {"PASS_MIN_LEN", NULL}, + {"PORTTIME_CHECKS_ENAB", NULL}, + {"SU_WHEEL_ONLY", NULL}, + {"QMAIL_DIR", NULL}, + {"QUOTAS_ENAB", NULL}, + {"ULIMIT", NULL}, #endif - { "CONSOLE", NULL }, - { "CONSOLE_GROUPS", NULL }, - { "CRACKLIB_DICTPATH", NULL }, - { "CREATE_HOME", NULL }, - { "DEFAULT_HOME", NULL }, - { "ENVIRON_FILE", NULL }, - { "ENV_HZ", NULL }, - { "ENV_PATH", NULL }, - { "ENV_ROOTPATH", NULL }, /* SuSE compatibility? */ - { "ENV_SUPATH", NULL }, - { "ENV_TZ", NULL }, - { "ERASECHAR", NULL }, - { "FAILLOG_ENAB", NULL }, - { "FAIL_DELAY", NULL }, - { "FAKE_SHELL", NULL }, - { "FTMP_FILE", NULL }, - { "GETPASS_ASTERISKS", NULL }, - { "GID_MAX", NULL }, - { "GID_MIN", NULL }, - { "HUSHLOGIN_FILE", NULL }, - { "ISSUE_FILE", NULL }, - { "KILLCHAR", NULL }, - { "LASTLOG_ENAB", NULL }, - { "LOGIN_RETRIES", NULL }, - { "LOGIN_STRING", NULL }, - { "LOGIN_TIMEOUT", NULL }, - { "LOG_OK_LOGINS", NULL }, - { "LOG_UNKFAIL_ENAB", NULL }, - { "MAIL_CHECK_ENAB", NULL }, - { "MAIL_DIR", NULL }, - { "MAIL_FILE", NULL }, - { "MD5_CRYPT_ENAB", NULL }, - { "MOTD_FILE", NULL }, - { "NOLOGINS_FILE", NULL }, - { "NOLOGIN_STR", NULL }, - { "OBSCURE_CHECKS_ENAB", NULL }, - { "PASS_ALWAYS_WARN", NULL }, - { "PASS_CHANGE_TRIES", NULL }, - { "PASS_MAX_DAYS", NULL }, - { "PASS_MAX_LEN", NULL }, - { "PASS_MIN_DAYS", NULL }, - { "PASS_MIN_LEN", NULL }, - { "PASS_WARN_AGE", NULL }, - { "PORTTIME_CHECKS_ENAB", NULL }, - { "QMAIL_DIR", NULL }, - { "QUOTAS_ENAB", NULL }, - { "SULOG_FILE", NULL }, - { "SU_NAME", NULL }, - { "SU_WHEEL_ONLY", NULL }, + {"CONSOLE", NULL}, + {"CONSOLE_GROUPS", NULL}, + {"CREATE_HOME", NULL}, + {"ERASECHAR", NULL}, + {"FAKE_SHELL", NULL}, + {"GETPASS_ASTERISKS", NULL}, + {"GID_MAX", NULL}, + {"GID_MIN", NULL}, + {"HUSHLOGIN_FILE", NULL}, + {"KILLCHAR", NULL}, + {"LOGIN_RETRIES", NULL}, + {"LOGIN_TIMEOUT", NULL}, + {"LOG_OK_LOGINS", NULL}, + {"LOG_UNKFAIL_ENAB", NULL}, + {"SULOG_FILE", NULL}, + {"SU_NAME", NULL}, #ifdef USE_SYSLOG - { "SYSLOG_SG_ENAB", NULL }, - { "SYSLOG_SU_ENAB", NULL }, + {"SYSLOG_SG_ENAB", NULL}, + {"SYSLOG_SU_ENAB", NULL}, #endif - { "TTYGROUP", NULL }, - { "TTYPERM", NULL }, - { "TTYTYPE_FILE", NULL }, - { "UID_MAX", NULL }, - { "UID_MIN", NULL }, - { "ULIMIT", NULL }, - { "UMASK", NULL }, - { "USERDEL_CMD", NULL }, - { "USERGROUPS_ENAB", NULL } + {"TTYGROUP", NULL}, + {"TTYPERM", NULL}, + {"TTYTYPE_FILE", NULL}, + {"UID_MAX", NULL}, + {"UID_MIN", NULL}, + {"UMASK", NULL}, + {"USERGROUPS_ENAB", NULL} }; #ifndef LOGINDEFS #define LOGINDEFS "/etc/login.defs" #endif -static char def_fname[] = LOGINDEFS; /* login config defs file */ -static int def_loaded = 0; /* are defs already loaded? */ +static char def_fname[] = LOGINDEFS; /* login config defs file */ +static int def_loaded = 0; /* are defs already loaded? */ /* local function prototypes */ -static struct itemdef *def_find(const char *); -static void def_load(void); +static struct itemdef *def_find (const char *); +static void def_load (void); /* @@ -142,15 +140,14 @@ static void def_load(void); * defined. First time invoked, will load definitions from the file. */ -char * -getdef_str(const char *item) +char *getdef_str (const char *item) { struct itemdef *d; if (!def_loaded) - def_load(); + def_load (); - return ((d = def_find(item)) == NULL ? (char *)NULL : d->value); + return ((d = def_find (item)) == NULL ? (char *) NULL : d->value); } @@ -160,18 +157,17 @@ getdef_str(const char *item) * Return TRUE if specified item is defined as "yes", else FALSE. */ -int -getdef_bool(const char *item) +int getdef_bool (const char *item) { struct itemdef *d; if (!def_loaded) - def_load(); + def_load (); - if ((d = def_find(item)) == NULL || d->value == NULL) + if ((d = def_find (item)) == NULL || d->value == NULL) return 0; - return (strcasecmp(d->value, "yes") == 0); + return (strcasecmp (d->value, "yes") == 0); } @@ -183,18 +179,17 @@ getdef_bool(const char *item) * values are handled. */ -int -getdef_num(const char *item, int dflt) +int getdef_num (const char *item, int dflt) { struct itemdef *d; if (!def_loaded) - def_load(); + def_load (); - if ((d = def_find(item)) == NULL || d->value == NULL) + if ((d = def_find (item)) == NULL || d->value == NULL) return dflt; - return (int) strtol(d->value, (char **)NULL, 0); + return (int) strtol (d->value, (char **) NULL, 0); } @@ -206,18 +201,17 @@ getdef_num(const char *item, int dflt) * values are handled. */ -unsigned int -getdef_unum(const char *item, unsigned int dflt) +unsigned int getdef_unum (const char *item, unsigned int dflt) { struct itemdef *d; if (!def_loaded) - def_load(); + def_load (); - if ((d = def_find(item)) == NULL || d->value == NULL) + if ((d = def_find (item)) == NULL || d->value == NULL) return dflt; - return (unsigned int) strtoul(d->value, (char **)NULL, 0); + return (unsigned int) strtoul (d->value, (char **) NULL, 0); } @@ -229,18 +223,17 @@ getdef_unum(const char *item, unsigned int dflt) * values are handled. */ -long -getdef_long(const char *item, long dflt) +long getdef_long (const char *item, long dflt) { struct itemdef *d; if (!def_loaded) - def_load(); + def_load (); - if ((d = def_find(item)) == NULL || d->value == NULL) + if ((d = def_find (item)) == NULL || d->value == NULL) return dflt; - return strtol(d->value, (char **)NULL, 0); + return strtol (d->value, (char **) NULL, 0); } @@ -249,35 +242,33 @@ getdef_long(const char *item, long dflt) * (also used when loading the initial defaults) */ -int -putdef_str(const char *name, const char *value) +int putdef_str (const char *name, const char *value) { struct itemdef *d; char *cp; if (!def_loaded) - def_load(); + def_load (); /* * Locate the slot to save the value. If this parameter * is unknown then "def_find" will print an err message. */ - if ((d = def_find(name)) == NULL) + if ((d = def_find (name)) == NULL) return -1; /* * Save off the value. */ - if ((cp = strdup(value)) == NULL) { - fprintf(stderr, - _("Could not allocate space for config info.\n")); - SYSLOG((LOG_ERR, - "could not allocate space for config info")); + if ((cp = strdup (value)) == NULL) { + fprintf (stderr, + _("Could not allocate space for config info.\n")); + SYSLOG ((LOG_ERR, "could not allocate space for config info")); return -1; } if (d->value) - free(d->value); + free (d->value); d->value = cp; return 0; @@ -291,8 +282,7 @@ putdef_str(const char *name, const char *value) * specified configuration option. */ -static struct itemdef * -def_find(const char *name) +static struct itemdef *def_find (const char *name) { int min, max, curr, n; @@ -301,7 +291,7 @@ def_find(const char *name) */ min = 0; - max = NUMDEFS-1; + max = NUMDEFS - 1; /* * Binary search into the table. Relies on the items being @@ -309,23 +299,26 @@ def_find(const char *name) */ while (min <= max) { - curr = (min+max)/2; + curr = (min + max) / 2; - if (! (n = strcmp(def_table[curr].name, name))) + if (!(n = strcmp (def_table[curr].name, name))) return &def_table[curr]; if (n < 0) - min = curr+1; + min = curr + 1; else - max = curr-1; + max = curr - 1; } /* * Item was never found. */ - fprintf(stderr, _("configuration error - unknown item '%s' (notify administrator)\n"), name); - SYSLOG((LOG_CRIT, "unknown configuration item `%s'", name)); + fprintf (stderr, + _ + ("configuration error - unknown item '%s' (notify administrator)\n"), + name); + SYSLOG ((LOG_CRIT, "unknown configuration item `%s'", name)); return (struct itemdef *) NULL; } @@ -335,8 +328,7 @@ def_find(const char *name) * Loads the user-configured options from the default configuration file */ -static void -def_load(void) +static void def_load (void) { int i; FILE *fp; @@ -345,10 +337,10 @@ def_load(void) /* * Open the configuration definitions file. */ - if ((fp = fopen(def_fname, "r")) == NULL) { - SYSLOG((LOG_CRIT, "cannot open login definitions %s [%m]", - def_fname)); - exit(1); + if ((fp = fopen (def_fname, "r")) == NULL) { + SYSLOG ((LOG_CRIT, "cannot open login definitions %s [%m]", + def_fname)); + exit (1); } /* @@ -360,13 +352,13 @@ def_load(void) /* * Go through all of the lines in the file. */ - while (fgets(buf, sizeof(buf), fp) != NULL) { + while (fgets (buf, sizeof (buf), fp) != NULL) { /* * Trim trailing whitespace. */ - for (i = strlen(buf)-1 ; i >= 0 ; --i) { - if (!isspace(buf[i])) + for (i = strlen (buf) - 1; i >= 0; --i) { + if (!isspace (buf[i])) break; } buf[++i] = '\0'; @@ -374,37 +366,36 @@ def_load(void) /* * Break the line into two fields. */ - name = buf + strspn(buf, " \t"); /* first nonwhite */ + name = buf + strspn (buf, " \t"); /* first nonwhite */ if (*name == '\0' || *name == '#') - continue; /* comment or empty */ + continue; /* comment or empty */ - s = name + strcspn(name, " \t"); /* end of field */ + s = name + strcspn (name, " \t"); /* end of field */ if (*s == '\0') - continue; /* only 1 field?? */ + continue; /* only 1 field?? */ *s++ = '\0'; - value = s + strspn(s, " \"\t"); /* next nonwhite */ - *(value + strcspn(value, "\"")) = '\0'; + value = s + strspn (s, " \"\t"); /* next nonwhite */ + *(value + strcspn (value, "\"")) = '\0'; /* * Store the value in def_table. */ - putdef_str(name, value); + putdef_str (name, value); } - if (ferror(fp)) { - SYSLOG((LOG_CRIT, "cannot read login definitions %s [%m]", - def_fname)); - exit(1); + if (ferror (fp)) { + SYSLOG ((LOG_CRIT, "cannot read login definitions %s [%m]", + def_fname)); + exit (1); } - (void) fclose(fp); + (void) fclose (fp); } #ifdef CKDEFS -int -main(int argc, char **argv) +int main (int argc, char **argv) { int i; char *cp; @@ -412,18 +403,19 @@ main(int argc, char **argv) def_load (); - for (i = 0 ; i < NUMDEFS ; ++i) { - if ((d = def_find(def_table[i].name)) == NULL) - printf("error - lookup '%s' failed\n", def_table[i].name); + for (i = 0; i < NUMDEFS; ++i) { + if ((d = def_find (def_table[i].name)) == NULL) + printf ("error - lookup '%s' failed\n", + def_table[i].name); else - printf("%4d %-24s %s\n", i+1, d->name, d->value); + printf ("%4d %-24s %s\n", i + 1, d->name, d->value); } - for (i = 1;i < argc;i++) { + for (i = 1; i < argc; i++) { if ((cp = getdef_str (argv[1])) != NULL) printf ("%s `%s'\n", argv[1], cp); else printf ("%s not found\n", argv[1]); } - exit(0); + exit (0); } #endif diff --git a/lib/getdef.h b/lib/getdef.h index 04c7d110..3368ae81 100644 --- a/lib/getdef.h +++ b/lib/getdef.h @@ -2,11 +2,11 @@ #define _GETDEF_H /* getdef.c */ -extern int getdef_bool(const char *); -extern long getdef_long(const char *, long); -extern int getdef_num(const char *, int); -extern unsigned int getdef_unum(const char *, unsigned int); -extern char *getdef_str(const char *); -extern int putdef_str(const char *, const char *); +extern int getdef_bool (const char *); +extern long getdef_long (const char *, long); +extern int getdef_num (const char *, int); +extern unsigned int getdef_unum (const char *, unsigned int); +extern char *getdef_str (const char *); +extern int putdef_str (const char *, const char *); -#endif /* _GETDEF_H */ +#endif /* _GETDEF_H */ diff --git a/lib/getpass.c b/lib/getpass.c index 761d280d..42d1cf9b 100644 --- a/lib/getpass.c +++ b/lib/getpass.c @@ -31,44 +31,36 @@ #include #include "rcsid.h" -RCSID("$Id: getpass.c,v 1.12 2003/05/05 21:44:12 kloczek Exp $") - +RCSID ("$Id: getpass.c,v 1.13 2005/03/31 05:14:49 kloczek Exp $") #include "defines.h" - #include #include - #include "getdef.h" - /* new code, #undef if there are any problems... */ #define USE_SETJMP 1 - #ifdef USE_SETJMP #include - -static sigjmp_buf intr; /* where to jump on SIGINT */ +static sigjmp_buf intr; /* where to jump on SIGINT */ #endif -static int sig_caught; +static int sig_caught; + #ifdef HAVE_SIGACTION -static struct sigaction sigact; +static struct sigaction sigact; #endif -/*ARGSUSED*/ -static RETSIGTYPE -sig_catch(int sig) + /*ARGSUSED*/ static RETSIGTYPE sig_catch (int sig) { sig_caught = 1; #ifdef USE_SETJMP - siglongjmp(intr, 1); + siglongjmp (intr, 1); #endif } #define MAXLEN 127 -static char * -readpass(FILE *ifp, FILE *ofp, int with_echo, int max_asterisks) +static char *readpass (FILE * ifp, FILE * ofp, int with_echo, int max_asterisks) { static char input[MAXLEN + 1], asterix[MAXLEN + 1]; static char once; @@ -77,9 +69,9 @@ readpass(FILE *ifp, FILE *ofp, int with_echo, int max_asterisks) if (max_asterisks < 0) { /* traditional code using fgets() */ - if (fgets(input, sizeof input, ifp) != input) + if (fgets (input, sizeof input, ifp) != input) return NULL; - cp = strrchr(input, '\n'); + cp = strrchr (input, '\n'); if (cp) *cp = '\0'; else @@ -87,12 +79,12 @@ readpass(FILE *ifp, FILE *ofp, int with_echo, int max_asterisks) return input; } if (!once) { - srandom(time(0)*getpid()); + srandom (time (0) * getpid ()); once = 1; } cp = input; ap = asterix; - while (read(fileno(ifp), &c, 1)) { + while (read (fileno (ifp), &c, 1)) { switch (c) { case '\n': case '\r': @@ -103,67 +95,68 @@ readpass(FILE *ifp, FILE *ofp, int with_echo, int max_asterisks) cp--; ap--; for (i = *ap; i > 0; i--) - fputs("\b \b", ofp); + fputs ("\b \b", ofp); *cp = '\0'; *ap = 0; } else { - putc('\a', ofp); /* BEL */ + putc ('\a', ofp); /* BEL */ } break; - case '\025': /* Ctrl-U = erase everything typed so far */ + case '\025': /* Ctrl-U = erase everything typed so far */ if (cp == input) { - putc('\a', ofp); /* BEL */ - } else while (cp > input) { - cp--; - ap--; - for (i = *ap; i > 0; i--) - fputs("\b \b", ofp); - *cp = '\0'; - *ap = 0; - } + putc ('\a', ofp); /* BEL */ + } else + while (cp > input) { + cp--; + ap--; + for (i = *ap; i > 0; i--) + fputs ("\b \b", ofp); + *cp = '\0'; + *ap = 0; + } break; default: *cp++ = c; if (with_echo) { *ap = 1; - putc(c, ofp); + putc (c, ofp); } else if (max_asterisks > 0) { - *ap = (random() % max_asterisks) + 1; + *ap = (random () % max_asterisks) + 1; for (i = *ap; i > 0; i--) - putc('*', ofp); + putc ('*', ofp); } else { *ap = 0; } ap++; break; } - fflush(ofp); + fflush (ofp); if (cp >= input + MAXLEN) { - putc('\a', ofp); /* BEL */ + putc ('\a', ofp); /* BEL */ break; } } -endwhile: + endwhile: *cp = '\0'; - putc('\n', ofp); + putc ('\n', ofp); return input; } -static char * -prompt_password(const char *prompt, int with_echo) +static char *prompt_password (const char *prompt, int with_echo) { static char nostring[1] = ""; static char *return_value; volatile int tty_opened; static FILE *ifp, *ofp; volatile int is_tty; + #ifdef HAVE_SIGACTION struct sigaction old_sigact; #else - RETSIGTYPE (*old_signal)(); + RETSIGTYPE (*old_signal) (); #endif TERMIO old_modes; - int max_asterisks = getdef_num("GETPASS_ASTERISKS", -1); + int max_asterisks = getdef_num ("GETPASS_ASTERISKS", -1); /* * set a flag so the SIGINT signal can be re-sent if it @@ -179,14 +172,14 @@ prompt_password(const char *prompt, int with_echo) * from stdin and write to stderr instead. */ - if (!(ifp = fopen("/dev/tty", "r+"))) { + if (!(ifp = fopen ("/dev/tty", "r+"))) { ifp = stdin; ofp = stderr; } else { ofp = ifp; tty_opened = 1; } - setbuf(ifp, (char *) 0); + setbuf (ifp, (char *) 0); /* * the current tty modes must be saved so they can be @@ -195,26 +188,25 @@ prompt_password(const char *prompt, int with_echo) */ is_tty = 1; - if (GTTY(fileno(ifp), &old_modes)) { + if (GTTY (fileno (ifp), &old_modes)) { is_tty = 0; } - #ifdef USE_SETJMP /* * If we get a SIGINT, sig_catch() will jump here - * no need to press Enter after Ctrl-C. */ - if (sigsetjmp(intr, 1)) + if (sigsetjmp (intr, 1)) goto out; #endif #ifdef HAVE_SIGACTION sigact.sa_handler = sig_catch; - sigemptyset(&sigact.sa_mask); + sigemptyset (&sigact.sa_mask); sigact.sa_flags = 0; - sigaction(SIGINT, &sigact, &old_sigact); + sigaction (SIGINT, &sigact, &old_sigact); #else - old_signal = signal(SIGINT, sig_catch); + old_signal = signal (SIGINT, sig_catch); #endif if (is_tty) { @@ -232,7 +224,7 @@ prompt_password(const char *prompt, int with_echo) new_modes.c_lflag |= ECHONL; - if (STTY(fileno(ifp), &new_modes)) + if (STTY (fileno (ifp), &new_modes)) goto out; } @@ -243,9 +235,9 @@ prompt_password(const char *prompt, int with_echo) * returned. */ - if ((fputs(prompt, ofp) != EOF) && (fflush(ofp) != EOF)) - return_value = readpass(ifp, ofp, with_echo, max_asterisks); -out: + if ((fputs (prompt, ofp) != EOF) && (fflush (ofp) != EOF)) + return_value = readpass (ifp, ofp, with_echo, max_asterisks); + out: /* * the old SIGINT handler is restored after the tty * modes. then /dev/tty is closed if it was opened in @@ -254,20 +246,19 @@ out: */ if (is_tty) { - if (STTY(fileno(ifp), &old_modes)) + if (STTY (fileno (ifp), &old_modes)) return_value = NULL; } - #ifdef HAVE_SIGACTION (void) sigaction (SIGINT, &old_sigact, NULL); #else (void) signal (SIGINT, old_signal); #endif if (tty_opened) - (void) fclose(ifp); + (void) fclose (ifp); if (sig_caught) { - kill(getpid(), SIGINT); + kill (getpid (), SIGINT); return_value = NULL; } if (!return_value) { @@ -277,15 +268,12 @@ out: return return_value; } -char * -libshadow_getpass(const char *prompt) +char *libshadow_getpass (const char *prompt) { - return prompt_password(prompt, 0); + return prompt_password (prompt, 0); } -char * -getpass_with_echo(const char *prompt) +char *getpass_with_echo (const char *prompt) { - return prompt_password(prompt, 1); + return prompt_password (prompt, 1); } - diff --git a/lib/grdbm.c b/lib/grdbm.c deleted file mode 100644 index b08c0f58..00000000 --- a/lib/grdbm.c +++ /dev/null @@ -1,211 +0,0 @@ -/* - * Copyright 1990 - 1994, Julianne Frances Haugh - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Julianne F. Haugh nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include - -#ifdef NDBM - -#include "rcsid.h" -RCSID("$Id: grdbm.c,v 1.3 1997/12/07 23:26:52 marekm Exp $") - -#include -#include -#include -#include "prototypes.h" - -#include -extern DBM *gr_dbm; - -#define GRP_FRAG 256 - -/* - * gr_dbm_update - * - * Updates the DBM password files, if they exist. - */ - -int -gr_dbm_update(const struct group *gr) -{ - datum key; - datum content; - char data[BUFSIZ*8]; - char grpkey[60]; - char *cp; - int len; - int i; - int cnt; - static int once; - - if (! once) { - if (! gr_dbm) - setgrent (); - - once++; - } - if (! gr_dbm) - return 0; - - len = gr_pack (gr, data); - - if (len <= GRP_FRAG) { - content.dsize = len; - content.dptr = data; - - key.dsize = strlen (gr->gr_name); - key.dptr = gr->gr_name; - if (dbm_store (gr_dbm, key, content, DBM_REPLACE)) - return 0; - - key.dsize = sizeof gr->gr_gid; - key.dptr = (char *) &gr->gr_gid; - if (dbm_store (gr_dbm, key, content, DBM_REPLACE)) - return 0; - - } else { - content.dsize = sizeof cnt; - content.dptr = (char *) &cnt; - cnt = (len + (GRP_FRAG-1)) / GRP_FRAG; - - key.dsize = strlen (gr->gr_name); - key.dptr = gr->gr_name; - if (dbm_store (gr_dbm, key, content, DBM_REPLACE)) - return 0; - - key.dsize = sizeof gr->gr_gid; - key.dptr = (char *) &gr->gr_gid; - if (dbm_store (gr_dbm, key, content, DBM_REPLACE)) - return 0; - - for (cp = data, i = 0;i < cnt;i++) { - content.dsize = len > GRP_FRAG ? GRP_FRAG:len; - len -= content.dsize; - content.dptr = cp; - cp += content.dsize; - - key.dsize = sizeof i + strlen (gr->gr_name); - key.dptr = grpkey; - memcpy (grpkey, (char *) &i, sizeof i); - strcpy (grpkey + sizeof i, gr->gr_name); - if (dbm_store (gr_dbm, key, content, DBM_REPLACE)) - return 0; - - key.dsize = sizeof i + sizeof gr->gr_gid; - key.dptr = grpkey; - memcpy (grpkey, (char *) &i, sizeof i); - memcpy (grpkey + sizeof i, (char *) &gr->gr_gid, - sizeof gr->gr_gid); - if (dbm_store (gr_dbm, key, content, DBM_REPLACE)) - return 0; - } - } - return 1; -} - -/* - * gr_dbm_remove - * - * Deletes the DBM group file entries, if they exist. - */ - -int -gr_dbm_remove(const struct group *gr) -{ - datum key; - datum content; - char grpkey[60]; - int i; - int cnt; - int errors = 0; - static int once; - - if (! once) { - if (! gr_dbm) - setgrent (); - - once++; - } - if (! gr_dbm) - return 0; - - key.dsize = strlen (gr->gr_name); - key.dptr = (char *) gr->gr_name; - content = dbm_fetch (gr_dbm, key); - if (content.dptr == 0) - ++errors; - else { - if (content.dsize == sizeof (int)) { - memcpy ((char *) &cnt, content.dptr, sizeof cnt); - - for (i = 0;i < cnt;i++) { - key.dsize = sizeof i + strlen (gr->gr_name); - key.dptr = grpkey; - memcpy (grpkey, (char *) &i, sizeof i); - strcpy (grpkey + sizeof i, gr->gr_name); - if (dbm_delete (gr_dbm, key)) - ++errors; - } - } else { - if (dbm_delete (gr_dbm, key)) - ++errors; - } - } - key.dsize = sizeof gr->gr_gid; - key.dptr = (char *) &gr->gr_gid; - content = dbm_fetch (gr_dbm, key); - if (content.dptr == 0) - ++errors; - else { - if (content.dsize == sizeof (int)) { - memcpy ((char *) &cnt, content.dptr, sizeof cnt); - - for (i = 0;i < cnt;i++) { - key.dsize = sizeof i + sizeof gr->gr_gid; - key.dptr = grpkey; - memcpy (grpkey, (char *) &i, sizeof i); - memcpy (grpkey + sizeof i, (char *) &gr->gr_gid, - sizeof gr->gr_gid); - - if (dbm_delete (gr_dbm, key)) - ++errors; - } - } else { - if (dbm_delete (gr_dbm, key)) - ++errors; - } - } - return errors ? 0:1; -} - -int -gr_dbm_present(void) -{ - return (access(GROUP_PAG_FILE, F_OK) == 0); -} -#endif diff --git a/lib/groupio.c b/lib/groupio.c index 90f61d98..4d9b6bf5 100644 --- a/lib/groupio.c +++ b/lib/groupio.c @@ -2,38 +2,33 @@ #include #include "rcsid.h" -RCSID("$Id: groupio.c,v 1.10 2001/08/14 21:10:36 malekith Exp $") - +RCSID ("$Id: groupio.c,v 1.11 2005/03/31 05:14:49 kloczek Exp $") #include "prototypes.h" #include "defines.h" - #include "commonio.h" #include "groupio.h" +extern int putgrent (const struct group *, FILE *); +extern struct group *sgetgrent (const char *); -extern int putgrent(const struct group *, FILE *); -extern struct group *sgetgrent(const char *); - -struct group * -__gr_dup(const struct group *grent) +struct group *__gr_dup (const struct group *grent) { struct group *gr; int i; - if (!(gr = (struct group *) malloc(sizeof *gr))) + if (!(gr = (struct group *) malloc (sizeof *gr))) return NULL; *gr = *grent; - if (!(gr->gr_name = strdup(grent->gr_name))) + if (!(gr->gr_name = strdup (grent->gr_name))) return NULL; - if (!(gr->gr_passwd = strdup(grent->gr_passwd))) + if (!(gr->gr_passwd = strdup (grent->gr_passwd))) return NULL; - for (i = 0; grent->gr_mem[i]; i++) - ; - gr->gr_mem = (char **) malloc((i + 1) * sizeof(char *)); + for (i = 0; grent->gr_mem[i]; i++); + gr->gr_mem = (char **) malloc ((i + 1) * sizeof (char *)); if (!gr->gr_mem) return NULL; for (i = 0; grent->gr_mem[i]; i++) { - gr->gr_mem[i] = strdup(grent->gr_mem[i]); + gr->gr_mem[i] = strdup (grent->gr_mem[i]); if (!gr->gr_mem[i]) return NULL; } @@ -41,45 +36,43 @@ __gr_dup(const struct group *grent) return gr; } -static void * -group_dup(const void *ent) +static void *group_dup (const void *ent) { const struct group *gr = ent; - return __gr_dup(gr); + + return __gr_dup (gr); } -static void -group_free(void *ent) +static void group_free (void *ent) { struct group *gr = ent; - free(gr->gr_name); - free(gr->gr_passwd); - while(*(gr->gr_mem)) { - free(*(gr->gr_mem)); + free (gr->gr_name); + free (gr->gr_passwd); + while (*(gr->gr_mem)) { + free (*(gr->gr_mem)); gr->gr_mem++; } - free(gr); + free (gr); } -static const char * -group_getname(const void *ent) +static const char *group_getname (const void *ent) { const struct group *gr = ent; + return gr->gr_name; } -static void * -group_parse(const char *line) +static void *group_parse (const char *line) { - return (void *) sgetgrent(line); + return (void *) sgetgrent (line); } -static int -group_put(const void *ent, FILE *file) +static int group_put (const void *ent, FILE * file) { const struct group *gr = ent; - return (putgrent(gr, file) == -1) ? -1 : 0; + + return (putgrent (gr, file) == -1) ? -1 : 0; } static struct commonio_ops group_ops = { @@ -93,114 +86,99 @@ static struct commonio_ops group_ops = { }; static struct commonio_db group_db = { - GROUP_FILE, /* filename */ - &group_ops, /* ops */ - NULL, /* fp */ - NULL, /* head */ - NULL, /* tail */ - NULL, /* cursor */ - 0, /* changed */ - 0, /* isopen */ - 0, /* locked */ - 0 /* readonly */ + GROUP_FILE, /* filename */ + &group_ops, /* ops */ + NULL, /* fp */ + NULL, /* head */ + NULL, /* tail */ + NULL, /* cursor */ + 0, /* changed */ + 0, /* isopen */ + 0, /* locked */ + 0 /* readonly */ }; -int -gr_name(const char *filename) +int gr_name (const char *filename) { - return commonio_setname(&group_db, filename); + return commonio_setname (&group_db, filename); } -int -gr_lock(void) +int gr_lock (void) { - return commonio_lock(&group_db); + return commonio_lock (&group_db); } -int -gr_open(int mode) +int gr_open (int mode) { - return commonio_open(&group_db, mode); + return commonio_open (&group_db, mode); } -const struct group * -gr_locate(const char *name) +const struct group *gr_locate (const char *name) { - return commonio_locate(&group_db, name); + return commonio_locate (&group_db, name); } -int -gr_update(const struct group *gr) +int gr_update (const struct group *gr) { - return commonio_update(&group_db, (const void *) gr); + return commonio_update (&group_db, (const void *) gr); } -int -gr_remove(const char *name) +int gr_remove (const char *name) { - return commonio_remove(&group_db, name); + return commonio_remove (&group_db, name); } -int -gr_rewind(void) +int gr_rewind (void) { - return commonio_rewind(&group_db); + return commonio_rewind (&group_db); } -const struct group * -gr_next(void) +const struct group *gr_next (void) { - return commonio_next(&group_db); + return commonio_next (&group_db); } -int -gr_close(void) +int gr_close (void) { - return commonio_close(&group_db); + return commonio_close (&group_db); } -int -gr_unlock(void) +int gr_unlock (void) { - return commonio_unlock(&group_db); + return commonio_unlock (&group_db); } -void -__gr_set_changed(void) +void __gr_set_changed (void) { group_db.changed = 1; } -struct commonio_entry * -__gr_get_head(void) +struct commonio_entry *__gr_get_head (void) { return group_db.head; } -struct commonio_db * -__gr_get_db(void) +struct commonio_db *__gr_get_db (void) { return &group_db; } -void -__gr_del_entry(const struct commonio_entry *ent) +void __gr_del_entry (const struct commonio_entry *ent) { - commonio_del_entry(&group_db, ent); + commonio_del_entry (&group_db, ent); } -static int -gr_cmp(const void *p1, const void *p2) +static int gr_cmp (const void *p1, const void *p2) { gid_t u1, u2; - if ((*(struct commonio_entry**)p1)->eptr == NULL) + if ((*(struct commonio_entry **) p1)->eptr == NULL) return 1; - if ((*(struct commonio_entry**)p2)->eptr == NULL) + if ((*(struct commonio_entry **) p2)->eptr == NULL) return -1; - - u1 = ((struct group *)(*(struct commonio_entry**)p1)->eptr)->gr_gid; - u2 = ((struct group *)(*(struct commonio_entry**)p2)->eptr)->gr_gid; + + u1 = ((struct group *) (*(struct commonio_entry **) p1)->eptr)->gr_gid; + u2 = ((struct group *) (*(struct commonio_entry **) p2)->eptr)->gr_gid; if (u1 < u2) return -1; @@ -211,8 +189,7 @@ gr_cmp(const void *p1, const void *p2) } /* Sort entries by gid */ -int -gr_sort() +int gr_sort () { - return commonio_sort(&group_db, gr_cmp); + return commonio_sort (&group_db, gr_cmp); } diff --git a/lib/groupio.h b/lib/groupio.h index a79b85b9..8474072c 100644 --- a/lib/groupio.h +++ b/lib/groupio.h @@ -1,13 +1,13 @@ -extern struct group *__gr_dup(const struct group *); -extern void __gr_set_changed(void); -extern int gr_close(void); -extern const struct group *gr_locate(const char *); -extern int gr_lock(void); -extern int gr_name(const char *); -extern const struct group *gr_next(void); -extern int gr_open(int); -extern int gr_remove(const char *); -extern int gr_rewind(void); -extern int gr_unlock(void); -extern int gr_update(const struct group *); -extern int gr_sort(void); +extern struct group *__gr_dup (const struct group *); +extern void __gr_set_changed (void); +extern int gr_close (void); +extern const struct group *gr_locate (const char *); +extern int gr_lock (void); +extern int gr_name (const char *); +extern const struct group *gr_next (void); +extern int gr_open (int); +extern int gr_remove (const char *); +extern int gr_rewind (void); +extern int gr_unlock (void); +extern int gr_update (const struct group *); +extern int gr_sort (void); diff --git a/lib/grpack.c b/lib/grpack.c index 9f4a1803..d383bd63 100644 --- a/lib/grpack.c +++ b/lib/grpack.c @@ -30,18 +30,14 @@ #include #include "rcsid.h" -RCSID("$Id: grpack.c,v 1.3 1997/12/07 23:26:52 marekm Exp $") - +RCSID ("$Id: grpack.c,v 1.4 2005/03/31 05:14:49 kloczek Exp $") #include #include - #include "defines.h" - -int -gr_pack(const struct group *group, char *buf) +int gr_pack (const struct group *group, char *buf) { - char *cp; - int i; + char *cp; + int i; cp = buf; strcpy (cp, group->gr_name); @@ -53,7 +49,7 @@ gr_pack(const struct group *group, char *buf) memcpy (cp, (const char *) &group->gr_gid, sizeof group->gr_gid); cp += sizeof group->gr_gid; - for (i = 0;group->gr_mem[i];i++) { + for (i = 0; group->gr_mem[i]; i++) { strcpy (cp, group->gr_mem[i]); cp += strlen (cp) + 1; } @@ -62,11 +58,10 @@ gr_pack(const struct group *group, char *buf) return cp - buf; } -int -gr_unpack(char *buf, int len, struct group *group) +int gr_unpack (char *buf, int len, struct group *group) { - char *org = buf; - int i; + char *org = buf; + int i; group->gr_name = buf; buf += strlen (buf) + 1; @@ -83,7 +78,7 @@ gr_unpack(char *buf, int len, struct group *group) if (buf - org > len) return -1; - for (i = 0;*buf && i < 1024;i++) { + for (i = 0; *buf && i < 1024; i++) { group->gr_mem[i] = buf; buf += strlen (buf) + 1; diff --git a/lib/gsdbm.c b/lib/gsdbm.c deleted file mode 100644 index a6da67ae..00000000 --- a/lib/gsdbm.c +++ /dev/null @@ -1,167 +0,0 @@ -/* - * Copyright 1990 - 1994, Julianne Frances Haugh - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Julianne F. Haugh nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include - -#if defined(NDBM) && defined(SHADOWGRP) /*{*/ - -#include -#include -#include "prototypes.h" - -#include "rcsid.h" -RCSID("$Id: gsdbm.c,v 1.3 1997/12/07 23:26:53 marekm Exp $") - -#include -extern DBM *sg_dbm; - -#define GRP_FRAG 256 - -/* - * sg_dbm_update - * - * Updates the DBM password files, if they exist. - */ - -int -sg_dbm_update(const struct sgrp *sgr) -{ - datum key; - datum content; - char data[BUFSIZ*8]; - char sgrpkey[60]; - char *cp; - int len; - int i; - int cnt; - static int once; - - if (! once) { - if (! sg_dbm) - setsgent (); - - once++; - } - if (! sg_dbm) - return 0; - - len = sgr_pack (sgr, data); - - if (len <= GRP_FRAG) { - content.dsize = len; - content.dptr = data; - - key.dsize = strlen (sgr->sg_name); - key.dptr = sgr->sg_name; - if (dbm_store (sg_dbm, key, content, DBM_REPLACE)) - return 0; - } else { - content.dsize = sizeof cnt; - content.dptr = (char *) &cnt; - cnt = (len + (GRP_FRAG-1)) / GRP_FRAG; - - key.dsize = strlen (sgr->sg_name); - key.dptr = sgr->sg_name; - if (dbm_store (sg_dbm, key, content, DBM_REPLACE)) - return 0; - - for (cp = data, i = 0;i < cnt;i++) { - content.dsize = len > GRP_FRAG ? GRP_FRAG:len; - len -= content.dsize; - content.dptr = cp; - cp += content.dsize; - - key.dsize = sizeof i + strlen (sgr->sg_name); - key.dptr = sgrpkey; - memcpy (sgrpkey, (char *) &i, sizeof i); - strcpy (sgrpkey + sizeof i, sgr->sg_name); - if (dbm_store (sg_dbm, key, content, DBM_REPLACE)) - return 0; - } - } - return 1; -} - -/* - * sg_dbm_remove - * - * Deletes the DBM shadow group file entries, if they exist. - */ - -int -sg_dbm_remove(const char *name) -{ - datum key; - datum content; - char grpkey[60]; - int i; - int cnt; - int errors = 0; - static int once; - - if (! once) { - if (! sg_dbm) - setsgent (); - - once++; - } - if (! sg_dbm) - return 0; - - key.dsize = strlen (name); - key.dptr = name; - content = dbm_fetch (sg_dbm, key); - if (content.dptr == 0) - ++errors; - else { - if (content.dsize == sizeof (int)) { - memcpy ((char *) &cnt, content.dptr, sizeof cnt); - - for (i = 0;i < cnt;i++) { - key.dsize = sizeof i + strlen (name); - key.dptr = grpkey; - memcpy (grpkey, (char *) &i, sizeof i); - strcpy (grpkey + sizeof i, name); - if (dbm_delete (sg_dbm, key)) - ++errors; - } - } else { - if (dbm_delete (sg_dbm, key)) - ++errors; - } - } - return errors ? 0:1; -} - -int -sg_dbm_present(void) -{ - return (access(SGROUP_PAG_FILE, F_OK) == 0); -} -#endif /*} SHADOWGRP && NDBM */ diff --git a/lib/gshadow.c b/lib/gshadow.c index 8de925b8..bd4b0fcf 100644 --- a/lib/gshadow.c +++ b/lib/gshadow.c @@ -30,47 +30,38 @@ #include /* Newer versions of Linux libc already have shadow support. */ -#if defined(SHADOWGRP) && !defined(HAVE_SHADOWGRP) /*{*/ +#if defined(SHADOWGRP) && !defined(HAVE_SHADOWGRP) /*{ */ #include "rcsid.h" -RCSID("$Id: gshadow.c,v 1.6 1998/04/02 21:51:43 marekm Exp $") - +RCSID ("$Id: gshadow.c,v 1.9 2005/04/06 04:26:05 kloczek Exp $") #include #include "prototypes.h" #include "defines.h" -#ifdef NDBM -#include -#include -DBM *sg_dbm; -int sg_dbm_mode = -1; -static int dbmopened; -static int dbmerror; -#endif +static FILE *shadow; +static char sgrbuf[BUFSIZ * 4]; +static char **members = NULL; +static size_t nmembers = 0; +static char **admins = NULL; +static size_t nadmins = 0; +static struct sgrp sgroup; -#define MAXMEM 1024 - -static FILE *shadow; -static char sgrbuf[BUFSIZ*4]; -static char *members[MAXMEM+1]; -static char *admins[MAXMEM+1]; -static struct sgrp sgroup; - -extern char *fgetsx(); -extern int fputsx(); +extern char *fgetsx (); +extern int fputsx (); #define FIELDS 4 #ifdef USE_NIS -static int nis_used; -static int nis_ignore; -static enum { native, start, middle, native2 } nis_state; -static int nis_bound; -static char *nis_domain; -static char *nis_key; -static int nis_keylen; -static char *nis_val; -static int nis_vallen; +static int nis_used; +static int nis_ignore; +static enum { native, start, middle, native2 } nis_state; +static int nis_bound; +static char *nis_domain; +static char *nis_key; +static int nis_keylen; +static char *nis_val; +static int nis_vallen; + #define IS_NISCHAR(c) ((c)=='+') #endif @@ -80,10 +71,9 @@ static int nis_vallen; * __setsgNIS - turn on or off NIS searches */ -void -__setsgNIS(int flag) +void __setsgNIS (int flag) { - nis_ignore = ! flag; + nis_ignore = !flag; if (nis_ignore) nis_used = 0; @@ -93,8 +83,7 @@ __setsgNIS(int flag) * bind_nis - bind to NIS server */ -static int -bind_nis(void) +static int bind_nis (void) { if (yp_get_default_domain (&nis_domain)) return -1; @@ -104,82 +93,53 @@ bind_nis(void) } #endif -static char ** -list(char *s, char **l) +static char **list (char *s, char **list[], size_t * nlist) { - int nmembers = 0; + char **ptr = *list; + size_t nelem = *nlist, size; - while (s && *s) { - l[nmembers++] = s; - if ((s = strchr (s, ','))) - *s++ = '\0'; + while (s != NULL && *s != '\0') { + size = (nelem + 1) * sizeof (ptr); + if ((ptr = realloc (*list, size)) != NULL) { + ptr[nelem++] = s; + *list = ptr; + *nlist = nelem; + if ((s = strchr (s, ','))) + *s++ = '\0'; + } } - l[nmembers] = (char *) 0; - return l; + size = (nelem + 1) * sizeof (ptr); + if ((ptr = realloc (*list, size)) != NULL) { + ptr[nelem] = '\0'; + *list = ptr; + } + return ptr; } -void -setsgent(void) +void setsgent (void) { -#ifdef NDBM - int mode; -#endif /* NDBM */ - #ifdef USE_NIS nis_state = native; #endif if (shadow) rewind (shadow); else - shadow = fopen(SGROUP_FILE, "r"); - - /* - * Attempt to open the DBM files if they have never been opened - * and an error has never been returned. - */ - -#ifdef NDBM - if (! dbmerror && ! dbmopened) { - char dbmfiles[BUFSIZ]; - - strcpy (dbmfiles, SGROUP_PAG_FILE); - - if (sg_dbm_mode == -1) - mode = O_RDWR; - else - mode = (sg_dbm_mode == O_RDWR) ? O_RDWR:O_RDONLY; - - if (access(dbmfiles, F_OK) || - (! (sg_dbm = dbm_open(SGROUP_FILE, mode, 0)))) - dbmerror = 1; - else - dbmopened = 1; - } -#endif /* NDBM */ + shadow = fopen (SGROUP_FILE, "r"); } -void -endsgent(void) +void endsgent (void) { if (shadow) (void) fclose (shadow); shadow = (FILE *) 0; -#ifdef NDBM - if (dbmopened && sg_dbm) { - dbm_close (sg_dbm); - dbmopened = 0; - sg_dbm = 0; - } -#endif } -struct sgrp * -sgetsgent(const char *string) +struct sgrp *sgetsgent (const char *string) { - char *fields[FIELDS]; - char *cp; - int i; + char *fields[FIELDS]; + char *cp; + int i; strncpy (sgrbuf, string, (int) sizeof sgrbuf - 1); sgrbuf[sizeof sgrbuf - 1] = '\0'; @@ -192,7 +152,7 @@ sgetsgent(const char *string) * all 4 of them and save the starting addresses in fields[]. */ - for (cp = sgrbuf, i = 0;i < FIELDS && cp;i++) { + for (cp = sgrbuf, i = 0; i < FIELDS && cp; i++) { fields[i] = cp; if ((cp = strchr (cp, ':'))) *cp++ = '\0'; @@ -205,7 +165,7 @@ sgetsgent(const char *string) if (cp || i != FIELDS) #ifdef USE_NIS - if (! IS_NISCHAR (fields[0][0])) + if (!IS_NISCHAR (fields[0][0])) return 0; else nis_used = 1; @@ -215,8 +175,18 @@ sgetsgent(const char *string) sgroup.sg_name = fields[0]; sgroup.sg_passwd = fields[1]; - sgroup.sg_adm = list (fields[2], admins); - sgroup.sg_mem = list (fields[3], members); + if (nadmins) { + nadmins = 0; + free (admins); + admins = NULL; + } + if (nmembers) { + nmembers = 0; + free (members); + members = NULL; + } + sgroup.sg_adm = list (fields[2], &admins, &nadmins); + sgroup.sg_mem = list (fields[3], &members, &nmembers); return &sgroup; } @@ -228,13 +198,12 @@ sgetsgent(const char *string) * converts it to a (struct sgrp). NULL is returned on EOF. */ -struct sgrp * -fgetsgent(FILE *fp) +struct sgrp *fgetsgent (FILE * fp) { - char buf[sizeof sgrbuf]; - char *cp; + char buf[sizeof sgrbuf]; + char *cp; - if (! fp) + if (!fp) return (0); #ifdef USE_NIS @@ -258,19 +227,18 @@ fgetsgent(FILE *fp) * getsgent - get a single shadow group entry */ -struct sgrp * -getsgent(void) +struct sgrp *getsgent (void) { #ifdef USE_NIS - int nis_1_group = 0; - struct sgrp *val; - char buf[BUFSIZ]; + int nis_1_group = 0; + struct sgrp *val; + char buf[BUFSIZ]; #endif - if (! shadow) + if (!shadow) setsgent (); #ifdef USE_NIS -again: + again: /* * See if we are reading from the local file. */ @@ -282,7 +250,7 @@ again: * NULL right away if there is none. */ - if (! (val = fgetsgent (shadow))) + if (!(val = fgetsgent (shadow))) return 0; /* @@ -328,15 +296,15 @@ again: } if (nis_state == start) { if (yp_first (nis_domain, "gshadow.byname", &nis_key, - &nis_keylen, &nis_val, &nis_vallen)) { + &nis_keylen, &nis_val, &nis_vallen)) { nis_state = native2; goto again; } nis_state = middle; } else if (nis_state == middle) { if (yp_next (nis_domain, "gshadow.byname", nis_key, - nis_keylen, &nis_key, &nis_keylen, - &nis_val, &nis_vallen)) { + nis_keylen, &nis_key, &nis_keylen, + &nis_val, &nis_vallen)) { nis_state = native2; goto again; } @@ -352,61 +320,35 @@ again: * getsgnam - get a shadow group entry by name */ -struct sgrp * -getsgnam(const char *name) +struct sgrp *getsgnam (const char *name) { - struct sgrp *sgrp; -#ifdef NDBM - datum key; - datum content; -#endif + struct sgrp *sgrp; + #ifdef USE_NIS - char buf[BUFSIZ]; - static char save_name[16]; - int nis_disabled = 0; + char buf[BUFSIZ]; + static char save_name[16]; + int nis_disabled = 0; #endif setsgent (); -#ifdef NDBM - - /* - * If the DBM file are now open, create a key for this group and - * try to fetch the entry from the database. A matching record - * will be unpacked into a static structure and returned to - * the user. - */ - - if (dbmopened) { - key.dsize = strlen (name); - key.dptr = (void *) name; - - content = dbm_fetch (sg_dbm, key); - if (content.dptr != 0) { - memcpy (sgrbuf, content.dptr, content.dsize); - sgroup.sg_mem = members; - sgroup.sg_adm = admins; - sgr_unpack (sgrbuf, content.dsize, &sgroup); - return &sgroup; - } - } -#endif #ifdef USE_NIS if (nis_used) { -again: + again: /* * Search the gshadow.byname map for this group. */ - if (! nis_bound) + if (!nis_bound) bind_nis (); if (nis_bound) { - char *cp; + char *cp; if (yp_match (nis_domain, "gshadow.byname", name, - strlen (name), &nis_val, &nis_vallen) == 0) { + strlen (name), &nis_val, + &nis_vallen) == 0) { if (cp = strchr (nis_val, '\n')) *cp = '\0'; @@ -448,24 +390,23 @@ again: * opposite of fgetsgent. */ -int -putsgent(const struct sgrp *sgrp, FILE *fp) +int putsgent (const struct sgrp *sgrp, FILE * fp) { char *buf, *cp; int i; size_t size; - if (! fp || ! sgrp) + if (!fp || !sgrp) return -1; /* calculate the required buffer size */ - size = strlen(sgrp->sg_name) + strlen(sgrp->sg_passwd) + 10; + size = strlen (sgrp->sg_name) + strlen (sgrp->sg_passwd) + 10; for (i = 0; sgrp->sg_adm && sgrp->sg_adm[i]; i++) - size += strlen(sgrp->sg_adm[i]) + 1; + size += strlen (sgrp->sg_adm[i]) + 1; for (i = 0; sgrp->sg_mem && sgrp->sg_mem[i]; i++) - size += strlen(sgrp->sg_mem[i]) + 1; + size += strlen (sgrp->sg_mem[i]) + 1; - buf = malloc(size); + buf = malloc (size); if (!buf) return -1; cp = buf; @@ -487,7 +428,7 @@ putsgent(const struct sgrp *sgrp, FILE *fp) * with a ",". */ - for (i = 0;sgrp->sg_adm[i];i++) { + for (i = 0; sgrp->sg_adm[i]; i++) { if (i > 0) *cp++ = ','; @@ -500,7 +441,7 @@ putsgent(const struct sgrp *sgrp, FILE *fp) * Now do likewise with the group members. */ - for (i = 0;sgrp->sg_mem[i];i++) { + for (i = 0; sgrp->sg_mem[i]; i++) { if (i > 0) *cp++ = ','; @@ -515,14 +456,14 @@ putsgent(const struct sgrp *sgrp, FILE *fp) * continuation conventions. */ - if (fputsx(buf, fp) == EOF) { - free(buf); + if (fputsx (buf, fp) == EOF) { + free (buf); return -1; } - free(buf); + free (buf); return 0; } #else -extern int errno; /* warning: ANSI C forbids an empty source file */ -#endif /*} SHADOWGRP */ +extern int errno; /* warning: ANSI C forbids an empty source file */ +#endif /*} SHADOWGRP */ diff --git a/lib/gshadow_.h b/lib/gshadow_.h index b1cac557..41e63a23 100644 --- a/lib/gshadow_.h +++ b/lib/gshadow_.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: gshadow_.h,v 1.2 1997/05/01 23:14:41 marekm Exp $ + * $Id: gshadow_.h,v 1.3 2005/03/31 05:14:49 kloczek Exp $ */ #ifndef _H_GSHADOW @@ -36,36 +36,36 @@ * Shadow group security file structure */ -struct sgrp { - char *sg_name; /* group name */ - char *sg_passwd; /* group password */ - char **sg_adm; /* group administator list */ - char **sg_mem; /* group membership list */ +struct sgrp { + char *sg_name; /* group name */ + char *sg_passwd; /* group password */ + char **sg_adm; /* group administator list */ + char **sg_mem; /* group membership list */ }; /* * Shadow group security file functions. */ -#include /* for FILE */ +#include /* for FILE */ #if __STDC__ -struct sgrp *getsgent (void); -struct sgrp *getsgnam (const char *); -struct sgrp *sgetsgent (const char *); -struct sgrp *fgetsgent (FILE *); -void setsgent (void); -void endsgent (void); -int putsgent (const struct sgrp *, FILE *); +struct sgrp *getsgent (void); +struct sgrp *getsgnam (const char *); +struct sgrp *sgetsgent (const char *); +struct sgrp *fgetsgent (FILE *); +void setsgent (void); +void endsgent (void); +int putsgent (const struct sgrp *, FILE *); #else -struct sgrp *getsgent (); -struct sgrp *getsgnam (); -struct sgrp *sgetsgent (); -struct sgrp *fgetsgent (); -void setsgent (); -void endsgent (); -int putsgent (); +struct sgrp *getsgent (); +struct sgrp *getsgnam (); +struct sgrp *sgetsgent (); +struct sgrp *fgetsgent (); +void setsgent (); +void endsgent (); +int putsgent (); #endif #define GSHADOW "/etc/gshadow" -#endif /* ifndef _H_GSHADOW */ +#endif /* ifndef _H_GSHADOW */ diff --git a/lib/gspack.c b/lib/gspack.c index fe76060b..c7472280 100644 --- a/lib/gspack.c +++ b/lib/gspack.c @@ -29,14 +29,12 @@ #include -#ifdef SHADOWGRP /*{*/ +#ifdef SHADOWGRP /*{ */ #include "rcsid.h" -RCSID("$Id: gspack.c,v 1.3 1997/12/07 23:26:53 marekm Exp $") - +RCSID ("$Id: gspack.c,v 1.4 2005/03/31 05:14:49 kloczek Exp $") #include #include "defines.h" - /* * sgr_pack - convert a shadow group structure to a packed * shadow group record @@ -45,12 +43,10 @@ RCSID("$Id: gspack.c,v 1.3 1997/12/07 23:26:53 marekm Exp $") * the components in a record. this record will be * unpacked later by sgr_unpack. */ - -int -sgr_pack(const struct sgrp *sgrp, char *buf) +int sgr_pack (const struct sgrp *sgrp, char *buf) { - char *cp; - int i; + char *cp; + int i; /* * The name and password are both easy - append each string @@ -74,13 +70,13 @@ sgr_pack(const struct sgrp *sgrp, char *buf) * find the start of the members. */ - for (i = 0;sgrp->sg_adm[i];i++) { + for (i = 0; sgrp->sg_adm[i]; i++) { strcpy (cp, sgrp->sg_adm[i]); cp += strlen (cp) + 1; } *cp++ = '\0'; - for (i = 0;sgrp->sg_mem[i];i++) { + for (i = 0; sgrp->sg_mem[i]; i++) { strcpy (cp, sgrp->sg_mem[i]); cp += strlen (cp) + 1; } @@ -97,11 +93,10 @@ sgr_pack(const struct sgrp *sgrp, char *buf) * into the normal shadow group structure format. */ -int -sgr_unpack(char *buf, int len, struct sgrp *sgrp) +int sgr_unpack (char *buf, int len, struct sgrp *sgrp) { - char *org = buf; - int i; + char *org = buf; + int i; /* * The name and password are both easy - they are the first @@ -125,7 +120,7 @@ sgr_unpack(char *buf, int len, struct sgrp *sgrp) * looking for an initial character of '\0'. */ - for (i = 0;*buf && i < 1024;i++) { + for (i = 0; *buf && i < 1024; i++) { sgrp->sg_adm[i] = buf; buf += strlen (buf) + 1; @@ -133,10 +128,10 @@ sgr_unpack(char *buf, int len, struct sgrp *sgrp) return -1; } sgrp->sg_adm[i] = (char *) 0; - if (! *buf) + if (!*buf) buf++; - for (i = 0;*buf && i < 1024;i++) { + for (i = 0; *buf && i < 1024; i++) { sgrp->sg_mem[i] = buf; buf += strlen (buf) + 1; @@ -147,4 +142,4 @@ sgr_unpack(char *buf, int len, struct sgrp *sgrp) return 0; } -#endif /*}*/ +#endif /*} */ diff --git a/lib/lockpw.c b/lib/lockpw.c index 879dc983..c1672d30 100644 --- a/lib/lockpw.c +++ b/lib/lockpw.c @@ -32,30 +32,25 @@ #ifndef HAVE_LCKPWDF #include "rcsid.h" -RCSID("$Id: lockpw.c,v 1.4 1998/01/29 23:22:28 marekm Exp $") - +RCSID ("$Id: lockpw.c,v 1.5 2005/03/31 05:14:49 kloczek Exp $") #include "prototypes.h" #include "defines.h" - #include "pwio.h" #ifdef SHADOWPWD #include "shadowio.h" #endif - /* * lckpwdf - lock the password files */ - -int -lckpwdf(void) +int lckpwdf (void) { - int i; + int i; /* * We have 15 seconds to lock the whole mess */ - for (i = 0;i < 15;i++) + for (i = 0; i < 15; i++) if (pw_lock ()) break; else @@ -73,7 +68,7 @@ lckpwdf(void) * file. */ - for (;i < 15;i++) + for (; i < 15; i++) if (spw_lock ()) break; else @@ -99,16 +94,15 @@ lckpwdf(void) * ulckpwdf - unlock the password files */ -int -ulckpwdf(void) +int ulckpwdf (void) { /* * Unlock both files. */ - return (pw_unlock () && spw_unlock ()) ? 0:-1; + return (pw_unlock () && spw_unlock ())? 0 : -1; } #else -extern int errno; /* warning: ANSI C forbids an empty source file */ +extern int errno; /* warning: ANSI C forbids an empty source file */ #endif diff --git a/lib/port.c b/lib/port.c index 6ffb9125..5a939991 100644 --- a/lib/port.c +++ b/lib/port.c @@ -30,17 +30,15 @@ #include #include "rcsid.h" -RCSID("$Id: port.c,v 1.3 1997/12/07 23:26:54 marekm Exp $") - +RCSID ("$Id: port.c,v 1.4 2005/03/31 05:14:49 kloczek Exp $") #include #include #include #include "defines.h" #include "port.h" +extern int errno; -extern int errno; - -static FILE *ports; +static FILE *ports; /* * portcmp - compare the name of a port to a /etc/porttime entry @@ -52,8 +50,7 @@ static FILE *ports; * A match returns 0, failure returns non-zero. */ -static int -portcmp(const char *pattern, const char *port) +static int portcmp (const char *pattern, const char *port) { const char *orig = port; @@ -65,7 +62,7 @@ portcmp(const char *pattern, const char *port) if (orig[0] == 'S' && orig[1] == 'U' && orig[2] == '\0') return 1; - return *pattern == '*' ? 0:1; + return *pattern == '*' ? 0 : 1; } /* @@ -75,12 +72,11 @@ portcmp(const char *pattern, const char *port) * opened for reading. */ -static void -setportent(void) +static void setportent (void) { if (ports) rewind (ports); - else + else ports = fopen (PORTS, "r"); } @@ -92,8 +88,7 @@ setportent(void) * open. */ -static void -endportent(void) +static void endportent (void) { if (ports) fclose (ports); @@ -110,28 +105,27 @@ endportent(void) * set to EINVAL on error to distinguish the two conditions. */ -static struct port * -getportent(void) +static struct port *getportent (void) { - static struct port port; /* static struct to point to */ - static char buf[BUFSIZ]; /* some space for stuff */ - static char *ttys[PORT_TTY+1]; /* some pointers to tty names */ - static char *users[PORT_IDS+1]; /* some pointers to user ids */ - static struct pt_time ptimes[PORT_TIMES+1]; /* time ranges */ - char *cp; /* pointer into line */ - int dtime; /* scratch time of day */ - int i, j; - int saveerr = errno; /* errno value on entry */ + static struct port port; /* static struct to point to */ + static char buf[BUFSIZ]; /* some space for stuff */ + static char *ttys[PORT_TTY + 1]; /* some pointers to tty names */ + static char *users[PORT_IDS + 1]; /* some pointers to user ids */ + static struct pt_time ptimes[PORT_TIMES + 1]; /* time ranges */ + char *cp; /* pointer into line */ + int dtime; /* scratch time of day */ + int i, j; + int saveerr = errno; /* errno value on entry */ /* * If the ports file is not open, open the file. Do not rewind * since we want to search from the beginning each time. */ - if (! ports) + if (!ports) setportent (); - if (! ports) { + if (!ports) { errno = saveerr; return 0; } @@ -139,14 +133,14 @@ getportent(void) /* * Common point for beginning a new line - * - * - read a line, and NUL terminate - * - skip lines which begin with '#' - * - parse off the tty names - * - parse off a list of user names - * - parse off a list of days and times + * - read a line, and NUL terminate + * - skip lines which begin with '#' + * - parse off the tty names + * - parse off a list of user names + * - parse off a list of days and times */ -again: + again: /* * Get the next line and remove the last character, which @@ -170,18 +164,18 @@ again: buf[strlen (buf) - 1] = 0; port.pt_names = ttys; - for (cp = buf, j = 0;j < PORT_TTY;j++) { + for (cp = buf, j = 0; j < PORT_TTY; j++) { port.pt_names[j] = cp; while (*cp && *cp != ':' && *cp != ',') cp++; - if (! *cp) + if (!*cp) goto again; /* line format error */ - if (*cp == ':') /* end of tty name list */ + if (*cp == ':') /* end of tty name list */ break; - if (*cp == ',') /* end of current tty name */ + if (*cp == ',') /* end of current tty name */ *cp++ = '\0'; } *cp++ = 0; @@ -198,7 +192,7 @@ again: port.pt_users = users; port.pt_users[0] = cp; - for (j = 1;*cp != ':';cp++) { + for (j = 1; *cp != ':'; cp++) { if (*cp == ',' && j < PORT_IDS) { *cp++ = 0; port.pt_users[j++] = cp; @@ -237,7 +231,7 @@ again: * Get the next comma separated entry */ - for (j = 0;*cp && j < PORT_TIMES;j++) { + for (j = 0; *cp && j < PORT_TIMES; j++) { /* * Start off with no days of the week @@ -251,38 +245,38 @@ again: * week or the other two values. */ - for (i = 0;cp[i] && cp[i + 1] && isalpha (cp[i]);i += 2) { + for (i = 0; cp[i] && cp[i + 1] && isalpha (cp[i]); i += 2) { switch ((cp[i] << 8) | (cp[i + 1])) { - case ('S' << 8) | 'u': - port.pt_times[j].t_days |= 01; - break; - case ('M' << 8) | 'o': - port.pt_times[j].t_days |= 02; - break; - case ('T' << 8) | 'u': - port.pt_times[j].t_days |= 04; - break; - case ('W' << 8) | 'e': - port.pt_times[j].t_days |= 010; - break; - case ('T' << 8) | 'h': - port.pt_times[j].t_days |= 020; - break; - case ('F' << 8) | 'r': - port.pt_times[j].t_days |= 040; - break; - case ('S' << 8) | 'a': - port.pt_times[j].t_days |= 0100; - break; - case ('W' << 8) | 'k': - port.pt_times[j].t_days |= 076; - break; - case ('A' << 8) | 'l': - port.pt_times[j].t_days |= 0177; - break; - default: - errno = EINVAL; - return 0; + case ('S' << 8) | 'u': + port.pt_times[j].t_days |= 01; + break; + case ('M' << 8) | 'o': + port.pt_times[j].t_days |= 02; + break; + case ('T' << 8) | 'u': + port.pt_times[j].t_days |= 04; + break; + case ('W' << 8) | 'e': + port.pt_times[j].t_days |= 010; + break; + case ('T' << 8) | 'h': + port.pt_times[j].t_days |= 020; + break; + case ('F' << 8) | 'r': + port.pt_times[j].t_days |= 040; + break; + case ('S' << 8) | 'a': + port.pt_times[j].t_days |= 0100; + break; + case ('W' << 8) | 'k': + port.pt_times[j].t_days |= 076; + break; + case ('A' << 8) | 'l': + port.pt_times[j].t_days |= 0177; + break; + default: + errno = EINVAL; + return 0; } } @@ -299,7 +293,7 @@ again: * representing the times of day. */ - for (dtime = 0;cp[i] && isdigit (cp[i]);i++) + for (dtime = 0; cp[i] && isdigit (cp[i]); i++) dtime = dtime * 10 + cp[i] - '0'; if (cp[i] != '-' || dtime > 2400 || dtime % 100 > 59) @@ -307,11 +301,10 @@ again: port.pt_times[j].t_start = dtime; cp = cp + i + 1; - for (dtime = i = 0;cp[i] && isdigit (cp[i]);i++) + for (dtime = i = 0; cp[i] && isdigit (cp[i]); i++) dtime = dtime * 10 + cp[i] - '0'; - if ((cp[i] != ',' && cp[i]) || - dtime > 2400 || dtime % 100 > 59) + if ((cp[i] != ',' && cp[i]) || dtime > 2400 || dtime % 100 > 59) goto again; port.pt_times[j].t_end = dtime; @@ -337,11 +330,10 @@ again: * entries are treated as an ordered list. */ -static struct port * -getttyuser(const char *tty, const char *user) +static struct port *getttyuser (const char *tty, const char *user) { - int i, j; - struct port *port; + int i, j; + struct port *port; setportent (); @@ -349,16 +341,16 @@ getttyuser(const char *tty, const char *user) if (port->pt_names == 0 || port->pt_users == 0) continue; - for (i = 0;port->pt_names[i];i++) + for (i = 0; port->pt_names[i]; i++) if (portcmp (port->pt_names[i], tty) == 0) break; if (port->pt_names[i] == 0) continue; - for (j = 0;port->pt_users[j];j++) + for (j = 0; port->pt_users[j]; j++) if (strcmp (user, port->pt_users[j]) == 0 || - strcmp (port->pt_users[j], "*") == 0) + strcmp (port->pt_users[j], "*") == 0) break; if (port->pt_users[j] != 0) @@ -375,13 +367,12 @@ getttyuser(const char *tty, const char *user) * the user name and TTY given. */ -int -isttytime(const char *id, const char *port, time_t when) +int isttytime (const char *id, const char *port, time_t when) { - int i; - int dtime; - struct port *pp; - struct tm *tm; + int i; + int dtime; + struct port *pp; + struct tm *tm; /* * Try to find a matching entry for this user. Default to @@ -389,7 +380,7 @@ isttytime(const char *id, const char *port, time_t when) * entry to match all users. */ - if (! (pp = getttyuser (port, id))) + if (!(pp = getttyuser (port, id))) return 1; /* @@ -415,17 +406,17 @@ isttytime(const char *id, const char *port, time_t when) * midnight and either the start or end time. */ - for (i = 0;pp->pt_times[i].t_start != -1;i++) { - if (! (pp->pt_times[i].t_days & PORT_DAY(tm->tm_wday))) + for (i = 0; pp->pt_times[i].t_start != -1; i++) { + if (!(pp->pt_times[i].t_days & PORT_DAY (tm->tm_wday))) continue; if (pp->pt_times[i].t_start <= pp->pt_times[i].t_end) { if (dtime >= pp->pt_times[i].t_start && - dtime <= pp->pt_times[i].t_end) + dtime <= pp->pt_times[i].t_end) return 1; } else { if (dtime >= pp->pt_times[i].t_start || - dtime <= pp->pt_times[i].t_end) + dtime <= pp->pt_times[i].t_end) return 1; } } diff --git a/lib/port.h b/lib/port.h index a02d6728..a010cee3 100644 --- a/lib/port.h +++ b/lib/port.h @@ -30,7 +30,7 @@ /* * port.h - structure of /etc/porttime * - * $Id: port.h,v 1.2 1997/05/01 23:14:43 marekm Exp $ + * $Id: port.h,v 1.3 2005/03/31 05:14:49 kloczek Exp $ * * Each entry in /etc/porttime consists of a TTY device * name or "*" to indicate all TTY devices, followed by @@ -62,10 +62,10 @@ * pt_times - pointer to list of allowable time periods. */ -struct port { - char **pt_names; - char **pt_users; - struct pt_time *pt_times; +struct port { + char **pt_names; + char **pt_users; + struct pt_time *pt_times; }; /* @@ -74,8 +74,8 @@ struct port { * t_end - ending time for this entry */ -struct pt_time { - short t_days; - short t_start; - short t_end; +struct pt_time { + short t_days; + short t_start; + short t_end; }; diff --git a/lib/prototypes.h b/lib/prototypes.h index 0358a2bd..41ae332b 100644 --- a/lib/prototypes.h +++ b/lib/prototypes.h @@ -6,7 +6,7 @@ * Juha Virtanen, ; November 1995 */ /* - * $Id: prototypes.h,v 1.15 2003/04/25 21:33:47 kloczek Exp $ + * $Id: prototypes.h,v 1.18 2005/04/06 03:01:07 kloczek Exp $ * * Added a macro to work around ancient (non-ANSI) compilers, just in case * someone ever tries to compile this with SunOS cc... --marekm @@ -27,206 +27,199 @@ #include "defines.h" /* addgrps.c */ -extern int add_groups(const char *); -extern void add_cons_grps(void); +extern int add_groups (const char *); +extern void add_cons_grps (void); /* age.c */ #ifdef SHADOWPWD -extern void agecheck(const struct passwd *, const struct spwd *); -extern int expire(const struct passwd *, const struct spwd *); -extern int isexpired(const struct passwd *, const struct spwd *); +extern void agecheck (const struct passwd *, const struct spwd *); +extern int expire (const struct passwd *, const struct spwd *); +extern int isexpired (const struct passwd *, const struct spwd *); #else -extern void agecheck(const struct passwd *); -extern int expire(const struct passwd *); -extern int isexpired(const struct passwd *); +extern void agecheck (const struct passwd *); +extern int expire (const struct passwd *); +extern int isexpired (const struct passwd *); #endif /* basename() renamed to Basename() to avoid libc name space confusion */ /* basename.c */ -extern char *Basename(char *str); +extern char *Basename (char *str); /* chkshell.c */ -extern int check_shell(const char *); +extern int check_shell (const char *); /* chowndir.c */ -extern int chown_tree(const char *, uid_t, uid_t, gid_t, gid_t); +extern int chown_tree (const char *, uid_t, uid_t, gid_t, gid_t); /* chowntty.c */ -extern void chown_tty(const char *, const struct passwd *); +extern void chown_tty (const char *, const struct passwd *); /* console.c */ -extern int console(const char *); -extern int is_listed(const char *, const char *, int); +extern int console (const char *); +extern int is_listed (const char *, const char *, int); /* copydir.c */ -extern int copy_tree(const char *, const char *, uid_t, gid_t); -extern int remove_tree(const char *); +extern int copy_tree (const char *, const char *, uid_t, gid_t); +extern int remove_tree (const char *); /* encrypt.c */ -extern char *pw_encrypt(const char *, const char *); +extern char *pw_encrypt (const char *, const char *); /* entry.c */ -extern void pw_entry(const char *, struct passwd *); +extern void pw_entry (const char *, struct passwd *); /* env.c */ -extern void addenv(const char *, const char *); -extern void initenv(void); -extern void set_env(int, char * const *); -extern void sanitize_env(void); +extern void addenv (const char *, const char *); +extern void initenv (void); +extern void set_env (int, char *const *); +extern void sanitize_env (void); /* fields.c */ -extern void change_field(char *, size_t, const char *); -extern int valid_field(const char *, const char *); +extern void change_field (char *, size_t, const char *); +extern int valid_field (const char *, const char *); /* fputsx.c */ -extern char *fgetsx(char *, int, FILE *); -extern int fputsx(const char *, FILE *); +extern char *fgetsx (char *, int, FILE *); +extern int fputsx (const char *, FILE *); /* grdbm.c */ -extern int gr_dbm_remove(const struct group *); -extern int gr_dbm_update(const struct group *); -extern int gr_dbm_present(void); +extern int gr_dbm_remove (const struct group *); +extern int gr_dbm_update (const struct group *); +extern int gr_dbm_present (void); /* grent.c */ -extern int putgrent(const struct group *, FILE *); +extern int putgrent (const struct group *, FILE *); /* grpack.c */ -extern int gr_pack(const struct group *, char *); -extern int gr_unpack(char *, int, struct group *); +extern int gr_pack (const struct group *, char *); +extern int gr_unpack (char *, int, struct group *); #ifdef SHADOWGRP /* gsdbm.c */ -extern int sg_dbm_remove(const char *); -extern int sg_dbm_update(const struct sgrp *); -extern int sg_dbm_present(void); +extern int sg_dbm_remove (const char *); +extern int sg_dbm_update (const struct sgrp *); +extern int sg_dbm_present (void); /* gspack.c */ -extern int sgr_pack(const struct sgrp *, char *); -extern int sgr_unpack(char *, int, struct sgrp *); +extern int sgr_pack (const struct sgrp *, char *); +extern int sgr_unpack (char *, int, struct sgrp *); #endif /* hushed.c */ -extern int hushed(const struct passwd *); +extern int hushed (const struct passwd *); /* limits.c */ -extern void setup_limits(const struct passwd *); +extern void setup_limits (const struct passwd *); /* list.c */ -extern char **add_list(char **, const char *); -extern char **del_list(char **, const char *); -extern char **dup_list(char * const *); -extern int is_on_list(char * const *, const char *); -extern char **comma_to_list(const char *); +extern char **add_list (char **, const char *); +extern char **del_list (char **, const char *); +extern char **dup_list (char *const *); +extern int is_on_list (char *const *, const char *); +extern char **comma_to_list (const char *); /* login.c */ -extern void login_prompt(const char *, char *, int); - -/* login_desrpc.c */ -extern int login_desrpc(const char *); +extern void login_prompt (const char *, char *, int); /* mail.c */ -extern void mailcheck(void); +extern void mailcheck (void); /* motd.c */ -extern void motd(void); +extern void motd (void); /* myname.c */ -extern struct passwd *get_my_pwent(void); +extern struct passwd *get_my_pwent (void); /* obscure.c */ -extern int obscure(const char *, const char *, const struct passwd *); +extern int obscure (const char *, const char *, const struct passwd *); /* pam_pass.c */ -extern int do_pam_passwd(const char *, int, int); +extern int do_pam_passwd (const char *, int, int); /* port.c */ -extern int isttytime(const char *, const char *, time_t); +extern int isttytime (const char *, const char *, time_t); /* pwd2spwd.c */ #ifdef SHADOWPWD -extern struct spwd *pwd_to_spwd(const struct passwd *); +extern struct spwd *pwd_to_spwd (const struct passwd *); #endif /* pwdcheck.c */ -extern void passwd_check(const char *, const char *, const char *); +extern void passwd_check (const char *, const char *, const char *); /* pwd_init.c */ -extern void pwd_init(void); +extern void pwd_init (void); /* pwdbm.c */ -extern int pw_dbm_remove(const struct passwd *); -extern int pw_dbm_update(const struct passwd *); -extern int pw_dbm_present(void); +extern int pw_dbm_remove (const struct passwd *); +extern int pw_dbm_update (const struct passwd *); +extern int pw_dbm_present (void); /* pwpack.c */ -extern int pw_pack(const struct passwd *, char *); -extern int pw_unpack(char *, int, struct passwd *); - -/* rad64.c */ -extern int c64i(int); -extern int i64c(int); +extern int pw_pack (const struct passwd *, char *); +extern int pw_unpack (char *, int, struct passwd *); /* rlogin.c */ -extern int do_rlogin(const char *, char *, int, char *, int); +extern int do_rlogin (const char *, char *, int, char *, int); /* salt.c */ -extern char *crypt_make_salt(void); +extern char *crypt_make_salt (void); /* setugid.c */ -extern int setup_groups(const struct passwd *); -extern int change_uid(const struct passwd *); -extern int setup_uid_gid(const struct passwd *, int); +extern int setup_groups (const struct passwd *); +extern int change_uid (const struct passwd *); +extern int setup_uid_gid (const struct passwd *, int); /* setup.c */ -extern void setup(struct passwd *); +extern void setup (struct passwd *); /* setupenv.c */ -extern void setup_env(struct passwd *); +extern void setup_env (struct passwd *); /* shell.c */ -extern void shell(const char *, const char *); +extern void shell (const char *, const char *); #ifdef SHADOWPWD /* spdbm.c */ -extern int sp_dbm_remove(const char *); -extern int sp_dbm_update(const struct spwd *); -extern int sp_dbm_present(void); +extern int sp_dbm_remove (const char *); +extern int sp_dbm_update (const struct spwd *); +extern int sp_dbm_present (void); /* sppack.c */ -extern int spw_pack(const struct spwd *, char *); -extern int spw_unpack(char *, int, struct spwd *); +extern int spw_pack (const struct spwd *, char *); +extern int spw_unpack (char *, int, struct spwd *); #endif /* strtoday.c */ -extern long strtoday(const char *); +extern long strtoday (const char *); /* suauth.c */ -extern int check_su_auth(const char *, const char *); +extern int check_su_auth (const char *, const char *); /* sulog.c */ -extern void sulog(const char *, int, const char *, const char *); +extern void sulog (const char *, int, const char *, const char *); /* sub.c */ -extern void subsystem(const struct passwd *); +extern void subsystem (const struct passwd *); /* ttytype.c */ -extern void ttytype(const char *); +extern void ttytype (const char *); /* tz.c */ -extern char *tz(const char *); +extern char *tz (const char *); /* ulimit.c */ -extern void set_filesize_limit(int); +extern void set_filesize_limit (int); /* utmp.c */ -extern void checkutmp(int); -extern void setutmp(const char *, const char *, const char *); +extern void checkutmp (int); +extern void setutmp (const char *, const char *, const char *); /* valid.c */ -extern int valid(const char *, const struct passwd *); +extern int valid (const char *, const struct passwd *); /* xmalloc.c */ -extern char *xmalloc(size_t); -extern char *xstrdup(const char *); +extern char *xmalloc (size_t); +extern char *xstrdup (const char *); -#endif /* _PROTOTYPES_H */ +#endif /* _PROTOTYPES_H */ diff --git a/lib/pwauth.c b/lib/pwauth.c index 6b1ae525..962e585b 100644 --- a/lib/pwauth.c +++ b/lib/pwauth.c @@ -29,9 +29,9 @@ #include +#ifndef USE_PAM #include "rcsid.h" -RCSID("$Id: pwauth.c,v 1.14 2003/05/12 04:58:56 kloczek Exp $") - +RCSID ("$Id: pwauth.c,v 1.17 2005/04/17 15:21:42 kloczek Exp $") #include #include #include @@ -41,23 +41,14 @@ RCSID("$Id: pwauth.c,v 1.14 2003/05/12 04:58:56 kloczek Exp $") #include "defines.h" #include "pwauth.h" #include "getdef.h" - -#ifdef SKEY -#include -#endif - -#ifdef OPIE -#include -#endif - -#ifdef __linux__ /* standard password prompt by default */ -static const char *PROMPT = gettext_noop("Password: "); +#ifdef __linux__ /* standard password prompt by default */ +static const char *PROMPT = gettext_noop ("Password: "); #else -static const char *PROMPT = gettext_noop("%s's Password: "); +static const char *PROMPT = gettext_noop ("%s's Password: "); #endif -extern char *getpass(); -extern char *getpass_with_echo(); +extern char *getpass (); +extern char *getpass_with_echo (); int wipe_clear_pass = 1; char *clear_pass = NULL; @@ -71,41 +62,12 @@ char *clear_pass = NULL; */ int -pw_auth(const char *cipher, const char *user, int reason, const char *input) +pw_auth (const char *cipher, const char *user, int reason, const char *input) { - char prompt[1024]; - char *clear = NULL; + char prompt[1024]; + char *clear = NULL; const char *cp; - int retval; -#ifdef SKEY - int use_skey = 0; - char challenge_info[40]; - struct skey skey; -#endif - -#ifdef OPIE - int use_opie = 0; - char o_challenge_info[OPIE_CHALLENGE_MAX + 1]; - struct opie opie; - /* - * This implementation is based almost entirely on the SKEY code - * above. Thus the opie struct is called skey, etc. I am unaware - * if the system works at the same time, but I cannot imagine why - * anyone would want to do this.... - * -- A.R. - * Mod: 5/14/98 A.R. - * Made the OPIE code separate from the S/Key code. Now - * (conceivably) both can be compiled in and function apart from - * one another (assuming a sysadmin really wants to maintain OPIE - * and an S/Key databases....). - * - * Also cleaned up the code a bit. Will be adding second-prompt - * support (the traditional Echo-on S/Key/OPIE-only prompts to let - * the users see the one-time passwords they are typing/pasting - * in.... - * -- A.R. - */ -#endif + int retval; /* * There are programs for adding and deleting authentication data. @@ -117,7 +79,6 @@ 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; @@ -129,7 +90,6 @@ 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; @@ -141,65 +101,21 @@ 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 - -#ifdef OPIE - /* - * Ditto above, for OPIE passwords. - * -- AR - */ - - o_challenge_info[0] = '\0'; - if (opiechallenge(&opie, user, o_challenge_info) == 0) - use_opie = 1; - - if (use_opie == 0) - opieverify(&opie, (char *)NULL); - /* - * This call to opieverify is necessary within OPIE's interface: - * Every call to opiechallenge(), which checks to see if the user - * has an OPIE password, and if so get the challenge, must be - * accompanied by exactly one call to opieverify, which clears - * any outstanding locks, and otherwise cleans up. - * -- AR - */ -#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"))) + if (!(cp = getdef_str ("LOGIN_STRING"))) cp = _(PROMPT); -#ifdef SKEY - if (use_skey) - printf ("[%s]\n", challenge_info); -#endif - -#ifdef OPIE - if (use_opie) - printf("[ %s ]\n", o_challenge_info); -#endif - - snprintf(prompt, sizeof prompt, cp, user); - clear = getpass(prompt); + snprintf (prompt, sizeof prompt, cp, user); + clear = getpass (prompt); if (!clear) { static char c[1]; + c[0] = '\0'; clear = c; } @@ -209,70 +125,9 @@ 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. Otherwise we see if SKEY is being used and check - * the results there as well. + * SUCCESS. */ - - retval = strcmp(pw_encrypt(input, cipher), cipher); - -#ifdef OPIE - /* - * This is required because using OPIE, opieverify() MUST be called - * opiechallenge() above even if OPIE isn't being used in this case, - * so locks get released, etc. - * -- AR - */ - - if ((retval == 0) && use_opie) - opieverify(&opie, (char *)NULL); -#endif - -#if (defined(SKEY) || defined(OPIE)) - /* - * 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] && - (0 -#ifdef SKEY - || use_skey -#endif -#ifdef OPIE - || use_opie -#endif - )) { - 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; - } -#endif - -#ifdef SKEY - if (retval && use_skey) { - int passcheck = -1; - - if (skeyverify(&skey, input) == 0) - passcheck = skey.n; - if (passcheck > 0) - retval = 0; - } -#endif - -#ifdef OPIE - if (retval && use_opie) { - if (opieverify(&opie, input) == 0) - retval = 0; - } -#endif /* OPIE */ + retval = strcmp (pw_encrypt (input, cipher), cipher); /* * Things like RADIUS authentication may need the password - @@ -280,9 +135,9 @@ pw_auth(const char *cipher, const char *user, int reason, const char *input) * 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); + strzero (clear); return retval; } +#endif /* !USE_PAM */ diff --git a/lib/pwauth.h b/lib/pwauth.h index a6aa77fe..f538c2b4 100644 --- a/lib/pwauth.h +++ b/lib/pwauth.h @@ -26,10 +26,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pwauth.h,v 1.3 2003/05/12 06:08:31 kloczek Exp $ + * $Id: pwauth.h,v 1.5 2005/03/31 06:24:27 kloczek Exp $ */ -int pw_auth(const char *cipher,const char *user,int flag,const char *input); +#ifndef USE_PAM +int pw_auth (const char *cipher, const char *user, int flag, const char *input); +#endif /* !USE_PAM */ /* * Local access diff --git a/lib/pwdbm.c b/lib/pwdbm.c deleted file mode 100644 index c0de8460..00000000 --- a/lib/pwdbm.c +++ /dev/null @@ -1,143 +0,0 @@ -/* - * Copyright 1990 - 1994, Julianne Frances Haugh - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Julianne F. Haugh nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include - -#ifdef NDBM /*{*/ - -#include "rcsid.h" -RCSID("$Id: pwdbm.c,v 1.4 1997/12/14 20:07:19 marekm Exp $") - -#include -#include -#include -#include "prototypes.h" -#include "defines.h" - -#include -extern DBM *pw_dbm; - -/* - * pw_dbm_update - * - * Updates the DBM password files, if they exist. - */ - -int -pw_dbm_update(const struct passwd *pw) -{ - datum key; - datum content; - char data[BUFSIZ]; - int len; - static int once; - - if (! once) { - if (! pw_dbm) - setpwent (); - once++; - } - if (! pw_dbm) - return 0; - - len = pw_pack (pw, data); - content.dsize = len; - content.dptr = data; - - key.dsize = strlen (pw->pw_name); - key.dptr = pw->pw_name; - - if (dbm_store(pw_dbm, key, content, DBM_REPLACE)) - return 0; - - /* - * XXX - on systems with 16-bit UIDs (such as Linux/x86) - * name "aa" and UID 24929 will give the same key. This - * happens only rarely, but code which only "works most - * of the time" is not good enough... - * - * This needs to be fixed in several places (pwdbm.c, - * grdbm.c, pwent.c, grent.c). Fixing it will cause - * incompatibility with existing dbm files. - * - * Summary: don't use this stuff for now. --marekm - */ - - key.dsize = sizeof pw->pw_uid; - key.dptr = (char *) &pw->pw_uid; - - if (dbm_store(pw_dbm, key, content, DBM_REPLACE)) - return 0; - - return 1; -} - -/* - * pw_dbm_remove - * - * Removes the DBM password entry, if it exists. - */ - -int -pw_dbm_remove(const struct passwd *pw) -{ - datum key; - static int once; - char data[BUFSIZ]; - - if (! once) { - if (! pw_dbm) - setpwent (); - once++; - } - if (! pw_dbm) - return 0; - - key.dsize = strlen (pw->pw_name); - key.dptr = pw->pw_name; - - if (dbm_delete (pw_dbm, key)) - return 0; - - key.dsize = sizeof pw->pw_uid; - key.dptr = (char *) &pw->pw_uid; - - if (dbm_delete (pw_dbm, key)) - return 0; - - return 1; -} - - -int -pw_dbm_present(void) -{ - return (access(PASSWD_PAG_FILE, F_OK) == 0); -} -#endif /* NDBM */ diff --git a/lib/pwio.c b/lib/pwio.c index 6d5a300f..55c8a87b 100644 --- a/lib/pwio.c +++ b/lib/pwio.c @@ -2,78 +2,72 @@ #include #include "rcsid.h" -RCSID("$Id: pwio.c,v 1.13 2003/05/03 16:14:23 kloczek Exp $") - +RCSID ("$Id: pwio.c,v 1.14 2005/03/31 05:14:49 kloczek Exp $") #include "prototypes.h" #include "defines.h" #include #include - #include "commonio.h" #include "pwio.h" +extern struct passwd *sgetpwent (const char *); +extern int putpwent (const struct passwd *, FILE *); -extern struct passwd *sgetpwent(const char *); -extern int putpwent(const struct passwd *, FILE *); - -struct passwd * -__pw_dup(const struct passwd *pwent) +struct passwd *__pw_dup (const struct passwd *pwent) { struct passwd *pw; - if (!(pw = (struct passwd *) malloc(sizeof *pw))) + if (!(pw = (struct passwd *) malloc (sizeof *pw))) return NULL; *pw = *pwent; - if (!(pw->pw_name = strdup(pwent->pw_name))) + if (!(pw->pw_name = strdup (pwent->pw_name))) return NULL; - if (!(pw->pw_passwd = strdup(pwent->pw_passwd))) + if (!(pw->pw_passwd = strdup (pwent->pw_passwd))) return NULL; - if (!(pw->pw_gecos = strdup(pwent->pw_gecos))) + if (!(pw->pw_gecos = strdup (pwent->pw_gecos))) return NULL; - if (!(pw->pw_dir = strdup(pwent->pw_dir))) + if (!(pw->pw_dir = strdup (pwent->pw_dir))) return NULL; - if (!(pw->pw_shell = strdup(pwent->pw_shell))) + if (!(pw->pw_shell = strdup (pwent->pw_shell))) return NULL; return pw; } -static void * -passwd_dup(const void *ent) +static void *passwd_dup (const void *ent) { const struct passwd *pw = ent; - return __pw_dup(pw); + + return __pw_dup (pw); } -static void -passwd_free(void *ent) +static void passwd_free (void *ent) { struct passwd *pw = ent; - free(pw->pw_name); - free(pw->pw_passwd); - free(pw->pw_gecos); - free(pw->pw_dir); - free(pw->pw_shell); - free(pw); + free (pw->pw_name); + free (pw->pw_passwd); + free (pw->pw_gecos); + free (pw->pw_dir); + free (pw->pw_shell); + free (pw); } -static const char * -passwd_getname(const void *ent) +static const char *passwd_getname (const void *ent) { const struct passwd *pw = ent; + return pw->pw_name; } -static void * -passwd_parse(const char *line) +static void *passwd_parse (const char *line) { - return (void *) sgetpwent(line); + return (void *) sgetpwent (line); } -static int -passwd_put(const void *ent, FILE *file) +static int passwd_put (const void *ent, FILE * file) { const struct passwd *pw = ent; - return (putpwent(pw, file) == -1) ? -1 : 0; + + return (putpwent (pw, file) == -1) ? -1 : 0; } static struct commonio_ops passwd_ops = { @@ -87,108 +81,94 @@ static struct commonio_ops passwd_ops = { }; static struct commonio_db passwd_db = { - PASSWD_FILE, /* filename */ - &passwd_ops, /* ops */ - NULL, /* fp */ - NULL, /* head */ - NULL, /* tail */ - NULL, /* cursor */ - 0, /* changed */ - 0, /* isopen */ - 0, /* locked */ - 0 /* readonly */ + PASSWD_FILE, /* filename */ + &passwd_ops, /* ops */ + NULL, /* fp */ + NULL, /* head */ + NULL, /* tail */ + NULL, /* cursor */ + 0, /* changed */ + 0, /* isopen */ + 0, /* locked */ + 0 /* readonly */ }; -int -pw_name(const char *filename) +int pw_name (const char *filename) { - return commonio_setname(&passwd_db, filename); + return commonio_setname (&passwd_db, filename); } -int -pw_lock(void) +int pw_lock (void) { - return commonio_lock(&passwd_db); + return commonio_lock (&passwd_db); } -int -pw_open(int mode) +int pw_open (int mode) { - return commonio_open(&passwd_db, mode); + return commonio_open (&passwd_db, mode); } -const struct passwd * -pw_locate(const char *name) +const struct passwd *pw_locate (const char *name) { - return commonio_locate(&passwd_db, name); + return commonio_locate (&passwd_db, name); } -int -pw_update(const struct passwd *pw) +int pw_update (const struct passwd *pw) { - return commonio_update(&passwd_db, (const void *) pw); + return commonio_update (&passwd_db, (const void *) pw); } -int -pw_remove(const char *name) +int pw_remove (const char *name) { - return commonio_remove(&passwd_db, name); + return commonio_remove (&passwd_db, name); } -int -pw_rewind(void) +int pw_rewind (void) { - return commonio_rewind(&passwd_db); + return commonio_rewind (&passwd_db); } -const struct passwd * -pw_next(void) +const struct passwd *pw_next (void) { - return commonio_next(&passwd_db); + return commonio_next (&passwd_db); } -int -pw_close(void) +int pw_close (void) { - return commonio_close(&passwd_db); + return commonio_close (&passwd_db); } -int -pw_unlock(void) +int pw_unlock (void) { - return commonio_unlock(&passwd_db); + return commonio_unlock (&passwd_db); } -struct commonio_entry * -__pw_get_head(void) +struct commonio_entry *__pw_get_head (void) { return passwd_db.head; } -void -__pw_del_entry(const struct commonio_entry *ent) +void __pw_del_entry (const struct commonio_entry *ent) { - commonio_del_entry(&passwd_db, ent); + commonio_del_entry (&passwd_db, ent); } -struct commonio_db * -__pw_get_db(void) +struct commonio_db *__pw_get_db (void) { return &passwd_db; } -static int -pw_cmp(const void *p1, const void *p2) +static int pw_cmp (const void *p1, const void *p2) { uid_t u1, u2; - if ((*(struct commonio_entry**)p1)->eptr == NULL) + if ((*(struct commonio_entry **) p1)->eptr == NULL) return 1; - if ((*(struct commonio_entry**)p2)->eptr == NULL) + if ((*(struct commonio_entry **) p2)->eptr == NULL) return -1; - - u1 = ((struct passwd *)(*(struct commonio_entry**)p1)->eptr)->pw_uid; - u2 = ((struct passwd *)(*(struct commonio_entry**)p2)->eptr)->pw_uid; + + u1 = ((struct passwd *) (*(struct commonio_entry **) p1)->eptr)->pw_uid; + u2 = ((struct passwd *) (*(struct commonio_entry **) p2)->eptr)->pw_uid; if (u1 < u2) return -1; @@ -199,8 +179,7 @@ pw_cmp(const void *p1, const void *p2) } /* Sort entries by uid */ -int -pw_sort() +int pw_sort () { - return commonio_sort(&passwd_db, pw_cmp); + return commonio_sort (&passwd_db, pw_cmp); } diff --git a/lib/pwio.h b/lib/pwio.h index 37874611..20118cfb 100644 --- a/lib/pwio.h +++ b/lib/pwio.h @@ -1,13 +1,13 @@ -extern struct passwd *__pw_dup(const struct passwd *); -extern void __pw_set_changed(void); -extern int pw_close(void); -extern const struct passwd *pw_locate(const char *); -extern int pw_lock(void); -extern int pw_name(const char *); -extern const struct passwd *pw_next(void); -extern int pw_open(int); -extern int pw_remove(const char *); -extern int pw_rewind(void); -extern int pw_unlock(void); -extern int pw_update(const struct passwd *); -extern int pw_sort(void); +extern struct passwd *__pw_dup (const struct passwd *); +extern void __pw_set_changed (void); +extern int pw_close (void); +extern const struct passwd *pw_locate (const char *); +extern int pw_lock (void); +extern int pw_name (const char *); +extern const struct passwd *pw_next (void); +extern int pw_open (int); +extern int pw_remove (const char *); +extern int pw_rewind (void); +extern int pw_unlock (void); +extern int pw_update (const struct passwd *); +extern int pw_sort (void); diff --git a/lib/pwpack.c b/lib/pwpack.c index a08640c0..6413a233 100644 --- a/lib/pwpack.c +++ b/lib/pwpack.c @@ -30,23 +30,18 @@ #include #include "rcsid.h" -RCSID("$Id: pwpack.c,v 1.6 2003/12/17 01:33:28 kloczek Exp $") - +RCSID ("$Id: pwpack.c,v 1.7 2005/03/31 05:14:49 kloczek Exp $") #include #include "defines.h" #include #include - - /* * pw_pack - convert a (struct pwd) to a packed record * WARNING: buf must be large enough, no check for overrun! */ - -int -pw_pack(const struct passwd *passwd, char *buf) +int pw_pack (const struct passwd *passwd, char *buf) { - char *cp; + char *cp; cp = buf; strcpy (cp, passwd->pw_name); @@ -68,7 +63,7 @@ pw_pack(const struct passwd *passwd, char *buf) cp += strlen (cp) + 1; strcpy (cp, passwd->pw_shell); - cp += strlen (cp) + 1; + cp += strlen (cp) + 1; return cp - buf; } @@ -77,12 +72,11 @@ pw_pack(const struct passwd *passwd, char *buf) * pw_unpack - convert a packed (struct pwd) record to a (struct pwd) */ -int -pw_unpack(char *buf, int len, struct passwd *passwd) +int pw_unpack (char *buf, int len, struct passwd *passwd) { - char *org = buf; + char *org = buf; - memzero(passwd, sizeof *passwd); + memzero (passwd, sizeof *passwd); passwd->pw_name = buf; buf += strlen (buf) + 1; diff --git a/lib/rad64.c b/lib/rad64.c deleted file mode 100644 index 249a71e1..00000000 --- a/lib/rad64.c +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright 1989 - 1992, Julianne Frances Haugh - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Julianne F. Haugh nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include - -#include "rcsid.h" -RCSID("$Id: rad64.c,v 1.5 2000/08/26 18:27:17 marekm Exp $") - -/* - * c64i - convert a radix 64 character to an integer - */ - -int -c64i(int c) -{ - if (c == '.') - return (0); - - if (c == '/') - return (1); - - if (c >= '0' && c <= '9') - return (c - '0' + 2); - - if (c >= 'A' && c <= 'Z') - return (c - 'A' + 12); - - if (c >= 'a' && c <= 'z') - return (c - 'a' + 38); - else - return (-1); -} - -/* - * i64c - convert an integer to a radix 64 character - */ - -int -i64c(int i) -{ - if (i <= 0) - return ('.'); - - if (i == 1) - return ('/'); - - if (i >= 2 && i < 12) - return ('0' - 2 + i); - - if (i >= 12 && i < 38) - return ('A' - 12 + i); - - if (i >= 38 && i < 63) - return ('a' - 38 + i); - - return ('z'); -} - -#ifndef HAVE_A64L - -/* - * l64a - convert a long to a string of radix 64 characters - */ - -char * -l64a(long l) -{ - static char buf[8]; - int i = 0; - - if (l < 0L) - return ((char *) 0); - - do { - buf[i++] = i64c ((int) (l % 64)); - buf[i] = '\0'; - } while (l /= 64L, l > 0 && i < 6); - - return (buf); -} - -/* - * a64l - convert a radix 64 string to a long integer - */ - -long -a64l(const char *s) -{ - int i; - long value; - long shift = 0; - - for (i = 0, value = 0L;i < 6 && *s;s++) { - value += (c64i ((int) *s) << shift); - shift += 6; - } - return (value); -} - -#endif /* !HAVE_A64L */ diff --git a/lib/rcsid.h b/lib/rcsid.h index 3869afc1..60ba0dbe 100644 --- a/lib/rcsid.h +++ b/lib/rcsid.h @@ -1,22 +1,23 @@ /* - * $Id: rcsid.h,v 1.2 1999/06/07 16:40:44 marekm Exp $ + * $Id: rcsid.h,v 1.3 2005/03/31 05:14:49 kloczek Exp $ */ #define PKG_VER " $Package: " PACKAGE " $ $Version: " VERSION " $ " #if defined(NO_RCSID) || defined(lint) -#define RCSID(x) /* empty */ +#define RCSID(x) /* empty */ #else #if __STDC__ /* * This function is never called from anywhere, but it calls itself * recursively only to fool gcc to not generate warnings :-). */ -static const char *rcsid(const char *); +static const char *rcsid (const char *); + #define RCSID(x) \ static const char *rcsid(const char *s) { \ return rcsid(x); } -#else /* ! __STDC__ */ +#else /* ! __STDC__ */ #define RCSID(x) \ static char *rcsid(s) char *s; { \ return rcsid(x); } -#endif /* ! __STDC__ */ +#endif /* ! __STDC__ */ #endif diff --git a/lib/sgetgrent.c b/lib/sgetgrent.c index daa5fbe2..d42b7c07 100644 --- a/lib/sgetgrent.c +++ b/lib/sgetgrent.c @@ -30,14 +30,11 @@ #include #include "rcsid.h" -RCSID("$Id: sgetgrent.c,v 1.4 1998/04/02 21:51:45 marekm Exp $") - +RCSID ("$Id: sgetgrent.c,v 1.5 2005/03/31 05:14:49 kloczek Exp $") #include #include #include "defines.h" - #define NFIELDS 4 - /* * list - turn a comma-separated string into an array of (char *)'s * @@ -51,12 +48,10 @@ RCSID("$Id: sgetgrent.c,v 1.4 1998/04/02 21:51:45 marekm Exp $") * FINALLY added dynamic allocation. Still need to fix sgetsgent(). * --marekm */ - -static char ** -list(char *s) +static char **list (char *s) { static char **members = 0; - static int size = 0; /* max members + 1 */ + static int size = 0; /* max members + 1 */ int i; char **rbuf; @@ -65,17 +60,18 @@ list(char *s) /* check if there is room for another pointer (to a group member name, or terminating NULL). */ if (i >= size) { - size = i + 100; /* at least: i + 1 */ + size = i + 100; /* at least: i + 1 */ if (members) { - rbuf = realloc(members, size * sizeof(char *)); + rbuf = + realloc (members, size * sizeof (char *)); } else { /* for old (before ANSI C) implementations of realloc() that don't handle NULL properly */ - rbuf = malloc(size * sizeof(char *)); + rbuf = malloc (size * sizeof (char *)); } if (!rbuf) { if (members) - free(members); + free (members); members = 0; size = 0; return (char **) 0; @@ -95,46 +91,45 @@ list(char *s) } -struct group * -sgetgrent(const char *buf) +struct group *sgetgrent (const char *buf) { static char *grpbuf = 0; static size_t size = 0; static char *grpfields[NFIELDS]; static struct group grent; - int i; - char *cp; + int i; + char *cp; - if (strlen(buf) + 1 > size) { + if (strlen (buf) + 1 > size) { /* no need to use realloc() here - just free it and allocate a larger block */ if (grpbuf) - free(grpbuf); - size = strlen(buf) + 1000; /* at least: strlen(buf) + 1 */ - grpbuf = malloc(size); + free (grpbuf); + size = strlen (buf) + 1000; /* at least: strlen(buf) + 1 */ + grpbuf = malloc (size); if (!grpbuf) { size = 0; return 0; } } - strcpy(grpbuf, buf); + strcpy (grpbuf, buf); - if ((cp = strrchr(grpbuf, '\n'))) + if ((cp = strrchr (grpbuf, '\n'))) *cp = '\0'; for (cp = grpbuf, i = 0; i < NFIELDS && cp; i++) { grpfields[i] = cp; - if ((cp = strchr(cp, ':'))) + if ((cp = strchr (cp, ':'))) *cp++ = 0; } - if (i < (NFIELDS-1) || *grpfields[2] == '\0') + if (i < (NFIELDS - 1) || *grpfields[2] == '\0') return 0; grent.gr_name = grpfields[0]; grent.gr_passwd = grpfields[1]; - grent.gr_gid = atoi(grpfields[2]); - grent.gr_mem = list(grpfields[3]); + grent.gr_gid = atoi (grpfields[2]); + grent.gr_mem = list (grpfields[3]); if (!grent.gr_mem) - return (struct group *) 0; /* out of memory */ + return (struct group *) 0; /* out of memory */ return &grent; } diff --git a/lib/sgetpwent.c b/lib/sgetpwent.c index b3aa54b7..b721a777 100644 --- a/lib/sgetpwent.c +++ b/lib/sgetpwent.c @@ -30,15 +30,12 @@ #include #include "rcsid.h" -RCSID("$Id: sgetpwent.c,v 1.6 2003/05/03 16:14:23 kloczek Exp $") - +RCSID ("$Id: sgetpwent.c,v 1.7 2005/03/31 05:14:49 kloczek Exp $") #include #include "defines.h" #include #include - #define NFIELDS 7 - /* * sgetpwent - convert a string to a (struct passwd) * @@ -51,15 +48,13 @@ RCSID("$Id: sgetpwent.c,v 1.6 2003/05/03 16:14:23 kloczek Exp $") * performance reasons. I am going to come up with some conditional * compilation glarp to improve on this in the future. */ - -struct passwd * -sgetpwent(const char *buf) +struct passwd *sgetpwent (const char *buf) { static struct passwd pwent; static char pwdbuf[1024]; - register int i; - register char *cp; - char *ep; + register int i; + register char *cp; + char *ep; char *fields[NFIELDS]; /* @@ -67,20 +62,20 @@ sgetpwent(const char *buf) * the password structure remain valid. */ - if (strlen(buf) >= sizeof pwdbuf) - return 0; /* fail if too long */ - strcpy(pwdbuf, buf); + if (strlen (buf) >= sizeof pwdbuf) + return 0; /* fail if too long */ + strcpy (pwdbuf, buf); /* * Save a pointer to the start of each colon separated * field. The fields are converted into NUL terminated strings. */ - for (cp = pwdbuf, i = 0;i < NFIELDS && cp;i++) { + for (cp = pwdbuf, i = 0; i < NFIELDS && cp; i++) { fields[i] = cp; while (*cp && *cp != ':') ++cp; - + if (*cp) *cp++ = '\0'; else @@ -105,11 +100,11 @@ sgetpwent(const char *buf) pwent.pw_name = fields[0]; pwent.pw_passwd = fields[1]; if (fields[2][0] == '\0' || - ((pwent.pw_uid = strtol (fields[2], &ep, 10)) == 0 && *ep)) { + ((pwent.pw_uid = strtol (fields[2], &ep, 10)) == 0 && *ep)) { return 0; } if (fields[3][0] == '\0' || - ((pwent.pw_gid = strtol (fields[3], &ep, 10)) == 0 && *ep)) { + ((pwent.pw_gid = strtol (fields[3], &ep, 10)) == 0 && *ep)) { return 0; } pwent.pw_gecos = fields[4]; diff --git a/lib/sgroupio.c b/lib/sgroupio.c index f5965f82..5b24efa0 100644 --- a/lib/sgroupio.c +++ b/lib/sgroupio.c @@ -4,50 +4,44 @@ #ifdef SHADOWGRP #include "rcsid.h" -RCSID("$Id: sgroupio.c,v 1.12 2001/08/14 21:10:36 malekith Exp $") - +RCSID ("$Id: sgroupio.c,v 1.13 2005/03/31 05:14:49 kloczek Exp $") #include "prototypes.h" #include "defines.h" - #include "commonio.h" #include "sgroupio.h" +extern int putsgent (const struct sgrp *, FILE *); +extern struct sgrp *sgetsgent (const char *); -extern int putsgent(const struct sgrp *, FILE *); -extern struct sgrp *sgetsgent(const char *); - -struct sgrp * -__sgr_dup(const struct sgrp *sgent) +struct sgrp *__sgr_dup (const struct sgrp *sgent) { struct sgrp *sg; int i; - if (!(sg = (struct sgrp *) malloc(sizeof *sg))) + if (!(sg = (struct sgrp *) malloc (sizeof *sg))) return NULL; *sg = *sgent; - if (!(sg->sg_name = strdup(sgent->sg_name))) + if (!(sg->sg_name = strdup (sgent->sg_name))) return NULL; - if (!(sg->sg_passwd = strdup(sgent->sg_passwd))) + if (!(sg->sg_passwd = strdup (sgent->sg_passwd))) return NULL; - for (i = 0; sgent->sg_adm[i]; i++) - ; - sg->sg_adm = (char **) malloc((i + 1) * sizeof(char *)); + for (i = 0; sgent->sg_adm[i]; i++); + sg->sg_adm = (char **) malloc ((i + 1) * sizeof (char *)); if (!sg->sg_adm) return NULL; for (i = 0; sgent->sg_adm[i]; i++) { - sg->sg_adm[i] = strdup(sgent->sg_adm[i]); + sg->sg_adm[i] = strdup (sgent->sg_adm[i]); if (!sg->sg_adm[i]) return NULL; } sg->sg_adm[i] = NULL; - for (i = 0; sgent->sg_mem[i]; i++) - ; - sg->sg_mem = (char **) malloc((i + 1) * sizeof(char *)); + for (i = 0; sgent->sg_mem[i]; i++); + sg->sg_mem = (char **) malloc ((i + 1) * sizeof (char *)); if (!sg->sg_mem) return NULL; for (i = 0; sgent->sg_mem[i]; i++) { - sg->sg_mem[i] = strdup(sgent->sg_mem[i]); + sg->sg_mem[i] = strdup (sgent->sg_mem[i]); if (!sg->sg_mem[i]) return NULL; } @@ -56,49 +50,47 @@ __sgr_dup(const struct sgrp *sgent) return sg; } -static void * -gshadow_dup(const void *ent) +static void *gshadow_dup (const void *ent) { const struct sgrp *sg = ent; - return __sgr_dup(sg); + + return __sgr_dup (sg); } -static void -gshadow_free(void *ent) +static void gshadow_free (void *ent) { struct sgrp *sg = ent; - free(sg->sg_name); - free(sg->sg_passwd); - while(*(sg->sg_adm)) { - free(*(sg->sg_adm)); + free (sg->sg_name); + free (sg->sg_passwd); + while (*(sg->sg_adm)) { + free (*(sg->sg_adm)); sg->sg_adm++; } - while(*(sg->sg_mem)) { - free(*(sg->sg_mem)); + while (*(sg->sg_mem)) { + free (*(sg->sg_mem)); sg->sg_mem++; } - free(sg); + free (sg); } -static const char * -gshadow_getname(const void *ent) +static const char *gshadow_getname (const void *ent) { const struct sgrp *gr = ent; + return gr->sg_name; } -static void * -gshadow_parse(const char *line) +static void *gshadow_parse (const char *line) { - return (void *) sgetsgent(line); + return (void *) sgetsgent (line); } -static int -gshadow_put(const void *ent, FILE *file) +static int gshadow_put (const void *ent, FILE * file) { const struct sgrp *sg = ent; - return (putsgent(sg, file) == -1) ? -1 : 0; + + return (putsgent (sg, file) == -1) ? -1 : 0; } static struct commonio_ops gshadow_ops = { @@ -112,110 +104,95 @@ static struct commonio_ops gshadow_ops = { }; static struct commonio_db gshadow_db = { - SGROUP_FILE, /* filename */ - &gshadow_ops, /* ops */ - NULL, /* fp */ - NULL, /* head */ - NULL, /* tail */ - NULL, /* cursor */ - 0, /* changed */ - 0, /* isopen */ - 0, /* locked */ - 0 /* readonly */ + SGROUP_FILE, /* filename */ + &gshadow_ops, /* ops */ + NULL, /* fp */ + NULL, /* head */ + NULL, /* tail */ + NULL, /* cursor */ + 0, /* changed */ + 0, /* isopen */ + 0, /* locked */ + 0 /* readonly */ }; -int -sgr_name(const char *filename) +int sgr_name (const char *filename) { - return commonio_setname(&gshadow_db, filename); + return commonio_setname (&gshadow_db, filename); } -int -sgr_file_present(void) +int sgr_file_present (void) { - return commonio_present(&gshadow_db); + return commonio_present (&gshadow_db); } -int -sgr_lock(void) +int sgr_lock (void) { - return commonio_lock(&gshadow_db); + return commonio_lock (&gshadow_db); } -int -sgr_open(int mode) +int sgr_open (int mode) { - return commonio_open(&gshadow_db, mode); + return commonio_open (&gshadow_db, mode); } -const struct sgrp * -sgr_locate(const char *name) +const struct sgrp *sgr_locate (const char *name) { - return commonio_locate(&gshadow_db, name); + return commonio_locate (&gshadow_db, name); } -int -sgr_update(const struct sgrp *sg) +int sgr_update (const struct sgrp *sg) { - return commonio_update(&gshadow_db, (const void *) sg); + return commonio_update (&gshadow_db, (const void *) sg); } -int -sgr_remove(const char *name) +int sgr_remove (const char *name) { - return commonio_remove(&gshadow_db, name); + return commonio_remove (&gshadow_db, name); } -int -sgr_rewind(void) +int sgr_rewind (void) { - return commonio_rewind(&gshadow_db); + return commonio_rewind (&gshadow_db); } -const struct sgrp * -sgr_next(void) +const struct sgrp *sgr_next (void) { - return commonio_next(&gshadow_db); + return commonio_next (&gshadow_db); } -int -sgr_close(void) +int sgr_close (void) { - return commonio_close(&gshadow_db); + return commonio_close (&gshadow_db); } -int -sgr_unlock(void) +int sgr_unlock (void) { - return commonio_unlock(&gshadow_db); + return commonio_unlock (&gshadow_db); } -void -__sgr_set_changed(void) +void __sgr_set_changed (void) { gshadow_db.changed = 1; } -struct commonio_entry * -__sgr_get_head(void) +struct commonio_entry *__sgr_get_head (void) { return gshadow_db.head; } -void -__sgr_del_entry(const struct commonio_entry *ent) +void __sgr_del_entry (const struct commonio_entry *ent) { - commonio_del_entry(&gshadow_db, ent); + commonio_del_entry (&gshadow_db, ent); } /* Sort with respect to group ordering. */ -int -sgr_sort() +int sgr_sort () { - extern struct commonio_db *__gr_get_db(); + extern struct commonio_db *__gr_get_db (); - return commonio_sort_wrt(&gshadow_db, __gr_get_db()); + return commonio_sort_wrt (&gshadow_db, __gr_get_db ()); } #else -extern int errno; /* warning: ANSI C forbids an empty source file */ +extern int errno; /* warning: ANSI C forbids an empty source file */ #endif diff --git a/lib/sgroupio.h b/lib/sgroupio.h index 462b58bd..90693b0f 100644 --- a/lib/sgroupio.h +++ b/lib/sgroupio.h @@ -1,14 +1,14 @@ -extern struct sgrp *__sgr_dup(const struct sgrp *); -extern void __sgr_set_changed(void); -extern int sgr_close(void); -extern int sgr_file_present(void); -extern const struct sgrp *sgr_locate(const char *); -extern int sgr_lock(void); -extern int sgr_name(const char *); -extern const struct sgrp *sgr_next(void); -extern int sgr_open(int); -extern int sgr_remove(const char *); -extern int sgr_rewind(void); -extern int sgr_unlock(void); -extern int sgr_update(const struct sgrp *); -extern int sgr_sort(void); +extern struct sgrp *__sgr_dup (const struct sgrp *); +extern void __sgr_set_changed (void); +extern int sgr_close (void); +extern int sgr_file_present (void); +extern const struct sgrp *sgr_locate (const char *); +extern int sgr_lock (void); +extern int sgr_name (const char *); +extern const struct sgrp *sgr_next (void); +extern int sgr_open (int); +extern int sgr_remove (const char *); +extern int sgr_rewind (void); +extern int sgr_unlock (void); +extern int sgr_update (const struct sgrp *); +extern int sgr_sort (void); diff --git a/lib/shadow.c b/lib/shadow.c index 2b21e23f..efb801e3 100644 --- a/lib/shadow.c +++ b/lib/shadow.c @@ -30,41 +30,32 @@ #include /* Newer versions of Linux libc already have shadow support. */ -#if defined(SHADOWPWD) && !defined(HAVE_GETSPNAM) /*{*/ +#if defined(SHADOWPWD) && !defined(HAVE_GETSPNAM) /*{ */ #include "rcsid.h" -RCSID("$Id: shadow.c,v 1.7 2003/05/03 16:14:24 kloczek Exp $") - +RCSID ("$Id: shadow.c,v 1.9 2005/04/06 04:26:05 kloczek Exp $") #include #include "prototypes.h" #include "defines.h" #include -#ifdef NDBM -#include -#include -DBM *sp_dbm; -int sp_dbm_mode = -1; -static int dbmopened; -static int dbmerror; -#endif - #ifdef USE_NIS -static int nis_used; -static int nis_ignore; -static enum { native, start, middle, native2 } nis_state; -static int nis_bound; -static char *nis_domain; -static char *nis_key; -static int nis_keylen; -static char *nis_val; -static int nis_vallen; +static int nis_used; +static int nis_ignore; +static enum { native, start, middle, native2 } nis_state; +static int nis_bound; +static char *nis_domain; +static char *nis_key; +static int nis_keylen; +static char *nis_val; +static int nis_vallen; + #define IS_NISCHAR(c) ((c)=='+') #endif -static FILE *shadow; -static char spwbuf[BUFSIZ]; -static struct spwd spwd; +static FILE *shadow; +static char spwbuf[BUFSIZ]; +static struct spwd spwd; #define FIELDS 9 #define OFIELDS 5 @@ -75,10 +66,9 @@ static struct spwd spwd; * __setspNIS - turn on or off NIS searches */ -void -__setspNIS(int flag) +void __setspNIS (int flag) { - nis_ignore = ! flag; + nis_ignore = !flag; if (nis_ignore) nis_used = 0; @@ -88,8 +78,7 @@ __setspNIS(int flag) * bind_nis - bind to NIS server */ -static int -bind_nis(void) +static int bind_nis (void) { if (yp_get_default_domain (&nis_domain)) return -1; @@ -103,84 +92,49 @@ bind_nis(void) * setspent - initialize access to shadow text and DBM files */ -void -setspent(void) +void setspent (void) { if (shadow) - rewind(shadow); + rewind (shadow); else - shadow = fopen(SHADOW_FILE, "r"); + shadow = fopen (SHADOW_FILE, "r"); #ifdef USE_NIS nis_state = native; #endif - - /* - * Attempt to open the DBM files if they have never been opened - * and an error has never been returned. - */ - -#ifdef NDBM - if (! dbmerror && ! dbmopened) { - int mode; - char dbmfiles[BUFSIZ]; - - strcpy (dbmfiles, SHADOW_PAG_FILE); - - if (sp_dbm_mode == -1) - mode = O_RDWR; - else - mode = (sp_dbm_mode == O_RDWR) ? O_RDWR:O_RDONLY; - - if (! (sp_dbm = dbm_open (SHADOW_FILE, mode, 0))) - dbmerror = 1; - else - dbmopened = 1; - } -#endif } /* * endspent - terminate access to shadow text and DBM files */ -void -endspent(void) +void endspent (void) { if (shadow) (void) fclose (shadow); shadow = (FILE *) 0; -#ifdef NDBM - if (dbmopened && sp_dbm) { - dbm_close (sp_dbm); - sp_dbm = 0; - } - dbmopened = 0; - dbmerror = 0; -#endif } /* * my_sgetspent - convert string in shadow file format to (struct spwd *) */ -static struct spwd * -my_sgetspent(const char *string) +static struct spwd *my_sgetspent (const char *string) { - char *fields[FIELDS]; - char *cp; - char *cpp; - int i; + char *fields[FIELDS]; + char *cp; + char *cpp; + int i; /* * Copy string to local buffer. It has to be tokenized and we * have to do that to our private copy. */ - if (strlen(string) >= sizeof spwbuf) + if (strlen (string) >= sizeof spwbuf) return 0; - strcpy(spwbuf, string); + strcpy (spwbuf, string); if ((cp = strrchr (spwbuf, '\n'))) *cp = '\0'; @@ -190,7 +144,7 @@ my_sgetspent(const char *string) * FIELDS different fields. */ - for (cp = spwbuf, i = 0;*cp && i < FIELDS;i++) { + for (cp = spwbuf, i = 0; *cp && i < FIELDS; i++) { fields[i] = cp; while (*cp && *cp != ':') cp++; @@ -199,7 +153,7 @@ my_sgetspent(const char *string) *cp++ = '\0'; } - if (i == (FIELDS-1)) + if (i == (FIELDS - 1)) fields[i++] = cp; if ((cp && *cp) || (i != FIELDS && i != OFIELDS)) @@ -227,7 +181,7 @@ my_sgetspent(const char *string) if ((spwd.sp_lstchg = strtol (fields[2], &cpp, 10)) == 0 && *cpp) { #ifdef USE_NIS - if (! nis_used) + if (!nis_used) return 0; else spwd.sp_lstchg = -1; @@ -243,7 +197,7 @@ my_sgetspent(const char *string) if ((spwd.sp_min = strtol (fields[3], &cpp, 10)) == 0 && *cpp) { #ifdef USE_NIS - if (! nis_used) + if (!nis_used) return 0; else spwd.sp_min = -1; @@ -259,7 +213,7 @@ my_sgetspent(const char *string) if ((spwd.sp_max = strtol (fields[4], &cpp, 10)) == 0 && *cpp) { #ifdef USE_NIS - if (! nis_used) + if (!nis_used) return 0; else spwd.sp_max = -1; @@ -276,7 +230,7 @@ my_sgetspent(const char *string) if (i == OFIELDS) { spwd.sp_warn = spwd.sp_inact = spwd.sp_expire = - spwd.sp_flag = -1; + spwd.sp_flag = -1; return &spwd; } @@ -287,7 +241,7 @@ my_sgetspent(const char *string) if ((spwd.sp_warn = strtol (fields[5], &cpp, 10)) == 0 && *cpp) { #ifdef USE_NIS - if (! nis_used) + if (!nis_used) return 0; else spwd.sp_warn = -1; @@ -304,7 +258,7 @@ my_sgetspent(const char *string) if ((spwd.sp_inact = strtol (fields[6], &cpp, 10)) == 0 && *cpp) { #ifdef USE_NIS - if (! nis_used) + if (!nis_used) return 0; else spwd.sp_inact = -1; @@ -321,7 +275,7 @@ my_sgetspent(const char *string) if ((spwd.sp_expire = strtol (fields[7], &cpp, 10)) == 0 && *cpp) { #ifdef USE_NIS - if (! nis_used) + if (!nis_used) return 0; else spwd.sp_expire = -1; @@ -338,7 +292,7 @@ my_sgetspent(const char *string) if ((spwd.sp_flag = strtol (fields[8], &cpp, 10)) == 0 && *cpp) { #ifdef USE_NIS - if (! nis_used) + if (!nis_used) return 0; else spwd.sp_flag = -1; @@ -355,13 +309,12 @@ my_sgetspent(const char *string) * fgetspent - get an entry from a /etc/shadow formatted stream */ -struct spwd * -fgetspent(FILE *fp) +struct spwd *fgetspent (FILE * fp) { - char buf[BUFSIZ]; - char *cp; + char buf[BUFSIZ]; + char *cp; - if (! fp) + if (!fp) return (0); #ifdef USE_NIS @@ -376,7 +329,7 @@ fgetspent(FILE *fp) if (nis_ignore && IS_NISCHAR (buf[0])) continue; #endif - return my_sgetspent(buf); + return my_sgetspent (buf); } return 0; } @@ -385,19 +338,18 @@ fgetspent(FILE *fp) * getspent - get a (struct spwd *) from the current shadow file */ -struct spwd * -getspent(void) +struct spwd *getspent (void) { #ifdef USE_NIS - int nis_1_user = 0; - struct spwd *val; - char buf[BUFSIZ]; + int nis_1_user = 0; + struct spwd *val; + char buf[BUFSIZ]; #endif - if (! shadow) + if (!shadow) setspent (); #ifdef USE_NIS -again: + again: /* * See if we are reading from the local file. */ @@ -409,7 +361,7 @@ again: * right away if there is none. */ - if (! (val = fgetspent (shadow))) + if (!(val = fgetspent (shadow))) return 0; /* @@ -455,20 +407,20 @@ again: } if (nis_state == start) { if (yp_first (nis_domain, "shadow.bynam", &nis_key, - &nis_keylen, &nis_val, &nis_vallen)) { + &nis_keylen, &nis_val, &nis_vallen)) { nis_state = native2; goto again; } nis_state = middle; } else if (nis_state == middle) { if (yp_next (nis_domain, "shadow.bynam", nis_key, - nis_keylen, &nis_key, &nis_keylen, - &nis_val, &nis_vallen)) { + nis_keylen, &nis_key, &nis_keylen, + &nis_val, &nis_vallen)) { nis_state = native2; goto again; } } - return my_sgetspent(nis_val); + return my_sgetspent (nis_val); } #else return (fgetspent (shadow)); @@ -479,68 +431,42 @@ again: * getspnam - get a shadow entry by name */ -struct spwd * -getspnam(const char *name) +struct spwd *getspnam (const char *name) { - struct spwd *sp; -#ifdef NDBM - datum key; - datum content; -#endif + struct spwd *sp; + #ifdef USE_NIS - char buf[BUFSIZ]; - static char save_name[16]; - int nis_disabled = 0; + char buf[BUFSIZ]; + static char save_name[16]; + int nis_disabled = 0; #endif setspent (); -#ifdef NDBM - - /* - * If the DBM file are now open, create a key for this UID and - * try to fetch the entry from the database. A matching record - * will be unpacked into a static structure and returned to - * the user. - */ - - if (dbmopened) { - key.dsize = strlen (name); - key.dptr = (char *) name; - - content = dbm_fetch (sp_dbm, key); - if (content.dptr != 0) { - memcpy (spwbuf, content.dptr, content.dsize); - spw_unpack (spwbuf, content.dsize, &spwd); - endspent(); - return &spwd; - } - } -#endif #ifdef USE_NIS /* * Search the shadow.byname map for this user. */ - if (! nis_ignore && ! nis_bound) + if (!nis_ignore && !nis_bound) bind_nis (); - if (! nis_ignore && nis_bound) { - char *cp; + if (!nis_ignore && nis_bound) { + char *cp; if (yp_match (nis_domain, "shadow.byname", name, - strlen (name), &nis_val, &nis_vallen) == 0) { + strlen (name), &nis_val, &nis_vallen) == 0) { if (cp = strchr (nis_val, '\n')) *cp = '\0'; nis_state = middle; - if ((sp = my_sgetspent(nis_val))) { + if ((sp = my_sgetspent (nis_val))) { strcpy (save_name, sp->sp_namp); nis_key = save_name; nis_keylen = strlen (save_name); } - endspent(); + endspent (); return sp; } else nis_state = native2; @@ -567,9 +493,9 @@ getspnam(const char *name) if (nis_disabled) nis_ignore--; #endif - endspent(); + endspent (); return (sp); } #else -extern int errno; /* warning: ANSI C forbids an empty source file */ -#endif /*}*/ +extern int errno; /* warning: ANSI C forbids an empty source file */ +#endif /*} */ diff --git a/lib/shadowio.c b/lib/shadowio.c index 0fceeb75..095fba1c 100644 --- a/lib/shadowio.c +++ b/lib/shadowio.c @@ -4,68 +4,62 @@ #ifdef SHADOWPWD #include "rcsid.h" -RCSID("$Id: shadowio.c,v 1.13 2001/08/14 21:10:36 malekith Exp $") - +RCSID ("$Id: shadowio.c,v 1.14 2005/03/31 05:14:49 kloczek Exp $") #include "prototypes.h" #include "defines.h" #ifdef HAVE_SHADOW_H # include #endif #include - #include "commonio.h" #include "shadowio.h" - -struct spwd * -__spw_dup(const struct spwd *spent) +struct spwd *__spw_dup (const struct spwd *spent) { struct spwd *sp; - if (!(sp = (struct spwd *) malloc(sizeof *sp))) + if (!(sp = (struct spwd *) malloc (sizeof *sp))) return NULL; *sp = *spent; - if (!(sp->sp_namp = strdup(spent->sp_namp))) + if (!(sp->sp_namp = strdup (spent->sp_namp))) return NULL; - if (!(sp->sp_pwdp = strdup(spent->sp_pwdp))) + if (!(sp->sp_pwdp = strdup (spent->sp_pwdp))) return NULL; return sp; } -static void * -shadow_dup(const void *ent) +static void *shadow_dup (const void *ent) { const struct spwd *sp = ent; - return __spw_dup(sp); + + return __spw_dup (sp); } -static void -shadow_free(void *ent) +static void shadow_free (void *ent) { struct spwd *sp = ent; - free(sp->sp_namp); - free(sp->sp_pwdp); - free(sp); + free (sp->sp_namp); + free (sp->sp_pwdp); + free (sp); } -static const char * -shadow_getname(const void *ent) +static const char *shadow_getname (const void *ent) { const struct spwd *sp = ent; + return sp->sp_namp; } -static void * -shadow_parse(const char *line) +static void *shadow_parse (const char *line) { - return (void *) sgetspent(line); + return (void *) sgetspent (line); } -static int -shadow_put(const void *ent, FILE *file) +static int shadow_put (const void *ent, FILE * file) { const struct spwd *sp = ent; - return (putspent(sp, file) == -1) ? -1 : 0; + + return (putspent (sp, file) == -1) ? -1 : 0; } static struct commonio_ops shadow_ops = { @@ -79,102 +73,88 @@ static struct commonio_ops shadow_ops = { }; static struct commonio_db shadow_db = { - SHADOW_FILE, /* filename */ - &shadow_ops, /* ops */ - NULL, /* fp */ - NULL, /* head */ - NULL, /* tail */ - NULL, /* cursor */ - 0, /* changed */ - 0, /* isopen */ - 0, /* locked */ - 0 /* readonly */ + SHADOW_FILE, /* filename */ + &shadow_ops, /* ops */ + NULL, /* fp */ + NULL, /* head */ + NULL, /* tail */ + NULL, /* cursor */ + 0, /* changed */ + 0, /* isopen */ + 0, /* locked */ + 0 /* readonly */ }; -int -spw_name(const char *filename) +int spw_name (const char *filename) { - return commonio_setname(&shadow_db, filename); + return commonio_setname (&shadow_db, filename); } -int -spw_file_present(void) +int spw_file_present (void) { - return commonio_present(&shadow_db); + return commonio_present (&shadow_db); } -int -spw_lock(void) +int spw_lock (void) { - return commonio_lock(&shadow_db); + return commonio_lock (&shadow_db); } -int -spw_open(int mode) +int spw_open (int mode) { - return commonio_open(&shadow_db, mode); + return commonio_open (&shadow_db, mode); } -const struct spwd * -spw_locate(const char *name) +const struct spwd *spw_locate (const char *name) { - return commonio_locate(&shadow_db, name); + return commonio_locate (&shadow_db, name); } -int -spw_update(const struct spwd *sp) +int spw_update (const struct spwd *sp) { - return commonio_update(&shadow_db, (const void *) sp); + return commonio_update (&shadow_db, (const void *) sp); } -int -spw_remove(const char *name) +int spw_remove (const char *name) { - return commonio_remove(&shadow_db, name); + return commonio_remove (&shadow_db, name); } -int -spw_rewind(void) +int spw_rewind (void) { - return commonio_rewind(&shadow_db); + return commonio_rewind (&shadow_db); } -const struct spwd * -spw_next(void) +const struct spwd *spw_next (void) { - return commonio_next(&shadow_db); + return commonio_next (&shadow_db); } -int -spw_close(void) +int spw_close (void) { - return commonio_close(&shadow_db); + return commonio_close (&shadow_db); } -int -spw_unlock(void) +int spw_unlock (void) { - return commonio_unlock(&shadow_db); + return commonio_unlock (&shadow_db); } -struct commonio_entry * -__spw_get_head(void) +struct commonio_entry *__spw_get_head (void) { return shadow_db.head; } -void -__spw_del_entry(const struct commonio_entry *ent) +void __spw_del_entry (const struct commonio_entry *ent) { - commonio_del_entry(&shadow_db, ent); + commonio_del_entry (&shadow_db, ent); } /* Sort with respect to passwd ordering. */ -int -spw_sort() +int spw_sort () { - extern struct commonio_db *__pw_get_db(); + extern struct commonio_db *__pw_get_db (); - return commonio_sort_wrt(&shadow_db, __pw_get_db()); + return commonio_sort_wrt (&shadow_db, __pw_get_db ()); } #endif diff --git a/lib/shadowio.h b/lib/shadowio.h index 25ffed0f..d5866079 100644 --- a/lib/shadowio.h +++ b/lib/shadowio.h @@ -1,14 +1,14 @@ -extern struct spwd *__spw_dup(const struct spwd *); -extern void __spw_set_changed(void); -extern int spw_close(void); -extern int spw_file_present(void); -extern const struct spwd *spw_locate(const char *); -extern int spw_lock(void); -extern int spw_name(const char *); -extern const struct spwd *spw_next(void); -extern int spw_open(int); -extern int spw_remove(const char *); -extern int spw_rewind(void); -extern int spw_unlock(void); -extern int spw_update(const struct spwd *); -extern int spw_sort(void); +extern struct spwd *__spw_dup (const struct spwd *); +extern void __spw_set_changed (void); +extern int spw_close (void); +extern int spw_file_present (void); +extern const struct spwd *spw_locate (const char *); +extern int spw_lock (void); +extern int spw_name (const char *); +extern const struct spwd *spw_next (void); +extern int spw_open (int); +extern int spw_remove (const char *); +extern int spw_rewind (void); +extern int spw_unlock (void); +extern int spw_update (const struct spwd *); +extern int spw_sort (void); diff --git a/lib/spdbm.c b/lib/spdbm.c deleted file mode 100644 index 317ea6b7..00000000 --- a/lib/spdbm.c +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright 1990 - 1994, Julianne Frances Haugh - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Julianne F. Haugh nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include - -#if defined(SHADOWPWD) && defined(NDBM) /*{*/ - -#include "rcsid.h" -RCSID("$Id: spdbm.c,v 1.3 1997/12/07 23:26:58 marekm Exp $") - -#include -#include -#include "prototypes.h" -#include "defines.h" - -#include -extern DBM *sp_dbm; - -/* - * sp_dbm_update - * - * Updates the DBM password files, if they exist. - */ - -int -sp_dbm_update(struct spwd *sp) -{ - datum key; - datum content; - char data[BUFSIZ]; - int len; - static int once; - - if (! once) { - if (! sp_dbm) - setspent (); - - once++; - } - if (! sp_dbm) - return 0; - - len = spw_pack (sp, data); - - content.dsize = len; - content.dptr = data; - - key.dsize = strlen (sp->sp_namp); - key.dptr = sp->sp_namp; - if (dbm_store (sp_dbm, key, content, DBM_REPLACE)) - return 0; - - return 1; -} - -/* - * sp_dbm_remove - * - * Updates the DBM password files, if they exist. - */ - -int -sp_dbm_remove(char *user) -{ - datum key; - static int once; - - if (! once) { - if (! sp_dbm) - setspent (); - - once++; - } - if (! sp_dbm) - return 0; - - key.dsize = strlen (user); - key.dptr = user; - if (dbm_delete (sp_dbm, key)) - return 0; - - return 1; -} - -int -sp_dbm_present(void) -{ - return (access(SHADOW_PAG_FILE, F_OK) == 0); -} -#endif /*} SHADOWPWD && NDBM */ diff --git a/lib/sppack.c b/lib/sppack.c index 463f633a..c36c4bd3 100644 --- a/lib/sppack.c +++ b/lib/sppack.c @@ -28,19 +28,16 @@ */ #include -#ifdef SHADOWPWD /*{*/ +#ifdef SHADOWPWD /*{ */ #include "rcsid.h" -RCSID("$Id: sppack.c,v 1.3 1997/12/07 23:26:58 marekm Exp $") - +RCSID ("$Id: sppack.c,v 1.4 2005/03/31 05:14:49 kloczek Exp $") #include #include #include "defines.h" - -int -spw_pack(const struct spwd *spwd, char *buf) +int spw_pack (const struct spwd *spwd, char *buf) { - char *cp; + char *cp; cp = buf; strcpy (cp, spwd->sp_namp); @@ -73,10 +70,9 @@ spw_pack(const struct spwd *spwd, char *buf) return cp - buf; } -int -spw_unpack(char *buf, int len, struct spwd *spwd) +int spw_unpack (char *buf, int len, struct spwd *spwd) { - char *org = buf; + char *org = buf; spwd->sp_namp = buf; buf += strlen (buf) + 1; @@ -110,4 +106,4 @@ spw_unpack(char *buf, int len, struct spwd *spwd) return 0; } -#endif /*}*/ +#endif /*} */ diff --git a/lib/utent.c b/lib/utent.c index 0b14d14c..1a190b84 100644 --- a/lib/utent.c +++ b/lib/utent.c @@ -37,18 +37,17 @@ #include #ifndef lint -static char rcsid[] = "$Id: utent.c,v 1.4 1998/01/29 23:22:32 marekm Exp $"; +static char rcsid[] = "$Id: utent.c,v 1.5 2005/03/31 05:14:49 kloczek Exp $"; #endif -static int utmp_fd = -1; -static struct utmp utmp_buf; +static int utmp_fd = -1; +static struct utmp utmp_buf; /* * setutent - open or rewind the utmp file */ -void -setutent(void) +void setutent (void) { if (utmp_fd == -1) if ((utmp_fd = open (_UTMP_FILE, O_RDWR)) == -1) @@ -62,8 +61,7 @@ setutent(void) * endutent - close the utmp file */ -void -endutent(void) +void endutent (void) { if (utmp_fd != -1) close (utmp_fd); @@ -75,8 +73,7 @@ endutent(void) * getutent - get the next record from the utmp file */ -struct utmp * -getutent(void) +struct utmp *getutent (void) { if (utmp_fd == -1) setutent (); @@ -94,11 +91,10 @@ getutent(void) * getutline - get the utmp entry matching ut_line */ -struct utmp * -getutline(const struct utmp *utent) +struct utmp *getutline (const struct utmp *utent) { - struct utmp save; - struct utmp *new; + struct utmp save; + struct utmp *new; save = *utent; while (new = getutent ()) @@ -110,5 +106,5 @@ getutline(const struct utmp *utent) return (struct utmp *) 0; } #else -extern int errno; /* warning: ANSI C forbids an empty source file */ +extern int errno; /* warning: ANSI C forbids an empty source file */ #endif diff --git a/libmisc/Makefile.am b/libmisc/Makefile.am index 7bf30292..7d81de10 100644 --- a/libmisc/Makefile.am +++ b/libmisc/Makefile.am @@ -27,9 +27,6 @@ libmisc_a_SOURCES = \ isexpired.c \ limits.c \ list.c log.c \ - login_access.c \ - login_desrpc.c \ - login_krb.c \ loginprompt.c \ mail.c \ motd.c \ diff --git a/libmisc/Makefile.in b/libmisc/Makefile.in index 462d4b4b..7b471a81 100644 --- a/libmisc/Makefile.in +++ b/libmisc/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.4 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -57,16 +57,15 @@ am_libmisc_a_OBJECTS = addgrps.$(OBJEXT) age.$(OBJEXT) \ copydir.$(OBJEXT) entry.$(OBJEXT) env.$(OBJEXT) \ failure.$(OBJEXT) fields.$(OBJEXT) getdate.$(OBJEXT) \ hushed.$(OBJEXT) isexpired.$(OBJEXT) limits.$(OBJEXT) \ - list.$(OBJEXT) log.$(OBJEXT) login_access.$(OBJEXT) \ - login_desrpc.$(OBJEXT) login_krb.$(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) \ - setup.$(OBJEXT) setupenv.$(OBJEXT) shell.$(OBJEXT) \ - strtoday.$(OBJEXT) sub.$(OBJEXT) sulog.$(OBJEXT) \ - ttytype.$(OBJEXT) tz.$(OBJEXT) ulimit.$(OBJEXT) utmp.$(OBJEXT) \ - valid.$(OBJEXT) xmalloc.$(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) setup.$(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 @@ -122,17 +121,16 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ 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@ @@ -231,9 +229,6 @@ libmisc_a_SOURCES = \ isexpired.c \ limits.c \ list.c log.c \ - login_access.c \ - login_desrpc.c \ - login_krb.c \ loginprompt.c \ mail.c \ motd.c \ @@ -272,9 +267,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libmisc/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libmisc/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu libmisc/Makefile + $(AUTOMAKE) --foreign libmisc/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -325,9 +320,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/limits.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/login_access.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/login_desrpc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/login_krb.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loginprompt.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mail.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/motd.Po@am__quote@ diff --git a/libmisc/addgrps.c b/libmisc/addgrps.c index c505d382..feb313fb 100644 --- a/libmisc/addgrps.c +++ b/libmisc/addgrps.c @@ -10,7 +10,7 @@ #include #include "rcsid.h" -RCSID ("$Id: addgrps.c,v 1.6 2003/04/22 10:59:21 kloczek Exp $") +RCSID ("$Id: addgrps.c,v 1.7 2005/03/31 05:14:50 kloczek Exp $") #define SEP ",:" /* * Add groups with names from LIST (separated by commas or colons) @@ -58,8 +58,7 @@ int add_groups (const char *list) continue; } - for (i = 0; i < ngroups && grouplist[i] != grp->gr_gid; - i++); + for (i = 0; i < ngroups && grouplist[i] != grp->gr_gid; i++); if (i < ngroups) continue; @@ -68,9 +67,7 @@ int add_groups (const char *list) fprintf (stderr, _("Warning: too many groups\n")); break; } - tmp = - realloc (grouplist, - (ngroups + 1) * sizeof (GETGROUPS_T)); + tmp = realloc (grouplist, (ngroups + 1) * sizeof (GETGROUPS_T)); if (!tmp) { free (grouplist); return -1; diff --git a/libmisc/age.c b/libmisc/age.c index 8c851ea1..a807ac5d 100644 --- a/libmisc/age.c +++ b/libmisc/age.c @@ -41,7 +41,7 @@ #if defined(SHADOWPWD) #include "rcsid.h" -RCSID ("$Id: age.c,v 1.9 2004/03/29 00:26:18 kloczek Exp $") +RCSID ("$Id: age.c,v 1.10 2005/03/31 05:14:50 kloczek Exp $") #ifndef PASSWD_PROGRAM #define PASSWD_PROGRAM "/bin/passwd" #endif @@ -124,8 +124,7 @@ int expire (const struct passwd *pw, const struct spwd *sp) if (setup_uid_gid (pw, 0)) _exit (126); - execl (PASSWD_PROGRAM, PASSWD_PROGRAM, pw->pw_name, - (char *) 0); + execl (PASSWD_PROGRAM, PASSWD_PROGRAM, pw->pw_name, (char *) 0); err = errno; perror ("Can't execute " PASSWD_PROGRAM); _exit ((err == ENOENT) ? 127 : 126); @@ -170,8 +169,7 @@ void agecheck (const struct passwd *pw, const struct spwd *sp) ("Your password will expire in %ld days.\n"), remain); else if (remain == 1) - printf (_ - ("Your password will expire tomorrow.\n")); + printf (_("Your password will expire tomorrow.\n")); else if (remain == 0) printf (_("Your password will expire today.\n")); } diff --git a/libmisc/chkname.h b/libmisc/chkname.h index b9e3ae02..8c9ec967 100644 --- a/libmisc/chkname.h +++ b/libmisc/chkname.h @@ -1,4 +1,4 @@ -/* $Id: chkname.h,v 1.2 2000/08/26 18:27:17 marekm Exp $ */ +/* $Id: chkname.h,v 1.3 2005/03/31 05:14:50 kloczek Exp $ */ #ifndef _CHKNAME_H_ #define _CHKNAME_H_ @@ -9,7 +9,7 @@ #include "defines.h" -extern int check_user_name(const char *); -extern int check_group_name(const char *name); +extern int check_user_name (const char *); +extern int check_group_name (const char *name); #endif diff --git a/libmisc/chowndir.c b/libmisc/chowndir.c index 7ed1cf61..4af7b432 100644 --- a/libmisc/chowndir.c +++ b/libmisc/chowndir.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID ("$Id: chowndir.c,v 1.7 2003/04/22 10:59:21 kloczek Exp $") +RCSID ("$Id: chowndir.c,v 1.8 2005/03/31 05:14:50 kloczek Exp $") #include #include #include "prototypes.h" @@ -86,8 +86,7 @@ chown_tree (const char *root, uid_t old_uid, uid_t new_uid, gid_t old_gid, * destination files. */ - if (strlen (root) + strlen (ent->d_name) + 2 > - sizeof new_name) + if (strlen (root) + strlen (ent->d_name) + 2 > sizeof new_name) break; snprintf (new_name, sizeof new_name, "%s/%s", root, @@ -114,8 +113,7 @@ chown_tree (const char *root, uid_t old_uid, uid_t new_uid, gid_t old_gid, #endif if (sb.st_uid == old_uid) LCHOWN (new_name, new_uid, - sb.st_gid == - old_gid ? new_gid : sb.st_gid); + sb.st_gid == old_gid ? new_gid : sb.st_gid); } closedir (dir); @@ -126,8 +124,7 @@ chown_tree (const char *root, uid_t old_uid, uid_t new_uid, gid_t old_gid, if (!stat (root, &sb)) { if (sb.st_uid == old_uid) LCHOWN (root, new_uid, - sb.st_gid == - old_gid ? new_gid : sb.st_gid); + sb.st_gid == old_gid ? new_gid : sb.st_gid); } return rc; } diff --git a/libmisc/chowntty.c b/libmisc/chowntty.c index 74765d26..bbca5b40 100644 --- a/libmisc/chowntty.c +++ b/libmisc/chowntty.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID ("$Id: chowntty.c,v 1.10 2003/04/22 10:59:21 kloczek Exp $") +RCSID ("$Id: chowntty.c,v 1.11 2005/03/31 05:14:50 kloczek Exp $") #include #include #include @@ -103,8 +103,7 @@ void chown_tty (const char *tty, const struct passwd *info) chmod (tty, getdef_num ("TTYPERM", 0600))) { int err = errno; - snprintf (buf, sizeof buf, _("Unable to change tty %s"), - tty); + snprintf (buf, sizeof buf, _("Unable to change tty %s"), tty); perror (buf); SYSLOG ((LOG_WARN, "unable to change tty `%s' for user `%s'\n", tty, diff --git a/libmisc/copydir.c b/libmisc/copydir.c index 00a4cb5b..fe56b5af 100644 --- a/libmisc/copydir.c +++ b/libmisc/copydir.c @@ -30,14 +30,17 @@ #include #include "rcsid.h" -RCSID ("$Id: copydir.c,v 1.10 2004/10/18 20:10:10 kloczek Exp $") - +RCSID ("$Id: copydir.c,v 1.12 2005/03/31 05:14:50 kloczek Exp $") #include #include #include #include #include "prototypes.h" #include "defines.h" +#ifdef WITH_SELINUX +#include +static int selinux_enabled = -1; +#endif static const char *src_orig; static const char *dst_orig; @@ -50,6 +53,26 @@ struct link_name { }; static struct link_name *links; +#ifdef WITH_SELINUX +static int selinux_file_context (const char *dst_name) +{ + security_context_t scontext = NULL; + + if (selinux_enabled < 0) + selinux_enabled = is_selinux_enabled () > 0; + if (selinux_enabled) { + if (matchpathcon (dst_name, 0, &scontext) < 0) + if (security_getenforce ()) + return 1; + if (setfscreatecon (scontext) < 0) + if (security_getenforce ()) + return 1; + freecon (scontext); + } + return 0; +} +#endif + /* * remove_link - delete a link from the link list */ @@ -80,8 +103,7 @@ static void remove_link (struct link_name *ln) * check_link - see if a file is really a link */ -static struct link_name *check_link (const char *name, - const struct stat *sb) +static struct link_name *check_link (const char *name, const struct stat *sb) { struct link_name *lp; int src_len; @@ -119,9 +141,7 @@ static struct link_name *check_link (const char *name, * as it goes. */ -int -copy_tree (const char *src_root, const char *dst_root, uid_t uid, - gid_t gid) +int copy_tree (const char *src_root, const char *dst_root, uid_t uid, gid_t gid) { char src_name[1024]; char dst_name[1024]; @@ -202,6 +222,9 @@ copy_tree (const char *src_root, const char *dst_root, uid_t uid, * the user and then recursively copy that directory. */ +#ifdef WITH_SELINUX + selinux_file_context (dst_name); +#endif mkdir (dst_name, sb.st_mode & 0777); chown (dst_name, uid == (uid_t) - 1 ? sb.st_uid : uid, @@ -238,16 +261,19 @@ copy_tree (const char *src_root, const char *dst_root, uid_t uid, break; } oldlink[len] = '\0'; /* readlink() does not NUL-terminate */ - if (!strncmp - (oldlink, src_orig, strlen (src_orig))) { + if (!strncmp (oldlink, src_orig, strlen (src_orig))) { snprintf (dummy, sizeof dummy, "%s%s", dst_orig, oldlink + strlen (src_orig)); strcpy (oldlink, dummy); } - if (symlink(oldlink, dst_name) || - lchown (dst_name, uid == (uid_t) -1 ? sb.st_uid:uid, - gid == (gid_t) -1 ? sb.st_gid:gid)) { +#ifdef WITH_SELINUX + selinux_file_context (dst_name); +#endif + if (symlink (oldlink, dst_name) || + lchown (dst_name, + uid == (uid_t) - 1 ? sb.st_uid : uid, + gid == (gid_t) - 1 ? sb.st_gid : gid)) { err++; break; } @@ -281,8 +307,10 @@ copy_tree (const char *src_root, const char *dst_root, uid_t uid, */ if (!S_ISREG (sb.st_mode)) { - if (mknod - (dst_name, sb.st_mode & ~07777, sb.st_rdev) +#ifdef WITH_SELINUX + selinux_file_context (dst_name); +#endif + if (mknod (dst_name, sb.st_mode & ~07777, sb.st_rdev) || chown (dst_name, uid == (uid_t) - 1 ? sb.st_uid : uid, gid == (gid_t) - 1 ? sb.st_gid : gid) @@ -302,6 +330,9 @@ copy_tree (const char *src_root, const char *dst_root, uid_t uid, err++; break; } +#ifdef WITH_SELINUX + selinux_file_context (dst_name); +#endif if ((ofd = open (dst_name, O_WRONLY | O_CREAT | O_TRUNC, 0)) < 0 || chown (dst_name, @@ -381,8 +412,7 @@ int remove_tree (const char *root) * Make the filename for the current entry. */ - if (strlen (root) + strlen (ent->d_name) + 2 > - sizeof new_name) { + if (strlen (root) + strlen (ent->d_name) + 2 > sizeof new_name) { err++; break; } diff --git a/libmisc/env.c b/libmisc/env.c index e4d9270b..175c0410 100644 --- a/libmisc/env.c +++ b/libmisc/env.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID ("$Id: env.c,v 1.10 2003/04/22 10:59:22 kloczek Exp $") +RCSID ("$Id: env.c,v 1.11 2005/03/31 05:14:50 kloczek Exp $") #include #include #include @@ -179,8 +179,7 @@ void set_env (int argc, char *const *argv) continue; /* ignore long entries */ if (!(cp = strchr (*argv, '='))) { - snprintf (variable, sizeof variable, "L%d", - noname++); + snprintf (variable, sizeof variable, "L%d", noname++); addenv (variable, *argv); } else { const char **p; diff --git a/libmisc/failure.c b/libmisc/failure.c index 7bfde829..e2c659a9 100644 --- a/libmisc/failure.c +++ b/libmisc/failure.c @@ -30,14 +30,13 @@ #include #include "rcsid.h" -RCSID ("$Id: failure.c,v 1.9 2003/04/25 21:11:08 kloczek Exp $") +RCSID ("$Id: failure.c,v 1.12 2005/04/12 14:12:26 kloczek Exp $") #include #include #include "defines.h" #include "faillog.h" #include "getdef.h" #include "failure.h" - #define YEAR (365L*DAY) /* * failure - make failure entry @@ -227,9 +226,12 @@ void failprint (const struct faillog *fail) if (*lasttime == ' ') lasttime++; #endif - printf (_("%d %s since last login. Last was %s on %s.\n"), + printf (ngettext("%d failure since last login.\n" + "Last was %s on %s.\n", + "%d failures since last login.\n" + "Last was %s on %s.\n", + fail->fail_cnt), fail->fail_cnt, - fail->fail_cnt > 1 ? _("failures") : _("failure"), lasttime, fail->fail_line); } diff --git a/libmisc/failure.h b/libmisc/failure.h index 1795b50d..06b4c7e2 100644 --- a/libmisc/failure.h +++ b/libmisc/failure.h @@ -1,4 +1,4 @@ -/* $Id: failure.h,v 1.2 2000/08/26 18:27:17 marekm Exp $ */ +/* $Id: failure.h,v 1.3 2005/03/31 05:14:50 kloczek Exp $ */ #ifndef _FAILURE_H_ #define _FAILURE_H_ @@ -12,7 +12,7 @@ * failure() creates a new (struct faillog) entry or updates an * existing one with the current failed login information. */ -extern void failure(uid_t, const char *, struct faillog *); +extern void failure (uid_t, const char *, struct faillog *); /* * failcheck - check for failures > allowable @@ -22,7 +22,7 @@ extern void failure(uid_t, const char *, struct faillog *); * returns FALSE to indicate that the login should be denied even though * the password is valid. */ -extern int failcheck(uid_t, struct faillog *, int); +extern int failcheck (uid_t, struct faillog *, int); /* * failprint - print line of failure information @@ -30,7 +30,7 @@ extern int failcheck(uid_t, struct faillog *, int); * failprint takes a (struct faillog) entry and formats it into a * message which is displayed at login time. */ -extern void failprint(const struct faillog *); +extern void failprint (const struct faillog *); /* * failtmp - update the cummulative failure log @@ -38,7 +38,6 @@ extern void failprint(const struct faillog *); * failtmp updates the (struct utmp) formatted failure log which * maintains a record of all login failures. */ -extern void failtmp(const struct utmp *); +extern void failtmp (const struct utmp *); #endif - diff --git a/libmisc/getdate.c b/libmisc/getdate.c index 15a27f01..65a65ed2 100644 --- a/libmisc/getdate.c +++ b/libmisc/getdate.c @@ -1,7 +1,7 @@ -/* A Bison parser, made by GNU Bison 1.875d. */ +/* A Bison parser, made by GNU Bison 1.875c. */ /* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -347,7 +347,7 @@ typedef union YYSTYPE { /* A type that is properly aligned for any stack member. */ union yyalloc { - short int yyss; + short yyss; YYSTYPE yyvs; }; @@ -357,7 +357,7 @@ union yyalloc /* The size of an array large to enough to hold all stacks, each with N elements. */ # define YYSTACK_BYTES(N) \ - ((N) * (sizeof (short int) + sizeof (YYSTYPE)) \ + ((N) * (sizeof (short) + sizeof (YYSTYPE)) \ + YYSTACK_GAP_MAXIMUM) /* Copy COUNT objects from FROM to TO. The source and destination do @@ -399,7 +399,7 @@ union yyalloc #if defined (__STDC__) || defined (__cplusplus) typedef signed char yysigned_char; #else - typedef short int yysigned_char; + typedef short yysigned_char; #endif /* YYFINAL -- State number of the termination state. */ @@ -491,7 +491,7 @@ static const yysigned_char yyrhs[] = }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ -static const unsigned short int yyrline[] = +static const unsigned short yyrline[] = { 0, 191, 191, 192, 195, 198, 201, 204, 207, 210, 213, 219, 225, 234, 240, 252, 255, 259, 264, 268, @@ -518,7 +518,7 @@ static const char *const yytname[] = # ifdef YYPRINT /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to token YYLEX-NUM. */ -static const unsigned short int yytoknum[] = +static const unsigned short yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 58, @@ -739,12 +739,12 @@ do { \ #if defined (__STDC__) || defined (__cplusplus) static void -yy_stack_print (short int *bottom, short int *top) +yy_stack_print (short *bottom, short *top) #else static void yy_stack_print (bottom, top) - short int *bottom; - short int *top; + short *bottom; + short *top; #endif { YYFPRINTF (stderr, "Stack now"); @@ -1011,9 +1011,9 @@ yyparse () to reallocate them elsewhere. */ /* The state stack. */ - short int yyssa[YYINITDEPTH]; - short int *yyss = yyssa; - register short int *yyssp; + short yyssa[YYINITDEPTH]; + short *yyss = yyssa; + register short *yyssp; /* The semantic value stack. */ YYSTYPE yyvsa[YYINITDEPTH]; @@ -1050,7 +1050,6 @@ yyparse () yyssp = yyss; yyvsp = yyvs; - goto yysetstate; /*------------------------------------------------------------. @@ -1076,7 +1075,7 @@ yyparse () these so that the &'s don't force the real ones into memory. */ YYSTYPE *yyvs1 = yyvs; - short int *yyss1 = yyss; + short *yyss1 = yyss; /* Each stack pointer address is followed by the size of the @@ -1104,7 +1103,7 @@ yyparse () yystacksize = YYMAXDEPTH; { - short int *yyss1 = yyss; + short *yyss1 = yyss; union yyalloc *yyptr = (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) @@ -1646,8 +1645,8 @@ yyreduce: } -/* Line 1010 of yacc.c. */ -#line 1651 "getdate.c" +/* Line 1000 of yacc.c. */ +#line 1650 "getdate.c" yyvsp -= yylen; yyssp -= yylen; diff --git a/libmisc/getdate.h b/libmisc/getdate.h index 691a508f..e136b388 100644 --- a/libmisc/getdate.h +++ b/libmisc/getdate.h @@ -4,5 +4,5 @@ #include #include "defines.h" -time_t get_date(const char *, const time_t *); +time_t get_date (const char *, const time_t *); #endif diff --git a/libmisc/hushed.c b/libmisc/hushed.c index eca1d709..2d2a22a7 100644 --- a/libmisc/hushed.c +++ b/libmisc/hushed.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID ("$Id: hushed.c,v 1.5 2003/04/22 10:59:22 kloczek Exp $") +RCSID ("$Id: hushed.c,v 1.6 2005/03/31 05:14:50 kloczek Exp $") #include #include #include "defines.h" @@ -64,8 +64,7 @@ int hushed (const struct passwd *pw) */ if (hushfile[0] != '/') { - snprintf (buf, sizeof (buf), "%s/%s", pw->pw_dir, - hushfile); + snprintf (buf, sizeof (buf), "%s/%s", pw->pw_dir, hushfile); return (access (buf, F_OK) == 0); } @@ -80,8 +79,7 @@ int hushed (const struct passwd *pw) for (found = 0; !found && fgets (buf, sizeof buf, fp);) { buf[strlen (buf) - 1] = '\0'; found = !strcmp (buf, - buf[0] == - '/' ? pw->pw_shell : pw->pw_name); + buf[0] == '/' ? pw->pw_shell : pw->pw_name); } (void) fclose (fp); return found; diff --git a/libmisc/isexpired.c b/libmisc/isexpired.c index ad79467c..7c8044de 100644 --- a/libmisc/isexpired.c +++ b/libmisc/isexpired.c @@ -41,7 +41,7 @@ #include #include "rcsid.h" -RCSID ("$Id: isexpired.c,v 1.11 2003/05/03 16:14:33 kloczek Exp $") +RCSID ("$Id: isexpired.c,v 1.12 2005/03/31 05:14:50 kloczek Exp $") /* * isexpired - determine if account is expired yet @@ -77,8 +77,7 @@ int isexpired (const struct passwd *pw, const struct spwd *sp) * if /etc/shadow doesn't exist, getspnam() still succeeds and * returns sp_lstchg==0 (must change password) instead of -1! */ - if (sp->sp_lstchg == 0 - && !strcmp (pw->pw_passwd, SHADOW_PASSWD_STRING)) + if (sp->sp_lstchg == 0 && !strcmp (pw->pw_passwd, SHADOW_PASSWD_STRING)) return 1; if (sp->sp_lstchg > 0 && sp->sp_max >= 0 && sp->sp_inact >= 0 && diff --git a/libmisc/limits.c b/libmisc/limits.c index 458d92b1..c19d7eb6 100644 --- a/libmisc/limits.c +++ b/libmisc/limits.c @@ -34,8 +34,10 @@ #include +#ifndef USE_PAM + #include "rcsid.h" -RCSID ("$Id: limits.c,v 1.14 2003/05/05 21:44:15 kloczek Exp $") +RCSID ("$Id: limits.c,v 1.16 2005/03/31 05:14:50 kloczek Exp $") #include #include #include @@ -248,8 +250,7 @@ static int do_user_limits (const char *buf, const char *name) case 'm': case 'M': /* RLIMIT_MEMLOCK - max locked-in-memory address space (KB) */ - retval |= - setrlimit_value (RLIMIT_MEMLOCK, pp, 1024); + retval |= setrlimit_value (RLIMIT_MEMLOCK, pp, 1024); break; #endif #ifdef RLIMIT_NOFILE @@ -398,8 +399,7 @@ void setup_limits (const struct passwd *info) exit (1); } #endif - for (cp = info->pw_gecos; cp != NULL; - cp = strchr (cp, ',')) { + for (cp = info->pw_gecos; cp != NULL; cp = strchr (cp, ',')) { if (*cp == ',') cp++; @@ -424,3 +424,5 @@ void setup_limits (const struct passwd *info) } } } + +#endif /* !USE_PAM */ diff --git a/libmisc/log.c b/libmisc/log.c index 1ad2a16c..22119f28 100644 --- a/libmisc/log.c +++ b/libmisc/log.c @@ -30,17 +30,13 @@ #include #include "rcsid.h" -RCSID ("$Id: log.c,v 1.7 2003/12/17 12:52:25 kloczek Exp $") +RCSID ("$Id: log.c,v 1.9 2005/04/02 11:31:39 kloczek Exp $") #include #include #include #include #include "defines.h" -#if HAVE_LASTLOG_H #include -#else -#include "lastlog_.h" -#endif /* * dolastlog - create lastlog entry * @@ -89,6 +85,7 @@ dolastlog (struct lastlog *ll, const struct passwd *pw, const char *line, ll_time = newlog.ll_time; time (&ll_time); + newlog.ll_time = ll_time; strncpy (newlog.ll_line, line, sizeof newlog.ll_line); #if HAVE_LL_HOST strncpy (newlog.ll_host, host, sizeof newlog.ll_host); diff --git a/libmisc/login_desrpc.c b/libmisc/login_desrpc.c deleted file mode 100644 index 80411853..00000000 --- a/libmisc/login_desrpc.c +++ /dev/null @@ -1,74 +0,0 @@ -/* Taken from logdaemon-5.0, only minimal changes. --marekm */ - -/************************************************************************ -* Copyright 1995 by Wietse Venema. All rights reserved. Individual files -* may be covered by other copyrights (as noted in the file itself.) -* -* This material was originally written and compiled by Wietse Venema at -* Eindhoven University of Technology, The Netherlands, in 1990, 1991, -* 1992, 1993, 1994 and 1995. -* -* Redistribution and use in source and binary forms are permitted -* provided that this entire copyright notice is duplicated in all such -* copies. -* -* This software is provided "as is" and without any expressed or implied -* warranties, including, without limitation, the implied warranties of -* merchantibility and fitness for any particular purpose. -************************************************************************/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#ifdef DES_RPC -#include "rcsid.h" -RCSID ("$Id: login_desrpc.c,v 1.8 2003/04/22 10:59:22 kloczek Exp $") -#include "defines.h" - /* - * Decrypt the user's secret secure RPC key and stores it into the - * keyserver. Returns 0 if successful, -1 on failure. - * - * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. - */ -#include -#include -#include -#if !(defined __GLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 0))) -/* these don't seem to be in any header file (libc-5.4.33) */ -/* but will be in glibc 2.1 and */ -extern int getnetname (char *); -extern int getsecretkey (const char *, char *, const char *); -extern int key_setsecret (const char *); -#endif - -int login_desrpc (const char *passwd) -{ - char netname[MAXNETNAMELEN + 1]; - char secretkey[HEXKEYBYTES + 1]; - - if (getnetname (netname) == 0) - return -1; - - if (getsecretkey (netname, secretkey, passwd) == 0) - return -1; - - if (secretkey[0] == 0) { - fprintf (stderr, - _ - ("Password does not decrypt secret key for %s.\n"), - netname); - return -1; - } - if (key_setsecret (secretkey) < 0) { - fprintf (stderr, - _ - ("Could not set %s's secret key: is the keyserv daemon running?\n"), - netname); - return -1; - } - return 0; -} -#else -extern int errno; /* warning: ANSI C forbids an empty source file */ -#endif diff --git a/libmisc/login_krb.c b/libmisc/login_krb.c deleted file mode 100644 index 93ca578f..00000000 --- a/libmisc/login_krb.c +++ /dev/null @@ -1,58 +0,0 @@ -/* Taken from logdaemon-5.0, only minimal changes. --marekm */ - -/************************************************************************ -* Copyright 1995 by Wietse Venema. All rights reserved. Individual files -* may be covered by other copyrights (as noted in the file itself.) -* -* This material was originally written and compiled by Wietse Venema at -* Eindhoven University of Technology, The Netherlands, in 1990, 1991, -* 1992, 1993, 1994 and 1995. -* -* Redistribution and use in source and binary forms are permitted -* provided that this entire copyright notice is duplicated in all such -* copies. -* -* This software is provided "as is" and without any expressed or implied -* warranties, including, without limitation, the implied warranties of -* merchantibility and fitness for any particular purpose. -************************************************************************/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#ifdef KERBEROS -#include "rcsid.h" -RCSID ("$Id: login_krb.c,v 1.4 2003/04/22 10:59:22 kloczek Exp $") -#include - /* - * Do an equivalent to kinit here. We need to do the kinit before trying to - * cd to the home directory, because it might be on a remote filesystem that - * uses Kerberos authentication. We also need to do this after we've - * setuid() to the user, or krb_get_pw_in_tkt() won't know where to put the - * ticket. - * - * We don't really care about whether or not it succeeds; if it fails, we'll - * just carry on bravely. - * - * NB: we assume: local realm, same username and password as supplied to login. - * - * Security note: if pp is NULL, login doesn't have the password. This is - * common when it's called by rlogind. Since this is almost always a remote - * connection, we don't want to risk asking for the password by supplying a - * NULL pp to krb_get_pw_in_tkt(), because somebody could be listening. So - * we'll just forget the whole thing. -jdd - */ -int login_kerberos (const char *username, const char *password) -{ - char realm[REALM_SZ]; - - (void) krb_get_lrealm (realm, 1); - if (password != 0) - (void) krb_get_pw_in_tkt (username, "", realm, "krbtgt", - realm, DEFAULT_TKT_LIFE, - password); -} -#else -extern int errno; /* warning: ANSI C forbids an empty source file */ -#endif /* KERBEROS */ diff --git a/libmisc/loginprompt.c b/libmisc/loginprompt.c index 5863259f..b501e6ab 100644 --- a/libmisc/loginprompt.c +++ b/libmisc/loginprompt.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID ("$Id: loginprompt.c,v 1.7 2003/04/22 10:59:22 kloczek Exp $") +RCSID ("$Id: loginprompt.c,v 1.8 2005/03/31 05:14:50 kloczek Exp $") #include #include #include @@ -144,8 +144,7 @@ void login_prompt (const char *prompt, char *name, int namesize) envp[envc] = nvar; } else { envp[envc] = xmalloc (strlen (nvar) + 32); - sprintf (envp[envc], "L%d=%s", count++, - nvar); + sprintf (envp[envc], "L%d=%s", count++, nvar); } } set_env (envc, envp); diff --git a/libmisc/motd.c b/libmisc/motd.c index 2d47f3b7..7c26f54c 100644 --- a/libmisc/motd.c +++ b/libmisc/motd.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID ("$Id: motd.c,v 1.4 2003/04/22 10:59:22 kloczek Exp $") +RCSID ("$Id: motd.c,v 1.5 2005/03/31 05:14:50 kloczek Exp $") #include #include "prototypes.h" #include "defines.h" @@ -54,8 +54,7 @@ void motd (void) strncpy (motdlist, mb, sizeof (motdlist)); motdlist[sizeof (motdlist) - 1] = '\0'; - for (mb = motdlist; (motdfile = strtok (mb, ":")) != NULL; - mb = NULL) { + for (mb = motdlist; (motdfile = strtok (mb, ":")) != NULL; mb = NULL) { if ((fp = fopen (motdfile, "r")) != NULL) { while ((c = getc (fp)) != EOF) putchar (c); diff --git a/libmisc/obscure.c b/libmisc/obscure.c index e3f8ee28..092a93ae 100644 --- a/libmisc/obscure.c +++ b/libmisc/obscure.c @@ -29,8 +29,10 @@ #include +#ifndef USE_PAM + #include "rcsid.h" -RCSID ("$Id: obscure.c,v 1.11 2003/05/05 21:44:15 kloczek Exp $") +RCSID ("$Id: obscure.c,v 1.12 2005/03/24 04:29:23 kloczek Exp $") /* * This version of obscure.c contains modifications to support "cracklib" @@ -273,3 +275,5 @@ int obscure (const char *old, const char *new, const struct passwd *pwdp) } return 1; } + +#endif /* !USE_PAM */ diff --git a/libmisc/pam_pass.c b/libmisc/pam_pass.c index dfd8bdff..2a50ed14 100644 --- a/libmisc/pam_pass.c +++ b/libmisc/pam_pass.c @@ -3,7 +3,7 @@ #ifdef USE_PAM #include "rcsid.h" -RCSID ("$Id: pam_pass.c,v 1.9 2003/07/29 09:05:39 kloczek Exp $") +RCSID ("$Id: pam_pass.c,v 1.10 2005/03/31 05:14:50 kloczek Exp $") /* * Change the user's password using PAM. Requires libpam and libpam_misc @@ -41,13 +41,12 @@ void do_pam_passwd (const char *user, int silent, int change_expired) ret = pam_chauthtok (pamh, flags); if (ret != PAM_SUCCESS) { - fprintf (stderr, _("passwd: %s\n"), - pam_strerror (pamh, ret)); + fprintf (stderr, _("passwd: %s\n"), pam_strerror (pamh, ret)); pam_end (pamh, ret); exit (10); /* XXX */ } - fputs(_("passwd: password updated successfully\n"), stderr); + fputs (_("passwd: password updated successfully\n"), stderr); pam_end (pamh, PAM_SUCCESS); } #else /* !USE_PAM */ diff --git a/libmisc/pwdcheck.c b/libmisc/pwdcheck.c index 797960f8..80582a68 100644 --- a/libmisc/pwdcheck.c +++ b/libmisc/pwdcheck.c @@ -1,7 +1,7 @@ #include #include "rcsid.h" -RCSID ("$Id: pwdcheck.c,v 1.4 2004/11/02 18:46:30 kloczek Exp $") +RCSID ("$Id: pwdcheck.c,v 1.5 2005/03/31 05:14:50 kloczek Exp $") #include "prototypes.h" #include "defines.h" #include @@ -13,8 +13,7 @@ RCSID ("$Id: pwdcheck.c,v 1.4 2004/11/02 18:46:30 kloczek Exp $") #include "pam_defs.h" #endif #define WRONGPWD2 "incorrect password for `%s'" -void -passwd_check (const char *user, const char *passwd, const char *progname) +void passwd_check (const char *user, const char *passwd, const char *progname) { #ifdef USE_PAM pam_handle_t *pamh = NULL; diff --git a/libmisc/rlogin.c b/libmisc/rlogin.c index a63cda95..ec7ff2c4 100644 --- a/libmisc/rlogin.c +++ b/libmisc/rlogin.c @@ -32,13 +32,12 @@ #ifdef RLOGIN #include "rcsid.h" -RCSID ("$Id: rlogin.c,v 1.7 2005/01/20 12:47:20 kloczek Exp $") +RCSID ("$Id: rlogin.c,v 1.9 2005/03/31 05:14:50 kloczek Exp $") #include "prototypes.h" #include "defines.h" #include #include -#include - +#include static struct { int spd_name; int spd_baud; diff --git a/libmisc/salt.c b/libmisc/salt.c index fafa429e..b198ee6f 100644 --- a/libmisc/salt.c +++ b/libmisc/salt.c @@ -8,13 +8,12 @@ #include #include "rcsid.h" -RCSID ("$Id: salt.c,v 1.6 2003/04/22 10:59:22 kloczek Exp $") +RCSID ("$Id: salt.c,v 1.7 2005/04/06 00:21:37 kloczek Exp $") +#include +#include #include "prototypes.h" #include "defines.h" -#include -#if 1 #include "getdef.h" -extern char *l64a (); /* * Generate 8 base64 ASCII characters of random salt. If MD5_CRYPT_ENAB @@ -44,21 +43,3 @@ char *crypt_make_salt (void) return result; } -#else -/* - * This is the old style random salt generator... - */ -char *crypt_make_salt (void) -{ - time_t now; - static unsigned long x; - static char result[3]; - - time (&now); - x += now + getpid () + clock (); - result[0] = i64c (((x >> 18) ^ (x >> 6)) & 077); - result[1] = i64c (((x >> 12) ^ x) & 077); - result[2] = '\0'; - return result; -} -#endif diff --git a/libmisc/setugid.c b/libmisc/setugid.c index 030975e0..9eadc564 100644 --- a/libmisc/setugid.c +++ b/libmisc/setugid.c @@ -34,7 +34,7 @@ #include #include "rcsid.h" -RCSID ("$Id: setugid.c,v 1.7 2003/04/22 10:59:22 kloczek Exp $") +RCSID ("$Id: setugid.c,v 1.9 2005/03/31 05:14:50 kloczek Exp $") #include #include #include "prototypes.h" @@ -80,12 +80,7 @@ int change_uid (const struct passwd *info) /* * Set the real UID to the UID value in the password file. */ -#ifndef BSD - if (setuid (info->pw_uid)) -#else - if (setreuid (info->pw_uid, info->pw_uid)) -#endif - { + if (setuid (info->pw_uid)) { perror ("setuid"); SYSLOG ((LOG_ERR, "bad user ID `%d' for user `%s': %m\n", (int) info->pw_uid, info->pw_name)); diff --git a/libmisc/setupenv.c b/libmisc/setupenv.c index fff04366..6b7e97bd 100644 --- a/libmisc/setupenv.c +++ b/libmisc/setupenv.c @@ -34,7 +34,7 @@ #include #include "rcsid.h" -RCSID ("$Id: setupenv.c,v 1.13 2003/05/05 21:44:15 kloczek Exp $") +RCSID ("$Id: setupenv.c,v 1.14 2005/03/31 05:14:50 kloczek Exp $") #include #include #include @@ -44,8 +44,7 @@ RCSID ("$Id: setupenv.c,v 1.13 2003/05/05 21:44:15 kloczek Exp $") #include #include "getdef.h" static void -addenv_path (const char *varname, const char *dirname, - const char *filename) +addenv_path (const char *varname, const char *dirname, const char *filename) { char *buf; diff --git a/libmisc/shell.c b/libmisc/shell.c index 3ea6e5d1..08095b1d 100644 --- a/libmisc/shell.c +++ b/libmisc/shell.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID ("$Id: shell.c,v 1.9 2003/05/05 21:49:56 kloczek Exp $") +RCSID ("$Id: shell.c,v 1.10 2005/03/31 05:14:50 kloczek Exp $") #include #include #include "prototypes.h" @@ -67,8 +67,7 @@ void shell (const char *file, const char *arg) */ if (arg == (char *) 0) { - snprintf (arg0, sizeof arg0, "-%s", - Basename ((char *) file)); + snprintf (arg0, sizeof arg0, "-%s", Basename ((char *) file)); arg = arg0; } #ifdef DEBUG diff --git a/libmisc/strtoday.c b/libmisc/strtoday.c index 3dd51b8f..4a220f45 100644 --- a/libmisc/strtoday.c +++ b/libmisc/strtoday.c @@ -34,7 +34,7 @@ #include #include "rcsid.h" -RCSID ("$Id: strtoday.c,v 1.9 2003/04/22 10:59:22 kloczek Exp $") +RCSID ("$Id: strtoday.c,v 1.10 2005/03/31 05:14:50 kloczek Exp $") #include "defines.h" #ifndef USE_GETDATE #define USE_GETDATE 1 @@ -190,8 +190,7 @@ long strtoday (const char *str) */ total = (long) ((year - 1970) * 365L) + (((year + 1) - 1970) / 4); - total += (long) juldays[month] + (month > 2 - && (year % 4) == 0 ? 1 : 0); + total += (long) juldays[month] + (month > 2 && (year % 4) == 0 ? 1 : 0); total += (long) day - 1; return total; diff --git a/libmisc/sulog.c b/libmisc/sulog.c index 3ed429fe..3a5fa916 100644 --- a/libmisc/sulog.c +++ b/libmisc/sulog.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID ("$Id: sulog.c,v 1.7 2003/04/22 10:59:22 kloczek Exp $") +RCSID ("$Id: sulog.c,v 1.8 2005/03/31 05:14:50 kloczek Exp $") #include #include #include @@ -41,8 +41,7 @@ RCSID ("$Id: sulog.c,v 1.7 2003/04/22 10:59:22 kloczek Exp $") /* * sulog - log a SU command execution result */ -void -sulog (const char *tty, int success, const char *oldname, const char *name) +void sulog (const char *tty, int success, const char *oldname, const char *name) { char *sulog_file; time_t now; diff --git a/libmisc/ttytype.c b/libmisc/ttytype.c index f2f8a01c..56250a3c 100644 --- a/libmisc/ttytype.c +++ b/libmisc/ttytype.c @@ -30,16 +30,14 @@ #include #include "rcsid.h" -RCSID ("$Id: ttytype.c,v 1.7 2004/08/18 09:53:58 kloczek Exp $") +RCSID ("$Id: ttytype.c,v 1.9 2005/03/31 05:14:50 kloczek Exp $") #include #include "prototypes.h" #include "defines.h" #include "getdef.h" - /* * ttytype - set ttytype from port to terminal type mapping database */ - void ttytype (const char *line) { FILE *fp; @@ -67,16 +65,9 @@ void ttytype (const char *line) if ((cp = strchr (buf, '\n'))) *cp = '\0'; -#if defined(SUN) || defined(BSD) || defined(SUN4) - if ((sscanf (buf, "%s \"%*[^\"]\" %s", port, type) == 2 || - sscanf (buf, "%s %*s %s", port, type) == 2) && - strcmp (line, port) == 0) - break; -#else /* USG */ if (sscanf (buf, "%s %s", type, port) == 2 && strcmp (line, port) == 0) break; -#endif } if (!feof (fp) && !ferror (fp)) addenv ("TERM", type); diff --git a/libmisc/utmp.c b/libmisc/utmp.c index dffb69ef..da810dd9 100644 --- a/libmisc/utmp.c +++ b/libmisc/utmp.c @@ -41,7 +41,7 @@ #include #include "rcsid.h" -RCSID ("$Id: utmp.c,v 1.14 2003/12/17 12:52:25 kloczek Exp $") +RCSID ("$Id: utmp.c,v 1.15 2005/03/31 05:14:50 kloczek Exp $") #if HAVE_UTMPX_H struct utmpx utxent; #endif @@ -108,8 +108,7 @@ void checkutmp (int picky) utent.ut_pid = pid; strncpy (utent.ut_line, line, sizeof utent.ut_line); /* XXX - assumes /dev/tty?? */ - strncpy (utent.ut_id, utent.ut_line + 3, - sizeof utent.ut_id); + strncpy (utent.ut_id, utent.ut_line + 3, sizeof utent.ut_id); strcpy (utent.ut_user, "LOGIN"); utent.ut_time = time (NULL); } @@ -175,11 +174,9 @@ void checkutmp (int picky) } if (strncmp (line, "/dev/", 5) == 0) line += 5; - strncpy (utent.ut_line, line, - sizeof utent.ut_line); + strncpy (utent.ut_line, line, sizeof utent.ut_line); #if HAVE_UTMPX_H - strncpy (utxent.ut_line, line, - sizeof utxent.ut_line); + strncpy (utxent.ut_line, line, sizeof utxent.ut_line); #endif } } else { @@ -201,15 +198,13 @@ void checkutmp (int picky) #if HAVE_UTMPX_H strncpy (utxent.ut_line, line, sizeof utxent.ut_line); if ((utx = getutxline (&utxent))) - strncpy (utxent.ut_id, utx->ut_id, - sizeof utxent.ut_id); + strncpy (utxent.ut_id, utx->ut_id, sizeof utxent.ut_id); strcpy (utxent.ut_user, "LOGIN"); utxent.ut_pid = utent.ut_pid; utxent.ut_type = utent.ut_type; if (sizeof (utxent.ut_tv) == sizeof (struct timeval)) - gettimeofday ((struct timeval *) &utxent.ut_tv, - NULL); + gettimeofday ((struct timeval *) &utxent.ut_tv, NULL); else { struct timeval tv; @@ -393,8 +388,7 @@ void setutmp (const char *name, const char *line, const char *host) } utline.ut_time = utxline.ut_tv.tv_sec; - strncpy (utxline.ut_host, host ? host : "", - sizeof utxline.ut_host); + strncpy (utxline.ut_host, host ? host : "", sizeof utxline.ut_host); pututxline (&utxline); pututline (&utline); diff --git a/libmisc/xmalloc.c b/libmisc/xmalloc.c index 56594da2..d21592cc 100644 --- a/libmisc/xmalloc.c +++ b/libmisc/xmalloc.c @@ -10,10 +10,9 @@ #include #include "rcsid.h" -RCSID ("$Id: xmalloc.c,v 1.5 2004/05/06 21:31:33 kloczek Exp $") +RCSID ("$Id: xmalloc.c,v 1.6 2005/03/31 05:14:50 kloczek Exp $") #include #include "defines.h" - char *xmalloc (size_t size) { char *ptr; diff --git a/ltmain.sh b/ltmain.sh index 12f39abc..23f82e3b 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -33,6 +33,9 @@ basename="s,^.*/,,g" # function. progpath="$0" +# RH: define SED for historic ltconfig's generated by Libtool 1.3 +[ -z "$SED" ] && SED=sed + # The name of this program: progname=`echo "$progpath" | $SED $basename` modename="$progname" @@ -43,14 +46,9 @@ EXIT_FAILURE=1 PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.5.10 -TIMESTAMP=" (1.1220.2.131 2004/09/19 12:46:56)" +VERSION=1.5.6 +TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42)" -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes. -if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi # Check that we have a working $echo. if test "X$1" = X--no-reexec; then @@ -240,122 +238,6 @@ func_infer_tag () { esac fi } - - -# func_extract_archives gentop oldlib ... -func_extract_archives () { - my_gentop="$1"; shift - my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" - my_status="" - - $show "${rm}r $my_gentop" - $run ${rm}r "$my_gentop" - $show "$mkdir $my_gentop" - $run $mkdir "$my_gentop" - my_status=$? - if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then - exit $my_status - fi - - for my_xlib in $my_oldlibs; do - # Extract the objects. - case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; - *) my_xabs=`pwd`"/$my_xlib" ;; - esac - my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` - my_xdir="$my_gentop/$my_xlib" - - $show "${rm}r $my_xdir" - $run ${rm}r "$my_xdir" - $show "$mkdir $my_xdir" - $run $mkdir "$my_xdir" - status=$? - if test "$status" -ne 0 && test ! -d "$my_xdir"; then - exit $status - fi - case $host in - *-darwin*) - $show "Extracting $my_xabs" - # Do not bother doing anything if just a dry run - if test -z "$run"; then - darwin_orig_dir=`pwd` - cd $my_xdir || exit $? - darwin_archive=$my_xabs - darwin_curdir=`pwd` - darwin_base_archive=`basename $darwin_archive` - darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null` - if test -n "$darwin_arches"; then - darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'` - darwin_arch= - $show "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - # Remove the table of contents from the thin files. - $AR -d "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" __.SYMDEF 2>/dev/null || true - $AR -d "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" __.SYMDEF\ SORTED 2>/dev/null || true - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - $AR -xo "${darwin_base_archive}" - rm "${darwin_base_archive}" - cd "$darwin_curdir" - done # $darwin_arches - ## Okay now we have a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f | xargs basename | sort -u | $NL2SP` - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` - lipo -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - rm -rf unfat-$$ - cd "$darwin_orig_dir" - else - cd $darwin_orig_dir - (cd $my_xdir && $AR x $my_xabs) || exit $? - fi # $darwin_arches - fi # $run - ;; - *) - # We will extract separately just the conflicting names and we will - # no longer touch any unique names. It is faster to leave these - # extract automatically by $AR in one run. - $show "(cd $my_xdir && $AR x $my_xabs)" - $run eval "(cd \$my_xdir && $AR x \$my_xabs)" || exit $? - if ($AR t "$my_xabs" | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 - $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 - $AR t "$my_xabs" | sort | uniq -cd | while read -r count name - do - i=1 - while test "$i" -le "$count" - do - # Put our $i before any first dot (extension) - # Never overwrite any file - name_to="$name" - while test "X$name_to" = "X$name" || test -f "$my_xdir/$name_to" - do - name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` - done - $show "(cd $my_xdir && $AR xN $i $my_xabs '$name' && $mv '$name' '$name_to')" - $run eval "(cd \$my_xdir && $AR xN $i \$my_xabs '$name' && $mv '$name' '$name_to')" || exit $? - i=`expr $i + 1` - done - done - fi - ;; - esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` - done - - func_extract_archives_result="$my_oldobjs" -} # End of Shell function definitions ##################################### @@ -2099,22 +1981,7 @@ EOF fi case $linkmode in lib) - valid_a_lib=no - case $deplibs_check_method in - match_pattern*) - set dummy $deplibs_check_method - match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` - if eval $echo \"$deplib\" 2>/dev/null \ - | $SED 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes - fi - ;; - pass_all) - valid_a_lib=yes - ;; - esac - if test "$valid_a_lib" != yes; then + if test "$deplibs_check_method" != pass_all; then $echo $echo "*** Warning: Trying to link with static lib archive $deplib." $echo "*** I have the capability to make that library automatically link in when" @@ -2287,17 +2154,10 @@ EOF absdir="$libdir" fi else - if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" - fi + dir="$ladir/$objdir" + absdir="$abs_ladir/$objdir" + # Remove this search path later + notinst_path="$notinst_path $abs_ladir" fi # $installed = yes name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` @@ -2518,7 +2378,6 @@ EOF if test "$linkmode" = prog || test "$mode" != relink; then add_shlibpath= - add_prefix_dir= add_dir= add= lib_linked=yes @@ -2644,22 +2503,10 @@ EOF add="-l$name" fi - if test -n "$inst_prefix_dir"; then - case "$libdir" in - [\\/]*) - add_prefix_dir="-L$inst_prefix_dir$libdir" - ;; - esac - fi - - # add_prefix_dir must be appended instead, otherwise it can - # possibly be overrided by any hardcoded -L/... path in deplibs if test "$linkmode" = prog; then - test -n "$add_prefix_dir" && finalize_deplibs="$finalize_deplibs $add_prefix_dir" test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" test -n "$add" && finalize_deplibs="$add $finalize_deplibs" else - test -n "$add_prefix_dir" && deplibs="$deplibs $add_prefix_dir" test -n "$add_dir" && deplibs="$add_dir $deplibs" test -n "$add" && deplibs="$add $deplibs" fi @@ -3097,7 +2944,7 @@ EOF # Check that each of the things are valid numbers. case $current in - 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; + [0-9]*) ;; *) $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 @@ -3106,7 +2953,7 @@ EOF esac case $revision in - 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; + [0-9]*) ;; *) $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 @@ -3115,7 +2962,7 @@ EOF esac case $age in - 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; + [0-9]*) ;; *) $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 @@ -3143,7 +2990,7 @@ EOF versuffix="$major.$age.$revision" # Darwin ld doesn't like 0 for these options... minor_current=`expr $current + 1` - verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" ;; freebsd-aout) @@ -3831,13 +3678,67 @@ EOF eval libobjs=\"\$libobjs $whole_archive_flag_spec\" else gentop="$output_objdir/${outputname}x" + $show "${rm}r $gentop" + $run ${rm}r "$gentop" + $show "$mkdir $gentop" + $run $mkdir "$gentop" + status=$? + if test "$status" -ne 0 && test ! -d "$gentop"; then + exit $status + fi generated="$generated $gentop" - func_extract_archives $gentop $convenience - libobjs="$libobjs $func_extract_archives_result" + for xlib in $convenience; do + # Extract the objects. + case $xlib in + [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; + *) xabs=`pwd`"/$xlib" ;; + esac + xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` + xdir="$gentop/$xlib" + + $show "${rm}r $xdir" + $run ${rm}r "$xdir" + $show "$mkdir $xdir" + $run $mkdir "$xdir" + status=$? + if test "$status" -ne 0 && test ! -d "$xdir"; then + exit $status + fi + # We will extract separately just the conflicting names and we will no + # longer touch any unique names. It is faster to leave these extract + # automatically by $AR in one run. + $show "(cd $xdir && $AR x $xabs)" + $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? + if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then + : + else + $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 + $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 + $AR t "$xabs" | sort | uniq -cd | while read -r count name + do + i=1 + while test "$i" -le "$count" + do + # Put our $i before any first dot (extension) + # Never overwrite any file + name_to="$name" + while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" + do + name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` + done + $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" + $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? + i=`expr $i + 1` + done + done + fi + + libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` + done fi fi - + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" linker_flags="$linker_flags $flag" @@ -4075,10 +3976,64 @@ EOF eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" else gentop="$output_objdir/${obj}x" + $show "${rm}r $gentop" + $run ${rm}r "$gentop" + $show "$mkdir $gentop" + $run $mkdir "$gentop" + status=$? + if test "$status" -ne 0 && test ! -d "$gentop"; then + exit $status + fi generated="$generated $gentop" - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" + for xlib in $convenience; do + # Extract the objects. + case $xlib in + [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; + *) xabs=`pwd`"/$xlib" ;; + esac + xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` + xdir="$gentop/$xlib" + + $show "${rm}r $xdir" + $run ${rm}r "$xdir" + $show "$mkdir $xdir" + $run $mkdir "$xdir" + status=$? + if test "$status" -ne 0 && test ! -d "$xdir"; then + exit $status + fi + # We will extract separately just the conflicting names and we will no + # longer touch any unique names. It is faster to leave these extract + # automatically by $AR in one run. + $show "(cd $xdir && $AR x $xabs)" + $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? + if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then + : + else + $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 + $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 + $AR t "$xabs" | sort | uniq -cd | while read -r count name + do + i=1 + while test "$i" -le "$count" + do + # Put our $i before any first dot (extension) + # Never overwrite any file + name_to="$name" + while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" + do + name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` + done + $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" + $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? + i=`expr $i + 1` + done + done + fi + + reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` + done fi fi @@ -4859,7 +4814,7 @@ sed_quote_subst='$sed_quote_subst' # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi relink_command=\"$relink_command\" @@ -5036,10 +4991,65 @@ fi\ if test -n "$addlibs"; then gentop="$output_objdir/${outputname}x" + $show "${rm}r $gentop" + $run ${rm}r "$gentop" + $show "$mkdir $gentop" + $run $mkdir "$gentop" + status=$? + if test "$status" -ne 0 && test ! -d "$gentop"; then + exit $status + fi generated="$generated $gentop" - func_extract_archives $gentop $addlibs - oldobjs="$oldobjs $func_extract_archives_result" + # Add in members from convenience archives. + for xlib in $addlibs; do + # Extract the objects. + case $xlib in + [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; + *) xabs=`pwd`"/$xlib" ;; + esac + xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` + xdir="$gentop/$xlib" + + $show "${rm}r $xdir" + $run ${rm}r "$xdir" + $show "$mkdir $xdir" + $run $mkdir "$xdir" + status=$? + if test "$status" -ne 0 && test ! -d "$xdir"; then + exit $status + fi + # We will extract separately just the conflicting names and we will no + # longer touch any unique names. It is faster to leave these extract + # automatically by $AR in one run. + $show "(cd $xdir && $AR x $xabs)" + $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? + if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then + : + else + $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 + $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 + $AR t "$xabs" | sort | uniq -cd | while read -r count name + do + i=1 + while test "$i" -le "$count" + do + # Put our $i before any first dot (extension) + # Never overwrite any file + name_to="$name" + while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" + do + name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` + done + $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" + $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? + i=`expr $i + 1` + done + done + fi + + oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP` + done fi # Do each command in the archive commands. @@ -5684,13 +5694,9 @@ relink_command=\"$relink_command\"" if test "$finalize" = yes && test -z "$run"; then tmpdir="/tmp" test -n "$TMPDIR" && tmpdir="$TMPDIR" + tmpdir="$tmpdir/libtool-$$" save_umask=`umask` umask 0077 - tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null` - if test $? = 0 ; then : - else - tmpdir="$tmpdir/libtool-$$" - fi if $mkdir "$tmpdir"; then umask $save_umask else diff --git a/man/Makefile.am b/man/Makefile.am index 27837704..9e52c3b0 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -19,6 +19,7 @@ man_MANS = \ grpck.8 \ grpconv.8 \ grpunconv.8 \ + gshadow.5 \ lastlog.8 \ limits.5 \ login.1 \ diff --git a/man/Makefile.in b/man/Makefile.in index c1d8be61..245a11a9 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.4 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -99,17 +99,16 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ 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@ @@ -203,6 +202,7 @@ man_MANS = \ grpck.8 \ grpconv.8 \ grpunconv.8 \ + gshadow.5 \ lastlog.8 \ limits.5 \ login.1 \ @@ -247,9 +247,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/Makefile + $(AUTOMAKE) --foreign man/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -465,7 +465,13 @@ uninstall-man8: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @set fnord $$MAKEFLAGS; amf=$$2; \ + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -477,7 +483,7 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ @@ -485,7 +491,13 @@ $(RECURSIVE_TARGETS): mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - @set fnord $$MAKEFLAGS; amf=$$2; \ + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ @@ -506,7 +518,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ diff --git a/man/chage.1 b/man/chage.1 index 69564d83..57c89dd2 100644 --- a/man/chage.1 +++ b/man/chage.1 @@ -1,4 +1,4 @@ -.\"$Id: chage.1,v 1.15 2004/12/11 20:05:01 kloczek Exp $ +.\"$Id: chage.1,v 1.24 2005/04/25 15:15:17 kloczek Exp $ .\" Copyright 1990 - 1994 Julianne Frances Haugh .\" All rights reserved. .\" @@ -30,51 +30,48 @@ chage \- change user password expiry information .SH SYNOPSIS .TP 6 -\fBchage\fR -[\fB-m \fImindays\fR] [\fB-M \fImaxdays\fR] -[\fB-d \fIlastday\fR] [\fB-I \fIinactive\fR] -.br -[\fB-E \fIexpiredate\fR] [\fB-W \fIwarndays\fR] \fIuser\fR +\fBchage\fR [\fB\-m\fR \fImindays\fR] [\fB\-M\fR \fImaxdays\fR] [\fB\-d\fR \fIlastday\fR] [\fB\-I\fR \fIinactive\fR] +[\fB\-E\fR \fIexpiredate\fR] [\fB\-W\fR \fIwarndays\fR] \fIuser\fR .TP 6 -\fBchage\fR -\fB-l \fIuser\fR +\fBchage\fR \fB\-l\fR \fIuser\fR .SH DESCRIPTION -\fBchage\fR changes the number of days between password changes and the date -of the last password change. This information is used by the system to -determine when a user must change her password. +\fBchage\fR command changes the number of days between password changes and +the date of the last password change. This information is used by the system +to determine when a user must change her password. .PP The \fBchage\fR command is restricted to the root user, except for the -\fB-l\fR option, which may be used by an unprivileged user to determine +\fB\-l\fR option, which may be used by an unprivileged user to determine when her password or account is due to expire. .SH OPTIONS The options which apply to the \fBchage\fR command are: -.IP "\fB-d\fR \fIlastday\fR" +.IP "\fB\-d\fR \fIlastday\fR" Set the number of days since January 1st, 1970 when the password was last -changed. The date may also be expressed in the format YYYY-MM-DD (or the +changed. The date may also be expressed in the format YYYY\-MM\-DD (or the format more commonly used in your area). -.IP "\fB-E\fR \fIexpiredate\fR" +.IP "\fB\-E\fR \fIexpiredate\fR" Set the date on which the user's account will no longer be accessible. The \fIexpiredate\fR option is the number of days since January 1, 1970 on which the accounted is locked. The date may also be expressed in the format -YYYY-MM-DD (or the format more commonly used in your area). A user whose +YYYY\-MM\-DD (or the format more commonly used in your area). A user whose account is locked must contact the system administrator before being able to -use the system again. -.IP "\fB-I\fR \fIinactive\fR" +use the system again. Passing the number \fI-1\fR as the \fIexpiredate\fR will +remove an accounts expiration date. +.IP "\fB\-I\fR \fIinactive\fR" Set the number of days of inactivity after a password has expired before the account is locked. The \fIinactive\fR option is the number of days of inactivity. A value of 0 disables this feature. A user whose account is locked must contact the system administrator before being able to use the system again. -.IP "\fB-m\fR \fImindays\fR" +.IP "\fB\-m\fR \fImindays\fR" Set the minimum number of days between password changes. A value of zero for this field indicates that the user may change her password at any time. -.IP "\fB-M\fR \fImaxdays\fR" +.IP "\fB\-M\fR \fImaxdays\fR" Set maximum number of days during which a password is valid. When \fImaxdays\fR plus fIlastday\fR is less than the current day, the user will be required to change her password before being able to use her account. -This occurrence can be planned for in advance by use of the \fB-W\fR option, +This occurrence can be planned for in advance by use of the \fB\-W\fR option, which provides the user with advance warning. -.IP "\fB-W\fR \fIwarndays\fR" +.IP "\fB\-W\fR \fIwarndays\fR" Set the number of days of warning before a password change is required. The \fIwarndays\fR option is the number of days prior to the password expiring that a user will be warned her password is about to expire. @@ -89,9 +86,9 @@ The \fBchage\fR program requires shadow password file to be available. Its functionality is not available when passwords are stored in the passwd file. .SH FILES -\fI/etc/passwd\fR \ - user account information +\fI/etc/passwd\fR \- user account information .br -\fI/etc/shadow\fR \ - shadow user account information +\fI/etc/shadow\fR \- secure user account information .SH SEE ALSO .BR passwd (5), .BR shadow (5) diff --git a/man/chfn.1 b/man/chfn.1 index 5b5241cb..6ea06db6 100644 --- a/man/chfn.1 +++ b/man/chfn.1 @@ -1,4 +1,4 @@ -.\"$Id: chfn.1,v 1.11 2004/12/11 20:05:01 kloczek Exp $ +.\"$Id: chfn.1,v 1.15 2005/04/05 18:47:50 kloczek Exp $ .\" Copyright 1990 - 1994 Julianne Frances Haugh .\" All rights reserved. .\" @@ -31,16 +31,14 @@ chfn \- change real user name and information .SH SYNOPSIS .TP 5 \fBchfn\fR -[\fB-f \fIfull_name\fR] [\fB-r \fIroom_no\fR] -.br -[\fB-w \fIwork_ph\fR] [\fB-h \fIhome_ph\fR] [\fB-o \fIother\fR] +[\fB\-f\fR \fIfull_name\fR] [\fB\-r\fR \fIroom_no\fR] [\fB\-w\fR \fIwork_ph\fR] [\fB\-h\fR \fIhome_ph\fR] [\fB\-o\fR \fIother\fR] [\fIuser\fR] .SH DESCRIPTION \fBchfn\fR changes user fullname, office number, office extension, and home phone number information for a user's account. This information is typically printed by \fBfinger\fR(1) and similar programs. A normal user may only change the fields for her own account, the super user may change -the fields for any account. Also, only the super user may use the \fB-o\fR +the fields for any account. Also, only the super user may use the \fB\-o\fR option to change the undefined portions of the GECOS field. .PP The only restriction placed on the contents of the fields is that no control @@ -54,7 +52,7 @@ Enter the new value to change the field, or leave the line blank to use the current value. The current value is displayed between a pair of \fB[ ]\fR marks. Without options, chfn prompts for the current user account. .SH FILES -\fI/etc/passwd\fR \- user account information +\fI/etc/passwd\fR \- user account information .SH SEE ALSO .BR passwd (5) .SH AUTHOR diff --git a/man/chpasswd.8 b/man/chpasswd.8 index 3828b8c3..eb6770dd 100644 --- a/man/chpasswd.8 +++ b/man/chpasswd.8 @@ -1,4 +1,4 @@ -.\"$Id: chpasswd.8,v 1.17 2004/12/12 20:49:52 kloczek Exp $ +.\"$Id: chpasswd.8,v 1.18 2005/04/02 16:10:23 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -27,7 +27,7 @@ .\" SUCH DAMAGE. .TH CHPASSWD 8 .SH NAME -chpasswd - update passwords in batch mode +chpasswd \- update passwords in batch mode .SH SYNOPSIS \fBchpasswd\fR [\fBoptions\fR] .SH DESCRIPTION @@ -37,18 +37,18 @@ line is of the format: .sp 1 \fIuser_name\fR:\fIpassword\fR .sp 1 -By default the supplied password must be in clear-text. Default encription +By default the supplied password must be in clear\-text. Default encription algoritm is DES. Also the password age will be updated, if present. .PP This command is intended to be used in a large system environment where many accounts are created at a single time. .SH OPTIONS The options which apply to the \fBchpasswd\fR command are: -.IP "\fB-e\fR, \fB--encrypted\fR" +.IP "\fB\-e\fR, \fB\-\-encrypted\fR" Supplied passwords are in encrypted form. -.IP "\fB-h\fR, \fB--help\fR" +.IP "\fB\-h\fR, \fB\-\-help\fR" Display help message and exit. -.IP "\fB-m\fR, \fB--md5\fR" +.IP "\fB\-m\fR, \fB\-\-md5\fR" Use MD5 encryption instead DES when the supplied passwords are not encrypted. .SH CAVEATS Remember keep protected for reading by others fille passed to standard input diff --git a/man/chsh.1 b/man/chsh.1 index 8f059d4b..f988b076 100644 --- a/man/chsh.1 +++ b/man/chsh.1 @@ -1,4 +1,4 @@ -.\"$Id: chsh.1,v 1.11 2004/11/02 19:28:31 kloczek Exp $ +.\"$Id: chsh.1,v 1.13 2005/04/02 16:10:23 kloczek Exp $ .\" Copyright 1990, Julianne Frances Haugh .\" All rights reserved. .\" @@ -30,7 +30,7 @@ chsh \- change login shell .SH SYNOPSIS .TP 5 -\fBchsh\fR [\fB-s \fIlogin_shell\fR] [\fIuser\fR] +\fBchsh\fR [\fB\-s\fR \fIlogin_shell\fR] [\fIuser\fR] .SH DESCRIPTION \fBchsh\fR changes the user login shell. This determines the name of the user's initial login command. A normal user may only change the login shell @@ -38,7 +38,7 @@ for her own account, the super user may change the login shell for any account. .PP The only restrictions placed on the login shell is that the command name -must be listed in \fI/etc/shells\fR, unless the invoker is the super-user, +must be listed in \fI/etc/shells\fR, unless the invoker is the super\-user, and then any value may be added. An account with a restricted login shell may not change her login shell. For this reason, placing \fB/bin/rsh\fR in \fI/etc/shells\fR is discouraged since accidentally changing to a restricted @@ -46,7 +46,7 @@ shell would prevent the user from every changing her login shell back to its original value. .PP .SH OPTIONS -If the \fB-s\fR option is not selected, \fBchsh\fR operates in an +If the \fB\-s\fR option is not selected, \fBchsh\fR operates in an interactive fashion, prompting the user with the current login shell. Enter the new value to change the shell, or leave the line blank to use the current one. The current shell is displayed between a pair of \fB[ ]\fR diff --git a/man/cs/Makefile.am b/man/cs/Makefile.am index 3723d04b..8d46af45 100644 --- a/man/cs/Makefile.am +++ b/man/cs/Makefile.am @@ -2,8 +2,11 @@ mandir = @mandir@/cs man_MANS = \ + groups.1 \ id.1 \ + lastlog.8 \ passwd.5 \ - shadow.5 + shadow.5 \ + su.1 EXTRA_DIST = $(man_MANS) diff --git a/man/cs/Makefile.in b/man/cs/Makefile.in index 9352652c..49a4fad2 100644 --- a/man/cs/Makefile.in +++ b/man/cs/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.4 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -47,8 +47,10 @@ CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = man1dir = $(mandir)/man1 -am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" +am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \ + "$(DESTDIR)$(man8dir)" man5dir = $(mandir)/man5 +man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -87,17 +89,16 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ 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@ @@ -172,9 +173,12 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ man_MANS = \ + groups.1 \ id.1 \ + lastlog.8 \ passwd.5 \ - shadow.5 + shadow.5 \ + su.1 EXTRA_DIST = $(man_MANS) all: all-am @@ -189,9 +193,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/cs/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/cs/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/cs/Makefile + $(AUTOMAKE) --foreign man/cs/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -309,6 +313,51 @@ uninstall-man5: echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \ rm -f "$(DESTDIR)$(man5dir)/$$inst"; \ done +install-man8: $(man8_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)" + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \ + done +uninstall-man8: + @$(NORMAL_UNINSTALL) + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man8dir)/$$inst"; \ + done tags: TAGS TAGS: @@ -347,7 +396,7 @@ check-am: all-am check: check-am all-am: Makefile $(MANS) installdirs: - for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)"; do \ + for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -398,7 +447,7 @@ install-exec-am: install-info: install-info-am -install-man: install-man1 install-man5 +install-man: install-man1 install-man5 install-man8 installcheck-am: @@ -420,18 +469,19 @@ ps-am: uninstall-am: uninstall-info-am uninstall-man -uninstall-man: uninstall-man1 uninstall-man5 +uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-exec install-exec-am \ install-info install-info-am install-man install-man1 \ - install-man5 install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-info-am \ - uninstall-man uninstall-man1 uninstall-man5 + install-man5 install-man8 install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am uninstall-man uninstall-man1 uninstall-man5 \ + uninstall-man8 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/man/cs/groups.1 b/man/cs/groups.1 new file mode 100644 index 00000000..6de30064 --- /dev/null +++ b/man/cs/groups.1 @@ -0,0 +1,29 @@ +.TH GROUPS 1 "GNU Shell Utilities" "FSF" \" \-*\- nroff \-*\- +.do hla cs +.do hpf hyphen.cs +.SH JM冇O +groups \- vyp竁e skupiny, jich je u養vatel 鋩enem +.SH POU埋T +\fBgroups\fR [\fIu養vatel...\fR] +.SH POPIS +Tato dokumentace nen d嫮e udr駟v嫕a a m躨e bt nep鷫sn nebo nepln. +Autoritativn璥 zdrojem je Texinfo dokumentace. +.PP +Tato manu嫮ov str嫕ka popisuje GNU verzi p齶kazu +.BR groups . +P齶kaz +.B groups +vyp竁e jm幯a v鈹ch skupin, v nich je zadan \fIu養vatel\fR nebo aktu嫮n proces, +pokud u養vatel nen zad嫕, 鋩enem. Pokud jsou zad嫕a jm幯a u養vatel, potom bude +jm幯o ka鞏嶭o z u養vatel vyps嫕o p鷫d seznam skupin, jich je 鋩enem. +.PP +Seznam skupin je ekvivalentn s vstupem p齶kazu `id \-Gn'. +.SH VOLBY +Kdy je GNU p齶kaz \fBgroups\fR vyvol嫕 pr嫛 s jedn璥 parametrem, +jsou rozpozn嫛嫕y n嫳leduj獳 volby: +.TP +.I "\-\-help" +Vyp竁e n嫛od k pou養t na standardn vstup a bezchybn skon鴈. +.TP +.I "\-\-version" +Vyp竁e 鴈slo verze na standardn vstup a bezchybn skon鴈. diff --git a/man/cs/id.1 b/man/cs/id.1 index de77930a..3a2b1437 100644 --- a/man/cs/id.1 +++ b/man/cs/id.1 @@ -1,4 +1,4 @@ -.TH ID 1 "GNU Shell Utilities" "FSF" \" -*- nroff -*- +.TH ID 1 "GNU Shell Utilities" "FSF" \" \-*\- nroff \-*\- .do hla cs .do hpf hyphen.cs .SH JM冇O diff --git a/man/cs/lastlog.8 b/man/cs/lastlog.8 new file mode 100644 index 00000000..6591c8b8 --- /dev/null +++ b/man/cs/lastlog.8 @@ -0,0 +1,40 @@ +.\" @(#)lastlog.8 3.3 08:24:58 29 Sep 1993 (National Guard Release) +.\" $Id: lastlog.8,v 1.2 2005/04/05 19:08:52 kloczek Exp $ +.\" +.TH LASTLOG 8 +.SH JM冇O +lastlog \- prozkoum soubor lastlog +.SH SYNTAXE +.B lastlog +.RB [ \-u +.IR p鷡hla雊vac燡-jm幯o ] +.RB [ \-t +.IR dny ] +.SH POPIS +\fBlastlog\fR set齶d a zobraz obsah souboru +\fI/var/log/lastlog\fR, +kter obsahuje z嫙namy o p鷡hla雊v嫕 a odhla雊v嫕 u養vatel v syst幦u. +Zobraz se \fBp鷡hla雊vac jm幯o\fR, \fBjm幯o termin嫮u\fR a \fB醀s posledn璫o +p鷡hla鈹n燡fR. +Standardn (tj. bez dal寤ch voleb) lastlog zobraz z嫙namy set齶d髶 +podle 鴈sla UID. +Pou養t p鷫p璯a鋀 \fB\-u \fIp鷡hla雊vac燡-jm幯o\fR +zp鑸ob, 頡 bude vyti靖髶 pouze posledn z嫙nam o p鷡hl廜en p齶slu雉嶭o u養vatele. +Zad嫕璥 \fB\-t \fIdny\fR se zobraz pouze +ta p鷡hl廜en, kter jsou d齶v骹寤 ne zadan \fIdny\fR. +Parametr \fB\-t\fR p鷫kryje p齶padn parametr \fB\-u\fR. +.PP +Pokud se u養vatel je靖 nikdy nep鷡hl嫳il, zobraz se zpr嫛a \fB"**Never logged in**"\fR (Nikdy nep鷡hl廜en) +m疄to jm幯a termin嫮u a 醀su. +.SH SOUBORY +/var/log/lastlog \- soubor se z嫙namy o p鷡hl廜en a odhl廜en +.SH N簍ITKY +Velk rozd璱y v UID 鴈slech jsou zp鑸obeny t璥, 頡 lastlog program b儩el dlouho bez +vstupu na obrazovku (nap. mmdf=800 a posledn uid=170, program se bude +jevit jako s uid 171\-799). +.SH AUTO陫 +Julianne Frances Haugh (jfh@austin.ibm.com) +.br +Phillip Street +.SH P閆LO埋L +Ond鷫j Pavl膻ek (mox@post.cz). diff --git a/man/cs/passwd.5 b/man/cs/passwd.5 index a0d9fd6c..42baa690 100644 --- a/man/cs/passwd.5 +++ b/man/cs/passwd.5 @@ -1,4 +1,4 @@ -.TH PASSWD 5 "19. b鷫zna 1997" "Linux" "Linux - p齶ru鋘a program嫢ora" +.TH PASSWD 5 "19. b鷫zna 1997" "Linux" "Linux \- p齶ru鋘a program嫢ora" .do hla cs .do hpf hyphen.cs .SH JM冇O diff --git a/man/cs/shadow.5 b/man/cs/shadow.5 index 44ed2c74..a7c79908 100644 --- a/man/cs/shadow.5 +++ b/man/cs/shadow.5 @@ -46,7 +46,7 @@ vypr Tyto informace o heslu a dob jeho platnosti maj prioritu p鷫d informacemi ulo頡nmi v souboru \fB/etc/passwd\fR. .PP -Tento soubor nesm bt 鋱teln 鸅dnmi u養vateli, m-li bt +Tento soubor nesm bt 鋱teln 鸅dnmi u養vateli, m塿-li bt ochrana hesel 鋱nn. .SH SOUBORY \fI/etc/passwd\fR \- informace o u養vatelskch 鋈ech diff --git a/man/cs/su.1 b/man/cs/su.1 new file mode 100644 index 00000000..8b30ac78 --- /dev/null +++ b/man/cs/su.1 @@ -0,0 +1,111 @@ +.TH SU 1 "GNU Shell Utilities" "FSF" \" \-*\- nroff \-*\- +.do hla cs +.do hpf hyphen.cs +.SH JM冇O +su \- spust shell pod jinm u養vatelskm a skupinovm ID +.SH POU埋T +.B su +[\-flmp] [\-c p齶kaz] [\-s shell] [\-\-login] [\-\-fast] +[\-\-preserve\-environment] [\-\-command=p齶kaz] [\-\-shell=shell] [\-] +[\-\-help] [\-\-version] [u養vatel [arg...]] +.SH POPIS +Tato dokumentace nen d嫮e udr駟v嫕a a m躨e bt nep鷫sn nebo nepln. +Autoritativn璥 zdrojem je Texinfo dokumentace. +.PP +Tato manu嫮ov str嫕ka popisuje GNU verzi p齶kazu +.BR su . +P齶kaz +.B su +umo橢uje, aby se u養vatel do醀sn stal jinm u養vatelem. Spust +shell s re嫮nm a efektivn璥 user ID, group ID, i skupinami, jich +je zadan +.I u養vatel +鋩enem. Pokud nen zad嫕 +.IR u養vatel , +dosad se root, superu養vatel. Jm幯o shellu je p鷫vzato ze souboru +/etc/passwd. Pokud v /etc/passwd jm幯o shellu nen, pou養je se +/bin/sh. Pokud m u養vatelsk 鋀t heslo, a p齶kaz +.B su +nen spu靖髶 pod re嫮nm user ID 0 (tj. superu養vatelem), bude +po靠dovat zad嫕 hesla. +.PP +P齶kaz +.B su +implicitn nem髶 aktu嫮n adres暟. Nastavuje prom髶n prost鷫d +`HOME' a `SHELL' podle daj z /etc/passwd a pokud zadan +.I u養vatel +nen superu養vatelem, nastav prom髶n `USER' a `LOGNAME' na +.IR u養vatel . +Implicitn nen spu靖髶 shell login shellem. +.PP +Jsou\-li zad嫕y dal寤 argumenty, budou p鷫d嫕y jako argumenty shellu. +.PP +P齶kaz +.B su +nezpracov嫛 speci嫮n /bin/sh nebo ostatn shelly (nastaven璥 +argv[0] na "\-su", p鷫d嫕璥 volby `\-c' pouze jistm shell籯, atd.). +.PP +Na syst幦ech se syslog d幦onem m躨e bt p齶kaz +.B su +p鷫lo頡n tak, aby zaznamen嫛al pomoc syslogu nesp儦n +a voliteln i sp儦n vyvol嫕 p齶kazu +.BR su . +.SS VOLBY +.TP +.I "\-c p齶kaz, \-\-command=p齶kaz" +M疄to odstartov嫕 interaktivn璫o shellu p鷫d +.I p齶kaz +s volbou +.I \-c +jako jedin p齶kazov 鸅dek shellu. +.TP +.I "\-f, \-\-fast" +P鷫d shellu volbu +.IR \-f . +Tuto volbu je pravd髹odobn vhodn pou橙vat pouze pro shelly +.B csh +a +.BR tcsh , +u nich zabr嫕 proveden startovac璫o souboru (.cshrc). +U shell vych嫙ej獳獳h z Bourne shellu volba +.I \-f +zakazuje expanzi 駟l璭ovch znak, co obecn nen 擔douc. +.TP +.I "\-\-help" +Vyp竁e n嫛od k pou養t na standardn vstup a bezchybn skon鴈. +.TP +.I "\-, \-l, \-\-login" +Spust shell jako login shell. To znamen, 頡 nebude nastaven obsah +擔dnch prom髶nch prost鷫d krom `TERM', `HOME', a `SHELL' (kter +budou nastaveny, jak je pops嫕o v鈹), `USER' a `LOGNAME' (kter +budou nastaveny i pro superu養vatele jak je pops嫕o v鈹). Prom髶n +prost鷫d `PATH' bude nastavena na hodnotu definovanou p鷡 p鷫kladu. +Aktu嫮n adres暟 bude nastaven na domovsk adres暟; p鷫d jm幯o +shellu bude p鷫d鷻zen znak "\-", kter zp鑸ob, 頡 bude zpracov嫕 +startovac soubor nebo soubory. +.TP +.I "\-m, \-p, \-\-preserve\-environment" +Nebude m髶it prom髶n prost鷫d `HOME', `USER', `LOGNAME' ani +`SHELL'. Je chybou, pokud u養vatel, kter spustil p齶kaz +.B su +nen superu養vatel a p鷡tom m nov u養vatel omezen shell. Jinak +se spust m疄to u養vatelova shellu z /etc/passwd shell zadan +v prom髶n prost鷫d `SHELL'. Omezen shell je takov, kter +nen uveden v souboru /etc/shells, nebo v zakompilov嫕 seznamu +soubor, pokud /etc/shells neexistuje. Chov嫕 p齶kazu +.B su +s touto volbou lze zm髶it volbami +.I \-\-login +a +.I \-\-shell +(m p鷫dnost p鷫d hodnotou prom髶n prost鷫d SHELL). +.TP +.I "\-s, \-\-shell shell" +Spust zadan shell m疄to u養vatelova shellu z /etc/passwd. +Je chybou, pokud u養vatel, kter spustil +.B su +nen superu養vatel a p鷡tom shell nov嶭o u養vatele uveden +v /etc/passwd je omezen. +.TP +.I "\-\-version" +Vyp竁e 鴈slo verze na standardn vstup a bezchybn skon鴈. diff --git a/man/de/Makefile.am b/man/de/Makefile.am index 801492ac..5c155ed0 100644 --- a/man/de/Makefile.am +++ b/man/de/Makefile.am @@ -7,6 +7,7 @@ man_MANS = \ groups.1 \ login.1 \ passwd.1 \ + passwd.5 \ vigr.8 \ vipw.8 diff --git a/man/de/Makefile.in b/man/de/Makefile.in index b38bb838..eb3e1834 100644 --- a/man/de/Makefile.in +++ b/man/de/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.4 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -47,7 +47,9 @@ CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = man1dir = $(mandir)/man1 -am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" +am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \ + "$(DESTDIR)$(man8dir)" +man5dir = $(mandir)/man5 man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) @@ -87,17 +89,16 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ 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@ @@ -177,6 +178,7 @@ man_MANS = \ groups.1 \ login.1 \ passwd.1 \ + passwd.5 \ vigr.8 \ vipw.8 @@ -193,9 +195,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/de/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/de/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/de/Makefile + $(AUTOMAKE) --foreign man/de/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -268,6 +270,51 @@ uninstall-man1: echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ done +install-man5: $(man5_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)" + @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.5*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \ + done +uninstall-man5: + @$(NORMAL_UNINSTALL) + @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.5*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man5dir)/$$inst"; \ + done install-man8: $(man8_MANS) $(man_MANS) @$(NORMAL_INSTALL) test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)" @@ -351,7 +398,7 @@ check-am: all-am check: check-am all-am: Makefile $(MANS) installdirs: - for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"; do \ + for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -402,7 +449,7 @@ install-exec-am: install-info: install-info-am -install-man: install-man1 install-man8 +install-man: install-man1 install-man5 install-man8 installcheck-am: @@ -424,18 +471,19 @@ ps-am: uninstall-am: uninstall-info-am uninstall-man -uninstall-man: uninstall-man1 uninstall-man8 +uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-exec install-exec-am \ install-info install-info-am install-man install-man1 \ - install-man8 install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-info-am \ - uninstall-man uninstall-man1 uninstall-man8 + install-man5 install-man8 install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am uninstall-man uninstall-man1 uninstall-man5 \ + uninstall-man8 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/man/de/chfn.1 b/man/de/chfn.1 index 5d2ed9ab..bf133475 100644 --- a/man/de/chfn.1 +++ b/man/de/chfn.1 @@ -11,9 +11,9 @@ chfn \- .SH SYNTAX .TP 5 \fBchfn\fR -[\fB-f \fIVollerName\fR] [\fB-r \fIRaumnummer\fR] +[\fB\-f\fR \fIVollerName\fR] [\fB\-r\fR \fIRaumnummer\fR] .br -[\fB-w \fITelArbeit\fR] [\fB-h \fITelPrivat\fR] [\fB-o \fIAnderes\fR] +[\fB\-w\fR \fITelArbeit\fR] [\fB\-h\fR \fITelPrivat\fR] [\fB\-o\fR \fIAnderes\fR] [\fINutzer\fR] .SH BESCHREIBUNG \fBchfn\fR 鄚dert den vollen Namen, die Bronummer und Broerweiterung, @@ -22,8 +22,8 @@ Diese Information wird meist von \fBfinger\fR(1) und anderen Programmen verwendet. Ein normaler Nutzer darf nur die Felder fr sein/ihr eigenes Konto 鄚dern, w鄣rend der Supernutzer dies fr alle Konten tun darf. -Auch darf nur der Supernutzer anhand der Option \fB-o\fR die Inhalte der -undefinierten Teile des GECOS-Feldes um鄚dern. +Auch darf nur der Supernutzer anhand der Option \fB\-o\fR die Inhalte der +undefinierten Teile des GECOS\-Feldes um鄚dern. .PP Die einzige Beschr鄚kung, die auf den Inhalten dieser Felder liegt, ist da kein Kontrollzeichen verwendet wird, und ebenso kein Komma, Doppelpunkt oder diff --git a/man/de/chsh.1 b/man/de/chsh.1 index 30cb1c72..c4a6587a 100644 --- a/man/de/chsh.1 +++ b/man/de/chsh.1 @@ -7,37 +7,37 @@ .\" .TH CHSH 1 .SH BEZEICHNUNG -chsh \- 鄚dert die Login-Shell -.SH SYNTAX +chsh \- 鄚dert die Login\-Shell +.SH "軮ERSICHT" .TP 5 \fBchsh\fR -[\fB-s \fILoginshell\fR] [\fINutzer\fR] +[\fB\-s\fR \fILoginshell\fR] [\fINutzer\fR] .SH BESCHREIBUNG -\fBchsh\fR 鄚dert die Login-Shell eines Nutzers. +\fBchsh\fR 鄚dert die Login\-Shell eines Nutzers. Es legt den Namen des Befehls fest, der beim Login ausgefhrt wird. -Ein normaler Nutzer kann die Login-Shell nur fr sein/ihr eigenes +Ein normaler Nutzer kann die Login\-Shell nur fr sein eigenes Konto 鄚dern, w鄣rend der Supernutzer dies fr jedes Konto tun darf. .PP -Die einzige Beschr鄚kung, die fr die Login-Shell gilt, ist da der -Name des Kommandos in der Datei \fI/etc/shells\fR stehen mu. +Die einzige Beschr鄚kung, die fr die Login\-Shell gilt, ist dass der +Name des Kommandos in der Datei \fI/etc/shells\fR stehen muss. Der Supernutzer darf allerdings jedes beliebige Kommando eintragen. Nutzern, deren Konten einer Beschr鄚kung unterliegen, ist es nicht -gestattet, ihre Login-Shell zu 鄚dern. +gestattet, ihre Login\-Shell zu 鄚dern. Aus diesem Grund ist es nicht empfehlenswert, \fB/bin/rsh\fR in \fI/etc/shells\fR einzutragen, da ein versehentlicher Wechsel zu einer beschr鄚kten Shell den Nutzer davon abhalten wrde, -seine/ihre Login-Shell wieder auf den Originalwert zurckzusetzen. -.PP -Wenn die Option \fB-s\fR nicht ausgew鄣lt ist, wird \fBchsh\fR im +seine Login\-Shell wieder auf den Originalwert zurckzusetzen. +.SH OPTIONEN +Wenn die Option \fB\-s\fR nicht ausgew鄣lt ist, wird \fBchsh\fR im interaktiven Modus betrieben, in der das Programm den Nutzer mit -der aktuellen Login-Shell fragt. +der aktuellen Login\-Shell fragt. Durch Eingabe eines Wertes wird die Shell gewechselt, w鄣rend sie bei einer leeren Zeile gleich bleibt. Die aktuelle Shell wird zwischen einem Paar von \fB[ ]\fR angezeigt. .SH DATEIEN \fI/etc/passwd\fR \- Informationen ber Nutzerkonten .br -\fI/etc/shells\fR \- Liste der gltigen Login-Shells +\fI/etc/shells\fR \- Liste der gltigen Login\-Shells .SH "SIEHE AUCH" .BR chfn (1), .BR passwd (5) @@ -45,4 +45,3 @@ Die aktuelle Shell wird zwischen einem Paar von \fB[ ]\fR angezeigt. Julianne Frances Haugh .br Deutsche 鈁ersetzung von Josef Spillner - diff --git a/man/de/login.1 b/man/de/login.1 index 02072abc..6707baae 100644 --- a/man/de/login.1 +++ b/man/de/login.1 @@ -9,11 +9,11 @@ .SH BEZEICHNUNG login \- startet eine Sitzung auf dem System .SH SYNTAX -\fBlogin\fR [\fB-p\fR] [\fINutzername\fR] [\fIENV=VAR\fR ...] +\fBlogin\fR [\fB\-p\fR] [\fINutzername\fR] [\fIENV=VAR\fR ...] .br -\fBlogin\fR [\fB-p\fR] [\fB-h \fIHost\fR] [\fB-f \fINutzername\fR] +\fBlogin\fR [\fB\-p\fR] [\fB\-h\fR \fIHost\fR] [\fB\-f\fR \fINutzername\fR] .br -\fBlogin\fR [\fB-p\fR] \fB-r \fIHost\fR +\fBlogin\fR [\fB\-p\fR] \fB\-r\fR \fIHost\fR .SH BESCHREIBUNG .B login wird verwendet, um eine neue Sitzung auf dem System zu starten. @@ -27,22 +27,12 @@ Typischerweise wird .B login von der Shell als \fBexec login\fR ausgefhrt, so da der Nutzer die aktuelle Shell verlassen mu. -Der Versuch, von einer Shell au絽r der Login-Shell \fBlogin\fR +Der Versuch, von einer Shell au絽r der Login\-Shell \fBlogin\fR auszufhren, wird eine Fehlermeldung generieren. .PP -Wenn das Programm vom Prompt \fIlogin:\fR ausgefhrt wird, -kann der Nutzer Umgebungsvariablen nach dem Nutzernamen eingeben. - -Diese Variablen werden in der Form \fBNAME=WERT\fR angegeben. -Nicht alle Variablen k霵nen auf diese Art und Weise gesetzt werden, -insbesondere \fBPATH\fR, \fBHOME\fR und \fBSHELL\fR stellen eine -Ausnahme dar. -Au絽rdem kann \fBIFS\fR dazugeh顤en, wenn die Login-Shell des -Nutzers \fB/bin/sh\fR ist. -.PP Der Nutzer wird anschlie絽nd nach einem Kennwort gefragt, falls erforderlich. Dieses wird w鄣rend der Eingabe nicht angezeigt. -Es sind nur eine kleine Anzahl von Login-Fehlern m鐷lich, +Es sind nur eine kleine Anzahl von Login\-Fehlern m鐷lich, falls \fBlogin\fR abbricht und die Kommunikation getrennt wird. .PP Falls die Kennwortalterung fr ein Konto aktiviert wurde, @@ -61,41 +51,41 @@ Die Mailnachricht ist entweder "\fBSie haben neue Mails.\fR", "\fBSie haben Mails.\fR", oder "\fBKeine Mails.\fR", je nach Zustandes der Mailbox des Nutzers. .PP -Die Nutzer- und Gruppen-IDs werden gem魠 den Werten in der Datei +Die Nutzer\- und Gruppen\-IDs werden gem魠 den Werten in der Datei \fI/etc/passwd\fR gesetzt. Die Werte fr \fB$HOME\fR, \fB$SHELL\fR, \fB$PATH\fR, \fB$LOGNAME\fR und \fB$MAIL\fR werden ebenfalls entsprechend der Eintr輍e in dem Kennworteintrag gesetzt. Werte fr ulimit, umask und nice k霵nen ebenfalls gem魠 Werten im -GECOS-Feld eingestellt werden. +GECOS\-Feld eingestellt werden. .PP Auf einigen Installationen wird die Umgebungsvariable \fB$TERM\fR entsprechend dem Typ des Ausgabeterminals gesetzt, so wie in \fI/etc/ttytype\fR angegeben. .PP -Ein Initialisierungsskript fr den Kommandozeilen-Interpreter +Ein Initialisierungsskript fr den Kommandozeilen\-Interpreter kann auch ausgefhrt werden. Dazu sehe man in den entsprechenden -Manual-Seiten nach. +Manual\-Seiten nach. .PP -Ein Subsystem-Login wird durch das Vorhandensein eines "*" als erstem -Buchstaben der Login-Shell angezeigt. Das angegebene Heimatverzeichnis +Ein Subsystem\-Login wird durch das Vorhandensein eines "*" als erstem +Buchstaben der Login\-Shell angezeigt. Das angegebene Heimatverzeichnis wird als Wurzel des neuen Dateisystems verwendet werden, in das der Nutzer tats踄hlich eingeloggt ist. .SH OPTIONEN .TP -.B -f +.B \-f Keine Authentifizierung durchfhren, Nutzer ist bereits angemeldet. .TP -.B -h +.B \-h Name des entfernten Rechners fr das Login. .TP -.B -p +.B \-p Behalte die Umgebungseinstellungen bei. .TP -.B -r -Fhr das Autologin-Protokoll fr rlogin aus. +.B \-r +Fhr das Autologin\-Protokoll fr rlogin aus. .PP -Die Optionen \fB-r\fP, \fB-h\fP und \fB-f\fP werden nur genutzt, +Die Optionen \fB\-r\fP, \fB\-h\fP und \fB\-f\fP werden nur genutzt, wenn \fBlogin\fP als root ausgefhrt wird. .SH HINWEISE Diese Version von \fBlogin\fR hat viele Optionen fr die Compilierung, @@ -104,7 +94,7 @@ davon sind eventuell nur einige auf bestimmten Systemen in Gebrauch. Der Ort der Konfigurationsdateien kann entsprechend der Systemkonfiguration abweichen. .PP -Es liegt NICHT in der Verantwortung von \fBlogin\fR, Nutzer von der utmp-Datei +Es liegt NICHT in der Verantwortung von \fBlogin\fR, Nutzer von der utmp\-Datei zu entfernen. Sowohl .BR getty (8) @@ -116,15 +106,15 @@ weiterhin in der Lage sein, eingeloggt zu erscheinen, obwohl er aus der Subsitzung ausgeloggt ist. .SH DATEIEN .br -\fI/var/run/utmp\fR \- Liste der aktuellen Login-Sitzungen +\fI/var/run/utmp\fR \- Liste der aktuellen Login\-Sitzungen .br -\fI/var/log/wtmp\fR \- Liste der vorherigen Login-Sitzungen +\fI/var/log/wtmp\fR \- Liste der vorherigen Login\-Sitzungen .br \fI/etc/passwd\fR \- Informationen ber Nutzerkonten .br \fI/etc/shadow\fR \- Verschlsselte Kennw顤ter und Alterungsinformationen .br -\fI/etc/motd\fR \- Systemnachricht-Datei +\fI/etc/motd\fR \- Systemnachricht\-Datei .br \fI/etc/nologin\fR \- Verhindert, da sich Nutzer au絽r dem Supernutzer einloggen .br @@ -144,4 +134,3 @@ Subsitzung ausgeloggt ist. Julianne Frances Haugh .br Deutsche 鈁ersetzung von Josef Spillner - diff --git a/man/de/passwd.1 b/man/de/passwd.1 index 60947022..7d54ae22 100644 --- a/man/de/passwd.1 +++ b/man/de/passwd.1 @@ -1,199 +1,212 @@ -.\" Copyleft (C) 2003 Josef Spillner -.\" 鈁ersetzung der englischen Version von Julianne Frances Haugh -.\" Ersatz fr die originale Version von: -.\" Copyright 1993 Sebastian Hetze und Peter Orbaek. +.\" $Id: passwd.1,v 1.7 2005/04/18 12:29:07 kloczek Exp $ +.\" Copyright 1989 - 1994, Julianne Frances Haugh +.\" All rights reserved. .\" -.\" Ver鐪fentlicht unter der GNU General Public License (GPL). +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. .\" +.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. .TH PASSWD 1 .SH BEZEICHNUNG -passwd \- 鄚dert das Nutzerkennwort -.SH SYNTAX -\fBpasswd\fR [\fB-f\fR|\fB-s\fR] [\fIName\fR] +passwd \- 鄚dert das Passwort eines Nutzers +.SH "軮ERSICHT" +\fBpasswd\fR [\fB\-f\fR|\fB\-s\fR] [\fIName\fR] .br -\fBpasswd\fR [\fB-g\fR] [\fB-r\fR|\fB-R\fR] \fIGruppe\fR +\fBpasswd\fR [\fB\-g\fR] [\fB\-r\fR|\fB\-R\fR] \fIGruppe\fR .br -\fBpasswd\fR [\fB-x \fImax\fR] [\fB-n \fImin\fR] -[\fB-w \fIwarn\fR] [\fB-i \fIinaktiv\fR] \fILogin\fR +\fBpasswd\fR [\fB\-x \fImax\fR] [\fB\-n \fImin\fR] +[\fB\-w \fIwarn\fR] [\fB\-i \fIinact\fR] \fIlogin\fR .br -\fBpasswd\fR {\fB-l\fR|\fB-u\fR|\fB-d\fR|\fB-S\fR|\fB-e\fR} \fILogin\fR +\fBpasswd\fR {\fB\-l\fR|\fB\-u\fR|\fB\-d\fR|\fB\-S\fR|\fB\-e\fR} \fIlogin\fR .SH BESCHREIBUNG -\fBpasswd\fR 鄚dert Kennw顤ter fr Nutzer- und Gruppenkonten. -Ein normaler Nutzer darf das Kennwort nur fr sein/ihr eigenes -Login 鄚dern, w鄣rend der Superuser (root) dies fr jedes Login darf. -Der Administrator einer Gruppe kann das Kennwort fr die Gruppe 鄚dern. -\fBpasswd\fR 鄚dert auch Kontoinformationen, wie den vollen Namen -des Nutzers, seine/ihre Loginshell, oder das Datum und Intervall des -Ablaufes des Kennwortes. +\fBpasswd\fR 鄚dert die Passw顤ter fr Nutzer\- und Gruppenkonten. Ein normaler +Nutzer kann nur das Passwort seines Kontos ver鄚dern, der Superuser dagegen +kann die Passw顤ter aller Konten 鄚dern. Der Verwalter einer Gruppe kann das +Passwort der Gruppe 鄚dern. \fBpasswd\fR ver鄚dert auch die Informationen ber +das Konto wie den vollst鄚digen Namen des Nutzers, seine Login\-Shell oder +Verfallsdatum und \-intervall des Passworts. .PP -Die Option \fB-s\fR sorgt dafr, da \fBpasswd\fR das Programm \fBchsh\fR -aufruft, welches die Shell des Nutzers 鄚dert. Die Option \fB-f\fR -l魠t \fBpasswd\fR das Programm \fBchfn\fR zum 瓏dern der GECOS-Information -starten. -Diese beiden Optionen sind nur aus Kompatibilit酹sgrnden vorhanden, da diese -Programme direkt aufgerufen werden k霵nen. -.SS 瓏derung des Kennwortes -Der Nutzer wird zuerst nach seinem/ihren alten Kennwort gefragt, sofern es -bereits existiert. Dieses wird dann verschlsselt und mit dem gespeicherten -Kennwort verglichen. -Der Nutzer hat nur einen Versuch, das Kennwort korrekt einzugeben. -Hingegen kann der Superuser diesen Schritt berspringen, um vergessene -Kennw顤ter abzu鄚dern. +Die Option \fB\-s\fR bewirkt, dass \fBpasswd\fR \fBchsh\fR aufruft, um die Shell +des Nutzers zu 鄚dern. Die Option \fB\-f\fR hat zur Folge, dass \fBpasswd\fR +\fBchfn\fR aufruft, um die Gecos\-Informationen des Nutzers zu 鄚dern. Diese +beiden Optionen sind nur aus Kompatibilit酹sgrnden vorhanden, da die anderen +Programme auch direkt aufgerufen werden k霵nen. +.SS Ver鄚dern des Passworts +Der Nutzer wird zuerst nach seinem alten Passwort gefragt, falls eines +vorhanden ist. Dieses Passwort wird dann verschlsselt und mit dem +abgespeicherten Passwort verglichen. Der Nutzer hat nur eine Gelegenheit, das +richtige Passwort einzugeben. Der Superuser kann diesen Schritt berspringen, +so dass vergessene Passw顤ter ge鄚dert werden k霵nen. .PP -Nachdem das Kennwort eingegeben wurde, wird die Gltigkeitsinformation -geprft, um herauszufinden ob der Nutzer zu diesem Zeitpunkt das Kennwort -鄚dern darf. -Wenn das nicht der Fall ist, verweigert \fBpasswd\fR die Kennwort鄚derung -und beendet sich. +Nachdem das Passwort eingegeben wurde, werden Informationen ber die +Gltigkeitsdauer des Passworts abgefragt, um festzustellen, ob der Nutzer das +Passwort zu dieser Zeit ver鄚dern darf. Wenn nicht, lehnt \fBpasswd\fR ab, +das Passwort zu 鄚dern, und beendet sich. .PP -Anschlie絽nd wird der Nutzer nach einem Ersatzkennwort gefragt. -Dieses wird auf Komplexit酹 berprft. -Als Richtlinie sollten Kennw顤ter mit 6 bis 8 Zeichen gew鄣lt werden, -inklusive einem oder mehreren Zeichen aus den folgenden Mengen: +Der Nutzer wird dann aufgefordert, ein neues Passwort einzugeben. Dieses +Passwort wird auf seine Komplexit酹 berprft. Eine allgemeine Richtlinie ist, +dass Passw顤ter aus sechs bis acht Zeichen bestehen sollten und ein oder +mehrere Zeichen aus folgenden Mengen enthalten sollten: .IP "" .5i Kleinbuchstaben .IP "" .5i Gro綌uchstaben .IP "" .5i -Ziffern von 0 bis 9 +Zahlen von 0 bis 9 .IP "" .5i Satzzeichen .PP -Es sollte darauf geachtet werden, da keine Systeml飉chzeichen -oder sonstigen Sonderzeichen darunter sind. -\fBpasswd\fR lehnt jedes Kennwort ab, welches nicht ein Mindestma -an Komplexit酹 besitzt. +Seien Sie vorsichtig, dass nicht die standardm魠igen Erase\- oder Killzeichen +des Systems eingegeben werden. \fBpasswd\fR weist alle Passw顤ter zurck, die +nicht ausreichend komplex sind. .PP -Wenn das Kennwort akzeptiert wurde, wird -\fBpasswd\fR ein weiteres Mal nach dem Kennwort fragen und dieses mit -der ersten Eingabe vergleichen. -Beide Eingaben mssen identisch sein, damit das Kennwort ge鄚dert -werden kann. -.SS Gruppenkennw顤ter -Wenn die Option \fB-g\fR benutzt wird, hat das die 瓏derung des Kennwortes -fr die angegebene Gruppe zur Auswahl. -Dafr mu der Nutzer entweder der Superuser oder der Gruppenadministrator -sein. -Es wird nicht nach dem aktuellen Gruppenkennwort gefragt. -Die Option \fB-r\fR wird zusammen mit \fB-g\fR verwendet, um das aktuelle -Kennwort von der angegebenen Gruppe zu entfernen. -Das erlaubt den Zugriff auf die Gruppe durch alle Mitglieder. -Die Option \fB-R\fR in Kombination mit \fB-g\fR beschr鄚kt den -Zugriff fr alle Nutzer. -.SS Kennwortgltigkeitsinformationen -Die Information zur Gltigkeitsdauer des Kennwortes kann vom Superuser -mit den Optionen \fB-x\fR, \fB-n\fR, \fB-w\fR und \fB-i\fR ge鄚dert werden. -Mit der Option \fB-x\fR wird die maximale Anzahl an Tagen eingestellt, -die ein Kennwort gltig bleiben soll. -Nach \fImax\fR Tagen wird eine Kennwort鄚derung verlangt. -Die Option \fB-n\fR setzt die minimale Gltigkeitsdauer in Tagen, -nach der ein Kennwort ge鄚dert werden kann. -Es ist dem Nutzer nicht gestattet, sein Kennwort zu 鄚dern, bis -\fImin\fR Tage verstrichen sind. -Die Option \fB-w\fR wird genutzt, um die Anzahl der Tage zu setzen, -an denen der Nutzer gewarnt wird, da die Gltigkeit seines/ihres Kennwortes -bald ausl酳ft. -Die Warnung tritt dann \fIwarn\fR Tage vor dem Ablauf der Gltigkeit ein, -und teilt dem Nutzer mit, wieviele Tage noch bis zur notwendigen 瓏derung -verbleiben. -Durch \fB-i\fR wird verwendet, ein Konto zu sperren, wenn das Kennwort nicht -ein paar Tage nach Ablauf der Gltigkeit ge鄚dert wurde. -Wenn die Gltigkeit bereits fr \fIinaktiv\fR Tage berschritten wurde, -kann sich der Nutzer nicht mehr an seinem Konto anmelden. +Wenn das Passwort akzeptiert wird, fordert \fBpasswd\fR zu einer erneuten +Eingabe des Passworts auf und vergleicht die zweite Eingabe mit der +ersten. Beide Eingaben mssen bereinstimmen, damit das Passwort ge鄚dert wird. +.SS Gruppenpassw顤ter +Wenn die Option \fB\-g\fR benutzt wird, wird das Passwort fr die bezeichnete +Gruppe ver鄚dert. Der Nutzer muss entweder der Superuser oder der Administrator +der Gruppe sein. Das aktuelle Gruppenpasswort wird nicht abgefragt. Die Option +\fB\-r\fR wird zusammen mit der Option \fB\-g\fR verwendet, um das aktuelle +Passwort der Gruppe zu entfernen. Das erlaubt den Zugang zur Gruppe fr alle +Mitglieder. Die Option \fB\-R\fR wird mit der Option \fB\-g\fR benutzt, um den +Zugang zur Gruppe fr alle Nutzer zu beschr鄚ken. +.SS Informationen ber den Verfall des Passworts +Die Informationen ber die Gltigkeitsdauer des Passworts k霵nen vom Superuser +mit den Optionen \fB\-x\fR, \fB\-n\fR, \fB\-w\fR und \fB\-i\fR ge鄚dert werden. +Die Option \fB\-x\fR wird verwendet, um die maximale Anzahl von Tagen +festzulegen, die das Passwort gltig bleibt. Nach \fImax\fR Tagen muss das +Passwort ge鄚dert werden. +Mit der Option \fB\-n\fR kann die Mindestzahl der Tage bestimmt werden, bevor es +ver鄚dert werden darf. Der Nutzer kann das Passwort nicht 鄚dern, bevor nicht +\fImin\fR Tage abgelaufen sind. +Die Option \fB\-w\fR wird verwendet, um die Anzahl der Tage festzulegen, an +denen der Nutzer eine Warnung erh鄟t, bevor sein Passwort ungltig wird. Die +Warnung wird dem Nutzer \fIwarn\fR Tage vor dem Verfall mitgeteilt und enth鄟t +den Hinweis, wie viele Tage noch verbleiben, bis das Passwort verf鄟lt. +Die Option \fB\-i\fR wird benutzt, um das Nutzerkonto zu deaktivieren, nachdem +das Passwort fr eine bestimmte Anzahl von Tagen ungltig war. Wenn ein +Nutzerkonto ein abgelaufenes Passwort fr \fIinact\fR Tage hatte, kann der +Nutzer sich nicht mehr bei seinem Konto anmelden. .PP -Wenn die sofortige Ungltigkeit eines Kennwortes gewnscht wird, -kann dieses ber die Option \fB-e\fR eingestellt werden. -Diese Ma羧ahme zwingt den Nutzer dazu, sein/ihr Kennwort beim n踄hsten -Login zu 鄚dern. Mit der Option \fB-d\fR kann ein Kennwort gel飉cht werden. -Dies sollte mit Vorsicht verwendet werden, denn ein leeres Kennwort kann -bedeuten, da beim Login keines mehr ben飆igt wird und somit Eindringlinge -Zugang zum System haben. -.SS Kontoverwaltung -Nutzerkonten k霵nen mit den Optionen \fB-l\fR und \fB-u\fR gesperrt und -wieder entsperrt werden. -Die Option \fB-l\fR deaktiviert ein Konto dadurch, da das Kennwort -auf einen Wert gesetzt wird, der durch kein verschlsseltes Kennwort -dargestellt werden kann. -Die Option \fB-u\fR schaltet das Konto wieder frei, indem das -Kennwort auf seinen vorherigen Wert zurckgesetzt wird. +Wenn Sie wollen, dass ein Passwort eines Kontos sofort verf鄟lt, sollten Sie +die Option \fB\-e\fR verwenden. Das hat zur Folge, dass der Nutzer gezwungen +wird, sein Passwort zu 鄚dern, wenn er sich das n踄hste Mal anmeldet. Sie +k霵nen auch die Option \fB\-d\fR verwenden, um das Passwort eines Nutzers zu +l飉chen (es wird also leer). Seien Sie mit dieser Option vorsichtig, da sie +dazu fhrt, dass ein Konto berhaupt kein Passwort zur Anmeldung ben飆igt. Das +鐪fnet Ihr System fr Eindringlinge. +.SS Wartung der Konten +Nutzerkonten k霵nen mit den Flags \fB\-l\fR und \fB\-u\fR gesperrt und +freigegeben werden. +Die Option \fB\-l\fR schaltet ein Konto ab, indem es ein Passwort zuweist, das +mit keinem m鐷lichen verschlsselten Wert bereinstimmen kann. +Die Option \fB\-u\fR reaktiviert ein Konto wieder, indem das Passwort auf seinen +alten Wert zurckgesetzt wird. .PP -Der Status eines Kontos kann mit der Option \fB-S\fR angesehen werden. -Die Statusinformation besteht aus 7 Feldern. -Das erste Feld ist der Loginname des Nutzers, gefolgt von dem Zustand -des Kontos: gesperrt (L), ohne Kennwort (NP), oder normal mit Kennwort -(P). Das dritte Feld gibt das Datum der letzten Kennwort鄚derung -zurck. In den restlichen vier Feldern stehen die minimale und maximale -Gltigkeitsdauer, die Warnzeit und die Dauer, nach der bei Inaktivit酹 -das Konto gesperrt wird. -Diese Werte sind als Tagesangaben zu verstehen. -Siehe obiger Absatz -.B Kennwortgltigkeitsinformationen -fr eine Erl酳terung dieser Felder. -.SS Hinweise fr Nutzerkennw顤ter -Die Sicherheit des Kennwortes h鄚gt von der Leistungsf鄣igkeit -des Verschlsselungsalgorithmus und dem Schlsselraum ab. -Die auf \fB\s-2UNIX\s+2\fR-Systemen eingesetzte Verschlsselungsmethode -basiert auf dem NBS DES-Algorithmus und gilt als sehr sicher. -Die Gr廲e des Schlsselraumes h鄚gt von der Zuf鄟ligkeit (Entropie) -des ausgew鄣lten Kennwortes ab. +Der Kontostatus kann mit der Option \fB\-S\fR abgerufen werden. Die +Statusinformation besteht aus sieben Feldern. +Das erste Feld ist der Login\-Name des Nutzers. +Das zweite Feld zeigt an, ob das Nutzerkonto gesperrt ist (L), kein Passwort +hat (NP) oder ein verwendbares Passwort hat (P). +Das dritte Feld zeigt das Datum der letzten Ver鄚derung des Passworts an. +Die n踄hsten vier Felder sind die minimale Zeit, die maximale Zeit, die Dauer +der Warnung und die Dauer der Unt酹igkeit fr das Passwort. +Die Zeitr酳me werden in Tagen ausgedrckt. Lesen Sie oben +.B Informationen ber den Verfall des Passworts +zu Ausfhrungen ber diese Felder. +.SS Hinweise zu Nutzerpassw顤tern +Die Sicherheit eines Passworts h鄚gt von der St酺ke des +Verschlsselungsalgorithmus und von der Gr廲e des Schlsselraums (key space) +ab. Die Verschlsselung auf \fB\s\-2UNIX\s+2\fR\-Systemen basiert auf dem +NBS\-DES\-Algorithmus und ist sehr sicher. Die Gr廲e des Schlsselraums h鄚gt von +der Zuf鄟ligkeit des gew鄣lten Passworts ab. .PP -Zwischenf鄟le bei Sicherheitsma羧ahmen mit Kennw顤tern sind meist -durch unsachgem魠en Umgang oder ungengende Kennwortwahl bedingt. -Aus diesem Grund sollte man kein Kennwort w鄣len, welches in einem -W顤terbuch vorkommt, oder so kompliziert ist da man es notieren -mu. -Es sollte auch keinem Namen entsprechen, und ebensowenig der -Ausweisnummer, dem Geburtstagsdatum oder der Adresse. -Nichtbeachtung dieser Regeln fhrt oft zu Verletzungen der Systemsicherheit. +Gefahren fr die Sicherheit von Passw顤tern kommen gew鐬nlich von sorgloser +Wahl oder Handhabung des Passworts. +Daher sollten Sie kein Passwort w鄣len, das in einem W顤terbuch auftaucht oder +das aufgeschrieben werden muss. Das Passwort sollte somit kein echter Name, +Ihr Autokennzeichen, Geburtstag oder Ihre Adresse sein. All das kann dazu +verwendet werden, das Passwort zu erraten, und stellt daher eine Gefahr fr die +Sicherheit Ihres Systems dar. .PP -Das Kennwort mu dennoch einfach genug gehalten sein, da man nicht -gezwungen ist, es auf Papier niederzuschreiben. -Das kann erreicht werden, indem man zwei kleine W顤ter durch ein -Sonderzeichen miteinander verbindet, bespielsweise so: Pass%wort. +Sie mssen sich Ihr Passwort leicht merken k霵nen, damit Sie nicht gezwungen +sind, es auf ein Stck Papier aufzuschreiben. Das k霵nen Sie dadurch erreichen, +indem zwei kurze W顤ter zusammengefgt werden und mit einem besonderen Zeichen +oder einer Zahl getrennt werden. Zum Beispiel Pass%wort. .PP -Andere Konstruktionsmethoden beinhalten die Auswahl eines leicht -zu merkenden Satzes und die Bildung eines Wortes durch -Aneinanderreihung der Anfangs- oder Endbuchstaben seiner W顤ter. -Das Beispiel hierfr kommt aus 'Faust' +Eine andere Herangehensweise ist es, einen leicht zu merkenden Satz aus der +Literatur zu w鄣len und den ersten oder letzten Buchstaben von jedem Wort zu +nehmen. Ein Beispiel dafr: .IP "" .5i -Was wollt ihr da? Was schlich sich ein? +Die Kruste wird im Allgemeinen ueberbewertet! .PP -welches folgendes Wort bildet: +Das ergibt .IP "" .5i -WwidWss1. +DKwiAu! .PP -Man kann sich ziemlich sicher sein, da nur weniger Cracker -diesen Term in ihrem W顤terbuch haben. -Man sollte jedoch eigene Methoden zum Konstruieren von -Kennw顤tern finden, und sich nicht ausschlie羦ich auf die -hier aufgezeigten Kennw顤ter verlassen. -.SS Bemerkungen zu Gruppenkennw顤tern -Gruppenkennw顤ter k霵nen ein ernsthaftes Sicherheitsproblem -darstellen, da mehr als eine Person befugt ist, das Kennwort -zu kennen. -Gruppen sind allerdings ein wichtiges Werkzeug fr die Kooperation -unter verschiedenen Nutzern. -.SH HINWEISE -Nicht alle Optionen werden untersttzt. -Die Komplexit酹sprfung fr Kennw顤ter kann sich von Rechner -zu Rechner unterscheiden. -Der Nutzer wird angehalten, ein Kennwort zu w鄣len, was so -komplex ist wie er/sie es fr richtig h鄟t. -Nutzer k霵nen eventuell ihre Kennw顤ter nicht 鄚dern, -wenn NIS eingesetzt wird und sie nicht im NIS-Server eingeloggt sind. +Sie k霵nen einigerma絽n sicher sein, dass dieses Wort nur wenige Cracker in +ihren W顤terlisten haben. Sie sollten allerdings Ihre eigenen Methoden +entwickeln, wie Sie Passw顤ter w鄣len, und sich nicht ausschlie羦ich auf die +hier vorgestellten sttzen. +.SS Anmerkungen zu Gruppenpassw顤tern +Gruppenpassw顤ter beinhalten ein inh酺entes Sicherheitsproblem, da mehr als nur +eine Person das Passwort kennt. Damit haftet schon der Idee von +Gruppenpassw顤tern ein Sicherheitsproblem an. Jedoch sind Gruppen ein +ntzliches Werkzeug, um Zusammenarbeit zwischen verschiedenen Nutzern zu +erm鐷lichen. +.SH WARNUNGEN +Es kann sein, dass einige Optionen nicht untersttzt werden. +Die Komplexit酹 der Passwortprfung kann sich auf verschiedenen Systemen +unterscheiden. +Der Nutzer wird angehalten, ein so komplexes Passwort zu w鄣len, wie es ihm +angenehm ist. +Nutzer k霵nen unter Umst鄚den ihr Passwort nicht 鄚dern, wenn auf dem System +NIS aktiviert ist, sie aber nicht am NIS\-Server angemeldet sind. .SH DATEIEN -.TP -.I /etc/passwd -Informationen ber Nutzerkonten -.TP -.I /etc/shadow -Verschlsselte Nutzerkennw顤ter +\fI/etc/passwd\fR \- Informationen zu den Nutzerkonten +.br +\fI/etc/shadow\fR \- Verschlsselte Informationen zu den Nutzerkonten +.SH "R軥KGABEWERTE" +.TP 2 +Der Befehl \fBpasswd\fR gibt beim Beenden folgende Werte zurck: +\fB0\fR \- Erfolg +.br +\fB1\fR \- Berechtigung verweigert +.br +\fB2\fR \- ungltige Kombination von Optionen +.br +\fB3\fR \- unerwarteter Fehler, nichts ver鄚dert +.br +\fB4\fR \- unerwarteter Fehler, die Datei passwd fehlt +.br +\fB5\fR \- Datei passwd wird benutzt, versuchen Sie es sp酹er noch einmal +.br +\fB6\fR \- ungltiges Argument fr Option .SH "SIEHE AUCH" .BR group (5), -.BR passwd (5) +.BR passwd (5), .BR shadow (5) .SH AUTOR Julianne Frances Haugh -.br -Deutsche 鈁ersetzung von Josef Spillner - +.PP +鈁ersetzung von Simon Brandmair (Apr 2005) diff --git a/man/de/passwd.5 b/man/de/passwd.5 new file mode 100644 index 00000000..a076c98a --- /dev/null +++ b/man/de/passwd.5 @@ -0,0 +1,94 @@ +.\" Copyright (c) 1993 Michael Haardt (u31b3hs@pool.informatik.rwth\-aachen.de), Fri Apr 2 11:32:09 MET DST 1993 +.\" +.\" This is free documentation; you can redistribute it and/or +.\" modify it under the terms of the GNU General Public License as +.\" published by the Free Software Foundation; either version 2 of +.\" the License, or (at your option) any later version. +.\" +.\" The GNU General Public License's references to "object code" +.\" and "executables" are to be interpreted as the output of any +.\" document formatting or typesetting system, including +.\" intermediate and printed output. +.\" +.\" This manual is distributed in the hope that it will be useful, +.\" but WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.\" GNU General Public License for more details. +.\" +.\" You should have received a copy of the GNU General Public +.\" License along with this manual; if not, write to the Free +.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, +.\" USA. +.\" +.\" Modified Sun Jul 25 10:46:28 1993 by Rik Faith (faith@cs.unc.edu) +.\" Modified Sun Aug 21 18:12:27 1994 by Rik Faith (faith@cs.unc.edu) +.\" Modified Sun Jun 18 01:53:57 1995 by Andries Brouwer (aeb@cwi.nl) +.\" Modified Thu Dec 21 19:49:52 1995 by Rene Tschirley (gremlin@cs.tu\-berlin.de) +.\" Modified Mon Jun 10 00:15:12 1996 by Martin Schulze (joey@linux.de) +.\" +.TH PASSWD 5 "24. Juli 1993" "Linux" "Dateiformate" +.SH BEZEICHNUNG +passwd \- Pa腛ort\-Datei +.SH BESCHREIBUNG +.B Passwd +ist eine ASCII\-Datei, die eine Liste der Benutzer des Systems und +deren Pa腛顤ter enth鄟t. Die Pa腛ort\-Datei sollte fr alle +Benutzer lesbar sein, was fr die Verschlsselung notwendig ist, +aber nur vom Superuser beschreibbar. Wenn Sie eine neue Kennung +einrichten, lassen Sie das Pa腛ort\-Feld in der Datei frei und benutzen +.BR passwd (1), +um dem System ein Pa腛ord fr die neue Kennung mitzuteilen. Ein Stern +oder ein 鄣nliches Sonderzeichen im Pa腛ort bedeutet, da sich dieser +Benutzer nicht mit +.BR login (1)s +einloggen kann. Wenn sich Ihr Root\-Dateisystem in +.I /dev/ram +befindet, mssen Sie die ver鄚derte Pa腛ort\-Datei in +Ihr Root\-Dateisystem auf der Startdiskette kopieren und die +Zugriffsrechte berprfen, bevor Sie Ihr System herunterfahren. +Wenn Sie Benutzer zu Gruppen zusammenfassen m鐼hten, mu die GID +bereinstimmen und es mu ein entsprechender Eintrag in der Datei +.I /etc/group +existieren, oder die Gruppe wird nicht vom System anerkannt. +.PP +Die Datei enth鄟t einen Eintrag pro Zeile, mit dem Format: +.sp +.RS +login_name:passwd:UID:GID:user_name:directory:shell +.RE +.sp +Die Bedeutung der Felder: +.sp +.RS +.TP 1.0in +.I login_name +Kennung des Benutzers auf dem System. +.TP +.I password +Das verschlsselte Pa腛ort des Benutzers. +.TP +.I UID +Die numerische Benutzernummer. +.TP +.I GID +Die numerische Gruppennummer des Benutzers. +.TP +.I user_name +Ein optionales Kommentarfeld, oft benutzt fr den vollen Namen des +Benutzers und weitere Informationen (Telefon, Raum\-Nummer etc.). +.TP +.I directory +Das Heimatverzeichnis $HOME des Benutzers. +.TP +.I shell +Das Programm, das beim Einloggen gestartet werden soll (falls nicht +n飆ig, benutzen Sie +.IR /bin/sh ). +.RE +.SH DATEIEN +.I /etc/passwd +.SH "SIEHE AUCH" +.BR passwd (1), +.BR login (1), +.BR group (5). + diff --git a/man/de/vipw.8 b/man/de/vipw.8 index 6793e5f5..a07125ba 100644 --- a/man/de/vipw.8 +++ b/man/de/vipw.8 @@ -1,20 +1,20 @@ -.\"$Id: vipw.8,v 1.1 2004/12/29 23:00:28 kloczek Exp $ +.\"$Id: vipw.8,v 1.2 2005/04/05 19:08:53 kloczek Exp $ .\" -.\"Translated into german by Helge Kreutzmann +.\"Translated into german by Helge Kreutzmann .TH VIPW 8 "21 Jul 2004" .SH NAME -vipw, vigr \- bearbeitet die Passwort-, Gruppen, Shadow-Pa腛ort oder Shadow-Gruppen-Datei. +vipw, vigr \- bearbeitet die Passwort\-, Gruppen, Shadow\-Pa腛ort oder Shadow\-Gruppen\-Datei. .SH SYNTAX -\fBvipw\fR [\fB-s\fR] +\fBvipw\fR [\fB\-s\fR] .br -\fBvigr\fR [\fB-s\fR] +\fBvigr\fR [\fB\-s\fR] .SH BESCHREIBUNG .BR vipw " und " vigr bearbeiten die Dateien .IR /etc/passwd " bzw. " /etc/group . Mit dem -.B -s -Schalter bearbeiten sie die Shadow-Version dieser Dateien, +.B \-s +Schalter bearbeiten sie die Shadow\-Version dieser Dateien, .IR /etc/shadow " bzw. " /etc/gshadow . Diese Programme setzen die entsprechenden Locks um Dateibesch輐igung zu verhindern. @@ -24,7 +24,7 @@ die Umgebungsvariable .BR VISUAL , dann die Umgebungsvariable .BR EDITOR , -und schlie羦ich den Aufruf des Standard-Editors +und schlie羦ich den Aufruf des Standard\-Editors .BR vi (1). .SH "SIEHE AUCH" .BR group (5), diff --git a/man/es/Makefile.in b/man/es/Makefile.in index 5873bc26..16f2c2c7 100644 --- a/man/es/Makefile.in +++ b/man/es/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.4 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -86,17 +86,16 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ 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@ @@ -188,9 +187,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/es/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/es/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/es/Makefile + $(AUTOMAKE) --foreign man/es/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/man/es/login.1 b/man/es/login.1 index 3c6c2bdd..9a73d808 100644 --- a/man/es/login.1 +++ b/man/es/login.1 @@ -3,7 +3,7 @@ .\" .\" Translated 17 sep. 1998 by Juan Jos L鏕ez Mellado(laveneno@hotmail.com) .\" -.TH LOGIN 1 "4 Noviembre 1996" "Util-linux 1.6" "Manual del Programador de Linux" +.TH LOGIN 1 "4 Noviembre 1996" "Util\-linux 1.6" "Manual del Programador de Linux" .SH NOMBRE login \- firmar .SH SINOPSIS @@ -158,7 +158,7 @@ Una secci CLASSES miclase1 tty1 tty2 miclase2 tty3 @.foo.com -.in -.5 +.in \-.5 .fi .PP Esto define las clases @@ -192,7 +192,7 @@ Un ejemplo de una secci GROUPS sys tty1 @.bar.edu stud miclase1 tty4 -.in -0.5 +.in \-0.5 .fi .PP Este ejemplo especifica que los miembros del grupo @@ -223,7 +223,7 @@ Una secci USERS zacho tty1 @130.225.16.0/255.255.255.0 pepe tty3 miclase2 -.in -0.5 +.in \-0.5 .fi .PP Esto autoriza al usuario zacho a ingresar solo en el tty1 y desde los @@ -250,7 +250,7 @@ ttyS0. .IP o La cadena @localhost, indicando que el usuario est autorizado a telnet/rlogin desde el host local al mismo host. Esto tambi幯 habilita al -usuario a ejecutar, por ejemplo, el comando: xterm -e /bin/login. +usuario a ejecutar, por ejemplo, el comando: xterm \-e /bin/login. .PP .IP o Un sufijo de nombre de dominio como @.algun.dom, indicando que el usuario @@ -270,11 +270,11 @@ Cualquiera de los or especificaci鏮 temporal acordando con la sintaxis: .PP .nf -espec-tiempo ::= '[' [':' ]* ']' +espec\-tiempo ::= '[' [':' ]* ']' d燰 ::= 'mon' | 'tue' | 'wed' | 'thu' | 'fri' | 'sat' | 'sun' hora ::= '0' | '1' | ... | '23' -espec-hora ::= | '\-' -d燰-u-hora ::= | +espec\-hora ::= | '\-' +d燰\-u\-hora ::= | .fi .PP Por ejemplo, el origen [mon:tue:wed:thu:fri:8\-17]tty3 significa que solo @@ -327,6 +327,6 @@ de BSD no est . .SH AUTOR Derivado de login 5.40 de BSD (5/9/89) por Michael Glad (glad@daimi.dk) -para HP-UX +para HP\-UX .br Portado a Linux 0.12: Peter Orbaek (poe@daimi.aau.dk) diff --git a/man/es/passwd.1 b/man/es/passwd.1 index 1d56a134..165e7a10 100644 --- a/man/es/passwd.1 +++ b/man/es/passwd.1 @@ -3,7 +3,7 @@ .\" .\" Translated 2 Dec 1998 by Victor Moral (victor@venexma.es) .\" -.TH PASSWD 1 "11 Noviembre 1996" "Util-linux 2.6" "Manual del Programador Linux" +.TH PASSWD 1 "11 Noviembre 1996" "Util\-linux 2.6" "Manual del Programador Linux" .SH NOMBRE passwd \- cambia contrase鎙s .SH SINOPSIS @@ -126,11 +126,9 @@ contrase .I /etc/passwd El archivo que contiene las contrase鎙s. .SH "V乜SE TAMBI冇" -.BR chsh (1), -.BR chfn (1), -.BR syslog (3), -.BR syslog.conf (5), -.BR passwd (8). +.BR group (5), +.BR passwd (5), +.BR shadow (5) .SH AUTOR Peter Orbaek (poe@daimi.aau.dk). .br diff --git a/man/es/su.1 b/man/es/su.1 index 197a2d15..22c624bb 100644 --- a/man/es/su.1 +++ b/man/es/su.1 @@ -1,4 +1,4 @@ -.\" -*- nroff -*- +.\" \-*\- nroff \-*\- .\"Translated 21 Jul 1998 by Javi Diaz (javid@si.upc.es) .TH SU 1 "Utilidades Shell de GNU" "FSF" .SH NOMBRE @@ -6,7 +6,7 @@ su \- ejecuta una shell con identificadores de grupo y de usuario distintos .SH SINOPSIS .B su [\-flmp] [\-c comando] [\-s shell] [\-\-login] [\-\-fast] -[\-\-preserve-environment] [\-\-command=comando] [\-\-shell=shell] [\-] +[\-\-preserve\-environment] [\-\-command=comando] [\-\-shell=shell] [\-] [\-\-help] [\-\-version] [usuario [arg...]] .SH DESCRIPCI粍 Este documento ya no es mantenido y puede ser impreciso o incompleto. La @@ -40,7 +40,7 @@ a la shell ejecutada. .PP .B su no ejecuta de manera especial /bin/sh u otras shells (colocando en argv[0] el -valor "-su", pasando -c nicamente a algunas shells, etc.). +valor "\-su", pasando \-c nicamente a algunas shells, etc.). .PP En sistemas que utilicen syslog, .B su diff --git a/man/expiry.1 b/man/expiry.1 index f30ab260..c832f63c 100644 --- a/man/expiry.1 +++ b/man/expiry.1 @@ -1,4 +1,4 @@ -.\"$Id: expiry.1,v 1.5 2003/05/01 18:17:39 kloczek Exp $ +.\"$Id: expiry.1,v 1.8 2005/04/12 16:31:06 kloczek Exp $ .\" Copyright 1990 - 1994 Julianne Frances Haugh .\" All rights reserved. .\" Modified for expiry by Ben Collins , 1999 @@ -32,14 +32,14 @@ expiry \- check and enforce password expiration policy .SH SYNOPSIS .TP 6 -\fBexpiry\fR [\fB-c\fR] [\fB-f\fR] +\fBexpiry\fR [\fB\-c\fR] [\fB\-f\fR] .SH DESCRIPTION -\fBexpiry\fR checks (\fB-c\fR) the current password expiration and forces -(\fB-f\fR) changes when required. It is callable as a normal user command. +\fBexpiry\fR checks (\fB\-c\fR) the current password expiration and forces +(\fB\-f\fR) changes when required. It is callable as a normal user command. .SH FILES -\fI/etc/passwd\fR \ - user account information +\fI/etc/passwd\fR \- user account information .br -\fI/etc/shadow\fR \ - shadow user account information +\fI/etc/shadow\fR \- secure user account information .SH SEE ALSO .BR passwd (5), .BR shadow (5) diff --git a/man/faillog.5 b/man/faillog.5 index af506098..631e9840 100644 --- a/man/faillog.5 +++ b/man/faillog.5 @@ -1,4 +1,4 @@ -.\"$Id: faillog.5,v 1.9 2003/05/01 18:17:39 kloczek Exp $ +.\"$Id: faillog.5,v 1.10 2005/04/02 16:10:23 kloczek Exp $ .\" Copyright 1989 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -47,7 +47,7 @@ The structure of the file is }; .DE .SH FILES -\fI/var/log/faillog\fR \ - login failure log +\fI/var/log/faillog\fR \- login failure log .SH SEE ALSO .BR faillog (8) .SH AUTHOR diff --git a/man/faillog.8 b/man/faillog.8 index f7e415f6..4e9ef163 100644 --- a/man/faillog.8 +++ b/man/faillog.8 @@ -1,4 +1,4 @@ -.\"$Id: faillog.8,v 1.15 2004/12/11 16:49:33 kloczek Exp $ +.\" $Id: faillog.8,v 1.19 2005/04/09 17:09:56 kloczek Exp $ .\" Copyright 1989 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,53 +25,48 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.\" -.\" .TH FAILLOG 8 .SH NAME -faillog \- examine faillog and set login failure limits +faillog \- display faillog records or set login failure limits .SH SYNOPSIS .TP 6 -\fBfaillog\fR [\fB-u\fR \fIlogin-name\fR] [\fB-a\fR] [\fB-t\fR \fIdays\fR] -[\fB-m\fR \fImax\fR] [\fB-pr\fR] +\fBfaillog\fR [\fBoptions\fR] .SH DESCRIPTION -\fBfaillog\fR formats the contents of the failure log, -\fI/var/log/faillog\fR, and maintains failure counts and -limits. The order of the arguments to \fBfaillog\fR is significant. Each -argument is processed immediately in the order given. +\fBfaillog\fR formats the contents of the failure log from \fI/var/log/faillog\fR +database. It also can be used for maintains failure counters and limits. +Run \fBfaillog\fR without arguments display only list of user faillog records +who have ever had a login failure. .SH OPTIONS -The \fB-p\fR flag causes failure entries to be printed in UID order. -Entering \fB-u \fIlogin-name\fR flag will cause the failure record for -\fIlogin-name\fR only to be printed. Entering \fB-t \fIdays\fR will cause -only the failures more recent than \fIdays\fR to be printed. The \fB-t\fR -flag overrides the use of \fB-u\fR. The \fB-a\fR flag causes all users to be -selected. When used with the \fB-p\fR flag, this option selects all users -who have ever had a login failure. It is meaningless with the \fB-r\fR flag. -.PP -The \fB-r\fR flag is used to reset the count of login failures. Write access -to \fI/var/log/faillog\fR is required for this option. Entering \fB-u -\fIlogin-name\fR will cause only the failure count for \fIlogin-name\fR to -be reset. -.PP -The \fB-m\fR flag is used to set the maximum number of login failures before -the account is disabled. Write access to \fI/var/log/faillog\fR is required -for this option. Entering \fB-m \fImax\fR will cause all accounts to be -disabled after \fImax\fR failed logins occur. This may be modified with -\fB-u \fIlogin-name\fR to limit this function to \fIlogin-name\fR only. -Selecting a \fImax\fR value of 0 has the effect of not placing a limit on -the number of failed logins. The maximum failure count should always be 0 -for \fBroot\fR to prevent a denial of services attack against the system. -.PP -Options may be combined in virtually any fashion. Each \fB-p\fR, \fB-r\fR, -and \fB-m\fR option will cause immediate execution using any \fB-u\fR or -\fB-t\fR modifier. +The options which apply to the \fBfaillog\fR command are: +.IP "\fB\-a\fR, \fB\-\-all\fR" +Display faillog records for all users. +.IP "\fB\-h\fR, \fB\-\-help\fR" +Display help message and exit. +.IP "\fB\-l\fR, \fB\-\-lock\-time\fR \fISEC\fR" +Lock accout to \fISEC\fR seconds after failed login. +.IP "\fB\-m\fR, \fB\-\-maximum\fR \fIMAX\fR" +Set maiximum number of login failures after the account is disabled to +\fIMAX\fR. Selecting \fIMAX\fR value of 0 has the effect of not placing a +limit on the number of failed logins. The maximum failure count should +always be 0 for \fBroot\fR to prevent a denial of services attack against +the system. +.IP "\fB\-r\fR, \fB\-\-reset\fR" +Reset the counters of login failures or one recor if used with \-u +\fILOGIN\fR option. Write access to \fI/var/log/faillog\fR is required for +this option. +.IP "\fB\-t\fR, \fB\-\-time\fR \fIDAYS\fR" +Display faillog records more recent than \fIDAYS\fR. The \fB\-t\fR flag +overrides the use of \fB\-u\fR. +.IP "\fB\-u\fR, \fB\-\-user\fR \fILOGIN\fR" +Display faillog record or maintains failure counters and limits (if used +with \fB\-l\fR, \fB\-m\fR or \fB\-r\fR options) only for user with \fILOGIN\fR. .SH CAVEATS \fBfaillog\fR only prints out users with no successful login since the last failure. To print out a user who has had a successful login since their last -failure, you must explicitly request the user with the \fB-u\fR flag, or -print out all users with the \fB-a\fR flag. +failure, you must explicitly request the user with the \fB\-u\fR flag, or +print out all users with the \fB\-a\fR flag. .SH FILES -\fI/var/log/faillog\fR \ - failure logging file +\fI/var/log/faillog\fR \- failure logging file .SH SEE ALSO .BR login (1), .BR faillog (5) diff --git a/man/fr/Makefile.in b/man/fr/Makefile.in index 5c8b58c9..ccd34e4c 100644 --- a/man/fr/Makefile.in +++ b/man/fr/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.4 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -89,17 +89,16 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ 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,9 +200,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/fr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/fr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/fr/Makefile + $(AUTOMAKE) --foreign man/fr/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/man/fr/chage.1 b/man/fr/chage.1 index 1861d355..1c5433e9 100644 --- a/man/fr/chage.1 +++ b/man/fr/chage.1 @@ -1,4 +1,4 @@ -.\" Copyright 1990 - 1994 Julianne Frances Haugh +.\" Copyright 1990 \- 1994 Julianne Frances Haugh .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: chage.1,v 1.2 2003/04/26 13:24:12 kloczek Exp $ +.\" $Id: chage.1,v 1.4 2005/04/05 19:08:53 kloczek Exp $ .\" .TH CHAGE 1 "1 Novembre 2001" .SH NOM @@ -34,64 +34,64 @@ utilisateur. .SH SYNOPSIS .TP 6 \fBchage\fR -[\fB-m \fImin\fR] [\fB-M \fImax\fR] -[\fB-d \fIdernier\fR] [\fB-I \fIinactive\fR] +[\fB\-m\fR \fImin\fR] [\fB\-M\fR \fImax\fR] +[\fB\-d\fR \fIdernier\fR] [\fB\-I\fR \fIinactive\fR] .br -[\fB-E \fIexpire\fR] [\fB-W \fIalerte\fR] \fIutilisateur\fR +[\fB\-E\fR \fIexpire\fR] [\fB\-W\fR \fIalerte\fR] \fIutilisateur\fR .TP 6 \fBchage\fR -\fB-l\fR \fIutilisateur\fR +\fB\-l\fR \fIutilisateur\fR .SH DESCRIPTION \fBchage\fR modifie le nombre de jours entre les changements de mot de passe ainsi que la date du dernier changement. Cette information est utilis嶪 par le syst鋗e pour d彋erminer quand un utilisateur doit changer son mot de passe. -La commande \fBchage\fR est r廥erv嶪 au Super-utilisateur, sauf pour l'option -\fB-l\fR, qui peut 皻re utilis嶪 par un utilisateur non privil嶲i pour savoir +La commande \fBchage\fR est r廥erv嶪 au Super\-utilisateur, sauf pour l'option +\fB\-l\fR, qui peut 皻re utilis嶪 par un utilisateur non privil嶲i pour savoir quand son mot de passe ou sont compte doit expirer. .PP -Avec l'option \fB-m\fR, la valeur de \fImin\fR repr廥ente le nombre minimum +Avec l'option \fB\-m\fR, la valeur de \fImin\fR repr廥ente le nombre minimum de jours entre chaque changement de mot de passe. Une valeur de z廨o pour ce champ indique que l'utilisateur peut changer son mot de passe n'importe quand. .PP -Avec l'option \fB-M\fR, la valeur de \fImax\fR repr廥ente le nombre maximum +Avec l'option \fB\-M\fR, la valeur de \fImax\fR repr廥ente le nombre maximum de jours pendant lesquels un mot de passe est valide. Quand \fImax\fR plus \fIdernier\fR est inf廨ieur la date courante, l'utilisateur est oblig de changer son mot de passe avant de pouvoir utiliser son compte. -Cet 憝鋝ement peut 皻re d嶰lench plus t矌 gr歊e l'option \fB-W\fR +Cet 憝鋝ement peut 皻re d嶰lench plus t矌 gr歊e l'option \fB\-W\fR qui pr憝ient l'utilisateur l'avance avec un message d'alerte. .PP -Avec l'option \fB-d\fR, la valeur \fIdernier\fR est le num廨o du +Avec l'option \fB\-d\fR, la valeur \fIdernier\fR est le num廨o du jour depuis le 1er Janvier 1970, o le mot de passe a 彋 chang la derni鋨e fois. -La date peut aussi 皻re exprim嶪 dans le format YYYY-MM-DD (ou le format +La date peut aussi 皻re exprim嶪 dans le format YYYY\-MM\-DD (ou le format utilis plus commun幦ent dans votre r嶲ion). .PP -L'option \fB-E\fR est utilis嶪 pour d嶨inir une date partir de laquelle +L'option \fB\-E\fR est utilis嶪 pour d嶨inir une date partir de laquelle le compte de l'utilisateur ne sera plus accessible. La valeur \fIexpire\fR est le num廨o du jour depuis le 1er Janvier 1970 apr鋊 lequel le compte sera bloqu. -La date peut aussi 皻re exprim嶪 dans un format YYYY-MM-DD (ou le format +La date peut aussi 皻re exprim嶪 dans un format YYYY\-MM\-DD (ou le format plus commun幦ent utilis dans votre r嶲ion). Un utilisateur dont le compte est bloqu doit contacter l'administrateur syst鋗e pour pouvoir utiliser le syst鋗e nouveau. .PP -L'option \fB-I\fR est utilis嶪 pour d嶨inir le nombre de jours d'inactivit, +L'option \fB\-I\fR est utilis嶪 pour d嶨inir le nombre de jours d'inactivit, apr鋊 qu'un mot de passe a expir, avant que le compte ne soit bloqu. Un utilisateur dont le compte est bloqu doit contacter l'administrateur syst鋗e avant de pouvoir utiliser le syst鋗e nouveau. La valeur \fIinactive\fR est le nombre de jours d'inactivit. Une valeur de 0 d廥active cette fonction. .PP -L'option \fB-W\fR est utilis嶪 pour d嶨inir le nombre de jours d'alerte +L'option \fB\-W\fR est utilis嶪 pour d嶨inir le nombre de jours d'alerte avant que le changement de mot de passe ne soit obligatoire. La valeur \fIalerte\fR est le nombre de jours pr嶰嶮ent l'expiration pendant lesquels un utilisateur sera pr憝enu que son mot de passe est sur le point d'expirer. .PP -Toutes les valeurs ci-dessus sont stock嶪s au jour pr鋊 quand le fichier +Toutes les valeurs ci\-dessus sont stock嶪s au jour pr鋊 quand le fichier 俞~shadow password\~ est utilis, mais sont converties en semaines quand le fichier de mots de passe standard est utilis. cause de cette conversion, des erreurs d'arrondis peuvent appara褾re. @@ -110,4 +110,3 @@ La valeur courante est affich .BR shadow (5) .SH TRADUCTION Olivier Marin, 2001. - diff --git a/man/fr/chpasswd.8 b/man/fr/chpasswd.8 index ad4501c1..20cbc947 100644 --- a/man/fr/chpasswd.8 +++ b/man/fr/chpasswd.8 @@ -25,18 +25,18 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: chpasswd.8,v 1.1 2002/03/10 07:41:04 kloczek Exp $ +.\" $Id: chpasswd.8,v 1.3 2005/04/05 19:08:53 kloczek Exp $ .\" .TH CHPASSWD 8 .SH NOM -\fBchpasswd\fR - met jour le fichier de mots de passe par lot +\fBchpasswd\fR \- met jour le fichier de mots de passe par lot .SH SYNOPSIS -\fBchpasswd [-e]\fR +\fBchpasswd\fR [\fB\-e\fR] .SH DESCRIPTION \fBchpasswd\fR lit un fichier contenant des paires de nom d'utilisateur et mot de passe depuis l'entr嶪 standard et utilise cette information -pour mettre jour un groupe d'utilisateurs existants. Sans l'option -e, -les mots de passe fournis doivent 皻re en clair. Si l'option -e est +pour mettre jour un groupe d'utilisateurs existants. Sans l'option \-e, +les mots de passe fournis doivent 皻re en clair. Si l'option \-e est utilis嶪, les mots de passe doivent 皻re fournis crypt廥. Chaque ligne est au format .sp 1 diff --git a/man/fr/chsh.1 b/man/fr/chsh.1 index a49c0c76..a9f8237e 100644 --- a/man/fr/chsh.1 +++ b/man/fr/chsh.1 @@ -1,5 +1,5 @@ .\" -.\" chsh.1 -- change your login shell +.\" chsh.1 \-\- change your login shell .\" (c) 1994 by salvatore valente .\" .\" this program is free software. you can redistribute it and @@ -7,10 +7,10 @@ .\" there is no warranty. .\" .\" $Author: kloczek $ -.\" $Revision: 1.2 $ -.\" $Date: 2004/08/04 13:02:24 $ +.\" $Revision: 1.4 $ +.\" $Date: 2005/04/05 19:08:53 $ .\" -.\" Traduction 22/04/1997 par Christophe Blaess (ccb@club-internet.fr) +.\" Traduction 22/04/1997 par Christophe Blaess (ccb@club\-internet.fr) .\" .TH CHSH 1 "22 Avril 1997" Linux "Manuel de l'utilisateur Linux" .SH NOM @@ -33,7 +33,7 @@ shell n'est pas mentionn .IR /etc/shells . .SH OPTIONS .TP -.I "\-l, \-\-list-shells" +.I "\-l, \-\-list\-shells" Afficher la liste des shells mentionn廥 dans .I /etc/shells puis quitter. @@ -44,8 +44,8 @@ Indiquer le shell de connexion d .I "\-u, \-\-help" Afficher un message d'aide puis quitter. .TP -.I "-v, \-\-version" -Afficher un num廨o de version, puis quitter. +.I "\-v, \-\-version" +Afficher un num廨o de version puis quitter. .SH "VOIR AUSSI" .BR login (1), .BR passwd (5), diff --git a/man/fr/faillog.5 b/man/fr/faillog.5 index 3eb07512..ecfcb6eb 100644 --- a/man/fr/faillog.5 +++ b/man/fr/faillog.5 @@ -1,4 +1,4 @@ -.\" Copyright 1989 - 1994, Julianne Frances Haugh +.\" Copyright 1989 \- 1994, Julianne Frances Haugh .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without diff --git a/man/fr/gpasswd.1 b/man/fr/gpasswd.1 index c919df7b..721795c4 100644 --- a/man/fr/gpasswd.1 +++ b/man/fr/gpasswd.1 @@ -4,7 +4,7 @@ .\" published by the Free Software Foundation; either version 2 of the .\" License, or (at your option) any later version. .\" -.\" $Id: gpasswd.1,v 1.2 2003/04/26 13:24:12 kloczek Exp $ +.\" $Id: gpasswd.1,v 1.3 2005/04/05 19:08:53 kloczek Exp $ .\" .TH GPASSWD 1 .SH NOM @@ -14,25 +14,25 @@ gpasswd \- administre le fichier /etc/group .B gpasswd \fIgroupe\fR .br .B gpasswd -.B -a +.B \-a \fIutilisateur\fR \fIgroupe\fR .br .B gpasswd -.B -d +.B \-d \fIutilisateur\fR \fIgroupe\fR .br .B gpasswd -.B -R +.B \-R \fIgroupe\fR .br .B gpasswd -.B -r +.B \-r \fIgroupe\fR .br .B gpasswd -.RB [ -A +.RB [ \-A \fIutilisateur\fR,...] -.RB [ -M +.RB [ \-M \fIutilisateur\fR,...] \fIgroupe\fR .br @@ -41,17 +41,17 @@ gpasswd \- administre le fichier /etc/group est utilis pour administrer le fichier /etc/group (ainsi que le fichier /etc/gshadow si l'option SHADOWGRP a 彋 d嶨inie lors de la compilation). Chaque groupe peut avoir des administrateurs, des membres ainsi qu'un mot de passe. -Les administrateurs syst鋗es poss鋄ent les droits d'administrateur de groupe et de membre, il peuvent utiliser l'option \fB-A\fR pour d嶨inir le(s) administrateur(s) de groupe et l'option \fB-M\fR pour en d嶨inir les membres +Les administrateurs syst鋗es poss鋄ent les droits d'administrateur de groupe et de membre, il peuvent utiliser l'option \fB\-A\fR pour d嶨inir le(s) administrateur(s) de groupe et l'option \fB\-M\fR pour en d嶨inir les membres .PP -Un administrateur de groupe peut ajouter ou supprimer des utilisateurs en utilisant respectivement les options \fB-a\fR et \fB-d\fR . Les administrateurs peuvent utiliser l'option \fB-r\fR pour supprimer le mot de passe d'un groupe. Lorsque aucun mot de passe n'est d嶨ini, seul les membres d'un groupe peuvent utiliser +Un administrateur de groupe peut ajouter ou supprimer des utilisateurs en utilisant respectivement les options \fB\-a\fR et \fB\-d\fR . Les administrateurs peuvent utiliser l'option \fB\-r\fR pour supprimer le mot de passe d'un groupe. Lorsque aucun mot de passe n'est d嶨ini, seul les membres d'un groupe peuvent utiliser .BR newgrp (1) -pour en faire partie. L'option \fB-R\fR d廥active l'acc鋊 au groupe via la commande +pour en faire partie. L'option \fB\-R\fR d廥active l'acc鋊 au groupe via la commande .BR newgrp (1) .PP .B gpasswd ex嶰ut par un administrateur de groupe suivit d'un nom de groupe, affiche simplement l'invite de changement de mot de passe du groupe. Si un mot de passe est d嶨ini alors seul les membres du groupe peuvent utiliser la commande .BR newgrp (1) -sans entrer de mot de passe, les non-membres doivent le fournir. +sans entrer de mot de passe, les non\-membres doivent le fournir. .SH FICHIERS \fI/etc/group\fR \- Identification des groupes diff --git a/man/fr/groups.1 b/man/fr/groups.1 index 5247fa10..2eab5393 100644 --- a/man/fr/groups.1 +++ b/man/fr/groups.1 @@ -1,4 +1,4 @@ -.\" Traduction 09/01/1997 par Christophe Blaess (ccb@club-internet.fr) +.\" Traduction 09/01/1997 par Christophe Blaess (ccb@club\-internet.fr) .\" .TH GROUPS 1L "9 Janvier 1997" FSF "Manuel de l'utilisateur Linux" .SH NOM diff --git a/man/fr/passwd.1 b/man/fr/passwd.1 index db86f246..266ee334 100644 --- a/man/fr/passwd.1 +++ b/man/fr/passwd.1 @@ -17,7 +17,7 @@ .\" the GNU Public License, in which case the provisions of the GPL are .\" required INSTEAD OF the above restrictions. (This clause is .\" necessary due to a potential bad interaction between the GPL and -.\" the restrictions contained in a BSD-style copyright.) +.\" the restrictions contained in a BSD\-style copyright.) .\" .\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED .\" WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -41,21 +41,21 @@ passwd \- mettre jour les marques d'authentification d'un utilisateur. .SH SYNOPSIS -.B passwd [-k] [-l] [-u [-f]] [-d] [-S] [nom_utilisateur] +\fBpasswd\fR [\fB\-k\fR] [\fB\-l\fR] [\fB\-u\fR [\fB\-f\fR]] [\fB\-d\fR] [\fB\-S\fR] [\fInom_utilisateur\fR] .sp 2 .SH DESCRIPTION Passwd est utilis pour mettre jour la (les) marque(s) d'authentification d'un utilisateur. Passwd est configur pour travailler gr歊e l' -.BR "API Linux-PAM" ". " +.BR "API Linux\-PAM" ". " Il s'initialise principalement en tant que service "passwd" avec -.I Linux-PAM +.I Linux\-PAM et utilise les modules .I "password" configur廥 pour authentifier et ensuite mettre jour le mot de passe d'un utilisateur. .sp Une entr嶪 du fichier de configuration de -.I Linux-PAM +.I Linux\-PAM pour ce service serait : .br @@ -85,36 +85,36 @@ Notez qu'aucun autre type de module n'est requis pour le fonctionnement correct de cette application. .SH OPTIONS -.IP \fB-d\fR +.IP \fB\-d\fR C'est une fa蔞n rapide pour d廥activer un mot de passe pour un compte. Il supprimera le besoin du mot de passe pour un compte donn. Disponible uniquement pour root. -.IP \fB-k\fR +.IP \fB\-k\fR L'option, -.BR -k ", " +.BR \-k ", " est utilis嶪 pour indiquer que la mise jour ne devrait 皻re effectu嶪 que pour les marques d'identifications (mots de passe); l'utilisateur conserve ses marques non expir廥. -.IP \fB-l\fR +.IP \fB\-l\fR Cette option est utilis pour verrouiller le compte sp嶰ifi, et n'est disponible que pour root. Le verrouillage est effecut en rendant le mot de passe crypt invalide (en le pr嶨ixant par un !). -.IP \fB--stdin\fR +.IP \fB\-\-stdin\fR Cette option est utilis嶪 pour indiquer que \fBpasswd\fR doit lire le nouveau mot de passe partir de l'entr嶪 standard, qui peut 皻re un tube. -.IP \fB-u\fR -L'inverse de l'option pr嶰嶮ente - il d憝errouillera le mot de passe du +.IP \fB\-u\fR +L'inverse de l'option pr嶰嶮ente \- il d憝errouillera le mot de passe du compte en supprimant le pr嶨ixe "!". Cette option n'est disponible que pour root. Par d嶨aut, \fBpasswd\fR refusera de cr嶪r un compte sans mot de passe associ (il ne d憝errouillera pas un compte contenant uniquement ! -pour mot de passe). L'option \fB-f\fR outrepassera cette protection. -.IP \fB-S\fR +pour mot de passe). L'option \fB\-f\fR outrepassera cette protection. +.IP \fB\-S\fR Cela affiche une information courte sur le statut du mot de passe pour un compte donn. Disponible uniquement pour root. -.SH "Rappelez-vous les deux principes suivants" +.SH "Rappelez\-vous les deux principes suivants" .IP \fBProt嶲ez\ votre\ mot de passe.\fR -N'嶰rivez nulle part votre mot de passe - m幦orisez-le. En particulier, ne +N'嶰rivez nulle part votre mot de passe \- m幦orisez\-le. En particulier, ne le laissez pas n'importe o et ne le placez pas non plus dans un fichier non crypt ! Utilisez des mots de passe non reli廥 sur des syst鋗es contr犨廥 par diff廨entes organisations. Ne divulguez ni ne partagez votre mot de @@ -124,7 +124,7 @@ de passe pendant que vous le tapez. N'entrez pas votre mot de passe sur un ordinateur auquel vous ne faites pas confiance, ou si les "choses" ont l'air amusantes; quelqu'un pourrait 皻re en train d'essayer de d彋ourner votre mot de passe. Utilisez votre mot de passe pour une p廨iode limit嶪 et -modifiez-le p廨iodiquement. +modifiez\-le p廨iodiquement. .IP \fBChoisisser un mot de passe difficile deviner.\fR .I passwd essaiera de vous emp璚her de choisir un mot de passe r嶪llemnt mauvais, mais @@ -138,7 +138,7 @@ personnelle qui soit accessible (comme votre num plaque d'immatriculation ou votre num廨o de s嶰urit sociale), ou sur les personnes de votre entourage. N'utilisez pas une date d'anniversaire ou un motif simple comme "azerty", "qwerty", "abc" ou "aaa"). N'utilisez aucun -幨幦ent cit ci-dessus suivi ou pr嶰嶮 par un chiffre. Au lieu de cela, +幨幦ent cit ci\-dessus suivi ou pr嶰嶮 par un chiffre. Au lieu de cela, utilisez un m幨ange de lettres minuscules et majuscules, de chiffres et de signes de ponctuation. Utiliseez des mots de passe longs (disons d'au moins 8 caract鋨es). Vous pourriez utiliser une paire de mots avec un signe de @@ -160,10 +160,10 @@ dans le flux d'erreur standard. .SH "CONFORMIT " .br -.BR Linux-PAM +.BR Linux\-PAM (Pluggable Authentication Modules pour Linux). .BR -Notez que si votre distribution de Linux-PAM se conforme au Standard de +Notez que si votre distribution de Linux\-PAM se conforme au Standard de Syst鋗e de fichiers de Linux, vous pouvez trouver les modules dans .I /lib/security/ au lieu de /usr/lib/security/, comme indiqu dans l'exemple. @@ -171,8 +171,8 @@ au lieu de /usr/lib/security/, comme indiqu .SH "FICHIERS" .br .B /etc/pam.d/passwd -- le fichier de configuration de -.BR Linux-PAM +\- le fichier de configuration de +.BR Linux\-PAM .SH BOGUES .sp 2 @@ -186,11 +186,11 @@ et .sp Pour des informations plus compl鋈es sur la fa蔞n de configurere cette application avec -.BR Linux-PAM ", " +.BR Linux\-PAM ", " voyez le -.BR "Linux-PAM System Administrators' Guide" " at " +.BR "Linux\-PAM System Administrators' Guide" " at " .br -.I "" +.I "" .SH AUTEUR Cristian Gafton diff --git a/man/fr/passwd.5 b/man/fr/passwd.5 index 77523785..3219e07d 100644 --- a/man/fr/passwd.5 +++ b/man/fr/passwd.5 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1993 Michael Haardt (u31b3hs@pool.informatik.rwth-aachen.de), Fri Apr 2 11:32:09 MET DST 1993 +.\" Copyright (c) 1993 Michael Haardt (u31b3hs@pool.informatik.rwth\-aachen.de), Fri Apr 2 11:32:09 MET DST 1993 .\" .\" This is free documentation; you can redistribute it and/or .\" modify it under the terms of the GNU General Public License as @@ -24,8 +24,8 @@ .\" Modified Sun Aug 21 18:12:27 1994 by Rik Faith (faith@cs.unc.edu) .\" Modified Sun Jun 18 01:53:57 1995 by Andries Brouwer (aeb@cwi.nl) .\" -.\" Traduction 17/10/1996 par Christophe Blaess (ccb@club-internet.fr) -.\" Mise jour 18/05/1998 (LDP-man-pages-1.19) +.\" Traduction 17/10/1996 par Christophe Blaess (ccb@club\-internet.fr) +.\" Mise jour 18/05/1998 (LDP\-man\-pages\-1.19) .\" .TH PASSWD 5 "18 Mai 1998" Linux "Manuel de l'administrateur Linux" .SH NOM @@ -57,7 +57,7 @@ avec lequel le fichier contient des * la place des mots de passe, et o ces derniers sont stock廥 sous forme crypt嶪 dans .I /etc/shadow -qui n'est lisible que par le Super-utilisateur. +qui n'est lisible que par le Super\-utilisateur. Que le masquage des mots de passe soit utilis ou non, de nombreux administrateurs syst鋗es utilisent un ast廨ique dans le champ diff --git a/man/fr/shadow.5 b/man/fr/shadow.5 index 408216a9..05cc701a 100644 --- a/man/fr/shadow.5 +++ b/man/fr/shadow.5 @@ -1,4 +1,4 @@ -.\" Copyright 1989 - 1990, Julianne Frances Haugh +.\" Copyright 1989 \- 1990, Julianne Frances Haugh .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: shadow.5,v 1.2 2003/04/26 13:24:12 kloczek Exp $ +.\" $Id: shadow.5,v 1.3 2005/04/05 19:08:53 kloczek Exp $ .\" .TH SHADOW 5 .SH NOM @@ -57,7 +57,7 @@ Le champs .I mot de passe doit 皻re rempli. Le mot de passe crypt comprend 13 24 caract鋨es pris dans -l'alphabet r嶮uit a-z, A-Z, 0-9, \. et /. +l'alphabet r嶮uit a\-z, A\-Z, 0\-9, \. et /. Consultez \fBcrypt\fR(3) pour plus d'information sur le traitement de cette cha螽e. .PP La date de derni鋨e modification du mot de passe est donn par le nNombre de jours 嶰oul廥 depuis le 1er janvier 1970 jusqu'au dernier changement de mot de passe. @@ -73,9 +73,9 @@ Cette information est prioritaire sur toutes les autres champs pr .PP Ce fichier \fBne doit pas 皻re\fR accessible en lecture par les utilisateurs normaux afin de maintenir la s嶰urit des mots de passe, en particuliers contre les attaques aux dictionnaires. .SH FICHIERS -\fI/etc/passwd\fR - information sur les comptes des utilisateurs +\fI/etc/passwd\fR \- information sur les comptes des utilisateurs .br -\fI/etc/shadow\fR - mots de passe crypt廥 des utilisateurs +\fI/etc/shadow\fR \- mots de passe crypt廥 des utilisateurs .SH VOIR AUSSI .BR chage (1), .BR login (1), diff --git a/man/fr/useradd.8 b/man/fr/useradd.8 index 90c49381..99563bc2 100644 --- a/man/fr/useradd.8 +++ b/man/fr/useradd.8 @@ -1,4 +1,4 @@ -.\" Copyright 1991 - 1994, Julianne Frances Haugh +.\" Copyright 1991 \- 1994, Julianne Frances Haugh .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: useradd.8,v 1.3 2004/11/04 03:06:31 kloczek Exp $ +.\" $Id: useradd.8,v 1.4 2005/04/05 19:08:53 kloczek Exp $ .\" .\" Traduction 26/09/00 par Fr嶮廨ic Delanoy (fdelanoy@info.fundp.ac.be) .\" @@ -35,95 +35,95 @@ useradd \- Cr .SH SYNOPSIS .TP 8 .B useradd -.\" .RB [ -A +.\" .RB [ \-A .\" .RI { method | \fBDEFAULT\fR "},... ]" -.RB [ -c +.RB [ \-c .IR commentaire ] -.RB [ -d +.RB [ \-d .IR r廧_perso ] .br -.RB [ -e +.RB [ \-e .IR date_expiration ] -.RB [ -f +.RB [ \-f .IR inactive_time ] .br -.RB [ -g +.RB [ \-g .IR groupe_initial ] -.RB [ -G +.RB [ \-G .IR groupe [,...]] .br -.RB [ -m " [" -k -.IR r廧_squelette ] " |" " " -M ] -.RB [ -p +.RB [ \-m " [" \-k +.IR r廧_squelette ] " |" " " \-M ] +.RB [ \-p .IR mot_de_passe ] .br -.RB [ -s +.RB [ \-s .IR shell ] -.RB [ -u +.RB [ \-u .IR uid " [" -.BR -o ]] -.RB [ -n ] -.RB [ -r ] +.BR \-o ]] +.RB [ \-n ] +.RB [ \-r ] .I login .TP 8 .B useradd -\fB-D\fR -[\fB-g\fI groupe_d嶨aut\fR] -[\fB-b\fI r廧_perso_d嶨aut\fR] +\fB\-D\fR +[\fB\-g\fI groupe_d嶨aut\fR] +[\fB\-b\fI r廧_perso_d嶨aut\fR] .br -[\fB-f\fI inactivit嬞fR] -[\fB-e\fI date_expiration_d嶨aut\fR] +[\fB\-f\fI inactivit嬞fR] +[\fB\-e\fI date_expiration_d嶨aut\fR] .br -[\fB-s\fI shell_d嶨aut\fR] +[\fB\-s\fI shell_d嶨aut\fR] .SH DESCRIPTION .SS Cr嶧tion de nouveaux utilisateurs -Quand elle est invoqu嶪 sans l'option \fB-D\fR, la commande \fBuseradd\fR cr嶪 un nouveau compte utilisateur qui utilise les valeurs sp嶰ifi嶪s sur la ligne de commandes, et les valeurs par d嶨aut du syst鋗e. Le nouveau compte utilisateur sera ins廨 dans les fichiers du syst鋗e quand c'est n嶰essaire, le r廧ertoire personnel sera cr澭, et les fichiers initiaux copi廥, cela d廧endant des options pr廥entes en ligne de commandes. La version fournie avec Red Hat Linux cr嶪 un groupe pour chaque utilisateur ajout au syst鋗e, moins que l'option \fB-n\fR ne soit fournie. Les options qui s'appliquent la commande \fBuseradd\fR sont : -.\" .IP "\fB-A {\fImethod\fR|\fBDEFAULT\fR},..." +Quand elle est invoqu嶪 sans l'option \fB\-D\fR, la commande \fBuseradd\fR cr嶪 un nouveau compte utilisateur qui utilise les valeurs sp嶰ifi嶪s sur la ligne de commandes, et les valeurs par d嶨aut du syst鋗e. Le nouveau compte utilisateur sera ins廨 dans les fichiers du syst鋗e quand c'est n嶰essaire, le r廧ertoire personnel sera cr澭, et les fichiers initiaux copi廥, cela d廧endant des options pr廥entes en ligne de commandes. La version fournie avec Red Hat Linux cr嶪 un groupe pour chaque utilisateur ajout au syst鋗e, moins que l'option \fB\-n\fR ne soit fournie. Les options qui s'appliquent la commande \fBuseradd\fR sont : +.\" .IP "\fB\-A {\fImethod\fR|\fBDEFAULT\fR},..." .\" The value of the user's authentication method. .\" The authentication method is the name of a program which is responsible .\" for validating the user's identity. .\" The string \fBDEFAULT\fR may be used to change the user's authentication .\" method to the standard system password method. -.\" This is a comma-separated list of program names. +.\" This is a comma\-separated list of program names. .\" It may include \fBDEFAULT\fR exactly once. -.IP "\fB-c \fIcommentaire\fR" +.IP "\fB\-c \fIcommentaire\fR" Le champ de commentaire du fichier de mots de passe du nouvel utilisateur. -.IP "\fB-d \fIr廧_perso\fR" +.IP "\fB\-d \fIr廧_perso\fR" Le nouvel utilisateur sera cr澭 en utilisant \fIr廧_perso\fR comme valeur du r廧ertoire de connexion de l'utilisateur. Le comportement par d嶨aut est de concat幯er le nom de \fIlogin\fR au \fIr廧_perso_d嶨aut\fR, et de l'utiliser en tant que nom de r廧ertoire de connexion. -.IP "\fB-e \fIdate_expiration\fR" -La date laquelle le compte de l'utilisateur sera d廥activ. La date est sp嶰ifi嶪 dans le format \fIAAAA-MM-JJ\fR. -.IP "\fB-f \fIjours_inactifs\fR" -Le nombre de jours suivant l'expiration d'un mot de passe apr鋊 lequel le compte est d嶨initivement d廥activ. Une valeur de 0 d廥active le compte d鋊 que le mot de passe a expir, et une valeur de -1 d廥active cette caract廨istique. La valeur par d嶨aut est de -1. -.IP "\fB-g \fIgroupe_initial\fR" +.IP "\fB\-e \fIdate_expiration\fR" +La date laquelle le compte de l'utilisateur sera d廥activ. La date est sp嶰ifi嶪 dans le format \fIAAAA\-MM\-JJ\fR. +.IP "\fB\-f \fIjours_inactifs\fR" +Le nombre de jours suivant l'expiration d'un mot de passe apr鋊 lequel le compte est d嶨initivement d廥activ. Une valeur de 0 d廥active le compte d鋊 que le mot de passe a expir, et une valeur de \-1 d廥active cette caract廨istique. La valeur par d嶨aut est de \-1. +.IP "\fB\-g \fIgroupe_initial\fR" Le nom du groupe ou le num廨o du groupe de connexion initial de l'utilisateur. Le nom du groupe doit exister. Un num廨o de groupe doit se r嶨廨er un groupe pr嶪xistant. Le num廨o de groupe par d嶨aut est de 1. -.IP "\fB-G \fIgroupe,[...]\fR" -Une liste de groupes suppl幦entaires auxquels fait 嶲alement partie l'utilisateur. Chaque groupe est s廧ar du suivant par une virgule, sans espace entre les deux. Les groupes sont soumis aux m瘱es restrictions que celui donn avec l'option \fB-g\fR. Le comportement par d嶨aut pour l'utilisateur est de n'appartenir qu'au groupe initial. -.IP \fB-m\fR -Le r廧ertoire personnel de l'utilisateur sera cr澭 s'il n'existe pas d嶴. Les fichiers contenus dans \fIr廧_squelette\fR seront copi廥 dans le r廧ertoire personnel si l'option \fB-k\fR est employ嶪; sinon, les fichiers contenus dans \fIr廧_squelette\fR seront utilis廥 la place. Tous les r廧ertoires contenus dans \fIr廧_squelette\fR ou dans \fI/etc/skel\fR seront 嶲alement cr澭s dans le r廧ertoire personnel de l'utilisateur. L'option \fB-k\fR n'est valide qu'en conjonction avec l'option \fB-m\fR. Le comportement par d嶨aut est de ne pas cr嶪r le r廧ertoire, et de ne copier aucun fichier. -.IP \fB-M\fR +.IP "\fB\-G \fIgroupe,[...]\fR" +Une liste de groupes suppl幦entaires auxquels fait 嶲alement partie l'utilisateur. Chaque groupe est s廧ar du suivant par une virgule, sans espace entre les deux. Les groupes sont soumis aux m瘱es restrictions que celui donn avec l'option \fB\-g\fR. Le comportement par d嶨aut pour l'utilisateur est de n'appartenir qu'au groupe initial. +.IP \fB\-m\fR +Le r廧ertoire personnel de l'utilisateur sera cr澭 s'il n'existe pas d嶴. Les fichiers contenus dans \fIr廧_squelette\fR seront copi廥 dans le r廧ertoire personnel si l'option \fB\-k\fR est employ嶪; sinon, les fichiers contenus dans \fIr廧_squelette\fR seront utilis廥 la place. Tous les r廧ertoires contenus dans \fIr廧_squelette\fR ou dans \fI/etc/skel\fR seront 嶲alement cr澭s dans le r廧ertoire personnel de l'utilisateur. L'option \fB\-k\fR n'est valide qu'en conjonction avec l'option \fB\-m\fR. Le comportement par d嶨aut est de ne pas cr嶪r le r廧ertoire, et de ne copier aucun fichier. +.IP \fB\-M\fR Le r廧ertoire personnel de l'utilisateur ne sera pas cr澭, m瘱e si les r嶲lages globaux au syst鋗e pr廥ents dans \fI/etc/login.defs\fR consistent en la cr嶧tion de r廧ertoires personnels. -.IP \fB-n\fR +.IP \fB\-n\fR Un groupe de m瘱e nom que l'utilisateur ajout au syst鋗e sera cr澭 par d嶨aut. Cette option d廥activera ce comportement sp嶰ifique de Red Hat Linux. -.IP \fB-r\fR +.IP \fB\-r\fR Cette option est utilis嶪 pour cr嶪r un compte syst鋗e, 諘d un utilisateur avec un UID plus petit que la valeur de UID_MIN d嶨inie dans -\fI/etc/login.defs\fR. Notez que \fBuseradd\fR ne cr嶪ra pas de r廧ertoire personnel pour un tel utilisateur, et ce quel que soit le r嶲lage par d嶨aut pr廥ent dans \fI/etc/login.defs\fR. Vous devez sp嶰ifier l'option \fB-m\fR si vous d廥irez la cr嶧tion d'un r廧ertoire personnel pour un tel utilisateur. C'est une option ajout嶪 par Red Hat. -.IP "\fB-p \fImot_de_passe\fR" +\fI/etc/login.defs\fR. Notez que \fBuseradd\fR ne cr嶪ra pas de r廧ertoire personnel pour un tel utilisateur, et ce quel que soit le r嶲lage par d嶨aut pr廥ent dans \fI/etc/login.defs\fR. Vous devez sp嶰ifier l'option \fB\-m\fR si vous d廥irez la cr嶧tion d'un r廧ertoire personnel pour un tel utilisateur. C'est une option ajout嶪 par Red Hat. +.IP "\fB\-p \fImot_de_passe\fR" Le mot de passe crypt, comme renvoy par \fBcrypt\fR(3). Le comportement par d嶨aut est de d廥activer le compte. -.IP "\fB-s \fIshell\fR" +.IP "\fB\-s \fIshell\fR" Le nom du shell de connexion de l'utilisateur. Le comportement par d嶨aut est de laisser ce compte vide, ce qui fait s幨ectionner au syst鋗e le shell de connexion par d嶨aut. -.IP "\fB-u \fIuid\fR" -La valeur num廨ique de l'ID de l'utilisateur. Cette valeur doit 皻re unique, moins que l'option \fI-o\fR ne soit utilis嶪. La valeur doit 皻re non n嶲ative. Le comportement par d嶨aut est d'utiliser la plus petite valeur d'ID plus grande que 999, et plus grande que celle de n'importe quel autre utilisateur. Les valeurs comprises entre 0 et 499 sont typiquement r廥erv嶪s pour les comptes syst鋗es. +.IP "\fB\-u \fIuid\fR" +La valeur num廨ique de l'ID de l'utilisateur. Cette valeur doit 皻re unique, moins que l'option \fI\-o\fR ne soit utilis嶪. La valeur doit 皻re non n嶲ative. Le comportement par d嶨aut est d'utiliser la plus petite valeur d'ID plus grande que 999, et plus grande que celle de n'importe quel autre utilisateur. Les valeurs comprises entre 0 et 499 sont typiquement r廥erv嶪s pour les comptes syst鋗es. .SS Modifier les valeurs par d嶨aut. -Quand il est invoqu avec l'option \fB-D\fR, \fBuseradd\fR soit affichera les valeurs actuelles par d嶨aut, soit mettra jour les valeurs par d嶨aut via la ligne de commandes. Les options valides sont -.IP "\fB-b \fIr廧_perso\fR" -Le pr嶨ixe de chemin initial pour un nouveau r廧ertoire personnel d'utilisateur. Le nom de l'utilisateur sera suffix la fin de \fIr廧_perso\fR pour cr嶪r le nom du nouveau r廧ertoire si l'option \fB-d\fI n'est pas utilis嶪 pendant la cr嶧tion d'un nouveau compte. -.IP "\fB-e \fIdate_expiration_d嶨aut\fR" +Quand il est invoqu avec l'option \fB\-D\fR, \fBuseradd\fR soit affichera les valeurs actuelles par d嶨aut, soit mettra jour les valeurs par d嶨aut via la ligne de commandes. Les options valides sont +.IP "\fB\-b \fIr廧_perso\fR" +Le pr嶨ixe de chemin initial pour un nouveau r廧ertoire personnel d'utilisateur. Le nom de l'utilisateur sera suffix la fin de \fIr廧_perso\fR pour cr嶪r le nom du nouveau r廧ertoire si l'option \fB\-d\fI n'est pas utilis嶪 pendant la cr嶧tion d'un nouveau compte. +.IP "\fB\-e \fIdate_expiration_d嶨aut\fR" La date laquelle le compte utilisateur sera d廥activ. -.IP "\fB-f \fIinactivit嬞fR" +.IP "\fB\-f \fIinactivit嬞fR" Le nombre de jours apr鋊 l'expiration d'un mot de passe avant que le compte ne soit d廥activ. -.IP "\fB-g \fIgroupe_d嶨aut\fR" +.IP "\fB\-g \fIgroupe_d嶨aut\fR" Le nom de groupe ou l'ID du groupe initial d'un nouvel utilisateur. Le groupe nomm doit exister, et un ID de groupe num廨ique doit d嶴 exister en tant qu'ID de groupe. -.IP "\fB-s \fIshell_d嶨aut\fR" +.IP "\fB\-s \fIshell_d嶨aut\fR" Le nom du shell de connexion d'un nouvel utilisateur. Le programme nomm sera utilis pour tous les futurs nouveaux comptes. .PP Si aucune option n'est sp嶰ifi嶪, \fBuseradd\fR affichera les valeurs par d嶨aut du moment. @@ -134,17 +134,17 @@ Cette version de \fIuseradd\fR a .SH INCONV冇IENTS Vous ne pouvez pas ajouter d'utilisateur un groupe NIS. Cela doit 皻re effectu sur le serveur NIS. .SH FICHIERS -\fB/etc/passwd\fR - information sur les comptes utilisateurs +\fB/etc/passwd\fR \- information sur les comptes utilisateurs .br -\fB/etc/shadow\fR - information s嶰uris嶪 sur les comptes utilisateurs +\fB/etc/shadow\fR \- information s嶰uris嶪 sur les comptes utilisateurs .br -\fB/etc/group\fR - information de groupes +\fB/etc/group\fR \- information de groupes .br -\fB/etc/default/useradd\fR - information par d嶨aut +\fB/etc/default/useradd\fR \- information par d嶨aut .br -\fB/etc/login.defs\fR - r嶲lages globaux du syst鋗e +\fB/etc/login.defs\fR \- r嶲lages globaux du syst鋗e .br -\fB/etc/skel\fR - r廧ertoire contenant les fichiers utilis廥 par d嶨aut +\fB/etc/skel\fR \- r廧ertoire contenant les fichiers utilis廥 par d嶨aut .SH "VOIR AUSSI" .BR chfn (1), .BR chsh (1), diff --git a/man/fr/userdel.8 b/man/fr/userdel.8 index 6d577806..24c8bb9a 100644 --- a/man/fr/userdel.8 +++ b/man/fr/userdel.8 @@ -1,4 +1,4 @@ -.\" Copyright 1991 - 1994, Julianne Frances Haugh +.\" Copyright 1991 \- 1994, Julianne Frances Haugh .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: userdel.8,v 1.2 2003/04/26 13:24:12 kloczek Exp $ +.\" $Id: userdel.8,v 1.3 2005/04/05 19:08:53 kloczek Exp $ .\" .\" Traduction 27/09/2000 par Fr嶮廨ic Delanoy (fdelanoy@info.fundp.ac.be) .\" @@ -34,19 +34,19 @@ userdel \- Effacer un compte utilisateur et les fichiers associ廥 .SH SYNOPSIS .B userdel -[\fB-r\fR] +[\fB\-r\fR] .I login .SH DESCRIPTION La commande \fBuserdel\fR modifie les fichiers des comptes du syst鋗e, en supprimant toutes les entr嶪s qui se r嶨鋨ent \fIlogin\fR. L'utilisateur nomm doit exister. .SH OPTIONS -.IP \fB-r\fR -Les fichiers pr廥ents dans le r廧ertoire personnel de l'utilisateur seront supprim廥 en m瘱e temps que le r廧ertoire lui-m瘱e. Les fichiers situ廥 dans d'autres syst鋗es de fichiers devront 皻re recherch廥 et 幨imin廥 manuellement. +.IP \fB\-r\fR +Les fichiers pr廥ents dans le r廧ertoire personnel de l'utilisateur seront supprim廥 en m瘱e temps que le r廧ertoire lui\-m瘱e. Les fichiers situ廥 dans d'autres syst鋗es de fichiers devront 皻re recherch廥 et 幨imin廥 manuellement. .SH FICHIERS -\fI/etc/passwd\fR - information sur les comptes utilisateurs +\fI/etc/passwd\fR \- information sur les comptes utilisateurs .br -\fI/etc/shadow\fR - information s嶰uris嶪 sur les comptes utilisateurs +\fI/etc/shadow\fR \- information s嶰uris嶪 sur les comptes utilisateurs .br -\fI/etc/group\fR - information de groupes +\fI/etc/group\fR \- information de groupes .SH INCONV冇IENTS \fBuserdel\fR ne vous permet pas de supprimer un compte si l'utilisateur en question est actuellement connect. Vous devez tuer tous les processus en cours d'ex嶰ution appartenant l'utilisateur poss嶮ant le compte que vous 皻es en train de supprimer. Vous ne pouvez pas supprimer d'attribut NIS d'un client NIS. Cela doit 皻re effectu sur le serveur NIS. .SH "VOIR AUSSI" diff --git a/man/fr/usermod.8 b/man/fr/usermod.8 index 02f56d4d..a2e546c4 100644 --- a/man/fr/usermod.8 +++ b/man/fr/usermod.8 @@ -1,4 +1,4 @@ -.\" Copyright 1991 - 1994, Julianne Frances Haugh +.\" Copyright 1991 \- 1994, Julianne Frances Haugh .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: usermod.8,v 1.5 2004/11/04 03:06:31 kloczek Exp $ +.\" $Id: usermod.8,v 1.6 2005/04/05 19:08:53 kloczek Exp $ .\" .\" Traduction 27/09/2000 par Fr嶮廨ic Delanoy (fdelanoy@info.fundp.ac.be) .\" @@ -35,76 +35,76 @@ usermod \- modifier un compte utilisateur .SH SYNOPSIS .TP 8 .B usermod -.\" .RB [ -A +.\" .RB [ \-A .\" .RI { method | \fBDEFAULT\fR "},... ]" -.RB [ -c +.RB [ \-c .IR commentaire ] -.RB [ -d +.RB [ \-d .IR r廧_perso " [" -.BR -m ]] +.BR \-m ]] .br -.RB [ -e +.RB [ \-e .IR date_expiration ] -.RB [ -f +.RB [ \-f .IR inactivit ] .br -.RB [ -g +.RB [ \-g .IR groupe_initial ] -.RB [ -G +.RB [ \-G .IR groupe [,...]] .br -.RB [ -l +.RB [ \-l .IR nom_connexion ] -.RB [ -p +.RB [ \-p .IR mot_de_passe ] .br -.RB [ -s +.RB [ \-s .IR shell ] -.RB [ -u +.RB [ \-u .IR uid " [" -.BR -o ]] -.RB [ -L | -U ] +.BR \-o ]] +.RB [ \-L | \-U ] .I login .SH DESCRIPTION La commande \fBusermod\fR modifie les fichiers des comptes du syst鋗e pour refl彋er les modifications qui ont 彋 sp嶰ifi嶪s sur la ligne de commandes. Les options qui s'appliquent la commande \fBusermod\fR sont -.\" .IP "\fB-A \fImethod\fR|\fBDEFAULT\fR" +.\" .IP "\fB\-A \fImethod\fR|\fBDEFAULT\fR" .\" The new value of the user's authentication method. .\" The authentication method is the name of a program which is responsible .\" for validating the user's identity. .\" The string \fBDEFAULT\fR may be used to change the user's authentication .\" method to the standard system password method. -.IP "\fB-c \fIcommentaire\fR" +.IP "\fB\-c \fIcommentaire\fR" La nouvelle valeur du fichier du champ de commentaire du fichier de mot de passe de l'utilisateur. Il est normalement modifi en utilisant l'utilitaire \fBchfn\fR(1). -.IP "\fB-d \fIr廧_perso\fR" -Le nouveau r廧ertoire de connexion de l'utilisateur. Si l'option \fB-m\fR est fournie, le contenu du r廧ertoire personnel actuel sera d廧lac dans le nouveau r廧ertoire personnel, qui sera cr澭 si n嶰essaire. -.IP "\fB-e \fIdate_expiration\fR" -La date laquelle le compte utilisateur sera d廥activ. La date est sp嶰ifi嶪 dans le format \fIAAAA-MM-JJ\fR. -.IP "\fB-f \fIjours_inactifs\fR" -Le nombre de jours suivant l'expiration d'un mot de passe apr鋊 lequel le compte est d嶨initivement d廥activ. Une valeur de 0 d廥active le compte d鋊 que le mot de passe a expir, et une valeur de -1 d廥active cette caract廨istique. La valeur par d嶨aut est de -1. -.IP "\fB-g \fIgroupe_initial\fR" +.IP "\fB\-d \fIr廧_perso\fR" +Le nouveau r廧ertoire de connexion de l'utilisateur. Si l'option \fB\-m\fR est fournie, le contenu du r廧ertoire personnel actuel sera d廧lac dans le nouveau r廧ertoire personnel, qui sera cr澭 si n嶰essaire. +.IP "\fB\-e \fIdate_expiration\fR" +La date laquelle le compte utilisateur sera d廥activ. La date est sp嶰ifi嶪 dans le format \fIAAAA\-MM\-JJ\fR. +.IP "\fB\-f \fIjours_inactifs\fR" +Le nombre de jours suivant l'expiration d'un mot de passe apr鋊 lequel le compte est d嶨initivement d廥activ. Une valeur de 0 d廥active le compte d鋊 que le mot de passe a expir, et une valeur de \-1 d廥active cette caract廨istique. La valeur par d嶨aut est de \-1. +.IP "\fB\-g \fIgroupe_initial\fR" Le nom du groupe ou le num廨o du groupe de connexion initial de l'utilisateur. Le nom du groupe doit exister. Un num廨o de groupe doit se r嶨廨er un groupe pr嶪xistant. Le num廨o de groupe par d嶨aut est de 1. -.IP "\fB-G \fIgroupe,[...]\fR" -Une liste de groupes suppl幦entaires auxquels fait 嶲alement partie l'utilisateur. Chaque groupe est s廧ar du suivant par une virgule, sans espace entre les deux. Les groupes sont soumis aux m瘱es restrictions que celles donn嶪s avec l'option \fB-g\fR. Si l'utilisateur fait actuellement partie d'un groupe qui n'est pas list, l'utilisateur sera supprim du groupe. -.IP "\fB-l \fInom_connexion\fR" +.IP "\fB\-G \fIgroupe,[...]\fR" +Une liste de groupes suppl幦entaires auxquels fait 嶲alement partie l'utilisateur. Chaque groupe est s廧ar du suivant par une virgule, sans espace entre les deux. Les groupes sont soumis aux m瘱es restrictions que celles donn嶪s avec l'option \fB\-g\fR. Si l'utilisateur fait actuellement partie d'un groupe qui n'est pas list, l'utilisateur sera supprim du groupe. +.IP "\fB\-l \fInom_connexion\fR" Le nom de l'utilisateur passera de \fIlogin\fR \fIlogin_name\fR. Rien d'autre n'est modifi. En particulier, le r廧ertoire personnel de l'utilisateur devra probablement 皻re chang pour refl彋er le nouveau nom de connexion. -.IP "\fB-L\fR" -Verrouiller le mot de passe d'un utilisateur. Cette option ajoute un `!' devant le mot de passe crypt, ce qui d廥active le mot de passe. Vous ne pouvez pas utiliser cette option avec \fI-p\fR ou \fI-U\fR. -.IP "\fB-p \fImot_de_passe\fR" +.IP "\fB\-L\fR" +Verrouiller le mot de passe d'un utilisateur. Cette option ajoute un `!' devant le mot de passe crypt, ce qui d廥active le mot de passe. Vous ne pouvez pas utiliser cette option avec \fI\-p\fR ou \fI\-U\fR. +.IP "\fB\-p \fImot_de_passe\fR" Le mot de passe crypt, comme renvoy par \fBcrypt\fR(3). -.IP "\fB-s \fIshell\fR" +.IP "\fB\-s \fIshell\fR" Le nom du nouveau shell de connexion de l'utilisateur. Si shell n'est pas fourni, le syst鋗e s幨ectionnera le shell de connexion par d嶨aut. -.IP "\fB-u \fIuid\fR" -La valeur num廨ique de l'ID de l'utilisateur. Cette valeur doit 皻re unique, moins que l'option \fI-o\fR ne soit utilis嶪. La valeur doit 皻re non n嶲ative. Les valeurs comprises entre 0 et 999 sont typiquement r廥erv嶪s aux comptes syst鋗es. Tous les fichiers poss嶮廥 par l'utilisateur et qui sont situ廥 dans le sous-arbre de r廧ertoires "d嶵utant" au r廧ertoire personnel de l'utilisateur verront leur ID d'utilisateur automatiquement modifi. Les fichiers situ廥 l'ext廨ieur du r廧ertoire personnel de l'utilisateur doivent 皻re modifi廥 la main. -.IP "\fB-U\fR" -D憝errouiller le mot de passe d'un utilisateur. Cela supprime le `!' situ devant le mot de passe crypt. Vous ne pouvez pas utiliser cette option avec \fI-p\fR ou \fI-L\fR. +.IP "\fB\-u \fIuid\fR" +La valeur num廨ique de l'ID de l'utilisateur. Cette valeur doit 皻re unique, moins que l'option \fI\-o\fR ne soit utilis嶪. La valeur doit 皻re non n嶲ative. Les valeurs comprises entre 0 et 999 sont typiquement r廥erv嶪s aux comptes syst鋗es. Tous les fichiers poss嶮廥 par l'utilisateur et qui sont situ廥 dans le sous\-arbre de r廧ertoires "d嶵utant" au r廧ertoire personnel de l'utilisateur verront leur ID d'utilisateur automatiquement modifi. Les fichiers situ廥 l'ext廨ieur du r廧ertoire personnel de l'utilisateur doivent 皻re modifi廥 la main. +.IP "\fB\-U\fR" +D憝errouiller le mot de passe d'un utilisateur. Cela supprime le `!' situ devant le mot de passe crypt. Vous ne pouvez pas utiliser cette option avec \fI\-p\fR ou \fI\-L\fR. .SH INCONV冇IENTS \fBusermod\fR ne vous permet pas de modifier le nom d'un utilisateur qui est actuellement connect. Vous devez 皻re sr que l'utilisateur nomm n'est pas en train d'ex嶰uter un quelconque programme quand cette commande est ex嶰ut嶪 si l'UID num廨ique de l'utilisateur est modifi. Vous devez modifier le nom du propri彋aire de tous les fichiers \fIcrontab\fR manuellement. Vous devez modifier le nom du propri彋aire de n'importe quel travail \fIat\fR manuellement. Vous devez effectuer les modifications impliquant NIS sur le serveur NIS. .SH FICHIERS -\fI/etc/passwd\fR - information sur les comptes utilisateurs +\fI/etc/passwd\fR \- information sur les comptes utilisateurs .br -\fI/etc/shadow\fR - information s嶰uris嶪 sur les comptes utilisateurs +\fI/etc/shadow\fR \- information s嶰uris嶪 sur les comptes utilisateurs .br -\fI/etc/group\fR - information de groupes +\fI/etc/group\fR \- information de groupes .SH "VOIR AUSSI" .BR chfn (1), .BR chsh (1), diff --git a/man/gpasswd.1 b/man/gpasswd.1 index e891a0f9..2aa03dec 100644 --- a/man/gpasswd.1 +++ b/man/gpasswd.1 @@ -1,4 +1,4 @@ -.\"$Id: gpasswd.1,v 1.10 2004/11/02 19:28:31 kloczek Exp $ +.\"$Id: gpasswd.1,v 1.17 2005/04/12 17:55:55 kloczek Exp $ .\" Copyright 1996, Rafal Maszkowski .\" All rights reserved. You can redistribute this man page and/or .\" modify it under the terms of the GNU General Public License as @@ -11,37 +11,37 @@ gpasswd \- administer the /etc/group file .br .SH SYNOPSIS .TP 6 -\fBgpasswd \fIgroup\fR +\fBgpasswd\fR \fIgroup\fR .br -\fBgpasswd -a \fIuser\fR \fIgroup\fR +\fBgpasswd \-a\fR \fIuser\fR \fIgroup\fR .br -\fBgpasswd -d \fIuser\fR \fIgroup\fR +\fBgpasswd \-d\fR \fIuser\fR \fIgroup\fR .br -\fBgpasswd -R \fIgroup\fR +\fBgpasswd \-R\fR \fIgroup\fR .br -\fBgpasswd -r \fIgroup\fR +\fBgpasswd \-r\fR \fIgroup\fR .br -\fBgpasswd\fR [\fB-A \fIuser\fR,...] [\fB-M\fR \fIuser\fR,...] \fIgroup\fR +\fBgpasswd\fR [\fB\-A\fR \fIuser\fR,...] [\fB\-M\fR \fIuser\fR,...] \fIgroup\fR .SH DESCRIPTION \fBgpasswd\fR is used to administer the \fI/etc/group\fR file (and \fI/etc/gshadow\fR file if compiled with SHADOWGRP defined). Every group can have administrators, members and a password. System administrator can use -\fB-A\fR option to define group administrator(s) and \fB-M\fR option to +\fB\-A\fR option to define group administrator(s) and \fB\-M\fR option to define members and has all rights of group administrators and members. .SH OPTIONS .PP -Group administrator can add and delete users using \fB-a\fR and \fB-d\fR -options respectively. Administrators can use \fB-r\fR option to remove group +Group administrator can add and delete users using \fB\-a\fR and \fB\-d\fR +options respectively. Administrators can use \fB\-r\fR option to remove group password. When no password is set only group members can use \fBnewgrp\fR to -join the group. Option \fB-R\fR disables access to the group through -\fBnewgrp\fR command. +join the group. Option \fB\-R\fR disables access via a password to the group +through \fBnewgrp\fR command (however members will still be able to switch to +this group). .PP \fBgpasswd\fR called by a group administrator with group name only prompts for the group password. If password is set the members can still -.BR newgrp (1) -without a password, non-members must supply the password. +\fBnewgrp\fR(1) without a password, non\-members must supply the password. .SH FILES -\fI/etc/group\fR \- group information +\fI/etc/group\fR \- group account information .br \fI/etc/gshadow\fR \- shadow group information .SH SEE ALSO @@ -49,6 +49,8 @@ without a password, non-members must supply the password. .BR groupadd (8), .BR groupdel (8), .BR groupmod (8), -.BR grpck (8) +.BR grpck (8), +.BR group (5), +.BR gshadow (5) .SH AUTHOR Rafal Maszkowski diff --git a/man/groupadd.8 b/man/groupadd.8 index 35c2d619..1d909bb9 100644 --- a/man/groupadd.8 +++ b/man/groupadd.8 @@ -1,4 +1,4 @@ -.\"$Id: groupadd.8,v 1.21 2004/11/04 03:06:31 kloczek Exp $ +.\"$Id: groupadd.8,v 1.24 2005/04/05 18:47:50 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -30,20 +30,20 @@ groupadd \- Create a new group .SH SYNOPSIS .TP 6 -\fBgroupadd\fR [\fB-g\fI gid \fR[\fB-o\fR]] [\fB-f\fR] \fIgroup\fR +\fBgroupadd\fR [\fB\-g\fR \fIgid \fR[\fB\-o\fR]] [\fB\-f\fR] \fIgroup\fR .SH DESCRIPTION The \fBgroupadd\fR command creates a new group account using the values specified on the command line and the default values from the system. The new group will be entered into the system files as needed. .SH OPTIONS The options which apply to the \fBgroupadd\fR command are: -.IP "\fB-f\fR" +.IP "\fB\-f\fR" This option causes to just exit with success status if the specified -group already exists. With \fB-g\fR, if specified gid already exists, -other (unique) gid is chosen (i.e. \fB-g\fR is turned off). -.IP "\fB-g\fR \fIgid\fR" +group already exists. With \fB\-g\fR, if specified gid already exists, +other (unique) gid is chosen (i.e. \fB\-g\fR is turned off). +.IP "\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 +\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. .SH FILES @@ -60,7 +60,7 @@ The \fBgroupadd\fR command exits with the following values: .br \fB3\fR \- invalid argument to option .br -\fB4\fR \- gid not unique (when -o not used) +\fB4\fR \- gid not unique (when \-o not used) .br \fB9\fR \- group name not unique .br diff --git a/man/groupdel.8 b/man/groupdel.8 index 3dccc4b4..ee1412df 100644 --- a/man/groupdel.8 +++ b/man/groupdel.8 @@ -1,4 +1,4 @@ -.\"$Id: groupdel.8,v 1.13 2003/05/01 18:17:39 kloczek Exp $ +.\"$Id: groupdel.8,v 1.14 2005/04/12 17:55:55 kloczek Exp $ .\" Copyright 1991 - 1993, Julianne Frances Haugh .\" All rights reserved. .\" @@ -40,7 +40,7 @@ the named group as the file group ID. You may not remove the primary group of any existing user. You must remove the user before you remove the group. .SH FILES -\fI/etc/group\fR \- group information +\fI/etc/group\fR \- group account information .br \fI/etc/gshadow\fR \- secure group information .SH EXIT VALUES diff --git a/man/groupmod.8 b/man/groupmod.8 index f326ce56..4ac44ec2 100644 --- a/man/groupmod.8 +++ b/man/groupmod.8 @@ -1,4 +1,4 @@ -.\"$Id: groupmod.8,v 1.16 2004/12/12 20:58:26 kloczek Exp $ +.\"$Id: groupmod.8,v 1.20 2005/04/12 17:55:55 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -29,35 +29,35 @@ .SH NAME groupmod \- modify a group .SH SYNOPSIS -\fBgroupmod\fR [\fB-g\fR \fIGID\fR [\fB-o\fR]] [\fB-n\fR \fINEW_GROUP_NAME\fR] -\fIGROUP\fR +\fBgroupmod\fR [\fB\-g\fR \fIgid\fR [\fB\-o\fR]] [\fB\-n\fR \fInew_group_name\fR] +\fIgroup\fR .SH DESCRIPTION The \fBgroupmod\fR command modifies the system account files to reflect the changes that are specified on the command line. .SH OPTIONS The options which apply to the \fBgroupmod\fR command are: -.IP "\fB-g\fR \fIGID\fR" +.IP "\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. Values between 0 +\fB\-o\fR option is used. The value must be non\-negative. Values between 0 and 999 are typically reserved for system groups. Any files which the old group ID is the file group ID must have the file group ID changed manually. -.IP "\fB-n\fR \fINEW_GROUP_NAME\fR" -The name of the group will be changed from \fIGROUP\fR to \fINEW_GROUP_NAME\fR. +.IP "\fB\-n\fR \fInew_group_name\fR" +The name of the group will be changed from \fIgroup\fR to \fInew_group_name\fR. .SH FILES -\fI/etc/group\fR \- group information +\fI/etc/group\fR \- group account information .br \fI/etc/gshadow\fR \- secure group information .SH EXIT VALUES .TP 2 The \fBgroupmod\fR command exits with the following values: .br -\fB0\fR \- success +\fB0\fR \- success .br \fB2\fR \- bad command syntax .br \fB3\fR \- invalid argument to option .br -\fB4\fR \- gid already in use (and no -o) +\fB4\fR \- gid already in use (and no \-o) .br \fB6\fR \- specified group doesn't exist .br diff --git a/man/groups.1 b/man/groups.1 index 355e1e19..d1d01bed 100644 --- a/man/groups.1 +++ b/man/groups.1 @@ -1,4 +1,4 @@ -.\"$Id: groups.1,v 1.12 2003/05/01 18:17:39 kloczek Exp $ +.\"$Id: groups.1,v 1.14 2005/04/12 17:55:55 kloczek Exp $ .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -42,7 +42,7 @@ from \fI/etc/group\fR reported. The user must use \fBnewgrp\fR or \fBsg\fR to change their current real and effective group ID. .SH FILES -\fI/etc/group\fR \ - group information +\fI/etc/group\fR \- group account information .SH SEE ALSO .BR newgrp (1), .BR getgid (2), diff --git a/man/grpck.8 b/man/grpck.8 index 039353b5..33274df2 100644 --- a/man/grpck.8 +++ b/man/grpck.8 @@ -1,4 +1,4 @@ -.\"$Id: grpck.8,v 1.14 2004/12/11 20:05:01 kloczek Exp $ +.\"$Id: grpck.8,v 1.17 2005/04/12 17:53:21 kloczek Exp $ .\" Copyright 1992 - 1993, Julianne Frances Haugh .\" All rights reserved. .\" @@ -29,7 +29,7 @@ .SH NAME grpck \- verify integrity of group files .SH SYNOPSIS -\fBgrpck\fR [\fB-r\fR] [\fIgroup\fR \fIshadow\fR] +\fBgrpck\fR [\fB\-r\fR] [\fIgroup\fR \fIshadow\fR] .SH DESCRIPTION \fBgrpck\fR verifies the integrity of the system authentication information. All entries in the \fI/etc/group\fR and \fI/etc/gshadow\fR are checked to @@ -40,12 +40,12 @@ have other incorrectable errors. Checks are made to verify that each entry has: .sp .in +.5i -- the correct number of fields +\- the correct number of fields .br -- a unique group name +\- a unique group name .br -- a valid list of members and administrators -.in -.5i +\- a valid list of members and administrators +.in \-.5i .sp .PP The checks for correct number of fields and unique group name are fatal. If @@ -63,17 +63,17 @@ circumstances to remove the offending entry. By default, \fBgrpck\fR operates on the files \fI/etc/group\fR and \fI/etc/gshadow\fR. The user may select alternate files with the \fIgroup\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 +in read\-only mode by specifying the \fB\-r\fR flag. This causes all questions regarding changes to be answered \fBno\fR without user intervention. \fBgrpck\fR can also sort entries in \fI/etc/group\fR and \fI/etc/gshadow\fR -by GID. To run it in sort mode pass it \fB-s\fR flag. No checks are +by GID. To run it in sort mode pass it \fB\-s\fR flag. No checks are performed then, it just sorts. .SH FILES -\fI/etc/group\fR\ - group account information +\fI/etc/group\fR \- group account information .br -\fI/etc/gshadow\fR\ - encrypted passwords and group administrator information +\fI/etc/gshadow\fR \- encrypted passwords and group administrator information .br -\fI/etc/passwd\fR\ - user information +\fI/etc/passwd\fR \- user account information .SH SEE ALSO .BR group (5), .BR passwd (5), diff --git a/man/gshadow.5 b/man/gshadow.5 new file mode 100644 index 00000000..686d5561 --- /dev/null +++ b/man/gshadow.5 @@ -0,0 +1,65 @@ +.\"$Id: gshadow.5,v 1.2 2005/04/02 16:10:23 kloczek Exp $ +.\" Copyright 2005, Nicolas FRANCOIS +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. Neither the name of Nicolas FRANCOIS nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY NICOLAS FRANCOIS AND CONTRIBUTORS ``AS IS'' +.\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL NICOLAS FRANCOIS OR CONTRIBUTORS BE +.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +.\" THE POSSIBILITY OF SUCH DAMAGE. +.TH GSHADOW 5 +.SH NAME +gshadow \- shadowed group file +.SH DESCRIPTION +.I gshadow +contains the shadowed information for group accounts. +It contains lines with the folowing colon\-separated fields: +.IP "" .5i +Group name +.IP "" .5i +Encrypted password +.IP "" .5i +Comma\-separated list of group administrators +.IP "" .5i +Comma\-separated list of group members. +.PP +The group name and password fields must be filled. +The encryped password consists of 13 characters from the 64\-character +alphabet a thru z, A thru Z, 0 thru 9, \. and /. +Refer to \fBcrypt\fR(3) for details on how this string is interpreted. +If the password field contains some string that is not valid result +of \fBcrypt\fR(3), for instance ! or *, the user will not be able to use +a unix password to log in, subject to \fBpam\fR(7). +.PP +This information supercedes any password present in \fI/etc/group\fR. +.PP +This file must not be readable by regular users if password +security is to be maintained. +.SH FILES +\fI/etc/group\fR \- user group file +.br +\fI/etc/gshadow\fR \- shadowed group file +.SH SEE ALSO +.BR group (5), +.BR gpasswd (5), +.BR newgrp (5) +.SH AUTHOR +Nicolas FRANCOIS diff --git a/man/hu/Makefile.in b/man/hu/Makefile.in index 4bb05d4c..228495b2 100644 --- a/man/hu/Makefile.in +++ b/man/hu/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.4 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -86,17 +86,16 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ 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@ @@ -193,9 +192,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/hu/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/hu/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/hu/Makefile + $(AUTOMAKE) --foreign man/hu/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/man/hu/chsh.1 b/man/hu/chsh.1 index d5663800..4dd31170 100644 --- a/man/hu/chsh.1 +++ b/man/hu/chsh.1 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: chsh.1,v 1.2 2003/04/26 13:24:13 kloczek Exp $ +.\" $Id: chsh.1,v 1.4 2005/04/05 19:08:54 kloczek Exp $ .\" .TH CHSH 1 .SH N勼 @@ -37,7 +37,7 @@ chsh \- bejelentkez .SH 糞TEKINT仉 .TP 5 \fBchsh\fR -[\fB-s \fIh嶴jprogram\fR] [\fIfelhaszn嫮酀fR] +[\fB\-s\fR \fIh嶴jprogram\fR] [\fIfelhaszn嫮酀fR] .SH LE炅糜 A \fBchsh\fR parancs a felhaszn嫮 bejelentkez廥i parancs廨telmez鰋彋 v嫮toztatja meg. Norm嫮 felhaszn嫮 csak a saj嫢 parancs廨telmez鰋彋 嫮l癃hatja, a @@ -47,11 +47,11 @@ A h a \fI/etc/shells\fR f奫lban, kiv憝e ha a rendszergazd摋 mert neki minden be嫮l癃嫳 elfogadott. Korl嫢ozott parancs廨telmez鰗 nem lehet m嫳ikra 嫢嫮l癃ani. -Ez廨t nem tan塶sos a \fB/bin/rsh\fR-nak a \fI/etc/shells\fR-ben -val felsorol嫳a, mert ha a felhaszn嫮 嫢v嫮t erre a h嶴j-ra +Ez廨t nem tan塶sos a \fB/bin/rsh\fR\-nak a \fI/etc/shells\fR\-ben +val felsorol嫳a, mert ha a felhaszn嫮 嫢v嫮t erre a h嶴j\-ra nem v嫮that m嫳ikra. .PP -A \fB-s\fR opci n幨kl a \fBchsh\fR interakt癉 m鏚on +A \fB\-s\fR opci n幨kl a \fBchsh\fR interakt癉 m鏚on mk鐰ik. Be kell 甏ni az j 廨t幧et, vagy resen hagyni a sort, hogy az 廧pen aktu嫮is be嫮l癃嫳 maradjon, ami \fB[ ]\fR jelek k驆飆t l嫢hat. .SH F穗LOK diff --git a/man/hu/gpasswd.1 b/man/hu/gpasswd.1 index cdd8b455..d1755e85 100644 --- a/man/hu/gpasswd.1 +++ b/man/hu/gpasswd.1 @@ -4,7 +4,7 @@ .\" published by the Free Software Foundation; either version 2 of the .\" License, or (at your option) any later version. .\" -.\" $Id: gpasswd.1,v 1.2 2003/04/26 13:24:13 kloczek Exp $ +.\" $Id: gpasswd.1,v 1.3 2005/04/05 19:08:54 kloczek Exp $ .\" .TH GPASSWD 1 .SH N勼 @@ -14,25 +14,25 @@ gpasswd \- az /etc/group f .B gpasswd \fIcsoport\fR .br .B gpasswd -.B -a +.B \-a \fIfelhaszn嫮酀fR \fIcsoport\fR .br .B gpasswd -.B -d +.B \-d \fIfelhaszn嫮酀fR \fIcsoport\fR .br .B gpasswd -.B -R +.B \-R \fIcsoport\fR .br .B gpasswd -.B -r +.B \-r \fIcsoport\fR .br .B gpasswd -.RB [ -A +.RB [ \-A \fIfelhaszn嫮酀fR,...] -.RB [ -M +.RB [ \-M \fIfelhaszn嫮酀fR,...] \fIcsoport\fR .br @@ -42,18 +42,18 @@ A program seg癃s嶲憝el adminisztr嫮hatjuk az /etc/group f奫lt illetve az /etc/gshadow f奫lt amennyiben a SHADOWGPR defini嫮va volt a ford癃嫳 alatt. Minden csoportban lehetnek adminisztr嫢orok, -tagok 廥 egy jelsz. A rendszeradminisztr嫢or a \fB-A\fR opci -seg癃s嶲憝el defini嫮hat csoportadminisztr嫢or(oka)t 廥 a \fB-M\fR +tagok 廥 egy jelsz. A rendszeradminisztr嫢or a \fB\-A\fR opci +seg癃s嶲憝el defini嫮hat csoportadminisztr嫢or(oka)t 廥 a \fB\-M\fR opci镽al tagokat. A rendszeradminiszt嫢or minden joggal rendelkezik, amellyel a csoportadminisztr嫢or 廥 a csoport tagjai. .PP -A csoportadminisztr嫢or a \fB-a\fR kapcsol镽al hozhat l彋re -felhaszn嫮鏦at, 廥 a \fB-d\fR opci镽al t顤闤heti 鰈et. Az -adminisztr嫢orok a \fB-r\fR opci镽al t顤闤hetik a csoport +A csoportadminisztr嫢or a \fB\-a\fR kapcsol镽al hozhat l彋re +felhaszn嫮鏦at, 廥 a \fB\-d\fR opci镽al t顤闤heti 鰈et. Az +adminisztr嫢orok a \fB\-r\fR opci镽al t顤闤hetik a csoport jelszav嫢. Ha nincs jelsz be嫮l癃va, akkor csak a csoport tagjai haszn嫮hatj嫜 a .BR newgrp (1) -parancsot a csatlakoz嫳hoz. A \fB-R\fR opci +parancsot a csatlakoz嫳hoz. A \fB\-R\fR opci megg嫢olja a csoport el廨廥彋 a .BR newgrp (1) parancson keresztl. diff --git a/man/hu/groups.1 b/man/hu/groups.1 index e631db7b..153e52d3 100644 --- a/man/hu/groups.1 +++ b/man/hu/groups.1 @@ -1,4 +1,4 @@ -.\" Copyright 1991 - 1994, Julianne Frances Haugh +.\" Copyright 1991 \- 1994, Julianne Frances Haugh .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: groups.1,v 1.4 2003/04/28 02:07:12 kloczek Exp $ +.\" $Id: groups.1,v 1.5 2005/04/05 19:08:54 kloczek Exp $ .\" .TH GROUPS 1 .SH N勼 diff --git a/man/hu/login.1 b/man/hu/login.1 index c6bfef99..319d093d 100644 --- a/man/hu/login.1 +++ b/man/hu/login.1 @@ -1,4 +1,4 @@ -.\" Copyright 1989 - 1994, Julianne Frances Haugh +.\" Copyright 1989 \- 1994, Julianne Frances Haugh .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: login.1,v 1.4 2003/04/28 02:07:12 kloczek Exp $ +.\" $Id: login.1,v 1.6 2005/04/05 19:08:54 kloczek Exp $ .\" .TH LOGIN 1 .SH N勼 @@ -45,19 +45,12 @@ A a shell szempontj墎鏊 kl霵leges kezel廥 lehet 廥 el灀ordulhat, hogy nem h癉hat meg alfolyamatk幯t. Tipikus p幨da erre, amikor a .B login -parancsot a shell \fBexec login\fR -k幯t 廨telmezi, teh嫢 az j +parancsot a shell \fBexec login\fR \-k幯t 廨telmezi, teh嫢 az j bejelentkez廥 el鰗t az aktu嫮isb鏊 val kil廧廥re k廥zteti a felhaszn嫮鏒. Ha nem login shellb鯷 pr鏏嫮juk meg a \fBlogin\fR parancsot v嶲rehajtani, hibazenetet kapunk. .PP -Amikor a \fIlogin:\fR promptn嫮 kerl megh癉嫳ra, lehet鰆嶲 van a -felhaszn嫮鏮憝 ut嫕 k顤nyezeti v嫮toz鏦 megad嫳嫫a, \fBN勼=仂T屮\fR. -form墎an, azonban nem minden v嫮toz鏒 tudunk ily m鏚on szab嫮yozni: -p幨d嫠l a \fBPATH\fR, \fBHOME\fR 廥 a \fBSHELL\fR nem kaphat itt 廨t幧et, -tov墎b az \fBIFS\fR letilt嫳ra kerlhet, ha a \felhaszn嫮 login shellje -a fB/bin/sh\fR. -.PP Ezut嫕 a jelszavunkat kell megadnunk. A be甏t karakterek nem jelennek meg a k廧erny鰒, megel鶝v幯 a 'leskel髇廥t'. Ha t鐽bsz顤 hib嫳 jelsz鏒 adunk meg, a \fBlogin\fR kil廧, 廥 a kapcsolat megszakad. @@ -76,7 +69,7 @@ k lev幨 van), "\fBYou have mail.\fR" (Lev幨 van), vagy "\fBNo Mail.\fR" (Nincs lev幨). .PP -A felhaszn嫮鏙- (UID) 廥 a csoportazonos癃鏮k (GID) be嫮l癃嫳ra kerl az +A felhaszn嫮鏙\- (UID) 廥 a csoportazonos癃鏮k (GID) be嫮l癃嫳ra kerl az \fI/etc/passwd\fR alapj嫕. A \fB$HOME\fR, \fB$SHELL\fR, \fB$PATH\fR, \fB$LOGNAME\fR 廥 a \fB$MAIL\fR k顤nyezeti v嫮toz鏦 be嫮l癃嫳ra kerlnek a passwd adatb嫙is megfelel mez鬑 alapj嫕. @@ -84,10 +77,10 @@ Az ulimit, umask alapj嫕. .PP N嶭嫕y rendszeren a \fB$TERM\fR v嫮toz is 廨t幧et kap, mik幯t az a -\fI/etc/ttytype\fR-ban meg van 甏va. +\fI/etc/ttytype\fR\-ban meg van 甏va. .PP V嶲rehajt鏚hat a parancs廨telmez鰒k inicializ塶i鏀 scriptje is. Ez gyben -l嫳d a megfelel k憴ik霵yv-oldalt. +l嫳d a megfelel k憴ik霵yv\-oldalt. .SH FIGYELMEZTET仉EK .PP A \fBlogin\fR ezen verzi鎩a sok ford癃嫳i opci镽al rendelkezik, b嫫 csak @@ -101,13 +94,13 @@ v .br \fI/var/log/wtmp\fR \- az el鶝 (eddigi) bejelentkez廥ek list奫a .br -\fI/etc/passwd\fR \- felhaszn嫮鏙 account-okra vonatkoz inform塶i鏦 +\fI/etc/passwd\fR \- felhaszn嫮鏙 account\-okra vonatkoz inform塶i鏦 .br -\fI/etc/shadow\fR \- titkos癃ott jelszavak 廥 廨v幯yess嶲i id-inform塶i鏦 +\fI/etc/shadow\fR \- titkos癃ott jelszavak 廥 廨v幯yess嶲i id騱-inform塶i鏦 .br \fI/etc/motd\fR \- rendszerzenet file .br -\fI/etc/nologin\fR \- nem-root felhaszn嫮鏦 bel廧廥幯ek tilt嫳a +\fI/etc/nologin\fR \- nem\-root felhaszn嫮鏦 bel廧廥幯ek tilt嫳a .br \fI/etc/ttytype\fR \- termin嫮t甑usok list奫a .br diff --git a/man/hu/newgrp.1 b/man/hu/newgrp.1 index e6a18577..1a47939d 100644 --- a/man/hu/newgrp.1 +++ b/man/hu/newgrp.1 @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: newgrp.1,v 1.3 2003/04/26 13:24:13 kloczek Exp $ +.\" $Id: newgrp.1,v 1.5 2005/04/12 18:08:46 kloczek Exp $ .\" .TH NEWGRP 1 .SH N勼 @@ -34,11 +34,11 @@ newgrp \- Csoportazonos .br sg \- Parancs v嶲rehajt嫳a m嫳 csoportazono癃 alatt .SH 糞TEKINT仉 -.BR newgrp " [" - ] +.BR newgrp " [" \- ] [\fIgroup\fR] .br -.BR sg " [" - ] -[\fIgroup\fR [\fB-c\fR \fIcommand\fR]] +.BR sg " [" \- ] +[\fIgroup\fR [\fB\-c\fR \fIcommand\fR]] .SH LE炅糜 A .B newgrp @@ -46,13 +46,13 @@ parancs a jelenlegi bejelentkez m鏚os癃嫳嫫a haszn嫮hat. Ha a parancsot az elhagyhat \fB\-\fR kapcsol镽al h癉tuk meg, akkor a rendszer gy inicializ嫮ja jra a felhaszn嫮鏙 k顤nyezetet, ahogy az a bejelelentkez廥 sor嫕 -megt顤t幯ik, ellenkez esetben a jelenlegi k顤nyezet - bele廨tve -az aktu嫮is munkak霵yvt嫫at is - v嫮tozatlan marad. +megt顤t幯ik, ellenkez esetben a jelenlegi k顤nyezet \- bele廨tve +az aktu嫮is munkak霵yvt嫫at is \- v嫮tozatlan marad. .PP A .B newgrp parancs lecser幨i az aktu嫮is csoportazonos癃鏒 a megnevezett -vagy - ha nincs megadva - az \fI/etc/passwd\fR f奫lban megadott +vagy \- ha nincs megadva \- az \fI/etc/passwd\fR f奫lban megadott alap廨telmezett csoportra. Ha a felhaszn嫮 nem rendelkezik jelsz镽al, de a csoport igen, vagy a felhaszn嫮 nem tagja a csoportnak, de a csoport rendelkezik jelsz镽al, akkor a rendszer bek廨i a csoport @@ -69,15 +69,15 @@ eredeti csoportazonos Az .B sg parancsnak egy m嫳ik, aposztr鏹ok k驆 z嫫t parancsot is meg lehet -adni, amely a Bourne parancs廨telmez鰉el kerl v嶲rehajt嫳ra. +adni, amely a \fB/bin/sh\fR parancs廨telmez鰉el kerl v嶲rehajt嫳ra. .SH HIB窿 A \fBnewgrp\fR t鐽bf幨e ford癃嫳i be嫮l癃嫳sal rendelkezik, amelyeknek egy adott felhaszn嫮嫳i k顤nyezetben csak egy r廥z廨e lehet szks嶲. .SH F穗LOK -\fI/etc/passwd\fR \- felhaszn嫮鏙 inform塶i鏦 +\fI/etc/passwd\fR \- felhaszn嫮鏙 inform塶i鏦 .br -\fI/etc/group\fR \- csoportinfom塶i鏦 +\fI/etc/group\fR \- csoportinfom塶i鏦 .SH L糜D M乇 .BR id (1), .BR login (1), diff --git a/man/hu/passwd.1 b/man/hu/passwd.1 index e1dc5067..80511601 100644 --- a/man/hu/passwd.1 +++ b/man/hu/passwd.1 @@ -1,4 +1,4 @@ -.\" Copyright 1989 - 1994, John F. Haugh II +.\" Copyright 1989 \- 1994, John F. Haugh II .\" All rights reserved. .\" .\" Redistribution is allowed, provided that the following conditions @@ -28,20 +28,20 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: passwd.1,v 1.3 2003/04/26 13:24:13 kloczek Exp $ +.\" $Id: passwd.1,v 1.5 2005/04/13 10:02:27 kloczek Exp $ .\" -.TH PASSWD 1 "" \" -*- nroff -*- +.TH PASSWD 1 "" \" \-*\- nroff \-*\- .SH N勼 passwd \- Felhaszn嫮鏙 jelsz megv嫮toztat嫳a .SH 糞TEKINT仉 -\fBpasswd\fR [\fB-f\fR|\fB-s\fR] [\fIn憝\fR] +\fBpasswd\fR [\fB\-f\fR|\fB\-s\fR] [\fIn憝\fR] .br -\fBpasswd\fR [\fB-g\fR] [\fB-r\fR|\fB-R\fR] \fIcsoport\fR +\fBpasswd\fR [\fB\-g\fR] [\fB\-r\fR|\fB\-R\fR] \fIcsoport\fR .br -\fBpasswd\fR [\fB-x\fR \fImax\fR] [\fB-n\fR \fImin\fR] -[\fB-w\fR \fIfigy\fR] [\fB-i\fR \fIinakt\fR] \fIn憝\fR +\fBpasswd\fR [\fB\-x\fR \fImax\fR] [\fB\-n\fR \fImin\fR] +[\fB\-w\fR \fIfigy\fR] [\fB\-i\fR \fIinakt\fR] \fIn憝\fR .br -\fBpasswd\fR {\fB-l\fR|\fB-u\fR|\fB-d\fR|\fB-S\fR} \fIn憝\fR +\fBpasswd\fR {\fB\-l\fR|\fB\-u\fR|\fB\-d\fR|\fB\-S\fR} \fIn憝\fR .SH LE炅糜 A \fBpasswd\fR a felhaszn嫮鏦 廥 a csoportok megv嫮toztat嫳嫢 v嶲zi. A felhaszn嫮鏦 csak a saj嫢 jelszavukat v嫮toztathatj嫜 meg, a rendszergazda @@ -64,8 +64,8 @@ az id v嫮toztat嫳 n幨kl. .PP Ezekut嫕 a program bek廨i a felhaszn嫮鏒鏊 az j jelsz鏒, majd -megvizsg嫮ja hogy el嶲 bonyolult-e. -翼tal嫕os szab嫮yk幯t elmondhat, hogy a jelszavak j鏦, ha 6-8 karakterb鯷 +megvizsg嫮ja hogy el嶲 bonyolult\-e. +翼tal嫕os szab嫮yk幯t elmondhat, hogy a jelszavak j鏦, ha 6\-8 karakterb鯷 嫮lnak, 廥 a k饘etkez jelk廥zletekb鯷 tartalmaz elemeket: .IP "" .5i Az ABC kis beti @@ -84,35 +84,35 @@ Ha a jelsz a \fBpasswd\fR a biztons墔 kedv澭rt m嶲 egyszer bek廨i az j jelsz鏒, 廥 csak akkor hajtja v嶲re a v嫮toztat嫳t, ha a k彋 bevitt jelsz megegyezik. .SS Csoportok jelszavai -A \fB-g\fR kapcsol haszn嫮ata eset幯 a megadott nev csoport jelszava +A \fB\-g\fR kapcsol haszn嫮ata eset幯 a megadott nev csoport jelszava v嫮tozik meg. Ezt csak a rendszergazda vagy a csoport adminisztr嫢ora teheti meg. A jelenlegi csoportjelszavat nem k廨i v嫮toztat嫳 el鰗t. -Az \fB-r\fR kapcsol鏒 a \fB-g\fR kapcsol镽al haszn嫮va lehet a csoport jelszav嫢 kikapcsolni, ez嫮tal minden tag haszn嫮hatja a csoportot. -Az \fB-R\fR kapcsol a \fB-g\fR kapcsol镽al haszn嫮va a csoport minden felhaszn嫮 el鰗t lez嫫ul. +Az \fB\-r\fR kapcsol鏒 a \fB\-g\fR kapcsol镽al haszn嫮va lehet a csoport jelszav嫢 kikapcsolni, ez嫮tal minden tag haszn嫮hatja a csoportot. +Az \fB\-R\fR kapcsol a \fB\-g\fR kapcsol镽al haszn嫮va a csoport minden felhaszn嫮 el鰗t lez嫫ul. .SS A jelszavak "szavatoss墔i ideje" -A jelszavak el憝l廥i idej彋 a rendszergazda a \fB-x\fR, \fB-n\fR, \fB-w\fR, 廥 \fB-i\fR kapcsol鏦kal szab嫮yozhatja. -A \fB-x\fR kapcsol a jelsz鏂ser幧 k驆ti maxim嫮is id鰗 嫮l癃ja be. +A jelszavak el憝l廥i idej彋 a rendszergazda a \fB\-x\fR, \fB\-n\fR, \fB\-w\fR, 廥 \fB\-i\fR kapcsol鏦kal szab嫮yozhatja. +A \fB\-x\fR kapcsol a jelsz鏂ser幧 k驆ti maxim嫮is id鰗 嫮l癃ja be. A jelsz鏒 legk廥騸b \fImax\fR naponk幯t meg kell v嫮toztatni. -Az \fB-n\fR kapcsol a k彋 jelsz鏂sere k驆飆ti minim嫮is id鰗 szab嫮yozza: a felhaszn嫮 addig nem v嫮toztathatja meg jelszav嫢, am璲 legal墎b +Az \fB\-n\fR kapcsol a k彋 jelsz鏂sere k驆飆ti minim嫮is id鰗 szab嫮yozza: a felhaszn嫮 addig nem v嫮toztathatja meg jelszav嫢, am璲 legal墎b \fImin\fR nap el nem telt az el鶝 v嫮toztat嫳 鏒a. -A \fB-w\fR kapcsol镽al azt 嫮l癃hatod be, hogy h嫕y nappal a jelsz lej嫫ta el鰗t kezdje el a rendszer a felhaszn嫮鏒 figyelmeztetni. Az els figyelmeztet廥 \fIfigy\fR nappal a lej嫫at el鰗t jelenik meg, 廥 ut嫕a naponta t奫幧oztatja a felhaszn嫮鏒 a m嶲 h嫢ral憝 napok sz嫥嫫鏊. -Az \fB-i\fR kapcsol \fIinakt\fR nappal a jelsz lej嫫ta ut嫕 lez嫫ja a felhaszn嫮 bel廧廥i lehet鰆嶲彋. +A \fB\-w\fR kapcsol镽al azt 嫮l癃hatod be, hogy h嫕y nappal a jelsz lej嫫ta el鰗t kezdje el a rendszer a felhaszn嫮鏒 figyelmeztetni. Az els figyelmeztet廥 \fIfigy\fR nappal a lej嫫at el鰗t jelenik meg, 廥 ut嫕a naponta t奫幧oztatja a felhaszn嫮鏒 a m嶲 h嫢ral憝 napok sz嫥嫫鏊. +Az \fB\-i\fR kapcsol \fIinakt\fR nappal a jelsz lej嫫ta ut嫕 lez嫫ja a felhaszn嫮 bel廧廥i lehet鰆嶲彋. -.SS Jogosults墔-kezel廥 -A felhaszn嫮鏦 lez嫫hat鏇k 廥 jra beengedhet髊k a \fB-l\fR 廥 a \fB-u\fR kapcsol鏦kal. -Az \fB-l\fR kapcsol a jelsz鏒 kicser幨i egy olyan 廨t幧re, ami semmilyen lehets嶲es jelsz k鏚olt 廨t幧憝el nem egyezik. -Az \fB-u\fR kapcsol vissza嫮l癃ja a jelsz鏒 a r嶲ire, 廥 璲y jra enged幨yezi a bel廧廥t. +.SS Jogosults墔\-kezel廥 +A felhaszn嫮鏦 lez嫫hat鏇k 廥 jra beengedhet髊k a \fB\-l\fR 廥 a \fB\-u\fR kapcsol鏦kal. +Az \fB\-l\fR kapcsol a jelsz鏒 kicser幨i egy olyan 廨t幧re, ami semmilyen lehets嶲es jelsz k鏚olt 廨t幧憝el nem egyezik. +Az \fB\-u\fR kapcsol vissza嫮l癃ja a jelsz鏒 a r嶲ire, 廥 璲y jra enged幨yezi a bel廧廥t. .PP -A jogosults墔ok az \fB-S\fR kapcsol镽al 嫮l癃hat鏇k be. Ez 6 r廥zb鯷 嫮l: +A jogosults墔ok az \fB\-S\fR kapcsol镽al 嫮l癃hat鏇k be. Ez 6 r廥zb鯷 嫮l: Az els azt jelzi, hogy a felhasz嫮 le van z嫫va (L), nincs jelszava (NP), vagy van 廨v幯yes jelszava (P). A m嫳odik r廥z az utols jelsz镽嫮toztat嫳 d嫢uma. A k饘etkez n嶲y r廥z a jelszavak minim嫮is 廥 maxim嫮is ideje, az els figyelmeztet廥 a jelsz lej嫫ta el鰗t 廥 hogy mennyi ideig 幨 a jelsz lej嫫ta ut嫕. .SS Tippek a felhaszn嫮鏙 jelszavakhoz Egy jelszavas rendszer biztons墔a a k鏚ol嫳i algoritmus er鰆s嶲彋鯷 廥 a lehets嶲es kulcsok sz嫥嫢鏊 fgg. -A \fB\s-2UNIX\s+2\fR rendszerek k鏚ol嫳i m鏚ja az NBS DES algoritmuson alapul, 廥 nagyon biztons墔os. A lehets嶲es kulcsok sz嫥a a v嫮asztott jelsz v幨etlenszers嶲幯 mlik. +A \fB\s\-2UNIX\s+2\fR rendszerek k鏚ol嫳i m鏚ja az NBS DES algoritmuson alapul, 廥 nagyon biztons墔os. A lehets嶲es kulcsok sz嫥a a v嫮asztott jelsz v幨etlenszers嶲幯 mlik. .PP A jelszavas rendszerek felt顤廥e legt鐽bsz顤 a gondatlanul megv嫮asztott jelsz镽嫮aszt嫳nak vagy a jelszavak cser幨get廥幯ek eredm幯ye. Ezen okok miatt c幨szer olyan jelsz鏒 v嫮asztanod, ami nem szerepel a sz鏒嫫ban 廥 nem szks嶲es le甏nod. Tipikusan rossz v嫮aszt嫳 m嶲, ha valamilyen nevet, valamilyen azonos癃鏀z嫥odat, szlet廥napodat, vagy c璥edet haszn嫮od jelsz鏦幯t. @@ -129,7 +129,7 @@ szav .IP "" .5i Morzsa kuty嫥 hegyezd fled .PP --b鯷 +\-b鯷 .IP "" .5i Maqmhdfd .PP @@ -140,7 +140,7 @@ m .SS Megjegyz廥 a csoportok jelszavair鏊 A csoportok jelszavai 嫮land biztons墔i probl幦嫢 jelenthetnek, mivel -nemcsak egy ember ismerheti a jelszavat. A csoport-kezel廥 azonban +nemcsak egy ember ismerheti a jelszavat. A csoport\-kezel廥 azonban hasznos abban az esetben, ha t鐽b felhaszn嫮 egyttmk鐰廥彋 kell megoldani. @@ -150,16 +150,15 @@ Az, hogy hogyan vizsg v嫮tozhat. Minden felhaszn嫮鏮ak c幨szer a lehet legbonyolultabb, de m嶲 haszn嫮hat jelsz鏒 haszn嫮nia. -Ha NIS-t haszn嫮 a felhaszn嫮鏦 azonos癃嫳嫫a a rendszer 廥 a felhaszn嫮 nem +Ha NIS\-t haszn嫮 a felhaszn嫮鏦 azonos癃嫳嫫a a rendszer 廥 a felhaszn嫮 nem l廧ett be a NIS kiszolg嫮鏎a, nem v嫮toztathatja meg jelszav嫢. .SH F穗LOK -\fI/etc/passwd\fR \- felhaszn嫮鏙 inform塶i鏦 +\fI/etc/passwd\fR \- felhaszn嫮鏙 inform塶i鏦 .br -\fI/etc/shadow\fR \- k鏚olt felhaszn嫮鏙 jelszavak +\fI/etc/shadow\fR \- k鏚olt felhaszn嫮鏙 jelszavak .SH L糜D M乇 -.BR passwd (3), -.BR shadow (3), .BR group (5), -.BR passwd (5) +.BR passwd (5), +.BR shadow (5) .SH MAGYAR FORD炆糜 宁di "Cactus" Gerg diff --git a/man/hu/su.1 b/man/hu/su.1 index f5698a22..2853dde0 100644 --- a/man/hu/su.1 +++ b/man/hu/su.1 @@ -3,7 +3,7 @@ .\" gnumaniak distribution .\" .\" The author kindly requests that no comments regarding the "better" -.\" suitability or up-to-date notices of any info documentation alternative +.\" suitability or up\-to\-date notices of any info documentation alternative .\" is added without contacting him first. .\" .\" (C) 1999 Ragnar Hojland Espinosa @@ -13,11 +13,11 @@ .\" .TH su 1 "18 August 1999" "GNU Shell Utilities 2.0" .SH N勼 -su \- ind癃 egy shellt m嫳 felhaszn嫮- 廥 csoportazonos癃镽al +su \- ind癃 egy shellt m嫳 felhaszn嫮酀- 廥 csoportazonos癃镽al .SH 糞TEKINT仉 .B su .BI "[\-] [\-flmp] [\-c " parancs "] [\-s " shell "] [\-\-fast] [\-\-login]" -.B [\-\-preserve-environment] +.B [\-\-preserve\-environment] .BI "[\-\-command=" parancs "] [\-\-shell=" shell "]" .BI [ felhaszn嫮 " [" argumentum... ]] .sp @@ -26,19 +26,19 @@ su \- ind Az .B su parancs lehet鰉 teszi, hogy ideiglenesen m嫳 felhaszn嫮镽 v嫮hassunk -gy, hogy egy j shell-t ind癃 a k廨t +gy, hogy egy j shell\-t ind癃 a k廨t .I felhaszn嫮 val鏀 廥 effekt癉 felhaszn嫮鏙 azonos癃鎩嫛al, csoportazonos癃鎩嫛al 廥 m嫳odlagos csoportjaival. Ha nem adunk meg -.IR felhaszn嫮 -t, -az alap廨telmezett 廨t幧 a root (super-user). Az a shell indul el, ami a +.IR felhaszn嫮 \-t, +az alap廨telmezett 廨t幧 a root (super\-user). Az a shell indul el, ami a .I felhaszn嫮 passwd bejegyz廥嶵en szerepel, ha ott nincs semmi, akkor a /bin/sh. Ha a -.IR felhaszn嫮 -nak +.IR felhaszn嫮 \-nak van jelszava, akkor az .B su -meg fogja azt k廨dezni, kiv憝e ha root-k幯t (a felhaszn嫮鏙 azonos癃 0) +meg fogja azt k廨dezni, kiv憝e ha root\-k幯t (a felhaszn嫮鏙 azonos癃 0) futtatjuk. .PP Alap廨telmez廥ben az @@ -51,7 +51,7 @@ k .I felhaszn嫮 password bejegyz廥嶵鯷 kin憴ett 廨t幧ekre, 廥 ha a .I felhaszn嫮 -nem a root (a super-user) a +nem a root (a super\-user) a .BR USER 廥 LOGNAME v嫮toz鏦at a .I felhaszn嫮 @@ -59,13 +59,13 @@ nev bejelentkez廥i shell. .PP Ha megadunk -.IR argumentum -k幯t +.IR argumentum \-k幯t valamit, az is 嫢ad鏚ik az indul shellnek. .PP Az .B su -se a /bin/sh-t, se m嫳 shell-eket nem kezel speci嫮isan. -(ilyen az argv[0] "-su"-ra 嫮l癃嫳a, vagy a -c param彋er csak +se a /bin/sh\-t, se m嫳 shell\-eket nem kezel speci嫮isan. +(ilyen az argv[0] "\-su"\-ra 嫮l癃嫳a, vagy a \-c param彋er csak bizonyos shelleknek val 嫢ad嫳a, stb.) .PP Azokon a rendszereken, ahol van @@ -79,7 +79,7 @@ sikeres pr .BI "\-c " parancs ", \-\-command=" parancs Csak a .I parancs -parancsot hajtatja v嶲re a shell-lel a +parancsot hajtatja v嶲re a shell\-lel a .B \-c opci seg癃s嶲憝el, 璲y a shell nem interakt癉an indul el. @@ -94,7 +94,7 @@ opci shellekn幨 van 廨telme ahol .B \-f opci megakad嫮yozza, hogy a startup f奫lt (.cshrc) a shell beolvassa. -A Bourne-hoz hasonl shellekn幨 a +A Bourne\-hoz hasonl shellekn幨 a .B \-f opci letiltja a f奫ln憝 mint嫜 kiterjeszt廥彋 (filename pattern expansion), ami 嫮tal墎an nem k癉嫕atos dolog. @@ -102,20 +102,20 @@ expansion), ami .B "\-, \-l, \-\-login" A shellt bejelentkez廥i shellk幯t ind癃ja. Ez a k饘etkez鰈et jelenti: t顤li az 飉szes k顤nyezeti v嫮toz鏒, kiv憝e a -.BR TERM "-et, " HOME -ot, +.BR TERM "\-et, " HOME \-ot, 廥 a -.BR SHELL -t +.BR SHELL \-t (amiket a fent le甏t m鏚on 嫮l癃 嫢), 廥 a -.BR USER "-t 廥 " LOGNAME -t +.BR USER "\-t 廥 " LOGNAME \-t (amiket szint幯 a fent le甏t m鏚on 嫮l癃 嫢 a rootnak), tov墎b a -.BR PATH -t, +.BR PATH \-t, amit a ford癃嫳kor meghat嫫ozott alap廨t幧re 嫮l癃. Az aktu嫮is k霵yvt嫫at a .I felhaszn嫮 -home-k霵yvt嫫嫫a +home\-k霵yvt嫫嫫a 嫮l癃ja. A shell neve el egy -.B \- -t +.B \- \-t szr be, 璲y el廨i azt, hogy az beolvassa a startup f奫lj嫢 illetve f奫ljait. .TP @@ -139,11 +139,11 @@ opci .TP .BI "\-s, \-\-shell " shell A -.IR shell "-t ind癃ja a " felhaszn嫮 +.IR shell "\-t ind癃ja a " felhaszn嫮 /etc/passwd f奫lban szerepl shellje helyett, ha parancsot vagy a superuser futtatja, vagy ha nem korl嫢ozott shellt akar futtatni. (Korl嫢ozott -shell-t l嫳d fentebb.) +shell\-t l嫳d fentebb.) .TP .B "\-\-help" Haszn嫮ati tmutat鏒 甏 a standard kimenetre, majd sikeres visszat廨廥i 廨t幧kel kil廧. @@ -154,7 +154,7 @@ sikeres visszat .SH Mi廨t nem t嫥ogatja a GNU su a wheel csoportot? (Richard Stallman) N嶭a a rendszer f闤飆ti teljes ellen鰎z廥t egy n嶭嫕y emberb鯷 -嫮l csoport akarja k憴be venni. P幨d嫠l 1984-ben p嫫 user a MIT AI +嫮l csoport akarja k憴be venni. P幨d嫠l 1984\-ben p嫫 user a MIT AI laborban gy d霵t飆t, hogy 嫢veszik az ir嫕y癃嫳t a Twenex rendszer oper嫢ori jelszav嫕ak megv嫮toztat嫳嫛al, 廥 annak titokban tart嫳嫛al. (A puccsot sikerlt leverni, 廥 a felhaszn嫮鏦at jogaikba visszahelyezni @@ -179,7 +179,7 @@ vissza .B sudo csomaggal. .SH MEGJEGYZ仉 -A hib嫜at a bug-sh-utils@gnu.org c璥en lehet jelenteni. +A hib嫜at a bug\-sh\-utils@gnu.org c璥en lehet jelenteni. Az oldalt Ragnar Hojland Espinosa friss癃ette. .SH MAGYAR FORD炆糜 Havasi Ferenc 廥 T璥嫫 Andr嫳 diff --git a/man/id.1 b/man/id.1 index 7007fd55..77975cfb 100644 --- a/man/id.1 +++ b/man/id.1 @@ -1,4 +1,4 @@ -.\"$Id: id.1,v 1.13 2004/12/11 20:05:01 kloczek Exp $ +.\"$Id: id.1,v 1.16 2005/04/12 17:55:55 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -29,17 +29,17 @@ .SH NAME id \- Display current user and group ID names .SH SYNOPSIS -\fBid [\fB-a\fR] +\fBid\fR [\fB\-a\fR] .SH DESCRIPTION \fBid\fR displays the current real and effective user and group ID names or values. If the value does not have a corresponding entry in \fI/etc/passwd\fR or \fI/etc/group\fR, the value will be displayed without -the corresponding name. The optional \fB-a\fR flag will display the group +the corresponding name. The optional \fB\-a\fR flag will display the group set on systems which support multiple concurrent group membership. .SH FILES -\fI/etc/passwd\fR\ - user account information +\fI/etc/passwd\fR \- user account information .br -\fI/etc/group\fR\ - group information +\fI/etc/group\fR \- group account information .SH SEE ALSO .BR getgid (2), .BR getgroups (2), diff --git a/man/id/Makefile.in b/man/id/Makefile.in index ca9b53cf..186fcf3d 100644 --- a/man/id/Makefile.in +++ b/man/id/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.4 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -87,17 +87,16 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ 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@ @@ -189,9 +188,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/id/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/id/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/id/Makefile + $(AUTOMAKE) --foreign man/id/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/man/id/chsh.1 b/man/id/chsh.1 index 2f034f15..9e27387e 100644 --- a/man/id/chsh.1 +++ b/man/id/chsh.1 @@ -1,5 +1,5 @@ .\" -.\" chsh.1 -- change your login shell +.\" chsh.1 \-\- change your login shell .\" (c) 1994 by salvatore valente .\" .\" this program is free software. you can redistribute it and @@ -7,8 +7,8 @@ .\" there is no warranty. .\" .\" $Author: kloczek $ -.\" $Revision: 1.2 $ -.\" $Date: 2004/08/04 13:02:25 $ +.\" $Revision: 1.3 $ +.\" $Date: 2005/04/05 19:08:54 $ .\" .TH CHSH 1 "October 13 1994" "chsh" "Linux Reference Manual" .SH NAMA PERINTAH/PROGRAM @@ -22,7 +22,7 @@ digunakan untuk merubah shell login Anda. Bila shell tidak diberikan pada baris perintah maka .B chsh menampilkan prompt untuk memasukkan shell. -.SS SHELL-SHELL YANG BENAR +.SS SHELL\-SHELL YANG BENAR .B chsh akan menerima pathname lengkap dari file executable pada sistem. Walau demikian, akan menampilkan peringatan bila shell tidak terdapat @@ -30,7 +30,7 @@ dalam file .I /etc/shells . .SH OPTION .TP -.I "\-l, \-\-list-shells" +.I "\-l, \-\-list\-shells" Menampilkan daftar shell yang ada dalam .I /etc/shells dan keluar atau exit. @@ -41,7 +41,7 @@ Menentukan shell login Anda. .I "\-u, \-\-help" Menampilkan cara penggunaan program. .TP -.I "-v, \-\-version" +.I "\-v, \-\-version" Menampilkan informasi versi program. .SH "LIHAT JUGA" .BR login (1), diff --git a/man/id/login.1 b/man/id/login.1 index 58f9f20f..f43865bc 100644 --- a/man/id/login.1 +++ b/man/id/login.1 @@ -1,6 +1,6 @@ .\" Copyright 1993 Rickard E. Faith (faith@cs.unc.edu) .\" May be distributed under the GNU General Public License -.TH LOGIN 1 "4 November 1996" "Util-linux 1.6" "Linux Programmer's Manual" +.TH LOGIN 1 "4 November 1996" "Util\-linux 1.6" "Linux Programmer's Manual" .SH NAME login \- masuk ke system .SH SYNOPSIS @@ -14,7 +14,7 @@ login \- masuk ke system .SH PENJELASAN .B login digunakan ketika hendak masuk ke sebuah system. Ia juga dapat digunakan -untuk berpindah dari satu user ke user lainnya kapan saja (shell-shell yang +untuk berpindah dari satu user ke user lainnya kapan saja (shell\-shell yang modern mendukung kemampuan ini). Jika tidak diikuti oleh sebuah argumen .B login @@ -39,7 +39,7 @@ di Kegagalan akan dicatat pada log melalui fasilitas .B syslog . -Setelah kondisi-kondisi tersebut dicek, anda akan dimintai password untuk +Setelah kondisi\-kondisi tersebut dicek, anda akan dimintai password untuk kemudian dicek (jika ada password untuk username tersebut). Anda dapat mencoba sepuluh kali sebelum .B login @@ -112,7 +112,7 @@ tidak mengubah environment .SH "PEMBATASAN AKSES TERTENTU/SPECIAL ACCESS RESTRICTIONS" File .I /etc/securetty -mencatat nama-nama tty dimana root boleh login. Nama device tty yang tidak +mencatat nama\-nama tty dimana root boleh login. Nama device tty yang tidak berawalan /dev/ harus ditentukan pada setiap barisnya. Jika file tersebut tidak ditemukan, root boleh login di tty mana saja. @@ -135,7 +135,7 @@ Komentar diawali oleh karakter # yang berlaku hingga akhir baris. .SS "Bagian CLASSES" Bagian CLASSES dimulai dengan kata CLASSES pada baris awal dalam huruf besar semua. Setiap baris berikutnya hingga permulaan bagian baru -atau akhir file terdiri dari urutan kata-kata yang dipisahkan oleh tab +atau akhir file terdiri dari urutan kata\-kata yang dipisahkan oleh tab atau spasi. Tiap baris mendefinisikan kelas tty dan pola host. .PP @@ -153,7 +153,7 @@ Contoh bagian CLASSES: CLASSES myclass1 tty1 tty2 myclass2 tty3 @.foo.com -.in -.5 +.in \-.5 .fi .PP File di atas mendefinisikan @@ -171,10 +171,10 @@ dan .I /etc/group dan jika sebuah group disebutkan pada bagian GROUPS di .I /etc/usertty -maka user diberikan akses jika memang itu group-nya. +maka user diberikan akses jika memang itu group\-nya. .PP Bagian GROUPS diawali oleh kata GROUPS dalam huruf besar semua pada permulaan -baris dan tiap baris selanjutnya merupakan urutan kata-kata yang dipisahkan +baris dan tiap baris selanjutnya merupakan urutan kata\-kata yang dipisahkan oleh spasi atau tab. Kata pertama pada sebuah baris adalah nama group dan sisanya menentukan tty dan host dimana anggota group tersebut boleh mendapatkan akses. Ketentuan ini dapat mengikutsertakan kelas yang telah @@ -188,21 +188,21 @@ Contoh bagian GROUPS GROUPS sys tty1 @.bar.edu stud myclass1 tty4 -.in -0.5 +.in \-0.5 .fi .PP Contoh ini menentukan bahwa anggota group .I sys -boleh log in pada tty1 dan dari host-host yang terdapat pada domain +boleh log in pada tty1 dan dari host\-host yang terdapat pada domain bar.edu. User yang terdapat pada group .I stud -boleh log in dari host-host/tty-tty yang ditentukan pada kelas myclass1 +boleh log in dari host\-host/tty\-tty yang ditentukan pada kelas myclass1 atau dari tty4 .PP .SS "Bagian USERS" Bagian USERS dimulai dengan kata USERS dalam huruf besar semua pada awal -baris, dan tiap baris berikutnya adalah urutan kata-kata yang dipisahkan +baris, dan tiap baris berikutnya adalah urutan kata\-kata yang dipisahkan oleh tab atau spasi. Kata pertama pada sebuah baris adalah username dan sisanya merupakan definisi tentang tty dan host tempat user boleh log in. Ketentuan ini dapat melibatkan kelas yang didefinisikan pada @@ -217,17 +217,17 @@ Contoh penggunaan bagian USERS: USERS zacho tty1 @130.225.16.0/255.255.255.0 blue tty3 myclass2 -.in -0.5 +.in \-0.5 .fi .PP KEtentuan ini mengizinkan zacho hanya boleh login pada tty1 dan dari -host-host yang alamat IP-nya terletak di kisaran 130.225.16.0 \- +host\-host yang alamat IP\-nya terletak di kisaran 130.225.16.0 \- 130.225.16.255, dan user bernama blue boleh log in dari tty3 dan apa saja yang disebutkan pada kelas myclass2. .PP Mungkin terdapat sebuah baris pada bagian USERS yang dimulai dengan sebuah username bernama *. Ini adalah aturan default dan ia akan -diterapkan pada user yang tidak tercantum pada baris-baris definisi. +diterapkan pada user yang tidak tercantum pada baris\-baris definisi. .PP Jika user ditemukan pada baris USERS dan GROUPS maka user tersebut boleh mengakses dari gabungan tty/host yang disebutkan pada ketentuan tersebut. @@ -242,7 +242,7 @@ Nama sebuah device tty tanpa awalan /dev/, contohnya tty1 atau ttyS0. .IP o String @localhost, artinya user boleh melakukan telnet/rlogin dari local host ke host yang sama. Ini juga membolehkan user untuk -menjalankan perintah: xterm -e /bin/login. +menjalankan perintah: xterm \-e /bin/login. .PP .IP o Sebuah akhiran nama domain seperti @.some.dom, artinya user boleh @@ -255,16 +255,16 @@ alamat IP pada notasi desimal biasa dan y.y.y.y adalah bitmask dalam notasi yang sama yang menentukan bit mana pada alamat tersebut untuk dibandingkan dengan alamat IP dari remote host. Contohnya @130.225.16.0/ 255.255.254.0 berarti user boleh rlogin/telnet dari host mana saja yang -alamat IP-nya berada pada kisaran 130.225.16.0 \- 130.225.17.255. +alamat IP\-nya berada pada kisaran 130.225.16.0 \- 130.225.17.255. .PP Origin di atas boleh diawali oleh penentuan waktu menurut syntax: .PP .nf -timespec ::= '[' [':' ]* ']' +timespec ::= '[' [':' ]* ']' day ::= 'mon' | 'tue' | 'wed' | 'thu' | 'fri' | 'sat' | 'sun' hour ::= '0' | '1' | ... | '23' hourspec ::= | '\-' -day-or-hour ::= | +day\-or\-hour ::= | .fi .PP Contohnya, origin [mon:tue:wed:thu:fri:8\-17]tty3 berarti log in diff --git a/man/id/useradd.8 b/man/id/useradd.8 index 8d2ba380..f1add9f8 100644 --- a/man/id/useradd.8 +++ b/man/id/useradd.8 @@ -1,14 +1,14 @@ -.\" Copyright 1991 - 1994, Julianne Frances Haugh +.\" Copyright 1991 \- 1994, Julianne Frances Haugh .\" All rights reserved. .\" .\" Pendistribusian dan penggunaan dalam bentuk source dan binary, dengan -.\" atau tanpa modifikasi, diperbolehkan asal syarat-syarat ini dipenuhi : +.\" atau tanpa modifikasi, diperbolehkan asal syarat\-syarat ini dipenuhi : .\" 1. Pendistribusian source code harus mempertahankan tulisan copyright .\" di atas, persyaratan ini, dan disclaimer berikut. .\" 2. Pendistribusian dalam bentuk binary harus menampilkan copyright di atas, .\" persyaratan ini, dan disclaimer yang tercantum pada dokumentasi dan/ .\" atau keterangan lainnya yang terdapat pada distribusi ini. -.\" 3. Nama Julianne F. Haugh atau nama-nama kontributor lainnya tidak boleh +.\" 3. Nama Julianne F. Haugh atau nama\-nama kontributor lainnya tidak boleh .\" digunakan sebagai jaminan atau untuk mempromosikan produk yang berasal .\" dari software ini tanpa izin khusus tertulis. .\" @@ -25,7 +25,7 @@ .\" KARENA KESALAHAN DALAM MENGGUNAKAN SOFTWARE INI, BAHKAN JIKA TELAH .\" DIPERINGATKAN SEBELUMNYA TENTANG KEMUNGKINAN AKAN KERUSAKAN TERSEBUT. .\" -.\" $Id: useradd.8,v 1.3 2004/11/04 03:06:31 kloczek Exp $ +.\" $Id: useradd.8,v 1.4 2005/04/05 19:08:54 kloczek Exp $ .\" .TH USERADD 8 .SH NAME @@ -33,147 +33,147 @@ useradd \- Membuat user baru atau memperbarui informasi tentang user baru .SH SYNOPSIS .TP 8 .B useradd -.\" .RB [ -A +.\" .RB [ \-A .\" .RI { method | \fBDEFAULT\fR "},... ]" -.RB [ -c +.RB [ \-c .IR comment ] -.RB [ -d +.RB [ \-d .IR home_dir ] .br -.RB [ -e +.RB [ \-e .IR expire_date ] -.RB [ -f +.RB [ \-f .IR inactive_time ] .br -.RB [ -g +.RB [ \-g .IR initial_group ] -.RB [ -G +.RB [ \-G .IR group [,...]] .br -.RB [ -m " [" -k -.IR skeleton_dir ] " |" " " -M ] -.RB [ -s +.RB [ \-m " [" \-k +.IR skeleton_dir ] " |" " " \-M ] +.RB [ \-s .IR shell ] .br -.RB [ -u +.RB [ \-u .IR uid " [" -.BR -o ]] -.RB [ -n ] -.RB [ -r ] +.BR \-o ]] +.RB [ \-n ] +.RB [ \-r ] .I login .TP 8 .B useradd -\fB-D\fR -[\fB-g\fI default_group\fR] -[\fB-b\fI default_home\fR] +\fB\-D\fR +[\fB\-g\fI default_group\fR] +[\fB\-b\fI default_home\fR] .br -[\fB-f\fI default_inactive\fR] -[\fB-e\fI default_expire_date\fR] +[\fB\-f\fI default_inactive\fR] +[\fB\-e\fI default_expire_date\fR] .br -[\fB-s\fI default_shell\fR] +[\fB\-s\fI default_shell\fR] .SH PENJELASAN .SS Membuat User Baru -Jika digunakan tanpa option \fB-D\fR, perintah \fBuseradd\fR menciptakan +Jika digunakan tanpa option \fB\-D\fR, perintah \fBuseradd\fR menciptakan sebuah user account baru dengan menggunakan nilai yang terdapat pada baris perintah dan nilai default dari system. User account yang baru tersebut akan dimasukkan ke system files seperlunya, -home directory akan dibuatkan, dan initial files di-copy-kan, tergantung +home directory akan dibuatkan, dan initial files di\-copy\-kan, tergantung option yang terdapat pada baris perintah. Versi yang terdapat pada Red Hat Linux akan membuat sebuah group untuk -setiap user yang didaftarkan pada system, jika \fB-b\fR tidak diberikan. +setiap user yang didaftarkan pada system, jika \fB\-b\fR tidak diberikan. Option yang dapat digunakan pada perintah \fBuseradd\fR adalah -.\" .IP "\fB-A {\fImethod\fR|\fBDEFAULT\fR},..." +.\" .IP "\fB\-A {\fImethod\fR|\fBDEFAULT\fR},..." .\" Nilai milik user dalam metode autentikasi/pengecekan. .\" Metode autentikasi/pengecekan adalah nama sebuah program yang bertanggung .\" jawab untuk memeriksa identitas user. .\" String \fBDEFAULT\fR dapat digunakan untuk mengubah metode autentikasi .\" menjadi metode password system yang standar. -.\" Daftar tersebut berisi nama-nama program, yang dipisahkan oleh koma. +.\" Daftar tersebut berisi nama\-nama program, yang dipisahkan oleh koma. .\" \fBDEFAULT\fR hanya dapat dicantumkan sekali saja. .\" .\" .\" -.IP "\fB-c \fIcomment\fR" +.IP "\fB\-c \fIcomment\fR" Komentar pada file password milik user baru. -.IP "\fB-d \fIhome_dir\fR" +.IP "\fB\-d \fIhome_dir\fR" User baru akan diciptakan dengan \fIhome_dir\fR sebagai lokasi directory -login-nya. -Default-nya adalah menambahkan nama \fIlogin\fR pada \fIdefault_home\fR +login\-nya. +Default\-nya adalah menambahkan nama \fIlogin\fR pada \fIdefault_home\fR dan menggunakannya sebagai nama directory login. -.IP "\fB-e \fIexpire_date\fR" +.IP "\fB\-e \fIexpire_date\fR" Tanggal ketika user account dimatikan. Tanggal ditulis dalam format \fIMM/DD/YY\fR. -.IP "\fB-f \fIinactive_days\fR" +.IP "\fB\-f \fIinactive_days\fR" Jumlah hari setelah sebuah password kadaluarsa hingga account tersebut dimatikan secara permanen. Nilai 0 mematikan account segera setelah password kadaluarsa, -dan nilai -1 mematikan fungsi ini. -Nilai default-nya adalah -1. -.IP "\fB-g \fIinitial_group\fR" +dan nilai \-1 mematikan fungsi ini. +Nilai default\-nya adalah \-1. +.IP "\fB\-g \fIinitial_group\fR" Nama group atau angka initial login group. Nama group harus sudah ada. Seorang anggota group harus merujuk pada group yang sudah ada. -Nilai group default-nya adalah 1. -.IP "\fB-G \fIgroup,[...]\fR" -Daftar group tambahan yang juga merupakan group-nya user. +Nilai group default\-nya adalah 1. +.IP "\fB\-G \fIgroup,[...]\fR" +Daftar group tambahan yang juga merupakan group\-nya user. Setiap group dipisahkan oleh koma, tanpa diikuti spasi. -Group juga mengikuti aturan yang diberikan dengan option \fB-g\fR. -Default-nya hanyalah untuk user yang terdaftar pada group awal. -.IP \fB-m\fR +Group juga mengikuti aturan yang diberikan dengan option \fB\-g\fR. +Default\-nya hanyalah untuk user yang terdaftar pada group awal. +.IP \fB\-m\fR Home directory milik user akan dibuatkan jika belum ada. File yang terdapat pada \fIskeleton_dir\fR atau \fI/etc/skel\fR akan dibuatkan pada home directory milik user. -Option \fB-k\fR hanya valid jika bertemu option \fB-m\fR. -Dafault-nya adalah tidak membuat directory dan tidak meng-copy +Option \fB\-k\fR hanya valid jika bertemu option \fB\-m\fR. +Dafault\-nya adalah tidak membuat directory dan tidak meng\-copy segala file. -.IP \fB-M\fR +.IP \fB\-M\fR Home directory milik user tidak akan dibuatkan, bahkan jika setting system pada \fI/etc/login.defs\fR ditujukan untuk membuat home directory. -.IP \fB-n\fR +.IP \fB\-n\fR Sebuah group yang namanya sama dengan user akan ditambahkan ke dalam system secara default. Option ini akan mematikan kebiasaan tersebut yang terdapat pada Red Hat Linux. -.IP \fB-r\fR +.IP \fB\-r\fR Flag ini digunakan untuk membuat sebuah system account. Yaitu, user dengan UID yang lebih kecil dari UID_MIN yang tercantum pada \fI/etc/login.defs\fR. Harap diingat bahwa \fBuseradd\fR tidak akan membuat home directory untuk user semacam ini, menghiraukan setting default yang terdapat di \fI/etc/login.defs\fR. -Anda harus menyebutkan option \fB-m\fR jika ingin membuat home directory +Anda harus menyebutkan option \fB\-m\fR jika ingin membuat home directory untuk sebuah system account yang akan dibuat. Ini adalah option yang ditambahkan oleh Red Hat. -.IP "\fB-s \fIshell\fR" +.IP "\fB\-s \fIshell\fR" Nama login shell milik user. -Default-nya adalah membiarkan field ini kosong, yang menyebabkan +Default\-nya adalah membiarkan field ini kosong, yang menyebabkan system untuk memilih login shell yang default. -.IP "\fB-u \fIuid\fR" +.IP "\fB\-u \fIuid\fR" Nilai user ID secara numerik. -Nilai ini harus unique, kecuali jika option \fI-o\fR digunakan. +Nilai ini harus unique, kecuali jika option \fI\-o\fR digunakan. Nilai tersebut tidak boleh negatif. -Default-nya adalah menggunakan nilai ID yang lebih besar dari 999 +Default\-nya adalah menggunakan nilai ID yang lebih besar dari 999 dan lebih besar dari semua user lain. Nilai di antara 0 dan 999 biasanya disiapkan untuk system aacount. -.SS Mengubah nilai-nilai default. -Ketika digunakan dengan option \fB-D\fR, \fBuseradd\fR akan +.SS Mengubah nilai\-nilai default. +Ketika digunakan dengan option \fB\-D\fR, \fBuseradd\fR akan menampilkan nilai default, atau memperbarui nilai default baru yang terdapat pada baris perintah. Option yang dapat digunakan adalah -.IP "\fB-b \fIdefault_home\fR" +.IP "\fB\-b \fIdefault_home\fR" Awalan path untuk home directory milik user baru. Nama user akan ditambahkan setelah akhir \fIdefault_home\fR -ketika membuat nama directory baru jika option \fB-d\fI tidak +ketika membuat nama directory baru jika option \fB\-d\fI tidak disebutkan dalam membuat account baru. -.IP "\fB-e \fIdefault_expire_date\fR" +.IP "\fB\-e \fIdefault_expire_date\fR" Tanggal ketika user account dimatikan. -.IP "\fB-f \fIdefault_inactive\fR" +.IP "\fB\-f \fIdefault_inactive\fR" Jumlah hari setelah password kadaluarsa sebelum account dimatikan. -.IP "\fB-g \fIdefault_group\fR" +.IP "\fB\-g \fIdefault_group\fR" Nama group atau ID sebagai group awal user baru. Nama group yang disebut harus sudah ada dan nomor group ID harus mempunyai entry. -.IP "\fB-s \fIdefault_shell\fR" +.IP "\fB\-s \fIdefault_shell\fR" Nama untuk login shell milik user baru. Nama program yang disebutkan akan digunakan untuk semua user account baru mendatang. @@ -198,7 +198,7 @@ Ini harus dilakukan pada server NIS. .br \fB/etc/default/useradd\fR \- informasi tentang nilai default .br -\fB/etc/login.defs\fR \- system-wide settings +\fB/etc/login.defs\fR \- system\-wide settings .br \fB/etc/skel\fR \- directory yang mengandung default files .SH LIHAT JUGA diff --git a/man/it/Makefile.am b/man/it/Makefile.am index c08a4295..b04c36f1 100644 --- a/man/it/Makefile.am +++ b/man/it/Makefile.am @@ -1,30 +1,35 @@ mandir = @mandir@/it +# Links to missing pages: +# grpconv.8 \ +# grpunconv.8 \ +# pwunconv.8 \ man_MANS = \ + chage.1 \ chfn.1 \ + chpasswd.8 \ chsh.1 \ - gpasswd.1 \ - groupadd.8 \ - groupdel.8 \ - groupmod.8 \ + expiry.1 \ + faillog.5 \ + faillog.8 \ + getspnam.3 \ groups.1 \ grpck.8 \ - grpconv.8 \ - grpunconv.8 \ + id.1 \ lastlog.8 \ login.1 \ + logoutd.8 \ newgrp.1 \ - passwd.1 \ - passwd.5 \ - pwconv.8 \ - pwunconv.8 \ + porttime.5 \ + pwck.8 \ + sg.1 \ + shadow.3 \ shadow.5 \ - useradd.8 \ - userdel.8 \ - usermod.8 \ + shadowconfig.8 \ + su.1 \ vigr.8 \ vipw.8 EXTRA_DIST = $(man_MANS) - \ No newline at end of file + diff --git a/man/it/Makefile.in b/man/it/Makefile.in index 34550796..0e067e1b 100644 --- a/man/it/Makefile.in +++ b/man/it/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.4 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -46,13 +46,6 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -man1dir = $(mandir)/man1 -am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \ - "$(DESTDIR)$(man8dir)" -man5dir = $(mandir)/man5 -man8dir = $(mandir)/man8 -NROFF = nroff -MANS = $(man_MANS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -89,17 +82,16 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ 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@ @@ -173,31 +165,36 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -man_MANS = \ - chfn.1 \ - chsh.1 \ - gpasswd.1 \ - groupadd.8 \ - groupdel.8 \ - groupmod.8 \ - groups.1 \ - grpck.8 \ - grpconv.8 \ - grpunconv.8 \ - lastlog.8 \ - login.1 \ - newgrp.1 \ - passwd.1 \ - passwd.5 \ - pwconv.8 \ - pwunconv.8 \ - shadow.5 \ - useradd.8 \ - userdel.8 \ - usermod.8 \ - vigr.8 \ - vipw.8 +# Links to missing pages: +# grpconv.8 \ +# grpunconv.8 \ +# pwunconv.8 \ +#man_MANS = \ +# chage.1 \ +# chfn.1 \ +# chpasswd.8 \ +# chsh.1 \ +# expiry.1 \ +# faillog.5 \ +# faillog.8 \ +# getspnam.3 \ +# groups.1 \ +# grpck.8 \ +# id.1 \ +# lastlog.8 \ +# login.1 \ +# logoutd.8 \ +# newgrp.1 \ +# porttime.5 \ +# pwck.8 \ +# sg.1 \ +# shadow.3 \ +# shadow.5 \ +# shadowconfig.8 \ +# su.1 \ +# vigr.8 \ +# vipw.8 EXTRA_DIST = $(man_MANS) all: all-am @@ -211,9 +208,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/it/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/it/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/it/Makefile + $(AUTOMAKE) --foreign man/it/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -241,141 +238,6 @@ clean-libtool: distclean-libtool: -rm -f libtool uninstall-info-am: -install-man1: $(man1_MANS) $(man_MANS) - @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ - else file=$$i; fi; \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 1*) ;; \ - *) ext='1' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ - done -uninstall-man1: - @$(NORMAL_UNINSTALL) - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 1*) ;; \ - *) ext='1' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ - rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ - done -install-man5: $(man5_MANS) $(man_MANS) - @$(NORMAL_INSTALL) - test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)" - @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.5*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ - else file=$$i; fi; \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 5*) ;; \ - *) ext='5' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \ - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \ - done -uninstall-man5: - @$(NORMAL_UNINSTALL) - @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.5*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 5*) ;; \ - *) ext='5' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \ - rm -f "$(DESTDIR)$(man5dir)/$$inst"; \ - done -install-man8: $(man8_MANS) $(man_MANS) - @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)" - @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.8*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ - else file=$$i; fi; \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 8*) ;; \ - *) ext='8' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \ - done -uninstall-man8: - @$(NORMAL_UNINSTALL) - @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.8*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 8*) ;; \ - *) ext='8' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \ - rm -f "$(DESTDIR)$(man8dir)/$$inst"; \ - done tags: TAGS TAGS: @@ -412,11 +274,8 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(MANS) +all-am: Makefile installdirs: - for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -459,13 +318,13 @@ info: info-am info-am: -install-data-am: install-man +install-data-am: install-exec-am: install-info: install-info-am -install-man: install-man1 install-man5 install-man8 +install-man: installcheck-am: @@ -485,21 +344,17 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am uninstall-man - -uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 +uninstall-am: uninstall-info-am .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-man1 \ - install-man5 install-man8 install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + install-info install-info-am install-man install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am uninstall-man uninstall-man1 uninstall-man5 \ - uninstall-man8 + uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/man/it/chfn.1 b/man/it/chfn.1 deleted file mode 100644 index 7240f506..00000000 --- a/man/it/chfn.1 +++ /dev/null @@ -1,74 +0,0 @@ -.\" $Id: chfn.1,v 1.2 2004/08/04 13:02:25 kloczek Exp $ -.\" -.\" chfn.1 -- change your finger information -.\" (c) 1994 by salvatore valente -.\" -.\" -.\" Traduzione in italiano di Giovanni Bortolozzo -.\" Agosto 1996 -.\" -.\" this program is free software. you can redistribute it and -.\" modify it under the terms of the gnu general public license. -.\" there is no warranty. -.\" -.\" $Author: kloczek $ -.\" $Revision: 1.2 $ -.\" $Date: 2004/08/04 13:02:25 $ -.\" -.\" " for hilit19 -.TH CHFN 1 "13 ottobre 1994" "chfn" "Linux Reference Manual" -.SH NOME -chfn \- cambia le proprie "finger information" -.SH SINTASSI -.B chfn -[\ \-f\ nome_vero\] [\ \-o\ ufficio\] [\ \-p\ telefono_ufficio\] -[\ \-h\ telefono_casa\] [\ \-u\ ] [\ \-v\ ] [\ nome_utente\] -.SH DESCRIZIONE -.B chfn - usato per cambiare le proprie finger information. Queste informazioni sono -salvate nel file -.IR /etc/passwd , -e sono mostrate dal programma -.BR finger . -Il comando -.B finger -di Linux mostra quattro porzioni di informazione che possono essere -cambiati tramite -.BR chfn : -il proprio nome vero, l'ufficio e il numero di telefono di quest'ultimo, e il -proprio numero di telefono di casa. -.SS LINEA DI COMANDO -Ognuno delle quattro porzioni pu essere specificata nella linea di comando. -Se non viene passata alcuna informazione sulla linea di comando, -.B chfn -entra in modo interattivo. -.SS MODO INTERATTIVO -Nel modo interattivo, -.B chfn -chieder ognuno dei campi. Al prompt, possono essere immesse le nuove -informazioni, o premere return per non cambiare il campo. L'immissione della -parola chiave "none" cancella il campo. -.SH OPZIONI -.TP -.I "\-f, \-\-full-name" -Specifica il proprio nome reale. -.TP -.I "\-h, \-\-home-phone" -Specifica il numero di telefono di casa. -.TP -.I "\-o, \-\-office" -Specifica il numero del proprio ufficio. -.TP -.I "\-p, \-\-office-phone" -Specifica il numero di telefono del proprio ufficio. -.TP -.I "\-u, \-\-help" -Mostra un messaggio d'aiuto ed esce. -.TP -.I "-v, \-\-version" -Mostra informazioni sulla versione ed esce. -.SH "VEDERE ANCHE" -.BR finger (1), -.BR passwd (5) -.SH AUTORE -Salvatore Valente diff --git a/man/it/chsh.1 b/man/it/chsh.1 deleted file mode 100644 index 1d1da815..00000000 --- a/man/it/chsh.1 +++ /dev/null @@ -1,58 +0,0 @@ -.\" $Id: chsh.1,v 1.1 2002/03/10 07:41:06 kloczek Exp $ -.\" -.\" chsh.1 -- change your login shell -.\" (c) 1994 by salvatore valente -.\" -.\" Traduzione in italiano di Giovanni Bortolozzo -.\" Agosto 1996 -.\" Aggiornamento alla 2.9 di Roberto Pertile -.\" Maggio 1999 -.\" this program is free software. you can redistribute it and -.\" modify it under the terms of the gnu general public license. -.\" there is no warranty. -.\" -.\" $Author: kloczek $ -.\" $Revision: 1.1 $ -.\" $Date: 2002/03/10 07:41:06 $ -.\" -.TH CHSH 1 "7 ottobre 1998" "chsh" "Linux Reference Manual" -.SH NOME -chsh \- cambia la shell di login -.SH SINTASSI -.B chsh -[\ \-s\ shell\ ] [\ \-l\ ] [\ \-u\ ] [\ \-v\ ] [\ nome_utente\ ] -.SH DESCRIZIONE -.B chsh - usato per cambiare la propria shell di login. -Se nella linea di comando non viene fornita una shell, -.B chsh -ne chiede una. -.SS SHELL VALIDE -.B chsh -accetter l'intero percorso di qualunque file eseguibile nel sistema. -Tuttavia, emetter un messaggio di avviso se la shell non elencata nel -file -.I /etc/shells. -D'altra parte, pu anche essere configurato in modo tale da accettare solo -shell elencate in questo file, a meno che sia eseguito da root. -.SH OPZIONI -.TP -.I "\-s, \-\-shell" -Specifica la propria shell di login. -.TP -.I "\-l, \-\-list-shells" -Stampa la lista delle shell elencate in -.I /etc/shells -ed esce. -.TP -.I "\-u, \-\-help" -Stampa un messaggio sull'uso ed esce. -.TP -.I "-v, \-\-version" -Stampa informazioni sulla versione ed esce. -.SH "VEDERE ANCHE" -.BR login (1), -.BR passwd (5), -.BR shells (5) -.SH AUTORE -Salvatore Valente diff --git a/man/it/gpasswd.1 b/man/it/gpasswd.1 deleted file mode 100644 index b87e5219..00000000 --- a/man/it/gpasswd.1 +++ /dev/null @@ -1,76 +0,0 @@ -.\" Copyright 1996, Rafal Maszkowski, rzm@pdi.net -.\" All rights reserved. You can redistribute this man page and/or -.\" modify it under the terms of the GNU General Public License as -.\" published by the Free Software Foundation; either version 2 of the -.\" License, or (at your option) any later version. -.\" -.\" $Id: gpasswd.1,v 1.3 2003/04/28 06:09:52 kloczek Exp $ -.\" -.\" Traduzione in italiano a cura di Isabella Ruocco -.\" luglio 1999 -.\" -.TH GPASSWD 1 -.SH NOME -gpasswd \- amministra il file /etc/group -.br -.SH SINTASSI -.B gpasswd \fIgruppo\fR -.br -.B gpasswd -.B -a -\fIutente\fR \fIgruppo\fR -.br -.B gpasswd -.B -d -\fIutente\fR \fIgruppo\fR -.br -.B gpasswd -.B -R -\fIgruppo\fR -.br -.B gpasswd -.B -r -\fIgruppo\fR -.br -.B gpasswd -.RB [ -A -\fIutente\fR,...] -.RB [ -M -\fIutente\fR,...] -\fIgruppo\fR -.br -.SH DESCRIZIONE -.B gpasswd -viene usato per amministrare il file /etc/group (ed il file /etc/gshadow -se compilato con SHADOWGRP definito). Ogni gruppo pu avere amministratori, -membri ed una password. L'amministratore di sistema pu usare l'opzione \fB-A\fR -per definire l'amministratore/gli amministratori di gruppo e l'opzione \fB-M\fR -per definire i membri ed ha tutti i diritti degli amministratori di gruppo e -dei membri. -.PP -L'amministratore di gruppo pu aggiungere e rimuovere utenti usando -rispettivamente le opzioni \fB-a\fR e \fB-d\fR. Gli amministratori possono usare -l'opzione \fB-r\fR per rimuovere la password di gruppo. Quando non -impostata alcuna password solo i membri del gruppo possono usare -.BR newgrp (1) -per unirsi al gruppo. L'opzione \fB-R\fR disabilita l'accesso al gruppo tramite -il comando -.BR newgrp (1). -.PP -.B gpasswd -invocata da un amministratore di gruppo con il solo nome del gruppo richiede -solamente la password di gruppo. Se la password impostata i membri possono ancora -usare -.BR newgrp (1) -senza la password, i non-membri devono fornire la password. - -.SH FILE -\fI/etc/group\fR \- informazioni sui gruppi -.br -\fI/etc/gshadow\fR \- informazioni sul gruppo shadow -.SH VEDERE ANCHE -.BR newgrp (1), -.BR groupadd (8), -.BR groupdel (8), -.BR groupmod (8), -.BR grpck (8) diff --git a/man/it/groupadd.8 b/man/it/groupadd.8 deleted file mode 100644 index 32890bd4..00000000 --- a/man/it/groupadd.8 +++ /dev/null @@ -1,65 +0,0 @@ -.\" Copyright 1991, Julianne Frances Haugh -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $Id: groupadd.8,v 1.7 2004/12/12 20:23:58 kloczek Exp $ -.\" -.\" Traduzione in italiano a cura di Isabella Ruocco -.\" luglio 1999 -.\" -.TH GROUPADD 8 -.SH NOME -groupadd \- Crea un nuovo gruppo -.SH SINTASSI -\fBgroupadd\fR [\fB-g\fI gid \fR[\fB-o\fR]] [\fB-f\fR] \fIgruppo\fR -.SH DESCRIZIONE -Il comando \fBgroupadd\fR crea un nuovo account di gruppo usando i valori -specificati sulla linea di comando ed i valori predefiniti dal sistema. -Il nuovo gruppo verr aggiunto ai file di sistema che lo necessitano. -.SH OPZIONI -Le opzioni che si applicano al comando \fBgroupadd\fR sono: -.IP "\fB-g \fIgid\fR" -Il valore numerico dell'identificatore (ID) del gruppo. -Questo valore deve essere univoco, a meno che non venga usata l'opzione \fB-o\fR. -Il valore deve essere non-negativo. -La scelta predefinita quella di usare il minimo valore di ID superiore a 999 -e superiore a qualunque altro gruppo. -Valori tra 0 e 999 sono tipicamente riservati per account di sistema. -.SH FILE -\fI/etc/group\fR \- informazioni sugli account di gruppo -.br -\fI/etc/gshadow\fR \- informazioni sicure sugli account di gruppo -.SH VEDERE ANCHE -.BR chfn (1), -.BR chsh (1), -.BR useradd (8), -.BR userdel (8), -.BR usermod (8), -.BR passwd (1), -.BR groupdel (8), -.BR groupmod (8) -.SH AUTORE -Julianne Frances Haugh (jfh@tab.com) diff --git a/man/it/groupdel.8 b/man/it/groupdel.8 deleted file mode 100644 index 0be07d45..00000000 --- a/man/it/groupdel.8 +++ /dev/null @@ -1,63 +0,0 @@ -.\" Copyright 1991 - 1993, Julianne Frances Haugh -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $Id: groupdel.8,v 1.3 2003/04/28 06:09:52 kloczek Exp $ -.\" -.\" Traduzione in italiano a cura di Isabella Ruocco -.\" luglio 1999 -.\" -.TH GROUPDEL 8 -.SH NOME -groupdel \- Rimuove un gruppo -.SH SINTASSI -.B groupdel -.I gruppo -.SH DESCRIZIONE -Il comando \fBgroupdel\fR modifica i file di account di sistema, rimuovendo -tutte le voci che si riferiscono a \fIgruppo\fR. -Il gruppo nominato deve esistere. -.PP -Occorre controllare manualmente tutti i filesystem per assicurarsi che non -rimanga alcun file avente come ID di gruppo del file il gruppo specificato. -.SH CAVEAT -Non si pu rimuovere il gruppo primario di qualche utente esistente. -Occorre rimuovere l'utente prima di rimuovere il gruppo. -.SH FILE -\fI/etc/group\fR \- informazioni sui gruppi -.br -\fI/etc/gshadow\fR \- informazioni sicure sui gruppi -.SH VEDERE ANCHE -.BR chfn (1), -.BR chsh (1), -.BR useradd (8), -.BR userdel (8), -.BR usermod (8), -.BR passwd (1), -.BR groupadd (8), -.BR groupmod (8) -.SH AUTORE -Julianne Frances Haugh (jfh@tab.com) diff --git a/man/it/groupmod.8 b/man/it/groupmod.8 deleted file mode 100644 index d0a9e07e..00000000 --- a/man/it/groupmod.8 +++ /dev/null @@ -1,69 +0,0 @@ -.\" Copyright 1991, Julianne Frances Haugh -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $Id: groupmod.8,v 1.5 2004/11/04 03:06:32 kloczek Exp $ -.\" -.\" Traduzione in italiano a cura di Isabella Ruocco -.\" luglio 1999 -.\" -.TH GROUPMOD 8 -.SH NOME -groupmod \- Modifica un gruppo -.SH SINTASSI -.B groupmod -[\fB-g\fI gid \fR[\fB-o\fR]] -[\fB-n\fI nome_gruppo \fR] -.I gruppo -.SH DESCRIZIONE -Il comando \fBgroupmod\fR modifica i file di account del sistema in modo -da riflettere i cambiamenti che sono specificati sulla linea di comando. -Le opzioni che si applicano al comando \fIgroupmod\fR sono -.IP "\fB-g \fIgid\fR" -Il valore numerico dell'identificatore (ID) del gruppo. -Questo valore deve essere univoco, a meno che non venga usata l'opzione -\fB-o\fR. -Il valore deve essere non-negativo. -Valori tra 0 e 999 sono tipicamente riservati per gruppi di sistema. -Occorre modificare manualmente l'ID di gruppo di tutti i file -il cui ID di gruppo quello vecchio. -.IP "\fB-n \fInome_gruppo\fR" -Il nome del gruppo verr modificato da \fIgruppo\fR a \fInome_gruppo\fR. -.SH FILE -\fI/etc/group\fR \- informazioni sui gruppi -.br -\fI/etc/gshadow\fR \- informazioni sicure sui gruppi -.SH VEDERE ANCHE -.BR chfn (1), -.BR chsh (1), -.BR useradd (8), -.BR userdel (8), -.BR usermod (8), -.BR passwd (1), -.BR groupadd (8), -.BR groupdel (8) -.SH AUTORE -Julianne Frances Haugh (jfh@tab.com) diff --git a/man/it/groups.1 b/man/it/groups.1 deleted file mode 100644 index 72f0aab7..00000000 --- a/man/it/groups.1 +++ /dev/null @@ -1,46 +0,0 @@ -.\" $Id: groups.1,v 1.1 2002/03/10 07:41:06 kloczek Exp $ -.\" Italian manpages for GNU sh-utils-1.16. -.\" Copyright (C) 1997 Free Software Foundation, Inc. -.\" Giovanni Bortolozzo , 1997. -.\" -.\" Traduzione di Giovanni Bortolozzo -.\" Maggio 1997 -.\" -.\"" for hilit19 -.TH GROUPS 1 "GNU Shell Utilities" "FSF" -.SH NOME -groups \- mostra i gruppi in cui presente l'utente -.SH SINTASSI -.B groups -[nomeutente...] -.br -.B groups -{\-\-help,\-\-version} -.SH DESCRIZIONE -Questa documentazione non mantenuta da lungo tempo e potrebbe essere -inaccurata o incompleta. La documentazione in Texinfo ora la fonte -autorevole. -.PP -Questa pagina di manuale documenta la versione GNU di -.BR groups . -.B groups -mostra i nomi dei gruppi supplementari in cui presente ogni -.I nomeutente -dato, o del processo corrente se non ne dato nessuno. Se sono dati -dei nomi di utenti, il nome di ogni utente stampato prima della -lista dei gruppi dell'utente. -.PP -La lista dei gruppi equivalente all'output del comando `id \-Gn'. -.SS OPZIONI -Quando GNU -.B groups - chiamato con un solo argomento sono riconosciute le seguenti -opzioni: -.TP -.I "\-\-help" -Mostra nello standard output un messaggio d'aiuto ed esce con successo. -.TP -.I "\-\-version" -Mostra nello standard output informazioni sulla versione ed esce con -successo. - diff --git a/man/it/grpck.8 b/man/it/grpck.8 deleted file mode 100644 index db895b95..00000000 --- a/man/it/grpck.8 +++ /dev/null @@ -1,108 +0,0 @@ -.\" Copyright 1992 - 1993, Julianne Frances Haugh -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $Id: grpck.8,v 1.3 2003/04/28 06:09:52 kloczek Exp $ -.\" -.\" Traduzione in italiano a cura di Isabella Ruocco -.\" luglio 1999 -.\" -.TH GRPCK 8 -.SH NOME -grpck \- verifica l'integrit dei file di gruppo -.SH SINTASSI -\fBgrpck\fR [\fB-r\fR] [\fIgruppo\fR \fIshadow\fR] -.SH DESCRIZIONE -\fBgrpck\fR verifica l'integrit delle informazioni di autenticazione del -sistema. -Vengono controllate tutte le voci in \fI/etc/group\fR e \fI/etc/gshadow\fR -per verificare che la voce abbia il formato appropriato e dati validi -in ciascun campo. -Viene richiesto all'utente di rimuovere le voci che sono formattate -impropriamente o che hanno altri errori incorreggibili. -.P -Vengono fatti controlli per verificare che ogni voce abbia -.sp -.in +.5i -- il corretto numero di campi -.br -- un nome univoco di gruppo -.br -- una lista valida di membri ed amministratori -.in -.5i -.sp -.P -Le verifiche sul corretto numero di campi e sul nome univoco del gruppo -sono fatali. -Se la voce ha un numero errato di campi, all'utente verr richiesto di -cancellare l'intera riga. -Se l'utente non risponde affermativamente, vengono omessi tutti gli -ulteriori controlli. -Verr richiesta la cancellazione di una voce avente il nome del gruppo duplicato, -ma i rimanenti controlli verranno ugualmente effettuati. -Tutti gli altri errori sono avvertimenti e l'utente incitato ad eseguire -il comando \fBgroupmod\fR per correggere l'errore. -.P -I comandi che operano sul file \fI/etc/group\fR non sono in grado di alterare -voci corrotte o duplicate. -In quelle circostanze dovrebbe essere usato \fBgrpck\fR per rimuovere la voce -scorretta. -.SH OPZIONI -Come modalit predefinita, \fBgrpck\fR opera sui file \fI/etc/group\fR ed -\fI/etc/gshadow\fR. -L'utente pu selezionare file alternativi con i parametri \fIgruppo\fR e -\fIshadow\fR. -Inoltre, l'utente pu eseguire il comando in modalit di sola lettura -specificando l'opzione \fB-r\fR. -Questa fa in modo che venga risposto \fBno\fR a tutte le domande che riguardano -i cambiamenti senza l'intervento dell'utente. -.SH FILE -\fI/etc/group\fR \- informazioni sugli account di gruppo -.br -\fI/etc/gshadow\fR \- password crittate e informazioni sugli amministratori di gruppo -.br -\fI/etc/passwd\fR \- informazioni sugli utenti -.SH VEDERE ANCHE -.BR groupmod (8), -.BR group (5), -.BR passwd (5), -.BR shadow (5) -.SH DIAGNOSTICA -Il comando \fBgrpck\fR esce con i seguenti valori: -.IP 0 5 -Successo -.IP 1 5 -Errore di sintassi -.IP 2 5 -Una o pi voci di gruppo scorrette -.IP 3 5 -Impossibile aprire i file di gruppo -.IP 4 5 -Impossibile eseguire il lock dei file di gruppo -.IP 5 5 -Impossibile aggiornare i file di gruppo -.SH AUTORE -Julianne Frances Haugh (jfh@tab.com) diff --git a/man/it/grpconv.8 b/man/it/grpconv.8 deleted file mode 100644 index 470d789c..00000000 --- a/man/it/grpconv.8 +++ /dev/null @@ -1,58 +0,0 @@ -.\" $Id: grpconv.8,v 1.1 2002/03/10 07:41:06 kloczek Exp $ -.\" Traduzione in italiano di Isabella Ruocco -.\" Giugno 1999 -.TH PWCONV 8 "26 sep 1997" -.SH NOME -pwconv, pwunconv, grpconv, grpunconv \- convertono a e da password e gruppi shadow. -.SH SINTASSI -.B pwconv -.br -.B pwunconv -.br -.B grpconv -.br -.B grpunconv -.SH DESCRIZIONE -Questi quattro programmi agiscono tutti sui file normali e e oscurati (shadow) -delle password e dei gruppi: -.IR /etc/passwd ", " /etc/group ", " /etc/shadow ", e " /etc/gshadow . - -.B pwconv -.RI "crea " shadow " da " passwd " e, in modo opzionale, da un preesistente " shadow . -.B pwunconv -.RI "crea " passwd " da " passwd " e " shadow " e quindi rimuove " shadow . -.B grpconv -.RI "crea " gshadow " da " group " e, in modo opzionale, da un preesistente " gshadow . -.B grpunconv -.RI "crea " group " da " group " e " gshadow " e quindi rimuove " gshadow . - -Ciascun programma, prima della conversione, acquisisce i lock necessari. - -.BR pwconv " e " grpconv -sono simili. Per prima cosa vengono rimosse le voci nel file oscurato che non esistono -nel file principale. Quindi vengono aggiornate le voci oscurate che -non hanno `x' come password nel file principale. Vengono aggiunte le eventuali voci -oscurate mancanti. Infine, le password nel file principale vengono -sostituite con `x'. Questi programmi possono essere usati per le conversioni iniziali -cos come per aggiornare il file oscurato se il file principale viene editato -a mano. - -.B pwconv -user i valori di -.BR PASS_MIN_GIORNI ", " PASS_MAX_GIORNI ", e " PASS__GIORNI_PREAVVISO -da -.I /etc/login.defs -quando si aggiungono nuove voci a -.IR /etc/shadow . - -.RB "Analogamente, " pwunconv " e " grpunconv -sono simili. Le password nel file principale vengono aggiornate -dal file oscurato. Voci che esistono nel file principale ma non -nel file oscurato vengono lasciate stare. Infine, viene rimosso il file oscurato. - -Alcune informazioni sull'invecchiamento delle password vengono perse da -.BR pwunconv . -Questo convertir quello che potr. -.SH "VEDERE ANCHE" -.BR login.defs (5), -.BR shadowconfig (8) diff --git a/man/it/grpunconv.8 b/man/it/grpunconv.8 deleted file mode 100644 index ca092223..00000000 --- a/man/it/grpunconv.8 +++ /dev/null @@ -1 +0,0 @@ -.so man8/grpconv.8 diff --git a/man/it/lastlog.8 b/man/it/lastlog.8 deleted file mode 100644 index 5dd764d8..00000000 --- a/man/it/lastlog.8 +++ /dev/null @@ -1,64 +0,0 @@ -.\" Copyright 1992, Phillip Street and Julianne Frances Haugh -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" @(#)lastlog.8 3.3 08:24:58 29 Sep 1993 (National Guard Release) -.\" $Id: lastlog.8,v 1.5 2003/04/28 06:38:54 kloczek Exp $ -.\" -.\" Traduzione in italiano a cura di Isabella Ruocco -.\" luglio 1999 -.\" -.TH LASTLOG 8 -.SH NOME -lastlog \- esamina il file lastlog -.SH SINTASSI -.TP 8 -\fBlastlog\fR [(\fB-u\fR|\fB--user\fR) \fIutente\fR] -[(\fB-t\fR|\fB--time\fR) \fIdays\fR] [(\fB-h\fR|\fB--help\fR)] -.SH DESCRIZIONE -\fBlastlog\fR formatta e stampa il contenuto dell'ultimo log di login, -\fI/var/log/lastlog\fR. Verranno stampati \fBnome-login\fR, \fBporta\fR, -e \fBdata_ultima_connessione\fR. -Il comportamento predefinito (senza opzioni) quello di stampare le voci di -lastlog in ordine di UID. -Digitando l'opzione \fB-u \fInome-login\fR verr stampato solo il -record di \fInome-login\fR. -Digitando \fB-t \fIgiorni\fR verranno stampate solo le ultime connessioni -pi recenti di \fIgiorni\fR. -L'opzione \fB-t\fR sovrascrive l'uso di \fB-u\fR. -.PP -Se l'utente non si mai connesso verr mostrato, al posto della porta e della -data, il messaggio \fB"**Never logged in**"\fR (**Mai connesso**). -.SH FILE -\fI/var/log/lastlog\fR \- file di connessione lastlog -.SH CAVEAT -Grandi lacune nei numeri di uid provocheranno una prolungata esecuzione del -programma lastlog senza alcun output sullo schermo (i.e. se mmdf=800 e l'ultimo -uid=170, sembrer che il programma rimanga appeso mentre elabora gli uid 171-799). -.SH AUTORI -Julianne Frances Haugh (jfh@tab.com) -.br -Phillip Street diff --git a/man/it/login.1 b/man/it/login.1 deleted file mode 100644 index 390bbf5c..00000000 --- a/man/it/login.1 +++ /dev/null @@ -1,334 +0,0 @@ -.\" $Id: login.1,v 1.1 2002/03/10 07:41:06 kloczek Exp $ -.\" Copyright 1993 Rickard E. Faith (faith@cs.unc.edu) -.\" May be distributed under the GNU General Public License -.\" Pu essere distribuito sotto la GNU General Public License -.\" -.\" Traduzione in italiano di Giovanni Bortolozzo -.\" Agosto 1996 -.\" Aggiornamento alla 2.9 di Roberto Pertile -.TH LOGIN 1 "4 novembre 1996" "Util-linux 1.6" "Linux Programmer's Manual" -.SH NOME -login \- accede al sistema -.SH SINTASSI -.BR "login [ " nome " ]" -.br -.B "login \-p" -.br -.BR "login \-h " nome_host -.br -.BR "login \-f " nome -.SH DESCRIZIONE -.B login -viene utilizzato quando si accede a un sistema. Pu -anche venire usato per passare da un utente a un altro in qualunque momento -(le shell pi recenti tuttavia hanno un supporto incorporato per questa -caratteristica). - -Se non sono forniti argomenti, -.B login -chiede il nome dell'utente. - -Se l'utente -.I non - root, e se esiste -.IR /etc/nologin , -vengono stampati sullo schermo i contenuti di questo file e viene -terminata l'operazione. -Ci viene usato, tipicamente, per impedire collegamenti quando il sistema -sta per essere spento. - -Se per l'utente sono specificate particolari restrizioni di accesso in -.IR /etc/usertty , -esse devono venire rispettate, altrimenti il tentativo di collegamento -ricever un diniego e verr generato un messaggio di -.BR syslog . -Si veda la sezione sulle "Restrizioni Speciali sull'Accesso". - -Se l'utente root, allora il collegamento deve avvenire da una tty -elencata in -.IR /etc/securetty . -I fallimenti saranno registrati dai servizi di -.BR syslog . - -Dopo la verifica di queste condizioni, verr richiesta e controllata -la password (se necessaria per quell'utente). Sono consentiti dieci -tentativi prima che -.B login -termini, tuttavia dopo i primi tre, la risposta comincer a diventare -molto lenta. -I collegamenti falliti vengono riferiti dai servizi di -.BR syslog . -Questi servizi sono inoltre usati per riferire qualsiasi collegamento -riuscito di root. - -Se esiste il file -.IR .hushlogin , -allora verr eseguito un collegamento "silenzioso" (disabilitando il -controllo della posta, la stampa dell'orario dell'ultimo collegamento -e del messaggio del giorno). Altrimenti, se esiste -.IR /var/log/lastlog , -viene stampata la data e ora dell'ultimo collegamento (e viene registrato -il collegamento in atto). - -Sono eseguiti compiti amministrativi vari, come impostare lo UID e il GID -della tty. Viene conservata la variabile d'ambiente TERM, se esiste (le altre -variabili d'ambiente vengono conservate se si usa l'opzione -.BR \-p ). -Quindi vengono impostate le variabili d'ambiente HOME, PATH, SHELL, TERM, -MAIL e LOGNAME. PATH viene predefinito come -.I /usr/local/bin:/bin:/usr/bin:. -per gli utenti normali e come -.I /sbin:/bin:/usr/sbin:/usr/bin -per root. Infine, se non si tratta di un collegamento "silenzioso", viene -stampato il messaggio del giorno, viene controllato il file col nome -dell'utente in -.IR /usr/spool/mail , -e stampato un messaggio se esso ha lunghezza non-zero. - -Viene poi lanciata la shell dell'utente. Se non specificata nessuna -shell per l'utente in -.BR /etc/passwd , -allora viene usata -.BR /bin/sh . -Se non sono specificate directory in -.IR /etc/passwd , -allora viene usata -.I / -(la directory home viene controllata dal file -.I .hushlogin -descritto sopra). -.SH OPZIONI -.TP -.B \-p -Usata da -.BR getty (8) -per dire a -.B login -di non distruggere l'ambiente. -.TP -.B \-f -Usata per saltare la seconda autentifica di collegamento. Ci, -specificamente, -.B non -funziona per root, e non sembra funzionare bene sotto Linux. -.TP -.B \-h -Usata da altri server (per esempio, -.BR telnetd (8)) -per passare il nome dell'host remoto a -.B login -onde poterlo collocare in utmp e wtmp. Solo il superutente pu usare -quest'opzione. - - -.SH "RESTRIZIONI SPECIALI SULL'ACCESSO" -Il file -.I /etc/securetty -elenca il nome delle tty sulle quali pu collegarsi root. Su ogni linea deve -essere specificato un nome di dispositivo tty senza il prefisso /dev/. Se -il file non esiste, a root permesso di collegarsi da qualunque tty. - -.PP -Il file -.I /etc/usertty -specifica restrizioni di accesso ulteriori per specifici utenti. Se questo -file non esiste, non viene imposta alcuna ulteriore restrizione d'accesso. -Il file consiste di una sequenza di sezioni. Ci sono tre possibili tipi di -sezione: CLASSES, GROUPS e USERS. Una sezione CLASSES definisce la classe di -tty consentiti e i modelli di hostname, una sezione GROUPS definisce tty e -host consentiti in base al gruppo, una sezione USERS definisce tty e host -consentiti in base all'utente. -.PP -Ogni riga di questo file pu avere una lunghezza massima di 255 caratteri. I -commenti iniziano con un carattere # e si estendono fino al termine della -riga. -.PP -.SS "La sezione CLASSES" -Una sezione CLASSES incomincia con la parola CLASSES, all'inizio della riga -e tutta in maiuscole. Ognuna delle righe che seguono, fino -all'inizio di una nuova sezione o alla fine del file, consistono in una -sequenza di parole separate da tabulazioni o spazi. Ogni riga definisce -una classe di tty e modelli di host. -.PP -La parola all'inizio di una riga viene definita come un nome collettivo -per le tty e i modelli di host specificati nel resto della riga. Questo -nome collettivo pu essere usato in ogni sezione successiva GROUPS o -USERS. Nessuno di tali nomi di classi deve essere parte della definizione -di una classe, per evitare problemi con classi ricorsive. -.PP -Un esempio di sezione CLASSES: -.PP -.nf -.in +.5 -CLASSES -mia_classe1 tty1 tty2 -mia_classe2 tty3 @.foo.com -.in -.5 -.fi -.PP -Ci definisce le classi -.I mia_classe1 -e -.I mia_classe2 -corrispondenti a quello che hanno a destra. -.PP - -.SS "La sezione GROUPS" -Una sezione GROUPS definisce i tipi consentiti di tty e host in base al -gruppo Unix. Se un utente membro di un gruppo Unix in accordo a -.I /etc/passwd -e -.I /etc/group -e tale gruppo menzionato in una sezione GROUPS in -.I /etc/usertty -allora l'utente ha il permesso di accesso se lo ha il gruppo. -.PP -Una sezione GROUPS incomincia con la parola GROUPS, tutta in maiuscole, -all'inizio di una riga, ogni riga seguente una sequenza di parole -separate da spazi o tabulazioni. La prima parola di una riga il nome -del gruppo e il resto delle parole sulla riga specificano le tty e gli host -dai quali consentito accesso ai membri di quel gruppo. Queste -specificazioni possono comportare l'uso di classi definite nelle precedenti -sezioni CLASSES. -.PP -Esempio di una sezione GROUPS: -.PP -.nf -.in +0.5 -GROUPS -sys tty1 @.bar.edu -stud mia_classe1 tty4 -.in -0.5 -.fi -.PP -Questo esempio specifica che i membri del gruppo -.I sys -possono collegarsi da tty1 e da host nel dominio bar.edu. Gli utenti nel -gruppo -.I stud -possono collegarsi dagli host/tty specificati nella classe mia_classe1 o -da tty4. -.PP - -.SS "La sezione USERS" -Una sezione USERS comincia con la parola USERS tutta in maiuscolo all'inizio -di una riga, e ogni riga successiva una sequenza di parole separate da -spazi o tabulazioni. La prima parola in una riga un nome di utente e a -quell'utente permesso di collegarsi dai tty e dagli host menzionati nel -resto della riga. Queste specificazioni possono comportare classi definite -in precedenti sezioni CLASSES. Se non viene specificata alcuna intestazione -all'inizio del file, la prima sezione predefinita come sezione USERS. -.PP -Esempio di una sezione USERS: -.PP -.nf -.in +0.5 -USERS -zacho tty1 @130.225.16.0/255.255.255.0 -blue tty3 mia_classe2 -.in -0.5 -.fi -.PP -Ci consente all'utente zacho di collegarsi solo sul tty1 e dagli host con -indirizzi IP nell'intervallo 130.225.16.0 \- 130.225.16.255, e all'utente -blue consente di collegarsi dal tty3 e da qualunque cosa sia stato -specificato in mia_classe2. -.PP -Ci pu essere una riga nella sezione USERS che comincia con un nome di -utente di *. Questa una regola predefinita e verr applicata a -qualsiasi utente che non corrisponda ad alcuna altra riga. -.PP -Se un utente corrisponde sia a una riga USERS sia a una riga GROUPS -allora all'utente consentito l'accesso risultante dall'unione di tutti i -tty/host menzionati in tali specificazioni. - -.SS Origini -Le specifiche di tty e i modelli di host usate nella specificazione degli -accessi di classi, gruppi e utenti si chiamano origini. Una stringa origine -pu avere uno dei seguenti formati: -.IP o -Il nome di un dispositivo tty senza il prefisso /dev/, per esempio tty1 o -ttyS0. -.PP -.IP o -La stringa @localhost, che significa che all'utente permesso di fare -telnet/rlogin dall'host locale allo stesso host. Questo consente inoltre -all'utente, per esempio, di eseguire il comando: xterm -e /bin/login. -.PP -.IP o -Il suffisso di un nome di dominio come @.some.dom, che significa che -l'utente pu fare rlogin/telnet da qualsiasi host il cui nome di dominio -abbia il suffisso -.some.dom. -.PP -.IP o -Un intervallo di indirizzi IPv4 , scritto @x.x.x.x/y.y.y.y dove x.x.x.x - l'indirizzo IP nella consueta notazione decimale puntata, e -y.y.y.y una bitmask nella stessa notazione che specifica quali bit -nell'indirizzo devono essere confrontati con l'indirizzo IP dell'host remoto. -Per esempio, @130.225.16.0/255.255.254.0 vuol dire che l'utente pu fare -rlogin/telnet da qualsiasi host il cui indirizzo IP sia nell'intervallo -130.225.16.0 \- 130.225.17.255. -.PP -Qualunque delle suddette origini pu essere prefissata da una -specificazione di tempo secondo la sintassi: -.PP -.nf -spec_ora ::= '[' [':' ]* ']' -giorno ::= 'mon' | 'tue' | 'wed' | 'thu' | 'fri' | 'sat' | 'sun' -ora ::= '0' | '1' | ... | '23' -spec_ora ::= | '\-' -giorno-o-ora ::= | -.fi -.PP -Per esempio, l'origine [mon:tue:wed:thu:fri:8\-17]tty3 significa che il -collegamento consentito dal luned al venerd fra le 8:00 e le 17:59 -(5:59 p.m.) dalla tty3. Questo mostra anche che un intervallo di ore a\-b -include tutti gli istanti fra a:00 e b:59. La specificazione di una singola -ora (come 10) significa l'intervallo di tempo fra le 10:00 e le 10:59. -.PP -La mancata specificazione di qualsiasi prefisso di tempo per una tty o host -significa che il collegamento da quella origine permesso in qualunque -momento. Se dato un prefisso di tempo, ci si accerti di specificare sia un -insieme di giorni sia una una o pi ore o intervalli di ore. Una -specificazione di ore non pu comprendere nessuno spazio bianco. -.PP -Se non data alcuna regola predefinita allora gli utenti che non -corrispondano ad alcuna riga di -.I /etc/usertty -possono collegarsi da qualunque posto, come il comportamento standard. -.PP -.SH FILE -.nf -.I /var/run/utmp -.I /var/log/wtmp -.I /var/log/lastlog -.I /usr/spool/mail/* -.I /etc/motd -.I /etc/passwd -.I /etc/nologin -.I /etc/usertty -.I .hushlogin -.fi -.SH "VEDERE ANCHE" -.BR init (8), -.BR getty (8), -.BR mail (1), -.BR passwd (1), -.BR passwd (5), -.BR environ (7), -.BR shutdown (8) -.SH BACHI - -Linux, a differenza di altri sistemi operativi draconiani, non controlla le -quote di spazio. - -Non supportata l'opzione non documentata del BSD -.BR \-r . -Ci potrebbe essere richiesto da alcuni programmi di -.BR rlogind (8) . - -.SH AUTORE -Derivato dal BSD login 5.40 (5/9/89) da Michael Glad (glad@daimi.dk) per HP-UX -.br -Portato a Linux 0.12: Peter Orbaek (poe@daimi.aau.dk) diff --git a/man/it/newgrp.1 b/man/it/newgrp.1 deleted file mode 100644 index c7396e0b..00000000 --- a/man/it/newgrp.1 +++ /dev/null @@ -1,34 +0,0 @@ -.\" $Id: newgrp.1,v 1.1 2002/03/10 07:41:06 kloczek Exp $ -.\" Original author unknown. This man page is in the public domain. -.\" Modified Sat Oct 9 17:46:48 1993 by faith@cs.unc.edu -.\" -.\" Traduzione in italiano di Giovanni Bortolozzo -.\" Agosto 1996 -.\" -.\" " for hilit19 -.TH NEWGRP 1 "9 ottobre 1993" "Linux 1.2" "Linux Programmer's Manual" -.SH NOME -newgrp \- logga in un nuovo gruppo -.SH SINTASSI -.BI "newgrp [ " gruppo " ]" -.SH DESCRIZIONE -.B Newgrp -cambia l'identificatico del gruppo (GID) del suo chiamante, in modo analogo a -.BR login (1). -La stessa persona rimane loggata, e non cambiata la directory corrente, -ma i calcoli sui permessi d'accesso ai file sono fatti rispetto a nuovo -group ID. -.LP -Se non specificato alcun gruppo, il GID posto pari al GID di login. -.LP -.SH FILE -.I /etc/group -.br -.I /etc/passwd - -.SH "VEDERE ANCHE" -.BR login "(1), " group (5) - -.SH AUTORE -All'inizio era Michael Haardt. Attualmente mantenuto da -Peter Orbaek (poe@daimi.aau.dk). diff --git a/man/it/passwd.1 b/man/it/passwd.1 deleted file mode 100644 index cf02ca50..00000000 --- a/man/it/passwd.1 +++ /dev/null @@ -1,57 +0,0 @@ -.\" $Id: passwd.1,v 1.1 2002/03/10 07:41:06 kloczek Exp $ -.\" Copyright 1992 Rickard E. Faith (faith@cs.unc.edu) -.\" May be distributed under the GNU General Public License -.\" -.\" Traduzione in italiano di Giovanni Bortolozzo -.\" Agosto 1996 -.\" -.\" " for hilit19 -.TH PASSWD 1 "22 giugno 1994" "Linux 1.2" "Linux Programmer's Manual" -.SH NOME -passwd \- cambia la password -.SH SINTASSI -.BR "passwd [ " utente " [ " password " ] ]" -.SH DESCRIZIONE -Senza alcun argomento -.B passwd -cambier la password per l'attuale utente. Per prima cosa all'utente chiesta -la vecchia password, dopo di che, per evitare errori di battitura, va immessa -per due volte la nuova password. La nuova password deve essere lunga almeno -sei caratteri ed essere composta sia da maiuscole che da minuscole o da -caratteri non alfabetici. La nuova password non deve essere uguale alla -vecchia password, e non deve coincidere con il nome dell'utente. - -Le forme a uno e due argomenti possono essere usate solo dal superuser. Usando -la forma ad un argomento, il superuser pu cambiare la password per -quell'utente. Al superuser non chiesta la vecchia password, e non sono -applicate le regole per le password valide, poich il superuser potrebbe -avere valide ragioni per scegliere una password che non ne sia conforme. - -La forma a due argomenti assegna ad -.I utente -la password passata come secondo argomento. Ci pu essere utile quando -si deve assegnare a molti utenti una password iniziale. - -Passando una stringa vuota come secondo argomento si cancella la password -dell'utente. - -.SH FILE -.I /etc/passwd -.br -.I /etc/shells -.SH "VEDERE ANCHE" -.BR chsh (1), -.BR chfn (1) -.SH BACHI -Sono permesse password composte solo da numeri. -.br -Non viene prodotto nessun messaggio d'avviso se il superuser sceglie una -password ``scadente''. -.br -Le opzioni -.B \-f -e -.B \-s -non sono supportare. -.SH AUTORE -Peter Orbaek (poe@daimi.aau.dk) diff --git a/man/it/passwd.5 b/man/it/passwd.5 deleted file mode 100644 index b97aa538..00000000 --- a/man/it/passwd.5 +++ /dev/null @@ -1,136 +0,0 @@ -.\" $Id: passwd.5,v 1.1 2002/03/10 07:41:06 kloczek Exp $ -.\" Copyright (c) 1993 Michael Haardt (u31b3hs@pool.informatik.rwth-aachen.de) -.\" Fri Apr 2 11:32:09 MET DST 1993 -.\" -.\" Traduzione in italiano di Giovanni Bortolozzo -.\" Agosto 1996 -.\" -.\" This is free documentation; you can redistribute it and/or -.\" modify it under the terms of the GNU General Public License as -.\" published by the Free Software Foundation; either version 2 of -.\" the License, or (at your option) any later version. -.\" -.\" The GNU General Public License's references to "object code" -.\" and "executables" are to be interpreted as the output of any -.\" document formatting or typesetting system, including -.\" intermediate and printed output. -.\" -.\" This manual is distributed in the hope that it will be useful, -.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public -.\" License along with this manual; if not, write to the Free -.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, -.\" USA. -.\" -.\" Modified Sun Jul 25 10:46:28 1993 by Rik Faith (faith@cs.unc.edu) -.\" Modified Sun Aug 21 18:12:27 1994 by Rik Faith (faith@cs.unc.edu) -.\" Modified Sun Jun 18 01:53:57 1995 by Andries Brouwer (aeb@cwi.nl) -.\" Modified Mon Jan 5 20:24:40 MET 1998 by Michael Haardt -.\" (michael@cantor.informatik.rwth-aachen.de) -.TH PASSWD 5 "5 gennaio 1988" "Linux" "Linux Programmer's Manual" -.SH NOME -passwd \- file delle password -.SH DESCRIZIONE -.B Passwd - un file di testo che contiene un elenco degli account sul sistema, e -per ciascuno di questi riporta alcune informazioni utili come user ID, -group ID, home directory, ecc. Spesso contiene anche le password -criptate di ciascun account. Il file delle password dovrebbe avere -permessi di lettura per tutti (molte utility, come -.BR ls (1), -ne fanno uso per associare lo user ID allo user name), ma permesso di -scrittura solo per il superuser. -.PP -Nei buoni tempi andati, il permesso di lettura per tutti non era un -grosso problema: chiunque poteva leggere le password criptate, ma i -calcolatori erano troppo lenti per decifrare una password scelta -bene. Soprattutto, si supponeva di lavorare fra amici. Oggigiorno, -molti usano una qualche versione di shadow password (chiavi ombra), in -cui -.I /etc/passwd -contiene degli * al posto delle password criptate, che a loro volta -sono nel file \fI/etc/shadow\fP, che solo il superuser pu leggere. -.PP -Sia che si utilizzino o meno le shadow password, molti amministratori di -sistema usano un asterisco nel campo della password per far s che un -utente non possa autenticarsi con una password (vedi le note pi -sotto). -.PP -Se si crea una nuova login, si metta un asterisco nel campo della -password, e poi si usi il programma -.BR passwd (1) -per riempirlo. -.PP -C' una voce per riga, ed ogni riga ha il formato: -.sp -.RS -account:passwd:UID:GID:GECOS:directory:shell -.RE -.sp -Il significato dei campi il seguente: -.sp -.RS -.TP 1.0in -.I account -il nome dell'utente nel sistema. Non dovrebbe contenere maiuscole. -.TP -.I password -la password criptata o un asterisco. -.TP -.I UID -l'identificativo numerico dell'utente (UID = User IDentifier). -.TP -.I GID -l'identificativo numerico del gruppo principale per l'utente (GID = -Group IDentifier). -.TP -.I GECOS -Questo campo opzionale e viene usato solo per fornire -informazioni. Di solito contiene il nome per esteso dell'utente. GECOS -sta per General Electric Comprehensive Operating System, (sistema -operativo comprensivo della General Electric), ribattezzato GCOS -quando la divisione grandi sistemi della GE fu venduta alla -Honeywell. Dennis Ritchie rifer: 隹 volte dovevamo spedire una stampa -o un gruppo di lavori alla macchina GCOS. Il campo del gcos nel file -delle password era un posto in cui sbattere le informazioni per la -$IDENTcard. Per niente elegante. -.TP -.I directory -la $HOME directory dell'utente. -.TP -.I shell -il programma lanciato al login (se vuoto, viene usato -.BR /bin/sh ). -Se punta ad un programma che non esiste, l'utente non potr avere -accesso tramite -.BR login (1). -.RE -.SH NOTE -Se si vuole creare un gruppo di utenti, il loro GID deve -essere uguale e ci deve essere una voce nel file \fI/etc/group\fP, o il -gruppo non esister. -.PP -Se la password criptata un asterisco, l'utente non potr fare login -tramite -.BR login (1). -ma potr ugualmente accedere al suo account usando -.BR rlogin (1), -far girare processi esistenti o iniziarne nuovi con -.BR rsh (1), -.BR cron (1), -.BR at (1) -o filtri per la posta, ecc. Bloccare un account semplicemente -modificando il campo della shell ha lo stesso effetto e in pi -permette l'uso di -.BR su (1). -.SH FILE -.I /etc/passwd -.SH "VEDERE ANCHE" -.BR passwd (1), -.BR login (1), -.BR su (1), -.BR group (5), -.BR shadow (5) diff --git a/man/it/pwconv.8 b/man/it/pwconv.8 deleted file mode 100644 index a8edb920..00000000 --- a/man/it/pwconv.8 +++ /dev/null @@ -1,58 +0,0 @@ -.\" $Id: pwconv.8,v 1.1 2002/03/10 07:41:06 kloczek Exp $ -.\" Traduzione in italiano di Isabella Ruocco -.\" Giugno 1999 -.TH PWCONV 8 "26 sep 1997" -.SH NOME -pwconv, pwunconv, grpconv, grpunconv \- convertono a e da password e gruppi shadow. -.SH SINTASSI -.B pwconv -.br -.B pwunconv -.br -.B grpconv -.br -.B grpunconv -.SH DESCRIPTION -Questi quattro programmi agiscono tutti sui file normali e e oscurati (shadow) -delle password e dei gruppi: -.IR /etc/passwd ", " /etc/group ", " /etc/shadow ", e " /etc/gshadow . - -.B pwconv -.RI "crea " shadow " da " passwd " e, in modo opzionale, da un preesistente " shadow . -.B pwunconv -.RI "crea " passwd " da " passwd " e " shadow " e quindi rimuove " shadow . -.B grpconv -.RI "crea " gshadow " da " group " e, in modo opzionale, da un preesistente " gshadow . -.B grpunconv -.RI "crea " group " da " group " e " gshadow " e quindi rimuove " gshadow . - -Ciascun programma, prima della conversione, acquisisce i lock necessari. - -.BR pwconv " e " grpconv -sono simili. Per prima cosa vengono rimosse le voci nel file oscurato che non esistono -nel file principale. Quindi vengono aggiornate le voci oscurate che -non hanno `x' come password nel file principale. Vengono aggiunte le eventuali voci -oscurate mancanti. Infine, le password nel file principale vengono -sostituite con `x'. Questi programmi possono essere usati per le conversioni iniziali -cos come per aggiornare il file oscurato se il file principale viene editato -a mano. - -.B pwconv -user i valori di -.BR PASS_MIN_GIORNI ", " PASS_MAX_GIORNI ", e " PASS_GIORNI_PREAVVISO -da -.I /etc/login.defs -quando si aggiungono nuove voci a -.IR /etc/shadow . - -.RB "Analogamente, " pwunconv " e " grpunconv -sono simili. Le password nel file principale vengono aggiornate -dal file oscurato. Voci che esistono nel file principale ma non -nel file oscurato vengono lasciate stare. Infine, viene rimosso il file oscurato. - -Alcune informazioni sull'invecchiamento delle password vengono perse da -.BR pwunconv . -Questo convertir quello che potr. -.SH "VEDERE ANCHE" -.BR login.defs (5), -.BR shadowconfig (8) diff --git a/man/it/pwunconv.8 b/man/it/pwunconv.8 deleted file mode 100644 index 6eed9e8b..00000000 --- a/man/it/pwunconv.8 +++ /dev/null @@ -1 +0,0 @@ -.so man8/pwconv.8 diff --git a/man/it/shadow.5 b/man/it/shadow.5 deleted file mode 100644 index e8f22f8c..00000000 --- a/man/it/shadow.5 +++ /dev/null @@ -1,102 +0,0 @@ -.\" Copyright 1989 - 1990, Julianne Frances Haugh -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $Id: shadow.5,v 1.2 2003/04/26 13:24:13 kloczek Exp $ -.\" -.\" Traduzione in italiano di Isabella Ruocco -.\" Giugno 1999 -.\" -.TH SHADOW 5 -.SH NOME -shadow \- file crittato delle password -.SH DESCRIZIONE -.I shadow -contiene le informazioni sulle password crittate per gli account degli utenti -e, opzionalmente, informazioni sull'invecchiamento delle password. -E' incluso -.IP "" .5i -Nome di login -.IP "" .5i -Password crittata -.IP "" .5i -Giorni a partire dal 1 gennaio 1970 in cui la password stata cambiata l'ultima volta -.IP "" .5i -Giorni prima che la password possa essere modificata -.IP "" .5i -Giorni dopo i quali la password deve essere modificata -.IP "" .5i -Giorni prima della scadenza della password in cui l'utente viene avvertito -.IP "" .5i -Giorni dopo la scadenza della password in cui l'account viene disabilitato -.IP "" .5i -Giorni a partire dal 1 gennaio 1970 dopo i quali l'account viene disabilitato -.IP "" .5i -Campo riservato -.PP -Il campo password deve essere riempito. -La password crittata composta da un numero compreso tra 13 e 24 di caratteri dei -64 caratteri alfabetici -da a fino a z, da A a Z, da 0 a 9, \. e /. -Fate riferimento a \fBcrypt\fR(3) per dettagli riguardanti il modo in cui questa stringa -viene interpretata. -.PP -La data dell'ultima modifica della password specificata come il numero -di giorni dal 1 gennaio 1970. -La passowrd non pu essere modifcata nuovamente prima che sia passato -il numero di giorni previsto, e deve essere cambiata dopo il massimo numero -di giorni. -Se il minimo numero di giorni richiesto superiore del -massimo numero di giorni permesso, questa password non potr -essere modificata dall'utente. -.PP -Un account viene considerato inattivo e viene disabilitato se -la password non viene modificata entro il numero di giorni specificato -dopo la scadenza della password. -Un account sar anche disabilitato il giorno specificato -senza tener conto di altre informazioni sulla scadenza della password. -.PP -Questa informazione ha la precedenza nei confronti di qualunque informazione sulla password o sulla scadenza della password -presente in \fI/etc/passwd\fR. -.PP -Questo file non deve essere leggibile dagli utenti normali se si vuole mantenere -la sicurezza sulle password. -.SH FILE -\fI/etc/passwd\fR \- informazioni sull'account dell'utente -.br -\fI/etc/shadow\fR \- password crittate degli utenti -.SH VEDERE ANCHE -.BR chage (1), -.BR login (1), -.BR passwd (1), -.BR su (1), -.BR sulogin (8), -.BR shadow (3), -.BR passwd (5), -.BR pwconv (8), -.BR pwunconv (8) -.SH AUTORE -Julianne Frances Haugh (jfh@tab.com) diff --git a/man/it/useradd.8 b/man/it/useradd.8 deleted file mode 100644 index 4060af93..00000000 --- a/man/it/useradd.8 +++ /dev/null @@ -1,198 +0,0 @@ -.\" Copyright 1991 - 1994, Julianne Frances Haugh -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $Id: useradd.8,v 1.6 2004/12/12 20:23:58 kloczek Exp $ -.\" -.\" Traduzione in italiano a cura di Isabella Ruocco -.\" luglio 1999 -.\" -.TH USERADD 8 -.SH NOME -useradd \- Crea un nuovo utente o aggiorna le informazioni predefinite per -i nuovi utenti -.SH SINTASSI -.TP 8 -.B useradd -.\" .RB [ -A -.\" .RI { metodo | \fBPREDEFINITO\fR "},... ]" -.RB [ -c -.IR commento ] -.RB [ -d -.IR home_dir ] -.br -.RB [ -e -.IR data_scadenza ] -.RB [ -f -.IR tempo_inattivit ] -.br -.RB [ -g -.IR gruppo_iniziale ] -.RB [ -G -.IR gruppo [,...]] -.br -.RB [ -m " [" -k -.IR dir_scheletro ]] -.RB [ -s -.IR shell ] -.br -.RB [ -u -.IR uid " [" -.BR -o ]] -.I login -.TP 8 -.B useradd -\fB-D\fR -[\fB-g\fI gruppo_predefinito\fR] -[\fB-b\fI home_predefinita\fR] -.br -[\fB-f\fI inattivit趌predefinita\fR] -[\fB-e\fI data_scadenza_predefinita\fR] -.br -[\fB-s\fI shell_predefinita\fR] -.SH DESCRIZIONE -.SS Creare Nuovi Utenti -Quando viene invocato senza l'opzione \fB-D\fR, il comando \fBuseradd\fR -crea un nuovo account di utente usando i valori specificati sulla linea di -comando ed i valori predefiniti dal sistema. -Il nuovo account di utente verr aggiunto ai file di sistema che lo necessitano, -verr creata la home directory, e l verranno copiati i file iniziali, a seconda -delle opzioni sulla linea di comando. -.SH OPZIONI -Le opzioni che si applicano al comando \fBuseradd\fR sono: -.\" .IP "\fB-A {\fImetodo\fR|\fBPREDEFINITO\fR},..." -.\" Il valore del metodo di autenticazione dell'utente. -.\" Il metodo di autenticazione il nome di un programma che responsabile -.\" della validazione dell'identit dell'utente. -.\" La stringa \fBPREDEFINITO\fR pu essere usata per cambiare il metodo di -.\" autenticazione dell'utente con il metodo standard di sistema delle -.\" password. -.\" Questa una lista di nomi di programmi separati da virgole. -.\" Pu includere \fBPREDEFINITO\fR esattamente una volta. -.IP "\fB-c \fIcommento\fR" -Il campo commento del nuovo utente nel file password. -.IP "\fB-d \fIhome_dir\fR" -Il nuovo utente verr creato usando \fIhome_dir\fR come valore per la -directory di login dell'utente. -Il comportamento predefinito di appendere il nome \fIlogin\fR a -\fIhome_predefinita\fR ed usare quella come nome di directory di login. -.IP "\fB-e \fIdata_scadenza\fR" -La data in cui verr disabilitato l'account dell'utente. -La data specificata nel formato \fIMM/GG/AA\fR. -.IP "\fB-f \fIgiorni_inattivit赨fR" -Il numero di giorni dopo la scadenza della password fino a quando l'account -verr permanentemente disabilitato. -Un valore pari a 0 disabilita l'account non appena scaduta la password, -ed un valore pari a -1 disabilita questa caratteristica. -Il valore predefinito -1. -.IP "\fB-g \fIgruppo_iniziale\fR" -IL nome o numero del gruppo iniziale di login dell'utente. -Il nome del gruppo deve esistere. Un numero di gruppo deve fare riferimento -ad un gruppo gi esistente. -Il numero di gruppo predefinito 1. -.IP "\fB-G \fIgruppo,[...]\fR" -Una lista di gruppi supplementari di cui l'utente altres membro. -Ciascun gruppo separato dal successivo da una virgola, senza spazi -bianchi intermedi. -I gruppi sono soggetti alle stesse restrizioni del gruppo dato con -l'opzione \fB-g\fR. -Il comportamento predefinito che l'utente appartenga solo al gruppo -iniziale. -.IP \fB-m\fR -La home directory dell'utente verr creata se non esiste. -I file contenuti in \fIdir_scheletro\fR saranno copiati nella home directory -se viene usata l'opzione \fB-k\fR, altrimenti verranno usati i file -contenuti in \fI/etc/skel\fR. -Anche tutte le directory contenute in \fIdir_scheletro\fR o \fI/etc/skel\fR -verranno create nella home directory dell'utente. -L'opzione \fB-k\fR valida solo in congiunzione con l'opzione \fB-m\fR. -Il comportamento predefinito di non creare la directory e di non copiarvi -alcun file. -.IP "\fB-s \fIshell\fR" -Il nome della shell di login dell'utente. -Il comportamento predefinito di lasciare vuoto questo campo, che fa s che -il sistema selezioni la shell di connessione predefinita. -.IP "\fB-u \fIuid\fR" -Il valore numerico dell'ID dell'utente. -Questo valore deve essere univoco, a meno che non venga usata l'opzione -\fI-o\fR. -Il valore deve essere non-negativo. -Il comportamento predefinito di usare il minimo valore di ID superiore a 999 -e superiore a quello di ogni altro utente. -Valori tra 0 e 999 sono tipicamente riservati per account di sistema. -.SS Cambiare i valori predefiniti -Quando invocato con l'opzione \fB-D\fR, \fBuseradd\fR o mostrer i valori -predefiniti correnti, oppure aggiorner i valori predefiniti dalla linea -di comando. -Le opzioni valide sono -.IP "\fB-b \fIhome_predefinita\fR" -Il prefisso del percorso per la home directory del nuovo utente. -Il nome dell'utente verr aggiunto alla fine di \fIhome_predefinita\fR -per creare il nome della nuova directory se non viene usata l'opzione \fB-d\fI -quando si crea un nuovo account. -.IP "\fB-e \fIdata_scadenza_predefinita\fR" -La data in cui l'account dell'utente verr disabilitato. -.IP "\fB-f \fIinattivit趌predefinita\fR" -Il numero di giorni dopo la scadenza di una password prima che l'account -venga disabilitato. -.IP "\fB-g \fIgruppo_predefinito\fR" -Il nome o ID del gruppo iniziale per un nuovo utente. -Il gruppo nominato deve esistere, ed un ID numerico di gruppo deve avere una -voce esistente. -.IP "\fB-s \fIshell_predifinita\fR" -Il nome della shell di login per un nuovo utente. -Il programma nominato verr usato per tutti gli account dei futuri nuovi -utenti. -.PP -Se non specificata alcuna opzione, \fBuseradd\fR mostra i valori predefiniti -correnti. -.SH NOTE -L'amministratore di sistema responsabile del posizionamento dei file -predefiniti degli utenti nella directory \fI/etc/skel\fR. -.SH CAVEAT -Non possibile aggiungere un utente ad un gruppo NIS. -Questo deve essere fatto sul server NIS. -.SH FILE -\fI/etc/passwd\fR \- informazioni sugli account di utenti -.br -\fI/etc/shadow\fR \- informazioni sicure sugli account di utenti -.br -\fI/etc/group\fR \- informazioni sui gruppi -.br -\fI/etc/default/useradd\fR \- informazioni predefinite -.br -\fI/etc/skel/ \fR\- directory contenente i file predefiniti -.SH VEDERE ANCHE -.BR chfn (1), -.BR chsh (1), -.BR groupadd (8), -.BR groupdel (8), -.BR groupmod (8), -.BR passwd (1), -.BR userdel (8), -.BR usermod (8) -.SH AUTORE -Julianne Frances Haugh (jfh@tab.com) diff --git a/man/it/userdel.8 b/man/it/userdel.8 deleted file mode 100644 index 19ea1638..00000000 --- a/man/it/userdel.8 +++ /dev/null @@ -1,72 +0,0 @@ -.\" Copyright 1991 - 1994, Julianne Frances Haugh -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $Id: userdel.8,v 1.3 2003/04/28 06:09:52 kloczek Exp $ -.\" -.\" Traduzione in italiano a cura di Isabella Ruocco -.\" luglio 1999 -.\" -.TH USERDEL 8 -.SH NOME -userdel \- Rimuove l'account di un utente ed i file relativi -.SH SINTASSI -.B userdel -[\fB-r\fR] -.I login -.SH DESCRIZIONE -Il comando \fBuserdel\fR modifica i file di account del sistema, rimuovendo -tutte le voci che si riferiscono a \fIlogin\fR. -L'utente nominato deve esistere. -.IP \fB-r\fR -I file nella home directory dell'utente verranno rimossi insieme alla home -directory stessa. -I file collocati in altri file system dovranno essere ricercati e rimossi -manualmente. -.SH FILE -\fI/etc/passwd\fR \- informazioni sugli account di utenti -.br -\fI/etc/shadow\fR \- informazioni sicure sugli account di utenti -.br -\fI/etc/group\fR \- informazioni sui gruppi -.SH CAVEAT -\fBuserdel\fR non permetter di rimuovere alcun account se l'utente -attualmente connesso. -Occorre uccidere qualunque processo in esecuzione che appartenga ad un account -che si sta rimuovendo. -Non possibile rimuovere nessun attributo NIS su un client NIS. -Questo deve essere fatto sul server NIS. -.SH VEDERE ANCHE -.BR chfn (1), -.BR chsh (1), -.BR groupadd (8), -.BR groupdel (8), -.BR groupmod (8), -.BR passwd (1), -.BR useradd (8), -.BR usermod (8) -.SH AUTORE -Julianne Frances Haugh (jfh@tab.com) diff --git a/man/it/usermod.8 b/man/it/usermod.8 deleted file mode 100644 index 0977cccb..00000000 --- a/man/it/usermod.8 +++ /dev/null @@ -1,151 +0,0 @@ -.\" Copyright 1991 - 1994, Julianne Frances Haugh -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $Id: usermod.8,v 1.5 2004/11/04 03:06:32 kloczek Exp $ -.\" -.\" Traduzione in italiano a cura di Isabella Ruocco -.\" luglio 1999 -.\" -.TH USERMOD 8 -.SH NOME -usermod \- Modifica l'account di un utente -.SH SINTASSI -.TP 8 -.B usermod -.\" .RB [ -A -.\" .RI { metodo | \fBPREDEFINITO\fR "},... ]" -.RB [ -c -.IR commento ] -.RB [ -d -.IR home_dir " [" -.BR -m ]] -.br -.RB [ -e -.IR data_scadenza ] -.RB [ -f -.IR tempo_inattivit ] -.br -.RB [ -g -.IR gruppo_iniziale ] -.RB [ -G -.IR gruppo [,...]] -.br -.RB [ -l -.IR nome_login ] -.RB [ -s -.IR shell ] -.br -.RB [ -u -.IR uid " [" -.BR -o ]] -.I login -.SH DESCRIZIONE -Il comando \fBusermod\fR modifica i file di account di sistema in modo da -riflettere le modifiche specificate sulla linea di comando. -Le opzioni che si applicano al comando \fBusermod\fR sono -.\" .IP "\fB-A \fImetodo\fR|\fBPREDEFINITO\fR" -.\" Il nuovo valore del metodo di autenticazione dell'utente. -.\" Il metodo di autenticazione il nome di un programma che responsabile -.\" della validazione dell'identit dell'utente. -.\" La stringa \fBPREDEFINITO\fR pu essere usata per cambiare il metodo di -.\" autenticazione dell'utente con il metodo standard di sistema delle -.\" password. -.IP "\fB-c \fIcommento\fR" -Il campo commento del nuovo utente nel file password. -Normalmente viene modificato usando l'utilit \fBchfn\fR(1). -.IP "\fB-d \fIhome_dir\fR" -La nuova directory di login dell'utente. -Se data l'opzione \fB-m\fR il contenuto della home directory corrente -sar spostato nella nuova home directory, che viene creata se non esiste gi. -.IP "\fB-e \fIdata_scadenza\fR" -La data in cui l'account dell'utente verr disabilitato. -La data specificata nel formato \fIMM/GG/AA\fR. -.IP "\fB-f \fIgiorni_inattivit赨fR" -Il numero di giorni dopo la scadenza di una password prima che l'account -venga permanentemente disabilitato. -Un valore pari a 0 disabilita l'account non appena la password scaduta, -ed un valore pari a -1 disabilita la caratteristica. -Il valore predefinito -1. -.IP "\fB-g \fIgruppo_iniziale\fR" -Il nuome o numero del nuovo gruppo di connessione dell'utente. -Il nome del gruppo deve esistere. Un numero di gruppo deve riferirsi ad un -gruppo gi esistente. -Il numero di gruppo predefinito 1. -.IP "\fB-G \fIgruppo,[...]\fR" -Una lista di gruppi supplementari di cui l'utente altres membro. -Ciascun gruppo separato dal successivo da una virgola, senza spazi bianchi -intermedi. -I gruppi sono soggetti alle stesse restrizioni del gruppo dato con l'opzione -\fB-g\fR. -Se l'utente attualmente membro di un gruppo che non elencato, l'utente -verr rimosso dal gruppo. -.IP "\fB-l \fInome_login\fR" -Il nome dell'utente verr cambiato da \fIlogin\fR a \fInome_login\fR. -Niente altro viene cambiato. -In particolare, la home directory dell'utente dovrebbe probabilmente -essere modificata in modo da riflettere il nuovo nome di login. -.IP "\fB-s \fIshell\fR" -Il nome della nuova shell di login dell'utente. -Lasciando questo campo vuoto si fa in modo che il sistema selezioni la shell -di connessione predefinita. -.IP "\fB-u \fIuid\fR" -Il valore numerico dell'ID dell'utente. -Questo valore deve essere univoco, a meno che non venga usata l'opzione -\fI-o\fR. -Questo valore deve essere non-negativo. -Valori tra 0 e 999 sono tipicamente riservati ad account di sistema. -Tutti i file che l'utente possiede e che sono posiszionati nell'albero di -directory avente come radice la home directory dell'utente avranno l'ID utente del -file cambiato automaticamente. -I file fuori della home directory dell'utente devono essere modificati -manualmente. -.SH CAVEAT -\fBusermod\fR non permetter di modificare il nome di un utente che -attualmente connesso. -Occorre essere certi che l'utente nominato non sta eseguendo alcun processo -quando questo comando viene eseguito se l'ID numerico dell'utente sta per -essere cambiato. -Occorre cambiare il proprietario di ogni file crontab manualmente. -Occorre cambiare il proprietario di ogni job manualmente. -Occorre fare qualunque cambiamento che riguarda NIS sul server NIS. -.SH FILE -\fI/etc/passwd\fR \- informazioni sugli account di utenti -.br -\fI/etc/shadow\fR \- informazioni sicure sugli account di utenti -.br -\fI/etc/group\fR \- informazioni sui gruppi -.SH VEDERE ANCHE -.BR chfn (1), -.BR chsh (1), -.BR groupadd (8), -.BR groupdel (8), -.BR groupmod (8), -.BR passwd (1), -.BR useradd (8), -.BR userdel (8) -.SH AUTORE -Julianne Frances Haugh (jfh@tab.com) diff --git a/man/it/vigr.8 b/man/it/vigr.8 deleted file mode 100644 index ff72d7ae..00000000 --- a/man/it/vigr.8 +++ /dev/null @@ -1 +0,0 @@ -.so man8/vipw.8 diff --git a/man/it/vipw.8 b/man/it/vipw.8 deleted file mode 100644 index 8978019e..00000000 --- a/man/it/vipw.8 +++ /dev/null @@ -1,31 +0,0 @@ -.\" $Id: vipw.8,v 1.1 2002/03/10 07:41:07 kloczek Exp $ -.\" Traduzione in italiano di Isabella Ruocco -.\" Giugno 1999 -.TH VIPW 8 "26 sep 1997" -.SH NOME -vipw, vigr \- editano i file delle password, dei gruppi, delle password oscurate, o dei gruppi oscurati. -.SH SINTASSI -.BR vipw " [-s]" -.br -.BR vigr " [-s]" -.SH DESCRIZIONE -.BR vipw " e " vigr -editeranno i file -.IR /etc/passwd " ed " /etc/group ", rispettivamente." -Con l'opzione -.B -s -, editeranno la versione oscurata di quei file, -.IR /etc/shadow " ed " /etc/gshadow ", rispettivamente. -I programmi imposteranno i lock appropriati per evitare la corruzione dei file. - -Quando cercano un editor, i programmi prima proveranno -con la variabile d'ambiente -.BR VISUAL , -poi con la variabile d'ambiente -.BR EDITOR , -e infine con l'editor predefinito, -.BR vi . -.SH "VEDERE ANCHE" -.BR passwd (5), -.BR group (5), -.BR shadow (5) diff --git a/man/ja/Makefile.in b/man/ja/Makefile.in index 5dc5d7d8..84d69caa 100644 --- a/man/ja/Makefile.in +++ b/man/ja/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.4 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -89,17 +89,16 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ 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@ @@ -233,9 +232,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/ja/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/ja/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/ja/Makefile + $(AUTOMAKE) --foreign man/ja/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/man/ja/chage.1 b/man/ja/chage.1 index 25038561..ce3875fd 100644 --- a/man/ja/chage.1 +++ b/man/ja/chage.1 @@ -1,4 +1,4 @@ -.\"$Id: chage.1,v 1.4 2003/04/28 02:14:00 kloczek Exp $ +.\" $Id: chage.1,v 1.6 2005/04/05 19:08:55 kloczek Exp $ .\" Copyright 1990 - 1994 Julianne Frances Haugh .\" All rights reserved. .\" @@ -38,13 +38,13 @@ chage \- .SH 踏摯 .TP 6 \fBchage\fR -[\fB-m \fImindays\fR] [\fB-M \fImaxdays\fR] -[\fB-d \fIlastday\fR] [\fB-I \fIinactive\fR] +[\fB\-m\fR \fImindays\fR] [\fB\-M\fR \fImaxdays\fR] +[\fB\-d\fR \fIlastday\fR] [\fB\-I\fR \fIinactive\fR] .br -[\fB-E \fIexpiredate\fR] [\fB-W \fIwarndays\fR] \fIuser\fR +[\fB\-E\fR \fIexpiredate\fR] [\fB\-W\fR \fIwarndays\fR] \fIuser\fR .TP 6 \fBchage\fR -\fB-l \fIuser\fR +\fB\-l\fR \fIuser\fR .SH 濩抸 \fBchage\fR 反﹜ 由旦伐□玉毛瘉詨卞凳蕙仄化井日﹜ @@ -52,39 +52,39 @@ chage \- 扑旦氾丞反仇及樹扷毛迕中化﹜ 交□扒互中勾由旦伐□玉毛庍凳仄卅仃木壬卅日卅中井毛瑁爛允月﹝ \fBchage\fR 戊穴件玉毛銀尹月及反 root 交□扒及心卞蜃日木化中月﹝ -凶分仄域怚獢憧隊 \fB-l\fR 左皿扑亦件毛隙爛允木壬仇及戊穴件玉毛厙迕匹五﹜ +凶分仄域怚獢憧隊 \fB\-l\fR 左皿扑亦件毛隙爛允木壬仇及戊穴件玉毛厙迕匹五﹜ 憤坌及由旦伐□玉引凶反失市它件玄互中勾濠木月井毛襞月仇午互匹五月﹝ .PP -\fB-m\fR 左皿扑亦件毛隙爛仄凶樺寧﹜ +\fB\-m\fR 左皿扑亦件毛隙爛仄凶樺寧﹜ \fImindays\fR 及襖反由旦伐□玉庍凳及棉厥及瘉羶ゥ醒卞卅月﹝ 仇及白奴□伙玉毛未伕午仄凶凜反﹜交□扒反中勾匹手由旦伐□玉毛庍凳匹五月﹝ .PP -\fB-M\fR 左皿扑亦件毛隙爛允月午﹜ +\fB\-M\fR 左皿扑亦件毛隙爛允月午﹜ \fImaxdays\fR 及襖反由旦伐□玉互肣躲卅瘉贏ゥ醒午卅月﹝ \fImaxdays\fR 午 \fIlastday\fR 毛簫仄凶襖互蜇箕及ゥ尥方曰凝今中樺寧﹜ 交□扒反失市它件玄毛銀迕允月蟆卞由旦伐□玉毛庍凳仄卅仃木壬卅日卅中﹝ -\fB-W\fR 左皿扑亦件毛銀尹壬仇及渝ゥ互中勾侳月井互坌井月方丹卞匹五月﹝ +\fB\-W\fR 左皿扑亦件毛銀尹壬仇及渝ゥ互中勾侳月井互坌井月方丹卞匹五月﹝ 仇及樺寧反交□扒卞儀蟆卞煞屢互芨尹日木月﹝ .PP -\fB-d\fR 左皿扑亦件毛迕中月午﹜ +\fB\-d\fR 左皿扑亦件毛迕中月午﹜ 由旦伐□玉及瘉蔽凳蕙ゥ毛澀爛匹五月﹝ \fIlastday\fR 及襖反 1970 ヵ 1 畸 1 ゥ井日由旦伐□玉瘉蔽凳蕙ゥ引匹及ゥ醒匹丐月﹝ -ゥ尥反 YYYY-MM-DD 午中丹踏摯 +ゥ尥反 YYYY\-MM\-DD 午中丹踏摯 (手仄仁反丐卅凶及譁啗匹手勻午方仁迕中日木化中月踏摯) 匹隙爛允月儀手匹五月﹝ .PP -\fB-E\fR 左皿扑亦件反﹜ +\fB\-E\fR 左皿扑亦件反﹜ 公木動嫦交□扒互失市它件玄卞失弁本旦匹五卅仁卅月ゥ尥毛澀爛允月及卞迕中日木月﹝ \fIexpiredate\fR 反 1970 ヵ 1 畸 1 ゥ井日 失市它件玄互伕永弁今木月ゥ引匹及ゥ醒匹丐月﹝ -ゥ尥反 YYYY-MM-DD 午中丹踏摯 +ゥ尥反 YYYY\-MM\-DD 午中丹踏摯 (手仄仁反丐卅凶及譁啗匹手勻午方仁迕中日木化中月手及) 匹隙爛允月仇午手匹五月﹝ 失市它件玄毛伕永弁今木凶交□扒互瘋太公及扑旦氾丞毛銀丹卞反﹜ 扑旦氾丞棟咥樊午洘俀毛潸月优邰互丐月﹝ .PP -\fB-I\fR 左皿扑亦件反﹜ +\fB\-I\fR 左皿扑亦件反﹜ 由旦伐□玉及渝蜃互濠木化井日失市它件玄互伕永弁今木月引匹及 旵譆ゥ醒毛澀爛允月凶戶卞迕中月﹝ 失市它件玄毛伕永弁今木凶交□扒互瘋太公及扑旦氾丞毛銀丹凶戶卞反﹜ @@ -92,7 +92,7 @@ chage \- \fIinactive\fR 反銀迕尕Х渝棉及ゥ醒匹丐月﹝ 0 卞允木壬仇及窗Х毛拑躲卞匹五月﹝ .PP -\fB-W\fR 左皿扑亦件反﹜ +\fB\-W\fR 左皿扑亦件反﹜ 由旦伐□玉及庍凳互优邰午卅月蟆卞煞屢毛墊丹渝棉及ゥ醒毛澀爛允月凶戶卞迕中月﹝ \fIwarndays\fR 反﹜ 由旦伐□玉及渝蜃濠木卞燮分勻化﹜ diff --git a/man/ja/chfn.1 b/man/ja/chfn.1 index 6a285829..dde6414f 100644 --- a/man/ja/chfn.1 +++ b/man/ja/chfn.1 @@ -1,4 +1,4 @@ -.\"$Id: chfn.1,v 1.4 2003/04/28 02:14:00 kloczek Exp $ +.\" $Id: chfn.1,v 1.6 2005/04/05 19:08:55 kloczek Exp $ .\" Copyright 1990 - 1994 Julianne Frances Haugh .\" All rights reserved. .\" @@ -37,10 +37,9 @@ chfn \- 交□扒及頗抩支樹扷毛庍凳允月﹝ .SH 踏摯 .TP 5 -\fBchfn\fR -[\fB-f \fIfull_name\fR] [\fB-r \fIroom_no\fR] +\fBchfn\fR [\fB\-f\fR \fIfull_name\fR] [\fB\-r\fR \fIroom_no\fR] .br -[\fB-w \fIwork_ph\fR] [\fB-h \fIhome_ph\fR] [\fB-o \fIother\fR] +[\fB\-w\fR \fIwork_ph\fR] [\fB\-h\fR \fIhome_ph\fR] [\fB\-o\fR \fIother\fR] [\fIuser\fR] .SH 濩抸 \fBchfn\fR 反﹜交□扒及白伙生□丞’左白奴旦及朿盒砦獢汎熏砦獢 @@ -48,7 +47,7 @@ chfn \- 仇及樹扷反 \fBfinger\fR(1) 及方丹卅皿伕弘仿丞卞方勻化刓憎今木月﹝ 域怚獢憧隊牳封狩姪及失市它件玄樹扷及心毛庍凳匹五月﹝ 旦□由□交□扒反蟈化及失市它件玄卞覆仄化樹扷毛庍凳匹五月﹝ -引凶 \fB-o\fR 左皿扑亦件毛迕中化 +引凶 \fB\-o\fR 左皿扑亦件毛迕中化 GECOS 勂及怳爛聒朿坌毛庍凳匹五月及手旦□由□交□扒分仃匹丐月﹝ .PP 備白奴□伙玉卞踏仁ま芢卞楮允月孺蜃反﹜ diff --git a/man/ja/chpasswd.8 b/man/ja/chpasswd.8 index d5061a42..8d4bd985 100644 --- a/man/ja/chpasswd.8 +++ b/man/ja/chpasswd.8 @@ -1,4 +1,4 @@ -.\"$Id: chpasswd.8,v 1.4 2003/04/28 02:14:00 kloczek Exp $ +.\"$Id: chpasswd.8,v 1.5 2005/04/05 19:08:55 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -38,13 +38,13 @@ .SH 抩蟆 \fBchpasswd\fR \- 由旦伐□玉白央奶伙毛田永民質咥匹凳蕙允月 .SH 踏摯 -\fBchpasswd\fR [\fB-e\fR] +\fBchpasswd\fR [\fB\-e\fR] .SH 濩抸 \fBchpasswd\fR 戊穴件玉反 伓賞ェ恘井日交□扒抩午由旦伐□玉及賺互筏今木化中月白央奶伙毛づ心慇心﹜ 公及樹扷毛迕中化湃繡及交□扒歇及由旦伐□玉樹扷毛凳蕙允月﹝ --e 左皿扑亦件互卅中樺寧反﹜由旦伐□玉反尪妐午心卅今木月﹝ --e 左皿扑亦件互丐月樺寧反﹜由旦伐□玉反剪寞祭今木化中月午心卅今木月﹝ +\-e 左皿扑亦件互卅中樺寧反﹜由旦伐□玉反尪妐午心卅今木月﹝ +\-e 左皿扑亦件互丐月樺寧反﹜由旦伐□玉反剪寞祭今木化中月午心卅今木月﹝ 備墊及踏摯反慼及騷曰﹝ .sp 1 \fIuser_name\fR:\fIpassword\fR diff --git a/man/ja/chsh.1 b/man/ja/chsh.1 index e10f3159..fee0ba07 100644 --- a/man/ja/chsh.1 +++ b/man/ja/chsh.1 @@ -1,4 +1,4 @@ -.\"$Id: chsh.1,v 1.4 2003/04/28 02:14:00 kloczek Exp $ +.\"$Id: chsh.1,v 1.6 2005/04/05 19:08:55 kloczek Exp $ .\" Copyright 1990, Julianne Frances Haugh .\" All rights reserved. .\" @@ -38,7 +38,7 @@ chsh \- .SH 踏摯 .TP 5 \fBchsh\fR -[\fB-s \fIlogin_shell\fR] [\fIuser\fR] +[\fB\-s\fR \fIlogin_shell\fR] [\fIuser\fR] .SH 濩抸 \fBchsh\fR 反交□扒及伕弘奶件扑尼伙毛庍凳允月﹝ 仇木卞方勻化﹜交□扒互伕弘奶件仄化瘉賡卞撢墊今木月戊穴件玉互瑁引月﹝ @@ -55,7 +55,7 @@ chsh \- 貲勻化窗Х互孺蜃今木凶扑尼伙卞庍凳仄化仄引丹午﹜ 伕弘奶件扑尼伙毛葭及手及卞枑六卅仁卅勻化仄引丹井日匹丐月﹝ .PP -\fB-s\fR 左皿扑亦件毛隙爛仄卅井勻凶樺寧反﹜ +\fB\-s\fR 左皿扑亦件毛隙爛仄卅井勻凶樺寧反﹜ \fBchsh\fR 反覆狪讀卞が綜允月﹝ 交□扒及蜇箕及伕弘奶件扑尼伙毛刓憎仄﹜蕙仄中襖及ェ恘毛瞼允﹝ 澀爛襖毛庍凳允月卅日蕙仄中襖毛ェ恘仄﹜ diff --git a/man/ja/expiry.1 b/man/ja/expiry.1 index f450d377..bd84df6c 100644 --- a/man/ja/expiry.1 +++ b/man/ja/expiry.1 @@ -1,4 +1,4 @@ -.\"$Id: expiry.1,v 1.1 2003/04/28 02:14:00 kloczek Exp $ +.\" $Id: expiry.1,v 1.2 2005/04/05 19:08:55 kloczek Exp $ .\" Copyright 1990 - 1994 Julianne Frances Haugh .\" All rights reserved. .\" Modified for expiry by Ben Collins , 1999 @@ -36,11 +36,11 @@ expiry \- 由旦伐□玉及渝蜃濠木禾伉扑□及民尼永弁午撕墊 .SH 踏摯 .TP 6 -\fBexpiry\fR [\fB-c\fR] [\fB-f\fR] +\fBexpiry\fR [\fB\-c\fR] [\fB\-f\fR] .SH 濩抸 .B expiry -反蜇箕及由旦伐□玉渝蜃濠木樹扷毛民尼永弁 (\fB-c\fR) 仄﹜ -优邰卅樺寧反庍凳毛雄孺允月 (\fB-f\fR)﹝ +反蜇箕及由旦伐□玉渝蜃濠木樹扷毛民尼永弁 (\fB\-c\fR) 仄﹜ +优邰卅樺寧反庍凳毛雄孺允月 (\fB\-f\fR)﹝ 仇及戊穴件玉反騷橘及交□扒戊穴件玉午仄化裟太請仄第Х匹丐月﹝ .SH 白央奶伙 \fI/etc/passwd\fR \- 交□扒失市它件玄樹扷 diff --git a/man/ja/faillog.8 b/man/ja/faillog.8 index e3e4481b..f290e12f 100644 --- a/man/ja/faillog.8 +++ b/man/ja/faillog.8 @@ -1,5 +1,5 @@ -.\"$Id: faillog.8,v 1.6 2004/12/11 16:49:33 kloczek Exp $ -.\" Copyright 1989 - 1994, Julianne Frances Haugh +.\"$Id: faillog.8,v 1.7 2005/04/05 19:08:55 kloczek Exp $ +.\" Copyright 1989 \- 1994, Julianne Frances Haugh .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -37,8 +37,8 @@ .SH 抩蟆 faillog \- faillog 毛譬屯﹜login 撩л及孺蜃毛澀爛允月 .SH 踏摯 -\fBfaillog\fR [\fB-u\fR \fIlogin-name\fR] [\fB-a\fR] [\fB-t\fR \fIdays\fR] -[\fB-m\fR \fImax\fR] [\fB-pr\fR] +\fBfaillog\fR [\fB\-u\fR \fIlogin\-name\fR] [\fB\-a\fR] [\fB\-t\fR \fIdays\fR] +[\fB\-m\fR \fImax\fR] [\fB\-pr\fR] .SH 濩抸 \fBfaillog\fR 反伕弘奶件及撩л毛筏狤允月伕弘白央奶伙 \fI/var/log/faillog\fR 及ま芢毛幫溥仄﹜ @@ -46,48 +46,48 @@ faillog \- faillog \fBfaillog\fR 卞芨尹月婁醒及賜輛反褐邰匹丐曰﹜ 備婁醒反芨尹日木凶賜卞躂切卞質咥今木月﹝ .PP -\fB-p\fR 白仿弘毛隙爛允月午伕弘奶件撩л及巨件玄伉毛 UID 賜卞刓憎允月﹝ -\fB-u \fIlogin-name\fR 午ェ恘允月午﹜ -\fIlogin-name\fR 及伕弘奶件撩л筏狤及心毛刓憎允月﹝ -\fB-t \fIdays\fR 午ェ恘允月午﹜ +\fB\-p\fR 白仿弘毛隙爛允月午伕弘奶件撩л及巨件玄伉毛 UID 賜卞刓憎允月﹝ +\fB\-u \fIlogin\-name\fR 午ェ恘允月午﹜ +\fIlogin\-name\fR 及伕弘奶件撩л筏狤及心毛刓憎允月﹝ +\fB\-t \fIdays\fR 午ェ恘允月午﹜ 瘉嗤 \fIdays\fR ゥ動ま及伕弘奶件撩л及筏狤毛刓憎允月﹝ -\fB-u\fR 白仿弘毛隙爛允月午 \fB-t\fR 白仿弘反拑骰今木月﹝ +\fB\-u\fR 白仿弘毛隙爛允月午 \fB\-t\fR 白仿弘反拑骰今木月﹝ .\"nakano 午中丹及互撢端及が綜及方丹卅竣互允月及分仃升... -\fB-a\fR 白仿弘毛迕中月午蟈交□扒卞覆允月筏狤互刓憎今木月﹝ -仇及白仿弘毛 \fB-p\fR 白仿弘午午手卞迕中月午﹜ +\fB\-a\fR 白仿弘毛迕中月午蟈交□扒卞覆允月筏狤互刓憎今木月﹝ +仇及白仿弘毛 \fB\-p\fR 白仿弘午午手卞迕中月午﹜ 仇木引匹卞伕弘奶件卞撩л仄凶蟈化及交□扒互刓憎今木月﹝ -\fB-a\fR 反 \fB-r\fR 白仿弘午迕中化手啦怗互拑中﹝ +\fB\-a\fR 反 \fB\-r\fR 白仿弘午迕中化手啦怗互拑中﹝ .PP -\fB-r\fR 白仿弘反伕弘奶件撩л莢醒及筏狤毛伉本永玄允月﹝ +\fB\-r\fR 白仿弘反伕弘奶件撩л莢醒及筏狤毛伉本永玄允月﹝ 仇及左皿扑亦件毛迕中月卞反 \fI/var/log/faillog\fR 尺及踏五慇心腺蜃互优邰匹丐月﹝ -\fB-u \fIlogin-name\fR 午ェ恘允月午﹜ -\fIlogin-name\fR 及伕弘奶件撩л莢醒及心毛伉本永玄允月﹝ +\fB\-u \fIlogin\-name\fR 午ェ恘允月午﹜ +\fIlogin\-name\fR 及伕弘奶件撩л莢醒及心毛伉本永玄允月﹝ .PP -\fB-m\fR 白仿弘反﹜ +\fB\-m\fR 白仿弘反﹜ 失市它件玄互銀迕尕Х卞卅月引匹及瘉釐及伕弘奶件撩л莢醒毛澀爛允月﹝ 仇及左皿扑亦件毛迕中月卞反 \fI/var/log/faillog\fR 尺及踏五慇心腺蜃互优邰匹丐月﹝ -\fB-m \fImax\fR 午ェ恘允月午﹜ +\fB\-m \fImax\fR 午ェ恘允月午﹜ 蟈化及失市它件玄反伕弘奶件撩л莢醒互 \fImax\fR 卞卅月午銀迕尕Х卞卅月﹝ .\"nakano double meaning... -\fB-u \fIlogin-name\fR 毛き凜卞迕中月午﹜ -仇及窗Х毛 \fIlogin-name\fR 分仃卞綜迕今六月仇午互匹五月﹝ +\fB\-u \fIlogin\-name\fR 毛き凜卞迕中月午﹜ +仇及窗Х毛 \fIlogin\-name\fR 分仃卞綜迕今六月仇午互匹五月﹝ \fImax\fR 及襖毛 0 卞允月午伕弘奶件及撩л莢醒卞反孺蜃互拑仁卅月﹝ 扑旦氾丞卞覆允月扔□申旦尕Х僎猾毛侂什凶戶﹜ \fBroot\fR 及瘉釐伕弘奶件撩л莢醒反橘卞 0 卞仄化云仁屯五匹丐月﹝ .PP 左皿扑亦件反幻廿升及方丹卞賺心寧歹六化手恌中﹝ -\fB-p\fR, \fB-r\fR, \fB-m\fR +\fB\-p\fR, \fB\-r\fR, \fB\-m\fR 及備左皿扑亦件反﹜ -\fB-u\fR, \fB-t\fR 及隙爛卞方月膜懇毛熬仃﹜ +\fB\-u\fR, \fB\-t\fR 及隙爛卞方月膜懇毛熬仃﹜ 隙爛仄凶賜卞撢墊今木月﹝ .SH 煞屢 \fBfaillog\fR 反﹜ 瘉詨卞撩л仄化動嫦伕弘奶件卞嶽跦仄化中卅中交□扒及心毛刓憎允月﹝ 伕弘奶件卞撩л仄凶詨卞懇仄仁伕弘奶件匹五凶交□扒手刓憎今六月卞反﹜ -\fB-u\fR 白仿弘毛迕中化公及交□扒毛抸憎讀卞隙爛允月井﹜ -\fB-a\fR 白仿弘毛迕中化蟈交□扒毛刓憎今六卅仃木壬卅日卅中﹝ +\fB\-u\fR 白仿弘毛迕中化公及交□扒毛抸憎讀卞隙爛允月井﹜ +\fB\-a\fR 白仿弘毛迕中化蟈交□扒毛刓憎今六卅仃木壬卅日卅中﹝ .SH 白央奶伙 \fI/var/log/faillog\fR \- 撩л毛筏狤仄凶白央奶伙 .SH 楮洘嫩杴 diff --git a/man/ja/gpasswd.1 b/man/ja/gpasswd.1 index 32ba5554..99dba61a 100644 --- a/man/ja/gpasswd.1 +++ b/man/ja/gpasswd.1 @@ -1,4 +1,4 @@ -.\"$Id: gpasswd.1,v 1.4 2003/04/28 02:14:00 kloczek Exp $ +.\"$Id: gpasswd.1,v 1.6 2005/04/05 19:08:55 kloczek Exp $ .\" Copyright 1996, Rafal Maszkowski .\" All rights reserved. You can redistribute this man page and/or .\" modify it under the terms of the GNU General Public License as @@ -14,17 +14,17 @@ .SH 抩蟆 gpasswd \- /etc/group白央奶伙毛棟咥允月 .SH 踏摯 -\fBgpasswd \fIgroup\fR +\fBgpasswd\fR \fIgroup\fR .br -\fBgpasswd -a \fIuser\fR \fIgroup\fR +\fBgpasswd \-a\fR \fIuser\fR \fIgroup\fR .br -\fBgpasswd -d \fIuser\fR \fIgroup\fR +\fBgpasswd \-d\fR \fIuser\fR \fIgroup\fR .br -\fBgpasswd -R \fIgroup\fR +\fBgpasswd \-R\fR \fIgroup\fR .br -\fBgpasswd -r \fIgroup\fR +\fBgpasswd \-r\fR \fIgroup\fR .br -\fBgpasswd\fR [\fB-A \fIuser\fR,...] [\fB-M\fR \fIuser\fR,...] \fIgroup\fR +\fBgpasswd\fR [\fB\-A\fR \fIuser\fR,...] [\fB\-M\fR \fIuser\fR,...] \fIgroup\fR .SH 濩抸 .B gpasswd 反 /etc/group 白央奶伙 @@ -32,18 +32,18 @@ gpasswd \- /etc/group 及棟咥卞迕中日木月﹝ 備弘伙□皿卞反﹜棟咥樊’丟件田□’由旦伐□玉毛澀爛匹五月﹝ 扑旦氾丞棟咥樊反﹜ -\fB-A\fR 左皿扑亦件毛銀勻化弘伙□皿棟咥樊 (呁醒匹手第) 毛爛聒仄凶曰﹜ -\fB-M\fR 左皿扑亦件毛銀勻化丟件田□毛爛聒仄凶曰匹五﹜ +\fB\-A\fR 左皿扑亦件毛銀勻化弘伙□皿棟咥樊 (呁醒匹手第) 毛爛聒仄凶曰﹜ +\fB\-M\fR 左皿扑亦件毛銀勻化丟件田□毛爛聒仄凶曰匹五﹜ 備弘伙□皿及棟咥樊’丟件田□午き羈及た腺毛儅勾﹝ .PP -弘伙□皿棟咥樊反﹜\fB-a\fR 左皿扑亦件毛迕中化交□扒毛馨笛仄凶曰﹜ -\fB-d\fR 左皿扑亦件毛迕中化交□扒毛綽輪仄凶曰匹五月﹝ -棟咥樊反 \fB-r\fR 左皿扑亦件毛迕中化弘伙□皿由旦伐□玉毛綽輪匹五月﹝ +弘伙□皿棟咥樊反﹜\fB\-a\fR 左皿扑亦件毛迕中化交□扒毛馨笛仄凶曰﹜ +\fB\-d\fR 左皿扑亦件毛迕中化交□扒毛綽輪仄凶曰匹五月﹝ +棟咥樊反 \fB\-r\fR 左皿扑亦件毛迕中化弘伙□皿由旦伐□玉毛綽輪匹五月﹝ 由旦伐□玉互澀爛今木化中卅中凜反﹜ 弘伙□皿及丟件田□及心互 .BR newgrp (1) 毛迕中化弘伙□皿及域夠卞卅木月﹝ -左皿扑亦件 \fB-R\fR 毛隙爛允月午﹜ +左皿扑亦件 \fB\-R\fR 毛隙爛允月午﹜ .BR newgrp (1) 戊穴件玉毛迕中凶弘伙□皿尺及失弁本旦反匹五卅仁卅月﹝ .PP diff --git a/man/ja/groupadd.8 b/man/ja/groupadd.8 index 6abed016..5ea0ca07 100644 --- a/man/ja/groupadd.8 +++ b/man/ja/groupadd.8 @@ -1,4 +1,4 @@ -.\"$Id: groupadd.8,v 1.9 2004/11/04 03:06:32 kloczek Exp $ +.\"$Id: groupadd.8,v 1.11 2005/04/05 19:08:55 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -36,16 +36,16 @@ .SH 抩蟆 groupadd \- 蕙仄中弘伙□皿毛綜嶽允月 .SH 踏摯 -\fBgroupadd\fR [\fB-g\fI gid \fR[\fB-o\fR]] [\fB-f\fR] \fIgroup\fR +\fBgroupadd\fR [\fB\-g\fR \fIgid \fR[\fB\-o\fR]] [\fB\-f\fR] \fIgroup\fR .SH 濩抸 \fBgroupadd\fR 戊穴件玉反﹜ 戊穴件玉仿奶件曉匹隙爛今木凶襖午 扑旦氾丞及犯白巧伙玄襖午毛迕中化蕙仄中弘伙□皿毛綜嶽允月﹝ 蕙仄中弘伙□皿互优邰卞殺元化扑旦氾丞白央奶伙卞筏ェ今木月﹝ \fBgroupadd\fR 戊穴件玉卞隙爛匹五月左皿扑亦件反慼及騷曰﹝ -.IP "\fB-g \fIgid\fR" +.IP "\fB\-g \fIgid\fR" 蕙筋弘伙□皿及 ID 砦獢 -仇及襖反﹜\fB-o\fR 左皿扑亦件毛迕中月樺寧毛輪五﹜職午褐呁仄化反卅日卅中﹝ +仇及襖反﹜\fB\-o\fR 左皿扑亦件毛迕中月樺寧毛輪五﹜職午褐呁仄化反卅日卅中﹝ 引凶鯠橨秅リ吨惜鴗苳吨擗吨丑 犯白巧伙玄匹反﹜99 云方太職及丐日斗月湃繡弘伙□皿及 ID 方曰手釐五中﹜ 瘉凝及醒襖午卅月﹝ diff --git a/man/ja/groupmod.8 b/man/ja/groupmod.8 index c8df6b29..160de3c8 100644 --- a/man/ja/groupmod.8 +++ b/man/ja/groupmod.8 @@ -1,4 +1,4 @@ -.\"$Id: groupmod.8,v 1.8 2004/11/04 03:06:32 kloczek Exp $ +.\"$Id: groupmod.8,v 1.10 2005/04/05 19:08:55 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -36,22 +36,22 @@ .SH 抩蟆 groupmod \- 弘伙□皿毛膜懇允月 .SH 踏摯 -\fBgroupmod\fR [\fB-g\fI gid \fR[\fB-o\fR]] [\fB-n\fI group_name \fR] +\fBgroupmod\fR [\fB\-g\fR \fIgid\fR [\fB\-o\fR]] [\fB\-n\fR \fIgroup_name\fR] \fIgroup\fR .SH 濩抸 \fBgroupmod\fR 戊穴件玉反﹜ 戊穴件玉仿奶件井日及隙爛卞方勻化﹜ 扑旦氾丞失市它件玄白央奶伙毛膜懇允月﹝ \fIgroupmod\fR 戊穴件玉卞隙爛匹五月左皿扑亦件反慼及騷曰﹝ -.IP "\fB-g \fIgid\fR" +.IP "\fB\-g \fIgid\fR" 庍凳毛熬仃月弘伙□皿及 ID 砦獢 -仇及襖反﹜\fB-o\fR 左皿扑亦件毛迕中月樺寧毛輪五﹜職午褐呁仄化反卅日卅中﹝ +仇及襖反﹜\fB\-o\fR 左皿扑亦件毛迕中月樺寧毛輪五﹜職午褐呁仄化反卅日卅中﹝ 引凶鯠橨秅リ吨砟々洃吨擗吨丑 犯白巧伙玄反﹜999 云方太職及丐日斗月湃繡弘伙□皿及 ID 方曰手釐五中﹜ 瘉凝及醒襖午卅月﹝ 庍凳蟆及弘伙□皿 ID 毛儅勾蟈化及白央奶伙反﹜ 澎綜僅匹蕙仄中弘伙□皿 ID 尺午庍凳仄卅仃木壬卅日卅中﹝ -.IP "\fB-n \fIgroup_name\fR" +.IP "\fB\-n \fIgroup_name\fR" 弘伙□皿及抩蟆互 \fIgroup\fR 井日 \fIgroup_name\fR 卞庍凳今木月﹝ .SH 白央奶伙 \fI/etc/group\fR \- 弘伙□皿樹扷 diff --git a/man/ja/groups.1 b/man/ja/groups.1 index 8efe7e67..6a34285a 100644 --- a/man/ja/groups.1 +++ b/man/ja/groups.1 @@ -1,4 +1,4 @@ -.\"$Id: groups.1,v 1.4 2003/04/28 02:14:00 kloczek Exp $ +.\"$Id: groups.1,v 1.5 2005/04/05 19:08:55 kloczek Exp $ .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -29,7 +29,7 @@ .\" Japanese Version Copyright (c) 2001 Maki KURODA .\" all right reserved, .\" Translated Tue Oct 30 11:58:18 JST 2001 -.\" by Maki KURODA +.\" by Maki KURODA .\" Modified Tue 16 Sep 2002 by NAKANO Takeo .\" .\"WORD: concurrent group set き凜赭簞弘伙□皿螂寧 diff --git a/man/ja/grpck.8 b/man/ja/grpck.8 index 45dd41f1..2a57bea5 100644 --- a/man/ja/grpck.8 +++ b/man/ja/grpck.8 @@ -1,4 +1,4 @@ -.\"$Id: grpck.8,v 1.5 2003/04/28 02:14:00 kloczek Exp $ +.\"$Id: grpck.8,v 1.6 2005/04/05 19:08:55 kloczek Exp $ .\" Copyright 1992 - 1993, Julianne Frances Haugh .\" All rights reserved. .\" @@ -36,7 +36,7 @@ .SH 抩蟆 grpck \- 弘伙□皿白央奶伙互懇仄中井升丹井腹犖允月 .SH 踏摯 -\fBgrpck\fR [\fB-r\fR] [\fIgroup\fR \fIshadow\fR] +\fBgrpck\fR [\fB\-r\fR] [\fIgroup\fR \fIshadow\fR] .SH 濩抸 \fBgrpck\fR 戊穴件玉反扑旦氾丞及ロ據樹扷互懇仄中井升丹井腹犖允月﹝ \fI/etc/group\fR 午 \fI/etc/gshadow\fR @@ -49,12 +49,12 @@ grpck \- 備★及巨件玄伉卞覆仄化 .sp .in +.5i -- 白奴□伙玉及醒互懇仄中井 +\- 白奴□伙玉及醒互懇仄中井 .br -- 弘伙□皿抩卞褐呁互卅中井 +\- 弘伙□皿抩卞褐呁互卅中井 .br -- 丟件田□及伉旦玄午棟咥樊及伉旦玄互懇仄中井 -.in -.5i +\- 丟件田□及伉旦玄午棟咥樊及伉旦玄互懇仄中井 +.in \-.5i .sp 互民尼永弁今木月﹝ .P @@ -77,7 +77,7 @@ grpck \- \fI/etc/gshadow\fR 卞覆仄化が綜允月﹝ \fIgroup\fR 由仿丟□正午 \fIshadow\fR 由仿丟□正毛迕中化﹜ 帎及白央奶伙毛薊鎗允月仇午手匹五月﹝ -今日卞 \fB-r\fR 白仿弘毛隙爛允木壬﹜ +今日卞 \fB\-r\fR 白仿弘毛隙爛允木壬﹜ 伉□玉左件伉□乒□玉匹戊穴件玉毛撢墊允月仇午手匹五月﹝ 仇及樺寧﹜庍凳毛墊丹井升丹井反交□扒尺杽中寧歹今木內﹜ 憤が讀卞 \fBno\fR 午莢蠶今木月﹝ @@ -85,14 +85,14 @@ grpck \- 反 \fI/etc/group\fR 午 \fI/etc/gshadow\fR 及巨件玄伉毛 GID 匹末□玄允月仇午手匹五月﹝ -末□玄乒□玉匹が綜今六月卞反 \fB-s\fR 白仿弘毛芨尹月﹝ +末□玄乒□玉匹が綜今六月卞反 \fB\-s\fR 白仿弘毛芨尹月﹝ 仇及樺寧民尼永弁反墊歹木內﹜簽卞末□玄允月分仃匹丐月﹝ .SH 白央奶伙 -\fI/etc/group\fR \ - 弘伙□皿失市它件玄樹扷 +\fI/etc/group\fR \ \- 弘伙□皿失市它件玄樹扷 .br \fI/etc/gshadow\fR \- 剪寞祭今木凶由旦伐□玉午弘伙□皿棟咥樊樹扷 .br -\fI/etc/passwd\fR \ - 交□扒□樹扷 +\fI/etc/passwd\fR \ \- 交□扒□樹扷 .SH 楮洘嫩杴 .BR group (5), .BR passwd (5), diff --git a/man/ja/id.1 b/man/ja/id.1 index 37956fa3..804c5eb1 100644 --- a/man/ja/id.1 +++ b/man/ja/id.1 @@ -1,4 +1,4 @@ -.\"$Id: id.1,v 1.5 2003/04/28 02:14:00 kloczek Exp $ +.\"$Id: id.1,v 1.6 2005/04/05 19:08:55 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -36,7 +36,7 @@ .SH 抩蟆 id \- 蜇箕及交□扒 ID 抩午弘伙□皿 ID 抩毛刓憎允月 .SH 踏摯 -\fBid\fR [\fB-a\fR] +\fBid\fR [\fB\-a\fR] .SH 濩抸 \fBid\fR反﹜蜇箕及撢交□扒 ID﹜撢躲交□扒 ID﹜撢弘伙□皿 ID﹜ 撢躲弘伙□皿 ID 及抩蟆引凶反襖毛刓憎允月﹝ @@ -44,11 +44,11 @@ id \- \fI/etc/group\fR 卞繡箕仄卅中樺寧反﹜ 覆殺允月抩蟆反刓憎今木內卞襖分仃互刓憎今木月﹝ 交□扒互き凜卞呁醒及弘伙□皿及丟件田□卞卅木月扑旦氾丞匹反﹜ -\fB-a\fR 左皿扑亦件毛隙爛允月午弘伙□皿及螂寧互刓憎今木月﹝ +\fB\-a\fR 左皿扑亦件毛隙爛允月午弘伙□皿及螂寧互刓憎今木月﹝ .SH 白央奶伙 \fI/etc/passwd\fR \- 交□扒□失市它件玄樹扷 .br -\fI/etc/group\fR \ - 弘伙□皿樹扷 +\fI/etc/group\fR \ \- 弘伙□皿樹扷 .SH 楮洘嫩杴 .BR getgid (2), .BR getgroups (2), diff --git a/man/ja/lastlog.8 b/man/ja/lastlog.8 index 18159625..5d05b4e2 100644 --- a/man/ja/lastlog.8 +++ b/man/ja/lastlog.8 @@ -1,4 +1,4 @@ -.\"$Id: lastlog.8,v 1.8 2003/04/28 06:38:54 kloczek Exp $ +.\"$Id: lastlog.8,v 1.9 2005/04/05 19:08:55 kloczek Exp $ .\" Copyright 1992, Phillip Street and Julianne Frances Haugh .\" All rights reserved. .\" @@ -41,8 +41,8 @@ lastlog \- lastlog 白央奶伙毛譬屯月 .SH 踏摯 .TP 8 -\fBlastlog\fR [(\fB-u\fR|\fB--user\fR) \fIlogin\fR] -[(\fB-t\fR|\fB--time\fR) \fIdays\fR] [(\fB-h\fR|\fB--help\fR)] +\fBlastlog\fR [(\fB\-u\fR|\fB\-\-user\fR) \fIlogin\fR] +[(\fB\-t\fR|\fB\-\-time\fR) \fIdays\fR] [(\fB\-h\fR|\fB\-\-help\fR)] .SH 濩抸 \fBlastlog\fR 反瘉蔽伕弘奶件及筏狤白央奶伙 \fI/var/log/lastlog\fR 及ま芢毛幫溥仄化刓憎允月﹝ @@ -50,16 +50,16 @@ lastlog \- lastlog 左皿扑亦件毛隙爛仄卅井勻凶樺寧﹜犯白巧伙玄匹反 lastlog 巨件玄伉毛 UID 及醒襖匹末□玄仄化刓憎允月﹝ .TP -\fB-u\fR, \fB--user\fR \fIlogin-name\fR -\fIlogin-name\fR 及筏狤分仃毛刓憎允月﹝ +\fB\-u\fR, \fB\-\-user\fR \fIlogin\-name\fR +\fIlogin\-name\fR 及筏狤分仃毛刓憎允月﹝ .TP -\fB-t\fR, \fB--time\fR \fIdays\fR +\fB\-t\fR, \fB\-\-time\fR \fIdays\fR 瘉嗤 \fIdays\fR ゥ動ま及瘉蔽伕弘奶件毛刓憎允月﹝ .TP -\fB-h\fR, \fB--help\fR +\fB\-h\fR, \fB\-\-help\fR 左件仿奶件目伙皿毛刓憎仄化蔽弇允月﹝ .PP -\fB-u\fR 白仿弘毛迕中月午 \fB-t\fR 反拑骰今木月﹝ +\fB\-u\fR 白仿弘毛迕中月午 \fB\-t\fR 反拑骰今木月﹝ .\"nakano 午中丹及互撢端及が綜及方丹卞葦尹月及分互﹝ .PP 域蘸手伕弘奶件仄化中卅中交□扒卞覆仄化反﹜ @@ -72,7 +72,7 @@ lastlog UID 砦璊侁蝷迨岓穭茪洶═諵﹜ lastlog 皿伕弘仿丞反贏凜棉脰昍卞窒手請恘仄卅中引引 撢墊毛糧仃月 (拺尹壬 mmdf 互 800 匹瘉詨及 UID 互 170 及樺寧﹜ -UID 互 171-799 及棉皿伕弘仿丞反窒手請恘仄卅中及匹﹜ +UID 互 171\-799 及棉皿伕弘仿丞反窒手請恘仄卅中及匹﹜ 甩件弘仄凶方丹卞葦尹月)﹝ .SH 難樊 Julianne Frances Haugh (jockgrrl@ix.netcom.com) diff --git a/man/ja/limits.5 b/man/ja/limits.5 index c0e8e179..496e34ff 100644 --- a/man/ja/limits.5 +++ b/man/ja/limits.5 @@ -1,4 +1,4 @@ -.\"$Id: limits.5,v 1.3 2003/04/28 02:14:00 kloczek Exp $ +.\"$Id: limits.5,v 1.4 2005/04/05 19:08:55 kloczek Exp $ .\" .\" Japanese Version Copyright (c) 2001 Maki KURODA .\" all right reserved, @@ -72,7 +72,7 @@ login 瘉詨及手及互犯白巧伙玄隙爛午仄化銀迕今木月﹝ .PP 丐月交□扒尺及孺蜃毛敦蟈卞拑躲卞允月卞反﹜ -扑件弘伙母永扑亙 "\fB-\fP" 毛銀迕允月﹝ +扑件弘伙母永扑亙 "\fB\-\fP" 毛銀迕允月﹝ .PP 今日卞﹜蟈化及孺蜃及澀爛反＞伕弘奶件簽匏＝匹澀爛今木化中月仇午卞鏜啦允月仇午﹝ 孺蜃反弘伕□田伙匹反卅仁﹜捩糧讀匹手卅中﹝ diff --git a/man/ja/login.1 b/man/ja/login.1 index 63738929..767b515c 100644 --- a/man/ja/login.1 +++ b/man/ja/login.1 @@ -1,4 +1,4 @@ -.\"$Id: login.1,v 1.6 2003/04/28 02:14:00 kloczek Exp $ +.\" $Id: login.1,v 1.9 2005/04/06 15:00:47 kloczek Exp $ .\" Copyright 1989 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,24 +25,15 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.\" -.\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka -.\" all rights reserved. -.\" Translated Fri Feb 14 23:06:00 JST 1997 -.\" by Kazuyoshi Furutaka -.\" Updated Fri Jan 12 04:05:44 JST 2001 -.\" by Kentaro Shirakata -.\" Modified Tue 16 Sep 2002 by NAKANO Takeo -.\" .TH LOGIN 1 .SH 抩蟆 login \- 扑旦氾丞曉匹本永扑亦件毛釩仁 .SH 踏摯 -\fBlogin\fR [\fB-p\fR] [\fIusername\fR] [\fIENV=VAR\fR ...] +\fBlogin\fR [\fB\-p\fR] [\fIusername\fR] [\fIENV=VAR\fR ...] .br -\fBlogin\fR [\fB-p\fR] [\fB-h \fIhost\fR] [\fB-f \fIusername\fR] +\fBlogin\fR [\fB\-p\fR] [\fB\-h\fR \fIhost\fR] [\fB\-f\fR \fIusername\fR] .br -\fBlogin\fR [\fB-p\fR] \fB-r \fIhost\fR +\fBlogin\fR [\fB\-p\fR] \fB\-r\fR \fIhost\fR .SH 濩抸 .B login 反扑旦氾丞卞蕙凶卞本永扑亦件毛釩仁凶戶卞迕中日木月﹝ @@ -59,16 +50,6 @@ login \- 伕弘奶件扑尼伙動陸井日 \fBlogin\fR 毛粟が仄方丹午允月午﹜ 巨仿□丟永本□斥互刓憎今木月﹝ .PP -\fIlogin:\fR皿伕件皿玄井日粟が仄凶端反﹜ -交□扒抩卞糧中化棕雁庍醒毛ェ恘允月儀手匹五月﹝ -公木日毛ェ恘允月樺寧反 \fBNAME=VALUE\fR 午中丹踏摯匹墊丹﹝ -仇及杅芊匹蟈化及庍醒毛澀爛匹五月歹仃匹反卅中﹝ -拺尹壬 -\fBPATH\fR, \fBHOME\fR, \fBSHELL\fR -卅升反澀爛匹五卅中﹝ -今日卞伕弘奶件扑尼伙互 \fB/bin/sh\fR 及樺寧反 -\fBIFS\fR 手澀爛手匹五卅中﹝ -.PP 慼中匹﹜优邰卅樺寧卞反﹜交□扒反由旦伐□玉毛ェ恘允月方丹瞼今木月﹝ 由旦伐□玉毛刓憎仄化仄引歹卅中方丹﹜巨戊□反墊歹木卅中﹝ 醒莢動曉由旦伐□玉ェ恘卞撩л允月午 @@ -111,19 +92,19 @@ GECOS 交□扒互撢端卞伕弘奶件允月蕙仄中白央奶伙扑旦氾丞及伙□玄午仄化健歹木月﹝ .SH 左皿扑亦件 .TP -.B -p +.B \-p 棕雁毛忡繡允月﹝ .TP -.B -f +.B \-f 交□扒反允匹卞ロ據今木化中月手及午仄化﹜ロ據が綜毛墊卅歹卅中﹝ .TP -.B -h +.B \-h 仇及伕弘奶件及伉乒□玄石旦玄及抩蟆﹝ .TP -.B -r +.B \-r rlogin 及憤が伕弘奶件皿伕玄戊伙毛撢墊允月﹝ .PP -\fB-r\fP, \fB-h\fP, \fB-f\fP 左皿扑亦件反﹜ +\fB\-r\fP, \fB\-h\fP, \fB\-f\fP 左皿扑亦件反﹜ root 互 \fBlogin\fP 毛粟が仄凶樺寧卞及心迕中月﹝ .SH 煞屢 仇及リ \fBlogin\fR 卞反聶仁及戊件由奶伙凜左皿扑亦件互丐月互﹜ @@ -131,21 +112,21 @@ root .PP 扑旦氾丞澀爛及啜中卞方勻化曉筏白央奶伙及譆五樺赭反庍歹月﹝ .SH 白央奶伙 -\fI/var/log/utmp\fR \ - 蜇箕及伕弘奶件本永扑亦件及伉旦玄 +\fI/var/log/utmp\fR \- 蜇箕及伕弘奶件本永扑亦件及伉旦玄 .br -\fI/var/run/wtmp\fR \ - 聊蛔及伕弘奶件本永扑亦件及伉旦玄 +\fI/var/run/wtmp\fR \- 聊蛔及伕弘奶件本永扑亦件及伉旦玄 .br -\fI/etc/passwd\fR \ - 交□扒失市它件玄樹扷 +\fI/etc/passwd\fR \- 交□扒失市它件玄樹扷 .br -\fI/etc/shadow\fR \ - 剪寞祭由旦伐□玉午肣躲渝蜃樹扷 +\fI/etc/shadow\fR \- 剪寞祭由旦伐□玉午肣躲渝蜃樹扷 .br -\fI/etc/motd\fR \ - 扑旦氾丞丟永本□斥白央奶伙 +\fI/etc/motd\fR \- 扑旦氾丞丟永本□斥白央奶伙 .br -\fI/etc/nologin\fR \ - root 動陸及交□扒及伕弘奶件毛嗟鞅允月 +\fI/etc/nologin\fR \- root 動陸及交□扒及伕弘奶件毛嗟鞅允月 .br -\fI/etc/ttytype\fR \ - 羹坱及滇及伉旦玄 +\fI/etc/ttytype\fR \- 羹坱及滇及伉旦玄 .br -\fI$HOME/.hushlogin\fR \- 扑旦氾丞丟永本□斥及刓憎毛俅孺允月 +\fI$HOME/.hushlogin\fR \- 扑旦氾丞丟永本□斥及刓憎毛俅孺允月 .SH 楮洘嫩杴 .BR mail (1), .BR passwd (1), diff --git a/man/ja/login.access.5 b/man/ja/login.access.5 index 2d97167c..88b247bc 100644 --- a/man/ja/login.access.5 +++ b/man/ja/login.access.5 @@ -1,4 +1,4 @@ -.\"$Id: login.access.5,v 1.4 2003/04/28 02:14:00 kloczek Exp $ +.\"$Id: login.access.5,v 1.5 2005/04/05 19:08:55 kloczek Exp $ .\" this is comment .\" .\" This page is originally in the shadow package. @@ -31,7 +31,7 @@ login.access \- .IR permission : users : origins .sp 1 瘉賡及白奴□伙玉反 "\fB+\fR" (失弁本旦毛袱第允月) 井 -"\fB-\fR" (失弁本旦毛蛐搕馱) 匹卅仃木壬卅日卅中﹝ +"\fB\-\fR" (失弁本旦毛蛐搕馱) 匹卅仃木壬卅日卅中﹝ わ筇雂峊掍ㄐ憧諝氻洁１鴗襤尨憭峊磳陞丰鯦黎銗陞諢憧訞鴃 手仄仁反 .B ALL diff --git a/man/ja/login.defs.5 b/man/ja/login.defs.5 index 01f5e123..7ded674d 100644 --- a/man/ja/login.defs.5 +++ b/man/ja/login.defs.5 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: login.defs.5,v 1.5 2003/04/28 02:14:00 kloczek Exp $ +.\" $Id: login.defs.5,v 1.6 2005/04/05 19:08:55 kloczek Exp $ .\" .\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka .\" all rights reserved. @@ -100,7 +100,7 @@ chfn .IP "CREATE_HOME (皮□伙襖)" useradd 互﹜犯白巧伙玄匹交□扒及石□丞犯奴伊弁玄伉毛 綜嶽允月井升丹井毛爛聒允月﹝ -仇及左皿扑亦件反 useradd 及戊穴件玉仿奶件及 -m 白仿弘午 OR 今木月﹝ +仇及左皿扑亦件反 useradd 及戊穴件玉仿奶件及 \-m 白仿弘午 OR 今木月﹝ .\" .IP "GID_MAX (醒襖)" .IP "GID_MIN (醒襖)" @@ -118,11 +118,11 @@ useradd .IP "PASS_MAX_DAYS (醒襖)" 域勾及由旦伐□玉毛銀尹月瘉贏ゥ醒﹝ 由旦伐□玉互仇及ゥ醒方曰手衙中樺寧反﹜庍凳允月方丹雄孺今木月﹝ -隙爛今木化中卅中樺寧反 -1 午卅月 (仇及孺蜃窗Х毛拑躲卞允月)﹝ +隙爛今木化中卅中樺寧反 \-1 午卅月 (仇及孺蜃窗Х毛拑躲卞允月)﹝ .IP "PASS_MIN_DAYS (醒襖)" 由旦伐□玉毛庍凳仄化井日慼卞庍凳匹五月方丹卞卅月引匹及瘉羶ゥ醒﹝ 仇及ゥ醒互煩凶卅中丹切卞由旦伐□玉毛庍凳仄方丹午仄化手蛐搕竣鴗諢 -隙爛今木化中卅中樺寧反 -1 午卅月 (仇及孺蜃窗Х毛拑躲卞允月)﹝ +隙爛今木化中卅中樺寧反 \-1 午卅月 (仇及孺蜃窗Х毛拑躲卞允月)﹝ .IP "PASS_WARN_AGE (醒襖)" 由旦伐□玉及肣躲渝蜃互侳月蟆卞煞屢毛砟馱賵棉及ゥ醒﹝ 未伕卞仄化云仁午﹜渝蜃濠木及癲ゥ卞及心煞屢毛墊中﹜ diff --git a/man/ja/mkpasswd.8 b/man/ja/mkpasswd.8 index 3eeda4c5..b393b263 100644 --- a/man/ja/mkpasswd.8 +++ b/man/ja/mkpasswd.8 @@ -1,4 +1,4 @@ -.\"$Id: mkpasswd.8,v 1.5 2003/04/28 02:14:00 kloczek Exp $ +.\"$Id: mkpasswd.8,v 1.6 2005/04/05 19:08:55 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -36,7 +36,7 @@ .SH 抩蟆 mkpasswd \- passwd 午 group 及犯□正矛□旦白央奶伙毛凳蕙允月 .SH 踏摯 -\fBmkpasswd\fR [\fB-fvgps\fR] \fIfile\fR +\fBmkpasswd\fR [\fB\-fvgps\fR] \fIfile\fR .SH 濩抸 .B mkpasswd 反白仿弘匹芨尹日木凶踏摯卞仄凶互勻化白央奶伙毛づ心慇心﹜ @@ -46,25 +46,25 @@ mkpasswd \- passwd 請恘白央奶伙及抩蟆反 \fIfile\fR.dir 云方太 \fIfile\fR.pag午卅月﹝ .PP -\fB-f\fR 左皿扑亦件毛隙爛允月午﹜ +\fB\-f\fR 左皿扑亦件毛隙爛允月午﹜ \fBmkpasswd\fR 反請恘白央奶伙互繡箕仄化中化手拑骰仄化曉踏五允月﹝ 騷橘反﹜請恘白央奶伙互湃卞繡箕允月需及煞屢毛砟楔す肥誘馱諢 .PP -\fB-v\fR 左皿扑亦件毛隙爛允月午﹜ +\fB\-v\fR 左皿扑亦件毛隙爛允月午﹜ \fBmkpasswd\fR 反庍晶毛墊卅丹咍卞備伊戊□玉及樹扷毛請恘仄﹜ 瘉詨卞蔽弇丟永本□斥毛刓憎允月﹝ .PP -\fB-g\fR 左皿扑亦件毛隙爛允月午﹜ +\fB\-g\fR 左皿扑亦件毛隙爛允月午﹜ ェ恘白央奶伙互 \fI/etc/group\fR 白央奶伙及踏摯匹丐月午心卅仄化質咥毛墊卅丹﹝ -\fB-s\fR 左皿扑亦件午き凜卞迕中凶樺寧反﹜ +\fB\-s\fR 左皿扑亦件午き凜卞迕中凶樺寧反﹜ \fI/etc/gshadow\fR 白央奶伙及踏摯互迕中日木月﹝ .PP -\fB-p\fR 左皿扑亦件毛隙爛允月午﹜ +\fB\-p\fR 左皿扑亦件毛隙爛允月午﹜ ェ恘白央奶伙互 \fB/etc/passwd\fR 白央奶伙及踏摯匹丐月午心卅仄化質咥毛墊丹﹝ 仇木互犯白巧伙玄及が綜匹丐月﹝ -\fB-s\fR 左皿扑亦件午き凜卞迕中凶樺寧反﹜ +\fB\-s\fR 左皿扑亦件午き凜卞迕中凶樺寧反﹜ \fI/etc/shadow\fR 白央奶伙及踏摯互迕中日木月﹝ .SH 煞屢 呁醒及犯□正矛□旦白央奶伙毛銀尹月及反﹜ @@ -75,11 +75,11 @@ NDBM 仇及戊穴件玉互优邰卞卅月及反﹜犯□正矛□旦毛綽輪仄化仄引勻凶樺寧支﹜ 犯□正矛□旦互莽木凶樺寧卅升卞﹜瘋戲嶽允月午五分仃匹丐月﹝ .SH 白央奶伙 -\fI/etc/passwd\fR \ - 交□扒失市它件玄樹扷 +\fI/etc/passwd\fR \ \- 交□扒失市它件玄樹扷 .br -\fI/etc/shadow\fR \ - shadow 祭今木凶交□扒樹扷 +\fI/etc/shadow\fR \ \- shadow 祭今木凶交□扒樹扷 .br -\fI/etc/group\fR \ - 弘伙□皿樹扷 +\fI/etc/group\fR \ \- 弘伙□皿樹扷 .br \fI/etc/gshadow\fR \- shadow 祭今木凶弘伙□皿樹扷 .SH 楮洘嫩杴 diff --git a/man/ja/newgrp.1 b/man/ja/newgrp.1 index 96310eb7..f4c3e0ea 100644 --- a/man/ja/newgrp.1 +++ b/man/ja/newgrp.1 @@ -1,4 +1,4 @@ -.\"$Id: newgrp.1,v 1.5 2003/04/28 02:14:00 kloczek Exp $ +.\"$Id: newgrp.1,v 1.7 2005/04/12 18:08:47 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -39,9 +39,9 @@ newgrp \- .br sg \- 帎及弘伙□皿 ID 匹戊穴件玉毛撢墊允月 .SH 踏摯 -\fBnewgrp\fR [\fB-\fR] [\fIgroup\fR] +\fBnewgrp\fR [\fB\-\fR] [\fIgroup\fR] .br -\fBsg\fR [\fB-\fR] [\fIgroup\fR [[\fB-c\fR] \fIcommand\fR]] +\fBsg\fR [\fB\-\fR] [\fIgroup\fR [[\fB\-c\fR] \fIcommand\fR]] .SH 濩抸 .B newgrp 反伕弘奶件本永扑亦件醱卞蜇箕及弘伙□皿 ID 毛庍凳允月凶戶卞迕中日木月﹝ @@ -66,7 +66,7 @@ sg \- 戊穴件玉反 .B newgrp 午き迋卞が綜允月互﹜戊穴件玉毛熬仃尥仃月﹝ -仇及戊穴件玉反 Bourne 扑尼伙匹撢墊今木月﹝ +仇及戊穴件玉反 \fB/bin/sh\fR 扑尼伙匹撢墊今木月﹝ 戊穴件玉互呁醒及簽賄井日卅月樺寧反﹜ sg 及撢墊葭午卅月匹丐欠丹扑尼伙及幻午氏升卞云中化﹜ 仇木日毛弁巧□玄允月优邰互丐月分欠丹﹝ @@ -81,9 +81,9 @@ sg .B sg 戊穴件玉井日枑勻凶端卞反動蟆及弘伙□皿 ID 卞枑月﹝ .SH 白央奶伙 -\fI/etc/passwd\fR \- 交□扒失市它件玄樹扷 +\fI/etc/passwd\fR \- 交□扒失市它件玄樹扷 .br -\fI/etc/group\fR \ - 弘伙□皿樹扷 +\fI/etc/group\fR \- 弘伙□皿樹扷 .SH 楮洘嫩杴 .BR id (1), .BR login (1), diff --git a/man/ja/passwd.1 b/man/ja/passwd.1 index 97b1b6b7..cde1a3cb 100644 --- a/man/ja/passwd.1 +++ b/man/ja/passwd.1 @@ -1,4 +1,4 @@ -.\"$Id: passwd.1,v 1.5 2003/04/28 02:14:00 kloczek Exp $ +.\" $Id: passwd.1,v 1.8 2005/04/13 10:02:27 kloczek Exp $ .\" Copyright 1989 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -37,14 +37,14 @@ .SH 抩蟆 passwd \- 交□扒由旦伐□玉毛庍凳允月 .SH 踏摯 -\fBpasswd\fR [\fB-f\fR|\fB-s\fR] [\fIname\fR] +\fBpasswd\fR [\fB\-f\fR|\fB\-s\fR] [\fIname\fR] .br -\fBpasswd\fR [\fB-g\fR] [\fB-r\fR|\fB-R\fR] \fIgroup\fR +\fBpasswd\fR [\fB\-g\fR] [\fB\-r\fR|\fB\-R\fR] \fIgroup\fR .br -\fBpasswd\fR [\fB-x \fImax\fR] [\fB-n \fImin\fR] -[\fB-w \fIwarn\fR] [\fB-i \fIinact\fR] \fIlogin\fR +\fBpasswd\fR [\fB\-x\fR \fImax\fR] [\fB\-n\fR \fImin\fR] +[\fB\-w\fR \fIwarn\fR] [\fB\-i\fR \fIinact\fR] \fIlogin\fR .br -\fBpasswd\fR {\fB-l\fR|\fB-u\fR|\fB-d\fR|\fB-S\fR|\fB-e\fR} \fIlogin\fR +\fBpasswd\fR {\fB\-l\fR|\fB\-u\fR|\fB\-d\fR|\fB\-S\fR|\fB\-e\fR} \fIlogin\fR .SH 濩抸 \fBpasswd\fR 反交□扒失市它件玄’弘伙□皿失市它件玄及由旦伐□玉毛庍凳允月﹝ 域怚獢憧隊牳封洶峊╞咱戎韞及由旦伐□玉仄井庍凳匹五卅中﹝ @@ -54,11 +54,11 @@ passwd \- 由旦伐□玉及渝蜃濠木及ゥ尥’ 肣躲渝棉午中勻凶失市它件玄樹扷毛庍凳允月仇午手匹五月﹝ .PP -.B -s +.B \-s 左皿扑亦件毛隙爛允月午 .BR passwd " 反 " chsh 毛裟太請仄化交□扒及扑尼伙毛庍凳允月﹝ -.B -f +.B \-f 左皿扑亦件毛隙爛允月午 .BR passwd " 反 " chfn 毛裟太請仄化交□扒及 GECOS 樹扷毛庍凳允月﹝ @@ -100,50 +100,50 @@ kill 妐 由旦伐□玉庍凳互熬仃ェ木日木月凶戶卞反﹜ 仇及徆樊互寧譙仄卅仁化反卅日卅中﹝ .SS 弘伙□皿由旦伐□玉 -\fB-g\fR 左皿扑亦件毛迕中凶樺寧﹜ +\fB\-g\fR 左皿扑亦件毛迕中凶樺寧﹜ 隙爛仄凶弘伙□皿及由旦伐□玉互庍凳今木月﹝ 仇及左皿扑亦件反旦□由□交□扒井隙爛仄凶弘伙□皿及棟咥樊仄井銀尹卅中﹝ 蜇箕及弘伙□皿由旦伐□玉反諜友化仇卅中﹝ -\fB-g\fR 左皿扑亦件毛 \fB-r\fR 左皿扑亦件午午手卞迕中月午﹜ +\fB\-g\fR 左皿扑亦件毛 \fB\-r\fR 左皿扑亦件午午手卞迕中月午﹜ 隙爛仄凶弘伙□皿及由旦伐□玉互綽輪今木月﹝ 仇丹允月午蟈化及丟件田□互仇及弘伙□皿卞失弁本旦匹五月方丹卞卅月﹝ -\fB-R\fR 左皿扑亦件毛 \fB-g\fR 左皿扑亦件午午手卞迕中月午﹜ +\fB\-R\fR 左皿扑亦件毛 \fB\-g\fR 左皿扑亦件午午手卞迕中月午﹜ 蟈化及交□扒卞覆仄化隙爛仄凶弘伙□皿尺及失弁本旦毛嗟鞅匹五月﹝ .SS 由旦伐□玉及肣躲渝蜃樹扷 旦□由□交□扒反﹜由旦伐□玉及肣躲渝蜃卞楮允月樹扷毛庍凳匹五月﹝ -仇木卞反 \fB-x\fR, \fB-n\fR, \fB-w\fR, \fB-i\fR 卅升及左皿扑亦件毛迕中月﹝ -\fB-x\fR 左皿扑亦件反由旦伐□玉互肣躲卅瘉贏ゥ醒毛澀爛允月及卞迕中日木月﹝ +仇木卞反 \fB\-x\fR, \fB\-n\fR, \fB\-w\fR, \fB\-i\fR 卅升及左皿扑亦件毛迕中月﹝ +\fB\-x\fR 左皿扑亦件反由旦伐□玉互肣躲卅瘉贏ゥ醒毛澀爛允月及卞迕中日木月﹝ \fImax\fR ゥ互聊亢月午由旦伐□玉毛庍凳允月方丹卞菲戶日木月﹝ -\fB-n\fR 左皿扑亦件反由旦伐□玉互庍凳第Х午卅月引匹及 +\fB\-n\fR 左皿扑亦件反由旦伐□玉互庍凳第Х午卅月引匹及 瘉羶ゥ醒毛澀爛允月及卞迕中日木月﹝ 交□扒反 \fImin\fR ゥ互煩聊仄凶詨匹卅中午由旦伐□玉毛庍凳匹五卅中﹝ -\fB-w\fR 左皿扑亦件反由旦伐□玉及銀迕渝蜃互侳月蟆卞 +\fB\-w\fR 左皿扑亦件反由旦伐□玉及銀迕渝蜃互侳月蟆卞 窒ゥ棉煞屢毛芨尹月井毛澀爛允月凶戶卞迕中日木月﹝ 渝蜃濠木及 \fIwarn\fR ゥ蟆井日鏜啦互釩銨今木﹜ 由旦伐□玉互渝蜃濠木卞卅月引匹丐午窒ゥ酸勻化中月井互憎今木月﹝ -\fB-i\fR 左皿扑亦件反﹜ +\fB\-i\fR 左皿扑亦件反﹜ 由旦伐□玉及渝蜃互濠木化井日窒ゥ棉煩聊仄凶日﹜ 公及失市它件玄毛銀迕尕Х及橇謫卞允月井毛澀爛允月及卞迕中月﹝ \fIinact\fR ゥ棉失市它件玄毛由旦伐□玉渝蜃濠木橇謫及引引卞允月午﹜ 交□扒反公及失市它件玄卞ェ木卅仁卅月﹝ .PP 丐月失市它件玄及由旦伐□玉毛躂切卞渝蜃濠木卞仄凶中樺寧反﹜ -\fB-e\fR 左皿扑亦件毛迕中木壬方中﹝ +\fB\-e\fR 左皿扑亦件毛迕中木壬方中﹝ 允月午公及交□扒反慼卞伕弘奶件允月端卞由旦伐□玉毛庍凳允月方丹雄孺今木月﹝ -\fB-d\fR 左皿扑亦件毛銀勻化﹜交□扒及由旦伐□玉毛綽輪允月仇午手匹五月 +\fB\-d\fR 左皿扑亦件毛銀勻化﹜交□扒及由旦伐□玉毛綽輪允月仇午手匹五月 (由旦伐□玉互塢卞卅月)﹝仇及左皿扑亦件反鏜啦仄化銀丹仇午﹝ 仇木毛銀丹午﹜公及失市它件玄反伕弘奶件卞由旦伐□玉毛蟈仁优邰午仄卅仁卅曰﹜ 扑旦氾丞互膳ェ樊卞覆仄化左□皿件卞卅勻化仄引丹﹝ .SS 失市它件玄及忡潮 -\fB-l\fR 白仿弘午 \fB-u\fR 白仿弘毛迕中月午﹜ +\fB\-l\fR 白仿弘午 \fB\-u\fR 白仿弘毛迕中月午﹜ 交□扒失市它件玄毛伕永弁仄凶曰﹜公及伕永弁毛陸仄凶曰匹五月﹝ -\fB-l\fR 左皿扑亦件毛迕中月午﹜ +\fB\-l\fR 左皿扑亦件毛迕中月午﹜ 由旦伐□玉白奴□伙玉及襖反剪寞祭今木凶ョ窒卅月襖午手穴永民仄卅仁卅曰﹜ 失市它件玄反銀迕尕Х卞卅月﹝ -\fB-u\fR 左皿扑亦件毛迕中月午﹜由旦伐□玉反動蟆及襖卞枑曰﹜ +\fB\-u\fR 左皿扑亦件毛迕中月午﹜由旦伐□玉反動蟆及襖卞枑曰﹜ 失市它件玄互瘋太銀迕第Х午卅月﹝ .PP -\fB-S\fR 左皿扑亦件毛迕中月午失市它件玄及橇謫互刓憎今木月﹝ +\fB\-S\fR 左皿扑亦件毛迕中月午失市它件玄及橇謫互刓憎今木月﹝ 失市它件玄及橇謫及樹扷反 6 勾及朿坌井日卅月﹝ 瘉賡及朿坌反﹜失市它件玄卞伕永弁互井仃日木化中月 (L)﹜ 由旦伐□玉互繡箕仄卅中 (NP)﹜ @@ -153,7 +153,7 @@ kill 妐 銀迕尕Х渝棉匹丐月﹝ .SS 交□扒由旦伐□玉卞覆允月甲件玄 由旦伐□玉及兜蟈嶺反剪寞祭失伙打伉朮丞及雄恘今午平□塢棉及釐五今卞匙繡允月﹝ -\fB\s-2UNIX\s+2\fR 及扑旦氾丞剪寞祭及杅芊反 +\fB\s\-2UNIX\s+2\fR 及扑旦氾丞剪寞祭及杅芊反 NBS DES 失伙打伉朮丞卞湘勿中化云曰﹜騞鴾阭臏替迨牲滮丑 平□塢棉及釐五今反薊壬木凶由旦伐□玉及仿件母丞今卞匙繡允月﹝ .PP @@ -211,6 +211,7 @@ NIS \fI/etc/shadow\fR \- 剪寞祭今木凶交□扒由旦伐□玉 .SH 楮洘嫩杴 .BR group (5), -.BR passwd (5) +.BR passwd (5), +.BR shadow (5) .SH 難樊 Julianne Frances Haugh diff --git a/man/ja/porttime.5 b/man/ja/porttime.5 index 50204e09..0b26b293 100644 --- a/man/ja/porttime.5 +++ b/man/ja/porttime.5 @@ -1,4 +1,4 @@ -.\"$Id: porttime.5,v 1.4 2003/04/28 02:14:00 kloczek Exp $ +.\" $Id: porttime.5,v 1.5 2005/04/05 19:08:55 kloczek Exp $ .\" Copyright 1989 - 1990, Julianne Frances Haugh .\" All rights reserved. .\" @@ -59,7 +59,7 @@ porttime \- 蟈化及禾□玄井日失弁本旦第Х匹丐月仇午毛憎允﹝ .br .sp 1 - *:jfh:Wk0900-1700 + *:jfh:Wk0900\-1700 .br .sp 1 慼及巨件玄伉反﹜ @@ -72,7 +72,7 @@ porttime \- 仄凶互勻化 console 井日及失弁本旦反袱第今木卅中﹝ .br .sp 1 - console:root,oper:Al0000-2400 + console:root,oper:Al0000\-2400 .br console:*: .br @@ -82,7 +82,7 @@ porttime \- 丐日斗月禾□玄井日失弁本旦匹五月方丹卞隙爛仄化中月﹝ .br .sp 1 - *:games:Wk1700-0900,SaSu0000-2400 + *:games:Wk1700\-0900,SaSu0000\-2400 .br .sp 1 .SH 白央奶伙 diff --git a/man/ja/pw_auth.3 b/man/ja/pw_auth.3 index e7de1aa0..10e42e6b 100644 --- a/man/ja/pw_auth.3 +++ b/man/ja/pw_auth.3 @@ -1,4 +1,4 @@ -.\"$Id: pw_auth.3,v 1.4 2003/04/28 02:14:00 kloczek Exp $ +.\" $Id: pw_auth.3,v 1.5 2005/04/05 19:08:55 kloczek Exp $ .\" Copyright 1992 - 1993, Julianne Frances Haugh .\" All rights reserved. .\" @@ -74,33 +74,33 @@ pwauth \- .IP \fBPW_SU\fR 1i 隙爛今木凶交□扒及撢交□扒 ID 卞濠曰贅尹方丹午仄化中月﹜ 蜇箕及撢交□扒 ID 卞覆仄化ロ據毛墊丹﹝ -\fB-s\fR 左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ +\fB\-s\fR 左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ .IP \fBPW_LOGIN\fR 1i 蕙凶卞伕弘奶件本永扑亦件毛綜曰請公丹午仄化中月 隙爛今木凶交□扒毛ロ據允月﹝ -\fB-l\fR 左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ +\fB\-l\fR 左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ .IP \fBPW_ADD\fR 1i 隙爛今木凶交□扒卞覆仄化蕙凶卅巨件玄伉毛綜月﹝ 仇木卞方曰﹜ロ據皿伕弘仿丞反蕙筋交□扒迕及筏盛恄啗毛賞髐リ迨諢 -\fB-a\fR 左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ +\fB\-a\fR 左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ .IP \fBPW_CHANGE\fR 1i 隙爛今木凶交□扒及湃繡及巨件玄伉毛庍凳允月﹝ 仇木卞方曰﹜ロ據皿伕弘仿丞反湃繡及交□扒及ロ據樹扷毛庍凳匹五月﹝ -\fB-c\fR 左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ +\fB\-c\fR 左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ .IP \fBPW_DELETE\fR 1i 隙爛今木凶交□扒及ロ據樹扷毛壅蛔允月﹝ 仇木卞方曰﹜ロ據皿伕弘仿丞反漆詨ロ據允月仇午互拑仁卅勻凶 交□扒迕及筏盛恄啗毛瘋厙迕匹五月﹝ -\fB-d\fR 左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ +\fB\-d\fR 左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ .IP \fBPW_TELNET\fR 1i \fBtelnet\fR 戊穴件玉毛迕中化扑旦氾丞卞濤糧仄化侳凶交□扒及ロ據毛墊丹﹝ -\fB-t\fR 左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ +\fB\-t\fR 左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ .IP \fBPW_RLOGIN\fR 1i \fBrlogin\fR 戊穴件玉毛迕中化扑旦氾丞卞濤糧仄化侳凶交□扒及ロ據毛墊丹﹝ -\fB-r\fR 左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ +\fB\-r\fR 左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ .IP \fBPW_FTP\fR 1i \fBftp\fR 戊穴件玉毛迕中化扑旦氾丞卞濤糧仄化侳凶交□扒及ロ據毛墊丹﹝ -\fB-f\fR 左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ +\fB\-f\fR 左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ 伓賞及白央奶伙犯奴旦弁伉皿正毛迕中化交□扒午騷耨允月仇午反匹五卅中﹝ 伓賞及ェ恘白央奶伙犯奴旦弁伉皿正反褪皿伕本旦卞濤糧今木化云曰﹜ 職及わ勾及請恘白央奶伙犯奴旦弁伉皿正反 \fI/dev/null\fR 卞濤糧今木化中月﹝ @@ -108,7 +108,7 @@ pwauth \- 毛迕中化域墊及犯□正毛ロ據皿伕弘仿丞卞由奶皿允月﹝ .IP \fBPW_REXEC\fR 1i \fIrexec\fR 戊穴件玉毛迕中化扑旦氾丞卞濤糧仄化侳凶交□扒及ロ據毛墊丹﹝ -\fB-x\fR 左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ +\fB\-x\fR 左皿扑亦件及詨卞交□扒抩毛隙爛仄化ロ據皿伕弘仿丞互裟太請今木月﹝ 伓賞及白央奶伙犯奴旦弁伉皿正毛迕中化交□扒午騷耨允月仇午反匹五卅中﹝ 伓賞及ェ恘白央奶伙犯奴旦弁伉皿正反褪皿伕本旦卞濤糧今木化云曰﹜ 職及わ勾及請恘白央奶伙犯奴旦弁伉皿正反 \fI/dev/null\fR 卞濤糧今木化中月﹝ diff --git a/man/ja/pwck.8 b/man/ja/pwck.8 index ebc4f5d1..0dd3194d 100644 --- a/man/ja/pwck.8 +++ b/man/ja/pwck.8 @@ -1,4 +1,4 @@ -.\"$Id: pwck.8,v 1.5 2003/04/28 02:14:00 kloczek Exp $ +.\"$Id: pwck.8,v 1.6 2005/04/05 19:08:55 kloczek Exp $ .\" Copyright 1992, Julianne Frances Haugh .\" All rights reserved. .\" @@ -37,7 +37,7 @@ .SH 抩蟆 pwck \- 由旦伐□玉白央奶伙互懇仄中井升丹井腹犖允月 .SH 踏摯 -\fBpwck\fR [\fB-sr\fR] [\fIpasswd\fR \fIshadow\fR] +\fBpwck\fR [\fB\-sr\fR] [\fIpasswd\fR \fIshadow\fR] .SH 濩抸 \fBpwck\fR 戊穴件玉反扑旦氾丞及ロ據樹扷互懇仄中井升丹井腹犖允月﹝ \fI/etc/passwd\fR 午 \fI/etc/shadow\fR @@ -50,18 +50,18 @@ pwck \- 備★及巨件玄伉卞覆仄化 .sp .in +.5i -- 白奴□伙玉及醒互懇仄中井 +\- 白奴□伙玉及醒互懇仄中井 .br -- 交□扒抩卞褐呁互卅中井 +\- 交□扒抩卞褐呁互卅中井 .br -- 交□扒支弘伙□皿及 ID 互懇仄中井 +\- 交□扒支弘伙□皿及 ID 互懇仄中井 .br -- 皿仿奶穴伉弘伙□皿互懇仄中井 +\- 皿仿奶穴伉弘伙□皿互懇仄中井 .br -- 石□丞犯奴伊弁玄伉互懇仄中井 +\- 石□丞犯奴伊弁玄伉互懇仄中井 .br -- 伕弘奶件扑尼伙互懇仄中井 -.in -.5i +\- 伕弘奶件扑尼伙互懇仄中井 +.in \-.5i .sp 互民尼永弁今木月﹝ .P @@ -84,20 +84,20 @@ pwck \- \fI/etc/shadow\fR 卞覆仄化が綜允月﹝ \fIpasswd\fR 由仿丟□正午 \fIshadow\fR 由仿丟□正毛迕中化﹜ 帎及白央奶伙毛薊鎗允月仇午手匹五月﹝ -今日卞 \fB-r\fR 白仿弘毛隙爛允木壬﹜ +今日卞 \fB\-r\fR 白仿弘毛隙爛允木壬﹜ 伉□玉左件伉□乒□玉匹戊穴件玉毛撢墊允月仇午手匹五月﹝ 仇及樺寧﹜庍凳毛墊丹井升丹井反交□扒尺杽中寧歹今木內﹜ 憤が讀卞 \fBno\fR 午莢蠶今木月﹝ \fBpwck\fR 反 \fI/etc/passwd\fR 午 \fI/etc/shadow\fR 及巨件玄伉毛 UID 匹末□玄允月仇午手匹五月﹝ -末□玄乒□玉匹が綜今六月卞反 \fB-s\fR 白仿弘毛芨尹月﹝ +末□玄乒□玉匹が綜今六月卞反 \fB\-s\fR 白仿弘毛芨尹月﹝ 仇及樺寧民尼永弁反墊歹木內﹜簽卞末□玄允月分仃匹丐月﹝ .SH 白央奶伙 \fI/etc/passwd\fR \- 交□扒□失市它件玄樹扷 .br \fI/etc/shadow\fR \- 剪寞祭今木凶由旦伐□玉樹扷 .br -\fI/etc/group\fR \ - 弘伙□皿樹扷 +\fI/etc/group\fR \ \- 弘伙□皿樹扷 .SH 楮洘嫩杴 .BR group (5), .BR passwd (5), diff --git a/man/ja/shadow.3 b/man/ja/shadow.3 index e66f271d..ad352e08 100644 --- a/man/ja/shadow.3 +++ b/man/ja/shadow.3 @@ -1,4 +1,4 @@ -.\"$Id: shadow.3,v 1.5 2003/04/28 02:14:00 kloczek Exp $ +.\" $Id: shadow.3,v 1.6 2005/04/05 19:08:55 kloczek Exp $ .\" Copyright 1989 - 1993, Julianne Frances Haugh .\" All rights reserved. .\" @@ -88,7 +88,7 @@ struct spwd { .br int sp_flag; /* reserved for future use */ .br -.in -.5i +.in \-.5i } .PP 備白奴□伙玉及啦怗反: @@ -134,13 +134,13 @@ shadow 公仄化瘉賡及 15 卍及酸曰及棉﹜ \fBspw_lock\fR 卞方勻化わ蘸杴及伕永弁毛仄方丹午魂心糧仃月﹝ 煌 15 卍棉及棉卞中內木井及魂心互撩л仄凶樺寧反﹜ -\fBlckpwdf\fR 反 -1 毛忒允﹝ +\fBlckpwdf\fR 反 \-1 毛忒允﹝ 中內木及伕永弁手嶽跦仄凶樺寧反 0 互忒今木月﹝ .SH 忒曰襖 仇木日及伙□民件反﹜巨件玄伉互酸勻化中卅中樺寧支﹜ 質咥及聊蠢匹巨仿□互素舅楔蕪儦蝷豸 NULL 毛忒允﹝ 忒曰襖互 \fBint\fR 匹丐月伙□民件反﹜ -嶽跦仄凶日 0 毛﹜撩л仄凶日 -1 毛忒允﹝ +嶽跦仄凶日 0 毛﹜撩л仄凶日 \-1 毛忒允﹝ .SH 煞屢 shadow今木凶由旦伐□玉白央奶伙尺及失弁本旦反孺蜃今木化中月及匹﹜ 仇木日及伙□民件反旦□由□交□扒分仃互厙迕匹五月﹝ diff --git a/man/ja/su.1 b/man/ja/su.1 index 33e14eb0..d4694777 100644 --- a/man/ja/su.1 +++ b/man/ja/su.1 @@ -1,4 +1,4 @@ -.\"$Id: su.1,v 1.6 2003/04/28 02:14:00 kloczek Exp $ +.\" $Id: su.1,v 1.7 2005/04/05 19:08:55 kloczek Exp $ .\" Copyright 1989 - 1990, Julianne Frances Haugh .\" All rights reserved. .\" @@ -39,7 +39,7 @@ .SH 抩蟆 su \- 交□扒ID毛庍凳允月﹝引凶反旦□由□交□扒卞卅月 .SH 踏摯 -\fBsu\fR [\fB-\fR] [\fIusername\fR [\fIargs\fR]] +\fBsu\fR [\fB\-\fR] [\fIusername\fR [\fIargs\fR]] .SH 濩抸 \fBsu\fR 反伕弘奶件本永扑亦件醱卞帎及交□扒卞卅月凶戶卞迕中月﹝ 交□扒抩毛隙爛六內卞粟が仄凶樺寧﹜ @@ -49,7 +49,7 @@ su \- .PP 交□扒抩及詨欠卞馨笛及婁醒毛芨尹月仇午手匹五﹜ 公及樺寧婁醒反交□扒及伕弘奶件扑尼伙卞欐今木月﹝ -た卞﹜公及婁醒及域勾午仄化 \fB-c\fR 毛欐仄凶樺寧﹜ +た卞﹜公及婁醒及域勾午仄化 \fB\-c\fR 毛欐仄凶樺寧﹜ 公木卞糧仁婁醒反釐朿坌及戊穴件玉奶件正皿伉正卞戊穴件玉午仄化荸澄今木月﹝ 戊穴件玉反公及交□扒卞 (\fI/etc/passwd\fR 匹) 隙爛今木化中月扑尼伙匹撢墊今木月﹝ diff --git a/man/ja/suauth.5 b/man/ja/suauth.5 index 444805eb..c9c6df70 100644 --- a/man/ja/suauth.5 +++ b/man/ja/suauth.5 @@ -1,4 +1,4 @@ -.\"$Id: suauth.5,v 1.4 2003/04/28 02:14:00 kloczek Exp $ +.\"$Id: suauth.5,v 1.5 2005/04/05 19:08:55 kloczek Exp $ .\" .\" Japanese Version Copyright (c) 1997 Kazuyoshi Furutaka .\" all rights reserved. @@ -31,10 +31,10 @@ su # 匹銨引月墊反戊丟件玄午仄化健歹木﹜拑骰今木月﹝ .PP .RS -to-id:from-id:ACTION +to\-id:from\-id:ACTION .RE .PP -仇仇匹 to-id 反﹜ +仇仇匹 to\-id 反﹜ .B ALL 午中丹簽賄﹜ 戊件穴匹嗉濠日木凶交□扒抩及伉旦玄﹜ @@ -42,7 +42,7 @@ to-id:from-id:ACTION 午中丹簽賄動嫦卞譆井木凶 "," 嗉濠曰及交□扒抩伉旦玄﹜ 及中內木井匹丐月﹝ .PP -from-id 反 to-id 午き元踏摯匹丐曰﹜凳卞 +from\-id 反 to\-id 午き元踏摯匹丐曰﹜凳卞 .B GROUP 午中丹簽賄手銀迕匹五月﹝ .B ALL EXCEPT GROUP diff --git a/man/ja/sulogin.8 b/man/ja/sulogin.8 index a845402a..a6e675dd 100644 --- a/man/ja/sulogin.8 +++ b/man/ja/sulogin.8 @@ -1,4 +1,4 @@ -.\"$Id: sulogin.8,v 1.5 2003/04/28 02:14:00 kloczek Exp $ +.\" $Id: sulogin.8,v 1.6 2005/04/05 19:08:55 kloczek Exp $ .\" Copyright 1989 - 1992, Julianne Frances Haugh .\" All rights reserved. .\" @@ -36,7 +36,7 @@ .SH 抩蟆 sulogin \- 扑件弘伙交□扒 login .SH 踏摯 -\fBsulogin\fR [\fItty-device\fR] +\fBsulogin\fR [\fItty\-device\fR] .SH 濩抸 .B sulogin 反﹜扑件弘伙交□扒乒□玉及凜﹜ @@ -48,7 +48,7 @@ sulogin \- .PP 慼及方丹卅皿伕件皿玄互請月﹝ .IP "" .5i -Type control-d to proceed with normal startup, +Type control\-d to proceed with normal startup, .br (or give root password for system maintenance): .PP diff --git a/man/ja/useradd.8 b/man/ja/useradd.8 index e06d4dd8..35a52a35 100644 --- a/man/ja/useradd.8 +++ b/man/ja/useradd.8 @@ -1,4 +1,4 @@ -.\"$Id: useradd.8,v 1.7 2004/11/04 03:06:32 kloczek Exp $ +.\" $Id: useradd.8,v 1.9 2005/04/05 19:08:55 kloczek Exp $ .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -41,24 +41,24 @@ useradd \- 蕙筋交□扒及綜嶽’蕙筋交□扒及犯白巧伙玄樹扷及凳蕙 .SH 踏摯 .TP 8 -\fBuseradd\fR [\fB-c\fR \fIcomment\fR] [\fB-d\fR \fIhome_dir\fR] +\fBuseradd\fR [\fB\-c\fR \fIcomment\fR] [\fB\-d\fR \fIhome_dir\fR] .br -[\fB-e\fR \fIexpire_date\fR] [\fB-f\fR \fIinactive_time\fR] +[\fB\-e\fR \fIexpire_date\fR] [\fB\-f\fR \fIinactive_time\fR] .br -[\fB-g\fR \fIinitial_group\fR] [\fB-G\fR \fIgroup\fR[,...]] +[\fB\-g\fR \fIinitial_group\fR] [\fB\-G\fR \fIgroup\fR[,...]] .br -[\fB-m\fR [\fB-k\fR \fIskeleton_dir\fR]] [\fB-o\fR] [\fB-p\fR \fIpasswd\fR] +[\fB\-m\fR [\fB\-k\fR \fIskeleton_dir\fR]] [\fB\-o\fR] [\fB\-p\fR \fIpasswd\fR] .br -[\fB-s\fR \fIshell\fR] [\fB-u\fR \fIuid\fR] \fIlogin\fR +[\fB\-s\fR \fIshell\fR] [\fB\-u\fR \fIuid\fR] \fIlogin\fR .TP 8 -\fBuseradd\fR \fB-D\fR [\fB-g\fI default_group\fR] [\fB-b\fI default_home\fR] +\fBuseradd\fR \fB\-D\fR [\fB\-g\fR \fIdefault_group\fR] [\fB\-b\fR \fIdefault_home\fR] .br -[\fB-e\fI default_expire_date\fR] [\fB-f\fI default_inactive\fR] +[\fB\-e\fR \fIdefault_expire_date\fR] [\fB\-f\fR \fIdefault_inactive\fR] .br -[\fB-s\fI default_shell\fR] +[\fB\-s\fR \fIdefault_shell\fR] .SH 濩抸 .SS 蕙筋交□扒及綜嶽 -\fB-D\fR 左皿扑亦件卅仄匹撢墊今木凶樺寧﹜ +\fB\-D\fR 左皿扑亦件卅仄匹撢墊今木凶樺寧﹜ \fBuseradd\fR 戊穴件玉反 戊穴件玉仿奶件及襖午犯白巧伙玄及澀爛襖毛手午卞 蕙筋交□扒及失市它件玄毛綜嶽允月﹝ @@ -67,79 +67,79 @@ useradd \- 石□丞犯奴伊弁玄伉互綜嶽今木﹜ 澀爛白央奶伙互戊疋□今木月﹝ \fBuseradd\fR 戊穴件玉及左皿扑亦件反慼及騷曰﹝ -.IP "\fB-c \fIcomment\fR" +.IP "\fB\-c\fR \fIcomment\fR" 由旦伐□玉白央奶伙卞馨笛允月蕙筋交□扒及戊丟件玄白奴□伙玉﹝ -.IP "\fB-d \fIhome_dir\fR" +.IP "\fB\-d\fR \fIhome_dir\fR" 蕙筋交□扒及伕弘奶件犯奴伊弁玄伉毛 \fIhome_dir\fR 卞允月﹝ 犯白巧伙玄匹反 \fIlogin\fR 毛 \fIdefault_home\fR 卞尥仃笛尹凶手及互伕弘奶件犯奴伊弁玄伉午卅月﹝ -.IP "\fB-e \fIexpire_date\fR" +.IP "\fB\-e\fR \fIexpire_date\fR" 交□扒失市它件玄互銀迕尕Х卞卅月ゥ尥﹝ -ゥ尥反 \fIYYYY-MM-DD\fR 午中丹踏摯匹隙爛允月﹝ -.IP "\fB-f \fIinactive_days\fR" +ゥ尥反 \fIYYYY\-MM\-DD\fR 午中丹踏摯匹隙爛允月﹝ +.IP "\fB\-f\fR \fIinactive_days\fR" 由旦伐□玉及銀迕渝蜃互濠木化井日失市它件玄互捩菁卞銀迕尕Х卞卅月引匹及ゥ醒﹝ 0 卞允月午﹜ 由旦伐□玉及渝蜃互濠木月午き凜卞仇及失市它件玄反銀迕尕Х卞卅月﹝ --1 卞允月午仇及窗Х互拑躲卞卅月﹝犯白巧伙玄襖反 -1﹝ -.IP "\fB-g \fIinitial_group\fR" +\-1 卞允月午仇及窗Х互拑躲卞卅月﹝犯白巧伙玄襖反 \-1﹝ +.IP "\fB\-g\fR \fIinitial_group\fR" 交□扒及簞允月潛弘伙□皿及弘伙□皿抩引凶反 ID﹝ 弘伙□皿抩反允匹卞繡箕仄化中卅仃木壬卅日卅中﹝ 弘伙□皿 ID 反湃繡及弘伙□皿卞覆殺允月手及匹卅仃木壬卅日卅中﹝ 犯白巧伙玄及弘伙□皿 ID 反 1 井﹜ 引凶反 \fI/etc/default/useradd\fR 匹隙爛今木化中月手及互丐木壬公木卞蝨丹﹝ -.IP "\fB-G \fIgroup,[...]\fR" +.IP "\fB\-G\fR \fIgroup,[...]\fR" 交□扒及簞允月怀踞弘伙□皿 (supplementary groups) 及伉旦玄﹝ 弘伙□皿反戊件穴匹嗉濠曰﹜棉卞塢⑩毛ェ木化反卅日卅中﹝ -隙爛匹五月弘伙□皿卞反 \fB-g\fR 左皿扑亦件午き迋及孺蜃互丐月﹝ +隙爛匹五月弘伙□皿卞反 \fB\-g\fR 左皿扑亦件午き迋及孺蜃互丐月﹝ 犯白巧伙玄匹反﹜交□扒反潛弘伙□皿及心卞簞允月﹝ -.IP \fB-m\fR +.IP \fB\-m\fR 石□丞犯奴伊弁玄伉互繡箕仄卅中樺寧卞反﹜石□丞犯奴伊弁玄伉毛綜嶽允月﹝ -\fB-k\fR 左皿扑亦件毛き凜卞隙爛允月午 \fIskeleton_dir\fR 動票及白央奶伙互﹜ +\fB\-k\fR 左皿扑亦件毛き凜卞隙爛允月午 \fIskeleton_dir\fR 動票及白央奶伙互﹜ 隙爛仄卅中午 \fI/etc/skel\fR 動票及白央奶伙互﹜ 石□丞犯奴伊弁玄伉卞戊疋□今木月﹝ 石□丞犯奴伊弁玄伉卞反﹜ \fIskeleton_dir\fR 引凶反 \fI/etc/skel\fR 卞殖引木月允屯化及犯奴伊弁玄伉手綜嶽今木月﹝ -\fB-k\fR 左皿扑亦件反﹜ -\fB-m\fR 左皿扑亦件午午手卞銀歹木月樺寧及心肣躲匹丐月﹝ +\fB\-k\fR 左皿扑亦件反﹜ +\fB\-m\fR 左皿扑亦件午午手卞銀歹木月樺寧及心肣躲匹丐月﹝ 犯白巧伙玄匹反﹜石□丞犯奴伊弁玄伉毛綜日內﹜白央奶伙及戊疋□手仄卅中﹝ -.IP "\fB-o\fR" +.IP "\fB\-o\fR" 褐呁仄凶 (裔肣匹卅中) UID 匹交□扒毛綜嶽匹五月方丹卞允月﹝ -.IP "\fB-p \fIpasswd\fR" +.IP "\fB\-p\fR \fIpasswd\fR" \fBcrypt\fR(3) 及忒曰襖匹丐月剪寞祭由旦伐□玉﹝ 犯白巧伙玄匹反﹜失市它件玄反銀尹卅中橇謫午卅月﹝ -.IP "\fB-s \fIshell\fR" +.IP "\fB\-s\fR \fIshell\fR" 交□扒及伕弘奶件扑尼伙及抩蟆﹝ 犯白巧伙玄匹反仇及白奴□伙玉反塢⑩午卅曰﹜ 扑旦氾丞互犯白巧伙玄及伕弘奶件扑尼伙毛薊少﹝ -.IP "\fB-u \fIuid\fR" +.IP "\fB\-u\fR \fIuid\fR" 交□扒及 ID 砦獢 -仇及襖反﹜\fB-o\fR 左皿扑亦件毛迕中月樺寧毛輪五﹜職午褐呁仄化反卅日卅中﹝ +仇及襖反﹜\fB\-o\fR 左皿扑亦件毛迕中月樺寧毛輪五﹜職午褐呁仄化反卅日卅中﹝ 引凶鯠橨秅リ吨砟々洃吨擗吨丑 犯白巧伙玄匹反﹜ 999 云方太職及丐日斗月湃繡交□扒及 ID 方曰手釐五中﹜ 瘉凝及醒襖午卅月﹝ 0 井日 999 引匹及襖反﹜ 騷橘扑旦氾丞迕及失市它件玄卞芺沶今木化中月﹝ .SS 犯白巧伙玄襖及庍凳 -\fB-D\fR 左皿扑亦件毛隙爛允月午﹜ +\fB\-D\fR 左皿扑亦件毛隙爛允月午﹜ \fBuseradd\fR 反蜇箕及犯白巧伙玄襖毛刓憎允月井﹜ 引凶反左皿扑亦件匹芨尹日木凶襖卞殺元化犯白巧伙玄襖毛庍凳允月﹝ 銀迕第Х卅左皿扑亦件反慼及騷曰﹝ -.IP "\fB-b \fIdefault_home\fR" +.IP "\fB\-b\fR \fIdefault_home\fR" 蕙筋交□扒及石□丞犯奴伊弁玄伉及由旦及皿伊白奴永弁旦﹝ -蕙筋交□扒失市它件玄及綜嶽凜卞 \fB-d\fI 左皿扑亦件互隙爛今木卅中午﹜ +蕙筋交□扒失市它件玄及綜嶽凜卞 \fB\-d\fI 左皿扑亦件互隙爛今木卅中午﹜ \fIdefault_home\fR 及詨卞交□扒抩毛尥仃笛尹凶手及互 蕙筋犯奴伊弁玄伉抩午仄化銀歹木月﹝ -.IP "\fB-e \fIdefault_expire_date\fR" +.IP "\fB\-e\fR \fIdefault_expire_date\fR" 交□扒失市它件玄互銀迕尕Х午卅月ゥ尥﹝ -.IP "\fB-f \fIdefault_inactive\fR" +.IP "\fB\-f\fR \fIdefault_inactive\fR" 由旦伐□玉及銀迕渝蜃互濠木化井日失市它件玄互銀迕尕Х午卅月引匹及ゥ醒﹝ -.IP "\fB-g \fIdefault_group\fR" +.IP "\fB\-g\fR \fIdefault_group\fR" 蕙筋交□扒及簞允月潛弘伙□皿及弘伙□皿抩引凶反弘伙□皿 ID﹝ 弘伙□皿抩反允匹卞繡箕允月手及匹卅仃木壬卅日卅中﹝ 弘伙□皿 ID 反湃繡及弘伙□皿卞覆殺允月手及匹卅仃木壬卅日卅中﹝ -.IP "\fB-s \fIdefault_shell\fR" +.IP "\fB\-s\fR \fIdefault_shell\fR" 蕙筋交□扒及伕弘奶件扑尼伙﹝ 隙爛今木凶皿伕弘仿丞反﹜ 漆詨綜日木月允屯化及蕙筋交□扒失市它件玄卞贗迕今木月﹝ @@ -157,11 +157,11 @@ NIS .br \fI/etc/shadow\fR \- 兜蟈卅交□扒失市它件玄樹扷 .br -\fI/etc/group\fR \ - 弘伙□皿樹扷 +\fI/etc/group\fR \ \- 弘伙□皿樹扷 .br \fI/etc/default/useradd\fR \- 犯白巧伙玄樹扷 .br -\fI/etc/skel/\fR \ - 白央奶伙及鋸溥互譆井木月犯奴伊弁玄伉 +\fI/etc/skel/\fR \ \- 白央奶伙及鋸溥互譆井木月犯奴伊弁玄伉 .SH 楮洘嫩杴 .BR chfn (1), .BR chsh (1), diff --git a/man/ja/userdel.8 b/man/ja/userdel.8 index 9716e6a9..60aac44f 100644 --- a/man/ja/userdel.8 +++ b/man/ja/userdel.8 @@ -1,4 +1,4 @@ -.\"$Id: userdel.8,v 1.6 2003/04/28 02:14:00 kloczek Exp $ +.\" $Id: userdel.8,v 1.7 2005/04/05 19:08:55 kloczek Exp $ .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -39,14 +39,14 @@ userdel \- 交□扒及失市它件玄午楮洘白央奶伙毛綽輪允月 .SH 踏摯 .B userdel -[\fB-r\fR] +[\fB\-r\fR] .I login .SH 濩抸 \fBuserdel\fR 戊穴件玉反﹜扑旦氾丞失市它件玄白央奶伙毛膜懇仄﹜ 交□扒 \fIlogin\fR 卞覆殺允月允屯化及巨件玄伉毛綽輪允月﹝ 綽輪今木月交□扒反繡箕仄化中卅仃木壬卅日卅中﹝ \fBuserdel\fR 戊穴件玉卞贗迕匹五月左皿扑亦件反動票及騷曰﹝ -.IP \fB-r\fR +.IP \fB\-r\fR 交□扒及石□丞犯奴伊弁玄伉醱及白央奶伙毛綽輪允月﹝ 石□丞犯奴伊弁玄伉憤蟲午交□扒及丟□伙旦皿□伙手壅蛔允月﹝ 白央奶伙扑旦氾丞醱及幻井及樺赭卞丐月公及交□扒及白央奶伙反﹜ @@ -56,7 +56,7 @@ userdel \- .br \fI/etc/shadow\fR \- 兜蟈卅交□扒失市它件玄樹扷 .br -\fI/etc/group\fR \ - 弘伙□皿樹扷 +\fI/etc/group\fR \ \- 弘伙□皿樹扷 .SH 煞屢 \fBuserdel\fR 反﹜綽輪今木月交□扒互蜇箕伕弘奶件仄化中月樺寧反﹜ 公及失市它件玄及綽輪毛袱第仄卅中﹝ diff --git a/man/ja/usermod.8 b/man/ja/usermod.8 index 0dfe3741..891ebfcd 100644 --- a/man/ja/usermod.8 +++ b/man/ja/usermod.8 @@ -1,4 +1,4 @@ -.\"$Id: usermod.8,v 1.8 2004/11/04 03:06:32 kloczek Exp $ +.\" $Id: usermod.8,v 1.10 2005/04/05 19:08:55 kloczek Exp $ .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -41,81 +41,81 @@ .SH 抩蟆 usermod \- 交□扒失市它件玄毛膜懇允月 .SH 踏摯 -\fBusermod\fR [\fB-c\fR \fIcomment\fR] [\fB-d\fR \fIhome_dir\fR [\fB-m\fR]] +\fBusermod\fR [\fB\-c\fR \fIcomment\fR] [\fB\-d\fR \fIhome_dir\fR [\fB\-m\fR]] .br -[\fB-e\fR \fIexpire_date\fR] [\fB-f\fR \fIinactive_time\fR] +[\fB\-e\fR \fIexpire_date\fR] [\fB\-f\fR \fIinactive_time\fR] .br -[\fB-g\fR \fIinitial_group\fR] [\fB-G\fR \fIgroup\fR [,...]] +[\fB\-g\fR \fIinitial_group\fR] [\fB\-G\fR \fIgroup\fR [,...]] .br -[\fB-l\fR \fIlogin_name\fR] [\fB-p\fR \fIpasswd\fR] +[\fB\-l\fR \fIlogin_name\fR] [\fB\-p\fR \fIpasswd\fR] .br -[\fB-s\fR \fIshell\fR] [\fB-u\fR \fIuid\fR [\fB-o\fR]] [\fB-L\fR|\fB-U\fR] +[\fB\-s\fR \fIshell\fR] [\fB\-u\fR \fIuid\fR [\fB\-o\fR]] [\fB\-L\fR|\fB\-U\fR] \fIlogin\fR .SH 濩抸 \fBusermod\fR 戊穴件玉反﹜ 戊穴件玉仿奶件曉匹及隙爛卞方勻化﹜ 扑旦氾丞失市它件玄白央奶伙毛膜懇允月﹝ \fBusermod\fR 戊穴件玉卞隙爛匹五月左皿扑亦件反慼及騷曰﹝ -.IP "\fB-c \fIcomment\fR" +.IP "\fB\-c\fR \fIcomment\fR" 由旦伐□玉白央奶伙及戊丟件玄白奴□伙玉卞芨尹月蕙仄中襖﹝ 騷橘反 .BR chfn (1) 交□氾奴伉氾奴卞方勻化庍凳今木月﹝ -.IP "\fB-d \fIhome_dir\fR" +.IP "\fB\-d\fR \fIhome_dir\fR" 蕙仄中伕弘奶件犯奴伊弁玄伉﹝ -\fB-m\fR 左皿扑亦件毛迕中月午﹜ +\fB\-m\fR 左皿扑亦件毛迕中月午﹜ 蜇箕及石□丞犯奴伊弁玄伉及醱褥互蕙仄中石□丞犯奴伊弁玄伉卞啖が今木月 (詨樊互繡箕仄卅中樺寧反蕙凶卞綜嶽今木月)﹝ -.IP "\fB-e \fIexpire_date\fR" +.IP "\fB\-e\fR \fIexpire_date\fR" 公及交□扒失市它件玄互銀迕尕Х卞卅月ゥ尥﹝ -ゥ尥反 \fIYYYY-MM-DD\fR 午中丹踏摯匹隙爛允月﹝ -.IP "\fB-f \fIinactive_days\fR" +ゥ尥反 \fIYYYY\-MM\-DD\fR 午中丹踏摯匹隙爛允月﹝ +.IP "\fB\-f\fR \fIinactive_days\fR" 由旦伐□玉及銀迕渝蜃互濠木化井日失市它件玄互捩菁卞銀迕尕Х卞卅月引匹及ゥ醒﹝ 0 卞允月午﹜ 由旦伐□玉及渝蜃互濠木月午き凜卞仇及失市它件玄反銀迕尕Х卞卅月﹝ --1 卞允月午仇及窗Х互拑躲卞卅月﹝犯白巧伙玄襖反 -1﹝ -.IP "\fB-g \fIinitial_group\fR" +\-1 卞允月午仇及窗Х互拑躲卞卅月﹝犯白巧伙玄襖反 \-1﹝ +.IP "\fB\-g\fR \fIinitial_group\fR" 蕙凶卞公及交□扒及伕弘奶件凜賡渝弘伙□皿午允月弘伙□皿抩引凶反 ID﹝ 弘伙□皿抩反湃卞繡箕仄化中卅仃木壬卅日卅中﹝ 弘伙□皿砦璊炴繡及弘伙□皿毛輔寰仄化中卅仃木壬卅日卅中﹝ 犯白巧伙玄及弘伙□皿砦璊 1﹝ -.IP "\fB-G \fIgroup,[...]\fR" +.IP "\fB\-G\fR \fIgroup,[...]\fR" 交□扒互簞允月怀踞弘伙□皿 (supplementary groups) 及伉旦玄﹝ 弘伙□皿反戊件穴匹嗉濠曰﹜棉卞塢⑩妐儂毛ェ木化反卅日卅中﹝ -隙爛匹五月弘伙□皿卞反 \fB-g\fR 左皿扑亦件午き迋及孺蜃互丐月﹝ +隙爛匹五月弘伙□皿卞反 \fB\-g\fR 左皿扑亦件午き迋及孺蜃互丐月﹝ 蜇箕公及交□扒互﹜ 蕙仄中伉旦玄卞卅中弘伙□皿及丟件田□卞卅勻化中月樺寧反﹜ 公及弘伙□皿井日綽輪今木月﹝ -.IP "\fB-l \fIlogin_name\fR" +.IP "\fB\-l\fR \fIlogin_name\fR" 交□扒及伕弘奶件抩毛 \fIlogin\fR 井日 \fIlogin_name\fR 卞庍凳允月﹝ 職反窒手庍凳仄卅中及匹﹜ 云公日仁蕙仄中伕弘奶件抩卞寧歹六化 石□丞犯奴伊弁玄伉及抩蟆毛庍凳允月优邰互丐月分欠丹﹝ -.IP "\fB-p \fIpasswd\fR" +.IP "\fB\-p\fR \fIpasswd\fR" \fBcrypt\fR(3) 及忒曰襖匹丐月剪寞祭由旦伐□玉﹝ -.IP "\fB-s \fIshell\fR" +.IP "\fB\-s\fR \fIshell\fR" 交□扒及蕙仄中伕弘奶件扑尼伙及抩蟆﹝ 仇及白奴□伙玉毛塢⑩卞仄凶樺寧反﹜ 扑旦氾丞互犯白巧伙玄及伕弘奶件扑尼伙毛薊鎗允月﹝ -.IP "\fB-u \fIuid\fR" +.IP "\fB\-u\fR \fIuid\fR" 交□扒及 ID 砦獢 -仇及襖反﹜\fB-o\fR 左皿扑亦件毛迕中月樺寧毛輪五﹜職午褐呁仄化反卅日卅中﹝ +仇及襖反﹜\fB\-o\fR 左皿扑亦件毛迕中月樺寧毛輪五﹜職午褐呁仄化反卅日卅中﹝ 引凶鯠橨秅リ吨砟々洃吨擗吨丑 0 井日 999 引匹及襖反﹜騷橘扑旦氾丞失市它件玄迕卞芺沶今木化中月﹝ 石□丞犯奴伊弁玄伉動票及﹜ 公及交□扒赭肣及允屯化及白央奶伙及交□扒 ID 反﹜ 憤が讀卞蕙仄中襖卞庍凳今木月﹝ 石□丞犯奴伊弁玄伉動票卞卅中白央奶伙反澎綜僅匹庍凳仄卅仃木壬卅日卅中﹝ -.IP "\fB-L\fR" +.IP "\fB\-L\fR" 交□扒及由旦伐□玉毛伕永弁允月﹝ 仇木反剪寞祭今木凶由旦伐□玉及蟆卞 '!' 毛馨笛仄﹜ 撢撙讀卞由旦伐□玉毛拑躲卞允月﹝ -仇及左皿扑亦件毛 \fI-p\fR 支 \fI-U\fR 午き凜卞迕中月仇午反匹五卅中﹝ -.IP "\fB-U\fR" +仇及左皿扑亦件毛 \fI\-p\fR 支 \fI\-U\fR 午き凜卞迕中月仇午反匹五卅中﹝ +.IP "\fB\-U\fR" 交□扒及由旦伐□玉毛失件伕永弁允月﹝ 仇木反剪寞祭今木凶由旦伐□玉及燮え及 '!' 毛潸曰輪仁﹝ -仇及左皿扑亦件毛 \fI-p\fR 支 \fI-L\fR 午き凜卞迕中月仇午反匹五卅中﹝ +仇及左皿扑亦件毛 \fI\-p\fR 支 \fI\-L\fR 午き凜卞迕中月仇午反匹五卅中﹝ .SH 煞屢 \fBusermod\fR 反蜇箕伕弘奶件仄化中月交□扒及抩蟆毛庍凳匹五卅中﹝ @@ -130,7 +130,7 @@ NIS .br \fI/etc/shadow\fR \- 兜蟈卅交□扒失市它件玄樹扷 .br -\fI/etc/group\fR \ - 弘伙□皿樹扷 +\fI/etc/group\fR \ \- 弘伙□皿樹扷 .SH 楮洘嫩杴 .BR chfn (1), .BR chsh (1), diff --git a/man/ja/vipw.8 b/man/ja/vipw.8 index e4e48b22..3a86c54c 100644 --- a/man/ja/vipw.8 +++ b/man/ja/vipw.8 @@ -1,4 +1,4 @@ -.\"$Id: vipw.8,v 1.4 2003/04/28 02:14:00 kloczek Exp $ +.\" $Id: vipw.8,v 1.5 2005/04/05 19:08:55 kloczek Exp $ .\" .\" Japanese Version Copyright (c) 2001 Maki KURODA .\" all right reserved, @@ -10,15 +10,15 @@ .SH 抩蟆 vipw, vigr \- password, group 午公木冗木及 shadow 白央奶伙毛彸螂允月 .SH 踏摯 -\fBvipw\fR [\fB-s\fR] +\fBvipw\fR [\fB\-s\fR] .br -\fBvigr\fR [\fB-s\fR] +\fBvigr\fR [\fB\-s\fR] .SH 濩抸 .BR vipw " 午 " vigr 反﹜公木冗木 \fI/etc/passwd\fR " 午 " \fI/etc/group\fR 毛彸螂允月﹝ -.B -s +.B \-s 白仿弘互隙爛今木月午﹜仇木日及白央奶伙及 shadow 祭リリ═ \fI/etc/shadow\fR 午 \fI/etc/gshadow\fR 毛公木冗木彸螂允月﹝ diff --git a/man/ko/Makefile.in b/man/ko/Makefile.in index f9f4d57f..d1b83a2e 100644 --- a/man/ko/Makefile.in +++ b/man/ko/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.4 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -87,17 +87,16 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ 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@ @@ -192,9 +191,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/ko/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/ko/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/ko/Makefile + $(AUTOMAKE) --foreign man/ko/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/man/ko/chfn.1 b/man/ko/chfn.1 index 32309435..0ad8b51c 100644 --- a/man/ko/chfn.1 +++ b/man/ko/chfn.1 @@ -1,22 +1,15 @@ +.\" $Id: chfn.1,v 1.2 2005/04/05 19:08:56 kloczek Exp $ +.\" (c) 1994 by salvatore valente .\" -.\" chfn.1 -- change your finger information -.\" (c) 1994 by salvatore valente -.\" -.\" this program is free software. you can redistribute it and -.\" modify it under the terms of the gnu general public license. -.\" there is no warranty. -.\" -.\" $Author: kloczek $ -.\" $Revision: 1.1 $ -.\" $Date: 2002/03/13 19:03:01 $ -.\" +.\" this program is free software. you can redistribute it and +.\" modify it under the terms of the gnu general public license. +.\" there is no warranty. .TH CHFN 1 "October 13 1994" "chfn" "Linux Reference Manual" .SH NAME chfn \- 餌辨濠 finger 薑爾蒂 夥羞棻. .SH SYNOPSIS -.B chfn -[\ \-f\ full-name\ ] [\ \-o\ office\ ] [\ \-p\ office-phone\ ] -[\ \-h\ home-phone\ ] [\ \-u\ ] [\ \-v\ ] [\ username\ ] +\fBchfn\fR [\fB\-f\fR \fIfull\-name\fR] [\fB\-o\fR \fIoffice\fR] [\fB\-p\fR \fIoffice\-phone\fR] +[\ \-h\ home\-phone\ ] [\ \-u\ ] [\ \-v\ ] [\ username\ ] .SH DESCRIPTION .B chfn 貲滄擎 餌辨濠曖 finger 薑爾蒂 夥羞棻. 檜匙擎 @@ -37,22 +30,22 @@ chfn \- 斜傖 Enter 旋潸蒂 援腦賊 脹棻. .SH OPTIONS .TP -.I "\-f, \-\-full-name" +.I "\-f, \-\-full\-name" 餌辨濠 褒營 檜葷 .TP .I "\-o, \-\-office" 餌辨濠 霜濰 .TP -.I "\-p, \-\-office-phone" +.I "\-p, \-\-office\-phone" 餌辨濠 霜濰 瞪食醽 .TP -.I "\-h, \-\-home-phone" +.I "\-h, \-\-home\-phone" 餌辨濠 餵 瞪 廓 .TP .I "\-u, \-\-help" 紫遺蜓擊 爾罹輿堅 葆耀棻. .TP -.I "-v, \-\-version" +.I "\-v, \-\-version" 幗瞪 薑爾蒂 爾罹輿堅 葆耀棻. .SH "SEE ALSO" .BR finger (1), diff --git a/man/ko/chsh.1 b/man/ko/chsh.1 index 7a545bdb..2b5c0f60 100644 --- a/man/ko/chsh.1 +++ b/man/ko/chsh.1 @@ -1,15 +1,9 @@ +.\" $Id: chsh.1,v 1.2 2005/04/05 19:08:56 kloczek Exp $ +.\" (c) 1994 by salvatore valente .\" -.\" chsh.1 -- change your login shell -.\" (c) 1994 by salvatore valente -.\" -.\" this program is free software. you can redistribute it and -.\" modify it under the terms of the gnu general public license. -.\" there is no warranty. -.\" -.\" $Author: kloczek $ -.\" $Revision: 1.1 $ -.\" $Date: 2002/03/13 19:03:01 $ -.\" +.\" this program is free software. you can redistribute it and +.\" modify it under the terms of the gnu general public license. +.\" there is no warranty. .TH CHSH 1 "October 13 1994" "chsh" "Linux Reference Manual" .SH NAME chsh \- 餌辨濠 煎斜檣 蔗擊 夥羞棻. @@ -32,14 +26,14 @@ chsh \- .I "\-s, \-\-shell" 雖薑ж朝 蔗擊 擅戲煎 餌辨й 煎斜檣 蔗煎 夥羞棻. .TP -.I "\-l, \-\-list-shells" +.I "\-l, \-\-list\-shells" .I /etc/shells だ橾 寰縑 雖薑脹 蔗擊 釭翮ж堅 葆耀棻. .TP .I "\-u, \-\-help" 紫遺蜓擊 爾罹輿堅 葆耀棻. .TP -.I "-v, \-\-version" +.I "\-v, \-\-version" 幗瞪 薑爾蒂 爾罹輿堅 葆耀棻. .SH "SEE ALSO" .BR login (1), diff --git a/man/ko/groups.1 b/man/ko/groups.1 index 10901a39..71d9a946 100644 --- a/man/ko/groups.1 +++ b/man/ko/groups.1 @@ -1,4 +1,5 @@ -.TH GROUPS 1L "GNU 蔗 嶸せ葬じ" "FSF" \" -*- nroff -*- +.\"$Id: groups.1,v 1.2 2005/04/05 19:08:56 kloczek Exp $ +.TH GROUPS 1L "GNU 蔗 嶸せ葬じ" "FSF" \" \-*\- nroff \-*\- .SH 檜葷 groups \- 餌辨濠陛 樓и 斜瑜菟擊 轎溘и棻 .SH 偃蹂 diff --git a/man/ko/login.1 b/man/ko/login.1 index 232c734a..0e418e29 100644 --- a/man/ko/login.1 +++ b/man/ko/login.1 @@ -142,7 +142,7 @@ CLASSES CLASSES myclass1 tty1 tty2 myclass2 tty3 @.foo.com -.in -.5 +.in \-.5 .fi .PP 嶺 蕨薯朝 @@ -176,7 +176,7 @@ GROUPS GROUPS sys tty1 @.bar.edu stud myclass1 tty4 -.in -0.5 +.in \-0.5 .fi .PP 嶺 蕨薯朝 @@ -202,7 +202,7 @@ USERS USERS zacho tty1 @130.225.16.0/255.255.255.0 blue tty3 myclass2 -.in -0.5 +.in \-0.5 .fi .PP 嶺 蕨薯朝 zacho 啗薑 餌辨濠朝 IP 輿模陛 130.225.16.0 睡攪 130.225.16.255 @@ -223,7 +223,7 @@ USERS .PP .IP o @localhost 僥濠翮擎 煎蠔 ˊ瘋挪□ telnet/rlogin戲煎 蕾樓ж朝 餌辨濠蒂 -曖嘐и棻. 闊 `xterm -e /bin/login' 貲滄偽擎 匙檜 褒ч脹棻朝 匙擊 曖嘐и棻. +曖嘐и棻. 闊 `xterm \-e /bin/login' 貲滄偽擎 匙檜 褒ч脹棻朝 匙擊 曖嘐и棻. .PP .IP o @.some.dom 僥濠翮擎 葬賅お ˊ瘋 蕾樓衛 斜 餌辨濠陛 rlogin/telnet戲煎 @@ -240,11 +240,11 @@ IP 斜 ⑽衝擎 棻擠婁 偽棻. .PP .nf -timespec ::= '[' [':' ]* ']' +timespec ::= '[' [':' ]* ']' day ::= 'mon' | 'tue' | 'wed' | 'thu' | 'fri' | 'sat' | 'sun' hour ::= '0' | '1' | ... | '23' hourspec ::= | '\-' -day-or-hour ::= | +day\-or\-hour ::= | .fi .PP 蕨蒂 菟橫, [mon:tue:wed:thu:fri:8\-17]tty3 僥濠翮擎 @@ -295,6 +295,6 @@ a\-b .BR rlogind (8) ヴ斜葡縑憮 в蹂й 雖紫 賅艇棻. .SH 虜萇檜 -Derived from BSD login 5.40 (5/9/89) by Michael Glad (glad@daimi.dk) for HP-UX +Derived from BSD login 5.40 (5/9/89) by Michael Glad (glad@daimi.dk) for HP\-UX .br Ported to Linux 0.12: Peter Orbaek (poe@daimi.aau.dk) diff --git a/man/ko/passwd.5 b/man/ko/passwd.5 index 5205265e..d1071a3a 100644 --- a/man/ko/passwd.5 +++ b/man/ko/passwd.5 @@ -1,5 +1,4 @@ -.\" Copyright (c) 1993 Michael Haardt (michael@moria.de), Fri Apr 2 11:32:09 MET DST 1993 -.\" +.\"$Id: passwd.5,v 1.3 2005/04/05 19:08:56 kloczek Exp $ .\" This is free documentation; you can redistribute it and/or .\" modify it under the terms of the GNU General Public License as .\" published by the Free Software Foundation; either version 2 of diff --git a/man/lastlog.8 b/man/lastlog.8 index 1ea6bb36..d1142b41 100644 --- a/man/lastlog.8 +++ b/man/lastlog.8 @@ -1,4 +1,4 @@ -.\"$Id: lastlog.8,v 1.19 2004/12/12 20:31:57 kloczek Exp $ +.\"$Id: lastlog.8,v 1.21 2005/04/05 18:47:50 kloczek Exp $ .\" Copyright 1992, Phillip Street and Julianne Frances Haugh .\" All rights reserved. .\" @@ -35,29 +35,29 @@ lastlog \- examine lastlog file .SH DESCRIPTION .PP \fBlastlog\fR formats and prints the contents of the last login log -\fI/var/log/lastlog\fR file. The \fBlogin-name\fR, \fBport\fR, and \fBlast +\fI/var/log/lastlog\fR file. The \fBlogin\-name\fR, \fBport\fR, and \fBlast login time\fR will be printed. The default (no flags) causes lastlog entries to be printed, sorted by their order in \fB/etc/passwd\fR. .SH OPTIONS .TP The options which apply to the \fBlastlog\fR command are: -.IP "\fB-h\fR, \fB--help\fR" +.IP "\fB\-h\fR, \fB\-\-help\fR" Print help message and exit. -.IP "\fB-t\fR, \fB--time\fR \fIDAYS\fR" +.IP "\fB\-t\fR, \fB\-\-time\fR \fIDAYS\fR" Print the lastlog records more recent than \fIDAYS\fR. -.IP "\fB-u\fR, \fB--user\fR \fILOGIN\fR" +.IP "\fB\-u\fR, \fB\-\-user\fR \fILOGIN\fR" Print the lastlog record for user with specified \fILOGIN\fR only. .TP -The \fB-t\fR flag overrides the use of \fB-u\fR. +The \fB\-t\fR flag overrides the use of \fB\-u\fR. .PP If the user has never logged in the message \fB"**Never logged in**"\fR will be displayed instead of the port and time. .SH FILES -\fI/var/log/lastlog\fR \ - lastlog logging file +\fI/var/log/lastlog\fR \- lastlog logging file .SH CAVEATS Large gaps in uid numbers will cause the lastlog program to run longer with no output to the screen (i.e. if mmdf=800 and last uid=170, program will -appear to hang as it processes uid 171-799). +appear to hang as it processes uid 171\-799). .SH AUTHORS Julianne Frances Haugh (jockgrrl@ix.netcom.com) .br diff --git a/man/limits.5 b/man/limits.5 index 596d8fa4..7cbc875d 100644 --- a/man/limits.5 +++ b/man/limits.5 @@ -1,4 +1,4 @@ -.\"$Id: limits.5,v 1.7 2003/05/01 18:17:39 kloczek Exp $ +.\"$Id: limits.5,v 1.9 2005/04/05 18:47:50 kloczek Exp $ .TH LIMITS 5 .SH NAME limits \- Resource limits definition @@ -8,7 +8,7 @@ config.h) describes the resource limits you wish to impose. It should be owned by root and readable by root account only. .PP By default no quotas are imposed on 'root'. In fact, there is no way to impose -limits via this procedure to root-equiv accounts (accounts with UID 0). +limits via this procedure to root\-equiv accounts (accounts with UID 0). .PP Each line describes a limit for a user in the form: .sp @@ -27,7 +27,7 @@ D: max data size (KB) .br F: maximum filesize (KB) .br -M: max locked-in-memory address space (KB) +M: max locked\-in\-memory address space (KB) .br N: max number of open files .br @@ -60,12 +60,11 @@ The default entry is denoted by username "\fB*\fP". If you have multiple \fIdefault\fP entries in your \fBLIMITS_FILE\fP, then the last one will be used as the default entry. .PP -To completely disable limits for a user, a single dash "\fB-\fP" will do. +To completely disable limits for a user, a single dash "\fB\-\fP" will do. .PP Also, please note that all limit settings are set PER LOGIN. They are not global, nor are they permanent. Perhaps global limits will come, but for now this will have to do ;) - .SH FILES \fI/etc/limits\fR .SH SEE ALSO diff --git a/man/login.1 b/man/login.1 index 0745a000..3ebf245f 100644 --- a/man/login.1 +++ b/man/login.1 @@ -1,4 +1,4 @@ -.\"$Id: login.1,v 1.18 2004/12/11 20:05:01 kloczek Exp $ +.\" $Id: login.1,v 1.23 2005/04/12 16:31:06 kloczek Exp $ .\" Copyright 1989 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -29,27 +29,20 @@ .SH NAME login \- begin session on the system .SH SYNOPSIS -\fBlogin\fR [\fB-p\fR] [\fIusername\fR] [\fIENV=VAR\fR ...] +\fBlogin\fR [\fB\-p\fR] [\fIusername\fR] [\fIENV=VAR\fR ...] .br -\fBlogin\fR [\fB-p\fR] [\fB-h \fIhost\fR] [\fB-f \fIusername\fR] +\fBlogin\fR [\fB\-p\fR] [\fB\-h\fR \fIhost\fR] [\fB\-f\fR \fIusername\fR] .br -\fBlogin\fR [\fB-p\fR] \fB-r \fIhost\fR +\fBlogin\fR [\fB\-p\fR] \fB\-r\fR \fIhost\fR .SH DESCRIPTION \fBlogin\fR is used to establish a new session with the system. It is normally invoked automatically by responding to the \fIlogin:\fR prompt on the user\'s terminal. fBlogin\fR may be special to the shell and may not be -invoked as a sub-process. Typically, \fBlogin\fR is treated by the shell as +invoked as a sub\-process. Typically, \fBlogin\fR is treated by the shell as \fBexec login\fR which causes the user to exit from the current shell. Attempting to execute \fBlogin\fR from any shell but the login shell will produce an error message. .PP - -When invoked from the \fIlogin:\fR prompt, the user may enter environmental -variables after the username. These variables are entered in the form -\fBNAME=VALUE\fR. Not all variables may be set in the fashion, notably -\fBPATH\fR, \fBHOME\fR and \fBSHELL\fR. Additionally, \fBIFS\fR may be -inhibited if the user\'s login shell is \fB/bin/sh\fR. -.PP The user is then prompted for a password, where appropriate. Echoing is disabled to prevent revealing the password. Only a small number of password failures are permitted before \fBlogin\fR exits and the communications link @@ -63,7 +56,7 @@ password and the new password before continuing. Please refer to After a successful login, you will be informed of any system messages and the presence of mail. You may turn off the printing of the system message -file, \fI/etc/motd\fR, by creating a zero-length file \fI.hushlogin\fR in +file, \fI/etc/motd\fR, by creating a zero\-length file \fI.hushlogin\fR in your login directory. The mail message will be one of "\fBYou have new mail.\fR", "\fBYou have mail.\fR", or "\fBNo Mail.\fR" according to the condition of your mailbox. @@ -90,16 +83,16 @@ 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 OPTIONS -.IP "\fB-f\fR" +.IP "\fB\-f\fR" Do not perform authentication, user is preauthenticated. -.IP "\fB-h\fR" +.IP "\fB\-h\fR" Name of the remote host for this login. -.IP "\fB-p\fR" +.IP "\fB\-p\fR" Preserve environment. -.IP "\fB-r\fR" +.IP "\fB\-r\fR" Perform autologin protocol for rlogin. .PP -The \fB-r\fP, \fB-h\fP and \fB-f\fP options are only used when \fBlogin\fP is +The \fB\-r\fP, \fB\-h\fP and \fB\-f\fP options are only used when \fBlogin\fP is invoked by root. .SH CAVEATS This version of \fBlogin\fR has many compilation options, only some of which @@ -107,21 +100,21 @@ may be in use at any particular site. .PP The location of files is subject to differences in system configuration. .SH FILES -\fI/var/run/utmp\fR \- list of current login sessions +\fI/var/run/utmp\fR \- list of current login sessions .br -\fI/var/log/wtmp\fR \- list of previous login sessions +\fI/var/log/wtmp\fR \- list of previous login sessions .br -\fI/etc/passwd\fR \- user account information +\fI/etc/passwd\fR \- user account information .br -\fI/etc/shadow\fR \- encrypted passwords and age information +\fI/etc/shadow\fR \- secure user account information .br -\fI/etc/motd\fR \- system message file +\fI/etc/motd\fR \- system message file .br -\fI/etc/nologin\fR \- prevent non-root users from logging in +\fI/etc/nologin\fR \- prevent non\-root users from logging in .br -\fI/etc/ttytype\fR \- list of terminal types +\fI/etc/ttytype\fR \- list of terminal types .br -\fI$HOME/.hushlogin\fR \- suppress printing of system messages +\fI$HOME/.hushlogin\fR \- suppress printing of system messages .SH SEE ALSO .BR mail (1), .BR passwd (1), diff --git a/man/login.access.5 b/man/login.access.5 index 9e4312ef..c41e8569 100644 --- a/man/login.access.5 +++ b/man/login.access.5 @@ -1,4 +1,4 @@ -.\"$Id: login.access.5,v 1.5 2003/05/01 18:17:39 kloczek Exp $ +.\"$Id: login.access.5,v 1.6 2005/04/02 16:10:24 kloczek Exp $ .\" this is comment .TH LOGIN.ACCESS 5 .\" .Dt SKEY.ACCESS 5 @@ -11,7 +11,7 @@ The \fIlogin.access\fR file specifies (user, host) combinations and/or refused. .PP When someone logs in, the \fIlogin.access\fR is scanned for the first entry -that matches the (user, host) combination, or, in case of non-networked +that matches the (user, host) combination, or, in case of non\-networked logins, the first entry that matches the (user, tty) combination. The permissions field of that table entry determines whether the login will be accepted or refused. @@ -21,10 +21,10 @@ Each line of the login access control table has three fields separated by a .sp 1 .IR permission : users : origins .sp 1 -The first field should be a "\fB+\fR" (access granted) or "\fB-\fR" (access +The first field should be a "\fB+\fR" (access granted) or "\fB\-\fR" (access denied) character. The second field should be a list of one or more login names, group names, or \fBALL\fR (always matches). The third field should be -a list of one or more tty names (for non-networked logins), host names, +a list of one or more tty names (for non\-networked logins), host names, domain names (begin with "\fB.\fR"), host addresses, internet network numbers (end with "\fB.\fR"), \fBALL\fR (always matches) or \fBLOCAL\fR (matches any string that does not contain a "\fB.\fR" character). If you run @@ -33,10 +33,10 @@ NIS you can use @netgroupname in host or user patterns. The \fBEXCEPT\fR operator makes it possible to write very compact rules. .PP The group file is searched only when a name does not match that of the -logged-in user. Only groups are matched in which users are explicitly +logged\-in user. Only groups are matched in which users are explicitly listed: the program does not look at a user's primary group id value. .SH FILES -\fI/etc/loginn.defs\fR +\fI/etc/loginn.defs\fR \- shadow password suite configuration .SH SEE ALSO .BR login (1) .SH AUTHOR diff --git a/man/login.defs.5 b/man/login.defs.5 index 48627585..8c158b51 100644 --- a/man/login.defs.5 +++ b/man/login.defs.5 @@ -1,3 +1,4 @@ +.\" $Id: login.defs.5,v 1.15 2005/04/05 18:47:50 kloczek Exp $ .\" Copyright 1991 - 1993, Julianne Frances Haugh and Chip Rosenthal .\" All rights reserved. .\" @@ -24,15 +25,12 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.\" -.\" $Id: login.defs.5,v 1.12 2003/05/01 18:17:39 kloczek Exp $ -.\" .TH LOGIN.DEFS 5 .SH NAME /etc/login.defs \- shadow password suite configuration .SH DESCRIPTION The -\fI/etc/login.defs\fR file defines the site-specific configuration for the +\fI/etc/login.defs\fR file defines the site\-specific configuration for the shadow password suite. This file is required. Absence of this file will not prevent system operation, but will probably result in undesirable operation. @@ -41,7 +39,7 @@ This file is a readable text file, each line of the file describing one configuration parameter. The lines consist of a configuration name and value, separated by whitespace. Blank lines and comment lines are ignored. Comments are introduced with a `#' pound sign and the pound sign must be the -first non-white character of the line. +first non\-white character of the line. .PP Parameter values may be of four types: strings, booleans, numbers, and long numbers. A string is comprised of any printable characters. A boolean should @@ -50,7 +48,7 @@ with a value other than these will be given a ``no'' value. Numbers (both regular and long) may be either decimal values, octal values (precede the value with ``0'') or hexadecimal values (precede the value with ``0x''). The maximum value of the regular and long numeric parameters is -machine-dependent. +machine\-dependent. .PP The following configuration items are provided: .\" @@ -70,25 +68,25 @@ installing chfn SUID. .\" .IP "CREATE_HOME (boolean)" This defines whether useradd should create home directories for users by -default. This option is OR'ed with the \fI-m\fR flag on useradd command line. +default. This option is OR'ed with the \fI\-m\fR flag on useradd command line. .\" .IP "GID_MAX (number)" .IP "GID_MIN (number)" -Range of group IDs to choose from for the fBuseradd\fR and \fBgroupadd\fR +Range of group IDs to choose from for the \fBuseradd\fR and \fBgroupadd\fR programs. .\" .IP "MAIL_DIR (string)" The mail spool directory. This is needed to manipulate the mailbox when its corresponding user account is modified or deleted. If not specified, a -compile-time default is used. +compile\-time default is used. .\" .IP "PASS_MAX_DAYS (number)" The maximum number of days a password may be used. If the password is older -than this, a password change will be forced. If not specified, -1 will be +than this, a password change will be forced. If not specified, \-1 will be assumed (which disables the restriction). .IP "PASS_MIN_DAYS (number)" The minimum number of days allowed between password changes. Any password -changes attempted sooner than this will be rejected. If not specified, -1 +changes attempted sooner than this will be rejected. If not specified, \-1 will be assumed (which disables the restriction). .IP "PASS_WARN_AGE (number)" The number of days warning given before a password expires. A zero means diff --git a/man/logoutd.8 b/man/logoutd.8 index 3a548ba7..a94c4993 100644 --- a/man/logoutd.8 +++ b/man/logoutd.8 @@ -1,4 +1,4 @@ -.\"$Id: logoutd.8,v 1.10 2003/05/01 18:17:39 kloczek Exp $ +.\"$Id: logoutd.8,v 1.11 2005/04/02 16:10:24 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -39,8 +39,8 @@ at the current time. Any login session which is violating the restrictions in \fI/etc/porttime\fR is terminated. .SH FILES -\fI/etc/porttime\fR \ - login and port permissions +\fI/etc/porttime\fR \- login and port permissions .br -\fI/var/run/utmp\fR \ - current login sessions +\fI/var/run/utmp\fR \- current login sessions .SH AUTHOR Julianne Frances Haugh (jockgrrl@ix.netcom.com) diff --git a/man/mkpasswd.8 b/man/mkpasswd.8 index 7569dead..7802a709 100644 --- a/man/mkpasswd.8 +++ b/man/mkpasswd.8 @@ -1,4 +1,4 @@ -.\"$Id: mkpasswd.8,v 1.11 2004/08/09 17:39:42 kloczek Exp $ +.\"$Id: mkpasswd.8,v 1.14 2005/04/12 17:55:55 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -29,43 +29,43 @@ .SH NAME mkpasswd \- Update passwd and group database files .SH SYNOPSIS -\fBmkpasswd\fR [\fB-fvgps\fR] \fIfile\fR +\fBmkpasswd\fR [\fB\-fvgps\fR] \fIfile\fR .SH DESCRIPTION \fBmkpasswd\fR reads the file in the format given by the flags and converts it to the corresponding database file format. These database files are used to improve access performance on systems with large numbers of users. The output files will be named \fIfile\fR.dir and \fIfile\fR.pag. .PP -The \fB-f\fR option causes \fBmkpasswd\fR to ignore any existing output +The \fB\-f\fR option causes \fBmkpasswd\fR to ignore any existing output files and overwrite them. Normally \fBmkpasswd\fR complains about existing output files and quits. .PP -The \fB-v\fR option causes \fBmkpasswd\fR to output information about each +The \fB\-v\fR option causes \fBmkpasswd\fR to output information about each record as it is converted, with a final message at the very end. .PP -The \fB-g\fR option treats the input file as though it were in -\fI/etc/group\fR file format. When combined with the \fB-s\fR option, the +The \fB\-g\fR option treats the input file as though it were in +\fI/etc/group\fR file format. When combined with the \fB\-s\fR option, the \fI/etc/gshadow\fR file format is used instead. .PP -The \fB-p\fR option treats the input file as though it were in +The \fB\-p\fR option treats the input file as though it were in \fI/etc/passwd\fR file format. This is the default. When combined with the -\fB-s\fR option, the \fI/etc/shadow\fR file format is used instead. +\fB\-s\fR option, the \fI/etc/shadow\fR file format is used instead. .SH CAVEATS The use of more than one database file is limited to systems which include the NDBM database library and therefore may not be available on every system. .SH NOTE Since most commands are capable of updating the database files as changes -are made, this command need only be used when re-creating a deleted or +are made, this command need only be used when re\-creating a deleted or corrupted database file. .SH FILES -\fI/etc/passwd\fR \ - user account information +\fI/etc/passwd\fR \- user account information .br -\fI/etc/shadow\fR \ - shadow user information +\fI/etc/shadow\fR \- secure user account information .br -\fI/etc/group\fR \ - group information +\fI/etc/group\fR \- group account information .br -\fI/etc/gshadow\fR \ - shadow group information +\fI/etc/gshadow\fR \- shadow group information .SH SEE ALSO .BR group (5), .BR passwd (5), diff --git a/man/newgrp.1 b/man/newgrp.1 index 6e2db4c4..7dec9d29 100644 --- a/man/newgrp.1 +++ b/man/newgrp.1 @@ -1,4 +1,4 @@ -.\"$Id: newgrp.1,v 1.15 2004/12/11 20:05:01 kloczek Exp $ +.\"$Id: newgrp.1,v 1.23 2005/04/12 18:08:46 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -31,9 +31,9 @@ newgrp \- log in to a new group .br sg \- execute command as different group ID .SH SYNOPSIS -\fBnewgrp\fR [\fB-\fR] [\fIgroup\fR] +\fBnewgrp\fR [\fB\-\fR] [\fIgroup\fR] .br -\fBsg\fR [\fB-\fR] [\fIgroup\fR [[\fB-c\fR] \fIcommand\fR]] +\fBsg\fR [\fB\-\fR] [\fIgroup\fR [[\fB\-c\fR] \fIcommand\fR]] .SH DESCRIPTION \fBnewgrp\fR is used to change the current group ID during a login session. If the optional \fB\-\fR flag is given, the user's environment will be @@ -41,26 +41,38 @@ reinitialized as though the user had logged in, otherwise the current environment, including current working directory, remains unchanged. .PP \fBnewgrp\fR changes the current real group ID to the named group, or to the -default group listed in \fI/etc/passwd\fR if no group name is given. The -user will be prompted for a password if she do not have a password and the -group does, or if the user is not listed as a member and the group has a -password. The user will be denied access if the group password is empty and -the user is not listed as a member. +default group listed in \fI/etc/passwd\fR if no group name is given. +\fBnewgrp\fR also tries to add the group to the user groupset. If not root, +the user will be prompted for a password if she do not have a password and +the group does, or if the user is not listed as a member and the group has +a password. The user will be denied access if the group password is empty +and the user is not listed as a member. +If compiled with SHADOWPWD (respectively SHADOWGRP) defined, the password +of the user (respectively, the password and the members of the group) will +be overwritten by the value defined in \fI/etc/shadow\fR (respectively in +\fI/etc/gshadow\fR) if an entry exists for this user (resp. group). .PP The \fBsg\fR command works similar to \fBnewgrp\fR but accepts a command. -The command will be executed with the Bourne shell. With most shells you -may run \fBsg\fR from, you need to enclose multi-word commands in quotes. +The command will be executed with the \fB/bin/sh\fR shell. With most shells you +may run \fBsg\fR from, you need to enclose multi\-word commands in quotes. Another difference between \fBnewgrp\fR and \fBsg\fR is that some shells treat \fBnewgrp\fR specially, replacing themselves with a new instance of a shell that \fBnewgrp\fR creates. This doesn't happen with \fBsg\fR, so upon exit from a \fBsg\fR command you are returned to your previous group ID. .SH FILES -\fI/etc/passwd\fR \- user account information +\fI/etc/passwd\fR \- user account information .br -\fI/etc/group\fR \- group information +\fI/etc/shadow\fR \- secure user account information +.br +\fI/etc/group\fR \- group account information +.br +\fI/etc/gshadow\fR \- shadow group file .SH SEE ALSO .BR id (1), .BR login (1), -.BR su (1) +.BR su (1), +.BR gpasswd (1), +.BR group (5), +.BR gshadow (5) .SH AUTHOR Julianne Frances Haugh diff --git a/man/newusers.8 b/man/newusers.8 index 89c38570..cca39aa5 100644 --- a/man/newusers.8 +++ b/man/newusers.8 @@ -1,4 +1,4 @@ -.\"$Id: newusers.8,v 1.13 2004/12/12 20:31:57 kloczek Exp $ +.\"$Id: newusers.8,v 1.14 2005/04/02 16:10:24 kloczek Exp $ .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -27,11 +27,11 @@ .\" SUCH DAMAGE. .TH NEWUSERS 8 .SH NAME -newusers - update and create new users in batch +newusers \- update and create new users in batch .SH SYNOPSIS \fBnewusers\fR [\fInew_users\fR] .SH DESCRIPTION -\fBnewusers\fR reads a file of user name and clear-text password pairs and +\fBnewusers\fR reads a file of user name and clear\-text password pairs and uses this information to update a group of existing users or to create new users. Each line is in the same format as the standard password file (see \fBpasswd\fR(5)) with the following exceptions. @@ -42,7 +42,7 @@ password. This field will be ignored for shadow passwords if the user already exists. .IP "\fIpw_gid\fR" This field may be the name of an existing group, in which case the named -user will be added as a member. If a non-existent numerical group is given, +user will be added as a member. If a non\-existent numerical group is given, a new group will be created having this number. .IP "\fIpw_dir\fR" This field will be checked for existence as a directory and a new directory diff --git a/man/passwd.1 b/man/passwd.1 index b37e8b42..6245cc7a 100644 --- a/man/passwd.1 +++ b/man/passwd.1 @@ -1,4 +1,4 @@ -.\"$Id: passwd.1,v 1.17 2004/10/29 15:48:21 kloczek Exp $ +.\" $Id: passwd.1,v 1.24 2005/04/15 19:17:20 kloczek Exp $ .\" Copyright 1989 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -29,14 +29,14 @@ .SH NAME passwd \- change user password .SH SYNOPSIS -\fBpasswd\fR [\fB-f\fR|\fB-s\fR] [\fIname\fR] +\fBpasswd\fR [\fB\-f\fR|\fB\-s\fR] [\fIname\fR] .br -\fBpasswd\fR [\fB-g\fR] [\fB-r\fR|\fB-R\fR] \fIgroup\fR +\fBpasswd\fR [\fB\-g\fR] [\fB\-r\fR|\fB\-R\fR] \fIgroup\fR .br -\fBpasswd\fR [\fB-x \fImax\fR] [\fB-n \fImin\fR] -[\fB-w \fIwarn\fR] [\fB-i \fIinact\fR] \fIlogin\fR +\fBpasswd\fR [\fB\-x\fR \fImax\fR] [\fB\-n\fR \fImin\fR] +[\fB\-w\fR \fIwarn\fR] [\fB\-i\fR \fIinact\fR] \fIlogin\fR .br -\fBpasswd\fR {\fB-l\fR|\fB-u\fR|\fB-d\fR|\fB-S\fR|\fB-e\fR} \fIlogin\fR +\fBpasswd\fR {\fB\-l\fR|\fB\-u\fR|\fB\-d\fR|\fB\-S\fR|\fB\-e\fR} \fIlogin\fR .SH DESCRIPTION \fBpasswd\fR changes passwords for user and group accounts. A normal user may only change the password for his/her own account, the super user may @@ -45,10 +45,10 @@ the password for the group. \fBpasswd\fR also changes account information, such as the full name of the user, user's login shell, or password expiry date and interval. .PP -The \fB-s\fR option makes passwd call chsh to change the user's shell. The -\fB-f\fR option makes passwd call chfn to change the user's gecos -information. These two options are only meant for compatiblity, since the -other programs can be called directly. +The \fB\-s\fR option makes \fBpasswd\fR call \fBchsh\fR to change the user's +shell. The \fB\-f\fR option makes passwd call chfn to change the user's +gecos information. These two options are only meant for compatiblity, since +the other programs can be called directly. .SS Password Changes The user is first prompted for his/her old password, if one is present. This password is then encrypted and compared against the stored password. The @@ -79,51 +79,54 @@ If the password is accepted, \fBpasswd\fR will prompt again and compare the second entry against the first. Both entries are required to match in order for the password to be changed. .SS Group passwords -When the \fB-g\fR option is used, the password for the named group is +When the \fB\-g\fR option is used, the password for the named group is changed. The user must either be the super user, or a group administrator for the named group. The current group password is not prompted for. The -\fB-r\fR option is used with the \fB-g\fR option to remove the current +\fB\-r\fR option is used with the \fB\-g\fR option to remove the current password from the named group. This allows group access to all members. The -\fB-R\fR option is used with the \fB-g\fR option to restrict the named group +\fB\-R\fR option is used with the \fB\-g\fR option to restrict the named group for all users. - .SS Password expiry information The password aging information may be changed by the super user with the -\fB-x\fR, \fB-n\fR, \fB-w\fR, and \fB-i\fR options. The \fB-x\fR option is +\fB\-x\fR, \fB\-n\fR, \fB\-w\fR, and \fB\-i\fR options. The \fB\-x\fR option is used to set the maximum number of days a password remains valid. After -\fImax\fR days, the password is required to be changed. The \fB-n\fR option +\fImax\fR days, the password is required to be changed. The \fB\-n\fR option is used to set the minimum number of days before a password may be changed. The user will not be permitted to change the password until \fImin\fR days -have elapsed. The \fB-w\fR option is used to set the number of days of +have elapsed. The \fB\-w\fR option is used to set the number of days of warning the user will receive before his/her password will expire. The warning occurs \fIwarn\fR days before the expiration, telling the user how -many days remain until the password is set to expire. The \fB-i\fR option is +many days remain until the password is set to expire. The \fB\-i\fR option is used to disable an account after the password has been expired for a number of days. After a user account has had an expired password for \fIinact\fR days, the user may no longer sign on to the account. .PP If you wish to immediately expire an account's password, you can use the -\fB-e\fR option. This in effect can force a user to change his/her password at -the user's next login. You can also use the \fB-d\fR option to delete a user's +\fB\-e\fR option. This in effect can force a user to change his/her password at +the user's next login. You can also use the \fB\-d\fR option to delete a user's password (make it empty). Use caution with this option since it can make an account not require a password at all to login, leaving your system open to intruders. .SS Account maintenance -User accounts may be locked and unlocked with the \fB-l\fR and \fB-u\fR -flags. The \fB-l\fR option disables an account by changing the password to -a value which matches no possible encrypted value. The \fB-u\fR option -re-enables an account by changing the password back to its previous value. +User accounts may be locked and unlocked with the \fB\-l\fR and \fB\-u\fR +flags. The \fB\-l\fR option disables an account by changing the password to +a value which matches no possible encrypted value. The \fB\-u\fR option +re\-enables an account by changing the password back to its previous value. .PP -The account status may be given with the \fB-S\fR option. The status -information consists of 6 parts. The first part indicates if the user -account is locked (L), has no password (NP), or has a usable password (P). -The second part gives the date of the last password change. The next four -parts are the minimum age, maximum age, warning period, and inactivity -period for the password. +The account status may be viewed with the \fB-S\fR option. +The status information consists of 7 fields. +The first field is the user's login name. +The second field indicates if the user account is locked (L), has no +password (NP), or has a usable password (P). +The third field gives the date of the last password change. +The next four fields are the minimum age, maximum age, warning period, +and inactivity period for the password. +These ages are expressed in days. +See \fBPassword expiry information\fR above for a discussion of these fields. .SS Hints for user passwords The security of a password depends upon the strength of the encryption algorithm and the size of the key space. -The \fB\s-2UNIX\s+2\fR System encryption method is based on +The \fB\s\-2UNIX\s+2\fR System encryption method is based on the NBS DES algorithm and is very secure. The size of the key space depends upon the randomness of the password which is selected. @@ -159,7 +162,7 @@ passwords and not rely exclusively on the methods given here. .SS Notes about group passwords Group passwords are an inherent security problem since more than one person is permitted to know the password. However, groups are a useful tool for -permitting co-operation between different users. +permitting co\-operation between different users. .SH CAVEATS Not all options may be supported. Password complexity checking may vary from site to site. @@ -170,7 +173,7 @@ is enabled and they are not logged into the NIS server. .SH FILES \fI/etc/passwd\fR \- user account information .br -\fI/etc/shadow\fR \- encrypted user passwords +\fI/etc/shadow\fR \- secure user account information .SH EXIT VALUES .TP 2 The \fBpasswd\fR command exits with the following values: @@ -189,6 +192,7 @@ The \fBpasswd\fR command exits with the following values: \fB6\fR \- invalid argument to option .SH "SEE ALSO" .BR group (5), -.BR passwd (5) +.BR passwd (5), +.BR shadow (5) .SH AUTHOR Julianne Frances Haugh diff --git a/man/passwd.5 b/man/passwd.5 index 84854614..21bbb6c2 100644 --- a/man/passwd.5 +++ b/man/passwd.5 @@ -1,4 +1,4 @@ -.\"$Id: passwd.5,v 1.13 2004/12/11 20:05:01 kloczek Exp $ +.\"$Id: passwd.5,v 1.15 2005/04/02 16:10:24 kloczek Exp $ .\" Copyright 1989 - 1990, Julianne Frances Haugh .\" All rights reserved. .\" @@ -48,9 +48,13 @@ User command interpreter .PP The password field may not be filled if shadow passwords have been enabled. If shadow passwords are being used, the encrypted password will be found in -\fI/etc/shadow\fR. The encrypted password consists of 13 characters from the -64 character alphabet a thru z, A thru Z, 0 thru 9, \. and /. Refer to -\fBcrypt\fR(3) for details on how this string is interpreted. +\fI/etc/shadow\fR. The encrypted password consists of characters from the +64 characters alphabet a thru z, A thru Z, 0 thru 9, \. and /. Optionally it +can start with a "$" character. This means the encrypted password was generated +using another (not DES) algorithm. For example if it starts with "$1$" it means +the MD5\-based algorithm was used. +.PP +Refer to \fBcrypt\fR(3) for details on how this string is interpreted. .PP The comment field is used by various system utilities, such as \fBfinger\fR(1). Three additional values may be present in the comment @@ -76,7 +80,7 @@ language interpreter, or the name of the initial program to execute. \fBSHELL\fR environmental variable. If this field is empty, it defaults to the value \fB/bin/sh\fR. .SH FILES -\fI/etc/passwd\fR \ - user account information +\fI/etc/passwd\fR \- user account information .SH SEE ALSO .BR login (1), .BR passwd (1), diff --git a/man/pl/Makefile.in b/man/pl/Makefile.in index 7b981fbd..29634c48 100644 --- a/man/pl/Makefile.in +++ b/man/pl/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.4 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -89,17 +89,16 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ 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@ @@ -233,9 +232,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/pl/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/pl/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/pl/Makefile + $(AUTOMAKE) --foreign man/pl/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/man/pl/chage.1 b/man/pl/chage.1 index 537df5a4..c82b7aaa 100644 --- a/man/pl/chage.1 +++ b/man/pl/chage.1 @@ -1,5 +1,4 @@ -.\" $Id: chage.1,v 1.9 2004/11/02 19:28:32 kloczek Exp $ -.\" {PTM/WK/1999-09-16} +.\" $Id: chage.1,v 1.12 2005/04/13 22:51:13 kloczek Exp $ .\" Copyright 1990 - 1994 Julianne Frances Haugh .\" All rights reserved. .\" @@ -32,50 +31,52 @@ chage \- zmiana informacji o terminie wa .SH SKｘDNIA .TP 6 \fBchage\fR -[\fB-m \fImindni\fR] [\fB-M \fImaxdni\fR] -[\fB-d \fIostatni\fR] [\fB-I \fInieaktywne\fR] +[\fB\-m\fR \fImindni\fR] [\fB\-M\fR \fImaxdni\fR] +[\fB\-d\fR \fIostatni\fR] [\fB\-I\fR \fInieaktywne\fR] .br -[\fB-E \fIdata_wa積o軼i\fR] [\fB-W \fIdni_ostrzegania\fR] \fIu篡tkownik\fR +[\fB\-E\fR \fIdata_wa積o軼i\fR] [\fB\-W\fR \fIdni_ostrzegania\fR] \fIu篡tkownik\fR .TP 6 \fBchage\fR -\fB-l \fIu篡tkownik\fR +\fB\-l\fR \fIu篡tkownik\fR .SH OPIS \fBchage\fR zmienia liczb dni pomi璠zy zmianami has豉 i dat ostatniej zmiany has豉. Informacj t system wykorzystuje do ustalenia, kiedy u篡tkownik musi zmieni has這. Polecenia \fBchage\fR mo瞠 u篡 tylko u篡tkownik root, za wyj徠kiem -opcji \fB-l\fR. Mo瞠 si ni pos逝篡 si u篡tkownik nieuprzywilejowany +opcji \fB\-l\fR. Mo瞠 si ni pos逝篡 si u篡tkownik nieuprzywilejowany do stwierdzenia, kiedy wygasa jego w豉sne has這 lub konto. .SH OPCJE Polecenie \fBchage\fR posiada nast瘼uj帷e opcje: -.IP "\fB-E\fR \fIdata_wa積o軼i\fR" +.IP "\fB\-E\fR \fIdata_wa積o軼i\fR" Ustawia dat, pocz患szy od kt鏎ej konto u篡tkownika nie b璠zie ju dost瘼ne. \fIdata_wa積o軼i\fR jest liczb dni od 1 stycznia 1970, od kt鏎ej konto jest -blokowane. Data mo瞠 by te wyra穎na w postaci RRRR-MM-DD (lub innej, +blokowane. Data mo瞠 by te wyra穎na w postaci RRRR\-MM\-DD (lub innej, powszechniej u篡wanej w danym regionie). U篡tkownik, kt鏎ego konto jest zablokowane musi skontaktowa si z administratorem systemu zanim b璠zie m鏬 z niego ponownie skorzysta. -.IP "\fB-I\fR \fInieaktywne\fR" -Opcja \fB-I\fR s逝篡 do ustawiania czasu nieaktywno軼i po wyga郾i璚iu +Przekazanie \fI-1\fR jako \fIdata_wa積o軼i\fR usuwa ograniczenie wa積o軼i +konta u篡tkownika. +.IP "\fB\-I\fR \fInieaktywne\fR" +Opcja \fB\-I\fR s逝篡 do ustawiania czasu nieaktywno軼i po wyga郾i璚iu has豉, po kt鏎ym konto jest blokowane. Parametr \fInieaktywne\fR podaje liczb dni nieaktywno軼i. Warto嗆 0 wy陰cza t funkcj. U篡tkownik, kt鏎ego konto jest zablokowane musi skontaktowa si z administratorem systemu zanim b璠zie m鏬 z niego ponownie skorzysta. -.IP "\fB-m\fR \fImindni\fR" +.IP "\fB\-m\fR \fImindni\fR" Utawia minimaln liczb dni pomi璠zy zmianami has豉 na warto嗆 fImindni\fR. Warto嗆 zerowa oznacza, 瞠 u篡tkownik mo瞠 je zmienia w dowolnym czasie. -.IP "\fB-M\fR \fImaxdni\fR" +.IP "\fB\-M\fR \fImaxdni\fR" Ustawia maksymaln liczb dni, przez jakie has這 jest wa積e na warto嗆 \fImaxdni\fR. Gdy \fImaxdni\fR plus \fIostatni\fR jest mniejsze ni bie膨cy dzie, u篡tkownik musi zmieni swoje has豉, zanim b璠zie m鏬 skorzysta z konta. Zdarzenie to mo瞠 by zaplanowane z wyprzedzeniem przez wykorzystanie -opcji \fB-W\fR, ostrzegaj帷ej zawczasu u篡tkownika o zbli瘸j帷ym si +opcji \fB\-W\fR, ostrzegaj帷ej zawczasu u篡tkownika o zbli瘸j帷ym si terminie zmiany. -.IP "\fB-M\fR \fIostatni\fR" +.IP "\fB\-M\fR \fIostatni\fR" Ustawia liczb dni od 1 stycznia 1970 do dnia kiedy ostatnio zmieniono has這 -na \fIostatni\fR. Data mo瞠 r闚nie zosta podana w postaci RRRR-MM-DD (lub +na \fIostatni\fR. Data mo瞠 r闚nie zosta podana w postaci RRRR\-MM\-DD (lub postaci powszechniej u篡wanej w danym regionie). -.IP "\fB-W\fR \fIdni_ostrzegania\fR" +.IP "\fB\-W\fR \fIdni_ostrzegania\fR" Ustawia na \fIdni_ostrzegania\fR liczb dni przed up造wem wa積o軼i has豉. Od tego dnia u篡tkownik b璠zie ostrzegany o nadchodz帷ym terminie zmiany has豉. diff --git a/man/pl/chfn.1 b/man/pl/chfn.1 index 57bae15e..cdc1e3b8 100644 --- a/man/pl/chfn.1 +++ b/man/pl/chfn.1 @@ -1,5 +1,4 @@ -.\" $Id: chfn.1,v 1.7 2003/04/26 13:24:15 kloczek Exp $ -.\" {PTM/WK/1999-09-25} +.\" $Id: chfn.1,v 1.9 2005/04/05 18:47:51 kloczek Exp $ .\" Copyright 1990 - 1994 Julianne Frances Haugh .\" All rights reserved. .\" @@ -32,9 +31,9 @@ chfn \- zmiana rzeczywistej nazwy u .SH SKｘDNIA .TP 5 \fBchfn\fR -[\fB-f \fIpe軟a_nazwa\fR] [\fB-r \fInr_pokoju\fR] +[\fB\-f\fR \fIpe軟a_nazwa\fR] [\fB\-r\fR \fInr_pokoju\fR] .br -[\fB-w \fR \fItel_s逝瘺\fR] [\fB-h \fItel_dom\fR] [\fB-o \fIinne\fR] +[\fB\-w\fR \fItel_s逝瘺\fR] [\fB\-h\fR \fItel_dom\fR] [\fB\-o\fR \fIinne\fR] [\fIu篡tkownik\fR] .SH OPIS \fBchfn\fR zmienia pe軟 nazw (imi i nazwisko), telefon s逝瘺owy i domowy @@ -42,7 +41,7 @@ dla danego konta u \fBfinger\fR(1) i podobne mu programy. Zwyk造 u篡tkownik mo瞠 zmienia wy陰cznie pola opisuj帷e w豉sne konto. Tylko superu篡tkownik mo瞠 zmienia pola dla dowolnego konta. -R闚nie tylko superu篡tkownik mo瞠 pos逝篡 si opcj \fB-o\fR by zmieni +R闚nie tylko superu篡tkownik mo瞠 pos逝篡 si opcj \fB\-o\fR by zmieni niezdefiniowane cz窷ci pola GECOS. .PP Jedynym ograniczeniem nak豉danym na zawarto嗆 p鏊 jest zakaz u篡wania w nich diff --git a/man/pl/chpasswd.8 b/man/pl/chpasswd.8 index 223bd849..68942894 100644 --- a/man/pl/chpasswd.8 +++ b/man/pl/chpasswd.8 @@ -1,5 +1,4 @@ -.\" $Id: chpasswd.8,v 1.7 2004/12/13 01:24:14 kloczek Exp $ -.\" {PTM/WK/1999-09-16} +.\" $Id: chpasswd.8,v 1.8 2005/04/05 18:47:51 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -28,9 +27,9 @@ .\" SUCH DAMAGE. .TH CHPASSWD 8 .SH NAZWA -\fBchpasswd\fR - wsadowa aktualizacja pliku hase +\fBchpasswd\fR \- wsadowa aktualizacja pliku hase .SH SKｘDNIA -\fBchpasswd\fR [\fI-e\fR] +\fBchpasswd\fR [\fI\-e\fR] .SH OPIS \fBchpasswd\fR odczytuje pary danych (u篡tkownik i has這) ze standardowego wej軼ia. Odczytane informacje wykorzystywane s do aktualizacji danych o @@ -47,11 +46,11 @@ Polecenie to przeznaczone jest do u si wiele kont naraz. .SH OPCJE Polecenie \fBchpasswd\fR posiada nast瘼uj帷e opcje: -.IP "\fB-e\fR, \fB--encrypted\fR" +.IP "\fB\-e\fR, \fB\-\-encrypted\fR" Dostarczone na standardowe wej軼ie has豉 s traktowane jako ju zakodowane. -.IP "\fB-h\fR, \fB--help\fR" +.IP "\fB\-h\fR, \fB\-\-help\fR" Wy鈍ietla kr鏒k informacj o tym jak u篡wa program i zako鎍zy prac. -.IP "\fB-m\fR, \fB--md5\fR" +.IP "\fB\-m\fR, \fB\-\-md5\fR" Je瞠li dpostarczane has豉 s w postaci jawnej u篡j kodowania MD5 zamiast domy郵nego DES. .SH PRZESTROGI diff --git a/man/pl/chsh.1 b/man/pl/chsh.1 index c1ab0af7..0cbac308 100644 --- a/man/pl/chsh.1 +++ b/man/pl/chsh.1 @@ -1,5 +1,4 @@ -.\" $Id: chsh.1,v 1.8 2004/11/02 19:28:32 kloczek Exp $ -.\" {PTM/WK/1999-09-25} +.\" $Id: chsh.1,v 1.10 2005/04/05 18:47:51 kloczek Exp $ .\" Copyright 1990, Julianne Frances Haugh .\" All rights reserved. .\" @@ -32,7 +31,7 @@ chsh \- zmiana pow .SH SKｘDNIA .TP 5 \fBchsh\fR -[\fB-s \fIpow這ka\fR] [\fIu篡tkownik\fR] +[\fB\-s\fR \fIpow這ka\fR] [\fIu篡tkownik\fR] .SH OPIS \fBchsh\fR zmienia pow這k zg這szeniow u篡tkownika. Okre郵a nazw pocz徠kowego polecenia zg這szeniowego u篡tkownika. @@ -41,14 +40,14 @@ superu .PP Jedynym ograniczeniem na這穎nym na pow這k zg這szeniow jest to, 瞠 jej nazwa musi by wymieniona w \fI/etc/shells\fR, chyba 瞠 polecenie \fBchsh\fR -wywo造wane jest przez superu篡tkownika - w闚czas mo瞠 by podana dowolna +wywo造wane jest przez superu篡tkownika \- w闚czas mo瞠 by podana dowolna nazwa. U篡tkownicy kont z ograniczon pow這k logowania nie mog jej zmienia. Odradza si z tego powodu umieszczanie \fB/bin/rsh\fR w pliku \fI/etc/shells\fR, gdy przypadkowa zmiana na pow這k ograniczon uniemo磧iwi u篡tkownikowi jak彗olwiek zmian pow這ki logowania, nawet z powrotem na dotychczasow. .SH OPCJE -Je瞠li nie podano opcji \fB-s\fR, to \fBchsh\fR dzia豉 w trybie interaktywnym, +Je瞠li nie podano opcji \fB\-s\fR, to \fBchsh\fR dzia豉 w trybie interaktywnym, proponuj帷 u篡tkownikowi bie膨c pow這k logowania. Wprowadzenie nowej warto軼i powoduje zmian pow這ki, a podanie warto軼i pustej pozostawia bie膨c pow這k. Bie膨ca pow這ka wy鈍ietlana jest w nawiasach \fB[ ]\fR. diff --git a/man/pl/expiry.1 b/man/pl/expiry.1 index 236b4c75..cbd2c6f5 100644 --- a/man/pl/expiry.1 +++ b/man/pl/expiry.1 @@ -1,4 +1,4 @@ -.\" $Id: expiry.1,v 1.3 2003/04/26 13:24:15 kloczek Exp $ +.\" $Id: expiry.1,v 1.4 2005/04/05 18:47:51 kloczek Exp $ .\" Copyright 1990 - 1994 Julianne Frances Haugh .\" All rights reserved. .\" Modified for expiry by Ben Collins , 1999 @@ -26,16 +26,15 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.\" .TH EXPIRY 1 .SH NAZWA expiry \- sprawdzenie wa積o軼i i wymuszenie zmiany has豉 .SH SKｘDNIA .TP 6 -\fBexpiry\fR [\fB-c\fR] [\fB-f\fR] +\fBexpiry\fR [\fB\-c\fR] [\fB\-f\fR] .SH OPIS -\fBexpiry\fR sprawdza (\fB-c\fR), kiedy wyga郾ie aktualne has這 oraz wymusza -(\fB-f\fR) jego zmian, je郵i potrzeba. Mo瞠 ono by wywo造wane jako zwyk貫 +\fBexpiry\fR sprawdza (\fB\-c\fR), kiedy wyga郾ie aktualne has這 oraz wymusza +(\fB\-f\fR) jego zmian, je郵i potrzeba. Mo瞠 ono by wywo造wane jako zwyk貫 polecenie przez u篡tkownika. .SH PLIKI \fI/etc/passwd\fR \- informacje o kontach u篡tkownik闚 diff --git a/man/pl/faillog.5 b/man/pl/faillog.5 index e310a385..b4f98223 100644 --- a/man/pl/faillog.5 +++ b/man/pl/faillog.5 @@ -1,4 +1,4 @@ -.\"$Id: faillog.5,v 1.5 2003/01/07 14:25:35 kloczek Exp $ +.\" $Id: faillog.5,v 1.6 2005/04/05 18:47:51 kloczek Exp $ .\" Copyright 1989 - 1994, Julianne Frances Haugh .\" Translation (c) 1998 "Gwidon S. Naskrent" .\" All rights reserved. @@ -49,7 +49,7 @@ Struktura tego pliku to .DE .SH PLIKI -.IR /var/log/faillog " - rejestr nieudanych zalogowa" +\fI/var/log/faillog\fR \- rejestr nieudanych zalogowa .SH ZOBACZ TAK浩 .BR faillog (8) .SH AUTOR diff --git a/man/pl/faillog.8 b/man/pl/faillog.8 index e2659551..bcee001c 100644 --- a/man/pl/faillog.8 +++ b/man/pl/faillog.8 @@ -1,5 +1,4 @@ -.\" $Id: faillog.8,v 1.6 2004/12/11 16:49:34 kloczek Exp $ -.\" {PTM/WK/1999-09-18} +.\" $Id: faillog.8,v 1.8 2005/04/05 18:47:51 kloczek Exp $ .\" Copyright 1989 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -31,54 +30,54 @@ faillog \- sprawd faillog i ustaw limity b喚dnych logowa .SH SKｘDNIA .TP 8 -\fBfaillog\fR [\fB-u\fR \fInazwa\fR] [\fB-a\fR] [\fB-t\fR \fIdni\fR] -[\fB-m \fImax\fR] [\fB-pr\fR] +\fBfaillog\fR [\fB\-u\fR \fInazwa\fR] [\fB\-a\fR] [\fB\-t\fR \fIdni\fR] +[\fB\-m\fR \fImax\fR] [\fB\-pr\fR] .SH OPIS \fBfaillog\fR formatuje zawarto嗆 rejestru nieudanych pr鏏 rozpocz璚ia sesji, \fI/var/log/faillog\fR, oraz obs逝guje ograniczenia i liczniki b喚dnych pr鏏. Kolejno嗆 argument闚 \fBfaillog\fR jest znacz帷a. Ka盥y z argument闚 jest natychmiast przetwarzany w zadanej kolejno軼i. .SH OPCJE -Flaga \fB-p\fR powoduje, 瞠 zapisy o nieudanych logowaniach wy鈍ietlane b璠 +Flaga \fB\-p\fR powoduje, 瞠 zapisy o nieudanych logowaniach wy鈍ietlane b璠 w kolejno軼i rosn帷ych identyfikator闚 u篡tkownik闚 (UID). -Pos逝瞠nie si flag \fB-u \fInazwa\fR spowoduje, 瞠 zostanie wy鈍ietlony +Pos逝瞠nie si flag \fB\-u\fR \fInazwa\fR spowoduje, 瞠 zostanie wy鈍ietlony wy陰cznie zapis dotycz帷y u篡tkownika o tej \fInazwie\fR. -U篡cie \fB-t \fIdni\fR powoduje wy鈍ietlanie wy陰cznie nieudanych pr鏏 +U篡cie \fB\-t\fR \fIdni\fR powoduje wy鈍ietlanie wy陰cznie nieudanych pr鏏 logowania 鈍ie窺zych ni sprzed zadanej liczby \fIdni\fR. -Flaga \fB-t\fR uniewa積ia u篡cie \fB-u\fR. -Flaga \fB-a\fR powoduje wybranie wszystkich u篡tkownik闚. -W po陰czeniu z flag \fB-p\fR flag, opcja ta wybiera wszystkich u篡tkownik闚, +Flaga \fB\-t\fR uniewa積ia u篡cie \fB\-u\fR. +Flaga \fB\-a\fR powoduje wybranie wszystkich u篡tkownik闚. +W po陰czeniu z flag \fB\-p\fR flag, opcja ta wybiera wszystkich u篡tkownik闚, dla kt鏎ych kiedykolwiek odnotowano niepomy郵n pr鏏 logowania. -Opcja ta nie ma znaczenia w po陰czeniu z flag \fB-r\fR. +Opcja ta nie ma znaczenia w po陰czeniu z flag \fB\-r\fR. .PP -\fB-r\fR s逝篡 do zerowania licznika b喚dnych logowa. Do poprawnego dzia豉nia +\fB\-r\fR s逝篡 do zerowania licznika b喚dnych logowa. Do poprawnego dzia豉nia tej opcji wymagane jest prawo zapisu do \fI/var/log/faillog\fR. -W po陰czeniu z \fB-u \fInazwa\fR s逝篡 do zerowania licznika b喚d闚 u篡tkownika +W po陰czeniu z \fB\-u\fR \fInazwa\fR s逝篡 do zerowania licznika b喚d闚 u篡tkownika o podanej \fInazwie\fR. .PP -Flaga \fB-m\fR ustawia maksymaln liczb b喚d闚 logowania, po kt鏎ej konto +Flaga \fB\-m\fR ustawia maksymaln liczb b喚d闚 logowania, po kt鏎ej konto zostanie wy陰czone. Dla tej opcji wymagane jest prawo zapisu do \fI/var/log/faillog\fR. -Argumenty \fB-m \fImax\fR powoduj, 瞠 wszystkie konta b璠 wy陰czane po +Argumenty \fB\-m\fR \fImax\fR powoduj, 瞠 wszystkie konta b璠 wy陰czane po \fImax\fR nieudanych pr鏏ach logowania. -U篡cie dodatkowo \fB-u \fInazwa\fR, ogranicza dzia豉nie tej funkcji do +U篡cie dodatkowo \fB\-u\fR \fInazwa\fR, ogranicza dzia豉nie tej funkcji do u篡tkownika o podanej \fInazwie\fR. Pos逝瞠nie si zerow warto軼i \fImax\fR powoduje, 瞠 liczba nieudanych pr鏏 rozpocz璚ia sesji jest nieograniczona. Dla u篡tkownika \fBroot\fR maksymalna liczba niepowodze powinna by zawsze ustawiona na 0, by zapobiec atakom typu denial of service (odmowa obs逝gi). .PP -Opcje mog by 陰czone w praktycznie dowolny spos鏏. Ka盥a z opcji \fB-p\fR, -\fB-r\fR i \fB-m\fR powoduje natychmiastowe wykonanie przy u篡ciu modyfikatora -\fB-u\fR lub \fB-t\fR. +Opcje mog by 陰czone w praktycznie dowolny spos鏏. Ka盥a z opcji \fB\-p\fR, +\fB\-r\fR i \fB\-m\fR powoduje natychmiastowe wykonanie przy u篡ciu modyfikatora +\fB\-u\fR lub \fB\-t\fR. .SH PRZESTROGI \fBfaillog\fR wy鈍ietla wy陰cznie u篡tkownik闚, kt鏎zy od ostatniej nieudanej pr鏏y nie mieli poprawnych logowa. Chc帷 wy鈍ietli u篡tkownika, kt鏎y po ostatniej pora盧e logowa si ju -pomy郵nie, musisz jawnie za膨da o nim informacji przy pomocy flagi \fB-u\fR. -Mo瞠sz tak瞠 wy鈍ietli wszystkich u篡tkownik闚 pos逝guj帷 si flag \fB-a\fR. +pomy郵nie, musisz jawnie za膨da o nim informacji przy pomocy flagi \fB\-u\fR. +Mo瞠sz tak瞠 wy鈍ietli wszystkich u篡tkownik闚 pos逝guj帷 si flag \fB\-a\fR. .SH PLIKI -.IR /var/log/faillog " - plik rejestracji b喚d闚 logowania" +\fI/var/log/faillog\fR \- plik rejestracji b喚d闚 logowania .SH ZOBACZ TAK浩 .BR login (1), .BR faillog (5) diff --git a/man/pl/gpasswd.1 b/man/pl/gpasswd.1 index 87dce071..61ae6173 100644 --- a/man/pl/gpasswd.1 +++ b/man/pl/gpasswd.1 @@ -1,5 +1,4 @@ -.\" $Id: gpasswd.1,v 1.5 2003/04/26 13:24:15 kloczek Exp $ -.\" {PTM/WK/1999-09-16} +.\" $Id: gpasswd.1,v 1.7 2005/04/05 18:47:51 kloczek Exp $ .\" Copyright 1996, Rafal Maszkowski .\" All rights reserved. You can redistribute this man page and/or .\" modify it under the terms of the GNU General Public License as @@ -11,32 +10,32 @@ gpasswd \- administracja plikiem /etc/group .br .SH SKｘDNIA -\fBgpasswd \fIgrupa\fR +\fBgpasswd\fR \fIgrupa\fR .br -\fBgpasswd -a \fIu篡tkownik grupa\fR +\fBgpasswd \-a\fR \fIu篡tkownik grupa\fR .br -\fBgpasswd -d \fIu篡tkownik grupa\fR +\fBgpasswd \-d\fR \fIu篡tkownik grupa\fR .br -\fBgpasswd -R \fIgrupa\fR +\fBgpasswd \-R\fR \fIgrupa\fR .br -\fBgpasswd -r \fIgrupa\fR +\fBgpasswd \-r\fR \fIgrupa\fR .br -\fBgpasswd\fR [\fB-A \fIu篡tkownik\fR,...] [\fB-M \fIu篡tkownik\fR,...] \fIgrupa\fR +\fBgpasswd\fR [\fB\-A\fR \fIu篡tkownik\fR,...] [\fB\-M\fR \fIu篡tkownik\fR,...] \fIgrupa\fR .SH OPIS \fBgpasswd\fR s逝篡 do administrowania plikiem /etc/group (oraz \fI/etc/gshadow\fR je郵i zosta豉 wykonana kompilacja ze zdefiniowanym SHADOWGRP). Ka盥a z grup mo瞠 posiada administrator闚, cz這nk闚 i has這. -Administrator systemu mo瞠 pos逝篡 si opcj \fB-A\fR do zdefiniowania -administratora(-闚) grupy oraz opcj \fB-M\fR do zdefiniowania jej cz這nk闚. +Administrator systemu mo瞠 pos逝篡 si opcj \fB\-A\fR do zdefiniowania +administratora(\-闚) grupy oraz opcj \fB\-M\fR do zdefiniowania jej cz這nk闚. Posiada on wszystkie prawa administrator闚 i cz這nk闚 grup. .PP Administrator grupy mo瞠 dodawa i usuwa u篡tkownik闚 przy pomocy, -odpowiednio, opcji \fB-a\fR i \fB-d\fR. Administratorzy mog te u篡wa opcji -\fB-r\fR w celu usuni璚ia has豉 grupy. Je瞠li grupa nie posiada has豉, +odpowiednio, opcji \fB\-a\fR i \fB\-d\fR. Administratorzy mog te u篡wa opcji +\fB\-r\fR w celu usuni璚ia has豉 grupy. Je瞠li grupa nie posiada has豉, to polecenia .BR newgrp (1) do przy陰czenia si do grupy mog u篡wa tylko jej cz這nkowie. -Opcja \fB-R\fR wy陰cza dost瘼 do grupy za pomoc polecenia +Opcja \fB\-R\fR wy陰cza dost瘼 do grupy za pomoc polecenia .BR newgrp (1). .PP .B gpasswd @@ -44,7 +43,6 @@ wywo Je瞠li has這 jest ustawione, to cz這nkowie grupy mog nadal wykonywa .BR newgrp (1) bez has豉, inni musz natomiast poda has這. - .SH PLIKI \fI/etc/group\fR \- informacja o grupach .br diff --git a/man/pl/groupadd.8 b/man/pl/groupadd.8 index dc3fff0c..67ccf99c 100644 --- a/man/pl/groupadd.8 +++ b/man/pl/groupadd.8 @@ -1,5 +1,4 @@ -.\" $Id: groupadd.8,v 1.13 2004/11/04 03:06:32 kloczek Exp $ -.\" {PTM/WK/0.1/VIII-1999} +.\" $Id: groupadd.8,v 1.14 2005/04/05 18:47:51 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -28,9 +27,9 @@ .\" SUCH DAMAGE. .TH GROUPADD 8 .SH NAZWA -groupadd - tw鏎z now grup +groupadd \- tw鏎z now grup .SH SKｘDNIA -\fBgroupadd\fR [\fB-g\fR \fIgid\fR [\fB-o\fR]] [\fB-f\fR] \fIgrupa\fR +\fBgroupadd\fR [\fB\-g\fR \fIgid\fR [\fB\-o\fR]] [\fB\-f\fR] \fIgrupa\fR .SH OPIS Polecenie \fBgroupadd\fR tworzy nowe konto grupy pos逝guj帷 si warto軼iami podanymi w wierszu polece i domy郵nymi warto軼iami z systemu. @@ -38,14 +37,14 @@ W razie potrzeby zostanie wprowadzona do systemu nowa grupa. .SH OPCJE Polecenie \fBgroupadd\fR posiada nast瘼uj帷e opcje: .TP -.BI -f +.BI \-f Ta opcja powoduje zako鎍zenie programu ze statusem oznaczaj帷ym sukces je郵i -podana groupa ju istnieje. Z opcj \fB-g\fR, je郵i podany gid ju istnieje, -wybierany jest inny (unikalny) gid (czyli \fB-g\fR jest wy陰czane). +podana groupa ju istnieje. Z opcj \fB\-g\fR, je郵i podany gid ju istnieje, +wybierany jest inny (unikalny) gid (czyli \fB\-g\fR jest wy陰czane). .TP -.BI -g " gid" +.BI \-g " gid" Numeryczna warto嗆 identyfikatora grupy. Warto嗆 ta musi by niepowtarzalna, -chyba 瞠 u篡to opcji \fB-o\fR. Warto嗆 ID grupy nie mo瞠 by ujemna. Domy郵nie +chyba 瞠 u篡to opcji \fB\-o\fR. Warto嗆 ID grupy nie mo瞠 by ujemna. Domy郵nie u篡wana jest najmniejsza warto嗆 identyfikatora wi瘯sza ni 999 a wi瘯sza ni jakiejkolwiek innej grupy. Warto軼i mi璠zy 0 a 999 s zwykle zarezerwowane dla kont systemowych. @@ -63,7 +62,7 @@ Polecenie \fBgroupadd\fR ko .br \fB3\fR \- niew豉軼iwe parametry opcji .br -\fB4\fR \- uid jest ju u篡wany (i nie u篡to opcji -o) +\fB4\fR \- uid jest ju u篡wany (i nie u篡to opcji \-o) .br \fB9\fR \- nazwa groupy nie jest unikalna .br diff --git a/man/pl/groupdel.8 b/man/pl/groupdel.8 index 27f11725..367295fe 100644 --- a/man/pl/groupdel.8 +++ b/man/pl/groupdel.8 @@ -1,5 +1,4 @@ -.\" $Id: groupdel.8,v 1.7 2003/04/28 17:52:15 kloczek Exp $ -.\" {PTM/WK/0.1/VIII-1999} +.\" $Id: groupdel.8,v 1.8 2005/04/05 18:47:51 kloczek Exp $ .\" Copyright 1991 - 1993, Julianne Frances Haugh .\" All rights reserved. .\" @@ -28,7 +27,7 @@ .\" SUCH DAMAGE. .TH GROUPDEL 8 .SH NAZWA -groupdel - usu grup +groupdel \- usu grup .SH SKｘDNIA \fBgroupdel\fR \fIgrupa\fR .SH OPIS diff --git a/man/pl/groupmod.8 b/man/pl/groupmod.8 index 99fca5bd..e5a15853 100644 --- a/man/pl/groupmod.8 +++ b/man/pl/groupmod.8 @@ -1,5 +1,4 @@ -.\" $Id: groupmod.8,v 1.11 2004/12/12 20:58:26 kloczek Exp $ -.\" {PTM/WK/0.1/VIII-1999} +.\" $Id: groupmod.8,v 1.13 2005/04/05 18:47:51 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -28,27 +27,27 @@ .\" SUCH DAMAGE. .TH GROUPMOD 8 .SH NAZWA -groupmod - zmie dane grupy +groupmod \- zmie dane grupy .SH SKｘDNIA -\fBgroupmod\fR [\fB-g\fR \fIGID\fR [\fB-o\fR]] [\fB-n\fR \fINOWA_NAZWA_GRUPY\fR] +\fBgroupmod\fR [\fB\-g\fR \fIGID\fR [\fB\-o\fR]] [\fB\-n\fR \fINOWA_NAZWA_GRUPY\fR] \fIGRUPA\fR .SH OPIS Polecenie \fBgroupmod\fR modyfikuje systemowe pliki kont tak, by odzwierciedli w nich zmiany grup podane w wierszu polece. .SH OPCJE Polecenie \fBgroupmod\fR posiada nast瘼uj帷e opcje: -.IP "\fB-g\fR \fIGID\fR" +.IP "\fB\-g\fR \fIGID\fR" Numeryczna warto嗆 identyfikatora grupy (group ID). Warto嗆 ta musi by -niepowtarzalna, chyba 瞠 u篡to opcji \fB-o\fR. Nie mo瞠 by ujemna. +niepowtarzalna, chyba 瞠 u篡to opcji \fB\-o\fR. Nie mo瞠 by ujemna. Warto軼i pomi璠zy 0 a 999 s zwykle zarezerwowane dla grup systemowych. Pliki, dla kt鏎ych stary identyfikator jest identyfikatorem grupy pliku, wymagaj r璚znej zmiany ID grupy. -.IP "\fB-n\fR \fINOWA_NAZWA_GRUPY\fR" +.IP "\fB\-n\fR \fINOWA_NAZWA_GRUPY\fR" Nazwa grupy zostanie zmieniona z \fIGRUPA\fR na \fINOWA_NAZWA_GRUPY\fR. .SH PLIKI \fI/etc/group\fR \- informacja o grupach .br -\fI/etc/gshadow\fI \- bezpieczna informacja o grupach +\fI/etc/gshadow\fR \- bezpieczna informacja o grupach .SH KOD ZAKO哸ZENIA .TP 2 Polecenie \fBgroupmod\fR ko鎍zy dzia豉nie z nast瘼uj帷ymi warto軼iami kod闚 zako鎍zenia: @@ -59,7 +58,7 @@ Polecenie \fBgroupmod\fR ko .br \fB3\fR \- niew豉軼iwe parametry opcji .br -\fB4\fR \- gid jest ju u篡wany (i nie u篡to opcji -o) +\fB4\fR \- gid jest ju u篡wany (i nie u篡to opcji \-o) .br \fB6\fR \- podana grupa nie istnieje .br diff --git a/man/pl/groups.1 b/man/pl/groups.1 index b46d1db9..9f77fd88 100644 --- a/man/pl/groups.1 +++ b/man/pl/groups.1 @@ -1,5 +1,4 @@ -.\" $Id: groups.1,v 1.8 2003/04/26 13:24:15 kloczek Exp $ -.\" {PRM/WK/1999-09-25} +.\" $Id: groups.1,v 1.9 2005/04/05 18:47:51 kloczek Exp $ .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" diff --git a/man/pl/grpck.8 b/man/pl/grpck.8 index f56e7b4c..90f98040 100644 --- a/man/pl/grpck.8 +++ b/man/pl/grpck.8 @@ -1,5 +1,4 @@ -.\" $Id: grpck.8,v 1.8 2004/08/09 17:39:42 kloczek Exp $ -.\" {PTM/WK/1999-09-17} +.\" $Id: grpck.8,v 1.9 2005/04/05 18:47:51 kloczek Exp $ .\" Copyright 1992 - 1993, Julianne Frances Haugh .\" All rights reserved. .\" @@ -30,7 +29,7 @@ .SH NAZWA grpck \- weryfikacja sp鎩no軼i plik闚 grup .SH SKｘDNIA -\fBgrpck\fR [\fB-r\fR] [\fIgroup shadow\fR] +\fBgrpck\fR [\fB\-r\fR] [\fIgroup shadow\fR] .SH OPIS \fBgrpck\fR weryfikuje integralno嗆 informacji autentykacji systemowej. Sprawdzane s wszystkie pozycje w plikach \fI/etc/group\fR @@ -42,12 +41,12 @@ si Kontrolowane jest czy ka盥a pozycja posiada: .sp .in +.5i -- w豉軼iw liczb p鏊 +\- w豉軼iw liczb p鏊 .br -- unikaln nazw grupy +\- unikaln nazw grupy .br -- poprawn list cz這nk闚 i administrator闚 -.in -.5i +\- poprawn list cz這nk闚 i administrator闚 +.in \-.5i .sp .P Kontrola w豉軼iwej liczby p鏊 i niepowtarzalnej nazwy grupy jest @@ -67,13 +66,13 @@ u Domy郵nie \fBgrpck\fR dzia豉 na plikach \fI/etc/group\fR oraz \fI/etc/gshadow\fR. Przy pomocy parametr闚 \fIgroup\fR i \fIshadow\fR u篡tkownik mo瞠 wybra inne pliki. -Dodatkowo, u篡tkownik mo瞠 wykona polecenie w trybie tylko-do-odczytu, poprzez -podanie flagi \fB-r\fR. +Dodatkowo, u篡tkownik mo瞠 wykona polecenie w trybie tylko\-do\-odczytu, poprzez +podanie flagi \fB\-r\fR. Powoduje to, 瞠 na wszystkie pytania dotycz帷e zmian zostanie, bez ingerencji u篡tkownika, u篡ta odpowied \fBnie\fR. \fBgrpck\fR mo瞠 by r闚nie u篡ty do sortowania pozycji w plikach \fI/etc/group\fR oraz \fI/etc/gshadow\fR wed逝g GID. By w陰czy tryb sortowania nale篡 przekaza -opcj \fB-s\fR. Nie s wtedy przeprowadzane 瘸dne kontrole, tylko sortowanie. +opcj \fB\-s\fR. Nie s wtedy przeprowadzane 瘸dne kontrole, tylko sortowanie. .SH PLIKI \fI/etc/group\fR \- informacja o kontach grup .br diff --git a/man/pl/id.1 b/man/pl/id.1 index 93eaed0e..7326ee27 100644 --- a/man/pl/id.1 +++ b/man/pl/id.1 @@ -1,5 +1,4 @@ -.\" $Id: id.1,v 1.8 2003/04/26 13:24:15 kloczek Exp $ -.\" {PTM/WK/1999-09-25} +.\" $Id: id.1,v 1.10 2005/04/05 18:47:51 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -28,21 +27,21 @@ .\" SUCH DAMAGE. .TH ID 1 .SH NAZWA -id - wy鈍ietlenie nazw bie膨cych ID u篡tkownika i grupy +id \- wy鈍ietlenie nazw bie膨cych ID u篡tkownika i grupy .SH SKｘDNIA -\fBid [\fB-a\fR] +\fBid\fR [\fB\-a\fR] .SH OPIS .B id wy鈍ietla bie膨ce nazwy (lub warto軼i) rzeczywistych i efektywnych identyfikator闚 u篡tkownika i grupy. Je瞠li dana warto嗆 nie posiada odpowiedniego wpisu w \fI/etc/passwd\fR lub \fI/etc/group\fR, to zostanie wy鈍ietlona bez odpowiedniej nazwy. -U篡vie opcji \fB-a\fR powoduje wy鈍ietlenie zestaw grup w systemach, kt鏎e +U篡vie opcji \fB\-a\fR powoduje wy鈍ietlenie zestaw grup w systemach, kt鏎e obs逝guj r闚noczesne cz這nkostwo w wielu grupach. .SH PLIKI -\fI/etc/passwd\fR \- informacja o kontach u篡tkownik闚 +\fI/etc/passwd\fR \- informacja o kontach u篡tkownik闚 .br -\fI/etc/group\fR \- informacja o grupach +\fI/etc/group\fR \- informacja o grupach .SH ZOBACZ TAK浩 .BR getgid (2), .BR getgroups (2), diff --git a/man/pl/lastlog.8 b/man/pl/lastlog.8 index 7921c139..57e1e99e 100644 --- a/man/pl/lastlog.8 +++ b/man/pl/lastlog.8 @@ -1,5 +1,4 @@ -.\" $Id: lastlog.8,v 1.12 2004/12/12 20:36:50 kloczek Exp $ -.\" {PTM/WK/1999-09-18} +.\" $Id: lastlog.8,v 1.13 2005/04/05 18:47:51 kloczek Exp $ .\" Copyright 1992, Phillip Street and Julianne Frances Haugh .\" All rights reserved. .\" @@ -42,15 +41,15 @@ flag) pozycje pliku wy \fB/etc/passwd\fR. .SH OPCJE Polecenie \fBlastlog\fR posiada nast瘼uj帷e opcje: -.IP "\fB-h\fR, \fB--help\fR" +.IP "\fB\-h\fR, \fB\-\-help\fR" Wy鈍ietla kr鏒k informacj o tym jak u篡wa program i ko鎍zy prac. -.IP "\fB-t\fR, \fB--time\fR \fIDNI\fR" +.IP "\fB\-t\fR, \fB\-\-time\fR \fIDNI\fR" Wy鈍ietla tylko ostatnie logowania u篡tkownik闚 nie starsze ni zadana ilo嗆 \fIDNI\fR. -.IP "\fB-u\fR, \fB--user\fR \fILOGIN\fR" +.IP "\fB\-u\fR, \fB\-\-user\fR \fILOGIN\fR" Wy鈍ietla tylko informacji o ostanim logowaniu u篡tkownika \fILOGIN\fR. .TP -Opcja \fB-t\fR przes豉nia u篡cie opcji \fB-u\fR. +Opcja \fB\-t\fR przes豉nia u篡cie opcji \fB\-u\fR. .PP Je瞠li u篡tkownik nigdy si nie logowa to zamiast portu i czasu logowania zostanie wy鈍ietlony komunikat \fB"**Never logged in**"\fR (nigdy si nie @@ -60,7 +59,7 @@ logowa .SH PRZESTROGI Du瞠 luki w numeracji UID powoduj, 瞠 program b璠zie pracowa d逝瞠j, nie wy鈍ietlaj帷 wynik闚 (np. je郵i mmdf=800, za ostatni uid=170, to program -b璠zie sprawia wra瞠nie zawieszonego w trakcie przetwarzania uid 171-799). +b璠zie sprawia wra瞠nie zawieszonego w trakcie przetwarzania uid 171\-799). .SH AUTORZY Julianne Frances Haugh (jockgrrl@ix.netcom.com) .br diff --git a/man/pl/limits.5 b/man/pl/limits.5 index 03ab6db3..ac1ffbb0 100644 --- a/man/pl/limits.5 +++ b/man/pl/limits.5 @@ -1,5 +1,4 @@ -.\" $Id: limits.5,v 1.2 2001/01/25 10:43:54 kloczek Exp $ -.\" {PTM/WK/1999-09-18} +.\" $Id: limits.5,v 1.3 2005/04/05 18:47:51 kloczek Exp $ .TH LIMITS 5 .SH NAZWA limits \- definicja ogranicze zasob闚 @@ -33,7 +32,7 @@ D: max. rozmiar danych (KB) .br F: maksymalny rozmiar pliku (KB) .br -M: max. locked-in-memory address space (KB) +M: max. locked\-in\-memory address space (KB) .br N: max. liczba otwartych plik闚 .br @@ -65,7 +64,7 @@ Nazwa u Je瞠li w pliku \fBLIMITS_FILE\fP posiadasz wiele takich wpis闚, to jako domy郵ny zostanie u篡ty ostatni z nich. .PP -Pojedyncza kreska "\fB-\fP" ca趾owicie wy陰cza ograniczenia dla u篡tkownika. +Pojedyncza kreska "\fB\-\fP" ca趾owicie wy陰cza ograniczenia dla u篡tkownika. .PP Zauwa te, prosz, 瞠 wszystkie te ograniczenia definiowane s w odniesieniu do pojedynczej sesji (per login). Nie s one globalne ani sta貫. By mo瞠 b璠 diff --git a/man/pl/login.1 b/man/pl/login.1 index 3f4175ad..f654b05e 100644 --- a/man/pl/login.1 +++ b/man/pl/login.1 @@ -1,6 +1,5 @@ -.\" $Id: login.1,v 1.10 2004/08/04 13:02:25 kloczek Exp $ -.\" {PTM/WK/1999-09-25} -.\" Copyright 1989 - 1994, Julianne Frances Haugh +.\" $Id: login.1,v 1.13 2005/04/05 18:47:51 kloczek Exp $ +.\" Copyright 1989 \- 1994, Julianne Frances Haugh .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -30,11 +29,11 @@ .SH NAZWA login \- rozpocznij sesj pracy w systemie .SH SKｘDNIA -\fBlogin\fR [\fB-p\fR] [\fIu篡tkownik\fR] [\fIZMIENNA=WARTO汎\fR ...] +\fBlogin\fR [\fB\-p\fR] [\fIu篡tkownik\fR] [\fIZMIENNA=WARTO汎\fR ...] .br -\fBlogin\fR [\fB-p\fR] [\fB-h \fIhost\fR] [\fB-f \fIu篡tkownik\fR] +\fBlogin\fR [\fB\-p\fR] [\fB\-h\fR \fIhost\fR] [\fB\-f\fR \fIu篡tkownik\fR] .br -\fBlogin\fR [\fB-p\fR] \fB-r \fIhost\fR +\fBlogin\fR [\fB\-p\fR] \fB\-r\fR \fIhost\fR .SH OPIS .B login s逝篡 do utworzenia nowej sesji pracy z systemem. Zwykle wywo造wane jest @@ -50,13 +49,6 @@ przez u Pr鏏a wykonania \fBlogin\fR z pow這ki innej ni zg這szeniowa powoduje wypisanie komunikatu o b喚dzie. .PP -Przy wywo豉niu polecenia z zach皻y \fIlogin:\fR, u篡tkownik mo瞠 po swojej -nazwie wprowadzi zmienne 鈔odowiska. Zmienne te wprowadzane s w postaci: -\fBNAZWA=WARTO汎\fR. Nie wszystkie zmienne mog jednak by ustawione w ten -spos鏏, szczeg鏊nie \fBPATH\fR, \fBHOME\fR i \fBSHELL\fR. -Dodatkowo, zakazane mo瞠 by \fBIFS\fR (input field separator: separator p鏊 -wej軼iowych), je瞠li pow這k zg這szeniow u篡tkownika jest \fB/bin/sh\fR. -.PP U篡tkownik pytany jest o has這, je郵i takowe istnieje. Dla zapobie瞠nia ujawnieniu has豉 wy鈍ietlanie wprowadzanych znak闚 jest w trakcie jego wprowadzania wy陰czone. Dozwolona jest jedynie niewielka liczba @@ -98,19 +90,19 @@ znaku pow katalog g堯wny nowego systemu plik闚, do kt鏎ego u篡tkownik si zaloguje. .SH OPCJE .TP -.B -f +.B \-f Nie przeprowadzanie autentykacji, u篡tkownik ju zosta zautentykowany. .TP -.B -h +.B \-h Name zdalnego hosta dla tego logowania. .TP -.B -p +.B \-p Zachowanie 鈔odowiska. .TP -.B -r +.B \-r Przeprowadzenie procedury automatycznego logowania dla rlogin. .PP -Opcje \fB-r\fP, \fB-h\fP i \fB-f\fP mog by u篡wane tylko w przypadku +Opcje \fB\-r\fP, \fB\-h\fP i \fB\-f\fP mog by u篡wane tylko w przypadku wywo豉nia \fBlogin\fP przez roota. .SH PRZESTROGI Niniejsza wersja \fBlogin\fR posiada wiele opcji kompilacji, z kt鏎ych tylko @@ -119,22 +111,21 @@ cz Po這瞠nie plik闚 mo瞠 by r騜ne w zale積o軼i od konfiguracji systemu. .SH PLIKI .br -\fI/var/run/utmp\fR \- lista bie膨cych sesji pracy +\fI/var/run/utmp\fR \- lista bie膨cych sesji pracy .br -\fI/var/log/wtmp\fR \- lista poprzednich sesji pracy +\fI/var/log/wtmp\fR \- lista poprzednich sesji pracy .br -\fI/etc/passwd\fR \- informacje o kontach u篡tkownik闚 +\fI/etc/passwd\fR \- informacje o kontach u篡tkownik闚 .br -\fI/etc/shadow\fR \- zakodowane has豉 i informacje o ich wa積o軼i +\fI/etc/shadow\fR \- zakodowane has豉 i informacje o ich wa積o軼i .br -\fI/etc/motd\fR \- plik 'wiadomo軼i dnia' +\fI/etc/motd\fR \- plik 'wiadomo軼i dnia' .br -\fI/etc/nologin\fR \- zapobiega logowaniu innych ni root +\fI/etc/nologin\fR \- zapobiega logowaniu innych ni root .br -\fI/etc/ttytype\fR \- lista typ闚 terminali +\fI/etc/ttytype\fR \- lista typ闚 terminali .br -.br -\fI$HOME/.hushlogin\fR \- zapobiega wy鈍ietlaniu wiadomo軼i dnia +\fI$HOME/.hushlogin\fR \- zapobiega wy鈍ietlaniu wiadomo軼i dnia .SH ZOBACZ TAK浩 .BR mail (1), .BR passwd (1), diff --git a/man/pl/login.access.5 b/man/pl/login.access.5 index 9d08104f..94dc361c 100644 --- a/man/pl/login.access.5 +++ b/man/pl/login.access.5 @@ -1,5 +1,4 @@ -.\" $Id: login.access.5,v 1.2 2001/01/25 10:43:54 kloczek Exp $ -.\" {PTM/WK/1999-09-17} +.\" $Id: login.access.5,v 1.3 2005/04/05 18:47:51 kloczek Exp $ .TH LOGIN.ACCESS 5 .\" .Dt SKEY.ACCESS 5 .\" .Os FreeBSD 1.2 @@ -14,7 +13,7 @@ dla kt Gdy kto si loguje, plik .I login.access przeszukiwany jest do znalezienia pierwszej pozycji pasuj帷ej do danej -kombinacji (u篡tkownik, host), lub, w przypadku logowa nie-sieciowych +kombinacji (u篡tkownik, host), lub, w przypadku logowa nie\-sieciowych kombinacji (u篡tkownik, tty). Pole zezwolenia w tej tablicy pozycji okre郵a czy logowanie b璠zie przyj皻e czy odrzucone. .PP @@ -23,16 +22,16 @@ znakiem dwukropka, pola: .sp 1 .IR zezwolenie : u篡tkownicy : pochodzenie .sp 1 -Pierwsze pole powinno zawiera znak "\fB+\fR" (dost瘼 zapewniony) lub "\fB-\fR" +Pierwsze pole powinno zawiera znak "\fB+\fR" (dost瘼 zapewniony) lub "\fB\-\fR" (zakaz dost瘼u). Drugie z p鏊 powinno zawiera list jednego lub wi璚ej nazw u篡tkownik闚, grup lub s這wo .B ALL (zawsze pasuje do wszystkich). Trzecie pole powinno by list jednej lub wi璚ej -nazw tty (dla logowa nie-sieciowych), nazw host闚, domen (rozpoczynaj帷ych si +nazw tty (dla logowa nie\-sieciowych), nazw host闚, domen (rozpoczynaj帷ych si od kropki), adres闚 host闚, internetowych numer闚 sieci (ko鎍z帷ych si kropk), s這wem .B ALL -(wszystkie - zawsze pasuje) lub +(wszystkie \- zawsze pasuje) lub .B LOCAL (dopasowuje dowolny 豉鎍uch nie zawieraj帷y kropki). Je瞠li uruchomisz NIS mo瞠sz u篡 @nazwagrupysieciowej we wzorcu hosta diff --git a/man/pl/login.defs.5 b/man/pl/login.defs.5 index 9e84b101..86dea8d5 100644 --- a/man/pl/login.defs.5 +++ b/man/pl/login.defs.5 @@ -1,6 +1,5 @@ -.\" $Id: login.defs.5,v 1.5 2002/03/09 11:16:19 ankry Exp $ -.\" {PTM/WK/1999-09-18} -.\" Copyright 1991 - 1993, Julianne Frances Haugh and Chip Rosenthal +.\" $Id: login.defs.5,v 1.7 2005/04/05 18:47:51 kloczek Exp $ +.\" Copyright 1991 \- 1993, Julianne Frances Haugh and Chip Rosenthal .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -256,7 +255,7 @@ T Jest to obs逝giwane tylko w systemach z interfejsem .IR termio, np. System V. Je瞠li nie podano parametru, to znak kasowania zostanie -zainicjowany na \s-2CTRL/U\s0. Informacj powi您an znajdziesz w opisie +zainicjowany na \s\-2CTRL/U\s0. Informacj powi您an znajdziesz w opisie ERASECHAR. .\" .IP "LASTLOG_ENAB (logiczna)" @@ -302,7 +301,7 @@ MAIL_DIR. .IP "MAIL_DIR (napis)" Okre郵a pe軟 nazw 軼ie磬ow do katalogu zawieraj帷ego pliki skrzynki pocztowej u篡tkownika. Do powy窺zej 軼ie磬i doklejana jest nazwa u篡tkownika, -tworz帷 w ten spos鏏 zmienn 鈔odowiskow MAIL - 軼ie磬 do skrzynki +tworz帷 w ten spos鏏 zmienn 鈔odowiskow MAIL \- 軼ie磬 do skrzynki u篡tkownika. Musi by zdefiniowany albo niniejszy parametr albo parametr MAIL_FILE; je郵i nie zostan zdefiniowane, to zostanie nadana, by mo瞠 niepoprawna, warto嗆 domy郵na. Zobacz tak瞠 opis MAIL_CHECK_ENAB. @@ -310,7 +309,7 @@ niepoprawna, warto .IP "MAIL_FILE (napis)" Okre郵a nazw pliku skrzynki pocztowej u篡tkownika. Nazwa ta doklejana jest na koniec nazwy katalogu domowego u篡tkownika tworz帷 zmienn 鈔odowiskow -MAIL - 軼ie磬 do skrzynki u篡tkownika. Musi by zdefiniowany albo niniejszy +MAIL \- 軼ie磬 do skrzynki u篡tkownika. Musi by zdefiniowany albo niniejszy parametr albo parametr MAIL_DIR; je郵i nie zostan zdefiniowane, to zostanie nadana, by mo瞠 niepoprawna, warto嗆 domy郵na. Zobacz tak瞠 opis MAIL_CHECK_ENAB. @@ -322,8 +321,8 @@ to program .B passwd b璠zie kodowa nowo zmieniane has豉 przy pomocy nowego algorytmu .BR crypt (3), -opartego o MD-5. Algorytm ten pierwotnie pojawi si we FreeBSD i jest te -obs逝giwany przez libc-5.4.38 oraz glibc-2.0 (lub wy窺z) w Linuksie. +opartego o MD\-5. Algorytm ten pierwotnie pojawi si we FreeBSD i jest te +obs逝giwany przez libc\-5.4.38 oraz glibc\-2.0 (lub wy窺z) w Linuksie. Pozwala on na u篡wanie hase d逝窺zych ni 8 znak闚 (ograniczone przez .BR getpass (3) do 127 znak闚), ale nie jest zgodny z tradycyjnymi implementacjami polecenia @@ -343,9 +342,6 @@ si roz陰czony. Je瞠li nie podano tego parametru, to opisana funkcja b璠zie wy陰czona. .\" -.IP "NOLOGIN_STR (napis)" -XXX powinno zosta udokumentowane. -.\" .IP "OBSCURE_CHECKS_ENAB (logiczna)" Je瞠li ma warto嗆 .IR yes , @@ -415,13 +411,13 @@ Patrz tak .BR passwd (5). .\" .IP "SU_NAME (napis)" -Przypisuje nazw polecenia do uruchomionego "su -". Na przyk豉d, je郵i +Przypisuje nazw polecenia do uruchomionego "su \-". Na przyk豉d, je郵i parametr ten jest zdefiniowany jako "su", to polecenie .BR ps (1) -poka瞠 uruchomione polecenie jako "-su". Je郵i parametr ten jest +poka瞠 uruchomione polecenie jako "\-su". Je郵i parametr ten jest niezdefiniowany, to .BR ps (1) -poka瞠 nazw faktycznie wykonywanej pow這ki, np. co w rodzaju "-sh". +poka瞠 nazw faktycznie wykonywanej pow這ki, np. co w rodzaju "\-sh". .\" .IP "SULOG_FILE (napis)" Pokazuje pe軟 nazw 軼ie磬ow pliku, w kt鏎ym rejestrowane jest wykorzystanie @@ -538,7 +534,7 @@ OBSCURE_CHECKS_ENAB PASS_MIN_LEN PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE .IP su 12 ENV_HZ ENV_SUPATH ENV_TZ HUSHLOGIN_FILE MAIL_CHECK_ENAB MAIL_DIR -MOTD_FILE NOLOGIN_STR QUOTAS_ENAB SULOG_FILE SYSLOG_SU_ENAB +MOTD_FILE QUOTAS_ENAB SULOG_FILE SYSLOG_SU_ENAB .IP sulogin 12 ENV_HZ ENV_SUPATH ENV_TZ MAIL_DIR QUOTAS_ENAB TTYPERM .ad diff --git a/man/pl/logoutd.8 b/man/pl/logoutd.8 index 3af4aa9b..d80623b3 100644 --- a/man/pl/logoutd.8 +++ b/man/pl/logoutd.8 @@ -1,5 +1,4 @@ -.\" $Id: logoutd.8,v 1.4 2002/10/07 17:32:42 kloczek Exp $ -.\" {PTM/WK/1999-09-17} +.\" $Id: logoutd.8,v 1.5 2005/04/05 18:47:51 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -43,8 +42,8 @@ czasie na danym porcie. Ka盥a sesja pracy (logowania) naruszaj帷a ograniczenia zawarte w \fI/etc/porttime\fR jest ko鎍zona. .SH PLIKI -.IR /etc/porttime " - zezwolenia dla logowania na portach" +.IR /etc/porttime " \- zezwolenia dla logowania na portach" .br -.IR /var/run/utmp " - bie膨ce sesje pracy" +.IR /var/run/utmp " \- bie膨ce sesje pracy" .SH AUTOR Julianne Frances Haugh (jockgrrl@ix.netcom.com) diff --git a/man/pl/mkpasswd.8 b/man/pl/mkpasswd.8 index 384dfe48..7b25dbbc 100644 --- a/man/pl/mkpasswd.8 +++ b/man/pl/mkpasswd.8 @@ -1,5 +1,4 @@ -.\" $Id: mkpasswd.8,v 1.6 2004/11/02 19:28:32 kloczek Exp $ -.\" {PTM/WK/1999-09-16} +.\" $Id: mkpasswd.8,v 1.7 2005/04/05 18:47:51 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -30,7 +29,7 @@ .SH NAZWA mkpasswd \- aktualizuj pliki baz passwd i group .SH SKｘDNIA -\fBmkpasswd\fR [\fB-fvgps\fR] \fIplik\fR +\fBmkpasswd\fR [\fB\-fvgps\fR] \fIplik\fR .SH OPIS .B mkpasswd czyta plik w formacie okre郵onym przez flagi i konwertuje go postaci @@ -39,22 +38,22 @@ Wymienione pliki baz danych u w systemach o du瞠j liczbie u篡tkownik闚. Pliki wynikowe otrzymaj nazwy \fIplik\fR.dir i \fIplik\fR.pag. .SH OPCJE -Opcja \fB-f\fR powoduje, 瞠 \fBmkpasswd\fR ignoruje istnienie plik闚 +Opcja \fB\-f\fR powoduje, 瞠 \fBmkpasswd\fR ignoruje istnienie plik闚 wynikowych i nadpisuje je. Normalnie \fBmkpasswd\fR skar篡 si na istnienie plik闚 wynikowych i ko鎍zy prac. .PP -Opcja \fB-v\fR powoduje wy鈍ietlanie informacji o ka盥ym konwertowanym +Opcja \fB\-v\fR powoduje wy鈍ietlanie informacji o ka盥ym konwertowanym rekordzie oraz komunikatu ko鎍owego. .PP -Opcja \fB-g\fR traktuje plik 廝鏚這wy tak, jak gdyby by on w formacie +Opcja \fB\-g\fR traktuje plik 廝鏚這wy tak, jak gdyby by on w formacie pliku \fI/etc/group\fR. -Przy po陰czeniu z opcj \fB-s\fR u篡wany jest format pliku \fI/etc/gshadow\fR. +Przy po陰czeniu z opcj \fB\-s\fR u篡wany jest format pliku \fI/etc/gshadow\fR. .PP -Opcja \fB-p\fR traktuje plik 廝鏚這wy tak, jak gdyby by on w formacie +Opcja \fB\-p\fR traktuje plik 廝鏚這wy tak, jak gdyby by on w formacie pliku \fI/etc/passwd\fR. Jest to opcja domy郵na. -Przy po陰czeniu z opcj \fB-s\fR u篡wany jest format pliku \fI/etc/shadow\fR. +Przy po陰czeniu z opcj \fB\-s\fR u篡wany jest format pliku \fI/etc/shadow\fR. .SH PRZESTROGI U篡cie wi璚ej ni jednego pliku bazy ogranicza si do system闚 posiadaj帷ych bibliotek baz danych NDBM. Mo瞠 zatem nie by dost瘼ne w ka盥ym systemie. @@ -63,13 +62,13 @@ Poniewa podczas dokonywania zmian, \fBmkpasswd\fR potrzebne jest jedynie do ponownego utworzenia usuni皻ego lub zepsutego pliku bazy. .SH PLIKI -.IR /etc/passwd " - informacja o kontach u篡tkownik闚" +\fI/etc/passwd\fR \- informacja o kontach u篡tkownik闚 .br -.IR /etc/shadow " - chroniona informacja o u篡tkownikach" +\fI/etc/shadow\fR \- chroniona informacja o u篡tkownikach .br -.IR /etc/group " - informacja o grupach" +\fI/etc/group\fR \- informacja o grupach .br -.IR /etc/gshadow " - chroniona informacja o grupach" +\fI/etc/gshadow\fR \- chroniona informacja o grupach .SH ZOBACZ TAK浩 .BR group (5), .BR passwd (5), diff --git a/man/pl/newgrp.1 b/man/pl/newgrp.1 index de7e77bf..34529916 100644 --- a/man/pl/newgrp.1 +++ b/man/pl/newgrp.1 @@ -1,5 +1,4 @@ -.\" $Id: newgrp.1,v 1.9 2004/12/16 23:00:55 kloczek Exp $ -.\" {PTM/WK/1999-09-15} +.\" $Id: newgrp.1,v 1.11 2005/04/12 18:08:47 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -32,9 +31,9 @@ newgrp \- zalogowanie do nowej grupy .br sg \- wykonanie polecenia z innym ID grupy .SH SKｘDNIA -\fBnewgrp\fR [\fB-\fR] [\fIgrupa\fR] +\fBnewgrp\fR [\fB\-\fR] [\fIgrupa\fR] .br -\fBsg\fR [\fB-\fR] [\fIgrupa\fR [[\fB-c\fR] \fIpolecenie\fR]] +\fBsg\fR [\fB\-\fR] [\fIgrupa\fR [[\fB\-c\fR] \fIpolecenie\fR]] .SH OPIS \fBnewgrp\fR s逝篡 do zmiany bie膨cego identyfikatora grupy (GID) podczas sesji. W przypadku podania opcji \fB\-\fR 鈔odowisko u篡tkownika zostanie @@ -50,7 +49,7 @@ o podanie has cz這nkiem, to efektem b璠zie odmowa dost瘼u. .PP Polecenie \fBsg\fR dzia豉 podobnie do \fBnewgrp\fR, z tym 瞠 mo積a mu poda -polecenie. Podane polecenie zostanie wykonane przy u篡ciu pow這ki Bourne'a. +polecenie. Podane polecenie zostanie wykonane przy u篡ciu pow這ki \fB/bin/sh\fR. W przypadku wi瘯szo軼i pow這k, z kt鏎ych \fBsg\fR mo瞠 zosta uruchomione, polecenie sk豉daj帷e si z wielu s堯w nale篡 umie軼i w cudzys這wach. Inna r騜nica pomi璠zy \fBnewgrp\fR a \fBsg\fR polega na tym, 瞠 niekt鏎e @@ -59,9 +58,9 @@ now \fBsg\fR, wi璚 po zako鎍zeniu \fBsg\fR u篡tkownik powraca do swego poprzedniego identyfikatora grupy. .SH PLIKI -\fI/etc/passwd\fR \- informacja o kontach u篡tkownik闚 +\fI/etc/passwd\fR \- informacja o kontach u篡tkownik闚 .br -\fI/etc/group\fR \- informacja o grupach +\fI/etc/group\fR \- informacja o grupach .SH ZOBACZ TAK浩 .BR id (1), .BR login (1), diff --git a/man/pl/newusers.8 b/man/pl/newusers.8 index aab6bfcd..b7c45578 100644 --- a/man/pl/newusers.8 +++ b/man/pl/newusers.8 @@ -1,5 +1,4 @@ -.\" $Id: newusers.8,v 1.4 2001/01/27 02:55:54 kloczek Exp $ -.\" {PTM/WK/1999-09-15} +.\" $Id: newusers.8,v 1.5 2005/04/05 18:47:51 kloczek Exp $ .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -28,7 +27,7 @@ .\" SUCH DAMAGE. .TH NEWUSERS 8 .SH NAZWA -newusers - wsadowa aktualizacja i tworzenie nowych u篡tkownik闚 +newusers \- wsadowa aktualizacja i tworzenie nowych u篡tkownik闚 .SH SKｘDNIA \fBnewusers\fR [\fInowi_u篡tkownicy\fR] .SH OPIS @@ -54,12 +53,8 @@ u .PP Polecenie to przeznaczone jest do u篡tku w du篡ch systemach, gdzie aktualizuje si wiele kont naraz. -.SH PRZESTROGI -.\" Po u篡ciu \fBnewusers\fR musi zosta wykonane polecenie \fImkpasswd\fR, -.\" aktualizuj帷e pliki DBM hase (DBM password files). Plik 廝鏚這wy, zawieraj帷y niezakodowane has豉, musi by chroniony. .SH ZOBACZ TAK浩 -.\" mkpasswd(8), passwd(1), useradd(1) .BR passwd (1), .BR useradd (8) .SH AUTOR diff --git a/man/pl/passwd.1 b/man/pl/passwd.1 index 2d0eafdf..e3a29b76 100644 --- a/man/pl/passwd.1 +++ b/man/pl/passwd.1 @@ -1,7 +1,4 @@ -.\" $Id: passwd.1,v 1.11 2003/04/28 17:52:15 kloczek Exp $ -.\" Translation (c) 1999 Wojtek Kotwica -.\" (c) 2002 Andrzej Krzysztofowicz -.\" +.\" $Id: passwd.1,v 1.15 2005/04/14 00:13:56 kloczek Exp $ .\" Copyright 1989 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -32,14 +29,14 @@ .SH NAZWA passwd \- zmiana has豉 u篡tkownika .SH SKｘDNIA -\fBpasswd\fR [\fB-f\fR|\fB-s\fR] [\fInazwa\fR] +\fBpasswd\fR [\fB\-f\fR|\fB\-s\fR] [\fInazwa\fR] .br -\fBpasswd\fR [\fB-g\fR] [\fB-r\fR|\fB-R\fR] \fIgrupa\fR +\fBpasswd\fR [\fB\-g\fR] [\fB\-r\fR|\fB\-R\fR] \fIgrupa\fR .br -\fBpasswd\fR [\fB-x \fImax\fR] [\fB-n \fImin\fR] -[\fB-w \fIostrze璞fR] [\fB-i \fInieakt\fR] \fIlogin\fR +\fBpasswd\fR [\fB\-x\fR \fImax\fR] [\fB\-n\fR \fImin\fR] +[\fB\-w\fR \fIostrze璞fR] [\fB\-i\fR \fInieakt\fR] \fIlogin\fR .br -\fBpasswd\fR {\fB-l\fR|\fB-u\fR|\fB-d\fR|\fB-S\fR|\fB-e\fR} \fIlogin\fR +\fBpasswd\fR {\fB\-l\fR|\fB\-u\fR|\fB\-d\fR|\fB\-S\fR|\fB\-e\fR} \fIlogin\fR .SH OPIS \fBpasswd\fR zmienia has豉 kont u篡tkownik闚 i grup. Zwyk造 u篡tkownik mo瞠 zmieni wy陰cznie has這 w豉snego konta, superu篡tkownik @@ -49,9 +46,9 @@ Administrator grupy mo u篡tkownika, jego pow這ka zg這szeniowa (logowania) czy daty i interwa造 dotycz帷e wa積o軼i has豉. .PP -U篡cie opcji \fB-s\fR powoduje wywo豉nie przez passwd programu chsh w celu -zmiany pow這ki u篡tkownika, u篡cie opcji \fB-f\fR powoduje wywo豉nie przez -passwd programu chfn w celu zmiany infirmacji o u篡tkowniku. Te dwie opcje +U篡cie opcji \fB\-s\fR powoduje wywo豉nie przez \fBpasswd\fR programu \fBchsh\fR +w celu zmiany pow這ki u篡tkownika, u篡cie opcji \fB\-f\fR powoduje wywo豉nie +przez passwd programu chfn w celu zmiany infirmacji o u篡tkowniku. Te dwie opcje istniej jedynie dla zgodno軼i, gdy wymienione programy mog by wywo造wane bezpo鈔ednio. .SS Zmiany has豉 @@ -85,46 +82,46 @@ Je i por闚nuje drugi wpis z pierwszym. Oba wpisy musz by takie same, by has這 zosta這 zmienione. .SS Has豉 grup -Je瞠li pos逝穎no si opcj \fB-g\fR, to zmieniane jest has這 podanej grupy. +Je瞠li pos逝穎no si opcj \fB\-g\fR, to zmieniane jest has這 podanej grupy. U篡tkownik powinien by albo superu篡tkownikiem albo administratorem tej grupy. Nie wyst瘼uje pytanie o bie膨ce has這 grupy. -Do usuwania bie膨cego has豉 danej grupy s逝篡 opcja \fB-g\fR w po陰czeniu -z \fB-r\fR. Pozwala to na dost瘼 do grupy tylko jej cz這nkom. -Opcja \fB-R\fR w po陰czeniu z \fR-g\fR ogranicza dost瘼 do grupy wszystkim +Do usuwania bie膨cego has豉 danej grupy s逝篡 opcja \fB\-g\fR w po陰czeniu +z \fB\-r\fR. Pozwala to na dost瘼 do grupy tylko jej cz這nkom. +Opcja \fB\-R\fR w po陰czeniu z \fR\-g\fR ogranicza dost瘼 do grupy wszystkim u篡tkownikom. .SS Informacja o wa積o軼i konta Superu篡tkownik mo瞠 zmienia informacj o wieku konta pos逝guj帷 si opcjami -\fB-x\fR, \fB-n\fR, \fB-w\fR oraz \fB-i\fR. -Opcja \fB-x\fR s逝篡 do ustawiania maksymalnej liczby dni, przez jakie has這 +\fB\-x\fR, \fB\-n\fR, \fB\-w\fR oraz \fB\-i\fR. +Opcja \fB\-x\fR s逝篡 do ustawiania maksymalnej liczby dni, przez jakie has這 pozostaje wa積e. Po up造wie \fImax\fR dni, has這 musi by zmienione. -Opcja \fB-n\fR ustawia minimaln liczb dni, jakie musz up造n望 zanim has這 +Opcja \fB\-n\fR ustawia minimaln liczb dni, jakie musz up造n望 zanim has這 b璠zie mog這 by zmienione. U篡tkownik nie otrzyma zezwolenia na zmian has豉 przed up造wem \fImin\fR dni. -Opcja \fB-w\fR s逝篡 do ustawienia liczby dni przed up造wem terminu wa積o軼i +Opcja \fB\-w\fR s逝篡 do ustawienia liczby dni przed up造wem terminu wa積o軼i has豉, przez kt鏎e u篡tkownik b璠zie otrzymywa ostrze瞠nie m闚i帷e mu, ile dni pozosta這 do tej daty. Ostrze瞠nia zaczn pojawia si \fIostrze璞fR dni przed up造wem wa積o軼i has豉. -Opcja \fB-i\fR (nieaktywno嗆) s逝篡 do wy陰czania konta po up造wie zadanej +Opcja \fB\-i\fR (nieaktywno嗆) s逝篡 do wy陰czania konta po up造wie zadanej liczby dni po wyga郾i璚iu has豉. Po up造wie \fInieakt\fR dni od przeterminowania has豉 u篡tkownik nie mo瞠 ju korzysta z konta. .PP Je郵i istnieje potrzeba natychmiastowego przeterminowania has豉 dla danego -konta, mo積a pos逝篡 si opcj \fB-e\fR. Spowoduje to zmuszenie u篡tkownika -do zmiany has豉 przy najbli窺zym logowaniu. Za pomoc opcji \fB-d\fR mo積a +konta, mo積a pos逝篡 si opcj \fB\-e\fR. Spowoduje to zmuszenie u篡tkownika +do zmiany has豉 przy najbli窺zym logowaniu. Za pomoc opcji \fB\-d\fR mo積a skasowa has這 u篡tkownika (uczyni je pustym). Nale篡 zachowa szczeg鏊n ostro積o嗆 u篡waj帷 tej opcji, gdy mo瞠 ona spowodowa, 瞠 do zalogowania si na konto nie b璠zie w og鏊e potrzebne has這, pozostawiaj帷 system otwartym dla nieproszonych go軼i. .SS Utrzymywanie i konserwacja konta Konta u篡tkownik闚 mog by blokowane i odblokowywane przy pomocy opcji -\fB-l\fR i \fB-u\fR. -Opcja \fB-l\fR wy陰cza konto zmieniaj帷 jego has這 na warto嗆 nieodpowiadaj帷 +\fB\-l\fR i \fB\-u\fR. +Opcja \fB\-l\fR wy陰cza konto zmieniaj帷 jego has這 na warto嗆 nieodpowiadaj帷 瘸dnemu mo磧iwemu zakodowanemu has逝. -Opcja \fB-u\fR ponownie udost瘼nia konto przywracaj帷 uprzedni warto嗆 has豉. +Opcja \fB\-u\fR ponownie udost瘼nia konto przywracaj帷 uprzedni warto嗆 has豉. .PP -Stan konta mo積a uzyska przy pomocy opcji \fB-S\fR. +Stan konta mo積a uzyska przy pomocy opcji \fB\-S\fR. Informacja o stanie sk豉da si z 6 cz窷ci. Pierwsza wskazuje, czy konto u篡tkownika jest zablokowane (L) (locked), nie posiada has豉 (NP) (no password) lub ma funkcjonalne has這 (P) (password). @@ -133,7 +130,7 @@ nast nieaktywno軼i has豉. .SS Podpowiedzi dotycz帷e hase u篡tkownika Bezpiecze雟two has豉 zale篡 od si造 algorytmu koduj帷ego oraz rozmiaru -przestrzeni kluczy. Metoda kodowania u篡wana w Systemie \fB\s-2UNIX\s+2\fR +przestrzeni kluczy. Metoda kodowania u篡wana w Systemie \fB\s\-2UNIX\s+2\fR oparta jest o algorytm NBS DES i jest bardzo bezpieczna. Rozmiar przestrzeni kluczy zale篡 od losowo軼i wybranego has豉. .PP @@ -205,6 +202,7 @@ Polecenie \fBpasswd\fR ko \fB6\fR \- niew豉軼iwe parametry opcji .SH "ZOBACZ TAK浩" .BR group (5), -.BR passwd (5) +.BR passwd (5), +.BR shadow (5) .SH AUTOR Julianne Frances Haugh diff --git a/man/pl/passwd.5 b/man/pl/passwd.5 index 2e16f756..e740e02d 100644 --- a/man/pl/passwd.5 +++ b/man/pl/passwd.5 @@ -1,30 +1,30 @@ -.\" $Id: passwd.5,v 1.3 2002/03/09 11:16:20 ankry Exp $ -.\" Copyright (c) 1993 Michael Haardt (u31b3hs@pool.informatik.rwth-aachen.de), Fri Apr 2 11:32:09 MET DST 1993 +.\" $Id: passwd.5,v 1.4 2005/04/05 18:47:51 kloczek Exp $ +.\" Copyright 1989 - 1990, Julianne Frances Haugh +.\" All rights reserved. .\" -.\" This is free documentation; you can redistribute it and/or -.\" modify it under the terms of the GNU General Public License as -.\" published by the Free Software Foundation; either version 2 of -.\" the License, or (at your option) any later version. +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. Neither the name of Julianne F. Haugh nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. .\" -.\" The GNU General Public License's references to "object code" -.\" and "executables" are to be interpreted as the output of any -.\" document formatting or typesetting system, including -.\" intermediate and printed output. -.\" -.\" This manual is distributed in the hope that it will be useful, -.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public -.\" License along with this manual; if not, write to the Free -.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, -.\" USA. -.\" -.\" Modified Sun Jul 25 10:46:28 1993 by Rik Faith (faith@cs.unc.edu) -.\" Modified Sun Aug 21 18:12:27 1994 by Rik Faith (faith@cs.unc.edu) -.\" Modified Sun Jun 18 01:53:57 1995 by Andries Brouwer (aeb@cwi.nl) -.\" Polish translation nov.1996 piotr.pogorzelski@ippt.gov.pl +.\" THIS SOFTWARE IS PROVIDED BY JULIE HAUGH AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL JULIE HAUGH OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. .TH PASSWD 5 "24 Czerwiec 1993" "Linux" "Podr璚znik programisty linuxowego" .SH NAZWA passwd \- plik passwd definiuj帷y u篡tkownik闚 systemu diff --git a/man/pl/porttime.5 b/man/pl/porttime.5 index 7b6c085f..33eb8d11 100644 --- a/man/pl/porttime.5 +++ b/man/pl/porttime.5 @@ -1,5 +1,4 @@ -.\" $Id: porttime.5,v 1.3 2001/01/25 10:43:54 kloczek Exp $ -.\" {PTM/WK/1999-09-17} +.\" $Id: porttime.5,v 1.4 2005/04/05 18:47:51 kloczek Exp $ .\" Copyright 1989 - 1990, Julianne Frances Haugh .\" All rights reserved. .\" @@ -48,20 +47,20 @@ skr tygodnia przyjmowane jest \fBAl\fR. .SH PRZYKｘDY Poni窺zy wpis zezwala u篡tkownikowi \fBjfh\fR na dost瘼 do ka盥ego portu -w dni robocze od godziny 9-tej do 17-tej. +w dni robocze od godziny 9\-tej do 17\-tej. .br .sp 1 - *:jfh:Wk0900-1700 + *:jfh:Wk0900\-1700 .br .sp 1 Poni窺ze pozycje pozwalaj na dost瘼 do konsoli (/dev/console) wy陰cznie -u篡tkownikom \fBroot\fR i \fBoper\fR - w dowolnym czasie. +u篡tkownikom \fBroot\fR i \fBoper\fR \- w dowolnym czasie. Przyk豉d ten pokazuje, 瞠 plik \fI/etc/porttime\fR stanowi uporz康kowan list czas闚 dost瘼u. Ka盥y inny u篡tkownik b璠zie pasowa do drugiej pozycji listy, nie zezwalaj帷ej na dost瘼 w 瘸dnym czasie. .br .sp 1 - console:root,oper:Al0000-2400 + console:root,oper:Al0000\-2400 .br console:*: .br @@ -70,11 +69,11 @@ Poni poza godzinami pracy. .br .sp 1 - *:games:Wk1700-0900,SaSu0000-2400 + *:games:Wk1700\-0900,SaSu0000\-2400 .br .sp 1 .SH PLIKI -.IR /etc/porttime " - plik zawieraj帷y czasy dost瘼u do port闚" +\fI/etc/porttime\fR \- plik zawieraj帷y czasy dost瘼u do port闚 .SH ZOBACZ TAK浩 .BR login (1) .SH AUTOR diff --git a/man/pl/pw_auth.3 b/man/pl/pw_auth.3 index fd09cacb..6b4d6fe0 100644 --- a/man/pl/pw_auth.3 +++ b/man/pl/pw_auth.3 @@ -1,5 +1,4 @@ -.\" $Id: pw_auth.3,v 1.3 2001/01/25 10:43:54 kloczek Exp $ -.\" {PTM/WK/1999-09-15} +.\" $Id: pw_auth.3,v 1.4 2005/04/05 18:47:51 kloczek Exp $ .\" Copyright 1992 - 1993, Julianne Frances Haugh .\" All rights reserved. .\" @@ -69,40 +68,40 @@ Przyczyna (\fIreason\fR) jest jedn .IP \fBPW_SU\fR 1i Wykonaj uwierzytelnienie dla bie膨cego rzeczywistego identyfikatora u篡tkownika pr鏏uj帷 prze陰czy rzeczywisty ID na podanego u篡tkownika. -Program uwierzytelniaj帷y zostanie wywo豉ny z opcj \fB-s\fR poprzedzaj帷 +Program uwierzytelniaj帷y zostanie wywo豉ny z opcj \fB\-s\fR poprzedzaj帷 nazw u篡tkownika. .IP \fBPW_LOGIN\fR 1i Wykonaj uwierzytelnienie dla danego u篡tkownika tworz帷 now sesj pracy -(loginow). Program uwierzytelniaj帷y zostanie wywo豉ny z opcj \fB-l\fR, +(loginow). Program uwierzytelniaj帷y zostanie wywo豉ny z opcj \fB\-l\fR, po kt鏎ej wyst徙i nazwa u篡tkownika. .IP \fBPW_ADD\fR 1i Utw鏎z nowy wpis dla danego u篡tkownika. Pozwala to programowi uwierzytelniania na zainicjowanie miejsca dla nowego u篡tkownika. -Program zostanie wywo豉ny z opcj \fB-a\fR, po kt鏎ej wyst徙i nazwa u篡tkownika. +Program zostanie wywo豉ny z opcj \fB\-a\fR, po kt鏎ej wyst徙i nazwa u篡tkownika. .IP \fBPW_CHANGE\fR 1i Zmie istniej帷y wpis dla danego u篡tkownika. Pozwala to na programowi uwierzytelniaj帷emu na zmian informacji autentykuj帷ej dla istniej帷ego u篡tkownika. -Program zostanie wywo豉ny z opcj \fB-c\fR poprzedzaj帷 nazw u篡tkownika. +Program zostanie wywo豉ny z opcj \fB\-c\fR poprzedzaj帷 nazw u篡tkownika. .IP \fBPW_DELETE\fR 1i Usu informacj autentykuj帷 dla danego u篡tkownika. Pozwala programowi uwierzytelniania na odzyskanie miejsca po u篡tkowniku, kt鏎y nie b璠zie ju identyfikowany przy u篡ciu tego programu. -Program uwierzytelniania zostanie wywo豉ny z opcj \fB-d\fR, +Program uwierzytelniania zostanie wywo豉ny z opcj \fB\-d\fR, po kt鏎ej wyst徙i nazwa u篡tkownika. .IP \fBPW_TELNET\fR 1i Wykonaj uwierzytelnianie u篡tkownika pod陰czaj帷ego si do systemu przy pomocy polecenia \fBtelnet\fR. -Program zostanie wywo豉ny z opcj \fB-t\fR, po kt鏎ej wyst徙i nazwa u篡tkownika. +Program zostanie wywo豉ny z opcj \fB\-t\fR, po kt鏎ej wyst徙i nazwa u篡tkownika. .IP \fBPW_RLOGIN\fR 1i Wykonaj uwierzytelnienie u篡tkownika pod陰czaj帷ego si do systemu przy pomocy polecenia \fBrlogin\fR. -Program zostanie wywo豉ny z opcj \fB-r\fR, po kt鏎ej wyst徙i nazwa u篡tkownika. +Program zostanie wywo豉ny z opcj \fB\-r\fR, po kt鏎ej wyst徙i nazwa u篡tkownika. .IP \fBPW_FTP\fR 1i Wykonaj uwierzytelnienie u篡tkownika pod陰czaj帷ego si do systemu przy pomocy polecenia \fBftp\fR. -Program uwierzytelniania zostanie wywo豉ny z opcj \fB-f\fR, +Program uwierzytelniania zostanie wywo豉ny z opcj \fB\-f\fR, po kt鏎ej wyst徙i nazwa u篡tkownika. Do komunikacji z u篡tkownikiem NIE s dost瘼ne standardowe deskryptory plik闚. Deskryptor standardowego wej軼ia zostanie pod陰czony do procesu macierzystego, @@ -112,7 +111,7 @@ uwierzytelniania pos .IP \fBPW_REXEC\fR 1i Wykonaj uwierzytelnienie u篡tkownika pod陰czaj帷ego si do systemu przy pomocy polecenia \fIrexec\fR. -Program zostanie wywo豉ny z opcj \fB-x\fR, po kt鏎ej wyst徙i nazwa u篡tkownika. +Program zostanie wywo豉ny z opcj \fB\-x\fR, po kt鏎ej wyst徙i nazwa u篡tkownika. Do komunikacji ze zdalnym u篡tkownikiem NIE s dost瘼ne standardowe deskryptory plik闚. Deskryptor standardowego wej軼ia zostanie pod陰czony do procesu macierzystego, diff --git a/man/pl/pwck.8 b/man/pl/pwck.8 index b12a82c2..c65ff10a 100644 --- a/man/pl/pwck.8 +++ b/man/pl/pwck.8 @@ -1,5 +1,4 @@ -.\" $Id: pwck.8,v 1.6 2004/08/09 17:39:42 kloczek Exp $ -.\" {PTM/WK/1999-09-14} +.\" $Id: pwck.8,v 1.7 2005/04/05 18:47:51 kloczek Exp $ .\" Copyright 1992, Julianne Frances Haugh .\" All rights reserved. .\" @@ -28,9 +27,9 @@ .\" SUCH DAMAGE. .TH PWCK 8 .SH NAZWA -pwck - weryfikacja sp鎩no軼i plik闚 hase +pwck \- weryfikacja sp鎩no軼i plik闚 hase .SH OPIS -\fBpwck\fR [\fB-r\fR] [\fIpasswd\fR \fIshadow\fR] +\fBpwck\fR [\fB\-r\fR] [\fIpasswd\fR \fIshadow\fR] .SH OPIS \fBpwck\fR weryfikuje integralno嗆 informacji autentykacji systemowej. W plikach \fI/etc/passwd\fR i \fI/etc/shadow\fR sprawdzane s wszystkie @@ -42,18 +41,18 @@ si Kontrolowane jest czy ka盥a pozycja posiada: .sp .in +.5i -- w豉軼iw liczb p鏊 +\- w豉軼iw liczb p鏊 .br -- unikaln nazw u篡tkownika +\- unikaln nazw u篡tkownika .br -- poprawny identyfikator u篡tkownika i grupy +\- poprawny identyfikator u篡tkownika i grupy .br -- poprawn grup g堯wn +\- poprawn grup g堯wn .br -- poprawny katalog domowy +\- poprawny katalog domowy .br -- poprawn pow這k zg這szeniow (startow) -.in -.5i +\- poprawn pow這k zg這szeniow (startow) +.in \-.5i .sp .P Kontrola w豉軼iwej liczby p鏊 i niepowtarzalnej nazwy u篡tkownika jest @@ -73,13 +72,13 @@ u Domy郵nie \fBpwck\fR dzia豉 na plikach \fI/etc/passwd\fR oraz \fI/etc/shadow\fR. Przy pomocy parametr闚 \fIpasswd\fR i \fIshadow\fR u篡tkownik mo瞠 wybra inne pliki. -Dodatkowo, u篡tkownik mo瞠 wykona polecenie w trybie tylko-do-odczytu, poprzez -podanie flagi \fB-r\fR. +Dodatkowo, u篡tkownik mo瞠 wykona polecenie w trybie tylko\-do\-odczytu, poprzez +podanie flagi \fB\-r\fR. Powoduje to, 瞠 na wszystkie pytania dotycz帷e zmian zostanie, bez ingerencji u篡tkownika, u篡ta odpowied \fBnie\fR. \fBpwck\fR mo瞠 by r闚nie u篡ty do sortowania pozycji w plikach \fI/etc/passwd\fR oraz \fI/etc/shadow\fR wed逝g UID. By w陰czy tryb sortowania nale篡 przekaza -opcj \fB-s\fR. Nie s wtedy przeprowadzane 瘸dne kontrole, tylko sortowanie. +opcj \fB\-s\fR. Nie s wtedy przeprowadzane 瘸dne kontrole, tylko sortowanie. .SH PLIKI \fI/etc/passwd\fR \- informacja o kontach u篡tkownik闚 .br diff --git a/man/pl/pwconv.8 b/man/pl/pwconv.8 index eff61cf0..ab1e9519 100644 --- a/man/pl/pwconv.8 +++ b/man/pl/pwconv.8 @@ -1,8 +1,7 @@ -.\" $Id: pwconv.8,v 1.3 2002/03/09 11:16:22 ankry Exp $ -.\" {PTM/WK/1999-09-14} +.\" $Id: pwconv.8,v 1.4 2005/04/05 18:47:51 kloczek Exp $ .TH PWCONV 8 "26 wrze郾ia 1997" .SH NAZWA -pwconv, pwunconv, grpconv, grpunconv - konwersja dot. chronionych plik闚 hase i grup +pwconv, pwunconv, grpconv, grpunconv \- konwersja dot. chronionych plik闚 hase i grup .SH SKｘDNIA .B pwconv .br diff --git a/man/pl/shadow.3 b/man/pl/shadow.3 index fc144642..4bc13dc9 100644 --- a/man/pl/shadow.3 +++ b/man/pl/shadow.3 @@ -1,5 +1,4 @@ -.\" $Id: shadow.3,v 1.4 2003/01/07 14:32:57 kloczek Exp $ -.\" {PTM/WK/1999-09-16} +.\" $Id: shadow.3,v 1.5 2005/04/05 18:47:51 kloczek Exp $ .\" Copyright 1989 - 1993, Julianne Frances Haugh .\" All rights reserved. .\" @@ -81,7 +80,7 @@ struct spwd { .br unsigned long int sp_flag; /* zarezerwowane do przysz貫go u篡tku */ .br -.in -.5i +.in \-.5i } .PP Znaczenie poszczeg鏊nych p鏊: @@ -127,18 +126,18 @@ by Kontynuuje pr鏏 uzyskania drugiej blokady przy pomocy \fBspw_lock\fR przez czas pozosta造 z pocz徠kowych 15 sekund. Je瞠li po up造wie 15 sekund kt鏎akolwiek z tych pr鏏 zawiedzie, -to \fBlckpwdf\fR zwraca -1. +to \fBlckpwdf\fR zwraca \-1. Je瞠li uzyskano obie blokady, to zwracane jest 0. .SH DIAGNOSTYKA Je瞠li nie ma dalszych pozycji lub podczas przetwarzania pojawi si b陰d, to procedury zwracaj NULL. Procedury zwracaj帷e warto嗆 typu \fBint\fR zwracaj 0 w przypadku powodzenia -a -1 dla pora磬i. +a \-1 dla pora磬i. .SH PRZESTROGI Procedury te mog by u篡wane wy陰cznie przez superu篡tkownika, gdy dost瘼 do dodatkowego, chronionego pliku hase jest ograniczony. .SH PLIKI -.IR /etc/shadow " - zakodowane has豉 u篡tkownik闚" +.IR /etc/shadow " \- zakodowane has豉 u篡tkownik闚" .SH ZOBACZ TAK浩 .BR getpwent (3), .BR shadow (5) diff --git a/man/pl/shadow.5 b/man/pl/shadow.5 index 47b0bd6c..a334c2d9 100644 --- a/man/pl/shadow.5 +++ b/man/pl/shadow.5 @@ -1,5 +1,4 @@ -.\" $Id: shadow.5,v 1.3 2001/01/25 10:43:54 kloczek Exp $ -.\" 1999 PTM Przemek Borys +.\" $Id: shadow.5,v 1.4 2005/04/05 18:47:51 kloczek Exp $ .\" Copyright 1989 - 1990, Julianne Frances Haugh .\" All rights reserved. .\" @@ -54,8 +53,8 @@ Dni od 1 stycznia 1970, okre .IP "" .5i Pole zarezerwowane .PP -Pole has豉 musi by wype軟ione. Zakodowane has這 sk豉da si z 13-24 znak闚 z -64 znakowego alfabetu a-z, A-Z, 0-9, \. i /. +Pole has豉 musi by wype軟ione. Zakodowane has這 sk豉da si z 13\-24 znak闚 z +64 znakowego alfabetu a\-z, A\-Z, 0\-9, \. i /. Dla szczeg馧闚 interpretacji tego napisu, odsy豉my do \fIcrypt(3)\fR. .PP Data ostatniej zmiany has豉 jest podawana jako liczba dni od 1 stycznia @@ -75,15 +74,15 @@ wieku znajduj Je郵i ma by utrzymywane bezpiecze雟two hase, to plik ten nie mo瞠 by odczytywalny dla zwyk造ch u篡tkownik闚. .SH Pliki -.IR /etc/passwd " - informacje o kontach u篡tkownik闚" +\fI/etc/passwd\fR \- informacje o kontach u篡tkownik闚 .br -.IR /etc/shadow " - zakodowane has豉 u篡tkownik闚" +\fI/etc/shadow\fR \- zakodowane has豉 u篡tkownik闚 .SH ZOBACZ TAK浩 -chage(1), -login(1), -passwd(1), -su(1), -sulogin(1), -passwd(5), -pwconv(8), -pwunconv(8) +.BR chage (1), +.BR login (1), +.BR passwd (1), +.BR su (1), +.BR passwd (5), +.BR pwconv (8), +.BR pwunconv (8), +.BR sulogin (8) diff --git a/man/pl/shadowconfig.8 b/man/pl/shadowconfig.8 index e3556e84..8ed4074c 100644 --- a/man/pl/shadowconfig.8 +++ b/man/pl/shadowconfig.8 @@ -1,8 +1,7 @@ -.\" $Id: shadowconfig.8,v 1.3 2001/08/23 23:10:51 kloczek Exp $ -.\" {PTM/WK/1999-09-14} +.\" $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 +shadowconfig \- prze陰cza ochron hase i grup przez pliki shadow .SH SKｘDNIA .B "shadowconfig" .IR on " | " off diff --git a/man/pl/su.1 b/man/pl/su.1 index 9f5e1c66..b8ca553c 100644 --- a/man/pl/su.1 +++ b/man/pl/su.1 @@ -1,5 +1,4 @@ -.\" $Id: su.1,v 1.8 2003/04/26 13:24:15 kloczek Exp $ -.\" {PTM/WK/1999-09-25} +.\" $Id: su.1,v 1.9 2005/04/05 18:47:51 kloczek Exp $ .\" Copyright 1989 - 1990, Julianne Frances Haugh .\" All rights reserved. .\" @@ -30,7 +29,7 @@ .SH NAZWA su \- zmiana identyfikatora u篡tkownika lub uzyskanie praw superu篡tkownika .SH SKｘDNIA -\fBsu\fR [\fB-\fR] [\fInazwa_u篡tkownika\fR [\fIargumenty\fR]] +\fBsu\fR [\fB\-\fR] [\fInazwa_u篡tkownika\fR [\fIargumenty\fR]] .SH OPIS .B su s逝篡 do stawania si innym u篡tkownikiem w trakcie w豉snej sesji. @@ -43,7 +42,7 @@ u .PP Po nazwie u篡tkownika mog wyst徙i dodatkowe argumenty. Zostan one dostarczone pow這ce zg這szeniowej u篡tkownika. W szczeg鏊no軼i, argument -\fB-c\fR spowoduje, 瞠 nast瘼ny argument zostanie potraktowany jak polecenie +\fB\-c\fR spowoduje, 瞠 nast瘼ny argument zostanie potraktowany jak polecenie przez wi瘯szo嗆 interpretator闚 polece. Polecenie zostanie wykonane przez pow這k wymienion w \fI/etc/passwd\fR dla docelowego u篡tkownika. @@ -64,9 +63,9 @@ katalog g Niniejsza wersja \fBsu\fR posiada wiele opcji kompilacji, z kt鏎ych tylko cz窷 b璠zie mie zastosowanie w danej instalacji. .SH PLIKI -\fI/etc/passwd\fR \- informacje o kontach u篡tkownik闚 +\fI/etc/passwd\fR \- informacje o kontach u篡tkownik闚 .br -\fI/etc/shadow\fR \- zakodowane has豉 i informacje o ich wa積o軼i +\fI/etc/shadow\fR \- zakodowane has豉 i informacje o ich wa積o軼i .SH ZOBACZ TAK浩 .BR login (1), .BR sh (1), diff --git a/man/pl/suauth.5 b/man/pl/suauth.5 index a8ebe609..990a091b 100644 --- a/man/pl/suauth.5 +++ b/man/pl/suauth.5 @@ -1,9 +1,8 @@ -.\" $Id: suauth.5,v 1.2 2001/01/25 10:43:54 kloczek Exp $ -.\" {PTM/WK/1999-09-14} +.\" $Id: suauth.5,v 1.3 2005/04/05 18:47:51 kloczek Exp $ .TH SUAUTH 5 "14 lutego 1996" .UC 5 .SH NAZWA -suauth - plik szczeg馧owej kontroli su +suauth \- plik szczeg馧owej kontroli su .\" detailed su control file .SH SKｘDNIA .B /etc/suauth @@ -25,17 +24,17 @@ Plik sformatowany jest jak poni traktowane jak wiersze komentarza i ignorowane. .PP .RS -na-ID:z-ID:AKCJA +na\-ID:z\-ID:AKCJA .RE .PP -Gdzie na-ID jest albo s這wem +Gdzie na\-ID jest albo s這wem .B ALL (wszyscy), albo list nazw u篡tkownik闚 rozdzielonych "," albo te s這wami .B ALL EXCEPT (wszyscy opr鏂z), po kt鏎ych nast瘼uje lista nazw u篡tkownik闚 rozdzielonych przecinkiem. .PP -z-ID jest formatowane w taki sam spos鏏 jak na-ID, z wyj徠kiem tego, 瞠 +z\-ID jest formatowane w taki sam spos鏏 jak na\-ID, z wyj徠kiem tego, 瞠 rozpoznawane jest dodatkowe s這wo .BR GROUP. Zapis @@ -44,7 +43,7 @@ Zapis Po s這wie .B GROUP powinna wyst徙i jedna lub wi璚ej rozdzielonych przecinkiem nazw grup. -Niewystarczaj帷e jest podanie g堯wnego ID danej grupy - niezb璠ny jest +Niewystarczaj帷e jest podanie g堯wnego ID danej grupy \- niezb璠ny jest wpis w .BR /etc/group (5). .PP diff --git a/man/pl/sulogin.8 b/man/pl/sulogin.8 index 71af1fc0..1cfd3103 100644 --- a/man/pl/sulogin.8 +++ b/man/pl/sulogin.8 @@ -1,5 +1,4 @@ -.\" $Id: sulogin.8,v 1.5 2003/04/26 13:24:15 kloczek Exp $ -.\" {PTM/WK/1999-09-14} +.\" $Id: sulogin.8,v 1.7 2005/04/05 18:47:51 kloczek Exp $ .\" Copyright 1989 - 1992, Julianne Frances Haugh .\" All rights reserved. .\" @@ -28,9 +27,9 @@ .\" SUCH DAMAGE. .TH SULOGIN 8 .SH NAZWA -sulogin - login w trybie jednou篡tkownikowym +sulogin \- login w trybie jednou篡tkownikowym .SH SKｘDNIA -\fBsulogin\fR [\fIurz康zenie-tty\fR] +\fBsulogin\fR [\fIurz康zenie\-tty\fR] .SH OPIS .B sulogin wywo造wane jest przez \fBinit\fR przed zezwoleniem u篡tkownikowi @@ -41,16 +40,16 @@ pozycj .PP Wy鈍ietlany jest symbol zach皻y .IP "" .5i -Type control-d to proceed with normal startup, +Type control\-d to proceed with normal startup, .br (or give root password for system maintenance): .br -Naci郾ij control-d by kontynuowa zwyk造 start, +Naci郾ij control\-d by kontynuowa zwyk造 start, .br (lub podaj has這 u篡tkownika root do konserwacji systemu): .PP Wej軼ie i wyj軼ie b璠 obs逝giwane przy u篡ciu standardowych deskryptor闚 -plik闚, chyba 瞠 u篡to opcjonalnego argumentu - nazwy urz康zenia. +plik闚, chyba 瞠 u篡to opcjonalnego argumentu \- nazwy urz康zenia. .PP Je郵i u篡tkownik wprowadzi poprawne has這 superu篡tkownika root, to rozpoczynana jest sesja pracy na koncie root. @@ -79,9 +78,9 @@ Jednak urz康zenia, za wiele polece u篡tkownika mo瞠 by niedost瘼nych lub nie funkcjonowa. .SH PLIKI -.IR /etc/passwd " - informacja o kontach u篡tkownik闚" +.IR /etc/passwd " \- informacja o kontach u篡tkownik闚" .br -.IR /etc/shadow " - zakodowane has豉 i informacja o ich wa積o軼i" +.IR /etc/shadow " \- zakodowane has豉 i informacja o ich wa積o軼i" .SH ZOBACZ TAK浩 .BR login (1), .BR sh (1), diff --git a/man/pl/useradd.8 b/man/pl/useradd.8 index 47dd6b4f..c823c80f 100644 --- a/man/pl/useradd.8 +++ b/man/pl/useradd.8 @@ -1,5 +1,4 @@ -.\" $Id: useradd.8,v 1.18 2004/11/04 03:06:32 kloczek Exp $ -.\" {PTM/WK/0.1/VIII-1999} +.\" $Id: useradd.8,v 1.20 2005/04/05 18:47:51 kloczek Exp $ .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -28,30 +27,30 @@ .\" SUCH DAMAGE. .TH USERADD 8 .SH NAZWA -useradd - tw鏎z nowego u篡tkownika lub zmie domy郵n informacj o nowym +useradd \- tw鏎z nowego u篡tkownika lub zmie domy郵n informacj o nowym .SH SKｘDNIA .TP 8 -\fBuseradd\fR [\fB-c\fR \fIkomentarz\fR] [\fB-d\fR \fIkatalog_domowy\fR] +\fBuseradd\fR [\fB\-c\fR \fIkomentarz\fR] [\fB\-d\fR \fIkatalog_domowy\fR] .br -[\fB-e\fR \fIdata_wa積o軼i\fR] [\fB-f\fR \fIdni_nieaktywno軼i\fR] +[\fB\-e\fR \fIdata_wa積o軼i\fR] [\fB\-f\fR \fIdni_nieaktywno軼i\fR] .br -[\fB-g\fR \fIgrupa_pocz徠kowa\fR] [\fB-G\fR \fIgrupa\fR[,...]] +[\fB\-g\fR \fIgrupa_pocz徠kowa\fR] [\fB\-G\fR \fIgrupa\fR[,...]] .br -[[\fB-M\fR] \fB-m\fR [\fB-k\fR \fIkatalog_wzorc闚\fR]] [\fB-o\fR] [\fB-p\fR \fIhas這\fR] +[[\fB\-M\fR] \fB\-m\fR [\fB\-k\fR \fIkatalog_wzorc闚\fR]] [\fB\-o\fR] [\fB\-p\fR \fIhas這\fR] .br -[\fB-s\fR \fIpow這ka\fR] [\fB-u\fR \fIuid\fR] \fIlogin\fR +[\fB\-s\fR \fIpow這ka\fR] [\fB\-u\fR \fIuid\fR] \fIlogin\fR .TP 8 -\fBuseradd\fR \fB-D\fR [\fB-g\fI domy郵na_grupa\fR] [\fB-b\fI katalog_bazowy\fR] +\fBuseradd\fR \fB\-D\fR [\fB\-g\fR \fIdomy郵na_grupa\fR] [\fB\-b\fR \fIkatalog_bazowy\fR] .br -[\fB-f\fI domy郵ne_dni_nieaktywno軼i\fR] +[\fB\-f\fR \fIdomy郵ne_dni_nieaktywno軼i\fR] .br -[\fB-e\fI domy郵na_data_wa積o軼i\fR] +[\fB\-e\fR \fIdomy郵na_data_wa積o軼i\fR] .br -[\fB-s\fI domy郵na_pow這ka\fR] +[\fB\-s\fR \fIdomy郵na_pow這ka\fR] .SH OPIS .SS Tworzenie nowych u篡tkownik闚 .\" .SS Creating New Users -Wywo豉ne bez opcji \fB-D\fR, polecenie \fBuseradd\fR tworzy nowe konto +Wywo豉ne bez opcji \fB\-D\fR, polecenie \fBuseradd\fR tworzy nowe konto u篡tkownika pos逝guj帷 si warto軼iami podanymi w wierszu polece i domy郵nymi warto軼iami z systemu. W zale積o軼i od potrzeb i opcji wiersza polece, do plik闚 systemowych @@ -59,91 +58,77 @@ zostanie wprowadzone nowe konto u domowy, do kt鏎ego przekopiowane zostan pliki startowe. .SH OPCJE Polecenie \fBuseradd\fR posiada nast瘼uj帷e opcje: -.\" .IP "\fB-A {\fImetoda\fR|\fBDEFAULT\fR},..." -.\" Okre郵a metod autentykacji u篡tkownika. -.\" Metoda autentykacji jest nazw programu odpowiedzialnego za weryfikacj -.\" to窺amo軼i u篡tkownika. -.\" Mo瞠 zosta u篡ty 豉鎍uch \fBDEFAULT\fR w celu zmiany metody autentykacji -.\" u篡tkownika na standardow metod has豉 systemowego. -.\" Argumentem tej opcji jest lista oddzielonych przecinkami nazw program闚. -.\" Mo瞠 ona zawiera 豉鎍uch \fBDEFAULT\fR tylko jednokrotnie. -.IP "\fB-c \fIkomentarz\fR" +.IP "\fB\-c\fR \fIkomentarz\fR" Pole komentarza dla zak豉danego u篡tkownika w pliku hase. -.IP "\fB-d \fIkatalog_domowy\fR" +.IP "\fB\-d\fR \fIkatalog_domowy\fR" Warto嗆 \fIkatalog_domowy\fR zostanie u篡ta do okre郵enia katalogu logowania nowotworzonego u篡tkownika. Domy郵nie do \fIdomy郵ny_domowy\fR dodawana jest nazwa u篡tkownika (\fIlogin\fR) tworz帷 pe軟 nazw katalogu logowania. -.IP "\fB-e \fIdata_wa積o軼i\fR" +.IP "\fB\-e\fR \fIdata_wa積o軼i\fR" Data, od kt鏎ej konto u篡tkownika zostanie wy陰czone. Data podawana jest w formacie \fIMM/DD/YY\fR. -.IP "\fB-f \fIdni_nieaktywno軼i\fR" +.IP "\fB\-f\fR \fIdni_nieaktywno軼i\fR" Liczba dni po wyga郾i璚iu has豉 do sta貫go wy陰czenia konta. Warto嗆 0 wy陰cza konto natychmiast po przeterminowaniu has豉, za warto嗆 --1 wy陰cza t cech. Domy郵n warto軼i jest -1. -.IP "\fB-g \fIgrupa_pocz徠kowa\fR" +\-1 wy陰cza t cech. Domy郵n warto軼i jest \-1. +.IP "\fB\-g\fR \fIgrupa_pocz徠kowa\fR" Nazwa lub numer pocz徠kowej grupy logowania u篡tkownika. Nazwa grupy musi istnie. Numer grupy musi odnosi si do ju istniej帷ej grupy. Domy郵nym numerem grupy jest 1. -.IP "\fB-G \fIgrupa,[...]\fR" +.IP "\fB\-G\fR \fIgrupa,[...]\fR" Lista dodatkowych grup, do kt鏎ych r闚nie nale篡 u篡tkownik. Ka盥a grupa oddzielona jest od nast瘼nej przecinkiem, bez wtr帷onej spacji. Do grup odnosz si te same ograniczenia, kt鏎e obowi您uj przy grupie podanej -w opcji \fB-g\fR. +w opcji \fB\-g\fR. Domy郵nie u篡tkownik nale篡 tylko do grupy pocz徠kowej. -.IP \fB-M\fR -RedHat doda opcj CREATE_HOME w pliku login.defs w swojej wersji shadow-utils, -kt鏎a powodowa豉 domy郵ne u篡cie \fB-m\fR - ta opcja wy陰cza to. U篡wanie jej +.IP \fB\-M\fR +RedHat doda opcj CREATE_HOME w pliku login.defs w swojej wersji shadow\-utils, +kt鏎a powodowa豉 domy郵ne u篡cie \fB\-m\fR \- ta opcja wy陰cza to. U篡wanie jej znajduje zastosowanie np. w skryptach, lecz mo瞠 by powodem niezgodno軼i -z innymi wersjami shadow-utils. -.IP \fB-m\fR +z innymi wersjami shadow\-utils. +.IP \fB\-m\fR Je郵i nie istnieje katalog domowy u篡tkownika, to zostanie on utworzony. -Je郵i pos逝穎no si opcj \fB-k\fR, to b璠 do niego przekopiowane wzorcowe +Je郵i pos逝穎no si opcj \fB\-k\fR, to b璠 do niego przekopiowane wzorcowe pliki startowe zawarte w \fIkatalogu_wzorc闚\fR. W przeciwnym przypadku, zamiast nich zostan u篡te pliki zawarte w \fI/etc/skel\fR. W katalogu domowym u篡tkownika zostan r闚nie utworzone podkatalogi zawarte w \fIkatalogu_wzorc闚\fR lub \fI/etc/skel\fR. -Opcja \fB-k\fR jest dozwolona tylko w po陰czeniu z opcj \fB-m\fR. +Opcja \fB\-k\fR jest dozwolona tylko w po陰czeniu z opcj \fB\-m\fR. Domy郵nym dzia豉niem jest nie tworzenie katalogu i nie kopiowanie jakichkolwiek plik闚. -.IP "\fB-o\fR" +.IP "\fB\-o\fR" Umo磧iwia utworzenie u篡tkownaika z nieunikalnym UID (takim samym jak ju istniej帷y). -.IP "\fB-p \fIpasswd\fR" +.IP "\fB\-p\fR \fIpasswd\fR" Zakodowane has這 w postaci zwracanej przez \fBcrypt\fR(3). Domy郵nym dzia豉niem jest blokowanie konta. -.\" .IP \fB-r\fR -.\" Tworzenie konta systemowego. Ta opcja pozwala na utworzenie konta o UID -.\" ni窺zym ni UID_MIN zdefiniowane w fI/etc/login.defs\fR. O ile nie poda si -.\" dodatkowo opcji \fB-m\fR nie jest tworzony katalog domowy dla tak tworzonego -.\" u篡tkownika niezale積ie od tego czy tworzenie katalogu jest ustawione czy -.\" nie w \fI/etc/login.defs\fR. -.IP "\fB-s \fIpow這ka\fR" +.IP "\fB\-s\fR \fIpow這ka\fR" Nazwa pow這ki (shell) u篡tkownika. Ustawienie tego pola na puste powoduje, 瞠 system wybierze domy郵n pow這k logowania. -.IP "\fB-u \fIuid\fR" +.IP "\fB\-u\fR \fIuid\fR" Numeryczna warto嗆 identyfikatora u篡tkownika (user's ID). Warto嗆 ta musi -by niepowtarzalna, chyba 瞠 u篡to opcji \fI-o\fR. Warto嗆 musi by nieujemna. +by niepowtarzalna, chyba 瞠 u篡to opcji \fI\-o\fR. Warto嗆 musi by nieujemna. Domy郵nie u篡wana jest tu najmniejsza warto嗆 identyfikatora wi瘯sza od 999 i wi瘯sza od identyfikator闚 pozosta造ch u篡tkownik闚. Warto軼i od 0 do 999 s zwykle zarezerwowane dla kont systemowych. .SS Zmiana warto軼i domy郵nych -Wywo豉ne z opcj \fB-D\fR, polecenie \fBuseradd\fR albo wy鈍ietli bie膨ce +Wywo豉ne z opcj \fB\-D\fR, polecenie \fBuseradd\fR albo wy鈍ietli bie膨ce warto軼i domy郵ne, albo zaktualizuje domy郵ne warto軼i z wiersza polece. Dozwolonymi opcjami s: -.IP "\fB-b \fIkatalog_bazowy\fR" +.IP "\fB\-b\fR \fIkatalog_bazowy\fR" Pocz徠kowy przedrostek 軼ie磬i dla katalogu domowego nowego u篡tkownika. -Je郵i przy tworzeniu nowego konta nie u篡to opcji \fB-d\fR, to +Je郵i przy tworzeniu nowego konta nie u篡to opcji \fB\-d\fR, to na koniec \fIkatalogu_bazowego\fR zostanie dodana nazwa u篡tkownika, tworz帷 now nazw katalogu. -.IP "\fB-e \fIdomy郵na_data_wa積o軼i\fR" +.IP "\fB\-e\fR \fIdomy郵na_data_wa積o軼i\fR" Data, od kt鏎ej konto u篡tkownika zostanie wy陰czone. -.IP "\fB-f \fIdomy郵ne_dni_nieaktywno軼i\fR" +.IP "\fB\-f\fR \fIdomy郵ne_dni_nieaktywno軼i\fR" Liczba dni po wyga郾i璚iu has豉 do sta貫go wy陰czenia konta. -.IP "\fB-g \fIdomy郵na_grupa\fR" +.IP "\fB\-g\fR \fIdomy郵na_grupa\fR" Nazwa lub numer pocz徠kowej grupy logowania u篡tkownika. Nazwa grupy musi istnie. Numer grupy musi odnosi si do ju istniej帷ej grupy. -.IP "\fB-s \fIdomy郵na_pow這ka\fR" +.IP "\fB\-s\fR \fIdomy郵na_pow這ka\fR" Nazwa pow這ki (shell) dla nowych u篡tkownik闚. Podany program b璠zie u篡ty dla wszystkich przysz造ch nowych kont u篡tkownik闚. .PP @@ -176,7 +161,7 @@ Polecenie \fBuseadd\fR ko .br \fB3\fR \- niew豉軼iwe parametry opcji .br -\fB4\fR \- uid jest ju u篡wany (i nie u篡to opcji -o) +\fB4\fR \- uid jest ju u篡wany (i nie u篡to opcji \-o) .br \fB6\fR \- podana grupa nie istnieje .br diff --git a/man/pl/userdel.8 b/man/pl/userdel.8 index 36006e64..e48ce4fe 100644 --- a/man/pl/userdel.8 +++ b/man/pl/userdel.8 @@ -1,5 +1,4 @@ -.\" $Id: userdel.8,v 1.10 2004/11/02 19:28:32 kloczek Exp $ -.\" {PTM/WK/0.1/VIII-1999} +.\" $Id: userdel.8,v 1.11 2005/04/05 18:47:51 kloczek Exp $ .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -30,7 +29,7 @@ .SH NAZWA userdel \- usu konto u篡tkownika i powi您ane pliki .SH SKｘDNIA -\fBuserdel\fR [\fB-r\fR] \fIlogin\fR +\fBuserdel\fR [\fB\-r\fR] \fIlogin\fR .SH OPIS Polecenie \fBuserdel\fR zmienia systemowe pliki kont, usuwaj帷 wszystkie zapisy odnosz帷e si do \fIlogin\fR. @@ -38,7 +37,7 @@ Podany u nast瘼uj帷e opcje: .SH OPCJE .TP -.B -r +.B \-r Zostan usuni皻e zar闚no pliki w katalogu domowym u篡tkownika jak i sam ten katalog. Pliki po這穎ne w innym systemie plik闚 musz by odszukane i usuni皻e r璚znie. diff --git a/man/pl/usermod.8 b/man/pl/usermod.8 index 403282c2..f88ceb01 100644 --- a/man/pl/usermod.8 +++ b/man/pl/usermod.8 @@ -1,5 +1,4 @@ -.\" $Id: usermod.8,v 1.12 2004/11/04 03:06:32 kloczek Exp $ -.\" {PTM/WK/0.1/VIII-1999} +.\" $Id: usermod.8,v 1.14 2005/04/05 18:22:49 kloczek Exp $ .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -31,87 +30,73 @@ usermod \- zmiana danych konta u篡tkownika .SH SKｘDNIA .TP 8 -.B usermod -.\" .RB [ -A -.\" .RI { metoda | \fBDEFAULT\fR "},... ]" -.RB [ -c -.IR komentarz ] -.RB [ -d -.IR katalog_domowy " [" -.BR -m ]] +\fBusermod\fR [\fB\-c\fR \fIkomentarz\fR] [\fB\-d\fR \fIkatalog_domowy\fR [\fB\-m\fR]] .br -.RB [ -e -.IR data_wa積o軼i ] -.RB [ -f -.IR dni_nieaktywno軼i ] +[\fB\-e\fR \fIdata_wa積o軼i\fR] [\fB\-f\fR \fIdni_nieaktywno軼i\fR] .br -.RB [ -g -.IR grupa_pocz徠kowa ] -.RB [ -G -.IR grupa [,...]] +[\fB\-g\fR \fIgrupa_pocz徠kowa\fR] [\fB\-G\fR \fIgrupa\fR [,...]] .br -.RB [ -l -.IR login_name ] -.RB [ -s -.IR pow這ka ] +[\fB\-l\fR \fIlogin_name\fR] [\fB\-p\fR \fIhas這\fR] .br -.RB [ -u -.IR uid " [" -.BR -o ]] -.I login +[\fB\-s\fR \fIpow這ka\fR] [\fB\-u\fR \fIuid\fR [\fB\-o\fR]] [\fB\-L\fR|\fB\-U\fR] +\fIlogin\fR .SH OPIS Polecenie \fBusermod\fR zmienia systemowe pliki kont, odzwierciedlaj帷 zmiany podane w wierszu polece. .SH OPCJE -Posiada ono nast瘼uj帷e opcje: -.\" .IP "\fB-A \fImetoda\fR|\fBDEFAULT\fR" -.\" Nowa warto嗆 metody autentykacji u篡tkownika. Metoda autentykacji jest -.\" nazw programu odpowiedzialnego za weryfikacj to窺amo軼i u篡tkownika. -.\" Mo瞠 zosta u篡ty 豉鎍uch \fBDEFAULT\fR w celu zmiany metody autentykacji -.\" u篡tkownika na standardow metod has豉 systemowego. -.\" method to the standard system password method. -.IP "\fB-c \fIkomentarz\fR" +Polecenie \fBusermod\fR posiada nast瘼uj帷e opcje: +.IP "\fB\-c\fR \fIkomentarz\fR" Nowa warto嗆 pola komentarza dla danego u篡tkownika w pliku hase. Zwykle jest zmieniana przy pomocy narz瞛ia \fBchfn\fR(1). -.IP "\fB-d \fIkatalog_domowy\fR" -Nowy katalog logowania u篡tkownika. Je瞠li podano opcj \fB-m\fR, to zawarto嗆 +.IP "\fB\-d\fR \fIkatalog_domowy\fR" +Nowy katalog logowania u篡tkownika. Je瞠li podano opcj \fB\-m\fR, to zawarto嗆 aktualnego katalogu domowego zostanie przesuni皻a do nowego katalogu. Nowy katalog domowy jest tworzony je郵i nie istnieje. -.IP "\fB-e \fIdata_wa積o軼i\fR" +.IP "\fB\-e\fR \fIdata_wa積o軼i\fR" Data, od kt鏎ej konto danego u篡tkownika zostanie wy陰czone. -.\" disabled Data podawana jest w formacie \fIMM/DD/YY\fR. -.IP "\fB-f \fIdni_nieaktywno軼i\fR" +.IP "\fB\-f\fR \fIdni_nieaktywno軼i\fR" Liczba dni po wyga郾i璚iu has豉 do sta貫go wy陰czenia konta. Warto嗆 0 wy陰cza konto natychmiast po przeterminowaniu has豉, za warto嗆 --1 wy陰cza t cech. Domy郵n warto軼i jest -1. -.IP "\fB-g \fIgrupa_pocz徠kowa\fR" +\-1 wy陰cza t cech. Domy郵n warto軼i jest \-1. +.IP "\fB\-g\fR \fIgrupa_pocz徠kowa\fR" Nazwa lub numer pocz徠kowej grupy logowania u篡tkownika. Nazwa grupy musi istnie. Numer grupy musi odnosi si do ju istniej帷ej grupy. Domy郵nym numerem grupy jest 1. -.IP "\fB-G \fIgrupa,[...]\fR" +.IP "\fB\-G\fR \fIgrupa,[...]\fR" Lista dodatkowych grup, do kt鏎ych r闚nie nale篡 u篡tkownik. Ka盥a grupa oddzielona jest od nast瘼nej przecinkiem, bez wtr帷onej spacji. Do grup odnosz si te same ograniczenia, kt鏎e obowi您uj przy grupie podanej -w opcji \fB-g\fR. +w opcji \fB\-g\fR. Je瞠li u篡tkownik jest obecnie cz這nkiem grupy, kt鏎ej nie podano na li軼ie, to zostanie z niej usuni皻y. -.IP "\fB-l \fIlogin_name\fR" +.IP "\fB\-l\fR \fIlogin_name\fR" Nazwa u篡tkownika zostanie zmieniona z \fIlogin\fR na \fIlogin_name\fR. Nic wi璚ej nie jest zmieniane. W szczeg鏊no軼i, prawdopodobnie powinna zosta zmieniona nazwa katalogu domowego u篡tkownika, tak by odzwierciedla豉 now nazw u篡tkownika. -.IP "\fB-s \fIpow這ka\fR" +.IP "\fB\-L\fR" +Zablokuj has這 u篡tkownika. Opcja ta powoduje wstawienie '!' na pocz徠ku zakodowanego +has豉. Opcji tej nie mo積a u篡wa z opcjami \fI\-p\fR, \fI\-U\fR. +.IP "\fB\-o\fR" +U篡te z opcja \fI\-u\fR umo磧iwia zmiane ID u篡tkownika na warto嗆 nieunikaln. +.IP "\fB\-p\fR \fIpasswd\fR" +Zakodowane has這 w postaci zwracanej przez \fBcrypt\fR(3). +Domy郵nym dzia豉niem jest blokowanie konta. +.IP "\fB\-s\fR \fIpow這ka\fR" Nazwa nowej pow這ki (shell) u篡tkownika. Ustawienie tego pola na puste powoduje, 瞠 system wybierze domy郵n pow這k logowania. -.IP "\fB-u \fIuid\fR" +.IP "\fB\-u\fR \fIuid\fR" Numeryczna warto嗆 identyfikatora u篡tkownika (user's ID). Warto嗆 ta musi -by niepowtarzalna, chyba, 瞠 u篡to opcji \fI-o\fR. Warto嗆 musi by nieujemna. +by niepowtarzalna, chyba, 瞠 u篡to opcji \fI\-o\fR. Warto嗆 musi by nieujemna. Warto軼i od 0 do 999 s zwykle zarezerwowane dla kont systemowych. Wszystkim plikom posiadanym przez u篡tkownika, a po這穎nym w drzewie katalogowym rozpoczynaj帷ym si od jego katalogu domowego zostanie automatycznie zmieniony identyfikator u篡tkownika pliku. Pliki poza katalogiem domowym u篡tkownika musz zosta zmienione r璚znie. +.IP "\fB\-U\fR" +Odblokowuje has這 u篡tkownika. Opcja ta powoduje usuniecie '!' z pocz徠ku +zakodowanego has豉. Opcji tej nie mo積a u篡wa z opcjami \fI\-p\fR, \fI\-L\fR. .SH OSTRZE浩NIA \fBusermod\fR nie pozwoli na zmian nazwy zalogowanego u篡tkownika. Je郵i zmieniany jest numeryczny identyfikator u篡tkownika procesu, to musisz @@ -121,11 +106,11 @@ W W豉郾iciela zada at musisz zmieni r璚znie. Jakiekolwiek zmiany dotycz帷e NIS musisz wykona na serwerze NIS. .SH PLIKI -\fI/etc/passwd\fR \- informacja o kontach u篡tkownik闚 +\fI/etc/passwd\fR \- informacja o kontach u篡tkownik闚 .br -\fI/etc/shadow\fR \- bezpieczna informacja o kontach u篡tkownik闚 +\fI/etc/shadow\fR \- bezpieczna informacja o kontach u篡tkownik闚 .br -\fI/etc/group\fR \- informacja o grupach +\fI/etc/group\fR \- informacja o grupach .SH ZOBACZ TAK浩 .BR chfn (1), .BR chsh (1), diff --git a/man/pl/vipw.8 b/man/pl/vipw.8 index 33fdf617..013e7987 100644 --- a/man/pl/vipw.8 +++ b/man/pl/vipw.8 @@ -1,19 +1,18 @@ -.\" $Id: vipw.8,v 1.5 2001/12/22 03:28:52 kloczek Exp $ -.\" {PTM\WK\1999-09-14} +.\" $Id: vipw.8,v 1.6 2005/04/05 18:47:51 kloczek Exp $ .TH VIPW 8 "26 wrze郾ia 1997" .SH NAZWA -vipw, vigr - edycja plik闚 hase, grup i ich wersji dodatkowych (shadow) +vipw, vigr \- edycja plik闚 hase, grup i ich wersji dodatkowych (shadow) .SH SKｘDNIA -\fBvipw\fR [\fB-s\fR] +\fBvipw\fR [\fB\-s\fR] .br -\fBvigr\fR [\fB-s\fR] +\fBvigr\fR [\fB\-s\fR] .SH OPIS .BR vipw " i " vigr umo磧iwiaj modyfikacj plik闚 odpowiednio .IR /etc/passwd " i " /etc/group . Przy zastosowaniu flagi -.BR -s, -modyfikuj tak瞠 dodatkowe wersje chronione (shadow) tych plik闚 - odpowiednio +.BR \-s, +modyfikuj tak瞠 dodatkowe wersje chronione (shadow) tych plik闚 \- odpowiednio .IR /etc/shadow " i " /etc/gshadow " . Dla ochrony przed uszkodzeniem plik闚 programy te ustawiaj odpowiednie blokady. @@ -30,4 +29,3 @@ a na ko .BR passwd (5), .BR group (5), .BR shadow (5) -.\" {PTM\WK\1999-09-14} diff --git a/man/porttime.5 b/man/porttime.5 index 3c64cf15..17cc7c97 100644 --- a/man/porttime.5 +++ b/man/porttime.5 @@ -1,4 +1,4 @@ -.\"$Id: porttime.5,v 1.9 2003/05/01 18:17:39 kloczek Exp $ +.\" $Id: porttime.5,v 1.11 2005/04/05 18:47:50 kloczek Exp $ .\" Copyright 1989 - 1990, Julianne Frances Haugh .\" All rights reserved. .\" @@ -50,7 +50,7 @@ The following entry allows access to user \fBjfh\fR on every port during weekdays from 9am to 5pm. .br .sp 1 - *:jfh:Wk0900-1700 + *:jfh:Wk0900\-1700 .br .sp 1 The following entries allow access only to the users \fBroot\fR and @@ -59,20 +59,20 @@ The following entries allow access only to the users \fBroot\fR and would match the second entry which does not permit access at any time. .br .sp 1 - console:root,oper:Al0000-2400 + console:root,oper:Al0000\-2400 .br console:*: .br .sp 1 The following entry allows access for the user \fBgames\fR on any port -during non-working hours. +during non\-working hours. .br .sp 1 - *:games:Wk1700-0900,SaSu0000-2400 + *:games:Wk1700\-0900,SaSu0000\-2400 .br .sp 1 .SH FILES -\fI/etc/porttime\fR \ - file containing port access times +\fI/etc/porttime\fR \- file containing port access times .SH SEE ALSO .BR login (1) .SH AUTHOR diff --git a/man/pt_BR/Makefile.in b/man/pt_BR/Makefile.in index e69f8b67..f58ed8c0 100644 --- a/man/pt_BR/Makefile.in +++ b/man/pt_BR/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.4 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -89,17 +89,16 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ 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@ @@ -193,9 +192,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/pt_BR/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/pt_BR/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/pt_BR/Makefile + $(AUTOMAKE) --foreign man/pt_BR/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/man/pt_BR/gpasswd.1 b/man/pt_BR/gpasswd.1 index aaf631be..a70bca78 100644 --- a/man/pt_BR/gpasswd.1 +++ b/man/pt_BR/gpasswd.1 @@ -20,37 +20,31 @@ .\" Voc deve receber uma c鏕ia da Licen蓷 Pblica GNU .\" junto com este manual; caso contr嫫io, escreva para a Free Software .\" Foundation, Inc., 675 mass Ave, Cambridge, MA 02139 USA ou -.\" em portugu瘰 na Conectiva Inform嫢ica - http://www.conectiva.com.br +.\" em portugu瘰 na Conectiva Inform嫢ica \- http://www.conectiva.com.br .\" -.\" $Id: gpasswd.1,v 1.2 2003/04/26 13:24:16 kloczek Exp $ +.\" $Id: gpasswd.1,v 1.3 2005/04/05 19:08:56 kloczek Exp $ .\" .TH GPASSWD 1 .SH NOME gpasswd \- administra o arquivo \fI/etc/group\fR .br .SH SINOSPE -.B gpasswd \fIgrupo\fR +\fBgpasswd\fR \fIgrupo\fR +.br +\fBgpasswd \-a\fR \fIusu嫫io\fR \fIgrupo\fR +.br +\fBgpasswd \-d\fR \fIusu嫫io\fR \fIgrupo\fR +.br +\fBgpasswd \-R\fR \fIgrupo\fR .br .B gpasswd -.B -a -\fIusu嫫io\fR \fIgrupo\fR -.br -.B gpasswd -.B -d -\fIusu嫫io\fR \fIgrupo\fR -.br -.B gpasswd -.B -R +.B \-r \fIgrupo\fR .br .B gpasswd -.B -r -\fIgrupo\fR -.br -.B gpasswd -.RB [ -A +.RB [ \-A \fIusu嫫io\fR,...] -.RB [ -M +.RB [ \-M \fIusu嫫io\fR,...] \fIgrupo\fR .br @@ -60,16 +54,16 @@ O utilizado para administrar o arquivo \fI/etc/group\fR (e o arquivo \fI/etc/gshadow\fR, caso compilado com SHADOWGRP). Todos os grupos podem ter administradores, membros e uma senha. O -administrador do sistema pode usar a op誽o \fB-A\fR para definir o -administrador do grupo e \fB-M\fR para definir os membros e todos os seus +administrador do sistema pode usar a op誽o \fB\-A\fR para definir o +administrador do grupo e \fB\-M\fR para definir os membros e todos os seus direitos assim como os do administrador. .PP Administradores de grupos podem adicionar e excluir usu嫫ios utilizando as -op踥es \fB-a\fR e \fB-d\fR respectivamente. Administradores podem usar a op誽o -\fB-r\fR para remover a senha de um grupo. Quando n緌 h senhas definidas +op踥es \fB\-a\fR e \fB\-d\fR respectivamente. Administradores podem usar a op誽o +\fB\-r\fR para remover a senha de um grupo. Quando n緌 h senhas definidas para um grupo, somente os membros do grupo podem usar o comando .BR newgrp (1) -para adicionar novos usu嫫ios ao grupo . A op誽o \fB-R\fR +para adicionar novos usu嫫ios ao grupo . A op誽o \fB\-R\fR desabilita o acesso ao grupo atrav廥 do comando .BR newgrp (1) . @@ -82,9 +76,9 @@ solicitar esteja habilitado para outros usu嫫ios do grupo sem o uso de senha, n緌 membros podem tamb幦 executar o comando, informando por幦 a senha do grupo. .SH ARQUIVOS -\fI/etc/group\fR \- informa踥es do grupo +\fI/etc/group\fR \- informa踥es do grupo .br -\fI/etc/gshadow\fR \- informa踥es do grupo em arquivo shadow +\fI/etc/gshadow\fR \- informa踥es do grupo em arquivo shadow .SH VEJA TAMB丏 .BR newgrp (1), .BR groupadd (8), diff --git a/man/pt_BR/groupadd.8 b/man/pt_BR/groupadd.8 index 086b6511..99ec0e36 100644 --- a/man/pt_BR/groupadd.8 +++ b/man/pt_BR/groupadd.8 @@ -21,45 +21,45 @@ .\" Voc deve receber uma c鏕ia da Licen蓷 Pblica GNU .\" junto com este manual; caso contr嫫io, escreva para a Free Software .\" Foundation, Inc., 675 mass Ave, Cambridge, MA 02139 USA ou -.\" em portugu瘰 na Conectiva Inform嫢ica Ltda. - http://www.conectiva.com.br +.\" em portugu瘰 na Conectiva Inform嫢ica Ltda. \- http://www.conectiva.com.br .\" .\" .\" -.\" $Id: groupadd.8,v 1.6 2004/11/04 03:06:32 kloczek Exp $ +.\" $Id: groupadd.8,v 1.8 2005/04/05 19:08:56 kloczek Exp $ .\" .TH GROUPADD 8 .SH NOME groupadd \- Criar um novo grupo .SH SINOPSE -\fBgroupadd\fR [\fB-g\fI gid \fR[\fB-o\fR]] [\fB-f\fR] \fIgrupo\fR +\fBgroupadd\fR [\fB\-g\fR \fIgid\fR [\fB\-o\fR]] [\fB\-f\fR] \fIgrupo\fR .SH DESCRIЫO O comando \fBgroupadd\fR cria um novo grupo usando valores especificados na linha de comando e os valores padr髊s do sistema. O novo grupo ser criado -nos arquivos do sistema, conforme o requerido. As op踥es que aplicam-se ao +nos arquivos do sistema, conforme o requerido. As op踥es que aplicam\-se ao comando \fBgroupadd\fR s緌 -.IP \fB-f\fR +.IP \fB\-f\fR Este o indicador \fIforce\fR . Ele n緌 ir parar o processamento do \fBgroupadd\fR e n緌 finalizar o programa, caso um grupo que esteja sendo criado j exista no sistema. Neste caso, o grupo n緌 ser alterado(ou adicionado novamente). -.IP "\fB-g \fIgid\fR" +.IP "\fB\-g \fIgid\fR" A identifica誽o num廨ica do grupo denominada ID. Este valor deve ser -nico, a menos que a op誽o \fB-o\fR seja usada. O valor deve ser n緌 +nico, a menos que a op誽o \fB\-o\fR seja usada. O valor deve ser n緌 negativo, e o padr緌 o menor valor maior que 500 e o maior que qualquer outro grupo. Valores entre 0 e 999 s緌 tipicamente reservados para \fIcontas do sistema\fR. -.IP \fB-r\fR +.IP \fB\-r\fR Este indicador instrui \fBgroupadd\fR a adicionar uma \fIconta do sistema \fR. A primeira identifica誽o de grupo \fI(gid)\fR menor que 999 ser -automaticamente selecionada a menos que a op誽o \fB-g\fR seja informada +automaticamente selecionada a menos que a op誽o \fB\-g\fR seja informada tamb幦. .BR Esta uma informa誽o disponibilizada pela Red Hat Software. .BR -Esta op誽o tamb幦 modifica o modo como a op誽o \fB-g\fR funciona. Ao +Esta op誽o tamb幦 modifica o modo como a op誽o \fB\-g\fR funciona. Ao solicitar um \fIgid\fR que n緌 seja nico e ao n緌 informar a op誽o -\fB-o\fR, a cria誽o do grupo , a cria誽o ter o comportamento padr緌 -(adicionando um grupo como se as op踥es \fB-g\fR ou \fB-o\fR \fBn緌\fR +\fB\-o\fR, a cria誽o do grupo , a cria誽o ter o comportamento padr緌 +(adicionando um grupo como se as op踥es \fB\-g\fR ou \fB\-o\fR \fBn緌\fR fossem especificadas). .BR .SH ARQUIVOS diff --git a/man/pt_BR/groupdel.8 b/man/pt_BR/groupdel.8 index 0eb75622..077bc6ff 100644 --- a/man/pt_BR/groupdel.8 +++ b/man/pt_BR/groupdel.8 @@ -1,4 +1,4 @@ -.\" Copyright 1991 - 1993, Julianne Frances Haugh +.\" Copyright 1991 \- 1993, Julianne Frances Haugh .\" All rights reserved. .\" .\" Todos os direitos reservados. @@ -23,9 +23,9 @@ .\" Voc deve receber uma c鏕ia da Licen蓷 Pblica GNU .\" junto com este manual; caso contr嫫io, escreva para a Free Software .\" Foundation, Inc., 675 mass Ave, Cambridge, MA 02139 USA ou -.\" em portugu瘰 na Conectiva Inform嫢ica Ltda. - http://www.conectiva.com.br.\" +.\" em portugu瘰 na Conectiva Inform嫢ica Ltda. \- http://www.conectiva.com.br.\" .\" -.\" $Id: groupdel.8,v 1.3 2003/04/26 13:24:16 kloczek Exp $ +.\" $Id: groupdel.8,v 1.4 2005/04/05 19:08:56 kloczek Exp $ .\" .TH GROUPDEL 8 .SH NOME @@ -36,9 +36,9 @@ groupdel \- Apaga um grupo .SH DESCRIЫO O comando \fBgroupdel\fR modifica os arquivos de contas do sistema, apagando todas as refer瘽cias ao \fIgrupo\fR. O grupo a ser apagado deve existir. .PP -Deve-se manualmente checar os sistemas de arquivos para garantir que nenhum dos arquivos permanece com o grupo ou com a sua identifica誽o. +Deve\-se manualmente checar os sistemas de arquivos para garantir que nenhum dos arquivos permanece com o grupo ou com a sua identifica誽o. .SH DICAS -N緌 se deve remover o grupo prim嫫io de um grupo existente. Deve-se remover os usu嫫ios, antes de se remover o grupo. +N緌 se deve remover o grupo prim嫫io de um grupo existente. Deve\-se remover os usu嫫ios, antes de se remover o grupo. .SH ARQUIVOS \fI/etc/group\fR \- informa踥es do grupo .br diff --git a/man/pt_BR/groupmod.8 b/man/pt_BR/groupmod.8 index 2292f7de..48d42774 100644 --- a/man/pt_BR/groupmod.8 +++ b/man/pt_BR/groupmod.8 @@ -1,7 +1,7 @@ +.\" $Id: groupmod.8,v 1.7 2005/04/05 19:08:56 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" Todos os direitos reservados. .\" -.\" .\" permitida a confec誽o e distribui誽o deste manual, devidamente .\" acompanhado dos avisos de direitos autorais e desta permiss緌 .\" em todas as c鏕ias. @@ -22,31 +22,29 @@ .\" Voc deve receber uma c鏕ia da Licen蓷 Pblica GNU .\" junto com este manual; caso contr嫫io, escreva para a Free Software .\" Foundation, Inc., 675 mass Ave, Cambridge, MA 02139 USA ou -.\" em portugu瘰 na Conectiva Inform嫢ica Ltda. - http://www.conectiva.com.br -.\" -.\" -.\" -.\" $Id: groupmod.8,v 1.5 2004/11/04 03:06:32 kloczek Exp $ -.\" +.\" em portugu瘰 na Conectiva Inform嫢ica Ltda. \- http://www.conectiva.com.br .TH GROUPMOD 8 .SH NOME groupmod \- Modifica um grupo .SH SINOPSE -.B groupmod -[\fB-g\fI gid \fR[\fB-o\fR]] -[\fB-n\fI nome_grupo \fR] -.I grupo +\fBgroupmod\fR [\fB\-g\fR \fIgid\fR [\fB\-o\fR]] [\fB\-n\fR \fInome_grupo\fR] \fIgrupo\fR .SH DESCRIЫO -O comando \fBgroupmod\fR modifica os arquivos de contas do sistema para as novas configura踥es informadas na linha de comando. As op踥es que aplicam-se ao comando \fIgroupmod\fR s緌: -.IP "\fB-g \fIgid\fR" -O valor num廨ico de identifica誽o do grupo denominada GID. Este valor deve ser nico, a menos que a op誽o \fB-o\fR seja usada. O valor dever ser n緌 negativo. Valores entre 0 e 999 s緌 tipicamente reservados para grupos do sistema. Quaisquer arquivos com uma identifica誽o antiga de grupo devem ter o ID mudado manualmente. -.IP "\fB-n \fInome_grupo\fR" +O comando \fBgroupmod\fR modifica os arquivos de contas do sistema para as +novas configuraXXes informadas na linha de comando. As opXXes que aplicam\-se +ao comando \fIgroupmod\fR sXo: +.IP "\fB\-g\fR \fIgid\fR" +O valor numXrico de identificaXXo do grupo X denominada GID. Este valor deve +ser Xnico, a menos que a opXXo \fB\-o\fR seja usada. O valor dever ser nXo +negativo. Valores entre 0 e 999 sXo tipicamente reservados para grupos do +sistema. Quaisquer arquivos com uma identificaXXo antiga de grupo devem ter +o ID mudado manualmente. +.IP "\fB\-n\fR \fInome_grupo\fR" O nome do grupo ir ser alterado de \fIgroup\fR para \fInome_grupo\fR. .SH ARQUIVOS -\fI/etc/group\fR \- Informa踥es do grupo +\fI/etc/group\fR \- Informa踥es do grupo .br -\fI/etc/gshadow\fR \- informa踥es seguras do grupo +\fI/etc/gshadow\fR \- informa踥es seguras do grupo .SH VEJA TAMB丏 .BR chfn (1), .BR chsh (1), diff --git a/man/pt_BR/shadow.5 b/man/pt_BR/shadow.5 index 5e735083..68683ea6 100644 --- a/man/pt_BR/shadow.5 +++ b/man/pt_BR/shadow.5 @@ -1,4 +1,5 @@ -.\" Copyright 1989 - 1990, Julianne Frances Haugh +.\" $Id: shadow.5,v 1.4 2005/04/05 19:08:56 kloczek Exp $ +.\" Copyright 1989 \- 1990, Julianne Frances Haugh .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -24,9 +25,6 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.\" -.\" $Id: shadow.5,v 1.3 2003/04/26 13:24:16 kloczek Exp $ -.\" .TH SHADOW 5 .SH NOME shadow \- arquivo de senhas criptografadas @@ -53,19 +51,19 @@ Dias decorridos entre 1 de janeiro de 1970 e a data em que a conta foi desabilit .IP "" .5i Campo reservado. .PP -O campo senha deve ser preenchido. A senha criptografada consiste de 13 a 24 caracteres entre os 64 caracteres alfab彋icos - de a at z e de A at Z, al幦 de 0 a 9, \. e /. Verifique em \fBcrypt\fR(3) por maiores detalhes de como esta cadeia de caracteres interpretada. +O campo senha deve ser preenchido. A senha criptografada consiste de 13 a 24 caracteres entre os 64 caracteres alfab彋icos \- de a at z e de A at Z, al幦 de 0 a 9, \. e /. Verifique em \fBcrypt\fR(3) por maiores detalhes de como esta cadeia de caracteres interpretada. .PP A data da ltima mudan蓷 da senha dada pelo nmero de dias desde 1 de janeiro de 1970. A senha n緌 pode ser alterada novamente at que um determinado nmero de dias tenha se passado, e deve ser alterada ap鏀 um nmero m嫞imo de dias. Se o nmero m璯imo de dias for maior que o nmero m嫞imo, a senha n緌 pode ser alterada pelo usu嫫io. .PP uma conta considerada inativa e desabilitada se a senha n緌 foi alterada dentro de um determinado nmero de dias ap鏀 a expira誽o das senhas. Uma conta poder ser desabilitada ainda no dia especificado, independentemente de qualquer informa誽o de expira誽o da senha. .PP -Esta informa誽o sobrep髊-se a qualquer senha ou idade de senha presente no arquivo. +Esta informa誽o sobrep髊\-se a qualquer senha ou idade de senha presente no arquivo. .PP Este arquivo n緌 poder ser acessado por usu嫫ios comuns, caso deseje manter a seguran蓷 das senhas. .SH ARQUIVOS -\fI/etc/passwd\fR \- informa踥es das contas de usu嫫ios +\fI/etc/passwd\fR \- informa踥es das contas de usu嫫ios .br -\fI/etc/shadow\fR \- senhas de usu嫫ios criptografadas +\fI/etc/shadow\fR \- senhas de usu嫫ios criptografadas .SH VEJA TAMB丏 .BR chage (1), .BR login (1), diff --git a/man/pw_auth.3 b/man/pw_auth.3 index 744f5f90..d39caaf2 100644 --- a/man/pw_auth.3 +++ b/man/pw_auth.3 @@ -1,4 +1,4 @@ -.\"$Id: pw_auth.3,v 1.9 2004/12/11 20:05:01 kloczek Exp $ +.\"$Id: pw_auth.3,v 1.10 2005/04/02 16:10:24 kloczek Exp $ .\" Copyright 1992 - 1993, Julianne Frances Haugh .\" All rights reserved. .\" @@ -46,7 +46,7 @@ invokes the administrator defined functions for a given user. \fIcommand\fR is the name of the authentication program. It is retrieved from the user's password file information. The string contains one or more executable file names, delimited by -semi-colons. +semi\-colons. Each program will be executed in the order given. The command line arguments are given for each of the reasons listed below. @@ -54,7 +54,7 @@ below. \fIuser\fR is the name of the user to be authenticated, as given in the \fI/etc/passwd\fR file. User entries are indexed by username. -This allows non-unique user IDs to be present and for each different +This allows non\-unique user IDs to be present and for each different username associated with that user ID to have a different authentication program and information. .PP @@ -68,44 +68,44 @@ making the authentication request. .IP \fBPW_SU\fR 1i Perform authentication for the current real user ID attempting to switch real user ID to the named user. -The authentication program will be invoked with a \fB-s\fR option, followed +The authentication program will be invoked with a \fB\-s\fR option, followed by the username. .IP \fBPW_LOGIN\fR 1i Perform authentication for the named user creating a new login session. -The authentication program will be invoked with a \fB-l\fR option, followed +The authentication program will be invoked with a \fB\-l\fR option, followed by the username. .IP \fBPW_ADD\fR 1i Create a new entry for the named user. This allows an authentication program to initialize storage for a new user. -The authentication program will be invoked with a \fB-a\fR option, followed +The authentication program will be invoked with a \fB\-a\fR option, followed by the username. .IP \fBPW_CHANGE\fR 1i Alter an existing entry for the named user. This allows an authentication program to alter the authentication information for an existing user. -The authentication program will be invoked with a \fB-c\fR option, followed +The authentication program will be invoked with a \fB\-c\fR option, followed by the username. .IP \fBPW_DELETE\fR 1i Delete authentication information for the named user. This allows an authentication program to reclaim storage for a user which is no longer authenticated using the authentication program. -The authentication program will be invoked with a \fB-d\fR option, followed +The authentication program will be invoked with a \fB\-d\fR option, followed by the username. .IP \fBPW_TELNET\fR 1i Authenticate a user who is connecting to the system using the \fBtelnet\fR command. -The authentication program will be invoked with a \fB-t\fR option, followed +The authentication program will be invoked with a \fB\-t\fR option, followed by the username. .IP \fBPW_RLOGIN\fR 1i Authenticate a user who is connecting to the system using the \fBrlogin\fR command. -The authentication program will be invoked with a \fB-r\fR option, followed +The authentication program will be invoked with a \fB\-r\fR option, followed by the username. .IP \fBPW_FTP\fR 1i Authenticate a user who is connecting to the system using the \fBftp\fR command. -The authentication program will be invoked with a \fB-f\fR option, followed +The authentication program will be invoked with a \fB\-f\fR option, followed by the username. The standard file descriptors are not available for communicating with the user. @@ -117,7 +117,7 @@ authentication program using file descriptor 0. .IP \fBPW_REXEC\fR 1i Authenticate a user who is connecting to the system using the \fIrexec\fR command. -The authentication program will be invoked with a \fB-x\fR option, followed +The authentication program will be invoked with a \fB\-x\fR option, followed by the username. The standard file descriptors are not available for communicating with the remote user. @@ -145,7 +145,7 @@ It only indicates if the user should be allowed to create the session. The network options are untested at this time. .SH DIAGNOSTICS The \fBpw_auth\fR function returns 0 if the authentication program exited -with a 0 exit code, and a non-zero value otherwise. +with a 0 exit code, and a non\-zero value otherwise. .SH SEE ALSO .BR login (1), .BR passwd (1), diff --git a/man/pwck.8 b/man/pwck.8 index de379bf1..e57a5a00 100644 --- a/man/pwck.8 +++ b/man/pwck.8 @@ -1,4 +1,4 @@ -.\"$Id: pwck.8,v 1.14 2004/12/11 20:05:01 kloczek Exp $ +.\"$Id: pwck.8,v 1.18 2005/04/12 17:55:55 kloczek Exp $ .\" Copyright 1992, Julianne Frances Haugh .\" All rights reserved. .\" @@ -29,7 +29,7 @@ .SH NAME pwck \- verify integrity of password files .SH SYNOPSIS -\fBpwck\fR [\fB-sr\fR] [\fIpasswd\fR \fIshadow\fR] +\fBpwck\fR [\fB\-sr\fR] [\fIpasswd\fR \fIshadow\fR] .SH DESCRIPTION \fBpwck\fR verifies the integrity of the system authentication information. All entries in the \fI/etc/passwd\fR and \fI/etc/shadow\fR are checked to @@ -40,18 +40,18 @@ which have other uncorrectable errors. Checks are made to verify that each entry has .sp .in +.5i -- the correct number of fields +\- the correct number of fields .br -- a unique user name +\- a unique user name .br -- a valid user and group identifier +\- a valid user and group identifier .br -- a valid primary group +\- a valid primary group .br -- a valid home directory +\- a valid home directory .br -- a valid login shell -.in -.5i +\- a valid login shell +.in \-.5i .sp .PP The checks for correct number of fields and unique user name are fatal. If @@ -70,17 +70,17 @@ entry. 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 +in read\-only mode by specifying the \fB\-r\fR flag. This causes all questions regarding changes to be answered \fBno\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 +by UID. To run it in sort mode pass it \fB\-s\fR flag. No checks are performed then, it just sorts. .SH FILES \fI/etc/passwd\fR \- user account information .br -\fI/etc/shadow\fR \- encrypted password information +\fI/etc/shadow\fR \- secure user account information .br -\fI/etc/group\fR \- group information +\fI/etc/group\fR \- group account information .SH SEE ALSO .BR group (5), .BR passwd (5), diff --git a/man/pwconv.8 b/man/pwconv.8 index ac7d1411..9ca98f3f 100644 --- a/man/pwconv.8 +++ b/man/pwconv.8 @@ -1,4 +1,4 @@ -.\"$Id: pwconv.8,v 1.12 2004/12/11 20:05:01 kloczek Exp $ +.\"$Id: pwconv.8,v 1.15 2005/04/02 08:01:24 kloczek Exp $ .TH PWCONV 8 "26 Sep 1997" .SH NAME pwconv, pwunconv, grpconv, grpunconv \- convert to and from shadow passwords and groups. @@ -28,7 +28,7 @@ files: \fI/etc/passwd\fR, \fI/etc/group\fR, \fI/etc/shadow\fR, and \fI/etc/gshadow\fR. .PP .PP -Each program acquires the necessary locks before conversion. fBpwconv\fR and +Each program acquires the necessary locks before conversion. \fBpwconv\fR and \fBgrpconv\fR are similar. First, entries in the shadowed file which don't exist in the main file are removed. Then, shadowed entries which don't have `x' as the password in the main file are updated. Any missing shadowed @@ -36,8 +36,8 @@ entries are added. Finally, passwords in the main file are replaced with `x'. These programs can be used for initial conversion as well to update the shadowed file if the main file is edited by hand. .PP -\fBpwconv\fR will use the values of fBPASS_MIN_DAYS\fR, \fBPASS_MAX_DAYS\fR, -and \fBPASS_WARN_AGE\fR from fI/etc/login.defs\fR when adding new entries +\fBpwconv\fR will use the values of \fIPASS_MIN_DAYS\fR, \fIPASS_MAX_DAYS\fR, +and \fIPASS_WARN_AGE\fR from \fI/etc/login.defs\fR when adding new entries to \fI/etc/shadow\fR. .PP Likewise \fBpwunconv\fR and \fBgrpunconv\fR are similiar. Passwords in the diff --git a/man/ru/Makefile.in b/man/ru/Makefile.in index a6aa99a8..e5ebc205 100644 --- a/man/ru/Makefile.in +++ b/man/ru/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.4 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -86,17 +86,16 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ 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@ @@ -186,9 +185,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/ru/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/ru/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/ru/Makefile + $(AUTOMAKE) --foreign man/ru/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/man/ru/passwd.5 b/man/ru/passwd.5 index 73230258..35226c4d 100644 --- a/man/ru/passwd.5 +++ b/man/ru/passwd.5 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1993 Michael Haardt (u31b3hs@pool.informatik.rwth-aachen.de), Fri Apr 2 11:32:09 MET DST 1993 +.\" Copyright (c) 1993 Michael Haardt (u31b3hs@pool.informatik.rwth\-aachen.de), Fri Apr 2 11:32:09 MET DST 1993 .\" .\" This is free documentation; you can redistribute it and/or .\" modify it under the terms of the GNU General Public License as @@ -25,12 +25,12 @@ .\" Modified Sun Jun 18 01:53:57 1995 by Andries Brouwer (aeb@cwi.nl) .\" Modified Mon Jan 5 20:24:40 MET 1998 by Michael Haardt .\" (michael@cantor.informatik.rwth-aachen.de) -.TH PASSWD 5 "$Date: 2003/04/28 02:17:55 $" "" "禢眝轂 そ帎瓬" +.TH PASSWD 5 "$Date: 2005/04/05 19:08:57 $" "" "禢眝轂 そ帎瓬" .SH 鍕欒鍣 passwd \- そ帎 釓眐旼 .SH 瀔澞搿毇 .B Passwd --- 嗩 埧剆婘趿 そ帎, 衃霰眚鄹圴 衄孖玹 殌籥挃 睋倅蚥 俵杻硨袬埧旼 +\-\- 嗩 埧剆婘趿 そ帎, 衃霰眚鄹圴 衄孖玹 殌籥挃 睋倅蚥 俵杻硨袬埧旼 蚕衲攪, 佹秺蹊 巟 冾婘砣 衃霰眚尕 埡劼 妅に眝謄劦, 佹 厊曬埩づ佹婘 俵杻硨袬埧曶, 厊曬埩づ佹婘 й桸倧, 鰍芩褁圴 佹埡昑, 冾芩恅挍 狟玶癹劼 . . 輾婘 嗩玵 そ帎 埡匊 衃霰眚轂衭 diff --git a/man/shadow.3 b/man/shadow.3 index b47331d3..d34b961d 100644 --- a/man/shadow.3 +++ b/man/shadow.3 @@ -1,4 +1,4 @@ -.\"$Id: shadow.3,v 1.10 2003/05/01 18:17:39 kloczek Exp $ +.\" $Id: shadow.3,v 1.13 2005/04/12 16:31:06 kloczek Exp $ .\" Copyright 1989 - 1993, Julianne Frances Haugh .\" All rights reserved. .\" @@ -81,14 +81,14 @@ struct spwd { .br unsigned long int sp_flag; /* reserved for future use */ .br -.in -.5i +.in \-.5i } .PP The meanings of each field are .sp -sp_namp \- pointer to null-terminated user name. +sp_namp \- pointer to null\-terminated user name. .br -sp_pwdp \- pointer to null-terminated password. +sp_pwdp \- pointer to null\-terminated password. .br sp_lstchg \- days since Jan 1, 1970 password was last changed. .br @@ -122,17 +122,17 @@ exclusive access to the \fI/etc/shadow\fR file. \fBlckpwdf\fR attempts to acquire a lock using \fBpw_lock\fR for up to 15 seconds. It continues by attempting to acquire a second lock using \fBspw_lock\fR for the remainder of the initial 15 seconds. Should either attempt fail after a total of 15 -seconds, \fBlckpwdf\fR returns -1. When both locks are acquired 0 is +seconds, \fBlckpwdf\fR returns \-1. When both locks are acquired 0 is returned. .SH DIAGNOSTICS Routines return NULL if no more entries are available or if an error occurs during processing. Routines which have \fBint\fR as the return value return -0 for success and -1 for failure. +0 for success and \-1 for failure. .SH CAVEATS These routines may only be used by the super user as access to the shadow password file is restricted. .SH FILES -\fI/etc/shadow\fR \ - encrypted user passwords +\fI/etc/shadow\fR \- secure user account information .SH SEE ALSO .BR getpwent (3), .BR shadow (5) diff --git a/man/shadow.5 b/man/shadow.5 index f86d6b61..1485d990 100644 --- a/man/shadow.5 +++ b/man/shadow.5 @@ -1,4 +1,4 @@ -.\"$Id: shadow.5,v 1.11 2003/05/01 18:17:39 kloczek Exp $ +.\"$Id: shadow.5,v 1.15 2005/04/12 16:31:06 kloczek Exp $ .\" Copyright 1989 - 1990, Julianne Frances Haugh .\" All rights reserved. .\" @@ -51,9 +51,12 @@ Days since Jan 1, 1970 that account is disabled A reserved field .PP The password field must be filled. The encryped password consists of 13 to -24 characters from the 64 character alphabet a thru z, A thru Z, 0 thru 9, -\. and /. Refer to \fBcrypt\fR(3) for details on how this string is -interpreted. +24 characters from the 64 characters alphabet a thru z, A thru Z, 0 thru 9, +\&\. and /. Optionally it can start with a "$" character. This means the +encrypted password was generated using another (not DES) algorithm. For +example if it starts with "$1$" it means the MD5\-based algorithm was used. +.PP +Refer to \fBcrypt\fR(3) for details on how this string is interpreted. .PP The date of the last password change is given as the number of days since Jan 1, 1970. The password may not be changed again until the proper number @@ -72,9 +75,9 @@ in \fI/etc/passwd\fR. This file must not be readable by regular users if password security is to be maintained. .SH FILES -\fI/etc/passwd\fR \ - user account information +\fI/etc/passwd\fR \- user account information .br -\fI/etc/shadow\fR \ - encrypted user passwords +\fI/etc/shadow\fR \- secure user account information .SH SEE ALSO .BR chage (1), .BR login (1), diff --git a/man/su.1 b/man/su.1 index 75400c91..af50d95d 100644 --- a/man/su.1 +++ b/man/su.1 @@ -1,4 +1,4 @@ -.\"$Id: su.1,v 1.13 2003/05/01 18:17:39 kloczek Exp $ +.\" $Id: su.1,v 1.16 2005/04/12 16:31:06 kloczek Exp $ .\" Copyright 1989 - 1990, Julianne Frances Haugh .\" All rights reserved. .\" @@ -27,9 +27,9 @@ .\" SUCH DAMAGE. .TH SU 1 .SH NAME -su \- change user ID or become super-user +su \- change user ID or become super\-user .SH SYNOPSIS -\fBsu\fR [\fB-\fR] [\fIusername\fR [\fIargs\fR]] +\fBsu\fR [\fB\-\fR] [\fIusername\fR [\fIargs\fR]] .SH DESCRIPTION \fBsu\fR is used to become another user during a login session. Invoked without a username, \fBsu\fR defaults to becoming the super user. The @@ -38,7 +38,7 @@ what the user would expect had the user logged in directly. .PP Additional arguments may be provided after the username, in which case they are supplied to the user\'s login shell. In particular, an argument of -\fB-c\fR will cause the next argument to be treated as a command by most +\fB\-c\fR will cause the next argument to be treated as a command by most command interpreters. The command will be executed by the shell specified in \fI/etc/passwd\fR for the target user. .PP @@ -59,9 +59,9 @@ the root of a new filesystem which the user is actually logged into. This version of \fBsu\fR has many compilation options, only some of which may be in use at any particular site. .SH FILES -\fI/etc/passwd\fR \ - user account information +\fI/etc/passwd\fR \- user account information .br -\fI/etc/shadow\fR \ - encrypted passwords and age information +\fI/etc/shadow\fR \- secure user account information .SH SEE ALSO .BR login (1), .BR sh (1), diff --git a/man/suauth.5 b/man/suauth.5 index 98f1540e..ca8f5101 100644 --- a/man/suauth.5 +++ b/man/suauth.5 @@ -1,4 +1,4 @@ -.\"$Id: suauth.5,v 1.5 2004/12/11 20:05:01 kloczek Exp $ +.\"$Id: suauth.5,v 1.7 2005/04/05 18:47:50 kloczek Exp $ .TH SUAUTH 5 "Feb 14, 1996" .UC 5 .SH NAME @@ -23,10 +23,10 @@ The file is formatted like this, with lines starting with a # being treated as comment lines and ignored; .PP .RS -to-id:from-id:ACTION +to\-id:from\-id:ACTION .RE .PP -Where to-id is either the word +Where to\-id is either the word .BR ALL , a list of usernames delimited by "," or the words @@ -34,7 +34,7 @@ delimited by "," or the words followed by a list of usernames delimited by "," .PP -from-id is formatted the same as to-id except the extra word +from\-id is formatted the same as to\-id except the extra word .B GROUP is recognised. .B ALL EXCEPT GROUP diff --git a/man/sulogin.8 b/man/sulogin.8 index 2e405430..227d5d76 100644 --- a/man/sulogin.8 +++ b/man/sulogin.8 @@ -1,4 +1,4 @@ -.\"$Id: sulogin.8,v 1.10 2003/05/01 18:17:39 kloczek Exp $ +.\" $Id: sulogin.8,v 1.13 2005/04/12 16:31:06 kloczek Exp $ .\" Copyright 1989 - 1992, Julianne Frances Haugh .\" All rights reserved. .\" @@ -27,9 +27,9 @@ .\" SUCH DAMAGE. .TH SULOGIN 8 .SH NAME -sulogin \- Single-user login +sulogin \- Single\-user login .SH SYNTAX -\fBsulogin\fR [\fItty-device\fR] +\fBsulogin\fR [\fItty\-device\fR] .SH DESCRIPTION \fBsulogin\fR is invoked by \fBinit\fR prior to allowing the user access to the system when in single user mode. This feature may only be available on @@ -38,7 +38,7 @@ certain systems where \fBinit\fR has been modified accordingly, or where the .PP The user is prompted .IP "" .5i -Type control-d to proceed with normal startup, +Type control\-d to proceed with normal startup, .br (or give root password for system maintenance): .PP @@ -46,11 +46,11 @@ Input and output will be performed with the standard file descriptors unless the optional device name argument is provided. .PP If the user enters the correct root password, a login session is initiated. -When \fBEOF\fR is pressed instead, the system enters multi-user mode. +When \fBEOF\fR is pressed instead, the system enters multi\-user mode. .PP -After the user exits the single-user shell, or presses \fBEOF\fR, +After the user exits the single\-user shell, or presses \fBEOF\fR, the system begins the initialization process required to enter -multi-user mode. +multi\-user mode. .SH CAVEATS .PP This command can only be used if \fBinit\fR has been modified to call @@ -67,9 +67,9 @@ As complete an environment as possible is created. However, various devices may be unmounted or uninitialized and many of the user commands may be unavailable or nonfunctional as a result. .SH FILES -\fI/etc/passwd\fR \ - user account information +\fI/etc/passwd\fR \- user account information .br -\fI/etc/shadow\fR \ - encrypted passwords and age information +\fI/etc/shadow\fR \- secure user account information .SH SEE ALSO .BR login (1), .BR sh (1), diff --git a/man/useradd.8 b/man/useradd.8 index 92496a03..f7b81bdc 100644 --- a/man/useradd.8 +++ b/man/useradd.8 @@ -1,4 +1,4 @@ -.\"$Id: useradd.8,v 1.23 2004/12/11 20:05:01 kloczek Exp $ +.\" $Id: useradd.8,v 1.29 2005/04/18 19:21:33 kloczek Exp $ .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -30,24 +30,20 @@ useradd \- Create a new user or update default new user information .SH SYNOPSIS .TP 8 -\fBuseradd\fR [\fB-c\fR \fIcomment\fR] [\fB-d\fR \fIhome_dir\fR] +\fBuseradd\fR [\fB\-c\fR \fIcomment\fR] [\fB\-d\fR \fIhome_dir\fR] [\fB\-e\fR \fIexpire_date\fR] [\fB\-f\fR \fIinactive_days\fR] .br -[\fB-e\fR \fIexpire_date\fR] [\fB-f\fR \fIinactive_days\fR] +[\fB\-g\fR \fIinitial_group\fR] [\fB\-G\fR \fIgroup1\fR[\fI,group2,...,\fR[\fIgroupN\fR]\fR]] .br -[\fB-g\fR \fIinitial_group\fR] [\fB-G\fR \fIgroup\fR[,...]] +[[\fB\-M\fR] \fB\-m\fR [\fB\-k\fR \fIskeleton_dir\fR]] [\fB\-o\fR] [\fB\-p\fR \fIpasswd\fR] [\fB\-s\fR \fIshell\fR] .br -[[\fB-M\fR] \fB-m\fR [\fB-k\fR \fIskeleton_dir\fR]] [\fB-o\fR] [\fB-p\fR \fIpasswd\fR] -.br -[\fB-s\fR \fIshell\fR] [\fB-u\fR \fIuid\fR] \fIlogin\fR +[\fB\-u\fR \fIuid\fR] \fIlogin\fR .TP 8 -\fBuseradd\fR \fB-D\fR [\fB-g\fI default_group\fR] [\fB-b\fI default_home\fR] +\fBuseradd\fR \fB\-D\fR [\fB\-g\fR \fIgroup\fR] [\fB\-b\fR \fIhome_dir\fR] [\fB\-e\fR \fIexpire_date\fR] .br -[\fB-e\fI default_expire_date\fR] [\fB-f\fI default_inactive\fR] -.br -[\fB-s\fI default_shell\fR] +[\fB\-f\fR \fIinactive_days\fR] [\fB\-s\fR \fIshell\fR] .SH DESCRIPTION .SS Creating New Users -When invoked without the \fB-D\fR option, the \fBuseradd\fR command creates +When invoked without the \fB\-D\fR option, the \fBuseradd\fR command creates a new user account using the values specified on the command line and the default values from the system. Depending on command line options, the useradd command will update system files and may also create the new user's @@ -55,74 +51,74 @@ home directory and copy initial files. .SH OPTIONS The options which apply to the \fBuseradd\fR command are: -.IP "\fB-c\fR \fIcomment\fR" +.IP "\fB\-c\fR \fIcomment\fR" The new user's password file comment field. -.IP "\fB-d\fR \fIhome_dir\fR" +.IP "\fB\-d\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 -\fIdefault_home\fR and use that as the login directory name. -.IP "\fB-e\fR \fIexpire_date\fR" +\fIhome\fR and use that as the login directory name. +.IP "\fB\-e\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. -.IP "\fB-f\fR \fIinactive_days\fR" +in the format \fIYYYY\-MM\-DD\fR. +.IP "\fB\-f\fR \fIinactive_days\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. -.IP "\fB-g\fR \fIinitial_group\fR" +expired, and a value of \-1 disables the feature. The default value is \-1. +.IP "\fB\-g\fR \fIinitial_group\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. -.IP "\fB-G\fR \fIgroup,[...]\fR" +.IP "\fB\-G\fR \fIgroup1\fR[\fI,group2,...,\fR[\fIgroupN\fR]\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 +\fB\-g\fR option. The default is for the user to belong only to the initial group. -.IP \fB-M\fR +.IP \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 +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. -.IP \fB-m\fR +.IP \fB\-m\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 +\fB\-k\fR option is used, otherwise the files contained in \fI/etc/skel\fR will be used instead. Any directories contained in \fIskeleton_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 +\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. -.IP "\fB-o\fR" -Allow create user with duplicate (non-unique) UID. -.IP "\fB-p \fIpasswd\fR" +.IP "\fB\-o\fR" +Allow create user with duplicate (non\-unique) UID. +.IP "\fB\-p\fR \fIpasswd\fR" The encrypted password, as returned by \fBcrypt\fR(3). The default is to disable the account. -.IP "\fB-s\fR \fIshell\fR" +.IP "\fB\-s\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. -.IP "\fB-u \fIuid\fR" +.IP "\fB\-u\fR \fIuid\fR" The numerical value of the user's ID. This value must be unique, unless the -\fI-o\fR option is used. The value must be non-negative. The default is to +\fI\-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 -When invoked with the \fB-D\fR option, \fBuseradd\fR will either display the +When invoked with the \fB\-D\fR option, \fBuseradd\fR will either display the current default values, or update the default values from the command line. The valid options are -.IP "\fB-b\fR \fIdefault_home\fR" +.IP "\fB\-b\fR \fIhome_dir\fR" The initial path prefix for a new user's home directory. The user's name -will be affixed to the end of \fIdefault_home\fR to create the new directory -name if the \fB-d\fR option is not used when creating a new account. -.IP "\fB-e\fR \fIdefault_expire_date\fR" +will be affixed to the end of \fIhome\fR to create the new directory +name if the \fB\-d\fR option is not used when creating a new account. +.IP "\fB\-e\fR \fIexpire_date\fR" The date on which the user account is disabled. -.IP "\fB-f\fR \fIdefault_inactive\fR" +.IP "\fB\-f\fR \fIinactive\fR" The number of days after a password has expired before the account will be disabled. -.IP "\fB-g\fR \fIdefault_group\fR" +.IP "\fB\-g\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 . -.IP "\fB-s\fR \fIdefault_shell\fR" +.IP "\fB\-s\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 @@ -139,7 +135,7 @@ server. .br \fI/etc/shadow\fR \- secure user account information .br -\fI/etc/group\fR \- group information +\fI/etc/group\fR \- group account information .br \fI/etc/default/useradd\fR \- default information .br @@ -156,7 +152,7 @@ The \fBuseadd\fR command exits with the following values: .br \fB3\fR \- invalid argument to option .br -\fB4\fR \- uid already in use (and no -o) +\fB4\fR \- uid already in use (and no \-o) .br \fB6\fR \- specified group doesn't exist .br diff --git a/man/userdel.8 b/man/userdel.8 index 2ba3e2b9..9ff2c68a 100644 --- a/man/userdel.8 +++ b/man/userdel.8 @@ -1,4 +1,4 @@ -.\"$Id: userdel.8,v 1.12 2004/11/02 19:28:31 kloczek Exp $ +.\"$Id: userdel.8,v 1.14 2005/04/12 17:55:55 kloczek Exp $ .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -30,14 +30,14 @@ userdel \- Delete a user account and related files .SH SYNOPSIS .B userdel -[\fB-r\fR] +[\fB\-r\fR] .I login .SH DESCRIPTION The \fBuserdel\fR command modifies the system account files, deleting all entries that refer to \fIlogin\fR. The named user must exist. .SH OPTIONS The options which apply to the \fBuserdel\fR command are: -.IP \fB-r\fR +.IP \fB\-r\fR Files in the user's home directory will be removed along with the home directory itself and the user's mail spool. Files located in other file systems will have to be searched for and deleted manually. @@ -46,7 +46,7 @@ systems will have to be searched for and deleted manually. .br \fI/etc/shadow\fR \- secure user account information .br -\fI/etc/group\fR \- group information +\fI/etc/group\fR \- group account information .SH EXIT VALUES .TP 2 The \fBuserdel\fR command exits with the following values: diff --git a/man/usermod.8 b/man/usermod.8 index 508b7af2..3790c098 100644 --- a/man/usermod.8 +++ b/man/usermod.8 @@ -1,4 +1,4 @@ -.\"$Id: usermod.8,v 1.17 2004/11/02 19:28:31 kloczek Exp $ +.\" $Id: usermod.8,v 1.24 2005/04/18 17:57:03 kloczek Exp $ .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -30,68 +30,69 @@ usermod \- Modify a user account .SH SYNOPSIS .TP 8 -\fBusermod\fR [\fB-c\fR \fIcomment\fR] [\fB-d\fR \fIhome_dir\fR [\fB-m\fR]] +\fBusermod\fR [\fB\-c\fR \fIcomment\fR] [\fB\-d\fR \fIhome_dir\fR [\fB\-m\fR]] [\fB\-e\fR \fIexpire_date\fR] +[\fB\-f\fR \fIinactive_time\fR] [\fB\-g\fR \fIinitial_group\fR] .br -[\fB-e\fR \fIexpire_date\fR] [\fB-f\fR \fIinactive_time\fR] +[\fB\-G\fR \fIgroup1\fR[\fI,group2,...,\fR[\fIgroupN\fR]\fR]] .br -[\fB-g\fR \fIinitial_group\fR] [\fB-G\fR \fIgroup\fR [,...]] +[\fB\-l\fR \fIlogin_name\fR] [\fB\-p\fR \fIpasswd\fR] [\fB\-s\fR \fIshell\fR] [\fB\-u\fR \fIuid\fR [\fB\-o\fR]] .br -[\fB-l\fR \fIlogin_name\fR] [\fB-p\fR \fIpasswd\fR] -.br -[\fB-s\fR \fIshell\fR] [\fB-u\fR \fIuid\fR [\fB-o\fR]] [\fB-L\fR|\fB-U\fR] -\fIlogin\fR +[\fB\-L\fR|\fB\-U\fR] \fIlogin\fR .SH DESCRIPTION The \fBusermod\fR command modifies the system account files to reflect the changes that are specified on the command line. .SH OPTIONS The options which apply to the \fBusermod\fR command are: -.IP "\fB-c\fR \fIcomment\fR" +.IP "\fB\-c\fR \fIcomment\fR" The new value of the user's password file comment field. It is normally modified using the \fBchfn\fR(1) utility. -.IP "\fB-d\fR \fIhome_dir\fR" -The user's new login directory. If the \fB-m\fR option is given the contents +.IP "\fB\-d\fR \fIhome_dir\fR" +The user's new login directory. If the \fB\-m\fR option is given the contents of the current home directory will be moved to the new home directory, which is created if it does not already exist. -.IP "\fB-e\fR \fIexpire_date\fR" +.IP "\fB\-e\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. -.IP "\fB-f\fR \fIinactive_days\fR" +in the format \fIYYYY\-MM\-DD\fR. +.IP "\fB\-f\fR \fIinactive_days\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. -.IP "\fB-g\fR \fIinitial_group\fR" +expired, and a value of \-1 disables the feature. The default value is \-1. +.IP "\fB\-g\fR \fIinitial_group\fR" The group name or number of the user's new initial login group. The group name must exist. A group number must refer to an already existing group. The default group number is 1. -.IP "\fB-G\fR \fIgroup,[...]\fR" +.IP "\fB\-G\fR \fIgroup1\fR[\fI,group2,...,\fR[\fIgroupN\fR]\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 +\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. -.IP "\fB-l\fR \fIlogin_name\fR" +.IP "\fB\-l\fR \fIlogin_name\fR" The name of the user will be changed from \fIlogin\fR to \fIlogin_name\fR. Nothing else is changed. In particular, the user's home directory name should probably be changed to reflect the new login name. -.IP "\fB-L\fR" +.IP "\fB\-L\fR" Lock a user's password. This puts a '!' in front of the encrypted password, -effectively disabling the password. You can't use this option with \fI-p\fR -or \fI-U\fR. -.IP "\fB-p\fR \fIpasswd\fR" +effectively disabling the password. You can't use this option with \fI\-p\fR +or \fI\-U\fR. +.IP "\fB\-o\fR" +When used with the \fI-u\fR option, this option allows to change the user ID +to a non-unique value. +.IP "\fB\-p\fR \fIpasswd\fR" The encrypted password, as returned by \fBcrypt\fR(3). -.IP "\fB-s\fR \fIshell\fR" +.IP "\fB\-s\fR \fIshell\fR" The name of the user's new login shell. Setting this field to blank causes the system to select the default login shell. -.IP "\fB-u\fR \fIuid\fR" +.IP "\fB\-u\fR \fIuid\fR" The numerical value of the user's ID. This value must be unique, unless the -\fI-o\fR option is used. The value must be non-negative. Values between 0 +\fI\-o\fR option is used. The value must be non\-negative. Values between 0 and 99 are typically reserved for system accounts. Any files which the user owns and which are located in the directory tree rooted at the user's home directory will have the file user ID changed automatically. Files outside of the user's home directory must be altered manually. -.IP "\fB-U\fR" +.IP "\fB\-U\fR" Unlock a user's password. This removes the '!' in front of the encrypted -password. You can't use this option with \fI-p\fR or \fI-L\fR. +password. You can't use this option with \fI\-p\fR or \fI\-L\fR. .SH CAVEATS \fBusermod\fR will not allow you to change the name of a user who is logged in. You must make certain that the named user is not executing any @@ -100,11 +101,11 @@ ID is being changed. You must change the owner of any crontab files manually. You must change the owner of any at jobs manually. You must make any changes involving NIS on the NIS server. .SH FILES -\fI/etc/passwd\fR \ - user account information +\fI/etc/passwd\fR \- user account information .br -\fI/etc/shadow\fR \ - secure user account information +\fI/etc/shadow\fR \- secure user account information .br -\fI/etc/group\fR \ - group information +\fI/etc/group\fR \- group account information .SH SEE ALSO .BR chfn (1), .BR chsh (1), diff --git a/man/vipw.8 b/man/vipw.8 index 099d897b..76b9686a 100644 --- a/man/vipw.8 +++ b/man/vipw.8 @@ -1,14 +1,14 @@ -.\"$Id: vipw.8,v 1.6 2003/05/01 18:17:39 kloczek Exp $ +.\"$Id: vipw.8,v 1.8 2005/04/05 18:47:50 kloczek Exp $ .TH VIPW 8 "26 Sep 1997" .SH NAME -vipw, vigr \- edit the password, group, shadow-password, or shadow-group file. +vipw, vigr \- edit the password, group, shadow\-password, or shadow\-group file. .SH SYNOPSIS -\fBvipw\fR [\fB-s\fR] +\fBvipw\fR [\fB\-s\fR] .br -\fBvigr\fR [\fB-s\fR] +\fBvigr\fR [\fB\-s\fR] .SH DESCRIPTION \fBvipw\fR and \fBvigr\fR will edit the files \fI/etc/passwd\fR and -\fI/etc/group\fR, respectively. With the \fB-s\fR flag, they will edit the +\fI/etc/group\fR, respectively. With the \fB\-s\fR flag, they will edit the shadow versions of those files, fI/etc/shadow\fR and \fI/etc/gshadow\fR, respectively. The programs will set the appropriate locks to prevent file corruption. When looking for an editor, the programs will first try the diff --git a/man/zh_CN/Makefile.in b/man/zh_CN/Makefile.in index 5e6d59bd..a0c99cb6 100644 --- a/man/zh_CN/Makefile.in +++ b/man/zh_CN/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.4 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -87,17 +87,16 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ 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@ @@ -197,9 +196,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/zh_CN/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/zh_CN/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/zh_CN/Makefile + $(AUTOMAKE) --foreign man/zh_CN/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/man/zh_CN/chfn.1 b/man/zh_CN/chfn.1 index 421b51f1..d2f2e286 100644 --- a/man/zh_CN/chfn.1 +++ b/man/zh_CN/chfn.1 @@ -1,22 +1,16 @@ +.\" $Id: chfn.1,v 1.3 2005/04/05 19:08:57 kloczek Exp $ +.\" (c) 1994 by salvatore valente .\" -.\" chfn.1 -- change your finger information -.\" (c) 1994 by salvatore valente -.\" -.\" this program is free software. you can redistribute it and -.\" modify it under the terms of the gnu general public license. +.\" this program is free software. you can redistribute it and +.\" modify it under the terms of the gnu general public license. .\" there is no warranty. -.\" -.\" $Author: kloczek $ -.\" $Revision: 1.2 $ -.\" $Date: 2004/08/04 13:02:25 $ -.\" .TH CHFN 1 "October 13 1994" "chfn" "Linux Reference Manual" .SH 靡備 chfn \- 蜊 曹 斕 腔 finger 捅 洘 .SH 逄楊 .B chfn -[\ \-f\ full-name\ ] [\ \-o\ office\ ] [\ \-p\ office-phone\ ] -[\ \-h\ home-phone\ ] [\ \-u\ ] [\ \-v\ ] [\ username\ ] +[\ \-f\ full\-name\ ] [\ \-o\ office\ ] [\ \-p\ office\-phone\ ] +[\ \-h\ home\-phone\ ] [\ \-u\ ] [\ \-v\ ] [\ username\ ] .SH 鏡扴 .B chfn 岆 蚚 懂 蜊 曹 斕 腔 finger 捅 洘 ﹝ 捅 洘 岆 湔 溫 婓 @@ -40,22 +34,22 @@ chfn \- 怀 "none" 寀 桶 尨 蜆 戲 諾 啞 ﹝ .SH 恁砐 .TP -.I "\-f, \-\-full-name" +.I "\-f, \-\-full\-name" 淩 妗 俷 靡 .TP -.I "\-h, \-\-home-phone" +.I "\-h, \-\-home\-phone" 模 爵 腔 萇 趕 .TP .I "\-o, \-\-office" 域 馱 弅 瘍 鎢 .TP -.I "\-p, \-\-office-phone" +.I "\-p, \-\-office\-phone" 域 鼠 弅 萇 趕 .TP .I "\-u, \-\-help" 凅 堤 妏 蚚 佽 隴 傻 捅 ﹝ .TP -.I "-v, \-\-version" +.I "\-v, \-\-version" 凅 堤 唳 掛 捅 洘 ﹝ .SH "眈壽恅璃" .BR finger (1), diff --git a/man/zh_CN/chpasswd.8 b/man/zh_CN/chpasswd.8 index 944e0af8..ad32ea27 100644 --- a/man/zh_CN/chpasswd.8 +++ b/man/zh_CN/chpasswd.8 @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: chpasswd.8,v 1.2 2003/04/26 13:24:16 kloczek Exp $ +.\" $Id: chpasswd.8,v 1.3 2005/04/05 19:08:57 kloczek Exp $ .\" .TH CHPASSWD 8 .SH NAME 靡趼 @@ -55,7 +55,7 @@ passwd .\" DBM password files. .\" This command may be discarded in favor of the newusers(8) command. 秪峈褫眕妏蚚恅璃笭隅砃輛俴怀諴 -撈ㄩchpasswd < user&passwd-filenameㄛ +撈ㄩchpasswd < user&passwd\-filenameㄛ 蝜怀輷躁岆偌準樓躇源宒換菰腔趕ㄛ③勤蜆恅璃輛俴巠絞腔樓躇﹝ .SH 衱獗 passwd(1),useradd(8),newuser(8) diff --git a/man/zh_CN/chsh.1 b/man/zh_CN/chsh.1 index 8951515e..174ac5c5 100644 --- a/man/zh_CN/chsh.1 +++ b/man/zh_CN/chsh.1 @@ -1,15 +1,9 @@ +.\" $Id: chsh.1,v 1.3 2005/04/05 19:08:57 kloczek Exp $ +.\" (c) 1994 by salvatore valente .\" -.\" chsh.1 -- change your login shell -.\" (c) 1994 by salvatore valente -.\" -.\" this program is free software. you can redistribute it and -.\" modify it under the terms of the gnu general public license. -.\" there is no warranty. -.\" -.\" $Author: kloczek $ -.\" $Revision: 1.2 $ -.\" $Date: 2004/08/04 13:02:25 $ -.\" +.\" this program is free software. you can redistribute it and +.\" modify it under the terms of the gnu general public license. +.\" there is no warranty. .TH CHSH 1 "October 13 1994" "chsh" "Linux Reference Manual" .SH 靡備 chsh \- 載遙斕腎輮捨齾繭礬hell @@ -30,7 +24,7 @@ chsh \- 紫奻ㄛ寀chsh頗枑堤劑豢捅洘﹝ .SH 恁砐 .TP -.I "\-l, \-\-list-shells" +.I "\-l, \-\-list\-shells" 蹈堤槨翹婓 .I /etc/shells 腔shell﹝ @@ -41,7 +35,7 @@ chsh \- .I "\-u, \-\-help" 妏蚚傻捅﹝ .TP -.I "-v, \-\-version" +.I "\-v, \-\-version" 唳掛訧捅 .SH "眈壽恅璃" .BR login (1), diff --git a/man/zh_CN/groupadd.8 b/man/zh_CN/groupadd.8 index 29f7b687..790b17c8 100644 --- a/man/zh_CN/groupadd.8 +++ b/man/zh_CN/groupadd.8 @@ -1,3 +1,4 @@ +.\" $Id: groupadd.8,v 1.6 2005/04/05 19:08:57 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -24,27 +25,24 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.\" -.\" $Id: groupadd.8,v 1.4 2004/11/04 03:06:33 kloczek Exp $ -.\" .TH GROUPADD 8 .SH 靡備 groupadd \- 膘 蕾 陔 郪 .SH 逄楊 .B groupadd -[\fB-g\fI gid \fR[\fB-o\fR]] [\fB-r\fR] [\fB-f\fR] \fIgroup\fR +[\fB\-g\fR \fIgid\fR [\fB\-o\fR]] [\fB\-r\fR] [\fB\-f\fR] \fIgroup\fR .SH 鏡扴 \fBgroupadd\fR 褫 硌 隅 郪 靡 備 懂 膘 蕾 陔 腔 郪 梛 瘍 ﹝ 剒 猁 奀 褫 植 炵 苀 笢 腕 陔 郪 硉 ﹝ \fBgroupadd\fR 衄 狟 蹈 恁 砐 褫 蚚 ﹝ -.IP "\fB-g \fIgid\fR" +.IP "\fB\-g\fR \fIgid\fR" group's ID 硉 ﹝ -壺 準 妏 蚚 \fB-o\fR 統 杅 祥 蜆 硉 斛 剕 岆 峔 珨 ㄛ 祥 褫 眈 肮 ﹝ +壺 準 妏 蚚 \fB\-o\fR 統 杅 祥 蜆 硉 斛 剕 岆 峔 珨 ㄛ 祥 褫 眈 肮 ﹝ 杅 硉 祥 褫 峈 蛹 ﹝ 啎 扢 峈 郔 苤 祥 腕 苤 衾 500 奧 紨 棒 崝 樓 ﹝ 0~999 換 苀 奻 岆 悵 隱 跤 \fI炵苀梛瘍\fR 妏 蚚 ﹝ -.IP \fB-r\fR +.IP \fB\-r\fR 森 統 杅 岆 蚚 懂 膘 蕾 \fI炵苀梛瘍\fR ﹝ @@ -52,26 +50,26 @@ group's ID 硉 腔 UID_MIN 懂 腔 苤 ﹝ 蛁 砩 useradd 森 蚚 楊 垀 膘 蕾 腔 梛 瘍 祥 頗 膘 蕾 妏 蚚 氪 醴 翹 ㄛ 珩 祥 頗 婓 綱 槨 翹 婓 /etc/login.defs. 腔 隅 砱 硉 ﹝ -彆 斕 砑 猁 衄 妏 蚚 氪 醴 翹 剕 塗 俋 硌 隅 -m 統 +彆 斕 砑 猁 衄 妏 蚚 氪 醴 翹 剕 塗 俋 硌 隅 \-m 統 杅 懂 膘 蕾 炵 苀 梛 瘍 ﹝ 涴 岆 RED HAT 塗 俋 崝 扢 腔 恁 砐 ﹝ 坳 頗 赻 雄 堆 斕 恁 隅 珨 跺 苤 衾 999 腔 \fIgif\fR -祥 剒 猁 婬 樓 奻 \fB-g\fR 統 杅 ﹝ +祥 剒 猁 婬 樓 奻 \fB\-g\fR 統 杅 ﹝ .br 涴 岆 RED HAT 塗 俋 崝 扢 腔 恁 砐 ﹝ -.IP \fB-f\fR +.IP \fB\-f\fR This is \fIforce\fR flag. 陔 崝 珨 跺 眒 冪 湔 婓 腔 郪 梛 瘍 ㄛ 炵 苀 頗 堤 珋 渣 昫 捅 洘 綴 賦 旰 \fBgroupadd\fR ﹝ 彆 岆 涴 欴 腔 ① 錶 ㄛ 祥 頗 陔 崝 涴 跺 郪 ( 彆 岆 涴 跺 ① 錶 狟 ㄛ 炵 苀 祥 頗 婬 陔 崝 珨 棒 ) .br -珩 褫 肮 奀 樓 奻 \fB-g\fR 恁 砐 +珩 褫 肮 奀 樓 奻 \fB\-g\fR 恁 砐 絞 斕 樓 奻 珨 跺 \fIgid\fR ㄛ 森 奀 \fIgid\fR -憩 祥 蚚 岆 峔 珨 硉 ㄛ 褫 祥 樓 \fB-o\fR 統 杅 ㄛ +憩 祥 蚚 岆 峔 珨 硉 ㄛ 褫 祥 樓 \fB\-o\fR 統 杅 ㄛ 膘 疑 郪 綴 頗 珆 賦 彆 -(adding a group as neither \fB-g\fR or \fB-o\fR options were +(adding a group as neither \fB\-g\fR or \fB\-o\fR options were specified). .br diff --git a/man/zh_CN/groupdel.8 b/man/zh_CN/groupdel.8 index ed65fbd1..74f325c9 100644 --- a/man/zh_CN/groupdel.8 +++ b/man/zh_CN/groupdel.8 @@ -1,4 +1,5 @@ -.\" Copyright 1991 - 1993, Julianne Frances Haugh +.\" $Id: groupdel.8,v 1.3 2005/04/05 19:08:57 kloczek Exp $ +.\" Copyright 1991 \- 1993, Julianne Frances Haugh .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -24,9 +25,6 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.\" -.\" $Id: groupdel.8,v 1.2 2003/04/26 13:24:16 kloczek Exp $ -.\" .TH GROUPDEL 8 .SH 靡備 groupdel \- 刉壺禍 diff --git a/man/zh_CN/groupmod.8 b/man/zh_CN/groupmod.8 index bb129c59..dff41889 100644 --- a/man/zh_CN/groupmod.8 +++ b/man/zh_CN/groupmod.8 @@ -25,31 +25,31 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: groupmod.8,v 1.4 2004/11/04 03:06:33 kloczek Exp $ +.\" $Id: groupmod.8,v 1.6 2005/04/05 19:08:57 kloczek Exp $ .\" .TH GROUPMOD 8 .SH 靡備 groupmod \- 党 蜊 郪 .SH 逄楊 .B groupmod -[\fB-g\fI gid \fR[\fB-o\fR]] -[\fB-n\fI group_name \fR] +[\fB\-g\fR \fIgid\fR [\fB\-o\fR]] +[\fB\-n\fR \fIgroup_name\fR] .I group .SH 鏡扴 \fBgroupmod\fR 韜 鍔 頗 統 桽 斕 韜 鍔 蹈 奻 硌 隅 腔 窒 爺 党 蜊 炵 苀 梛 瘍 紫 ﹝ 狟 蹈 峈 \fIgroupmod\fR 褫 恁 蚚 腔 統 杅 ﹝ -.IP "\fB-g \fIgid\fR" +.IP "\fB\-g\fR \fIgid\fR" 郪 I D 硉 ﹝ -斛 剕 峈 峔 珨 腔 ID 硉 ㄛ 壺 準 蚚 -o 恁 砐 ﹝ +斛 剕 峈 峔 珨 腔 ID 硉 ㄛ 壺 準 蚚 \-o 恁 砐 ﹝ 杅 趼 祥 褫 峈 蛹 硉﹝啎 扢 峈 郔 苤 祥 腕 苤 衾 999 奧 紨 棒 崝 樓 ﹝ 0~ 499 換 苀 奻 岆 悵 隱 跤 炵 苀 梛 瘍 妏 蚚 ﹝ 彆 衄 紫 偶 妏 蚚 導 腔 郪 ID ㄛ 奧 涴 奀 緊 斕 陔 崝 腔 郪 ID ョ 疑 迵 導 腔 眈 肮 ㄛ 涴 欴 腔 趕 斕 猁 忒 雄 蜊 珨 狟 涴 虳 紫 偶 腔 郪 ID ﹝ -.IP "\fB-n \fIgroup_name\fR" +.IP "\fB\-n\fR \fIgroup_name\fR" 載 蜊 郪 靡 ﹝ .SH 紫偶 \fI/etc/group\fR \- 郪 訧 捅 diff --git a/man/zh_CN/useradd.8 b/man/zh_CN/useradd.8 index f7f250ca..47e27d01 100644 --- a/man/zh_CN/useradd.8 +++ b/man/zh_CN/useradd.8 @@ -1,3 +1,4 @@ +.\" $Id: useradd.8,v 1.6 2005/04/05 19:08:57 kloczek Exp $ .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -25,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: useradd.8,v 1.4 2004/11/04 03:06:33 kloczek Exp $ +.\" $Id: useradd.8,v 1.6 2005/04/05 19:08:57 kloczek Exp $ .\" .TH USERADD 8 .SH 靡 備 @@ -33,135 +34,122 @@ useradd \- .SH 逄 楊 .TP 8 .B useradd -.\" .RB [ -A -.\" .RI { method | \fBDEFAULT\fR "},... ]" -.RB [ -c +.RB [ \-c .IR comment ] -.RB [ -d +.RB [ \-d .IR home_dir ] .br -.RB [ -e +.RB [ \-e .IR expire_date ] -.RB [ -f +.RB [ \-f .IR inactive_time ] .br -.RB [ -g +.RB [ \-g .IR initial_group ] -.RB [ -G +.RB [ \-G .IR group [,...]] .br -.RB [ -m " [" -k -.IR skeleton_dir ] " |" " " -M ] -.RB [ -s +.RB [ \-m " [" \-k +.IR skeleton_dir ] " |" " " \-M ] +.RB [ \-s .IR shell ] .br -.RB [ -u +.RB [ \-u .IR uid " [" -.BR -o ]] -.RB [ -n ] -.RB [ -r ] +.BR \-o ]] +.RB [ \-n ] +.RB [ \-r ] .I login .TP 8 .B useradd -\fB-D\fR -[\fB-g\fI default_group\fR] -[\fB-b\fI default_home\fR] +\fB\-D\fR [\fB\-g\fR \fIdefault_group\fR] [\fB\-b\fR \fIdefault_home\fR] .br -[\fB-f\fI default_inactive\fR] -[\fB-e\fI default_expire_date\fR] +[\fB\-f\fR \fIdefault_inactive\fR] [\fB\-e\fR \fIdefault_expire_date\fR] .br -[\fB-s\fI default_shell\fR] +[\fB\-s\fR \fIdefault_shell\fR] .SH 鏡 扴 .SS 陔 梛 瘍 膘 蕾 -絞 祥 樓 \fB-D\fR 統 杅 , \fBuseradd\fR 硌 鍔 妏 蚚 韜 鍔 蹈 懂 硌 隅 +絞 祥 樓 \fB\-D\fR 統 杅 , \fBuseradd\fR 硌 鍔 妏 蚚 韜 鍔 蹈 懂 硌 隅 陔 梛 瘍 腔 扢 隅 硉 and 妏 蚚 炵 苀 奻 腔 啎 扢 硉 . 陔 妏 蚚 氪 梛 瘍 蔚 莉 汜 珨 虳 炵 苀 紫 偶 ㄛ 妏 蚚 氪 醴 翹 膘 蕾 ㄛ 蕭 掘 れ 宎 紫 偶 脹 ㄛ 涴 虳 歙 褫 眕 瞳 蚚 韜 鍔蹈 恁 砐 硌 隅 ﹝ 森 唳 掛 峈 Red Hat Linux 枑 鼎 -ㄛ 褫 堆 藩 跺 陔 樓 腔 妏 蚚 氪 膘 蕾 跺 梗 腔 group , 拺 剕 氝 樓 \fB-n\fR +ㄛ 褫 堆 藩 跺 陔 樓 腔 妏 蚚 氪 膘 蕾 跺 梗 腔 group , 拺 剕 氝 樓 \fB\-n\fR 恁 砐 ﹝ \fBuseradd\fR 褫 妏 蚚 腔 恁 砐 峈 -.\" .IP "\fB-A {\fImethod\fR|\fBDEFAULT\fR},..." -.\" The value of the user's authentication method. -.\" The authentication method is the name of a program which is responsible -.\" for validating the user's identity. -.\" The string \fBDEFAULT\fR may be used to change the user's authentication -.\" method to the standard system password method. -.\" This is a comma-separated list of program names. -.\" It may include \fBDEFAULT\fR exactly once. -.IP "\fB-c \fIcomment\fR" +.IP "\fB\-c\fR \fIcomment\fR" 陔 梛 瘍 password 紫 腔 佽 隴 戲 ﹝ -.IP "\fB-d \fIhome_dir\fR" +.IP "\fB\-d\fR \fIhome_dir\fR" 陔 梛 瘍 藩 棒 腎 奀 垀 妏 蚚 腔 \fIhome_dir\fR ﹝ 啎 扢 硉 峈 \fIdefault_home\fR 囀 \fIlogin\fR 靡 備 ㄛ 甜 絞 傖 腎 奀 醴 翹 靡 備 ﹝ -.IP "\fB-e \fIexpire_date\fR" +.IP "\fB\-e\fR \fIexpire_date\fR" 梛 瘍 笝 砦 ぶ ﹝ ぶ 腔 硌 隅 跡 宒 峈 \fIMM/DD/YY\fR ﹝ -.IP "\fB-f \fIinactive_days\fR" +.IP "\fB\-f\fR \fIinactive_days\fR" 梛 瘍 徹 ぶ 撓 綴 蚗 壅 礿 ﹝ 絞 硉 峈 0 奀 梛 瘍 寀 蕾 覦 掩 礿 ﹝ -奧 絞 硉 峈 -1 奀 寀 壽 敕 森 髡 夔 ㄛ 啎 扢 硉 峈 -1 -.IP "\fB-g \fIinitial_group\fR" +奧 絞 硉 峈 \-1 奀 寀 壽 敕 森 髡 夔 ㄛ 啎 扢 硉 峈 \-1 +.IP "\fB\-g\fR \fIinitial_group\fR" group 靡 備 麼 眕 杅 趼 懂 酕 峈 妏 蚚 氪 腎 れ 宎 郪 (group) ﹝ 郪 靡 剕 峈 珋 衄 湔 婓 腔 靡 備 ﹝ 郪 杅 趼 珩 剕 峈 珋 衄 湔 婓 腔 郪 ﹝ 啎 扢 腔 郪 杅 趼 峈 1 ﹝ -.IP "\fB-G \fIgroup,[...]\fR" +.IP "\fB\-G\fR \fIgroup,[...]\fR" 隅 砱 森 妏 蚚 氪 峈 森 珨 剽 groups 腔 傖 埜 ﹝ 藩 跺 郪 妏 蚚 "," ⑹ 跡 羲 懂 ㄛ 祥 褫 眕 標 娸 諾 啞 趼 啋 ﹝ - 郪 靡 肮 \fB-g\fR 恁 砐 腔 癹 秶 ﹝ + 郪 靡 肮 \fB\-g\fR 恁 砐 腔 癹 秶 ﹝ 隅 砱 硉 峈 妏蚚 氪 腔 れ 宎 郪 ﹝ -.IP \fB-m\fR +.IP \fB\-m\fR 妏 蚚 氪 醴 翹 祥 湔 婓 寀 赻 雄 膘 蕾 ﹝ - 妏 蚚 \fB-k\fR 恁 砐 \fIskeleton_dir\fR 囀 腔 紫 偶 蔚 葩 秶 祫 妏 蚚 氪 醴 + 妏 蚚 \fB\-k\fR 恁 砐 \fIskeleton_dir\fR 囀 腔 紫 偶 蔚 葩 秶 祫 妏 蚚 氪 醴 翹 狟 ﹝ 奧 婓 \fI/etc/skel\fR 醴 翹 狟 腔 紫 偶 珩 頗 葩 秶 徹 測 ﹝ 睡 婓 \fIskeleton_dir\fR or \fI/etc/skel\fR 腔 醴 翹 珩 眈 肮 頗 婓 妏 蚚 氪 醴 翹 狟 珨 珨 膘 蕾 ﹝ -The \fB-k\fR 肮 \fB-m\fR +The \fB\-k\fR 肮 \fB\-m\fR 祥 膘 蕾 醴 翹 眕 摯 祥 葩 秶 睡 紫 偶 峈 啎 扢 硉 ﹝ -.IP \fB-M\fR +.IP \fB\-M\fR 祥 膘 蕾 妏 蚚 氪 醴 翹 ㄛ 撈 妏 \fI/etc/login.defs\fR 炵 苀 紫 扢 隅 猁 膘 蕾 妏 蚚 氪 醴 翹 ﹝ -.IP \fB-n\fR +.IP \fB\-n\fR 啎 扢 硉 妏 蚚 氪 郪 迵 妏 蚚 氪 靡 備 頗 眈 肮 ﹝ 森 恁 砐 蔚 秏 森 啎 扢 硉 ﹝ -.IP \fB-r\fR +.IP \fB\-r\fR 森 統 杅 岆 蚚 懂 膘 蕾 炵 苀 梛 瘍 ﹝ 炵 苀 梛 瘍 腔 UID 頗 掀 隅 砱 婓 炵 苀 紫 奻 \fI/etc/login.defs\fR. 腔 UID_MIN 懂 腔 苤 ﹝ 蛁 砩 \fBuseradd\fR 森 蚚 楊 垀 膘 蕾 腔 梛 瘍 祥 頗 膘 蕾 妏 蚚 氪 醴 翹 ㄛ 珩 祥 頗 婓 綱 槨 翹 婓 \fI/etc/login.defs\fR. 腔 隅 砱 硉 ﹝ - 彆 斕 砑 猁 衄 妏 蚚 氪 醴 翹 剕 塗 俋 硌 隅 \fB-m\fR 統 杅 懂 膘 蕾 炵 + 彆 斕 砑 猁 衄 妏 蚚 氪 醴 翹 剕 塗 俋 硌 隅 \fB\-m\fR 統 杅 懂 膘 蕾 炵 苀 梛 瘍 ﹝ 涴 岆 RED HAT 塗 俋 崝 扢 腔 恁 砐 ﹝ -.IP "\fB-s \fIshell\fR" +.IP "\fB\-s \fIshell\fR" 妏 蚚 氪 腎 綴 妏 蚚 腔 shell 靡 備 ﹝ 啎 扢 峈 祥 沓 迡 ㄛ 涴 欴 炵 苀 頗 堆 斕 硌 隅 啎 扢 腔 腎 shell ﹝ -.IP "\fB-u \fIuid\fR" -妏 蚚 氪 腔 ID 硉 ﹝ 斛 剕 峈 峔 珨 腔 ID 硉 ㄛ 壺 準 蚚 \fI-o\fR 恁 砐 ﹝ +.IP "\fB\-u \fIuid\fR" +妏 蚚 氪 腔 ID 硉 ﹝ 斛 剕 峈 峔 珨 腔 ID 硉 ㄛ 壺 準 蚚 \fI\-o\fR 恁 砐 ﹝ 杅 趼 祥 褫 峈 蛹 硉﹝啎 扢 峈 郔 苤 祥 腕 苤 衾 999 奧 紨 棒 崝 樓 ﹝ 0~ 999 換 苀 奻 岆 悵 隱 跤 炵 苀 梛 瘍 妏 蚚 ﹝ .SS 蜊 曹 啎 扢 硉 -絞 \fB-D\fR 恁 砐 堤 珋 奀 ㄛ \fBuseradd\fR 凅 堤 珋 婓 腔 啎 扢 硉 ㄛ 麼 岆 賢 +絞 \fB\-D\fR 恁 砐 堤 珋 奀 ㄛ \fBuseradd\fR 凅 堤 珋 婓 腔 啎 扢 硉 ㄛ 麼 岆 賢 蚕 韜 鍔 蹈 腔 源 宒 載 陔 啎 扢 硉 ﹝ 褫 蚚 恁 砐 峈 ￣ -.IP "\fB-b \fIdefault_home\fR" +.IP "\fB\-b\fR \fIdefault_home\fR" 隅 砱 妏 蚚 氪 垀 扽 醴 翹 腔 ヶ 珨 跺 醴 翹 ﹝ 妏 蚚 氪 靡 備 頗 蜇 樓 婓 \fIdefault_home\fR 綴 醱 蚚 懂 膘 蕾 陔 妏 蚚 氪 腔 醴 翹 ﹝ -絞 妏 蚚 \fB-d\fI 綴 寀 森 恁 砐 拸 虴 ﹝ -.IP "\fB-e \fIdefault_expire_date\fR" +絞 妏 蚚 \fB\-d\fI 綴 寀 森 恁 砐 拸 虴 ﹝ +.IP "\fB\-e\fR \fIdefault_expire_date\fR" 妏 蚚 氪 梛 瘍 礿 砦 ぶ ﹝ -.IP "\fB-f \fIdefault_inactive\fR" +.IP "\fB\-f\fR \fIdefault_inactive\fR" 梛 瘍 徹 ぶ 撓 綴 礿 ﹝ -.IP "\fB-g \fIdefault_group\fR" +.IP "\fB\-g\fR \fIdefault_group\fR" 陔 梛 瘍 れ 宎 郪 靡 麼 ID ﹝ 郪 靡 剕 峈 珋 衄 湔 婓 腔 靡 備 ﹝ 郪 I D 珩 剕 峈 珋 衄 湔 婓 腔 郪 ﹝ -.IP "\fB-s \fIdefault_shell\fR" +.IP "\fB\-s\fR \fIdefault_shell\fR" 妏 蚚 氪 腎 綴 妏 蚚 腔 shell 靡 備 ﹝ 厘 綴 陔 樓 腔 梛 瘍 飲 蔚 妏 蚚 森 shell. .PP diff --git a/man/zh_CN/userdel.8 b/man/zh_CN/userdel.8 index 26552ae4..a1eab004 100644 --- a/man/zh_CN/userdel.8 +++ b/man/zh_CN/userdel.8 @@ -1,3 +1,4 @@ +.\" $Id: userdel.8,v 1.3 2005/04/05 19:08:57 kloczek Exp $ .\" Copyright 1991 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -24,21 +25,18 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.\" -.\" $Id: userdel.8,v 1.2 2003/04/26 13:24:16 kloczek Exp $ -.\" .TH USERDEL 8 .SH 靡備 userdel \- 刉 壺 妏 蚚 氪 梛 瘍 摯 眈 壽 紫 偶 .SH 逄楊 .B userdel -[\fB-r\fR] +[\fB\-r\fR] .I login .SH 鏡扴 \fBuserdel\fR 韜 鍔 党 蜊 炵 苀 梛 瘍 紫 刉 壺 垀 衄 \fIlogin\fR 頗 統 蕉 腔 窒 爺 ﹝ 妏 蚚 氪 靡 備 斛 剕岆 湔 婓 腔 ﹝ -.IP \fB-r\fR +.IP \fB\-r\fR 妏 蚚 氪 醴 翹 狟 腔 紫 偶 珨 甜 痄 壺 ﹝ 婓 む 坻 弇 离 奻 腔 紫 偶 珩 蔚 珨 珨 梑 堤 甜 刉 壺 ﹝ .SH 紫偶 diff --git a/man/zh_CN/usermod.8 b/man/zh_CN/usermod.8 index b9c94fc3..0c4419b8 100644 --- a/man/zh_CN/usermod.8 +++ b/man/zh_CN/usermod.8 @@ -1,4 +1,5 @@ -.\" Copyright 1991 - 1994, Julianne Frances Haugh +.\" $Id: usermod.8,v 1.6 2005/04/05 19:08:57 kloczek Exp $ +.\" Copyright 1991 \- 1994, Julianne Frances Haugh .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -24,82 +25,79 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.\" -.\" $Id: usermod.8,v 1.4 2004/11/04 03:06:33 kloczek Exp $ -.\" .TH USERMOD 8 .SH 靡備 usermod \- 党 蜊 妏 蚚 氪 梛 瘍 .SH 逄楊 .TP 8 .B usermod -.\" .RB [ -A +.\" .RB [ \-A .\" .RI { method | \fBDEFAULT\fR "},... ]" -.RB [ -c +.RB [ \-c .IR comment ] -.RB [ -d +.RB [ \-d .IR home_dir " [" -.BR -m ]] +.BR \-m ]] .br -.RB [ -e +.RB [ \-e .IR expire_date ] -.RB [ -f +.RB [ \-f .IR inactive_time ] .br -.RB [ -g +.RB [ \-g .IR initial_group ] -.RB [ -G +.RB [ \-G .IR group [,...]] .br -.RB [ -l +.RB [ \-l .IR login_name ] -.RB [ -s +.RB [ \-s .IR shell ] .br -.RB [ -u +.RB [ \-u .IR uid " [" -.BR -o ]] +.BR \-o ]] .I login .SH 鏡扴 \fBusermod\fR 韜 鍔 頗 統 桽 斕 韜 鍔 蹈 奻 硌 隅 腔 窒 爺 党 蜊 炵 苀 梛 瘍 紫 ﹝ 狟 蹈 峈 \fBusermod\fR 褫 恁 蚚 腔 統 杅 ﹝ -.\" .IP "\fB-A \fImethod\fR|\fBDEFAULT\fR" +.\" .IP "\fB\-A \fImethod\fR|\fBDEFAULT\fR" .\" The new value of the user's authentication method. .\" The authentication method is the name of a program which is responsible .\" for validating the user's identity. .\" The string \fBDEFAULT\fR may be used to change the user's authentication .\" method to the standard system password method. -.IP "\fB-c \fIcomment\fR" +.IP "\fB\-c\fR \fIcomment\fR" 載 陔 妏 蚚 氪 梛 瘍 password 紫 笢 腔 蛁 賤 戲 ㄛ 珨 啜 岆 妏 蚚 \fBchfn\fR(1) 懂 党 蜊 ﹝ -.IP "\fB-d \fIhome_dir\fR" +.IP "\fB\-d\fR \fIhome_dir\fR" 載 陔 妏 蚚 氪 陔 腔 腎 醴 翹 ﹝ - 彆 跤 隅 \fB-m\fR 恁 砐 ㄛ 妏 蚚 氪 導 醴 翹 頗 唸 善 陔 腔 醴 翹 + 彆 跤 隅 \fB\-m\fR 恁 砐 ㄛ 妏 蚚 氪 導 醴 翹 頗 唸 善 陔 腔 醴 翹 ㄛ 導 醴 翹 祥 湔 婓 寀 膘 跺 陔 腔 ﹝ -.IP "\fB-e \fIexpire_date\fR" +.IP "\fB\-e\fR \fIexpire_date\fR" 樓 奻 妏 蚚 氪 梛 瘍 礿 砦 ぶ ﹝ ぶ 跡 宒 峈 \fIMM/DD/YY\fR. -.IP "\fB-f \fIinactive_days\fR" +.IP "\fB\-f\fR \fIinactive_days\fR" 梛 瘍 徹 ぶ 撓 綴 蚗 壅 礿 芋ㄤ 硉 峈 0 奀 -梛 瘍 寀 蕾 覦 掩 礿 ﹝ 奧 絞 硉 峈 -1 奀 寀 壽敕森髡夔 -﹝啎 扢 硉 峈 -1﹝ -.IP "\fB-g \fIinitial_group\fR" +梛 瘍 寀 蕾 覦 掩 礿 ﹝ 奧 絞 硉 峈 \-1 奀 寀 壽敕森髡夔 +﹝啎 扢 硉 峈 \-1﹝ +.IP "\fB\-g\fR \fIinitial_group\fR" 載 陔 妏 蚚 氪 陔 腔 れ 宎 腎 郪 ﹝ 郪 靡 剕 眒 湔 婓 ﹝ 郪 ID 斛 剕 統 桽 暫 衄 腔 腔 郪 ﹝ 郪 ID 啎 扢 硉 峈 1 ﹝ -.IP "\fB-G \fIgroup,[...]\fR" +.IP "\fB\-G\fR \fIgroup,[...]\fR" 隅 砱 妏 蚚 氪 峈 珨 剽 groups 腔 傖 埜 ﹝ 藩 跺 郪 妏 蚚 "," ⑹ 跡 羲 懂 ㄛ 祥 褫 眕 標 娸 諾 -啞 趼 啋 ﹝ 郪 靡 肮 -g 恁 砐 腔 癹 秶 ﹝ +啞 趼 啋 ﹝ 郪 靡 肮 \-g 恁 砐 腔 癹 秶 ﹝ 彆 妏 蚚 氪 珋 婓 腔 郪 祥 婬 森 蹈 ㄛ 寀 蔚 妏 蚚 氪 蚕 蜆 郪 笢 痄 壺 ﹝ -.IP "\fB-l \fIlogin_name\fR" +.IP "\fB\-l\fR \fIlogin_name\fR" 曹 載 妏 蚚 氪 \fIlogin\fR 奀 腔 靡 備 峈 \fIlogin_name\fR ﹝ む 衾 祥 曹 ﹝ 杻 梗 岆 ㄛ 妏 蚚 氪 醴 翹 靡 茼 蜆 珩 頗 躲 覂 載 雄 傖 陔 腔 腎 靡 ﹝ -.IP "\fB-s \fIshell\fR" +.IP "\fB\-s\fR \fIshell\fR" 硌 隅 陔 腎 shell ﹝ 森 戲 隱 啞 ㄛ 炵 苀 蔚 恁 蚚 炵 苀 啎 扢 shell ﹝ -.IP "\fB-u \fIuid\fR" -妏 蚚 氪 ID 硉 ﹝斛 剕 峈 峔 珨 腔 ID 硉 ㄛ 壺 準 蚚 \fI-o\fR 恁 砐 ﹝ 杅 +.IP "\fB\-u\fR \fIuid\fR" +妏 蚚 氪 ID 硉 ﹝斛 剕 峈 峔 珨 腔 ID 硉 ㄛ 壺 準 蚚 \fI\-o\fR 恁 砐 ﹝ 杅 趼 祥 褫 峈 蛹 硉﹝啎 扢 峈 郔 苤 祥 腕 苤 衾 999 奧 紨 棒 崝 樓 ﹝ 0~ 999 換 苀 奻 岆 悵 隱 跤 炵 苀 梛 瘍 妏 蚚 ﹝ 妏 蚚 氪 醴 翹 攷 狟 垀 衄 腔 紫 偶 醴 翹 む user ID 頗 赻 雄 蜊 曹 ﹝ diff --git a/man/zh_TW/Makefile.in b/man/zh_TW/Makefile.in index f5a249cf..9ca322ed 100644 --- a/man/zh_TW/Makefile.in +++ b/man/zh_TW/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.4 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -87,17 +87,16 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ 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@ @@ -196,9 +195,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/zh_TW/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/zh_TW/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/zh_TW/Makefile + $(AUTOMAKE) --foreign man/zh_TW/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/man/zh_TW/chfn.1 b/man/zh_TW/chfn.1 index 3d0df679..181d06af 100644 --- a/man/zh_TW/chfn.1 +++ b/man/zh_TW/chfn.1 @@ -1,22 +1,16 @@ +.\" $Id: chfn.1,v 1.3 2005/04/05 19:08:57 kloczek Exp $ +.\" (c) 1994 by salvatore valente .\" -.\" chfn.1 -- change your finger information -.\" (c) 1994 by salvatore valente -.\" -.\" this program is free software. you can redistribute it and -.\" modify it under the terms of the gnu general public license. -.\" there is no warranty. -.\" -.\" $Author: kloczek $ -.\" $Revision: 1.2 $ -.\" $Date: 2004/08/04 13:02:26 $ -.\" +.\" this program is free software. you can redistribute it and +.\" modify it under the terms of the gnu general public license. +.\" there is no warranty. .TH CHFN 1 "October 13 1994" "chfn" "Linux Reference Manual" .SH 名稱 chfn \- 改 變 你 的 finger 訊 息 .SH 語法 .B chfn -[\ \-f\ full-name\ ] [\ \-o\ office\ ] [\ \-p\ office-phone\ ] -[\ \-h\ home-phone\ ] [\ \-u\ ] [\ \-v\ ] [\ username\ ] +[\ \-f\ full\-name\ ] [\ \-o\ office\ ] [\ \-p\ office\-phone\ ] +[\ \-h\ home\-phone\ ] [\ \-u\ ] [\ \-v\ ] [\ username\ ] .SH 描述 .B chfn 是 用 來 改 變 你 的 finger 訊 息 。 訊 息 是 存 放 在 @@ -40,22 +34,22 @@ chfn \- 輸 入 "none" 則 表 示 該 欄 空 白 。 .SH 選項 .TP -.I "\-f, \-\-full-name" +.I "\-f, \-\-full\-name" 真 實 姓 名 .TP -.I "\-h, \-\-home-phone" +.I "\-h, \-\-home\-phone" 家 裡 的 電 話 .TP .I "\-o, \-\-office" 辦 工 室 號 碼 .TP -.I "\-p, \-\-office-phone" +.I "\-p, \-\-office\-phone" 辦 公 室 電 話 .TP .I "\-u, \-\-help" 秀 出 使 用 說 明 短 訊 。 .TP -.I "-v, \-\-version" +.I "\-v, \-\-version" 秀 出 版 本 訊 息 。 .SH "相關文件" .BR finger (1), diff --git a/man/zh_TW/chsh.1 b/man/zh_TW/chsh.1 index 04ca9d1f..54b930fd 100644 --- a/man/zh_TW/chsh.1 +++ b/man/zh_TW/chsh.1 @@ -1,15 +1,9 @@ -.\" -.\" chsh.1 -- change your login shell +.\" $Id: chsh.1,v 1.3 2005/04/05 19:08:57 kloczek Exp $ .\" (c) 1994 by salvatore valente .\" .\" this program is free software. you can redistribute it and .\" modify it under the terms of the gnu general public license. .\" there is no warranty. -.\" -.\" $Author: kloczek $ -.\" $Revision: 1.2 $ -.\" $Date: 2004/08/04 13:02:26 $ -.\" .TH CHSH 1 "October 13 1994" "chsh" "Linux Reference Manual" .SH 名稱 chsh \- 更換你登入時所用的shell @@ -30,7 +24,7 @@ chsh \- 檔上，則chsh會提出警告訊息。 .SH 選項 .TP -.I "\-l, \-\-list-shells" +.I "\-l, \-\-list\-shells" 列出紀錄在 .I /etc/shells 的shell。 @@ -41,7 +35,7 @@ chsh \- .I "\-u, \-\-help" 使用短訊。 .TP -.I "-v, \-\-version" +.I "\-v, \-\-version" 版本資訊 .SH "相關文件" .BR login (1), diff --git a/man/zh_TW/groupadd.8 b/man/zh_TW/groupadd.8 index 1e8e0105..0e19b976 100644 --- a/man/zh_TW/groupadd.8 +++ b/man/zh_TW/groupadd.8 @@ -1,3 +1,4 @@ +.\" $Id: groupadd.8,v 1.7 2005/04/05 19:08:57 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -24,50 +25,47 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.\" -.\" $Id: groupadd.8,v 1.5 2004/11/04 03:06:33 kloczek Exp $ -.\" .TH GROUPADD 8 .SH 名稱 groupadd \- 建 立 新 群 組 .SH 語法 -\fBgroupadd\fR [\fB-g\fI gid \fR[\fB-o\fR]] [\fB-f\fR] \fIgroup\fR +\fBgroupadd\fR [\fB\-g\fR \fIgid\fR [\fB\-o\fR]] [\fB\-f\fR] \fIgroup\fR .SH 描述 \fBgroupadd\fR 可 指 定 群 組 名 稱 來 建 立 新 的 群 組 帳 號 。 需 要 時 可 從 系 統 中 取 得 新 群 組 值 。 \fBgroupadd\fR 有 下 列 選 項 可 用 。 -.IP \fB-f\fR +.IP \fB\-f\fR This is \fIforce\fR flag. 新 增 一 個 已 經 存 在 的 群 組 帳 號 ， 系 統 會 出 現 錯 誤 訊 息 然 後 結 束 \fBgroupadd\fR 。 如 果 是 這 樣 的 情 況 ， 不 會 新 增 這 個 群 組 ( 如 果 是 這 個 情 況 下 ， 系 統 不 會 再 新 增 一 次 ) .br -也 可 同 時 加 上 \fB-g\fR 選 項 +也 可 同 時 加 上 \fB\-g\fR 選 項 當 你 加 上 一 個 \fIgid\fR ， 此 時 \fIgid\fR -就 不 用 是 唯 一 值 ， 可 不 加 \fB-o\fR 參 數 ， +就 不 用 是 唯 一 值 ， 可 不 加 \fB\-o\fR 參 數 ， 建 好 群 組 後 會 顯 結 果 -(adding a group as neither \fB-g\fR or \fB-o\fR options were +(adding a group as neither \fB\-g\fR or \fB\-o\fR options were specified). -.IP "\fB-g \fIgid\fR" +.IP "\fB\-g \fIgid\fR" group's ID 值 。 -除 非 使 用 \fB-o\fR 參 數 不 然 該 值 必 須 是 唯 一 ， 不 可 相 同 。 +除 非 使 用 \fB\-o\fR 參 數 不 然 該 值 必 須 是 唯 一 ， 不 可 相 同 。 數 值 不 可 為 負 。 預 設 為 最 小 不 得 小 於 500 而 逐 次 增 加 。 0~999 傳 統 上 是 保 留 給 \fI系統帳號\fR 使 用 。 -.IP \fB-r\fR +.IP \fB\-r\fR 此 參 數 是 用 來 建 立 \fI系統帳號\fR 。 的 UID 會 比 定 義 在 系 統 檔 上 /etc/login.defs. 的 UID_MIN 來 的 小 。 注 意 useradd 此 用 法 所 建 立 的 帳 號 不 會 建 立 使 用 者 目 錄 ， 也 不 會 在 乎 紀 錄 在 /etc/login.defs. 的 定 義 值 。 如 -果 你 想 要 有 使 用 者 目 錄 須 額 外 指 定 -m 參 +果 你 想 要 有 使 用 者 目 錄 須 額 外 指 定 \-m 參 數 來 建 立 系 統 帳 號 。 這 是 RED HAT 額 外 增 設 的 選 項 。 它 會 自 動 幫 你 選 定 一 個 小 於 999 的 \fIgif\fR -不 需 要 再 加 上 \fB-g\fR 參 數 。 +不 需 要 再 加 上 \fB\-g\fR 參 數 。 .br 這 是 RED HAT 額 外 增 設 的 選 項 。 diff --git a/man/zh_TW/groupdel.8 b/man/zh_TW/groupdel.8 index a614e850..7c6972da 100644 --- a/man/zh_TW/groupdel.8 +++ b/man/zh_TW/groupdel.8 @@ -1,3 +1,4 @@ +.\" $Id: groupdel.8,v 1.3 2005/04/05 19:08:57 kloczek Exp $ .\" Copyright 1991 - 1993, Julianne Frances Haugh .\" All rights reserved. .\" @@ -24,9 +25,6 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.\" -.\" $Id: groupdel.8,v 1.2 2003/04/26 13:24:16 kloczek Exp $ -.\" .TH GROUPDEL 8 .SH 名稱 groupdel \- 刪除群組 diff --git a/man/zh_TW/groupmod.8 b/man/zh_TW/groupmod.8 index 1d2fb871..1805613c 100644 --- a/man/zh_TW/groupmod.8 +++ b/man/zh_TW/groupmod.8 @@ -1,3 +1,4 @@ +.\" $Id: groupmod.8,v 1.6 2005/04/05 19:08:57 kloczek Exp $ .\" Copyright 1991, Julianne Frances Haugh .\" All rights reserved. .\" @@ -24,32 +25,26 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.\" -.\" $Id: groupmod.8,v 1.4 2004/11/04 03:06:33 kloczek Exp $ -.\" .TH GROUPMOD 8 .SH 名稱 groupmod \- 修 改 群 組 .SH 語法 -.B groupmod -[\fB-g\fI gid \fR[\fB-o\fR]] -[\fB-n\fI group_name \fR] -.I group +\fBgroupmod\fR [\fB\-g\fR \fIgid \fR[\fB\-o\fR]] [\fB\-n\fR \fIgroup_name \fR] \fIgroup\fR .SH 描述 \fBgroupmod\fR 命 令 會 參 照 你 命 令 列 上 指 定 的 部 份 修 改 系 統 帳 號 檔 。 下 列 為 \fIgroupmod\fR 可 選 用 的 參 數 。 -.IP "\fB-g \fIgid\fR" +.IP "\fB\-g\fR \fIgid\fR" 群 組 I D 值 。 -必 須 為 唯 一 的 ID 值 ， 除 非 用 -o 選 項 。 +必 須 為 唯 一 的 ID 值 ， 除 非 用 \-o 選 項 。 數 字 不 可 為 負 值。預 設 為 最 小 不 得 小 於 999 而 逐 次 增 加 。 0~ 499 傳 統 上 是 保 留 給 系 統 帳 號 使 用 。 如 果 有 檔 案 使 用 舊 的 群 組 ID ， 而 這 時 候 你 新 增 的 群 組 ID 恰 好 與 舊 的 相 同 ， 這 樣 的 話 你 要 手 動 改 一 下 這 些 檔 案 的 群 組 ID 。 -.IP "\fB-n \fIgroup_name\fR" +.IP "\fB\-n\fR \fIgroup_name\fR" 更 改 群 組 名 。 .SH 檔案 \fI/etc/group\fR \- 群 組 資 訊 diff --git a/man/zh_TW/useradd.8 b/man/zh_TW/useradd.8 index 039fa932..81eac571 100644 --- a/man/zh_TW/useradd.8 +++ b/man/zh_TW/useradd.8 @@ -1,4 +1,5 @@ -.\" Copyright 1991 - 1994, Julianne Frances Haugh +.\" $Id: useradd.8,v 1.6 2005/04/05 19:08:57 kloczek Exp $ +.\" Copyright 1991 \- 1994, Julianne Frances Haugh .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -24,144 +25,129 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.\" -.\" $Id: useradd.8,v 1.4 2004/11/04 03:06:33 kloczek Exp $ -.\" .TH USERADD 8 .SH 名 稱 useradd \- 帳 號 建 立 或 更 新 新 使 用 者 的 資 訊 .SH 語 法 .TP 8 .B useradd -.\" .RB [ -A +.\" .RB [ \-A .\" .RI { method | \fBDEFAULT\fR "},... ]" -.RB [ -c +.RB [ \-c .IR comment ] -.RB [ -d +.RB [ \-d .IR home_dir ] .br -.RB [ -e +.RB [ \-e .IR expire_date ] -.RB [ -f +.RB [ \-f .IR inactive_time ] .br -.RB [ -g +.RB [ \-g .IR initial_group ] -.RB [ -G +.RB [ \-G .IR group [,...]] .br -.RB [ -m " [" -k -.IR skeleton_dir ] " |" " " -M ] -.RB [ -s +.RB [ \-m " [" \-k +.IR skeleton_dir ] " |" " " \-M ] +.RB [ \-s .IR shell ] .br -.RB [ -u +.RB [ \-u .IR uid " [" -.BR -o ]] -.RB [ -n ] -.RB [ -r ] +.BR \-o ]] +.RB [ \-n ] +.RB [ \-r ] .I login .TP 8 -.B useradd -\fB-D\fR -[\fB-g\fI default_group\fR] -[\fB-b\fI default_home\fR] +\fBuseradd\fR \fB\-D\fR [\fB\-g\fR \fIdefault_group\fR] [\fB\-b\fR \fIdefault_home\fR] .br -[\fB-f\fI default_inactive\fR] -[\fB-e\fI default_expire_date\fR] +[\fB\-f\fR \fIdefault_inactive\fR] [\fB\-e\fR \fIdefault_expire_date\fR] .br -[\fB-s\fI default_shell\fR] +[\fB\-s\fR \fIdefault_shell\fR] .SH 描 述 .SS 新 帳 號 建 立 -當 不 加 \fB-D\fR 參 數 , \fBuseradd\fR 指 令 使 用 命 令 列 來 指 定 +當 不 加 \fB\-D\fR 參 數 , \fBuseradd\fR 指 令 使 用 命 令 列 來 指 定 新 帳 號 的 設 定 值 and 使 用 系 統 上 的 預 設 值 . 新 使 用 者 帳 號 將 產 生 一 些 系 統 檔 案 ， 使 用 者 目 錄 建 立 ， 拷 備 起 始 檔 案 等 ， 這 些 均 可 以 利 用 命 令列 選 項 指 定 。 此 版 本 為 Red Hat Linux 提 供 -， 可 幫 每 個 新 加 入 的 使 用 者 建 立 個 別 的 group , 毋 須 添 加 \fB-n\fR +， 可 幫 每 個 新 加 入 的 使 用 者 建 立 個 別 的 group , 毋 須 添 加 \fB\-n\fR 選 項 。 \fBuseradd\fR 可 使 用 的 選 項 為 -.\" .IP "\fB-A {\fImethod\fR|\fBDEFAULT\fR},..." -.\" The value of the user's authentication method. -.\" The authentication method is the name of a program which is responsible -.\" for validating the user's identity. -.\" The string \fBDEFAULT\fR may be used to change the user's authentication -.\" method to the standard system password method. -.\" This is a comma-separated list of program names. -.\" It may include \fBDEFAULT\fR exactly once. -.IP "\fB-c \fIcomment\fR" +.IP "\fB\-c\fR \fIcomment\fR" 新 帳 號 password 檔 的 說 明 欄 。 -.IP "\fB-d \fIhome_dir\fR" +.IP "\fB\-d\fR \fIhome_dir\fR" 新 帳 號 每 次 登 入 時 所 使 用 的 \fIhome_dir\fR 。 預 設 值 為 \fIdefault_home\fR 內 \fIlogin\fR 名 稱 ， 並 當 成 登 入 時 目 錄 名 稱 。 -.IP "\fB-e \fIexpire_date\fR" +.IP "\fB\-e\fR \fIexpire_date\fR" 帳 號 終 止 日 期 。 日 期 的 指 定 格 式 為 \fIMM/DD/YY\fR 。 -.IP "\fB-f \fIinactive_days\fR" +.IP "\fB\-f\fR \fIinactive_days\fR" 帳 號 過 期 幾 日 後 永 久 停 權 。 當 值 為 0 時 帳 號 則 立 刻 被 停 權 。 -而 當 值 為 -1 時 則 關 閉 此 功\ 能 ， 預 設 值 為 -1 -.IP "\fB-g \fIinitial_group\fR" +而 當 值 為 \-1 時 則 關 閉 此 功\ 能 ， 預 設 值 為 \-1 +.IP "\fB\-g\fR \fIinitial_group\fR" group 名 稱 或 以 數 字 來 做 為 使 用 者 登 入 起 始 群 組 (group) 。 群 組 名 須 為 現 有 存 在 的 名 稱 。 群 組 數 字 也 須 為 現 有 存 在 的 群 組 。 預 設 的 群 組 數 字 為 1 。 -.IP "\fB-G \fIgroup,[...]\fR" +.IP "\fB\-G\fR \fIgroup,[...]\fR" 定 義 此 使 用 者 為 此 一 堆 groups 的 成 員 。 每 個 群 組 使 用 "," 區 格 開 來 ， 不 可 以 夾 雜 空 白 字 元 。 - 群 組 名 同 \fB-g\fR 選 項 的 限 制 。 + 群 組 名 同 \fB\-g\fR 選 項 的 限 制 。 定 義 值 為 使用 者 的 起 始 群 組 。 -.IP \fB-m\fR +.IP \fB\-m\fR 使 用 者 目 錄 如 不 存 在 則 自 動 建 立 。 -如 使 用 \fB-k\fR 選 項 \fIskeleton_dir\fR 內 的 檔 案 將 複 製 至 使 用 者 目 +如 使 用 \fB\-k\fR 選 項 \fIskeleton_dir\fR 內 的 檔 案 將 複 製 至 使 用 者 目 錄 下 。 然 而 在 \fI/etc/skel\fR 目 錄 下 的 檔 案 也 會 複 製 過 去 取 代 。 任 何 在 \fIskeleton_dir\fR or \fI/etc/skel\fR 的 目 錄 也 相 同 會 在 使 用 者 目 錄 下 一 一 建 立 。 -The \fB-k\fR 同 \fB-m\fR +The \fB\-k\fR 同 \fB\-m\fR 不 建 立 目 錄 以 及 不 複 製 任 何 檔 案 為 預 設 值 。 -.IP \fB-M\fR +.IP \fB\-M\fR 不 建 立 使 用 者 目 錄 ， 即 使 \fI/etc/login.defs\fR 系 統 檔 設 定 要 建 立 使 用 者 目 錄 。 -.IP \fB-n\fR +.IP \fB\-n\fR 預 設 值 使 用 者 群 組 與 使 用 者 名 稱 會 相 同 。 此 選 項 將 取 消 此 預 設 值 。 -.IP \fB-r\fR +.IP \fB\-r\fR 此 參 數 是 用 來 建 立 系 統 帳 號 。 系 統 帳 號 的 UID 會 比 定 義 在 系 統 檔 上 \fI/etc/login.defs\fR. 的 UID_MIN 來 的 小 。 注 意 \fBuseradd\fR 此 用 法 所 建 立 的 帳 號 不 會 建 立 使 用 者 目 錄 ， 也 不 會 在 乎 紀 錄 在 \fI/etc/login.defs\fR. 的 定 義 值 。 -如 果 你 想 要 有 使 用 者 目 錄 須 額 外 指 定 \fB-m\fR 參 數 來 建 立 系 +如 果 你 想 要 有 使 用 者 目 錄 須 額 外 指 定 \fB\-m\fR 參 數 來 建 立 系 統 帳 號 。 這 是 RED HAT 額 外 增 設 的 選 項 。 -.IP "\fB-s \fIshell\fR" +.IP "\fB\-s\fR \fIshell\fR" 使 用 者 登 入 後 使 用 的 shell 名 稱 。 預 設 為 不 填 寫 ， 這 樣 系 統 會 幫 你 指 定 預 設 的 登 入 shell 。 -.IP "\fB-u \fIuid\fR" -使 用 者 的 ID 值 。 必 須 為 唯 一 的 ID 值 ， 除 非 用 \fI-o\fR 選 項 。 +.IP "\fB\-u\fR \fIuid\fR" +使 用 者 的 ID 值 。 必 須 為 唯 一 的 ID 值 ， 除 非 用 \fI\-o\fR 選 項 。 數 字 不 可 為 負 值。預 設 為 最 小 不 得 小 於 999 而 逐 次 增 加 。 0~ 999 傳 統 上 是 保 留 給 系 統 帳 號 使 用 。 .SS 改 變 預 設 值 -當 \fB-D\fR 選 項 出 現 時 ， \fBuseradd\fR 秀 出 現 在 的 預 設 值 ， 或 是 藉 +當 \fB\-D\fR 選 項 出 現 時 ， \fBuseradd\fR 秀 出 現 在 的 預 設 值 ， 或 是 藉 由 命 令 列 的 方 式 更 新 預 設 值 。 可 用 選 項 為 ： -.IP "\fB-b \fIdefault_home\fR" +.IP "\fB\-b\fR \fIdefault_home\fR" 定 義 使 用 者 所 屬 目 錄 的 前 一 個 目 錄 。 使 用 者 名 稱 會 附 加 在 \fIdefault_home\fR 後 面 用 來 建 立 新 使 用 者 的 目 錄 。 -當 然 使 用 \fB-d\fI 後 則 此 選 項 無 效 。 -.IP "\fB-e \fIdefault_expire_date\fR" +當 然 使 用 \fB\-d\fI 後 則 此 選 項 無 效 。 +.IP "\fB\-e\fR \fIdefault_expire_date\fR" 使 用 者 帳 號 停 止 日 期 。 -.IP "\fB-f \fIdefault_inactive\fR" +.IP "\fB\-f\fR \fIdefault_inactive\fR" 帳 號 過 期 幾 日 後 停 權 。 -.IP "\fB-g \fIdefault_group\fR" +.IP "\fB\-g\fR \fIdefault_group\fR" 新 帳 號 起 始 群 組 名 或 ID 。 群 組 名 須 為 現 有 存 在 的 名 稱 。 群 組 I D 也 須 為 現 有 存 在 的 群 組 。 -.IP "\fB-s \fIdefault_shell\fR" +.IP "\fB\-s\fR \fIdefault_shell\fR" 使 用 者 登 入 後 使 用 的 shell 名 稱 。 往 後 新 加 入 的 帳 號 都 將 使 用 此 shell. .PP diff --git a/man/zh_TW/userdel.8 b/man/zh_TW/userdel.8 index 23421880..afed4ce0 100644 --- a/man/zh_TW/userdel.8 +++ b/man/zh_TW/userdel.8 @@ -1,4 +1,5 @@ -.\" Copyright 1991 - 1994, Julianne Frances Haugh +.\" $Id: userdel.8,v 1.3 2005/04/05 19:08:57 kloczek Exp $ +.\" Copyright 1991 \- 1994, Julianne Frances Haugh .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -24,21 +25,18 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.\" -.\" $Id: userdel.8,v 1.2 2003/04/26 13:24:16 kloczek Exp $ -.\" .TH USERDEL 8 .SH 名稱 userdel \- 刪 除 使 用 者 帳 號 及 相 關 檔 案 .SH 語法 .B userdel -[\fB-r\fR] +[\fB\-r\fR] .I login .SH 描述 \fBuserdel\fR 命 令 修 改 系 統 帳 號 檔 刪 除 所 有 \fIlogin\fR 會 參 考 的 部 份 。 使 用 者 名 稱 必 須是 存 在 的 。 -.IP \fB-r\fR +.IP \fB\-r\fR 使 用 者 目 錄 下 的 檔 案 一 並 移 除 。 在 其 他 位 置 上 的 檔 案 也 將 一 一 找 出 並 刪 除 。 .SH 檔案 diff --git a/man/zh_TW/usermod.8 b/man/zh_TW/usermod.8 index f1cc719a..f4a70849 100644 --- a/man/zh_TW/usermod.8 +++ b/man/zh_TW/usermod.8 @@ -1,4 +1,5 @@ -.\" Copyright 1991 - 1994, Julianne Frances Haugh +.\" $Id: usermod.8,v 1.6 2005/04/05 19:08:57 kloczek Exp $ +.\" Copyright 1991 \- 1994, Julianne Frances Haugh .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -24,82 +25,79 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.\" -.\" $Id: usermod.8,v 1.4 2004/11/04 03:06:33 kloczek Exp $ -.\" .TH USERMOD 8 .SH 名稱 usermod \- 修 改 使 用 者 帳 號 .SH 語法 .TP 8 .B usermod -.\" .RB [ -A +.\" .RB [ \-A .\" .RI { method | \fBDEFAULT\fR "},... ]" -.RB [ -c +.RB [ \-c .IR comment ] -.RB [ -d +.RB [ \-d .IR home_dir " [" -.BR -m ]] +.BR \-m ]] .br -.RB [ -e +.RB [ \-e .IR expire_date ] -.RB [ -f +.RB [ \-f .IR inactive_time ] .br -.RB [ -g +.RB [ \-g .IR initial_group ] -.RB [ -G +.RB [ \-G .IR group [,...]] .br -.RB [ -l +.RB [ \-l .IR login_name ] -.RB [ -s +.RB [ \-s .IR shell ] .br -.RB [ -u +.RB [ \-u .IR uid " [" -.BR -o ]] +.BR \-o ]] .I login .SH 描述 \fBusermod\fR 命 令 會 參 照 你 命 令 列 上 指 定 的 部 份 修 改 系 統 帳 號 檔 。 下 列 為 \fBusermod\fR 可 選 用 的 參 數 。 -.\" .IP "\fB-A \fImethod\fR|\fBDEFAULT\fR" +.\" .IP "\fB\-A \fImethod\fR|\fBDEFAULT\fR" .\" The new value of the user's authentication method. .\" The authentication method is the name of a program which is responsible .\" for validating the user's identity. .\" The string \fBDEFAULT\fR may be used to change the user's authentication .\" method to the standard system password method. -.IP "\fB-c \fIcomment\fR" +.IP "\fB\-c\fR \fIcomment\fR" 更 新 使 用 者 帳 號 password 檔 中 的 注 解 欄 ， 一 般 是 使 用 \fBchfn\fR(1) 來 修 改 。 -.IP "\fB-d \fIhome_dir\fR" +.IP "\fB\-d\fR \fIhome_dir\fR" 更 新 使 用 者 新 的 登 入 目 錄 。 -如 果 給 定 \fB-m\fR 選 項 ， 使 用 者 舊 目 錄 會 搬 到 新 的 目 錄 去 +如 果 給 定 \fB\-m\fR 選 項 ， 使 用 者 舊 目 錄 會 搬 到 新 的 目 錄 去 ，如 舊 目 錄 不 存 在 則 建 個 新 的 。 -.IP "\fB-e \fIexpire_date\fR" +.IP "\fB\-e\fR \fIexpire_date\fR" 加 上 使 用 者 帳 號 停 止 日 期 。 日 期 格 式 為 \fIMM/DD/YY\fR. -.IP "\fB-f \fIinactive_days\fR" +.IP "\fB\-f\fR \fIinactive_days\fR" 帳 號 過 期 幾 日 後 永 久 停 權。當 值 為 0 時 -帳 號 則 立 刻 被 停 權 。 而 當 值 為 -1 時 則 關閉此功\能 -。預 設 值 為 -1。 -.IP "\fB-g \fIinitial_group\fR" +帳 號 則 立 刻 被 停 權 。 而 當 值 為 \-1 時 則 關閉此功\能 +。預 設 值 為 \-1。 +.IP "\fB\-g\fR \fIinitial_group\fR" 更 新 使 用 者 新 的 起 始 登 入 群 組 。 群 組 名 須 已 存 在 。群 組 ID 必 須 參 照 既 有 的 的 群 組 。 群 組 ID 預 設 值 為 1 。 -.IP "\fB-G \fIgroup,[...]\fR" +.IP "\fB\-G\fR \fIgroup,[...]\fR" 定 義 使 用 者 為 一 堆 groups 的 成 員 。 每 個 群 組 使 用 "," 區 格 開 來 ， 不 可 以 夾 雜 空 -白 字 元 。 群 組 名 同 -g 選 項 的 限 制 。 +白 字 元 。 群 組 名 同 \-g 選 項 的 限 制 。 如 果 使 用 者 現 在 的 群 組 不 再 此 列 ， 則 將 使 用 者 由 該 群 組 中 移 除 。 -.IP "\fB-l \fIlogin_name\fR" +.IP "\fB\-l\fR \fIlogin_name\fR" 變 更 使 用 者 \fIlogin\fR 時 的 名 稱 為 \fIlogin_name\fR 。 其 於 不 變 。 特 別 是 ， 使 用 者 目 錄 名 應 該 也 會 跟 著 更 動 成 新 的 登 入 名 。 -.IP "\fB-s \fIshell\fR" +.IP "\fB\-s\fR \fIshell\fR" 指 定 新 登 入 shell 。 如 此 欄 留 白 ， 系 統 將 選 用 系 統 預 設 shell 。 -.IP "\fB-u \fIuid\fR" -使 用 者 ID 值 。必 須 為 唯 一 的 ID 值 ， 除 非 用 \fI-o\fR 選 項 。 數 +.IP "\fB\-u\fR \fIuid\fR" +使 用 者 ID 值 。必 須 為 唯 一 的 ID 值 ， 除 非 用 \fI\-o\fR 選 項 。 數 字 不 可 為 負 值。預 設 為 最 小 不 得 小 於 999 而 逐 次 增 加 。 0~ 999 傳 統 上 是 保 留 給 系 統 帳 號 使 用 。 使 用 者 目 錄 樹 下 所 有 的 檔 案 目 錄 其 user ID 會 自 動 改 變 。 diff --git a/po/LINGUAS b/po/LINGUAS index 91ebdde8..54e3d8bb 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -24,6 +24,7 @@ ru sk sq sv +tl tr uk zh_CN diff --git a/po/POTFILES.in b/po/POTFILES.in index a00d0633..fbebdfee 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -18,9 +18,6 @@ libmisc/isexpired.c libmisc/limits.c libmisc/list.c libmisc/log.c -libmisc/login_access.c -libmisc/login_desrpc.c -libmisc/login_krb.c libmisc/loginprompt.c libmisc/mail.c libmisc/motd.c @@ -49,25 +46,20 @@ lib/encrypt.c lib/fputsx.c lib/getdef.c lib/getpass.c -lib/grdbm.c lib/groupio.c lib/grpack.c -lib/gsdbm.c lib/gshadow.c lib/gspack.c lib/lockpw.c lib/port.c lib/pwauth.c -lib/pwdbm.c lib/pwio.c lib/pwpack.c -lib/rad64.c lib/sgetgrent.c lib/sgetpwent.c lib/sgroupio.c lib/shadow.c lib/shadowio.c -lib/spdbm.c lib/sppack.c lib/utent.c src/chage.c @@ -87,6 +79,7 @@ src/grpunconv.c src/id.c src/lastlog.c src/login.c +src/login_nopam.c src/logoutd.c src/mkpasswd.c src/newgrp.c diff --git a/po/bs.gmo b/po/bs.gmo index 784cae68..67c3a55b 100644 Binary files a/po/bs.gmo and b/po/bs.gmo differ diff --git a/po/bs.po b/po/bs.po index 5bad04b7..9905220a 100644 --- a/po/bs.po +++ b/po/bs.po @@ -6,20 +6,22 @@ msgid "" msgstr "" "Project-Id-Version: shadow\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-26 07:53+0100\n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" "PO-Revision-Date: 2004-05-09 12:03+0100\n" "Last-Translator: Safir eerovi \n" "Language-Team: Bosnian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" msgstr "" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" msgstr "" @@ -47,17 +49,17 @@ msgstr "" msgid " Choose a new password.\n" msgstr " Izaberite novu 禳ifru.\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "Va禳a 禳ifra istie za in %ld dana.\n" -#: libmisc/age.c:174 +#: libmisc/age.c:172 #, c-format msgid "Your password will expire tomorrow.\n" msgstr "Va禳a 禳ifra istie sutra.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:174 #, c-format msgid "Your password will expire today.\n" msgstr "Va禳a 禳ifra istie danas.\n" @@ -72,39 +74,27 @@ msgstr "" msgid "Environment overflow\n" msgstr "" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr "" -#: libmisc/failure.c:230 +#: libmisc/failure.c:229 #, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "" +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "" +msgstr[1] "" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" msgstr "Previ禳e prijavljivanja.\n" -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "" - #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "Imate novu po禳tu." @@ -117,7 +107,7 @@ msgstr "Nema po禳te." msgid "You have mail." msgstr "Imate po禳tu." -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " msgstr "Neispravna 禳ifra: %s. " @@ -132,20 +122,20 @@ msgstr "" msgid "passwd: %s\n" msgstr "" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" msgstr "" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" msgstr "" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr "" @@ -160,189 +150,178 @@ msgstr "" msgid "Can't change root directory to \"%s\"\n" msgstr "" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" msgstr "" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "" -#: lib/pwauth.c:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "ifra:" -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "%s's ifra: " -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "" - -#: src/chage.c:118 +#: src/chage.c:112 #, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" " [-I inactive] [-E expire] [-d last_day] user\n" msgstr "" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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:155 +#: src/chage.c:149 msgid "Minimum Password Age" msgstr "Minimalna trajnost 禳ifre" -#: src/chage.c:161 +#: src/chage.c:155 msgid "Maximum Password Age" msgstr "Maskimalna trajnost 禳ifre" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" msgstr "" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" msgstr "Upozorenje o isteku 禳ifre" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "ifra neaktivna" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Datum isteka rauna (GGGG-MM-DD)" -#: src/chage.c:238 +#: src/chage.c:231 #, c-format msgid "Last password change\t\t\t\t\t: " msgstr "" -#: src/chage.c:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 #, fuzzy, c-format msgid "never\n" msgstr "Nikad\n" -#: src/chage.c:251 +#: src/chage.c:244 #, fuzzy, c-format msgid "Password expires\t\t\t\t\t: " msgstr "ifra:" -#: src/chage.c:267 +#: src/chage.c:260 #, fuzzy, c-format msgid "Password inactive\t\t\t\t\t: " msgstr "ifra neaktivna" -#: src/chage.c:281 +#: src/chage.c:274 #, c-format msgid "Account expires\t\t\t\t\t\t: " msgstr "" -#: src/chage.c:297 +#: src/chage.c:290 #, c-format msgid "Minimum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:298 +#: src/chage.c:292 #, c-format msgid "Maximum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:299 +#: src/chage.c:294 #, c-format msgid "Number of days of warning before password expires\t: %ld\n" msgstr "" -#: src/chage.c:444 +#: src/chage.c:431 #, c-format msgid "%s: do not include \"l\" with other flags\n" msgstr "" -#: src/chage.c:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 #, c-format msgid "%s: permission denied.\n" msgstr "" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 #, c-format msgid "%s: PAM authentication failed\n" msgstr "" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, c-format msgid "%s: can't open password file\n" msgstr "" -#: src/chage.c:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "" -#: src/chage.c:535 +#: src/chage.c:519 #, c-format msgid "%s: can't lock shadow password file" msgstr "" -#: src/chage.c:543 +#: src/chage.c:527 #, c-format msgid "%s: can't open shadow password file" msgstr "" -#: src/chage.c:604 +#: src/chage.c:587 #, c-format msgid "Changing the aging information for %s\n" msgstr "" -#: src/chage.c:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" msgstr "" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, c-format msgid "%s: can't update password file\n" msgstr "" -#: src/chage.c:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" msgstr "" -#: src/chage.c:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "" - -#: src/chage.c:692 +#: src/chage.c:649 #, c-format msgid "%s: can't rewrite shadow password file\n" msgstr "" -#: src/chage.c:740 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite password file\n" msgstr "" -#: src/chage.c:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 #, c-format msgid "%s: PAM chauthtok failed\n" msgstr "" @@ -359,117 +338,122 @@ msgstr "" msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" msgstr "" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "Puno ime i prezime" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "Broj sobe" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "Poslovni telefon" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" msgstr "Kuni telefon" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "Ostalo" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, c-format +msgid "%s: Permission denied.\n" +msgstr "" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" msgstr "" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" msgstr "" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" msgstr "" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" msgstr "" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" msgstr "" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" msgstr "" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" msgstr "" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -486,48 +470,48 @@ msgstr "" msgid "%s: can't lock password file\n" msgstr "" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" msgstr "" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" msgstr "" @@ -537,26 +521,26 @@ msgstr "" msgid "Usage: %s [-s shell] [name]\n" msgstr "" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" msgstr "" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" msgstr "" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" msgstr "" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" msgstr "" @@ -566,12 +550,12 @@ msgstr "" msgid "Usage: expiry {-f|-c}\n" msgstr "" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" msgstr "" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "" @@ -585,320 +569,285 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" msgstr "" -#: src/faillog.c:86 +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" +msgid "Login Failures Maximum Latest On\n" msgstr "" -#: src/faillog.c:103 -#, c-format -msgid " %s on %s" -msgstr "" - -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" msgstr "" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr "" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "Nepoznat korisnik: %s\n" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr "" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr "" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr "" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr "" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" msgstr "" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr "nepoznata grupa: %s\n" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "Dodajem korisnika %s grupi %s\n" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "Uklanjam korisnika %s iz grupe %s\n" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" msgstr "%s: nepoznat lan %s\n" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "Mijenjam 禳ifru za grupu %s\n" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "Nova 禳ifra:" -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " msgstr "Ponovo unesite novu 禳ifru:" -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" msgstr "One se ne sla鱉u; poku禳ajte ponovo" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" msgstr "%s: Poku禳ajte ponovo kasnije\n" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" msgstr "" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" msgstr "" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" msgstr "" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, c-format msgid "%s: error adding new group entry\n" msgstr "" -#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" msgstr "" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, c-format msgid "%s: %s is not a valid group name\n" msgstr "" -#: src/groupadd.c:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" msgstr "" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" msgstr "" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" msgstr "" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" msgstr "" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "%s: grupa %s postoji\n" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, c-format msgid "Usage: groupdel group\n" msgstr "" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" msgstr "" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "" @@ -908,110 +857,105 @@ msgstr "" msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" msgstr "" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" msgstr "" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "" -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" msgstr "" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" msgstr "" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " msgstr "" -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" msgstr "" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" msgstr "" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" msgstr "" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" msgstr "" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " msgstr "" -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" msgstr "" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "" -#: src/grpck.c:647 src/pwck.c:612 -#, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format -msgid "%s: no changes\n" -msgstr "" - -#: src/grpck.c:651 src/pwck.c:616 +#: src/grpck.c:640 src/pwck.c:606 #, c-format msgid "%s: the files have been updated\n" msgstr "" +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "" + #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" @@ -1027,37 +971,37 @@ msgstr "" msgid "%s: can't lock shadow group file\n" msgstr "" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" msgstr "" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" msgstr "" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" msgstr "" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "" @@ -1077,121 +1021,112 @@ msgstr "" msgid " groups=" msgstr "" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" msgstr "" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "" -#: src/login.c:175 +#: src/login.c:156 #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr "" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr "" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" msgstr "" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" "System closed for routine maintenance\n" msgstr "" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" "[Disconnect bypassed -- root login allowed.]\n" msgstr "" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" "Login timed out after %d seconds.\n" msgstr "" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" msgstr "" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" msgstr "" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" "%s login: " msgstr "" -#: src/login.c:819 -msgid "login: " -msgstr "" - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" msgstr "" -#: src/login.c:1198 +#: src/login.c:996 msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "" -#: src/login.c:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" msgstr "" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" msgstr "" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" @@ -1232,17 +1167,17 @@ msgstr "" msgid "added %d entries, longest was %d\n" msgstr "" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "" @@ -1262,16 +1197,16 @@ msgstr "" msgid "unknown uid: %u\n" msgstr "" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" msgstr "" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "" @@ -1281,107 +1216,107 @@ msgstr "" msgid "Usage: %s [input]\n" msgstr "" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "" -#: src/passwd.c:155 +#: src/passwd.c:154 #, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr "" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr "" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "Stara 禳ifra:" -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" msgstr "" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" "Please use a combination of upper and lower case letters and numbers.\n" msgstr "" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "Nova 禳ifra:" -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" msgstr "Poku禳ajte ponovo.\n" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" @@ -1390,52 +1325,52 @@ msgstr "" "\n" "Upozorenje: slaba 禳ifra (unesite je ponovo ako je ipak 鱉elite koristiti).\n" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" msgstr "One se ne sla鱉u; poku禳ajte ponovo\n" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" msgstr "" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" msgstr "" -#: src/passwd.c:914 +#: src/passwd.c:884 #, fuzzy, c-format -msgid "You may not change the password for %s.\n" +msgid "%s: You may not view or modify password information for %s.\n" msgstr "Mijenjam 禳ifru za grupu %s\n" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "" @@ -1450,49 +1385,49 @@ msgstr "" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" msgstr "" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" msgstr "" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" msgstr "" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" msgstr "" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" msgstr "" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" msgstr "" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" msgstr "" @@ -1512,17 +1447,17 @@ msgstr "" msgid "%s: can't remove shadow entry for %s\n" msgstr "" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" msgstr "" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" msgstr "" @@ -1532,62 +1467,62 @@ msgstr "" msgid "%s: can't update entry for user %s\n" msgstr "" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format msgid "%s: can't delete shadow password file\n" msgstr "" -#: src/su.c:133 +#: src/su.c:132 msgid "Sorry." msgstr "鬚alim." -#: src/su.c:323 +#: src/su.c:320 #, c-format msgid "%s: must be run from a terminal\n" msgstr "" -#: src/su.c:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" msgstr "" -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, c-format msgid "You are not authorized to su %s\n" msgstr "" -#: src/su.c:502 +#: src/su.c:495 msgid "(Enter your own password.)" msgstr "" -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" "(Ignored)\n" msgstr "" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" msgstr "" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr "" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" msgstr "" @@ -1602,464 +1537,409 @@ msgstr "" msgid "No password entry for 'root'\n" msgstr "" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" "(or give root password for system maintenance):" msgstr "" -#: src/sulogin.c:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" msgstr "" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "" -#: src/useradd.c:475 +#: src/useradd.c:418 #, c-format msgid "%s: cannot create new defaults file\n" msgstr "" -#: src/useradd.c:480 +#: src/useradd.c:423 #, c-format msgid "%s: cannot open new defaults file\n" msgstr "" -#: src/useradd.c:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" msgstr "" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "" -#: src/useradd.c:721 +#: src/useradd.c:660 #, c-format msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n" msgstr "" -#: src/useradd.c:724 +#: src/useradd.c:663 #, c-format msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr "" -#: src/useradd.c:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, c-format msgid " [-f inactive] [-e expire]\n" msgstr "" -#: src/useradd.c:728 +#: src/useradd.c:667 #, c-format msgid " [-p passwd] name\n" msgstr "" -#: src/useradd.c:730 +#: src/useradd.c:669 #, c-format msgid " useradd -D [-g group] [-b base] [-s shell]\n" msgstr "" -#: src/useradd.c:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, c-format msgid "%s: error locking group file\n" msgstr "" -#: src/useradd.c:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, c-format msgid "%s: error opening group file\n" msgstr "" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, c-format msgid "%s: error locking shadow group file\n" msgstr "" -#: src/useradd.c:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, c-format msgid "%s: error opening shadow group file\n" msgstr "" -#: src/useradd.c:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, c-format msgid "%s: shadow passwords required for -f\n" msgstr "" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" msgstr "" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "" -#: src/useradd.c:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, c-format msgid "%s: unable to lock password file\n" msgstr "" -#: src/useradd.c:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, c-format msgid "%s: unable to open password file\n" msgstr "" -#: src/useradd.c:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, c-format msgid "%s: cannot lock shadow password file\n" msgstr "" -#: src/useradd.c:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, c-format msgid "%s: cannot open shadow password file\n" msgstr "" -#: src/useradd.c:1459 +#: src/useradd.c:1354 #, c-format msgid "%s: error adding new password entry\n" msgstr "" -#: src/useradd.c:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, c-format msgid "%s: error adding new shadow password entry\n" msgstr "" -#: src/useradd.c:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" msgstr "" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, c-format msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n" msgstr "" -#: src/useradd.c:1590 +#: src/useradd.c:1446 #, c-format msgid "Can't create mail spool for user %s.\n" msgstr "" -#: src/useradd.c:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" msgstr "" -#: src/useradd.c:1767 +#: src/useradd.c:1602 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" msgstr "" -#: src/userdel.c:124 +#: src/userdel.c:108 #, c-format msgid "Usage: %s [-r] name\n" msgstr "" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" msgstr "" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "" - -#: src/userdel.c:214 -#, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " msgstr "" -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" msgstr "" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "" -#: src/usermod.c:306 +#: src/usermod.c:289 #, c-format msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "" -#: src/usermod.c:310 +#: src/usermod.c:293 #, c-format msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n" msgstr "" -#: src/usermod.c:313 +#: src/usermod.c:296 #, c-format msgid "[-f inactive] [-e expire] " msgstr "" -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" msgstr "" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "" -#: src/usermod.c:965 +#: src/usermod.c:903 #, c-format msgid "%s: shadow passwords required for -e and -f\n" msgstr "" -#: src/usermod.c:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, c-format msgid "%s: error changing password entry\n" msgstr "" -#: src/usermod.c:1122 +#: src/usermod.c:1053 #, c-format msgid "%s: error removing password entry\n" msgstr "" -#: src/usermod.c:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "" -#: src/usermod.c:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" msgstr "" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, c-format msgid "%s: cannot rename directory %s to %s\n" msgstr "" -#: src/usermod.c:1333 +#: src/usermod.c:1223 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "" -#: src/usermod.c:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" msgstr "" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" msgstr "" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" "%s: %s is unchanged\n" msgstr "" -#: src/vipw.c:133 +#: src/vipw.c:131 msgid "Couldn't lock file" msgstr "" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" msgstr "" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/po/ca.gmo b/po/ca.gmo index 16eefdf4..465b1ad5 100644 Binary files a/po/ca.gmo and b/po/ca.gmo differ diff --git a/po/ca.po b/po/ca.po index 0cdb1f22..7217b5ec 100644 --- a/po/ca.po +++ b/po/ca.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: shadow 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-26 07:53+0100\n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" "PO-Revision-Date: 2004-06-16 20:58:19+0200\n" "Last-Translator: Guillem Jover \n" "Language-Team: Catalan \n" @@ -19,7 +19,7 @@ msgstr "" msgid "Warning: unknown group %s\n" msgstr "Av穩s: el grup %s 矇s desconegut\n" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" msgstr "Av穩s: hi ha massa grups\n" @@ -47,17 +47,17 @@ msgstr " Contacteu amb l'administrador del sistema.\n" msgid " Choose a new password.\n" msgstr " Escolliu una nova contrasenya.\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "La vostra contrasenya caduca en %ld dies.\n" -#: libmisc/age.c:174 +#: libmisc/age.c:172 #, c-format msgid "Your password will expire tomorrow.\n" msgstr "La vostra contrasenya caduca dem.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:174 #, c-format msgid "Your password will expire today.\n" msgstr "La vostra contrasenya caduca avui.\n" @@ -72,42 +72,29 @@ msgstr "No es pot canviar la tty %s" msgid "Environment overflow\n" msgstr "Desbordament d'entorn\n" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr "No podeu canviar $%s\n" -#: libmisc/failure.c:230 +#: libmisc/failure.c:229 #, fuzzy, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "" +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "" +"S'ha produ簿t %d error des de l'繳ltim acc矇s. L'ultim va ser %s en %s.\n" +msgstr[1] "" "S'ha produ簿t %d error des de l'繳ltim acc矇s. L'ultim va ser %s en %s.\n" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" msgstr "Massa accessos.\n" -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "La contrasenya no desxifra la clau secreta per a %s.\n" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "" -"No s'ha pogut establir la clau secreta de %s: est funcionant el dimoni " -"竄keyserv罈?\n" - #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "Teniu correu nou." @@ -120,7 +107,7 @@ msgstr "No hi ha correu." msgid "You have mail." msgstr "Teniu correu." -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " msgstr "La contrasenya 矇s incorrecta: %s." @@ -135,20 +122,20 @@ msgstr "passwd: pam_start() ha fallat, error %d\n" msgid "passwd: %s\n" msgstr "passwd: %s\n" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" msgstr "" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "No es pot canviar el directori actual a 竄%s罈\n" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" msgstr "No hi ha directori, entrant amb HOME=/" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr "No es pot executar %s" @@ -163,37 +150,33 @@ msgstr "El directori arrel 竄%s罈 no 矇s vlid\n" msgid "Can't change root directory to \"%s\"\n" msgstr "No s'ha pogut canviar el directori arrel a 竄%s罈\n" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "malloc(%d) ha fallat\n" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" msgstr "No s'ha pogut reservar espai per a la informaci籀 de configuraci籀.\n" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "" "error de configuraci籀 - element 竄%s罈 desconegut (notifiqueu-ho a " "l'administrador)\n" -#: lib/pwauth.c:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "Contrasenya: " -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "Contrasenya de l'usuari %s: " -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "(Eco activat) " - -#: src/chage.c:118 +#: src/chage.c:112 #, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" @@ -202,154 +185,147 @@ msgstr "" "Forma d'繳s: chage [-l] [-m m穩n_dies] [-M mx_dies] [-W av穩s]\n" " [-I inactiu] [-E caduca] [-d 繳ltim_dia] usuari\n" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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:155 +#: src/chage.c:149 msgid "Minimum Password Age" msgstr "Duraci籀 m穩nima de la contrasenya" -#: src/chage.c:161 +#: src/chage.c:155 msgid "Maximum Password Age" msgstr "Duraci籀 mxima de la contrasenya" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" msgstr "ltim canvi de contrasenya (AAAA-MM-DD)" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" msgstr "Av穩s de caducitat de la contrasenya" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "Contrasenya inactiva" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Data de caducitat per al compte (AAAA-MM-YY)" -#: src/chage.c:238 +#: src/chage.c:231 #, fuzzy, c-format msgid "Last password change\t\t\t\t\t: " msgstr "ltim canvi de contrasenya (AAAA-MM-DD)" -#: src/chage.c:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 #, fuzzy, c-format msgid "never\n" msgstr "Mai\n" -#: src/chage.c:251 +#: src/chage.c:244 #, fuzzy, c-format msgid "Password expires\t\t\t\t\t: " msgstr "La contrasenya caduca:\t" -#: src/chage.c:267 +#: src/chage.c:260 #, fuzzy, c-format msgid "Password inactive\t\t\t\t\t: " msgstr "Contrasenya inactiva:\t" -#: src/chage.c:281 +#: src/chage.c:274 #, fuzzy, c-format msgid "Account expires\t\t\t\t\t\t: " msgstr "El compte caduca:\t" -#: src/chage.c:297 +#: src/chage.c:290 #, c-format msgid "Minimum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:298 +#: src/chage.c:292 #, c-format msgid "Maximum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:299 +#: src/chage.c:294 #, c-format msgid "Number of days of warning before password expires\t: %ld\n" msgstr "" -#: src/chage.c:444 +#: src/chage.c:431 #, c-format msgid "%s: do not include \"l\" with other flags\n" msgstr "%s: no inclogueu 竄l罈 amb altres senyaladors\n" -#: src/chage.c:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 #, fuzzy, c-format msgid "%s: permission denied.\n" msgstr "%s: perm穩s denegat\n" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 #, c-format msgid "%s: PAM authentication failed\n" msgstr "%s: l'autenticaci籀 PAM ha fallat\n" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, c-format msgid "%s: can't open password file\n" msgstr "%s: no es pot obrir el fitxer de contrasenyes\n" -#: src/chage.c:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "%s: l'usuari %s desconegut\n" -#: src/chage.c:535 +#: src/chage.c:519 #, c-format msgid "%s: can't lock shadow password file" msgstr "%s: no es pot bloquejar el fitxer de contrasenyes ombra" -#: src/chage.c:543 +#: src/chage.c:527 #, c-format msgid "%s: can't open shadow password file" msgstr "%s: no es pot obrir el fitxer de contrasenyes ombra" -#: src/chage.c:604 +#: src/chage.c:587 #, 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:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" msgstr "%s: s'ha produ簿t un error en canviar els camps\n" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, c-format msgid "%s: can't update password file\n" msgstr "%s: no es pot actualitzar el fitxer de contrasenyes\n" -#: src/chage.c:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, 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:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "Error actualitzant l'entrada de contrasenya DBM.\n" - -#: src/chage.c:692 +#: src/chage.c:649 #, 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:740 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite password file\n" msgstr "%s: no es pot reescriure el fitxer de contrasenyes\n" -#: src/chage.c:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 #, c-format msgid "%s: PAM chauthtok failed\n" msgstr "%s: PAM chauthok ha fallat\n" @@ -370,118 +346,123 @@ msgstr "" "Forma d'繳s: %s [-f nom_complet] [-r num_habitaci籀] [-w tel_feina]\n" "[-h tel_casa]\n" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "Nom complet" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "\tNom complet: %s\n" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "N繳mero d'habitaci籀" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "Tel癡fon de la feina" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" msgstr "Tel癡fon de casa" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "Altre" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s: No s'ha pogut determinar el seu nom d'usuari.\n" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s: no s'ha pogut canviar l'usuari 竄%s罈 al client NIS.\n" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "%s: 竄%s罈 矇s el mestre NIS per a aquest client.\n" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, fuzzy, c-format +msgid "%s: Permission denied.\n" +msgstr "%s: perm穩s denegat\n" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" msgstr "S'est canviant la informaci籀 d'usuari per a %s\n" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s: el nom no 矇s vlid: 竄%s罈\n" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s: el n繳mero d'habitaci籀 no 矇s vlid: 竄%s罈\n" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s: el tel癡fon de casa no 矇s vlid: 竄%s罈\n" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s: el tel癡fon de la feina no 矇s vlid: 竄%s罈\n" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s: 竄%s罈 cont矇 carcters il繚legals\n" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "%s: els camps s籀n massa llargs\n" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" msgstr "No s'ha pogut canviar l'ID al de root.\n" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" msgstr "" "No s'ha pogut bloquejar el fitxer de contrasenyes; intenteu-ho m矇s tard\n" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" msgstr "No s'ha pogut obrir el fitxer de contrasenyes.\n" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s: no s'ha trobat %s a 竄/etc/passwd罈\n" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" msgstr "Error en actualitzar l'entrada de la contrasenya.\n" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" msgstr "No es poden confirmar els canvis del fitxer de contrasenyes.\n" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" msgstr "No s'ha pogut desbloquejar el fitxer de contrasenyes.\n" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -498,49 +479,49 @@ msgstr "" msgid "%s: can't lock password file\n" msgstr "%s: no es pot bloquejar el fitxer de contrasenyes\n" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "%s: no s'ha pogut bloquejar el fitxer de contrasenyes ombra\n" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "%s: no s'ha pogut obrir el fitxer de contrasenyes ombra\n" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "%s: l穩nia %d: la l穩nia 矇s massa llarga\n" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "%s: l穩nia %d: manca la nova contrasenya\n" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "%s: l穩nia %d: l'usuari %s 矇s desconegut\n" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "%s: l穩nia %d: no s'ha pogut actualitzar l'entrada de la contrasenya\n" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "%s: s'ha detectat un error, els canvis s'han ignorat\n" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" msgstr "" "%s: s'ha produ簿t un error en actualitzar el fitxer de contrasenyes ombra\n" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" msgstr "%s: s'ha produ簿t un error en actualitzar el fitxer de contrasenyes\n" @@ -550,26 +531,26 @@ msgstr "%s: s'ha produ簿t un error en actualitzar el fitxer de contrasenyes\n" msgid "Usage: %s [-s shell] [name]\n" msgstr "Forma d'繳s: %s [-s int癡rpret] [nom]\n" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" msgstr "Int癡rpret d'acc矇s" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" msgstr "No podeu canviar l'int癡rpret per a %s.\n" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" msgstr "S'est canviant l'int癡rpret d'acc矇s per a %s\n" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s: L'entrada no 矇s vlida: %s\n" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" msgstr "%s no 矇s un int癡rpret vlid.\n" @@ -579,12 +560,12 @@ msgstr "%s no 矇s un int癡rpret vlid.\n" msgid "Usage: expiry {-f|-c}\n" msgstr "Forma d'繳s: expiry {-f|-c}\n" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" msgstr "%s: AVS! Ha de ser set-UID de root!\n" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "%s: l'usuari 矇s desconegut\n" @@ -598,320 +579,285 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" msgstr "" -#: src/faillog.c:86 +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" -msgstr "Usuari Fallides Mxim ltim\n" +msgid "Login Failures Maximum Latest On\n" +msgstr "" -#: src/faillog.c:103 -#, c-format -msgid " %s on %s" -msgstr " %s en %s" - -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" msgstr " [falten %lds]" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr " [bloquejats %lds]" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "L'usuari 矇s desconegut: %s\n" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "Forma d'繳s: %s [-r|-R] grup\n" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr " %s [-a usuari] grup\n" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr " %s [-d usuari] grup\n" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr " %s [-A usuari,...] [-M usuari,...] grup\n" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr " %s [-M usuari,...] grup\n" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" msgstr "%s: contrasenyes ombra de grups requerides per a 竄-A罈\n" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "Qui sou?\n" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr "El grup 矇s desconegut: %s\n" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "S'est afegint l'usuari %s al grup %s\n" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "S'est eliminant l'usuari %s del grup %s\n" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" msgstr "%s: El membre %s 矇s desconegut\n" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "%s: No 矇s una tty\n" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "S'est canviant la contrasenya per al grup %s\n" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "Nova contrasenya: " -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " msgstr "Reintrodu簿u la nova contrasenya: " -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" msgstr "No coincideixen; intenteu-ho de nou." -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" msgstr "%s: Intenteu-ho de nou m矇s tard.\n" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "%s: no es pot obtenir el bloqueig\n" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" msgstr "%s: no es pot obtenir el bloqueig del fitxer de contrasenyes ombra\n" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "%s: no es pot obrir el fitxer\n" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "%s: no es pot actualitzar l'entrada\n" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" msgstr "%s: no es pot actualitzar l'entrada del fixter de contrasenyes ombra\n" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "%s: no es pot reescriure el fitxer\n" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" msgstr "%s: no es pot reescriure el fitxer ombra\n" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "%s: no es pot desbloquejar el fitxer\n" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "%s: no es poden actualitzar els fitxers DBM\n" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "%s: no es poden actualitzar els fitxers ombra DBM\n" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "Forma d'繳s: groupadd [-g gid [-o]] [-f] grup\n" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, 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:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: no es pot afegir una entrada nova de grup DBM\n" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "%s: el nom %s no 矇s 繳nic\n" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" msgstr "%s: el GID %u no 矇s 繳nic\n" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "%s: no es pot obtenir un GID 繳nic\n" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, c-format msgid "%s: %s is not a valid group name\n" msgstr "%s: %s no 矇s un nom de grup valid\n" -#: src/groupadd.c:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "%s: el grup %s no 矇s vlid\n" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "%s: 竄-O罈 requereix NOM=VALOR\n" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s: no es pot reescriure el fitxer de grup\n" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s: no es pot reescriure el fitxer de grups ombra\n" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" msgstr "%s: no es pot bloquejar el fitxer de grup\n" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" msgstr "%s: no es pot obrir el fitxer de grup\n" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" msgstr "%s: no es pot bloquejar el fitxer de grup ombra\n" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" msgstr "%s: no es pot obrir el fitxer de grup ombra\n" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "%s: el grup %s existeix\n" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, c-format msgid "Usage: groupdel group\n" msgstr "Forma d'繳s: groupdel grup\n" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" msgstr "%s: s'ha produ簿t un error en eliminar l'entrada de grup\n" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "%s: s'ha produ簿t un error en eliminar l'entrada de grup DBM\n" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "%s: s'ha produ簿t un error en eliminar l'entrada de grup ombra\n" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "%s: s'ha produ簿t un error en eliminar l'entrada de grup ombra DBM\n" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "%s: no es pot eliminar el grup primari de l'usuari.\n" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "%s: el grup %s no existeix\n" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "%s: el grup %s no 矇s un grup NIS\n" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s: %s 矇s el mestre NIS\n" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "Forma d'繳s: groupmod [-g gid [-o]] [-n nom] grup\n" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "%s: no s'ha trobat %s a 竄/etc/group罈\n" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s: no es pot afegir una nova entrada de grup ombra DBM\n" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s: %u no 矇s un GID 繳nic\n" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "%s: %s no 矇s un nom 繳nic\n" @@ -921,110 +867,105 @@ msgstr "%s: %s no 矇s un nom 繳nic\n" msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "Forma d'繳s: %s [-r] [-s] [grup [gombra]]\n" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "Forma d'繳s: %s [-r] [-s] [grup]\n" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "No" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" msgstr "%s: 竄-s罈 i 竄-r罈 s籀n incompatibles\n" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "%s: no es pot bloquejar el fitxer %s\n" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "%s: no es pot obrir el fitxer %s\n" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" msgstr "l'entrada del fitxer de grup no 矇s vlida\n" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "voleu eliminar la l穩nia 竄%s罈? " -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" msgstr "l'entrada de grup est duplicada\n" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" msgstr "el nom de grup 竄%s罈 no 矇s vlid\n" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "grup %s: no existeix l'usuari %s\n" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " msgstr "voleu eliminar el membre 竄%s罈? " -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" msgstr "l'entrada del fitxer de grup ombra no 矇s vlida\n" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" msgstr "l'entrada de grup ombra est duplicada\n" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" msgstr "no hi ha entrades coincidents al fitxer de grup\n" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" msgstr "grup ombra %s: no existeix l'usuari administratiu %s\n" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " msgstr "voleu eliminar el membre administratiu 竄%s罈? " -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" msgstr "grup ombra %s: no existeix l'usuari %s\n" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "%s: no es pot actualitzar el fitxer %s\n" -#: src/grpck.c:647 src/pwck.c:612 -#, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: el fitxer s'ha actualitzat; executeu 竄mkpasswd罈\n" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format -msgid "%s: no changes\n" -msgstr "%s: no hi ha canvis\n" - -#: src/grpck.c:651 src/pwck.c:616 +#: src/grpck.c:640 src/pwck.c:606 #, c-format msgid "%s: the files have been updated\n" msgstr "%s: el fitxer s'ha actualitzat\n" +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "%s: no hi ha canvis\n" + #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" @@ -1040,37 +981,37 @@ msgstr "%s: no es pot obrir el fitxer de grups\n" msgid "%s: can't lock shadow group file\n" msgstr "%s: no es pot bloquejar el fitxer de grups ombra\n" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" msgstr "%s: no es pot obrir el fitxer de grups ombra\n" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "%s: no es pot eliminar el grup ombra %s\n" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "%s: no es pot actualitzar l'entrada ombra per a %s\n" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "%s: no es pot actualitzar l'entrada per al grup %s\n" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" msgstr "%s: no es pot actualitzar el fitxer de grups ombra\n" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" msgstr "%s: no es pot actualitzar el fitxer de grups\n" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "%s: no es pot eliminar el fitxer de grups ombra\n" @@ -1090,52 +1031,52 @@ msgstr "Forma d'繳s: id\n" msgid " groups=" msgstr " grup=" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" msgstr "Usuari Port Des de ltim\n" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "Usuari Port ltim\n" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "**No ha entrat mai**" -#: src/login.c:175 +#: src/login.c:156 #, fuzzy, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Forma d'繳s: %s [-p] [nom]\n" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr " %s [-p] [-h ordinador] [-f nom]\n" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr " %s [-p] -r ordinador\n" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" msgstr "El temps d'acc矇s no 矇s vlid\n" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" @@ -1144,7 +1085,7 @@ msgstr "" "\n" "Sistema tancat per a manteniment rutinari\n" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" @@ -1153,7 +1094,7 @@ msgstr "" "\n" "[S'ha evitat la desconnexi籀 -- l'acc矇s de root est perm矇s.]\n" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" @@ -1162,17 +1103,17 @@ msgstr "" "\n" "L'acc矇s ha caducat despr矇s de %d segons.\n" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" msgstr " a 竄%.100s罈 des de 竄%.200s罈" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" msgstr " a 竄%.100s罈" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" @@ -1181,38 +1122,29 @@ msgstr "" "\n" "%s login: " -#: src/login.c:819 -msgid "login: " -msgstr "login: " - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" msgstr "Login incorrecte" -#: src/login.c:1198 +#: src/login.c:996 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:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "ltima entrada: %s a %s" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" msgstr "ltima entrada: %.19s a %s" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" msgstr " des de %.*s" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "S'est iniciant 竄rad_login罈\n" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" @@ -1254,17 +1186,17 @@ msgstr "%s: s'ha produ簿t un error en afegir el registre per a " msgid "added %d entries, longest was %d\n" msgstr "s'han afegit %d entrades, la m矇s llarga era de %d\n" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "Forma d'繳s: %s [-vf] [-p|g|sp|sg] fitxer\n" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "Forma d'繳s: %s [-vf] [-p|g|sp] fitxer\n" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "Forma d'繳s: %s [-vf] [-p|g] fitxer\n" @@ -1284,16 +1216,16 @@ msgstr "Forma d'繳s: sg grup [[-c] ordre]\n" msgid "unknown uid: %u\n" msgstr "L'UID 矇s desconegut: %u\n" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" msgstr "El gid 矇s desconegut: %lu\n" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "Disculpeu.\n" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "hi ha massa grups\n" @@ -1303,91 +1235,91 @@ msgstr "hi ha massa grups\n" msgid "Usage: %s [input]\n" msgstr "Forma d'繳s: %s [entrada]\n" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "%s: no es pot bloquejar 竄/etc/passwd罈.\n" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "%s: no es poden bloquejar els fitxers, intenteu-ho m矇s tard\n" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "%s: no es poden obrir els fitxers\n" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "%s: l穩nia %d: la l穩nia no 矇s vlida\n" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "%s: l穩nia %d: no es pot crear el GID\n" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "%s: l穩nia %d: no es pot crear el UID\n" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "%s: l穩nia %d: no es pot trobar l'usuari %s\n" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "%s: l穩nia %d: no es pot actualitzar la contrasenya\n" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "%s: l穩nia %d: no s'ha pogut crear el directori\n" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "%s: l穩nia %d: no s'ha pogut canviar el propietari\n" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "%s: l穩nia %d: no es pot actualitzar l'entrada\n" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "%s: s'ha produ簿t un error en actualitzar el fitxer\n" -#: src/passwd.c:155 +#: src/passwd.c:154 #, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "Forma d'繳s: %s [-f|-s] [nom]\n" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr " %s [-x mx] [-n m穩n] [-w av穩s] [-i inactiu] nom\n" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} nom\n" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "Contrasenya antiga: " -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" msgstr "La contrasenya 矇s incorrecte per a 竄%s罈\n" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" @@ -1397,16 +1329,16 @@ msgstr "" "Si us plau feu servir una combinaci籀 de lletres maj繳scules i min繳scules i\n" "n繳meros.\n" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "Contrasenya nova:" -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" msgstr "Intenteu-ho de nou.\n" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" @@ -1415,52 +1347,52 @@ msgstr "" "\n" "Av穩s: contrasenya feble (introdu簿u-la de nou per fer-la servir igualment).\n" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" msgstr "No coincideixen; intenteu-ho de nou.\n" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "No es pot canviar la contrasenya per a %s.\n" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" msgstr "Disculpeu, la contrasenya per a %s encara no es pot canviar.\n" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "%s: sense mem簷ria\n" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "%s: No es pot executar %s" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" msgstr "%s: el repositori %s no est suportat\n" -#: src/passwd.c:914 +#: src/passwd.c:884 #, fuzzy, c-format -msgid "You may not change the password for %s.\n" +msgid "%s: You may not view or modify password information for %s.\n" msgstr "No podeu canviar l'int癡rpret per a %s.\n" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "S'est canviant la contrasenya per a %s\n" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "No s'ha canviat la contrasenya per a %s.\n" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "S'ha canviat la contrasenya.\n" @@ -1475,49 +1407,49 @@ msgstr "Forma d'繳s: %s [-q] [-r] [-s] [contrasenya [ombra]]\n" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "Forma d'繳s: %s [-q] [-r] [-s] [contrasenya]\n" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" msgstr "l'entrada del fitxer de contrasenyes no 矇s vlida\n" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" msgstr "l'entrada de contrasenya est duplicada\n" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" msgstr "el nom d'usuari 竄%s罈 no 矇s vlid\n" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "usuari %s: no existeix el grup %u\n" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "usuari %s: el directori %s no existeix\n" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "usuari %s: el programa %s no existeix\n" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" msgstr "l'entrada del fitxer de contrasenyes ombra no 矇s vlida\n" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" msgstr "entrada de contrasenya ombra duplicada\n" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" msgstr "cap entrada del fitxer de contrasenyes coincideix\n" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" msgstr "usuari %s: l'繳ltim canvi de contrasenya s'ha produ簿t en el futur\n" @@ -1537,17 +1469,17 @@ msgstr "%s: no es pot obrir el fitxer de contrasenyes\n" msgid "%s: can't remove shadow entry for %s\n" msgstr "%s: no es pot eliminar l'entrada ombra per a %s\n" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "%s: no es pot actualitzar l'entrada de la contrasenya per a %s\n" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" msgstr "%s: no es pot actualitzar el fitxer de contrasenyes ombra\n" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" msgstr "%s: no es pot actualitzar el fitxer de contrasenyes\n" @@ -1557,40 +1489,40 @@ msgstr "%s: no es pot actualitzar el fitxer de contrasenyes\n" msgid "%s: can't update entry for user %s\n" msgstr "%s: no es pot actualitzar l'entrada per a l'usuari %s\n" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format msgid "%s: can't delete shadow password file\n" msgstr "%s: no es pot eliminar el fitxer de contrasenyes ombra\n" -#: src/su.c:133 +#: src/su.c:132 msgid "Sorry." msgstr "Disculpeu." -#: src/su.c:323 +#: src/su.c:320 #, 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:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "%s: pam_start: s'ha produ簿t un error %d\n" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" msgstr "L'id 矇s desconegut: %s\n" -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, c-format msgid "You are not authorized to su %s\n" msgstr "No esteu autoritzats a usar 竄su %s罈\n" -#: src/su.c:502 +#: src/su.c:495 msgid "(Enter your own password.)" msgstr "(Introdu簿u la vostra pr簷pia contrasenya)." -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" @@ -1599,22 +1531,22 @@ msgstr "" "%s: %s\n" "(Ignorat)\n" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" msgstr "No hi ha int癡rpret\n" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr "L'acc矇s de 竄su罈 a aquest compte est DENEGAT.\n" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "S'ha evitat l'autenticaci籀 de contrasenya.\n" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" msgstr "" @@ -1630,7 +1562,7 @@ msgstr "No hi ha fitxer de contrasenyes\n" msgid "No password entry for 'root'\n" msgstr "No hi ha entrada de contrasenya per a 竄root罈\n" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" @@ -1640,238 +1572,216 @@ msgstr "" "Pitjeu 竄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:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" msgstr "S'est entrant en mode de manteniment del sistema\n" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "%s: reconstru簿u la base de dades de grups\n" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "%s: reconstru簿u la base de dades de grups ombra\n" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "%s: l'argument num癡ric 竄%s罈 no 矇s vlid\n" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "%s: el GID %s 矇s desconegut\n" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "%s: el grup %s 矇s desconegut\n" -#: src/useradd.c:475 +#: src/useradd.c:418 #, 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:480 +#: src/useradd.c:423 #, 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:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" msgstr "%s: renombra: %s" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s: el grup 竄%s罈 矇s un grup NIS.\n" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, 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:721 +#: src/useradd.c:660 #, 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:724 +#: src/useradd.c:663 #, c-format msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr "" " [-d home] [-s int癡rpret] [-c ordre] [-m [-k " "plantilla]]\n" -#: src/useradd.c:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, c-format msgid " [-f inactive] [-e expire]\n" msgstr " [-f inactiu] [-e caduca]\n" -#: src/useradd.c:728 +#: src/useradd.c:667 #, c-format msgid " [-p passwd] name\n" msgstr " [-p contrasenya] nom\n" -#: src/useradd.c:730 +#: src/useradd.c:669 #, 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:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, 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:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, 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:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, 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:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, 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:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "%s: l'UID %u no 矇s 繳nic\n" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "%s: no es pot obtenir un UID 繳nic\n" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "%s: el directori base 竄%s罈 no 矇s vlid\n" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "%s: el comentari 竄%s罈 no 矇s vlid\n" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "%s: el directori home 竄%s罈 no 矇s vlid\n" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s: la data 竄%s罈 no 矇s vlida\n" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, 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:1142 +#: src/useradd.c:1044 #, 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:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" msgstr "%s: el camp 竄%s罈 no 矇s vlid\n" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "%s: l'int癡rpret 竄%s罈 no 矇s vlid\n" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "%s: el nom d'usuari 竄%s罈 no 矇s vlid\n" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "%s: no es pot reescriure el fitxer de contrasenyes\n" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, 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:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, c-format msgid "%s: unable to lock password file\n" msgstr "%s: no es pot bloquejar el fitxer de contrasenyes\n" -#: src/useradd.c:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, 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:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, 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:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, 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:1459 +#: src/useradd.c:1354 #, 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:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "" -"%s: s'ha produ簿t un error en actualitzar l'entrada de contrasenya DBM\n" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, 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:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "" -"%s: s'ha produ簿t un error en actualitzar l'entrada de contrasenya ombra DBM\n" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" msgstr "%s: no es pot crear el directori %s\n" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, c-format msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n" msgstr "" -#: src/useradd.c:1590 +#: src/useradd.c:1446 #, fuzzy, c-format msgid "Can't create mail spool for user %s.\n" msgstr "%s: no es pot actualitzar l'entrada per a l'usuari %s\n" -#: src/useradd.c:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "%s: l'usuari %s existeix\n" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" @@ -1879,209 +1789,172 @@ msgstr "" "%s: el grup %s existeix, si voleu afegir aquest usuari a aquest grup, useu 竄-" "g罈.\n" -#: src/useradd.c:1767 +#: src/useradd.c:1602 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" msgstr "" "%s: av穩s: CREATE_HOME no est suportat, si us plau useu 竄-m罈 en el seu " "lloc.\n" -#: src/userdel.c:124 +#: src/userdel.c:108 #, c-format msgid "Usage: %s [-r] name\n" msgstr "Forma d'繳s: %s [-r] nom\n" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" msgstr "%s: s'ha produ簿t un error en actualitzar l'entrada de grup\n" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "%s: no es pot actualitzar l'entrada de grup DBM\n" - -#: src/userdel.c:214 -#, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: no es pot eliminar l'entrada de grup DBM\n" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "%s: no es pot obrir el fitxer de grups\n" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "%s: no es pot obrir el fitxer de grups ombra\n" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "%s: s'ha produ簿t un error en eliminar l'entrada de contrasenya\n" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "%s: s'ha produ簿t un error en eliminar l'entrada de contrasenya ombra\n" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "%s: s'ha produ簿t un error en eliminar l'entrada de contrasenya DBM\n" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "" -"%s: s'ha produ簿t un error en eliminar l'entrada de contrasenya ombra DBM\n" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "%s: l'usuari %s est actualment dins el sistema\n" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "%s: %s no 矇s propietat de %s, no s'elimina\n" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " msgstr "%s: av穩s: no es pot eliminar " -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" msgstr "%s: l'usuari %s no existeix\n" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s: l'usuari %s 矇s un usuari NIS\n" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "%s: no s'elimina el directori %s (eliminaria el home de l'usuari %s)\n" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "%s: s'ha produ簿t un error en eliminar el directori %s\n" -#: src/usermod.c:306 +#: src/usermod.c:289 #, c-format msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "Forma d'繳s: %s\t[-u uid [-o]] [-g grup] [-G grup,...]\n" -#: src/usermod.c:310 +#: src/usermod.c:293 #, 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:313 +#: src/usermod.c:296 #, c-format msgid "[-f inactive] [-e expire] " msgstr "[-f inactiu] [-e caduca] " -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p contrasenya] [-L|-U] nom\n" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" msgstr "%s: sense mem簷ria a update_group\n" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "%s: sense mem簷ria a update_gshadow\n" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "%s: no s'han especificat senyaladors\n" -#: src/usermod.c:965 +#: src/usermod.c:903 #, 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:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "%s: l'UID %lu no 矇s 繳nic\n" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, 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:1122 +#: src/usermod.c:1053 #, 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:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "%s: s'ha produ簿t un error en afegir l'entrada de contrasenya DBM\n" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "%s: s'ha produ簿t un error en eliminar l'entrada de contrasenya DBM\n" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, 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:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "" -"%s: s'ha produ簿t un error en eliminar l'entrada de contrasenya ombra DBM\n" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "%s: el directori %s ja existeix\n" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "%s: no es pot crear %s\n" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" msgstr "%s: no es pot fer canviar el propietari a %s\n" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, 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:1333 +#: src/usermod.c:1223 #, 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:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" msgstr "no s'ha pogut canviar el propietari de la b繳stia de correu" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" msgstr "no s'ha pogut renombrar la b繳stia de correu" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" @@ -2090,20 +1963,20 @@ msgstr "" "\n" "%s: no s'ha canviat %s\n" -#: src/vipw.c:133 +#: src/vipw.c:131 msgid "Couldn't lock file" msgstr "No s'ha pogut bloquejar el fitxer" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" msgstr "No s'ha pogut fer una c簷pia de seguretat" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s: no es pot restaurar %s: %s (els seus canvis estan a %s)\n" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/po/cs.gmo b/po/cs.gmo index d3bf6e65..3a361659 100644 Binary files a/po/cs.gmo and b/po/cs.gmo differ diff --git a/po/cs.po b/po/cs.po index d6f4e38e..f751d2e8 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,24 +1,27 @@ # Czech translation of shadow-utils. # Ji穩 Pavlovsk羸 , 1999-2000 +# Miroslav Kue , 2004-2005 # msgid "" msgstr "" -"Project-Id-Version: shadow-utils-20000902\n" +"Project-Id-Version: shadow 4.0.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-26 07:53+0100\n" -"PO-Revision-Date: 2000-09-23 19:58+0200\n" -"Last-Translator: Ji穩 Pavlovsk羸 \n" -"Language-Team: Czech \n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" +"PO-Revision-Date: 2005-04-19 21:17+0200\n" +"Last-Translator: Miroslav Kure \n" +"Language-Team: Czech \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" -msgstr "Varov獺n穩: skupina %s je nezn獺m獺\n" +msgstr "Varov獺n穩: nezn獺m獺 skupina %s\n" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" msgstr "Varov獺n穩: p穩li禳 mnoho skupin\n" @@ -46,20 +49,20 @@ msgstr " Kontaktujte spr獺vce syst矇mu.\n" msgid " Choose a new password.\n" msgstr " Zvolte nov矇 heslo.\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" -msgstr "Platnost va禳eho heslo vypr禳穩 za %ld dn轡.\n" +msgstr "Platnost va禳eho hesla vypr禳穩 za %ld dn轡.\n" + +#: libmisc/age.c:172 +#, c-format +msgid "Your password will expire tomorrow.\n" +msgstr "Platnost va禳eho hesla vypr禳穩 z穩tra.\n" #: libmisc/age.c:174 #, c-format -msgid "Your password will expire tomorrow.\n" -msgstr "Platnost va禳eho heslo vypr禳穩 z穩tra.\n" - -#: libmisc/age.c:176 -#, c-format msgid "Your password will expire today.\n" -msgstr "Platnost va禳eho heslo vypr禳穩 dnes.\n" +msgstr "Platnost va禳eho hesla vypr禳穩 dnes.\n" #: libmisc/chowntty.c:106 #, c-format @@ -71,39 +74,34 @@ msgstr "TTY %s nelze zmnit" msgid "Environment overflow\n" msgstr "Peteen穩 prosted穩\n" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr "Nem轡鱉ete zmnit $%s\n" -#: libmisc/failure.c:230 +#: libmisc/failure.c:229 #, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "Poet %2$s od posledn穩ho pihl獺禳en穩: %1$d. Posledn穩: %3$s na %4$s.\n" +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "" +"%d selh獺n穩 od posledn穩ho pihl獺禳en穩.\n" +"Posledn穩: %s na %s.\n" +msgstr[1] "" +"%d selh獺n穩 od posledn穩ho pihl獺禳en穩.\n" +"Posledn穩: %s na %s.\n" +msgstr[2] "" +"%d selh獺n穩 od posledn穩ho pihl獺禳en穩.\n" +"Posledn穩: %s na %s.\n" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "selh獺n穩" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "selh獺n穩" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" msgstr "P穩li禳 mnoho soub鱉n羸ch pihl獺禳en穩.\n" -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "T穩mto heslem nelze de禳ifrovat tajn羸 kl穩 pro %s.\n" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "Tajn羸 kl穩 pro %s nelze nastavit. Je keyserv d矇mon v provozu?\n" - #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "M獺te novou po禳tu." @@ -116,7 +114,7 @@ msgstr "Nem獺te 鱉獺dnou po禳tu." msgid "You have mail." msgstr "M獺te po禳tu." -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " msgstr "Heslo %s je chybn矇. " @@ -131,20 +129,20 @@ msgstr "passwd: vol獺n穩 pam_start() selhalo, chyba %d\n" msgid "passwd: %s\n" msgstr "passwd: %s\n" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" -msgstr "" +msgstr "passwd: heslo bylo 繳sp禳n zmnno\n" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "Nelze nastavit aktu獺ln穩 adres獺 na \"%s\"\n" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" msgstr "鬚獺dn羸 adres獺, nastavuji HOME na /" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr "%s nelze spustit" @@ -159,36 +157,32 @@ msgstr "Chybn羸 koenov羸 adres獺 \"%s\"\n" msgid "Can't change root directory to \"%s\"\n" msgstr "Nelze nastavit koenov羸 adres獺 na \"%s\"\n" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "vol獺n穩 malloc(%d) selhalo\n" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" msgstr "Nemohu alokovat dostatek m穩sta pro konfiguran穩 繳daje.\n" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format 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:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "Heslo: " -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "Heslo u鱉ivatele %s:" -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "(Echo zapnuto)" - -#: src/chage.c:118 +#: src/chage.c:112 #, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" @@ -197,158 +191,151 @@ msgstr "" "Pou鱉it穩: chage [-l] [-m min_dn轡] [-M max_dn轡] [-W varov獺n穩]\n" " [-I vypnut穩] [-E vypr禳en穩] [-d posledn穩 den] u鱉ivatel\n" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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:155 +#: src/chage.c:149 msgid "Minimum Password Age" msgstr "Minim獺ln穩 st獺穩 hesla" -#: src/chage.c:161 +#: src/chage.c:155 msgid "Maximum Password Age" -msgstr "maxim獺ln穩 st獺穩 hesla" +msgstr "Maxim獺ln穩 st獺穩 hesla" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" -msgstr "Posledn穩 zmna hesla (YYYY-MM-DD)" +msgstr "Posledn穩 zmna hesla (RRRR-MM-DD)" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" msgstr "Varov獺n穩 o vypr禳en穩 platnosti hesla" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "Vypnut矇 heslo" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" -msgstr "Vypr禳en穩 platnosti 繳tu (YYYY-MM-DD)" +msgstr "Vypr禳en穩 platnosti 繳tu (RRRR-MM-DD)" -#: src/chage.c:238 -#, fuzzy, c-format +#: src/chage.c:231 +#, c-format msgid "Last password change\t\t\t\t\t: " -msgstr "Posledn穩 zmna hesla (YYYY-MM-DD)" +msgstr "Posledn穩 zmna hesla\t\t\t\t\t: " -#: src/chage.c:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 -#, fuzzy, c-format +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 +#, c-format msgid "never\n" -msgstr "Nikdy\n" +msgstr "nikdy\n" -#: src/chage.c:251 -#, fuzzy, c-format +#: src/chage.c:244 +#, c-format msgid "Password expires\t\t\t\t\t: " -msgstr "Platnost hesla vypr禳穩:\t" +msgstr "Platnost hesla vypr禳穩\t\t\t\t\t: " -#: src/chage.c:267 -#, fuzzy, c-format +#: src/chage.c:260 +#, c-format msgid "Password inactive\t\t\t\t\t: " -msgstr "Vypnut矇 heslo:\t" +msgstr "Vypnut矇 heslo\t\t\t\t\t: " -#: src/chage.c:281 -#, fuzzy, c-format +#: src/chage.c:274 +#, c-format msgid "Account expires\t\t\t\t\t\t: " -msgstr "Platnost hesla vypr禳穩:\t" +msgstr "Platnost 繳tu vypr禳穩\t\t\t\t\t\t: " -#: src/chage.c:297 +#: src/chage.c:290 #, c-format msgid "Minimum number of days between password change\t\t: %ld\n" -msgstr "" +msgstr "Minim獺ln穩 poet dn轡 mezi zmnami hesla\t\t: %ld\n" -#: src/chage.c:298 +#: src/chage.c:292 #, c-format msgid "Maximum number of days between password change\t\t: %ld\n" -msgstr "" +msgstr "Maxim獺ln穩 poet dn轡 mezi zmnami hesla\t\t: %ld\n" -#: src/chage.c:299 +#: src/chage.c:294 #, c-format msgid "Number of days of warning before password expires\t: %ld\n" -msgstr "" +msgstr "Poet varovn羸ch dn轡 ped vypr禳en穩m platnosti hesla\t: %ld\n" -#: src/chage.c:444 +#: src/chage.c:431 #, 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:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 -#, fuzzy, c-format +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 +#, c-format msgid "%s: permission denied.\n" -msgstr "%s: p穩stup odm穩tnut\n" +msgstr "%s: p穩stup odm穩tnut.\n" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 -#, fuzzy, c-format +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 +#, c-format msgid "%s: PAM authentication failed\n" -msgstr "%s: chyba pi vytv獺en穩 ovovac穩 metody\n" +msgstr "%s: oven穩 pomoc穩 PAM selhalo\n" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, c-format msgid "%s: can't open password file\n" msgstr "%s: soubor s hesly nelze otev穩t\n" -#: src/chage.c:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" -msgstr "%s: u鱉ivatel %s je nezn獺m羸\n" +msgstr "%s: nezn獺m羸 u鱉ivatel %s\n" -#: src/chage.c:535 +#: src/chage.c:519 #, c-format msgid "%s: can't lock shadow password file" msgstr "%s: soubor se st穩nov羸mi hesly nelze zamknout" -#: src/chage.c:543 +#: src/chage.c:527 #, c-format msgid "%s: can't open shadow password file" msgstr "%s: soubor se st穩nov羸mi hesly nelze otev穩t" -#: src/chage.c:604 +#: src/chage.c:587 #, c-format msgid "Changing the aging information for %s\n" msgstr "Mn穩m informace o u鱉ivateli %s\n" -#: src/chage.c:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" msgstr "%s: chyba pi zmn polo鱉ek\n" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, c-format msgid "%s: can't update password file\n" msgstr "%s: soubor s hesly nelze aktualizovat\n" -#: src/chage.c:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, 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:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "Chyba pi aktualizaci DBM datab獺ze hesel.\n" - -#: src/chage.c:692 +#: src/chage.c:649 #, 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:740 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite password file\n" msgstr "%s: soubor s hesly nelze pepsat\n" -#: src/chage.c:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 -#, fuzzy, c-format +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 +#, c-format msgid "%s: PAM chauthtok failed\n" -msgstr "%s: nelze odemknout soubor\n" +msgstr "%s: PAM chauthtok selhal\n" #: src/chfn.c:84 #, c-format @@ -366,117 +353,122 @@ msgstr "" "Pou鱉it穩: %s [-f jm矇no] [-r 穩slo m穩stnosti] [-w telefon do zamstn獺n穩]\n" "\t[-h telefon dom轡]\n" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "Cel矇 jm矇no" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "\tCel矇 jm矇no: %s\n" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "穩slo m穩stnosti" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "Telefon do zamstn獺n穩" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" msgstr "Telefon dom轡" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "Ostatn穩" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s: va禳e u鱉ivatelsk矇 jm矇no nelze zjistit.\n" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s: u鱉ivatele `%s' nelze na NIS klientu zmnit.\n" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "%s: `%s' je hlavn穩m NIS serverem pro tohoto klienta.\n" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, c-format +msgid "%s: Permission denied.\n" +msgstr "%s: P穩stup odm穩tnut.\n" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" msgstr "Mn穩m informace o u鱉ivateli %s\n" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" -msgstr "%s: jm矇no (\"%s\") je chybn矇\n" +msgstr "%s: jm矇no \"%s\" je chybn矇\n" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" -msgstr "%s: 穩slo m穩stnosti (\"%s\") je chybn矇\n" +msgstr "%s: 穩slo m穩stnosti \"%s\" je chybn矇\n" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" -msgstr "%s: telefonn穩 穩slo do zamstn獺n穩 (\"%s\") je chybn矇\n" +msgstr "%s: telefonn穩 穩slo do zamstn獺n穩 \"%s\" je chybn矇\n" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" -msgstr "%s: telefonn穩 穩slo dom轡 (\"%s\") je chybn矇\n" +msgstr "%s: telefonn穩 穩slo dom轡 \"%s\" je chybn矇\n" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s: \"%s\" obsahuje chybn矇 znaky\n" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "%s: polo鱉ka je p穩li禳 dlouh獺\n" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" msgstr "Nelze zmnit ID na root.\n" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" msgstr "Nelze zamknout soubor s hesly; zkuste to pozdji.\n" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" msgstr "Soubor s hesly nelze otev穩t.\n" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s: %s se v /etc/passwd nenal矇z獺\n" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" msgstr "Chyba pi aktualizaci polo鱉ky v souboru s hesly.\n" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" msgstr "Nelze prov矇st zmny v souboru s hesly.\n" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" msgstr "Soubor s hesly nelze odemknout.\n" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -487,54 +479,61 @@ msgid "" " -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n" "\t\t\tpasswords are not encrypted\n" msgstr "" +"Pou鱉it穩: chpasswd [volby]\n" +"\n" +"Volby:\n" +" -e, --encrypted\tzadan獺 hesla jsou za禳ifrovan獺\n" +" -h, --help\t\tzobraz穩 tuto n獺povdu a skon穩\n" +" -m, --md5\t\tpokud zadan獺 hesla nejsou za禳ifrovan獺,\n" +"\t\t\tpou鱉ije m穩sto DES algoritmus MD5\n" #: src/chpasswd.c:189 #, c-format msgid "%s: can't lock password file\n" msgstr "%s: soubor s hesly nelze zamknout\n" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "%s: soubor se st穩nov羸mi hesly nelze zamknout\n" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "%s: soubor se st穩nov羸mi hesly nelze otev穩t\n" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "%s: 獺dek %d je p穩li禳 dlouh羸\n" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "%s: 獺dek %d: chyb穩 nov矇 heslo\n" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" -msgstr "%s: 獺dek %d: u鱉ivatel %s je nezn獺m羸\n" +msgstr "%s: 獺dek %d: nezn獺m羸 u鱉ivatel %s\n" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "%s: 獺dek %d: polo鱉ku v souboru s hesly nelze aktualizovat\n" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "%s: chyba, zmny budou ignorov獺ny\n" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" msgstr "%s: chyba pi aktualizaci souboru se st穩nov羸mi hesly\n" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" msgstr "%s: chyba pi aktualizaci souboru s hesly\n" @@ -544,41 +543,41 @@ msgstr "%s: chyba pi aktualizaci souboru s hesly\n" msgid "Usage: %s [-s shell] [name]\n" msgstr "Pou鱉it穩: %s [-s shell] [jm矇no]\n" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" -msgstr "Implicitn穩 shell" +msgstr "Pihla禳ovac穩 shell" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" msgstr "Nem轡鱉ete zmnit shell pro %s.\n" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" -msgstr "Mn穩m implicitn穩 shell pro %s\n" +msgstr "Mn穩m pihla禳ovac穩 shell pro %s\n" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s: chybn獺 polo鱉ka %s\n" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" -msgstr "Shell %s je chybn羸.\n" +msgstr "Shell %s je neplatn羸.\n" #: src/expiry.c:59 #, c-format msgid "Usage: expiry {-f|-c}\n" msgstr "Pou鱉it穩: expiry {-f|-c}\n" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" msgstr "%s: VAROVN! Mus穩 m穩t opr獺vnn穩 superu鱉ivatele!\n" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "%s: nezn獺m羸 u鱉ivatel\n" @@ -592,322 +591,297 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" msgstr "" +"Pou鱉it穩: faillog [volby]\n" +"\n" +"Volby:\n" +" -a, --all\t\t\tzobraz穩 z獺znamy faillogu o v禳ech u鱉ivatel穩ch\n" +" -h, --help\t\t\tzobraz穩 tuto n獺povdu a skon穩\n" +" -l, --lock-time SEK\t\tpo ne繳sp禳n矇m pihl獺禳en穩 zamkne 繳et na SEC sekund\n" +" -m, --maximum MAX\t\tnastav穩 maxim獺ln穩 poet chybn羸ch pihl獺禳en穩 na MAX\n" +" -r, --reset\t\t\tvynuluje poitadlo chybn羸ch pihl獺禳en穩\n" +" -t, --time DN躓\t\tzobraz穩 z獺znamy faillogu novj禳穩 ne鱉 DN躓\n" +" -u, --user LOGIN\t\tzobraz穩 z獺znamy faillogu nebo uprav穩 poitadla\n" +"\t\t\t\ta limity chybn羸ch pihl獺禳en穩 pouze pro u鱉ivatele LOGIN\n" +"\t\t\t\t(s volbami -r, -m nebo -l)\n" -#: src/faillog.c:86 +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" -msgstr "Jm矇no Chyb Maximum Posledn穩\n" +msgid "Login Failures Maximum Latest On\n" +msgstr "U鱉ivatel Chyb Maximum Posledn穩 Na\n" -#: src/faillog.c:103 -#, c-format -msgid " %s on %s" -msgstr " %s on %s" - -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" msgstr " [%lds zbylo]" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr " [%lds z獺mek]" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "Nezn獺m羸 u鱉ivatel: %s\n" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "Pou鱉it穩: %s [r|-R] skupina\n" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr " %s [-a u鱉ivatel] skupina\n" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr " %s [-d u鱉ivatel] skupina\n" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr " %s [-A u鱉ivatel,...] [-M u鱉ivatel,...] skupina\n" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr " %s [-M u鱉ivatel,...] skupina\n" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" msgstr "%s: pep穩na -A funguje pouze se st穩nov羸mi hesly skupin\n" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "Kdo jste?\n" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" -msgstr "skupina %s je nezn獺m獺\n" +msgstr "nezn獺m獺 skupina %s\n" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "Pid獺v獺m u鱉ivatele %s do skupiny %s\n" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "Odstrauji u鱉ivatele %s ze skupiny %s\n" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" -msgstr "%s: len %s je nezn獺m羸\n" +msgstr "%s: nezn獺m羸 len %s\n" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "%s: Nejedn獺 se o tty\n" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "Mn穩m heslo skupiny %s\n" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "Nov矇 heslo: " -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " msgstr "Zadejte opt nov矇 heslo: " -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" -msgstr "Neshoduj穩 se; zkuste to opt" +msgstr "Neshoduj穩 se; zkuste to znovu" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" msgstr "%s: Zkuste to pozdji\n" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "%s: nelze z穩skat z獺mek\n" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" msgstr "%s: nelze z穩skat z獺mek pro soubor se st穩nov羸mi hesly\n" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "%s: nelze otev穩t soubor\n" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "%s: nelze aktualizovat polo鱉ku\n" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" msgstr "%s: nelze aktualizovat polo鱉ku souboru se st穩nov羸mi hesly\n" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "%s: nelze pepsat soubor\n" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" msgstr "%s: nelze pepsat soubor se st穩nov羸mi hesly\n" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "%s: nelze odemknout soubor\n" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "%s: nelze aktualizovat soubory s DBM datab獺zemi\n" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "%s: nelze aktualizovat soubory s DBM datab獺zemi st穩nov羸ch hesel\n" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "Pou鱉it穩: groupadd [-g gid [-o]] [-f] skupina\n" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, 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:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: nelze pidat polo鱉ku do souboru s dbm datab獺z穩 skupin\n" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "%s: jm矇no %s nen穩 jedinen矇\n" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" msgstr "%s: uid %u nen穩 jedinen矇\n" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "%s: nelze vytvoit jedinen矇 gid\n" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, c-format msgid "%s: %s is not a valid group name\n" msgstr "%s: %s nen穩 platn羸m jm矇nem skupiny\n" -#: src/groupadd.c:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "%s: chybn獺 skupina %s\n" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "%s: pep穩na -O vy鱉aduje argument typu JMNO=HODNOTA\n" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s: soubor se skupinami nelze pepsat\n" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s: soubor se st穩nov羸mi skupinami nelze pepsat\n" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" msgstr "%s: soubor se skupinami nelze zamknout\n" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" msgstr "%s: soubor se skupinami nelze otev穩t\n" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" msgstr "%s: soubor se st穩nov羸mi skupinami nelze zamknout\n" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" msgstr "%s: soubor se st穩nov羸mi skupinami nelze otev穩t\n" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "%s: skupina %s ji鱉 existuje\n" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, c-format msgid "Usage: groupdel group\n" msgstr "Pou鱉it穩: groupdel skupina\n" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" msgstr "%s: chyba pi odstraov獺n穩 polo鱉ky ze souboru se skupinami\n" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "%s: chyba pi odstraov獺n穩 polo鱉ky ze souboru s dbm datab獺z穩 skupin\n" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "%s: chyba pi odstraov獺n穩 polo鱉ky ze souboru se st穩nov羸mi skupinami\n" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "" -"%s: chyba pi odstraov獺n穩 polo鱉ky ze souboru s dbm datab獺z穩 st穩nov羸ch " -"skupin\n" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "%s: prim獺rn穩 skupinu u鱉ivatele nelze odstranit.\n" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "%s: skupina %s neexistuje\n" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "%s: skupina %s je NIS skupinou\n" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s: %s je hlavn穩m NIS serverem\n" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "Pou鱉it穩: groupmod [-g gid [-o]] [-n jm矇no] skupina\n" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "%s: %s se v /etc/group nenal矇z獺\n" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s: nelze pidat polo鱉ku do souboru s dbm datab獺z穩 st穩nov羸ch skupin\n" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s: gid %u nen穩 jedinen矇\n" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "%s: jm矇no %s nen穩 jedinen矇\n" @@ -918,110 +892,105 @@ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "" "Pou鱉it穩: %s [-r] [-s] [soubor se skupinami [soubor se st穩nov羸mi skupinami]]\n" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "Usage: %s [-r] [-s] [soubor se skupinami]\n" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "Ne" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" -msgstr "" +msgstr "%s: -s a -r nejsou sluiteln矇\n" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "%s: soubor %s nelze zamknout\n" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "%s: soubor %s nelze otev穩t\n" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" msgstr "chybn獺 polo鱉ka v souboru se skupinami\n" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "smazat 獺dek `%s'?" -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" msgstr "tato polo鱉ka se v souboru se skupinami vyskytuje v穩cekr獺t\n" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" msgstr "jm矇no skupiny `%s' je chybn矇\n" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "skupina %s: u鱉ivatel %s neexistuje\n" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " msgstr "smazat lena `%s'? " -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" msgstr "chybn獺 polo鱉ka v souboru se st穩nov羸mi skupinami\n" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" msgstr "duplikovan獺 polo鱉ka v souboru se st穩nov羸mi skupinami\n" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" msgstr "v souboru se skupinami neexistuje odpov穩daj穩c穩 polo鱉ka\n" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" msgstr "st穩nov獺 skupina %s: administr獺tor %s neexistuje\n" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " msgstr "smazat administr獺tora `%s'? " -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" msgstr "st穩nov獺 skupina %s: u鱉ivatel %s neexistuje\n" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "%s: soubor %s nelze aktualizovat\n" -#: src/grpck.c:647 src/pwck.c:612 -#, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: soubory byly aktualizov獺ny; spus聽te mkpasswd\n" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format -msgid "%s: no changes\n" -msgstr "%s: 鱉獺dn矇 zmny nebyly provedeny\n" - -#: src/grpck.c:651 src/pwck.c:616 +#: src/grpck.c:640 src/pwck.c:606 #, c-format msgid "%s: the files have been updated\n" msgstr "%s: soubory byly aktualizov獺ny\n" +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "%s: 鱉獺dn矇 zmny nebyly provedeny\n" + #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" @@ -1037,37 +1006,37 @@ msgstr "%s: soubor se skupinami nelze otev穩t\n" msgid "%s: can't lock shadow group file\n" msgstr "%s: soubor se st穩nov羸mi skupinami nelze zamknout\n" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" msgstr "%s: soubor se st穩nov羸mi skupinami nelze otev穩t\n" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "%s: polo鱉ku st穩nov矇 skupiny %s nelze odstranit\n" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "%s: polo鱉ku %s souboru se st穩nov羸mi hesly nelze aktualizovat\n" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "%s: polo鱉ku skupiny %s nelze odstranit\n" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" msgstr "%s: soubor se st穩nov羸mi hesly nelze aktualizovat\n" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" msgstr "%s: soubor s hesly nelze aktualizovat\n" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "%s: soubor se st穩nov羸mi hesly skupin nelze smazat\n" @@ -1087,52 +1056,58 @@ msgstr "Pou鱉it穩: id\n" msgid " groups=" msgstr " skupiny=" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" +"Pou鱉it穩: lastlog [volby]\n" +"\n" +"Volby:\n" +" -u, --login LOGIN\tzobraz穩 z獺znamy lastlogu pro u鱉ivatele LOGIN\n" +" -h, --help\t\tzobraz穩 tuto n獺povdu a skon穩\n" +" -t, --time DN躓\tzobraz穩 z獺znamy lastlogu novj禳穩 ne鱉 DN躓\n" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" msgstr "U鱉ivatel Port Z Naposledy\n" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "U鱉ivatel Port Naposledy\n" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "**Nikdy nebyl pihl獺禳en**" -#: src/login.c:175 +#: src/login.c:156 #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Pou鱉it穩: %s [-p] [jm矇no]\n" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr " %s [-p] [-h po穩ta] [-f jm矇no]\n" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr " %s [-p] -r po穩ta\n" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" msgstr "Chybn羸 as pihl獺禳en穩\n" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" @@ -1141,7 +1116,7 @@ msgstr "" "\n" "Syst矇m byl uzaven kv轡li pravideln矇 繳dr鱉b.\n" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" @@ -1150,7 +1125,7 @@ msgstr "" "\n" "[Odpojen穩 peskoeno -- u鱉ivatel root sm穩 b羸t pihl獺禳en.]\n" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" @@ -1159,17 +1134,17 @@ msgstr "" "\n" "Vypr禳el asov羸 limit (%d vtein) pro pihl獺禳en穩.\n" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" msgstr " na `%.100s' z `%.200s'" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" msgstr " na `%.100s'" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" @@ -1178,38 +1153,29 @@ msgstr "" "\n" "Pihla禳ovac穩 jm矇no na %s: " -#: src/login.c:819 -msgid "login: " -msgstr "Pihla禳ovac穩 jm矇no: " - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" msgstr "Chybn矇 pihl獺禳en穩" -#: src/login.c:1198 +#: src/login.c:996 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:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "Posledn穩 pihl獺禳en穩: %s na %s" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" msgstr "Posledn穩 pihl獺禳en穩: %.19s na %s" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" msgstr " z %.*s" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "Spou禳t穩m rad_login\n" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" @@ -1226,9 +1192,9 @@ msgid "%s: cannot open DBM files for %s\n" msgstr "%s: soubory s DBM datab獺zemi pro %s nelze otev穩t\n" #: src/mkpasswd.c:286 -#, fuzzy, c-format +#, c-format msgid "%s: the line beginning with %.16s... is too long\n" -msgstr "%s: za獺tek s " +msgstr "%s: 獺dek za穩naj穩c穩 %.16s... je p穩li禳 dlouh羸\n" #: src/mkpasswd.c:313 #, c-format @@ -1236,31 +1202,31 @@ msgid "%s: error parsing line \"%s\"\n" msgstr "%s: chyba pi zpracov獺n穩 獺dku \"%s\"\n" #: src/mkpasswd.c:321 src/mkpasswd.c:326 src/mkpasswd.c:331 src/mkpasswd.c:336 -#, fuzzy, c-format +#, c-format msgid "adding record for name %s\n" -msgstr "pid獺v獺m z獺znam pro jm矇no" +msgstr "pid獺v獺m z獺znam pro jm矇no %s\n" #: src/mkpasswd.c:342 src/mkpasswd.c:348 src/mkpasswd.c:353 src/mkpasswd.c:358 -#, fuzzy, c-format +#, c-format msgid "%s: error adding record for %s\n" -msgstr "%s: chyba pi zad獺v獺n穩 z獺znamu pro jm矇no " +msgstr "%s: chyba pi pid獺v獺n穩 z獺znamu pro %s\n" #: src/mkpasswd.c:376 #, c-format msgid "added %d entries, longest was %d\n" msgstr "poet pidan羸ch polo鱉ek: %d; d矇lka nejvt禳穩: %d\n" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "Pou鱉it穩: %s [-vf] [-p|g|sp|sg] soubor\n" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "Pou鱉it穩: %s [-vf] [-p|g|sp] soubor\n" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "Pou鱉it穩: %s [-vf] [-p|g] soubor\n" @@ -1278,18 +1244,18 @@ msgstr "Pou鱉it穩: sg skupina [[-c] p穩kaz]\n" #: src/newgrp.c:131 #, c-format msgid "unknown uid: %u\n" -msgstr "uid %u je nezn獺m矇\n" +msgstr "nezn獺m矇 uid %u\n" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" -msgstr "gid %lu je nezn獺m矇\n" +msgstr "nezn獺m矇 gid %lu\n" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "Lituji.\n" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "p穩li禳 mnoho skupin\n" @@ -1299,91 +1265,91 @@ msgstr "p穩li禳 mnoho skupin\n" msgid "Usage: %s [input]\n" msgstr "Pou鱉it穩: %s [vstup]\n" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "%s: soubor /etc/passwd nelze zamknout.\n" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "%s: soubory nelze zamknout. Zkuste to opt pozdji.\n" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "%s: soubory nelze otev穩t\n" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "%s: 獺dek %d: chybn羸 獺dek\n" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "%s: 獺dek %d: nelze vytvoit GID\n" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "%s: 獺dek %d: nelze vytvoit UID\n" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "%s: 獺dek %d: u鱉ivatele %s nelze nal矇zt\n" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "%s: 獺dek %d: heslo nelze aktualizovat\n" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "%s: 獺dek %d: vol獺n穩 mkdir selhalo\n" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "%s: 獺dek %d: vol獺n穩 chown selhalo\n" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "%s: 獺dek %d: polo鱉ku nelze aktualizovat\n" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "%s: chyba pi aktualizaci soubor轡\n" -#: src/passwd.c:155 +#: src/passwd.c:154 #, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "Pou鱉it穩: %s [-f|-s] [jm矇no]\n" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr " %s [-x max] [-n min] [-w varov獺n穩] [-i vypnut穩] jm矇no\n" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} jm矇no\n" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "Star矇 heslo: " -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" msgstr "Chybn矇 heslo pro `%s'\n" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" @@ -1392,70 +1358,70 @@ msgstr "" "Zadejte nov矇 heslo (poet znak轡 v intervalu %d a鱉 %d).\n" "Pou鱉ijte kombinaci velk羸ch a mal羸ch p穩smen s 穩slicemi.\n" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "Nov矇 heslo: " -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" msgstr "Zkuste to znovu.\n" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" "Warning: weak password (enter it again to use it anyway).\n" msgstr "" "\n" -"Varov獺n穩: slab矇 heslo (pokud jej opravdu chcete pou鱉穩t, zadejte jej znovu).\n" +"Varov獺n穩: slab矇 heslo (chcete-li jej opravdu pou鱉穩t, zadejte jej znovu).\n" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" msgstr "Neshoduj穩 se; zkuste to znovu.\n" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" -msgstr "Heslo pro %s nelze zmnit.\n" +msgstr "Heslo u鱉ivatele %s nelze zmnit.\n" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" msgstr "Lituji, ale heslo pro %s nelze je禳t zmnit.\n" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "%s: do禳la pam聽\n" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "%s: %s nelze spustit" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" msgstr "%s: 繳lo鱉na %s nen穩 podporov獺na\n" -#: src/passwd.c:914 +#: src/passwd.c:884 #, c-format -msgid "You may not change the password for %s.\n" -msgstr "Nesm穩te zmnit heslo pro %s.\n" +msgid "%s: You may not view or modify password information for %s.\n" +msgstr "%s: Nem轡鱉ete prohl穩鱉et nebo mnit heslo u鱉ivatele %s.\n" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "Mn穩m heslo u鱉ivatele %s\n" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "Heslo u鱉ivatele %s nebylo zmnno.\n" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "Heslo bylo zmnno.\n" @@ -1471,49 +1437,49 @@ msgstr "" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "Pou鱉it穩: %s [-q] [-r] [-s] [soubor s hesly]\n" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" msgstr "chybn獺 polo鱉ka v souboru s hesly\n" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" msgstr "duplikovan獺 polo鱉ka v souboru s hesly\n" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" msgstr "chybn矇 u鱉ivatelsk矇 jm矇no '%s'\n" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "u鱉ivatel %s: skupina %u neexistuje\n" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "u鱉ivatel %s: adres獺 %s neexistuje\n" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "u鱉ivatel %s: program %s neexistuje\n" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" msgstr "chybn獺 polo鱉ka v souboru se st穩nov羸mi hesly\n" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" msgstr "duplikovan獺 polo鱉ka v souboru se st穩nov羸mi hesly\n" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" msgstr "chyb穩 polo鱉ka v souboru s hesly\n" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" msgstr "u鱉ivatel %s: posledn穩 zmna hesla v budoucnosti\n" @@ -1533,17 +1499,17 @@ msgstr "%s: soubor s hesly nelze otev穩t\n" msgid "%s: can't remove shadow entry for %s\n" msgstr "%s: polo鱉ku souboru s hesly pro u鱉ivatele %s nelze odstranit\n" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "%s: polo鱉ku souboru s hesly pro u鱉ivatele %s nelze aktualizovat\n" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" msgstr "%s: soubor se st穩nov羸mi hesly nelze aktualizovat\n" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" msgstr "%s: soubor s hesly nelze aktualizovat\n" @@ -1553,40 +1519,40 @@ msgstr "%s: soubor s hesly nelze aktualizovat\n" msgid "%s: can't update entry for user %s\n" msgstr "%s: polo鱉ku pro u鱉ivatele %s nelze aktualizovat\n" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format msgid "%s: can't delete shadow password file\n" msgstr "%s: nem轡鱉ete smazat soubor se st穩nov羸mi hesly\n" -#: src/su.c:133 +#: src/su.c:132 msgid "Sorry." msgstr "Lituji." -#: src/su.c:323 +#: src/su.c:320 #, 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:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "%s: pam_start: chyba %d\n" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" -msgstr "Id %s je nezn獺m矇.\n" +msgstr "Nezn獺m矇 id: %s\n" -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, c-format msgid "You are not authorized to su %s\n" msgstr "Nejste opr獺vnn pou鱉穩vat su %s\n" -#: src/su.c:502 +#: src/su.c:495 msgid "(Enter your own password.)" -msgstr "(Zadejte va禳e heslo.)" +msgstr "(Zadejte sv矇 heslo.)" -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" @@ -1595,22 +1561,22 @@ msgstr "" "%s: %s\n" "(Ignoruji)\n" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" msgstr "鬚獺dn羸 shell\n" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr "Z tohoto 繳tu je p穩stup k su ZAKZN.\n" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "Ovov獺n穩 heslem vynech獺no.\n" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" msgstr "Pro oven穩 zadejte VAE vlastn穩 heslo.\n" @@ -1625,7 +1591,7 @@ msgstr "Soubor s hesly neexistuje\n" msgid "No password entry for 'root'\n" msgstr "V datab獺zi nen穩 polo鱉ka pro u鱉ivatele 'root'\n" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" @@ -1635,439 +1601,386 @@ 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:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" msgstr "Vstupuji do re鱉imu 繳dr鱉by syst矇mu\n" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "%s: vytvote znovu datab獺zi skupin\n" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "%s: vytvote znovu datab獺zi st穩nov羸ch skupin\n" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "%s: chybn羸 numerick羸 argument `%s'\n" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" -msgstr "%s: gid %s je nezn獺m矇\n" +msgstr "%s: nezn獺m矇 gid %s\n" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" -msgstr "%s: skupina %s je nezn獺m獺\n" +msgstr "%s: nezn獺m獺 skupina %s\n" -#: src/useradd.c:475 +#: src/useradd.c:418 #, c-format msgid "%s: cannot create new defaults file\n" msgstr "%s: nemohu vytvoit nov羸 soubor s implicitn穩mi hodnotami\n" -#: src/useradd.c:480 +#: src/useradd.c:423 #, c-format msgid "%s: cannot open new defaults file\n" msgstr "%s: nemohu vytvoit nov羸 soubor s implicitn穩mi hodnotami\n" -#: src/useradd.c:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" msgstr "%s: pejmenovat: %s" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s: skupina `%s' je NIS skupinou\n" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, 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:721 +#: src/useradd.c:660 #, 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:724 +#: src/useradd.c:663 #, c-format msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr "" " [-d dom獺c穩 adr.] [-s shell] [-c koment獺]\n" " [-m [-k 禳ablona]]\n" -#: src/useradd.c:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, c-format msgid " [-f inactive] [-e expire]\n" msgstr " [-f vypnut穩] [-e vypr禳en穩]\n" -#: src/useradd.c:728 +#: src/useradd.c:667 #, c-format msgid " [-p passwd] name\n" msgstr " [-p heslo] jm矇no\n" -#: src/useradd.c:730 +#: src/useradd.c:669 #, 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:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, c-format msgid "%s: error locking group file\n" msgstr "%s: chyba pi zamyk獺n穩 souboru se skupinami\n" -#: src/useradd.c:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, c-format msgid "%s: error opening group file\n" msgstr "%s: chyba pi otev穩r獺n穩 souboru se skupinami\n" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, 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:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, 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:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "%s uid %u nen穩 jedinen矇\n" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "%s: nemohu z穩skat jedinen矇 uid\n" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "%s: chybn羸 z獺kladn穩 adres獺 `%s'\n" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "%s: chybn羸 koment獺 `%s'\n" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "%s: chybn羸 dom獺c穩 adres獺 `%s'\n" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s: chybn矇 datum `%s'\n" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "%s: pep穩na -e vy鱉aduje st穩nov獺 hesla\n" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, c-format msgid "%s: shadow passwords required for -f\n" msgstr "%s: pep穩na -f vy鱉aduje st穩nov獺 hesla\n" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" msgstr "%s: chybn獺 polo鱉ka `%s'\n" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "%s: chybn羸 shell `%s'\n" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "%s: chybn矇 u鱉ivatelsk矇 jm矇no `%s'\n" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "%s: soubor s hesly nelze pepsat\n" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "%s: soubor se st穩nov羸mi hesly nelze pepsat\n" -#: src/useradd.c:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, c-format msgid "%s: unable to lock password file\n" msgstr "%s: soubor s hesly nelze zamknout\n" -#: src/useradd.c:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, c-format msgid "%s: unable to open password file\n" msgstr "%s: soubor s hesly nelze otev穩t\n" -#: src/useradd.c:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, c-format msgid "%s: cannot lock shadow password file\n" msgstr "%s: soubor se st穩nov羸mi hesly nelze zamknout\n" -#: src/useradd.c:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, 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:1459 +#: src/useradd.c:1354 #, 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:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "%s: chyba pi aktualizaci polo鱉ky dbm datab獺ze hesel\n" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, 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:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s: chyba pi aktualizaci polo鱉ky dbm datab獺ze st穩nov羸ch hesel\n" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" msgstr "%s: adres獺 %s nelze vytvoit\n" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, c-format msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n" -msgstr "" +msgstr "Skupina \"mail\" neexistuje, vytv獺穩m soubor s po禳tou s pr獺vy 0600.\n" -#: src/useradd.c:1590 -#, fuzzy, c-format +#: src/useradd.c:1446 +#, c-format msgid "Can't create mail spool for user %s.\n" -msgstr "%s: polo鱉ku pro u鱉ivatele %s nelze aktualizovat\n" +msgstr "Nemohu vytvoit soubor s p穩choz穩 po禳tou pro u鱉ivatele %s.\n" -#: src/useradd.c:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "%s: u鱉ivatel %s ji鱉 existuje\n" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" msgstr "" +"%s: skupina %s existuje - chcete-li pidat u鱉ivatele do t矇to skupiny, " +"pou鱉ijte -g.\n" -#: src/useradd.c:1767 +#: src/useradd.c:1602 #, 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" -#: src/userdel.c:124 +#: src/userdel.c:108 #, c-format msgid "Usage: %s [-r] name\n" msgstr "Pou鱉it穩: %s [-r] jm矇no\n" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" msgstr "%s: polo鱉ku souboru se skupinami nelze aktualizovat\n" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "%s: polo鱉ku dbm datab獺ze skupin nelze aktualizovat\n" - -#: src/userdel.c:214 -#, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: polo鱉ku dbm datab獺ze skupin nelze odstranit\n" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "%s: soubor se skupinami nelze otev穩t\n" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "%s: soubor se st穩nov羸mi skupinami nelze otev穩t\n" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "%s: chyba pi odstraov獺n穩 polo鱉ky ze souboru s hesly\n" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "%s: chyba pi odstraov獺n穩 polo鱉ky ze souboru se st穩nov羸mi hesly\n" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "%s: chyba pi odstraov獺n穩 polo鱉ky z dbm datab獺ze hesel\n" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s: chyba pi odstraov獺n穩 polo鱉ky z dbm datab獺ze st穩nov羸ch hesel\n" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "%s: u鱉ivatel %s je pr獺v pihl獺禳en\n" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "%s: vlastn穩kem %s nen穩 %s, nema鱉u jej\n" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " msgstr "%s: varov獺n穩: nemohu smazat " -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" msgstr "%s: u鱉ivatel %s neexistuje\n" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s: u鱉ivatel %s je NIS u鱉ivatelem\n" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "%s: adres獺 %s nebudu mazat (je to dom獺c穩 adres獺 u鱉ivatele %s)\n" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "%s: chyba pi maz獺n穩 adres獺e %s\n" -#: src/usermod.c:306 +#: src/usermod.c:289 #, c-format msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "Pou鱉it穩: %s [-u uid [-o]] [-g skupina [-G skupina,...] \n" -#: src/usermod.c:310 +#: src/usermod.c:293 #, 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:313 +#: src/usermod.c:296 #, c-format msgid "[-f inactive] [-e expire] " msgstr "[-f vypnut穩] [-e vypr禳en穩] " -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p heslo] [-L|-U] jm矇no\n" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" msgstr "%s nedostatek pamti v update_group\n" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "%s: nedostatek pamti v update_gshadow\n" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "%s: 鱉獺dn矇 pep穩nae\n" -#: src/usermod.c:965 +#: src/usermod.c:903 #, 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:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "%s uid %lu nen穩 jedinen矇\n" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, c-format msgid "%s: error changing password entry\n" msgstr "%s: chyba pi zmn polo鱉ky v souboru s hesly\n" -#: src/usermod.c:1122 +#: src/usermod.c:1053 #, 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:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "%s: chyba pi pid獺v獺n穩 polo鱉ky do dbm datab獺ze hesel\n" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "%s: chyba pi odstraov獺n穩 polo鱉ky z dbm datab獺ze hesel\n" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, 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:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s: chyba pi odstraov獺n穩 polo鱉ky z dbm datab獺ze st穩nov羸ch hesel\n" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "%s: adres獺 %s ji鱉 existuje\n" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "%s: %s nelze vytvoit\n" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" msgstr "%s: vol獺n穩 chown pro %s selhalo\n" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, c-format msgid "%s: cannot rename directory %s to %s\n" msgstr "%s: adres獺 %s nelze na %s pejmenovat\n" -#: src/usermod.c:1333 +#: src/usermod.c:1223 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "%s: varov獺n穩: vlastn穩kem %s nen穩 %s\n" -#: src/usermod.c:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" -msgstr "chyba pi zmn vlastn穩ka schr獺nky" +msgstr "chyba pi zmn vlastn穩ka po禳tovn穩 schr獺nky" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" -msgstr "chyba pi pejmenov獺v獺n穩 schr獺nky" +msgstr "chyba pi pejmenov獺v獺n穩 po禳tovn穩 schr獺nky" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" @@ -2076,20 +1989,20 @@ msgstr "" "\n" "%s: %s je beze zmny\n" -#: src/vipw.c:133 +#: src/vipw.c:131 msgid "Couldn't lock file" msgstr "Soubor nelze zamknout" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" msgstr "Z獺lohov獺n穩 nelze prov矇st." -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s: %s nelze obnovit: %s (zmny jsou v %s)\n" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/po/da.gmo b/po/da.gmo index e5071607..2617ad59 100644 Binary files a/po/da.gmo and b/po/da.gmo differ diff --git a/po/da.po b/po/da.po index 76078b70..710b004b 100644 --- a/po/da.po +++ b/po/da.po @@ -5,23 +5,24 @@ # msgid "" msgstr "" -"Project-Id-Version: shadow 4.0.7\n" +"Project-Id-Version: shadow 4.0.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-26 07:53+0100\n" -"PO-Revision-Date: 2005-01-16 11:26+0100\n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" +"PO-Revision-Date: 2005-04-19 10:17+0200\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.9.1\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" msgstr "Advarsel: ukendt gruppe %s\n" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" msgstr "Advarsel: for mange grupper\n" @@ -49,17 +50,17 @@ msgstr " Kontakt systemadministratoren.\n" msgid " Choose a new password.\n" msgstr " V疆lg en ny adgangskode.\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "Din adgangskode udl繪ber om %ld dage.\n" -#: libmisc/age.c:174 +#: libmisc/age.c:172 #, c-format msgid "Your password will expire tomorrow.\n" msgstr "Din adgangskode udl繪ber i morgen.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:174 #, c-format msgid "Your password will expire today.\n" msgstr "Din adgangskode udl繪ber i dag.\n" @@ -74,39 +75,31 @@ msgstr "Kunne ikke 疆ndre tty %s" msgid "Environment overflow\n" msgstr "Milj繪overl繪b\n" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr "Du kan ikke 疆ndre $%s\n" -#: libmisc/failure.c:230 +#: libmisc/failure.c:229 #, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "%d %s siden du sidst var logget p疇. Sidst var %s, %s.\n" +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "" +"%d fejl siden sidste logind.\n" +"Sidst var %s, %s.\n" +msgstr[1] "" +"%d fejl siden sidste logind.\n" +"Sidst var %s, %s.\n" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "fejl" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "fejl" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" msgstr "Logget p疇 for mange gange.\n" -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "Adgangskode kan ikke dekryptere den hemmelige n繪gle for %s.\n" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "Kunne ikke s疆tte %s's hemmelige n繪gle: k繪rer keyserv-d疆monen?\n" - #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "Du har ny post." @@ -119,7 +112,7 @@ msgstr "Ingen post." msgid "You have mail." msgstr "Du har post." -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " msgstr "Ugyldig adgangskode: %s. " @@ -134,20 +127,20 @@ msgstr "passwd: pam_start() mislykkedes, fejl %d\n" msgid "passwd: %s\n" msgstr "passwd: %s\n" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" msgstr "passwd: adgangskoden blev opdateret\n" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "Kunne ikke skifte mappe til \"%s\"\n" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" msgstr "Ingen mappe, logger p疇 med HOME=/" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr "Kan ikke udf繪re %s" @@ -162,35 +155,31 @@ msgstr "Ugyldig rodmappe \"%s\"\n" msgid "Can't change root directory to \"%s\"\n" msgstr "Kan ikke 疆ndre rodmappen til \"%s\"\n" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "malloc(%d) mislykkedes\n" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" msgstr "Kunne ikke frig繪re plads til ops疆tningsoplysninger.\n" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "ops疆tningsfejl - ukendt punkt %s (inform矇r administrator)\n" -#: lib/pwauth.c:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "Adgangskode: " -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "%s's adgangskode: " -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "(Ekko aktiveret) " - -#: src/chage.c:118 +#: src/chage.c:112 #, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" @@ -199,154 +188,147 @@ msgstr "" "Brug: chage [-l] [-m min_dage] [-M maks_dage] [-W advar]\n" " [-I inaktive] [-E udl繪b] [-d sidste_dag] bruger\n" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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:155 +#: src/chage.c:149 msgid "Minimum Password Age" msgstr "Minimal adgangskode-alder" -#: src/chage.c:161 +#: src/chage.c:155 msgid "Maximum Password Age" msgstr "Maksimal adgangskode-alder" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" msgstr "Sidste 疆ndring af adgangskode (-MM-DD)" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" msgstr "Advarsel om udl繪b af adgangskode" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "Adgangskode inaktiv" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Konto-udl繪bsdato (-MM-DD)" -#: src/chage.c:238 +#: src/chage.c:231 #, c-format msgid "Last password change\t\t\t\t\t: " msgstr "Sidste 疆ndring af adgangskode\t\t\t\t\t: " -#: src/chage.c:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 #, c-format msgid "never\n" msgstr "aldrig\n" -#: src/chage.c:251 +#: src/chage.c:244 #, c-format msgid "Password expires\t\t\t\t\t: " msgstr "Adgangskode udl繪ber\t\t\t\t\t: " -#: src/chage.c:267 +#: src/chage.c:260 #, c-format msgid "Password inactive\t\t\t\t\t: " msgstr "Adgangskode inaktiv\t\t\t\t\t: " -#: src/chage.c:281 +#: src/chage.c:274 #, c-format msgid "Account expires\t\t\t\t\t\t: " msgstr "Konto udl繪ber\t\t\t\t\t\t: " -#: src/chage.c:297 +#: src/chage.c:290 #, 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:298 +#: src/chage.c:292 #, 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:299 +#: src/chage.c:294 #, 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:444 +#: src/chage.c:431 #, c-format msgid "%s: do not include \"l\" with other flags\n" msgstr "%s: medtag ikke \"l\" med andre flag\n" -#: src/chage.c:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 #, c-format msgid "%s: permission denied.\n" msgstr "%s: adgang n疆gtet.\n" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 #, c-format msgid "%s: PAM authentication failed\n" msgstr "%s: PAM-autentifikation mislykkedes\n" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, c-format msgid "%s: can't open password file\n" msgstr "%s: kan ikke 疇bne adgangskodefil\n" -#: src/chage.c:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "%s: ukendt bruger %s\n" -#: src/chage.c:535 +#: src/chage.c:519 #, c-format msgid "%s: can't lock shadow password file" msgstr "%s: kan ikke l疇se skyggeadgangskodefil" -#: src/chage.c:543 +#: src/chage.c:527 #, c-format msgid "%s: can't open shadow password file" msgstr "%s: kan ikke 疇bne skyggeadgangskodefil" -#: src/chage.c:604 +#: src/chage.c:587 #, c-format msgid "Changing the aging information for %s\n" msgstr "ndrer for疆ldelsesoplysninger for %s\n" -#: src/chage.c:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" msgstr "%s: fejl ved 疆ndring af felter\n" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, c-format msgid "%s: can't update password file\n" msgstr "%s: kan ikke opdatere adgangskodefil\n" -#: src/chage.c:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" msgstr "%s: kan ikke opdatere skyggeadgangskodefil\n" -#: src/chage.c:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "Fejl under opdatering af DBM-adgangskodelinjen.\n" - -#: src/chage.c:692 +#: src/chage.c:649 #, c-format msgid "%s: can't rewrite shadow password file\n" msgstr "%s: kan ikke genskrive skyggeadgangskodefilen\n" -#: src/chage.c:740 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite password file\n" msgstr "%s: kan ikke genskrive adgangskodefilen\n" -#: src/chage.c:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 #, c-format msgid "%s: PAM chauthtok failed\n" msgstr "%s: PAM chauthtok fejlede\n" @@ -366,117 +348,122 @@ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" msgstr "" "Brug: %s [-f fulde_navn] [-r rum] [-w arbedstelefon] [-h hjemmetelefon]\n" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "Fulde navn" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "\tFulde navn: %s\n" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "Rum-nummer" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "Arbejdstelefon" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" msgstr "Hjemmetelefon" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "Andet" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s: Kan ikke afg繪re dit brugernavn.\n" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s: kan ikke 疆ndre brugeren`%s' p疇 NIS-klienten.\n" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "%s: `%s' er NIS-masteren for denne klient.\n" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, c-format +msgid "%s: Permission denied.\n" +msgstr "%s: Adgang n疆gtet.\n" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" msgstr "ndrer brugeroplysninger for %s\n" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s: ugyldigt navn: \"%s\"\n" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s: ugyldigt rum-nummer: \"%s\"\n" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s: ugyldig arbejdstelefon: \"%s\"\n" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s: ugyldig hjemmetelefon: \"%s\"\n" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s: \"%s\" indeholder ugyldige tegn\n" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "%s: felter for lange\n" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" msgstr "Kan ikke 疆ndre ID til root.\n" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" msgstr "Kan ikke l疇se adgangskodefilen; fors繪g igen senere.\n" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" msgstr "Kan ikke 疇bne adgangskodefilen.\n" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s: %s ikke fundet i /etc/passwd\n" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" msgstr "Fejl under opdatering af adgangskodelinje.\n" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" msgstr "Kan ikke skrive 疆ndringerne til adgangskodefilen.\n" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" msgstr "Kan ikke l疇se adgangskodefilen op.\n" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -500,48 +487,48 @@ msgstr "" msgid "%s: can't lock password file\n" msgstr "%s: kan ikke l疇se adgangskodefil\n" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "%s: Kan ikke l疇se skyggefilen\n" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "%s: Kan ikke 疇bne skyggefilen\n" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "%s: linje %d: linjen er for lang\n" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "%s: linje %d: mangler ny adgangskode\n" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "%s: linje %d: ukendt bruger %s\n" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "%s: linje %d: kan ikke opdatere adgangskodelinje\n" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "%s: fejl opdaget, 疆ndringerne blev ignoreret\n" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" msgstr "%s: fejl under opdatering af skyggefil\n" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" msgstr "%s: fejl under opdatering af adgangskodefil\n" @@ -551,26 +538,26 @@ msgstr "%s: fejl under opdatering af adgangskodefil\n" msgid "Usage: %s [-s shell] [name]\n" msgstr "Brug: %s [-s skal] [navn]\n" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" msgstr "Login-skal" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" msgstr "Du kan ikke 疆ndre skal for %s.\n" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" msgstr "ndrer login-skallen for %s\n" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s: Ugyldig linje: %s\n" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" msgstr "%s er en ugyldig skal.\n" @@ -580,12 +567,12 @@ msgstr "%s er en ugyldig skal.\n" msgid "Usage: expiry {-f|-c}\n" msgstr "Brug: expiry {-f|-c}\n" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" msgstr "%s: ADVARSEL! Skal v疆re set-UID root!\n" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "%s: ukendt bruger\n" @@ -599,8 +586,9 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" @@ -613,318 +601,283 @@ msgstr "" " -l, --lock-time SEK\t\tl疇s konto i SEK sekunder efter mislykket logind\n" " -m, -- maximum MAKS\t\ts疆t det maksimale antal mislykkede logind til MAKS\n" " -r, --reset\t\t\tnulstil opt疆llingen af mislykkede logind\n" +" -r, --time DAGE\t\tvis fejllog-optegnelser, der er nyere end DAGE\n" " -u, --user LOGIND\t\tvis fejllog-optegnelser eller vedligehold kun " "fejlt疆llere\n" "\t\t\t\tog gr疆nser (hvis den bruges sammen med tilvalgene -r, -m eller -l)\n" "\t\t\t\tfor brugeren med LOGIND\n" -#: src/faillog.c:86 +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" -msgstr "Brugernavn Fejl Maksimum Seneste\n" +msgid "Login Failures Maximum Latest On\n" +msgstr "Logind Fejl Maksimum Seneste Tid\n" -#: src/faillog.c:103 -#, c-format -msgid " %s on %s" -msgstr " %s p疇 %s" - -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" msgstr " [%lds tilbage]" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr " [%lds l疇s]" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "Ukendt bruger: %s\n" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "Brug: %s [-r|-R] gruppe\n" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr " %s [-a bruger] gruppe\n" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr " %s [-d bruger] gruppe\n" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr " %s [-A bruger,...] [-M bruger,...] gruppe\n" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr " %s [-M bruger,...] gruppe\n" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" msgstr "%s: der kr疆ves skyggeadgangskoder for -A\n" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "Hvem er du?\n" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr "ukendt gruppe: %s\n" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "Tilf繪jer brugeren %s til gruppen %s\n" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "Fjerner brugeren %s fra gruppen %s\n" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" msgstr "%s: ukendt medlem %s\n" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "%s: Ikke en tty\n" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "ndrer adgangskoden for gruppen %s\n" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "Ny adgangskode: " -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " msgstr "Gentag ny adgangskode: " -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" msgstr "De er ikke ens. Pr繪v igen" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" msgstr "%s: Pr繪v igen senere\n" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "%s: Kan ikke opn疇 l疇s\n" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" msgstr "%s: Kan ikke opn疇 skyggel疇s\n" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "%s: kan ikke 疇bne fil\n" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "%s: kan ikke opdatere linje\n" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" msgstr "%s: kan ikke opdatere skyggelinje\n" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "%s: kan ikke genskrive fil\n" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" msgstr "%s: kan ikke genskrive skyggefil\n" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "%s: kan ikke l疇se fil op\n" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "%s: kan ikke opdatere DBM-filer\n" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "%s: kan ikke opdatere DBM-skyggefiler\n" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "Brug: groupadd [-g gid [-o]] [-f] gruppe\n" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, c-format msgid "%s: error adding new group entry\n" msgstr "%s: fejl under tilf繪jelse af gruppelinje\n" -#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: kan ikke tilf繪je ny dbm-gruppelinje\n" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "%s: navnet %s er ikke unikt\n" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" msgstr "%s: gid %u er ikke unikt\n" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "%s: kan ikke f疇 unik gid\n" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, c-format msgid "%s: %s is not a valid group name\n" msgstr "%s: %s er ikke et gyldigt gruppenavn\n" -#: src/groupadd.c:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "%s: ugyldig gruppe %s\n" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "%s: -O kr疆ver NAVN=VRDI\n" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s: kan ikke genskrive gruppefil\n" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s: kan ikke genskrive skyggegruppefil\n" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" msgstr "%s: kan ikke l疇se gruppefil\n" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" msgstr "%s: kan ikke 疇bne gruppefil\n" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" msgstr "%s: kan ikke l疇se skyggegruppefil\n" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" msgstr "%s: kan ikke 疇bne skyggegruppefil\n" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "%s: gruppen %s eksisterer\n" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, c-format msgid "Usage: groupdel group\n" msgstr "Brug: groupdel gruppe\n" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" msgstr "%s: fejl under fjernelse af gruppelinje\n" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "%s: fejl under fjernelse af dbm-gruppelinje\n" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "%s: fejl under fjernelse af skyggegruppelinje\n" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "%s: fejl under fjernelse af dbm-skyggegruppelinje\n" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "%s: kan ikke fjerne brugerens prim疆re gruppe.\n" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "%s: gruppen %s eksisterer ikke\n" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "%s: gruppen %s er en NIS-gruppe\n" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s: %s er NIS-masteren\n" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "Brug: groupmod [-g gid [-o]] [-n navn] gruppe\n" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "%s: %s blev ikke fundet i /etc/group\n" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s: kan ikke tilf繪je ny dbm-skyggegruppelinje\n" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s: %u er ikke en unik gid\n" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "%s: %s er ikke et unikt navn\n" @@ -934,110 +887,105 @@ msgstr "%s: %s er ikke et unikt navn\n" msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "Brug: %s [-r] [-s] [gruppe [gskygge]]\n" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "Brug %s [-r] [-s] [gruppe]\n" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "Nej" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" msgstr "%s: -s og -r er ikke kompatible\n" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "%s: kan ikke l疇se filen %s\n" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "%s: kan ikke 疇bne filen %s\n" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" msgstr "ugyldig gruppefils-linje\n" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "slet linjen '%s'? " -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" msgstr "gruppelinjen er en dublet\n" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" msgstr "ugyldigt gruppenavn '%s'\n" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "gruppe %s: ingen bruger %s\n" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " msgstr "slet medlemmet`%s'? " -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" msgstr "ugyldig skyggegruppefils-linje\n" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" msgstr "skyggegruppelinjen er en dublet\n" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" msgstr "ingen tilsvarende gruppefilslinje\n" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" msgstr "skyggegruppen %s: ingen administrator-bruger %s\n" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " msgstr "slet administrator-medlemmet '%s'? " -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" msgstr "skyggegruppen %s: ingen bruger %s\n" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "%s: kan ikke opdatere filen %s\n" -#: src/grpck.c:647 src/pwck.c:612 -#, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: filerne er blevet opdateret; k繪r mkpasswd\n" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format -msgid "%s: no changes\n" -msgstr "%s: ingen 疆ndringer\n" - -#: src/grpck.c:651 src/pwck.c:616 +#: src/grpck.c:640 src/pwck.c:606 #, c-format msgid "%s: the files have been updated\n" msgstr "%s: filerne er blevet opdateret\n" +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "%s: ingen 疆ndringer\n" + #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" @@ -1053,37 +1001,37 @@ msgstr "%s: kan ikke 疇bne gruppefilen\n" msgid "%s: can't lock shadow group file\n" msgstr "%s: kan ikke l疇se skyggegruppefilen\n" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" msgstr "%s: kan ikke 疇bne skyggegruppefilen\n" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "%s: kan ikke fjerne skyggegruppen %s\n" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "%s: kan ikke opdatere skygge-linjen for %s\n" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "%s: kan ikke opdatere linjen for gruppen %s\n" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" msgstr "%s: kan ikke opdatere skyggegruppefilen\n" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" msgstr "%s: kan ikke opdatere gruppefilen\n" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "%s: kan ikke slette skyggegruppefilen\n" @@ -1103,13 +1051,13 @@ msgstr "Brug: id\n" msgid " groups=" msgstr " grupper=" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" @@ -1121,41 +1069,41 @@ msgstr "" " -h, --help\t\tdvis denne hj疆lpebesked og afslut\n" " -t, --time DAGE\tvis kun lastlog-optegnelser, der er nyere end DAGE\n" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" msgstr "Brugernavn Port Fra Seneste\n" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "Brugernavn Port Seneste\n" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "**Har aldrig logget p疇**" -#: src/login.c:175 +#: src/login.c:156 #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Brug: %s [-p] [navn]\n" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr " %s [-p] [-h v疆rt] [-f navn]\n" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr " %s [-p] -r v疆rt\n" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" msgstr "Ugyldig login-tid\n" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" @@ -1164,7 +1112,7 @@ msgstr "" "\n" "Systemet er lukket for rutinem疆ssig vedligehold\n" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" @@ -1173,7 +1121,7 @@ msgstr "" "\n" "[Afbr繪d ikke forbindelsen -- root-login er tilladt.]\n" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" @@ -1182,17 +1130,17 @@ msgstr "" "\n" "Login udl繪b efter %d sekunder.\n" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" msgstr " p疇 `%.100s' fra `%.200s'" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" msgstr " p疇 `%.100s'" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" @@ -1201,38 +1149,29 @@ msgstr "" "\n" "%s login: " -#: src/login.c:819 -msgid "login: " -msgstr "login: " - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" msgstr "Forkert login" -#: src/login.c:1198 +#: src/login.c:996 msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "Advarsel: login genetableret efter midlertidig udelukkelse.\n" -#: src/login.c:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "Sidst logget p疇: %s p疇 %s" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" msgstr "Sidst logget p疇: %.19s p疇 %s" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" msgstr " fra %.*s" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "Starter rad_login\n" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" @@ -1249,9 +1188,9 @@ msgid "%s: cannot open DBM files for %s\n" msgstr "%s: kan ikke 疇bne DBM-filer for %s\n" #: src/mkpasswd.c:286 -#, fuzzy, c-format +#, c-format msgid "%s: the line beginning with %.16s... is too long\n" -msgstr "%s: begyndelsen med " +msgstr "%s: linjen, der starter med %.16s... er for lang\n" #: src/mkpasswd.c:313 #, c-format @@ -1273,17 +1212,17 @@ msgstr "%s: fejl under tilf繪jelse af post for %s\n" msgid "added %d entries, longest was %d\n" msgstr "tilf繪jede %d poster, den l疆ngste var %d\n" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "Brug: %s [-vf] [-p|g|sp|sg] fil\n" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "Brug: %s [-vf] [-p|g|sp] fil\n" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "Brug: %s [-vf] [-p|g] fil\n" @@ -1303,16 +1242,16 @@ msgstr "Brug: sg gruppe [[-c] kommando]\n" msgid "unknown uid: %u\n" msgstr "ukendt uid: %u\n" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" msgstr "ukendt gid: %lu\n" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "Beklager.\n" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "for mange grupper\n" @@ -1322,91 +1261,91 @@ msgstr "for mange grupper\n" msgid "Usage: %s [input]\n" msgstr "Brug: %s [inddata]\n" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "%s: kan ikke l疇se /etc/passwd.\n" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "%s: kan ikke l疇se filer. Pr繪v igen senere\n" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "%s: kan ikke 疇bne filer\n" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "%s: linje %d: ugyldig linje\n" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "%s: linje %d: kan ikke oprette GID\n" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "%s: linje %d: kan ikke oprette UID\n" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "%s: linje %d: kan ikke finde brugeren %s\n" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "%s: linje %d: kan ikke opdatere adgangskode\n" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "%s: linje %d: mkdir fejlede\n" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "%s: linje %d: chown fejlede\n" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "%s: linje %d: kan ikke opdatere posten\n" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "%s: fejl under opdatering af filerne\n" -#: src/passwd.c:155 +#: src/passwd.c:154 #, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "Brug: %s [-f|-s] [navn]\n" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr " %s [-x maks] [-n min] [-w advar] [-i inact] navn\n" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} navn\n" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "Gammel adgangskode: " -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" msgstr "Ugyldig adgangskode for `%s'\n" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" @@ -1415,16 +1354,16 @@ msgstr "" "Angiv ny adgangskode (mindst %d, h繪jst %d tegn)\n" "Brug en kombination af sm疇 og store bogstaver samt tal.\n" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "Ny adgangskode: " -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" msgstr "Pr繪v igen.\n" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" @@ -1433,52 +1372,52 @@ msgstr "" "\n" "Advarsel: svag adgangskode (skriv den igen for at bruge det alligevel).\n" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" msgstr "De er ikke ens; pr繪v igen.\n" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "Adgangskoden for %s kan ikke 疆ndres.\n" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" msgstr "Beklager, adgangskoden for %s kan endnu ikke 疆ndres.\n" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "%s: hukommelse opbrugt\n" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "%s: Kan ikke udf繪re %s" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" msgstr "%s: samlingen %s underst繪ttes ikke\n" -#: src/passwd.c:914 +#: src/passwd.c:884 #, c-format -msgid "You may not change the password for %s.\n" -msgstr "Du kan ikke 疆ndre adgangskoden for %s.\n" +msgid "%s: You may not view or modify password information for %s.\n" +msgstr "%s: Du har ikke lov til at se adgangskodeoplysninger for %s.\n" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "ndrer adgangskode for %s\n" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "Adgangskoden for %s er u疆ndret.\n" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "Adgangskode 疆ndret.\n" @@ -1493,49 +1432,49 @@ msgstr "Brug: %s [-q] [-r] [-s] [adgangskode [skygge]]\n" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "Brug: %s [-q] [-r] [-s] [adgangskode]\n" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" msgstr "ugyldig linje i adgangskodefil\n" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" msgstr "adgangskodelinjen er en dublet\n" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" msgstr "ugyldigt brugernavn'%s'\n" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "bruger %s: ingen gruppe %u\n" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "bruger %s: mappen %s eksisterer ikke\n" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "bruger %s: programmet %s eksisterer ikke\n" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" msgstr "ugyldig linje i skyggeadgangskodefil\n" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" msgstr "skyggeadgangskodelinjen er en dublet\n" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" msgstr "fandt ingen tilsvarende linje i adgangskodefilen\n" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" msgstr "bruger %s: seneste 疆ndring af adgangskoden skete i fremtiden\n" @@ -1555,17 +1494,17 @@ msgstr "%s: kan ikke 疇bne adgangskodefil\n" msgid "%s: can't remove shadow entry for %s\n" msgstr "%s: kan ikke fjerne skyggelinjen for %s\n" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "%s: kan ikke opdatere adgangskodelinjen for %s\n" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" msgstr "%s: kan ikke opdatere skyggefilen\n" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" msgstr "%s: kan ikke opdatere adgangskodefilen\n" @@ -1575,40 +1514,40 @@ msgstr "%s: kan ikke opdatere adgangskodefilen\n" msgid "%s: can't update entry for user %s\n" msgstr "%s: kan ikke opdatere linje for brugeren %s\n" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format msgid "%s: can't delete shadow password file\n" msgstr "%s: kan ikke slette skyggeadgangskodefilen\n" -#: src/su.c:133 +#: src/su.c:132 msgid "Sorry." msgstr "Beklager." -#: src/su.c:323 +#: src/su.c:320 #, c-format msgid "%s: must be run from a terminal\n" msgstr "%s: skal k繪res fra en terminal\n" -#: src/su.c:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "%s: pam_start: fejl %d\n" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" msgstr "Ukendt id: %s\n" -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, c-format msgid "You are not authorized to su %s\n" msgstr "Du er ikke autoriseret til at 'su %s'\n" -#: src/su.c:502 +#: src/su.c:495 msgid "(Enter your own password.)" msgstr "(Angiv din adgangskode.)" -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" @@ -1617,22 +1556,22 @@ msgstr "" "%s: %s\n" "(Ignoreret)\n" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" msgstr "Ingen skal\n" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr "Adgang til at udf繪re su til den konto er NGTET.\n" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "Gik uden om adgangskode-autentifikation.\n" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" msgstr "Angiv din EGEN adgangskode som autentifikation.\n" @@ -1647,7 +1586,7 @@ msgstr "Ingen adgangskodefil\n" msgid "No password entry for 'root'\n" msgstr "Ingen adgangskodelinje for 'root'\n" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" @@ -1657,236 +1596,216 @@ msgstr "" "Tryk control-d for at forts疆tte den normale opstart,\n" "(eller angiv root-adgangskoden for systemvedligehold):" -#: src/sulogin.c:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" msgstr "G疇r i systemvedligeholdelses-tilstand\n" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "%s: genopbygger gruppe-databasen\n" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "%s: genopbygger skyggegruppe-databasen\n" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "%s: ugyldigt numerisk parameter`%s'\n" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "%s: ukendt gid %s\n" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "%s: ukendt gruppe %s\n" -#: src/useradd.c:475 +#: src/useradd.c:418 #, c-format msgid "%s: cannot create new defaults file\n" msgstr "%s: kan ikke oprette ny standardv疆rdi-fil\n" -#: src/useradd.c:480 +#: src/useradd.c:423 #, c-format msgid "%s: cannot open new defaults file\n" msgstr "%s: kan ikke 疇bne ny standardv疆rdi-fil\n" -#: src/useradd.c:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" msgstr "%s: omd繪b: %s" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s: gruppen`%s' er en NIS-gruppe.\n" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "%s: der er angivet for mange grupper (maks %d).\n" -#: src/useradd.c:721 +#: src/useradd.c:660 #, 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:724 +#: src/useradd.c:663 #, c-format msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr "" " [-d hjemmemappe] [-s skal] [-c kommentar] [-m [-k skabelon]]\n" -#: src/useradd.c:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, c-format msgid " [-f inactive] [-e expire]\n" msgstr " [-f inaktiv] [-e udl繪b ]\n" -#: src/useradd.c:728 +#: src/useradd.c:667 #, c-format msgid " [-p passwd] name\n" msgstr " [-p adgangskode] navn\n" -#: src/useradd.c:730 +#: src/useradd.c:669 #, 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:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, c-format msgid "%s: error locking group file\n" msgstr "%s: fejl under l疇sning af gruppefil\n" -#: src/useradd.c:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, c-format msgid "%s: error opening group file\n" msgstr "%s: fejl under 疇bning af gruppefil\n" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, c-format msgid "%s: error locking shadow group file\n" msgstr "%s: fejl under l疇sning af skyggegruppefil\n" -#: src/useradd.c:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, c-format msgid "%s: error opening shadow group file\n" msgstr "%s: fejl under 疇bning af skyggegruppefil\n" -#: src/useradd.c:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "%s: uid %u er ikke unik\n" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "%s: kan ikke f疇 unik uid\n" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "%s: ugyldig grundmappe '%s'\n" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "%s: ugyldig kommentar '%s'\n" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "%s: ugyldig hjemmemappe '%s'\n" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s: ugyldig dato '%s'\n" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "%s: der kr疆ves skyggeadgangskoder for -e\n" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, c-format msgid "%s: shadow passwords required for -f\n" msgstr "%s: der kr疆ves skyggeadgangskoder for -f\n" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" msgstr "%s: ugyldigt felt ''%s'\n" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "%s: ugyldig skal '%s'\n" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "%s: ugyldigt brugernavn '%s'\n" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "%s: kan ikke genskrive adgangskodefilen\n" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "%s: kan ikke genskrive skyggeadgangskodefilen\n" -#: src/useradd.c:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, c-format msgid "%s: unable to lock password file\n" msgstr "%s: kunne ikke l疇se adgangskodefilen\n" -#: src/useradd.c:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, c-format msgid "%s: unable to open password file\n" msgstr "%s: kunne ikke 疇bne adgangskodefilen\n" -#: src/useradd.c:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, c-format msgid "%s: cannot lock shadow password file\n" msgstr "%s: kunne ikke l疇se skyggeadgangskodefilen\n" -#: src/useradd.c:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, c-format msgid "%s: cannot open shadow password file\n" msgstr "%s: kunne ikke 疇bne skyggeadgangskodefilen\n" -#: src/useradd.c:1459 +#: src/useradd.c:1354 #, c-format msgid "%s: error adding new password entry\n" msgstr "%s: fejl under tilf繪jelse af ny adgangskodelinje\n" -#: src/useradd.c:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "%s: fejl under opdatering af dbm-adgangskodelinje\n" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, 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:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s: fejl under opdatering af af skyggeadgangskode-linje\n" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" msgstr "%s: kan ikke oprette mappen %s\n" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, 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:1590 +#: src/useradd.c:1446 #, c-format msgid "Can't create mail spool for user %s.\n" msgstr "Kan ikke oprette postk繪 for brugeren %s.\n" -#: src/useradd.c:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "%s: brugeren %s eksisterer\n" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" @@ -1894,206 +1813,171 @@ msgstr "" "%s: gruppen %s eksisterer - brug -g hvis du vil tilf繪je denne bruger til den " "gruppe.\n" -#: src/useradd.c:1767 +#: src/useradd.c:1602 #, 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" -#: src/userdel.c:124 +#: src/userdel.c:108 #, c-format msgid "Usage: %s [-r] name\n" msgstr "Brug: %s [-r] navn\n" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" msgstr "%s: fejl under opdatering af gruppelinje\n" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "%s: kan ikke opdatere dbm-gruppelinje\n" - -#: src/userdel.c:214 -#, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: kan ikke fjerne dbm-gruppelinje\n" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "%s: kan ikke 疇bne gruppefilen\n" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "%s: kan ikke 疇bne skyggegruppefilen\n" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "%s: fejl under sletning af adgangskodelinje\n" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "%s: fejl under sletning af skyggeadgangskodelinje\n" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "%s: fejl under sletning af dbm-adgangskodelinje\n" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s: fejl under sletning af dbm-skyggeadgangskodelinje\n" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "%s: brugeren %s er logget p疇\n" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "%s: %s ejes ikke af %s, fjerner ikke\n" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " msgstr "%s: advarsel: kan ikke fjerne " -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" msgstr "%s: brugeren %s eksisterer ikke\n" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s: brugeren %s er en NIS-bruger\n" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "" "%s: fjerner ikke mappen %s (det ville fjerne hjemmemappen for brugeren %s)\n" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "%s: fejl under fjernelse af mappen %s\n" -#: src/usermod.c:306 +#: src/usermod.c:289 #, c-format msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "Brug: %s\t[-u uid [-o]] [-g gruppe] [-G gruppe,...] \n" -#: src/usermod.c:310 +#: src/usermod.c:293 #, 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:313 +#: src/usermod.c:296 #, c-format msgid "[-f inactive] [-e expire] " msgstr "[-f inaktiv] [-e udl繪b ] " -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p adgangskode] [-L|-U] navn\n" -#: src/usermod.c:495 +#: src/usermod.c:476 #, 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:622 +#: src/usermod.c:585 #, 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:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "%s: ingen flag angivet\n" -#: src/usermod.c:965 +#: src/usermod.c:903 #, 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:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "%s: uid %lu er ikke unik\n" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, c-format msgid "%s: error changing password entry\n" msgstr "%s: fejl under 疆ndring af adgangskodelinje\n" -#: src/usermod.c:1122 +#: src/usermod.c:1053 #, c-format msgid "%s: error removing password entry\n" msgstr "%s: fejl under fjernelse af adgangskodelinje\n" -#: src/usermod.c:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "%s: fejl under tilf繪jelse af dbm-adgangskodelinje\n" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "%s: fejl under fjernelse af dbm-adgangskodelinje\n" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "%s: fejl under fjernelse af skyggeadgangskodelinje\n" -#: src/usermod.c:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s: fejl under fjernelse af dbm-skyggeadgangskodelinje\n" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "%s: mappen %s eksisterer\n" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "%s: kan ikke oprette %s\n" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" msgstr "%s: kan ikke chown %s\n" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, 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:1333 +#: src/usermod.c:1223 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "%s: advarsel: %s ejes ikke af %s\n" -#: src/usermod.c:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" msgstr "kunne ikke 疆ndre postkassens ejer" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" msgstr "kunne ikke omd繪be postkasse" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" @@ -2102,20 +1986,20 @@ msgstr "" "\n" "%s: %s er u疆ndret\n" -#: src/vipw.c:133 +#: src/vipw.c:131 msgid "Couldn't lock file" msgstr "kunne ikke l疇se filen" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" msgstr "kunne ikke lave sikkerhedskopi" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s: kunne ikke genskabe %s: %s (dine 疆ndringer er i %s)\n" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/po/de.gmo b/po/de.gmo index 7bb7131f..e8614a7c 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index 4d8530b6..7170289b 100644 --- a/po/de.po +++ b/po/de.po @@ -7,20 +7,21 @@ msgid "" msgstr "" "Project-Id-Version: shadow 19990709\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-26 07:53+0100\n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" "PO-Revision-Date: 2002-03-11 12:02-0100\n" "Last-Translator: Frank Schmid \n" "Language-Team: Frank Schmid \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" msgstr "Warnung: Gruppe %s ist unbekannt\n" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" msgstr "Warnung: zu viele Gruppen\n" @@ -48,17 +49,17 @@ msgstr " Verst瓣ndigen Sie den Systemadministrator.\n" msgid " Choose a new password.\n" msgstr " W瓣hlen Sie ein neues Kennwort.\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "Ihr Kennwort l瓣uft in %ld Tagen ab.\n" -#: libmisc/age.c:174 +#: libmisc/age.c:172 #, c-format msgid "Your password will expire tomorrow.\n" msgstr "Ihr Kennwort l瓣uft morgen ab.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:174 #, c-format msgid "Your password will expire today.\n" msgstr "Ihr Kennwort l瓣uft heute ab.\n" @@ -73,39 +74,27 @@ msgstr "tty %s kann nicht ge瓣ndert werden" msgid "Environment overflow\n" msgstr "Umgebungs羹berlauf\n" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr "Sie k繹nnen $%s nicht 瓣ndern\n" -#: libmisc/failure.c:230 -#, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "%d %s seit letzter Verbindung. Die letzte war am %s auf %s.\n" +#: libmisc/failure.c:229 +#, fuzzy, c-format +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "%d %s seit letzter Verbindung. Die letzte war am %s auf %s.\n" +msgstr[1] "%d %s seit letzter Verbindung. Die letzte war am %s auf %s.\n" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "Fehlanmeldungen" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "Fehlanmeldung" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" msgstr "Zu viele Verbindungen.\n" -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "Kennwort entschl羹sselt den Schl羹ssel f羹r %s nicht.\n" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "Kann den Schl羹ssel von %s nicht setzen: l瓣uft der keyserv-Dienst ?\n" - #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "Sie haben neue Post." @@ -118,7 +107,7 @@ msgstr "Keine Post vorhanden." msgid "You have mail." msgstr "Sie haben Post." -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " msgstr "Schlechtes Kennwort: %s. " @@ -133,20 +122,20 @@ msgstr "passwd: pam_start() fehlgeschlagen, Fehler %d\n" msgid "passwd: %s\n" msgstr "passwd: %s\n" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" msgstr "" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "Kann nicht in Verzeichnis \"%s\" wechseln\n" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" msgstr "Kein Verzeichnis, Anmeldung mit HOME=/" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr "Kann %s nicht ausf羹hren" @@ -161,36 +150,32 @@ msgstr "Ung羹ltiges Basis-Verzeichnis \"%s\"\n" msgid "Can't change root directory to \"%s\"\n" msgstr "Kann Basisverzeichnis nicht nach \"%s\" 瓣ndern\n" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "malloc(%d) fehlgeschlagen\n" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" msgstr "Kann keinen Speicherplatz f羹r Konfigurationsinformation reservieren.\n" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "" "Konfigurationsfehler - Element '%s' unbekannt (Administrator verst瓣ndigen)\n" -#: lib/pwauth.c:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "Kennwort: " -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "Kennwort von %s: " -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "(Echo an) " - -#: src/chage.c:118 +#: src/chage.c:112 #, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" @@ -199,154 +184,147 @@ msgstr "" "Syntax: chage [-l] [-m min_tage] [-M max_tage] [-W warnung]\n" " [-I inaktiv] [-E ablauf] [-d letzter_tag] Benutzer\n" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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:155 +#: src/chage.c:149 msgid "Minimum Password Age" msgstr "Minimales Kennwortalter" -#: src/chage.c:161 +#: src/chage.c:155 msgid "Maximum Password Age" msgstr "Maximales Kennwortalter" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" msgstr "Letzte Kennwort瓣nderung (JJJJ-MM-TT)" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" msgstr "Warnung falls Kennwort abl瓣uft" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "Kennwort inaktiv" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Ablaufdatum des Accounts (JJJJ-MM-TT)" -#: src/chage.c:238 +#: src/chage.c:231 #, fuzzy, c-format msgid "Last password change\t\t\t\t\t: " msgstr "Letzte Kennwort瓣nderung (JJJJ-MM-TT)" -#: src/chage.c:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 #, fuzzy, c-format msgid "never\n" msgstr "Nie\n" -#: src/chage.c:251 +#: src/chage.c:244 #, fuzzy, c-format msgid "Password expires\t\t\t\t\t: " msgstr "Kennwort l瓣uft ab :\t" -#: src/chage.c:267 +#: src/chage.c:260 #, fuzzy, c-format msgid "Password inactive\t\t\t\t\t: " msgstr "Kennwort inaktiv:\t" -#: src/chage.c:281 +#: src/chage.c:274 #, fuzzy, c-format msgid "Account expires\t\t\t\t\t\t: " msgstr "Account l瓣uft ab:\t" -#: src/chage.c:297 +#: src/chage.c:290 #, c-format msgid "Minimum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:298 +#: src/chage.c:292 #, c-format msgid "Maximum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:299 +#: src/chage.c:294 #, c-format msgid "Number of days of warning before password expires\t: %ld\n" msgstr "" -#: src/chage.c:444 +#: src/chage.c:431 #, c-format msgid "%s: do not include \"l\" with other flags\n" msgstr "%s: benutzen Sie nicht \"l\" mit anderen Optionen\n" -#: src/chage.c:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 #, fuzzy, c-format msgid "%s: permission denied.\n" msgstr "%s: Zugriff verweigert\n" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 #, fuzzy, c-format msgid "%s: PAM authentication failed\n" msgstr "%s: PAM-Authentifizierung fehlgeschlagen\n" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, c-format msgid "%s: can't open password file\n" msgstr "%s: Kann Kennwortdatei nicht 繹ffnen\n" -#: src/chage.c:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "%s: Benutzer %s unbekannt\n" -#: src/chage.c:535 +#: src/chage.c:519 #, c-format msgid "%s: can't lock shadow password file" msgstr "%s: Kann Shadow-Datei nicht sperren" -#: src/chage.c:543 +#: src/chage.c:527 #, c-format msgid "%s: can't open shadow password file" msgstr "%s: Kann Shadow-Datei nicht 繹ffnen" -#: src/chage.c:604 +#: src/chage.c:587 #, c-format msgid "Changing the aging information for %s\n" msgstr "ndere die Kennwortalterung f羹r %s\n" -#: src/chage.c:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" msgstr "%s: Fehler beim 瓣ndern der Felder\n" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, c-format msgid "%s: can't update password file\n" msgstr "%s: Kann Kennwortdatei nicht aktualisieren\n" -#: src/chage.c:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" msgstr "%s: Kann Shadow-Datei nicht aktualisieren\n" -#: src/chage.c:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "Fehler beim aktualisieren des DBM-Kennworteintrags.\n" - -#: src/chage.c:692 +#: src/chage.c:649 #, c-format msgid "%s: can't rewrite shadow password file\n" msgstr "%s: Kann die Shadow-Datei nicht neu erstellen\n" -#: src/chage.c:740 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite password file\n" msgstr "%s: Kann die Kennwortdatei nicht neu erstellen\n" -#: src/chage.c:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 #, fuzzy, c-format msgid "%s: PAM chauthtok failed\n" msgstr "%s: PAM chauthtok fehlgeschlagen\n" @@ -365,118 +343,123 @@ msgstr "" msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" msgstr "Syntax: %s [-f name] [-r raum] [-w tel_gesch] [-h tel_privat]\n" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "Name" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "\tName: %s\n" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "Raum" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "Telefon gesch瓣ftlich" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" msgstr "Telefon privat" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "Sonstiges" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s: Kann Ihren Benutzernamen nicht feststellen.\n" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s: Kann den Benutzer `%s' nicht auf dem NIS-Client 瓣ndern.\n" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "%s: `%s' ist der NIS-Master f羹r diesen Client.\n" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, fuzzy, c-format +msgid "%s: Permission denied.\n" +msgstr "%s: Zugriff verweigert\n" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" msgstr "ndere Benutzerinformationen f羹r %s\n" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s: Name ung羹ltig: \"%s\"\n" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s: Raumnummer ung羹ltig: \"%s\"\n" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s: Telefon (gesch瓣ftlich) ung羹ltig: \"%s\"\n" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s: Telefon (privat) ung羹ltig: \"%s\"\n" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s: \"%s\" enth瓣lt ung羹ltige Zeichen\n" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "%s: Feld zu lang\n" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" msgstr "Kann ID nicht zu root 瓣ndern.\n" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" msgstr "" "Kann die Kennwortdatei nicht sperren; versuchen Sie es sp瓣ter nocheinmal.\n" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" msgstr "Kann die Kennwortdatei nicht 繹ffnen.\n" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s: %s nicht in /etc/passwd gefunden\n" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" msgstr "Fehler beim aktualisieren des Kennworteintrags.\n" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" msgstr "Kann nderungen in der Kennwortdatei nicht schreiben.\n" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" msgstr "Kann die Kennwortdatei nicht entsperren.\n" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -493,48 +476,48 @@ msgstr "" msgid "%s: can't lock password file\n" msgstr "%s: kann Kennwortdatei nicht sperren\n" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "%s: Kann die Shadow-Datei nicht sperren\n" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "%s: Kann die Shadow-Datei nicht 繹ffnen\n" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "%s: Zeile %d: Zeile zu lang\n" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "%s: Zeile %d: Neues Kennwort fehlt\n" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "%s: Zeile %d: Benutzer %s unbekannt\n" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "%s: Zeile %d: Kann Kennworteintrag nicht aktualisieren\n" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "%s: Fehler entdeckt, nderungen werden verworfen\n" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" msgstr "%s: Fehler beim aktualisieren der Shadow-Datei\n" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" msgstr "%s: Fehler beim Aktualisieren der Kennwortdatei\n" @@ -544,26 +527,26 @@ msgstr "%s: Fehler beim Aktualisieren der Kennwortdatei\n" msgid "Usage: %s [-s shell] [name]\n" msgstr "Syntax: %s [-s shell] [Name]\n" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" msgstr "Login-Shell" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" msgstr "Sie d羹rfen die Shell f羹r %s nicht 瓣ndern.\n" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" msgstr "ndere die Login-Shell f羹r %s\n" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s: Ung羹ltiger Eintrag: %s\n" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" msgstr "%s ist eine ung羹ltige Shell.\n" @@ -573,12 +556,12 @@ msgstr "%s ist eine ung羹ltige Shell.\n" msgid "Usage: expiry {-f|-c}\n" msgstr "Syntax: expiry {-f|-c}\n" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" msgstr "%s: WARNUNG! Muss set-UID root sein\n" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "%s: Unbekannter Benutzer\n" @@ -592,320 +575,285 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" msgstr "" -#: src/faillog.c:86 +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" -msgstr "Benutzer Fehler Maximum Letzter\n" +msgid "Login Failures Maximum Latest On\n" +msgstr "" -#: src/faillog.c:103 -#, c-format -msgid " %s on %s" -msgstr " %s an %s" - -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" msgstr " [%lds 羹brig]" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr " [%lds Sperre]" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "Benutzer %s unbekannt\n" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "Syntax: %s [-r|-R] Gruppe\n" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr " %s [-a Benutzer] Gruppe\n" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr " %s [-d Benutzer] Gruppe\n" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr " %s [-A Benutzer,...] [-M Benutzer,...] Gruppe\n" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr " %s [-M Benutzer,...] Gruppe\n" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" msgstr "%s: Shadow-Gruppen-Kennw繹rter f羹r -A ben繹tigt\n" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "Wer sind Sie?\n" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr "Unbekannte Gruppe: %s\n" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "F羹ge Benutzer %s zu Gruppe %s hinzu\n" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "Entferne Benutzer %s aus der Gruppe %s\n" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" msgstr "%s: Mitglied %s unbekannt\n" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "%s: Kein tty\n" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "ndere Kennwort f羹r die Gruppe %s\n" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "Neues Kennwort: " -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " msgstr "Kennwort wiederholen: " -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" msgstr "Keine bereinstimmung; versuchen Sie es nocheinmal" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" msgstr "%s: Versuchen Sie es sp瓣ter nocheinmal\n" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "%s: Kann Sperre nicht lesen\n" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" msgstr "%s: Kann Sperre nicht aus Shadow-Datei lesen\n" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "%s: Kann Datei nicht 繹ffnen\n" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "%s: Eintrag kann nicht aktualisiert werden\n" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" msgstr "%s: Shadow-Eintrag kann nicht aktualisiert werden\n" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "%s: Datei kann nicht neu erstellt werden\n" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" msgstr "%s: Shadow-Datei kann nicht neu erstellt werden\n" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "%s: Datei kann nicht entsperrt werden\n" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "%s: DBM-Dateien k繹nnen nicht aktualisiert werden\n" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "%s: DBM-Shadow-Dateien k繹nnen nicht aktualisiert werden\n" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "Syntax: groupadd [-g gid [-o]] [-f] Gruppe\n" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, c-format msgid "%s: error adding new group entry\n" msgstr "%s: Fehler beim Hinzuf羹gen eines neuen Gruppeneintrags\n" -#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: Kann keinen neuen DBM-Gruppen-Eintrag hinzuf羹gen\n" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "%s: Name %s ist nicht eindeutig\n" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" msgstr "%s: GID %u ist nicht eindeutig\n" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "%s: Kann keine eindeutige GID feststellen\n" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, c-format msgid "%s: %s is not a valid group name\n" msgstr "%s: %s ist kein g羹ltiger Gruppenname\n" -#: src/groupadd.c:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "%s: Ung羹ltige Gruppe %s\n" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "%s: -O ben繹tigt NAME=WERT\n" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s: Kann Gruppendatei nicht neu erstellen\n" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s: Kann Shadow-Gruppendatei nicht neu erstellen\n" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" msgstr "%s: Kann Gruppendatei nicht sperren\n" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" msgstr "%s: Kann Gruppendatei nicht 繹ffnen\n" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" msgstr "%s: Kann Shadow-Gruppendatei nicht sperren\n" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" msgstr "%s: Kann Shadow-Gruppendatei nicht 繹ffnen\n" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "%s: Gruppe %s bereits vorhanden\n" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, c-format msgid "Usage: groupdel group\n" msgstr "Syntax: groupdel Gruppe\n" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" msgstr "%s: Fehler beim Entfernen des Gruppeneintrags\n" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "%s: Fehler beim Entfernen des DBM-Gruppeneintrags\n" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "%s: Fehler beim Entfernen des Shadow-Gruppeneintrags\n" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "%s: Fehler beim Entfernen des DBM-Shadow-Gruppeneintrags\n" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "%s: Kann die prim瓣re Gruppe des Benutzers nicht entfernen.\n" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "%s: Gruppe %s existiert nicht\n" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "%s: Gruppe %s ist eine NIS-Gruppe\n" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s: %s ist der NIS-Master\n" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "Syntax: groupmod [-g gid [-o]] [-n Name] Gruppe\n" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "%s: %s nicht in /etc/group gefunden\n" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s: Kann DBM-Shadow-Gruppeneintrag nicht hinzuf羹gen\n" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s: %u ist keine eindeutige GID\n" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "%s: %s ist kein eindeutiger Name\n" @@ -915,110 +863,105 @@ msgstr "%s: %s ist kein eindeutiger Name\n" msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "Syntax: %s [-r] [-s] [Gruppe [gshadow]]\n" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "Syntax: %s [-r] [-s] [Gruppe]\n" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "Nein" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" msgstr "" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "%s: Kann Datei %s nicht sperren\n" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "%s: Kann Datei %s nicht 繹ffnen\n" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" msgstr "Ung羹ltiger Eintrag in Gruppendatei\n" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "Zeile `%s' l繹schen? " -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" msgstr "Doppelter Gruppeneintrag\n" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" msgstr "Gruppenname `%s' ung羹ltig\n" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "Gruppe %s: Kein Benutzer %s\n" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " msgstr "Mitglied `%s' l繹schen? " -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" msgstr "Ung羹ltiger Shadow-Gruppeneintrag\n" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" msgstr "Doppelter Shadow-Gruppeneintrag\n" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" msgstr "Kein passender Gruppeneintrag\n" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" msgstr "Shadow-Gruppe %s: Benutzer %s ist kein Administrator\n" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " msgstr "Administratives Mitglied `%s' l繹schen?" -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" msgstr "Shadow-Gruppe %s: kein Benutzer %s\n" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "%s: Kann Datei %s nicht aktualisieren\n" -#: src/grpck.c:647 src/pwck.c:612 -#, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: Die Dateien wurden aktualisiert; starten Sie mkpasswd\n" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format -msgid "%s: no changes\n" -msgstr "%s: keine nderungen\n" - -#: src/grpck.c:651 src/pwck.c:616 +#: src/grpck.c:640 src/pwck.c:606 #, c-format msgid "%s: the files have been updated\n" msgstr "%s: Die Dateien wurden aktualisiert\n" +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "%s: keine nderungen\n" + #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" @@ -1034,37 +977,37 @@ msgstr "%s: Kann Gruppendatei nicht 繹ffnen\n" msgid "%s: can't lock shadow group file\n" msgstr "%s: Kann Shadow-Gruppendatei nicht sperren\n" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" msgstr "%s: Kann Shadow-Gruppendatei nicht 繹ffnen\n" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "%s: Kann Shadow-Gruppe %s nicht entfernen\n" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "%s: Kann Shadow-Eintrag f羹r %s nicht aktualisieren\n" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "%s: Kann Gruppeneintrag %s nicht aktualisieren\n" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" msgstr "%s: Kann Shadow-Gruppendatei nicht aktualisieren\n" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" msgstr "%s: Kann Gruppendatei nicht aktualisieren\n" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "%s: Kann Shadow-Gruppendatei nicht l繹schen\n" @@ -1084,52 +1027,52 @@ msgstr "Syntax: id\n" msgid " groups=" msgstr " Gruppen=" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" msgstr "Benutzer Port Von Letzter\n" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "Benutzer Port Letzter\n" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "**Nie angemeldet **" -#: src/login.c:175 +#: src/login.c:156 #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Syntax: %s [-p] [Name]\n" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr " %s [-p] [-h Host] [-f Name]\n" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr " %s [-p] -r Host\n" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" msgstr "Ung羹ltige Anmeldezeit\n" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" @@ -1138,7 +1081,7 @@ msgstr "" "\n" "System wegen Wartungsarbeiten geschlossen\n" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" @@ -1147,7 +1090,7 @@ msgstr "" "\n" "[Trennung abgebrochen -- root-Login erlaubt.]\n" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" @@ -1156,17 +1099,17 @@ msgstr "" "\n" "Login: Timeout nach %d Sekunden.\n" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" msgstr " an `%.100s' von `%.200s'" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" msgstr " an `%.100s'" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" @@ -1175,38 +1118,29 @@ msgstr "" "\n" "%s login: " -#: src/login.c:819 -msgid "login: " -msgstr "login: " - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" msgstr "Login fehlerhaft" -#: src/login.c:1198 +#: src/login.c:996 msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "Warnung: Login reaktiviert nach tempor瓣rer Sperre.\n" -#: src/login.c:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "Letzte Verbindung: %s an %s" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" msgstr "Letzte Verbindung: %.19s an %s" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" msgstr " von %.*s" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "Starte rad_login\n" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" @@ -1247,17 +1181,17 @@ msgstr "%s: Fehler beim Hinzuf羹gen von " msgid "added %d entries, longest was %d\n" msgstr "%d Eintr瓣ge hinzugef羹gt, der l瓣ngste war %d\n" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "Syntax: %s [-vf] [-p|g|sp|sg] Datei\n" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "Syntax: %s [-vf] [-p|g|sp] Datei\n" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "Syntax: %s [-vf] [-p|g] Datei\n" @@ -1277,16 +1211,16 @@ msgstr "Syntax: sg Gruppe [[-c] Befehl]\n" msgid "unknown uid: %u\n" msgstr "Unbekannte UID: %u\n" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" msgstr "Unbekannte GID: %lu\n" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "Entschuldigung.\n" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "zu viele Gruppen\n" @@ -1296,91 +1230,91 @@ msgstr "zu viele Gruppen\n" msgid "Usage: %s [input]\n" msgstr "Syntax: %s [Eingabe]\n" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "%s: Kann /etc/passwd nicht sperren.\n" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "%s: Kann Dateien nicht sperren, versuchen Sie es sp瓣ter nocheinmal\n" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "%s: Kann Dateien nicht 繹ffnen\n" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "%s: Zeile %d: Ung羹ltige Zeile\n" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "%s: Zeile %d: Kann GID nicht erstellen\n" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "%s: Zeile %d: Kann UID nicht erstellen\n" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "%s: Zeile %d: Kann Benutzer %s nicht finden\n" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "%s: Zeile %d: Kann Kennwort nicht aktualisieren\n" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "%s: Zeile %d: mkdir fehlgeschlagen\n" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "%s: Zeile %d: chown fehlgeschlagen\n" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "%s: Zeile %d: Kann Eintrag nicht aktualisieren\n" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "%s: Fehler beim Aktualisieren von Dateien\n" -#: src/passwd.c:155 +#: src/passwd.c:154 #, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "Syntax: %s [-f|-s] [Name]\n" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr " %s [-x max] [-n min] [-w Warnung] [-i Inaktiv] Name\n" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} Name\n" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "Altes Kennwort: " -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" msgstr "Falsches Kennwort f羹r `%s'\n" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" @@ -1390,16 +1324,16 @@ msgstr "" "Bitte benutzen Sie eine Kombination von Gro-/Kleinbuchstaben und\n" "Ziffern.\n" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "Neues Kennwort: " -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" msgstr "Versuchen Sie es nocheinmal...\n" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" @@ -1409,52 +1343,52 @@ msgstr "" "Warnung: Schlechtes Kennwort (Geben Sie es nocheinmal ein, um\n" "es trotzdem zu verwenden).\n" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" msgstr "Sie sind nicht identisch; versuchen Sie es nocheinmal...\n" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "Das Kennwort f羹r %s kann nicht ge瓣ndert werden.\n" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" msgstr "Das Kennwort f羹r %s kan z.Zt. nicht ge瓣ndert werden.\n" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "%s: Zu wenig Speicher\n" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "%s: Kann %s nicht ausf羹hren" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" msgstr "%s: Speicher %s nicht unterst羹tzt\n" -#: src/passwd.c:914 -#, c-format -msgid "You may not change the password for %s.\n" +#: src/passwd.c:884 +#, fuzzy, c-format +msgid "%s: You may not view or modify password information for %s.\n" msgstr "Sie d羹rfen das Kennwort f羹r %s nicht 瓣ndern.\n" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "ndere Kennwort f羹r %s\n" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "Das Kennwort f羹r %s wurde nicht ge瓣ndert.\n" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "Kennwort ge瓣ndert.\n" @@ -1469,49 +1403,49 @@ msgstr "Syntax: %s [-q] [-r] [-s] [passwd [shadow]]\n" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "Syntax: %s [-q] [-r] [-s] [passwd]\n" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" msgstr "Ung羹ltiger Eintrag in Kennwortdatei\n" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" msgstr "Doppelter Kennworteintrag\n" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" msgstr "Ung羹ltiger Benutzername '%s'\n" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "Benutzer %s: Keine Gruppe %u\n" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "Benutzer %s: Verzeichnis %s nicht vorhanden\n" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "Benutzer %s: Programm %s nicht vorhanden\n" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" msgstr "Ung羹ltiger Shadow-Kennworteintrag\n" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" msgstr "Doppelter Shadow-Kennworteintrag\n" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" msgstr "Kein passender Kennworteintrag gefunden\n" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" msgstr "Benutzer %s: Letzte Kennwort瓣nderung liegt in der Zukunft\n" @@ -1531,17 +1465,17 @@ msgstr "%s: Kann Kennwortdatei nicht 繹ffnen\n" msgid "%s: can't remove shadow entry for %s\n" msgstr "%s: Kann Shadow-Eintrag f羹r %s nicht l繹schen\n" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "%s: Kann Kennworteintrag f羹r %s nicht aktualisieren\n" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" msgstr "%s: Kann Shadow-Datei nicht aktualisieren\n" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" msgstr "%s: Kann Kennwortdatei nicht aktualisieren\n" @@ -1551,42 +1485,42 @@ msgstr "%s: Kann Kennwortdatei nicht aktualisieren\n" msgid "%s: can't update entry for user %s\n" msgstr "%s: Kann Eintrag f羹r Benutzer %s nicht aktualisieren\n" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format msgid "%s: can't delete shadow password file\n" msgstr "%s: Kann Shadow-Datei nicht l繹schen\n" -#: src/su.c:133 +#: src/su.c:132 msgid "Sorry." msgstr "Entschuldigung." -#: src/su.c:323 +#: src/su.c:320 #, c-format msgid "%s: must be run from a terminal\n" msgstr "%s: Muss von einem Terminal gestartet werden\n" -#: src/su.c:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "%s: pam_start: Fehler %d\n" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" msgstr "Unbekannte ID: %s\n" -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, fuzzy, c-format msgid "You are not authorized to su %s\n" msgstr "" "Sie d羹rfen su %s nicht\n" " " -#: src/su.c:502 +#: src/su.c:495 msgid "(Enter your own password.)" msgstr "(Geben Sie Ihr eigenes Kennwort an.)" -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" @@ -1595,22 +1529,22 @@ msgstr "" "%s: %s\n" "(Ignoriert)\n" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" msgstr "Keine Shell\n" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr "Zugriff auf su zu diesem Account VERWEIGERT.\n" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "Kennwort-Authentifizierung umgangen.\n" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" msgstr "Bitte geben Sie Ihr EIGENES Kennwort als Authentifizierung an.\n" @@ -1625,7 +1559,7 @@ msgstr "Keine Kennwortdatei\n" msgid "No password entry for 'root'\n" msgstr "Kein Kennworteintrag f羹r 'root'\n" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" @@ -1635,234 +1569,214 @@ msgstr "" "Geben Sie Strg-D ein, um normal zu starten\n" "(oder geben Sie das root-Kennwort ein zur Systemwartung): " -#: src/sulogin.c:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" msgstr "Starte im Systemwartungs-Modus\n" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "%s: Baue die Gruppendatenbank neu auf\n" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "%s: Baue die Shadow-Gruppendatenbank neu auf\n" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "%s: Ung羹ltiges nummerisches Argument `%s'\n" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "%s: GID %s unbekannt\n" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "%s: Gruppe %s unbekannt\n" -#: src/useradd.c:475 +#: src/useradd.c:418 #, c-format msgid "%s: cannot create new defaults file\n" msgstr "%s: Kann keine neue Datei mit Standardwerten erstellen\n" -#: src/useradd.c:480 +#: src/useradd.c:423 #, c-format msgid "%s: cannot open new defaults file\n" msgstr "%s: Kann die neue Datei mit Standardwerten nicht 繹ffnen\n" -#: src/useradd.c:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" msgstr "%s: Umbenennen: %s" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s: Die Gruppe `%s' ist eine NIS-Gruppe.\n" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "%s: Zu viele Gruppen angegeben (max %d).\n" -#: src/useradd.c:721 +#: src/useradd.c:660 #, 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:724 +#: src/useradd.c:663 #, c-format msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr "" " [-d home] [-s Shell] [-c Kommentar] [-m [-k Vorlage]]\n" -#: src/useradd.c:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, c-format msgid " [-f inactive] [-e expire]\n" msgstr " [-f inaktiv] [-e Ablauf]\n" -#: src/useradd.c:728 +#: src/useradd.c:667 #, c-format msgid " [-p passwd] name\n" msgstr " [-p Kennwort] Name\n" -#: src/useradd.c:730 +#: src/useradd.c:669 #, 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:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, c-format msgid "%s: error locking group file\n" msgstr "%s: Kann Gruppendatei nicht sperren\n" -#: src/useradd.c:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, c-format msgid "%s: error opening group file\n" msgstr "%s: Kann Gruppendatei nicht 繹ffnen\n" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, c-format msgid "%s: error locking shadow group file\n" msgstr "%s: Kann Shadow-Gruppendatei nicht sperren\n" -#: src/useradd.c:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, c-format msgid "%s: error opening shadow group file\n" msgstr "%s: Kann Shadow-Gruppendatei nicht 繹ffnen\n" -#: src/useradd.c:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "%s: UID %u ist nicht eindeutig\n" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "%s: Kann keine eindeutige UID finden\n" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "%s: Ung羹ltiges Basisverzeichnis `%s'\n" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "%s: Kommentar `%s' ung羹ltig\n" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "%s: Homeverzeichnis `%s' ung羹ltig\n" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s: Datum `%s' ung羹ltig\n" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "%s: Shadow-Kennw繹rter f羹r -e ben繹tigt\n" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, c-format msgid "%s: shadow passwords required for -f\n" msgstr "%s: Shadow-Kennw繹rter f羹r -f ben繹tigt\n" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" msgstr "%s: Feld `%s' ung羹ltig\n" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "%s: Shell `%s' ist ung羹ltig\n" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "%s: Benutzername `%s' ung羹ltig\n" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "%s: Kann Kennwortdatei nicht neu erstellen\n" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "%s: Kann Shadow-Kennwortdatei nicht neu erstellen\n" -#: src/useradd.c:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, c-format msgid "%s: unable to lock password file\n" msgstr "%s: Kann Kennwortdatei nicht sperren\n" -#: src/useradd.c:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, c-format msgid "%s: unable to open password file\n" msgstr "%s: Kann Kennwortdatei nicht 繹ffnen\n" -#: src/useradd.c:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, c-format msgid "%s: cannot lock shadow password file\n" msgstr "%s: Kann Shadow-Kennwortdatei nicht sperren\n" -#: src/useradd.c:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, c-format msgid "%s: cannot open shadow password file\n" msgstr "%s: Kann Shadow-Kennwortdatei nicht 繹ffnen\n" -#: src/useradd.c:1459 +#: src/useradd.c:1354 #, c-format msgid "%s: error adding new password entry\n" msgstr "%s: Fehler beim Hinzuf羹gen eines neuen Kennworteintrags\n" -#: src/useradd.c:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "%s: Fehler beim Aktualisieren des DBM-Kennworteintrags\n" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, 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:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s: Fehler beim Aktualisieren des Shadow-DBM-Kennworteintrags\n" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" msgstr "%s: Kann Verzeichnis %s nicht erstellen\n" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, c-format msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n" msgstr "" -#: src/useradd.c:1590 +#: src/useradd.c:1446 #, fuzzy, c-format msgid "Can't create mail spool for user %s.\n" msgstr "%s: Kann Eintrag f羹r Benutzer %s nicht aktualisieren\n" -#: src/useradd.c:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "%s: Benutzer %s vorhanden\n" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" @@ -1870,208 +1784,173 @@ msgstr "" "%s: Gruppe %s vorhanden - Wenn Sie den Benutzer zur Gruppe\n" "hinzuf羹gen wollen, benutzen Sie -g.\n" -#: src/useradd.c:1767 +#: src/useradd.c:1602 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" msgstr "" "%s: Warnung: CREATE_HOME nicht unterst羹tzt, verwenden Sie stattdessen -m.\n" -#: src/userdel.c:124 +#: src/userdel.c:108 #, c-format msgid "Usage: %s [-r] name\n" msgstr "Syntax: %s [-r] Name\n" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" msgstr "%s: Fehler beim Aktualisieren des Gruppeneintrags\n" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "%s: Kann DBM-Gruppeneintrag nicht aktualisieren\n" - -#: src/userdel.c:214 -#, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: Kann DBM-Gruppeneintrag nicht entfernen\n" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "%s: Kann Gruppendatei nicht 繹ffnen\n" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "%s: Kann Shadow-Gruppendatei nicht 繹ffnen\n" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "%s: Fehler beim L繹schen des Kennworteintrags\n" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "%s: Fehler beim L繹schen des Shadow-Kennworteintrags\n" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "%s: Fehler beim L繹schen des DBM-Kennworteintrags\n" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s: Fehler beim L繹schen des Shadow-DBM-Kennworteintrags\n" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "%s: Benutzer %s ist z.Zt. angemeldet\n" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "%s: %s nicht im Besitz von %s, L繹schen abgebrochen\n" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " msgstr "%s: Warnung: Kann nicht l繹schen " -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" msgstr "%s: Benutzer %s nicht vorhanden\n" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s: Benutzer %s ist ein NIS-Benutzer\n" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "" "%s: Verzeichnis %s wird nicht gel繹scht (w羹rde das Homeverzeichnis des\n" "Benutzers %s l繹schen\n" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "%s: Fehler beim L繹schen des Verzeichnisses %s\n" -#: src/usermod.c:306 +#: src/usermod.c:289 #, c-format msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "Syntax: %s\t[-u uid [-o]] [-g Gruppe] [-G Gruppe,...] \n" -#: src/usermod.c:310 +#: src/usermod.c:293 #, 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:313 +#: src/usermod.c:296 #, c-format msgid "[-f inactive] [-e expire] " msgstr "[-f inaktiv] [-e Ablauf] " -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p Kennwort] [-L|-U] Name\n" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" msgstr "%s: Zu wenig Speicher in update_group\n" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "%s: Zu wenig Speicher in update_gshadow\n" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "%s: Keine Optionen angegeben\n" -#: src/usermod.c:965 +#: src/usermod.c:903 #, 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:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "%s: UID %lu ist nicht eindeutig\n" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, c-format msgid "%s: error changing password entry\n" msgstr "%s: Fehler beim ndern des Kennworteintrags\n" -#: src/usermod.c:1122 +#: src/usermod.c:1053 #, c-format msgid "%s: error removing password entry\n" msgstr "%s: Fehler beim L繹schen des Kennworteintrags\n" -#: src/usermod.c:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "%s: Fehler beim Hinzuf羹gen des DBM-Kennworteintrags\n" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "%s: Fehler beim L繹schen des DBM-Kennworteintrags\n" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "%s: Fehler beim L繹schen des Shadow-Kennworteintrags\n" -#: src/usermod.c:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s: Fehler beim Entfernen des Shadow-DBM-Kennworteintrags\n" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "%s: Verzeichnis %s vorhanden\n" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "%s: Kann %s nicht erstellen\n" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" msgstr "%s: Kann den Besitzer von %s nicht 瓣ndern\n" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, 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:1333 +#: src/usermod.c:1223 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "%s: Warnung: %s nicht im Besitz von %s\n" -#: src/usermod.c:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" msgstr "Fehler beim ndern des Postfach-Besitzers" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" msgstr "Fehler beim Umbenennen des Postfachs" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" @@ -2080,22 +1959,22 @@ msgstr "" "\n" "%s: %s wurde nicht ge瓣ndert\n" -#: src/vipw.c:133 +#: src/vipw.c:131 msgid "Couldn't lock file" msgstr "Datei konnte nicht gesperrt werden" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" msgstr "Sicherung konnte nicht erstellt werden" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "" "%s: Wiederherstellung von %s fehlgeschlagen: %s\n" "(Ihre nderungen befinden sich in %s)\n" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/po/el.gmo b/po/el.gmo index 842a8cb9..f349e12d 100644 Binary files a/po/el.gmo and b/po/el.gmo differ diff --git a/po/el.po b/po/el.po index dd7aad0f..6cac7e50 100644 --- a/po/el.po +++ b/po/el.po @@ -6,20 +6,21 @@ msgid "" msgstr "" "Project-Id-Version: Shadow 980726\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-26 07:53+0100\n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" "PO-Revision-Date: 1998-12-28 20:35:31+0100\n" "Last-Translator: Nikos Mavroyanopoulos \n" "Language-Team: Hellenic \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" msgstr "怷庰庣帤怷怷巹庢庢: 峎帠彖庢 怷弮峎帤帢 %s\n" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" msgstr "怷庰庣帤怷怷巹庢庢: 怷弇弇峟 怷弮峎帤庰\n" @@ -47,17 +48,17 @@ msgstr " 庣庥怷庣彖彖峸庰 弮庰 怷彖 帤庣帢庰庣庣峸 怷 msgid " Choose a new password.\n" msgstr " 庣弇峟徆庰 峟彖帢 彖峟怷 彖庛庢弮帢庣庥.\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "峇怷 彖庛庢弮帢庣庥 帢 庛帢 弇峸徆庰庣 庰 %ld 弮峟庰.\n" -#: libmisc/age.c:174 +#: libmisc/age.c:172 #, c-format msgid "Your password will expire tomorrow.\n" msgstr "峇怷 彖庛庢弮帢庣庥 帢 庛帢 弇峸徆庰庣 帢庣怷.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:174 #, c-format msgid "Your password will expire today.\n" msgstr "峇怷 彖庛庢弮帢庣庥 帢 庛帢 弇峸徆庰庣 峸弮庰帢.\n" @@ -72,41 +73,27 @@ msgstr "帤彖帢弮巹帢 帢弇弇帢帠峸 tty %s" msgid "Environment overflow\n" msgstr "峊庰庰巹弇庣庢 庰庣帣峎弇弇怷彖怷\n" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr "庰彖 弮怷庰巹庰 彖帢 帢弇弇峎徆庰庰 怷 $%s\n" -#: libmisc/failure.c:230 -#, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "%d %s 帢 庢彖 庰弇庰帢巹帢 庰巹怷帤怷. 庰弇庰帢巹帢 峸帢彖 庣 %s 怷 %s.\n" +#: libmisc/failure.c:229 +#, fuzzy, c-format +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "%d %s 帢 庢彖 庰弇庰帢巹帢 庰巹怷帤怷. 庰弇庰帢巹帢 峸帢彖 庣 %s 怷 %s.\n" +msgstr[1] "%d %s 帢 庢彖 庰弇庰帢巹帢 庰巹怷帤怷. 庰弇庰帢巹帢 峸帢彖 庣 %s 怷 %s.\n" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "帢怷巹庰" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "帢怷巹帢" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" msgstr "怷弇弇峟 庰巹怷帤怷庣 怷 庢弮帢.\n" -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "峇怷 彖庛庢弮帢庣庥 帤庰彖 帢怷庥帤庣庥怷怷庣庰巹 怷 弮庣庥 庥弇庰庣帤巹 帠庣帢 怷(彖) %s.\n" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "" -"庰彖 庰巹彖帢庣 帤彖帢彖 彖帢 庰庛庰巹 怷 弮庣庥 庥弇庰庣帤巹 怷 %s: 庥庰弇庰巹帢庣 怷\n" -"帤庣帢庥怷弮庣峸 庥弇庰庣帤庣彖;\n" - #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "庰庰 彖峟帢 帠峎弮弮帢帢." @@ -119,7 +106,7 @@ msgstr "帢彖峟彖帢 帠峎弮弮帢." msgid "You have mail." msgstr "庰庰 帠峎弮弮帢帢." -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " msgstr "帢庥 彖庛庢弮帢庣庥: %s. " @@ -134,20 +121,20 @@ msgstr "彖庛庢弮帢庣庥: pam_start() 帢峟庰, 峎弇弮帢 %d\n" msgid "passwd: %s\n" msgstr "彖庛庢弮帢庣庥: %s\n" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" msgstr "" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "帤彖帢弮巹帢 帢弇弇帢帠峸 庥帢帢弇帠怷 怷彖 \"%s\"\n" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" msgstr "峓巹 庥帢峎弇怷帠怷, 庰庣帢帠帠峸 弮庰 峇峞_峇=/" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr "帤彖帢弮巹帢 庰庥峟弇庰庢 %s" @@ -162,37 +149,33 @@ msgstr "庢 峟帠庥怷 帢庣庥 庥帢峎弇怷帠怷 \"%s\"\n" msgid "Can't change root directory to \"%s\"\n" msgstr "帤彖帢弮巹帢 帢弇弇帢帠峸 怷 帢庣庥怷 庥帢帢弇帠怷 庰 \"%s\"\n" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr " 庥弇峸庢 malloc(%d) 帢峟庰\n" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" msgstr "帤彖帢弮巹帢 帤峟弮庰庢 怷 帠庣帢 弇庢怷怷巹庰 帤庣帢弮庢.\n" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "" "峎弇弮帢 帤庣帢弮庢 - 峎帠彖怷 帢彖庣庥庰巹弮庰彖怷 '%s' (庰庣帤怷怷庣庰巹庰 怷彖 " "帤庣帢庰庣庣峸)\n" -#: lib/pwauth.c:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "峉彖庛庢弮帢庣庥: " -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "峇怷 %s 怷 峉彖庛庢弮帢庣庥: " -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "" - -#: src/chage.c:118 +#: src/chage.c:112 #, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" @@ -201,155 +184,147 @@ msgstr "" "峓峸庢: chage [-l] [-m 庰弇帢_弮峟庰] [-M 弮庰帠_弮峟庰] [-W 怷庰庣帤.]\n" " [-I 帢彖庰彖庰帠] [-E 弇峸徆庢] [-d 庰弇庰帢巹帢_弮峟帢] 峸庢\n" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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:155 +#: src/chage.c:149 msgid "Minimum Password Age" msgstr "庣庥庰庢 帤庣峎庥庰庣帢 彖庛庢弮帢庣庥怷" -#: src/chage.c:161 +#: src/chage.c:155 msgid "Maximum Password Age" msgstr "峟帠庣庢 帤庣峎庥庰庣帢 彖庛庢弮帢庣庥怷" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" msgstr "峇庰弇庰帢巹帢 帢弇弇帢帠峸 彖庛庢弮帢庣庥怷 (峓峓峓峓--)" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" msgstr "怷庰庣帤怷怷巹庢庢 弇峸徆庢 彖庛庢弮帢庣庥怷" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "彖庰彖庰帠 彖庛庢弮帢庣庥" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "弮庰怷弮庢彖巹帢 峸徆庢 怷帠帢庣帢弮怷 (峓峓峓峓--)" -#: src/chage.c:238 +#: src/chage.c:231 #, fuzzy, c-format msgid "Last password change\t\t\t\t\t: " msgstr "峇庰弇庰帢巹帢 帢弇弇帢帠峸 彖庛庢弮帢庣庥怷 (峓峓峓峓--)" -#: src/chage.c:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 #, fuzzy, c-format msgid "never\n" msgstr "怷峟\n" -#: src/chage.c:251 +#: src/chage.c:244 #, fuzzy, c-format msgid "Password expires\t\t\t\t\t: " msgstr "峇怷 彖庛庢弮帢庣庥 弇峸帠庰庣:\t" -#: src/chage.c:267 +#: src/chage.c:260 #, fuzzy, c-format msgid "Password inactive\t\t\t\t\t: " msgstr "彖庰彖庰帠 彖庛庢弮帢庣庥:\t" -#: src/chage.c:281 +#: src/chage.c:274 #, fuzzy, c-format msgid "Account expires\t\t\t\t\t\t: " msgstr "峇怷 彖庛庢弮帢庣庥 弇峸帠庰庣:\t" -#: src/chage.c:297 +#: src/chage.c:290 #, c-format msgid "Minimum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:298 +#: src/chage.c:292 #, c-format msgid "Maximum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:299 +#: src/chage.c:294 #, c-format msgid "Number of days of warning before password expires\t: %ld\n" msgstr "" -#: src/chage.c:444 +#: src/chage.c:431 #, c-format msgid "%s: do not include \"l\" with other flags\n" msgstr "%s: 帢 弮庢彖 弮庰庣弇帢弮帣峎彖庰庰 怷 \"l\" 弮庰 庣 峎弇弇庰 庰彖帤庰巹徆庰庣\n" -#: src/chage.c:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 #, fuzzy, c-format msgid "%s: permission denied.\n" msgstr "%s: 峎帤庰庣帢 帢怷巹庛庢庥庰\n" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 #, fuzzy, c-format msgid "%s: PAM authentication failed\n" msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 怷庛峸庥庢 弮庰庛帤怷 庰徆帢庥巹帣庢\n" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, c-format msgid "%s: can't open password file\n" msgstr "%s: 帢帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 怷 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/chage.c:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "%s: 峎帠彖怷 峸庢 %s\n" -#: src/chage.c:535 +#: src/chage.c:519 #, fuzzy, c-format msgid "%s: can't lock shadow password file" msgstr "%s: 帢帤彖帢弮巹帢 庥弇庰庣帤弮帢怷 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/chage.c:543 +#: src/chage.c:527 #, fuzzy, c-format msgid "%s: can't open shadow password file" msgstr "%s: 帢帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/chage.c:604 +#: src/chage.c:587 #, c-format msgid "Changing the aging information for %s\n" msgstr "弇弇帢帠峸 弇庢怷怷庣彖 彖怷 帠庣帢 怷彖 %s\n" -#: src/chage.c:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 帢弇弇帢帠峸 庰帤巹彖\n" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, c-format msgid "%s: can't update password file\n" msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/chage.c:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/chage.c:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "" -"峉峎弇弮帢 庥帢峎 庢彖 帢彖帢彖峟庢 庢 庥帢帢庢庢 怷 dbm 帢庰巹怷 彖庛庢弮帢庣庥彖.\n" - -#: src/chage.c:692 +#: src/chage.c:649 #, c-format msgid "%s: can't rewrite shadow password file\n" msgstr "%s: 帢帤彖帢弮巹帢 庰帢彖庰帠帠帢峸 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/chage.c:740 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite password file\n" msgstr "%s: 帢帤彖帢弮巹帢 庰帢彖庰帠帠帢峸 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/chage.c:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 #, fuzzy, c-format msgid "%s: PAM chauthtok failed\n" msgstr "%s: 帢帤彖帢弮巹帢 徆庰庥弇庰庣帤弮帢怷 帢庰巹怷\n" @@ -370,117 +345,122 @@ msgstr "" "峓峸庢: %s [-f 弇峸庰_彖怷弮帢] [-r 帢庣庛弮_帤弮帢巹怷] [-w 庢弇_帤弮帢巹怷]\n" "[-h 庢弇_怷庣庥巹帢]\n" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "弇峸庰 彖怷弮帢" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "\t弇峸庰 彖怷弮帢: %s\n" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "庣庛弮 帤弮帢巹怷" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "峇庢弇峟彖怷 帠帢巹帢" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" msgstr "峇庢弇峟彖怷 庣庥巹帢" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "弇弇怷" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s: 庰彖 庰巹彖帢庣 帤彖帢彖 彖帢 庥帢庛怷庣庰巹 怷 彖怷弮帢 峸庢 帢.\n" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s: 帢帤彖帢弮巹帢 帢弇弇帢帠峸 峸庢 `%s' 怷彖 NIS 庰徆庢庰怷弮庰彖怷.\n" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "%s: `%s' 庰巹彖帢庣 怷 庥庣怷 帤庣帢庥怷弮庣峸 NIS 帠庣'帢彖 怷彖 庰徆庢庰怷弮庰彖怷.\n" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, fuzzy, c-format +msgid "%s: Permission denied.\n" +msgstr "%s: 峎帤庰庣帢 帢怷巹庛庢庥庰\n" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" msgstr "弇弇帢帠峸 弇庢怷怷庣彖 峸庢 帠庣帢 怷彖 %s\n" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s: 庢 峟帠庥怷 彖怷弮帢: `%s'\n" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s: 庢 峟帠庥怷 帢庣庛弮 帤弮帢巹怷: `%s'\n" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s: 庢 峟帠庥怷 庢弇峟彖怷 庰帠帢巹帢: `%s'\n" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s: 庢 峟帠庥怷 庢弇峟彖怷 怷庣庥巹帢: `%s'\n" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s: \"%s\" 庰庣峟庰庣 弮庢 峟帠庥怷 帢帢庥峸庰\n" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "%s: 怷弇 弮帢庥庣峎 庰帤巹帢\n" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" msgstr "帤彖帢弮巹帢 帢弇弇帢帠峸 帢庢帢 峸庢 庰 root.\n" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" msgstr "帤彖帢弮巹帢 庥弇庰庣帤弮帢怷 怷 帢庰巹怷 彖庛庢弮帢庣庥彖. 怷庥庣弮峎庰 帢帠庰帢.\n" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" msgstr "帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 怷 帢庰巹怷 彖庛庢弮帢庣庥彖.\n" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s: %s 帤庰彖 帣峟庛庢庥庰 怷 /etc/passwd\n" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" msgstr "峉峎弇弮帢 庥帢峎 庢彖 帢彖帢彖峟庢 庥帢帢庢庢 怷 帢庰巹怷 彖庛庢弮帢庣庥彖.\n" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" msgstr "帤彖帢弮巹帢 庰庣帢帠帠峸 彖 帢弇弇帢帠彖 怷 帢庰巹怷 彖庛庢弮帢庣庥彖.\n" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" msgstr "帤彖帢弮巹帢 徆庰庥弇庰庣帤弮帢怷 怷 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -497,49 +477,49 @@ msgstr "" msgid "%s: can't lock password file\n" msgstr "%s: 帢帤彖帢弮巹帢 庥弇庰庣帤弮帢怷 怷 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "%s: 帢帤彖帢弮巹帢 庥弇庰庣帤弮帢怷 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "%s: 帢帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "%s: 帠帢弮弮峸 %d: 怷弇 弮庰帠峎弇庢 帠帢弮弮峸\n" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "%s: 帠帢弮弮峸 %d: 峟弇弇庰庣庢 彖峟怷 彖庛庢弮帢庣庥怷\n" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "%s: 帠帢弮弮峸 %d: 峎帠彖怷 峸庢 %s\n" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "%s: 帠帢弮弮峸 %d: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 庥帢帢庢庢 彖庛庢弮帢庣庥怷\n" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "%s: 彖庣彖峟庢庥庰 峎弇弮帢, 怷庣 帢弇弇帢帠峟 帢帠彖怷峸庛庢庥帢彖\n" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" msgstr "" "%s: 峉峎弇弮帢 庥帢峎 庢彖 帢彖帢彖峟庢 庥帢帢峸庰彖 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 帢彖帢彖峟庢 庥帢帢峸庰彖 怷 帢庰巹怷 彖庛庢弮帢庣庥彖\n" @@ -549,26 +529,26 @@ msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 帢彖帢彖峟庢 庥帢帢峸庰 msgid "Usage: %s [-s shell] [name]\n" msgstr "峓峸庢: %s [-s 弇怷庣] [彖怷弮帢]\n" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" msgstr "峟弇怷 庣帤怷" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" msgstr "庰彖 弮怷庰巹庰 彖帢 帢弇弇峎徆庰庰 怷 弇怷庣 帠庣帢 怷(彖) %s.\n" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" msgstr "弇弇峎帠峸 怷 弇怷庣怷 帠庣帢 怷彖 %s\n" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s: 庢 峟帠庥庢 庥帢帢庢庢: %s\n" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" msgstr "%s 帤庰彖 庰巹彖帢庣 峟帠庥怷 弇怷庣.\n" @@ -578,13 +558,13 @@ msgstr "%s 帤庰彖 庰巹彖帢庣 峟帠庥怷 弇怷庣.\n" msgid "Usage: expiry {-f|-c}\n" msgstr "峓峸庢: expiry {-f|-c}\n" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" msgstr "" "%s: 峞峉峓! 峟庰庣 彖帢 峟庰庣 庰庛庰巹 怷 bit 帢帢庢庢 帢庢帢 root!\n" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "%s: 峎帠彖怷 峸庢\n" @@ -598,326 +578,288 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" msgstr "" -#: src/faillog.c:86 +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" -msgstr "彖怷弮帢_峓峸庢 怷巹庰 峟帠庣怷 峇庰弇庰帢巹帢\n" +msgid "Login Failures Maximum Latest On\n" +msgstr "" -#: src/faillog.c:103 -#, c-format -msgid " %s on %s" -msgstr " %s 怷 %s" - -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" msgstr " [%lds 帢峟弮庰庣彖帢彖]" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr " [%lds 庥弇庰巹帤弮帢]" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "帠彖怷 峸庢: %s\n" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "峓峸庢: %s [-r|-R] 怷弮峎帤帢\n" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr " %s [-a 峸庢] 怷弮峎帤帢\n" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr " %s [-d 峸庢] 怷弮峎帤帢\n" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr " %s [-A 峸庢,...] [-M 峸庢,...] 怷弮峎帤帢\n" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr " %s [-M 峸庢,...] 怷弮峎帤帢\n" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" msgstr "%s: 庥庣帤庢 彖庛庢弮帢庣庥峎 怷弮峎帤彖 帢帢庣怷彖帢庣 帠庣帢 怷 -A\n" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "怷庣怷 庰巹帢庣;\n" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr "峎帠彖庢 怷弮峎帤帢: %s\n" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "怷庛峸庥庢 怷 峸庢 %s 庢彖 怷弮峎帤帢 %s\n" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "庣帢帠峎庢 怷 峸庢 %s 帢 庢彖 怷弮峎帤帢 %s\n" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" msgstr "%s: 峎帠彖怷 弮峟弇怷 %s\n" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "%s: 庰彖 庰巹彖帢庣 tty\n" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "弇弇帢帠峸 怷 彖庛峸弮帢怷 帠庣帢 庢彖 怷弮峎帤帢 %s\n" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "峟怷 峉彖庛庢弮帢庣庥: " -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " msgstr "帢彖庰庣峎帠庰庰 怷 彖峟怷 彖庛庢弮帢庣庥: " -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" msgstr "庰彖 帢庣庣峎庤怷彖. 怷庥庣弮峎庰 徆帢彖峎" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" msgstr "%s: 帢彖帢帤怷庥庣弮峎庰 帢帠庰帢\n" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "%s: 帤彖帢弮巹帢 帤庢弮庣怷帠巹帢 庥弇庰庣帤弮帢怷\n" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" msgstr "" "%s: 帤彖帢弮巹帢 帤庢弮庣怷帠巹帢 庥弇庰庣帤弮帢怷 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "%s: 帢帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 怷 帢庰巹怷\n" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 庥帢帢庢庢\n" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 庥帢帢庢庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "%s: 帢帤彖帢弮巹帢 庰帢彖庰帠帠帢峸 帢庰巹怷\n" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" msgstr "%s: 帢帤彖帢弮巹帢 庰帢彖庰帠帠帢峸 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "%s: 帢帤彖帢弮巹帢 徆庰庥弇庰庣帤弮帢怷 帢庰巹怷\n" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 彖 DBM 帢庰巹彖\n" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 彖 DBM 帢庰巹彖 庥庣帤彖 彖庛庢弮帢庣庥彖\n" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "峓峸庢: groupadd [-g gid [-o]] [-f] 怷弮峎帤帢\n" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, c-format msgid "%s: error adding new group entry\n" msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 怷庛峸庥庢 彖峟帢 庥帢帢庢庢 怷 帢庰巹怷 怷弮峎帤彖\n" -#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: 帢帤彖帢弮巹帢 怷庛峸庥庢 彖峟帢 dbm 庥帢帢庢庢 怷 帢庰巹怷 怷弮峎帤彖\n" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "%s: 峇怷 彖怷弮帢 %s 帤庰彖 庰巹彖帢庣 弮怷彖帢帤庣庥\n" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" msgstr "%s: 峇怷 uid %u 帤庰彖 庰巹彖帢庣 弮怷彖帢帤庣庥\n" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "%s: 帢帤彖帢弮巹帢 庰庰庢 弮怷彖帢帤庣庥怷 gid\n" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, c-format msgid "%s: %s is not a valid group name\n" msgstr "%s: 峇怷 %s 帤庰彖 庰巹彖帢庣 峟帠庥怷 彖怷弮帢 怷弮峎帤帢\n" -#: src/groupadd.c:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "%s: 庢 峟帠庥庢 怷弮峎帤帢 `%s'\n" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "%s: -O 帢帢庣庰巹 =峇\n" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s: 帢帤彖帢弮巹帢 庰帢彖庰帠帠帢峸 怷 帢庰巹怷 怷弮峎帤彖\n" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s: 帢帤彖帢弮巹帢 庰帢彖庰帠帠帢峸 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 怷弮峎帤彖\n" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" msgstr "%s: 帤彖帢弮巹帢 庥弇庰庣帤弮帢怷 怷 帢庰巹怷 怷弮峎帤彖\n" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" msgstr "%s: 帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 怷 帢庰巹怷 怷弮峎帤彖\n" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" msgstr "%s: 帤彖帢弮巹帢 庥弇庰庣帤弮帢怷 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 怷弮峎帤彖\n" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" msgstr "%s: 帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 怷弮峎帤彖\n" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "%s: 怷弮峎帤帢 %s 峎庰庣\n" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, c-format msgid "Usage: groupdel group\n" msgstr "峓峸庢: groupdel 怷弮峎帤帢\n" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 帤庣帢帠帢峸 庥帢帢庢庢 怷弮峎帤帢\n" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 帤庣帢帠帢峸 庥帢帢庢庢 怷 dbm 帢庰巹怷 怷弮峎帤彖\n" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "" "%s: 峉峎弇弮帢 庥帢峎 庢彖 帢帢巹庰庢 庥帢帢庢庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 " "怷弮峎帤彖\n" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "" -"%s: 峉峎弇弮帢 庥帢峎 庢彖 帢帢巹庰庢 庥帢帢庢庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "%s: 帢帤彖帢弮巹帢 帢帢巹庰庢 庢 帢庣庥峸 怷弮峎帤帢 怷 峸庢.\n" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "%s: 怷弮峎帤帢 %s 帤庰彖 峎庰庣\n" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "%s: 怷弮峎帤帢 %s 庰巹彖帢庣 NIS 怷弮峎帤帢\n" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s: %s 庰巹彖帢庣 怷 庥庣怷 帤庣帢庥怷弮庣峸 NIS\n" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "峓峸庢: groupmod [-g gid [-o]] [-n 彖怷弮帢] 怷弮峎帤帢\n" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, fuzzy, c-format msgid "%s: %s not found in /etc/group\n" msgstr "%s: %s 帤庰彖 帣峟庛庢庥庰 怷 /etc/passwd\n" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "" -"%s: 帢帤彖帢弮巹帢 怷庛峸庥庢 彖峟帢 dbm 庥帢帢庢庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 " -"怷弮峎帤彖\n" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, fuzzy, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s: 峇怷 %ld 帤庰彖 庰巹彖帢庣 弮怷彖帢帤庣庥 gid\n" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "%s: 峇怷 %s 帤庰彖 庰巹彖帢庣 弮怷彖帢帤庣庥 彖怷弮帢\n" @@ -927,110 +869,105 @@ msgstr "%s: 峇怷 %s 帤庰彖 庰巹彖帢庣 弮怷彖帢帤庣庥 彖怷弮帢\n" msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "峓峸庢: %s [-r] [-s] [group [gshadow]]\n" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "峓峸庢: %s [-r] [-s] [group]\n" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "庣" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" msgstr "" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "%s: 帢帤彖帢弮巹帢 庥弇庰庣帤弮帢怷 怷 帢庰巹怷 %s\n" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "%s: 帢帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 帢庰巹怷 %s\n" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" msgstr "庢 峟帠庥庢 庥帢帢庢庢 怷 帢庰巹怷 怷弮峎帤彖\n" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "帤庣帢帠帢峸 帠帢弮弮峸 `%s'; " -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" msgstr "帢彖庣帠帢峸 庥帢帢庢庢 怷 帢庰巹怷 怷弮峎帤彖\n" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" msgstr "庢 峟帠庥怷 彖怷弮帢 怷弮峎帤帢 `%s'\n" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "怷弮峎帤帢 %s: 帤庰彖 峎庰庣 峸庢 %s\n" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " msgstr "帤庣帢帠帢峸 弮峟弇怷 `%s'; " -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" msgstr "庢 峟帠庥庢 庥帢帢庢庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 怷弮峎帤彖\n" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" msgstr "帢彖庣帠帢峸 庥帢帢庢庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 怷弮峎帤彖\n" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" msgstr "庰彖 帣峟庛庢庥庰 庥帢帢庢庢 怷 帢庰巹怷 怷弮峎帤彖 怷 彖帢 帢庣庣峎庤庰庣\n" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" msgstr "庥庣帤庢 怷弮峎帤帢 %s: 庰彖 峎庰庣 帤庣帢庰庣庣峸 峸庢 %s\n" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " msgstr "帤庣帢帠帢峸 帤庣帢庰庣庣庣庥怷 弮峟弇怷 `%s'; " -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" msgstr "庥庣帤庢 怷弮峎帤帢 %s: 帤庰彖 峎庰庣 峸庢 %s\n" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 帢庰巹怷 %s\n" -#: src/grpck.c:647 src/pwck.c:612 -#, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: 帢 帢庰巹帢 帢彖帢彖庰庛庢庥帢彖. 庥庰弇峟庰 mkpasswd\n" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format -msgid "%s: no changes\n" -msgstr "%s: 庥帢弮庣峎 帢弇弇帢帠峸\n" - -#: src/grpck.c:651 src/pwck.c:616 +#: src/grpck.c:640 src/pwck.c:606 #, c-format msgid "%s: the files have been updated\n" msgstr "%s: 帢 帢庰巹帢 帢彖帢彖庰庛庢庥帢彖\n" +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "%s: 庥帢弮庣峎 帢弇弇帢帠峸\n" + #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" @@ -1046,41 +983,41 @@ msgstr "%s: 帢帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 怷 帢庰巹怷 怷弮峎帤 msgid "%s: can't lock shadow group file\n" msgstr "%s: 帢帤彖帢弮巹帢 庥弇庰庣帤弮帢怷 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 怷弮峎帤彖\n" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" msgstr "%s: 帢帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 怷弮峎帤彖\n" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "" "%s: 帢帤彖帢弮巹帢 帢帢巹庰庢 庢 怷弮峎帤帢 %s, 帢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" "怷弮峎帤彖\n" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "" "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 庥帢帢庢庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 帠庣帢 怷彖 %" "s\n" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 庥帢帢庢庢 帠庣帢 庢彖 怷弮峎帤帢 %s\n" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 怷弮峎帤彖\n" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 帠庣帢 怷 帢庰巹怷 怷弮峎帤彖\n" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "" @@ -1101,52 +1038,52 @@ msgstr "峓峸庢: id\n" msgid " groups=" msgstr " 怷弮峎帤庰=" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" msgstr "彖怷弮帢_峓峸庢 帢 峇庰弇庰帢巹帢\n" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "彖怷弮帢_峓峸庢 帢 峇庰弇庰帢巹帢\n" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "**帢弮庣峎 庰巹怷帤怷 怷 庢弮帢**" -#: src/login.c:175 +#: src/login.c:156 #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "峓峸庢: %s [-p] [彖怷弮帢]\n" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr " %s [-p] [-h 庢弮帢] [-f 彖怷弮帢]\n" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr " %s [-p] -r 庢弮帢\n" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" msgstr "帢弇弮峟彖庢 帢 庰庣帤怷\n" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" @@ -1155,7 +1092,7 @@ msgstr "" "\n" "峇怷 庢弮帢 峟庥弇庰庣庰 帠庣帢 彖峸庢庢 怷巹彖帢\n" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" @@ -1164,7 +1101,7 @@ msgstr "" "\n" "[帢峎庥帢弮庢 帢怷彖帤庰庢 -- 庰巹怷帤怷 怷 root 庰庰峎庢.]\n" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" @@ -1173,17 +1110,17 @@ msgstr "" "\n" " 帤庣帢帤庣庥帢巹帢 庰庣帤怷 庰弮帢巹庢庥庰 弮庰峎 帢 %d 帤庰庰弇庰帢.\n" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" msgstr " 怷 `%.100s' 帢 `%.200s'" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" msgstr " 怷 `%.100s'" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" @@ -1192,39 +1129,30 @@ msgstr "" "\n" "%s login: " -#: src/login.c:819 -msgid "login: " -msgstr "login: " - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" msgstr "庣帢帤庣庥帢巹帢 庰庣帤怷 帢峟庰" -#: src/login.c:1198 +#: src/login.c:996 msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "" "怷庰庣帤怷怷巹庢庢: 庰巹怷帤怷 庰帢彖庰彖庰帠怷怷庣峸庛庢庥庰 弮庰峎 帢 怷庣彖 帢怷庥弇庰庣弮.\n" -#: src/login.c:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "峇庰弇庰帢巹帢 庰巹怷帤怷: %s 怷 %s" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" msgstr "峇庰弇庰帢巹帢 庰巹怷帤怷: %.19s 怷 %s" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" msgstr " 帢 %.*s" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "彖帢徆庢 rad_login\n" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" @@ -1267,17 +1195,17 @@ msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 怷庛峸庥庢 庥帢帢庢庢 msgid "added %d entries, longest was %d\n" msgstr "怷峟庛庢庥帢彖 %d 庥帢帢峸庰庣, 庢 弮庰帠帢弇庰庢 峸帢彖 %d\n" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "峓峸庢: %s [-vf] [-p|g|sp|sg] 帢庰巹怷\n" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "峓峸庢: %s [-vf] [-p|g|sp] 帢庰巹怷\n" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "峓峸庢: %s [-vf] [-p|g] 帢庰巹怷\n" @@ -1297,16 +1225,16 @@ msgstr "峓峸庢: sg 怷弮峎帤帢 [[-c] 庰彖怷弇峸]\n" msgid "unknown uid: %u\n" msgstr "峎帠彖怷 uid: %u\n" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" msgstr "峎帠彖怷 gid: %lu\n" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "峎弮帢庣.\n" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "峎帢 怷弇弇峟 怷弮峎帤庰\n" @@ -1316,91 +1244,91 @@ msgstr "峎帢 怷弇弇峟 怷弮峎帤庰\n" msgid "Usage: %s [input]\n" msgstr "峓峸庢: %s [庰巹怷帤怷]\n" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "%s: 帢帤彖帢弮巹帢 庥弇庰庣帤弮帢怷 怷 /etc/passwd.\n" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "%s: 帢帤彖帢弮巹帢 庥弇庰庣帤弮帢怷 帢庰巹彖, 徆帢彖帢帤怷庥庣弮峎庰 帢帠庰帢\n" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "%s: 帢帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 彖 帢庰巹彖\n" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "%s: 帠帢弮弮峸 %d: 弮庢 峟帠庥庢 帠帢弮弮峸\n" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "%s: 帠帢弮弮峸 %d: 帢帤彖帢弮巹帢 帤庢弮庣怷帠巹帢 GID\n" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "%s: 帠帢弮弮峸 %d: 帢帤彖帢弮巹帢 帤庢弮庣怷帠巹帢 UID\n" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "%s: 帠帢弮弮峸 %d: 帢帤彖帢弮巹帢 庰庰庢 峸庢 %s\n" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "%s: 帠帢弮弮峸 %d: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 彖庛庢弮帢庣庥怷\n" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "%s: 帠帢弮弮峸 %d: 帢怷巹帢 帤庢弮庣怷帠巹帢 庥帢帢弇帠怷(mkdir)\n" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "%s: 帠帢弮弮峸 %d: 帢怷巹帢 帢弇弇帢帠峸 庣帤庣怷庥峸庢(chown)\n" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "%s: 帠帢弮弮峸 %d: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 庥帢帢庢庢\n" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 庰彖庢弮峟庢 帢庰巹彖\n" -#: src/passwd.c:155 +#: src/passwd.c:154 #, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "峓峸庢: %s [-f|-s] [彖怷弮帢]\n" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr " %s [-x 弮庰帠.] [-n 庰弇峎.] [-w 怷庰庣帤.] [-i 帢彖庰彖庰帠] 彖怷弮帢\n" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} 彖怷弮帢\n" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "帢弇庣 峉彖庛庢弮帢庣庥: " -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" msgstr "帢弇弮峟彖怷 彖庛庢弮帢庣庥 帠庣帢 怷彖 `%s'\n" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" @@ -1410,16 +1338,16 @@ msgstr "" "帢帢庥帢弇 庢庣弮怷怷庣峸庰 峟彖帢 彖帤帢弮 帢 庥庰帢弇帢巹帢 庥帢庣 弮庣庥峎 帠峎弮弮帢帢\n" "庥帢庛 庥帢庣 帢庣庛弮怷.\n" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "峟怷 峉彖庛庢弮帢庣庥: " -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" msgstr "帢彖帢帤怷庥庣弮峎庰.\n" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" @@ -1428,52 +1356,52 @@ msgstr "" "\n" "怷怷峸: 帢帤彖帢弮怷 彖庛庢弮帢庣庥 (庰庣峎帠庰峟 怷 峎弇庣 帠庣帢 彖帢 怷 庢庣弮怷怷庣峸庰庰).\n" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" msgstr "庰彖 帢庣庣峎庤怷彖. 怷庥庣弮峎庰 徆帢彖峎.\n" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "峇怷 彖庛庢弮帢庣庥 帠庣帢 怷彖 %s 帤庰彖 弮怷庰巹 彖帢 帢弇弇峎徆庰庣.\n" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" msgstr "峉帠彖弮庢, 怷 彖庛庢弮帢庣庥 帠庣帢 怷彖 %s 帤庰彖 弮怷庰巹 彖帢 帢弇弇峎徆庰庣 帢庥弮庢.\n" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "%s: 帤庰彖 峎庰庣 庰弇庰庛庰庢 弮彖峸弮庢\n" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "%s: 帤彖帢弮巹帢 庰庥峟弇庰庢 怷 %s" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" msgstr "%s: 庢 帢怷庛峸庥庢 %s 帤庰彖 怷庢巹庤庰帢庣\n" -#: src/passwd.c:914 -#, c-format -msgid "You may not change the password for %s.\n" +#: src/passwd.c:884 +#, fuzzy, c-format +msgid "%s: You may not view or modify password information for %s.\n" msgstr "庰彖 弮怷庰巹庰 彖帢 帢弇弇峎徆庰庰 怷 彖庛庢弮帢庣庥 帠庣帢 怷(彖) %s.\n" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "弇弇帢帠峸 彖庛庢弮帢庣庥怷 帠庣帢 怷彖 %s\n" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "峇怷 彖庛庢弮帢庣庥 帠庣帢 怷彖 %s 帤庰彖 峎弇弇帢徆庰.\n" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "峇怷 彖庛庢弮帢庣庥 峎弇弇帢徆庰.\n" @@ -1488,49 +1416,49 @@ msgstr "峓峸庢: %s [-q] [-r] [-s] [passwd [shadow]]\n" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "峓峸庢: %s [-q] [-r] [-s] [passwd]\n" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" msgstr "庢 峟帠庥庢 庥帢帢庢庢 怷 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" msgstr "帢彖庣帠帢峸 庥帢帢庢庢 怷 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" msgstr "庢 峟帠庥怷 彖怷弮帢 峸庢 '%s'\n" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "峸庢 %s: 庥帢弮庣峎 怷弮峎帤帢 %u\n" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "峸庢 %s: 怷 庥帢峎弇怷帠怷 %s 帤庰彖 峎庰庣\n" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "峸庢 %s: 怷 帠帢弮弮帢 %s 帤庰彖 峎庰庣\n" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" msgstr "庢 峟帠庥庢 庥帢帢庢庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" msgstr "帢彖庣帠帢峸 庥帢帢庢庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" msgstr "庰彖 帣峟庛庢庥庰 庥帢帢庢庢 怷 帢庰巹怷 彖庛庢弮帢庣庥彖 怷 彖帢 帢庣巹帢庤庰庣\n" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" msgstr "峸庢 %s: 庰弇庰帢巹帢 帢弇弇帢帠峸 彖庛庢弮帢庣庥怷 怷 弮峟弇弇怷彖\n" @@ -1552,17 +1480,17 @@ msgstr "" "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 庥帢帢庢庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 帠庣帢 怷彖 %" "s\n" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 庥帢帢庢庢 彖庛庢弮帢庣庥怷 帠庣帢 怷彖 %s\n" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 庥帢帢庢庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 帢庰巹怷 彖庛庢弮帢庣庥彖\n" @@ -1572,40 +1500,40 @@ msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 帢庰巹怷 彖庛庢弮帢 msgid "%s: can't update entry for user %s\n" msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 庥帢帢庢庢 帠庣帢 怷彖 峸庢 %s\n" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format msgid "%s: can't delete shadow password file\n" msgstr "%s: 庰彖 庰巹彖帢庣 帤彖帢彖 彖帢 帤庣帢帠帢庰巹 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/su.c:133 +#: src/su.c:132 msgid "Sorry." msgstr "峎弮帢庣." -#: src/su.c:323 +#: src/su.c:320 #, c-format msgid "%s: must be run from a terminal\n" msgstr "%s: 峟庰庣 彖帢 庰庥庰弇庰庰巹 帢 庰弮帢庣庥\n" -#: src/su.c:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "%s: pam_start: 峎弇弮帢 %d\n" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" msgstr "帠彖庢 帢庢帢: %s\n" -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, c-format msgid "You are not authorized to su %s\n" msgstr "庰彖 峟庰庰 峎帤庰庣帢 帠庣帢 su %s\n" -#: src/su.c:502 +#: src/su.c:495 msgid "(Enter your own password.)" msgstr "(庣峎帠庰庰 怷 帤庣庥 帢 彖庛庢弮帢庣庥.)" -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" @@ -1614,22 +1542,22 @@ msgstr "" "%s: %s\n" "(帠彖怷峸庛庢庥庰)\n" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" msgstr "庰彖 峎庰庣 弇怷庣\n" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr "帣帢庢 庢 su 庰 帢彖 怷彖 弇怷帠帢庣帢弮 峞.\n" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "帢峎庥帢弮庢 庰徆帢庥巹帣庢 弮庰 彖庛庢弮帢庣庥.\n" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" msgstr "帢帢庥帢弇 庰庣峎帠庰庰 怷 帢 彖庛庢弮帢庣庥 帠庣帢 庰徆帢庥巹帣庢.\n" @@ -1644,7 +1572,7 @@ msgstr "庰彖 峎庰庣 帢庰巹怷 彖庛庢弮帢庣庥彖\n" msgid "No password entry for 'root'\n" msgstr "庰彖 峎庰庣 庥帢帢庢庢 彖庛庢弮帢庣庥怷 帠庣帢 怷彖 'root'\n" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" @@ -1654,457 +1582,393 @@ msgstr "" "弇庢庥怷弇怷帠峸庰 control-d 帠庣帢 彖帢 彖庰巹庰庰 弮庰 庢彖 庥帢彖怷彖庣庥峸 峟彖帢徆庢,\n" "(峸 帤庰 怷 彖庛庢弮帢庣庥 怷 root 帠庣帢 彖峸庢庢 怷 峸弮帢怷):" -#: src/sulogin.c:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" msgstr "彖帢徆庢 帢峎帢庢 峉彖峸庢庢 峉峸弮帢怷\n" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "%s: 庰帢彖帢庥巹庰 庢彖 帣峎庢 帤庰帤怷弮峟彖彖 怷弮峎帤彖\n" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "%s: 庰帢彖帢庥巹庰 庢彖 帣峎庢 帤庰帤怷弮峟彖彖 彖 庥庣帤彖 彖庛庢弮帢庣庥彖 怷弮峎帤彖\n" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "%s: 庢 峟帠庥庢 帢庣庛弮庢庣庥峸 帢峎弮庰怷 `%s'\n" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "%s: 峎帠彖怷 gid %s\n" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "%s: 峎帠彖庢 怷弮峎帤帢 %s\n" -#: src/useradd.c:475 +#: src/useradd.c:418 #, c-format msgid "%s: cannot create new defaults file\n" msgstr "%s: 帢帤彖帢弮巹帢 帤庢弮庣怷帠巹帢 彖峟怷 帢庰巹怷 怷庥帢庛怷庣弮峟彖彖 庛弮巹庰彖\n" -#: src/useradd.c:480 +#: src/useradd.c:423 #, fuzzy, c-format msgid "%s: cannot open new defaults file\n" msgstr "%s: 帢帤彖帢弮巹帢 帤庢弮庣怷帠巹帢 彖峟怷 帢庰巹怷 怷庥帢庛怷庣弮峟彖彖 庛弮巹庰彖\n" -#: src/useradd.c:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" msgstr "%s: 弮庰怷彖怷弮帢巹帢: %s" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s: 怷弮峎帤帢 `%s' 庰巹彖帢庣 NIS 怷弮峎帤帢.\n" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "%s: 怷帤庣怷巹庢庥帢彖 庰帣怷弇庣庥峟 怷弮峎帤庰 (弮庰帠. %d).\n" -#: src/useradd.c:721 +#: src/useradd.c:660 #, c-format msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n" msgstr "峓峸庢: useradd [-u uid [-o]] [-g 怷弮峎帤帢] [-G 怷弮峎帤帢,...] \n" -#: src/useradd.c:724 +#: src/useradd.c:663 #, c-format msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr "" " [-d 弮庢庣庥_庥帢峎弇怷帠怷] [-s 弇怷庣] [-c 弇庣怷]\n" " [-m [-k 庥帢彖彖帢]]\n" -#: src/useradd.c:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, c-format msgid " [-f inactive] [-e expire]\n" msgstr " [-f 帢彖庰彖庰帠] [-e 弇峸徆庢]\n" -#: src/useradd.c:728 +#: src/useradd.c:667 #, c-format msgid " [-p passwd] name\n" msgstr " [-p 彖庛庢弮帢庣庥] 彖怷弮帢\n" -#: src/useradd.c:730 +#: src/useradd.c:669 #, c-format msgid " useradd -D [-g group] [-b base] [-s shell]\n" msgstr " useradd -D [-g 怷弮峎帤帢] [-b 帣峎庢] [-s 弇怷庣]\n" -#: src/useradd.c:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, c-format msgid "%s: error locking group file\n" msgstr "%s: 峉峎弇弮帢 庥帢峎 怷 庥弇庰巹帤弮帢 怷 帢庰巹怷 怷弮峎帤彖\n" -#: src/useradd.c:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, c-format msgid "%s: error opening group file\n" msgstr "%s: 峉峎弇弮帢 庥帢峎 怷 峎彖怷庣帠弮帢 怷 帢庰巹怷 怷弮峎帤彖\n" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, c-format msgid "%s: error locking shadow group file\n" msgstr "%s: 峉峎弇弮帢 庥帢峎 怷 庥弇庰巹帤弮帢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 怷弮峎帤彖\n" -#: src/useradd.c:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, c-format msgid "%s: error opening shadow group file\n" msgstr "%s: 峉峎弇弮帢 庥帢峎 怷 峎彖怷庣帠弮帢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 怷弮峎帤彖\n" -#: src/useradd.c:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "%s: 峇怷 uid %u 帤庰彖 庰巹彖帢庣 弮怷彖帢帤庣庥\n" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "%s: 帢帤彖帢弮巹帢 庰庰庢 弮怷彖帢帤庣庥怷 uid\n" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "%s: 庢 峟帠庥怷 庥帢峎弇怷帠怷 帣峎庢 `%s'\n" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "%s: 庢 峟帠庥怷 弇庣怷 `%s'\n" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "%s: 庢 峟帠庥怷 弮庢庣庥 庥帢峎弇怷帠怷 峸庢 `%s'\n" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s: 庢 峟帠庥庢 庢弮庰怷弮庢彖巹帢 `%s'\n" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "%s: 庥庣帤庢 彖庛庢弮帢庣庥峎 帢帢庣怷彖帢庣 帠庣帢 怷 -e\n" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, c-format msgid "%s: shadow passwords required for -f\n" msgstr "%s: 庥庣帤庢 彖庛庢弮帢庣庥峎 帢帢庣怷彖帢庣 帠庣帢 -f\n" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" msgstr "%s: 庢 峟帠庥怷 庰帤巹怷 `%s'\n" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "%s: 庢 峟帠庥怷 弇怷庣 `%s'\n" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "%s: 庢 峟帠庥怷 彖怷弮帢 峸庢 `%s'\n" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "%s: 帢帤彖帢弮巹帢 庰帢彖庰帠帠帢峸 怷 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "%s: 帢帤彖帢弮巹帢 庰帢彖庰帠帠帢峸 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/useradd.c:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, c-format msgid "%s: unable to lock password file\n" msgstr "%s: 帤彖帢弮巹帢 庥弇庰庣帤弮帢怷 怷 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/useradd.c:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, c-format msgid "%s: unable to open password file\n" msgstr "%s: 帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 怷 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/useradd.c:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, c-format msgid "%s: cannot lock shadow password file\n" msgstr "%s: 帢帤彖帢弮巹帢 庥弇庰庣帤弮帢怷 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/useradd.c:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, c-format msgid "%s: cannot open shadow password file\n" msgstr "%s: 帢帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/useradd.c:1459 +#: src/useradd.c:1354 #, c-format msgid "%s: error adding new password entry\n" msgstr "" "%s: 峉峎弇弮帢 庥帢峎 庢彖 怷庛峸庥庢 彖峟帢 庥帢帢庢庢 怷 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/useradd.c:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "" -"%s: 峉峎弇弮帢 庥帢峎 庢彖 帢彖帢彖峟庢 庥帢帢峸庰彖 怷 dbm 帢庰巹怷 彖庛庢弮帢庣庥彖\n" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, c-format msgid "%s: error adding new shadow password entry\n" msgstr "" "%s: 峉峎弇弮帢 庥帢峎 庢彖 怷庛峸庥庢 彖峟帢 庥帢帢庢庢 怷 帢庰巹怷 庥庣帤彖 " "彖庛庢弮帢庣庥彖\n" -#: src/useradd.c:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "" -"%s: 峉峎弇弮帢 庥帢峎 庢彖 帢彖帢彖峟庢 庥帢帢峸庰彖 怷 dbm 帢庰巹怷 庥庣帤彖 " -"彖庛庢弮帢庣庥彖\n" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" msgstr "%s: 帢帤彖帢弮巹帢 帤庢弮庣怷帠巹帢 庥帢帢弇帠怷 %s\n" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, c-format msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n" msgstr "" -#: src/useradd.c:1590 +#: src/useradd.c:1446 #, fuzzy, c-format msgid "Can't create mail spool for user %s.\n" msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 庥帢帢庢庢 帠庣帢 怷彖 峸庢 %s\n" -#: src/useradd.c:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "%s: 峸庢 %s 峎庰庣\n" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" msgstr "" -#: src/useradd.c:1767 +#: src/useradd.c:1602 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" msgstr "" -#: src/userdel.c:124 +#: src/userdel.c:108 #, c-format msgid "Usage: %s [-r] name\n" msgstr "峓峸庢: %s [-r] 彖怷弮帢\n" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 帢彖帢彖峟庢 庥帢帢峸庢 怷弮峎帤帢\n" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 庢 dbm 庥帢帢庢庢 怷 帢庰巹怷 怷弮峎帤彖\n" - -#: src/userdel.c:214 -#, fuzzy, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: 帢帤彖帢弮巹帢 帢彖帢彖峟庢 庢 dbm 庥帢帢庢庢 怷 帢庰巹怷 怷弮峎帤彖\n" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "%s: 帢帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 帢庰巹怷 怷弮峎帤彖\n" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "%s: 帢帤彖帢弮巹帢 帢彖怷巹帠弮帢怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖 怷弮峎帤彖\n" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 帤庣帢帠帢峸 庥帢帢庢庢 怷 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "" "%s: 峉峎弇弮帢 庥帢峎 庢彖 帤庣帢帠帢峸 庥帢帢庢庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 帤庣帢帠帢峸 庥帢帢庢庢 怷 dbm 帢庰巹怷 彖庛庢弮帢庣庥彖\n" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "" -"%s: 峉峎弇弮帢 庥帢峎 庢彖 帤庣帢帠帢峸 庥帢帢庢庢 怷 dbm 帢庰巹怷 庥庣帤彖 " -"彖庛庢弮帢庣庥彖\n" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "%s: 峸庢 %s 帣巹庥庰帢庣 怷 庢弮帢\n" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "%s: 峇怷 %s 帤庰彖 帢彖峸庥庰庣 怷彖 %s, 帤庰彖 帢帢庣庰巹帢庣\n" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " msgstr "%s: 怷庰庣帤怷怷巹庢庢: 帢帤彖帢弮巹帢 帤庣帢帠帢峸 " -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" msgstr "%s: 峸庢 %s 帤庰彖 峎庰庣\n" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s: 峸庢 %s 庰巹彖帢庣 NIS 峸庢\n" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "" "%s: 庰彖 帤庣帢帠峎庰帢庣 怷 庥帢峎弇怷帠怷 %s (庛帢 帢帢庣怷庰 怷彖 弮庢庣庥 庥帢峎弇怷帠怷 怷 " "峸庢 %s)\n" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 帤庣帢帠帢峸 怷 庥帢帢弇帠怷 %s\n" -#: src/usermod.c:306 +#: src/usermod.c:289 #, c-format msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "峓峸庢: %s\t[-u uid [-o]] [-g 怷弮峎帤帢] [-G 怷弮峎帤帢,...] \n" -#: src/usermod.c:310 +#: src/usermod.c:293 #, 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:313 +#: src/usermod.c:296 #, c-format msgid "[-f inactive] [-e expire] " msgstr "[-f 帢彖庰彖庰帠] [-e 弇峸徆庢] " -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p 彖庛庢弮帢庣庥] [-L|-U] 彖怷弮帢\n" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" msgstr "%s: 帤庰彖 峎庰庣 庰弇庰庛庰庢 弮彖峸弮庢 怷 update_group\n" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "%s: 怷 update_gshadow\n" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "%s: 庰彖 帤庛庢庥帢彖 庰彖帤庰巹徆庰庣\n" -#: src/usermod.c:965 +#: src/usermod.c:903 #, c-format msgid "%s: shadow passwords required for -e and -f\n" msgstr "%s: 庥庣帤庢 彖庛庢弮帢庣庥峎 帢帢庣怷彖帢庣 帠庣帢 怷 -e 庥帢庣 -f\n" -#: src/usermod.c:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "%s: 峇怷 uid %lu 帤庰彖 庰巹彖帢庣 弮怷彖帢帤庣庥\n" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, c-format msgid "%s: error changing password entry\n" msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 帢弇弇帢帠峸 庥帢帢庢庢 彖庛庢弮帢庣庥怷\n" -#: src/usermod.c:1122 +#: src/usermod.c:1053 #, c-format msgid "%s: error removing password entry\n" msgstr "%s: 峉峎弇弮帢 庥帢峎 庢彖 帢帢巹庰庢 庥帢帢庢庢 怷 帢庰巹怷 彖庛庢弮帢庣庥彖\n" -#: src/usermod.c:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "" -"%s: 峉峎弇弮帢 庥帢峎 庢彖 怷庛峸庥庢 彖峟帢 庥帢帢庢庢 怷 dbm 帢庰巹怷 彖庛庢弮帢庣庥彖\n" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "" -"%s: 峉峎弇弮帢 庥帢峎 庢彖 帢帢巹庰庢 庥帢帢庢庢 帢 怷 dbm 帢庰巹怷 彖庛庢弮帢庣庥彖\n" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "" "%s: 峉峎弇弮帢 庥帢峎 庢彖 帢帢巹庰庢 庥帢帢庢庢 怷 帢庰巹怷 庥庣帤彖 彖庛庢弮帢庣庥彖\n" -#: src/usermod.c:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "" -"%s: 峉峎弇弮帢 庥帢峎 庢彖 帢帢巹庰庢 庥帢帢庢庢 怷 dbm 帢庰巹怷 庥庣帤彖 " -"彖庛庢弮帢庣庥彖\n" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "%s: 怷 庥帢峎弇怷帠怷 %s 峎庰庣\n" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "%s: 帢帤彖帢弮巹帢 帤庢弮庣怷帠巹帢 怷 %s\n" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" msgstr "%s: 帤彖帢弮巹帢 帢弇弇帢帠峸 庣帤庣怷庥峸庢(chown) 怷 %s\n" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, c-format msgid "%s: cannot rename directory %s to %s\n" msgstr "%s: 帢帤彖帢弮巹帢 弮庰怷彖怷弮帢巹帢 怷 庥帢帢弇帠怷 %s 庰 %s\n" -#: src/usermod.c:1333 +#: src/usermod.c:1223 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "%s: 怷庰庣帤怷怷巹庢庢: 峇怷 %s 帤庰彖 帢彖峸庥庰庣 怷彖 %s\n" -#: src/usermod.c:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" msgstr "帢怷巹帢 帢弇弇帢帠峸 怷 庣帤庣怷庥峸庢 怷 帠帢弮弮帢怷庥庣帣巹怷" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" msgstr "帢怷巹帢 弮庰怷彖怷弮帢巹帢 帠帢弮弮帢怷庥庣帣巹怷" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" @@ -2113,21 +1977,21 @@ msgstr "" "\n" "%s: 峇怷 %s 帤庰彖 峎弇弇帢徆庰\n" -#: src/vipw.c:133 +#: src/vipw.c:131 #, fuzzy msgid "Couldn't lock file" msgstr "帢帤彖帢弮巹帢 徆庰庥弇庰庣帤弮帢怷 帢庰巹怷\n" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" msgstr "" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s: 帢帤彖帢弮巹帢 庰帢彖帢怷峎 %s: %s (怷庣 帢弇弇帢帠峟 庰巹彖帢庣 怷 %s)\n" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/po/es.gmo b/po/es.gmo index 2db49a53..e7026316 100644 Binary files a/po/es.gmo and b/po/es.gmo differ diff --git a/po/es.po b/po/es.po index 0f7e3963..0b83b056 100644 --- a/po/es.po +++ b/po/es.po @@ -4,22 +4,23 @@ # Reviewed by Ricardo Mones , 2004. msgid "" msgstr "" -"Project-Id-Version: shadow 4.0.7\n" +"Project-Id-Version: shadow 4.0.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-26 07:53+0100\n" -"PO-Revision-Date: 2005-01-16 11:37+0100\n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" +"PO-Revision-Date: 2005-04-18 23:39+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" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" msgstr "Aviso: grupo %s desconocido\n" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" msgstr "Aviso: demasiados grupos\n" @@ -47,17 +48,17 @@ msgstr " Contacte con el administrador.\n" msgid " Choose a new password.\n" msgstr " Elija una contrase簽a nueva.\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "Su contrase簽a caducar獺 en %ld d穩as.\n" -#: libmisc/age.c:174 +#: libmisc/age.c:172 #, c-format msgid "Your password will expire tomorrow.\n" msgstr "Su contrase簽a caducar獺 ma簽ana.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:174 #, c-format msgid "Your password will expire today.\n" msgstr "Su contrase簽a caducar獺 hoy.\n" @@ -72,41 +73,31 @@ msgstr "Incapaz de cambiar tty %s" msgid "Environment overflow\n" msgstr "Desbordamiento de entorno\n" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr "No debe cambiar $%s\n" -#: libmisc/failure.c:230 +#: libmisc/failure.c:229 #, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "%d %s desde la 繳ltima entrada. La 繳ltima fue %s en %s.\n" +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "" +"%d fallo desde la 繳ltima entrada.\n" +"La 繳ltima fue %s en %s.\n" +msgstr[1] "" +"%d fallos desde la 繳ltima entrada.\n" +"La 繳ltima fue %s en %s.\n" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "fallos" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "fallo" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" msgstr "Demasiados accesos.\n" -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "La contrase簽a no descifra la llave secreta para %s.\n" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "" -"No pude establecer la clave secreta de %s: 聶est獺 ejecut獺ndose el demonio " -"keyserv?\n" - #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "Tiene correo nuevo." @@ -119,7 +110,7 @@ msgstr "Sin correo." msgid "You have mail." msgstr "Tiene correo." -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " msgstr "Contrase簽a mala: %s. " @@ -134,20 +125,20 @@ msgstr "passwd: fall籀 pam_start(), error %d\n" msgid "passwd: %s\n" msgstr "passwd: %s\n" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" msgstr "passwd: contrase簽a actualizada correctamente\n" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "Incapaz de cambiar el directorio a \"%s\"\n" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" msgstr "Sin directorio, entrando con HOME=/" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr "No puedo ejecutar %s" @@ -162,37 +153,33 @@ msgstr "Directorio ra穩z \"%s\" inv獺lido\n" msgid "Can't change root directory to \"%s\"\n" msgstr "No puedo cambiar el directorio ra穩z a \"%s\"\n" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "fall籀 malloc(%d)\n" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" msgstr "No pude reservar espacio para la informaci籀n de configuraci籀n.\n" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "" "error de configuraci籀n - elemento '%s' desconocido (notif穩quelo al " "administrador)\n" -#: lib/pwauth.c:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "Contrase簽a: " -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "Contrase簽a de %s: " -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "(Eco activado) " - -#: src/chage.c:118 +#: src/chage.c:112 #, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" @@ -201,155 +188,148 @@ msgstr "" "Modo de uso: chage [-l] [-m m穩n_d穩as] [-M m獺x_d穩as] [-W aviso]\n" " [-I inactivo] [-E caducidad] [-d 繳ltimo_d穩a] usuario\n" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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:155 +#: src/chage.c:149 msgid "Minimum Password Age" msgstr "Duraci籀n m穩nima de la contrase簽a" -#: src/chage.c:161 +#: src/chage.c:155 msgid "Maximum Password Age" msgstr "Duraci籀n m獺xima de la contrase簽a" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" msgstr "ltimo cambio de contrase簽a (AAAA-MM-DD)" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" msgstr "Aviso de caducidad de la contrase簽a" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "Contrase簽a inactiva" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Fecha de caducidad de la cuenta (AAAA-MM-DD)" -#: src/chage.c:238 +#: src/chage.c:231 #, 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:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 #, c-format msgid "never\n" msgstr "nunca\n" -#: src/chage.c:251 +#: src/chage.c:244 #, c-format msgid "Password expires\t\t\t\t\t: " msgstr "La contrase簽a caduca\t\t\t\t\t: " -#: src/chage.c:267 +#: src/chage.c:260 #, c-format msgid "Password inactive\t\t\t\t\t: " msgstr "Contrase簽a inactiva\t\t\t\t\t: " -#: src/chage.c:281 +#: src/chage.c:274 #, c-format msgid "Account expires\t\t\t\t\t\t: " msgstr "La cuenta caduca\t\t\t\t\t\t: " -#: src/chage.c:297 +#: src/chage.c:290 #, 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:298 +#: src/chage.c:292 #, 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:299 +#: src/chage.c:294 #, 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:444 +#: src/chage.c:431 #, c-format msgid "%s: do not include \"l\" with other flags\n" msgstr "%s: no incluya \"l\" con otras banderas\n" -#: src/chage.c:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 #, c-format msgid "%s: permission denied.\n" msgstr "%s: permiso denegado.\n" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 #, c-format msgid "%s: PAM authentication failed\n" msgstr "%s: Autenticaci籀n PAM fallida\n" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, c-format msgid "%s: can't open password file\n" msgstr "%s: no puedo abrir el fichero de contrase簽as\n" -#: src/chage.c:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "%s: usuario desconocido %s\n" -#: src/chage.c:535 +#: src/chage.c:519 #, c-format msgid "%s: can't lock shadow password file" msgstr "%s: no puedo bloquear el fichero de contrase簽as ocultas (shadow)" -#: src/chage.c:543 +#: src/chage.c:527 #, c-format msgid "%s: can't open shadow password file" msgstr "%s: no puedo abrir el fichero de contrase簽as ocultas (shadow)" -#: src/chage.c:604 +#: src/chage.c:587 #, c-format msgid "Changing the aging information for %s\n" msgstr "Cambiando la informaci籀n de la edad para %s\n" -#: src/chage.c:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" msgstr "%s: error cambiando los campos\n" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, c-format msgid "%s: can't update password file\n" msgstr "%s: no puedo actualizar el fichero de contrase簽as\n" -#: src/chage.c:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, 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:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "Error actualizando la entrada de contrase簽a DBM.\n" - -#: src/chage.c:692 +#: src/chage.c:649 #, 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:740 +#: src/chage.c:693 #, 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:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 #, c-format msgid "%s: PAM chauthtok failed\n" msgstr "%s: PAM chauthtok fall籀\n" @@ -370,117 +350,122 @@ msgstr "" "Modo de uso: %s [-f nombre_completo] [-r num_habitaci籀n] [-w telf_trabajo]\n" "\t[-h telf_casa]\n" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "Nombre completo" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "\tNombre completo: %s\n" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "N繳mero de habitaci籀n" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "Tel矇fono del trabajo" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" msgstr "Tel矇fono de casa" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "Otro" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s: no puedo determinar su nombre de usuario.\n" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s: no puedo cambiar el usuario `%s' en el cliente NIS.\n" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "%s: `%s' es el maestro NIS para este cliente.\n" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, c-format +msgid "%s: Permission denied.\n" +msgstr "%s: Permiso denegado.\n" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" msgstr "Cambiando la informaci籀n de usuario para %s\n" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s: nombre inv獺lido: \"%s\"\n" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s: nombre de habitaci籀n inv獺lido: \"%s\"\n" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s: tel矇fono del trabajo inv獺lido: \"%s\"\n" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s: tel矇fono de casa inv獺lido: \"%s\"\n" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s: \"%s\" contiene caracteres ilegales\n" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "%s: campos demasiado largos\n" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" msgstr "No se puede cambiar el ID al del superusuario.\n" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" msgstr "No se puede bloquear el fichero de contrase簽as, int矇ntelo m獺s tarde.\n" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" msgstr "No se puede abrir el fichero de contrase簽as.\n" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s: no se encontr籀 %s en /etc/passwd\n" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" msgstr "Error actualizando la entrada de la contrase簽a.\n" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" msgstr "No se pueden remitir los cambios del fichero de contrase簽as.\n" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" msgstr "No se puede desbloquear el fichero de contrase簽as.\n" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -504,48 +489,48 @@ msgstr "" msgid "%s: can't lock password file\n" msgstr "%s: no puedo bloquear el fichero de contrase簽as\n" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "%s: no se puede bloquear el fichero de contrase簽as ocultas (shadow)\n" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "%s: no se puede abrir el fichero de contrase簽as ocultas (shadow)\n" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "%s: l穩nea %d: l穩nea demasiado larga\n" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "%s: l穩nea %d: falta la nueva contrase簽a\n" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "%s: l穩nea %d: usuario desconocido %s\n" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "%s: l穩nea %d: no se puede actualizar la entrada de la contrase簽a\n" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "%s: error detectado, cambios ignorados\n" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" msgstr "%s: error actualizando el fichero de contrase簽as ocultas (shadow)\n" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" msgstr "%s: error actualizando el fichero de contrase簽as\n" @@ -555,26 +540,26 @@ msgstr "%s: error actualizando el fichero de contrase簽as\n" msgid "Usage: %s [-s shell] [name]\n" msgstr "Modo de uso: %s [-s shell] [nombre]\n" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" msgstr "Shell de acceso" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" msgstr "No debe cambiar la shell para %s.\n" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" msgstr "Cambiando la shell de acceso para %s\n" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s: entrada inv獺lida: %s\n" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" msgstr "%s no es una shell v獺lida.\n" @@ -584,12 +569,12 @@ msgstr "%s no es una shell v獺lida.\n" msgid "Usage: expiry {-f|-c}\n" msgstr "Modo de uso: expiry {-f|-c}\n" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" msgstr "%s: 癒AVISO! 癒Debe ser set-UID de superusuario!\n" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "%s: usuario desconocido\n" @@ -603,8 +588,9 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" @@ -620,320 +606,286 @@ msgstr "" " -m, --maximum MAX\t\testablece el n繳mero m獺ximo de accesos fallidos\n" " a MAX\n" " -r, --reset\t\t\treinicia los contadores de accesos fallidos\n" +" -t, --time ND muestra los registros de faillog para los " +"繳ltimos\n" +" ND d穩as\n" " -u, --user USUARIO\t\tmuestra el registro de faillog o mantiene los\n" " contadores de fallos y los l穩mites (si se " "usan\n" " las opciones -r, -m o -l) para el usuario\n" " USUARIO\n" -#: src/faillog.c:86 +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" -msgstr "Usuario Fallos M獺ximo ltimo\n" +msgid "Login Failures Maximum Latest On\n" +msgstr "Usuario Fallos M獺ximo ltimo Activo\n" -#: src/faillog.c:103 -#, c-format -msgid " %s on %s" -msgstr " %s en %s" - -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" msgstr "[faltan %lds]" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr "[bloqueados %lds]" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "Usuario desconocido: %s\n" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "Modo de uso: %s [-r|-R] grupo\n" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr " %s [-a usuario] grupo\n" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr " %s [-d usuario] grupo\n" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr " %s [-A usuario,...] [-M usuario,...] grupo\n" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr " %s [-M usuario,...] grupo\n" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" msgstr "%s: se requieren contrase簽as de grupo ocultas (shadow) para -A\n" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "聶Qui矇n es?\n" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr "grupo desconocido: %s\n" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "A簽adiendo al usuario %s al grupo %s\n" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "Eliminando al usuario %s del grupo %s\n" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" msgstr "%s: miembro desconocido %s\n" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "%s: No es una tty\n" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "Cambiando la contrase簽a para el grupo %s\n" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "Nueva contrase簽a: " -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " msgstr "Reintroduzca la nueva contrase簽a: " -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" msgstr "No concuerdan, pruebe otra vez" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" msgstr "%s: Pruebe otra vez m獺s tarde\n" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "%s: no se puede obtener el bloqueo\n" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" msgstr "%s: no se puede obtener el bloqueo de shadow\n" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "%s: no se puede abrir el fichero\n" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "%s: no se puede actualizar la entrada\n" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" msgstr "%s: no se puede actualizar la entrada oculta (shadow)\n" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "%s: no se puede reescribir el fichero\n" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" msgstr "%s: no se puede reescribir el fichero oculto (shadow)\n" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "%s: no se puede desbloquear el fichero\n" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "%s: no se pueden actualizar los ficheros DBM\n" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "%s: no se pueden actualizar los ficheros DBM ocultos (shadow)\n" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "Modo de uso: groupadd [-g gid [-o]] [-f] grupo\n" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, c-format msgid "%s: error adding new group entry\n" msgstr "%s: error a簽adiendo entrada nueva de grupo\n" -#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: no se puede a簽adir entrada nueva de grupo dbm\n" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "%s: el nombre %s no es 繳nico\n" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" msgstr "%s: el gid %u no es 繳nico\n" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "%s: no se puede obtener un gid 繳nico\n" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, 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:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "%s: grupo %s inv獺lido\n" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "%s: -O requiere NOMBRE=VALOR\n" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s: no se puede reescribir el fichero grupos\n" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s: no se puede reescribir el fichero de grupos oculto (shadow)\n" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" msgstr "%s: incapaz de bloquear el fichero de grupos\n" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" msgstr "%s: incapaz de abrir el fichero de grupos\n" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" msgstr "%s: incapaz de bloquear el fichero de grupos oculto (shadow)\n" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" msgstr "%s: incapaz de abrir el fichero de grupos oculto (shadow)\n" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "%s: el grupo %s existe\n" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, c-format msgid "Usage: groupdel group\n" msgstr "Modo de uso: groupdel grupo\n" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" msgstr "%s: error eliminando la entrada del grupo\n" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "%s: error eliminando la entrada del grupo dbm\n" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "%s: error eliminando entrada del grupo oculto (shadow)\n" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "%s: error eliminando la entrada del grupo dbm oculto (shadow)\n" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "%s: no se puede eliminar el grupo primario del usuario.\n" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "%s: el grupo %s no existe\n" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "%s: el grupo %s es un grupo NIS\n" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s: %s es el maestro NIS\n" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "Modo de uso: groupmod [-g gid [-o]] [-n nombre] grupo\n" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "%s: no se encontr籀 %s en /etc/group\n" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "" -"%s: no se puede a簽adir la entrada del grupo dbm oculto (shadow) nuevo\n" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s: %u no es un gid 繳nico\n" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "%s: %s no es un nombre 繳nico\n" @@ -943,110 +895,105 @@ msgstr "%s: %s no es un nombre 繳nico\n" msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "Modo de uso: %s [-r] [-s] [grupo [gshadow]]\n" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "Modo de uso: %s [-r] [-s] [grupo]\n" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "No" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" msgstr "%s: -s y -r son incompatibles\n" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "%s: no se puede bloquear el fichero %s\n" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "%s: no se puede abrir el fichero %s\n" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" msgstr "entrada del fichero de grupos inv獺lida\n" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "聶eliminar la l穩nea `%s'? " -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" msgstr "entrada de grupo duplicada\n" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" msgstr "nombre de grupo `%s' inv獺lido\n" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "grupo %s: no existe el usuario %s\n" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " msgstr "聶eliminar miembro `%s'? " -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" msgstr "entrada del fichero de grupos oculto (shadow) inv獺lida\n" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" msgstr "entrada del fichero de grupos oculto (shadow) duplicada\n" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" msgstr "no hay entradas coincidentes en el fichero de grupos\n" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" msgstr "grupo oculto (shadow) %s: no existe el usuario administrativo %s\n" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " msgstr "聶eliminar miembro administrativo `%s'? " -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" msgstr "grupo oculto (shadow) %s: no existe el usuario %s\n" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "%s: no se puede actualizar el fichero %s\n" -#: src/grpck.c:647 src/pwck.c:612 -#, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: los ficheros se han actualizado, ejecute mkpasswd\n" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format -msgid "%s: no changes\n" -msgstr "%s: sin cambios\n" - -#: src/grpck.c:651 src/pwck.c:616 +#: src/grpck.c:640 src/pwck.c:606 #, c-format msgid "%s: the files have been updated\n" msgstr "%s: los ficheros se han actualizado\n" +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "%s: sin cambios\n" + #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" @@ -1062,37 +1009,37 @@ msgstr "%s: no se puede abrir el fichero de grupos\n" msgid "%s: can't lock shadow group file\n" msgstr "%s: no se puede bloquear el fichero de grupos oculto (shadow)\n" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" msgstr "%s: no se puede abrir el fichero de grupos oculto (shadow)\n" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "%s: no se puede eliminar el grupo oculto (shadow) %s\n" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "%s: no se puede actualizar la entrada oculta (shadow) para %s\n" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "%s: no se puede actualizar la entrada para el grupo %s\n" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" msgstr "%s: no se puede actualizar el fichero de grupos oculto (shadow)\n" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" msgstr "%s: no se puede actualizar el fichero de grupo\n" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "%s: no se puede eliminar el fichero de grupos oculto (shadow)\n" @@ -1112,13 +1059,13 @@ msgstr "Modo de uso: id\n" msgid " groups=" msgstr "grupos=" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" @@ -1131,41 +1078,41 @@ msgstr "" " -t, --time DAS\tmuestra s籀lo los registros lastlog m獺s recientes\n" " que DAS\n" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" msgstr "Nombre Puerto De ltimo\n" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "Nombre Puerto ltimo\n" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "**Nunca ha entrado**" -#: src/login.c:175 +#: src/login.c:156 #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Modo de uso: %s [-p] [nombre]\n" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr " %s [-p] [-h puesto] [-f nombre]\n" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr " %s [-p] -r puesto\n" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" msgstr "Tiempo de acceso inv獺lido\n" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" @@ -1174,7 +1121,7 @@ msgstr "" "\n" "Sistema cerrado para mantenimiento rutinario\n" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" @@ -1183,7 +1130,7 @@ msgstr "" "\n" "[Desconexi籀n evitada -- acceso del superusuario permitido.]\n" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" @@ -1192,17 +1139,17 @@ msgstr "" "\n" "El acceso caduc籀 despu矇s de %d segundos.\n" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" msgstr " en `%.100s' desde `%.200s'" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" msgstr " en `%.100s'" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" @@ -1211,38 +1158,29 @@ msgstr "" "\n" "%s login: " -#: src/login.c:819 -msgid "login: " -msgstr "login: " - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" msgstr "Login incorrecto" -#: src/login.c:1198 +#: src/login.c:996 msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "Aviso: acceso reestablecido despu矇s de un lockout temporal.\n" -#: src/login.c:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "ltima entrada: %s en %s" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" msgstr "ltima entrada: %.19s en %s" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" msgstr " desde %.*s" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "Empezando rad_login\n" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" @@ -1260,9 +1198,9 @@ msgid "%s: cannot open DBM files for %s\n" msgstr "%s: no se pueden abrir los ficheros DBM para %s\n" #: src/mkpasswd.c:286 -#, fuzzy, c-format +#, c-format msgid "%s: the line beginning with %.16s... is too long\n" -msgstr "%s: el comienzo con " +msgstr "%s: la l穩nea que comienza con %.16s... es demasiado larga\n" #: src/mkpasswd.c:313 #, c-format @@ -1284,17 +1222,17 @@ msgstr "%s: error a簽adiendo un registro para %s\n" msgid "added %d entries, longest was %d\n" msgstr "%d entradas a簽adidas, la m獺s larga fue %d\n" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "Modo de uso: %s [-vf] [-p|g|sp|sg] fichero\n" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "Modo de uso: %s [-vf] [-p|g|sp] fichero\n" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "Modo de uso: %s [-vf] [-p|g] fichero\n" @@ -1314,16 +1252,16 @@ msgstr "Modo de uso: sg grupo [[-c] orden]\n" msgid "unknown uid: %u\n" msgstr "uid desconocido: %u\n" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" msgstr "gid desconocido: %lu\n" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "Disculpe.\n" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "demasiados grupos\n" @@ -1333,93 +1271,93 @@ msgstr "demasiados grupos\n" msgid "Usage: %s [input]\n" msgstr "Modo de uso: %s [entrada]\n" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "%s: no se puede bloquear /etc/passwd.\n" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "%s: no se pueden bloquear los ficheros, pruebe de nuevo m獺s tarde\n" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "%s: no se pueden abrir los ficheros\n" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "%s: l穩nea %d: l穩nea inv獺lida\n" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "%s: l穩nea %d: no se puede crear GID\n" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "%s: l穩nea %d: no se puede crear UID\n" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "%s: l穩nea %d: no se puede encontrar el usuario %s\n" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "%s: l穩nea %d: no se puede actualizar la contrase簽a\n" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "%s: l穩nea %d: fall籀 mkdir\n" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "" "%s: l穩nea %d: fall籀 chown\n" "\n" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "%s: l穩nea %d: no se puede actualizar la entrada\n" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "%s: error actualizando los ficheros\n" -#: src/passwd.c:155 +#: src/passwd.c:154 #, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "Modo de uso: %s [-f|-s] [nombre]\n" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr " %s [-x m獺x] [-n m穩n] [-w aviso] [-i inact] nombre\n" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} nombre\n" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "Contrase簽a antigua: " -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" msgstr "Contrase簽a incorrecta para `%s'\n" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" @@ -1428,16 +1366,16 @@ msgstr "" "Introduzca la nueva contrase簽a (m穩nimo de %d caracteres, m獺ximo de %d)\n" "Por favor, use una combinaci籀n de letras may繳sculas, min繳sculas y n繳meros.\n" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "Nueva contrase簽a: " -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" msgstr "Vuelva a intentarlo.\n" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" @@ -1446,52 +1384,52 @@ msgstr "" "\n" "Aviso: contrase簽a d矇bil (introd繳zcala otra vez para usarla de todos modos).\n" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" msgstr "No concuerdan, pruebe de nuevo.\n" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "No puede cambiarse la contrase簽a para %s.\n" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" msgstr "Disculpe, a繳n no puede cambiarse la contrase簽a para %s.\n" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "%s: sin memoria\n" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "%s: no se puede ejecutar %s" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" msgstr "%s: repositorio %s no soportado\n" -#: src/passwd.c:914 +#: src/passwd.c:884 #, c-format -msgid "You may not change the password for %s.\n" -msgstr "No debe cambiar la contrase簽a para %s.\n" +msgid "%s: You may not view or modify password information for %s.\n" +msgstr "%s: No debe ver o cambiar la informaci籀n de la contrase簽a para %s.\n" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "Cambiando la contrase簽a para %s\n" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "La contrase簽a para %s no se ha modificado.\n" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "Contrase簽a cambiada.\n" @@ -1506,49 +1444,49 @@ msgstr "Modo de uso: %s [-q] [-r] [-s] [passwd [shadow]]\n" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "Modo de uso: %s [-q] [-r] [-s] [passwd]\n" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" msgstr "entrada del fichero de contrase簽as inv獺lida\n" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" msgstr "entrada de contrase簽a duplicada\n" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" msgstr "nombre de usuario '%s' inv獺lido\n" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "usuario %s: no existe el grupo %u\n" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "usuario %s: el directorio %s no existe\n" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "usuario %s: el programa %s no existe\n" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" msgstr "entrada de contrase簽a oculta (shadow) inv獺lida\n" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" msgstr "entrada de contrase簽a oculta (shadow) duplicada\n" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" msgstr "ninguna entrada del fichero de contrase簽as concuerda\n" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" msgstr "" @@ -1569,17 +1507,17 @@ msgstr "%s: no se puede abrir el fichero passwd\n" msgid "%s: can't remove shadow entry for %s\n" msgstr "%s: no se puede eliminar la entrada oculta (shadow) para %s\n" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "%s: no se puede actualizar la entrada de la contrase簽a para %s\n" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" msgstr "%s: no se puede actualizar el fichero oculto (shadow)\n" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" msgstr "%s: no se puede actualizar el fichero passwd\n" @@ -1589,40 +1527,40 @@ msgstr "%s: no se puede actualizar el fichero passwd\n" msgid "%s: can't update entry for user %s\n" msgstr "%s: no se puede actualizar la entrada para el usuario %s\n" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format 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:133 +#: src/su.c:132 msgid "Sorry." msgstr "Disculpe." -#: src/su.c:323 +#: src/su.c:320 #, c-format msgid "%s: must be run from a terminal\n" msgstr "%s: debe ejecutarse desde un terminal\n" -#: src/su.c:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "%s: pam_start: error %d\n" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" msgstr "Id desconocido: %s\n" -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, c-format msgid "You are not authorized to su %s\n" msgstr "No est獺 autorizado a usar su %s\n" -#: src/su.c:502 +#: src/su.c:495 msgid "(Enter your own password.)" msgstr "(Introduzca su propia contrase簽a)." -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" @@ -1631,22 +1569,22 @@ msgstr "" "%s: %s\n" "(Ignorado)\n" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" msgstr "Sin shell\n" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr "Acceso a \"su\" a esa cuenta DENEGADO.\n" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "Evitada autenticaci籀n de contrase簽a.\n" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" msgstr "Por favor, introduzca su PROPIA contrase簽a como autenticaci籀n.\n" @@ -1661,7 +1599,7 @@ msgstr "No hay fichero de contrase簽as\n" msgid "No password entry for 'root'\n" msgstr "No hay entrada de contrase簽a para 'root'\n" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" @@ -1671,448 +1609,393 @@ 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:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" msgstr "Entrando en el Modo de Mantenimiento del Sistema\n" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "%s: reconstruya la base de datos de los grupos\n" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "%s: reconstruya la base de datos de los grupos ocultos (shadow)\n" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "%s: argumento num矇rico inv獺lido `%s'\n" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "%s: gid %s desconocido\n" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "%s: grupo %s desconocido\n" -#: src/useradd.c:475 +#: src/useradd.c:418 #, 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:480 +#: src/useradd.c:423 #, 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:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" msgstr "%s: renombra: %s" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s: el grupo `%s' es un grupo NIS.\n" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "%s: demasiados grupos especificados (m獺x de %d).\n" -#: src/useradd.c:721 +#: src/useradd.c:660 #, 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:724 +#: src/useradd.c:663 #, c-format msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr "" " [-d home] [-s shell] [-c comentario] [-m [-k " "plantilla]]\n" -#: src/useradd.c:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, c-format msgid " [-f inactive] [-e expire]\n" msgstr " [-f inactivo] [-e caduca]\n" -#: src/useradd.c:728 +#: src/useradd.c:667 #, c-format msgid " [-p passwd] name\n" msgstr " [-p contrase簽a] nombre\n" -#: src/useradd.c:730 +#: src/useradd.c:669 #, 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:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, c-format msgid "%s: error locking group file\n" msgstr "%s: error bloqueando el fichero de grupos\n" -#: src/useradd.c:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, c-format msgid "%s: error opening group file\n" msgstr "%s: error abriendo el fichero de grupos\n" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, c-format msgid "%s: error locking shadow group file\n" msgstr "%s: error bloqueando el fichero de grupos oculto (shadow)\n" -#: src/useradd.c:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, c-format msgid "%s: error opening shadow group file\n" msgstr "%s: error abriendo el fichero de grupos oculto (shadow)\n" -#: src/useradd.c:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "%s: el uid %u no es 繳nico\n" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "%s: no se puede obtener un uid 繳nico\n" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "%s: directorio base `%s' inv獺lido\n" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "%s: comentario `%s' inv獺lido\n" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "%s: directorio home `%s' inv獺lido\n" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s: fecha `%s' inv獺lida\n" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "%s: se requiere contrase簽as ocultas (shadow) para -e\n" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, c-format msgid "%s: shadow passwords required for -f\n" msgstr "%s: se requiere contrase簽as ocultas (shadow) para -f\n" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" msgstr "%s: campo `%s' inv獺lido\n" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "%s: shell `%s' inv獺lida\n" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "%s: nombre de usuario `%s' inv獺lido\n" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "%s: no se puede reescribir el fichero de contrase簽as\n" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, 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:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, c-format msgid "%s: unable to lock password file\n" msgstr "%s: incapaz de bloquear el fichero de contrase簽as\n" -#: src/useradd.c:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, c-format msgid "%s: unable to open password file\n" msgstr "%s: incapaz de abrir el fichero de contrase簽as\n" -#: src/useradd.c:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, 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:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, 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:1459 +#: src/useradd.c:1354 #, c-format msgid "%s: error adding new password entry\n" msgstr "%s: error a簽adiendo entrada de contrase簽a nueva\n" -#: src/useradd.c:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "%s: error actualizando entrada dbm de contrase簽a\n" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, 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:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s: error actualizando la entrada dbm de contrase簽a oculta (shadow)\n" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" msgstr "%s: no se puede crear el directorio %s\n" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, 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:1590 +#: src/useradd.c:1446 #, 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:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "%s: el usuario %s existe\n" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, 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:1767 +#: src/useradd.c:1602 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" msgstr "" "%s: aviso: CREATE_HOME no est獺 soportado, por favor, use -m en su lugar.\n" -#: src/userdel.c:124 +#: src/userdel.c:108 #, c-format msgid "Usage: %s [-r] name\n" msgstr "Modo de uso: %s [-r] nombre\n" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" msgstr "%s: error actualizando la entrada del grupo\n" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "%s: no se puede actualizar la entrada del grupo dbm\n" - -#: src/userdel.c:214 -#, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: no se puede eliminar la entrada del grupo dbm\n" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "%s: no se puede abrir el fichero de grupos\n" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "%s: no se puede abrir el fichero de grupos oculto (shadow)\n" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "%s: error eliminando la entrada de contrase簽a\n" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "%s: error eliminando la entrada de contrase簽a oculta (shadow)\n" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "%s: error eliminando la entrada dbm de contrase簽a\n" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s: error eliminando la entrada dbm de contrase簽a oculta (shadow)\n" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "%s: el usuario %s est獺 actualmente dentro del sistema\n" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "%s: %s no pertenece a %s, no se elimina\n" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " msgstr "%s: aviso: no se puede eliminar " -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" msgstr "%s: el usuario %s no existe\n" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s: el usuario %s es un usuario NIS\n" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "" "%s: no se elimina el directorio %s (eliminar穩a el directorio home del " "usuario %s)\n" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "%s: error eliminando el directorio %s\n" -#: src/usermod.c:306 +#: src/usermod.c:289 #, c-format msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "Modo de uso: %s\t[-u uid [-o]] [-g grupo] [-G grupo,...] \n" -#: src/usermod.c:310 +#: src/usermod.c:293 #, 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:313 +#: src/usermod.c:296 #, c-format msgid "[-f inactive] [-e expire] " msgstr "[-f inactivo] [-e caduca] " -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p contrase簽a] [-L|-U] nombre\n" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" msgstr "%s: sin memoria en update_group\n" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "%s: sin memoria en update_gshadow\n" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "%s: no se ha dado ninguna opci籀n\n" -#: src/usermod.c:965 +#: src/usermod.c:903 #, 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:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "%s: el uid %lu no es 繳nico\n" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, c-format msgid "%s: error changing password entry\n" msgstr "%s: error cambiando la entrada de la contrase簽a\n" -#: src/usermod.c:1122 +#: src/usermod.c:1053 #, c-format msgid "%s: error removing password entry\n" msgstr "%s: error eliminando la entrada de la contrase簽a\n" -#: src/usermod.c:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "%s: error a簽adiendo la entrada dbm de la contrase簽a\n" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "%s: error eliminando la entrada dbm de la contrase簽a\n" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "%s: error eliminando entrada de contrase簽a oculta (shadow)\n" -#: src/usermod.c:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s: error eliminando la entrada dbm de contrase簽a oculta (shadow)\n" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "%s: el directorio %s existe\n" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "%s: no se puede crear %s\n" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" msgstr "%s: no se puede chown %s\n" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, 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:1333 +#: src/usermod.c:1223 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "%s: aviso: %s no pertenece a %s\n" -#: src/usermod.c:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" msgstr "fall籀 el cambio de propietario del buz籀n de correo" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" msgstr "fall籀 el cambio de nombre del buz籀n de correo" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" @@ -2121,20 +2004,20 @@ msgstr "" "\n" "%s: %s no se cambia\n" -#: src/vipw.c:133 +#: src/vipw.c:131 msgid "Couldn't lock file" msgstr "No se puede bloquear el fichero" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" msgstr "No se puede realizar una copia de seguridad" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s: no se puede restaurar %s: %s (sus cambios est獺n en %s)\n" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/po/eu.gmo b/po/eu.gmo index 84263c7d..34a45f7e 100644 Binary files a/po/eu.gmo and b/po/eu.gmo differ diff --git a/po/eu.po b/po/eu.po index c3a3acb5..5c706262 100644 --- a/po/eu.po +++ b/po/eu.po @@ -1,131 +1,125 @@ +# translation of shadow_eu.po to Basque +# translation of shadow_eu.po to # translation of shadow_perrier_eu_po.po to Euskara # translation of shadow_po.po to Euskara -# Copyright (C) 2004 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. # Piarres Beobide EgaC1a , 2004. -# Piarres Beobide Ega簽a , 2004. +# Piarres Beobide Ega簽a , 2004, 2005. +# I鎙ki Larra鎙ga Murgoitio , 2005. # msgid "" msgstr "" -"Project-Id-Version: shadow_po\n" +"Project-Id-Version: shadow 4.0.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-26 07:53+0100\n" -"PO-Revision-Date: 2004-06-21 01:18+0200\n" -"Last-Translator: Piarres Beobide Ega簽a \n" -"Language-Team: Euskara \n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" +"PO-Revision-Date: 2005-04-19 21:28+0200\n" +"Last-Translator: Iaki Larraaga Murgoitio \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.3.1\n" -"Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: KBabel 1.9.1\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" -msgstr "Kontuz: talde ezezaguna %s \n" +msgstr "Abisua: %s talde ezezaguna\n" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" -msgstr "Kontuz: talde gehiegi\n" +msgstr "Abisua: talde gehiegi\n" #: libmisc/age.c:72 #, c-format msgid "Your password has expired." -msgstr "Zure pasahitza iraungirik dago." +msgstr "Pasahitza iraungi egin da." #: libmisc/age.c:75 #, c-format msgid "Your password is inactive." -msgstr "Zure pasahitza ezgaiturik dago." +msgstr "Pasahitza ez-aktibo dago." #: libmisc/age.c:78 #, c-format msgid "Your login has expired." -msgstr "Zure Erabiltzaile izena iraungirik dago." +msgstr "Erabiltzaile-izena iraungi egin da." #: libmisc/age.c:90 msgid " Contact the system administrator.\n" -msgstr " Sistema kudeatzailearekin harremanetan jarri.\n" +msgstr " Jarri harremanetan sistema-administratzailearekin.\n" #: libmisc/age.c:93 msgid " Choose a new password.\n" msgstr " Aukeratu pasahitz berria.\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" -msgstr "Zure pasahitza %ld egun barru iraungiko da\n" +msgstr "Pasahitza %ld egun barru iraungi egingo da.\n" + +#: libmisc/age.c:172 +#, c-format +msgid "Your password will expire tomorrow.\n" +msgstr "Pasahitza bihar iraungi egingo da.\n" #: libmisc/age.c:174 #, c-format -msgid "Your password will expire tomorrow.\n" -msgstr "Zure pasahitza bihar iraungiko da.\n" - -#: libmisc/age.c:176 -#, c-format msgid "Your password will expire today.\n" -msgstr "Zure pasahitza gaur iraungiko da.\n" +msgstr "Pasahitza gaur iraungi egingo da.\n" #: libmisc/chowntty.c:106 #, c-format msgid "Unable to change tty %s" -msgstr "Ezin da tty%s aldatu" +msgstr "Ezin da %s tty aldatu" #: libmisc/env.c:155 #, c-format msgid "Environment overflow\n" -msgstr "Ingurune gainezkatzea\n" +msgstr "Inguruneak gainezka egin du\n" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" -msgstr "Zuk ez zenuke $%s aldatu beharko\n" +msgstr "Ez zenuke $%s aldatu beharko\n" -#: libmisc/failure.c:230 -#, fuzzy, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "huts %d azken saio hasiertaik. Azkena %s %s-n izan zen.\n" +#: libmisc/failure.c:229 +#, c-format +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "" +"Hutsegite %d azken saio-hasiertaik.\n" +"Azkena %s izan zen %s(e)n.\n" +msgstr[1] "" +"%d hutsegite azken saio-hasiertaik.\n" +"Azkena %s izan zen %s(e)n.\n" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" -msgstr "Sarrera saio gehiegi.\n" - -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "Password ez da %s-ren gako sekretua desenkriptatzeko gai.\n" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "" -"Ezin da %s-n gako sekretua ezarri: keyserv deabrua abiarazirik al dago?\n" +msgstr "Gehiegizko saio-hasierak.\n" #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." -msgstr "ePosta berria duzu." +msgstr "Mezu berria duzu." #: libmisc/mail.c:72 msgid "No mail." -msgstr "ePostarik gabe." +msgstr "Mezurik ez." #: libmisc/mail.c:74 msgid "You have mail." -msgstr "ePosta duzu." +msgstr "Mezua duzu." -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " -msgstr "Okerreko pasahitza: %s. " +msgstr "Pasahitz okerra: %s. " #: libmisc/pam_pass.c:38 #, c-format @@ -135,25 +129,25 @@ msgstr "passwd: pam_start() huts egin du, errorea: %d\n" #: libmisc/pam_pass.c:44 #, c-format msgid "passwd: %s\n" -msgstr "pasahitza:%s\n" +msgstr "passwd: %s\n" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" -msgstr "" +msgstr "passwd: pasahitza ongi eguneratu da\n" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "Ezin da \"%s\"-ra aldatu\n" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" -msgstr "Ez da karpeta aurkitzen ; HOME=/ erabiliaz saioa hasten" +msgstr "Direktoriorik ez dago, HOME=/ erabiliz saioa hasiko da" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" -msgstr "Ezin da %s abiarazi" +msgstr "Ezin izan da %s exekutatu" #: libmisc/sub.c:55 #, c-format @@ -165,194 +159,186 @@ msgstr "Baliogabeko erro direktorioa \"%s\"\n" msgid "Can't change root directory to \"%s\"\n" msgstr "Ezin da erro direktorioa \"%s\"-ra aldatu.\n" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "malloc(%d) huts egin du\n" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" -msgstr "Ezin da konfigurazio informazioa gordetzeko tokirik blokeatu.\n" +msgstr "Ezin izan da lekua esleitu, konfigurazioaren informaziorako.\n" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" -msgstr "konfigurazio errorea - %s item ezezaguna (abisatu kudeatzailea)\n" +msgstr "" +"konfigurazio errorea - %s item ezezaguna (eman honen berri " +"administratzaileari)\n" -#: lib/pwauth.c:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "Pasahitza: " -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " -msgstr "%s -ren Pasahitza: " +msgstr "%s (r)en pasahitza: " -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "(Oihartzuna gaiturik)" - -#: src/chage.c:118 +#: src/chage.c:112 #, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" " [-I inactive] [-E expire] [-d last_day] user\n" msgstr "" "Erabilera: chage [-l] [-m gutxi_egun] [-M gehi_egun] [-W abisua]\n" -" [-I ezgaitua] [-E irauli] [-d azken_egun] erabiltzailea\n" +" [-I ez-aktiboa] [-E iraungi] [-d azken_eguna] " +"erabiltzailea\n" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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 ENTER sakatu lehentsirako\n" +msgstr "Idatzi balio berria, edo sakatu 'Sartu' tekla lehentsirako\n" + +#: src/chage.c:149 +msgid "Minimum Password Age" +msgstr "Pasahitzaren gutxiengo iraupena" #: src/chage.c:155 -msgid "Minimum Password Age" -msgstr "Gutxiengo Pasahitz luzapena" - -#: src/chage.c:161 msgid "Maximum Password Age" -msgstr "Gehienezko Pasahitz Luzapena" +msgstr "Pasahitzaren gehienezko iraupena" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" -msgstr "Azke pasahitz Aldaketa (UUUU-HH-EE)" +msgstr "Azken pasahitz-aldaketa (UUUU-HH-EE)" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" -msgstr "Pasahitz Iraungitze Abisua" +msgstr "Pasahitza iraungitzearen abisua" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" -msgstr "Pasahitza ezgaiturik" +msgstr "Pasahitza ez-aktiboa" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" -msgstr "Kontu Iraungitze Data (UUUU-HH-EE)" +msgstr "Kontuaren iraungitze data (UUUU-HH-EE)" -#: src/chage.c:238 -#, fuzzy, c-format +#: src/chage.c:231 +#, c-format msgid "Last password change\t\t\t\t\t: " -msgstr "Azke pasahitz Aldaketa (UUUU-HH-EE)" +msgstr "Azken pasahitz-aldaketa\t\t\t\t\t: " -#: src/chage.c:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 -#, fuzzy, c-format +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 +#, c-format msgid "never\n" -msgstr "Inoiz\n" +msgstr "Inoiz ere ez\n" -#: src/chage.c:251 -#, fuzzy, c-format +#: src/chage.c:244 +#, c-format msgid "Password expires\t\t\t\t\t: " -msgstr "Pasahitza Iraungitze data:\t" +msgstr "Pasahitza iraungitzeko data\t\t\t\t\t:" -#: src/chage.c:267 -#, fuzzy, c-format +#: src/chage.c:260 +#, c-format msgid "Password inactive\t\t\t\t\t: " -msgstr "Pasahitza ezgaitze data\t" +msgstr "Pasahitza ez-aktiboa jarriko da\t\t\t\t\t: " -#: src/chage.c:281 -#, fuzzy, c-format +#: src/chage.c:274 +#, c-format msgid "Account expires\t\t\t\t\t\t: " -msgstr "Kontua Iraungitze data :" +msgstr "Kontua iraungitzeko data\t\t\t\t\t: " -#: src/chage.c:297 +#: src/chage.c:290 #, c-format msgid "Minimum number of days between password change\t\t: %ld\n" -msgstr "" +msgstr "Gutxiengo egunak, pasahitza aldatzeko\t\t: %ld\n" -#: src/chage.c:298 -#, fuzzy, c-format +#: src/chage.c:292 +#, c-format msgid "Maximum number of days between password change\t\t: %ld\n" -msgstr "Saiakera kopuru muga gainditurik (%d)\n" +msgstr "Gehienezko egunak, pasahitza aldatzeko\t\t: %ld\n" -#: src/chage.c:299 +#: src/chage.c:294 #, c-format msgid "Number of days of warning before password expires\t: %ld\n" -msgstr "" +msgstr "Abisuen egun kopurua, pasahitza iraungi aurretik\t: %ld\n" -#: src/chage.c:444 +#: src/chage.c:431 #, c-format msgid "%s: do not include \"l\" with other flags\n" msgstr "%s: ez erabili \"l\" beste bandera batzuekin\n" -#: src/chage.c:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 -#, fuzzy, c-format +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 +#, c-format msgid "%s: permission denied.\n" -msgstr "%s: baimena ukaturik\n" +msgstr "%s: baimena ukatuta.\n" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 #, c-format msgid "%s: PAM authentication failed\n" -msgstr "%s: PAM egiaztatzeak huts egin du\n" +msgstr "%s: PAM autentifikazioak huts egin du\n" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, c-format msgid "%s: can't open password file\n" -msgstr "%s: ezin da pasahitz fitxategia ireki\n" +msgstr "%s: ezin da pasahitzen fitxategia ireki\n" -#: src/chage.c:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "%s: %s erabiltzaile ezezaguna\n" -#: src/chage.c:535 +#: src/chage.c:519 #, c-format msgid "%s: can't lock shadow password file" -msgstr "%s: ezin da itzalpeko pasahitz fitxategia blokeatu" +msgstr "%s: ezin da itzalpeko (shadow) pasahitz-fitxategia blokeatu" -#: src/chage.c:543 +#: src/chage.c:527 #, c-format msgid "%s: can't open shadow password file" -msgstr "%s: ezin da itzalpeko pasahitz fitxategia ireki" +msgstr "%s: ezin da itzalpeko (shadow) pasahitz-fitxategia ireki" -#: src/chage.c:604 +#: src/chage.c:587 #, c-format msgid "Changing the aging information for %s\n" -msgstr "%s-ren data informazioa aldatzen\n" +msgstr "%s(r)en data-informazioa aldatzen\n" -#: src/chage.c:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" -msgstr "%s:errorea eremuak aldatzean\n" +msgstr "%s: errorea eremuak aldatzean\n" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, c-format msgid "%s: can't update password file\n" -msgstr "%s: ezin da pasahitz fitxategia eguneratu\n" +msgstr "%s: ezin da pasahitzen fitxategia eguneratu\n" -#: src/chage.c:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" -msgstr "%s: ezin da itzalpeko pasahitz fitxategia eguneratu\n" +msgstr "%s: ezin da itzalpeko (shadow) pasahitz-fitxategia eguneratu\n" -#: src/chage.c:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "Errorea DBM pasahitz erregistroa eguneratzerakoan.\n" - -#: src/chage.c:692 +#: src/chage.c:649 #, c-format msgid "%s: can't rewrite shadow password file\n" -msgstr "%s:ezin da itzalpeko pasahitz fitxategi berridatzi\n" +msgstr "%s:ezin da itzalpeko pasahitz-fitxategia berridatzi\n" -#: src/chage.c:740 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite password file\n" -msgstr "%s: ezin da pasahitz fitxategia berridatzi\n" +msgstr "%s: ezin da pasahitzen fitxategia berridatzi\n" -#: src/chage.c:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 #, c-format msgid "%s: PAM chauthtok failed\n" -msgstr "%s: PAM chauthtok errorea\n" +msgstr "%s: PAM chauthtok-ek huts egin du\n" #: src/chfn.c:84 #, c-format @@ -361,124 +347,129 @@ msgid "" "\t[-h home_ph] [-o other] [user]\n" msgstr "" "Erabilera: %s [-f izen_osoa] [-r gela_zenb] [-w lan_tlf]\n" -"\t[-h etxe_tlf] [-o beste] [erabiltzailea]\n" +"\t[-h etxe_tlf] [-o bestelakoa] [erabiltzaile-izena]\n" #: src/chfn.c:89 #, c-format msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" msgstr "Erabilera: %s [-f izen_osoa] [-r gela_zb] [-w lan_tlf] [-h etxe_tlf]\n" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" -msgstr "Izen Osoa" +msgstr "Izen osoa" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" -msgstr "\tIzen Osoa: %s\n" +msgstr "\tIzen osoa: %s\n" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" -msgstr "Gela Zenbakia" +msgstr "Gela zenbakia" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "Laneko telefonoa" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" -msgstr "Etxeko Telefonoa" +msgstr "Etxeko telefonoa" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" -msgstr "Besteak" +msgstr "Bestelakoa" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" -msgstr "%s: Ezin da zure erabiltzaile izena atzeman.\n" +msgstr "%s: Ezin da erabiltzaile-izena zehaztu.\n" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" -msgstr "%s: ezin da NIS bezero batetako %s erabiltzailea aldatu.\n" +msgstr "%s: ezin da NIS bezeroko %s erabiltzailea aldatu.\n" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "%s: %s da bezero honen NIS nagusia.\n" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, c-format +msgid "%s: Permission denied.\n" +msgstr "%s: baimena ukatuta.\n" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" -msgstr "%s-ren erabiltzaile informazioa aldatzen\n" +msgstr "%s(r)en erabiltzaile informazioa aldatzen\n" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s: izen baliogabea: \"%s\"\n" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s: gela zenbaki baliogabea:\"%s\"\n" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s: laneko tlf baliogabea:\"%s\"\n" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s: etxeko tlf baliogabea:\"%s\"\n" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" -msgstr "%s:\"%s\"-k ezlegezko karaktereak ditu\n" +msgstr "%s:\"%s\"(e)k karaktere baliogabeak ditu\n" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" -msgstr "%s: eremu luzeegiak\n" +msgstr "%s: eremu luzegiak\n" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" -msgstr "Ezin da ID-a root-era aldatu.\n" +msgstr "Ezin izan da IDa root-era aldatu.\n" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" -msgstr "Ezin da pasahitz fitxategia blokeatu; geroago berriz saiatu.\n" +msgstr "Ezin izan da pasahitzen fitxategia blokeatu; saiatu geroago.\n" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" -msgstr "Ezin da pasahitz fitxategia ireki.\n" +msgstr "Ezin izan da pasahitzen fitxategia ireki.\n" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" -msgstr "%s: %s ez da /etc/paswd-en aurkitu\n" +msgstr "%s: %s ez da '/etc/paswd'-en aurkitu\n" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" -msgstr "Errorea pasahitz erregistroa eguneratzerakoan.\n" +msgstr "Errorea pasahitzen sarrera eguneratzean.\n" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" -msgstr "Ezin dira pasahitz fitxategi aldaketak grabatu.\n" +msgstr "Ezin izan da pasahitzen fitxategiko aldaketak bidali.\n" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" -msgstr "Ezin da pasahitz fitxategia desblokeatu.\n" +msgstr "Ezin izan da pasahitzen fitxategia desblokeatu.\n" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -489,83 +480,90 @@ msgid "" " -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n" "\t\t\tpasswords are not encrypted\n" msgstr "" +"Erabilera: chpasswd [aukerak]\n" +"\n" +"Aukerak:\n" +" -e, .- encrypted\temandako pasahitzak enkripatzen dira\n" +" -h, --help\t\tlaguntzako mezu hau erakustsi eta irten egiten da\n" +" -m, --md5\t\terabili MD5 enkriptatze mota (DES-en ordez), \n" +"\t\t\tpasahitzak enkriptatuta ez daudenean\n" #: src/chpasswd.c:189 #, c-format msgid "%s: can't lock password file\n" -msgstr "%s: ezin da pasahitz fitxategia blokeatu\n" +msgstr "%s: ezin da pasahitzen fitxategia blokeatu\n" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" -msgstr "%s: ezin da shadow fitxategia blokeatu\n" +msgstr "%s: ezin da 'shadow' fitxategia blokeatu\n" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" -msgstr "%s ezin da shadow fitxategia ireki\n" +msgstr "%s ezin da 'shadow' fitxategia ireki\n" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" -msgstr "%s: %d lerroa: lerro luzeegia\n" +msgstr "%s: %d. lerroa: lerro luzegia\n" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" -msgstr "%s: %d lerroa: pasahitz berria falta da\n" +msgstr "%s: %d. lerroa: pasahitz berria falta da\n" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" -msgstr "%s: %d lerroa: %s erabitzaile ezezaguna\n" +msgstr "%s: %d. lerroa: %s erabitzaile ezezaguna\n" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" -msgstr "%s: %d lerroa: ezin da pasahitz sarerra eguneratu\n" +msgstr "%s: %d. lerroa: ezin da pasahitzaren sarerra eguneratu\n" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" -msgstr "%s:errorea atzemanda, aldaketak alde batetara utzi dira\n" +msgstr "%s:errorea atzeman da, aldaketak alde batera utzi dira\n" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" -msgstr "%s: errorea itzalpeko pasahitz fitxategia eguneratzerakoan\n" +msgstr "%s: errorea 'shadow' fitxategia eguneratzean\n" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" -msgstr "%s: errorea pasahitz fitxategia eguneratzerakoan\n" +msgstr "%s: errorea pasahitzen fitxategia eguneratzean\n" #: src/chsh.c:76 #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "Erabilera: %s [-s shell] [izena]\n" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" -msgstr "Saio Shell-a" +msgstr "Saio-hasierako shell-a" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" -msgstr "Ez zenuke %s-ren shell-a aldatu behar.\n" +msgstr "Ez zenuke %s(r)en shell-a aldatu behar.\n" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" -msgstr "%s-ren saio shell-a aldatzen\n" +msgstr "%s(r)en saio-hasierko shell-a aldatzen\n" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" -msgstr "%s: baliogabeko erregistroa: %s\n" +msgstr "%s: baliogabeko sarrera: %s\n" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" msgstr "%s shell baliogabea da.\n" @@ -575,15 +573,15 @@ msgstr "%s shell baliogabea da.\n" msgid "Usage: expiry {-f|-c}\n" msgstr "Erabilera: expiry {-f|-c}\n" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" -msgstr "%s: KONTUZ! root UID-a ezarririk izan behar du\n" +msgstr "%s: ABISUA! root-aren set-UID izan behar du\n" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" -msgstr "%s:erabiltzaile ezezaguna\n" +msgstr "%s: erabiltzaile ezezaguna\n" #: src/faillog.c:59 #, c-format @@ -594,320 +592,302 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" msgstr "" +"Erabilea: faillog [aukerak]\n" +"\n" +"Aukerak:\n" +" -a, --all\t\t\terabiltzaile guztien faillog-en erregistroak bistaratzen " +"ditu\n" +" -h, --help\t\t\tlaguntzako mezu hau bistaratu eta irten egiten da\n" +" -l, --lock-time SEG\t\tsaio-hasieran hutsegin ondoren kontua zenbat " +"segundotan blokeatuta egongo den\n" +" -m, --maximum GEH\t\tsaio-hasierako GEHiengo hutsegite kopurua ezartzeko\n" +" -r, --reset\t\t\tsaio-hasierako hutsegiteen kontatzailea \n" +"\t\t\t\tberrezartzeko\n" +" -t, --time EGUNAK\t\tEGUNAK baino berriagoak diren faillog-en erregistroak " +"bistaratzeko\n" +" -u, --user SAIOA\t\tfaillog-en erregistroak bistaratzeko edo \n" +"\t\t\t\thutsegiteen kontatzailea eta ERABILTZAILEA\n" +"\t\t\t\tizeneko erabiltzailearen(-r, -m edo -l aukerekin \n" +"\t\t\t\terabiltzen bada) mantentzeko.\n" -#: src/faillog.c:86 +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" -msgstr "Erabiltzaile Izena Akatsak Gehinez Azkena\n" +msgid "Login Failures Maximum Latest On\n" +msgstr "Saio-hasiera Hutsegiteak Gehienezkoa Azkena Aktiboa\n" -#: src/faillog.c:103 -#, c-format -msgid " %s on %s" -msgstr " %s %s-n" - -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" -msgstr " [%lds faltan]" +msgstr " [%lds falta]" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" -msgstr " [%lds blok]" +msgstr " [%lds blokeatuta]" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "Erabiltzaile ezezaguna: %s\n" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "Erabilera: %s [-r|-R] taldea\n" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr " %s [-a erabiltzailea] taldea\n" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr " %s [-d erabiltzailea] taldea\n" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr " %s [-A erab,...] [-M erab,...] taldea\n" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr " %s [-M erab,...] taldea\n" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" -msgstr "%s: -A erabiltzeko itzalpeko talde pasahitza beharrezkoa\n" +msgstr "%s: -A erabiltzeko itzalpeko talde-pasahitza eskatzen da\n" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "Zer moduz zaude?\n" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr "talde ezezaguna: %s\n" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" -msgstr "%s erabiltzailea %s taldera gehitzen\n" +msgstr "%s erabiltzailea %s taldean gehitzen\n" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" -msgstr "%s erabiltzailea %s taldetik ezabatzen\n" +msgstr "%s erabiltzailea %s taldetik kentzen\n" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" -msgstr "%s: %s partaide ezezaguna\n" +msgstr "%s: %s kide ezezaguna\n" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "%s: ez da tty\n" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "%s taldearen pasahitza aldatzen\n" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "Pasahitz berria: " -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " -msgstr "Pasahitz berria berretsi:" +msgstr "Berretsi pasahitz berria:" -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" -msgstr "Ez dira berdinak, berriz saiatu" +msgstr "Ez dira berdinak, saiatu berriro" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" -msgstr "%s: Beranduago berriz saiatu \n" +msgstr "%s: Saiatu geroago\n" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "%s: ezin da blokeatu\n" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" -msgstr "%s: ezin da shadow blokeatu\n" +msgstr "%s: ezin da 'shadow' blokeatu\n" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "%s: ezin da fitxategia ireki\n" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" -msgstr "%s: ezin da erregistroa eguneratu\n" +msgstr "%s: ezin da sarrera eguneratu\n" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" -msgstr "%s: ezin da shadow erregistroa eguneratu\n" +msgstr "%s: ezin da 'shadow'-eko sarrera eguneratu\n" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "%s: ezin da fitxategia berridatzi\n" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" -msgstr "%s: ezin da itzalpeko fitxategia berridatzi\n" +msgstr "%s: ezin da 'shadow' fitxategia berridatzi\n" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "%s: ezin da fitxategia desblokeatu\n" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "%s: ezin dira DBM fitxategiak eguneratu\n" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "%s: ezin dira itzalpeko DBM fitxategiak eguneratu\n" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "Erabilera: groupadd [-g gid [-o]] [-f] taldea\n" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, c-format msgid "%s: error adding new group entry\n" -msgstr "%s: errorea talde erregistro berria gehitzerakoan\n" +msgstr "%s: errorea talde sarrera berria gehitzean\n" -#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: ezin da dbm talde erregistro berria gehitu\n" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "%s: %s izena ez da bakarra\n" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" msgstr "%s: %u gid-a ez da bakarra\n" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "%s: ezin da gid bakarra lortu\n" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, c-format msgid "%s: %s is not a valid group name\n" -msgstr "%s: %s ez da baliozko talde izena\n" +msgstr "%s: %s ez da baliozko talde-izena\n" -#: src/groupadd.c:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "%s: %s talde baliogabea\n" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" -msgstr "%s: -O-k NAME=BALIOA beharrezko du\n" +msgstr "%s: -O-k NAME=BALIOA eskatzen du\n" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" -msgstr "%s: ezin da talde fitxategia berridatzi\n" +msgstr "%s: ezin da 'group' fitxategia berridatzi\n" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" -msgstr "%s: ezin da itzalpeko talde fitxategia berridatzi\n" +msgstr "%s: ezin da itzalpeko talde-fitxategia berridatzi\n" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" -msgstr "%s: ezin da talde fitxategia blokeatu\n" +msgstr "%s: ezin da talde-fitxategia blokeatu\n" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" -msgstr "%s: ezin da talde fitxategia ireki\n" +msgstr "%s: ezin da talde-fitxategia ireki\n" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" -msgstr "%s: ezin da itzalpeko talde fitxategia blokeatu\n" +msgstr "%s: ezin da itzalpeko talde-fitxategia blokeatu\n" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" -msgstr "%s: ezin da itzalpeko talde fitxategia ireki\n" +msgstr "%s: ezin da itzalpeko talde-fitxategia ireki\n" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "%s: %s taldea badago\n" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, c-format msgid "Usage: groupdel group\n" msgstr "Erabilera: groupdel taldea\n" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" -msgstr "%s: errorea talde erregistroa ezabatzerakoan\n" +msgstr "%s: errorea taldearen sarrera ezabatzean\n" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "%s: errorea talde dbm erregistroa ezabatzerakoan\n" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" -msgstr "%s: errorea itzalpeko talde erregistroa ezabatzerakoan\n" +msgstr "%s: errorea itzalpeko taldearen sarrera ezabatzean\n" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "%s: errorea itzalpeko talde dbm erregistroa ezabatzerakoan\n" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "%s ezin da erabiltzailearen talde nagusia ezabatu\n" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "%s: %s taldea ez da existitzen\n" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "%s: %s taldea NIS talde bat da\n" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s: %s NIS nagusia da\n" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "Erabilera: groupmod [-g gid [-o]] [-n izena] taldea\n" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "%s: %s ez da aurkitu /etc/group-en\n" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s: ezin da dbm itzalpeko talde erregistroa gehitu\n" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s: %u ez da gid bakarra\n" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "%s: %s ez da izen bakarra\n" @@ -917,159 +897,154 @@ msgstr "%s: %s ez da izen bakarra\n" msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "Erabilera: %s [-r] [-s] [taldea [gshadow]]\n" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "Erabilera: %s [-r] [-s] [taldea]\n" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "Ez" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" msgstr "%s: -s eta -r ezin dira batera erabili\n" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "%s: ezin da %s fitxategia blokeatu\n" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "%s: ezin da %s fitxategia ireki\n" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" -msgstr "baliogabeko talde fitxategi erregistroa\n" +msgstr "baliogabeko talde-fitxategiko sarrera\n" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "%s lerroa ezabatu?" -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" -msgstr "bikoiztu talde erregistroa\n" +msgstr "bikoiztu taldearen sarrera\n" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" -msgstr "`%s' baliogabeko talde izena\n" +msgstr "`%s' baliogabeko talde-izena\n" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "%s taldea: %s erabiltzailea ez dago\n" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " -msgstr "`%s' partaidea ezbatu?" +msgstr "`%s' kidea ezabatu?" -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" -msgstr "Baliogabeko itzalpeko talde fitxategi erregistroa\n" +msgstr "Baliogabeko itzalpeko talde-fitxategiko sarrera\n" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" -msgstr "bikoiztutako itzalpeko talde erregistroa\n" +msgstr "bikoiztutako itzalpeko taldearen sarrera\n" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" -msgstr "ez da parekatzeko talde fitxategi erregistrorik aurkitu\n" +msgstr "ez dago bat datorren sarrerarik talde-fitxategian\n" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" -msgstr "%s itzalpeko taldea: ez dago %s erabiltzaile kudeatzailea\n" +msgstr "%s itzalpeko taldea: ez dago %s erabiltzaile administratzailea\n" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " -msgstr "`%s' Kudeatzaile partaidea ezabatu?" +msgstr "`%s' kide administratzailea kendu?" -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" msgstr "%s itzalpeko taldea: %s erabiltzailea ez dago\n" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "%s: ezin da %s fitxategia eguneratu\n" -#: src/grpck.c:647 src/pwck.c:612 +#: src/grpck.c:640 src/pwck.c:606 #, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: fitxategiak eguneratu egin dira: mkpasswd abiarazi\n" +msgid "%s: the files have been updated\n" +msgstr "%s: fitxategiak eguneratu dira\n" -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 +#: src/grpck.c:641 src/pwck.c:607 #, c-format msgid "%s: no changes\n" msgstr "%s: aldaketarik gabe\n" -#: src/grpck.c:651 src/pwck.c:616 -#, c-format -msgid "%s: the files have been updated\n" -msgstr "%s: fitxategiak eguneratuak izan dira\n" - #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" -msgstr "%s: ezin da talde fitxategia blokeatu\n" +msgstr "%s: ezin da talde-fitxategia blokeatu\n" #: src/grpconv.c:65 src/grpunconv.c:61 #, c-format msgid "%s: can't open group file\n" -msgstr "%s: ezin da talde fitxategia ireki\n" +msgstr "%s: ezin da talde-fitxategia ireki\n" #: src/grpconv.c:70 src/grpunconv.c:66 #, c-format msgid "%s: can't lock shadow group file\n" -msgstr "%s: ezin da itzalpeko talde fitxategia blokeatu\n" +msgstr "%s: ezin da itzalpeko talde-fitxategia blokeatu\n" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" -msgstr "%s: ezin da itzalpeko talde fitxategia ireki\n" +msgstr "%s: ezin da itzalpeko talde-fitxategia ireki\n" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" -msgstr "%s: ezin da %s itzalpeko taldea ezabatu\n" +msgstr "%s: ezin da itzalpeko %s taldea ezabatu\n" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" -msgstr "%s: ezin da %s-ren itzalpeko erregistroa eguneratu\n" +msgstr "%s: ezin da %s-ren itzalpeko sarrera eguneratu\n" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" -msgstr "%s: ezin da %s taldearen erregistroa eguneratu\n" +msgstr "%s: ezin da %s taldearen sarrera eguneratu\n" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" -msgstr "%s: ezin da itzalpeko talde fitxategia eguneratu\n" +msgstr "%s: ezin da itzalpeko talde-fitxategia eguneratu\n" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" -msgstr "%s: ezin da talde fitxategia eguneratu\n" +msgstr "%s: ezin da talde-fitxategia eguneratu\n" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" -msgstr "%s: ezin da itzalpeko talde fitxategia ezabatu\n" +msgstr "%s: ezin da itzalpeko talde-fitxategia ezabatu\n" #: src/id.c:53 #, c-format @@ -1086,134 +1061,134 @@ msgstr "Erabilera: id\n" msgid " groups=" msgstr " taldeak=" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" +"Erabilera: lastlog [aukerak]\n" +"\n" +"Aukerak:\n" +" -u, --login IZENA\tIZENA duen erabiltzailearen lastlog erregistroa \n" +"\t\t\t\tbistaratzen du\n" +" -h, --help\t\tlaguntzako mezu hau bistaratu eta irten egiten da\n" +" -t, --time EGUNAK\tEGUNAK baino berriagoak diren erregistroak \n" +"\t\t\t\tbakarrik bistaratzen ditu\n" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" -msgstr "Erabiltzaile izena Ataka Nork Azkenez\n" +msgstr "Erabiltzaile-izena Ataka Nondik Azkena\n" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" -msgstr "Erabiltzaile izena Ataka Azkenez\n" +msgstr "Erabiltzaile-izena Ataka Azkena\n" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" -msgstr "**Inoiz saioa hasi gabe**" +msgstr "**Inoiz ez du saiorik hasi**" -#: src/login.c:175 +#: src/login.c:156 #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Erabilera: %s [-p] [izena]\n" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" -msgstr " %s [-p] [-h host] [-f izena]\n" +msgstr " %s [-p] [-h ostalaria] [-f izena]\n" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" -msgstr " %s [-p] -r host\n" +msgstr " %s [-p] -r ostalaria\n" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" -msgstr "Baliogabeko saio hasiera data\n" +msgstr "Baliogabeko saio-hasieraren denbora\n" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" "System closed for routine maintenance\n" msgstr "" "\n" -"Sistema aldiriko mantenuagatik itxirik\n" +"Sistema aldiko mantenuagatik itxita\n" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" "[Disconnect bypassed -- root login allowed.]\n" msgstr "" "\n" -"[Deskonexioa saltaturik -- root saio hastea onarturik.]\n" +"[Deskonexioa saltatuta -- root-ek saio-hastea baimenduta.]\n" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" "Login timed out after %d seconds.\n" msgstr "" "\n" -"Saio hasiera denboraz kanpo %d segundu eta gero.\n" +"Saio-hasiera denboraz kanpo %d segundo igarotakoan.\n" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" -msgstr "`%.100s'-tik `%.200s'-ra" +msgstr "`%.100s'(e)tik `%.200s'(e)ra" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" -msgstr "`%.100s'-n" +msgstr "`%.100s'(e)n" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" "%s login: " msgstr "" "\n" -"%s login: " +"%s izena: " -#: src/login.c:819 -msgid "login: " -msgstr "login: " - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" -msgstr "Saio hasera okerra" +msgstr "Izen okerra" -#: src/login.c:1198 +#: src/login.c:996 msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "" -"Kontuz: saio abiaraztea birgaitu egingo da blokeo aldi baten ondoren.\n" +"Abisua: saio-hasiera berriru gaitu egingo da aldi bateko blokeoaren " +"ondoren.\n" -#: src/login.c:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" -msgstr "Azken saio hasiera: %s %s-ean" +msgstr "Azken saio-hasiera: %s %s(e)n" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" -msgstr "Azken saio hasiera: %.19s %s-ean" +msgstr "Azken saio-hasiera: %.19s %s(e)n" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" -msgstr "%.*s-tik" - -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "rad_login abiarazten\n" +msgstr "%.*s(e)tik" #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" -msgstr "%s: Ez dago DBM databaserik sisteman - ez da ekintzarik egingo\n" +msgstr "%s: ez dago DBM datubaserik sisteman - ez da ekintzarik egingo\n" #: src/mkpasswd.c:231 src/mkpasswd.c:236 #, c-format @@ -1223,44 +1198,44 @@ msgstr "%s: ezin da %s fitxategia berridatzi\n" #: src/mkpasswd.c:251 #, c-format msgid "%s: cannot open DBM files for %s\n" -msgstr "%s: ezin dira %s-ren DBM fitxategiak ireki\n" +msgstr "%s: ezin dira %s(r)en DBM fitxategiak ireki\n" #: src/mkpasswd.c:286 -#, fuzzy, c-format +#, c-format msgid "%s: the line beginning with %.16s... is too long\n" -msgstr "%s: hasiera" +msgstr "%s: '%.16s...' katearekin hasten den lerroa luzegia da\n" #: src/mkpasswd.c:313 #, c-format msgid "%s: error parsing line \"%s\"\n" -msgstr "%s errorea \"%s\" lerroa arakatzerakoan\n" +msgstr "%s: errorea \"%s\" lerroa analizatzean\n" #: src/mkpasswd.c:321 src/mkpasswd.c:326 src/mkpasswd.c:331 src/mkpasswd.c:336 -#, fuzzy, c-format +#, c-format msgid "adding record for name %s\n" -msgstr "izenaren erregistroa gehitzen" +msgstr "%s izenaren erregistroa gehitzen\n" #: src/mkpasswd.c:342 src/mkpasswd.c:348 src/mkpasswd.c:353 src/mkpasswd.c:358 -#, fuzzy, c-format +#, c-format msgid "%s: error adding record for %s\n" -msgstr "%s: errorea honentzat erregistroa gehitzean:" +msgstr "%s: errorea %s(r)en erregistroa gehitzean\n" #: src/mkpasswd.c:376 #, c-format msgid "added %d entries, longest was %d\n" -msgstr "%d erregistro gehiturik; luzeena %d da\n" +msgstr "%d erregistro gehitu dira; luzeena %d da\n" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "Erabilera: %s [-vf] [-p|g|sp|sg] fitxategia\n" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "Erabilera: %s [-vf] [-p|g|sp] fitxategia\n" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "Erabilera: %s [-vf] [-p|g] fitxategia\n" @@ -1278,18 +1253,18 @@ msgstr "Erabilera: sg taldea [[-c] komandoa]\n" #: src/newgrp.c:131 #, c-format msgid "unknown uid: %u\n" -msgstr "%u uid ezezaguna\n" +msgstr "uid ezezaguna: %u\n" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" msgstr "gid ezezaguna: %lu\n" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "Barkatu.\n" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "talde gehiegi\n" @@ -1299,166 +1274,166 @@ msgstr "talde gehiegi\n" msgid "Usage: %s [input]\n" msgstr "Erabilera: %s [sarrera]\n" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" -msgstr "%s: ezin da /etc/passwd blokeatu.\n" +msgstr "%s: ezin da '/etc/passwd' blokeatu.\n" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" -msgstr "%s: ezin dira fitxategiak blokeatu, saiatu berriz geroago\n" +msgstr "%s: ezin dira fitxategiak blokeatu, saiatu geroago\n" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "%s: ezin dira fitxategiak ireki\n" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "%s: %d lerroa: lerro baliogabea\n" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "%s: %d lerroa: ezin da GID-a sortu\n" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "%s: %d lerroa: ezin da UID-a sortu\n" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "%s: %d lerroa: ezin da %s erabiltzailea aurkitu\n" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "%s: %d lerroa: ezin da pasahitza eguneratu\n" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" -msgstr "%s: %d lerroa: mkdir-ek huts\n" +msgstr "%s: %d lerroa: mkdir-ek huts egin du\n" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" -msgstr "%s: %d lerroa: chown-ek huts\n" +msgstr "%s: %d lerroa: chown-ek huts egin du\n" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" -msgstr "%s: %d lerroa: ezin da erregistroa eguneratu\n" +msgstr "%s: %d lerroa: ezin da sarrera eguneratu\n" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "%s: errorea fitxategiak eguneratzean\n" -#: src/passwd.c:155 +#: src/passwd.c:154 #, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "Erabilera: %s [-f|-s] [izena]\n" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" -msgstr " %s [-x geh] [-n gutx] [-w abisu] [-i ezgaitu] izena\n" +msgstr " %s [-x geh] [-n gutx] [-w abisu] [-i ez-aktib] izena\n" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} izena\n" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "Pasahitz zaharra: " -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" -msgstr "`%s'-rentzat psahitz okerra\n" +msgstr "`%s'(r)en pasahitz okerra\n" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" "Please use a combination of upper and lower case letters and numbers.\n" msgstr "" -"Sar pasahitz berria (gutxienez %d, gehienez %d karaktere)\n" -"Mesedez erabili maiuskula/minuskula eta zenbaki konbinazio bat.\n" +"Sartu pasahitz berria (gutxienez %d eta gehienez %d karaktere)\n" +"Erabili maiuskulen, minuskulen eta zenbakien arteko konbinazioa.\n" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "Pasahitz berria: " -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" msgstr "Saiatu berriro.\n" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" "Warning: weak password (enter it again to use it anyway).\n" msgstr "" "\n" -"Oharra: pasahitz ahula (sar ezazu berriz hala ere erabiltzeko).\n" +"Oharra: pasahitza ahula da (sartu berriro erabiltzen jarraitzeko).\n" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" msgstr "Ez dira berdinak, saiatu berriro.\n" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" -msgstr "%s-ren pasahitzak ezin dira aldatu.\n" +msgstr "%s(r)en pasahitzak ezin dira aldatu.\n" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" -msgstr "Barkatu; %s-ren pasahitzak ezin dira aldatu oraindik.\n" +msgstr "Barkatu; %s(r)en pasahitzak ezin dira aldatu oraindik.\n" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" -msgstr "%s: memoriaz kanpo\n" +msgstr "%s: memoriarik ez\n" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" -msgstr "%s: Ezin da %s abiarazi" +msgstr "%s: Ezin da %s exekutatu" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" -msgstr "%s: %s repositorioa ez da onartzen\n" +msgstr "%s: %s biltegia ez da onartzen\n" -#: src/passwd.c:914 -#, fuzzy, c-format -msgid "You may not change the password for %s.\n" -msgstr "Ez zenuke %s-ren shell-a aldatu behar.\n" +#: src/passwd.c:884 +#, c-format +msgid "%s: You may not view or modify password information for %s.\n" +msgstr "%s: Ez zenuke %s(r)en shell-a aldatu behar.\n" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" -msgstr "%s-ren pasahitza aldatzen\n" +msgstr "%s(r)en pasahitza aldatzen\n" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" -msgstr "%s-ren pasahitza aldatu gabe dago\n" +msgstr "%s(r)en pasahitza aldatu gabe dago.\n" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" -msgstr "Pasahitza aldaturik.\n" +msgstr "Pasahitza aldatuta.\n" #: src/pwck.c:87 #, c-format @@ -1470,606 +1445,548 @@ msgstr "Erabilera: %s [-q] [-r] [-s] [pasahitza [itzalpekoa]]\n" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "Erabilera: %s [-q] [-r] [-s] [pasahitza]\n" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" -msgstr "Baliogabeko pasahitz fitxategi erregistroa\n" +msgstr "Baliogabeko pasahitzen fitxategiko sarrera\n" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" -msgstr "pasahitz erregistro bikoiztua\n" +msgstr "bikoiztutako pasahitz sarrera\n" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" -msgstr "%s erabiltzaile izen baliogabea\n" +msgstr "%s erabiltzaile-izen baliogabea\n" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "%s erabiltzailea: ez da %u taldea\n" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" -msgstr "%s erabiltzailea: ez da %s karpeta esistitzen\n" +msgstr "%s erabiltzailea: %s direktorioa ez da existitzen\n" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" -msgstr "%s erabiltzailea: ez da %s programa esistitzen\n" +msgstr "%s erabiltzailea: %s programa ez da existitzen\n" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" -msgstr "baliogabeko itzalpeko pasahitz fitxategi erregistroa\n" +msgstr "baliogabeko itzalpeko pasahitz-fitxategiko sarrera\n" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" -msgstr "bikoiztutako itzalpeko pasahitz fitxategi erregistroa\n" +msgstr "bikoiztutako itzalpeko pasahitz-fitxategiko sarrera\n" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" -msgstr "ez dago pareko pasahitz fitxategi erregistrorik\n" +msgstr "ez dago bat datorren sarrerarik pasahitz-fitxategian\n" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" -msgstr "%s erabiltzailea: azken pasahitz aldaketa etorkizunean\n" +msgstr "%s erabiltzailea: pasahitza etorkizunean aldatu zen azken aldiz\n" #: src/pwconv.c:85 src/pwunconv.c:79 #, c-format msgid "%s: can't lock passwd file\n" -msgstr "%s: ezin da pasahitz fitxategia blokeatu\n" +msgstr "%s: ezin da pasahitz-fitxategia blokeatu\n" #: src/pwconv.c:90 src/pwunconv.c:84 #, c-format msgid "%s: can't open passwd file\n" -msgstr "%s: ezin da pasahitz fitxategia ireki\n" +msgstr "%s: ezin da pasahitz-fitxategia ireki\n" #: src/pwconv.c:118 #, c-format msgid "%s: can't remove shadow entry for %s\n" -msgstr "%s: ezin da %s-ren itzalpeko erregistroa ezabatu\n" +msgstr "%s: ezin da %s(r)en itzalpeko sarrera kendu\n" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" -msgstr "%s: ezin da %s-ren pasahitz erregistroa eguneratu\n" +msgstr "%s: ezin da %s(r)en pasahitzaren sarrera eguneratu\n" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" -msgstr "%s: ezin da shadow fitxategia eguneratu\n" +msgstr "%s: ezin da 'shadow' fitxategia eguneratu\n" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" -msgstr "%s: ezin da passwd fitxategia eguneratu\n" +msgstr "%s: ezin da 'passwd' fitxategia eguneratu\n" #: src/pwunconv.c:124 #, c-format msgid "%s: can't update entry for user %s\n" -msgstr "%s: %s erabiltzailearen erregistroa eguneratu\n" +msgstr "%s: ezin da %s erabiltzailearen sarrera eguneratu\n" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format msgid "%s: can't delete shadow password file\n" -msgstr "%s: ezin da itzalpeko pasahitz fitxategia ezabatu\n" +msgstr "%s: ezin da itzalpeko pasahitz-fitxategia ezabatu\n" -#: src/su.c:133 +#: src/su.c:132 msgid "Sorry." msgstr "Barkatu." -#: src/su.c:323 +#: src/su.c:320 #, c-format msgid "%s: must be run from a terminal\n" -msgstr "%s: terminal batetatik abiarazi behar da\n" +msgstr "%s: terminal batetik exekutatu behar da\n" -#: src/su.c:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" -msgstr "%s: pam_start: errorea %d\n" +msgstr "%s: pam_start: %d errorea\n" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" -msgstr "id ezezaguna: %s\n" +msgstr "ID ezezaguna: %s\n" -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, c-format msgid "You are not authorized to su %s\n" -msgstr "Ez duzu su %s egiteko baimenik\n" +msgstr "Ez duzu 'su %s' exekutatzeko baimenik\n" -#: src/su.c:502 +#: src/su.c:495 msgid "(Enter your own password.)" -msgstr "(sar zure jabetza pasahitza.)" +msgstr "(sartu zure pasahitza.)" -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" "(Ignored)\n" msgstr "" "%s: %s\n" -"(Bazterturik)\n" +"(Ez ikusi egin zaio)\n" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" msgstr "Ez dago shell-a\n" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" -msgstr "kontu honetzako su erabilera UKATUA.\n" +msgstr "kontu honentzako 'su' sarbidea UKATUTA.\n" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" -msgstr "Pasahitz egiaztapena saltaturik.\n" +msgstr "Pasahitz autentifikazioa saltatuta.\n" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" -msgstr "Mesedez sar ezazu zure Jabetza pasahitza egiaztapen bezala.\n" +msgstr "Sartu zure pasahitz PROPIOA autentifikazio gisa\n" #: src/sulogin.c:118 #, c-format msgid "No password file\n" -msgstr "Ez dago pasahitz fitxategirik\n" +msgstr "Ez dago pasahitz-fitxategirik\n" #: src/sulogin.c:160 #, c-format msgid "No password entry for 'root'\n" -msgstr "Ez dago root pasahitzik\n" +msgstr "Ez dago 'root'-en pasahitzik\n" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" "(or give root password for system maintenance):" msgstr "" "\n" -"Jo kontrol+d abiarazte arrunta erabiltzeko,\n" -"(edo sar root pasahitza sistema mantenurako):" +"Sakatu Kontrol+d teklak hasiera arrunta erabiltzeko,\n" +"(edo idatzi root-en pasahitza sistemaren mantentze-lanetarako):" -#: src/sulogin.c:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" -msgstr "Sistema Mantenu Modura sartzen\n" +msgstr "Sistemaren mantentze-lanetako moduan sartzen\n" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "%s:talde databasea berrairikitzen\n" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "%s:itzalpeko talde databasea berrairikitzen\n" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" -msgstr "%s:baliogabeko zenbakizko %s argumentoa\n" +msgstr "%s:baliogabeko zenbakizko '%s' argumentoa\n" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "%s: %s gid ezezaguna \n" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "%s: %s talde ezezaguna\n" -#: src/useradd.c:475 +#: src/useradd.c:418 #, c-format msgid "%s: cannot create new defaults file\n" msgstr "%s: ezin da lehenespen fitxategi berria sortu\n" -#: src/useradd.c:480 +#: src/useradd.c:423 #, c-format msgid "%s: cannot open new defaults file\n" msgstr "%s: ezin da lehenespen fitxategi berria ireki\n" -#: src/useradd.c:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" msgstr "%s: berrizendatu: %s" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s: taldea `%s' NIS talde bat da.\n" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, c-format msgid "%s: too many groups specified (max %d).\n" -msgstr "%s: talde gehiegi ezarri dira (geh. %d).\n" +msgstr "%s: talde gehiegi zehaztu dira (geh. %d).\n" -#: src/useradd.c:721 +#: src/useradd.c:660 #, 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:724 +#: src/useradd.c:663 #, c-format msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr "" -" [-d etxea] [-s shell] [-c iruzkina] [-m [-k " -"txantilloia]]\n" +" [-d etxea] [-s shell] [-c iruzkina] [-m [-k txantiloia]]\n" -#: src/useradd.c:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, c-format msgid " [-f inactive] [-e expire]\n" -msgstr " [-f ezgaiturik] [-e zaharkiturik]\n" +msgstr " [-f ez-aktiboa] [-e iraungitu]\n" -#: src/useradd.c:728 +#: src/useradd.c:667 #, c-format msgid " [-p passwd] name\n" -msgstr " [-p pasahitz] izena\n" +msgstr " [-p pasahitza] izena\n" -#: src/useradd.c:730 +#: src/useradd.c:669 #, 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:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, c-format msgid "%s: error locking group file\n" -msgstr "%s: errorea talde fitxategia blokeatzerakoan\n" +msgstr "%s: errorea talde-fitxategia blokeatzean\n" -#: src/useradd.c:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, c-format msgid "%s: error opening group file\n" -msgstr "%s: errorea talde fitxategia irekitzerakoan\n" +msgstr "%s: errorea talde-fitxategia irekitzean\n" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, c-format msgid "%s: error locking shadow group file\n" -msgstr "%s: errorea itzalpeko talde fitxategia blokeatzerakoan\n" +msgstr "%s: errorea itzalpeko talde-fitxategia blokeatzean\n" -#: src/useradd.c:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, c-format msgid "%s: error opening shadow group file\n" -msgstr "%s: erroea itzalpeko talde fitxategia irekitzerakoan\n" +msgstr "%s: errorea itzalpeko talde-fitxategia irekitzean\n" -#: src/useradd.c:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "%s:%u uid-a ez da bakarra\n" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "%s: ezin da uid bakar bat eskuratu\n" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" -msgstr "%s: `%s' base karpeta baliogabea\n" +msgstr "%s: oinarrizko '%s' direktorio baliogabea\n" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "%s: `%s' iruzkin baliogabea\n" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" -msgstr "%s: `%s' etxe karpeta baliogabea\n" +msgstr "%s: `%s' etxe-direktorio baliogabea\n" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s: `%s' data baliogabea\n" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, c-format msgid "%s: shadow passwords required for -e\n" -msgstr "%s: -e-rentzat itzalpeko pasahitza beharrezkoa\n" +msgstr "%s: -e itzalpeko pasahitza eskatzen du\n" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, c-format msgid "%s: shadow passwords required for -f\n" -msgstr "%s: -f-rentzat itzalpeko pasahitza beharrezkoa\n" +msgstr "%s: -f itzalpeko pasahitza eskatzen du\n" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" msgstr "%s: `%s' eremu baliogabea\n" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" -msgstr "%s: shell baliogabea `%s'\n" +msgstr "%s: '%s' shell baliogabea\n" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, c-format msgid "%s: invalid user name '%s'\n" -msgstr "%s: '%s' erabiltzaile izen baliogabea\n" +msgstr "%s: '%s' erabiltzaile-izen baliogabea\n" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, c-format msgid "%s: cannot rewrite password file\n" -msgstr "%s: ezin da pasahitz fitxategia berridatzi\n" +msgstr "%s: ezin da pasahitz-fitxategia berridatzi\n" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, c-format msgid "%s: cannot rewrite shadow password file\n" -msgstr "%s: ezin da itzalpeko pasahitz fitxategia berridatzi\n" +msgstr "%s: ezin da itzalpeko pasahitz-fitxategia berridatzi\n" -#: src/useradd.c:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, c-format msgid "%s: unable to lock password file\n" -msgstr "%s: ezin da pasahitz fitxategia blokeatu\n" +msgstr "%s: ezin da pasahitz-fitxategia blokeatu\n" -#: src/useradd.c:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, c-format msgid "%s: unable to open password file\n" -msgstr "%s: ezin da pasahitz fitxategia ireki\n" +msgstr "%s: ezin da pasahitz-fitxategia ireki\n" -#: src/useradd.c:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, c-format msgid "%s: cannot lock shadow password file\n" -msgstr "%s: ezin da itzalpeko pasahitz fitxategia blokeatu\n" +msgstr "%s: ezin da itzalpeko pasahitz-fitxategia blokeatu\n" -#: src/useradd.c:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, c-format msgid "%s: cannot open shadow password file\n" -msgstr "%s: ezin da itzalpeko pasahitz fitxategia ireki\n" +msgstr "%s: ezin da itzalpeko pasahitz-fitxategia ireki\n" -#: src/useradd.c:1459 +#: src/useradd.c:1354 #, c-format msgid "%s: error adding new password entry\n" -msgstr "%s: errorea pasahitz erregistro berria gehitzerakoan\n" +msgstr "%s: errorea pasahitzaren sarrera berria gehitzean\n" -#: src/useradd.c:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "%s: errorea pasahitz dbm erregistroa eguneratzerakoan\n" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, c-format msgid "%s: error adding new shadow password entry\n" -msgstr "%s: errorea itzalpeko pasahitz erregistro berria gehitzerakoan\n" +msgstr "%s: errorea itzalpeko pasahitzaren sarrera berria gehitzean\n" -#: src/useradd.c:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s: errorea itzalpeko pasahitz dbm erregistroa eguneratzean\n" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" -msgstr "%s: ezin da %s karpeta sortu\n" +msgstr "%s: ezin da %s direktorioa sortu\n" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, c-format msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n" -msgstr "" +msgstr "Ez dago \"mail\" izeneko talderik, posta ilara sortzen (0600 moduan)\n" -#: src/useradd.c:1590 -#, fuzzy, c-format +#: src/useradd.c:1446 +#, c-format msgid "Can't create mail spool for user %s.\n" -msgstr "%s: %s erabiltzailearen erregistroa eguneratu\n" +msgstr "Ezin da %s erabiltzailearen posta ilara sortu.\n" -#: src/useradd.c:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "%s: %s erabiltzailea badago dagoeneko\n" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, 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 honetara gehitu nahi naduzu " -"erabili -g\n" +"%s: %s taldea badago - erabiltzaile hau talde honetan gehiteko erabili '-g'\n" -#: src/useradd.c:1767 +#: src/useradd.c:1602 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" -msgstr "" -"%s: kontuz: CREATE_HOME ez da onartzen, mesedez erabili -m aldagaiaz.\n" +msgstr "%s: abisua: CREATE_HOME ez da onartzen, erabili '-m' aukera.\n" -#: src/userdel.c:124 +#: src/userdel.c:108 #, c-format msgid "Usage: %s [-r] name\n" msgstr "Erabilera: %s [-r] izena\n" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" -msgstr "%s: erroea talde erregistroa eguneratzerakoan\n" +msgstr "%s: errorea taldearen sarrera eguneratzean\n" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "%s:ezin da dbm talde erregistroa eguneratu\n" - -#: src/userdel.c:214 -#, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: ezin da dbm talde erregistroa ezabatu\n" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" -msgstr "%s: ezin da talde fitxategia ireki\n" +msgstr "%s: ezin da talde-fitxategia ireki\n" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" -msgstr "%s: ezin da itzalpeko talde fitxategia ireki\n" +msgstr "%s: ezin da itzalpeko talde-fitxategia ireki\n" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" -msgstr "%s: errorea pasahitza erregistroa ezabatzerakoan\n" +msgstr "%s: errorea pasahitzaren sarrera ezabatzean\n" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" -msgstr "%s: errorea itzalpeko pasahitz erregistroa ezabatzerakoan\n" +msgstr "%s: errorea itzalpeko pasahitzaren sarrera ezabatzean\n" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "%s: errorea pasahitz dbm erregistroa ezabatzean\n" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s: errorea itzalpeko pasahitz dbm erregistroa ezabatzerakoan\n" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" -msgstr "%s: %s erabiltzaileak saioa hasirik du\n" +msgstr "%s: une honetan %s erabiltzaileak saioan sartuta dago\n" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" -msgstr "%s: %s ez dago %s-n jabetzan. ez da ezabatuko\n" +msgstr "%s: %s ez dago %s(r)en jabetzan. ez da ezabatuko\n" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " -msgstr "%s:kontuz: ezin da ezabatu " +msgstr "%s: abisua: ezin da ezabatu " -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" -msgstr "%s: %s erabiltzailea ez da aurkitzen\n" +msgstr "%s: %s erabiltzailea ez da existitzen\n" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s: %s erabiltzailea NIS erabiltzaile bat da\n" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" -msgstr "%s: ez da %s karpeta ezabatuko (%s-ren etxea ezabatu beharko zen)\n" +msgstr "%s: ez da %s direktorioa ezabatuko (%s(r)en etxea ezabatuko luke)\n" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" -msgstr "%s: errorea %s karpeta ezabatzerakoan\n" +msgstr "%s: errorea %s direktorioa ezabatzean\n" -#: src/usermod.c:306 +#: src/usermod.c:289 #, c-format msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "Erabilera: %s\t[-u uid [-o]] [-g taldea] [-G taldea,...] \n" -#: src/usermod.c:310 +#: src/usermod.c:293 #, 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:313 +#: src/usermod.c:296 #, c-format msgid "[-f inactive] [-e expire] " -msgstr "[-f ezgaiturik] [-e zaharkiturik] " +msgstr "[-f ez-aktiboa] [-e iraungitu] " -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" -msgstr "[-p pasahitz] [-L|-U] izena\n" +msgstr "[-p pasahitza] [-L|-U] izena\n" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" -msgstr "%s: memoriaz kanpo update_group-en\n" +msgstr "%s: memoriarik ez 'update_group'en\n" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" -msgstr "%s: memoriaz kanpo update_gshadow-en\n" +msgstr "%s: memoriarik ez 'update_gshadow'-en\n" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "%s: ez da banderarik eman\n" -#: src/usermod.c:965 +#: src/usermod.c:903 #, c-format msgid "%s: shadow passwords required for -e and -f\n" -msgstr "%s: -e eta -f-rekin itzalpeko pasahitzak beharrezkoak\n" +msgstr "%s: -e eta -f aukerek itzalpeko pasahitzak eskatzen dute\n" -#: src/usermod.c:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" -msgstr "%s: %lu uid-a ez da bakarra\n" +msgstr "%s: %lu ez da uid bakarra\n" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, c-format msgid "%s: error changing password entry\n" -msgstr "%s: erroea pasahitz erregistroa aldatzerakoan\n" +msgstr "%s: errorea pasahitzaren sarrera aldatzean\n" -#: src/usermod.c:1122 +#: src/usermod.c:1053 #, c-format msgid "%s: error removing password entry\n" -msgstr "%s: erroea pasahitz erregistroa ezabatzerakoan\n" +msgstr "%s: errorea pasahitzaren sarrera ezabatzean\n" -#: src/usermod.c:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "%s: errorea pasahitz dbm sarrrera gehitzerakoan\n" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "%s: errorea pasahitz dbm sarrrera ezabatzerakoan\n" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, c-format msgid "%s: error removing shadow password entry\n" -msgstr "%s: errorea itzalpeko pasahitz erregistroa ezabatzerakoan\n" +msgstr "%s: errorea itzalpeko pasahitzaren sarrera ezabatzean\n" -#: src/usermod.c:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s: errorea itzalpeko pasahitz dbm erregistroa ezabatzerakoan\n" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" -msgstr "%s: %s karpeta badago\n" +msgstr "%s: %s direktorioa badago\n" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "%s: ezin da %s sortu\n" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" msgstr "%s:ezin da %s jabez aldatu\n" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, c-format msgid "%s: cannot rename directory %s to %s\n" -msgstr "%s: ezin da %s direktorioa %s-ra berrizendatu\n" +msgstr "%s: ezin da %s direktorioa %s gisa izenez aldatu\n" -#: src/usermod.c:1333 +#: src/usermod.c:1223 #, c-format msgid "%s: warning: %s not owned by %s\n" -msgstr "%s: kontuz: %s ez dago %s-jabegoan\n" +msgstr "%s: abisua: %s ez dago %s(r)en jabegoan\n" -#: src/usermod.c:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" -msgstr "huts postakutxa jabez aldatzerakoan" +msgstr "huts egin du postontzia jabez aldatzean" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" -msgstr "huts postakutxa berrizendatzerakoan" +msgstr "huts egin du postontzia izenez aldatzean" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" @@ -2078,20 +1995,20 @@ msgstr "" "\n" "%s: %s ez da aldatu\n" -#: src/vipw.c:133 +#: src/vipw.c:131 msgid "Couldn't lock file" msgstr "Ezin da fitxategia blokeatu" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" -msgstr "Ezin da babeskopia egin" +msgstr "Ezin izan da babeskopiarik egin" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" -msgstr "%s: ezin da %s leheneratu: %s (zure aldaketak %s-n daude)\n" +msgstr "%s: ezin da %s leheneratu: %s (zure aldaketak %s(e)n daude)\n" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/po/fi.gmo b/po/fi.gmo index b56de2d0..e5866b62 100644 Binary files a/po/fi.gmo and b/po/fi.gmo differ diff --git a/po/fi.po b/po/fi.po index c0b3efa2..042bc136 100644 --- a/po/fi.po +++ b/po/fi.po @@ -4,22 +4,23 @@ # msgid "" msgstr "" -"Project-Id-Version: shadow 4.0.7\n" +"Project-Id-Version: shadow 4.0.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-26 07:53+0100\n" -"PO-Revision-Date: 2005-01-19 13:11+0200\n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" +"PO-Revision-Date: 2005-04-19 09:23+0300\n" "Last-Translator: Tommi Vainikainen \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" msgstr "Varoitus: tuntematon ryhm瓣 %s\n" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" msgstr "Varoitus: liian monta ryhm瓣瓣\n" @@ -47,17 +48,17 @@ msgstr " Ota yhteys j瓣rjestelm瓣n yll瓣pitoon.\n" msgid " Choose a new password.\n" msgstr " Valitse uusi salasana.\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "Salasanasi vanhenee %ld p瓣iv瓣ss瓣.\n" -#: libmisc/age.c:174 +#: libmisc/age.c:172 #, c-format msgid "Your password will expire tomorrow.\n" msgstr "Salasanasi vanhenee huomenna.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:174 #, c-format msgid "Your password will expire today.\n" msgstr "Salasanasi vanhenee t瓣n瓣瓣n.\n" @@ -72,42 +73,31 @@ msgstr "P瓣瓣tett瓣 %s ei voi vaihtaa" msgid "Environment overflow\n" msgstr "Ymp瓣rist繹n ylivuoto\n" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr "Et voi muuttaa muuttujaa $%s\n" -#: libmisc/failure.c:230 +#: libmisc/failure.c:229 #, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "%d %s sitten viime kirjautumisen. Viimeisin oli %s p瓣瓣tteell瓣 %s.\n" +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "" +"Edellisen kirjautumisen j瓣lkeen %d ep瓣onnistunut yrityst瓣.\n" +"Viimeisin oli %s p瓣瓣tteell瓣 %s.\n" +msgstr[1] "" +"Edellisen kirjautumisen j瓣lkeen %d ep瓣onnistunutta yrityst瓣.\n" +"Viimeisin oli %s p瓣瓣tteell瓣 %s.\n" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "ep瓣onnistunutta yrityst瓣" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "ep瓣onnistunut yritys" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" msgstr "Liian monta sis瓣瓣nkirjautumista.\n" -# %s liittyy johonkin RPC-netnameen, mik瓣s olisi parempi kun en tied瓣 -# RPC:st瓣 juuri mit瓣瓣n? -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "Salasanalla ei voida avata salaista avainta kohteelle %s.\n" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "" -"Kohteen %s salaista avainta ei voi asettaa: onko keyserv-palvelu p瓣瓣ll瓣?\n" - #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "Sinulle on uutta postia." @@ -120,7 +110,7 @@ msgstr "Ei postia." msgid "You have mail." msgstr "Sinulle on postia." -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " msgstr "Huono salasana: %s. " @@ -135,20 +125,20 @@ msgstr "passwd: pam_start() ep瓣onnistui, virhe %d\n" msgid "passwd: %s\n" msgstr "passwd: %s\n" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" msgstr "passwd: salasanan p瓣ivitys onnistui\n" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "Ei voi vaihtaa hakemistoon \"%s\"\n" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" msgstr "Ei hakemistoa, sis瓣瓣nkirjaudutaan siten, ett瓣 HOME=/" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr "Ei voi suorittaa %s" @@ -163,35 +153,31 @@ msgstr "Virheellinen juurihakemisto \"%s\"\n" msgid "Can't change root directory to \"%s\"\n" msgstr "Ei voi vaihtaa juurihakemistoksi \"%s\"\n" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "malloc(%d) ep瓣onnistui\n" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" msgstr "Asetustiedoille ei voi varata tilaa.\n" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "asetusvirhe - tuntematon kohta \"%s\" (kerro yll瓣pidolle)\n" -#: lib/pwauth.c:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "Salasana: " -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "K瓣ytt瓣j瓣n %s salasana: " -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "(Kaiku p瓣瓣ll瓣) " - -#: src/chage.c:118 +#: src/chage.c:112 #, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" @@ -200,154 +186,147 @@ msgstr "" "K瓣ytt繹: chage [-l] [-m v瓣h_p瓣iv瓣瓣] [-M kork_p瓣iv瓣瓣] [-W varoitus]\n" " [-I poisk瓣yt繹st瓣] [-E vanhenee] [-d viim_p瓣iv瓣] k瓣ytt瓣j瓣\n" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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:155 +#: src/chage.c:149 msgid "Minimum Password Age" msgstr "Salasanan ik瓣 v瓣hint瓣瓣n" -#: src/chage.c:161 +#: src/chage.c:155 msgid "Maximum Password Age" msgstr "Salasanan ik瓣 korkeintaan" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" msgstr "Viimeisin salasanan vaihto (VVVV-KK-PP)" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" msgstr "Salasanan vanhenemisvaroitus" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "Salasana pois k瓣yt繹st瓣" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Tunnuksen vanhenemisp瓣iv瓣ys (VVVV-KK-PP)" -#: src/chage.c:238 +#: src/chage.c:231 #, c-format msgid "Last password change\t\t\t\t\t: " msgstr "Edellinen salasanan vaihto\t\t\t\t\t: " -#: src/chage.c:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 #, c-format msgid "never\n" msgstr "ei koskaan\n" -#: src/chage.c:251 +#: src/chage.c:244 #, c-format msgid "Password expires\t\t\t\t\t: " msgstr "Salasana vanhenee\t\t\t\t\t: " -#: src/chage.c:267 +#: src/chage.c:260 #, c-format msgid "Password inactive\t\t\t\t\t: " msgstr "Salasana pois k瓣yt繹st瓣\t\t\t\t\t:" -#: src/chage.c:281 +#: src/chage.c:274 #, c-format msgid "Account expires\t\t\t\t\t\t: " msgstr "Tunnus vanhenee\t\t\t\t\t:" -#: src/chage.c:297 +#: src/chage.c:290 #, 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:298 +#: src/chage.c:292 #, 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:299 +#: src/chage.c:294 #, 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:444 +#: src/chage.c:431 #, 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:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 #, c-format msgid "%s: permission denied.\n" msgstr "%s: Lupa ev瓣tty.\n" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 #, c-format msgid "%s: PAM authentication failed\n" msgstr "%s: PAM-todennus ep瓣onnistui\n" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, c-format msgid "%s: can't open password file\n" msgstr "%s: salasanatiedostoa ei voi avata\n" -#: src/chage.c:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "%s: Tuntematon k瓣ytt瓣j瓣 %s\n" -#: src/chage.c:535 +#: src/chage.c:519 #, c-format msgid "%s: can't lock shadow password file" msgstr "%s: varjosalasanatiedostoa ei voi lukita" -#: src/chage.c:543 +#: src/chage.c:527 #, c-format msgid "%s: can't open shadow password file" msgstr "%s: varjosalasanatiedostoa ei voi avata" -#: src/chage.c:604 +#: src/chage.c:587 #, c-format msgid "Changing the aging information for %s\n" msgstr "Muutetaan k瓣ytt瓣j瓣n %s vanhenemistietoja\n" -#: src/chage.c:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" msgstr "%s: virhe muutettaessa kentti瓣\n" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, c-format msgid "%s: can't update password file\n" msgstr "%s: salasanatiedostoa ei voi p瓣ivitt瓣瓣\n" -#: src/chage.c:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" msgstr "%s: varjosalasanatiedostoa ei voi p瓣ivitt瓣瓣\n" -#: src/chage.c:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "Virhe p瓣ivitett瓣ess瓣 DBM-salasanatietuetta.\n" - -#: src/chage.c:692 +#: src/chage.c:649 #, c-format msgid "%s: can't rewrite shadow password file\n" msgstr "%s: varjosalasanatiedostoa ei voi uudelleenkirjoittaa\n" -#: src/chage.c:740 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite password file\n" msgstr "%s: salasanatiedostoa ei voi uudelleenkirjoittaa\n" -#: src/chage.c:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 #, c-format msgid "%s: PAM chauthtok failed\n" msgstr "%s: PAM-chauthtok ep瓣onnistui\n" @@ -366,117 +345,122 @@ msgstr "" msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" msgstr "K瓣ytt繹: %s [-f koko_nimi] [-r huonenro] [-w ty繹puh] [-h kotipuh]\n" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "Koko nimi" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "\tKoko nimi: %s\n" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "Huonenumero" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "Ty繹puhelin" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" msgstr "Kotipuhelin" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "Muu" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s: K瓣ytt瓣j瓣tunnusta ei voi selvitt瓣瓣.\n" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s: ei voi vaihtaa k瓣ytt瓣j瓣瓣 \"%s\" NIS-asiakkaalla.\n" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "%s: \"%s\" on NIS-palvelin t瓣lle asiakkaalle.\n" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, c-format +msgid "%s: Permission denied.\n" +msgstr "%s: Lupa ev瓣tty.\n" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" msgstr "Muutetaan k瓣ytt瓣j瓣n %s tietoja\n" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s: virheellinen nimi: \"%s\"\n" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s: virheellinen huonenumero: \"%s\"\n" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s: virheellinen ty繹puhelin: \"%s\"\n" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s: virheellinen kotipuhelin: \"%s\"\n" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s: \"%s\" sis瓣lt瓣瓣 ei-sallittuja merkkej瓣\n" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "%s: kent瓣t liian pitki瓣\n" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" msgstr "Ei voi vaihtaa tunnusta p瓣瓣k瓣ytt瓣j瓣ksi.\n" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" -msgstr "Salasanatiedostoa ei voi lukita. Yrit瓣 my繹hemmin uudelleen.\n" +msgstr "Salasanatiedostoa ei voi lukita. Yrit瓣 my繹hemmin uudelleen.\n" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" msgstr "Salasanatiedostoa ei voi avata.\n" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s: K瓣ytt瓣j瓣瓣 %s ei l繹ydy tiedostosta /etc/passwd\n" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" msgstr "Virhe p瓣ivitett瓣ess瓣 salasanatietuetta.\n" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" msgstr "Salasanatiedoston muutoksia ei voi tallentaa.\n" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" msgstr "Salasanatiedoston lukitusta ei voi avata.\n" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -500,48 +484,48 @@ msgstr "" msgid "%s: can't lock password file\n" msgstr "%s: salasanatiedostoa ei voi lukita\n" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "%s: varjotiedostoa ei voi lukita\n" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "%s: varjotiedostoa ei voi avata\n" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "%s: rivi %d: rivi on liian pitk瓣\n" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "%s: rivi %d: uusi salasana puuttuu\n" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "%s: rivi %d: tuntematon k瓣ytt瓣j瓣 %s\n" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "%s: rivi %d: salasanatietuetta ei voi p瓣ivitt瓣瓣\n" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "%s: virhe havaittu, muutokset ohitetaan\n" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" msgstr "%s: virhe p瓣ivitett瓣ess瓣 varjotiedostoa\n" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" msgstr "%s: virhe p瓣ivitett瓣ess瓣 salasanatiedostoa\n" @@ -551,26 +535,26 @@ msgstr "%s: virhe p瓣ivitett瓣ess瓣 salasanatiedostoa\n" msgid "Usage: %s [-s shell] [name]\n" msgstr "K瓣ytt繹: %s [-s kuori] [nimi]\n" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" msgstr "Sis瓣瓣nkirjautumiskuori" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" msgstr "Et voi muuttaa k瓣ytt瓣j瓣n %s kuorta.\n" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" msgstr "Muutetaan k瓣ytt瓣j瓣n %s sis瓣瓣nkirjautumiskuorta\n" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s: Virheellinen tietue: %s\n" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" msgstr "%s on virheellinen kuori.\n" @@ -580,12 +564,12 @@ msgstr "%s on virheellinen kuori.\n" msgid "Usage: expiry {-f|-c}\n" msgstr "K瓣ytt繹: expiry {-f|-c}\n" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" msgstr "%s: VAROITUS! Oikeuksina t瓣ytyy olla aseta-UID p瓣瓣k瓣ytt瓣j瓣ksi!\n" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "%s: tuntematon k瓣ytt瓣j瓣\n" @@ -599,8 +583,9 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" @@ -616,317 +601,282 @@ msgstr "" " -m, --maximum MAX Aseta sallittujen kirjautumisyritysten\n" " laskureiksi MAX\n" " -r, --reset Nollaa kirjautumisyrityslaskurit\n" +" -t, --time PIVI N瓣yt瓣 PIVI uudemmat faillog-tietueet\n" " -u, --user TUNNUS N瓣yt瓣 faillog-tietue k瓣ytt瓣j瓣lle TUNNUS tai\n" " muuta kirjautumisyrityslaskureita (kun\n" " k瓣ytet瓣瓣n -r, -m tai -l -valitsimilla)\n" -#: src/faillog.c:86 +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" -msgstr "K瓣ytt瓣j瓣 Yrityst瓣 Maksimi Viimeisin\n" +msgid "Login Failures Maximum Latest On\n" +msgstr "Tunnus Ep瓣onn. Enint. Edellinen P瓣瓣tteell瓣\n" -#: src/faillog.c:103 -#, c-format -msgid " %s on %s" -msgstr " %s p瓣瓣tteell瓣 %s" - -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" msgstr " [%lds j瓣ljell瓣]" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr " [%lds lukittu]" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "Tuntematon k瓣ytt瓣j瓣: %s\n" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "K瓣ytt繹: %s [-r|-R] ryhm瓣\n" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr " %s [-a k瓣ytt瓣j瓣] ryhm瓣\n" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr " %s [-d k瓣ytt瓣j瓣] ryhm瓣\n" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr " %s [-A k瓣ytt瓣j瓣,...] [-M k瓣ytt瓣j瓣,...] ryhm瓣\n" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr " %s [-M k瓣ytt瓣j瓣,...] ryhm瓣\n" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" msgstr "%s: varjoryhm瓣salanat vaaditaan valitsimelle -A\n" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "Kuka olet?\n" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr "tuntematon ryhm瓣: %s\n" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "Lis瓣t瓣瓣n k瓣ytt瓣j瓣 %s ryhm瓣瓣n %s\n" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "Poistetaan k瓣ytt瓣j瓣 %s ryhm瓣st瓣 %s\n" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" msgstr "%s: tuntematon j瓣sen %s\n" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "%s: Ei ole p瓣瓣te\n" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "Vaihdetaan ryhm瓣n %s salasana\n" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "Uusi salasana: " -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " msgstr "Toista uusi salasana: " -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" -msgstr "Ne eiv瓣t t瓣sm瓣瓣. Yrit瓣 uudelleen" +msgstr "Ne eiv瓣t t瓣sm瓣瓣. Yrit瓣 uudelleen" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" msgstr "%s: Yrit瓣 my繹hemmin uudelleen\n" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "%s: ei voi lukita\n" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" msgstr "%s: varjoa ei voi lukita\n" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "%s: tiedosta ei voi avata\n" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "%s: tietuetta ei voi p瓣ivitt瓣瓣\n" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" msgstr "%s: varjotietuetta ei voi p瓣ivitt瓣瓣\n" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "%s: tiedostoa ei voi uudelleenkirjoittaa\n" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" msgstr "%s: varjotiedostoa ei voi uudelleenkirjoittaa\n" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "%s: tiedoston lukkoa ei voi avata\n" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "%s: DBM-tiedostoja ei voi p瓣ivitt瓣瓣\n" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "%s: DBM-varjotiedostoja ei voi p瓣ivitt瓣瓣\n" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "K瓣ytt繹: groupadd [-g gid [-o]] [-f] ryhm瓣\n" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, c-format msgid "%s: error adding new group entry\n" msgstr "%s: virhe lis瓣tt瓣ess瓣 uutta ryhm瓣tietuetta\n" -#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: ei voi lis瓣t瓣 uutta dbm-ryhm瓣tietuetta\n" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "%s: nimi %s ei ole ainutkertainen\n" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" msgstr "%s: gid %u ei ole ainutkertainen\n" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "%s: ei saa ainutkertaista gid:i瓣\n" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, c-format msgid "%s: %s is not a valid group name\n" msgstr "%s: %s ei ole kelpo ryhm瓣nimi\n" -#: src/groupadd.c:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "%s: virheellinen ryhm瓣 %s\n" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "%s: -O vaatii NIMI=ARVO\n" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s: ryhm瓣tiedostoa ei voi uudelleenkirjoittaa\n" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s: varjoryhm瓣tiedostoa ei voi uudelleenkirjoittaa\n" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" msgstr "%s: ryhm瓣tiedostoa ei voi lukita\n" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" msgstr "%s: ryhm瓣tiedostoa ei voi avata\n" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" msgstr "%s: varjoryhm瓣tiedostoa ei voi lukita\n" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" msgstr "%s: varjoryhm瓣tiedostoa ei voi avata\n" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "%s: ryhm瓣 %s on olemassa\n" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, c-format msgid "Usage: groupdel group\n" msgstr "K瓣ytt繹: groupdel ryhm瓣\n" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" msgstr "%s: virhe poistettaessa ryhm瓣tietuetta\n" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "%s: virhe poistettaessa ryhm瓣-dbm-tietuetta\n" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "%s: virhe poistettaessa varjoryhm瓣tietuetta\n" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "%s: virhe poistettaessa varjoryhm瓣-dbm-tietuetta\n" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "%s: k瓣ytt瓣j瓣n ensisijaista ryhm瓣瓣 ei voi poistaa\n" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "%s: ryhm瓣瓣 %s ei ole olemassa\n" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "%s: ryhm瓣 %s on NIS-ryhm瓣\n" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s: is瓣nt瓣 %s on NIS-palvelin\n" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "K瓣ytt繹: groupmod [-g gid [-o]] [-n nimi] ryhm瓣\n" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "%s: Ryhm瓣瓣 %s ei l繹ydy tiedostosta /etc/group\n" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s: uutta dbm-varjoryhm瓣tietuetta ei voi lis瓣t瓣\n" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s: %u ei ole ainutkertainen gid\n" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "%s: %s ei ole ainutkertainen nimi\n" @@ -936,110 +886,105 @@ msgstr "%s: %s ei ole ainutkertainen nimi\n" msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "K瓣ytt繹: %s [-r] [-s] [ryhm瓣 [ryhm瓣varjo]]\n" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "K瓣ytt繹: %s [-r] [-s] [ryhm瓣]\n" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "Ei" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" msgstr "%s: valitsimet -s ja -r eiv瓣t sovi yhteen\n" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "%s: tiedostoa %s ei voi lukita\n" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "%s: tiedostoa %s ei voi lukita\n" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" msgstr "virheellinen ryhm瓣tiedostotietue\n" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "poista rivi \"%s\"? " -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" msgstr "kaksinkertainen ryhm瓣tietue\n" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" msgstr "virheellinen ryhm瓣nimi \"%s\"\n" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "ryhm瓣 %s: ei k瓣ytt瓣j瓣瓣 %s\n" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " msgstr "poista j瓣sen \"%s\"? " -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" msgstr "virheellinen tietue varjoryhm瓣tiedostossa\n" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" msgstr "kaksinkertainen varjoryhm瓣tietue\n" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" msgstr "ei t瓣sm瓣瓣v瓣瓣 ryhm瓣tiedostotietue\n" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" msgstr "varjoryhm瓣 %s: k瓣ytt瓣j瓣 %s ei kuulu yll瓣pitoon\n" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " msgstr "poista yll瓣pidon j瓣sen \"%s\"? " -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" msgstr "varjoryhm瓣 %s: ei k瓣ytt瓣j瓣瓣 %s\n" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "%s: tiedostoa %s ei voi p瓣ivitt瓣瓣\n" -#: src/grpck.c:647 src/pwck.c:612 -#, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: tiedostot p瓣ivitettiin; suorita mkpasswd\n" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format -msgid "%s: no changes\n" -msgstr "%s: ei muutoksia\n" - -#: src/grpck.c:651 src/pwck.c:616 +#: src/grpck.c:640 src/pwck.c:606 #, c-format msgid "%s: the files have been updated\n" msgstr "%s: tiedostot p瓣ivitettiin\n" +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "%s: ei muutoksia\n" + #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" @@ -1055,37 +1000,37 @@ msgstr "%s: ryhm瓣tiedostoa ei voi avata\n" msgid "%s: can't lock shadow group file\n" msgstr "%s: varjoryhm瓣tiedostoa ei voi lukita\n" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" msgstr "%s: varjoryhm瓣tiedostoa ei voi avata\n" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "%s: varjoryhm瓣瓣 %s ei voi poistaa\n" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "%s: varjotietuetta ryhm瓣lle %s ei voi p瓣ivitt瓣瓣\n" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "%s: ryhm瓣n %s tietuetta ei voi p瓣ivitt瓣瓣\n" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" msgstr "%s: varjoryhm瓣tiedostoa ei voi p瓣ivitt瓣瓣\n" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" msgstr "%s: ryhm瓣tiedostoa ei voi p瓣ivitt瓣瓣\n" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "%s: varjoryhm瓣tiedostoa ei voi poistaa\n" @@ -1105,13 +1050,13 @@ msgstr "K瓣ytt繹: id\n" msgid " groups=" msgstr " ryhm瓣t=" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" @@ -1122,41 +1067,41 @@ msgstr "" " -h, --help N瓣yt瓣 t瓣m瓣 ohje ja lopeta\n" " -t, --time PIV Tulosta vain PIV tuoreemmat lastlog-tietueet\n" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" msgstr "K瓣ytt瓣j瓣 Portti Mist瓣 Viimeksi\n" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "K瓣ytt瓣j瓣 Portti Viimeksi\n" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "**Ei koskaan kirjautunut sis瓣瓣n**" -#: src/login.c:175 +#: src/login.c:156 #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "K瓣ytt繹: %s [-p] [nimi]\n" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr " %s [-p] [-h is瓣nt瓣] [-f nimi]\n" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr " %s [-p] -r is瓣nt瓣\n" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" msgstr "Virheellinen kirjautumisaika\n" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" @@ -1165,7 +1110,7 @@ msgstr "" "\n" "J瓣rjestelm瓣 on suljettu yll瓣pidon ajaksi\n" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" @@ -1174,7 +1119,7 @@ msgstr "" "\n" "[Yhteydenkatkaisu ohitettu -- p瓣瓣k瓣ytt瓣j瓣n kirjautuminen sallittu.]\n" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" @@ -1183,17 +1128,17 @@ msgstr "" "\n" "Sis瓣瓣nkirjautuminen keskeytetty %d sekunnin j瓣lkeen.\n" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" msgstr " p瓣瓣tteelt瓣 \"%.100s\" osoitteesta \"%.200s\"" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" msgstr " p瓣瓣tteelt瓣 \"%.100s\"" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" @@ -1202,39 +1147,30 @@ msgstr "" "\n" "%s-tunnus: " -#: src/login.c:819 -msgid "login: " -msgstr "tunnus: " - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" msgstr "Sis瓣瓣nkirjautuminen ep瓣onnistui" -#: src/login.c:1198 +#: src/login.c:996 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:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "Edellinen kirjautuminen: %s p瓣瓣tteell瓣 %s" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" msgstr "Edellinen kirjautuminen: %.19s p瓣瓣tteell瓣 %s" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" msgstr " osoitteesta %.*s" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "Aloitettu rad_login\n" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" @@ -1275,17 +1211,17 @@ msgstr "%s: virhe lis瓣tt瓣ess瓣 tietuetta nimelle %s\n" msgid "added %d entries, longest was %d\n" msgstr "lis瓣tty %d tietuetta, pisin oli %d\n" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "K瓣ytt繹: %s [-vf] [-p|g|sp|sg] tiedosto\n" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "K瓣ytt繹: %s [-vf] [-p|g|sp] tiedosto\n" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "K瓣ytt繹: %s [-vf] [-p|g] tiedosto\n" @@ -1305,16 +1241,16 @@ msgstr "K瓣ytt繹: sg ryhm瓣 [[-c] komento]\n" msgid "unknown uid: %u\n" msgstr "tuntematon uid: %u\n" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" msgstr "tuntematon gid: %lu\n" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "Pahoittelen.\n" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "liian monta ryhm瓣瓣\n" @@ -1324,91 +1260,91 @@ msgstr "liian monta ryhm瓣瓣\n" msgid "Usage: %s [input]\n" msgstr "K瓣ytt繹: %s [sy繹te]\n" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "%s: tiedostoa /etc/passwd ei voi lukita.\n" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "%s: tiedostoja ei voi lukita, yrit瓣 my繹hemmin uudelleen\n" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "%s: tiedostoja ei voi avata\n" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "%s: rivi %d: virheellinen rivi\n" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "%s: rivi %d: GIDi瓣 ei voi luoda\n" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "%s: rivi %d: UID:t瓣 ei voi luoda\n" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "%s: rivi %d: k瓣ytt瓣j瓣瓣 %s ei l繹ydy\n" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "%s: rivi %d: salasanaa ei voi p瓣ivitt瓣瓣\n" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "%s: rivi %d: mkdir ep瓣onnistui\n" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "%s: rivi %d: chown ep瓣onnistui\n" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "%s: rivi %d: tietuetta ei voi p瓣ivitt瓣瓣\n" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "%s: virhe p瓣ivitett瓣ess瓣 tiedostoja\n" -#: src/passwd.c:155 +#: src/passwd.c:154 #, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "K瓣ytt繹: %s [-f|-s] [nimi]\n" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr " %s [-x kork] [-n v瓣h] [-w varoitus] [-i poisk瓣yt] nimi\n" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} nimi\n" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "Vanha salasana: " -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" msgstr "V瓣瓣r瓣 salasana k瓣ytt瓣j瓣lle \"%s\"\n" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" @@ -1417,16 +1353,16 @@ msgstr "" "Sy繹t瓣 uusi salasana (v瓣hint瓣瓣n %d ja korkeintaan %d merkki瓣)\n" "K瓣yt瓣th瓣n salasanassa numeroita sek瓣 pien- ja suuraakkosia.\n" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "Uusi salasana: " -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" msgstr "Yrit瓣 uudelleen.\n" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" @@ -1435,52 +1371,52 @@ msgstr "" "\n" "Varoitus: heikko salasana (sy繹t瓣 uudelleen k瓣ytt瓣瓣ksesi joka tapauksessa).\n" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" -msgstr "Ne eiv瓣t t瓣sm瓣瓣. Yrit瓣 uudelleen.\n" +msgstr "Ne eiv瓣t t瓣sm瓣瓣. Yrit瓣 uudelleen.\n" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "K瓣ytt瓣j瓣n %s salasanaa ei voi vaihtaa.\n" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" msgstr "Pahoittelen, k瓣ytt瓣j瓣n %s salasanaa ei voi vaihtaa viel瓣.\n" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "%s: muisti loppui\n" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "%s: Komento %s ei voi suorittaa" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" msgstr "%s: tietol瓣hdett瓣 %s ei tueta\n" -#: src/passwd.c:914 +#: src/passwd.c:884 #, c-format -msgid "You may not change the password for %s.\n" -msgstr "Et voi vaihtaa k瓣ytt瓣j瓣n %s salasanaa.\n" +msgid "%s: You may not view or modify password information for %s.\n" +msgstr "%s: Et voi katsoa tai muokata k瓣ytt瓣j瓣n %s salasanatietoja.\n" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "Vaihdetaan salasana k瓣ytt瓣j瓣lle %s\n" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "K瓣ytt瓣j瓣n %s salasanaa ei vaihdettu.\n" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "Salasana vaihdettu.\n" @@ -1495,49 +1431,49 @@ msgstr "K瓣ytt繹: %s [-q] [-r] [-s] [passwd [varjo]]\n" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "K瓣ytt繹: %s [-q] [-r] [-s] [passwd]\n" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" msgstr "virheellinen sanasanatiedostotietue\n" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" msgstr "kaksinkertainen salasanatietue\n" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" msgstr "virheellinen k瓣ytt瓣j瓣tunnus \"%s\"\n" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "k瓣ytt瓣j瓣 %s: ei ryhm瓣瓣 %u\n" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "k瓣ytt瓣j瓣 %s: hakemistoa %s ei ole olemassa\n" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "k瓣ytt瓣j瓣 %s: kuorta %s ei ole olemassa\n" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" msgstr "virheellinen tietue varjosalasanatiedostossa\n" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" msgstr "kaksinkertainen varjosalasanatietue\n" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" msgstr "ei t瓣sm瓣瓣v瓣瓣 tietuetta salasanatiedostossa\n" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" msgstr "k瓣ytt瓣j瓣 %s: viimeisin salasanan vaihto tapahtunut tulevaisuudessa\n" @@ -1557,17 +1493,17 @@ msgstr "%s: passwd-tiedostoa ei voi avata\n" msgid "%s: can't remove shadow entry for %s\n" msgstr "%s: varjotietuetta %s ei voi poistaa\n" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "%s: salasanatietuetta %s ei voi p瓣ivitt瓣瓣\n" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" msgstr "%s: varjotiedostoa ei voi p瓣ivitt瓣瓣\n" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" msgstr "%s: salasanatiedostoa ei voi p瓣ivitt瓣瓣\n" @@ -1577,40 +1513,40 @@ msgstr "%s: salasanatiedostoa ei voi p瓣ivitt瓣瓣\n" msgid "%s: can't update entry for user %s\n" msgstr "%s: k瓣ytt瓣j瓣n %s tietuetta ei voi p瓣ivitt瓣瓣\n" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format msgid "%s: can't delete shadow password file\n" msgstr "%s: varjosalasanatiedostoa ei voi poistaa\n" -#: src/su.c:133 +#: src/su.c:132 msgid "Sorry." msgstr "Pahoittelen." -#: src/su.c:323 +#: src/su.c:320 #, c-format msgid "%s: must be run from a terminal\n" msgstr "%s: t瓣ytyy suorittaa p瓣瓣tteess瓣\n" -#: src/su.c:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "%s: pam_start: virhe %d\n" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" msgstr "Tuntematon id: %s\n" -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, 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:502 +#: src/su.c:495 msgid "(Enter your own password.)" msgstr "(Sy繹t瓣 oma salasanasi.)" -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" @@ -1619,22 +1555,22 @@ msgstr "" "%s: %s\n" "(Ohitettu)\n" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" msgstr "Ei kuorta\n" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr "Tunnuksen vaihtaminen t瓣ksi k瓣ytt瓣j瓣ksi EVTTY.\n" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "Salasanatodennus ohitettu.\n" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" msgstr "Sy繹t瓣 OMA salasanasi todennukseksi.\n" @@ -1649,7 +1585,7 @@ msgstr "Ei salasanatiedosto\n" msgid "No password entry for 'root'\n" msgstr "Ei salasanatietuetta p瓣瓣k瓣ytt瓣j瓣lle (\"root\")\n" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" @@ -1659,236 +1595,216 @@ 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:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" msgstr "Siirryt瓣瓣n j瓣rjestelm瓣n yll瓣pitotilaan\n" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "%s: uudelleenkoostetaan ryhm瓣tietokanta\n" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "%s: uudelleenkoostetaan varjoryhm瓣tietokanta\n" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "%s: virheellinen numeroargumentti \"%s\"\n" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "%s: tuntematon gid %s\n" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "%s: tuntematon ryhm瓣 %s\n" -#: src/useradd.c:475 +#: src/useradd.c:418 #, c-format msgid "%s: cannot create new defaults file\n" msgstr "%s: uutta defaults-tiedostoa ei voi luoda\n" -#: src/useradd.c:480 +#: src/useradd.c:423 #, 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:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" msgstr "%s: rename: %s" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s: ryhm瓣 \"%s\" ei ole NIS-ryhm瓣.\n" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "%s: liian monta ryhm瓣瓣 m瓣瓣ritelty (korkeintaan %d).\n" -#: src/useradd.c:721 +#: src/useradd.c:660 #, 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" -#: src/useradd.c:724 +#: src/useradd.c:663 #, 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:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, c-format msgid " [-f inactive] [-e expire]\n" msgstr " [-f poisk瓣yt繹st瓣] [-e vanhenee]\n" -#: src/useradd.c:728 +#: src/useradd.c:667 #, c-format msgid " [-p passwd] name\n" msgstr " [-p salansana] nimi\n" -#: src/useradd.c:730 +#: src/useradd.c:669 #, 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:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, c-format msgid "%s: error locking group file\n" msgstr "%s: virhe lukittaessa ryhm瓣tiedostoa\n" -#: src/useradd.c:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, c-format msgid "%s: error opening group file\n" msgstr "%s: virhe avattaessa ryhm瓣tiedostoa\n" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, c-format msgid "%s: error locking shadow group file\n" msgstr "%s: virhe lukittaessa varjoryhm瓣tiedostoa\n" -#: src/useradd.c:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, c-format msgid "%s: error opening shadow group file\n" msgstr "%s: virhe avattaessa varjoryhm瓣tiedostoa\n" -#: src/useradd.c:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "%s: uid %u ei ole ainutkertainen\n" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "%s: ainutkertaista uidia ei saa\n" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "%s: virheellinen perushakemisto \"%s\"\n" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "%s: virheellinen kommentti \"%s\"\n" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "%s: virheellinen kotihakemisto \"%s\"\n" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s: virheellinen p瓣iv瓣ys \"%s\"\n" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "%s: varjosalasanat vaaditaan valitsimelle -e\n" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, c-format msgid "%s: shadow passwords required for -f\n" msgstr "%s: varjosalasanat vaaditaan valitsimelle -f\n" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" msgstr "%s: virheellinen kentt瓣 \"%s\"\n" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "%s: virheellinen kuori \"%s\"\n" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "%s: virheellinen k瓣ytt瓣j瓣tunnus \"%s\"\n" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "%s: salasanatiedostoa ei voi uudelleenkirjoittaa\n" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "%s: varjosalasanatiedostoa ei voi uudelleenkirjoittaa\n" -#: src/useradd.c:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, c-format msgid "%s: unable to lock password file\n" msgstr "%s: salasanatiedostoa ei voi lukita\n" -#: src/useradd.c:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, c-format msgid "%s: unable to open password file\n" msgstr "%s: salasanatiedostoa ei voi avata\n" -#: src/useradd.c:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, c-format msgid "%s: cannot lock shadow password file\n" msgstr "%s: varjosalasanatiedostoa ei voi lukita\n" -#: src/useradd.c:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, c-format msgid "%s: cannot open shadow password file\n" msgstr "%s: varjosalasanatiedostoa ei voi avata\n" -#: src/useradd.c:1459 +#: src/useradd.c:1354 #, c-format msgid "%s: error adding new password entry\n" msgstr "%s: virhe lis瓣tt瓣ess瓣 uutta salasanatietuetta\n" -#: src/useradd.c:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "%s: virhe p瓣ivitett瓣ess瓣 salasana-dbm-tietuetta\n" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, c-format msgid "%s: error adding new shadow password entry\n" msgstr "%s: virhe lis瓣tt瓣ess瓣 uutta varjosalasanatietuetta\n" -#: src/useradd.c:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s: virhe p瓣ivitett瓣ess瓣 varjosalasana-dbm-tietuetta\n" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" msgstr "%s: hakemistoa %s ei voi luoda\n" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, 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:1590 +#: src/useradd.c:1446 #, 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:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "%s: k瓣ytt瓣j瓣 %s on olemassa\n" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" @@ -1896,206 +1812,171 @@ 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:1767 +#: src/useradd.c:1602 #, 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" -#: src/userdel.c:124 +#: src/userdel.c:108 #, c-format msgid "Usage: %s [-r] name\n" msgstr "K瓣ytt繹: %s [-r] nimi\n" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" msgstr "%s: virhe p瓣ivitett瓣ess瓣 ryhm瓣tietuetta\n" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "%s: dbm-ryhm瓣tietuetta ei voi p瓣ivitt瓣瓣\n" - -#: src/userdel.c:214 -#, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: dbm-ryhm瓣tietuetta ei voi poistaa\n" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "%s: ryhm瓣tiedostoa ei voi avata\n" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "%s: varjoryhm瓣tiedostoa ei voi avata\n" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "%s: virhe poistettaessa salasanatietuetta\n" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "%s: virhe poistettaessa varjosalasanatietuetta\n" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "%s: virhe poistettaessa salasana-dbm-tietuetta\n" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s: virhe poistettaessa varjosalasana-dbm-tietuetta\n" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "%s: k瓣ytt瓣j瓣 %s on nyt sis瓣瓣nkirjautuneena\n" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "%s: tiedoston %s omistaja ei ole %s, ei poisteta\n" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " msgstr "%s: varoitus: ei voi poistaa tiedostoa " -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" msgstr "%s: k瓣ytt瓣j瓣瓣 %s ei ole olemassa\n" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s: k瓣ytt瓣j瓣 %s on NIS-k瓣ytt瓣j瓣\n" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "" "%s: ei poisteta hakemistoa %s (poistettaisiin k瓣ytt瓣j瓣n %s kotihakemisto)\n" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "%s: virhe poistettaessa hakemistoa %s\n" -#: src/usermod.c:306 +#: src/usermod.c:289 #, 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" -#: src/usermod.c:310 +#: src/usermod.c:293 #, 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:313 +#: src/usermod.c:296 #, c-format msgid "[-f inactive] [-e expire] " msgstr "[-f poisk瓣yt繹st瓣] [-e vanhenee] " -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p passwd] [-L|-U] nimi\n" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" msgstr "%s: muisti loppui funktiossa update_group\n" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "%s: muisti loppui funktiossa update_gshadow\n" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "%s: lippuja ei annettu\n" -#: src/usermod.c:965 +#: src/usermod.c:903 #, c-format msgid "%s: shadow passwords required for -e and -f\n" msgstr "%s: varjosalasanat vaaditaan valitsimille -e ja -f\n" -#: src/usermod.c:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "%s: uid %lu ei ole ainutkertainen\n" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, c-format msgid "%s: error changing password entry\n" msgstr "%s: virhe muutettaessa salasanatietuetta\n" -#: src/usermod.c:1122 +#: src/usermod.c:1053 #, c-format msgid "%s: error removing password entry\n" msgstr "%s: virhe poistettaessa salasanatietuetta\n" -#: src/usermod.c:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "%s: virhe lis瓣tt瓣ess瓣 salasana-dbm-tietuetta\n" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "%s: virhe poistettaessa salasana-dbm-tietuetta\n" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "%s: virhe poistettaessa varjosalasanatietuetta\n" -#: src/usermod.c:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s: virhe poistettaessa varjosalasana-dbm-tietuetta\n" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "%s: hakemisto %s on olemassa\n" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "%s: tiedostoa %s ei voi luoda\n" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" msgstr "%s: tiedoston %s omistajaa ei voi asettaa\n" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, c-format msgid "%s: cannot rename directory %s to %s\n" msgstr "%s: hakemistoa %s ei voi uudelleennimet瓣 hakemistoksi %s\n" -#: src/usermod.c:1333 +#: src/usermod.c:1223 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "%s: varoitus: tiedoston %s omistaja ei ole %s\n" -#: src/usermod.c:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" msgstr "postilaatikon omistajan vaihtaminen ep瓣onnistui" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" msgstr "postilaatikon uudelleennime瓣minen ep瓣onnistui" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" @@ -2104,21 +1985,21 @@ msgstr "" "\n" "%s: tiedostoa %s ei muutettu\n" -#: src/vipw.c:133 +#: src/vipw.c:131 msgid "Couldn't lock file" msgstr "Tiedostoa ei voi lukita" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" msgstr "Tiedostoa ei voi varmuuskopioida" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "" "%s: tiedostoa %s ei voi palauttaa: %s (muutoksesi ovat tiedostossa %s)\n" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/po/fr.gmo b/po/fr.gmo index 8ae45bb6..dd66cd40 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index 60ee3372..47e53a70 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,34 +1,37 @@ +# translation of fr.po to French # shadow fr.po -# Copyright (C) 1999 Free Software Foundation, Inc. -# Vincent Renardias , 1999 +# Copyright (C) 1999, 2004, 2005 Free Software Foundation, Inc. # Patches, suggestions, etc welcome. +# Vincent Renardias , 1999, 2005. # msgid "" msgstr "" -"Project-Id-Version: shadow 19990709\n" +"Project-Id-Version: shadow 4.0.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-26 07:53+0100\n" -"PO-Revision-Date: 1999-07-09 20:02+0200\n" -"Last-Translator: Vincent Renardias \n" -"Language-Team: Vincent Renardias \n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" +"PO-Revision-Date: 2005-04-20 22:39+0200\n" +"Last-Translator: Jean-Luc Coulon (f5ibh) \n" +"Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n>1;\n" +"X-Generator: KBabel 1.9.1\n" #: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" -msgstr "Avertissement: le groupe %s est inconnu\n" +msgstr "Attention: le groupe %s est inconnu\n" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" -msgstr "Avertissement: trop de groupes\n" +msgstr "Attention: il y a trop de groupes\n" #: libmisc/age.c:72 #, c-format msgid "Your password has expired." -msgstr "Votre mot de passe a expir矇." +msgstr "Votre mot de passe est arriv矇 en fin de validit矇." #: libmisc/age.c:75 #, c-format @@ -38,92 +41,82 @@ msgstr "Votre mot de passe est d矇sactiv矇." #: libmisc/age.c:78 #, c-format msgid "Your login has expired." -msgstr "Votre compte a expir矇." +msgstr "Votre compte est arriv矇 en fin de validit矇." #: libmisc/age.c:90 msgid " Contact the system administrator.\n" -msgstr " Contactez l'administrateur syst癡me.\n" +msgstr " Contactez l'administrateur du syst癡me.\n" #: libmisc/age.c:93 msgid " Choose a new password.\n" msgstr " Choisissez un nouveau mot de passe.\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" -msgstr "Votre mot de passe expirera dans %ld jours.\n" +msgstr "Votre mot de passe arrivera en fin de validit矇 dans %ld jours.\n" + +#: libmisc/age.c:172 +#, c-format +msgid "Your password will expire tomorrow.\n" +msgstr "Votre mot de passe arrivera demain en fin de validit矇.\n" #: libmisc/age.c:174 #, c-format -msgid "Your password will expire tomorrow.\n" -msgstr "Votre mot de passe expirera demain.\n" - -#: libmisc/age.c:176 -#, c-format msgid "Your password will expire today.\n" -msgstr "Votre mot de passe expirera aujourd'hui.\n" +msgstr "Votre mot de passe arrive aujourd'hui en fin de validit矇.\n" #: libmisc/chowntty.c:106 #, c-format msgid "Unable to change tty %s" -msgstr "Impossible de changer le tty %s" +msgstr "Impossible de modifier le tty %s" #: libmisc/env.c:155 #, c-format msgid "Environment overflow\n" -msgstr "D矇passement de l'environnement\n" +msgstr "D矇bordement de l'environnement\n" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr "Vous ne pouvez pas changer $%s\n" -#: libmisc/failure.c:230 +#: libmisc/failure.c:229 #, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "%d %s depuis la derni癡re connexion. La derni癡re fut le %s sur %s.\n" +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "" +"%d 矇chec depuis la derni癡re connexion.\n" +"Le dernier 矇chec 矇tait le %s sur %s.\n" +msgstr[1] "" +"%d 矇checs depuis la derni癡re connexion.\n" +"Le dernier 矇chec 矇tait le %s sur %s.\n" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "矇checs" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "矇chec" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" msgstr "Trop de connexions.\n" -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "Le mot de passe ne d矇crypte pas le cl矇 secr矇te pour %s.\n" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "" -"Impossible de changer la cl矇 secr矇te de %s: le daemon keyserv fonctionne-t-" -"il?\n" - #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." -msgstr "Vous avez des nouveaux messages." +msgstr "Vous avez de nouveaux messages." #: libmisc/mail.c:72 msgid "No mail." -msgstr "Pas de courier." +msgstr "Pas de courrier." #: libmisc/mail.c:74 msgid "You have mail." -msgstr "Vous avez du courier." +msgstr "Vous avez du courrier." -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " -msgstr "Mauvais mot de passe: %s. " +msgstr "Mot de passe incorrect: %s. " #: libmisc/pam_pass.c:38 #, c-format @@ -135,20 +128,20 @@ msgstr "passwd: 矇chec de pam_start(), erreur %d\n" msgid "passwd: %s\n" msgstr "passwd: %s\n" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" -msgstr "" +msgstr "passwd: le mot de passe a 矇t矇 mis jour avec succ癡s\n" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" -msgstr "Impossible d'aller dans \"%s\"\n" +msgstr "Impossible d'aller dans le r矇pertoire 竄%s罈\n" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" msgstr "Pas de r矇pertoire, connexion avec HOME=/" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr "Impossible d'ex矇cuter %s" @@ -156,203 +149,198 @@ msgstr "Impossible d'ex矇cuter %s" #: libmisc/sub.c:55 #, c-format msgid "Invalid root directory \"%s\"\n" -msgstr "R矇pertoire root \"%s\" non valide\n" +msgstr "R矇pertoire racine 竄%s罈 incorrect\n" #: libmisc/sub.c:67 #, c-format msgid "Can't change root directory to \"%s\"\n" -msgstr "Impossible de changer le r矇pertoire racine en \"%s\"\n" +msgstr "Impossible de changer le r矇pertoire racine en 竄%s罈\n" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "矇chec de malloc(%d)\n" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" -msgstr "Impossible d'allouer l'espace pour l'information sur la conf.\n" +msgstr "" +"Impossible d'allouer l'espace pour l'information sur la configuration.\n" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "" -"erreur de configuration - 矇l矇ment '%s' inconnu (avertissez " +"erreur de configuration - 矇l矇ment 竄%s罈 inconnu (pr矇venez " "l'administrateur)\n" -#: lib/pwauth.c:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "Mot de passe: " -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "Mot de passe de %s: " -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "" - -#: src/chage.c:118 +#: src/chage.c:112 #, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" " [-I inactive] [-E expire] [-d last_day] user\n" msgstr "" -"Usage: chage [-l] [-m min_jourss] [-M max_jours] [-W avertissement]\n" +"Usage: chage [-l] [-m min_jours] [-M max_jours] [-W avertissement]\n" " [-I inactif] [-E expire] [-d dernier_jour] utilisateur\n" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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 tapez Entr矇e pour le d矇faut\n" +msgstr "" +"Entrez la nouvelle valeur ou 竄Entr矇e罈 pour conserver la valeur propos矇e\n" + +#: src/chage.c:149 +msgid "Minimum Password Age" +msgstr "Dur矇e minimale de validit矇 du mot de passe" #: src/chage.c:155 -msgid "Minimum Password Age" -msgstr "Age minimum du mot de passe" - -#: src/chage.c:161 msgid "Maximum Password Age" -msgstr "Age maximum du mot de passe" +msgstr "Dur矇e maximale de validit矇 du mot de passe" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" -msgstr "Dernier changement de mot de passe (YYYY-MM-DD)" +msgstr "Dernier changement de mot de passe (AAAA-MM-JJ)" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" -msgstr "Avertissement d'expiration de mot de passe" +msgstr "Avertissement de fin de validit矇 du mot de passe" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "Mot de passe d矇sactiv矇" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" -msgstr "Date d'expiration du compte (YYYY-MM-DD)" +msgstr "Date de fin de validit矇 du compte (AAAA-MM-JJ)" -#: src/chage.c:238 -#, fuzzy, c-format +#: src/chage.c:231 +#, c-format msgid "Last password change\t\t\t\t\t: " -msgstr "Dernier changement de mot de passe (YYYY-MM-DD)" +msgstr "Dernier changement de mot de passe\t\t\t\t\t: " -#: src/chage.c:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 -#, fuzzy, c-format +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 +#, c-format msgid "never\n" -msgstr "Jamais\n" +msgstr "jamais\n" -#: src/chage.c:251 -#, fuzzy, c-format +#: src/chage.c:244 +#, c-format msgid "Password expires\t\t\t\t\t: " -msgstr "Expiration du mot de passe :\t" +msgstr "Fin de validit矇 du mot de passe\t\t\t\t\t: " -#: src/chage.c:267 -#, fuzzy, c-format +#: src/chage.c:260 +#, c-format msgid "Password inactive\t\t\t\t\t: " -msgstr "Mot de passe d矇sactiv矇:\t" +msgstr "Mot de passe d矇sactiv矇\t\t\t\t\t: " -#: src/chage.c:281 -#, fuzzy, c-format +#: src/chage.c:274 +#, c-format msgid "Account expires\t\t\t\t\t\t: " -msgstr "Expiration du mot de passe:\t" +msgstr "Fin de validit矇 du compte\t\t\t\t\t: " -#: src/chage.c:297 +#: src/chage.c:290 #, 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:298 +#: src/chage.c:292 #, 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:299 +#: src/chage.c:294 #, 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:444 +#: src/chage.c:431 #, c-format msgid "%s: do not include \"l\" with other flags\n" -msgstr "%s: ne pas include \"l\" avec les autres drapeaux\n" +msgstr "%s: ne pas m矇langer 竄l罈 avec les autres indicateurs\n" -#: src/chage.c:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 -#, fuzzy, c-format +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 +#, c-format msgid "%s: permission denied.\n" -msgstr "%s: permission refus矇e\n" +msgstr "%s: permission refus矇e.\n" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 -#, fuzzy, c-format +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 +#, c-format msgid "%s: PAM authentication failed\n" -msgstr "%s: erreur lors de l'ajout de la m矇thode d'authentification\n" +msgstr "%s: 矇chec de la m矇thode d'authentification PAM\n" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, c-format msgid "%s: can't open password file\n" -msgstr "%s: impossible d'ouvrir le fichier de mots de passe\n" +msgstr "%s: impossible d'ouvrir le fichier des mots de passe\n" -#: src/chage.c:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "%s: utilisateur %s inconnu\n" -#: src/chage.c:535 +#: src/chage.c:519 #, c-format msgid "%s: can't lock shadow password file" -msgstr "%s: impossible de v矇rouiller le fichier shadow password" +msgstr "%s: impossible de verrouiller le fichier des mots de passe cach矇s" -#: src/chage.c:543 +#: src/chage.c:527 #, c-format msgid "%s: can't open shadow password file" -msgstr "%s: impossible d'ouvrir le fichier shadow password" +msgstr "%s: impossible d'ouvrir le fichier des mots de passe cach矇s" -#: src/chage.c:604 +#: src/chage.c:587 #, c-format msgid "Changing the aging information for %s\n" -msgstr "Changement des informations sur l'age pour %s\n" +msgstr "Changement des informations sur la limite de validit矇 pour %s\n" -#: src/chage.c:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" -msgstr "%s: erreur lors du changement des champs\n" +msgstr "%s: erreur lors de la modification des champs\n" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, c-format msgid "%s: can't update password file\n" -msgstr "%s: impossible de mettre jour le fichier passwd\n" +msgstr "%s: impossible de mettre jour le fichier des mots de passe\n" -#: src/chage.c:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" -msgstr "%s: impossible de mettre jour le fichier shadow password\n" +msgstr "%s: impossible de mettre jour le fichier des mots de passe cach矇s\n" -#: src/chage.c:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "Erreur durant la mise jour de l'entr矇e du mot de passe DBM.\n" - -#: src/chage.c:692 +#: src/chage.c:649 #, c-format msgid "%s: can't rewrite shadow password file\n" -msgstr "%s: impossible de re-矇crire le fichier shadow password\n" +msgstr "%s: impossible de r矇矇crire le fichier des mots de passe cach矇s\n" -#: src/chage.c:740 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite password file\n" -msgstr "%s: impossible de re-矇crire le fichier password\n" +msgstr "%s: impossible de r矇矇crire le fichier des mots de passe\n" -#: src/chage.c:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 -#, fuzzy, c-format +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 +#, c-format msgid "%s: PAM chauthtok failed\n" -msgstr "%s: impossible de d矇v矇rouiller le fichier\n" +msgstr "%s: erreur de PAM chauthtok\n" #: src/chfn.c:84 #, c-format @@ -360,126 +348,133 @@ msgid "" "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n" "\t[-h home_ph] [-o other] [user]\n" msgstr "" -"Usage: %s [-f nom_complet] [-r no_bureau] [-w tel_bureau]\n" +"Usage: %s [-f nom_complet] [-r num_bureau] [-w tel_bureau]\n" "\t[-h tel_perso] [-o autre] [utilisateur]\n" #: src/chfn.c:89 #, c-format msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" -msgstr "Usage: %s [-f nom_complet] [-w no_bureau] [-h tel_bureau]\n" +msgstr "" +"Usage: %s [-f nom_complet] [-r num_bureau] [-w tel_bureau] [-h tel_maison]\n" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "Nom complet" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "\tNom complet: %s\n" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "No de bureau" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" -msgstr "T矇l矇phone travail" +msgstr "T矇l矇phone professionnel" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" -msgstr "T矇l矇phone perso" +msgstr "T矇l矇phone personnel" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "Autre" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s: Impossible de d矇terminer votre nom d'utilisateur.\n" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" -msgstr "%s: impossible de changer l'utilisateur `%' sur le client NIS.\n" +msgstr "%s: impossible de changer l'utilisateur 竄%s罈 sur le client NIS.\n" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" -msgstr "%s: `%s' est le ma簾tre NIS pour ce client.\n" +msgstr "%s: 竄%s罈 est le ma簾tre NIS pour ce client.\n" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, c-format +msgid "%s: Permission denied.\n" +msgstr "%s: permission refus矇e.\n" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" -msgstr "Changement de l'information utilisateur pour %s\n" +msgstr "Modification des informations relatives l'utilisateur %s\n" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" -msgstr "%s: nom non valide: \"%s\"\n" +msgstr "%s: nom incorrect: 竄%s罈\n" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" -msgstr "%s: no de bureau non valide: \"%s\"\n" +msgstr "%s: num矇ro de bureau non valable: 竄%s罈\n" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" -msgstr "%s: t矇l矇phone du bureau non valide: \"%s\"\n" +msgstr "%s: t矇l矇phone professionnel non valable: 竄%s罈\n" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" -msgstr "%s: t矇l矇phone perso non valide: \"%s\"\n" +msgstr "%s: t矇l矇phone personnel non valable: 竄%s罈\n" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" -msgstr "%s: \"%s\" contient des caract癡res non valide\n" +msgstr "%s: 竄%s罈 contient des caract癡res incorrects\n" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "%s: champs trop longs\n" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" -msgstr "Impossible de changer l'ID en root.\n" +msgstr "Impossible de changer l'identifiant root.\n" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" msgstr "" -"Impossible de v矇rouiller le fichier de mots de passe; essayez plus tard.\n" +"Impossible de verrouiller le fichier des mots de passe; r矇essayez plus " +"tard.\n" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" -msgstr "Impossible d'ouvrir le fichier de mots de passe.\n" +msgstr "Impossible d'ouvrir le fichier des mots de passe.\n" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s: %s non trouv矇 dans /etc/passwd\n" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" -msgstr "Erreur durant la mise jour du mot de passe.\n" +msgstr "Erreur lors de la mise jour du mot de passe.\n" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" -msgstr "Impossible de valider le changement de mot de passe.\n" +msgstr "Impossible de valider le changement du mot de passe.\n" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" -msgstr "Impossible de d矇v矇rouiller le fichier de mots de passe.\n" +msgstr "Impossible de d矇verrouiller le fichier des mots de passe.\n" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -490,98 +485,106 @@ msgid "" " -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n" "\t\t\tpasswords are not encrypted\n" msgstr "" +"Usage: chpasswd [options]\n" +"\n" +"Options:\n" +" -e, --encrypted\tles mots de passe fournis sont chiffr矇s\n" +" -h, --help\t\tafficher ce message d'aide et quitter\n" +" -m, --md5\t\tUtiliser le chiffrage MD5 la place de DES lorsque\n" +"\t\t\tles mots de passe fournis ne sont pas chiffr矇s\n" #: src/chpasswd.c:189 #, c-format msgid "%s: can't lock password file\n" -msgstr "%s: impossible de v矇rouiller de fichier de mots de passe\n" +msgstr "%s: impossible de verrouiller le fichier des mots de passe\n" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" -msgstr "%s: impossible de v矇rouiller le fichier shadow\n" +msgstr "%s: impossible de verrouiller le fichier des mots de passe cach矇s\n" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" -msgstr "%s: impossible d'ouvrir le fichier shadow\n" +msgstr "%s: impossible d'ouvrir le fichier des mots de passe cach矇s\n" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "%s: ligne %d: ligne trop longue\n" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "%s: ligne %d: nouveau mot de passe manquant\n" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "%s: ligne %d: utilisateur %s inconnu\n" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "%s: ligne %d: impossible de mettre le mot de passe jour\n" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" -msgstr "%s: erreur d矇tect矇e; changements ignor矇s\n" +msgstr "%s: erreur d矇tect矇e; changements ignor矇s\n" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" -msgstr "%s: erreur lors de la mise jour du fichier shadow\n" +msgstr "" +"%s: erreur lors de la mise jour du fichier des mots de passe cach矇s\n" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" -msgstr "%s: erreur lors de la mise jour du fichier de mots de passe\n" +msgstr "%s: erreur lors de la mise jour du fichier des mots de passe\n" #: src/chsh.c:76 #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "Usage: %s [-s shell] [nom]\n" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" -msgstr "Shell de login" +msgstr "Interpr矇teur interactif" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" -msgstr "Vous ne pouvez pas changer le shell de %s.\n" +msgstr "Vous ne pouvez pas changer l'interpr矇teur de commandes de %s.\n" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" -msgstr "Changement du shell de login pour %s\n" +msgstr "Changement d'interpr矇teur de commandes initial pour %s\n" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" -msgstr "%s: Entr矇e non valide: %s\n" +msgstr "%s: Entr矇e non valable: %s\n" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" -msgstr "%s n'est pas un shell valide.\n" +msgstr "%s n'est pas un interpr矇teur de commandes valable.\n" #: src/expiry.c:59 #, c-format msgid "Usage: expiry {-f|-c}\n" msgstr "Usage: expiry {-f|-c}\n" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" -msgstr "%s: AVERTISSEMENT! Devrait 礙tre set-UID root!\n" +msgstr "%s: ATTENTION, doit s'ex矇cuter avec les droits du superutilisateur.\n" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "%s: utilisateur inconnu\n" @@ -595,320 +598,303 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" msgstr "" +"Usage: faillog [options]\n" +"\n" +"Options:\n" +" -a, --all afficher les enregistrements 竄faillog罈 pour tous\n" +" les utilisateurs\n" +" -h, --help afficher ce message d'aide et quitter\n" +" -l, --lock-time SEC apr癡s une connexion refus矇e, verrouiller le compte\n" +" pendant SEC secondes\n" +" -m, --maximum MAX positionner les compteurs de connexions refus矇es \n" +" MAX\n" +" -r, --reset remettre z矇ro les compteurs de connexions refus矇es\n" +" -t, --time JOURS afficher les 矇checs de connexions datant de moins de\n" +" JOURS\n" +" -u, --user LOGIN afficher l'enregistrement 竄faillog罈 ou g矇rer les\n" +" compteurs et les limites (si utilis矇 conjointement " +"aux\n" +" options -r, -m ou -l) d'矇checs uniquement pour\n" +" l'utilisateur dont le compte est LOGIN\n" -#: src/faillog.c:86 +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" -msgstr "Utilisateur checs Maximum Dernier\n" +msgid "Login Failures Maximum Latest On\n" +msgstr "Identifiant checs Maximum Dernier Sur\n" -#: src/faillog.c:103 -#, c-format -msgid " %s on %s" -msgstr " %s sur %s" - -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" -msgstr " [%lds restant]" +msgstr " [%lds restants]" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr " [%lds verrou]" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "Utilisateur %s inconnu\n" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "Usage: %s [-r|-R] groupe\n" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr " %s [-a utilisateur] groupe\n" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr " %s [-d utilisateur] groupe\n" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr " %s [-A utilisateur,...] [-M utilisateur,...] groupe\n" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr " %s [-M utilisateur,...] groupe\n" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" -msgstr "%s: mots de passe shadow n矇cessaires pour -A\n" +msgstr "%s: mots de passe de groupe cach矇s n矇cessaires pour -A\n" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" -msgstr "Qui 礙tes vous?\n" +msgstr "Qui 礙tes-vous?\n" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr "groupe inconnu: %s\n" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "Ajout de l'utilisateur %s au groupe %s\n" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "Retrait de l'utilisateur %s du groupe %s\n" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" msgstr "%s: membre %s inconnu\n" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" -msgstr "%s: N'est pas un tty\n" +msgstr "%s: n'est pas un tty\n" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" -msgstr "Changement du mot de passe pour le group %s\n" +msgstr "Changement du mot de passe pour le groupe %s\n" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "Nouveau mot de passe: " -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " -msgstr "Nouveau mot de passe ( nouveau): " +msgstr "Nouveau mot de passe (pour v矇rification): " -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" -msgstr "Ils ne sont pas identiques; essayez nouveau" +msgstr "Les mots de passe ne correspondent pas. Essayez nouveau" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" -msgstr "%s: Essayez nouveau plus tard\n" +msgstr "%s: r矇essayez plus tard\n" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "%s: impossible d'obtenir le verrou\n" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" -msgstr "%s: impossible d'obtenir le verrou sur shadow\n" +msgstr "%s: impossible d'obtenir le verrou sur les mots de passe cach矇s\n" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "%s: impossible d'ouvrir le fichier\n" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "%s: impossible de mettre jour l'entr矇e\n" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" -msgstr "%s: impossible de mettre jour l'entr矇e shadow\n" +msgstr "%s: impossible de mettre jour l'entr矇e du mot de passe cach矇\n" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" -msgstr "%s: impossible de re-矇crire le fichier\n" +msgstr "%s: impossible de r矇矇crire le fichier\n" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" -msgstr "%s: impossible de re-矇crire le fichier shadow\n" +msgstr "%s: impossible de r矇矇crire le fichier des mots de passe cach矇s\n" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" -msgstr "%s: impossible de d矇v矇rouiller le fichier\n" +msgstr "%s: impossible de d矇verrouiller le fichier\n" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "%s: impossible de mettre jours les fichiers DBM\n" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "%s: impossible de mettre jours les fichiers DBM shadow\n" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "Usage: groupadd [-g gid [-o]] [-f] groupe\n" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, c-format msgid "%s: error adding new group entry\n" -msgstr "%s: erreur durant l'addition du nouveau groupe\n" +msgstr "%s: erreur lors de l'ajout du nouveau groupe\n" -#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: impossible d'ajouter une nouvelle entr矇e pour le groupe dbm\n" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "%s: le nom %s n'est pas unique\n" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" -msgstr "%s: l'uid %u n'est pas unique\n" +msgstr "%s: le gid %u n'est pas unique\n" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "%s: impossible d'obtenir un gid unique\n" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, c-format 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:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" -msgstr "%s: groupe %s non valide\n" +msgstr "%s: groupe %s non valable\n" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "%s: -O requiert NAME=VALEUR\n" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" -msgstr "%s: impossible de re-矇crire le fichier group\n" +msgstr "%s: impossible de r矇矇crire le fichier group\n" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" -msgstr "%s: impossible de re-矇crire le fichier shadow group\n" +msgstr "%s: impossible de r矇矇crire le fichier des groupes cach矇s\n" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" -msgstr "%s: impossible de v矇rouiller le fichier group\n" +msgstr "%s: impossible de verrouiller le fichier des groupes\n" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" -msgstr "%s: impossible d'ouvrir le fichier group\n" +msgstr "%s: impossible d'ouvrir le fichier des groupes\n" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" -msgstr "%s: impossible de v矇rouiller le fichier group\n" +msgstr "%s: impossible de verrouiller le fichier des groupes\n" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" -msgstr "%s: impossible d'ouvrir le fichier shadow group\n" +msgstr "%s: impossible d'ouvrir le fichier des groupes cach矇s\n" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "%s: le groupe %s existe\n" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, c-format msgid "Usage: groupdel group\n" msgstr "Usage: groupdel groupe\n" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" -msgstr "%s: erreur lors de retrait de l'entr矇e du groupe\n" +msgstr "%s: erreur lors de la suppression de l'entr矇e du groupe\n" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "%s: erreur lors du retrait de l'entr矇e dbm du groupe\n" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" -msgstr "%s: erreur lors du retrait de l'entr矇e shadow du groupe\n" +msgstr "%s: erreur lors de la suppression de l'entr矇e cach矇e du groupe\n" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "%s: erreur lors du retrait de l'entr矇e dbm shadow du groupe\n" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" -msgstr "%s: impossible d'enlever l'utilisateur de son groupe primaire.\n" +msgstr "%s: impossible d'enlever le groupe primaire de l'utilisateur.\n" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "%s: le groupe %s n'existe pas\n" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "%s: le groupe %s est un groupe NIS\n" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s: %s est le ma簾tre NIS\n" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "Usage: groupmod [-g gid [-o]] [-n nom] groupe\n" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "%s: %s non trouv矇 dans /etc/group\n" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s: impossible d'ajouter une nouvelle entr矇e dbm shadow group\n" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s: %u n'est pas un gid unique\n" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "%s: %s n'est pas un nom unique\n" @@ -918,159 +904,154 @@ msgstr "%s: %s n'est pas un nom unique\n" msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "Usage: %s [-r] [-s] [groupe [gshadow]]\n" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "Usage: %s [-r] [-s] [groupe]\n" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "Non" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" -msgstr "" +msgstr "%s: -s et -r sont incompatibles\n" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" -msgstr "%s: impossible de v矇rouiller le fichier %s\n" +msgstr "%s: impossible de verrouiller le fichier %s\n" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "%s: impossible d'ouvrir le fichier %s\n" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" -msgstr "entr矇e dans le fichier group non valide\n" +msgstr "entr矇e non valable dans le fichier de groupe\n" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " -msgstr "effacer la ligne `%s'? " +msgstr "effacer la ligne 竄%s罈? " -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" msgstr "entr矇e de groupe dupliqu矇e\n" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" -msgstr "nom de groupe `%s' non valide\n" +msgstr "nom de groupe 竄%s罈 non valable\n" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "groupe %s: pas d'utilisateur %s\n" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " -msgstr "effacer le membre `%s'? " +msgstr "effacer le membre 竄%s罈? " -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" -msgstr "entr矇e non valide dans le fichier shadow group\n" +msgstr "entr矇e non valable dans le fichier des groupes cach矇s\n" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" -msgstr "entr矇e dupliqu矇e dans le fichier shadow group\n" +msgstr "entr矇e dupliqu矇e dans le fichier des groupes cach矇s\n" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" -msgstr "aucune entr矇e dans le fichier group correspondante\n" +msgstr "aucune entr矇e correspondante dans le fichier des groupes\n" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" -msgstr "groupe shadow %s: aucun administrateur %s\n" +msgstr "groupe cach矇 %s: aucun administrateur %s\n" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " -msgstr "effacer le membre administrateur `%s' ?" +msgstr "effacer le membre administrateur 竄%s罈? " -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" -msgstr "groupe shadow %s: aucun utilisateur %s\n" +msgstr "groupe cach矇 %s: aucun utilisateur %s\n" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "%s: impossible de mettre jour le fichier %s\n" -#: src/grpck.c:647 src/pwck.c:612 +#: src/grpck.c:640 src/pwck.c:606 #, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: les fichiers ont 矇t矇 mis jour; ex矇cutez mkpasswd\n" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, fuzzy, c-format -msgid "%s: no changes\n" -msgstr "%s: erreur lors du changement des champs\n" - -#: src/grpck.c:651 src/pwck.c:616 -#, fuzzy, c-format msgid "%s: the files have been updated\n" -msgstr "%s: les fichiers ont 矇t矇 mis jour; ex矇cutez mkpasswd\n" +msgstr "%s: les fichiers ont 矇t矇 mis jour\n" + +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "%s: aucun changement\n" #: src/grpconv.c:60 src/grpunconv.c:56 -#, fuzzy, c-format +#, c-format msgid "%s: can't lock group file\n" -msgstr "%s: impossible de d矇v矇rouiller le fichier\n" +msgstr "%s: impossible de verrouiller le fichier de groupe\n" #: src/grpconv.c:65 src/grpunconv.c:61 -#, fuzzy, c-format +#, c-format msgid "%s: can't open group file\n" -msgstr "%s: impossible d'ouvrir le fichier group\n" +msgstr "%s: impossible d'ouvrir le fichier de groupe\n" #: src/grpconv.c:70 src/grpunconv.c:66 -#, fuzzy, c-format +#, c-format msgid "%s: can't lock shadow group file\n" -msgstr "%s: impossible de v矇rouiller le fichier shadow\n" +msgstr "%s: impossible de verrouiller le fichier cach矇 de groupe\n" -#: src/grpconv.c:76 src/grpunconv.c:72 -#, fuzzy, c-format +#: src/grpconv.c:75 src/grpunconv.c:71 +#, c-format msgid "%s: can't open shadow group file\n" -msgstr "%s: impossible d'ouvrir le fichier shadow group\n" +msgstr "%s: impossible d'ouvrir le fichier cach矇 de groupe\n" -#: src/grpconv.c:94 -#, fuzzy, c-format +#: src/grpconv.c:92 +#, c-format msgid "%s: can't remove shadow group %s\n" -msgstr "%s: impossible d'enlever l'entr矇e shadow pour %s\n" +msgstr "%s: impossible de supprimer le groupe cach矇 %s\n" -#: src/grpconv.c:133 src/pwconv.c:154 -#, fuzzy, c-format +#: src/grpconv.c:130 src/pwconv.c:153 +#, c-format msgid "%s: can't update shadow entry for %s\n" -msgstr "%s: impossible de mettre jour l'entr矇e shadow\n" +msgstr "%s: impossible de mettre jour l'entr矇e cach矇e pour %s\n" -#: src/grpconv.c:143 src/grpunconv.c:91 -#, fuzzy, c-format +#: src/grpconv.c:140 src/grpunconv.c:88 +#, c-format msgid "%s: can't update entry for group %s\n" -msgstr "%s: impossible de mettre jour l'entr矇e %s\n" +msgstr "%s: impossible de mettre jour l'entr矇e pour le groupe %s\n" -#: src/grpconv.c:150 src/grpunconv.c:99 -#, fuzzy, c-format +#: src/grpconv.c:147 src/grpunconv.c:96 +#, c-format msgid "%s: can't update shadow group file\n" -msgstr "%s: impossible de mettre jour le fichier shadow\n" +msgstr "%s: impossible de mettre jour le fichier cach矇 de groupe\n" -#: src/grpconv.c:155 src/grpunconv.c:105 -#, fuzzy, c-format +#: src/grpconv.c:152 src/grpunconv.c:102 +#, c-format msgid "%s: can't update group file\n" -msgstr "%s: impossible de mettre jour le fichier passwd\n" +msgstr "%s: impossible de mettre jour le fichier de groupe\n" -#: src/grpunconv.c:110 -#, fuzzy, c-format +#: src/grpunconv.c:107 +#, c-format msgid "%s: can't delete shadow group file\n" -msgstr "%s: impossible de re-矇crire le fichier shadow group\n" +msgstr "%s: impossible de supprimer le fichier cach矇 de groupe\n" #: src/id.c:53 #, c-format @@ -1087,52 +1068,60 @@ msgstr "Usage: id\n" msgid " groups=" msgstr " groupes=" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" +"Usage: lastlog [options]\n" +"\n" +"Options:\n" +" -u, --login LOGIN afficher l'enregistrement 竄lastlog罈 " +"pour l'utilisateur dont le compte est LOGIN\n" +" -h, --help afficher ce message d'aide et quitter\n" +" -t, --time JOURS afficher uniquement les enregistrements " +"de 竄lastlog罈 plus r矇cents que JOURS\n" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" msgstr "Utilisateur Port Venant de Derni癡re\n" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "Utilisateur Port Derni癡re\n" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "**Jamais connect矇**" -#: src/login.c:175 +#: src/login.c:156 #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Usage: %s [-p] [nom]\n" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr " %s [-p] [-h h繫te] [-f nom]\n" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr " %s [-p] -r h繫te\n" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" -msgstr "Heure de connexion non valide\n" +msgstr "Heure de connexion non valable\n" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" @@ -1141,16 +1130,16 @@ msgstr "" "\n" "Syst癡me ferm矇 pour maintenance\n" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" "[Disconnect bypassed -- root login allowed.]\n" msgstr "" "\n" -"[Disconnexion court-circuit矇e -- login root authoris矇.]\n" +"[D矇connexion court-circuit矇e -- acc癡s superutilisateur autoris矇].\n" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" @@ -1159,17 +1148,17 @@ msgstr "" "\n" "Tentative de connexion: d矇lai de %d secondes d矇pass矇.\n" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" -msgstr " sur `%.100s' partir de `%.200s'" +msgstr " sur 竄%.100s罈 partir de 竄%.200s罈" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" -msgstr " sur `%.100s'" +msgstr " sur 竄%.100s罈" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" @@ -1178,42 +1167,34 @@ msgstr "" "\n" "%s login: " -#: src/login.c:819 -msgid "login: " -msgstr "login: " - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" -msgstr "Login incorrect" +msgstr "Identifiant incorrect" -#: src/login.c:1198 +#: src/login.c:996 msgid "Warning: login re-enabled after temporary lockout.\n" -msgstr "Avertissement: login r矇activ矇 apr癡s une d矇sactivation temporaire.\n" +msgstr "Attention: identifiant r矇activ矇 apr癡s une d矇sactivation temporaire.\n" -#: src/login.c:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "Derni癡re connexion: le %s sur %s" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" msgstr "Derni癡re connexion: le %.19s sur %s" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" msgstr " partir de %.*s" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "D矇marrage de rad_login\n" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" -msgstr "%s: pas de base de donn矇es DBM sur le syst癡me - aucune action prise\n" +msgstr "" +"%s: pas de base de donn矇es DBM sur le syst癡me - aucune action effectu矇e\n" #: src/mkpasswd.c:231 src/mkpasswd.c:236 #, c-format @@ -1228,39 +1209,39 @@ msgstr "%s: impossible d'ouvrir les fichiers DBM pour %s\n" #: src/mkpasswd.c:286 #, c-format msgid "%s: the line beginning with %.16s... is too long\n" -msgstr "" +msgstr "%s: la ligne commen癟ant par %.16s... est trop longue\n" #: src/mkpasswd.c:313 #, c-format msgid "%s: error parsing line \"%s\"\n" -msgstr "%s: erreur lors l'analyse de la ligne \"%s\"\n" +msgstr "%s: erreur lors l'analyse de la ligne 竄%s罈\n" #: src/mkpasswd.c:321 src/mkpasswd.c:326 src/mkpasswd.c:331 src/mkpasswd.c:336 -#, fuzzy, c-format +#, c-format msgid "adding record for name %s\n" -msgstr "%s: erreur lors de l'ajout de la nouvelle entr矇e\n" +msgstr "ajout d'un enregistrement pour le nom %s\n" #: src/mkpasswd.c:342 src/mkpasswd.c:348 src/mkpasswd.c:353 src/mkpasswd.c:358 -#, fuzzy, c-format +#, c-format msgid "%s: error adding record for %s\n" -msgstr "%s: erreur lors de l'ajout de la nouvelle entr矇e\n" +msgstr "%s: erreur lors de l'ajout de l'enregistrement %s\n" #: src/mkpasswd.c:376 #, c-format msgid "added %d entries, longest was %d\n" msgstr "%d entr矇es ajout矇es, la plus longue fut %d\n" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" -msgstr "Usage: %s [-vf] [-p|g|sp|sg] fichier\n" +msgstr "Usage: %s [-vf ] [-p|g|sp|sg] fichier\n" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "Usage: %s [-vf] [-p|g|sp] fichier\n" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "Usage: %s [-vf] [-p|g] fichier\n" @@ -1278,18 +1259,18 @@ msgstr "Usage: sg groupe [[-c] commande]\n" #: src/newgrp.c:131 #, c-format msgid "unknown uid: %u\n" -msgstr "uid inconnue: %u\n" +msgstr "uid inconnu: %u\n" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" msgstr "gid inconnu: %lu\n" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" -msgstr "D矇sol矇.\n" +msgstr " \n" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "trop de groupes\n" @@ -1299,165 +1280,167 @@ msgstr "trop de groupes\n" msgid "Usage: %s [input]\n" msgstr "Usage: %s [entr矇e]\n" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" -msgstr "%s: impossible de v矇rouiller /etc/passwd.\n" +msgstr "%s: impossible de verrouiller /etc/passwd.\n" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" -msgstr "%s: impossible de v矇rouiller les fichiers, essayez plus tard\n" +msgstr "%s: impossible de verrouiller les fichiers, r矇essayez plus tard\n" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "%s: impossible d'ouvrir les fichiers\n" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" -msgstr "%s: ligne %d: ligne non valide\n" +msgstr "%s: ligne %d: ligne non valable\n" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "%s: ligne %d: impossible de cr矇er le GID\n" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" -msgstr "%s: ligne %d: impossible de cr矇er le GID\n" +msgstr "%s: ligne %d: impossible de cr矇er l'UID\n" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "%s: ligne %d: impossible de trouver l'utilisateur %s\n" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "%s: ligne %d: impossible de mettre le mot de passe jour\n" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "%s: ligne %d: 矇chec de mkdir\n" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "%s: ligne %d: 矇chec de chown\n" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "%s: ligne %d: impossible de mettre l'entr矇e jour\n" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "%s: erreur lors de la mise jour des fichiers\n" -#: src/passwd.c:155 +#: src/passwd.c:154 #, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "Usage: %s [-f|-s] [nom]\n" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr " %s [-x max] [-n min] [-w avert] [-i inact] nom\n" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} nom\n" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "Ancien mot de passe: " -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" -msgstr "Mot de passe incorrect pour `%s'\n" +msgstr "Mot de passe incorrect pour 竄%s罈\n" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" "Please use a combination of upper and lower case letters and numbers.\n" msgstr "" "Entrez le nouveau mot de passe (minimum de %d, maximum de %d\n" -"caract癡res). Utilisez une combinaison de lettres en majuscule/minuscule\n" -"et de nombres.\n" +"caract癡res). Utilisez une combinaison de lettres majuscules, minuscules\n" +"et de chiffres.\n" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "Nouveau mot de passe: " -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" -msgstr "Essaye encore...\n" +msgstr "R矇essayez...\n" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" "Warning: weak password (enter it again to use it anyway).\n" msgstr "" "\n" -"Avertissement: mot de passe simpliste (tapez le nouveau pour l'utiliser\n" +"Attention: mot de passe trop simple (entrez-le nouveau pour l'utiliser\n" "quand m礙me).\n" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" -msgstr "Ils ne sont pas identique; essaye encore...\n" +msgstr "Mots de passe diff矇rents, recommencez...\n" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "Le mot de passe pour %s ne peut 礙tre chang矇.\n" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" -msgstr "D矇sol矇, le mot de passe pour %s ne peux pas encore 礙tre chang矇.\n" +msgstr "Le mot de passe pour %s ne peut pas encore 礙tre chang矇.\n" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "%s: plus de m矇moire\n" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "%s: Impossible d'ex矇cuter %s" -#: src/passwd.c:815 -#, fuzzy, c-format -msgid "%s: repository %s not supported\n" -msgstr "utilisateur %s: le r矇pertoire %s n'existe pas\n" - -#: src/passwd.c:914 +#: src/passwd.c:786 #, c-format -msgid "You may not change the password for %s.\n" -msgstr "Vous ne pouvez pas changer le mot de passe de %s.\n" +msgid "%s: repository %s not supported\n" +msgstr "%s: le d矇p繫t %s n'est pas g矇r矇\n" -#: src/passwd.c:962 +#: src/passwd.c:884 +#, c-format +msgid "%s: You may not view or modify password information for %s.\n" +msgstr "" +"%s: Vous ne pouvez pas afficher ou modifier les informations de mot de passe " +"de %s.\n" + +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "Changement du mot de passe de %s\n" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "Le mot de passe pour %s est inchang矇.\n" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "Mot de passe chang矇.\n" @@ -1472,123 +1455,122 @@ msgstr "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "Usage: %s [-q] [-r] [-s] [passwd]\n" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" -msgstr "entr矇e non valide dans le fichier password\n" +msgstr "entr矇e non valable dans le fichier des mots de passe\n" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" -msgstr "entr矇e dupliqu矇e dans password\n" +msgstr "entr矇e dupliqu矇e dans le fichier des mots de passe\n" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" -msgstr "nom d'utilisateur '%s' non valide\n" +msgstr "nom d'utilisateur 竄%s罈 non valable\n" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "utilisateur %s: aucun groupe %u\n" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "utilisateur %s: le r矇pertoire %s n'existe pas\n" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "utilisateur %s: le programme %s n'existe pas\n" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" -msgstr "entr矇e shadow password non valide\n" +msgstr "entr矇e de mot de passe cach矇 non valable\n" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" -msgstr "entr矇e shadow password dupliqu矇e\n" +msgstr "entr矇e de mot de passe cach矇 dupliqu矇e\n" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" -msgstr "aucune entr矇e correspondante dans le fichier password\n" +msgstr "aucune entr矇e correspondante dans le fichier des mots de passe\n" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" -msgstr "" -"utilisateur %s: date du dernier changement de mot de passe dans le futur\n" +msgstr "utilisateur %s: dernier changement du mot de passe dans le futur\n" #: src/pwconv.c:85 src/pwunconv.c:79 #, c-format msgid "%s: can't lock passwd file\n" -msgstr "%s: impossible de v矇rouiller le fichier passwd\n" +msgstr "%s: impossible de verrouiller le fichier des mots de passe\n" #: src/pwconv.c:90 src/pwunconv.c:84 #, c-format msgid "%s: can't open passwd file\n" -msgstr "%s: impossible d'ouvrir le fichier passwd\n" +msgstr "%s: impossible d'ouvrir le fichier des mots de passe\n" #: src/pwconv.c:118 #, c-format msgid "%s: can't remove shadow entry for %s\n" -msgstr "%s: impossible d'enlever l'entr矇e shadow pour %s\n" +msgstr "%s: impossible d'enlever l'entr矇e cach矇e pour %s\n" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "%s: impossible de mettre jour le mot de passe de %s\n" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" -msgstr "%s: impossible de mettre jour le fichier shadow\n" +msgstr "%s: impossible de mettre jour le fichier des mots de passe cach矇s\n" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" -msgstr "%s: impossible de mettre jour le fichier passwd\n" +msgstr "%s: impossible de mettre jour le fichier des mots de passe\n" #: src/pwunconv.c:124 #, c-format msgid "%s: can't update entry for user %s\n" -msgstr "%s: impossible de mettre jour l'entr矇e %s\n" +msgstr "%s: impossible de mettre jour l'entr矇e pour l'utilisateur %s\n" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format msgid "%s: can't delete shadow password file\n" -msgstr "%s: impossible d'effacer le fichier shadow\n" +msgstr "%s: impossible d'effacer le fichier des mots de passe cach矇s\n" -#: src/su.c:133 +#: src/su.c:132 msgid "Sorry." -msgstr "D矇sol矇." +msgstr " " -#: src/su.c:323 +#: src/su.c:320 #, c-format msgid "%s: must be run from a terminal\n" msgstr "%s: doit 礙tre lanc矇 partir d'un terminal\n" -#: src/su.c:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "%s: pam_start: erreur %d\n" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" msgstr "ID inconnue: %s\n" -#: src/su.c:490 src/su.c:507 -#, fuzzy, c-format +#: src/su.c:484 src/su.c:500 +#, c-format msgid "You are not authorized to su %s\n" -msgstr "Vous n'礙tes pas authoris矇s " +msgstr "Vous n'礙tes pas autoris矇 utiliser 竄su罈 %s\n" -#: src/su.c:502 +#: src/su.c:495 msgid "(Enter your own password.)" -msgstr "(Entrez votre propre mot de passe.)" +msgstr "(Entrez votre propre mot de passe)." -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" @@ -1597,480 +1579,433 @@ msgstr "" "%s: %s\n" "(Ignor矇)\n" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" -msgstr "Pas de shell\n" +msgstr "Pas d'interpr矇teur de commandes\n" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr "Acc癡s su partir de ce compte REFUS.\n" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "Authentification par mot de passe court-circuit矇e.\n" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" -msgstr "Entrez VOTRE mot de passe comme identification.\n" +msgstr "Entrez votre PROPRE mot de passe pour vous authentifier.\n" #: src/sulogin.c:118 #, c-format msgid "No password file\n" -msgstr "Pas de fichier de mot de passe\n" +msgstr "Pas de fichier des mots de passe\n" #: src/sulogin.c:160 #, c-format msgid "No password entry for 'root'\n" -msgstr "Pas d'entr矇e pour le mot de passe de 'root'\n" +msgstr "Pas de mot de passe pour 竄root罈\n" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" "(or give root password for system maintenance):" msgstr "" "\n" -"Tapez control-d pour proc矇der au d矇marrage normal,\n" -"(ou donnez le mot de passe de root pour la maintenance): " +"Tapez Ctrl+D pour d矇marrer normalement\n" +"(ou donnez le mot de passe du superutilisateur pour la maintenance du " +"syst癡me): " -#: src/sulogin.c:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" -msgstr "Entr矇e du syst癡me en mode maintenance\n" +msgstr "Entr矇e dans le mode de maintenance du syst癡me\n" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "%s: reconstruction de la base de donn矇es des groupes\n" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "%s: reconstruction de la base de donn矇es des groupes shadow\n" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" -msgstr "%s: argument num矇rique `%s' non valide\n" +msgstr "%s: argument num矇rique 竄%s罈 incorrect\n" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "%s: gid %s inconnu\n" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "%s: groupe %s inconnu\n" -#: src/useradd.c:475 +#: src/useradd.c:418 #, c-format msgid "%s: cannot create new defaults file\n" -msgstr "%s: impossible de cr矇er un nouveau fichier de d矇fauts\n" +msgstr "%s: impossible de cr矇er le nouveau fichier des valeurs par d矇faut\n" -#: src/useradd.c:480 +#: src/useradd.c:423 #, c-format msgid "%s: cannot open new defaults file\n" -msgstr "%s: impossible de cr矇er un nouveau fichier de d矇fauts\n" +msgstr "%s: impossible d'ouvrir le nouveau fichier des valeurs par d矇faut\n" -#: src/useradd.c:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" -msgstr "%s: rename: %s" +msgstr "%s: renomme: %s" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" -msgstr "%s: le groupe `%s' est un groupe NIS.\n" +msgstr "%s: le groupe 竄%s罈 est un groupe NIS.\n" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, 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:721 +#: src/useradd.c:660 #, c-format msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n" -msgstr "Usage: useradd [-u uid [-o]] [-g groupe] [-G groupe,...] \n" +msgstr "Usage: useradd [-u uid [-o]] [-g groupe] [-G groupe,...]\n" -#: src/useradd.c:724 +#: src/useradd.c:663 #, c-format msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr "" " [-d home] [-s shell] [-c commentaire] [-m [-k template]]\n" -#: src/useradd.c:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, c-format msgid " [-f inactive] [-e expire]\n" msgstr " [-f inactif] [-e expire]\n" -#: src/useradd.c:728 +#: src/useradd.c:667 #, c-format msgid " [-p passwd] name\n" msgstr " [-p mot-de-passe] nom\n" -#: src/useradd.c:730 +#: src/useradd.c:669 #, 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:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, c-format msgid "%s: error locking group file\n" -msgstr "%s: erreur lors du v矇rouillage du fichier de groupe\n" +msgstr "%s: erreur lors du verrouillage du fichier de groupe\n" -#: src/useradd.c:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, c-format msgid "%s: error opening group file\n" msgstr "%s: erreur lors d'ouverture du fichier de groupe\n" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, c-format msgid "%s: error locking shadow group file\n" -msgstr "%s: erreur lors du v矇rouillage du fichier shadow group\n" +msgstr "%s: erreur lors du verrouillage du fichier des groupes cach矇s\n" -#: src/useradd.c:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, c-format msgid "%s: error opening shadow group file\n" -msgstr "%s: erreur lors de l'ouverture du fichier shadow group\n" +msgstr "%s: erreur lors de l'ouverture du fichier des groupes cach矇s\n" -#: src/useradd.c:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "%s: l'uid %u n'est pas unique\n" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "%s: impossible d'obtenir un uid unique\n" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" -msgstr "%s: r矇pertoire de base non valide `%s'\n" +msgstr "%s: r矇pertoire de base non valable 竄%s罈\n" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" -msgstr "%s: commentaire `%s' non valide\n" +msgstr "%s: commentaire 竄%s罈 non valable\n" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" -msgstr "%s: r矇pertoire personnel `%s' non valide\n" +msgstr "%s: r矇pertoire personnel 竄%s罈 non valable\n" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" -msgstr "%s: date `%s' non valide\n" +msgstr "%s: date 竄%s罈 non valable\n" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, c-format msgid "%s: shadow passwords required for -e\n" -msgstr "%s: mots de passe shadow n矇cessaires pour -e\n" +msgstr "%s: mots de passe cach矇s n矇cessaires pour -e\n" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, c-format msgid "%s: shadow passwords required for -f\n" -msgstr "%s: mots de passe shadow n矇cessaires pour -f\n" +msgstr "%s: mots de passe cach矇s n矇cessaires pour -f\n" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" -msgstr "%s: champs `%s' non valide\n" +msgstr "%s: champ 竄%s罈 non valable\n" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" -msgstr "%s: shell `%s' non valide\n" +msgstr "%s: interpr矇teur de commandes 竄%s罈 non valable\n" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, c-format msgid "%s: invalid user name '%s'\n" -msgstr "%s: nom d'utilisateur `%s' non valide\n" +msgstr "%s: nom d'utilisateur 竄%s罈 non valable\n" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, c-format msgid "%s: cannot rewrite password file\n" -msgstr "%s: impossible de re矇crire le fichier de mots de passe\n" +msgstr "%s: impossible de r矇矇crire le fichier des mots de passe\n" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, c-format msgid "%s: cannot rewrite shadow password file\n" -msgstr "%s: impossible de re矇crire le fichier shadow\n" +msgstr "%s: impossible de r矇矇crire le fichier des mots de passe cach矇s\n" -#: src/useradd.c:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, c-format msgid "%s: unable to lock password file\n" -msgstr "%s: impossible de v矇rouiller le fichier de mots de passe\n" +msgstr "%s: impossible de verrouiller le fichier des mots de passe\n" -#: src/useradd.c:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, c-format msgid "%s: unable to open password file\n" -msgstr "%s: impossible d'ouvrir le fichier de mots de passe\n" +msgstr "%s: impossible d'ouvrir le fichier des mots de passe\n" -#: src/useradd.c:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, c-format msgid "%s: cannot lock shadow password file\n" -msgstr "%s: impossible de v矇rouiller le fichier de mots de passe\n" +msgstr "%s: impossible de verrouiller le fichier des mots de passe cach矇s\n" -#: src/useradd.c:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, c-format msgid "%s: cannot open shadow password file\n" -msgstr "%s: impossible d'ouvrir le fichier shadow\n" +msgstr "%s: impossible d'ouvrir le fichier des mots de passe cach矇s\n" -#: src/useradd.c:1459 +#: src/useradd.c:1354 #, 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:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "%s: erreur lors de la mise jour de l'entr矇e dbm\n" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, c-format msgid "%s: error adding new shadow password entry\n" -msgstr "%s: erreur lors de l'ajout de la nouvelle entr矇e shadow\n" +msgstr "" +"%s: erreur lors de l'ajout de la nouvelle entr矇e du mot de passe cach矇\n" -#: src/useradd.c:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s: erreur lors de la mise jour de l'entr矇e shadow passwd dbm\n" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" msgstr "%s: impossible de cr矇er le r矇pertoire %s\n" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, 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:1590 -#, fuzzy, c-format +#: src/useradd.c:1446 +#, c-format msgid "Can't create mail spool for user %s.\n" -msgstr "%s: impossible de mettre jour l'entr矇e %s\n" +msgstr "" +"Impossible de cr矇er le r矇pertoire de d矇p繫t de courrier pour l'utilisateur %" +"s.\n" -#: src/useradd.c:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "%s: l'utilisateur %s existe\n" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" msgstr "" +"%s: le groupe %s existe - si vous voulez ajouter cet utilisateur ce " +"groupe, utilisez -g.\n" -#: src/useradd.c:1767 +#: src/useradd.c:1602 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" -msgstr "%s: avertissement: CREATE_HOME non support矇, utilisez -m la place.\n" +msgstr "%s: attention: CREATE_HOME n'est pas support矇, veuillez utiliser -m.\n" -#: src/userdel.c:124 +#: src/userdel.c:108 #, c-format msgid "Usage: %s [-r] name\n" msgstr "Usage: %s [-r] nom\n" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" -msgstr "%s: erreur lors de la mise jour de l'entr矇e group\n" +msgstr "%s: erreur lors de la mise jour de l'entr矇e de groupe\n" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "%s: impossible de mettre jour l'entr矇e dbm group\n" - -#: src/userdel.c:214 -#, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: impossible de mettre jour l'entr矇e dbm group\n" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "%s: impossible d'ouvrir le fichier group\n" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" -msgstr "%s: impossible d'ouvrir le fichier shadow group\n" +msgstr "%s: impossible d'ouvrir le fichier des groupes cach矇s\n" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "%s: erreur lors de la suppression de l'entr矇e dans /etc/passwd\n" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "%s: erreur lors de la suppression de l'entr矇e dans /etc/shadow\n" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "%s: erreur lors de l'effacement de l'entr矇e dbm du mot de passe\n" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s: erreur lors de l'effacement de l'entr矇e shadow passwd dbm\n" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "%s: l'utilisateur %s est connect矇\n" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" -msgstr "%s: %s n'appartient pas %s, non enlev矇\n" +msgstr "%s: %s n'appartient pas %s, non supprim矇\n" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " -msgstr "%s: impossible d'enlever " +msgstr "%s: attention: suppression impossible " -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" msgstr "%s: l'utilisateur %s n'existe pas\n" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s: le compte %s est un compte NIS\n" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "" -"%s: r矇pertoire %s non enlev矇 (cela enl矇verait le r矇pertoire personnel de %" -"s)\n" +"%s: r矇pertoire %s non supprim矇 (cela supprimerait le r矇pertoire personnel de " +"%s)\n" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "%s: erreur lors de l'effacement du r矇pertoire %s\n" -#: src/usermod.c:306 +#: src/usermod.c:289 #, c-format msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" -msgstr "Usage: %s\t[-u uid [-o]] [-g groupe] [-G groupe,...] \n" +msgstr "Usage: %s\t[-u uid [-o]] [-g groupe] [-G groupe,...]\n" -#: src/usermod.c:310 +#: src/usermod.c:293 #, 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:313 +#: src/usermod.c:296 #, c-format msgid "[-f inactive] [-e expire] " msgstr "[-f inactif] [-e expire] " -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p mot-de-passe] [-L|-U] nom\n" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" msgstr "%s: plus de m矇moire pour update_group\n" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "%s: plus de m矇moire pour update_gshadow\n" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" -msgstr "%s: aucun drapeau donn矇\n" +msgstr "%s: aucun indicateur n'a 矇t矇 pr矇cis矇\n" -#: src/usermod.c:965 +#: src/usermod.c:903 #, 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:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "%s: l'uid %lu n'est pas unique\n" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, 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:1122 +#: src/usermod.c:1053 #, c-format msgid "%s: error removing password entry\n" msgstr "%s: erreur lors de l'effacement du mot de passe\n" -#: src/usermod.c:1131 -#, fuzzy, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "%s: erreur lors de la mise jour de l'entr矇e dbm\n" - -#: src/usermod.c:1139 -#, fuzzy, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "%s: erreur lors de l'effacement du mot de passe\n" - -#: src/usermod.c:1158 -#, fuzzy, c-format +#: src/usermod.c:1070 +#, c-format msgid "%s: error removing shadow password entry\n" -msgstr "%s: erreur lors de l'effacement du mot de passe\n" +msgstr "%s: erreur lors de la suppression de l'entr矇e cach矇e du mot de passe\n" -#: src/usermod.c:1175 -#, fuzzy, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s: erreur lors de l'effacement de l'entr矇e shadow passwd dbm\n" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "%s: le r矇pertoire %s existe\n" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "%s: impossible de cr矇er %s\n" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" -msgstr "%s: impossible de changer le propri癡taire de %s\n" +msgstr "%s: impossible de changer le propri矇taire de %s\n" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, 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:1333 +#: src/usermod.c:1223 #, c-format msgid "%s: warning: %s not owned by %s\n" -msgstr "%s: avertissement: %s n'appartient pas %s\n" +msgstr "%s: attention: %s n'appartient pas %s\n" -#: src/usermod.c:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" -msgstr "矇chec du changement de propri癡taire de la mailbox" +msgstr "矇chec du changement de propri矇taire de la bo簾te lettres" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" -msgstr "矇chec du renommage de la mailbox" +msgstr "矇chec du changement de nom de la bo簾te lettres" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" @@ -2079,26 +2014,26 @@ msgstr "" "\n" "%s: %s est inchang矇\n" -#: src/vipw.c:133 +#: src/vipw.c:131 msgid "Couldn't lock file" -msgstr "Impossible de v矇rouiller le fichier" +msgstr "Impossible de verrouiller le fichier" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" -msgstr "Impossible de faire une sauvegarde" +msgstr "Impossible d'effectuer une sauvegarde" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s: impossible de restaurer %s: %s (vos changements sont dans %s)\n" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" "`vipw' edits /etc/passwd `vipw -s' edits /etc/shadow\n" "`vigr' edits /etc/group `vigr -s' edits /etc/gshadow\n" msgstr "" -"Usage :\n" -"`vipw' 矇dite /etc/passwd `vipw -s' 矇dite /etc/shadow\n" -"`vigr' 矇dite /etc/group `vigr -s' 矇dite /etc/gshadow\n" +"Usage:\n" +"竄vipw罈 矇dite /etc/passwd 竄vipw -s罈 矇dite /etc/shadow\n" +"竄vigr罈 矇dite /etc/group 竄vigr -s罈 矇dite /etc/gshadow\n" diff --git a/po/he.gmo b/po/he.gmo index fc824ab1..9a611c66 100644 Binary files a/po/he.gmo and b/po/he.gmo differ diff --git a/po/he.po b/po/he.po index c3cce1ea..7be6a752 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-01-26 07:53+0100\n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" "PO-Revision-Date: 2004-07-21 23:59+0300\n" "Last-Translator: Lior Kaplan \n" "Language-Team: Hebrew \n" @@ -22,7 +22,7 @@ msgstr "" msgid "Warning: unknown group %s\n" msgstr "蚳: 蚹蛈 蚳蛌 %s\n" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" msgstr "蚳: 蛌蚳 蚹蛈蛌\n" @@ -50,17 +50,17 @@ msgstr " 蛈蚳 蚹蚸蚳 蛁 蛁蚳蛌.\n" msgid " Choose a new password.\n" msgstr " 蚳 蛂蛂 蚸.\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "蛌蚹蛅 蛂蛂 蚸 蚺 蛌 %ld .\n" -#: libmisc/age.c:174 +#: libmisc/age.c:172 #, c-format msgid "Your password will expire tomorrow.\n" msgstr "蛌蚹蛅 蛂蛂 蚸 蚺 蚳.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:174 #, c-format msgid "Your password will expire today.\n" msgstr "蛌蚹蛅 蛂蛂 蚸 蚺 .\n" @@ -75,39 +75,27 @@ msgstr " 蚸蛌 tty %s" msgid "Environment overflow\n" msgstr "蛈蚺蛌 蛂\n" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr " 蚳蚸 蚸蛌 蛌 $%s\n" -#: libmisc/failure.c:230 +#: libmisc/failure.c:229 #, fuzzy, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "%d 蚸 蛂 蚳 蛁蚳蛌. 蚳 蛌 %s 蛁 %s.\n" +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "%d 蚸 蛂 蚳 蛁蚳蛌. 蚳 蛌 %s 蛁 %s.\n" +msgstr[1] "%d 蚸 蛂 蚳 蛁蚳蛌. 蚳 蛌 %s 蛁 %s.\n" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" msgstr "蛌蚳 蛂蛌 蛁蚳蛌.\n" -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "" - #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "蚸 蚳 蚸." @@ -120,7 +108,7 @@ msgstr " 蚳." msgid "You have mail." msgstr "蚸 蚳." -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " msgstr "蛂蛂 : %s. " @@ -135,20 +123,20 @@ msgstr "" msgid "passwd: %s\n" msgstr "passwd: %s\n" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" msgstr "" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr " 蛈蛁 cd -\"%s\"\n" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" msgstr " 蛂蚺蚳, 蛂 蛁蚳蛌 蛁 HOME=/" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr " 蚳蚰 %s" @@ -163,35 +151,31 @@ msgstr "蛂蚺蚳蛌 蚸蚳蚸 蚹蛌 \"%s\"\n" msgid "Can't change root directory to \"%s\"\n" msgstr " 蚸蛌 蛂蚺蚳蛌 蚸蚳蚸 -\"%s\"\n" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "malloc(%d) 蚸\n" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" msgstr " 蚹蛈蛌 蚹 蚸 蛁 蛁 蚹蚺蚳蛈.\n" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "蚸蛌 蚳蛌 - 蚳 蛁 '%s' (蛁 )\n" -#: lib/pwauth.c:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "蛂蛂: " -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "蛂蛂 蚸 %s: " -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "" - -#: src/chage.c:118 +#: src/chage.c:112 #, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" @@ -200,154 +184,147 @@ msgstr "" "蚸蚸: chage [-l] [-m ] [-M 蚹蛂 ] [-W 蚳]\n" " [-I 蚺蛁] [-E 蚺 蛌蚹蛅] [-d 蚳] 蚸 蚸蛌蚸\n" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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:155 +#: src/chage.c:149 msgid "Minimum Password Age" msgstr " 蛂蛂 " -#: src/chage.c:161 +#: src/chage.c:155 msgid "Maximum Password Age" msgstr " 蛂蛂 蚹蛂" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" msgstr "蚸 蛂蛂 蚳 (YYYY-MM-DD)" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" msgstr "蚳蛌 蛌蚹蛅 蛂蛂" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "蛂蛂 蚺蛁" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "蛌蚳 蛌蚹蛅 蚸 (YYYY-MM-DD)" -#: src/chage.c:238 +#: src/chage.c:231 #, fuzzy, c-format msgid "Last password change\t\t\t\t\t: " msgstr "蚸 蛂蛂 蚳 (YYYY-MM-DD)" -#: src/chage.c:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 #, fuzzy, c-format msgid "never\n" msgstr "蛅 蚺蛁\n" -#: src/chage.c:251 +#: src/chage.c:244 #, fuzzy, c-format msgid "Password expires\t\t\t\t\t: " msgstr "蛌蚹蛅 蛂蛂:\t" -#: src/chage.c:267 +#: src/chage.c:260 #, fuzzy, c-format msgid "Password inactive\t\t\t\t\t: " msgstr "蛂蚳 蚺蛁蛌 蛂蛂:\t" -#: src/chage.c:281 +#: src/chage.c:274 #, fuzzy, c-format msgid "Account expires\t\t\t\t\t\t: " msgstr "蛌蚹蛅 蚸:\t" -#: src/chage.c:297 +#: src/chage.c:290 #, c-format msgid "Minimum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:298 +#: src/chage.c:292 #, c-format msgid "Maximum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:299 +#: src/chage.c:294 #, c-format msgid "Number of days of warning before password expires\t: %ld\n" msgstr "" -#: src/chage.c:444 +#: src/chage.c:431 #, c-format msgid "%s: do not include \"l\" with other flags\n" msgstr "" -#: src/chage.c:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 #, fuzzy, c-format msgid "%s: permission denied.\n" msgstr "%s: 蚸 蛂蚳\n" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 #, c-format msgid "%s: PAM authentication failed\n" msgstr "%s: PAM 蚸\n" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, c-format msgid "%s: can't open password file\n" msgstr "%s: 蚺蛌 蚹蚰 蛂蛂蛌\n" -#: src/chage.c:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "" -#: src/chage.c:535 +#: src/chage.c:519 #, c-format msgid "%s: can't lock shadow password file" msgstr "%s: 蛁 蚹蚰 蛂蛂蛌 蛈" -#: src/chage.c:543 +#: src/chage.c:527 #, c-format msgid "%s: can't open shadow password file" msgstr "%s: 蚺蛌 蚹蚰 蛂蛂蛌 蛈" -#: src/chage.c:604 +#: src/chage.c:587 #, c-format msgid "Changing the aging information for %s\n" msgstr "蚸 蛁 蚹蛌 蚸 %s\n" -#: src/chage.c:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" msgstr "%s: 蚸 蚸 蚸蛌\n" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, c-format msgid "%s: can't update password file\n" msgstr "%s: 蛁 蚹蚰 蛂蛂蛌\n" -#: src/chage.c:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" msgstr "%s: 蛁 蚹蚰 蛂蛂蛌 蛈\n" -#: src/chage.c:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "" - -#: src/chage.c:692 +#: src/chage.c:649 #, c-format msgid "%s: can't rewrite shadow password file\n" msgstr "%s: 蛌 蚸 蚹蚰 蛂蛂蛌 蛈\n" -#: src/chage.c:740 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite password file\n" msgstr "%s: 蛌 蚸 蚹蚰 蛂蛂蛌\n" -#: src/chage.c:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 #, c-format msgid "%s: PAM chauthtok failed\n" msgstr "" @@ -364,117 +341,122 @@ msgstr "" msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" msgstr "" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "蚸 " -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "\t蚸 : %s\n" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "蛂蚺蚳 蚳" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "蛂蚺蚳 蚺 蛁" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" msgstr "蛂蚺蚳 蚺 蛌" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "蚳" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s: 蚹蛁 蛌 蚸 蚸蛌蚸 蚸.\n" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s: 蚸蛌 蚸蛌蚸 `%s' 蛁 蚹 NIS.\n" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, fuzzy, c-format +msgid "%s: Permission denied.\n" +msgstr "%s: 蚸 蛂蚳\n" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" msgstr "蚸 蛁 蚸 蚸蛌蚸 %s\n" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s: 蚸 蚹: \"%s\"\n" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s: 蛂蚺蚳 蚳 蚹: \"%s\"\n" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s: 蛂蚺蚳 蚺 蛁 蚹: \"%s\"\n" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s: 蛂蚺蚳 蚺 蛌 蚹: \"%s\"\n" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s: \"%s\" 蛌 蚹\n" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "%s: 蚸蛌 蚳 \n" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" msgstr " 蚸蛌 ID -root\n" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" msgstr " 蛁 蚹蚰 蛂蛂蛌; 蛂 蚸 蚳 蛌蚳\n" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" msgstr " 蚺蛌 蛌 蚹蚰 蛂蛂蛌.\n" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" msgstr "蚸 蛁 蚳蚸蛌 蛂蛂.\n" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" msgstr " 蛈蛁 蚸 蚹蚰 蛂蛂蛌.\n" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" msgstr " 蚸蚳蚳 蛁 蚸 蚹蚰 蛂蛂蛌.\n" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -491,48 +473,48 @@ msgstr "" msgid "%s: can't lock password file\n" msgstr "%s: 蛁 蚹蚰 蛂蛂蛌\n" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "%s: 蛁 蚹蚰 蛈\n" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "%s: 蚺蛌 蚹蚰 蛈\n" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "%s: 蚸蚳 %d: 蚸蚳 蚳 \n" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "%s: 蚸蚳 %d: 蛂蚳 蛂蛂 蚸\n" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "%s: 蚸蚳 %d: 蚸蛌蚸 蚳 %s\n" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "%s: 蚸蚳 %d: 蛁 蚳蚸蛌 蛂蛂\n" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "%s: 蚸 蛌, 蛌蛁 蚸\n" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" msgstr "%s: 蚸 蛁 蚹蚰 蛈\n" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" msgstr "%s: 蚸 蛁 蚹蚰 蛂蛂蛌\n" @@ -542,26 +524,26 @@ msgstr "%s: 蚸 蛁 蚹蚰 蛂蛂蛌\n" msgid "Usage: %s [-s shell] [name]\n" msgstr "蚸蚸: %s [-s shell] [name]\n" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" msgstr "蛁蚺蛌 蛂 蛁蚳蛌" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" msgstr " 蚳蚸 蚸蛌 蛌 蛁蚺蛌 蚸 %s.\n" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" msgstr "蚸 蛁蚺蛌 蛂 蛁蚳蛌 蚸 %s\n" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s: 蚳蚸 蚹蛌: %s\n" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" msgstr "%s 蛁蚺蛌 蚹蛌.\n" @@ -571,12 +553,12 @@ msgstr "%s 蛁蚺蛌 蚹蛌.\n" msgid "Usage: expiry {-f|-c}\n" msgstr "蚸蚸: expiry {-f|-c}\n" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" msgstr "" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "" @@ -590,320 +572,285 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" msgstr "" -#: src/faillog.c:86 +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" +msgid "Login Failures Maximum Latest On\n" msgstr "" -#: src/faillog.c:103 -#, c-format -msgid " %s on %s" -msgstr "" - -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" msgstr "" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr "" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, fuzzy, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "蚸蚸: %s [-r|-R] group\n" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr "" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr "" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr "" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr "" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" msgstr "" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr "" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" msgstr "" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "" -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " msgstr "" -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" msgstr "" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" msgstr "" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" msgstr "" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" msgstr "" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" msgstr "" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, c-format msgid "%s: error adding new group entry\n" msgstr "" -#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" msgstr "" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, c-format msgid "%s: %s is not a valid group name\n" msgstr "%s: 蚸 蚹: \"%s\"\n" -#: src/groupadd.c:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" msgstr "" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" msgstr "" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" msgstr "" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" msgstr "" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, c-format msgid "Usage: groupdel group\n" msgstr "" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" msgstr "" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "" @@ -913,110 +860,105 @@ msgstr "" msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" msgstr "" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" msgstr "" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "" -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" msgstr "" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" msgstr "" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " msgstr "" -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" msgstr "" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" msgstr "" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" msgstr "" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" msgstr "" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " msgstr "" -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" msgstr "" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "" -#: src/grpck.c:647 src/pwck.c:612 -#, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format -msgid "%s: no changes\n" -msgstr "" - -#: src/grpck.c:651 src/pwck.c:616 +#: src/grpck.c:640 src/pwck.c:606 #, c-format msgid "%s: the files have been updated\n" msgstr "" +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "" + #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" @@ -1032,37 +974,37 @@ msgstr "" msgid "%s: can't lock shadow group file\n" msgstr "" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" msgstr "" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" msgstr "" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" msgstr "" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "" @@ -1082,121 +1024,112 @@ msgstr "蚸蚸: id\n" msgid " groups=" msgstr "" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" msgstr "" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "" -#: src/login.c:175 +#: src/login.c:156 #, fuzzy, c-format msgid "Usage: %s [-p] [name]\n" msgstr "蚸蚸: %s [-p] [name]\n" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr "" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr "" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" msgstr "" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" "System closed for routine maintenance\n" msgstr "" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" "[Disconnect bypassed -- root login allowed.]\n" msgstr "" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" "Login timed out after %d seconds.\n" msgstr "" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" msgstr "" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" msgstr "" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" "%s login: " msgstr "" -#: src/login.c:819 -msgid "login: " -msgstr "" - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" msgstr "" -#: src/login.c:1198 +#: src/login.c:996 msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "" -#: src/login.c:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" msgstr "" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" msgstr "" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" @@ -1237,17 +1170,17 @@ msgstr "%s: 蚸 蚸 蚸蛌\n" msgid "added %d entries, longest was %d\n" msgstr "" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "" @@ -1267,16 +1200,16 @@ msgstr "" msgid "unknown uid: %u\n" msgstr "" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" msgstr "" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "" @@ -1286,159 +1219,159 @@ msgstr "" msgid "Usage: %s [input]\n" msgstr "" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "" -#: src/passwd.c:155 +#: src/passwd.c:154 #, fuzzy, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "蚸蚸: %s [-f|-s] [name]\n" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr "" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr "" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "" -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" msgstr "" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" "Please use a combination of upper and lower case letters and numbers.\n" msgstr "" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "" -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" msgstr "" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" "Warning: weak password (enter it again to use it anyway).\n" msgstr "" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" msgstr "" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" msgstr "" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" msgstr "" -#: src/passwd.c:914 +#: src/passwd.c:884 #, fuzzy, c-format -msgid "You may not change the password for %s.\n" +msgid "%s: You may not view or modify password information for %s.\n" msgstr " 蚳蚸 蚸蛌 蛌 蛁蚺蛌 蚸 %s.\n" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "" @@ -1453,49 +1386,49 @@ msgstr "" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" msgstr "" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" msgstr "" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" msgstr "" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" msgstr "" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" msgstr "" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" msgstr "" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" msgstr "" @@ -1515,17 +1448,17 @@ msgstr "" msgid "%s: can't remove shadow entry for %s\n" msgstr "" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" msgstr "" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" msgstr "" @@ -1535,62 +1468,62 @@ msgstr "" msgid "%s: can't update entry for user %s\n" msgstr "" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format msgid "%s: can't delete shadow password file\n" msgstr "" -#: src/su.c:133 +#: src/su.c:132 msgid "Sorry." msgstr "" -#: src/su.c:323 +#: src/su.c:320 #, c-format msgid "%s: must be run from a terminal\n" msgstr "" -#: src/su.c:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" msgstr "" -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, c-format msgid "You are not authorized to su %s\n" msgstr "" -#: src/su.c:502 +#: src/su.c:495 msgid "(Enter your own password.)" msgstr "" -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" "(Ignored)\n" msgstr "" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" msgstr "" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr "" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" msgstr "" @@ -1605,464 +1538,409 @@ msgstr "" msgid "No password entry for 'root'\n" msgstr "" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" "(or give root password for system maintenance):" msgstr "" -#: src/sulogin.c:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" msgstr "" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "" -#: src/useradd.c:475 +#: src/useradd.c:418 #, c-format msgid "%s: cannot create new defaults file\n" msgstr "" -#: src/useradd.c:480 +#: src/useradd.c:423 #, c-format msgid "%s: cannot open new defaults file\n" msgstr "" -#: src/useradd.c:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" msgstr "" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "" -#: src/useradd.c:721 +#: src/useradd.c:660 #, c-format msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n" msgstr "" -#: src/useradd.c:724 +#: src/useradd.c:663 #, c-format msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr "" -#: src/useradd.c:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, c-format msgid " [-f inactive] [-e expire]\n" msgstr "" -#: src/useradd.c:728 +#: src/useradd.c:667 #, c-format msgid " [-p passwd] name\n" msgstr "" -#: src/useradd.c:730 +#: src/useradd.c:669 #, c-format msgid " useradd -D [-g group] [-b base] [-s shell]\n" msgstr "" -#: src/useradd.c:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, c-format msgid "%s: error locking group file\n" msgstr "" -#: src/useradd.c:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, c-format msgid "%s: error opening group file\n" msgstr "" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, c-format msgid "%s: error locking shadow group file\n" msgstr "" -#: src/useradd.c:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, c-format msgid "%s: error opening shadow group file\n" msgstr "" -#: src/useradd.c:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, c-format msgid "%s: shadow passwords required for -f\n" msgstr "" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" msgstr "" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "" -#: src/useradd.c:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, c-format msgid "%s: unable to lock password file\n" msgstr "" -#: src/useradd.c:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, c-format msgid "%s: unable to open password file\n" msgstr "" -#: src/useradd.c:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, c-format msgid "%s: cannot lock shadow password file\n" msgstr "" -#: src/useradd.c:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, c-format msgid "%s: cannot open shadow password file\n" msgstr "" -#: src/useradd.c:1459 +#: src/useradd.c:1354 #, c-format msgid "%s: error adding new password entry\n" msgstr "" -#: src/useradd.c:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, c-format msgid "%s: error adding new shadow password entry\n" msgstr "" -#: src/useradd.c:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" msgstr "" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, c-format msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n" msgstr "" -#: src/useradd.c:1590 +#: src/useradd.c:1446 #, c-format msgid "Can't create mail spool for user %s.\n" msgstr "" -#: src/useradd.c:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" msgstr "" -#: src/useradd.c:1767 +#: src/useradd.c:1602 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" msgstr "" -#: src/userdel.c:124 +#: src/userdel.c:108 #, fuzzy, c-format msgid "Usage: %s [-r] name\n" msgstr "蚸蚸: %s [-r] [name]\n" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" msgstr "" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "" - -#: src/userdel.c:214 -#, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " msgstr "" -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" msgstr "" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "" -#: src/usermod.c:306 +#: src/usermod.c:289 #, c-format msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "" -#: src/usermod.c:310 +#: src/usermod.c:293 #, c-format msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n" msgstr "" -#: src/usermod.c:313 +#: src/usermod.c:296 #, c-format msgid "[-f inactive] [-e expire] " msgstr "" -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" msgstr "" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "" -#: src/usermod.c:965 +#: src/usermod.c:903 #, c-format msgid "%s: shadow passwords required for -e and -f\n" msgstr "" -#: src/usermod.c:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, c-format msgid "%s: error changing password entry\n" msgstr "" -#: src/usermod.c:1122 +#: src/usermod.c:1053 #, c-format msgid "%s: error removing password entry\n" msgstr "" -#: src/usermod.c:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "" -#: src/usermod.c:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" msgstr "" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, c-format msgid "%s: cannot rename directory %s to %s\n" msgstr "" -#: src/usermod.c:1333 +#: src/usermod.c:1223 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "" -#: src/usermod.c:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" msgstr "" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" msgstr "" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" "%s: %s is unchanged\n" msgstr "" -#: src/vipw.c:133 +#: src/vipw.c:131 msgid "Couldn't lock file" msgstr "" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" msgstr "" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/po/id.gmo b/po/id.gmo index eaf6b9c4..57474765 100644 Binary files a/po/id.gmo and b/po/id.gmo differ diff --git a/po/id.po b/po/id.po index 74c1dea2..68ae0cda 100644 --- a/po/id.po +++ b/po/id.po @@ -5,20 +5,21 @@ msgid "" msgstr "" "Project-Id-Version: shadow\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-26 07:53+0100\n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" "PO-Revision-Date: 2004-04-09 00:12+0700\n" "Last-Translator: Parlin Imanuel Toh \n" "Language-Team: Debian Indonesia \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" msgstr "Peringatan: grup tidak dikenal %s\n" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" msgstr "Peringatan: terlalu banyak grup\n" @@ -46,17 +47,17 @@ msgstr " Hubungi administrator sistem.\n" msgid " Choose a new password.\n" msgstr " Pilih sebuah kata sandi baru.\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "Kata sandi anda akan kadaluarsa dalam %ld hari.\n" -#: libmisc/age.c:174 +#: libmisc/age.c:172 #, c-format msgid "Your password will expire tomorrow.\n" msgstr "Kata sandi anda akan kadaluarsa besok.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:174 #, c-format msgid "Your password will expire today.\n" msgstr "Kata sandi anda akan kadaluarsa hari ini.\n" @@ -71,40 +72,26 @@ msgstr "Tidak dapat mengubah tts %s" msgid "Environment overflow\n" msgstr "Lingkungan overflow\n" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr "Anda tidak boleh mengubah $%s\n" -#: libmisc/failure.c:230 +#: libmisc/failure.c:229 #, fuzzy, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "%d %s sejak login terakhir. Terkahir di %s pada %s.\n" +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "%d %s sejak login terakhir. Terkahir di %s pada %s.\n" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "kegagalan" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "kegagalan" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" msgstr "Terlalu banyak login.\n" -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "Kata sandi tidak melakukan dekripsi kunci rahasia untuk %s.\n" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "" -"Tidak dapat mengatur kunci rahasia dari %s: apakah daemon keyserv berjalan?\n" - #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "Anda memiliki surat baru." @@ -117,7 +104,7 @@ msgstr "Tidak ada surat." msgid "You have mail." msgstr "Anda memiliki surat." -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " msgstr "Kata sandi buruk: %s." @@ -132,20 +119,20 @@ msgstr "passwd: pam_start() gagal, kesalahan nomor %d\n" msgid "passwd: %s\n" msgstr "passwd: %s\n" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" msgstr "" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "Tidak dapat cd ke \"%s\"\n" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" msgstr "Tidak terdapat direktori, masuk dengan HOME=/" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr "Tidak dapat menjalankan %s" @@ -160,36 +147,32 @@ msgstr "Direktori root tidak sah \"%s\"\n" msgid "Can't change root directory to \"%s\"\n" msgstr "Tidak dapat mengubah direktori root ke \"%s\"\n" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "malloc(%d) gagal\n" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" msgstr "Tidak dapat mengalokasikan ruang untuk informasi konfigurasi.\n" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "" "Kesalahan konfigurasi - item tidak dikenal '%s' (beritahu administrator)\n" -#: lib/pwauth.c:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "Kata sandi:" -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "Kata sandi dari %s:" -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "(Echo on)" - -#: src/chage.c:118 +#: src/chage.c:112 #, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" @@ -198,154 +181,147 @@ msgstr "" "Penggunaan: chage [-l] [-m hari_min] [-M hari_maks] [-W peringatan]\n" " [-I tidak_aktif] [-E kadaluarsa] [-d hari_akhir] pengguna\n" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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:155 +#: src/chage.c:149 msgid "Minimum Password Age" msgstr "Umur Kata Sandi Minimal" -#: src/chage.c:161 +#: src/chage.c:155 msgid "Maximum Password Age" msgstr "Umur Kata Sandi Maksimal" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" msgstr "Penggantian Kata Sandi Terakhir (TTTT-MM-HH)" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" msgstr "Peringatan Kadaluarsanya Kata Sandi" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "Kata Sandi Tak-aktif" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Waktu Kadaluarsa Akun (TTTT-MM-HH)" -#: src/chage.c:238 +#: src/chage.c:231 #, fuzzy, c-format msgid "Last password change\t\t\t\t\t: " msgstr "Penggantian Kata Sandi Terakhir (TTTT-MM-HH)" -#: src/chage.c:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 #, fuzzy, c-format msgid "never\n" msgstr "Tidak Pernah\n" -#: src/chage.c:251 +#: src/chage.c:244 #, fuzzy, c-format msgid "Password expires\t\t\t\t\t: " msgstr "Kata Sandi Kadaluarsa:\t" -#: src/chage.c:267 +#: src/chage.c:260 #, fuzzy, c-format msgid "Password inactive\t\t\t\t\t: " msgstr "Kata Sandi Tidak Aktif:\t" -#: src/chage.c:281 +#: src/chage.c:274 #, fuzzy, c-format msgid "Account expires\t\t\t\t\t\t: " msgstr "Akun Kadaluarsa:\t" -#: src/chage.c:297 +#: src/chage.c:290 #, c-format msgid "Minimum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:298 +#: src/chage.c:292 #, c-format msgid "Maximum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:299 +#: src/chage.c:294 #, c-format msgid "Number of days of warning before password expires\t: %ld\n" msgstr "" -#: src/chage.c:444 +#: src/chage.c:431 #, c-format msgid "%s: do not include \"l\" with other flags\n" msgstr "%s: jangan gabungkan \"l\" dengan flag lain\n" -#: src/chage.c:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 #, fuzzy, c-format msgid "%s: permission denied.\n" msgstr "%s: ijin ditolak\n" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 #, c-format msgid "%s: PAM authentication failed\n" msgstr "%s: Otentikasi PAM gagal\n" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, c-format msgid "%s: can't open password file\n" msgstr "%s: tidak dapat membuka berkas kata sandi\n" -#: src/chage.c:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "%s: pengguna %s tak dikenal\n" -#: src/chage.c:535 +#: src/chage.c:519 #, c-format msgid "%s: can't lock shadow password file" msgstr "%s: tidak dapat mengunci berkas kata sandi bayangan" -#: src/chage.c:543 +#: src/chage.c:527 #, c-format msgid "%s: can't open shadow password file" msgstr "%s: tidak dapat membuka berkas kata sandi bayangan" -#: src/chage.c:604 +#: src/chage.c:587 #, c-format msgid "Changing the aging information for %s\n" msgstr "Mengubah informasi umur akun untuk %s\n" -#: src/chage.c:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" msgstr "%s: kesalahan saat mengubah ruas-ruas isian\n" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, c-format msgid "%s: can't update password file\n" msgstr "%s: tidak dapat memperbaharui berkas kata sandi\n" -#: src/chage.c:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" msgstr "%s: tidak dapat memperbaharui berkas kata sandi bayangan\n" -#: src/chage.c:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "Kesalahan saat memperbaharui entri kata sandi DBM.\n" - -#: src/chage.c:692 +#: src/chage.c:649 #, 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:740 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite password file\n" msgstr "%s: tidak dapat menulis kembali berkas kata sandi\n" -#: src/chage.c:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 #, c-format msgid "%s: PAM chauthtok failed\n" msgstr "%s: chauthok PAM gagal\n" @@ -365,117 +341,122 @@ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" msgstr "" "Penggunaan: %s [-f nama_lkp] [-r no_ruang] [-w telp_ktr] [-h telp_rmh]\n" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "Nama Lengkap" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "\tNama Lengkap: %s\n" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "Nomor Ruangan" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "Telepon Kantor" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" msgstr "Telepon Rumah" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "Lain-lain" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s: Tidak dapat menentukan nama pengguna anda.\n" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s: tidak dapat mengubah pengguna '%s' pada klien NIS.\n" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "%s: `%s' merupakan master NIS untuk klien ini.\n" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, fuzzy, c-format +msgid "%s: Permission denied.\n" +msgstr "%s: ijin ditolak\n" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" msgstr "Mengubah informasi pengguna dari %s\n" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s: nama tidak sah: \"%s\"\n" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s: nomor ruang tidak sah: \"%s\"\n" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s: telepon kantor tidak sah: \"%s\"\n" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s: telepon rumah tidak sah: \"%s\"\n" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s: \"%s\" berisi karakter-karakter ilegal\n" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "%s: ruas terlalu panjang\n" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" msgstr "Tidak dapat mengubah ID menjadi root.\n" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" msgstr "Tidak dapat mengunci berkas kata sandi; coba lagi nanti.\n" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" msgstr "Tidak dapat membuka berkas kata sandi.\n" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s: %s tidak ditemukan pada /etc/passwd\n" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" msgstr "Kesalahan saat memperbaharui entri kata sandi.\n" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" msgstr "Tidak dapat menyimpan perubahan berkas kata sandi.\n" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" msgstr "Tidak dapat membuka kunci berkas kata sandi.\n" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -492,48 +473,48 @@ msgstr "" msgid "%s: can't lock password file\n" msgstr "%s: tidak dapat mengunci berkas kata sandi\n" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "%s: tidak dapat mengunci berkas kata sandi bayangan\n" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "%s: tidak dapat membuka berkas kata sandi bayangan\n" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "%s: baris %d: baris terlalu panjang\n" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "%s: baris %d: kata sandi baru hilang\n" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "%s: baris %d: pengguna %s tak dikenal\n" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "%s: baris %d: tidak dapat memperbaharui entri kata sandi\n" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "%s: kesalahan terdeteksi, perubahan diabaikan\n" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" msgstr "%s: kesalahan saat memperbaharui berkas kata sandi bayangan\n" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" msgstr "%s: kesalahan saat memperbaharui berkas kata sandi\n" @@ -543,26 +524,26 @@ msgstr "%s: kesalahan saat memperbaharui berkas kata sandi\n" msgid "Usage: %s [-s shell] [name]\n" msgstr "Penggunaan: %s [-s shell] [nama]\n" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" msgstr "Login Shell" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" msgstr "Anda tidak boleh mengubah shell untuk %s.\n" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" msgstr "Mengubah login shell untuk %s\n" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s: Entri tidak sah: %s\n" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" msgstr "%s merupakan shell yang tidak sah.\n" @@ -572,12 +553,12 @@ msgstr "%s merupakan shell yang tidak sah.\n" msgid "Usage: expiry {-f|-c}\n" msgstr "Penggunaan: expiry {-f|-c}\n" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" msgstr "%s: PERINGATAN! Mesti merupakan set-UID root!\n" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "%s: pengguna tak dikenal\n" @@ -591,320 +572,285 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" msgstr "" -#: src/faillog.c:86 +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" -msgstr "Pengguna Kegagalan Maksimun Terakhir\n" +msgid "Login Failures Maximum Latest On\n" +msgstr "" -#: src/faillog.c:103 -#, c-format -msgid " %s on %s" -msgstr " %s pada %s" - -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" msgstr " [%lds tersisa]" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr " [%lds terkunci]" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "Pengguna tak dikenal: %s\n" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "Penggunaan: %s [-r|-R] grup\n" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr " %s [-a pengguna] grup\n" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr " %s [-d pengguna] grup\n" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr " %s [-A pengguna,...] [-M pengguna,...] grup\n" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr " %s [-M pengguna,...] grup\n" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" msgstr "%s: kata sandi bayangan grup diperlukan untuk -A\n" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "Anda siapa?\n" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr "grup tak dikenal: %s\n" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "Menambahkan pengguna %s ke grup %s\n" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "Mengeluarkan pengguna %s dari grup %s\n" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" msgstr "%s: anggota tak dikenal %s\n" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "%s: Bukan sebuah tty\n" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "Mengubah kata sandi untuk grup %s\n" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "Kata sandi baru: " -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " msgstr "Masukkan lagi kata sandi baru: " -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" msgstr "Kedua kata sandi tidak identik; coba lagi" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" msgstr "%s: Coba lagi nanti\n" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "%s: tidak mendapatkan kunci\n" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" msgstr "%s: tidak mendapatkan kunci untuk berkas bayangan\n" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "%s: tidak dapat membuka berkas\n" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "%s: tidak dapat memperbaharui entri\n" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" msgstr "%s: tidak dapat memperbaharui entri bayangan\n" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "%s: tidak dapat menuliskan kembali berkas\n" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" msgstr "%s: tidak dapat menuliskan kembali berkas bayangan\n" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "%s: tidak dapat membuka kunci berkas\n" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "%s: tidak dapat memperbaharui berkas-berkas DBM\n" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "%s: tidak dapat memperbaharui berkas-berkas bayangan DBM\n" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "Penggunaan: groupadd [-g gid [-o]] [-f] grup\n" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, c-format msgid "%s: error adding new group entry\n" msgstr "%s: kesalahan saat menambahkan entri grup yang baru\n" -#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: tidak dapat menambahkan entri grup dbm yang baru\n" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "%s: nama %s tidak unik\n" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" msgstr "%s: gid %u tidak unik\n" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "%s: tidak mendapatkan gid yang unik\n" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, c-format msgid "%s: %s is not a valid group name\n" msgstr "%s: nama grup %s tidak sah\n" -#: src/groupadd.c:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "%s: grup %s tidak sah\n" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "%s: -O memerlukan NAMA=NILAI\n" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s: tidak dapat menuliskan kembali berkas grup\n" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s: tidak dapat menuliskan kembali berkas grup bayangan\n" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" msgstr "%s: tidak dapat mengunci berkas grup\n" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" msgstr "%s: tidak dapat membuka berkas grup\n" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" msgstr "%s: tidak dapat mengunci berkas grup bayangan\n" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" msgstr "%s: tidak dapat membuka berkas grup bayangan\n" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "%s: grup %s telah ada\n" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, c-format msgid "Usage: groupdel group\n" msgstr "Penggunaan: groupdel grup\n" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" msgstr "%s: kesalahan saat menghapus entri grup\n" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "%s: kesalahan saat menghapus entri dbm dari grup\n" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "%s: kesalahan saat menghapus entri group bayangan\n" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "%s: kesalahan saat menghapus entri dbm grup bayangan\n" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "%s: tidak dapat menghapus grup utama dari pengguna.\n" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "%s: grup %s tidak ada\n" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "%s: grup %s merupakan sebuah grup NIS\n" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s: %s merupakan master NIS\n" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "Penggunaan: groupmod [-g gid [-o]] [-n nama] grup\n" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "%s: %s tidak ditemukan dalam /etc/group\n" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s: tidak dapat menambah entri grup bayangan dbm yang baru\n" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s: %u bukan gid yang unik\n" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "%s: %s bukan nama yang unik\n" @@ -914,110 +860,105 @@ msgstr "%s: %s bukan nama yang unik\n" msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "Penggunaan: %s [-r] [-s] [grup [gbayangan]]\n" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "Penggunaan: %s [-r] [-s] [grup]\n" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "Tidak" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" msgstr "%s: -s dan -r tidak kompatible\n" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "%s: tidak dapat mengunci berkas %s\n" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "%s: tidak dapat membuka berkas %s\n" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" msgstr "entri berkas grup tidak sah\n" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "hapus baris `%s'? " -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" msgstr "entri grup berulang\n" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" msgstr "nama grup `%s' tidak sah\n" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "grup %s: tak ada pengguna %s\n" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " msgstr "hapus anggota `%s'? " -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" msgstr "entri berkas grup bayangan tidak sah\n" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" msgstr "entri grup bayangan berulang\n" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" msgstr "entri tidak ditemukan pada berkas grup\n" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" msgstr "grup bayangan %s: tak ada pengguna administratif %s\n" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " msgstr "hapus anggota administratif `%s'? " -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" msgstr "grup bayangan %s: tak ada pengguna %s\n" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "%s: tidak dapat memperbaharui berkas %s\n" -#: src/grpck.c:647 src/pwck.c:612 -#, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: berkas-berkas telah diperbaharui; jalankan mkpasswd\n" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format -msgid "%s: no changes\n" -msgstr "%s: tak ada perubahan\n" - -#: src/grpck.c:651 src/pwck.c:616 +#: src/grpck.c:640 src/pwck.c:606 #, c-format msgid "%s: the files have been updated\n" msgstr "%s: berkas-berkas telah diperbaharui\n" +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "%s: tak ada perubahan\n" + #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" @@ -1033,37 +974,37 @@ msgstr "%s: tidak dapat membuka berkas grup\n" msgid "%s: can't lock shadow group file\n" msgstr "%s: tidak dapat mengunci berkas grup bayangan\n" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" msgstr "%s: tidak dapat membuka berkas grup banyangan\n" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "%s: tidak dapat menghapus grup bayangan %s\n" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "%s: tidak dapat memperbaharui entri bayangan untuk %s\n" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "%s: tidak dapat memperbaharui entri untuk grup %s\n" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" msgstr "%s: tidak dapat memperbaharui berkas grup bayangan\n" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" msgstr "%s: tidak dapat memperbaharui berkas grup\n" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "%s: tidak dapat menghapus berkas grup bayangan\n" @@ -1083,52 +1024,52 @@ msgstr "Penggunaan: id\n" msgid " groups=" msgstr " grup=" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" msgstr "Nama pengguna Port Dari Terakhir\n" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "Nama pengguna Port Terakhir\n" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "**Tidak pernah log in**" -#: src/login.c:175 +#: src/login.c:156 #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Penggunaan: %s [-p] [nama]\n" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr " %s [-p] [-h host] [-f nama]\n" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr " %s [-p] -r host\n" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" msgstr "Waktu login tidak sah\n" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" @@ -1137,7 +1078,7 @@ msgstr "" "\n" "Sistem ditutup untuk pengelolaan rutin\n" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" @@ -1146,7 +1087,7 @@ msgstr "" "\n" "[Pemutusan hubungan diabaikan -- login root diperbolehkan.]\n" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" @@ -1155,17 +1096,17 @@ msgstr "" "\n" "Login time out setelah %d detik.\n" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" msgstr " pada `%.100s' dari `%.200s'" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" msgstr " pada `%.100s'" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" @@ -1174,38 +1115,29 @@ msgstr "" "\n" "%s login: " -#: src/login.c:819 -msgid "login: " -msgstr "login: " - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" msgstr "Login tidak tepat" -#: src/login.c:1198 +#: src/login.c:996 msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "Perhatian: login dibolehkan setelah penguncian sementara.\n" -#: src/login.c:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "Login terakhir: %s pada %s" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" msgstr "Login terakhir: %.19s pada %s" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" msgstr " dari %.*s" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "Memulai rad_login\n" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" @@ -1246,17 +1178,17 @@ msgstr "%s: kesalahan saat menambah rekor untuk " msgid "added %d entries, longest was %d\n" msgstr "ditambahkan %d entri, yang terpanjang adalah %d\n" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "Penggunaan: %s [-vf] [-p|q|sp|sg] nama-berkas\n" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "Penggunaan: %s [-vf] [-p|g|sp] nama-berkas\n" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "Penggunaan: %s [-vf] [-p|g] nama-berkas\n" @@ -1276,16 +1208,16 @@ msgstr "Penggunaan: sg grup [[-c] perintah]\n" msgid "unknown uid: %u\n" msgstr "uid tidak dikenal: %u\n" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" msgstr "gid tidak dikenal: %lu\n" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "Maaf.\n" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "terlalu banyak grup\n" @@ -1295,92 +1227,92 @@ msgstr "terlalu banyak grup\n" msgid "Usage: %s [input]\n" msgstr "Penggunaan: %s [input]\n" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "%s: tidak dapat mengunci /etc/passwd.\n" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "%s: tidak dapat mengunci berkas-berkas, coba lagi nanti\n" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "%s: tidak dapat membuka berkas-berkas\n" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "%s: baris %d: baris tidak sah\n" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "" -#: src/passwd.c:155 +#: src/passwd.c:154 #, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "Penggunaan: %s [-f|-s] [nama]\n" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr "" " %s [-x maks] [-n min] [-w peringatan] [-i tak-aktif] nama\n" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} nama\n" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "Kata sandi lama: " -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" msgstr "Kata sandi tidak tepat untuk `%s'\n" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" @@ -1389,16 +1321,16 @@ msgstr "" "Masukkan password baru (minimim %d, maksimum %d karakter)\n" "Mohon gunakan kombinasi huruf besar, huruf kecil dan angka.\n" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "kata sandi baru: " -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" msgstr "Coba lagi.\n" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" @@ -1407,52 +1339,52 @@ msgstr "" "\n" "Kata sandi lemah (masukkan lagi untuk tetap menggunakannya).\n" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" msgstr "Kata sandi tidak sama; coba lagi.\n" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "Kata sandi untuk %s tidak dapat diganti.\n" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" msgstr "Maaf, kata sandi untuk %s belum dapat diganti.\n" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "%s: kehabisan memori\n" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "%s: Tidak dapat menjalankan %s" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" msgstr "%s: repositori %s tidak didukung\n" -#: src/passwd.c:914 +#: src/passwd.c:884 #, fuzzy, c-format -msgid "You may not change the password for %s.\n" +msgid "%s: You may not view or modify password information for %s.\n" msgstr "Anda tidak boleh mengubah shell untuk %s.\n" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "Mengganti kata sandi untuk %s\n" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "Kata sandi untuk %s tidak diubah.\n" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "Password telah diubah.\n" @@ -1467,49 +1399,49 @@ msgstr "" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" msgstr "" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" msgstr "" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" msgstr "" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" msgstr "" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" msgstr "" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" msgstr "" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" msgstr "" @@ -1529,17 +1461,17 @@ msgstr "" msgid "%s: can't remove shadow entry for %s\n" msgstr "" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" msgstr "" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" msgstr "" @@ -1549,40 +1481,40 @@ msgstr "" msgid "%s: can't update entry for user %s\n" msgstr "" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format msgid "%s: can't delete shadow password file\n" msgstr "" -#: src/su.c:133 +#: src/su.c:132 msgid "Sorry." msgstr "Maaf." -#: src/su.c:323 +#: src/su.c:320 #, c-format msgid "%s: must be run from a terminal\n" msgstr "%s: mesti dijalankan dari sebuah terminal\n" -#: src/su.c:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "%s: pam_start: kesalahan %d\n" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" msgstr "Id tidak dikenal: %s\n" -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, c-format msgid "You are not authorized to su %s\n" msgstr "Anda tidak diperbolehkan untuk su %s\n" -#: src/su.c:502 +#: src/su.c:495 msgid "(Enter your own password.)" msgstr "(Masukkan password anda sendiri.)" -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" @@ -1591,22 +1523,22 @@ msgstr "" "%s: %s\n" "(Diabaikan)\n" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" msgstr "Tak ada shell\n" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr "Akses su untuk account it DITOLAK.\n" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "Otentikasi kata sandi diabaikan.\n" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" msgstr "Silakan masukkan kata sandi anda SENDIRI sebagai otentikasi.\n" @@ -1621,7 +1553,7 @@ msgstr "Tak ada berkas kata sandi\n" msgid "No password entry for 'root'\n" msgstr "Tak ada entri kata sandi untuk 'root'\n" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" @@ -1631,438 +1563,383 @@ msgstr "" "Ketikkan control-d untuk melanjutkan startup normal,\n" "(ata berikan kata sandi root untuk pengelolaan sistem):" -#: src/sulogin.c:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" msgstr "Memasuki Mode Pengelolaan Sistem\n" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "" -#: src/useradd.c:475 +#: src/useradd.c:418 #, c-format msgid "%s: cannot create new defaults file\n" msgstr "" -#: src/useradd.c:480 +#: src/useradd.c:423 #, c-format msgid "%s: cannot open new defaults file\n" msgstr "" -#: src/useradd.c:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" msgstr "" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "" -#: src/useradd.c:721 +#: src/useradd.c:660 #, 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:724 +#: src/useradd.c:663 #, c-format msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr "" " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" -#: src/useradd.c:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, c-format msgid " [-f inactive] [-e expire]\n" msgstr " [-f tidak_aktif] [-e kadaluarsa]\n" -#: src/useradd.c:728 +#: src/useradd.c:667 #, c-format msgid " [-p passwd] name\n" msgstr " [-p kata_sandi] nama\n" -#: src/useradd.c:730 +#: src/useradd.c:669 #, 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:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, c-format msgid "%s: error locking group file\n" msgstr "" -#: src/useradd.c:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, c-format msgid "%s: error opening group file\n" msgstr "" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, c-format msgid "%s: error locking shadow group file\n" msgstr "" -#: src/useradd.c:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, c-format msgid "%s: error opening shadow group file\n" msgstr "" -#: src/useradd.c:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, c-format msgid "%s: shadow passwords required for -f\n" msgstr "" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" msgstr "" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "" -#: src/useradd.c:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, c-format msgid "%s: unable to lock password file\n" msgstr "" -#: src/useradd.c:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, c-format msgid "%s: unable to open password file\n" msgstr "" -#: src/useradd.c:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, c-format msgid "%s: cannot lock shadow password file\n" msgstr "" -#: src/useradd.c:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, c-format msgid "%s: cannot open shadow password file\n" msgstr "" -#: src/useradd.c:1459 +#: src/useradd.c:1354 #, c-format msgid "%s: error adding new password entry\n" msgstr "" -#: src/useradd.c:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, c-format msgid "%s: error adding new shadow password entry\n" msgstr "" -#: src/useradd.c:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" msgstr "" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, c-format msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n" msgstr "" -#: src/useradd.c:1590 +#: src/useradd.c:1446 #, c-format msgid "Can't create mail spool for user %s.\n" msgstr "" -#: src/useradd.c:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" msgstr "" -#: src/useradd.c:1767 +#: src/useradd.c:1602 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" msgstr "" -#: src/userdel.c:124 +#: src/userdel.c:108 #, c-format msgid "Usage: %s [-r] name\n" msgstr "Penggunaan: %s [-r] nama\n" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" msgstr "" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "" - -#: src/userdel.c:214 -#, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " msgstr "" -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" msgstr "" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "" -#: src/usermod.c:306 +#: src/usermod.c:289 #, c-format msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "Penggunaan: %s\t[-u uid [-o]] [-g grup] [-G grup,...] \n" -#: src/usermod.c:310 +#: src/usermod.c:293 #, 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:313 +#: src/usermod.c:296 #, c-format msgid "[-f inactive] [-e expire] " msgstr "[-f tidak_aktif] [-e kadaluarsa] " -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p kata_sandi] [-L|-U] nama\n" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" msgstr "" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "" -#: src/usermod.c:965 +#: src/usermod.c:903 #, c-format msgid "%s: shadow passwords required for -e and -f\n" msgstr "" -#: src/usermod.c:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, c-format msgid "%s: error changing password entry\n" msgstr "" -#: src/usermod.c:1122 +#: src/usermod.c:1053 #, c-format msgid "%s: error removing password entry\n" msgstr "" -#: src/usermod.c:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "" -#: src/usermod.c:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" msgstr "" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, c-format msgid "%s: cannot rename directory %s to %s\n" msgstr "" -#: src/usermod.c:1333 +#: src/usermod.c:1223 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "" -#: src/usermod.c:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" msgstr "" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" msgstr "" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" @@ -2071,20 +1948,20 @@ msgstr "" "\n" "%s: %s tidak berubah\n" -#: src/vipw.c:133 +#: src/vipw.c:131 msgid "Couldn't lock file" msgstr "Tidak dapat mengunci berkas" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" msgstr "Tidak dapat membuat backup" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s: tidak dapat mengembalikan %s: %s (perubahan ada dalam %s)\n" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/po/it.gmo b/po/it.gmo index 45cad2cf..7b6469e1 100644 Binary files a/po/it.gmo and b/po/it.gmo differ diff --git a/po/it.po b/po/it.po index 0ce16abe..0633f812 100644 --- a/po/it.po +++ b/po/it.po @@ -2,14 +2,13 @@ # Copyright (C) 2004 Free Software Foundation, Inc. # This file is distributed under the same license as the shadow package. # Giuseppe Sacco , 2004. -# Danilo Piazzalunga , 2004. -# +# Danilo Piazzalunga , 2004-2005. # Convenzioni utilizzate per tradurre i termini pi羅 frequenti: -# # faillog (record)..................: 竄(record degli) accessi falliti罈 # group file/database...............: 竄file/database dei gruppi罈 -# last login........................: 竄ultimo accesso罈 # logged in.........................: 竄collegato罈 +# login.............................: 竄accesso罈 (nella maggioranza dei casi) +# login [user account]..............: 竄login罈 # mail spool........................: 竄spool di posta罈 # primary group.....................: 竄gruppo principale罈 # shadow file.......................: 竄file shadow罈 @@ -17,28 +16,28 @@ # (shadow) group file/database......: 竄file/database dei gruppi (shadow)罈 # shadow password...................: 竄shadow password罈 # (shadow) password file/database...: 竄file/database delle (shadow) password罈 +# super user........................: 竄root罈 o 竄amministratore罈 # user name.........................: 竄nome utente罈 -# msgid "" msgstr "" -"Project-Id-Version: shadow 4.0.7\n" +"Project-Id-Version: shadow 4.0.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-26 07:53+0100\n" -"PO-Revision-Date: 2005-01-21 17:38+0100\n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" +"PO-Revision-Date: 2005-04-17 21:57+0200\n" "Last-Translator: Danilo Piazzalunga \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.3.1\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" msgstr "Attenzione: gruppo 竄%s罈 sconosciuto\n" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" msgstr "Attenzione: troppi gruppi\n" @@ -66,17 +65,17 @@ msgstr " Contattare l'amministratore del sistema.\n" msgid " Choose a new password.\n" msgstr " Scegliere una nuova password.\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "La password in uso scadr tra %ld giorni.\n" -#: libmisc/age.c:174 +#: libmisc/age.c:172 #, c-format msgid "Your password will expire tomorrow.\n" msgstr "La password in uso scadr domani.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:174 #, c-format msgid "Your password will expire today.\n" msgstr "La password in uso scade oggi.\n" @@ -91,41 +90,31 @@ msgstr "Impossibile cambiare i permessi al device %s" msgid "Environment overflow\n" msgstr "Dimensione dell'ambiente eccessiva\n" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr "Non si pu簷 modificare $%s\n" -#: libmisc/failure.c:230 +#: libmisc/failure.c:229 #, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "%d %s dall'ultimo accesso. L'ultimo 癡 stato %s su %s.\n" +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "" +"%d fallimento dall'ultimo accesso.\n" +"L'ultimo 癡 stato %s su %s.\n" +msgstr[1] "" +"%d fallimenti dall'ultimo accesso.\n" +"L'ultimo 癡 stato %s su %s.\n" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "fallimenti" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "fallimento" - -# Riferito al numero massimo di accessi concorrenti per un utente. -#: libmisc/limits.c:396 +# NdT: Riferito al numero massimo di accessi concorrenti per un utente. +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" -msgstr "Troppi login.\n" - -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "La password non decifra la chiave segreta di %s.\n" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "" -"Impossibile impostare la chiave segreta di %s: verificare che il demone " -"竄keyserv罈 sia attivo.\n" +msgstr "Troppi accessi.\n" #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." @@ -139,7 +128,7 @@ msgstr "Nessun messaggio di posta." msgid "You have mail." msgstr "C'癡 la solita posta." -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " msgstr "Password troppo debole: %s. " @@ -154,20 +143,20 @@ msgstr "passwd: pam_start() ha restituito l'errore %d\n" msgid "passwd: %s\n" msgstr "passwd: %s\n" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" msgstr "passwd: password aggiornata correttamente\n" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "Impossibile spostarsi nella directory 竄%s罈\n" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" msgstr "Directory non presente, accesso con HOME=/" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr "Impossibile eseguire %s" @@ -182,37 +171,33 @@ msgstr "Directory root 竄%s罈 non valida\n" msgid "Can't change root directory to \"%s\"\n" msgstr "Impossibile cambiare la directory root in 竄%s罈\n" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "malloc(%d) non riuscita\n" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" msgstr "Impossibile allocare spazio per le informazioni di configurazione.\n" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "" "errore di configurazione: oggetto 竄%s罈 sconosciuto (avvisare " "l'amministratore)\n" -#: lib/pwauth.c:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "Password: " -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "Password di %s: " -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "(Eco attivo) " - -#: src/chage.c:118 +#: src/chage.c:112 #, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" @@ -221,161 +206,154 @@ msgstr "" "Uso: chage [-l] [-m GG_MIN] [-M GG_MAX] [-W AVVISO]\n" " [-I INATTIVIT] [-E SCADENZA] [-d ULTIMO_GIORNO] UTENTE\n" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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:155 +#: src/chage.c:149 msgid "Minimum Password Age" msgstr "Durata minima della password" -#: src/chage.c:161 +#: src/chage.c:155 msgid "Maximum Password Age" msgstr "Durata massima della password" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" msgstr "Ultimo cambio della password (AAAA-MM-GG)" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" msgstr "Avviso di scadenza della password" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "Inattivit della password" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Data di scadenza dell'account (AAAA-MM-GG)" # "Last password change . . . . : " -#: src/chage.c:238 +#: src/chage.c:231 #, c-format msgid "Last password change\t\t\t\t\t: " msgstr "Ultimo cambio della password : " -#: src/chage.c:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 #, c-format msgid "never\n" msgstr "mai\n" # "Password expires . . . . : " -#: src/chage.c:251 +#: src/chage.c:244 #, c-format msgid "Password expires\t\t\t\t\t: " msgstr "Scadenza della password : " # "Password inactive . . . . : " -#: src/chage.c:267 +#: src/chage.c:260 #, c-format msgid "Password inactive\t\t\t\t\t: " msgstr "Inattivit della password : " # "Account expires . . . . . : " -#: src/chage.c:281 +#: src/chage.c:274 #, 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:297 +#: src/chage.c:290 #, 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:298 +#: src/chage.c:292 #, 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:299 +#: src/chage.c:294 #, 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:444 +#: src/chage.c:431 #, c-format msgid "%s: do not include \"l\" with other flags\n" msgstr "%s: non includere 竄l罈 con altri flag\n" -#: src/chage.c:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 #, c-format msgid "%s: permission denied.\n" msgstr "%s: permesso negato.\n" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 #, c-format msgid "%s: PAM authentication failed\n" msgstr "%s: autenticazione PAM non riuscita\n" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, c-format msgid "%s: can't open password file\n" msgstr "%s: impossibile aprire il file delle password\n" -#: src/chage.c:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "%s: utente 竄%s罈 sconosciuto\n" -#: src/chage.c:535 +#: src/chage.c:519 #, c-format msgid "%s: can't lock shadow password file" msgstr "%s: impossibile fare il lock del file delle shadow password" -#: src/chage.c:543 +#: src/chage.c:527 #, c-format msgid "%s: can't open shadow password file" msgstr "%s: impossibile aprire il file delle shadow password" -#: src/chage.c:604 +#: src/chage.c:587 #, c-format msgid "Changing the aging information for %s\n" msgstr "Modifica delle informazioni sulla durata dell'account di %s\n" -#: src/chage.c:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" msgstr "%s: errore nel cambiare i campi\n" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, c-format msgid "%s: can't update password file\n" msgstr "%s: impossibile aggiornare il file delle password\n" -#: src/chage.c:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" msgstr "%s: impossibile aggiornare il file delle shadow password\n" -#: src/chage.c:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "Errore nell'aggiornare l'elemento nel file DBM delle password.\n" - -#: src/chage.c:692 +#: src/chage.c:649 #, c-format msgid "%s: can't rewrite shadow password file\n" msgstr "%s: impossibile riscrivere il file delle shadow password\n" -#: src/chage.c:740 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite password file\n" msgstr "%s: impossibile riscrivere il file delle password\n" -#: src/chage.c:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 #, c-format msgid "%s: PAM chauthtok failed\n" msgstr "%s: la chiamata PAM chauthok ha restituito un errore\n" @@ -396,118 +374,123 @@ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" msgstr "" "Uso: %s [-f NOME_COMPLETO] [-r NUM_STANZA] [-w TEL_LAVORO] [-h TEL_CASA]\n" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "Nome completo" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "\tNome completo: %s\n" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "Stanza n簞" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "Numero telefonico di lavoro" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" msgstr "Numero telefonico di casa" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "Altro" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s: impossibile determinare il proprio nome utente.\n" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s: impossibile modificare l'utente 竄%s罈 sul client NIS.\n" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "%s: 竄%s罈 癡 il NIS master per questo client.\n" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, c-format +msgid "%s: Permission denied.\n" +msgstr "%s: Permesso negato.\n" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" msgstr "Modifica delle informazioni relative all'utente %s\n" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s: nome 竄%s罈 non valido\n" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s: numero di stanza 竄%s罈 non valido\n" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s: telefono di lavoro 竄%s罈 non valido\n" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s: telefono di casa 竄%s罈 non valido\n" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s: 竄%s罈 contiene caratteri non ammessi\n" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "%s: lunghezza dei campi eccessiva\n" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" msgstr "Impossibile cambiare ID a root.\n" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" msgstr "" "Impossibile fare il lock del file delle password; riprovare pi羅 tardi.\n" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" msgstr "Impossibile aprire il file delle password.\n" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s: impossibile trovare 竄%s罈 in /etc/passwd\n" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" msgstr "Errore nell'aggiornare la voce nel file delle password.\n" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" msgstr "Impossibile effettuare le modifiche al file delle password.\n" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" msgstr "Impossibile togliere il lock dal file delle password.\n" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -531,48 +514,48 @@ msgstr "" msgid "%s: can't lock password file\n" msgstr "%s: impossibile fare il lock del file delle password\n" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "%s: impossibile fare il lock del file shadow\n" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "%s: impossibile aprire il file shadow\n" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "%s: riga %d: riga troppo lunga\n" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "%s: riga %d: manca la nuova password\n" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "%s: riga %d: utente 竄%s罈 sconosciuto\n" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "%s: riga %d: impossibile aggiornare la voce nel file delle password\n" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "%s: rilevato un errore; le modifiche vengono ignorate\n" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" msgstr "%s: errore nell'aggiornare il file shadow\n" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" msgstr "%s: errore nell'aggiornare il file delle password\n" @@ -582,26 +565,26 @@ msgstr "%s: errore nell'aggiornare il file delle password\n" msgid "Usage: %s [-s shell] [name]\n" msgstr "Uso: %s [-s SHELL] [NAME]\n" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" msgstr "Shell di login" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" msgstr "Non 癡 permesso cambiare la shell di %s.\n" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" msgstr "Cambio della shell di login di %s\n" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s: voce 竄%s罈 non valida\n" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" msgstr "%s non 癡 una shell valida.\n" @@ -611,12 +594,12 @@ msgstr "%s non 癡 una shell valida.\n" msgid "Usage: expiry {-f|-c}\n" msgstr "Uso: expiry {-f|-c}\n" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" msgstr "%s: attenzione: il bit SUID deve essere impostato a root.\n" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "%s: utente sconosciuto\n" @@ -630,8 +613,9 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" @@ -647,321 +631,287 @@ msgstr "" " -m, --maximum MAX imposta a MAX il numero massimo di tentativi di\n" " accesso falliti\n" " -r, --reset azzera il conteggio degli accessi falliti\n" +" -t, --time GIORNI mostra i record degli accessi falliti pi羅 recenti\n" +" di un numero di GIORNI\n" " -u, --user LOGIN mostra il record degli accessi falliti o, se sono\n" " state usate con le opzioni -r, -m o -l, imposta\n" " conteggi e limiti solo per l'utente specificato\n" " da LOGIN\n" -#: src/faillog.c:86 +# NdT: Vedere faillog(5) per il significato dei campi. +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" -msgstr "Utente Errori Massimo Ultimo accesso\n" +msgid "Login Failures Maximum Latest On\n" +msgstr "Login Errori Massimo Ultimo accesso Da\n" -#: src/faillog.c:103 -#, c-format -msgid " %s on %s" -msgstr " %s su %s" - -# NdT: la 竄s罈 indica l'unit di misura (secondi). -#: src/faillog.c:107 +# NdT: La 竄s罈 indica l'unit di misura (secondi). +#: src/faillog.c:105 #, c-format msgid " [%lds left]" msgstr " [%lds rimasti]" -# NdT: la 竄s罈 indica l'unit di misura (secondi). -#: src/faillog.c:111 +# NdT: La 竄s罈 indica l'unit di misura (secondi). +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr " [%lds bloccato]" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "Utente 竄%s罈 sconosciuto\n" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "Uso: %s [-r|-R] GRUPPO\n" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr " %s [-a UTENTE] GRUPPO\n" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr " %s [-d UTENTE] GRUPPO\n" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr " %s [-A UTENTE,...] [-M UTENTE,...] GRUPPO\n" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr " %s [-M UTENTE,...] GRUPPO\n" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" msgstr "%s: l'opzione -A richiede le shadow password per i gruppi\n" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "Chi sei?\n" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr "gruppo 竄%s罈 sconosciuto\n" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "Aggiunta dell'utente %s al gruppo %s\n" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "Rimozione dell'utente %s dal gruppo %s\n" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" msgstr "%s: membro 竄%s罈 sconosciuto\n" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "%s: non 癡 un terminale\n" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "Cambio della password del gruppo %s\n" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "Nuova password: " -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " msgstr "Reimmettere la nuova password: " -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" msgstr "Non corrispondono; provare di nuovo" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" msgstr "%s: riprovare pi羅 tardi\n" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "%s: impossibile fare il lock\n" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" msgstr "%s: impossibile fare il lock del file shadow\n" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "%s: impossibile aprire il file\n" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "%s: impossibile aggiornare la voce\n" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" msgstr "%s: impossibile aggiornare la voce nel file shadow\n" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "%s: impossibile riscrivere il file\n" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" msgstr "%s: impossibile riscrivere il file shadow\n" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "%s: impossibile togliere il lock dal file\n" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "%s: impossibile aggiornare i file DBM\n" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "%s: impossibile aggiornare i file DBM shadow\n" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "Uso: groupadd [-g GID [-o]] [-f] GRUPPO\n" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, 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:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: impossibile aggiungere la nuova voce al file DBM dei gruppi\n" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "%s: il nome 竄%s罈 non 癡 univoco\n" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" msgstr "%s: gid 竄%u罈 non univoco\n" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "%s: impossibile ottenere un gid univoco\n" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, c-format msgid "%s: %s is not a valid group name\n" msgstr "%s: %s non 癡 un nome di gruppo valido\n" -#: src/groupadd.c:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "%s: gruppo 竄%s罈 non valido\n" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "%s: -O richiede NOME=VALORE\n" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s: impossibile riscrivere il file dei gruppi\n" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s: impossibile riscrivere il file dei gruppi shadow\n" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" msgstr "%s: impossibile fare il lock del file dei gruppi\n" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" msgstr "%s: impossibile aprire il file dei gruppi\n" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" msgstr "%s: impossibile fare il lock del file dei gruppi shadow\n" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" msgstr "%s: impossibile aprire il file dei gruppi shadow\n" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "%s: gruppo 竄%s罈 gi esistente\n" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, c-format msgid "Usage: groupdel group\n" msgstr "Uso: groupdel GRUPPO\n" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" msgstr "%s: errore nel rimuovere la voce dal file dei gruppi\n" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "%s: errore nel rimuovere la voce dal file DBM dei gruppi\n" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "%s: errore nel rimuovere la voce dal file dei gruppi shadow\n" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "%s: errore nel rimuovere la voce dal file DBM dei gruppi shadow\n" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "%s: impossibile rimuovere il gruppo principale dell'utente.\n" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "%s: gruppo 竄%s罈 inesistente\n" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "%s: il gruppo 竄%s罈 癡 un gruppo NIS\n" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s: %s 癡 il NIS master\n" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "Uso: groupmod [-g GID [-o]] [-n NOME] GRUPPO\n" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "%s: 竄%s罈 non trovato in /etc/group\n" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "" -"%s: impossibile aggiungere la nuova voce al file DBM dei gruppi shadow\n" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s: %u non 癡 un gid univoco\n" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "%s: %s non 癡 un nome univoco\n" @@ -971,110 +921,105 @@ msgstr "%s: %s non 癡 un nome univoco\n" msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "Uso: %s [-r] [-s] [GRUPPO [GSHADOW]]\n" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "Uso: %s [-r] [-s] [GRUPPO]\n" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "No" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" msgstr "%s: -s e -r sono incompatibili\n" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "%s: impossibile fare il lock del file %s\n" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "%s: impossibile aprire il file %s\n" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" msgstr "voce non valida nel file dei gruppi\n" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "eliminare la riga 竄%s罈? " -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" msgstr "voce duplicata nel file dei gruppi\n" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" msgstr "nome di gruppo 竄%s罈 non valido\n" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "gruppo %s: nessun utente %s\n" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " msgstr "rimuovere il membro 竄%s罈? " -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" msgstr "voce non valida nel file dei gruppi shadow\n" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" msgstr "voce duplicata nel file dei gruppi shadow\n" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" msgstr "nessuna voce corrispondente nel file dei gruppi\n" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" msgstr "gruppo shadow %s: nessun utente amministrativo %s\n" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " msgstr "rimuovere il membro amministrativo 竄%s罈? " -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" msgstr "gruppo shadow %s: nessun utente %s\n" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "%s: impossibile aggiornare il file %s\n" -#: src/grpck.c:647 src/pwck.c:612 -#, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: i file sono stati aggiornati; eseguire 竄mkpasswd罈\n" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format -msgid "%s: no changes\n" -msgstr "%s: nessuna modifica\n" - -#: src/grpck.c:651 src/pwck.c:616 +#: src/grpck.c:640 src/pwck.c:606 #, c-format msgid "%s: the files have been updated\n" msgstr "%s: i file sono stati aggiornati\n" +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "%s: nessuna modifica\n" + #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" @@ -1090,37 +1035,37 @@ msgstr "%s: impossibile aprire il file dei gruppi\n" msgid "%s: can't lock shadow group file\n" msgstr "%s: impossibile fare il lock del file dei gruppi shadow\n" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" msgstr "%s: impossibile aprire il file dei gruppi shadow\n" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "%s: impossibile rimuovere il gruppo shadow %s\n" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "%s: impossibile aggiornare la voce relativa a %s nel file shadow\n" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "%s: impossibile aggiornare la voce del gruppo %s\n" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" msgstr "%s: impossibile aggiornare il file dei gruppi shadow\n" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" msgstr "%s: impossibile aggiornare il file dei gruppi\n" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "%s: impossibile eliminare il file dei gruppi shadow\n" @@ -1140,64 +1085,61 @@ msgstr "Uso: id\n" msgid " groups=" msgstr " gruppi=" -# NdT: Un'alternativa 癡 riportata qui sotto, ma sarebbe da evitare perch矇 -# confonde il valore con il significato. -# " -t, --time GIORNI stampa solo i record di ultimo accesso relativi\n" -# " agli ultimi GIORNI\n" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" "Uso: lastlog [OPZIONI]\n" "\n" "Opzioni:\n" -" -u, --login LOGIN stampa il record di ultimo accesso per l'utente\n" +" -u, --login LOGIN mostra il record di ultimo accesso per l'utente\n" " specificato da LOGIN\n" " -h, --help mostra questo messaggio di aiuto ed esce\n" -" -t, --time GIORNI stampa solo i record di ultimo accesso pi羅 recenti\n" +" -t, --time GIORNI mostra solo i record di ultimo accesso pi羅 recenti\n" " di un numero di GIORNI\n" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" msgstr "Nome utente Porta Da Ultimo accesso\n" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "Nome utente Porta Ultimo accesso\n" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "**Nessun accesso effettuato**" -#: src/login.c:175 +#: src/login.c:156 #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Uso: %s [-p] [NOME]\n" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr " %s [-p] [-h HOST] [-f NOME]\n" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr " %s [-p] -r HOST\n" -#: src/login.c:259 +# NdT: Non 癡 l'ora giusta per accedere da questo tty (con questo utente). +#: src/login.c:198 #, c-format msgid "Invalid login time\n" -msgstr "Ora di login non valida\n" +msgstr "Orario di accesso non permesso\n" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" @@ -1206,7 +1148,7 @@ msgstr "" "\n" "Sistema chiuso per lavori di ordinaria manutenzione\n" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" @@ -1215,7 +1157,7 @@ msgstr "" "\n" "[Disconnessione obbligatoria evitata: root pu簷 accedere.]\n" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" @@ -1224,17 +1166,17 @@ msgstr "" "\n" "Login scaduto dopo %d secondi.\n" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" msgstr " su 竄%.100s罈 da 竄%.200s罈" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" msgstr " su 竄%.100s罈" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" @@ -1243,39 +1185,32 @@ msgstr "" "\n" "%s login: " -#: src/login.c:819 -msgid "login: " -msgstr "login: " - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" msgstr "Login non corretto" -#: src/login.c:1198 +# NdT: Non 癡 chiaro se login sia da tradurre con "accesso abilitato" o +# "utente abilitato": il significato comunque 癡 lo stesso. +#: src/login.c:996 msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "" -"Attenzione: login di nuovo abilitato dopo una proibizione temporanea.\n" +"Attenzione: accesso di nuovo abilitato dopo una proibizione temporanea.\n" -#: src/login.c:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "Ultimo accesso: %s su %s" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" msgstr "Ultimo accesso: %.19s su %s" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" msgstr " da %.*s" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "Avvio di rad_login\n" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" @@ -1316,17 +1251,17 @@ msgstr "%s: errore nell'aggiungere il record per %s\n" msgid "added %d entries, longest was %d\n" msgstr "aggiunte %d voci; la pi羅 lunga era %d\n" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "Uso: %s [-vf] [-p|g|sp|sg] FILE\n" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "Uso: %s [-vf] [-p|g|sp] FILE\n" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "Uso: %s [-vf] [-p|g] FILE\n" @@ -1346,16 +1281,16 @@ msgstr "Uso: sg GRUPPO [[-c] COMANDO]\n" msgid "unknown uid: %u\n" msgstr "uid 竄%u罈 sconosciuto\n" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" msgstr "gid 竄%lu罈 sconosciuto\n" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "Spiacente.\n" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "troppi gruppi\n" @@ -1365,92 +1300,91 @@ msgstr "troppi gruppi\n" msgid "Usage: %s [input]\n" msgstr "Uso: %s [INPUT]\n" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "%s: impossibile fare il lock di /etc/passwd.\n" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "%s: impossibile fare il lock dei file; riprovare pi羅 tardi\n" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "%s: impossibile aprire i file\n" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "%s: riga %d: riga non valida\n" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "%s: riga %d: impossibile creare il nuovo GID\n" -# NdT: Preferisco evitare l'articolo davanti a 竄UID罈. -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "%s: riga %d: impossibile creare il nuovo UID\n" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "%s: riga %d: impossibile trovare l'utente %s\n" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "%s: riga %d: impossibile aggiornare la password\n" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "%s: riga %d: la chiamata mkdir ha restituito un errore\n" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "%s: riga %d: la chiamata chown ha restituito un errore\n" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "%s: riga %d: impossibile aggiornare la voce\n" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "%s: errore nell'aggiornare i file\n" -#: src/passwd.c:155 +#: src/passwd.c:154 #, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "Uso: %s [-f|-s] [NOME]\n" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr " %s [-x MAX] [-n MIN] [-w AVVISO] [-i INATT] NOME\n" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} NOME\n" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "Vecchia password: " -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" msgstr "Password sbagliata per 竄%s罈\n" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" @@ -1459,16 +1393,16 @@ msgstr "" "Inserire la nuova password (minimo %d caratteri, massimo %d)\n" "Utilizzare una combinazione di lettere maiuscole, minuscole e numeri.\n" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "Nuova password: " -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" msgstr "Provare di nuovo.\n" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" @@ -1478,52 +1412,53 @@ msgstr "" "Attenzione: password troppo debole (inserirla di nuovo per usarla " "comunque).\n" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" msgstr "Non corrispondono; provare di nuovo.\n" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "La password di %s non pu簷 essere cambiata.\n" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" msgstr "La password di %s non pu簷 ancora essere cambiata.\n" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "%s: memoria esaurita\n" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "%s: impossibile eseguire %s" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" msgstr "%s: repository %s non supportato\n" -#: src/passwd.c:914 +#: src/passwd.c:884 #, c-format -msgid "You may not change the password for %s.\n" -msgstr "Non 癡 permesso cambiare la password di %s.\n" +msgid "%s: You may not view or modify password information for %s.\n" +msgstr "" +"%s: non 癡 permesso vedere o cambiare le informazioni sulla password di %s.\n" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "Cambio della password di %s\n" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "La password di %s non 癡 cambiata.\n" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "Password cambiata.\n" @@ -1538,49 +1473,49 @@ msgstr "Uso: %s [-q] [-r] [-s] [PASSWD [SHADOW]]\n" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "Uso: %s [-q] [-r] [-s] [PASSWD]\n" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" msgstr "voce non valida nel file delle password\n" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" msgstr "voce duplicata nel file delle password\n" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" msgstr "nome utente 竄%s罈 non valido\n" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "utente %s: nessun gruppo %u\n" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "utente %s: la directory %s non esiste\n" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "utente %s: il programma %s non esiste\n" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" msgstr "voce non valida nel file delle shadow password\n" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" msgstr "voce duplicata nel file delle shadow password\n" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" msgstr "nessuna voce corrispondente nel file delle password\n" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" msgstr "utente %s: l'ultimo cambio di password reca una data futura\n" @@ -1600,17 +1535,17 @@ msgstr "%s: impossibile aprire il file passwd\n" msgid "%s: can't remove shadow entry for %s\n" msgstr "%s: impossibile rimuovere la voce relativa a %s dal file shadow\n" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "%s: impossibile aggiornare la voce relativa a %s nel file passwd\n" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" msgstr "%s: impossibile aggiornare il file shadow\n" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" msgstr "%s: impossibile aggiornare il file passwd\n" @@ -1620,41 +1555,40 @@ msgstr "%s: impossibile aggiornare il file passwd\n" msgid "%s: can't update entry for user %s\n" msgstr "%s: impossibile aggiornare la voce relativa all'utente %s\n" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format msgid "%s: can't delete shadow password file\n" msgstr "%s: impossibile eliminare il file delle shadow password\n" -#: src/su.c:133 +#: src/su.c:132 msgid "Sorry." msgstr "Spiacente." -#: src/su.c:323 +#: src/su.c:320 #, c-format msgid "%s: must be run from a terminal\n" msgstr "%s: si deve avviare da un terminale\n" -#: src/su.c:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "%s: pam_start: errore %d\n" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" msgstr "Id 竄%s罈 sconosciuto\n" -# NdT: traduzione libera del verbo 竄to su罈 -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, c-format msgid "You are not authorized to su %s\n" msgstr "Non si 癡 autorizzati a diventare %s\n" -#: src/su.c:502 +#: src/su.c:495 msgid "(Enter your own password.)" msgstr "(Immettere la propria password)" -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" @@ -1663,22 +1597,22 @@ msgstr "" "%s: %s\n" "(Ignorato)\n" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" msgstr "Nessuna shell\n" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr "L'accesso a 竄su罈 癡 NEGATO a questo account.\n" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "Evitata l'autenticazione tramite password.\n" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" msgstr "Inserire la PROPRIA password per autenticarsi.\n" @@ -1693,7 +1627,7 @@ msgstr "Manca il file delle password\n" msgid "No password entry for 'root'\n" msgstr "Manca una voce per 竄root罈 nel file delle password\n" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" @@ -1703,235 +1637,215 @@ 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:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" msgstr "Avvio modalit manutenzione del sistema\n" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "%s: ricostruire il database dei gruppi\n" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "%s: ricostruire il database dei gruppi shadow\n" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "%s: argomento numerico 竄%s罈 non valido\n" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "%s: gid 竄%s罈 sconosciuto\n" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "%s: gruppo 竄%s罈 sconosciuto\n" -#: src/useradd.c:475 +#: src/useradd.c:418 #, c-format msgid "%s: cannot create new defaults file\n" msgstr "%s: impossibile creare il nuovo file dei valori predefiniti\n" -#: src/useradd.c:480 +#: src/useradd.c:423 #, c-format msgid "%s: cannot open new defaults file\n" msgstr "%s: impossibile aprire il nuovo file dei valori predefiniti\n" -#: src/useradd.c:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" msgstr "%s: rename: %s" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s: il gruppo 竄%s罈 癡 un gruppo NIS.\n" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "%s: troppi gruppi specificati (max %d).\n" -#: src/useradd.c:721 +#: src/useradd.c:660 #, c-format msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n" msgstr "Uso: useradd [-u UID [-o]] [-g GRUPPO] [-G GRUPPO,...] \n" -#: src/useradd.c:724 +#: src/useradd.c:663 #, 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:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, c-format msgid " [-f inactive] [-e expire]\n" msgstr " [-f INATTIVIT] [-e SCADENZA]\n" -#: src/useradd.c:728 +#: src/useradd.c:667 #, c-format msgid " [-p passwd] name\n" msgstr " [-p PASSWORD] NOME\n" -#: src/useradd.c:730 +#: src/useradd.c:669 #, 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:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, c-format msgid "%s: error locking group file\n" msgstr "%s: errore nel fare il lock del file dei gruppi\n" -#: src/useradd.c:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, c-format msgid "%s: error opening group file\n" msgstr "%s: errore nell'aprire il file dei gruppi\n" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, 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:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, c-format msgid "%s: error opening shadow group file\n" msgstr "%s: errore nell'aprire il file dei gruppi shadow\n" -#: src/useradd.c:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "%s: uid 竄%u罈 non univoco\n" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "%s: impossibile ottenere un uid univoco\n" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "%s: directory di base 竄%s罈 non valida\n" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "%s: commento 竄%s罈 non valido\n" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "%s: home directory 竄%s罈 non valida\n" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s: data 竄%s罈 non valida\n" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "%s: le shadow password sono necessarie per -e\n" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, c-format msgid "%s: shadow passwords required for -f\n" msgstr "%s: le shadow password sono necessarie per -f\n" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" msgstr "%s: campo 竄%s罈 non valido\n" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "%s: shell 竄%s罈 non valida\n" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "%s: nome utente 竄%s罈 non valido\n" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "%s: impossibile riscrivere il file delle password\n" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "%s: impossibile riscrivere il file delle shadow password\n" -#: src/useradd.c:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, c-format msgid "%s: unable to lock password file\n" msgstr "%s: impossibile fare il lock del file delle password\n" -#: src/useradd.c:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, c-format msgid "%s: unable to open password file\n" msgstr "%s: impossibile aprire il file delle password\n" -#: src/useradd.c:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, 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:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, c-format msgid "%s: cannot open shadow password file\n" msgstr "%s: impossibile aprire il file delle shadow password\n" -#: src/useradd.c:1459 +#: src/useradd.c:1354 #, 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:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "%s: errore nell'aggiornare la voce nel file DBM delle password\n" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, 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:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s: errore nell'aggiornare la voce al file DBM delle shadow password\n" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" msgstr "%s: impossibile creare la directory %s\n" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, 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:1590 +#: src/useradd.c:1446 #, 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:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "%s: l'utente 竄%s罈 esiste gi\n" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" @@ -1939,210 +1853,177 @@ msgstr "" "%s: il gruppo 竄%s罈 esiste gi; usare -g per aggiungere questo utente a tale " "gruppo.\n" -#: src/useradd.c:1767 +#: src/useradd.c:1602 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" msgstr "%s: attenzione: CREATE_HOME non 癡 supportata; usare -m.\n" -#: src/userdel.c:124 +#: src/userdel.c:108 #, c-format msgid "Usage: %s [-r] name\n" msgstr "Uso: %s [-r] NOME\n" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" msgstr "%s: errore nell'aggiornare la voce nel file dei gruppi\n" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "%s: impossibile aggiornare la voce nel file DBM dei gruppi\n" - -#: src/userdel.c:214 -#, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: impossibile rimuovere la voce dal file DBM dei gruppi\n" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "%s: impossibile aprire il file dei gruppi\n" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "%s: impossibile aprire il file dei gruppi shadow\n" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "%s: errore nel rimuovere la voce dal file delle password\n" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "%s: errore nel rimuovere la voce dal file delle shadow password\n" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "%s errore nel rimuovere la voce dal file DBM delle password\n" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s: errore nel rimuovere la voce dal file DBM delle shadow password\n" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "%s: l'utente %s 癡 attualmente collegato\n" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "%s: %s non appartiene a %s, quindi non viene rimosso\n" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " msgstr "%s: attenzione: impossibile rimuovere " -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" msgstr "%s: l'utente %s non esiste\n" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s: l'utente %s 癡 un utente NIS\n" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "" "%s: la directory %s non viene rimossa (verrebbe eliminata la home " "dell'utente %s)\n" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "%s: errore nel rimuovere la directory %s\n" # NdT: Lasicare i invariati perch矇 la riga sotto 癡 indentata # con due . -#: src/usermod.c:306 +#: src/usermod.c:289 #, c-format msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "Uso: %s\t[-u UID [-o]] [-g GRUPPO] [-G GRUPPO,...] \n" -#: src/usermod.c:310 +# NdT: Lasicare i invariati perch矇 la riga sotto 癡 indentata +# con due . +#: src/usermod.c:293 #, 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:313 +#: src/usermod.c:296 #, c-format msgid "[-f inactive] [-e expire] " msgstr "[-f INATTIVIT] [-e SCADENZA] " -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p PASSWORD] [-L|-U] NOME\n" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" msgstr "%s: memoria esaurita in update_group\n" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "%s: memoria esaurita in update_gshadow\n" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "%s: non 癡 stata fornita nessuna opzione\n" -#: src/usermod.c:965 +#: src/usermod.c:903 #, 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:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "%s: uid 竄%lu罈 non univoco\n" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, c-format msgid "%s: error changing password entry\n" msgstr "%s: errore nel cambio della voce nel file delle password\n" -#: src/usermod.c:1122 +#: src/usermod.c:1053 #, c-format msgid "%s: error removing password entry\n" msgstr "%s: errore nel rimuovere la voce dal file delle password\n" -#: src/usermod.c:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "%s: errore nell'aggiungere la voce al file DBM delle password\n" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "%s: errore nel rimuovere la voce dal file DBM delle password\n" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, 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:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s: errore nel rimuovere la voce dal file DBM delle shadow password\n" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "%s: la directory %s esiste gi\n" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "%s: impossibile creare %s\n" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" msgstr "%s: chown di %s non riuscito\n" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, c-format msgid "%s: cannot rename directory %s to %s\n" msgstr "%s: impossibile rinominare la directory %s in %s\n" -#: src/usermod.c:1333 +#: src/usermod.c:1223 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "%s: attenzione: %s non appartiene a %s\n" -#: src/usermod.c:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" msgstr "impossibile cambiare il proprietario della casella di posta" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" msgstr "impossibile rinominare la casella di posta" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" @@ -2151,21 +2032,21 @@ msgstr "" "\n" "%s: %s non modificato\n" -#: src/vipw.c:133 +#: src/vipw.c:131 msgid "Couldn't lock file" msgstr "Impossibile fare il lock del file" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" msgstr "Impossibile effettuare il backup" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "" "%s: impossibile ripristinare %s: %s (le modifiche effettuate sono in %s)\n" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/po/ja.gmo b/po/ja.gmo index 489c1ac8..e5a0c75c 100644 Binary files a/po/ja.gmo and b/po/ja.gmo differ diff --git a/po/ja.po b/po/ja.po index b91b75b2..5ffc73ef 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,20 +6,21 @@ msgid "" msgstr "" "Project-Id-Version: shadow 1990827\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-26 07:53+0100\n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" "PO-Revision-Date: 2000-06-18 120:22+0900\n" "Last-Translator: Yasuyuki Furukawa \n" "Language-Team: Japanese\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" msgstr "霅血: 銝芥啜怒潦 %s扼\n" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" msgstr "霅血: 啜怒潦憭整\n" @@ -47,17 +48,17 @@ msgstr " 瑯嫘蝞∠函貉艾.\n" msgid " Choose a new password.\n" msgstr " 啜嫘胯潦豢艾.\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "芥柴嫘胯潦%ld乩葉急整.\n" -#: libmisc/age.c:174 +#: libmisc/age.c:172 #, c-format msgid "Your password will expire tomorrow.\n" msgstr "芥柴嫘胯潦舀乓急整.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:174 #, c-format msgid "Your password will expire today.\n" msgstr "芥柴嫘胯潦舀祆交扼.\n" @@ -72,39 +73,26 @@ msgstr "TTY %s憭氬扼整" msgid "Environment overflow\n" msgstr "啣芥潦潦准潦扼\n" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr "$%s憭氬扼整\n" -#: libmisc/failure.c:230 -#, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "敺柴准啜扎喋 %d %s. 敺柴准啜扎喋 %s, 瑯 %s.\n" +#: libmisc/failure.c:229 +#, fuzzy, c-format +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "敺柴准啜扎喋 %d %s. 敺柴准啜扎喋 %s, 瑯 %s.\n" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "憭望" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "憭望" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" msgstr "准啜扎喋憭整.\n" -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "嫘胯潦%s桃撖萸瑕儔扼整.\n" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "%s桃撖萸閮剖扼整扼: keyserv潦Ｕ喋韏瑕艾整?\n" - #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "啜∼潦怒乓艾整." @@ -117,7 +105,7 @@ msgstr "∼潦怒胯整." msgid "You have mail." msgstr "∼潦怒整." -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " msgstr "銝甇芥嫘胯潦扼: %s." @@ -132,20 +120,20 @@ msgstr "passwd: pam_start: 具押 %d\n" msgid "passwd: %s\n" msgstr "嫘胯潦: %s\n" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" msgstr "" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "\"%s\"詻研胯芸氬扼整\n" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" msgstr "研胯芥整. HOME=/ 具艾准啜扎喋整" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr "%s摰銵扼整" @@ -160,35 +148,31 @@ msgstr "銝甇芥怒潦研胯 \"%s\" 扼 \n" msgid "Can't change root directory to \"%s\"\n" msgstr "怒潦研胯芥 \"%s\"詨氬扼整\n" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "malloc(%d) 怠仃整\n" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" msgstr "閮剖梁具桃征摰寥蝣箔扼整扼.\n" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "閮剖具押 - 銝芥Ｕ扎 '%s'扼 (notify administrator)\n" -#: lib/pwauth.c:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "嫘胯潦: " -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "%s柴嫘胯潦: " -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "" - -#: src/chage.c:118 +#: src/chage.c:112 #, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" @@ -197,156 +181,149 @@ msgstr "" "雿輻冽: chage [-l] [-m 撠交財 [-M 憭扳交財 [-W 霅血]\n" " [-I ∪鉛 [-E ] [-d 敺包 艾潦跚n" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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:155 +#: src/chage.c:149 msgid "Minimum Password Age" msgstr "撠嫘胯潦憭港航賣交" -#: src/chage.c:161 +#: src/chage.c:155 msgid "Maximum Password Age" msgstr "憭扼嫘胯潦憭游航賣交" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" msgstr "敺嫘胯潦憭湔乩 (YYYY-MM-DD)" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" msgstr "嫘胯潦霅血交" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "嫘胯潦∪寞交" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Ｕ怒艾喋乩 (YYYY-MM-DD)" -#: src/chage.c:238 +#: src/chage.c:231 #, fuzzy, c-format msgid "Last password change\t\t\t\t\t: " msgstr "敺嫘胯潦憭湔乩 (YYYY-MM-DD)" -#: src/chage.c:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 #, fuzzy, c-format msgid "never\n" msgstr "芥:\n" -#: src/chage.c:251 +#: src/chage.c:244 #, fuzzy, c-format msgid "Password expires\t\t\t\t\t: " msgstr "嫘胯潦:\t" -#: src/chage.c:267 +#: src/chage.c:260 #, fuzzy, c-format msgid "Password inactive\t\t\t\t\t: " msgstr "嫘胯潦∪:\t" -#: src/chage.c:281 +#: src/chage.c:274 #, fuzzy, c-format msgid "Account expires\t\t\t\t\t\t: " msgstr "Ｕ怒艾喋:\t" -#: src/chage.c:297 +#: src/chage.c:290 #, c-format msgid "Minimum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:298 +#: src/chage.c:292 #, c-format msgid "Maximum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:299 +#: src/chage.c:294 #, c-format msgid "Number of days of warning before password expires\t: %ld\n" msgstr "" -#: src/chage.c:444 +#: src/chage.c:431 #, c-format msgid "%s: do not include \"l\" with other flags\n" msgstr "%s: 隞柴押啜柴 \"l\" 芥瑯扼喋臬怒整具扼整\n" -#: src/chage.c:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 #, fuzzy, c-format msgid "%s: permission denied.\n" msgstr "%s: 璅拚整\n" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 #, fuzzy, c-format msgid "%s: PAM authentication failed\n" msgstr "扎嫘怒艾嫘胯潦隤閮潦整.\n" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, c-format msgid "%s: can't open password file\n" msgstr "%s: 嫘胯潦∼扎怒整\n" -#: src/chage.c:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "%s: 銝芥艾潦 %s 扼\n" -#: src/chage.c:535 +#: src/chage.c:519 #, fuzzy, c-format msgid "%s: can't lock shadow password file" msgstr "瑯艾颯嫘胯潦颯∼扎怒准胯扼整\n" -#: src/chage.c:543 +#: src/chage.c:527 #, fuzzy, c-format msgid "%s: can't open shadow password file" msgstr "%s: 瑯艾颯嫘胯潦颯∼扎怒整\n" -#: src/chage.c:604 +#: src/chage.c:587 #, c-format msgid "Changing the aging information for %s\n" msgstr "%s格晞憭港葉\n" -#: src/chage.c:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" msgstr "%s: 桀氬扼具押潦韏瑯整\n" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, c-format msgid "%s: can't update password file\n" msgstr "%s: 嫘胯潦颯∼扎怒湔啜整\n" -#: src/chage.c:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" msgstr "%s: 瑯艾颯嫘胯潦颯∼扎怒湔啜整\n" -#: src/chage.c:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, fuzzy, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "嫘胯潦亙格湔啜柴具押潦扼.\n" - -#: src/chage.c:692 +#: src/chage.c:649 #, fuzzy, c-format msgid "%s: can't rewrite shadow password file\n" msgstr "%s: 瑯艾颯嫘胯潦颯∼扎怒扎扼整\n" -#: src/chage.c:740 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite password file\n" msgstr "%s: 嫘胯潦颯∼扎怒銝詻扼整\n" -#: src/chage.c:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 #, fuzzy, c-format msgid "%s: PAM chauthtok failed\n" msgstr "%s: ∼扎怒准胯扼整\n" @@ -365,117 +342,122 @@ msgstr "" msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" msgstr "雿輻冽: %s [-f 怒潦] [-r 怒潦No] [-w 瑕幅EL] [-h 芸TEL]\n" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "怒潦" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "\t怒潦: %s\n" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "典芸" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "瑕湧餉店芸" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" msgstr "芸餉店芸" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "桐" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s: 芥柴艾潦嗅文扼整.\n" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s: NIS胯押扎Ｕ喋銝扼艾潦跆%s'臬氬扼整.\n" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "%s: `%s'柴胯押扎Ｕ喋具奘IS嫘踴潦扼.\n" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, fuzzy, c-format +msgid "%s: Permission denied.\n" +msgstr "%s: 璅拚整\n" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" msgstr "%s柴艾潦嗆勗港葉\n" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s: 艾潦嗅銝甇扼: \"%s\"\n" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s: 典芸瑯銝甇扼: \"%s\"\n" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s: 瑕湧餉店芸瑯銝甇扼: \"%s\"\n" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s: 芸餉店芸瑯銝甇扼: \"%s\"\n" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s: \"%s\" 臭甇芣摮怒扼整\n" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "%s: 亙摰嫘琿整\n" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" msgstr "IDroot詨氬扼整.\n" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" msgstr "嫘胯潦颯∼扎怒准胯扼整; 敺扼銝摨西岫艾.\n" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" msgstr "嫘胯潦颯∼扎怒整.\n" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s: %s /etc/passwd銝准怨隞整\n" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" msgstr "嫘胯潦亙格湔啜柴具押潦扼.\n" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" msgstr "嫘胯潦颯∼扎怒桀氬蝣箏(commit)扼整.\n" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" msgstr "嫘胯潦颯∼扎怒准航圾扎扼整.\n" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -492,48 +474,48 @@ msgstr "" msgid "%s: can't lock password file\n" msgstr "%s: 嫘胯潦∼扎怒准胯扼整\n" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "%s: 瑯艾颯∼扎怒准胯扼整\n" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "%s: 瑯艾颯∼扎怒整\n" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "%s: %d 銵: 1銵琿整\n" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "%s: %d 銵: 啗嫘胯潦整\n" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "%s: %d 銵: 銝芥艾潦 %s 扼\n" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "%s: %d 銵: 嫘胯潦亙湔啜扼整\n" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "%s: 具押潦璊箝整, 憭氬舐∪嫘怒芥整\n" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" msgstr "%s: 瑯艾颯∼扎怒格湔啜怒具押潦扼\n" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" msgstr "%s: 嫘胯潦颯∼扎怒格湔啜柴具押潦扼\n" @@ -543,26 +525,26 @@ msgstr "%s: 嫘胯潦颯∼扎怒格湔啜柴具押潦扼\n" msgid "Usage: %s [-s shell] [name]\n" msgstr "雿輻冽: %s [-s 瑯扼侷 [艾潦嗅]\n" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" msgstr "准啜扎喋颯瑯扼" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" msgstr "芥 %s柴瑯扼怒憭氬具胯扼整.\n" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" msgstr "%s柴准啜扎喋瑯扼怒憭港葉\n" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s: 銝甇芸亙: %s\n" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" msgstr "%s臭甇芥瑯扼怒扼.\n" @@ -572,12 +554,12 @@ msgstr "%s臭甇芥瑯扼怒扼.\n" msgid "Usage: expiry {-f|-c}\n" msgstr "雿輻冽: expiry {-f|-c}\n" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" msgstr "%s: 霅血! set-UID root艾芥艾胯芥整!\n" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "%s: 銝芥艾潦嗚扼\n" @@ -591,320 +573,285 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" msgstr "" -#: src/faillog.c:86 +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" -msgstr "艾潦嗅 憭望 憭 餈\n" +msgid "Login Failures Maximum Latest On\n" +msgstr "" -#: src/faillog.c:103 -#, fuzzy, c-format -msgid " %s on %s" -msgstr "餈柴准啜扎: %s on %s" - -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" msgstr "" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr "" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "銝芥艾潦嗚扼: %s\n" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "雿輻冽: %s [-r|-R] 啜怒潦\n" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr " %s [-d 艾潦跑 啜怒潦\n" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr " %s [-d 艾潦跑 啜怒潦\n" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr " %s [-A 艾潦,...] [-M 艾潦,...] 啜怒潦\n" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr " %s [-M 艾潦,...] 啜怒潦\n" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" msgstr "%s: 瑯艾颯啜怒潦颯嫘胯潦 -A怠紋血閬扼\n" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "芥航狐?\n" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr "銝芥啜怒潦扼: %s\n" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "艾潦 %s 啜怒潦 %s 餈賢\n" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "艾潦 %s 啜怒潦 %s 么n" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" msgstr "%s: 銝芰芸 %s扼\n" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "%s: TTY扼胯整\n" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "%s啜怒潦柴嫘胯潦憭廄n" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "啗嫘胯潦: " -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " msgstr "啗嫘胯潦亙: " -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" msgstr "銝氬整; 銝摨艾憿整" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" msgstr "%s: 敺扼銝摨艾憿整\n" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "%s: 准胯扼整\n" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" msgstr "%s: 瑯艾准胯扼整\n" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "%s: ∼扎怒整\n" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "%s: 具喋芥湔啜扼整\n" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" msgstr "%s: 瑯艾颯具喋芥湔啜扼整\n" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "%s: ∼扎怒銝詻扼整\n" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" msgstr "%s: 瑯艾颯∼扎怒銝詻扼整\n" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "%s: ∼扎怒准胯扼整\n" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "%s: DBM ∼扎怒湔啜扼整\n" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "%s: DBM 瑯艾颯∼扎怒湔啜扼整\n" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "雿輻冽: groupadd [-g 啜怒潦ID [-o]] [-f] 啜怒潦\n" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, c-format msgid "%s: error adding new group entry\n" msgstr "%s: 啗啜怒潦具喋芥貉蕭柴具押潦扼\n" -#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: 啗DBM啜怒潦颯具喋芥貉蕭扼整\n" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "%s: %s 舫銴艾整\n" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" msgstr "%s: 艾潦貂D %u 銴艾整\n" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "%s: 銝柴啜怒潦ID敺扼整\n" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, c-format msgid "%s: %s is not a valid group name\n" msgstr "%s: %s 臬銴艾整\n" -#: src/groupadd.c:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "%s: 啜怒潦 %s 臭拙扼\n" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s: 啜怒潦颯∼扎怒整\n" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s: 瑯艾颯啜怒潦颯∼扎怒整\n" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, fuzzy, c-format msgid "%s: unable to lock group file\n" msgstr "%s: 啜怒潦颯∼扎怒准胯扼整\n" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, fuzzy, c-format msgid "%s: unable to open group file\n" msgstr "%s: 啜怒潦∼扎怒整\n" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, fuzzy, c-format msgid "%s: unable to lock shadow group file\n" msgstr "%s: 瑯艾颯啜怒潦颯∼扎怒准胯扼整\n" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, fuzzy, c-format msgid "%s: unable to open shadow group file\n" msgstr "%s: 瑯艾颯啜怒潦颯∼扎怒整\n" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, fuzzy, c-format msgid "%s: group %s exists\n" msgstr "%s: 艾潦 %s 臬具整\n" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, fuzzy, c-format msgid "Usage: groupdel group\n" msgstr "雿輻冽: groupdel 啜怒潦\n" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, fuzzy, c-format msgid "%s: error removing group entry\n" msgstr "%s: 啜怒潦颯具喋芥格湔啜柴具押潦扼\n" -#: src/groupdel.c:119 src/groupmod.c:205 -#, fuzzy, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "%s: 嫘胯潦DBM具喋芸扎柴具押潦扼\n" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, fuzzy, c-format msgid "%s: error removing shadow group entry\n" msgstr "%s: 瑯艾颯嫘胯潦颯具喋芸扎柴具押潦扼\n" -#: src/groupdel.c:149 src/groupmod.c:255 -#, fuzzy, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "%s: 瑯艾嫘胯潦 DBM具喋 桀扎柴具押墦n" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, fuzzy, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "%s: DBM啜怒潦颯具喋芥湔啜扼整\n" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "%s: %s啜怒潦 臬具整\n" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "%s: %s啜怒潦 NIS 柴啜怒潦扼\n" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s: %s NIS 嫘踴潦扼\n" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "雿輻冽: groupmod [-g 啜怒潦ID [-o]] [-n ] 啜怒潦\n" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "%s: /etc/group %s 閬隞整\n" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s: 啗DBM瑯艾颯啜怒潦颯具喋芥餈賢扼整\n" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s: %u 胯啜怒潦ID銴艾整\n" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "%s: %s 臬銴艾整\n" @@ -914,110 +861,105 @@ msgstr "%s: %s 臬銴艾整\n" msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "雿輻冽: %s [-r] [-s] [啜怒潦 [啜怒潦瑯因]\n" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "雿輻冽: %s [-r] [-s] [啜怒潦]\n" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" msgstr "" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "%s: ∼扎 %s 准胯扼整\n" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "%s: ∼扎 %s 整\n" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" msgstr "銝甇芥啜怒潦颯∼扎怒柴具喋芥扼\n" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "`%s'銵扎整? " -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" msgstr "啜怒潦具喋芥銴艾整\n" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" msgstr "銝甇芥啜怒潦 `%s' 扼\n" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "啜怒潦 %s: 艾潦 %s 胯整\n" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " msgstr "∼喋 `%s' 扎整? " -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" msgstr "瑯艾颯啜怒潦颯∼扎怒颯具喋芥銝甇扼\n" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" msgstr "啜怒潦具喋芥銴艾整\n" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" msgstr "啜怒潦∼扎怒具喋芥其氬整\n" -#: src/grpck.c:558 +#: src/grpck.c:553 #, fuzzy, c-format msgid "shadow group %s: no administrative user %s\n" msgstr "啜怒潦 %s: 艾潦 %s 胯整\n" -#: src/grpck.c:560 +#: src/grpck.c:555 #, fuzzy, c-format msgid "delete administrative member `%s'? " msgstr "∼喋 `%s' 扎整? " -#: src/grpck.c:588 +#: src/grpck.c:583 #, fuzzy, c-format msgid "shadow group %s: no user %s\n" msgstr "啜怒潦 %s: 艾潦 %s 胯整\n" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, fuzzy, c-format msgid "%s: cannot update file %s\n" msgstr "%s: ∼扎 %s 整\n" -#: src/grpck.c:647 src/pwck.c:612 -#, fuzzy, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: ∼扎怒舀湔啜整\n" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format -msgid "%s: no changes\n" -msgstr "%s: 憭氬胯整\n" - -#: src/grpck.c:651 src/pwck.c:616 +#: src/grpck.c:640 src/pwck.c:606 #, c-format msgid "%s: the files have been updated\n" msgstr "%s: ∼扎怒舀湔啜整\n" +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "%s: 憭氬胯整\n" + #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" @@ -1033,37 +975,37 @@ msgstr "%s: 啜怒潦∼扎怒整\n" msgid "%s: can't lock shadow group file\n" msgstr "%s: 瑯艾颯啜怒潦颯∼扎怒准胯扼整\n" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" msgstr "%s: 瑯艾颯啜怒潦颯∼扎怒整\n" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "%s: 瑯艾颯啜怒潦 %s 扎扼整\n" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "%s: %s 柴瑯艾颯具喋芥湔啜扼整\n" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "%s: 啜怒潦 %s 柴具喋芥湔啜扼整\n" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" msgstr "%s: 瑯艾颯啜怒潦颯∼扎怒湔啜扼整\n" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" msgstr "%s: 啜怒潦颯∼扎怒湔啜扼整\n" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "%s: 啜怒潦颯∼扎怒扎扼整\n" @@ -1083,52 +1025,52 @@ msgstr "雿輻冽: id\n" msgid " groups=" msgstr " 啜怒潦=" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" msgstr "艾潦嗅 潦 湔 餈柴准啜扎許n" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "艾潦嗅 潦 餈柴准啜扎許n" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "**銝摨艾准啜扎喋胯整**" -#: src/login.c:175 +#: src/login.c:156 #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "雿輻冽: %s [-p] [艾潦嗅]\n" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr " %s [-p] [-h 嫘] [-f 艾潦嗅]\n" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr " %s [-p] -r 嫘\n" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" msgstr "准啜扎單銝甇扼\n" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" @@ -1137,31 +1079,31 @@ msgstr "" "\n" "瑯嫘胯∼喋喋嫘怒潦喋怠紋阡整\n" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" "[Disconnect bypassed -- root login allowed.]\n" msgstr "" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" "Login timed out after %d seconds.\n" msgstr "" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" msgstr "" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" msgstr "" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" @@ -1170,38 +1112,29 @@ msgstr "" "\n" "%s 准啜扎: " -#: src/login.c:819 -msgid "login: " -msgstr "准啜扎: " - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" msgstr "准啜扎喋整" -#: src/login.c:1198 +#: src/login.c:996 msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "" -#: src/login.c:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "餈柴准啜扎: %s on %s" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" msgstr "餈柴准啜扎: %.19s on %s" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" msgstr " 湔 %.*s" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" @@ -1242,17 +1175,17 @@ msgstr "%s: 啗啜怒潦具喋芥貉蕭柴具押潦扼\n" msgid "added %d entries, longest was %d\n" msgstr "" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "雿輻冽: %s [-vf] [-p|g|sp|sg] ∼扎俞n" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "雿輻冽: %s [-vf] [-p|g|sp] ∼扎俞n" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "雿輻冽: %s [-vf] [-p|g] ∼扎俞n" @@ -1272,16 +1205,16 @@ msgstr "雿輻冽: sg 啜怒潦 [[-c] 喋喋]\n" msgid "unknown uid: %u\n" msgstr "銝芥艾潦貂D扼: %u\n" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" msgstr "銝芥啜怒潦ID扼: %lu\n" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "喋閮喋整.\n" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "啜怒潦憭整\n" @@ -1291,107 +1224,107 @@ msgstr "啜怒潦憭整\n" msgid "Usage: %s [input]\n" msgstr "雿輻冽: %s [亙]\n" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "%s: /etc/passwd 准胯扼整.\n" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "%s: ∼扎怒准胯扼整, 敺扼銝摨西岫艾\n" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "%s: ∼扎怒整\n" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "%s: %d銵: 銝甇銵扼\n" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "%s: %d銵: 啜怒潦ID雿扼整\n" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "%s: %d銵: 艾潦貂D雿扼整\n" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "%s: %d銵: 艾潦 %s 閬隞整\n" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "%s: %d銵: 嫘胯潦湔啜扼整\n" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "%s: %d銵: mkdir 怠仃整\n" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "%s: %d銵: chown 怠仃整\n" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "%s: %d銵: 具喋芥湔啜扼整\n" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "%s: ∼扎急湔啜柴具押潦扼\n" -#: src/passwd.c:155 +#: src/passwd.c:154 #, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "雿輻冽: %s [-f|-s] [艾潦嗅]\n" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr " %s [-x 憭吞 [-n 撠] [-w 霅血] [-i ∪鉛 艾潦嗅\n" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} 艾潦嗅\n" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "扎嫘胯潦: " -#: src/passwd.c:225 +#: src/passwd.c:223 #, fuzzy, c-format msgid "Incorrect password for `%s'\n" msgstr "%s柴嫘胯潦桀廄n" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" "Please use a combination of upper and lower case letters and numbers.\n" msgstr "" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "啜嫘胯潦: " -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" msgstr "銝摨艾憿整.\n" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" @@ -1401,52 +1334,52 @@ msgstr "" "霅血: 嫘胯潦扼 (押艾雿踴游, 銝摨艾亙艾" ").\n" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" msgstr "銝氬整: 銝摨艾憿整.\n" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "%s 柴嫘胯潦臬氬扼整.\n" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" msgstr "喋閮喋整, %s 柴嫘胯潦胯整憭氬具胯扼整.\n" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "%s: ∼Ｕ芥整\n" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "%s: %s摰銵扼整" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" msgstr "%s: 研詻 %s 胯萸潦艾整\n" -#: src/passwd.c:914 -#, c-format -msgid "You may not change the password for %s.\n" +#: src/passwd.c:884 +#, fuzzy, c-format +msgid "%s: You may not view or modify password information for %s.\n" msgstr "芥 %s 柴嫘胯潦憭氬具胯扼整.\n" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "%s柴嫘胯潦桀廄n" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "%s柴嫘胯潦臬氬整.\n" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "嫘胯潦臬氬整.\n" @@ -1461,49 +1394,49 @@ msgstr "雿輻: %s [-q] [-r] [-s] [嫘胯潦 [瑯因]\n" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "雿輻: %s [-q] [-r] [-s] [嫘胯潦]\n" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" msgstr "嫘胯潦颯∼扎怒颯具喋芥銝甇扼\n" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" msgstr "嫘胯潦具喋芥銴艾整\n" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" msgstr "銝甇芥艾潦嗅'%s' 扼\n" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "艾潦 %s: 啜怒潦 %u 整\n" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "艾潦 %s: 研胯 %s 摮具整\n" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "艾潦 %s: 准啜押 %s 臬具整\n" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" msgstr "銝甇芥瑯艾颯嫘胯潦颯具喋芥扼\n" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" msgstr "瑯艾颯嫘胯潦颯具喋芥銴艾整\n" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" msgstr "嫘胯潦颯∼扎怒颯具喋芥其氬整\n" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" msgstr "艾潦 %s: 敺柴嫘胯潦憭氬芣乓怒整\n" @@ -1523,17 +1456,17 @@ msgstr "%s: 嫘胯潦∼扎怒整\n" msgid "%s: can't remove shadow entry for %s\n" msgstr "%s: %s柴瑯艾颯具喋芥扎扼整\n" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "%s: %s柴嫘胯潦具喋芥湔啜扼整\n" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" msgstr "%s: 瑯艾∼扎怒湔啜扼整\n" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" msgstr "%s: 嫘胯潦∼扎怒湔啜扼整\n" @@ -1543,40 +1476,40 @@ msgstr "%s: 嫘胯潦∼扎怒湔啜扼整\n" msgid "%s: can't update entry for user %s\n" msgstr "%s: 艾潦 %s 柴具喋芥湔啜扼整\n" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format msgid "%s: can't delete shadow password file\n" msgstr "%s: 瑯艾颯嫘胯潦颯∼扎怒扎扼整\n" -#: src/su.c:133 +#: src/su.c:132 msgid "Sorry." msgstr "喋閮喋整." -#: src/su.c:323 +#: src/su.c:320 #, c-format msgid "%s: must be run from a terminal\n" msgstr "%s: 蝡舀思摰銵艾\n" -#: src/su.c:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "%s: pam_start: 具押 %d\n" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" msgstr "銝 ID扼: %s\n" -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, c-format msgid "You are not authorized to su %s\n" msgstr "芥 su %s 怨閮潦扼整扼\n" -#: src/su.c:502 +#: src/su.c:495 msgid "(Enter your own password.)" msgstr "(芥芾澈柴嫘胯潦亙艾.)" -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" @@ -1585,22 +1518,22 @@ msgstr "" "%s: %s\n" "(∪)\n" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" msgstr "瑯扼怒整\n" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr "su扼柴Ｕ怒艾喋詻Ｕ胯颯嫘具艾整.\n" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "扎嫘怒艾嫘胯潦隤閮潦整.\n" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" msgstr "隤閮潦具, 芥柴嫘胯潦亙艾.\n" @@ -1615,242 +1548,222 @@ msgstr "嫘胯潦∼扎怒整\n" msgid "No password entry for 'root'\n" msgstr "'root'柴嫘胯潦具喋芥整\n" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" "(or give root password for system maintenance):" msgstr "" -#: src/sulogin.c:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" msgstr "瑯嫘∼喋喋嫘Ｕ潦詨乓整\n" -#: src/useradd.c:239 -#, fuzzy, c-format -msgid "%s: rebuild the group database\n" -msgstr "%s: 啜怒潦 %s 臭拙扼\n" - -#: src/useradd.c:248 -#, fuzzy, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "%s: 瑯艾颯啜怒潦颯∼扎怒整\n" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, fuzzy, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "%s: 喋∼喋 `%s' 臭甇扼\n" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "%s: 銝芥啜怒潦ID %s\n" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "%s: 銝芥啜怒潦 %s\n" -#: src/useradd.c:475 +#: src/useradd.c:418 #, fuzzy, c-format msgid "%s: cannot create new defaults file\n" msgstr "%s: 啜怒潦颯∼扎怒整\n" -#: src/useradd.c:480 +#: src/useradd.c:423 #, fuzzy, c-format msgid "%s: cannot open new defaults file\n" msgstr "%s: 啜怒潦颯∼扎怒整\n" -#: src/useradd.c:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, fuzzy, c-format msgid "%s: rename: %s" msgstr "%s: %s雿扼整" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, fuzzy, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s: %s啜怒潦 NIS 柴啜怒潦扼\n" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "" -#: src/useradd.c:721 +#: src/useradd.c:660 #, c-format msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n" msgstr "雿輻冽: useradd [-u 艾潦貂D [-o]] [-g 啜怒潦] [-G 啜怒潦,...] \n" -#: src/useradd.c:724 +#: src/useradd.c:663 #, c-format msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr "" " [-d 潦] [-s 瑯扼侷 [-c 喋∼喋]\n" " [-m [-k 喋研潦]]\n" -#: src/useradd.c:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, c-format msgid " [-f inactive] [-e expire]\n" msgstr " [-f ∪寞交財 [-e 包\n" -#: src/useradd.c:728 +#: src/useradd.c:667 #, c-format msgid " [-p passwd] name\n" msgstr " [-p 嫘胯潦] 艾潦嗅\n" -#: src/useradd.c:730 +#: src/useradd.c:669 #, c-format msgid " useradd -D [-g group] [-b base] [-s shell]\n" msgstr " useradd -D [-g 啜怒潦] [-b 潦鉛 [-s 瑯扼侷\n" -#: src/useradd.c:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, fuzzy, c-format msgid "%s: error locking group file\n" msgstr "%s: 啜怒潦颯∼扎怒准胯扼整\n" -#: src/useradd.c:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, fuzzy, c-format msgid "%s: error opening group file\n" msgstr "%s: 啜怒潦颯∼扎怒整\n" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, fuzzy, c-format msgid "%s: error locking shadow group file\n" msgstr "%s: 瑯艾颯啜怒潦颯∼扎怒准胯扼整\n" -#: src/useradd.c:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, fuzzy, c-format msgid "%s: error opening shadow group file\n" msgstr "%s: 瑯艾颯啜怒潦颯∼扎怒整\n" -#: src/useradd.c:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "%s: 艾潦貂D %u 銴艾整\n" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "%s: 銝柴艾潦貂D敺扼整\n" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "%s: 潦嫘研胯 `%s' 臭甇扼\n" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "%s: 喋∼喋 `%s' 臭甇扼\n" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "%s: 潦研胯 `%s' 臭甇扼\n" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s: 乩 `%s' 臭甇扼\n" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, fuzzy, c-format msgid "%s: shadow passwords required for -e\n" msgstr "%s: 瑯艾颯嫘胯潦怒 -e -e 敹閬扼\n" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, fuzzy, c-format msgid "%s: shadow passwords required for -f\n" msgstr "%s: 瑯艾颯嫘胯潦怒 -e -e 敹閬扼\n" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, fuzzy, c-format msgid "%s: invalid field `%s'\n" msgstr "%s: 瑯扼 `%s' 臭甇扼\n" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "%s: 瑯扼 `%s' 臭甇扼\n" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, fuzzy, c-format msgid "%s: invalid user name '%s'\n" msgstr "銝甇芥艾潦嗅'%s' 扼\n" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, fuzzy, c-format msgid "%s: cannot rewrite password file\n" msgstr "%s: 嫘胯潦颯∼扎怒銝詻扼整\n" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, fuzzy, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "%s: 瑯艾颯嫘胯潦颯∼扎怒扎扼整\n" -#: src/useradd.c:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, fuzzy, c-format msgid "%s: unable to lock password file\n" msgstr "%s: 嫘胯潦∼扎怒准胯扼整\n" -#: src/useradd.c:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, fuzzy, c-format msgid "%s: unable to open password file\n" msgstr "%s: 嫘胯潦∼扎怒整\n" -#: src/useradd.c:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, fuzzy, c-format msgid "%s: cannot lock shadow password file\n" msgstr "瑯艾颯嫘胯潦颯∼扎怒准胯扼整\n" -#: src/useradd.c:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, fuzzy, c-format msgid "%s: cannot open shadow password file\n" msgstr "%s: 瑯艾颯嫘胯潦颯∼扎怒整\n" -#: src/useradd.c:1459 +#: src/useradd.c:1354 #, fuzzy, c-format msgid "%s: error adding new password entry\n" msgstr "%s: 嫘胯潦DBM具喋芾蕭柴具押潦扼\n" -#: src/useradd.c:1473 -#, fuzzy, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "%s: 嫘胯潦DBM具喋芸扎柴具押潦扼\n" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, fuzzy, c-format msgid "%s: error adding new shadow password entry\n" msgstr "%s: 瑯艾颯嫘胯潦颯具喋芸扎柴具押潦扼\n" -#: src/useradd.c:1505 src/usermod.c:1168 -#, fuzzy, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s: 瑯艾嫘胯潦 DBM具喋 桀扎柴具押墦n" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, fuzzy, c-format msgid "%s: cannot create directory %s\n" msgstr "%s: 研胯%s %s詨憭氬扼整\n" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, c-format msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n" msgstr "" -#: src/useradd.c:1590 +#: src/useradd.c:1446 #, fuzzy, c-format msgid "Can't create mail spool for user %s.\n" msgstr "%s: 艾潦 %s 柴具喋芥湔啜扼整\n" -#: src/useradd.c:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "%s: 艾潦 %s 臬具整\n" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" @@ -1858,205 +1771,170 @@ msgstr "" "%s: 啜怒潦 %s 臬具整 柴艾潦嗚柴啜怒潦貉蕭怒, -" "g 拍具艾.\n" -#: src/useradd.c:1767 +#: src/useradd.c:1602 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" msgstr "" -#: src/userdel.c:124 +#: src/userdel.c:108 #, c-format msgid "Usage: %s [-r] name\n" msgstr "雿輻冽: %s [-r] 艾潦嗅\n" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" msgstr "%s: 啜怒潦颯具喋芥格湔啜柴具押潦扼\n" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "%s: DBM啜怒潦颯具喋芥湔啜扼整\n" - -#: src/userdel.c:214 -#, fuzzy, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: DBM啜怒潦颯具喋芥湔啜扼整\n" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "%s: 啜怒潦颯∼扎怒整\n" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "%s: 瑯艾颯啜怒潦颯∼扎怒整\n" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "%s: 嫘胯潦颯具喋芸扎柴具押潦扼\n" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "%s: 瑯艾颯嫘胯潦颯具喋芸扎柴具押潦扼\n" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "%s: 嫘胯潦DBM具喋芸扎柴具押潦扼\n" - -#: src/userdel.c:440 -#, fuzzy, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s: 瑯艾颯嫘胯潦颯具喋芸扎柴具押潦扼\n" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "%s: 艾潦 %s 舐曉具准啜扎喃葉扼\n" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "%s: %s %s格扼胯整, 扎航整\n" -#: src/userdel.c:600 +#: src/userdel.c:502 #, fuzzy, c-format msgid "%s: warning: can't remove " msgstr "%s: 霅血: %s %s格扼胯整\n" -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" msgstr "%s: 艾潦 %s 臬具整\n" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s: 艾潦 %s NIS 艾潦嗚扼\n" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "%s: 研胯%s 桀扎航整 (would remove home of user %s)\n" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "%s: 研胯 %s 桀扎柴具押潦扼\n" -#: src/usermod.c:306 +#: src/usermod.c:289 #, c-format msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "雿輻冽: %s\t[-u 艾潦貂D [-o]] [-g 啜怒潦] [-G 啜怒潦,...] \n" -#: src/usermod.c:310 +#: src/usermod.c:293 #, 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:313 +#: src/usermod.c:296 #, c-format msgid "[-f inactive] [-e expire] " msgstr "[-f ∪寞交財 [-e 包 " -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p 嫘胯潦] [-L|-U] 艾潦嗅\n" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" msgstr "%s: update_group 銝准怒∼Ｕ芥銝頞喋整\n" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "%s: update_shdow 銝准怒∼Ｕ芥銝頞喋整\n" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "%s: 脯具扎押啜摰艾整\n" -#: src/usermod.c:965 +#: src/usermod.c:903 #, c-format msgid "%s: shadow passwords required for -e and -f\n" msgstr "%s: 瑯艾颯嫘胯潦怒 -e -e 敹閬扼\n" -#: src/usermod.c:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "%s: 艾潦貂D %lu 銴艾整\n" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, c-format msgid "%s: error changing password entry\n" msgstr "%s: 嫘胯潦颯具喋芸氬柴具押潦扼\n" -#: src/usermod.c:1122 +#: src/usermod.c:1053 #, c-format msgid "%s: error removing password entry\n" msgstr "%s: 嫘胯潦颯具喋芸扎柴具押潦扼\n" -#: src/usermod.c:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "%s: 嫘胯潦DBM具喋芾蕭柴具押潦扼\n" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "%s: 嫘胯潦DBM具喋芸扎柴具押潦扼\n" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "%s: 瑯艾颯嫘胯潦颯具喋芸扎柴具押潦扼\n" -#: src/usermod.c:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s: 瑯艾嫘胯潦 DBM具喋 桀扎柴具押墦n" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "%s: 研胯 %s臬具整\n" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "%s: %s 雿扼整\n" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" msgstr "%s: %schown扼整\n" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, c-format msgid "%s: cannot rename directory %s to %s\n" msgstr "%s: 研胯%s %s詨憭氬扼整\n" -#: src/usermod.c:1333 +#: src/usermod.c:1223 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "%s: 霅血: %s %s格扼胯整\n" -#: src/usermod.c:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" msgstr "mailbox格桀氬怠仃整" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" msgstr "mailbox桀憭氬怠仃整" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" @@ -2065,20 +1943,20 @@ msgstr "" "\n" "%s: %s 桀氬航整\n" -#: src/vipw.c:133 +#: src/vipw.c:131 msgid "Couldn't lock file" msgstr "∼扎怒准胯扼整" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" msgstr "胯Ｕ雿扼整" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s: %s敺拇扼扼整扼: %s (芥桀氬%s怒整)\n" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/po/ko.gmo b/po/ko.gmo index 3b46e5c1..e8342b78 100644 Binary files a/po/ko.gmo and b/po/ko.gmo differ diff --git a/po/ko.po b/po/ko.po index 8304a5ae..c52012bd 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,25 +1,26 @@ -# shadow korean translations -# Hwang, SangJin , 1999. -# Changwoo Ryu , 2004. -# +# shadow korean translations +# Hwang, SangJin , 1999. +# Changwoo Ryu , 2004, 2005. +# msgid "" msgstr "" -"Project-Id-Version: shadow\n" +"Project-Id-Version: shadow 4.0.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-26 07:53+0100\n" -"PO-Revision-Date: 2004-04-05 12:30+0900\n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" +"PO-Revision-Date: 2005-04-19 16:02+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" msgstr "窶赭: 篞賈ㄨ(%s)\n" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" msgstr "窶赭: 篞賈ㄨ穈 諡 諤\n" @@ -47,17 +48,17 @@ msgstr " 欠 窵謔科 渣原.\n" msgid " Choose a new password.\n" msgstr " 諢 渥篣諝 賄.\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "渥篣 科抱萼 %ld潰 拘.\n" -#: libmisc/age.c:174 +#: libmisc/age.c:172 #, c-format msgid "Your password will expire tomorrow.\n" msgstr "渥篣 科抱萼 渥 拘.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:174 #, c-format msgid "Your password will expire today.\n" msgstr "渥篣 科抱萼 月 拘.\n" @@ -72,39 +73,28 @@ msgstr "%s tty(刺圉站)諝 諻篹 蛟" msgid "Environment overflow\n" msgstr "窶 貐 月諢豹n" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr "$%s 貐 諻篹 蛟么n" -#: libmisc/failure.c:230 +#: libmisc/failure.c:229 #, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "諤鴔諤 諢篞賄賄潺賱 %d %s. 諤鴔諤 諢篞賄賄 %s 伊 %s.\n" +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "" +"諤鴔諤 諢篞賄 渣 %d貒 欠.\n" +"諤鴔諤 諢篞賄賄 %s, %s.\n" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "欠" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "欠" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" msgstr "諢篞賄賄穈 諤蛟.\n" -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "渥篣 %s 赬諻月未 渥 .\n" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "%s 赬諻渥諝 木 蛟: keyserv圉狀 欠鴗篧?\n" - #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "諢 諰潰 麆拗蛟." @@ -117,7 +107,7 @@ msgstr "諰 ." msgid "You have mail." msgstr "諰潰 蛟." -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " msgstr "諈骰 渥篣: %s. " @@ -132,20 +122,20 @@ msgstr "渥篣: pam_start() 欠刮蛟, 月 %d\n" msgid "passwd: %s\n" msgstr "渥篣: %s\n" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" msgstr "passwd: 渥篣 梓陬潺 域渣貲蛟么n" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "\"%s\" 謔禺 渠 蛟么n" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" msgstr "謔禹 , 諴刮 謔(/)諢 諢篞賄貲拘" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr "%s(諝) 欠 蛟" @@ -160,37 +150,33 @@ msgstr "諴刮 謔 \"%s\"(穈) 諈骰蛟么n" msgid "Can't change root directory to \"%s\"\n" msgstr "諴刮 謔禺未 \"%s\"()諢 諻篹 蛟么n" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "malloc(%d) 欠刮\n" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" msgstr "木 貐渠未 窸虛 貐渠未 蛟.\n" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "" "木 月 - 卿版 '%s'(穈) 蛟 (窵謔科窶 謔禹萼 諻" ")\n" -#: lib/pwauth.c:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "渥篣: " -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "%s 渥篣: " -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "(儠 儤) " - -#: src/chage.c:118 +#: src/chage.c:112 #, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" @@ -199,154 +185,147 @@ msgstr "" "科拘: chage [-l] [-m 黖潰] [-M 黖潰] [-W 窶赭潰]\n" " [-I 諡渣到潰] [-E 諤諴潰] [-d 諤鴔諤 貐窶趣奭 科拖諈\n" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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:155 +#: src/chage.c:149 msgid "Minimum Password Age" msgstr "黖 渥篣 篣國" -#: src/chage.c:161 +#: src/chage.c:155 msgid "Maximum Password Age" msgstr "黖 渥篣 篣國" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" msgstr "諤鴔諤潺 渥篣 諻篨 (YYYY-MM-DD)" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" msgstr "渥篣 科拘篣域 黕窸 窶赭" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "渥篣 刮鴔 " -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "窸 科拖 諤篣 (YYYY-MM-DD)" -#: src/chage.c:238 -#, fuzzy, c-format +#: src/chage.c:231 +#, c-format msgid "Last password change\t\t\t\t\t: " -msgstr "諤鴔諤潺 渥篣 諻篨 (YYYY-MM-DD)" +msgstr "諤鴔諤潺 渥篣 諻篨 \t\t\t\t\t:" -#: src/chage.c:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 -#, fuzzy, c-format +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 +#, c-format msgid "never\n" msgstr "賱穈\n" -#: src/chage.c:251 -#, fuzzy, c-format +#: src/chage.c:244 +#, c-format msgid "Password expires\t\t\t\t\t: " -msgstr "渥篣 諤篣:\t" +msgstr "渥篣 諤篣:\t\t\t\t\t:" -#: src/chage.c:267 -#, fuzzy, c-format +#: src/chage.c:260 +#, c-format msgid "Password inactive\t\t\t\t\t: " -msgstr "渥篣 刮鴔 :\t" +msgstr "渥篣 刮鴔 \t\t\t\t\t:" -#: src/chage.c:281 -#, fuzzy, c-format +#: src/chage.c:274 +#, c-format msgid "Account expires\t\t\t\t\t\t: " -msgstr "窸 諤篣:\t" +msgstr "窸 諤篣豹t\t\t\t\t\t:" -#: src/chage.c:297 +#: src/chage.c:290 #, c-format msgid "Minimum number of days between password change\t\t: %ld\n" -msgstr "" +msgstr "渥篣 諻篹 黖 \t\t: %ld\n" -#: src/chage.c:298 +#: src/chage.c:292 #, c-format msgid "Maximum number of days between password change\t\t: %ld\n" -msgstr "" +msgstr "渥篣 諻篹 黖 \t\t: %ld\n" -#: src/chage.c:299 +#: src/chage.c:294 #, c-format msgid "Number of days of warning before password expires\t: %ld\n" -msgstr "" +msgstr "渥篣 諤諴篣 窶赭 \t\t: %ld\n" -#: src/chage.c:444 +#: src/chage.c:431 #, c-format msgid "%s: do not include \"l\" with other flags\n" msgstr "%s: \"l\" 刷 月斥 flags諝 秒刮鴔 諤窶\n" -#: src/chage.c:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 -#, fuzzy, c-format +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 +#, c-format msgid "%s: permission denied.\n" -msgstr "%s: 篞澎 穇圉沔n" +msgstr "%s: 篞澎 穇圉.\n" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 #, c-format msgid "%s: PAM authentication failed\n" msgstr "%s: PAM 賄 欠刮蛟么n" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, c-format msgid "%s: can't open password file\n" msgstr "%s: 渥篣 潰 蛟么n" -#: src/chage.c:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "%s: 科拖 %s\n" -#: src/chage.c:535 +#: src/chage.c:519 #, c-format msgid "%s: can't lock shadow password file" msgstr "%s: 圉 渥篣 潰 篣 蛟" -#: src/chage.c:543 +#: src/chage.c:527 #, c-format msgid "%s: can't open shadow password file" msgstr "%s: 圉 渥篣 潰 穈 蛟" -#: src/chage.c:604 +#: src/chage.c:587 #, c-format msgid "Changing the aging information for %s\n" msgstr "%s 篣國 貐渠未 諻篹么n" -#: src/chage.c:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" msgstr "%s: 卿版 諻篨賈 鴗 月穈 諻蛟么n" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, c-format msgid "%s: can't update password file\n" msgstr "%s: 渥篣 潰 域渣 蛟么n" -#: src/chage.c:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" msgstr "%s: 圉 渥篣 潰 域渣 蛟么n" -#: src/chage.c:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "DBM 木 伙賱 域渣貲 月穈 諻蛟.\n" - -#: src/chage.c:692 +#: src/chage.c:649 #, c-format msgid "%s: can't rewrite shadow password file\n" msgstr "%s: 圉 渥篣 潰 木 桶 蛟么n" -#: src/chage.c:740 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite password file\n" msgstr "%s: 渥篣 潰 木 桶 蛟么n" -#: src/chage.c:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 #, c-format msgid "%s: PAM chauthtok failed\n" msgstr "%s: PAM chauthtok穈 欠刮蛟么n" @@ -366,117 +345,122 @@ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" msgstr "" "科拘: %s [-f 渠] [-r 諻奇貒窟 [-w 鴔北貒窟 [-h 鴔_貒窟\n" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "渠" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "\t渠: %s\n" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "諻 貒" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "鴔 貒貒" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" msgstr "鴔 貒" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "篣堅" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s: 科拖 渠 賄 蛟.\n" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s: NIS 渠潰渥貲賄 '%s' 科拖 渠 諻篹 蛟.\n" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "%s: 科 渠潰渥貲賄 '%s'(穈) NIS 諤欠域.\n" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, c-format +msgid "%s: Permission denied.\n" +msgstr "%s: 篞澎 穇圉.\n" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" msgstr "%s 科拖 貐渠未 諻篹么n" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s: 刮鴔 渠: \"%s\"\n" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s: 刮鴔 諻 貒: \"%s\"\n" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s: 刮鴔 鴔 貒: \"%s\"\n" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s: 刮鴔 鴔 貒: \"%s\"\n" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s: \"%s\" 篣穈 木 蛟么n" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "%s: 伙穈 諡 篧么n" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" msgstr "諴刮賈 渠諝 諻篹 蛟.\n" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" msgstr "渥篣 潰 lock 蛟; 鴗 木 原.\n" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" msgstr "渥篣 潰 穈 蛟.\n" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s: %s(穈) /etc/passwd 蛟么n" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" msgstr "渥篣 伊 域渣貲 月諻.\n" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" msgstr "渥篣 諻篨資萼諝 麮謔秒 蛟.\n" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" msgstr "渥篣 潰 lock 蛟.\n" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -487,54 +471,61 @@ msgid "" " -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n" "\t\t\tpasswords are not encrypted\n" msgstr "" +"科拘: chpasswd [蛙]\n" +"\n" +"蛙:\n" +" -e, --encrypted\t渥篣 潺庖 貲 蛟么n" +" -h, --help\t\t 諤 諰賄諝 窸 拘么n" +" -m, --md5\t\t渥篣 潺庖 DES穈 MD5 貲諝 科拗拘么n" +"\t\t\t渥篣 貲鴔 蛟么n" #: src/chpasswd.c:189 #, c-format msgid "%s: can't lock password file\n" msgstr "%s: 渥篣 潰 lock 蛟么n" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "%s: 圉 潰 lock 蛟么n" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "%s: 圉 潰 蛟么n" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "%s: line %d: 諡 篧么n" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "%s: line %d: 諢 渥篣 蛟么n" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "%s: line %d: 科拖 %s\n" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "%s: line %d: 渥篣 伊 域渣 蛟么n" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "%s: 月 諻, 諻 秒原 諡渥拘么n" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" msgstr "%s: 圉 潰 域渣貲 月諻\n" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" msgstr "%s: 渥篣 潰 域渣貲 月諻\n" @@ -544,26 +535,26 @@ msgstr "%s: 渥篣 潰 域渣貲 月諻\n" msgid "Usage: %s [-s shell] [name]\n" msgstr "科拘: %s [-s ] [渠]\n" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" msgstr "諢篞賄 " -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" msgstr "科拖 %s 諻篹 蛟.\n" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" msgstr "%s 諢篞賄 貐窶踫窸 蛟么n" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s: 賱 : %s\n" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" msgstr "%s() .\n" @@ -573,12 +564,12 @@ msgstr "%s() .\n" msgid "Usage: expiry {-f|-c}\n" msgstr "科拘: expiry {-f|-c}\n" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" msgstr "%s: 窶赭! 諻 諴刮賄 UID諝 諤黺窶!\n" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "%s: 科拖\n" @@ -592,320 +583,298 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" msgstr "" +"科拘: faillog [蛙]\n" +"\n" +"蛙:\n" +" -a, --all\t\t\t諈刺 科拖 諢篞賄 欠 篣圉 拘么n" +" -h, --help\t\t\t 諤 諰賄諝 窸 拘么n" +" -l, --lock-time SEC\t\t諢篞賄 欠刮諰 SEC黕 窸 篣么n" +" -m, --maximum MAX\t\t黖 諢篞賄 欠 諝 MAX諢 拘么n" +" -r, --reset\t\t\t諢篞賄 欠 諝 黕篣堅拘么n" +" -t, --time DAYS\t\tDAYS 渥 黖篞 諢篞賄 欠 篣圉諤 拘么n" +" -u, --user LOGIN\t\tLOGIN 科拖 諢篞賄 欠 篣圉 貐湊掠 \n" +" 諢篞賄 欠 窸穈 (-r, -m, -l " +" \n" +" 科) 窵謔秒拘.\n" -#: src/faillog.c:86 +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" -msgstr "黖 伊 篧鴔 科拖 渠 賄 欠沔n" +msgid "Login Failures Maximum Latest On\n" +msgstr "諢篞賄 欠 黖穈 黖篞 科坼n" -#: src/faillog.c:103 -#, c-format -msgid " %s on %s" -msgstr " %s, %s" - -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" msgstr " [%ld黕 到蛟也" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr " [%ld黕 篣]" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr " 科拖: %s\n" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "科拘: %s [-r|-R] 篞賈ㄨ\n" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr " %s [-a 科拖] 篞賈ㄨ\n" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr " %s [-d 科拖] 篞賈ㄨ\n" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr " %s [-A 科拖,...] [-M 科拖,...] 篞賈ㄨ\n" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr " %s [-M 科拖,...] 篞賈ㄨ\n" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" msgstr "%s: -A 圉 篞賈ㄨ 渥篣 拘么n" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "寢 窱科卿篧?\n" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr " 篞賈ㄨ: %s\n" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "%s 篞賈ㄨ %s 科拖 梵鴗\n" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "%s 篞賈ㄨ 潺賱 %s 科拖 原鴗\n" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" msgstr "%s: 篞賈ㄨ諰月 %s\n" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "%s: tty穈 \n" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "%s 篞賈ㄨ 渥篣 貐窶趣\n" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "諢 渥篣: " -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " msgstr " 渥篣 木 伕賄: " -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" msgstr "伉 潰鴔 蛟; 木 賄" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" msgstr "%s: 鴗 木 賄\n" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "%s: 篣 蛟么n" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" msgstr "%s: 圉 篣 蛟么n" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "%s: 潰 蛟么n" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "%s: 伉 域渣 蛟么n" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" msgstr "%s: 圉 伉 域渣 蛟么n" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "%s: 潰 木 蛟么n" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" msgstr "%s: 圉 潰 木 蛟么n" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "%s: 篣 蛟么n" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "%s: DBM 潰 域渣 蛟么n" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "%s: DBM 圉 潰 域渣 蛟么n" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "科拘: groupadd [-g GID [-o]] [-f] 篞賈ㄨ諈\n" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, c-format msgid "%s: error adding new group entry\n" msgstr "%s: 諢 篞賈ㄨ 月穈 諻蛟么n" -#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: 諢 dbm 篞賈ㄨ 伉 月穈 諻蛟么n" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "%s: %s 渠 鴔 蛟么n" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" msgstr "%s: GID %u() 潤 渠穈 么n" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "%s: 潤 GID諝 髦 蛟么n" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, c-format msgid "%s: %s is not a valid group name\n" msgstr "%s: %s() 篞賈ㄨ 渠 么n" -#: src/groupadd.c:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "%s: 刮鴔 篞賈ㄨ %s\n" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "%s: NAME=VALUE諝 渥 -O 蛙 拘么n" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s: 篞賈ㄨ潰 木 蛟么n" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s: 圉 篞賈ㄨ 潰 木 蛟么n" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" msgstr "%s: 篞賈ㄨ 篣 蛟么n" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" msgstr "%s: 篞賈ㄨ 潰 穈 蛟么n" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" msgstr "%s: 圉 篞賈ㄨ 篣 蛟么n" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" msgstr "%s: 圉 篞賈ㄨ 潰 蛟么n" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "%s: 篞賈ㄨ %s(穈) 蛟么n" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, c-format msgid "Usage: groupdel group\n" msgstr "科拘: groupdel 篞賈ㄨ諈\n" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" msgstr "%s: 篞賈ㄨ 伉 穇堅 月穈 諻蛟么n" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "%s: 篞賈ㄨ dbm 伉 鴔圉 月穈 諻蛟么n" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "%s: 圉 篞賈ㄨ 伉 鴔圉 月穈 諻蛟么n" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "%s: 圉 篞賈ㄨ dbm 伉 鴔圉 月穈 諻蛟么n" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "%s: 科拖 鴥潰 篞賈ㄨ 鴔 蛟.\n" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "%s: %s 篞賈ㄨ 蛟么n" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "%s: %s 篞賈ㄨ NIS 篞賈ㄨ么n" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s: %s() NIS 諤欠域么n" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "科拘: groupmod [-g GID [-o]] [-n 渠] 篞賈ㄨ諈\n" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "%s: %s() /etc/group 蛟么n" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s: 諢 dbm 圉 篞賈ㄨ 伉 蛟么n" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s: %u() 潤 GID穈 么n" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "%s: %s() 潤 渠 么n" @@ -915,110 +884,105 @@ msgstr "%s: %s() 潤 渠 么n" msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "科拘: %s [-r] [-s] [篞賈ㄨ [gshadow]]\n" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "科拘: %s [-r] [-s] [篞賈ㄨ]\n" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" msgstr "%s: -s 蛙窸 -r 蛙 蛟么n" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "%s: %s 篣 蛟么n" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "%s: %s 潰 蛟么n" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" msgstr "刮鴔 篞賈ㄨ 伉\n" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "'%s' 鴗 鴔資?" -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" msgstr "篞賈ㄨ 伉 貐蛙\n" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" msgstr "刮鴔 篞賈ㄨ諈 '%s'\n" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "篞賈ㄨ %s: %s 科拖穈 蛟么n" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " msgstr "'%s' 諰月諝 鴔資? " -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" msgstr "刮鴔 圉 篞賈ㄨ 伉\n" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" msgstr "圉 篞賈ㄨ 伉 貐蛙\n" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" msgstr "篞賈ㄨ 伉 潰鴔 蛟么n" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" msgstr "圉 篞賈ㄨ %s: 窵謔科 科拖 %s(穈) 蛟么n" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " msgstr "窵謔科 諰月 '%s'(諝) 鴔資? " -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" msgstr "圉 篞賈ㄨ %s: %s 科拖穈 蛟么n" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "%s: %s 潰 域渣 蛟么n" -#: src/grpck.c:647 src/pwck.c:612 -#, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: 潰 域渣 蛟; mkpasswd諝 欠原么n" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format -msgid "%s: no changes\n" -msgstr "%s: 諻篨賄 蛟么n" - -#: src/grpck.c:651 src/pwck.c:616 +#: src/grpck.c:640 src/pwck.c:606 #, c-format msgid "%s: the files have been updated\n" msgstr "%s: 潰 域渣 蛟么n" +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "%s: 諻篨賄 蛟么n" + #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" @@ -1034,37 +998,37 @@ msgstr "%s: 篞賈ㄨ 潰 蛟么n" msgid "%s: can't lock shadow group file\n" msgstr "%s: 圉 篞賈ㄨ 篣 蛟么n" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" msgstr "%s: 圉 篞賈ㄨ 潰 蛟么n" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "%s: 圉 篞賈ㄨ %s(諝) 鴔 蛟么n" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "%s: %s 圉 伉 域渣 蛟么n" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "%s: %s 篞賈ㄨ 伉 域渣 蛟么n" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" msgstr "%s: 圉 篞賈ㄨ 潰 域渣 蛟么n" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" msgstr "%s: 篞賈ㄨ 潰 域渣 蛟么n" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "%s: 圉 篞賈ㄨ 潰 鴔 蛟么n" @@ -1084,52 +1048,58 @@ msgstr "科拘: id\n" msgid " groups=" msgstr " 篞賈ㄨ=" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" +"科拘: lastlog [蛙]\n" +"\n" +"蛙:\n" +" -u, --login LOGIN\tLOGIN渠潺 科拖 黖篞 篣圉 賵么n" +" -h, --help\t\t 諤 諰賄諝 窸 拘么n" +" -t, --time DAYS\tDAYS 渥 黖篞 諢篞 篣圉諤 拘么n" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" msgstr "科拖諈 秒 ~諢賱 黖篞潰貐廄n" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "科拖渠 秒 黖篞潰貐廄n" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "**貒 諢篞賄貲 蛟**" -#: src/login.c:175 +#: src/login.c:156 #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "科拘: %s [-p] [渠]\n" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr " %s [-p] [-h 賄欠賈] [-f 渠]\n" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr " %s [-p] -r 賄欠稞n" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" msgstr "諈骰 諢篞賄 穈\n" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" @@ -1138,7 +1108,7 @@ msgstr "" "\n" "篣 窶 欠 鮈諴蛟么n" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" @@ -1147,7 +1117,7 @@ msgstr "" "\n" "[渥穈 諡渥蛟 -- 諴刮賈 諢篞賄賄 蛟也\n" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" @@ -1156,17 +1126,17 @@ msgstr "" "\n" "%d 黕 諢篞賄 穈 諴拘.\n" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" msgstr " on `%.100s' from `%.200s'" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" msgstr " on `%.100s'" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" @@ -1175,38 +1145,29 @@ msgstr "" "\n" "%s 諢篞賄: " -#: src/login.c:819 -msgid "login: " -msgstr "諢篞賄: " - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" msgstr "諢篞賄賄 諤鴔 蛟" -#: src/login.c:1198 +#: src/login.c:996 msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "窶赭: 潰潺 木 諢篞賄貲 蛟.\n" -#: src/login.c:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "諤鴔諤 諢篞賄: %s on %s" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" msgstr "諤鴔諤 諢篞賄: %.19s on %s" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" msgstr " from %.*s" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "rad_login 窸 蛟么n" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" @@ -1225,9 +1186,9 @@ msgid "%s: cannot open DBM files for %s\n" msgstr "%s: %s DBM 潰 蛟么n" #: src/mkpasswd.c:286 -#, fuzzy, c-format +#, c-format msgid "%s: the line beginning with %.16s... is too long\n" -msgstr "%s: ~ 刷 " +msgstr "%s: %.16s...諢 鴗 諡 篧么n" #: src/mkpasswd.c:313 #, c-format @@ -1235,31 +1196,31 @@ msgid "%s: error parsing line \"%s\"\n" msgstr "%s: \"%s\" 鴗 桶 月穈 諻蛟么n" #: src/mkpasswd.c:321 src/mkpasswd.c:326 src/mkpasswd.c:331 src/mkpasswd.c:336 -#, fuzzy, c-format +#, c-format msgid "adding record for name %s\n" -msgstr "木 渠 篣圉 拘:" +msgstr "渠 %s 篣圉 拘么n" #: src/mkpasswd.c:342 src/mkpasswd.c:348 src/mkpasswd.c:353 src/mkpasswd.c:358 -#, fuzzy, c-format +#, c-format msgid "%s: error adding record for %s\n" -msgstr "%s: 木 篣圉 月:" +msgstr "%s: %s 篣圉 月\n" #: src/mkpasswd.c:376 #, c-format msgid "added %d entries, longest was %d\n" msgstr "%d穈 伉 蛟, 穈 篣 窶 %d么n" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "科拘: %s [-vf] [-p|sp|sg] 潺\n" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "科拘: %s [-vf] [-p|g|sp] 潺\n" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "科拘: %s [-vf] [-p|g] 潺\n" @@ -1279,16 +1240,16 @@ msgstr "科拘: sg group [[-c] 諈鉛\n" msgid "unknown uid: %u\n" msgstr " UID: %u\n" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" msgstr " GID: %lu\n" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "鴥∮拘.\n" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "篞賈ㄨ木 諡渠 諤蛟么n" @@ -1298,91 +1259,91 @@ msgstr "篞賈ㄨ木 諡渠 諤蛟么n" msgid "Usage: %s [input]\n" msgstr "科拘: %s [伉]\n" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "%s: /etc/passwd 篣 蛟.\n" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "%s: 篣 蛟, 鴗 木 賄\n" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "%s: 潰 穈 蛟么n" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "%s: %d貒 鴗: 刮鴔 潰稞n" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "%s: %d貒 鴗: GID諝 諤 蛟么n" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "%s: %d貒 鴗: UID諝 諤 蛟么n" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "%s: %d貒 鴗: %s 科拖穈 蛟么n" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "%s: %d貒 鴗: 渥篣 域渣 蛟么n" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "%s: %d貒 鴗: 謔 諤曰萼諝 欠刮蛟么n" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "%s: %d貒 鴗: chown 欠刮蛟么n" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "%s: %d貒 鴗: 伉 域渣 蛟么n" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "%s: 潰 域渣 月穈 諻蛟么n" -#: src/passwd.c:155 +#: src/passwd.c:154 #, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "科拘: %s [-f|-s] [渠]\n" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr " %s [-x 黖][-n 黖][-w 窶赭][-i 赬桶] 渠\n" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} 渠\n" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr " 渥篣: " -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" msgstr "`%s' 渥篣 諤鴔 蛟么n" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" @@ -1391,16 +1352,16 @@ msgstr "" "諢 渥篣 伕賄 (黖 %d, 黖 %d 篣)\n" " 篣 恢諝 魽堅拗 科拗賄.\n" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "諢 渥篣: " -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" msgstr "木 賄.\n" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" @@ -1409,52 +1370,52 @@ msgstr "" "\n" "窶赭: 貐渥桿 渥篣 (篞賈 科拗篣 月庖 木 伕賄).\n" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" msgstr "伉 潰鴔 蛟; 木 賄.\n" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "%s 渥篣 諻篹 蛟.\n" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" msgstr "鴥∮拘, %s 渥篣 鴔 諻篹 蛟.\n" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "%s: 諰諈刺收 賱魽崤n" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "%s: %s(諝) 欠 蛟" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" msgstr "%s: %s 伊 鴔鴔 蛟么n" -#: src/passwd.c:914 +#: src/passwd.c:884 #, c-format -msgid "You may not change the password for %s.\n" -msgstr "%s 渥篣 諻篹 蛟.\n" +msgid "%s: You may not view or modify password information for %s.\n" +msgstr "%s: %s 渥篣 貐渠未 貐湊掠 諻篹 蛟.\n" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "%s 渥篣 貐窶趣\n" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "%s 渥篣 諻篨賄 蛟.\n" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "渥篣 諻篹到蛟.\n" @@ -1469,49 +1430,49 @@ msgstr "科拘: %s [-q] [-r] [-s] [渥篣 [shadow]]\n" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "科拘: %s [-q] [-r] [-s] [渥篣]\n" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" msgstr "刮鴔 渥篣 功n" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" msgstr "渥篣 伉 貐蛙\n" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" msgstr "刮鴔 科拖諈 '%s'\n" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "科拖 %s: 篞賈ㄨ 蛟 %u\n" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "科拖 %s: %s 謔禺 蛟么n" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "科拖 %s: %s 諢篞賈到 蛟么n" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" msgstr "刮鴔 圉 渥篣 伉\n" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" msgstr "圉 渥篣 伉 貐蛙\n" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" msgstr "渥篣 伉 潰鴔 蛟么n" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" msgstr "科拖 %s: 諤鴔諤 渥篣 諻篨 穈 諯賈么n" @@ -1531,17 +1492,17 @@ msgstr "%s: 渥篣 潰 蛟么n" msgid "%s: can't remove shadow entry for %s\n" msgstr "%s: %s 圉 伉 鴔 蛟么n" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "%s: %s 渥篣 伉 域渣 蛟么n" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" msgstr "%s: 圉 潰 域渣 蛟么n" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" msgstr "%s: 渥篣 潰 域渣 蛟么n" @@ -1551,40 +1512,40 @@ msgstr "%s: 渥篣 潰 域渣 蛟么n" msgid "%s: can't update entry for user %s\n" msgstr "%s: 科拖 %s 伉 域渣 蛟么n" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format msgid "%s: can't delete shadow password file\n" msgstr "%s: 圉 渥篣 潰 鴔 蛟么n" -#: src/su.c:133 +#: src/su.c:132 msgid "Sorry." msgstr "鴥∮拘." -#: src/su.c:323 +#: src/su.c:320 #, c-format msgid "%s: must be run from a terminal\n" msgstr "%s: 圉站 諻 欠 渥賄 拘么n" -#: src/su.c:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "%s: pam_start: 月 %d\n" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" msgstr " 渠: %s\n" -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, c-format msgid "You are not authorized to su %s\n" msgstr "寢 su %s 窶 賄 鴔 蛟么n" -#: src/su.c:502 +#: src/su.c:495 msgid "(Enter your own password.)" msgstr "( 渥篣 伕賄.)" -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" @@ -1593,22 +1554,22 @@ msgstr "" "%s: %s\n" "(諡渥)\n" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" msgstr " \n" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr " 渥僑渣賈 su諢 篞潰渣 穈穈 穇圉蛟.\n" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "渥篣 賄 諡渥蛟.\n" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" msgstr "科拖 渥篣 賄潺 伊 原.\n" @@ -1623,7 +1584,7 @@ msgstr "渥篣 \n" msgid "No password entry for 'root'\n" msgstr "'諴刮' 渥篣 伉 \n" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" @@ -1633,234 +1594,214 @@ msgstr "" "潺潺 (normal startup) 月庖 control-d諝 伕賄,\n" "(篞賈鴔 潺庖 欠 赬諝 諴刮 渥篣 伕賄)" -#: src/sulogin.c:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" msgstr "欠 赬 諈刺諢 木湊窸 蛟么n" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "%s: 篞賈ㄨ 域渣圉渥月未 木 諤卿么n" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "%s: 圉 篞賈ㄨ 域渣圉渥月未 木 諤卿么n" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "%s: 刮鴔 恢 伉 `%s'\n" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "%s: GID %s\n" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "%s: 篞賈ㄨ %s\n" -#: src/useradd.c:475 +#: src/useradd.c:418 #, c-format msgid "%s: cannot create new defaults file\n" msgstr "%s: 諢 渣 潰 諤 蛟么n" -#: src/useradd.c:480 +#: src/useradd.c:423 #, c-format msgid "%s: cannot open new defaults file\n" msgstr "%s: 諢 渣 潰 諤 蛟么n" -#: src/useradd.c:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" msgstr "%s: 渠 木: %s" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s: `%s' 篞賈ㄨ NIS 篞賈ㄨ.\n" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "%s: 諡渠 諤 篞賈ㄨ 諈蛟 (黖 %d).\n" -#: src/useradd.c:721 +#: src/useradd.c:660 #, c-format msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n" msgstr "科拘: useradd [-u UID [-o]] [-g 篞賈ㄨ諈] [-G 篞賈ㄨ,...]\n" -#: src/useradd.c:724 +#: src/useradd.c:663 #, c-format msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr " [-d 謔柵 [-s ] [-c 鴥潰] [-m [-k template]]\n" -#: src/useradd.c:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, c-format msgid " [-f inactive] [-e expire]\n" msgstr " [-f 赬桶] [-e 諤篣財\n" -#: src/useradd.c:728 +#: src/useradd.c:667 #, c-format msgid " [-p passwd] name\n" msgstr " [-p 渥篣] 渠\n" -#: src/useradd.c:730 +#: src/useradd.c:669 #, c-format msgid " useradd -D [-g group] [-b base] [-s shell]\n" msgstr " useradd -D [-g 篞賈ㄨ諈] [-b 黕篣圉謔柵 [-s ]\n" -#: src/useradd.c:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, c-format msgid "%s: error locking group file\n" msgstr "%s: 篞賈ㄨ 篣 月穈 諻蛟么n" -#: src/useradd.c:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, c-format msgid "%s: error opening group file\n" msgstr "%s: 篞賈ㄨ 潰 禺 月穈 諻蛟么n" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, c-format msgid "%s: error locking shadow group file\n" msgstr "%s: 圉 篞賈ㄨ 篞賈 月穈 諻蛟么n" -#: src/useradd.c:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, c-format msgid "%s: error opening shadow group file\n" msgstr "%s: 篞賈ㄨ 潰 禺 月穈 諻蛟么n" -#: src/useradd.c:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "%s: UID %u() 潤鴔 蛟么n" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "%s: UID諝 髦 蛟么n" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "%s: 篣圉雩 謔 `%s'() 諈骰蛟么n" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "%s: 鴥潰 `%s'(穈) 賄蛟么n" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "%s: 謔 `%s'() 諈骰蛟么n" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s: 鴔 `%s'() 諈骰蛟么n" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "%s: 圉 渥篣 -e 蛙 窱秒拘么n" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, c-format msgid "%s: shadow passwords required for -f\n" msgstr "%s: 圉 渥篣 -f 蛙 窱秒拘么n" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" msgstr "%s: `%s' 賱賱 刮鴔 蛟么n" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "%s: 刮鴔 `%s'\n" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "%s: 刮鴔 科拖諈 `%s'\n" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "%s: 渥篣 潰 木 穈 蛟么n" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "%s: 圉 渥篣 潰 木 穈 蛟么n" -#: src/useradd.c:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, c-format msgid "%s: unable to lock password file\n" msgstr "%s: 渥篣 篣 蛟么n" -#: src/useradd.c:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, c-format msgid "%s: unable to open password file\n" msgstr "%s: 渥篣 潰 蛟么n" -#: src/useradd.c:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, c-format msgid "%s: cannot lock shadow password file\n" msgstr "%s: 圉 渥篣 潰 篣 蛟么n" -#: src/useradd.c:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, c-format msgid "%s: cannot open shadow password file\n" msgstr "%s: 圉 渥篣 潰 蛟么n" -#: src/useradd.c:1459 +#: src/useradd.c:1354 #, c-format msgid "%s: error adding new password entry\n" msgstr "%s: 諢 渥篣 伉 月穈 諻蛟么n" -#: src/useradd.c:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "%s: 渥篣 dbm 伉 域渣貲 月穈 諻蛟么n" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, c-format msgid "%s: error adding new shadow password entry\n" msgstr "%s: 諢 圉 渥篣 伉 月穈 諻蛟么n" -#: src/useradd.c:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s: 圉 渥篣 dbm 伉 域渣 月穈 諻蛟么n" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" msgstr "%s: 謔 %s(諝) 諤 蛟么n" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, c-format msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n" msgstr "" "\"mail\"渠潺 渠 篞賈ㄨ 蛟. 諰 欠 諈刺 0600潺 諤卿.\n" -#: src/useradd.c:1590 +#: src/useradd.c:1446 #, c-format msgid "Can't create mail spool for user %s.\n" msgstr "科拖 %s 諰 欠 諤 蛟.\n" -#: src/useradd.c:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "%s: 科拖 %s(穈) 蛟么n" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" @@ -1868,207 +1809,172 @@ msgstr "" "%s: %s 篞賈ㄨ 蛟 - 科拖諝 篞賈ㄨ 月庖, -g 蛙 科拗原" ".\n" -#: src/useradd.c:1767 +#: src/useradd.c:1602 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" msgstr "%s:窶赭: CREATE_HOME 鴔鴔 蛟, -m 蛙 科拗賄.\n" -#: src/userdel.c:124 +#: src/userdel.c:108 #, c-format msgid "Usage: %s [-r] name\n" msgstr "科拘: %s [-r] 渠\n" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" msgstr "%s: 篞賈ㄨ 伉 域渣貲 月穈 諻蛟么n" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "%s: dbm 篞賈ㄨ 伉 域渣 蛟么n" - -#: src/userdel.c:214 -#, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: dbm 篞賈ㄨ 伉 鴔 蛟么n" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "%s: 篞賈ㄨ 潰 蛟么n" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "%s: 圉 篞賈ㄨ 潰 蛟么n" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "%s: 渥篣 伉 鴔圉 月穈 諻蛟么n" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "%s: 圉 渥篣 伉 鴔圉 月穈 諻蛟么n" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "%s: 渥篣 dbm 伉 鴔圉 月穈 諻蛟么n" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s: 圉 渥篣 dbm 伉 鴔圉 月穈 諻蛟么n" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "%s: %s 科拖 諢篞賄貲 么n" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "%s: %s() %s 穈 , 鴔域 蛟么n" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " msgstr "%s: 窶赭: 鴔 蛟 " -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" msgstr "%s: 科拖 %s() 蛟么n" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s: 科拖 %s() NIS 科拖 么n" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "" "%s: 謔 %s() 鴔域 蛟 (科拖 %s 謔禹 鴔鴔 窶" ")\n" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "%s: 謔 %s(諝) 鴔圉 月穈 諻蛟么n" -#: src/usermod.c:306 +#: src/usermod.c:289 #, c-format msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "科拘: %s\t[-u UID [-o]] [-g 篞賈ㄨ渠][-G 篞賈ㄨ,...]\n" -#: src/usermod.c:310 +#: src/usermod.c:293 #, 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:313 +#: src/usermod.c:296 #, c-format msgid "[-f inactive] [-e expire] " msgstr "[-f 赬桶] [-e 諤篣財 " -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p 渥篣] [-L|-U] 渠\n" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" msgstr "%s: 域渣筷篞賈ㄨ 諰諈刺收 賱魽崤n" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "%s: 域渣筷篞賈ㄨ圉域 諰諈刺收 賱魽崤n" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "%s: 鴥潰渥 flag穈 蛟么n" -#: src/usermod.c:965 +#: src/usermod.c:903 #, c-format msgid "%s: shadow passwords required for -e and -f\n" msgstr "%s: 圉 渥篣 -e 蛙窸 -f 蛙 窱秒拘么n" -#: src/usermod.c:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "%s: UID %lu() 潤鴔 蛟么n" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, c-format msgid "%s: error changing password entry\n" msgstr "%s: 渥篣 伉 貐窶踫 月穈 諻蛟么n" -#: src/usermod.c:1122 +#: src/usermod.c:1053 #, c-format msgid "%s: error removing password entry\n" msgstr "%s: 渥篣 伉 穇堅 月穈 諻蛟么n" -#: src/usermod.c:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "%s: 渥篣 dbm 伉 月穈 諻蛟么n" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "%s: 渥篣 dbm 伉 穇堅 月穈 諻蛟么n" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "%s: 圉 渥篣 伉 穇堅 月穈 諻蛟么n" -#: src/usermod.c:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s: 圉 渥篣 dbm 伉 穇堅 月穈 諻蛟么n" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "%s: 謔 %s() 蛟么n" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "%s: %s(諝) 諤 蛟么n" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" msgstr "%s: %s(諝) chown 蛟么n" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, c-format msgid "%s: cannot rename directory %s to %s\n" msgstr "%s: 謔 %s %s()諢 渠 諻篹 蛟么n" -#: src/usermod.c:1333 +#: src/usermod.c:1223 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "%s: 窶赭: %s() %s 鴔 蛟么n" -#: src/usermod.c:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" msgstr "諰潺 諝 諻篨賈 欠刮蛟" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" msgstr "諰潺木 渠 諻篨賈 欠刮蛟" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" @@ -2077,20 +1983,20 @@ msgstr "" "\n" "%s: %s() 諻篨賄 蛟么n" -#: src/vipw.c:133 +#: src/vipw.c:131 msgid "Couldn't lock file" msgstr "潰 篣 蛟" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" msgstr "諻桿 諤 蛟" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s: %s(諝) 貐虛筋 蛟: %s (諻 秒原 %s 蛟)\n" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/po/nb.gmo b/po/nb.gmo index c2eb8647..86e31fec 100644 Binary files a/po/nb.gmo and b/po/nb.gmo differ diff --git a/po/nb.po b/po/nb.po index 3d12efb0..9d0dcfe7 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-01-26 07:53+0100\n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" "PO-Revision-Date: 2004-06-03 21:42+0200\n" "Last-Translator: H疇vard Korsvoll \n" "Language-Team: Norwegian (Nynorsk) \n" @@ -21,14 +21,14 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.3.1\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" msgstr "Advarsel: ukjent gruppe %s\n" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" msgstr "Advarsel: for mange grupper\n" @@ -56,17 +56,17 @@ msgstr " Kontakt systemadministrator.\n" msgid " Choose a new password.\n" msgstr " Velg et nytt passord.\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "Ditt passord vil utl繪pe om %ld dager.\n" -#: libmisc/age.c:174 +#: libmisc/age.c:172 #, c-format msgid "Your password will expire tomorrow.\n" msgstr "Ditt passord vil utl繪pe i morgen.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:174 #, c-format msgid "Your password will expire today.\n" msgstr "Ditt passord vil utl繪pe i dag.\n" @@ -81,39 +81,27 @@ msgstr "Kan ikke endre tty %s" msgid "Environment overflow\n" msgstr "Omgivelsene er overfyllt\n" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr "Du kan ikke endre $%s\n" -#: libmisc/failure.c:230 +#: libmisc/failure.c:229 #, fuzzy, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "%d %s siden forrige innlogging. Forrige innlogging var %s p疇 %s.\n" +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "%d %s siden forrige innlogging. Forrige innlogging var %s p疇 %s.\n" +msgstr[1] "%d %s siden forrige innlogging. Forrige innlogging var %s p疇 %s.\n" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "mislykka fors繪k" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "mislykka fors繪k" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" msgstr "For mange innlogginger.\n" -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "Passordet dekrypterer ikke hemmelig n繪kkel for %s.\n" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "Kunne ikke bestemme hemmelige n繪kkel til %s: kj繪rer keyserv-nissen?\n" - #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "Du har f疇tt ny epost." @@ -126,7 +114,7 @@ msgstr "Ingen epost." msgid "You have mail." msgstr "Du har epost." -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " msgstr "D疇rlig passord: %s. " @@ -141,20 +129,20 @@ msgstr "passwd: pam_start() feilet, feil %d\n" msgid "passwd: %s\n" msgstr "passwd: %s\n" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" msgstr "" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "Klare ikke endre katalog til \"%s\"\n" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" msgstr "Ingen hjemmemappe, logger inn med HOME=/" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr "Kan ikke utf繪re %s" @@ -169,35 +157,31 @@ msgstr "Ugyldig rot mappe \"%s\"\n" msgid "Can't change root directory to \"%s\"\n" msgstr "Kan ikke endre rot mappa til \"%s\"\n" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "malloc(%d) feilet\n" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" msgstr "Fant ikke plass til config-info.\n" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "feil med oppsettet - ukjent element 竄%s罈 (kontakt administrator)\n" -#: lib/pwauth.c:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "Passord: " -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "%s's Passord: " -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "(Echo p疇) " - -#: src/chage.c:118 +#: src/chage.c:112 #, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" @@ -206,155 +190,148 @@ msgstr "" "Bruk: chage [-l] [-m min_dager] [-M max_dager] [-W varsel]\n" " [-I inaktiv] [-E utg疇tt/(expire)] [-d siste_dag] bruker/(user)\n" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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:155 +#: src/chage.c:149 msgid "Minimum Password Age" msgstr "Minimum gyldighetsperiode p疇 passord" -#: src/chage.c:161 +#: src/chage.c:155 msgid "Maximum Password Age" msgstr "Maksimum gyldighetsperiode p疇 passord" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" msgstr "Siste endring av passord (YYYY-MM-DD)" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" msgstr "Varsel n疇r passordet er utg疇tt p疇 dato" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "Inaktivt passord" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Konto utl繪per (YYYY-MM-DD)" -#: src/chage.c:238 +#: src/chage.c:231 #, fuzzy, c-format msgid "Last password change\t\t\t\t\t: " msgstr "Siste endring av passord (YYYY-MM-DD)" -#: src/chage.c:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 #, fuzzy, c-format msgid "never\n" msgstr "Aldri\n" -#: src/chage.c:251 +#: src/chage.c:244 #, fuzzy, c-format msgid "Password expires\t\t\t\t\t: " msgstr "Passord utl繪per:\t" -#: src/chage.c:267 +#: src/chage.c:260 #, fuzzy, c-format msgid "Password inactive\t\t\t\t\t: " msgstr "Passord er inaktivt:\t" -#: src/chage.c:281 +#: src/chage.c:274 #, fuzzy, c-format msgid "Account expires\t\t\t\t\t\t: " msgstr "Kontoen utl繪per:\t" -#: src/chage.c:297 +#: src/chage.c:290 #, c-format msgid "Minimum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:298 +#: src/chage.c:292 #, c-format msgid "Maximum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:299 +#: src/chage.c:294 #, c-format msgid "Number of days of warning before password expires\t: %ld\n" msgstr "" -#: src/chage.c:444 +#: src/chage.c:431 #, 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:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 #, fuzzy, c-format msgid "%s: permission denied.\n" msgstr "%s: ikke tillatelse\n" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 #, c-format msgid "%s: PAM authentication failed\n" msgstr "%s: PAM autentifisering feilet\n" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, c-format msgid "%s: can't open password file\n" msgstr "%s: kan ikke 疇pne passordfila\n" -#: src/chage.c:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "%s: ukjent bruker %s\n" -#: src/chage.c:535 +#: src/chage.c:519 #, c-format msgid "%s: can't lock shadow password file" msgstr "%s: kan ikke l疇se skyggepassordfila" -#: src/chage.c:543 +#: src/chage.c:527 #, c-format msgid "%s: can't open shadow password file" msgstr "%s: kan ikke 疇pne skyggepassordfila" -#: src/chage.c:604 +#: src/chage.c:587 #, c-format msgid "Changing the aging information for %s\n" msgstr "Endre utl繪psinformasjon for %s\n" -#: src/chage.c:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" msgstr "%s: feil ved endring i feltene\n" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, c-format msgid "%s: can't update password file\n" msgstr "%s: kan ikke oppdatere passordfila\n" -#: src/chage.c:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" msgstr "%s: kan ikke oppdatere skyggepassordfila\n" -#: src/chage.c:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "Feil ved oppdatering i DBM-passordlinja.\n" - -#: src/chage.c:692 +#: src/chage.c:649 #, c-format msgid "%s: can't rewrite shadow password file\n" msgstr "%s: kan ikke gjenskrive skyggepassordfila\n" -#: src/chage.c:740 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite password file\n" msgstr "%s: kan ikke gjenskrive passordfila\n" -#: src/chage.c:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 #, c-format msgid "%s: PAM chauthtok failed\n" msgstr "%s: PAM chauthtok feilet\n" @@ -373,117 +350,122 @@ msgstr "" msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" msgstr "Bruk: %s [-f fullt_navn] [-r room_no] [-w work_ph] [-h home_ph]\n" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "Fullstendig navn" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "\tFullstendig navn: %s\n" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "Romnummer" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "Jobbtelefon" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" msgstr "Hjemtelefon" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "Andre" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s: Kan ikke avgj繪re ditt brukernavn.\n" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s: kan ikke endre bruker 竄%s罈 p疇 NIS-klienten.\n" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "%s: 竄%s罈 er NIS-sjefen for denne klienten.\n" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, fuzzy, c-format +msgid "%s: Permission denied.\n" +msgstr "%s: ikke tillatelse\n" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" msgstr "Endrer brukerinformasjon for %s\n" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s: Ugyldig navn: \"%s\"\n" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s: ugyldig romnummer: \"%s\"\n" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s: ugyldig jobbtelefon: \"%s\"\n" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s: ugyldig hjemtelefon: \"%s\"\n" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s: \"%s\" inneholder ugyldige tegn\n" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "%s: feltene er for lange\n" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" msgstr "Kan ikke endre ID til root.\n" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" msgstr "Kan ikke l疇se passordfila; fors繪k senere.\n" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" msgstr "Kan ikke 疇pne passordfila.\n" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s: %s ikke funnet i /etc/passwd\n" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" msgstr "Feil ved oppdatering av passord.\n" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" msgstr "Kan ikke sende inn endringer til passordfila.\n" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" msgstr "Kan ikke l疇se opp passordfila.\n" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -500,48 +482,48 @@ msgstr "" msgid "%s: can't lock password file\n" msgstr "%s: kan ikke l疇se passordfila\n" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "%s: kan ikke l疇se shadow filen\n" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "%s: kan ikke 疇pne shadow filen\n" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "%s: linje %d: linje er for lang\n" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "%s: linje %d: mangler nytt passord\n" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "%s: linje %d: ukjent bruker %s\n" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "%s: linje %d: kan ikke oppdatere passordlinja\n" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "%s: feil funnet, endringer er ikke utf繪rt\n" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" msgstr "%s: feil ved oppdatering av skyggefilen\n" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" msgstr "%s: feil ved oppdatering av passordfilen\n" @@ -551,26 +533,26 @@ msgstr "%s: feil ved oppdatering av passordfilen\n" msgid "Usage: %s [-s shell] [name]\n" msgstr "Bruk: %s [-s skjell] [navn]\n" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" msgstr "Innloggingsskall" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" msgstr "Du kan ikke endre skall til %s.\n" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" msgstr "Endre innloggingsskall til %s\n" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s: ugyldig inntasting: %s\n" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" msgstr "%s er et ugyldig skall.\n" @@ -580,12 +562,12 @@ msgstr "%s er et ugyldig skall.\n" msgid "Usage: expiry {-f|-c}\n" msgstr "Bruk: expiry {-f|-c}\n" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" msgstr "%s: ADVARSEL! M疇 v疆re set-UID root!\n" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "%s: ukjent bruker\n" @@ -599,320 +581,285 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" msgstr "" -#: src/faillog.c:86 +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" -msgstr "Brukernavn Feil Maksimum Siste\n" +msgid "Login Failures Maximum Latest On\n" +msgstr "" -#: src/faillog.c:103 -#, c-format -msgid " %s on %s" -msgstr " %s p疇 %s" - -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" msgstr " [%lds igjen]" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr " [%lds l疇s]" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "Ukjent bruker: %s\n" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "Bruk: %s [-r|-R] gruppe\n" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr " %s [-a bruker] gruppe\n" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr " %s [-d bruker] gruppe\n" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr " %s [-A bruker,...] [-M bruker,...] gruppe\n" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr " %s [-M bruker,...] gruppe\n" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" msgstr "%s: shadow gruppepassord kreves for -A\n" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "Hvem er du?\n" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr "ukjent gruppe: %s\n" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "Legger til brukere i %s gruppen %s\n" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "Fjerner brukeren %s fra gruppa %s\n" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" msgstr "%s: ukjent medlem %s\n" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "%s: Ikke en tty\n" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "Endrer passordet for gruppa %s\n" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "Nytt passord: " -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " msgstr "Skriv inn passordet p疇nytt: " -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" msgstr "Passordene var ikke like, pr繪v igjen" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" msgstr "%s: Pr繪v igjen senere\n" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "%s: kan ikke l疇se\n" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" msgstr "%s: klarer ikke 疇 l疇se shadow-fila \n" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "%s: kan ikke 疇pne fila\n" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "%s: klarer ikke 疇 oppdatere oppf繪ringen\n" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" msgstr "%s: klarer ikke 疇 oppdatere oppf繪ringen i shadow-fila\n" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "%s: klarer ikke 疇 omskrive fila\n" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" msgstr "%s: klarer ikke 疇 omskrive shadow-fila\n" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "%s: kan ikke l疇se opp filen\n" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "%s: kan ikke oppdatere DBM filene\n" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "%s: kan ikke oppdatere DBM-shadow filene\n" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "Bruk: groupadd [-g gid [-o]] [-f] gruppe\n" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, c-format msgid "%s: error adding new group entry\n" msgstr "%s: feil ved oppretting av ny gruppeoppf繪ring\n" -#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: klarer ikke 疇 legge til ny oppf繪ring for dbm-gruppen \n" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "%s: navn %s er ikke unikt\n" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" msgstr "%s: gid %u er ikke unikt\n" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "%s: klarer ikke 疇 f疇 unik gid\n" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, c-format msgid "%s: %s is not a valid group name\n" msgstr "%s: %s er ikke et gyldig gruppenavn\n" -#: src/groupadd.c:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "%s: ugyldig gruppe %s\n" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "%s: -O krever NAME=VALUE\n" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s: klarer ikke 疇 omskrive gruppefila\n" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s: klarer ikke 疇 omskrive shadow-fila\n" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" msgstr "%s: klarer ikke 疇 l疇se gruppefilen\n" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" msgstr "%s: klarer ikke 疇 疇pne gruppefilen\n" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" msgstr "%s: klarer ikke 疇 l疇se shadow gruppefilen\n" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" msgstr "%s: klarer ikke 疇 疇pne shadow gruppefila\n" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "%s: gruppen %s finnes allerede\n" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, c-format msgid "Usage: groupdel group\n" msgstr "Bruk: groupdel gruppe\n" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" msgstr "%s: feil ved fjerning av gruppeoppf繪ring\n" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "%s: feil ved fjerning av dbm-oppf繪ringen for gruppen\n" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "%s: feil ved sletting av shadow gruppe oppf繪ring\n" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "%s: feil ved sletting av shadow gruppe dbm-oppf繪ring\n" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "%s: kan ikke fjerne brukerens prim疆rgruppe.\n" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "%s: gruppen %s finnes ikke\n" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "%s: gruppen %s er en NIS gruppe\n" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s: %s er NIS sjefen\n" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "Bruk: groupmod [-g gid [-o]] [-n navn] gruppe\n" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "%s: %s ikke funnet i /etc/group\n" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s kan ikke legge til ny shadowgruppe i dbm\n" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s: %u er ikke en entydig gid\n" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "%s: %s er ikke et entydig navn\n" @@ -922,110 +869,105 @@ msgstr "%s: %s er ikke et entydig navn\n" msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "Bruk: %s [-r] [-s] [gruppe [gshadow]]\n" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "Bruk: %s [-r] [-s] [gruppe]\n" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "Nei" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" msgstr "%s: -s og -r kan ikke brukes samtidig\n" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "%s: kan ikke l疇se filen %s\n" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "%s: kan ikke 疇pne filen %s\n" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" msgstr "ugyldig oppf繪ring i gruppefila\n" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "slett linje `%s'? " -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" msgstr "duplisert gruppeoppf繪ring\n" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" msgstr "ugyldig gruppenavn `%s'\n" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "gruppe %s: ingen bruker %s\n" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " msgstr "slett medlem `%s'? " -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" msgstr "ugyldig oppf繪ring i shadow gruppefila\n" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" msgstr "duplisert shadowgruppe-oppf繪ring\n" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" msgstr "fant ingen tilsvarende oppf繪ring i gruppefila\n" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" msgstr "shadow-gruppe %s: ingen administrativ bruker %s\n" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " msgstr "slett administrativt medlem 竄%s罈 ?" -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" msgstr "shadow gruppe %s: ingen bruker %s\n" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "%s: kan ikke oppdatere fila %s\n" -#: src/grpck.c:647 src/pwck.c:612 -#, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: filene har blitt oppdatert, kj繪r mkpasswd\n" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format -msgid "%s: no changes\n" -msgstr "%s: ingen endringer\n" - -#: src/grpck.c:651 src/pwck.c:616 +#: src/grpck.c:640 src/pwck.c:606 #, c-format msgid "%s: the files have been updated\n" msgstr "%s: filene har blitt oppdatert\n" +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "%s: ingen endringer\n" + #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" @@ -1041,37 +983,37 @@ msgstr "%s: klarer ikke 疇 疇pne gruppefila\n" msgid "%s: can't lock shadow group file\n" msgstr "%s: kan ikke l疇se shadow-gruppefila\n" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" msgstr "%s: kan ikke 疇pne shadow-gruppefila\n" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "%s: kan ikke fjerne shadow-gruppe %s\n" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "%s: kan ikke oppdatere shadow-oppf繪ringen for %s\n" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "%s: kan ikke oppdatere oppf繪ringen for gruppa %s\n" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" msgstr "%s: kan ikke oppdatere shadow-gruppefila\n" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" msgstr "%s: kan ikke oppdatere gruppefila\n" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "%s: kan ikke slette shadow-gruppefila\n" @@ -1091,52 +1033,52 @@ msgstr "Bruk: id\n" msgid " groups=" msgstr " grupper=" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" msgstr "Brukernavn Port Fra Sist\n" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "Brukernavn Port Sist\n" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "**Aldri v疆rt innlogget**" -#: src/login.c:175 +#: src/login.c:156 #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Bruk: %s [-p] [navn]\n" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr " %s [-p] [-h host] [-f navn]\n" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr " %s [-p] -r host\n" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" msgstr "Ugyldig tidspunkt for innlogging\n" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" @@ -1145,7 +1087,7 @@ msgstr "" "\n" "Systemet stengt for rutinemessig vedlikehold\n" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" @@ -1154,7 +1096,7 @@ msgstr "" "\n" "[Frakobling omg疇tt - root-innlogging tillatt.]\n" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" @@ -1163,17 +1105,17 @@ msgstr "" "\n" "Innlogging avbrutt p疇 tid etter %d sekunder.\n" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" msgstr " p疇 `%.100s' fra `%.200s'" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" msgstr " p疇 `%.100s'" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" @@ -1182,38 +1124,29 @@ msgstr "" "\n" "%s login: " -#: src/login.c:819 -msgid "login: " -msgstr "login: " - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" msgstr "Ugyldig innlogging" -#: src/login.c:1198 +#: src/login.c:996 msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "Advarsel: innlogging reaktivert etter midlertidig stenging.\n" -#: src/login.c:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "Forrige login: %s p疇 %s" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" msgstr "Forrige login: %.19s p疇 %s" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" msgstr " fra %.*s" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "Starter rad_login\n" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" @@ -1254,17 +1187,17 @@ msgstr "%s: feil under innlegging av post for " msgid "added %d entries, longest was %d\n" msgstr "la til %d oppf繪ringer, lengste var %d\n" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "Bruk: %s [-vf] [-p|g|sp|sg] file\n" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "Bruk: %s [-vf] [-p|g|sp] file\n" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "Bruk: %s [-vf] [-p|g] file\n" @@ -1284,16 +1217,16 @@ msgstr "Bruk: sg group [[-c] command]\n" msgid "unknown uid: %u\n" msgstr "ukjent uid: %u\n" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" msgstr "ukjent gid: %lu\n" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "Beklager.\n" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "For mange grupper\n" @@ -1303,91 +1236,91 @@ msgstr "For mange grupper\n" msgid "Usage: %s [input]\n" msgstr "Bruk: %s [input]\n" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "%s: kan ikke l疇se /etc/passwd.\n" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "%s: kan ikke l疇se filene, pr繪v igjen senere\n" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "%s: kan ikke 疇pne filer\n" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "%s: linje %d: ugyldig linje\n" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "%s: linje %d: kan ikke opprette GID\n" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "%s: linje %d: kan ikke opprette UID\n" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "%s: linje %d: kan ikke finne bruker %s\n" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "%s: linje %d: kan ikke oppdatere passord\n" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "%s: linje %d: mkdir feilet\n" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "%s: linje %d: chown feilet\n" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "%s: linje %d: kan ikke oppdatere oppf繪ring\n" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "%s: feil ved oppdatering av filer\n" -#: src/passwd.c:155 +#: src/passwd.c:154 #, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "Bruk: %s [-f|-s] [navn]\n" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr " %s [-x max] [-n min] [-w advar] [-i inakt] navn\n" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} navn\n" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "Gammelt passord: " -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" msgstr "Feil passord for 竄%s罈\n" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" @@ -1396,16 +1329,16 @@ msgstr "" "Skriv inn det nye passordet (minst %d, h繪yst %d tegn)\n" "Bruk en kombinasjon av store og sm疇 bokstaver, og tall.\n" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "Nytt passord: " -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" msgstr "Pr繪v igjen.\n" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" @@ -1414,52 +1347,52 @@ msgstr "" "\n" "Advarsel: svakt passord (skriv det inn igjen for 疇 bruke det likevel).\n" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" msgstr "Passordene var ikke like, pr繪v igjen.\n" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "Passordet for %s kan ikke endres.\n" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" msgstr "Passordet for %s kan ikke endres enn疇.\n" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "%s: slapp opp for minne\n" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "%s: Kan ikke utf繪re %s" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" msgstr "%s: ikke st繪tte for lager %s\n" -#: src/passwd.c:914 +#: src/passwd.c:884 #, fuzzy, c-format -msgid "You may not change the password for %s.\n" +msgid "%s: You may not view or modify password information for %s.\n" msgstr "Du kan ikke endre skall til %s.\n" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "Endrer passordet til %s\n" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "Passordet for %s er uendret.\n" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "Passordet er endret.\n" @@ -1474,49 +1407,49 @@ msgstr "Bruk: %s [-q] [-r] [-s] [passord [shadow]]\n" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "Bruk: %s [-q] [-r] [-s] [passord]\n" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" msgstr "ugyldig oppf繪ring i passordfila\n" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" msgstr "duplisert oppf繪ring i passordfila\n" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" msgstr "ugyldig brukernavn '%s'\n" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "bruker %s: ingen gruppe %u\n" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "bruker %s: mappe %s finnes ikke\n" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "bruker %s: programmet %s finnes ikke\n" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" msgstr "ugyldig oppf繪ring i shadow-passordfila\n" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" msgstr "duplisert oppf繪ring i shadow-passordfila\n" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" msgstr "fant ingen tilsvarende oppf繪ring i passordfila\n" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" msgstr "bruker %s: seneste passordendring i fremtiden\n" @@ -1536,17 +1469,17 @@ msgstr "%s: klarte ikke 疇 疇pne passordfila\n" msgid "%s: can't remove shadow entry for %s\n" msgstr "%s: klarte ikke 疇 fjerne shadow-oppf繪ring for %s\n" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "%s: klarer ikke 疇 endre passord-oppf繪ringen for %s\n" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" msgstr "%s: klarer ikke 疇 oppdatere shadow-fila\n" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" msgstr "%s: klarer ikke 疇 oppdatere passordfila\n" @@ -1556,40 +1489,40 @@ msgstr "%s: klarer ikke 疇 oppdatere passordfila\n" msgid "%s: can't update entry for user %s\n" msgstr "%s: klarer ikke 疇 oppdatere oppf繪ring for bruker %s\n" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format msgid "%s: can't delete shadow password file\n" msgstr "%s: kan ikke slette shadow-passordfila\n" -#: src/su.c:133 +#: src/su.c:132 msgid "Sorry." msgstr "Beklager." -#: src/su.c:323 +#: src/su.c:320 #, c-format msgid "%s: must be run from a terminal\n" msgstr "%s: m疇 kj繪res fra en terminal\n" -#: src/su.c:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "%s: pam_start: feil %d\n" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" msgstr "Ukjent id: %s\n" -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, c-format msgid "You are not authorized to su %s\n" msgstr "Du har ikke adgang til 疇 su %s\n" -#: src/su.c:502 +#: src/su.c:495 msgid "(Enter your own password.)" msgstr "(Oppgi ditt eget passord.)" -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" @@ -1598,22 +1531,22 @@ msgstr "" "%s: %s\n" "(Ignorert)\n" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" msgstr "Mangler skall\n" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr "NEKTET tilgang til su til den kontoen.\n" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "Passordautentisering forbi-koblet.\n" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" msgstr "Oppgi ditt EGET passord som autentisering.\n" @@ -1628,7 +1561,7 @@ msgstr "Ingen passordfil.\n" msgid "No password entry for 'root'\n" msgstr "Ingen oppf繪ring for 竄root罈 i passordfila\n" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" @@ -1638,233 +1571,213 @@ msgstr "" "Bruk control-d for 疇 fortsette med normal oppstart,\n" "(eller skriv inn root passordet for 疇 starte maskinen i vedlikeholdsmodus):" -#: src/sulogin.c:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" msgstr "Starter systemvedlikeholds-modus\n" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "%s: bygg gruppedatabasen omigjen\n" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "%s: bygg shadow-gruppedatabasen omigjen\n" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "%s: ugyldig numerisk argument `%s'\n" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "%s: ukjent gid %s\n" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "%s: ukjent gruppe %s\n" -#: src/useradd.c:475 +#: src/useradd.c:418 #, c-format msgid "%s: cannot create new defaults file\n" msgstr "%s: klarer ikke 疇 opprette ny 竄defaults罈-fil\n" -#: src/useradd.c:480 +#: src/useradd.c:423 #, c-format msgid "%s: cannot open new defaults file\n" msgstr "%s: klarer ikke 疇 疇pne ny 竄defaults罈-fil\n" -#: src/useradd.c:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" msgstr "%s: gi nytt navn: %s" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s: gruppe `%s' er en NIS gruppe.\n" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "%s: for mange grupper spesifisert (maks %d).\n" -#: src/useradd.c:721 +#: src/useradd.c:660 #, c-format msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n" msgstr "Bruk: useradd [-u uid [-o]] [-g gruppe] [-G gruppe,...] \n" -#: src/useradd.c:724 +#: src/useradd.c:663 #, 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:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, c-format msgid " [-f inactive] [-e expire]\n" msgstr " [-f inaktiv] [-e utg疇 ]\n" -#: src/useradd.c:728 +#: src/useradd.c:667 #, c-format msgid " [-p passwd] name\n" msgstr " [-p passord] navn\n" -#: src/useradd.c:730 +#: src/useradd.c:669 #, 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:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, c-format msgid "%s: error locking group file\n" msgstr "%s: feil ved l疇sing av gruppefila\n" -#: src/useradd.c:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, c-format msgid "%s: error opening group file\n" msgstr "%s: feil ved 疇pning av gruppefila\n" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, c-format msgid "%s: error locking shadow group file\n" msgstr "%s: feil ved l疇sing av shadow-gruppefila\n" -#: src/useradd.c:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, c-format msgid "%s: error opening shadow group file\n" msgstr "%s: feil ved 疇pning av shadow-gruppefila\n" -#: src/useradd.c:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "%s: uid %u er ikke unik\n" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "%s: kan ikke finne unikt uid\n" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "%s: ugyldig basismappe `%s'\n" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "%s: ugyldig kommentar `%s'\n" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "%s: ugyldig hjemmemappe `%s'\n" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s: ugyldig dato `%s'\n" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "%s: shadow-passord kreves for -e\n" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, c-format msgid "%s: shadow passwords required for -f\n" msgstr "%s: shadow-passord kreves for -f\n" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" msgstr "%s: ugyldig felt `%s'\n" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "%s: ugyldig skall `%s'\n" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "%s: ugyldig brukernavn '%s'\n" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "%s: kan ikke skrive passordfila p疇 nytt\n" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "%s: kan ikke skrive shadow-passordfila p疇 nytt\n" -#: src/useradd.c:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, c-format msgid "%s: unable to lock password file\n" msgstr "%s: klarte ikke 疇 l疇se passordfila\n" -#: src/useradd.c:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, c-format msgid "%s: unable to open password file\n" msgstr "%s: klarte ikke 疇 疇pne passordfila\n" -#: src/useradd.c:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, c-format msgid "%s: cannot lock shadow password file\n" msgstr "%s: klarte ikke 疇 l疇se shadow-passordfila\n" -#: src/useradd.c:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, c-format msgid "%s: cannot open shadow password file\n" msgstr "%s: klarte ikke 疇 疇pne shadow-passordfila\n" -#: src/useradd.c:1459 +#: src/useradd.c:1354 #, c-format msgid "%s: error adding new password entry\n" msgstr "%s: feil ved innlegging av ny passord-oppf繪ring\n" -#: src/useradd.c:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "%s: feil under oppdatering av passord dbm-oppf繪ring\n" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, 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:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s: feil ved oppdatering av shadow passord dbm-oppf繪ring\n" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" msgstr "%s: kan ikke opprette mappa %s\n" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, c-format msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n" msgstr "" -#: src/useradd.c:1590 +#: src/useradd.c:1446 #, 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:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "%s: bruker %s finnes\n" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" @@ -1872,206 +1785,171 @@ msgstr "" "%s: gruppen %s finnes - hvis du 繪nsker 疇 legge til denne brukeren til denne " "gruppen, bruk -g.\n" -#: src/useradd.c:1767 +#: src/useradd.c:1602 #, 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" -#: src/userdel.c:124 +#: src/userdel.c:108 #, c-format msgid "Usage: %s [-r] name\n" msgstr "Bruk: %s [-r] navn\n" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" msgstr "%s: feil ved oppdatering av gruppe-oppf繪ring\n" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "%s: klarte ikke oppdatere gruppe dbm-oppf繪ring\n" - -#: src/userdel.c:214 -#, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: kan ikke fjerne gruppe dbm-oppf繪ring\n" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "%s: kan ikke 疇pne gruppefila\n" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "%s: kan ikke 疇pne shadow-gruppefila\n" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "%s: feil ved sletting av passord-oppf繪ring\n" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "%s: feil ved sletting av shadow passordoppf繪ring\n" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "%s: feil ved sletting av passord dbm-oppf繪ring\n" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s: feil ved sletting av shadow passord dbm-oppf繪ring\n" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "%s: brukeren %s er p疇logget\n" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "%s: %s ikke eid av %s, ikke fjernet\n" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " msgstr "%s: advarsel: kan ikke fjerne " -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" msgstr "%s: bruker %s finnes ikke\n" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s: bruker %s er ikke en NIS bruker\n" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "" "%s: fjerner ikke mappe %s (det ville fjerne hjemmemappa til bruker %s)\n" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "%s: feil ved fjerning av mappe %s\n" -#: src/usermod.c:306 +#: src/usermod.c:289 #, c-format msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "Bruk: %s\t[-u uid [-o]] [-g gruppe] [-G gruppe,...] \n" -#: src/usermod.c:310 +#: src/usermod.c:293 #, 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:313 +#: src/usermod.c:296 #, fuzzy, c-format msgid "[-f inactive] [-e expire] " msgstr "[-f inaktiv] [-e utg疇 ] " -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p passord] [-L|-U] navn\n" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" msgstr "%s: slapp opp for minne i update_group\n" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "%s: slapp opp for minne i update_gshadow\n" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "%s: ingen flagg oppgitt\n" -#: src/usermod.c:965 +#: src/usermod.c:903 #, 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:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "%s: uid %lu er ikke unik\n" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, c-format msgid "%s: error changing password entry\n" msgstr "%s: feil ved endring av passordoppf繪ring\n" -#: src/usermod.c:1122 +#: src/usermod.c:1053 #, c-format msgid "%s: error removing password entry\n" msgstr "%s: feil ved sletting av passordoppf繪ring\n" -#: src/usermod.c:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "%s: feil ved innlegging av passord dbm-oppf繪ring\n" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "%s: feil ved fjerning av passord dbm-oppf繪ring\n" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "%s: feil ved sletting av shadow passord-oppf繪ring\n" -#: src/usermod.c:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s: feil ved sletting av shadow passord dbm-oppf繪ring\n" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "%s: mappa %s finnes\n" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "%s: kan ikke lage %s\n" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" msgstr "%s: kan ikke chown %s\n" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, 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:1333 +#: src/usermod.c:1223 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "%s: advarsel: %s er ikke eid av %s\n" -#: src/usermod.c:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" msgstr "klarte ikke 疇 endre eier av mailbox" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" msgstr "klarte ikke 疇 endre navn p疇 mailbox" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" @@ -2080,20 +1958,20 @@ msgstr "" "\n" "%s: %s er ikke endret\n" -#: src/vipw.c:133 +#: src/vipw.c:131 msgid "Couldn't lock file" msgstr "Kunne ikke l疇se fil" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" msgstr "Kunne ikke lage backup" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s: kan ikke gjenopprette %s: %s (dine endringer befinner seg i %s)\n" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/po/nl.gmo b/po/nl.gmo index 4fe8ac2a..9cd1f27a 100644 Binary files a/po/nl.gmo and b/po/nl.gmo differ diff --git a/po/nl.po b/po/nl.po index 4adc3f88..bb988581 100644 --- a/po/nl.po +++ b/po/nl.po @@ -2,24 +2,24 @@ # msgid "" msgstr "" -"Project-Id-Version: shadow 4.0.7\n" +"Project-Id-Version: shadow 4.0.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-26 07:53+0100\n" -"PO-Revision-Date: 2005-01-18 17:55+0100\n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" +"PO-Revision-Date: 2005-04-24 15:38+0100\n" "Last-Translator: Bart Cornelis \n" "Language-Team: debian-l10n-dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.3.1\n" -"Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" msgstr "Waarschuwing: onbekende groep %s\n" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" msgstr "Waarschuwing: teveel groepen\n" @@ -47,17 +47,17 @@ msgstr " U dient contact op te nemen met de systeembeheerder.\n" msgid " Choose a new password.\n" msgstr " U dient een nieuw wachtwoord te kiezen.\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "Uw wachtwoord vervalt binnen %ld dagen.\n" -#: libmisc/age.c:174 +#: libmisc/age.c:172 #, c-format msgid "Your password will expire tomorrow.\n" msgstr "Uw wachtwoord vervalt morgen.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:174 #, c-format msgid "Your password will expire today.\n" msgstr "Uw wachtwoord vervalt vandaag.\n" @@ -72,41 +72,31 @@ msgstr "Kan tty %s niet veranderen" msgid "Environment overflow\n" msgstr "Omgeving wordt te groot\n" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr "U mag $%s niet veranderen\n" -#: libmisc/failure.c:230 +#: libmisc/failure.c:229 #, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "" -"%d %s sinds u de laatste keer aangemeld heeft. De laatste %s was op %s.\n" +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "" +"%d mislukte poging sinds u de laatste keer aangemeld heeft.\n" +"Deze mislukte poging %s was op %s.\n" +msgstr[1] "" +"%d mislukte pogingen sinds u de laatste keer aangemeld heeft.\n" +"De laatste mislukte poging %s was op %s.\n" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "mislukkingen" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "mislukking" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" msgstr "Teveel aanmeldingen.\n" -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "Wachtwoord ontsleutelt de geheime sleutel voor %s niet.\n" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "" -"Kon de geheime sleutel van %s niet instellen: is de keyserv-daemon actief?\n" - #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "U heeft nieuwe e-mails ontvangen" @@ -119,7 +109,7 @@ msgstr "Geen e-mails" msgid "You have mail." msgstr "U heeft e-mail." -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " msgstr "Slecht wachtwoord: %s. " @@ -134,20 +124,20 @@ msgstr "passwd: pam_start() is mislukt, fout %d\n" msgid "passwd: %s\n" msgstr "passwd: %s\n" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" msgstr "passwd: wachtwoord is mes succes aangepast\n" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "Kan niet verspringen naar map '%s'\n" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" msgstr "Geen thuismap, er wordt aangemeld met HOME=/" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr "Kan %s niet uitvoeren" @@ -162,36 +152,32 @@ msgstr "Ongeldige hoofdmap '%s'\n" msgid "Can't change root directory to \"%s\"\n" msgstr "Kan de hoofdmap niet veranderen naar '%s'\n" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "malloc(%d) is mislukt\n" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" msgstr "Kon geen ruimte toewijzen voor de configuratie-informatie.\n" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "" "configuratiefout - onbekend item '%s' (waarschuw een systeembeheerder)\n" -#: lib/pwauth.c:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "Wachtwoord: " -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "Wachtwoord van %s:" -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "(Echo aan) " - -#: src/chage.c:118 +#: src/chage.c:112 #, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" @@ -200,157 +186,150 @@ msgstr "" "Gebruik: chage [-l] [-m min_dagen] [-M max_dagen] [-W waarschuwing]\n" " [-I niet actief] [-E vervalt] [-d laatste_dag] gebruiker\n" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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:155 +#: src/chage.c:149 msgid "Minimum Password Age" msgstr "Minimumleeftijd voor wachtwoord" -#: src/chage.c:161 +#: src/chage.c:155 msgid "Maximum Password Age" msgstr "Maximumleeftijd voor wachtwoord" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" msgstr "Laatste wachtwoordverandering (JJJJ-MM-DD)" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" msgstr "Waarschuwing voor wachtwoordverval" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "Wachtwoord niet actief" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Vervaldatum van account (JJJJ-MM-DD)" -#: src/chage.c:238 +#: src/chage.c:231 #, c-format msgid "Last password change\t\t\t\t\t: " msgstr "Laatste wachtwoord-verandering\t\t\t\t\t: " -#: src/chage.c:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 #, c-format msgid "never\n" msgstr "nooit\n" -#: src/chage.c:251 +#: src/chage.c:244 #, c-format msgid "Password expires\t\t\t\t\t: " msgstr "Wachtwoord vervalt\t\t\t\t\t:" -#: src/chage.c:267 +#: src/chage.c:260 #, c-format msgid "Password inactive\t\t\t\t\t: " msgstr "Wachtwoord niet actief\t\t\t\t\t:" -#: src/chage.c:281 +#: src/chage.c:274 #, c-format msgid "Account expires\t\t\t\t\t\t: " msgstr "Account vervalt\t\t\t\t\t\t:" -#: src/chage.c:297 +#: src/chage.c:290 #, 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:298 +#: src/chage.c:292 #, 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:299 +#: src/chage.c:294 #, 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:444 +#: src/chage.c:431 #, 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:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 #, c-format msgid "%s: permission denied.\n" msgstr "%s: toegang geweigerd.\n" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 #, c-format msgid "%s: PAM authentication failed\n" msgstr "%s: PAM-authenticatie is mislukt\n" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, c-format msgid "%s: can't open password file\n" msgstr "%s: kan wachtwoordbestand niet openen\n" -#: src/chage.c:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "%s: onbekende gebruiker %s\n" -#: src/chage.c:535 +#: src/chage.c:519 #, c-format msgid "%s: can't lock shadow password file" msgstr "%s: kan schaduw-wachtwoordenbestand niet vergrendelen" -#: src/chage.c:543 +#: src/chage.c:527 #, c-format msgid "%s: can't open shadow password file" msgstr "%s: kan schaduw-wachtwoordenbestand niet openen" -#: src/chage.c:604 +#: src/chage.c:587 #, c-format msgid "Changing the aging information for %s\n" msgstr "Verouderingsinformatie voor %s wordt aangepast\n" -#: src/chage.c:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" msgstr "%s: fout bij het aanpassen van de velden\n" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, c-format msgid "%s: can't update password file\n" msgstr "%s: kan wachtwoordbestand niet bijwerken\n" -#: src/chage.c:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" msgstr "%s: kan schaduwwachtwoordbestand niet bijwerken\n" -#: src/chage.c:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "Fout bij het bijwerken van de DBM-wachtwoordingang.\n" - -#: src/chage.c:692 +#: src/chage.c:649 #, c-format msgid "%s: can't rewrite shadow password file\n" msgstr "%s: kan het schaduwwachtwoordbestand niet herschrijven\n" -#: src/chage.c:740 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite password file\n" msgstr "%s: kan het wachtwoordbestand niet herschrijven\n" -#: src/chage.c:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 #, c-format msgid "%s: PAM chauthtok failed\n" msgstr "%s: PAM-chauthtok is mislukt\n" @@ -370,119 +349,124 @@ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" msgstr "" "Gebruik: %s [-f volledige_naam] [-r kamer_nr] [-w tel_werk] [-h tel_thuis]\n" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "Volledig naam" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "\tVolledige naam: %s\n" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "Kamernummer" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "Telefoon werk" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" msgstr "Telefoon thuis" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "Varia" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s: Kan uw gebruikersnaam niet bepalen.\n" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s: kan gebruiker '%s' niet veranderen op NIS-client.\n" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "%s: '%s' is the NIS-master voor deze client.\n" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, c-format +msgid "%s: Permission denied.\n" +msgstr "%s: toegang geweigerd.\n" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" msgstr "De gebruikersinformatie van %s wordt veranderd\n" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s: ongeldige naam: \"%s\"\n" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s: ongeldig kamernummer '%s'\n" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s: '%s' voor 'telefoon werk' is ongeldig\n" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s: '%s' voor 'telefoon thuis' is ongeldig\n" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s: '%s' bevat illegale karakters\n" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "%s: velden zijn te lang\n" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" msgstr "Kan ID niet veranderen naar root.\n" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" msgstr "" "Kan het wachtwoordbestand niet vergrendelen; u kunt best later nog eens " "proberen.\n" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" msgstr "Kan het wachtwoordbestand niet openen.\n" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s: %s is niet gevonden in /etc/passwd\n" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" msgstr "Fout tijdens het bijwerken van de wachtwoordingang.\n" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" msgstr "Kan de aanpassingen aan het wachtwoordbestand niet vastleggen.\n" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" msgstr "Kan het wachtwoordbestand niet ontgrendelen.\n" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -506,48 +490,48 @@ msgstr "" msgid "%s: can't lock password file\n" msgstr "%s: kan wachtwoordbestand niet vergrendelen\n" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "%s: kan het 'schadow'-bestand niet vergrendelen\n" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "%s: kan het schaduwbestand niet openen\n" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "%s: op regel %d: regel is te lang\n" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "%s: regel %d: nieuw wachtwoord ontbreekt\n" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "%s: regel %d: onbekende gebruiker %s\n" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "%s: regel %d: kan wachtwoordingang niet bijwerken\n" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "%s: fouten gedetecteerd, aanpassingen genegeerd\n" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" msgstr "%s: fout tijdens bijwerken schaduwbestand\n" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" msgstr "%s: fout tijdens bijwerken van het wachtwoordbestand\n" @@ -557,26 +541,26 @@ msgstr "%s: fout tijdens bijwerken van het wachtwoordbestand\n" msgid "Usage: %s [-s shell] [name]\n" msgstr "Gebruik: %s [-s shell] [naam]\n" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" msgstr "Aanmeldshell" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" msgstr "U mag de shell voor %s niet aanpassen.\n" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" msgstr "De aanmeldshell voor %s wordt aangepast\n" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s: ongeldige ingang: %s\n" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" msgstr "%s is geen geldige shell.\n" @@ -586,12 +570,12 @@ msgstr "%s is geen geldige shell.\n" msgid "Usage: expiry {-f|-c}\n" msgstr "Gebruik: expiry {-f|-c}\n" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" msgstr "%s: WAARSCHUWING! Dient set-UID root ingesteld te zijn!\n" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "%s: onbekende gebruiker\n" @@ -605,8 +589,9 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" @@ -619,319 +604,285 @@ msgstr "" " -l, --lock-time SEC\t\tBevries accounts SEC seconden na mislukt aanmelden\n" " -m, --maximum MAX\t\tstel maximaal aantal mislukte aanmeldingen in op MAX\n" " -r, --reset\t\t\therbegin de tellers voor mislukte aanmeldingen\n" -" -u, --user LOGIN\t\tgeef faillog-record weer en onderhoud mislukking-" +" -t, --time AANTAL\t\t\tgeef alle faillog records van de laatste AANTAL " +"dagen weer\n" +" -u, --user LOGIN\t\tgeef faillog-record weer en onderhoud mislukking-" "tellers\n" "\t\t\t\ten limieten (indien de -r, -m or -l opties gebruikt worden), maar " "enkel\n" "\t\t\t\tvoor gebruiker LOGIN\n" -#: src/faillog.c:86 +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" -msgstr "Gebruikersnaam Mislukkingen Maximum Laatste\n" +msgid "Login Failures Maximum Latest On\n" +msgstr "Gebruiker Missingen Maximum Laatste Op\n" -#: src/faillog.c:103 -#, c-format -msgid " %s on %s" -msgstr " %s op %s" - -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" msgstr " [%lds over]" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr " [%lds slot]" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "Onbekende gebruiker %s\n" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "Gebruik: %s [-r|-R] groep\n" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr " %s [-a gebruiker] groep\n" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr " %s [-d gebruiker] groep\n" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr " %s [-A gebruiker,...] [-M gebruiker,...] groep\n" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr " %s [-M gebruiker,...] groep\n" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" msgstr "%s: schaduw groepwachtwoorden zijn vereist voor -A\n" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "Wie bent u?\n" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr "onbekende groep: %s\n" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "Gebruiker %s wordt toegevoegd aan groep %s\n" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "Gebruiker %s wordt verwijderd uit groep %s\n" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" msgstr "%s: onbekende gebruiker %s\n" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "%s: Is geen tty\n" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "Het wachtwoord voor groep %s wordt veranderd\n" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "Nieuw wachtwoord:" -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " msgstr "Nieuw wachtwoord bevestigen:" -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" msgstr "Wachtwoorden komen niet overeen, probeer het nog eens" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" msgstr "%s: U kunt het later nog eens proberen\n" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "%s: kan geen vergrendeling verkrijgen\n" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" msgstr "%s: kan geen schaduwvergrendeling verkrijgen\n" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "%s: kan bestand niet openen\n" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "%s: kan ingang niet bijwerken\n" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" msgstr "%s: kan schaduwingang niet bijwerken\n" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "%s: kan bestand niet herschrijven\n" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" msgstr "%s: kan schaduwbestand niet herschrijven\n" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "%s: kan bestand niet ontgrendelen\n" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "%s: kan DBM-bestanden niet bijwerken\n" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "%s: kan DBM-schaduwbestanden niet bijwerken\n" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "Gebruik: groupadd [-g gid [-o]] [-f] groep\n" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, c-format msgid "%s: error adding new group entry\n" msgstr "%s: fout tijdens toevoegen nieuwe groepingang\n" -#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: kan geen nieuwe dbm-groepingang toevoegen\n" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "%s: naam %s is niet uniek\n" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" msgstr "%s: gid %u is niet uniek\n" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "%s: kan geen unieke gid verkrijgen\n" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, c-format msgid "%s: %s is not a valid group name\n" msgstr "%s: %s is geen geldige groepsnaam\n" -#: src/groupadd.c:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "%s: ongeldige groep %s\n" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "%s: -O vereist NAAM=WAARDE\n" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s: kan groepbestand niet herschrijven\n" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s: kan schaduwgroepbestand niet herschrijven\n" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" msgstr "%s: kan groepbestand niet vergrendelen\n" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" msgstr "%s: kan groepbestand niet openen\n" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" msgstr "%s: kan schaduwgroepbestand niet vergrendelen\n" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" msgstr "%s: kan schaduwgroepbestand niet openen\n" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "%s: groep %s bestaat reeds\n" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, c-format msgid "Usage: groupdel group\n" msgstr "Gebruik: groupdel groep\n" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" msgstr "%s: fout bij het verwijderen van de groepingang\n" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "%s: fout tijdens het verwijderen van de dbm-groepingang\n" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "%s: fout tijdens het verwijderen van de schaduwgroepingang\n" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "%s: fout tijdens het verwijderen van de dbm-schaduwgroepingang\n" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "%s: kan de primaire groep van een gebruiker niet verwijderen.\n" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "%s: groep %s bestaan niet\n" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "%s: groep %s is een NIS-groep\n" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s: %s is de NIS-master\n" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "Gebruik: groupmod [-g gid [-o]] [-n naam] groep\n" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "%s: %s is niet gevonden in /etc/group\n" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s: kan geen dbm-schaduwgroepingang toevoegen\n" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s: %u is geen unieke gid\n" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "%s: %s is geen unieke naam\n" @@ -941,110 +892,105 @@ msgstr "%s: %s is geen unieke naam\n" msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "Gebruik: %s [-r] [-s] [groep [gshaduw]]\n" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "Gebruik: %s [-r] [-s] [groep]\n" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "Nee" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" msgstr "%s: -s en -r zijn niet compatibel\n" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "%s: kan bestand %s niet vergrendelen\n" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "%s: kan bestand %s niet openen\n" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" msgstr "ongeldige ingang in het groepbestand\n" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "regel '%s' verwijderen?" -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" msgstr "dubbele groepsingang\n" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" msgstr "ongeldige groepsnaam '%s'\n" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "groep %s: geen gebruiker %s\n" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " msgstr "lid '%s' verwijderen?" -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" msgstr "ongeldige ingang in het schaduwgroepbestand\n" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" msgstr "dubbele schaduwgroepingang\n" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" msgstr "geen overeenkomende groepbestandingang\n" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" msgstr "schaduwgroep %s: geen administratieve gebruiker %s\n" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " msgstr "administratieve gebruiker '%s' verwijderen?" -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" msgstr "schaduwgroep %s: geen gebruiker %s\n" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "%s: kan bestand %s niet bijwerken\n" -#: src/grpck.c:647 src/pwck.c:612 -#, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: de bestanden zijn bijgewerkt; voer mkpasswd uit\n" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format -msgid "%s: no changes\n" -msgstr "%s: geen aanpassingen\n" - -#: src/grpck.c:651 src/pwck.c:616 +#: src/grpck.c:640 src/pwck.c:606 #, c-format msgid "%s: the files have been updated\n" msgstr "%s: de bestanden zijn bijgewerkt\n" +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "%s: geen aanpassingen\n" + #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" @@ -1060,37 +1006,37 @@ msgstr "%s: kan groepbestand niet openen\n" msgid "%s: can't lock shadow group file\n" msgstr "%s: kan schaduwgroepbestand niet openen\n" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" msgstr "%s: kan schaduwgroepbestand niet openen\n" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "%s: kan schaduwgroep %s niet verwijderen\n" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "%s: kan schaduwingang voor %s niet bijwerken\n" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "%s: kan ingang voor groep %s niet bijwerken\n" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" msgstr "%s: kan schaduwgroepbestand niet bijwerken\n" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" msgstr "%s: kan groepbestand niet bijwerken\n" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "%s: kan schaduwgroepbestand niet verwijderen\n" @@ -1110,13 +1056,13 @@ msgstr "Gebruik: id\n" msgid " groups=" msgstr " groepen=" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" @@ -1127,41 +1073,41 @@ msgstr "" " -h, --help\t\ttoon dit bericht en sluit af\n" " -t, --time DAGEN\tprint enkel lastlog-records van de laatste DAGEN dagen\n" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" msgstr "Gebruikersnaam Poort Vanaf Laatste\n" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "Gebruikersnaam Poort Laatste\n" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "**Heeft zich nog nooit aangemeld**" -#: src/login.c:175 +#: src/login.c:156 #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Gebruik: %s [-p] [naam]\n" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr " %s [-p] [-h computer] [-f naam]\n" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr " %s [-p] -r computer\n" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" msgstr "Ongeldig aanmeldtijdstip\n" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" @@ -1170,7 +1116,7 @@ msgstr "" "\n" "Systeem gesloten wegens routineonderhoud\n" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" @@ -1179,7 +1125,7 @@ msgstr "" "\n" "[Verbinding verbreken omzeild -- aanmelden van root is toegelaten.]\n" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" @@ -1188,17 +1134,17 @@ msgstr "" "\n" "Aanmelding is na %d seconden verlopen.\n" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" msgstr " om `%.100s' vanaf `%.200s'" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" msgstr " om `%.100s'" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" @@ -1207,38 +1153,29 @@ msgstr "" "\n" "%s gebruikersnaam: " -#: src/login.c:819 -msgid "login: " -msgstr "gebruikersnaam" - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" msgstr "Gebruikersnaam onjuist" -#: src/login.c:1198 +#: src/login.c:996 msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "Waarschuwing: aanmelden gereactiveerd na tijdelijke buitensluiting.\n" -#: src/login.c:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "Laatst aangemeld: %s om %s" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" msgstr "Laatst aangemeld: %.19s om %s" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" msgstr " vanaf %.*s" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "rad_login wordt opgestart\n" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" @@ -1279,17 +1216,17 @@ msgstr "%s: fout tijdens toevoegen record voor '%s'\n" msgid "added %d entries, longest was %d\n" msgstr "%d ingangen toegevoegd, langste was %d\n" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "Gebruik: %s [-vf] [-p|g|sp|sg] bestand\n" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "Gebruik: %s [-vf] [-p|g|sp] bestand\n" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "Gebruik: %s [-vf] [-p|g] bestand\n" @@ -1309,16 +1246,16 @@ msgstr "Gebruik: sg groep [[-c] commando]\n" msgid "unknown uid: %u\n" msgstr "onbekende uid: %u\n" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" msgstr "onbekende gid: %lu\n" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "Sorry.\n" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "teveel groepen\n" @@ -1328,91 +1265,91 @@ msgstr "teveel groepen\n" msgid "Usage: %s [input]\n" msgstr "Gebruik: %s [invoer]\n" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "%s: kan /etc/passwd niet vergrendelen.\n" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "%s: kan bestanden niet vergrendelen, probeer dit later nog eens\n" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "%s: kan bestanden niet openen\n" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "%s: regel %d: ongeldige regel\n" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "%s: regel %d: kan geen GID aanmaken\n" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "%s: regel %d: kan geen UID aanmaken\n" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "%s: regel %d: kan gebruiker %s niet vinden\n" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "%s: regel %d: kan wachtwoord niet bijwerken\n" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "%s: regel %d: mkdir is mislukt\n" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "%s: regel %d: chown is mislukt\n" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "%s: regel %d: kan ingang niet bijwerken\n" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "%s: fout tijdens bijwerken bestanden\n" -#: src/passwd.c:155 +#: src/passwd.c:154 #, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "Gebruik: %s [-f|-s] [naam]\n" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr " %s [-x max] [-n min] [-w waarschuwing] [-i inact] naam\n" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} naam\n" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "Oud wachtwoord: " -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" msgstr "Onjuist wachtwoord voor '%s'\n" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" @@ -1422,16 +1359,16 @@ msgstr "" "Dit dient te bestaan uit een combinatie van grote letters, kleine letters en " "cijfers.\n" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "Nieuw wachtwoord:" -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" msgstr "Probeer het nog eens.\n" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" @@ -1441,52 +1378,52 @@ msgstr "" "Waarschuwing: zwak wachtwoord (voer het nogmaals in om het toch te " "gebruiken).\n" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" msgstr "Ze komen niet overeen; probeer het nog eens.\n" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "Het wachtwoord voor %s kan niet veranderd worden.\n" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" msgstr "Sorry, het wachtwoord voor %s kan nog niet veranderd worden.\n" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "%s: geen geheugen over\n" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "%s: Kan %s niet uitvoeren" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" msgstr "%s: opslagplaats %s wordt niet ondersteund\n" -#: src/passwd.c:914 +#: src/passwd.c:884 #, c-format -msgid "You may not change the password for %s.\n" -msgstr "U mag het wachtwoord van %s niet aanpassen.\n" +msgid "%s: You may not view or modify password information for %s.\n" +msgstr "%s: U mag het wachtwoord van %s niet aanpassen.\n" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "Wachtwoord van %s wordt veranderd\n" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "Het wachtwoord voor %s is niet veranderd.\n" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "Wachtwoord veranderd\n" @@ -1501,49 +1438,49 @@ msgstr "Gebruik: %s [-q] [-r] [-s] [wachtwoord [shaduw]]\n" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "Gebruik: %s [-q] [-r] [-s] [wachtwoord]\n" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" msgstr "ongeldige ingang in het wachtwoordbestand\n" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" msgstr "dubbele wachtwoordingang\n" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" msgstr "ongeldige gebruikersnaam '%s'\n" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "gebruiker %s: geen groep %u\n" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "gebruiker %s: map %s bestaat niet\n" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "gebruiker %s: programma %s bestaat niet\n" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" msgstr "ongeldige ingang in het schaduwwachtwoordbestand\n" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" msgstr "dubbele schaduwwachtwoordingang\n" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" msgstr "geen overeenkomende ingang in het wachtwoordbestand\n" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" msgstr "gebruiker %s: laatste wachtwoordverandering is in de toekomst\n" @@ -1563,17 +1500,17 @@ msgstr "%s: kan 'passwd'-bestand niet openen\n" msgid "%s: can't remove shadow entry for %s\n" msgstr "%s: kan schaduwingang voor %s niet verwijderen\n" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "%s: kan 'passwd'-ingang voor %s niet bijwerken\n" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" msgstr "%s: kan schaduwbestand niet bijwerken\n" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" msgstr "%s: kan 'passwd'-bestand niet bijwerken\n" @@ -1583,40 +1520,40 @@ msgstr "%s: kan 'passwd'-bestand niet bijwerken\n" msgid "%s: can't update entry for user %s\n" msgstr "%s: kan ingang voor gebruiker %s niet bijwerken\n" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format msgid "%s: can't delete shadow password file\n" msgstr "%s: kan schaduwwachtwoordbestand niet verwijderen\n" -#: src/su.c:133 +#: src/su.c:132 msgid "Sorry." msgstr "Sorry." -#: src/su.c:323 +#: src/su.c:320 #, c-format msgid "%s: must be run from a terminal\n" msgstr "%s: dient uitgevoerd te worden vanaf een terminal\n" -#: src/su.c:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "%s: pam_start: fout %d\n" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" msgstr "Onbekende id: %s\n" -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, 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:502 +#: src/su.c:495 msgid "(Enter your own password.)" msgstr "(U dient uw eigen wachtwoord in te voeren)" -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" @@ -1625,22 +1562,22 @@ msgstr "" "%s: %s\n" "(Genegeerd)\n" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" msgstr "Geen shell\n" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr "Toegang tot su naar die account is GEWEIGERD.\n" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "Wachtwoordauthenticatie is omzeild.\n" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" msgstr "Gelieve uw EIGEN wachtwoord in te voeren voor authenticatie.\n" @@ -1655,7 +1592,7 @@ msgstr "Geen wachtwoordbestand\n" msgid "No password entry for 'root'\n" msgstr "Geen wachtwoordingang voor 'root'\n" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" @@ -1665,237 +1602,217 @@ 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:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" msgstr "Systeemonderhoudsmodus wordt opgestart\n" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "%s: groepdatabase moet herbouwd worden\n" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "%s: schaduwgroepdatabase moet herbouwd worden\n" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "%s: ongeldig numeriek argument '%s'\n" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "%s: onbekende gid %s\n" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "%s: onbekende groep %s\n" -#: src/useradd.c:475 +#: src/useradd.c:418 #, c-format msgid "%s: cannot create new defaults file\n" msgstr "%s: kan geen nieuw standaardwaardenbestand aanmaken\n" -#: src/useradd.c:480 +#: src/useradd.c:423 #, c-format msgid "%s: cannot open new defaults file\n" msgstr "%s: kan het nieuwe standaardwaardenbestand niet openen\n" -#: src/useradd.c:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" msgstr "%s: hernoemen: %s" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s: groep '%s' is een NIS-groep.\n" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "%s: teveel groepen gespecificeerd (max %d).\n" -#: src/useradd.c:721 +#: src/useradd.c:660 #, 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:724 +#: src/useradd.c:663 #, c-format msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr "" " [-d thuismap] [-s shell] [-c commentaar] [-m [-k " "sjabloon]]\n" -#: src/useradd.c:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, c-format msgid " [-f inactive] [-e expire]\n" msgstr " [-f niet actief] [-e vervalt ]\n" -#: src/useradd.c:728 +#: src/useradd.c:667 #, c-format msgid " [-p passwd] name\n" msgstr " [-p wachtwoord] naam\n" -#: src/useradd.c:730 +#: src/useradd.c:669 #, 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:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, c-format msgid "%s: error locking group file\n" msgstr "%s: fout tijdens vergrendelen groepbestand\n" -#: src/useradd.c:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, c-format msgid "%s: error opening group file\n" msgstr "%s: fout tijdens openen groepbestand\n" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, c-format msgid "%s: error locking shadow group file\n" msgstr "%s: fout tijdens vergrendelen schaduwgroepbestand\n" -#: src/useradd.c:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, c-format msgid "%s: error opening shadow group file\n" msgstr "%s: fout tijdens openen schaduwgroepbestand\n" -#: src/useradd.c:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "%s: uid %u is niet uniek\n" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "%s: kan geen unieke uid verkrijgen\n" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "%s: ongeldige basismap '%s'\n" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "%s: ongeldige commentaar '%s'\n" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "%s: ongeldige thuismap '%s'\n" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s: ongeldige datum '%s'\n" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "%s: schaduwwachtwoorden zijn vereist voor -e\n" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, c-format msgid "%s: shadow passwords required for -f\n" msgstr "%s: schaduwwachtwoorden zijn vereist voor -f\n" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" msgstr "%s: ongeldig veld `%s'\n" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "%s: ongeldige shell '%s'\n" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "%s: ongeldige gebruikersnaam '%s'\n" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "%s: kan wachtwoordbestand niet herschrijven\n" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "%s: kan schaduwwachtwoordbestand niet herschrijven\n" -#: src/useradd.c:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, c-format msgid "%s: unable to lock password file\n" msgstr "%s: kan wachtwoordbestand niet vergrendelen\n" -#: src/useradd.c:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, c-format msgid "%s: unable to open password file\n" msgstr "%s; kan wachtwoordbestand niet openen\n" -#: src/useradd.c:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, c-format msgid "%s: cannot lock shadow password file\n" msgstr "%s: kan schaduwwachtwoordbestand niet vergrendelen\n" -#: src/useradd.c:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, c-format msgid "%s: cannot open shadow password file\n" msgstr "%s: kan schaduwwachtwoordbestand niet openen\n" -#: src/useradd.c:1459 +#: src/useradd.c:1354 #, c-format msgid "%s: error adding new password entry\n" msgstr "%s: fout tijdens toevoegen nieuwe wachtwoordingang\n" -#: src/useradd.c:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "%s: fout tijdens bijwerken dbm-wachtwoordingang\n" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, c-format msgid "%s: error adding new shadow password entry\n" msgstr "%s: fout tijdens toevoegen schaduwwachtwoordingang\n" -#: src/useradd.c:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s: fout tijdens bijwerken dbm-schaduwwachtwoordingang\n" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" msgstr "%s: kan map %s niet aanmaken\n" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, 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:1590 +#: src/useradd.c:1446 #, c-format msgid "Can't create mail spool for user %s.\n" msgstr "Kan geen mailspool aanmaken voor gebruiker %s.\n" -#: src/useradd.c:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "%s: gebruiker %s bestaat\n" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" @@ -1903,209 +1820,174 @@ msgstr "" "%s: groep %s bestaat - om deze gebruiker aan die groep toe te voegen dient u " "-g te gebruiken.\n" -#: src/useradd.c:1767 +#: src/useradd.c:1602 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" msgstr "" "%s: waarschuwing: CREATE_HOME is niet ondersteund, u dient in plaats hiervan " "-m te gebruiken.\n" -#: src/userdel.c:124 +#: src/userdel.c:108 #, c-format msgid "Usage: %s [-r] name\n" msgstr "Gebruik: %s [-r] naam\n" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" msgstr ":%s: fout tijdens bijwerken groepingang\n" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "%s: kan dbm-groepingang niet bijwerken\n" - -#: src/userdel.c:214 -#, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: kan dbm-groepingang niet verwijderen\n" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "%s: kan groepbestand niet openen\n" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "%s: kan schaduwgroepbestand niet openen\n" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "%s: fout tijdens verwijderen wachtwoordingang\n" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "%s: fout tijdens verwijderen schaduwwachtwoordingang\n" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "%s: fout tijdens verwijderen dbm-wachtwoordingang\n" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s: fout tijdens verwijderen dbm-schaduwwachtwoordingang\n" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "%s: gebruiker %s is momenteel niet aangemeld\n" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "%s: %s is niet van %s, wordt niet verwijderd\n" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " msgstr "%s: waarschuwing: kan niet verwijderen " -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" msgstr "%s: gebruiker %s bestaat niet\n" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s: gebruiker %s is een NIS-gebruiker\n" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "" "%s: map %s wordt niet verwijderd (zou thuismap van gebruiker %s " "verwijderen)\n" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "%s: fout tijdens verwijderen van map %s\n" -#: src/usermod.c:306 +#: src/usermod.c:289 #, c-format msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "Gebruik: %s\t[-u uid [-o]] [-g groep] [-G groep,...] \n" -#: src/usermod.c:310 +#: src/usermod.c:293 #, 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:313 +#: src/usermod.c:296 #, c-format msgid "[-f inactive] [-e expire] " msgstr "[-f inactierf] [-e vervalt] " -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p wachtwoord] [-L|-U] naam\n" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" msgstr "%s: geheugen is op in update_group\n" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "%s: geheugen is op in update_gshadow\n" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "%s: geen vlaggen gegeven\n" -#: src/usermod.c:965 +#: src/usermod.c:903 #, 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:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "%s: uid %lu is niet uniek\n" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, c-format msgid "%s: error changing password entry\n" msgstr "%s: fout tijdens aanpassen wachtwoordingang\n" -#: src/usermod.c:1122 +#: src/usermod.c:1053 #, c-format msgid "%s: error removing password entry\n" msgstr "%s: fout tijdens verwijderen wachtwoordingang\n" -#: src/usermod.c:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "%s: fout tijdens toevoegen dbm-wachwoordingang\n" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "%s: fout tijdens verwijderen dbm-wachtwoordingang\n" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "%s: fout tijdens verwijderen schaduwwachtwoordingang\n" -#: src/usermod.c:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s: fout tijdens verwijderen dbm-schaduwwachtwoordingang\n" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "%s: map %s bestaat\n" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "%s: kan %s niet aanmaken\n" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" msgstr "%s: kan chown %s niet uitvoeren\n" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, c-format msgid "%s: cannot rename directory %s to %s\n" msgstr "%s: kan map %s niet hernoemen naar %s\n" -#: src/usermod.c:1333 +#: src/usermod.c:1223 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "%s: waarschuwing: %s is niet van %s\n" -#: src/usermod.c:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" msgstr "aanpassen van de eigenaar van de e-mailbox is mislukt" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" msgstr "hernoemen van de e-mailbox is mislukt" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" @@ -2114,20 +1996,20 @@ msgstr "" "\n" "%s: %s is onveranderd\n" -#: src/vipw.c:133 +#: src/vipw.c:131 msgid "Couldn't lock file" msgstr "Kon bestand niet vergrendelen" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" msgstr "Kon geen reservekopie maken" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s: kan %s niet herstellen: %s (uw aanpassingen zijn in %s)\n" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/po/nn.gmo b/po/nn.gmo index 2eee6143..6bf2fd09 100644 Binary files a/po/nn.gmo and b/po/nn.gmo differ diff --git a/po/nn.po b/po/nn.po index 321ebbd2..e9ae0026 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-01-26 07:53+0100\n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" "PO-Revision-Date: 2004-06-03 21:41+0200\n" "Last-Translator: H疇vard Korsvoll \n" "Language-Team: Norwegian (Nynorsk) \n" @@ -14,14 +14,14 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.3.1\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" msgstr "tvaring: ukjent gruppe %s\n" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" msgstr "tvaring: for mange grupper\n" @@ -49,17 +49,17 @@ msgstr " Ta kontakt med systemadministrator.\n" msgid " Choose a new password.\n" msgstr " Lag eit nytt passord.\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "Passordet ditt vil utg疇 om %ld dagar.\n" -#: libmisc/age.c:174 +#: libmisc/age.c:172 #, c-format msgid "Your password will expire tomorrow.\n" msgstr "Passordet ditt vil utg疇 i morgon.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:174 #, c-format msgid "Your password will expire today.\n" msgstr "Passordet ditt vil utg疇 i dag.\n" @@ -74,39 +74,27 @@ msgstr "Klarer ikkje skifta tty %s" msgid "Environment overflow\n" msgstr "Milj繪 overflyt\n" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr "Du klarer ikkje endra $%s\n" -#: libmisc/failure.c:230 +#: libmisc/failure.c:229 #, fuzzy, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "%d %s sidan f繪rre innlogging. F繪rre var %s p疇 %s.\n" +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "%d %s sidan f繪rre innlogging. F繪rre var %s p疇 %s.\n" +msgstr[1] "%d %s sidan f繪rre innlogging. F繪rre var %s p疇 %s.\n" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "mislukka fors繪k" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "mislukka fors繪k" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" msgstr "For mange innloggingar.\n" -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "Passordet dekrypterer ikkje hemmeleg n繪kkel for %s.\n" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "Klarte ikkje setja %s sin hemmelege n繪kkel: k繪yrer keyserv-nissen?\n" - #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "Du har ny e-post." @@ -119,7 +107,7 @@ msgstr "Ingen e-post." msgid "You have mail." msgstr "Du har e-post." -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " msgstr "Feil passord: %s. " @@ -134,20 +122,20 @@ msgstr "passwd: pam_start() feila, feil %d\n" msgid "passwd: %s\n" msgstr "passwd: %s\n" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" msgstr "" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "Klarer ikkje cd til 竄%s罈\n" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" msgstr "Inga mappe, loggar inn med HOME=/" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr "Klarer ikkje k繪yra %s" @@ -162,35 +150,31 @@ msgstr "Ugyldig rotmappe 竄%s罈\n" msgid "Can't change root directory to \"%s\"\n" msgstr "Klarer ikkje endra rotmappe til 竄%s罈\n" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "malloc(%d) feila\n" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" msgstr "Klarte ikkje finna plass for oppsettsinformasjon.\n" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "oppsettsfeil - ukjent element 竄%s罈 (gje melding til administrator)\n" -#: lib/pwauth.c:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "Passord: " -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "%s sitt passord: " -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "(Ekko p疇) " - -#: src/chage.c:118 +#: src/chage.c:112 #, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" @@ -199,154 +183,147 @@ msgstr "" "Bruk: chage [-l] [-m min_dagar] [-M maks_dagar] [-W 疇tvare]\n" " [-I inaktiv] [-E utg疇r] [-d siste_dag] brukar\n" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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:155 +#: src/chage.c:149 msgid "Minimum Password Age" msgstr "Minimum alder p疇 passord" -#: src/chage.c:161 +#: src/chage.c:155 msgid "Maximum Password Age" msgstr "Maksimum alder p疇 passord" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" msgstr "F繪rre passordendring (-MM-DD)" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" msgstr "tvaring for utg疇tt passord" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "Passord inaktivt" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Dato for n疇r kontoen utg疇r (-MM-DD)" -#: src/chage.c:238 +#: src/chage.c:231 #, fuzzy, c-format msgid "Last password change\t\t\t\t\t: " msgstr "F繪rre passordendring (-MM-DD)" -#: src/chage.c:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 #, fuzzy, c-format msgid "never\n" msgstr "Aldri\n" -#: src/chage.c:251 +#: src/chage.c:244 #, fuzzy, c-format msgid "Password expires\t\t\t\t\t: " msgstr "Passord utg疇r:\t" -#: src/chage.c:267 +#: src/chage.c:260 #, fuzzy, c-format msgid "Password inactive\t\t\t\t\t: " msgstr "Passord inaktiv:\t" -#: src/chage.c:281 +#: src/chage.c:274 #, fuzzy, c-format msgid "Account expires\t\t\t\t\t\t: " msgstr "Konto utg疇r:\t" -#: src/chage.c:297 +#: src/chage.c:290 #, c-format msgid "Minimum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:298 +#: src/chage.c:292 #, c-format msgid "Maximum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:299 +#: src/chage.c:294 #, c-format msgid "Number of days of warning before password expires\t: %ld\n" msgstr "" -#: src/chage.c:444 +#: src/chage.c:431 #, 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:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 #, fuzzy, c-format msgid "%s: permission denied.\n" msgstr "%s: nekta tilgang\n" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 #, c-format msgid "%s: PAM authentication failed\n" msgstr "%s: PAM-autentisering feila\n" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, c-format msgid "%s: can't open password file\n" msgstr "%s: klarer ikkje opna passordfil\n" -#: src/chage.c:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "%s: ukjend brukar %s\n" -#: src/chage.c:535 +#: src/chage.c:519 #, c-format msgid "%s: can't lock shadow password file" msgstr "%s: klarer ikkje l疇sa skuggepassordfila" -#: src/chage.c:543 +#: src/chage.c:527 #, c-format msgid "%s: can't open shadow password file" msgstr "%s: klarer ikkje opna skuggepassordfila" -#: src/chage.c:604 +#: src/chage.c:587 #, c-format msgid "Changing the aging information for %s\n" msgstr "Endrar aldringsformasjonen for %s\n" -#: src/chage.c:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" msgstr "%s: feil ved endring av felt\n" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, c-format msgid "%s: can't update password file\n" msgstr "%s: klarer ikkje oppdatere passordfil\n" -#: src/chage.c:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" msgstr "%s: klarer ikkje oppdatere skuggepassordfil\n" -#: src/chage.c:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "Feil ved oppdatering av DBM passordoppf繪ring.\n" - -#: src/chage.c:692 +#: src/chage.c:649 #, c-format msgid "%s: can't rewrite shadow password file\n" msgstr "%s: klarer ikkje skriva ny skuggepassordfil\n" -#: src/chage.c:740 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite password file\n" msgstr "%s: klarer ikkje skriva ny passordfil\n" -#: src/chage.c:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 #, c-format msgid "%s: PAM chauthtok failed\n" msgstr "%s: PAM chauthtok feila\n" @@ -365,117 +342,122 @@ msgstr "" msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" msgstr "Bruk: %s [-f fullt_namn] [-r romnr] [-w tlf_arb] [-h tlf_heime]\n" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "Fullt namn" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "\tFullt namn: %s\n" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "Romnummer" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "Telefon, arbeid" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" msgstr "Telefon, heime" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "Anna" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s: Klarer ikkje avgjere brukarnamnet ditt.\n" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s: klarer ikkje endra brukar 竄%s罈 p疇 NIS-klient.\n" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "%s: 竄%s罈 er NIS-hovud for denne klienten.\n" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, fuzzy, c-format +msgid "%s: Permission denied.\n" +msgstr "%s: nekta tilgang\n" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" msgstr "Endrar brukarinformasjon for %s\n" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s: ugyldig namn: 竄%s罈\n" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s: ugyldig romnummer: 竄%s罈\n" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s: ugyldig telefonnummer, arbeid: 竄%s罈\n" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s: ugyldig telefonnummer, heime: 竄%s罈\n" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s: 竄%s罈 inneheld ulovlege teikn\n" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "%s: felta er for lange\n" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" msgstr "Klarer ikkje endra ID til root.\n" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" msgstr "Klarer ikkje l疇sa passordfila, pr繪v igjen seinare.\n" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" msgstr "Klarer ikkje opna passordfila.\n" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s: %s ikkje funne i /etc/passwd\n" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" msgstr "Feil ved oppdatering av passordet.\n" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" msgstr "Klarer ikkje utf繪ra endringar i passordfila.\n" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" msgstr "Klarer ikkje l疇sa opp passordfila.\n" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -492,48 +474,48 @@ msgstr "" msgid "%s: can't lock password file\n" msgstr "%s: klarer ikkje l疇sa passordfil\n" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "%s: klarer ikkje l疇sa skuggepassordfila\n" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "%s: klarer ikkje opna skuggepassordfila\n" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "%s: linje %d: linja er for lang\n" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "%s: linje %d: manglar nytt passord\n" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "%s: linje %d: ukjent brukar %s\n" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "%s: linje %d: klarer ikkje oppdatere passordet\n" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "%s: feil funne, endringar er ikkje utf繪rt\n" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" msgstr "%s: feil ved oppdatering av skuggepassordfila\n" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" msgstr "%s: feil ved oppdatering av passordfila\n" @@ -543,26 +525,26 @@ msgstr "%s: feil ved oppdatering av passordfila\n" msgid "Usage: %s [-s shell] [name]\n" msgstr "Bruk: %s [-s skal] [namn]\n" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" msgstr "Innloggingskal" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" msgstr "Du treng ikkje endra skal for %s.\n" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" msgstr "Endra innloggingskal for %s\n" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s: Ugyldig inntasting: %s\n" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" msgstr "%s er eit ugyldig skal.\n" @@ -572,12 +554,12 @@ msgstr "%s er eit ugyldig skal.\n" msgid "Usage: expiry {-f|-c}\n" msgstr "Bruk: expiry {-f|-c}\n" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" msgstr "%s: TVARING! M疇 vera set-UID root!\n" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "%s: ukjent brukar\n" @@ -591,320 +573,285 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" msgstr "" -#: src/faillog.c:86 +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" -msgstr "Brukarnamn Feiltak Maksimum Siste\n" +msgid "Login Failures Maximum Latest On\n" +msgstr "" -#: src/faillog.c:103 -#, c-format -msgid " %s on %s" -msgstr " %s p疇 %s" - -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" msgstr " [%lds igjen]" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr " [%lds l疇s]" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "Ukjent brukar: %s\n" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "Bruk: %s [-r|-R] gruppe\n" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr " %s [-a brukar] gruppe\n" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr " %s [-d brukar] gruppe\n" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr " %s [-A brukar,...] [-M brukar,...] gruppe\n" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr " %s [-M brukar,...] gruppe\n" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" msgstr "%s: skuggepassord for gruppe krevst for -A\n" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "Kven er du?\n" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr "ukjent gruppe: %s\n" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "Legg brukaren %s til gruppa %s\n" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "Fjernar brukaren %s fr疇 gruppa %s\n" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" msgstr "%s: ukjent medlem %s\n" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "%s: Ikkje ein tty\n" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "Endrar passordet for gruppa %s\n" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "Nytt passord: " -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " msgstr "Gjenta det nye passordet: " -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" msgstr "Passorda er ikkje like, pr繪v igjen" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" msgstr "%s: Pr繪v igjen seinare\n" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "%s: klarer ikkje f疇 l疇s\n" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" msgstr "%s: klarer ikkje f疇 l疇s p疇 skuggefil\n" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "%s: klarer ikkje opna fil\n" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "%s: klarer ikkje oppdatere oppf繪ring\n" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" msgstr "%s: klarer ikkje oppdatere skuggeoppf繪ring\n" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "%s: klarer ikkje skriva ny fila\n" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" msgstr "%s: klarer ikkje skriva ny skuggefil\n" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "%s: klarer ikkje l疇sa opp fil\n" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "%s: klarer ikkje oppdatere DBM-filer\n" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "%s: klarer ikkje oppdatere DBM-skuggefiler\n" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "Bruk: groupadd [-g gid [-o]] [-f] gruppe\n" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, c-format msgid "%s: error adding new group entry\n" msgstr "%s: feil ved oppretting av ny gruppeoppf繪ring\n" -#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: klarer ikkje leggja til ny oppf繪ring for dbm-gruppe\n" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "%s: namn %s er ikkje unikt\n" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" msgstr "%s: gid %u er ikkje unikt\n" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "%s: klarer ikkje f疇 unikt gid\n" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, c-format msgid "%s: %s is not a valid group name\n" msgstr "%s: %s er ikkje eit gyldig gruppenamn\n" -#: src/groupadd.c:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "%s: ugyldig gruppe %s\n" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "%s: -O krev NAME=VERDI\n" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s: klarer ikkje skriva ny gruppefil\n" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s: klarer ikkje skriva ny skuggegruppefil\n" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" msgstr "%s: klarer ikkje l疇sa gruppefil\n" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" msgstr "%s: klarer ikkje opna gruppefil\n" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" msgstr "%s: klarer ikkje l疇sa skuggegruppefil\n" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" msgstr "%s: klarer ikkje opna skuggegruppefil\n" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "%s: gruppa %s finst allereie\n" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, c-format msgid "Usage: groupdel group\n" msgstr "Bruk: goupdel gruppe\n" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" msgstr "%s: feil ved fjerning av gruppeoppf繪ring\n" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "%s: feil ved fjerning av dbm-oppf繪ring for gruppe\n" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "%s: feil ved fjerning av oppf繪ring for skuggegruppe\n" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "%s: feil ved fjerning av dbm-oppf繪ring for skuggegruppe\n" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "%s: klarer ikkje fjerna prim疆rgruppa til brukaren.\n" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "%s: gruppe %s eksisterer ikkje\n" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "%s: gruppe %s er ei NIS-gruppe\n" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s: %s er NIS-hovudet\n" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "Bruk: groupmod [-g gid [-o]] [-n namn] gruppe\n" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "%s: %s ikkje funne i /etc/group\n" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s: klarer ikkje leggja til ny oppf繪ring for dbm-skuggegruppe\n" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s: %u er ikkje ein unik gid\n" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "%s: %s er ikkje eit unikt namn\n" @@ -914,110 +861,105 @@ msgstr "%s: %s er ikkje eit unikt namn\n" msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "Bruk: %s [-r] [-s] [gruppe [gskugge]]\n" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "Bruk: %s [-r] [-s] [gruppe]\n" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "Nei" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" msgstr "%s: -s og -r er inkompatible\n" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "%s: klarer ikkje l疇se fila %s\n" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "%s: klarer ikkje opna fila %s\n" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" msgstr "ugyldig oppf繪ring for gruppefil\n" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "slett linja 竄%s罈? " -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" msgstr "duplisert gruppeoppf繪ring\n" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" msgstr "ugyldig gruppenamn 竄%s罈\n" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "gruppe %s: ingen brukar %s\n" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " msgstr "slett medlem 竄%s罈?" -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" msgstr "ugyldig oppf繪ring av skuggegruppefil\n" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" msgstr "duplisert oppf繪ring for skuggegruppe\n" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" msgstr "ingen passande oppf繪ring for gruppefil\n" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" msgstr "skuggegruppe %s: ingen administratorbrukar %s\n" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " msgstr "slett administratormedlem 竄%s罈?" -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" msgstr "skuggegruppe %s: ingen brukar %s\n" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "%s: klarer ikkje oppdatere fila %s\n" -#: src/grpck.c:647 src/pwck.c:612 -#, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: filene er oppdaterte; k繪yr mkpasswd\n" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format -msgid "%s: no changes\n" -msgstr "%s: ingen endringar\n" - -#: src/grpck.c:651 src/pwck.c:616 +#: src/grpck.c:640 src/pwck.c:606 #, c-format msgid "%s: the files have been updated\n" msgstr "%s: filene er oppdaterte\n" +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "%s: ingen endringar\n" + #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" @@ -1033,37 +975,37 @@ msgstr "%s: klarer ikkje opna gruppefil\n" msgid "%s: can't lock shadow group file\n" msgstr "%s: klarer ikkje l疇sa skuggegruppefil\n" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" msgstr "%s: klarer ikkje opna skuggegruppefil\n" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "%s: klarer ikkje fjerna skuggegruppe %s\n" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "%s: klarer ikkje oppdatere skuggeoppf繪ring for %s\n" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "%s: klarer ikkje oppdatere oppf繪ring for gruppa %s\n" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" msgstr "%s: klarer ikkje oppdatere skuggegruppefil\n" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" msgstr "%s: klarer ikkje oppdatere gruppefil\n" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "%s: klan ikkje slette skuggegruppefil\n" @@ -1083,52 +1025,52 @@ msgstr "Bruk: id\n" msgid " groups=" msgstr " grupper=" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" msgstr "Brukarnamn Port Fr疇 Siste \n" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "Brukarnamn Port Siste \n" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "**Aldri vore innlogga**" -#: src/login.c:175 +#: src/login.c:156 #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Bruk: %s [-p] [namn]\n" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr " %s [-p] [-h vert] [-f namn]\n" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr " %s [-p] -r vert\n" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" msgstr "Ugyldig innloggingstid\n" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" @@ -1137,7 +1079,7 @@ msgstr "" "\n" "Systemet stengt for rutinemessig vedlikehald\n" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" @@ -1146,7 +1088,7 @@ msgstr "" "\n" "[Fr疇kopling omg疇tt -- innlogging av root er tillete.]\n" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" @@ -1155,17 +1097,17 @@ msgstr "" "\n" "Innlogging gjekk ut p疇 tid etter %d sekund.\n" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" msgstr " p疇 竄%.100s罈 fr疇 竄%.200s罈" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" msgstr " p疇 竄%.100s罈" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" @@ -1174,39 +1116,30 @@ msgstr "" "\n" "%s brukarnamn: " -#: src/login.c:819 -msgid "login: " -msgstr "brukarnamn: " - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" msgstr "Feil innlogging" -#: src/login.c:1198 +#: src/login.c:996 msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "" "tvaring: innlogging gjort mogeleg igjen etter mellombels utestenging.\n" -#: src/login.c:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "F繪rre innlogging: %s p疇 %s" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" msgstr "F繪rre inlogging: %.19s p疇 %s" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" msgstr " fr疇 %.*s" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "Startar rad_login\n" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" @@ -1247,17 +1180,17 @@ msgstr "%s: feil ved innlegging av post for " msgid "added %d entries, longest was %d\n" msgstr "lagt til %d oppf繪ringar, den lengste var %d\n" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "Bruk: %s [-vf] [-p|g|sp|sg] fil\n" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "Bruk: %s [-vf] [-p|g|sp] fil\n" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "Bruk: %s [-vf] [-p|g] fil\n" @@ -1277,16 +1210,16 @@ msgstr "Bruk: sg gruppe [[-c] kommando]\n" msgid "unknown uid: %u\n" msgstr "ukjent uid: %u\n" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" msgstr "ukjent gid: %lu\n" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "rsak.\n" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "for mange grupper\n" @@ -1296,91 +1229,91 @@ msgstr "for mange grupper\n" msgid "Usage: %s [input]\n" msgstr "Bruk: %s [inndata]\n" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "%s: klarer ikkje l疇sa /etc/passwd.\n" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "%s: klarer ikkje l疇sa filer, pr繪v igjen seinare\n" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "%s: klarer ikkje opna filer\n" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "%s: linje %d: ugyldig linje\n" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "%s: linje %d: klarer ikkje laga GID\n" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "%s: linje %d: klarer ikkje laga UID\n" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "%s: linje %d: klarer ikkje finne brukar %s\n" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "%s: linje %d: klarer ikkje oppdatere passord\n" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "%s: linje %d: mkdir feila\n" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "%s: linje %d: chown feila\n" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "%s: linje %d: kan ikkje oppdatere oppf繪ring\n" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "%s: feil ved oppdatering av filer\n" -#: src/passwd.c:155 +#: src/passwd.c:154 #, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "Bruk: %s [-f|-s] [namn]\n" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr " %s [-x maks] [-n min] [-w 疇tvar] [-i inaktiv] namn\n" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} namn\n" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "Gamalt passord:" -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" msgstr "Feil passord for 竄%s罈\n" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" @@ -1389,16 +1322,16 @@ msgstr "" "Skriv inn det nye passordet (minimum %d, maksimum %d teikn)\n" "Bruk ein kombinasjon av store og sm疇 bokstavar og tal.\n" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "Nytt passord: " -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" msgstr "Pr繪v igjen.\n" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" @@ -1408,52 +1341,52 @@ msgstr "" "tvaring: Svakt passord (skriv det inn ein gong til for 疇 bruka det " "likevel).\n" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" msgstr "Passorda er ikkje like, pr繪v igjen.\n" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "Passordet for %s kan ikkje endrast.\n" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" msgstr "Passordet for %s kan ikkje endrast enno.\n" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "%s: tomt for minne\n" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "%s: Kan ikkje k繪yre %s" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" msgstr "%s: arkiv %s er ikkje st繪tta\n" -#: src/passwd.c:914 +#: src/passwd.c:884 #, fuzzy, c-format -msgid "You may not change the password for %s.\n" +msgid "%s: You may not view or modify password information for %s.\n" msgstr "Du treng ikkje endra skal for %s.\n" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "Enrar passord for %s\n" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "Passordet til %s er ikkje endra.\n" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "Passord er endra.\n" @@ -1468,49 +1401,49 @@ msgstr "Bruk: %s [-q] [-r] [-s] [passord [skugge]]\n" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "Bruk: %s [-q] [-r] [-s] [passord]\n" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" msgstr "Ugyldig oppf繪ring i passordfila\n" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" msgstr "duplisert oppf繪ring i passordfila\n" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" msgstr "ugyldig brukarnamn 竄%s罈\n" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "brukar %s: inga gruppe %u\n" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "brukar %s: mappe %s finst ikkje\n" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "brukar %s: program %s finst ikkje\n" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" msgstr "ugyldig oppf繪ring i skuggepassordfila\n" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" msgstr "duplisert oppf繪ring i skuggepassordfila\n" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" msgstr "ingen oppf繪ringar i passordfila som passar\n" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" msgstr "brukar %s: siste passordendring i framtida\n" @@ -1530,17 +1463,17 @@ msgstr "%s: klarer ikkje opna passordfil\n" msgid "%s: can't remove shadow entry for %s\n" msgstr "%s: klarer ikkje fjerna oppf繪ring for %s i skuggepassordfila\n" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "%s: klarer ikkje oppdatere oppf繪ring i passordfila for %s\n" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" msgstr "%s: klarer ikkje oppdatere skuggepassordfil\n" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" msgstr "%s: klarer ikkje oppdatere passordfil\n" @@ -1550,40 +1483,40 @@ msgstr "%s: klarer ikkje oppdatere passordfil\n" msgid "%s: can't update entry for user %s\n" msgstr "%s: klarer ikkje oppdatere oppf繪ring for brukar %s\n" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format msgid "%s: can't delete shadow password file\n" msgstr "%s: klarer ikkje sletta skuggepassordfil\n" -#: src/su.c:133 +#: src/su.c:132 msgid "Sorry." msgstr "rsak." -#: src/su.c:323 +#: src/su.c:320 #, c-format msgid "%s: must be run from a terminal\n" msgstr "%s: m疇 k繪yrast fr疇 ein terminal\n" -#: src/su.c:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "%s: pam_start: feil %d\n" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" msgstr "Ukjent id: %s\n" -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, c-format msgid "You are not authorized to su %s\n" msgstr "Du er ikkje autorisert til su %s\n" -#: src/su.c:502 +#: src/su.c:495 msgid "(Enter your own password.)" msgstr "(Skriv inn ditt eige passord.)" -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" @@ -1592,22 +1525,22 @@ msgstr "" "%s: %s\n" "(Ignorert)\n" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" msgstr "Ingen skal\n" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr "Tilgang til su for den kontoen er AVVIST.\n" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "Passordautentisering er forbig疇tt.\n" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" msgstr "Oppgje ditt EIGE passord for autentisering.\n" @@ -1622,7 +1555,7 @@ msgstr "Inga passordfil\n" msgid "No password entry for 'root'\n" msgstr "Inga passordoppf繪ring for 竄root罈\n" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" @@ -1632,233 +1565,213 @@ msgstr "" "Trykk Ctrl-d for 疇 halda fram med normal oppstart,\n" "(eller oppgje root-passord for systemvedlikehald):" -#: src/sulogin.c:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" msgstr "Startar modus for systemvedlikehald\n" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "%s: bygg gruppedatabasen p疇 ny\n" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "%s: bygg skuggegruppedatabasen p疇 ny\n" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "%s: ugyldig nummerisk argument 竄%s罈\n" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "%s: ukjent gid %s\n" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "%s: ukjent gruppe %s\n" -#: src/useradd.c:475 +#: src/useradd.c:418 #, c-format msgid "%s: cannot create new defaults file\n" msgstr "%s: klarer ikkje opprette fil for standardverdiar\n" -#: src/useradd.c:480 +#: src/useradd.c:423 #, c-format msgid "%s: cannot open new defaults file\n" msgstr "%s: klarer ikkje opna fil for standardverdiar\n" -#: src/useradd.c:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" msgstr "%s: gje nytt namn: %s" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s: gruppe 竄%s罈 er ei NIS-gruppe.\n" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "%s: for mange grupper spesifisert (maks %d).\n" -#: src/useradd.c:721 +#: src/useradd.c:660 #, c-format msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n" msgstr "Bruk: useradd [-u uid [-o]] [-g gruppe] [-G gruppe,...] \n" -#: src/useradd.c:724 +#: src/useradd.c:663 #, 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:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, c-format msgid " [-f inactive] [-e expire]\n" msgstr " [-f inaktiv] [-e utg疇r]\n" -#: src/useradd.c:728 +#: src/useradd.c:667 #, c-format msgid " [-p passwd] name\n" msgstr " [-p passord] namn\n" -#: src/useradd.c:730 +#: src/useradd.c:669 #, 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:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, c-format msgid "%s: error locking group file\n" msgstr "%s: feil ved l疇sing av gruppefil\n" -#: src/useradd.c:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, c-format msgid "%s: error opening group file\n" msgstr "%s: feil ved opning av gruppefil\n" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, c-format msgid "%s: error locking shadow group file\n" msgstr "%s: feil ved l疇sing av skuggegruppefil\n" -#: src/useradd.c:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, c-format msgid "%s: error opening shadow group file\n" msgstr "%s: feil ved opning av skuggegruppefil\n" -#: src/useradd.c:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "%s: uid %u er ikkje unik\n" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "%s: klarer ikkje finne unik uid\n" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "%s: ugyldig startmappe 竄%s罈\n" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "%s: ugyldig kommentar 竄%s罈\n" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "%s: ugyldig heimemappe 竄%s罈\n" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s: ugyldig dato 竄%s罈\n" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "%s: skuggepassord krevst for -e\n" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, c-format msgid "%s: shadow passwords required for -f\n" msgstr "%s: skuggepassord krevst for -f\n" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" msgstr "%s: ugyldig felt 竄%s罈\n" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "%s: ugyldig skal 竄%s罈\n" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "%s: ugyldig brukarnamn 竄%s罈\n" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "%s: klarer ikkje skriva ny passordfil\n" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "%s: klarer ikkje skriva ny skuggepassordfil\n" -#: src/useradd.c:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, c-format msgid "%s: unable to lock password file\n" msgstr "%s: klarer ikkje l疇sa passordfil\n" -#: src/useradd.c:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, c-format msgid "%s: unable to open password file\n" msgstr "%s: klarer ikkje opna passordfil\n" -#: src/useradd.c:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, c-format msgid "%s: cannot lock shadow password file\n" msgstr "%s: klarer ikkje l疇sa skuggepassordfil\n" -#: src/useradd.c:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, c-format msgid "%s: cannot open shadow password file\n" msgstr "%s: klarer ikkje opna skuggepassordfil\n" -#: src/useradd.c:1459 +#: src/useradd.c:1354 #, c-format msgid "%s: error adding new password entry\n" msgstr "%s: feil n疇r passordoppf繪ring blei lagt til\n" -#: src/useradd.c:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "%s: feil ved oppdatering av dbm-oppf繪ring av passord\n" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, 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:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s: feil ved oppdatering av dbm-oppf繪ring av skuggepassord\n" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" msgstr "%s: kan ikkje oppretta mappa %s\n" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, c-format msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n" msgstr "" -#: src/useradd.c:1590 +#: src/useradd.c:1446 #, 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:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "%s: brukar %s finst\n" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" @@ -1866,206 +1779,171 @@ msgstr "" "%s: gruppa %s finst - viss du 繪nskjer 疇 leggja brukaren til denne gruppa, " "bruk -g.\n" -#: src/useradd.c:1767 +#: src/useradd.c:1602 #, 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" -#: src/userdel.c:124 +#: src/userdel.c:108 #, c-format msgid "Usage: %s [-r] name\n" msgstr "Bruk: %s [-r] namn\n" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" msgstr "%s: feil ved oppdatering av gruppeoppf繪ring\n" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "%s: klarer ikkje oppdatere dbm-oppf繪ring for gruppe\n" - -#: src/userdel.c:214 -#, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: klarer ikkje fjerna dbm-oppf繪ring for gruppe\n" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "%s: klarer ikkje opna gruppefila\n" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "%s: klarer ikkje opna skuggepassordfila\n" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "%s: feil ved sletting av passordoppf繪ring\n" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "%s: feil ved sletting av skuggepassordoppf繪ring\n" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "%s: feil ved sletting av passord dbm-oppf繪ring\n" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s: feil ved sletting av dbm-oppf繪ring av skuggepassord\n" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "%s: brukaren %s er p疇logga\n" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "%s: %s ikkje eigd av %s, ikkje fjerna\n" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " msgstr "%s: 疇tvaring: kan ikkje fjerna " -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" msgstr "%s: brukar %s finst ikkje\n" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s: brukar %s er ikkje ein NIS brukar\n" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "" "%s: fjernar ikkje mappa %s (det ville fjerna heimemappa til brukar %s)\n" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "%s: feil ved fjerning av mappe %s\n" -#: src/usermod.c:306 +#: src/usermod.c:289 #, c-format msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "Bruk: %s\t[-u uid [-o]] [-g gruppe] [-G gruppe,...] \n" -#: src/usermod.c:310 +#: src/usermod.c:293 #, 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:313 +#: src/usermod.c:296 #, c-format msgid "[-f inactive] [-e expire] " msgstr "[-f inaktiv] [-e utg疇r] " -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p passord] [-L|-U] namn\n" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" msgstr "%s: slapp opp for minne i update_group\n" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "%s: slapp opp for minne i update_gshadow\n" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "%s: ingen flagg oppgjeve\n" -#: src/usermod.c:965 +#: src/usermod.c:903 #, c-format msgid "%s: shadow passwords required for -e and -f\n" msgstr "%s: skuggepassord krevst for -e og -f\n" -#: src/usermod.c:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "%s: uid %lu er ikkje unik\n" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, c-format msgid "%s: error changing password entry\n" msgstr "%s: feil ved endring av passordoppf繪ring\n" -#: src/usermod.c:1122 +#: src/usermod.c:1053 #, c-format msgid "%s: error removing password entry\n" msgstr "%s: feil ved sletting av passordoppf繪ring\n" -#: src/usermod.c:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "%s: feil ved innlegging av dbm-oppf繪ring for passord\n" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "%s: feil ved fjerning av dbm-oppf繪ring for passord\n" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "%s: feil ved sletting av oppf繪ring for skuggepassord\n" -#: src/usermod.c:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s: feil ved sletting av dbm-oppf繪ring for skuggepassord\n" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "%s: mappa %s finst\n" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "%s: kan ikkje oppretta %s\n" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" msgstr "%s: kan ikkje chown %s\n" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, 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:1333 +#: src/usermod.c:1223 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "%s: 疇tvaring: %s er ikkje eigd av %s\n" -#: src/usermod.c:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" msgstr "klarte ikke 疇 endra eigar av mailbox" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" msgstr "klarte ikkje endra namn p疇 mailbox" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" @@ -2074,20 +1952,20 @@ msgstr "" "\n" "%s: %s er ikkje endra\n" -#: src/vipw.c:133 +#: src/vipw.c:131 msgid "Couldn't lock file" msgstr "Klarte ikkje l疇sa fil" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" msgstr "Klarte ikkje laga reservekopi" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s: klarer ikkje gjenoppretta %s: %s (endringane dine er i %s)\n" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/po/pl.gmo b/po/pl.gmo index 658da280..ddc893a5 100644 Binary files a/po/pl.gmo and b/po/pl.gmo differ diff --git a/po/pl.po b/po/pl.po index e34503b9..80744fb0 100644 --- a/po/pl.po +++ b/po/pl.po @@ -5,22 +5,24 @@ # msgid "" msgstr "" -"Project-Id-Version: shadow-4.0.7\n" +"Project-Id-Version: shadow-4.0.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-26 07:53+0100\n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" "PO-Revision-Date: 2004-02-29 00:27+01:00\n" -"Last-Translator: Jakub Bogusz \n" +"Last-Translator: Tomasz Koczko \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2);\n" #: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" msgstr "Ostrze髒enie: nieznana grupa %s\n" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" msgstr "Ostrze髒enie: zbyt wiele grup\n" @@ -48,17 +50,17 @@ msgstr " Skontaktuj si z administratorem systemu.\n" msgid " Choose a new password.\n" msgstr " Wybierz nowe haso.\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "Twoje haso straci wa髒no w cigu %ld dni.\n" -#: libmisc/age.c:174 +#: libmisc/age.c:172 #, c-format msgid "Your password will expire tomorrow.\n" msgstr "Jutro twoje haso straci wa髒no.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:174 #, c-format msgid "Your password will expire today.\n" msgstr "Dzi twoje haso straci wa髒no.\n" @@ -73,41 +75,34 @@ msgstr "Nie mo髒na zmieni tty %s" msgid "Environment overflow\n" msgstr "Przepenienie rodowiska\n" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr "Nie mo髒esz zmienia $%s\n" -#: libmisc/failure.c:230 +#: libmisc/failure.c:229 #, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "" -"%d %s od ostatniego logowania. Ostatnie logowanie: dnia %s na terminalu %" -"s.\n" +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "" +"%d nieudana pr籀ba logowania od ostatniego logowania.\n" +"Ostatnie logowanie: dnia %s na terminalu %s.\n" +msgstr[1] "" +"%d nieudane pr籀by logowania od ostatniego logowania.\n" +"Ostatnie logowanie: dnia %s na terminalu %s.\n" +msgstr[2] "" +"%d nieudanych pr籀b logowania od ostatniego logowania.\n" +"Ostatnie logowanie: dnia %s na terminalu %s.\n" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "niepowodzenia" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "niepowodzenie" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" msgstr "Zbyt wiele otwartych sesji.\n" -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "Tym hasem nie mo髒na odszyfrowa tajnego klucza dla %s.\n" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "Nie mo髒na ustawi tajnego klucza dla %s: czy serwer kluczy dziaa?\n" - #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "Masz now poczt." @@ -120,7 +115,7 @@ msgstr "Nie masz poczty." msgid "You have mail." msgstr "Masz poczt." -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " msgstr "Ze haso: %s. " @@ -135,20 +130,20 @@ msgstr "passwd: pam_start() nie powiodo si, bd %d\n" msgid "passwd: %s\n" msgstr "passwd: %s\n" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" msgstr "passwd: haso zostao zmienione\n" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "Nie mo髒na zmieni katalogu na \"%s\"\n" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" msgstr "Brak katalogu, loguj z HOME=/" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr "Nie mo髒na uruchomi %s" @@ -163,36 +158,32 @@ msgstr "Nieprawidowy katalog g籀wny \"%s\"\n" msgid "Can't change root directory to \"%s\"\n" msgstr "Nie mo髒na zmieni g籀wnego katalogu na \"%s\"\n" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "malloc(%d) nie powiodo si\n" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" msgstr "Nie mo髒na przydzieli miejsca dla informacji o konfiguracji.\n" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "" "bd w konfiguracji - nieznana pozycja '%s' (powiadom administratora)\n" -#: lib/pwauth.c:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "Haso: " -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "Haso u髒ytkownika %s: " -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "(Echo on) " - -#: src/chage.c:118 +#: src/chage.c:112 #, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" @@ -202,154 +193,147 @@ msgstr "" " [-I nieaktywne] [-E utrata_wa髒noci]\n" " [-d ostatni_dzie] u髒ytkownik\n" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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:155 +#: src/chage.c:149 msgid "Minimum Password Age" msgstr "Minimalny wiek hasa" -#: src/chage.c:161 +#: src/chage.c:155 msgid "Maximum Password Age" msgstr "Maksymalny wiek hasa" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" msgstr "Ostatnia zmiana hasa (RRRR-MM-DD)" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" msgstr "Ostrze髒enie o utracie wa髒noci hasa" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "Haso nieaktywne" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Data utraty wa髒noci konta (RRRR-MM-DD)" -#: src/chage.c:238 +#: src/chage.c:231 #, c-format msgid "Last password change\t\t\t\t\t: " msgstr "Ostatnia zmiana hasa\t\t\t\t\t: " -#: src/chage.c:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 #, c-format msgid "never\n" msgstr "nigdy\n" -#: src/chage.c:251 +#: src/chage.c:244 #, c-format msgid "Password expires\t\t\t\t\t: " msgstr "Haso traci wa髒no\t\t\t\t\t: " -#: src/chage.c:267 +#: src/chage.c:260 #, c-format msgid "Password inactive\t\t\t\t\t: " msgstr "Haso nieaktywne\t\t\t\t\t: " -#: src/chage.c:281 +#: src/chage.c:274 #, c-format msgid "Account expires\t\t\t\t\t\t: " msgstr "Konto traci wa髒no\t\t\t\t\t: " -#: src/chage.c:297 +#: src/chage.c:290 #, 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:298 +#: src/chage.c:292 #, 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:299 +#: src/chage.c:294 #, 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:444 +#: src/chage.c:431 #, c-format msgid "%s: do not include \"l\" with other flags\n" msgstr "%s: nie cz \"l\" z innymi flagami\n" -#: src/chage.c:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 #, c-format msgid "%s: permission denied.\n" msgstr "%s: odmowa dostpu.\n" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 #, c-format msgid "%s: PAM authentication failed\n" msgstr "%s: bd podczas uwierzytelniania przez PAM\n" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, c-format msgid "%s: can't open password file\n" msgstr "%s: nie mo髒na otworzy pliku z hasami\n" -#: src/chage.c:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "%s: nieznany u髒ytkownik %s\n" -#: src/chage.c:535 +#: src/chage.c:519 #, c-format msgid "%s: can't lock shadow password file" msgstr "%s: nie mo髒na zablokowa pliku z ukrytymi hasami" -#: src/chage.c:543 +#: src/chage.c:527 #, c-format msgid "%s: can't open shadow password file" msgstr "%s: nie mo髒na otworzy pliku z ukrytymi hasami" -#: src/chage.c:604 +#: src/chage.c:587 #, c-format msgid "Changing the aging information for %s\n" msgstr "Zmieniam informacj o u髒ytkowniku %s\n" -#: src/chage.c:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" msgstr "%s: bd podczas zmieniania p籀l\n" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, c-format msgid "%s: can't update password file\n" msgstr "%s: nie mo髒na zaktualizowa pliku z hasami\n" -#: src/chage.c:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, 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:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "Bd podczas aktualizacji bazy hase DBM.\n" - -#: src/chage.c:692 +#: src/chage.c:649 #, 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:740 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite password file\n" msgstr "%s: nie mo髒na przepisa pliku z hasami\n" -#: src/chage.c:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 #, c-format msgid "%s: PAM chauthtok failed\n" msgstr "%s: PAM chauthtok nie powiodo si\n" @@ -369,117 +353,122 @@ msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" msgstr "" "U髒ycie: %s [-f imi_nazwisko] [-r nr_pokoju] [-w tel_praca] [-h tel_dom]\n" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "Imi i nazwisko" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "\tImi i nazwisko: %s\n" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "Numer pokoju" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "Telefon do pracy" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" msgstr "Telefon domowy" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "Inne" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s: Nie mo髒na ustali twojej nazwy u髒ytkownika.\n" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s: nie mo髒na zmieni u髒ytkownika `%s' na kliencie NIS.\n" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "%s: `%s' jest nadrzdnym serwerem NIS dla tego klienta.\n" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, c-format +msgid "%s: Permission denied.\n" +msgstr "%s: Operacja niedozwolona.\n" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" msgstr "Zmieniam informacj o u髒ytkowniku %s\n" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s: nieprawidowa nazwa: \"%s\"\n" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s: nieprawidowy numer pokoju: \"%s\"\n" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s: nieprawidowy numer telefonu do pracy: \"%s\"\n" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s: nieprawidowy numer telefonu domowego: \"%s\"\n" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s: \"%s\" zawiera nieprawidowe znaki\n" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "%s: pola zbyt dugie\n" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" msgstr "Nie mo髒na zmieni ID na root.\n" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" msgstr "Nie mo髒na zablokowa pliku z hasami; spr籀buj p籀驕niej.\n" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" msgstr "Nie mo髒na otworzy pliku z hasami.\n" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s: nie znaleziono %s w /etc/passwd\n" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" msgstr "Bd podczas aktualizacji wpisu do bazy hase.\n" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" msgstr "Wprowadzenie zmian do pliku passwd jest niemo髒liwe.\n" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" msgstr "Nie mo髒na usun blokady z pliku z hasami.\n" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -504,48 +493,48 @@ msgstr "" msgid "%s: can't lock password file\n" msgstr "%s: nie mo髒na zablokowa pliku z hasami\n" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "%s: nie mo髒na zablokowa pliku z ukrytymi hasami\n" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "%s: nie mo髒na otworzy pliku z ukrytymi hasami\n" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "%s: linia %d: linia zbyt duga\n" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "%s: linia %d: brakuje nowego hasa\n" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "%s: linia %d: nieznany u髒ytkownik %s\n" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "%s: linia %d: nie mo髒na zaktualizowa wpisu do bazy hase\n" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "%s: wykryto bd, zignorowano modyfikacje\n" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" msgstr "%s: bd podczas aktualizacji pliku z ukrytymi hasami\n" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" msgstr "%s: bd podczas aktualizacji pliku z hasami\n" @@ -555,26 +544,26 @@ msgstr "%s: bd podczas aktualizacji pliku z hasami\n" msgid "Usage: %s [-s shell] [name]\n" msgstr "U髒ycie: %s [-s powoka] [nazwa]\n" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" msgstr "Powoka logowania" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" msgstr "Nie mo髒esz zmienia powoki dla %s.\n" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" msgstr "Zmieniam powok logowania dla %s\n" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s: Nieprawidowy wpis: %s\n" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" msgstr "%s jest nieprawidow powok.\n" @@ -584,12 +573,12 @@ msgstr "%s jest nieprawidow powok.\n" msgid "Usage: expiry {-f|-c}\n" msgstr "U髒ycie: expiry {-f|-c}\n" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" msgstr "%s: OSTRZE驍ENIE! Program musi posiada SUID root!\n" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "%s: nieznany u髒ytkownik\n" @@ -603,8 +592,9 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" @@ -618,318 +608,282 @@ msgstr "" "logowaniu\n" " -m, --maximum MAX\t\tustaw maksymaln ilo niepoprawnych logowa na MAX\n" " -r, --reset\t\t\twyzeruj licznik niepoprawnych logowa\n" +" -t, --time DNI\t\twywietlaj rekordy nie starsze ni髒 DNI\n" " -u, --user LOGIN\t\twywietlaj rekordy lub zarzdzaj licznikami\n" "\t\t\t\ti limitami faillog (w poaczeniu z opcjami -r, -m lub -l) tylko\n" "\t\t\t\tdla u髒ytkownika o loginie LOGIN\n" -#: src/faillog.c:86 +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" -msgstr "U髒ytkownik Bdy Maksimum Ostatnio\n" +msgid "Login Failures Maximum Latest On\n" +msgstr "Login Nieudane Maks. Ostanio Na\n" -#: src/faillog.c:103 -#, c-format -msgid " %s on %s" -msgstr " %s na %s" - -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" msgstr " [pozostao %lds]" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr " [blokada %lds]" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "Nieznany u髒ytkownik: %s\n" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "U髒ycie: %s [-r|-R] grupa\n" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr " %s [-a u髒ytkownik] grupa\n" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr " %s [-d u髒ytkownik] grupa\n" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr " %s [-A u髒ytkownik,...] [-M u髒ytkownik,...] grupa\n" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr " %s [-M u髒ytkownik,...] grupa\n" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" msgstr "%s: plik z ukrytymi hasami grup wymagany dla -A\n" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "Kim jeste?\n" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr "nieznana grupa: %s\n" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "Dodaj nowego u髒ytkownika %s do grupy %s\n" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "Usuwam u髒ytkownika %s z grupy %s\n" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" msgstr "%s: nieznany czonek %s\n" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "%s: To nie tty\n" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "Zmieniam haso dla grupy %s\n" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "Nowe haso: " -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " msgstr "Wpisz haso ponownie: " -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" msgstr "Nie zgadzaj si; spr籀buj ponownie" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" msgstr "%s: Spr籀buj ponownie p籀驕niej\n" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "%s: nie mo髒na zablokowa\n" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" msgstr "%s: nie mo髒na zablokowa pliku z ukrytymi hasami\n" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "%s: nie mo髒na otworzy pliku\n" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "%s: nie mo髒na zaktualizowa wpisu\n" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" msgstr "%s: nie mo髒na zaktualizowa wpisu do pliku z ukrytymi hasami\n" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "%s: nie mo髒na przepisa pliku\n" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" msgstr "%s: nie mo髒na przepisa pliku z ukrytymi hasami\n" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "%s: nie mo髒na usun blokady z pliku\n" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "%s: nie mo髒na zaktualizowa plik籀w DBM\n" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "%s: nie mo髒na zaktualizowa pliku DBM z ukrytymi hasami\n" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "U髒ycie: groupadd [-g gid [-o]] [-f] grupa\n" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, c-format msgid "%s: error adding new group entry\n" msgstr "%s: bd podczas dodawania nowej grupy\n" -#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: nie mo髒na doda nowego wpisu do bazy dbm grup\n" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "%s: nazwa %s nie jest niepowtarzalny\n" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" msgstr "%s: uid %u nie jest niepowtarzalny\n" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "%s: nie mo髒na uzyska niepowtarzalnego gid\n" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, c-format msgid "%s: %s is not a valid group name\n" msgstr "%s: %s: nie jest prawidow nazw grupy\n" -#: src/groupadd.c:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "%s: nieprawidowa grupa %s\n" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "%s: -O wymaga ZMIENNA=WARTO\n" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s: nie mo髒na przepisa pliku z grupami\n" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s: nie mo髒na przepisa pliku z ukrytymi hasami grup\n" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" msgstr "%s: nie mo髒na zablokowa pliku z grupami\n" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" msgstr "%s: nie mo髒na otworzy pliku z grupami\n" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" msgstr "%s: nie mo髒na zablokowa pliku z ukrytymi hasami grup\n" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" msgstr "%s: nie mo髒na otworzy pliku z ukrytymi hasami grup\n" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "%s: grupa %s istnieje\n" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, c-format msgid "Usage: groupdel group\n" msgstr "U髒ycie: groupdel grupa\n" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" msgstr "%s: bd podczas usuwania grupy\n" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "%s: bd podczas usuwania wpisu dbm o grupie\n" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "%s: bd podczas usuwania wpisu z pliku z ukrytymi hasami grup\n" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "%s: bd podczas usuwania wpisu dbm z pliku z ukrytymi hasami grup\n" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "%s: nie mo髒na usun podstawowej grupy u髒ytkownik籀w.\n" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "%s: grupa %s nie istnieje\n" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "%s: grupa %s jest grup NIS\n" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s: %s jest g籀wnym serwerem NIS\n" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "U髒ycie: groupmod [-g gid [-o]] [-n nazwa] grupa\n" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "%s: nie znaleziono %s w /etc/group\n" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "" -"%s: nie mo髒na doda nowego wpisu dbm do pliku z ukrytymi hasami grup\n" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s: %u nie jest niepowtarzalnym gid\n" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "%s: %s nie jest niepowtarzaln nazw\n" @@ -939,112 +893,107 @@ msgstr "%s: %s nie jest niepowtarzaln nazw\n" msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "U髒ycie: %s [-r] [-s] [grupa [gshadow]]\n" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "U髒ycie: %s [-r] [-s] [grupa]\n" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "Nie" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" msgstr "%s: -s i -r s niekompatybilne\n" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "%s: nie mo髒na zablokowa pliku %s\n" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "%s: nie mo髒na otworzy pliku %s\n" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" msgstr "nieprawidowy wpis do pliku grup\n" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "usun lini `%s'? " -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" msgstr "powt籀rzony wpis w pliku grup\n" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" msgstr "nieprawidowa nazwa grupy `%s'\n" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "grupa %s: nie ma u髒ytkownika %s\n" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " msgstr "skasowa czonka `%s'? " -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" msgstr "nieprawidowy wpis w pliku z ukrytymi hasami grup\n" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" msgstr "powt籀rzony wpis w pliku z ukrytymi hasami grup\n" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" msgstr "brak pasujcego wpisu w pliku grup\n" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" msgstr "" "grupa %s: u髒ytkownik administracyjny %s z pliku ukrytych hase grup nie " "istnieje\n" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " msgstr "usun czonka administracyjnego `%s'? " -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" msgstr "grupa %s: u髒ytkownik %s z pliku ukrytych hase grup nie istnieje\n" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "%s: nie mo髒na zaktualizowa pliku %s\n" -#: src/grpck.c:647 src/pwck.c:612 -#, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: pliki zostay zaktualizowane; uruchom mkpasswd\n" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format -msgid "%s: no changes\n" -msgstr "%s: bez zmian\n" - -#: src/grpck.c:651 src/pwck.c:616 +#: src/grpck.c:640 src/pwck.c:606 #, c-format msgid "%s: the files have been updated\n" msgstr "%s: pliki zostay zaktualizowane\n" +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "%s: bez zmian\n" + #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" @@ -1060,37 +1009,37 @@ msgstr "%s: nie mo髒na otworzy pliku z grupami\n" msgid "%s: can't lock shadow group file\n" msgstr "%s: nie mo髒na zablokowa pliku z ukrytymi hasami grup\n" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" msgstr "%s: nie mo髒na otworzy pliku z ukrytymi hasami grup\n" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "%s: nie mo髒na usun grupy %s z pliku ukrytych hase grup\n" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "%s: nie mo髒na zaktualizowa wpisu w pliku z ukrytymi hasami dla %s\n" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "%s: nie mo髒na zaktualizowa wpisu dla grupy %s\n" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" msgstr "%s: nie mo髒na zaktualizowa pliku z ukrytymi hasami grup\n" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" msgstr "%s: nie mo髒na zaktualizowa pliku z grupami\n" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "%s: nie mo髒na skasowa pliku z ukrytymi hasami grup\n" @@ -1110,13 +1059,13 @@ msgstr "U髒ycie: id\n" msgid " groups=" msgstr " grupy=" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" @@ -1128,41 +1077,41 @@ msgstr "" " -h, --help\t\t\twywietlenie tego opisu i zakoczenie\n" " -t, --time DAYS\twywietl tylko rekordy lastlog nei starsze ni髒 DAYS dni\n" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" msgstr "U髒ytkownik Port Z Ostatnio\n" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "U髒ytkownik Port Ostatnio\n" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "**Nigdy nie zalogowany**" -#: src/login.c:175 +#: src/login.c:156 #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "U髒ycie: %s [-p] [nazwa]\n" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr " %s [-p] [-h host] [-f nazwa]\n" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr " %s [-p] -r host\n" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" msgstr "Nieprawidowy czas logowania\n" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" @@ -1171,7 +1120,7 @@ msgstr "" "\n" "System zamknity do rutynowej konserwacji.\n" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" @@ -1180,7 +1129,7 @@ msgstr "" "\n" "[Rozczenie pominite -- zezwolenie na logowanie si roota.]\n" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" @@ -1189,17 +1138,17 @@ msgstr "" "\n" "Limit czasu logowania przekroczony po %d sekundach.\n" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" msgstr " na `%.100s' z `%.200s'" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" msgstr " na `%.100s'" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" @@ -1208,38 +1157,29 @@ msgstr "" "\n" "%s login: " -#: src/login.c:819 -msgid "login: " -msgstr "login: " - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" msgstr "Nieprawidowe logowanie" -#: src/login.c:1198 +#: src/login.c:996 msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "Ostrze髒enie: logowanie ponownie odblokowanie po czasowej blokadzie.\n" -#: src/login.c:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "Ostatnie logowanie: %s na %s" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" msgstr "Ostatnie logowanie: %s na %s" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" msgstr " z %.*s" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "Startuj rad_login\n" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" @@ -1281,17 +1221,17 @@ msgstr "%s: bd podczas dodawania rekordu dla %s\n" msgid "added %d entries, longest was %d\n" msgstr "dodano %d wpis籀w, najdu髒szy by %d\n" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "U髒ycie: %s [-vf] [-p|g|sp|sg] plik\n" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "U髒ycie: %s [-vf] [-p|g|sp] plik\n" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "U髒ycie: %s [-vf] [-p|g] plik\n" @@ -1311,16 +1251,16 @@ msgstr "U髒ycie: sg grupa [[-c] polecenie]\n" msgid "unknown uid: %u\n" msgstr "nieznany uid: %u\n" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" msgstr "nieznany gid: %lu\n" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "Wybacz.\n" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "zbyt wiele grup\n" @@ -1330,91 +1270,91 @@ msgstr "zbyt wiele grup\n" msgid "Usage: %s [input]\n" msgstr "U髒ycie: %s [wejcie]\n" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "%s: nie mo髒na zablokowa /etc/passwd.\n" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "%s: nie mo髒na zablokowa plik籀w, spr籀buj p籀驕niej\n" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "%s: nie mo髒na otworzy plik籀w\n" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "%s: linia %d: nieprawidowa linia\n" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "%s: linia %d: nie mo髒na utworzy GID\n" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "%s: linia %d: nie mo髒na utworzy UID\n" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "%s: linia %d: nie mo髒na znale驕 u髒ytkownika %s\n" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "%s: linia %d: nie mo髒na zaktualizowa pliku z hasami\n" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "%s: linia %d: mkdir nie powiodo si\n" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "%s: linia %d: chown nie powiodo si\n" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "%s: linia %d: nie mo髒na zaktualizowa wpisu\n" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "%s: bd podczas aktualizowania plik籀w\n" -#: src/passwd.c:155 +#: src/passwd.c:154 #, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "U髒ycie: %s [-f|-s] [nazwa]\n" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr " %s [-x maks] [-n min] [-w ostrz] [-i nieakty] nazwa\n" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} nazwa\n" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "Stare haso: " -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" msgstr "Nieprawidowe haso `%s'\n" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" @@ -1423,16 +1363,16 @@ msgstr "" "Wpisz nowe haso (minimum %d, maksimum %d znak籀w)\n" "Prosz u髒yj kombinacji wielkich i maych znak籀w oraz cyfr.\n" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "Nowe haso: " -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" msgstr "Spr籀buj ponownie.\n" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" @@ -1441,52 +1381,52 @@ msgstr "" "\n" "Ostrze髒enie: sabe haso (wpisz je ponowie jeli jednak chcesz go u髒y).\n" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" msgstr "Nie zgadzaj si; spr籀buj ponownie.\n" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "Haso dla %s nie mo髒e by zmienione.\n" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" msgstr "Wybacz, haso dla %s nie mo髒e by jeszcze zmienione.\n" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "%s: brak pamici\n" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "%s: Nie mo髒na wykona %s" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" msgstr "%s: repozytorium %s nie jest obsugiwane\n" -#: src/passwd.c:914 +#: src/passwd.c:884 #, c-format -msgid "You may not change the password for %s.\n" -msgstr "Nie mo髒esz zmienia hasa dla %s.\n" +msgid "%s: You may not view or modify password information for %s.\n" +msgstr "%s: Nie mo髒esz przeglda lub zmienia informacji o hale dla %s.\n" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "Zmieniam haso dla %s\n" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "Haso dla %s pozostaje niezmienione.\n" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "Haso zmienione.\n" @@ -1501,49 +1441,49 @@ msgstr "U髒ycie: %s [-q] [-r] [-s] [passwd [shadow]]\n" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "U髒ycie: %s [-q] [-r] [-s] [passwd]\n" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" msgstr "nieprawidowy wpis do pliku z hasami\n" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" msgstr "powt籀rzony wpis w pliku z hasami\n" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" msgstr "nieprawidowa nazwa u髒ytkownika '%s'\n" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "u髒ytkownik %s: brak grupy %u\n" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "u髒ytkownik %s: katalog %s nie istnieje\n" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "u髒ytkownik %s: program %s nie istnieje\n" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" msgstr "nieprawidowy wpis w pliku z hasami\n" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" msgstr "powt籀rzony wpis w pliku z ukrytymi hasami\n" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" msgstr "brak pasujcego wpisu w pliku z hasami\n" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" msgstr "u髒ytkownik %s: ostatnia zmiana hasa w przyszoci\n" @@ -1563,17 +1503,17 @@ msgstr "%s: nie mo髒na otworzy pliku z hasami\n" msgid "%s: can't remove shadow entry for %s\n" msgstr "%s: nie mo髒na usun wpisu z pliku z ukrytymi hasami dla %s\n" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "%s: nie mo髒na zaktualizowa wpisu w pliku z hasami dla %s\n" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" msgstr "%s: nie mo髒na zaktualizowa pliku z ukrytymi hasami\n" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" msgstr "%s: nie mo髒na zaktualizowa pliku z hasami\n" @@ -1583,40 +1523,40 @@ msgstr "%s: nie mo髒na zaktualizowa pliku z hasami\n" msgid "%s: can't update entry for user %s\n" msgstr "%s: nie mo髒na zaktualizowa wpisu dla u髒ytkownika %s\n" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format msgid "%s: can't delete shadow password file\n" msgstr "%s: nie mo髒na skasowa pliku z ukrytymi hasami\n" -#: src/su.c:133 +#: src/su.c:132 msgid "Sorry." msgstr "Wybacz." -#: src/su.c:323 +#: src/su.c:320 #, c-format msgid "%s: must be run from a terminal\n" msgstr "%s: musisz uruchamia z terminala\n" -#: src/su.c:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "%s: pam_start: bd %d\n" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" msgstr "Nieznany id: %s\n" -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, c-format msgid "You are not authorized to su %s\n" msgstr "Nie masz autoryzacji by u髒ywa su %s\n" -#: src/su.c:502 +#: src/su.c:495 msgid "(Enter your own password.)" msgstr "(Wpisz swoje wasne haso.)" -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" @@ -1625,22 +1565,22 @@ msgstr "" "%s: %s\n" "(Zignorowano)\n" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" msgstr "Brak powoki\n" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr "Dostp do polecenia su z tego konta ZABRONIONY.\n" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "Uwierzytelnianie na podstawie hasa pominite.\n" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" msgstr "Prosz wpisz swoje WASNE haso jako haso uwierzytelniajce.\n" @@ -1655,7 +1595,7 @@ msgstr "Brak pliku z hasami\n" msgid "No password entry for 'root'\n" msgstr "Brak wpisu do bazy hase dla 'root'\n" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" @@ -1665,441 +1605,386 @@ msgstr "" "Nacinij control-d by kontynuowa normalny start\n" "(lub podaj haso roota by przej do trybu konserwacji systemu):" -#: src/sulogin.c:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" msgstr "Wchodz w tryb konserwacji systemu\n" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "%s: przebuduj baz grup\n" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "%s: przebuduj baz ukrytych hase grup\n" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "%s: nieprawidowy argument numeryczny `%s'\n" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "%s: nieznany gid %s\n" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "%s: nieznana grupa %s\n" -#: src/useradd.c:475 +#: src/useradd.c:418 #, 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:480 +#: src/useradd.c:423 #, 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:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" msgstr "%s: zmiana nazwy: %s" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s: grupa `%s' jest grup NIS.\n" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "%s: podano zbyt wiele grup (maks %d).\n" -#: src/useradd.c:721 +#: src/useradd.c:660 #, 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:724 +#: src/useradd.c:663 #, c-format msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr "" " [-d kat_dom] [-s powoka] [-c komentarz] [-m [-k wz籀r]]\n" -#: src/useradd.c:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, c-format msgid " [-f inactive] [-e expire]\n" msgstr " [-f nieaktywne] [-e utrata_wa髒noci]\n" -#: src/useradd.c:728 +#: src/useradd.c:667 #, c-format msgid " [-p passwd] name\n" msgstr " [-p haso] nazwa\n" -#: src/useradd.c:730 +#: src/useradd.c:669 #, 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:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, c-format msgid "%s: error locking group file\n" msgstr "%s: bd podczas blokowania pliku z grupami\n" -#: src/useradd.c:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, c-format msgid "%s: error opening group file\n" msgstr "%s: bd podczas otwierania pliku z grupami\n" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, c-format msgid "%s: error locking shadow group file\n" msgstr "%s: bd podczas blokowania pliku z ukrytymi hasami grup\n" -#: src/useradd.c:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, c-format msgid "%s: error opening shadow group file\n" msgstr "%s: bd podczas otwierania pliku z ukrytymi hasami grup\n" -#: src/useradd.c:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "%s: uid %u nie jest niepowtarzalny\n" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "%s: nie mo髒na uzyska niepowtarzalnego uid\n" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "%s: nieprawidowy katalog bazowy `%s'\n" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "%s: nieprawidowy komentarz `%s'\n" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "%s: nieprawidowy katalog domowy `%s'\n" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s: nieprawidowa data `%s'\n" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "%s: ukryte hasa wymagane dla -e\n" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, c-format msgid "%s: shadow passwords required for -f\n" msgstr "%s: ukryte hasa wymagane dla -f\n" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" msgstr "%s: nieprawidowe pole `%s'\n" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "%s: nieprawidowa powoka `%s'\n" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "%s: nieprawidowa nazwa u髒ytkownika '%s'\n" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "%s: nie mo髒na przepisa pliku z hasami\n" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "%s: nie mo髒na przepisa pliku z ukrytymi hasami\n" -#: src/useradd.c:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, c-format msgid "%s: unable to lock password file\n" msgstr "%s: nie mo髒na zablokowa pliku z hasami\n" -#: src/useradd.c:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, c-format msgid "%s: unable to open password file\n" msgstr "%s: nie mo髒na otworzy pliku z hasami\n" -#: src/useradd.c:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, c-format msgid "%s: cannot lock shadow password file\n" msgstr "%s: nie mo髒na zablokowa pliku z ukrytymi hasami\n" -#: src/useradd.c:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, c-format msgid "%s: cannot open shadow password file\n" msgstr "%s: nie mo髒na otworzy pliku z ukrytymi hasami\n" -#: src/useradd.c:1459 +#: src/useradd.c:1354 #, 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:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "%s: bd podczas aktualizacji wpisu dbm w pliku z hasami\n" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, 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:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s: bd podczas aktualizacji wpisu dbm w pliku z ukrytymi hasami\n" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" msgstr "%s: nie mo髒na utworzy katalogu %s\n" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, 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:1590 +#: src/useradd.c:1446 #, 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:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "%s: u髒ytkownik %s istnieje\n" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, 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:1767 +#: src/useradd.c:1602 #, 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" -#: src/userdel.c:124 +#: src/userdel.c:108 #, c-format msgid "Usage: %s [-r] name\n" msgstr "U髒ycie: %s [-r] nazwa\n" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" msgstr "%s: bd podczas aktualizacji wpisu grupy\n" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "%s: nie mo髒na zaktualizowa wpisu dbm w pliku z grupami\n" - -#: src/userdel.c:214 -#, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: nie mo髒na usun wpisu dbm z pliku z grupami\n" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "%s: nie mo髒na otworzy pliku z grupami\n" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "%s: nie mo髒na otworzy pliku z ukrytymi hasami grup\n" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "%s: bd podczas usuwania wpisu z pliku z hasami\n" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "%s: bd podczas usuwania wpisu z pliku z ukrytymi hasami\n" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "%s: bd podczas usuwania wpisu dbm z pliku z hasami\n" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s: bd podczas usuwania wpisu dbm z pliku z ukrytymi hasami\n" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "%s: u髒ytkownik %s jest aktualnie zalogowany\n" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "%s: wacicielem %s nie jest %s, nie usuwam\n" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " msgstr "%s: ostrze髒enie: nie mo髒na usun " -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" msgstr "%s: u髒ytkownik %s nie istnieje\n" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s: u髒ytkownik %s jest u髒ytkownikiem NIS\n" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "" "%s: nie usuwam katalogu %s (usunoby to katalog domowy u髒ytkownika %s)\n" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "%s: bd podczas usuwania katalogu %s\n" -#: src/usermod.c:306 +#: src/usermod.c:289 #, 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" -#: src/usermod.c:310 +#: src/usermod.c:293 #, 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:313 +#: src/usermod.c:296 #, c-format msgid "[-f inactive] [-e expire] " msgstr "[-f nieaktywne] [-e utrata_wa髒noci] " -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p haso] [-L|-U] nazwa\n" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" msgstr "%s: zabrako pamici w update_group\n" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "%s: zabrako pamici w update_gshadow\n" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "%s: nie podano flag\n" -#: src/usermod.c:965 +#: src/usermod.c:903 #, 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:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "%s: uid %lu nie jest niepowtarzalny\n" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, c-format msgid "%s: error changing password entry\n" msgstr "%s: bd podczas zmiany wpisu w pliku z hasami\n" -#: src/usermod.c:1122 +#: src/usermod.c:1053 #, c-format msgid "%s: error removing password entry\n" msgstr "%s: bd podczas usuwania wpisu z pliku z hasami\n" -#: src/usermod.c:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "%s: bd podczas dodawania wpisu dbm do pliku z hasami\n" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "%s: bd podczas usuwania wpisu dbm z pliku z hasami\n" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, 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:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s: bd podczas usuwania wpisu dbm z pliku z ukrytymi hasami\n" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "%s: katalog %s istnieje\n" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "%s: nie mo髒na utworzy %s\n" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" msgstr "%s: nie mo髒na zmieni waciciela %s\n" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, 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:1333 +#: src/usermod.c:1223 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "%s: ostrze髒enie: wacicielem %s nie jest %s\n" -#: src/usermod.c:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" msgstr "zmiana waciciela skrzynki pocztowej nie powioda si" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" msgstr "zmiana nazwy skrzynki pocztowej nie powioda si" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" @@ -2108,20 +1993,20 @@ msgstr "" "\n" "%s: %s jest niezmieniony\n" -#: src/vipw.c:133 +#: src/vipw.c:131 msgid "Couldn't lock file" msgstr "Nie mo髒na zablokowa pliku" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" msgstr "Nie mo髒na wykona kopii zapasowej" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s: nie mo髒na odzyska %s: %s (twoje zmiany s w %s)\n" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/po/pt.gmo b/po/pt.gmo index 01fa984a..a888523a 100644 Binary files a/po/pt.gmo and b/po/pt.gmo differ diff --git a/po/pt.po b/po/pt.po index 923d45c9..4f21a3e9 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,25 +1,25 @@ # Portuguese (Portugal) Translation Project (traduz@debianpt.org) # Nuno S矇nica , 2004 -# +# 18-04-2005 - Miguel Figueiredo - 5f1u msgid "" msgstr "" -"Project-Id-Version: shadow 4.0.7\n" +"Project-Id-Version: shadow 4.0.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-26 07:53+0100\n" -"PO-Revision-Date: 2005-01-16 10:28+0000\n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" +"PO-Revision-Date: 2005-04-17 22:55+0000\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n!=1;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" msgstr "Aviso: grupo desconhecido %s\n" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" msgstr "Aviso: demasiados grupos\n" @@ -47,17 +47,17 @@ msgstr " Contacte o administrador do sistema.\n" msgid " Choose a new password.\n" msgstr " Escolha uma nova password.\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "A sua password vai caducar em %ld dias.\n" -#: libmisc/age.c:174 +#: libmisc/age.c:172 #, c-format msgid "Your password will expire tomorrow.\n" msgstr "A sua password vai caducar amanh瓊.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:174 #, c-format msgid "Your password will expire today.\n" msgstr "A sua password caduca hoje.\n" @@ -72,40 +72,27 @@ msgstr "Foi imposs穩vel mudar o tty %s" msgid "Environment overflow\n" msgstr "Overflow do ambiente\n" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr "N瓊o pode alterar $%s\n" -#: libmisc/failure.c:230 +#: libmisc/failure.c:229 #, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "%d %s desde o 繳ltimo login. A 繳ltima vez foi %s em %s.\n" +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "%d falha desde o 繳ltimo login. O 繳ltimo foi %s em %s.\n" +msgstr[1] "%d falhas desde o 繳ltimo login. O 繳ltimo foi %s em %s.\n" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "falhas" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "falha" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" msgstr "Demasiados logins.\n" -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "A password n瓊o desencripta a chave secreta para %s.\n" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "" -"N瓊o pode definir a chave secreta de %s: est獺 a correr o daemon keyserv?\n" - #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "Tem novo correio." @@ -118,7 +105,7 @@ msgstr "N瓊o tem correio." msgid "You have mail." msgstr "Tem correio." -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " msgstr "Password inv獺lida: %s. " @@ -133,20 +120,20 @@ msgstr "passwd: o pam_start() falhou, erro %d\n" msgid "passwd: %s\n" msgstr "passwd: %s\n" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" msgstr "passwd: a password foi actualizada com sucesso\n" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "N瓊o foi poss穩vel mudar para a directoria \"%s\"\n" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" msgstr "Directoria n瓊o encontrada, a entrar para HOME=/" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr "N瓊o foi poss穩vel executar %s" @@ -161,36 +148,32 @@ msgstr "Directoria de ra穩z inv獺lida \"%s\"\n" msgid "Can't change root directory to \"%s\"\n" msgstr "N瓊o 矇 poss穩vel mudar a directoria de raiz para \"%s\"\n" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "O malloc(%d) falhou\n" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" msgstr "N瓊o foi poss穩vel alocar o espa癟o para a informa癟瓊o de configura癟瓊o.\n" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "" "erro de configura癟瓊o - item '%s' desconhecido (notifique o administrador)\n" -#: lib/pwauth.c:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "Password: " -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "Password de %s: " -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "(Echo ligado) " - -#: src/chage.c:118 +#: src/chage.c:112 #, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" @@ -199,155 +182,148 @@ msgstr "" "Utiliza癟瓊o: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" " [-I inactive] [-E expire] [-d last_day] utilizador\n" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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:155 +#: src/chage.c:149 msgid "Minimum Password Age" msgstr "Idade M穩nima da Password" -#: src/chage.c:161 +#: src/chage.c:155 msgid "Maximum Password Age" msgstr "Idade M獺xima da Password" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" msgstr "ltima Altera癟瓊o da Password (YYYY-MM-DD)" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" msgstr "Aviso de Caducidade da Password" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "Password Inactiva" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Data de Caducidade da Conta (YYYY-MM-DD)" -#: src/chage.c:238 +#: src/chage.c:231 #, 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:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 #, c-format msgid "never\n" msgstr "nunca\n" -#: src/chage.c:251 +#: src/chage.c:244 #, c-format msgid "Password expires\t\t\t\t\t: " msgstr "A password caduca em\t\t\t\t\t: " -#: src/chage.c:267 +#: src/chage.c:260 #, c-format msgid "Password inactive\t\t\t\t\t: " msgstr "Password inactiva\t\t\t\t\t: " -#: src/chage.c:281 +#: src/chage.c:274 #, 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:297 +#: src/chage.c:290 #, 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:298 +#: src/chage.c:292 #, 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:299 +#: src/chage.c:294 #, 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:444 +#: src/chage.c:431 #, 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:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 #, c-format msgid "%s: permission denied.\n" msgstr "%s: acesso negado.\n" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 #, c-format msgid "%s: PAM authentication failed\n" msgstr "%s: A autentica癟瓊o PAM falhou\n" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, 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:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "%s: utilizador desconhecido %s\n" -#: src/chage.c:535 +#: src/chage.c:519 #, c-format msgid "%s: can't lock shadow password file" msgstr "" "%s: n瓊o 矇 poss穩vel obter acesso exclusivo ao ficheiro de passwords shadow" -#: src/chage.c:543 +#: src/chage.c:527 #, c-format msgid "%s: can't open shadow password file" msgstr "%s: n瓊o 矇 poss穩vel abrir o ficheiro de passwords shadow" -#: src/chage.c:604 +#: src/chage.c:587 #, c-format msgid "Changing the aging information for %s\n" msgstr "A alterar a informa癟瓊o de envelhecimento de %s\n" -#: src/chage.c:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" msgstr "%s: erro na altera癟瓊o de campos\n" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, 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:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, 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:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "Erro na actualiza癟瓊o do registo da password DBM\n" - -#: src/chage.c:692 +#: src/chage.c:649 #, 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:740 +#: src/chage.c:693 #, 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:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 #, c-format msgid "%s: PAM chauthtok failed\n" msgstr "%s: falhou chauthtok de PAM\n" @@ -368,120 +344,125 @@ msgstr "" "Utiliza癟瓊o: %s [-f nome_completo] [-r no_sala] [-w telefone_trabalho] [-h " "telefone_casa]\n" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "Nome Completo" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "\tNome Completo: %s\n" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "N繳mero da Sala" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "Telefone do Trabalho" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" msgstr "Telefone de Casa" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "Outra Informa癟瓊o" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s: N瓊o 矇 poss穩vel determinar o seu nome de utilizador.\n" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s: n瓊o 矇 poss穩vel alterar o utilizador `%s' no cliente NIS.\n" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "%s: `%s' 矇 o NIS master por este cliente.\n" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, c-format +msgid "%s: Permission denied.\n" +msgstr "%s: acesso negado.\n" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" msgstr "A alterar a informa癟瓊o de utilizador de %s\n" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s: nome inv獺lido: \"%s\"\n" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s: n繳mero de sala inv獺lido: \"%s\"\n" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s: telefone do trabalho inv獺lido: \"%s\"\n" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s: telefone de casa inv獺lido: \"%s\"\n" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s: \"%s\" cont矇m caracteres n瓊o permitidos.\n" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "%s: valores demasiado grandes\n" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" msgstr "N瓊o 矇 poss穩vel alterar o ID para root.\n" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" msgstr "" "N瓊o 矇 poss穩vel obter acesso exclusivo ao ficheiro de passwords; tente de " "novo mais tarde.\n" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" msgstr "N瓊o 矇 poss穩vel abrir o ficheiro de passwords.\n" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s: %s n瓊o foi encontrado em /etc/passwd\n" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" msgstr "Erro ao actualizar o registo da password.\n" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" msgstr "" "N瓊o 矇 poss穩vel gravar as altera癟瓊o efectuadas ao ficheiros de passwords.\n" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" msgstr "N瓊o 矇 poss穩vel libertar o ficheiro de passwords.\n" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -505,48 +486,48 @@ msgstr "" msgid "%s: can't lock password file\n" msgstr "%s: n瓊o 矇 poss穩vel obter acesso exclusivo ao ficheiro de passwords\n" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "%s: n瓊o 矇 poss穩vel obter acesso exclusivo ao ficheiro shadow\n" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "%s: n瓊o 矇 poss穩vel abrir o ficheiro shadow\n" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "%s: linha %d: linha demasiado grande\n" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "%s: linha %d: falta a nova password\n" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "%s: linha %d: utilizador %s desconhecido\n" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "%s: linha %d: n瓊o 矇 poss穩vel actualizar o registo da password\n" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "%s: foi detectado um erro, as altera癟繭es foram ignoradas\n" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" msgstr "%s: erro a actualizar o ficheiro shadow\n" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" msgstr "%s: erro a actualizar o ficheiro de passwords\n" @@ -556,26 +537,26 @@ msgstr "%s: erro a actualizar o ficheiro de passwords\n" msgid "Usage: %s [-s shell] [name]\n" msgstr "Utiliza癟瓊o: %s [-s shell] [nome]\n" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" msgstr "Shell de Login" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" msgstr "N瓊o pode alterar a shell de %s.\n" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" msgstr "A alterar a shell de entrada de %s\n" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s: Entrada inv獺lida: %s\n" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" msgstr "%s 矇 uma shell inv獺lida.\n" @@ -585,12 +566,12 @@ msgstr "%s 矇 uma shell inv獺lida.\n" msgid "Usage: expiry {-f|-c}\n" msgstr "Utiliza癟瓊o: expiry {-f|-c}\n" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" msgstr "%s: AVISO! Tem de ter o UID root!\n" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "%s: utilizador desconhecido\n" @@ -604,8 +585,9 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" @@ -619,318 +601,283 @@ msgstr "" " -m, --maximum MAX\t\tdefinir contadores de m獺ximo de logins falhados para " "MAX\n" " -r, --reset\t\t\tesvazia os contadores de login falhados\n" +" -t, --time DIAS\t\tmostrar registos do faillog mais recentes do que DIAS\n" " -u, --user LOGIN\t\tmostra o registo de faillog ou contadores de falhas \n" "\t\t\t\tmantidos e limites (se utilizado com as op癟繭es -r, -m ou -l) \n" "\t\t\t\tapenas para o utilizador com o login LOGIN\n" -#: src/faillog.c:86 +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" -msgstr "Utilizador Falhas M獺ximo ltimo\n" +msgid "Login Failures Maximum Latest On\n" +msgstr "Login Falhas M獺ximo ltima Em\n" -#: src/faillog.c:103 -#, c-format -msgid " %s on %s" -msgstr " %s em %s" - -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" msgstr " [faltam %lds]" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr " [%lds lock]" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "Utilizador Deconhecido: %s\n" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "Utiliza癟瓊o: %s [-r|-R] grupo\n" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr " %s [-a utilizador] grupo\n" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr " %s [-d utilizador] grupo\n" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr " %s [-A utilizador,...] [-M utilizador,...] grupo\n" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr " %s [-M utilizador,...] grupo\n" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" msgstr "%s: passwords shadow de grupo necess獺rias para -A\n" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "Quem 矇 voc礙?\n" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr "grupo desconhecido: %s\n" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "A adicionar o utilizador %s ao grupo %s\n" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "A remover o utilizador %s do grupo %s\n" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" msgstr "%s: membro desconhecido %s\n" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "%s: N瓊o 矇 um tty\n" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "A alterar a password para o grupo %s\n" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "Nova Password: " -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " msgstr "Re-introduza a nova password: " -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" msgstr "N瓊o coincidem; tente de novo" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" msgstr "%s: Tente de novo mais tarde\n" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "%s: n瓊o 矇 poss穩vel obter acesso exclusivo\n" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" msgstr "%s: n瓊o 矇 poss穩vel obter acesso exclusivo a shadow\n" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "%s: n瓊o 矇 poss穩vel abrir o ficheiro\n" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "%s: n瓊o 矇 poss穩vel actualizar o registo\n" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" msgstr "%s: n瓊o 矇 poss穩vel actualizar o registo do shadow\n" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "%s: n瓊o 矇 poss穩vel reescrever o ficheiro\n" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" msgstr "%s: n瓊o 矇 poss穩vel reescrever o ficheiro de shadow\n" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "%s: n瓊o 矇 poss穩vel libertar o ficheiro\n" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "%s: n瓊o 矇 poss穩vel actualizar os ficheiros DBM\n" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "%s: n瓊o 矇 poss穩vel actualizar os ficheiros de shadow DBM\n" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "Utiliza癟瓊o: groupadd [-g gid [-o]] [-f] grupo\n" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, c-format msgid "%s: error adding new group entry\n" msgstr "%s: erro a adicionar o registo do novo grupo\n" -#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: n瓊o 矇 poss穩vel adicionar o registo do novo grupo dbm\n" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "%s: o nome %s n瓊o 矇 繳nico\n" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" msgstr "%s: gid %u n瓊o 矇 繳nico\n" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "%s: n瓊o 矇 poss穩vel obter um gid 繳nico\n" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, 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:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "%s: grupo %s inv獺lido\n" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "%s: -O necessita de NAME=VALUE\n" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s: n瓊o 矇 poss穩vel reescrever o ficheiro dos grupos\n" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s: n瓊o 矇 poss穩vel reescrever o ficheiro de shadow dos grupos\n" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" msgstr "%s: n瓊o 矇 poss穩vel obter acesso exclusivo ao ficheiro dos grupos\n" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" msgstr "%s: n瓊o 矇 poss穩vel abrir o ficheiro dos grupos\n" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" msgstr "" "%s: n瓊o 矇 possivel obter acesso exclusivo ao ficheiro de shadow dos grupos\n" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" msgstr "%s: n瓊o 矇 poss穩vel abrir o ficheiro de shadow dos grupos\n" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "%s: o grupo %s j獺 existe\n" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, c-format msgid "Usage: groupdel group\n" msgstr "Utiliza癟瓊o: groupdel grupo\n" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" msgstr "%s: erro ao remover o registo do grupo\n" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "%s: erro ao remover o registo do grupo dbm\n" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "%s: erro ao remover o registo de shadow do grupo\n" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "%s: erro ao remover o registo de shadow do grupo dbm\n" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "%s: n瓊o 矇 poss穩vel remover o grupo prim獺rio do utilizador.\n" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "%s: o grupo %s n瓊o existe.\n" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "%s: o grupo %s 矇 um grupo NIS\n" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s: %s 矇 o NIS master\n" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "Utiliza癟瓊o: groupmod [-g gid [-o]] [-n nome] grupo\n" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "%s: %s n瓊o foi encontrado em /etc/group\n" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s: n瓊o 矇 poss穩vel adicionar um novo registo shadow do grupo dbm\n" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s: %u n瓊o 矇 um gid 繳nico\n" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "%s: %s n瓊o 矇 um nome 繳nico\n" @@ -940,110 +887,105 @@ msgstr "%s: %s n瓊o 矇 um nome 繳nico\n" msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "Utiliza癟瓊o: %s [-r] [-s] [grupo [gshadow]]\n" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "Utiliza癟瓊o: %s [-r] [-s] [grupo]\n" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "N瓊o" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" msgstr "%s: -s e -r s瓊o incompat穩veis\n" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "%s: n瓊o 矇 poss穩vel obter acesso exclusivo ao ficheiro %s\n" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "%s: n瓊o 矇 poss穩vel abrir o ficheiro %s\n" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" msgstr "um registo no ficheiro dos grupos 矇 inv獺lido\n" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "apagar a linha `%s'? " -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" msgstr "registo de grupo duplicado\n" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" msgstr "o nome de grupo `%s' 矇 inv獺lido\n" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "grupo %s: n瓊o existe o utilizador %s\n" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " msgstr "apagar o membro `%s'? " -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" msgstr "o registo no ficheiro de shadow dos grupos 矇 inv獺lido\n" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" msgstr "registo de grupo em shadow duplicado\n" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" msgstr "o registo coincidente para esse grupo n瓊o foi encontrado\n" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" msgstr "grupo shadow %s: o utilizador %s n瓊o administrador\n" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " msgstr "apagar o membro administrador `%s'? " -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" msgstr "grupo shadow %s: o utilizador %s n瓊o existe\n" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "%s: n瓊o 矇 poss穩vel actualizar o ficheiro %s\n" -#: src/grpck.c:647 src/pwck.c:612 -#, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: os ficheiros foram actualizados; execute mkpasswd\n" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format -msgid "%s: no changes\n" -msgstr "%s: n瓊o houve altera癟繭es\n" - -#: src/grpck.c:651 src/pwck.c:616 +#: src/grpck.c:640 src/pwck.c:606 #, c-format msgid "%s: the files have been updated\n" msgstr "%s: os ficheiros foram actualizados\n" +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "%s: n瓊o houve altera癟繭es\n" + #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" @@ -1060,37 +1002,37 @@ msgid "%s: can't lock shadow group file\n" msgstr "" "%s: n瓊o 矇 poss穩vel obter acesso exclusivo ao ficheiro de shadow dos grupos\n" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" msgstr "%s: n瓊o 矇 poss穩vel abrir o ficheiro de shadow dos grupos\n" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "%s: n瓊o 矇 poss穩vel remover o grupo shadow %s\n" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "%s: n瓊o 矇 poss穩vel actualizar o registo de shadow de %s\n" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "%s: n瓊o 矇 poss穩vel actualizar o registo do grupo %s\n" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" msgstr "%s: n瓊o 矇 poss穩vel actualizar o ficheiro de shadow do grupo\n" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" msgstr "%s: n瓊o 矇 poss穩vel actualizar o ficheiro do grupo\n" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "%s: n瓊o 矇 poss穩vel apagar o ficheiro de shadow dos grupos.\n" @@ -1110,13 +1052,13 @@ msgstr "Utiliza癟瓊o: id\n" msgid " groups=" msgstr " grupos=" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" @@ -1127,41 +1069,41 @@ msgstr "" " -h, --help\t\tmostra esta mensagem e sai\n" " -t, --time DIAS\tmostra apenas registos de lastlog mais recentes que DIAS\n" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" msgstr "Utilizador Porto De ltimo\n" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "Utilizador Port ltimo\n" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "**Nunca entrou no sistema**" -#: src/login.c:175 +#: src/login.c:156 #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Utiliza癟瓊o: %s [-p] [nome]\n" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr " %s [-p] [-h host] [-f nome]\n" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr " %s [-p] -r host\n" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" msgstr "Tempo de login inv獺lido\n" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" @@ -1170,7 +1112,7 @@ msgstr "" "\n" "Sistema encerrado para manuten癟瓊o de rotina\n" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" @@ -1179,7 +1121,7 @@ msgstr "" "\n" "[Encerramento ultrapassado -- entrada de root permitida.]\n" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" @@ -1188,17 +1130,17 @@ msgstr "" "\n" "Tempo de login caducou ap籀s %d segundos de inactividade.\n" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" msgstr " em `%.100s' de `%.200s'" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" msgstr " em `%.100s'" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" @@ -1207,38 +1149,29 @@ msgstr "" "\n" "%s login: " -#: src/login.c:819 -msgid "login: " -msgstr "login: " - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" msgstr "Login incorrecto" -#: src/login.c:1198 +#: src/login.c:996 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:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "ltima entrada no sistema: %s em %s" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" msgstr "ltima entrada no sistema: %.19s em %s" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" msgstr " de %.*s" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "A iniciar rad_login\n" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" @@ -1257,9 +1190,9 @@ msgid "%s: cannot open DBM files for %s\n" msgstr "%s: n瓊o 矇 poss穩vel abrir os ficheiros DBM para %s\n" #: src/mkpasswd.c:286 -#, fuzzy, c-format +#, c-format msgid "%s: the line beginning with %.16s... is too long\n" -msgstr "%s: o inicio com " +msgstr "%s: a linha que come癟a por %.16s... 矇 demasiado longa\n" #: src/mkpasswd.c:313 #, c-format @@ -1281,17 +1214,17 @@ msgstr "%s: erro a adicionar o registo para %s\n" msgid "added %d entries, longest was %d\n" msgstr "foram adicionados %d registos, o maior foi o %d\n" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "Utiliza癟瓊o: %s [-vf] [-p|g|sp|sg] ficheiro\n" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "Utiliza癟瓊o: %s [-vf] [-p|g|sp] ficheiro\n" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "Utiliza癟瓊o: %s [-vf] [-p|g] ficheiro\n" @@ -1311,16 +1244,16 @@ msgstr "Utiliza癟瓊o: sg grupo [[-c] comando]\n" msgid "unknown uid: %u\n" msgstr "uid desconhecido: %u\n" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" msgstr "gid desconhecido: %lu\n" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "Desculpe.\n" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "demasiados grupos\n" @@ -1330,92 +1263,92 @@ msgstr "demasiados grupos\n" msgid "Usage: %s [input]\n" msgstr "Utiliza癟瓊o: %s [input]\n" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "%s: n瓊o 矇 poss穩vel obter acesso exclusivo a /etc/passwd.\n" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "" "%s: n瓊o 矇 poss穩vel obter acesso excluviso a ficheiros, tente mais tarde\n" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "%s: n瓊o 矇 poss穩vel abrir ficheiros\n" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "%s: linha %d: linha inv獺lida\n" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "%s: linha %d: n瓊o 矇 poss穩vel criar o GID\n" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "%s: linha %d: n瓊o 矇 poss穩vel criar o UID\n" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "%s: linha %d: n瓊o 矇 possivel encontrar o utilizador %s\n" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "%s: linha %d: n瓊o 矇 poss穩vel actualizar a password\n" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "%s: linha %d: o mkdir falhou\n" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "%s: linha %d: o chown falhou\n" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "%s: linha %d: n瓊o 矇 poss穩vel actualizar o registo\n" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "%s: erro ao actualizar ficheiros\n" -#: src/passwd.c:155 +#: src/passwd.c:154 #, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "Utiliza癟瓊o: %s [-f|-s] [nome]\n" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr " %s [-x max] [-n min] [-w aviso] [-i inactivo] nome\n" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} nome\n" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "Password antiga: " -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" msgstr "Password incorrecta para `%s'\n" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" @@ -1425,16 +1358,16 @@ msgstr "" "Por favor utilize um combina癟瓊o de letras mai繳sculas, min繳sculas e de " "n繳meros.\n" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "Nova password: " -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" msgstr "Tente de novo.\n" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" @@ -1443,52 +1376,52 @@ msgstr "" "\n" "Aviso: password fraca (introduza-a de novo para us獺-la mesmo assim).\n" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" msgstr "N瓊o coincidem; tente de novo.\n" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "A password para %s n瓊o pode ser alterada.\n" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" msgstr "Desculpe, mas a password para %s ainda n瓊o pode ser alterada.\n" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "%s: falta de mem籀ria\n" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "%s: N瓊o 矇 poss穩vel executar %s" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" msgstr "%s: o reposit籀rio %s n瓊o 矇 suportado\n" -#: src/passwd.c:914 +#: src/passwd.c:884 #, c-format -msgid "You may not change the password for %s.\n" -msgstr "N瓊o pode alterar a password para %s.\n" +msgid "%s: You may not view or modify password information for %s.\n" +msgstr "%s: N瓊o pode ver ou alterar a informa癟瓊o da password para %s.\n" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "A alterar a password de %s\n" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "A password de %s n瓊o foi alterada.\n" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "Password alterada.\n" @@ -1503,49 +1436,49 @@ msgstr "Utiliza癟瓊o: %s [-q] [-r] [-s] [passwd [shadow]]\n" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "Utiliza癟瓊o: %s [-q] [-r] [-s] [passwd]\n" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" msgstr "registo no ficheiro de passwords inv獺lido\n" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" msgstr "registo de password duplicado\n" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" msgstr "o nome de utilizador '%s' 矇 inv獺lido\n" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "utilizador %s: o grupo %u n瓊o existe\n" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "utilizador %s: a directoria %s n瓊o existe\n" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "utilizador %s: o programa %s n瓊o existe\n" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" msgstr "registo no ficheiro de shadow de passwords inv獺lido\n" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" msgstr "registo de shadow da password duplicado\n" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" msgstr "registo no ficheiro de passwords n瓊o coincidente\n" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" msgstr "utilizador %s: a 繳ltima altera癟瓊o de password foi no futuro\n" @@ -1565,17 +1498,17 @@ msgstr "%s: n瓊o 矇 poss穩vel abrir o ficheiro passwd\n" msgid "%s: can't remove shadow entry for %s\n" msgstr "%s: n瓊o 矇 poss穩vel remover o registo shadow de %s\n" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "%s: n瓊o 矇 poss穩vel actualizar o registo em passwd de %s\n" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" msgstr "%s: n瓊o 矇 poss穩vel actualizar o ficheiro shadow\n" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" msgstr "%s: n瓊o 矇 poss穩vel actualizar o ficheiro passwd\n" @@ -1585,40 +1518,40 @@ msgstr "%s: n瓊o 矇 poss穩vel actualizar o ficheiro passwd\n" msgid "%s: can't update entry for user %s\n" msgstr "%s: n瓊o 矇 poss穩vel actualizar o registo do utilizador %s\n" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format 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:133 +#: src/su.c:132 msgid "Sorry." msgstr "Desculpe." -#: src/su.c:323 +#: src/su.c:320 #, 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:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "%s: pam_start: erro %d\n" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" msgstr "Id desconhecido: %s\n" -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, c-format msgid "You are not authorized to su %s\n" msgstr "N瓊o est獺 autorizado a fazer su %s\n" -#: src/su.c:502 +#: src/su.c:495 msgid "(Enter your own password.)" msgstr "(Introduza a sua password.)" -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" @@ -1627,22 +1560,22 @@ msgstr "" "%s: %s\n" "(Ignorado)\n" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" msgstr "Sem shell\n" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr "Acesso a su para essa conta foi NEGADO.\n" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "Autentica癟瓊o por password foi ultrapassada.\n" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" msgstr "Por favor introduza a SUA password como autentica癟瓊o.\n" @@ -1657,7 +1590,7 @@ msgstr "Ficheiro de passwords n瓊o existe\n" msgid "No password entry for 'root'\n" msgstr "N瓊o est獺 definida nenhuma password para 'root'\n" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" @@ -1667,239 +1600,219 @@ 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:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" msgstr "A Entrar no Modo de Manuten癟瓊o do Sistema\n" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "%s: reconstru癟瓊o da base de dados dos grupos\n" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "%s: reconstru癟瓊o da base de dados de shadow dos grupos\n" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "%s: argumento num矇rico inv獺lido `%s'\n" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "%s: gid %s desconhecido\n" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "%s: grupo %s desconhecido\n" -#: src/useradd.c:475 +#: src/useradd.c:418 #, 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:480 +#: src/useradd.c:423 #, 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:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" msgstr "%s: renomear: %s" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s: o grupo `%s' 矇 um grupo NIS.\n" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "%s: est瓊o especificados demasiados grupos (max %d).\n" -#: src/useradd.c:721 +#: src/useradd.c:660 #, 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:724 +#: src/useradd.c:663 #, c-format msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr "" " [-d home] [-s shell] [-c coment獺rio] [-m [-k template]]\n" -#: src/useradd.c:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, c-format msgid " [-f inactive] [-e expire]\n" msgstr " [-f inactivo] [-e caduca]\n" -#: src/useradd.c:728 +#: src/useradd.c:667 #, c-format msgid " [-p passwd] name\n" msgstr " [-p passwd] nome\n" -#: src/useradd.c:730 +#: src/useradd.c:669 #, 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:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, 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:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, c-format msgid "%s: error opening group file\n" msgstr "%s: erro ao tentar abrir o ficheiro dos grupos\n" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, 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:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, 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:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "%s: uid %u n瓊o 矇 繳nico\n" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "%s: n瓊o 矇 poss穩vel obter um uid 繳nico\n" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "%s: a directoria base `%s' 矇 inv獺lida\n" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "%s: o coment獺rio `%s' 矇 inv獺lido\n" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "%s: a directoria home `%s' 矇 inv獺lida\n" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s: a data `%s' 矇 inv獺lida\n" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "%s: 矇 necess獺rio shadow passwords para -e\n" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, c-format msgid "%s: shadow passwords required for -f\n" msgstr "%s: 矇 necess獺rio shadow passwords para -f\n" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" msgstr "%s: o campo `%s' 矇 inv獺lido\n" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "%s: a shell `%s' 矇 inv獺lida\n" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "%s: o nome de utilizador '%s' 矇 inv獺lido\n" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, 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:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, 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:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, 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:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, 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:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, 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:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, 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:1459 +#: src/useradd.c:1354 #, c-format msgid "%s: error adding new password entry\n" msgstr "%s: erro ao adicionar o registo da nova password\n" -#: src/useradd.c:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "%s: erro ao actualizar o registo de passwords dbm\n" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, 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:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s: erro ao actualizar o registo da nova password de shadow dbm\n" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" msgstr "%s: n瓊o 矇 poss穩vel criar a directoria %s\n" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, 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:1590 +#: src/useradd.c:1446 #, 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:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "%s: o utilizador %s existe\n" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" @@ -1907,208 +1820,173 @@ msgstr "" "%s: o grupo %s existe - se pretende adicionar este utilizador a esse grupo, " "utilize -g.\n" -#: src/useradd.c:1767 +#: src/useradd.c:1602 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" msgstr "" "%s: aviso: CREATE_HOME n瓊o 矇 suportado, por favor em vez disso utilize -m.\n" -#: src/userdel.c:124 +#: src/userdel.c:108 #, c-format msgid "Usage: %s [-r] name\n" msgstr "Utiliza癟瓊o: %s [-r] nome\n" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" msgstr "%s: erro ao actualizar o registo do grupo\n" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "%s: n瓊o 矇 poss穩vel actualizar o registo do grupo dbm\n" - -#: src/userdel.c:214 -#, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: n瓊o 矇 poss穩vel remover o registo do grupo dbm\n" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "%s: n瓊o 矇 poss穩vel abrir o ficheiro dos grupos\n" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "%s: n瓊o 矇 poss穩vel abrir o ficheiro de shadow dos grupos\n" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "%s: erro ao apagar o registo da password\n" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "%s: erro ao apagar o registo da password de shadow\n" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "%s: erro ao apagar o registo dbm da password\n" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s: erro ao apagar o registo dbm da password de shadow\n" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "%s: o utilizador %s est獺 actualmente no sistema\n" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "%s: o %s n瓊o pertence a %s, n瓊o ser獺 removido\n" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " msgstr "%s: aviso: n瓊o 矇 poss穩vel remover " -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" msgstr "%s: o utilizador %s n瓊o existe\n" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s: o utilizador %s 矇 um utilizador NIS\n" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "" "%s: a directoria %s n瓊o ser獺 removida (iria remover a home do utilizador %" "s)\n" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "%s: erro ao remover a directoria %s\n" -#: src/usermod.c:306 +#: src/usermod.c:289 #, c-format msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "Utiliza癟瓊o: %s\t[-u uid [-o]] [-g grupo] [-G grupo,...] \n" -#: src/usermod.c:310 +#: src/usermod.c:293 #, 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:313 +#: src/usermod.c:296 #, c-format msgid "[-f inactive] [-e expire] " msgstr "[-f inactivo] [-e caduca] " -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p passwd] [-L|-U] nome\n" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" msgstr "%s: falta de mem籀ria em update_group\n" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "%s: falta de mem籀ria em update_gshadow\n" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "%s: n瓊o foram especificadas flags\n" -#: src/usermod.c:965 +#: src/usermod.c:903 #, 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:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "%s: o uid %lu n瓊o 矇 繳nico\n" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, c-format msgid "%s: error changing password entry\n" msgstr "%s: erro ao alterar o registo de password\n" -#: src/usermod.c:1122 +#: src/usermod.c:1053 #, c-format msgid "%s: error removing password entry\n" msgstr "%s: erro ao remover o registo de password\n" -#: src/usermod.c:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "%s: erro ao adicionar o registo dbm de password\n" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "%s: erro ao apagar o registo dbm de password\n" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, 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:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s: erro ao apagar o registo dbm de password de shadow\n" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "%s: a directoria %s existe\n" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "%s: n瓊o 矇 poss穩vel criar %s\n" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" msgstr "%s: n瓊o 矇 poss穩vel efectuar o chown a %s\n" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, 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:1333 +#: src/usermod.c:1223 #, 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:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" msgstr "a altera癟瓊o do dono da caixa de correio falhou" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" msgstr "falha ao renomear a caixa do correio" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" @@ -2117,20 +1995,20 @@ msgstr "" "\n" "%s: o %s n瓊o foi alterado\n" -#: src/vipw.c:133 +#: src/vipw.c:131 msgid "Couldn't lock file" msgstr "N瓊o 矇 poss穩vel obter acesso exclusivo ao ficheiro" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" msgstr "N瓊o 矇 poss穩vel efectuar c籀pia de seguran癟a" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s: n瓊o 矇 poss穩vel restaurar %s: %s (a suas altera癟繭es est瓊o em %s)\n" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo index a29f07bd..9c050e20 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 0f81a358..fc5df3ab 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6,21 +6,21 @@ msgid "" msgstr "" "Project-Id-Version: shadow\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-26 07:53+0100\n" +"POT-Creation-Date: 2005-04-25 12:28+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" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n>1;\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" msgstr "Aviso : grupo desconhecido %s\n" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" msgstr "Aviso : muitos grupos\n" @@ -48,17 +48,17 @@ msgstr " Entre em contato com o adminisrador do sistema.\n" msgid " Choose a new password.\n" msgstr " Escolha uma nova senha.\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "Sua senha ir獺 expirar em %ld dias.\n" -#: libmisc/age.c:174 +#: libmisc/age.c:172 #, c-format msgid "Your password will expire tomorrow.\n" msgstr "Sua senha ir獺 expirar amanh瓊.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:174 #, c-format msgid "Your password will expire today.\n" msgstr "Sua senha ir獺 expirar hoje.\n" @@ -73,41 +73,27 @@ msgstr "N瓊o foi poss穩vel mudar tty %s" msgid "Environment overflow\n" msgstr "Overflow de ambiente\n" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr "Voc礙 n瓊o pode mudar $%s\n" -#: libmisc/failure.c:230 +#: libmisc/failure.c:229 #, fuzzy, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "%d desde o 繳ltimo login. O 繳ltimo foi %s em %s.\n" +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "%d desde o 繳ltimo login. O 繳ltimo foi %s em %s.\n" +msgstr[1] "%d desde o 繳ltimo login. O 繳ltimo foi %s em %s.\n" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "falhas" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "falha" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" msgstr "Muitos logins.\n" -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "A senha n瓊o desencripta a chave secreta para %s.\n" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "" -"N瓊o foi poss穩vel definir a chave secreta de %s : o daemon servidor de chaves " -"est獺 em execu癟瓊o ?\n" - #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "Voc礙 possui novas mensagens." @@ -120,7 +106,7 @@ msgstr "Sem mensagens." msgid "You have mail." msgstr "Voc礙 possui mensagens." -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " msgstr "Senha ruim : %s. " @@ -135,20 +121,20 @@ msgstr "passwd : pam_start() falhou, erro %d\n" msgid "passwd: %s\n" msgstr "passwd : %s\n" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" msgstr "" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "N瓊o foi poss穩vel entrar em \"%s\"\n" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" msgstr "Sem diret籀rio pessoal, logando com HOME=/" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr "N瓊o foi poss穩vel executar %s" @@ -163,36 +149,32 @@ msgstr "Diret籀rio ra穩z \"%s\" inv獺lido\n" msgid "Can't change root directory to \"%s\"\n" msgstr "N瓊o foi poss穩vel mudar o diret籀rio ra穩z para \"%s\"\n" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "malloc(%d) falhou\n" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" msgstr "N瓊o foi poss穩vel alocar espa癟o para a informa癟瓊o de configura癟瓊o.\n" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "" "erro de configura癟瓊o - item '%s' desconhecido (notifique o administrador)\n" -#: lib/pwauth.c:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "Senha : " -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "Senha de %s : " -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "(Echo ligado) " - -#: src/chage.c:118 +#: src/chage.c:112 #, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" @@ -201,154 +183,147 @@ msgstr "" "Uso : chage [-l] [-m m穩nimo_dias] [-M m獺ximo_dias] [-W aviso]\n" " [-I inativo] [-E expira] [-d 繳ltimo_dia] usu獺rio\n" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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:155 +#: src/chage.c:149 msgid "Minimum Password Age" msgstr "Idade M穩nima da Senha" -#: src/chage.c:161 +#: src/chage.c:155 msgid "Maximum Password Age" msgstr "Idade M獺xima da Senha" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" msgstr "ltima Mudan癟a de Senha (YYYY-MM-DD)" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" msgstr "Aviso de Expira癟瓊o de Senha" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "Senha Inativa" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Data de Expira癟瓊o de Senha (YYYY-MM-DD)" -#: src/chage.c:238 +#: src/chage.c:231 #, fuzzy, c-format msgid "Last password change\t\t\t\t\t: " msgstr "ltima Mudan癟a de Senha (YYYY-MM-DD)" -#: src/chage.c:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 #, fuzzy, c-format msgid "never\n" msgstr "Nunca\n" -#: src/chage.c:251 +#: src/chage.c:244 #, fuzzy, c-format msgid "Password expires\t\t\t\t\t: " msgstr "Senha Expira :\t" -#: src/chage.c:267 +#: src/chage.c:260 #, fuzzy, c-format msgid "Password inactive\t\t\t\t\t: " msgstr "Senha Inativa :\t" -#: src/chage.c:281 +#: src/chage.c:274 #, fuzzy, c-format msgid "Account expires\t\t\t\t\t\t: " msgstr "Conta Expira :\t" -#: src/chage.c:297 +#: src/chage.c:290 #, c-format msgid "Minimum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:298 +#: src/chage.c:292 #, 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:299 +#: src/chage.c:294 #, c-format msgid "Number of days of warning before password expires\t: %ld\n" msgstr "" -#: src/chage.c:444 +#: src/chage.c:431 #, 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:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 #, fuzzy, c-format msgid "%s: permission denied.\n" msgstr "%s : permiss瓊o negada\n" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 #, c-format msgid "%s: PAM authentication failed\n" msgstr "%s : autentica癟瓊o PAM falhou\n" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, 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:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "%s : usu獺rio %s desconhecido\n" -#: src/chage.c:535 +#: src/chage.c:519 #, c-format msgid "%s: can't lock shadow password file" msgstr "%s : n瓊o foi poss穩vel obter lock em arquivos de senhas shadow" -#: src/chage.c:543 +#: src/chage.c:527 #, c-format msgid "%s: can't open shadow password file" msgstr "%s : n瓊o foi poss穩vel abrir arquivo de senhas shadow" -#: src/chage.c:604 +#: src/chage.c:587 #, c-format msgid "Changing the aging information for %s\n" msgstr "Mudando a informa癟瓊o de idade para %s\n" -#: src/chage.c:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" msgstr "%s : erro modificando campos\n" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, 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:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, 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:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "Erro atualizando a entrada de senha DBM.\n" - -#: src/chage.c:692 +#: src/chage.c:649 #, 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:740 +#: src/chage.c:693 #, 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:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 #, c-format msgid "%s: PAM chauthtok failed\n" msgstr "%s : chauthok PAM falhou\n" @@ -369,119 +344,124 @@ msgstr "" "Uso : %s [-f nome_completo] [-r n繳mero_sala] [-w fone_rabalho] [-h " "fone_dom矇stico]\n" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "Nome Completo" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "\tNome Completo : %s\n" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "N繳mero da Sala" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "Fone de Trabalho" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" msgstr "Fone Dom矇stico" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "Outro" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s : N瓊o foi poss穩vel determinar seu nome de usu獺rio.\n" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s : n瓊o foi poss穩vel mudar o usu獺rio `%s' no cliente NIS.\n" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "%s : `%s' 矇 o mestre NIS para este cliente.\n" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, fuzzy, c-format +msgid "%s: Permission denied.\n" +msgstr "%s : permiss瓊o negada\n" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" msgstr "Modificando as informa癟繭es de usu獺rio para %s\n" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s : nome inv獺lido : \"%s\"\n" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s : n繳mero de sala inv獺lido : \"%s\"\n" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s : fone de trabalho inv獺lido : \"%s\"\n" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s : fone dom矇stico inv獺lido : \"%s\"\n" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s : \"%s\" cont矇m caracteres ilegais\n" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "%s : campos muito extensos\n" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" msgstr "N瓊o foi poss穩vel mudar o ID para root.\n" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" msgstr "" "N瓊o foi poss穩vel fazer local em arquivo de senhas; tente novamente mais " "tarde.\n" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" msgstr "N瓊o foi poss穩vel abrir arquivo de senhas.\n" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s : %s n瓊o encontrado em /etc/passwd\n" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" msgstr "Erro atualizando a entrada de senha.\n" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" msgstr "N瓊o foi poss穩vel gravar as mudan癟as no arquivo de senhas.\n" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" msgstr "N瓊o foi poss穩vel remover o locak do arquivo de senhas.\n" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -498,48 +478,48 @@ msgstr "" msgid "%s: can't lock password file\n" msgstr "%s : n瓊o foi poss穩vel obter lock em arquivo de senhas\n" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "%s : nao foi poss穩vel obter lock em arquivo shadow\n" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "%s : n瓊o foi poss穩vel abrir arquivo shadow\n" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "%s : linha %d : linha muito extensa\n" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "%s : linha %d : nova senha faltando\n" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "%s : linha %d : usu獺rio %s desconhecido\n" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "%s : linha %d : n瓊o foi poss穩vel atualizar entrada de senha\n" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "%s : erro detectado, mudan癟as ignoradas\n" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" msgstr "%s : erro atualizando arquivo shadow\n" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" msgstr "%s : erro atualizando arquivo de senhas\n" @@ -549,26 +529,26 @@ msgstr "%s : erro atualizando arquivo de senhas\n" msgid "Usage: %s [-s shell] [name]\n" msgstr "Uso : %s [-s shell] [nome]\n" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" msgstr "Shell de Login" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" msgstr "Voc礙 n瓊o pode mudar o shell para %s.\n" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" msgstr "Mudando o shell de login para %s\n" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s : Entrada inv獺lida : %s\n" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" msgstr "%s 矇 um shell inv獺lido.\n" @@ -578,12 +558,12 @@ msgstr "%s 矇 um shell inv獺lido.\n" msgid "Usage: expiry {-f|-c}\n" msgstr "Uso : expiry {-f|-c}\n" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" msgstr "%s : AVISO ! Deve ser set-UID root !\n" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "%s : usu獺rio desconhecido\n" @@ -597,320 +577,285 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" msgstr "" -#: src/faillog.c:86 +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" -msgstr "Nome de Usu獺rio Falhas M獺ximo ltimo\n" +msgid "Login Failures Maximum Latest On\n" +msgstr "" -#: src/faillog.c:103 -#, c-format -msgid " %s on %s" -msgstr " %s em %s" - -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" msgstr " [%lds restante]" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr " [%lds lock]" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "Usu獺rio Desconhecido : %s\n" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "Uso : %s [-r|-R] grupo\n" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr " %s [-a usu獺rio] grupo\n" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr " %s [-d usu獺rio] grupo\n" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr " %s [-A usu獺rio,...] [-M usu獺rio,...] grupo\n" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr " %s [-M usu獺rio,...] grupo\n" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" msgstr "%s : senhas de grupo shadow requeridas para -A\n" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "Quem 矇 voc礙 ?\n" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr "grupo desconhecido : %s\n" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "Adicionando usu獺rio %s ao grupo %s\n" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "Removendo usu獺rio %s do grupo %s\n" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" msgstr "%s : membro %s desconecido\n" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "%s : N瓊o 矇 um tty\n" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "Mudando a senha para o grupo %s\n" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "Nova Senha : " -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " msgstr "Informe a nova senha novamente : " -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" msgstr "As senhas n瓊o s瓊o iguais; tente novamente" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" msgstr "%s : Tente novamente mais tarde\n" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "%s : n瓊o foi poss穩vel obter lock\n" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" msgstr "%s : n繭 foi poss穩vel obter lock shadow\n" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "%s : n瓊o foi poss穩vel abrir arquivo\n" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "%s : n瓊o foi poss穩vel atualizar entrada\n" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" msgstr "%s : n瓊o foi poss穩vel atualizar entrada shadow\n" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "%s : n瓊o foi poss穩vel regravar arquivo\n" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" msgstr "%s : n瓊o foi poss穩vel regravar arquivo shadow\n" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "%s : n瓊o foi poss穩vel remover o lock do arquivo\n" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "%s : n瓊o foi poss穩vel atualizar arquivos DBM\n" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "%s : n瓊o foi poss穩vel atualizar arquivos shadow DBM\n" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "Uso : groupadd [-g gid [-o]] [-f] grupo\n" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, c-format msgid "%s: error adding new group entry\n" msgstr "%s : erro adicionando nova entrada de grupo\n" -#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "%s : n瓊o foi poss穩vel adicionar nova entrada de grupo dbm\n" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "%s : o nome %s n瓊o 矇 繳nico\n" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" msgstr "%s : o gid %u n瓊o 矇 繳nico\n" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "%s : n瓊o foi poss穩vel obter gid 繳nico\n" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, c-format 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:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "%s : grupo %s inv獺lido\n" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "%s : -O requer NOME=VALOR\n" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s : n瓊o foi poss穩vel regravar arquivo de grupo\n" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s : n瓊o foi poss穩vel regravar arquivo de grupo shadow\n" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" msgstr "%s : n瓊o foi poss穩vel obter lock em arquivo de grupo\n" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" msgstr "%s : n瓊o foi poss穩vel abrir arquivo de grupo\n" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" msgstr "%s : n瓊o foi poss穩vel obter lock em arquivo de grupo shadow\n" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" msgstr "%s : n瓊o foi poss穩vel abrir arquivo de grupo shadow\n" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "%s : grupo %s existe\n" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, c-format msgid "Usage: groupdel group\n" msgstr "Uso : groupdel grupo\n" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" msgstr "%s : erro removendo entrada de grupo\n" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "%s : erro removendo entrada de grupo dbm\n" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "%s : erro removendo entrada de grupo shadow\n" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "%s : erro removendo entrada de grupo shadow dbm\n" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "%s : n瓊o foi poss穩vel remover grupo prim獺rio do usu獺rio.\n" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "%s : grupo %s n瓊o existe\n" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "%s : grupo %s 矇 um grupo NIS\n" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s : %s 矇 o mestre NIS\n" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "Uso : groupmod [-g gid [-o]] [-n nome] grupo\n" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "%s : %s n瓊o encontrado em /etc/group\n" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s : n瓊o foi poss穩vel adicionar nova entrada de grupo shadow dbm\n" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s : %u n瓊o 矇 um gid 繳nico\n" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "%s : %s n瓊o 矇 um nome 繳nico\n" @@ -920,110 +865,105 @@ msgstr "%s : %s n瓊o 矇 um nome 繳nico\n" msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "Uso : %s [-r] [-s] [grupo [gshadow]]\n" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "Uso : %s [-r] [-s] [grupo]\n" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "N瓊o" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" msgstr "%s : -s e -r s瓊o incompat穩veis\n" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "%s : n瓊o foi poss穩vel obter lock no arquivo %s\n" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "%s : n瓊o foi poss穩vel abrir arquivo %s\n" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" msgstr "entrada inv獺lida no arquivo de grupo\n" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "remover a linha `%s' ? " -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" msgstr "entrada de grupo duplicada\n" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" msgstr "nome de grupo `%s' inv獺lido\n" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "grupo %s : nenhum usu獺rio %s\n" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " msgstr "remover membro `%s' ? " -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" msgstr "entrada inv獺lida no arquivo de grupo shadow\n" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" msgstr "entrada de grupo shadow duplicada\n" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" msgstr "entrada no arquivo de grupo n瓊o casa\n" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" msgstr "grupo shadow %s : nenhum usu獺rio administrativo %s\n" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " msgstr "remover membro administrativo `%s' ? " -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" msgstr "grupo shadow %s : nenhum usu獺rio %s\n" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "%s : n瓊o foi poss穩vel atualizar arquivo %s\n" -#: src/grpck.c:647 src/pwck.c:612 -#, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s : os arquivos foram atualizados; execute mkpasswd\n" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format -msgid "%s: no changes\n" -msgstr "%s : nenhuma mudan癟a\n" - -#: src/grpck.c:651 src/pwck.c:616 +#: src/grpck.c:640 src/pwck.c:606 #, c-format msgid "%s: the files have been updated\n" msgstr "%s : os arquivos foram atualizados\n" +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "%s : nenhuma mudan癟a\n" + #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" @@ -1039,37 +979,37 @@ msgstr "%s : n瓊o foi poss穩vel abrir arquivo de grupo\n" msgid "%s: can't lock shadow group file\n" msgstr "%s : n瓊o foi poss穩vel obter lock em arquivo de grupo shadow\n" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" msgstr "%s : n瓊o foi poss穩vel abrir arquivo de grupo shadow\n" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "%s : n瓊o foi poss穩vel remover grupo shadow %s\n" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "%s : n瓊o foi poss穩vel atualizar entrada shadow para %s\n" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "%s : n瓊o foi poss穩vel atualizar entrada para grupo %s\n" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" msgstr "%s : n瓊o foi poss穩vel atualizar arquivo de grupo shadow\n" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" msgstr "%s : n瓊o foi poss穩vel atualizar arquivo de grupo\n" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "%s : n瓊o foi poss穩vel remover arquivo de grupo shadow\n" @@ -1089,52 +1029,52 @@ msgstr "Uso : id\n" msgid " groups=" msgstr " grupos=" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" msgstr "Nome de Usu獺rio Porta De ltimo\n" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "Nome de Usu獺rio Porta ltimo\n" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "**Nunca logou**" -#: src/login.c:175 +#: src/login.c:156 #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Uso : %s [-p] [nome]\n" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr " %s [-p] [-h host] [-f nome]\n" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr " %s [-p] -r host\n" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" msgstr "Hora de login inv獺lida\n" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" @@ -1143,7 +1083,7 @@ msgstr "" "\n" "Sistema fechado para manuten癟瓊o de rotina\n" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" @@ -1152,7 +1092,7 @@ msgstr "" "\n" "[Disconex瓊o contornada -- login de root permitido.]\n" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" @@ -1161,17 +1101,17 @@ msgstr "" "\n" "Login falhou ap籀s %d segundos de espera.\n" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" msgstr " em `%.100s' de `%.200s'" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" msgstr " em `%.100s'" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" @@ -1180,38 +1120,29 @@ msgstr "" "\n" "%s login : " -#: src/login.c:819 -msgid "login: " -msgstr "login : " - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" msgstr "Login incorreto" -#: src/login.c:1198 +#: src/login.c:996 msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "Aviso : login rehabilitado ap籀s travamento tempor獺rio.\n" -#: src/login.c:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "ltimo login : %s em %s" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" msgstr "ltimo login : %.19s em %s" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" msgstr " de %.*s" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "Iniciando rad_login\n" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" @@ -1252,17 +1183,17 @@ msgstr "%s : erro adicionando registro para " msgid "added %d entries, longest was %d\n" msgstr "adicionadas %d entradas. a maior foi %d\n" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "Uso : %s [-vf] [-p|g|sp|sg] arquivo\n" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "Uso : %s [-vf] [-p|g|sp] arquivo\n" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "Uso : %s [-vf] [-p|g] arquivo\n" @@ -1282,16 +1213,16 @@ msgstr "Uso : sg group [[-c] comando]\n" msgid "unknown uid: %u\n" msgstr "uid desconhecido : %u\n" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" msgstr "gid desconhecido : %lu\n" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "Desculpe.\n" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "muitos grupos\n" @@ -1301,92 +1232,92 @@ msgstr "muitos grupos\n" msgid "Usage: %s [input]\n" msgstr "Uso : %s [entrada]\n" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "%s : n瓊o foi poss穩vel obter de /etc/passwd.\n" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "" "%s : n瓊o foi poss穩vel obter lock de arquivos, tente novamente mais tarde\n" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "%s : n瓊o foi poss穩vel abrir arquivos\n" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "%s : linha %d : linha inv獺lida\n" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "%s : linha %d : n瓊o foi poss穩vel criar GID\n" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "%s : linha %d : n瓊o foi poss穩vel criar UID\n" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "%s : linha %d : n瓊o foi poss穩vel encontrar usu獺rio %s\n" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "%s : linha %d : n瓊o foi poss穩vel atualizar a senha\n" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "%s : linha %d : mkdir falhou\n" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "%s : linha %d : chown falhou\n" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "%s : linha %d : n瓊o foi poss穩vel atualizar entrada\n" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "%s : erro atualizando arquivos\n" -#: src/passwd.c:155 +#: src/passwd.c:154 #, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "Uso : %s [-f|-s] [nome]\n" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr " %s [-x m獺ximo] [-n m穩nimo] [-w aviso] [-i inativo] nome\n" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} nome\n" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "Senha antiga : " -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" msgstr "Senha incorreta para `%s'\n" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" @@ -1396,16 +1327,16 @@ msgstr "" "Por favor, use uma combina癟瓊o de letras em mai繳sculas e min繳sculas \n" "e de n繳meros.\n" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "Nova senha : " -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" msgstr "Tente novamente.\n" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" @@ -1414,52 +1345,52 @@ msgstr "" "\n" "Aviso : senha fraca (informe-a novamente para us獺-la de qualquer forma).\n" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" msgstr "As senhas n瓊o s瓊o iguais; tente novamente.\n" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "A senha para %s n瓊o pode ser modificada.\n" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" msgstr "Desculpe, a senha para %s ainda n瓊o pode ser modificada.\n" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "%s : sem mem籀ria\n" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "%s : N瓊o foi poss穩vel executar %s" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" msgstr "%s : reposit籀rio %s n瓊o suportado\n" -#: src/passwd.c:914 +#: src/passwd.c:884 #, fuzzy, c-format -msgid "You may not change the password for %s.\n" +msgid "%s: You may not view or modify password information for %s.\n" msgstr "Voc礙 n瓊o pode mudar o shell para %s.\n" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "Modificando a senha para %s\n" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "A senha para %s n瓊o foi modificada.\n" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "Senha modificada.\n" @@ -1474,49 +1405,49 @@ msgstr "Uso : %s [-q] [-r] [-s] [passwd [shadow]]\n" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "Uso : %s [-q] [-r] [-s] [passwd]\n" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" msgstr "entrada de arquivo de senha inv獺lida\n" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" msgstr "entrada de senha duplicada\n" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" msgstr "nome de usu獺rio '%s' inv獺lido\n" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "usu獺rio %s : nenhum grupo %u\n" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "usu獺rio %s : diret籀rio %s n瓊o existe\n" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "usu獺rio %s : programa %s n瓊o existe\n" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" msgstr "entrada de arquivos de senhas shadow inv獺lida\n" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" msgstr "entrada de senha shadow inv獺lida\n" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" msgstr "entrada de arquivo de senha n瓊o casa\n" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" msgstr "usu獺rio %s : 繳ltima mudan癟a de senha no futuro\n" @@ -1536,17 +1467,17 @@ msgstr "%s : n瓊o foi poss穩vel abrir arquivo passwd.\n" msgid "%s: can't remove shadow entry for %s\n" msgstr "%s : n瓊o foi poss穩vel remover entrada shadow para %s\n" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "%s : n瓊o foi poss穩vel atualizar entrada passwd para %s\n" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" msgstr "%s : n瓊o foi poss穩vel atualizar arquivo shadow\n" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" msgstr "%s : n瓊o foi poss穩vel atualizar arquivo passwd\n" @@ -1556,40 +1487,40 @@ msgstr "%s : n瓊o foi poss穩vel atualizar arquivo passwd\n" msgid "%s: can't update entry for user %s\n" msgstr "%s : n瓊o foi poss穩vel atualizar entrada para usu獺rio %s\n" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format 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:133 +#: src/su.c:132 msgid "Sorry." msgstr "Desculpe." -#: src/su.c:323 +#: src/su.c:320 #, 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:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "%s : pam_start : erro %d\n" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" msgstr "Id desconhecido : %s\n" -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, 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:502 +#: src/su.c:495 msgid "(Enter your own password.)" msgstr "{Informe sua pr籀pria senha.)" -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" @@ -1598,22 +1529,22 @@ msgstr "" "%s : %s\n" "(Ignorado)\n" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" msgstr "Sem shell\n" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr "Acesso ao su para esta conta NEGADO.\n" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "Autentica癟瓊o por senha contornada.\n" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" msgstr "Por favor, informe sua PRPRIA senha como autentica癟瓊o.\n" @@ -1628,7 +1559,7 @@ msgstr "Sem arquivo de senhas\n" msgid "No password entry for 'root'\n" msgstr "Nenhuma entrada de senha para 'root'\n" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" @@ -1638,234 +1569,214 @@ 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:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" msgstr "Entrando em Modo de Manuten癟瓊o do Sistema\n" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "%s : reconstrua a base de dados de grupos\n" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "%s : recosntrua a base de dados de grupos shadow\n" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "%s : argumento num矇rico `%s' inv獺lido\n" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "%s : gid %s desconhecido\n" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "%s : grupo %s desconhecido\n" -#: src/useradd.c:475 +#: src/useradd.c:418 #, 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:480 +#: src/useradd.c:423 #, 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:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" msgstr "%s : rename : %s" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s : grupo `%s' 矇 um grupo NIS.\n" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "%s : muitos grupos especificados *m獺imo %d).\n" -#: src/useradd.c:721 +#: src/useradd.c:660 #, 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:724 +#: src/useradd.c:663 #, c-format msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr "" " [-d home] [-s shell] [-c coment獺rio] [-m [-k template]]\n" -#: src/useradd.c:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, c-format msgid " [-f inactive] [-e expire]\n" msgstr " [-f inativo] [-e expira ]\n" -#: src/useradd.c:728 +#: src/useradd.c:667 #, c-format msgid " [-p passwd] name\n" msgstr " [-p passwd] nome\n" -#: src/useradd.c:730 +#: src/useradd.c:669 #, 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:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, c-format msgid "%s: error locking group file\n" msgstr "%s : erro obtendo lock em arquivo de grupo\n" -#: src/useradd.c:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, c-format msgid "%s: error opening group file\n" msgstr "%s : erro abrindo arquivo de grupo\n" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, c-format msgid "%s: error locking shadow group file\n" msgstr "%s : erro obtendo lock em arquivo de grupo shadow\n" -#: src/useradd.c:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, c-format msgid "%s: error opening shadow group file\n" msgstr "%s : erro abrindo arquivo de grupo shadow\n" -#: src/useradd.c:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "%s : o uid %u n瓊o 矇 繳nico\n" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "%s : n瓊o foi poss穩vel obter uid 繳nico\n" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "%s : diret籀rio base `%s'inv獺lido\n" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "%s : coment獺rio `%s' inv獺lido\n" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "%s : diret籀rio home `%s' inv獺lido\n" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s : data `%s' inv獺lida\n" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "%s : senhas shadow necess獺rias para -e\n" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, c-format msgid "%s: shadow passwords required for -f\n" msgstr "%s : senhas shadow necess獺rias para -f\n" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" msgstr "%s : campo `%s' inv獺lido\n" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "%s : shell `%s' inv獺lida\n" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "%s : nome de usu獺rio '%s' inv獺lido\n" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "%s : n瓊o foi poss穩vel reescrever arquivo de senhas\n" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, 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:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, 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:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, 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:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, 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:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, 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:1459 +#: src/useradd.c:1354 #, c-format msgid "%s: error adding new password entry\n" msgstr "%s : erro adicionando nova entrada de senha\n" -#: src/useradd.c:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "%s : erro atualizando entrada de senha dbm\n" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, c-format msgid "%s: error adding new shadow password entry\n" msgstr "%s : erro adicionando nova entrada de senha shadow\n" -#: src/useradd.c:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s : erro atualizando entrada de senha shadow dbm\n" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" msgstr "%s : n瓊o foi poss穩vel criar diret籀rio %s\n" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, c-format msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n" msgstr "" -#: src/useradd.c:1590 +#: src/useradd.c:1446 #, 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:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "%s : usu獺rio %s existe\n" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" @@ -1873,205 +1784,170 @@ msgstr "" "%s : grupo %s existe - caso voc礙 ueira adicionar esse usu獺rio a esse \n" "grupo, utilize -g.\n" -#: src/useradd.c:1767 +#: src/useradd.c:1602 #, 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" -#: src/userdel.c:124 +#: src/userdel.c:108 #, c-format msgid "Usage: %s [-r] name\n" msgstr "Uso : %s [-r] nome\n" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" msgstr "%s : erro atualizando entrada de grupo\n" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "%s : n瓊o foi poss穩vel atualizar entrada de grupo dbm\n" - -#: src/userdel.c:214 -#, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "%s : n瓊o foi poss穩vel remover entrada de grupo dbm\n" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "%s : n瓊o foi poss穩vel abrir arquivo de grupo\n" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "%s : n瓊o foi poss穩vel abrir arquivo de grupo shadow\n" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "%s : erro removendo entrada de senha\n" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "%s : erro removendo entrada de senha shadow\n" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "%s : erro removendo entrada de senha dbm\n" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s : erro removendo entrada de senha shadow dbm\n" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "%s : o usu獺rio %s est獺 logado no momento\n" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "%s : %s n瓊o 矇 propriedade de %s, n瓊o removendo\n" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " msgstr "%s : aviso : n瓊o foi poss穩vel remover " -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" msgstr "%s : usu獺rio %s n瓊o existe\n" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s : usu獺rio %s 矇 um usu獺rio NIS\n" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "%s : n瓊o removendo diret籀rio %s (removeria o home do usu獺rio %s)\n" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "%s : erro removendo diret籀rio %s\n" -#: src/usermod.c:306 +#: src/usermod.c:289 #, c-format msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "Uso : %s\t[-u uid [-o]] [-g grupo] [-G grupo,...] \n" -#: src/usermod.c:310 +#: src/usermod.c:293 #, 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:313 +#: src/usermod.c:296 #, c-format msgid "[-f inactive] [-e expire] " msgstr "[-f inativo] [-e expira] " -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p passwd] [-L|-U] nome\n" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" msgstr "%s : sem mem籀ria em update_group\n" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "%s : sem mem籀ria em update_gshadow\n" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "%s : nenhuma flag informada\n" -#: src/usermod.c:965 +#: src/usermod.c:903 #, 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:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "%s : o uid %lu n瓊o 矇 繳nico\n" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, c-format msgid "%s: error changing password entry\n" msgstr "%s : erro modificando entrada de senha\n" -#: src/usermod.c:1122 +#: src/usermod.c:1053 #, c-format msgid "%s: error removing password entry\n" msgstr "%s : erro removendo entrada de senha\n" -#: src/usermod.c:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "%s : erro adicionando entrada de senha dbm\n" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "%s : erro removendo entrada passwd dbm\n" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "%s erro removendo entrada de senha shadow\n" -#: src/usermod.c:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s : erro removendo entrada de passwd shadow dbm\n" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "%s : diret籀rio %s existe\n" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "%s : n瓊o foi poss穩vel criar %s\n" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" msgstr "%s : n瓊o foi poss穩vel executar chown %s\n" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, 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:1333 +#: src/usermod.c:1223 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "%s : aviso : %s n瓊o 矇 propriedade de %s\n" -#: src/usermod.c:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" msgstr "falha au mudar o dono da caixa-postal" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" msgstr "falha ao renomear caixa-postal" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" @@ -2080,20 +1956,20 @@ msgstr "" "\n" "%s : %s n瓊o foi modificado\n" -#: src/vipw.c:133 +#: src/vipw.c:131 msgid "Couldn't lock file" msgstr "N瓊o foi poss穩vel obter lock em arquivo" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" msgstr "N瓊o foi poss穩vel fazer backup" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s : n瓊o foi poss穩vel restaurar %s : %s (suas mudan癟as est瓊o em %s)\n" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/po/ro.gmo b/po/ro.gmo index af81b7e2..b4434f91 100644 Binary files a/po/ro.gmo and b/po/ro.gmo differ diff --git a/po/ro.po b/po/ro.po index 63092522..3bf1c0dc 100644 --- a/po/ro.po +++ b/po/ro.po @@ -8,14 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: ro\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-26 07:53+0100\n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" "PO-Revision-Date: 2004-12-14 18:17+0200\n" "Last-Translator: Sorin Batariuc \n" "Language-Team: Romanian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n>1\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.3.1\n" #: libmisc/addgrps.c:56 @@ -23,7 +23,7 @@ msgstr "" msgid "Warning: unknown group %s\n" msgstr "Avertisment: grup necunoscut %s\n" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" msgstr "Avertisment: prea multe grupuri\n" @@ -51,17 +51,17 @@ msgstr " Contacta籟i administratorul de sistem.\n" msgid " Choose a new password.\n" msgstr " Alege籟i o parol nou.\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "Parola v va expira 簾n %ld zile.\n" -#: libmisc/age.c:174 +#: libmisc/age.c:172 #, c-format msgid "Your password will expire tomorrow.\n" msgstr "Parola v va expira m璽ine.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:174 #, c-format msgid "Your password will expire today.\n" msgstr "Parola v va expira azi.\n" @@ -76,39 +76,29 @@ msgstr "Nu pot schimba tty %s" msgid "Environment overflow\n" msgstr "Inunda籟ie de mediu\n" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr "Nu pute籟i schimba $%s\n" -#: libmisc/failure.c:230 +#: libmisc/failure.c:229 #, fuzzy, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "%d euare de la ultima autentificare. Ultima oar a fost %s 簾n %s.\n" +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "" +"%d euare de la ultima autentificare. Ultima oar a fost %s 簾n %s.\n" +msgstr[1] "" +"%d euare de la ultima autentificare. Ultima oar a fost %s 簾n %s.\n" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" msgstr "Prea multe autentificri.\n" -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "Parola nu decripteaz cheia secret pentru %s.\n" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "Nu pot atribui cheia secret pentru %s: demonul keyserv este pornit?\n" - #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "Ave籟i mesaje noi." @@ -121,7 +111,7 @@ msgstr "N-ave籟i mesaje." msgid "You have mail." msgstr "Ave籟i mesaje." -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " msgstr "Parol incorect: %s. " @@ -136,20 +126,20 @@ msgstr "passwd: euare pam_start(), eroare %d\n" msgid "passwd: %s\n" msgstr "passwd: %s\n" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" msgstr "" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "Nu pot schimba directorul ctre \"%s\"\n" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" msgstr "Fr director personal, autentificat cu HOME=/" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr "Nu pot executa %s" @@ -164,36 +154,32 @@ msgstr "Director rdcin invalid \"%s\"\n" msgid "Can't change root directory to \"%s\"\n" msgstr "Nu pot schimba directorul rdcin la \"%s\"\n" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "euare malloc(%d)\n" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" msgstr "Nu pot aloca spa籟iu pentru informa籟iile despre configurare.\n" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "" "eroare de configurare - articol necunoscut '%s' (anun籟a籟i administratorul)\n" -#: lib/pwauth.c:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "Parola: " -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "Parola %s: " -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "(Ecou activat) " - -#: src/chage.c:118 +#: src/chage.c:112 #, fuzzy, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" @@ -202,154 +188,147 @@ msgstr "" "Utilizare: %s [-l] [-m min_zile] [-M max_zile] [-W avertiza]\n" "\t[-I inactiv] [-E expir] [-d ultima_zi] utilizator\n" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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:155 +#: src/chage.c:149 msgid "Minimum Password Age" msgstr "V璽rsta minim a parolei" -#: src/chage.c:161 +#: src/chage.c:155 msgid "Maximum Password Age" msgstr "V璽rsta maxim a parolei" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" msgstr "Ultima schimbare de parol (AAAA-LL-ZZ)" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" msgstr "Avertisment de expirare a parolei" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "Parol inactiv" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Data expirrii contului (AAAA-LL-ZZ)" -#: src/chage.c:238 +#: src/chage.c:231 #, fuzzy, c-format msgid "Last password change\t\t\t\t\t: " msgstr "Ultima schimbare de parol (AAAA-LL-ZZ)" -#: src/chage.c:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 #, fuzzy, c-format msgid "never\n" msgstr "Niciodat\n" -#: src/chage.c:251 +#: src/chage.c:244 #, fuzzy, c-format msgid "Password expires\t\t\t\t\t: " msgstr "Parola expir:\t" -#: src/chage.c:267 +#: src/chage.c:260 #, fuzzy, c-format msgid "Password inactive\t\t\t\t\t: " msgstr "Parol inactiv:\t" -#: src/chage.c:281 +#: src/chage.c:274 #, fuzzy, c-format msgid "Account expires\t\t\t\t\t\t: " msgstr "Contul expir:\t" -#: src/chage.c:297 +#: src/chage.c:290 #, c-format msgid "Minimum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:298 +#: src/chage.c:292 #, fuzzy, c-format msgid "Maximum number of days between password change\t\t: %ld\n" msgstr "Numrul maxim de 簾ncercri a fost atins (%d)\n" -#: src/chage.c:299 +#: src/chage.c:294 #, c-format msgid "Number of days of warning before password expires\t: %ld\n" msgstr "" -#: src/chage.c:444 +#: src/chage.c:431 #, c-format msgid "%s: do not include \"l\" with other flags\n" msgstr "%s: nu include \"l\" cu alte semnalizatoare\n" -#: src/chage.c:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 #, fuzzy, c-format msgid "%s: permission denied.\n" msgstr "%s: permisiune refuzat\n" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 #, c-format msgid "%s: PAM authentication failed\n" msgstr "%s: autentificare PAM euat\n" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, c-format msgid "%s: can't open password file\n" msgstr "%s; nu pot deschide fiierul de conturi utilizatori\n" -#: src/chage.c:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "%s: utilizator necunoscut %s\n" -#: src/chage.c:535 +#: src/chage.c:519 #, c-format msgid "%s: can't lock shadow password file" msgstr "%s nu pot 簾ncuia fiierul de parole criptate" -#: src/chage.c:543 +#: src/chage.c:527 #, c-format msgid "%s: can't open shadow password file" msgstr "%s: nu pot deschide fiierul de parole criptate" -#: src/chage.c:604 +#: src/chage.c:587 #, c-format msgid "Changing the aging information for %s\n" msgstr "Modific informa籟ia de temporalitate pentru %s\n" -#: src/chage.c:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" msgstr "%s: eroare la modificarea c璽mpurilor\n" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, c-format msgid "%s: can't update password file\n" msgstr "%s: nu pot actualiza fiierul de conturi utilizatori\n" -#: src/chage.c:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" msgstr "%s: nu pot actualiza fiierul de parole criptate\n" -#: src/chage.c:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "Eroare la actualizarea intrrii contului utilizator DBM.\n" - -#: src/chage.c:692 +#: src/chage.c:649 #, c-format msgid "%s: can't rewrite shadow password file\n" msgstr "%s: nu pot rescrie fiierul de parole criptate\n" -#: src/chage.c:740 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite password file\n" msgstr "%s: nu pot rescrie fiierul de conturi utilizatori\n" -#: src/chage.c:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 #, c-format msgid "%s: PAM chauthtok failed\n" msgstr "%s: euare chauthtok PAM\n" @@ -370,117 +349,122 @@ msgstr "" "Utilizare: %s [-f nume_complet] [-r nr_camer] [-w cale_lucru] [-h " "cale_acas]\n" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "Nume complet" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "\tNume complet: %s\n" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "Numr camer" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "Telefon birou" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" msgstr "Telefon acas" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "Altele" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s: Nu v pot determina numele de utilizator.\n" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s: nu pot schimba utilizatorul `%s' pe un client NIS.\n" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "%s: `%s' este stp璽nul NIS pentru acest client.\n" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, fuzzy, c-format +msgid "%s: Permission denied.\n" +msgstr "%s: permisiune refuzat\n" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" msgstr "Modificare informa籟ii utilizator pentru %s\n" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s: nume nevalid: \"%s\"\n" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s: numr de camer nevalid: \"%s\"\n" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s: numr telefon de birou nevalid: \"%s\"\n" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s: numr telefon acas nevalid: \"%s\"\n" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s: \"%s\" con籟ine caractere ilegale\n" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "%s: c璽mpuri prea lungi\n" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" msgstr "Nu pot schimba identificatorul la root.\n" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" msgstr "Nu pot 簾ncuia fiierul de conturi utilizatori; 簾ncerca籟i mai t璽rziu.\n" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" msgstr "Nu pot deschide fiierul de conturi utilizatori.\n" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s: nu s-a gsit %s 簾n /etc/passwd\n" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" msgstr "Eroare la actualizarea intrrii contului utilizator.\n" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" msgstr "Nu pot face modificrile 簾n fiierul de conturi utilizatori.\n" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" msgstr "Nu pot descuia fiierul de conturi utilizatori.\n" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -504,48 +488,48 @@ msgstr "" msgid "%s: can't lock password file\n" msgstr "%s: nu pot 簾ncuia fiierul de conturi utilizator\n" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "%s: nu pot 簾nchide fiierul de parole criptate\n" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "%s: nu pot deschide fiierul de parole criptate\n" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "%s: linia %d: linie prea lung\n" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "%s: linia %d: lipsete noua parol\n" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "%s: linia %d: utilizator necunoscut %s\n" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "%s: linia %d: nu pot actualiza intrarea contului utilizator\n" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "%s: detectat o eroare, schimbrile sunt ignorate\n" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" msgstr "%s: eroare la actualizarea fiierului de parole criptate\n" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" msgstr "%s: eroare la actualizarea fiierului de conturi utilizatori\n" @@ -555,26 +539,26 @@ msgstr "%s: eroare la actualizarea fiierului de conturi utilizatori\n" msgid "Usage: %s [-s shell] [name]\n" msgstr "Utilizare: %s [-s consol] [nume]\n" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" msgstr "Autentificare consol" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" msgstr "Nu pute籟i schimba consola pentru %s.\n" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" msgstr "Schimb consola de autentificare pentru %s\n" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s: Intrare nevalid: %s\n" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" msgstr "%s este o consol nevalid.\n" @@ -584,12 +568,12 @@ msgstr "%s este o consol nevalid.\n" msgid "Usage: expiry {-f|-c}\n" msgstr "Utilizare: expiry {-f|-c}\n" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" msgstr "%s: AVERTISMENT! Trebuie atribuit UID root!\n" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "%s: utilizator necunoscut\n" @@ -603,320 +587,285 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" msgstr "" -#: src/faillog.c:86 +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" -msgstr "Nume utilizator Euri Maximum Ultima\n" +msgid "Login Failures Maximum Latest On\n" +msgstr "" -#: src/faillog.c:103 -#, c-format -msgid " %s on %s" -msgstr " %s pe %s" - -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" msgstr " [%lds rmase]" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr " [%lds rmase]" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "Utilizator necunoscut: %s\n" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, fuzzy, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "utilizare: %s [-r|-R] grup\n" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr " %s [-a utilizator] grup\n" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr " %s [-d utilizator] grup\n" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr " %s [-A utilizator,...] [-M utilizator,...] grup\n" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr " %s [-M utilizator,...] grup\n" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" msgstr "%s: sunt cerute parole criptate de grup pentru -A\n" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "Cine sunte籟i?\n" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr "grup necunoscut: %s\n" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "Adugare utilizator %s la grupul %s\n" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "tergere utilizator %s din grupul %s\n" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" msgstr "%s: membru necunoscut %s\n" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "%s: nu este un tty\n" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "Schimbare parol pentru grupul %s\n" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "Parola nou: " -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " msgstr "Reintroduce籟i noua parol: " -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" msgstr "Acestea nu se potrivesc, mai 簾ncerca籟i odat" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" msgstr "%s: Mai 簾ncerca籟i mai t璽rziu\n" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "%s: nu pot ob籟ine 簾nchiderea\n" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" msgstr "%s: nu pot ob籟ine 簾nchiderea criptat\n" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "%s: nu pot deschide fiierul\n" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "%s: nu pot actualiza intrarea\n" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" msgstr "%s: nu pot actualiza intrarea criptat\n" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "%s: nu pot rescrie fiierul\n" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" msgstr "%s: nu pot rescrie fiierul de parole criptate\n" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "%s: nu pot descuia fiierul\n" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "%s: nu pot actualiza fiierele DBM\n" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "%s: nu pot actualiza fiierele criptate DBM\n" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, fuzzy, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "utilizare: groupadd [-g id_grup [-o]] grup\n" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, c-format msgid "%s: error adding new group entry\n" msgstr "%s: eroare la adugarea unei noi intrri de grup\n" -#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: nu pot aduga o nou intrare de grup dbm\n" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "%s: numele %s nu este unic\n" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" msgstr "%s: id grup %u nu este unic\n" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "%s: nu pot prelua id unic de grup\n" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, fuzzy, 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:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "%s: grup nevalid %s\n" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "%s: -O cere NAME=VALUE\n" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s: nu pot rescrie fiierul de grupuri\n" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s: nu pot rescrie fiierul de parole criptate pentru grupuri\n" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" msgstr "%s: nu pot 簾ncuia fiierul de grupuri\n" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" msgstr "%s: nu pot deschide fiierul de grupuri\n" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" msgstr "%s: nu pot 簾ncuia fiierul de parole criptate pentru grupuri\n" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" msgstr "%s: nu pot deschide fiierul de parole criptate pentru grupuri\n" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "%s: grupul %s exist\n" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, fuzzy, c-format msgid "Usage: groupdel group\n" msgstr "utilizare: groupdel grup\n" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" msgstr "%s: eroare la tergerea intrrii de grup\n" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "%s: eroare la tergerea intrrii dbm de grup\n" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "%s: eroare la tergerea intrrii parolei criptate de grup\n" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "%s: eroare la tergerea intrrii parolei criptate dbm de grup\n" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "%s: nu pot terge grupul primar al utilizatorului.\n" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "%s: grupul %s nu exist\n" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "%s: grupul %s este un grup NIS\n" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s: %s este stp璽n NIS\n" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, fuzzy, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "utilizare: groupmod [-g id_grup [-o]] [-n nume] grup\n" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "%s: %s nu s-a gsit 簾n /etc/group\n" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s: nu pot aduga o nou intrare de parol criptat pentru dbm grup\n" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s: %u nu este un id unic de grup\n" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "%s: %s nu este un nume unic\n" @@ -926,110 +875,105 @@ msgstr "%s: %s nu este un nume unic\n" msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "Utilizare: %s [-r] [-s] [grup [gshadow]]\n" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "Utilizare: %s [-r] [-s] [grup]\n" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "Nu" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" msgstr "%s: -s i -r sunt incompatibile\n" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "%s: nu pot 簾ncuia fiierul %s\n" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "%s: nu pot deschide fiierul %s\n" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" msgstr "intrare nevalid 簾n fiierul de grupuri\n" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "terg linia `%s'? " -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" msgstr "intrare de grup dublat\n" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" msgstr "nume de grup nevalid `%s'\n" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "grupul %s: nici un utilizator %s\n" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " msgstr "terg membrul `%s'? " -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" msgstr "intrare nevalid 簾n fiierul de parole criptate de grupuri\n" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" msgstr "intrare dublat de parol criptat de grup\n" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" msgstr "nici o potrivire pentru intrarea din fiierul de grupuri\n" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" msgstr "parola criptat a grupului %s: nici un utilizator administrativ %s\n" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " msgstr "terg membrul administrativ `%s'? " -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" msgstr "parola criptat a grupului %s: nici un utilizator %s\n" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "%s: nu pot actualiza fiierul %s\n" -#: src/grpck.c:647 src/pwck.c:612 -#, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: fiierele au fost actualizate, pornesc mkpasswd\n" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format -msgid "%s: no changes\n" -msgstr "%s: fr schimbri\n" - -#: src/grpck.c:651 src/pwck.c:616 +#: src/grpck.c:640 src/pwck.c:606 #, c-format msgid "%s: the files have been updated\n" msgstr "%s: fiierele au fost actualizate\n" +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "%s: fr schimbri\n" + #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" @@ -1045,37 +989,37 @@ msgstr "%s: nu pot deschide fiierul de grupuri\n" msgid "%s: can't lock shadow group file\n" msgstr "%s: nu pot 簾ncuia fiierul de parole criptate de grupuri\n" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" msgstr "%s: nu pot deschide fiierul de parole criptate de grupuri\n" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "%s: nu pot terge parola criptat pentru grupul %s\n" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "%s: nu pot actualiza intrarea parolei criptate pentru %s\n" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "%s: nu pot actualiza intrarea pentru grupul %s\n" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" msgstr "%s: nu pot actualiza fiierul de parole criptate de grupuri\n" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" msgstr "%s: nu pot actualiza fiierul de grupuri\n" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "%s: nu pot terge fiierul de parole criptate de grupuri\n" @@ -1095,13 +1039,13 @@ msgstr "utilizare: id\n" msgid " groups=" msgstr " grupuri=" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, fuzzy, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" @@ -1113,41 +1057,41 @@ msgstr "" " -m, --md5\t\tfolosesc criptarea MD5 簾n loc de DES c璽nd parola\n" "\t\t\tfurnizat nu este criptat\n" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" msgstr "Nume utilizator Port De la Cel mai recent\n" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "Nume utilizator Port Cel mai recent\n" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "**Niciodat autentificat**" -#: src/login.c:175 +#: src/login.c:156 #, fuzzy, c-format msgid "Usage: %s [-p] [name]\n" msgstr "utilizare: %s [-p] [nume]\n" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr " %s [-p] [-h gazd] [-f nume]\n" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr " %s [-p] -r gazd\n" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" msgstr "Timp de autentificare nevalid\n" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" @@ -1156,7 +1100,7 @@ msgstr "" "\n" "Sistem 簾nchis pentru 簾ntre籟inere de rutin\n" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" @@ -1165,7 +1109,7 @@ msgstr "" "\n" "[Faz de deconectare trecut -- autentificare permis pentru root.]\n" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" @@ -1174,17 +1118,17 @@ msgstr "" "\n" "Timp expirat pentru autentificare dup %d secunde.\n" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" msgstr " 簾n `%.100s' din `%.200s'" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" msgstr " 簾n `%.100s'" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" @@ -1193,38 +1137,29 @@ msgstr "" "\n" "%s autentificat: " -#: src/login.c:819 -msgid "login: " -msgstr "autentificare: " - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" msgstr "autentificare incorect" -#: src/login.c:1198 +#: src/login.c:996 msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "Avertisment: autentificare reactivat dup 簾nchiderea temporar.\n" -#: src/login.c:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "Ultima autentificare: %s 簾n %s" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" msgstr "Ultima autentificare: %.19s 簾n %s" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" msgstr " de la %.*s" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "Pornire rad_login\n" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" @@ -1265,17 +1200,17 @@ msgstr "%s: eroare la adugare 簾nregistrare pentru " msgid "added %d entries, longest was %d\n" msgstr "adugate %d intrri, cea mai lung a fost %d\n" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "Utilizare: %s [-vf] [-p|g|sp|sg] fiier\n" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "Utilizare: %s [-vf] [-p|g|sp] fiier\n" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "Utilizare: %s [-vf] [-p|g] fiier\n" @@ -1295,16 +1230,16 @@ msgstr "utilizare: sg grup [[-c] comanda]\n" msgid "unknown uid: %u\n" msgstr "id utilizator necunoscut: %u\n" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" msgstr "id grup necunoscut: %lu\n" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "Scuze.\n" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "prea multe grupuri\n" @@ -1314,91 +1249,91 @@ msgstr "prea multe grupuri\n" msgid "Usage: %s [input]\n" msgstr "Utilizare: %s [input]\n" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "%s: nu pot 簾ncuia /etc/passwd.\n" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "%s: nu pot 簾ncuia fiierele, 簾ncerca籟i mai t璽rziu\n" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "%s: nu pot deschide fiierele\n" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "%s: linia %d: linie nevalid\n" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "%s: linia %d: nu pot crea ID grup\n" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "%s: linia %d: nu pot crea ID utilizator\n" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "%s: linia %d: nu pot gsi utilizatorul %s\n" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "%s: linia %d: nu pot actualiza parola\n" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "%s: linia %d: euare mkdir\n" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "%s: linia %d: euare chown\n" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "%s: linia %d: nu pot actualiza intrarea\n" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "%s: eroare la actualizarea fiierelor\n" -#: src/passwd.c:155 +#: src/passwd.c:154 #, fuzzy, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "utilizare: %s [-f|-s] [nume]\n" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr " %s [-x max] [-n min] [-w avertism] [-i inactiv] nume\n" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} nume\n" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "Parola veche: " -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" msgstr "Parol incorect pentru `%s'\n" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" @@ -1407,16 +1342,16 @@ msgstr "" "Introduce籟i noua parol (minimum %d, maximum %d caractere)\n" "V rog utiliza籟i o combina籟ie de litere mari i mici i numere.\n" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "Parola nou: " -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" msgstr "Mai 簾ncerca籟i.\n" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" @@ -1426,52 +1361,52 @@ msgstr "" "Avertisment: parol slab (mai introduce籟i-o odat pentru a o folosi " "oricum).\n" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" msgstr "Nu se potrivesc, mai 簾ncerca籟i odat.\n" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "Parola pentru %s nu poate fi schimbat.\n" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" msgstr "Scuze, parola pentru %s 簾nc nu poate fi schimbat.\n" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "%s: nu mai este memorie\n" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "%s: nu pot executa %s" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" msgstr "%s: depozitul %s nu este suportat\n" -#: src/passwd.c:914 +#: src/passwd.c:884 #, fuzzy, c-format -msgid "You may not change the password for %s.\n" +msgid "%s: You may not view or modify password information for %s.\n" msgstr "Nu pute籟i schimba consola pentru %s.\n" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "Schimbare parol pentru %s\n" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "Parola pentru %s este neschimbat.\n" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "Parol schimbat.\n" @@ -1486,49 +1421,49 @@ msgstr "Utilizare: %s [-q] [-r] [-s] [passwd [shadow]]\n" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "Utilizare: %s [-q] [-r] [-s] [passwd]\n" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" msgstr "intrare nevalid 簾n fiierul de parole\n" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" msgstr "intrare de parol dublat\n" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" msgstr "nume de utilizator nevalid '%s'\n" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "utilizatorul %s: fr grup %u\n" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "utilizatorul %s: directorul %s nu exist\n" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "utilizatorul %s: programul %s nu exist\n" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" msgstr "intrare nevalid 簾n fiierul de parole criptate\n" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" msgstr "intrare dublat de parol criptat\n" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" msgstr "nici o potrivire la intrrile fiierului de conturi utilizatori\n" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" msgstr "utilizatorul %s: ultima schimbare de parol s-a fcut 簾n viitor\n" @@ -1548,17 +1483,17 @@ msgstr "%s: nu pot deschide fiierul de conturi utilizator\n" msgid "%s: can't remove shadow entry for %s\n" msgstr "%s: nu pot terge intrarea de parol criptat pentru %s\n" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "%s: nu pot actualiza intrarea contului pentru %s\n" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" msgstr "%s: nu pot actualiza fiierul de parole criptate shadow\n" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" msgstr "%s: nu pot actualiza fiierul de conturi utilizator passwd\n" @@ -1568,40 +1503,40 @@ msgstr "%s: nu pot actualiza fiierul de conturi utilizator passwd\n" msgid "%s: can't update entry for user %s\n" msgstr "%s: nu pot actualiza intrarea pentru utilizatorul %s\n" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format msgid "%s: can't delete shadow password file\n" msgstr "%s: nu pot terge fiierul de parole criptate shadow\n" -#: src/su.c:133 +#: src/su.c:132 msgid "Sorry." msgstr "Scuze." -#: src/su.c:323 +#: src/su.c:320 #, c-format msgid "%s: must be run from a terminal\n" msgstr "%s: trebuie pornit de la un terminal\n" -#: src/su.c:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "%s: pam_start: eroare %d\n" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" msgstr "Identificator necunoscut: %s\n" -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, c-format msgid "You are not authorized to su %s\n" msgstr "Nu sunte籟i autorizat pentru su %s\n" -#: src/su.c:502 +#: src/su.c:495 msgid "(Enter your own password.)" msgstr "(Introduce籟i propria parol.)" -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" @@ -1610,22 +1545,22 @@ msgstr "" "%s: %s\n" "(Ignorat)\n" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" msgstr "Fr consol\n" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr "Acces INTERZIS ctre su spre acest cont.\n" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "Autentificare cu parol ocolit.\n" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" msgstr "V rog introduce籟i PROPRIA parol pentru autentificare.\n" @@ -1640,7 +1575,7 @@ msgstr "Fr fiier de conturi utilizatori passwd\n" msgid "No password entry for 'root'\n" msgstr "Fr intrare de parol pentru 'root'\n" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" @@ -1650,235 +1585,215 @@ msgstr "" "Apsa籟i ctrl-d pentru pornire normal,\n" "(sau da籟i parola de root pentru depanarea sistemului):" -#: src/sulogin.c:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" msgstr "Intrare 簾n modul de 簾ntre籟inere sistem\n" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "%s: reconstruirea bazei de date de grupuri\n" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "%s: reconstruirea bazei de date de parole criptate pentru grupuri\n" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "%s: argument numeric nevalid `%s'\n" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "%s: id grup necunoscut %s\n" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "%s: grup necunoscut %s\n" -#: src/useradd.c:475 +#: src/useradd.c:418 #, c-format msgid "%s: cannot create new defaults file\n" msgstr "%s: nu pot crea noile fiiere implicite\n" -#: src/useradd.c:480 +#: src/useradd.c:423 #, c-format msgid "%s: cannot open new defaults file\n" msgstr "%s: nu pot deschide noile fiiere implicite\n" -#: src/useradd.c:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" msgstr "%s: redenumesc: %s" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s: grupul `%s' este un grup NIS.\n" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "%s: prea multe grupuri specificate (maximum %d).\n" -#: src/useradd.c:721 +#: src/useradd.c:660 #, fuzzy, c-format msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n" msgstr "utilizare: %s\t[-u id_utilizator [-o]] [-g grup] [-G grup,...] \n" -#: src/useradd.c:724 +#: src/useradd.c:663 #, fuzzy, c-format msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr "\t\t[-d acas] [-s consol] [-c comentariu] [-m [-k ablon]]\n" -#: src/useradd.c:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, fuzzy, c-format msgid " [-f inactive] [-e expire]\n" msgstr "\t\t[-f inactiv] [-e expir ]\n" -#: src/useradd.c:728 +#: src/useradd.c:667 #, fuzzy, c-format msgid " [-p passwd] name\n" msgstr "[-p passwd] nume\n" -#: src/useradd.c:730 +#: src/useradd.c:669 #, fuzzy, c-format msgid " useradd -D [-g group] [-b base] [-s shell]\n" msgstr " %s\t-D [-g grup] [-b base] [-s consol]\n" -#: src/useradd.c:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, c-format msgid "%s: error locking group file\n" msgstr "%s: eroare la 簾nchiderea fiierului de grupuri\n" -#: src/useradd.c:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, c-format msgid "%s: error opening group file\n" msgstr "%s: eroare la deschiderea fiierului de grupuri\n" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, 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:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, 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:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "%s; id utilizator %u nu este unic\n" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "%s: nu pot aloca un id utilizator unic\n" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "%s: director de baz nevalid `%s'\n" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "%s: comentariu nevalid `%s'\n" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "%s: director personal nevalid `%s'\n" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s: dat nevalid `%s'\n" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "%s: parole criptate cerute pentru -e\n" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, c-format msgid "%s: shadow passwords required for -f\n" msgstr "%s; parole criptate cerute pentru -f\n" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" msgstr "%s: fiier nevalid `%s'\n" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "%s: consol nevalid `%s'\n" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "%s: nume utilizator nevalid '%s'\n" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "%s: nu pot rescrie fiierul de conturi utilizator\n" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "%s: nu pot rescrie fiierul de parole criptate\n" -#: src/useradd.c:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, c-format msgid "%s: unable to lock password file\n" msgstr "%s: nu pot 簾ncuia fiierul de conturi utilizatori\n" -#: src/useradd.c:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, c-format msgid "%s: unable to open password file\n" msgstr "%s: nu pot deschide fiierul de conturi utilizatori\n" -#: src/useradd.c:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, c-format msgid "%s: cannot lock shadow password file\n" msgstr "%s: nu pot 簾ncuia fiierul de parole criptate\n" -#: src/useradd.c:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, c-format msgid "%s: cannot open shadow password file\n" msgstr "%s: nu pot deschide fiierul de parole criptate\n" -#: src/useradd.c:1459 +#: src/useradd.c:1354 #, 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:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "%s: eroare la actualizare intrare cont utilizator dbm\n" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, 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:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s: eroare la actualizarea intrrii parolei criptate dbm\n" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" msgstr "%s: nu pot crea directorul %s\n" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, c-format msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n" msgstr "" -#: src/useradd.c:1590 +#: src/useradd.c:1446 #, fuzzy, c-format msgid "Can't create mail spool for user %s.\n" msgstr "%s: nu pot actualiza intrarea pentru utilizatorul %s\n" -#: src/useradd.c:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "%s: utilizatorul %s exist\n" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" @@ -1886,207 +1801,172 @@ msgstr "" "%s: grupul %s exist - dac vre籟i s aduga籟i un utilizator la acest grup, " "folosi籟i -g.\n" -#: src/useradd.c:1767 +#: src/useradd.c:1602 #, 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" -#: src/userdel.c:124 +#: src/userdel.c:108 #, fuzzy, c-format msgid "Usage: %s [-r] name\n" msgstr "utilizare: %s [-r] nume\n" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" msgstr "%s: eroare la actualizarea intrrilor de grupuri\n" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "%s: nu pot actualiza intrarea grupurilor dbm\n" - -#: src/userdel.c:214 -#, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: nu pot terge intrarea grupurilor dbm\n" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "%s: nu pot deschide fiierul de grupuri\n" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "%s: nu pot deschide fiierul de parole criptate pentru grupuri\n" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "%s: eroare la tergerea intrrii contului utilizator\n" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "%s: eroare la tergerea intrrii parolei criptate\n" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "%s: eroare la tergerea contului utilizator dbm\n" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s: eroare la tergerea intrrii parolei criptate dbm\n" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "%s: utilizatorul %s este autentificat 簾n acest moment\n" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "%s: %s nu apar籟ine de %s, nu se terge\n" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " msgstr "%s: avertisment: nu pot terge " -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" msgstr "%s: utilizatorul %s nu exist\n" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s: utilizatorul %s este un utilizator NIS\n" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "" "%s: nu se terge directorul %s (s-ar terge directorul personal al " "utilizatorului %s)\n" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "%s: eroare la tergerea directorului %s\n" -#: src/usermod.c:306 +#: src/usermod.c:289 #, fuzzy, c-format msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "utilizare: %s\t[-u id_utilizator [-o]] [-g grup] [-G grup,...] \n" -#: src/usermod.c:310 +#: src/usermod.c:293 #, 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:313 +#: src/usermod.c:296 #, fuzzy, c-format msgid "[-f inactive] [-e expire] " msgstr "[-f inactiv] [-e expir ] " -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p passwd] [-L|-U] nume\n" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" msgstr "%s: nu mai este memorie pentru update_group\n" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "%s: nu mai este memorie pentru update_gshadow\n" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "%s: nu s-au dat semnalizatoare\n" -#: src/usermod.c:965 +#: src/usermod.c:903 #, 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:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "%s: id utilizator %lu nu este unic\n" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, c-format msgid "%s: error changing password entry\n" msgstr "%s: eroare la schimbarea intrrii contului utilizator\n" -#: src/usermod.c:1122 +#: src/usermod.c:1053 #, c-format msgid "%s: error removing password entry\n" msgstr "%s: eroare la tergerea intrrii contului utilizator\n" -#: src/usermod.c:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "%s: eroare la adugarea intrrii contului utilizator dbm\n" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "%s: eroare la tergerea intrrii contului utilizator dbm\n" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "%s: eroare la tergerea intrrii parolei criptate\n" -#: src/usermod.c:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s: eroare la tergerea intrrii parolei criptate dbm\n" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "%s: directorul %s exist\n" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "%s: nu pot crea %s\n" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" msgstr "%s: nu pot schimba proprietarul %s\n" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, c-format msgid "%s: cannot rename directory %s to %s\n" msgstr "%s: nu pot redenumi directorul %s 簾n %s\n" -#: src/usermod.c:1333 +#: src/usermod.c:1223 #, 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:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" msgstr "euare 簾n schimbarea proprietarului csu籟ei potale" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" msgstr "euare 簾n redenumirea csu籟ei potale" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" @@ -2095,20 +1975,20 @@ msgstr "" "\n" "%s: %s este neschimbat\n" -#: src/vipw.c:133 +#: src/vipw.c:131 msgid "Couldn't lock file" msgstr "N-am putut 簾ncuia fiierul" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" msgstr "N-am putut face o copie de rezerv" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s: nu pot reface %s: %s (schimbrile dvs. sunt 簾n %s)\n" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/po/ru.gmo b/po/ru.gmo index 2b461a8f..f1852b3d 100644 Binary files a/po/ru.gmo and b/po/ru.gmo differ diff --git a/po/ru.po b/po/ru.po index 43cd1572..796680d1 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2,20 +2,22 @@ msgid "" msgstr "" "Project-Id-Version: shadow 3.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-26 07:53+0100\n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" "PO-Revision-Date: 2000-04-05 11:00:00+0200\n" "Last-Translator: Sergey Kubushin \n" "Language-Team: RU \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" msgstr "迮迡郈迮迠迡迮郇邽迮: 郇迮邽郱赲迮郇訄 迣郈郈訄 %s\n" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" msgstr "迮迡郈迮迠迡迮郇邽迮: 郅邽郕郋邾 邾郇郋迣郋 迣郈郈\n" @@ -43,17 +45,17 @@ msgstr " 苤赲迠邽迮 邽迮邾郇邾 訄迡邾邽郇邽訄郋郋 msgid " Choose a new password.\n" msgstr " 訇迮邽迮 郇郋赲邿 郈訄郋郅.\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "苤郋郕 迡迮邿赲邽 赲訄迮迣郋 郈訄郋郅 邽迮迮 迮迮郱 %ld 迡郇迮邿.\n" -#: libmisc/age.c:174 +#: libmisc/age.c:172 #, c-format msgid "Your password will expire tomorrow.\n" msgstr "苤郋郕 迡迮邿赲邽 赲訄迮迣郋 郈訄郋郅 郱訄郕訄郇邽赲訄迮 郱訄赲訄.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:174 #, c-format msgid "Your password will expire today.\n" msgstr "苤郋郕 迡迮邿赲邽 赲訄迮迣郋 郈訄郋郅 郱訄郕訄郇邽赲訄迮 迮迣郋迡郇.\n" @@ -68,39 +70,28 @@ msgstr "迮 邾郋迣 郈郋邾迮郇 tty %s" msgid "Environment overflow\n" msgstr "迮迮郈郋郅郇迮郇邽迮 郋郕迠迮郇邽\n" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr " 郇迮 邾郋迠迮迮 邽郱邾迮郇邽 $%s\n" -#: libmisc/failure.c:230 -#, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "%d %s 郈郋郅迮迡郇迮迣郋 郅郋迣邽郇訄, 郕郋郋邿 訇郅 %s 郇訄 %s.\n" +#: libmisc/failure.c:229 +#, fuzzy, c-format +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "%d %s 郈郋郅迮迡郇迮迣郋 郅郋迣邽郇訄, 郕郋郋邿 訇郅 %s 郇訄 %s.\n" +msgstr[1] "%d %s 郈郋郅迮迡郇迮迣郋 郅郋迣邽郇訄, 郕郋郋邿 訇郅 %s 郇訄 %s.\n" +msgstr[2] "%d %s 郈郋郅迮迡郇迮迣郋 郅郋迣邽郇訄, 郕郋郋邿 訇郅 %s 郇訄 %s.\n" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "郇迮迡訄邽" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "郇迮迡訄訄" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" msgstr "苤郅邽郕郋邾 邾郇郋迣郋 郅郋迣邽郇郋赲.\n" -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "Password 郇迮 迡迮邽迮 迮郕迮郇邿 郕郅 迡郅 %s.\n" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "迮 邾郋迣 訄郇郋赲邽 迮郕迮郇邿 郕郅 迡郅 %s: 郱訄郈迮郇 郅邽 迡迮邾郋郇 keyserv?\n" - #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "郅 赲訄 迮 郇郋赲訄 郈郋訄." @@ -113,7 +104,7 @@ msgstr "郋 郇迮." msgid "You have mail." msgstr "郅 赲訄 迮 郈郋訄." -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " msgstr "迮赲迮郇邿 郈訄郋郅: %s. " @@ -128,20 +119,20 @@ msgstr "passwd: 郇迮迡訄訄 pam_start(), 郋邽訇郕訄 %d\n" msgid "passwd: %s\n" msgstr "passwd: %s\n" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" msgstr "" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "迮 邾郋迣 郈迮迮邿邽 赲 \"%s\"\n" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" msgstr "迮 郕訄訄郅郋迣訄, 郅郋迣邽郇邽邾 HOME=/" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr "迮 邾郋迣 邽郈郋郅郇邽 %s" @@ -156,36 +147,32 @@ msgstr "迮赲迮郇邿 郕郋郇迮赲郋邿 郕訄訄郅郋迣 \"%s\"\n" msgid "Can't change root directory to \"%s\"\n" msgstr "迮 邾郋迣 邽郱邾迮郇邽 郕郋郇迮赲郋邿 郕訄訄郅郋迣 郇訄 \"%s\"\n" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "郇迮迡訄訄 malloc(%d)\n" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" msgstr "迮 邾迮訄 迡郅 邽郇郋邾訄邽邽 郋 郕郋郇邽迣訄邽邽.\n" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "" "郋邽訇郕訄 郕郋郇邽迣訄邽邽 - 郇迮邽郱赲迮郇訄 郱訄郈邽 '%s' (郋郋訇邽迮 訄迡邾邽郇邽訄郋)\n" -#: lib/pwauth.c:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "訄郋郅: " -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "訄郋郅 %s: " -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "(衪郋 赲郕郅.) " - -#: src/chage.c:118 +#: src/chage.c:112 #, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" @@ -194,154 +181,147 @@ msgstr "" "訄郈郕: chage [-l] [-m 邾邽郇_迡郇迮邿] [-M 邾訄郕_迡郇迮邿] [-W 郈迮迡郈.]\n" " [-I 郇迮訄郕邽赲郇.] [-E 迡訄訄 郋郕郋郇訄郇邽] [-d 郈郋郅_迡迮郇] 郱迮\n" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 src/chfn.c:139 src/chsh.c:89 #, fuzzy, c-format msgid "Enter the new value, or press ENTER for the default\n" msgstr "赲迮迡邽迮 郇郋赲郋迮 郱郇訄迮郇邽迮 邽郅邽 return 迡郅 郱郇訄迮郇邽 郈郋 邾郋郅訄郇邽\n" -#: src/chage.c:155 +#: src/chage.c:149 msgid "Minimum Password Age" msgstr "邽郇邽邾訄郅郇邿 \"赲郋郱訄\" 郈訄郋郅" -#: src/chage.c:161 +#: src/chage.c:155 msgid "Maximum Password Age" msgstr "訄郕邽邾訄郅郇邿 \"赲郋郱訄\" 郈訄郋郅" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" msgstr "郋郅迮迡郇迮迮 邽郱邾迮郇迮郇邽迮 郈訄郋郅 (--)" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" msgstr "迮迡郈迮迠迡迮郇邽 郋訇 郋郕郋郇訄郇邽邽 郋郕訄 迡迮邿赲邽 郈訄郋郅" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "訄郋郅 郇迮訄郕邽赲迮郇" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "訄訄 郋郕郋郇訄郇邽 郋郕訄 迡迮邿赲邽 訄郕郕訄郇訄 (--)" -#: src/chage.c:238 +#: src/chage.c:231 #, fuzzy, c-format msgid "Last password change\t\t\t\t\t: " msgstr "郋郅迮迡郇迮迮 邽郱邾迮郇迮郇邽迮 郈訄郋郅 (--)" -#: src/chage.c:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 #, fuzzy, c-format msgid "never\n" msgstr "邽郕郋迣迡訄\n" -#: src/chage.c:251 +#: src/chage.c:244 #, fuzzy, c-format msgid "Password expires\t\t\t\t\t: " msgstr "訄郋郅 邽迮郕訄迮:\t" -#: src/chage.c:267 +#: src/chage.c:260 #, fuzzy, c-format msgid "Password inactive\t\t\t\t\t: " msgstr "訄郋郅 迡迮郱訄郕邽赲邽迮:\t" -#: src/chage.c:281 +#: src/chage.c:274 #, fuzzy, c-format msgid "Account expires\t\t\t\t\t\t: " msgstr "郕郕訄郇 邽迮郕訄迮:\t" -#: src/chage.c:297 +#: src/chage.c:290 #, c-format msgid "Minimum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:298 +#: src/chage.c:292 #, c-format msgid "Maximum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:299 +#: src/chage.c:294 #, c-format msgid "Number of days of warning before password expires\t: %ld\n" msgstr "" -#: src/chage.c:444 +#: src/chage.c:431 #, c-format msgid "%s: do not include \"l\" with other flags\n" msgstr "%s: 郇迮 赲郕郅訄邿迮 \"l\" 迡迣邽邾邽 郋郈邽邾邽\n" -#: src/chage.c:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 #, fuzzy, c-format msgid "%s: permission denied.\n" msgstr "%s: 迡郋郈 郱訄郈迮迮郇\n" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 #, fuzzy, c-format msgid "%s: PAM authentication failed\n" msgstr "%s: 郋邽訇郕訄 迡郋訇訄赲郅迮郇邽 邾迮郋迡訄 訄迮郇邽郕訄邽邽\n" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, c-format msgid "%s: can't open password file\n" msgstr "%s: 郇迮 邾郋迣 郋郕 訄邿郅 郈訄郋郅迮邿\n" -#: src/chage.c:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "%s: 郇迮邽郱赲迮郇邿 郈郋郅郱郋赲訄迮郅 %s\n" -#: src/chage.c:535 +#: src/chage.c:519 #, fuzzy, c-format msgid "%s: can't lock shadow password file" msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 shadow-訄邿郅 郈訄郋郅迮邿\n" -#: src/chage.c:543 +#: src/chage.c:527 #, fuzzy, c-format msgid "%s: can't open shadow password file" msgstr "%s: 郇迮 邾郋迣 郋郕 shadow-訄邿郅 郈訄郋郅迮邿\n" -#: src/chage.c:604 +#: src/chage.c:587 #, c-format msgid "Changing the aging information for %s\n" msgstr "郱邾迮郇迮邾 郈訄訄邾迮 赲迮邾迮郇邽 迡迮邿赲邽 迡郅 %s\n" -#: src/chage.c:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" msgstr "%s: 郋邽訇郕訄 邽郱邾迮郇迮郇邽 郈郋郅迮邿\n" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, c-format msgid "%s: can't update password file\n" msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 訄邿郅 郈訄郋郅迮邿\n" -#: src/chage.c:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 shadow-訄邿郅 郈訄郋郅迮邿\n" -#: src/chage.c:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "邽訇郕訄 郋訇郇郋赲郅迮郇邽 郱訄郈邽邽 赲 訇訄郱迮 迡訄郇郇 郈訄郋郅迮邿.\n" - -#: src/chage.c:692 +#: src/chage.c:649 #, c-format msgid "%s: can't rewrite shadow password file\n" msgstr "%s: 郇迮 邾郋迣 郈迮迮郈邽訄 shadow-訄邿郅 郈訄郋郅迮邿\n" -#: src/chage.c:740 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite password file\n" msgstr "%s: 郇迮 邾郋迣 郈迮迮郈邽訄 訄邿郅 郈訄郋郅迮邿\n" -#: src/chage.c:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 #, fuzzy, c-format msgid "%s: PAM chauthtok failed\n" msgstr "%s: 郇迮 邾郋迣 訄郱訇郅郋郕邽郋赲訄 訄邿郅\n" @@ -360,117 +340,122 @@ msgstr "" msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" msgstr "訄郈郕: %s [-f 郈郋郅郇郋迮_邽邾] [-r 郕郋邾郇訄訄] [-w 訄訇_迮郅] [-h 迡郋邾_迮郅]\n" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "郋郅郇郋迮 邽邾" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "\t郋郅郇郋迮 邽邾: %s\n" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "郋邾迮 郕郋邾郇訄" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "訄訇郋邽邿 迮郅迮郋郇" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" msgstr "郋邾. 迮郅迮郋郇" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "郋迮迮" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s: 迮 邾郋迣 郋郈迮迡迮郅邽 赲訄迮迣郋 邽邾迮郇邽 郈郋郅郱郋赲訄迮郅.\n" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s: 郇迮 邾郋迣 邽郱邾迮郇邽 郈郋郅郱郋赲訄迮郅 `%s' 郇訄 郕郅邽迮郇迮 NIS.\n" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "%s: `%s' - NIS-邾訄迮 迡郅 郋迣郋 郕郅邽迮郇訄.\n" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, fuzzy, c-format +msgid "%s: Permission denied.\n" +msgstr "%s: 迡郋郈 郱訄郈迮迮郇\n" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" msgstr "郱邾迮郇迮邾 邽郇郋邾訄邽 郋 郈郋郅郱郋赲訄迮郅迮 %s\n" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s: 郇迮赲迮郇郋迮 邽邾: \"%s\"\n" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s: 郇迮赲迮郇邿 郇郋邾迮 郕郋邾郇訄: \"%s\"\n" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s: 郇迮赲迮郇邿 訄訇郋邽邿 迮郅迮郋郇: \"%s\"\n" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s: 郇迮赲迮郇邿 迡郋邾. 迮郅迮郋郇: \"%s\"\n" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s: \"%s\" 郋迡迮迠邽 郇迮迡郋郈邽邾迮 邽邾赲郋郅\n" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "%s: 郅邽郕郋邾 迡郅邽郇郇迮 郈郋郅\n" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" msgstr "迮 邾郋迣 邽郱邾迮郇邽 ID root'訄.\n" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" msgstr "迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 訄邿郅 郈訄郋郅迮邿; 郈郋郈郋訇邿迮 郈郋郱迠迮.\n" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" msgstr "迮 邾郋迣 郋郕 訄邿郅 郈訄郋郅迮邿.\n" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s: %s 郇迮 郇訄邿迡迮郇 赲 /etc/passwd\n" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" msgstr "邽訇郕訄 郋訇郇郋赲郅迮郇邽 郱訄郈邽邽 郈訄郋郅.\n" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" msgstr "迮 邾郋迣 郱訄郈邽訄 邽郱邾迮郇迮郇邽 訄邿郅訄 郈訄郋郅迮邿.\n" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" msgstr "迮 邾郋迣 訄郱訇郅郋郕邽郋赲訄 訄邿郅 郈訄郋郅迮邿.\n" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -487,48 +472,48 @@ msgstr "" msgid "%s: can't lock password file\n" msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 訄邿郅 郈訄郋郅迮邿\n" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 訄邿郅 shadow\n" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "%s: 郇迮 邾郋迣 郋郕 訄邿郅 shadow\n" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "%s: 郋郕訄 %d: 郅邽郕郋邾 迡郅邽郇郇訄 郋郕訄\n" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "%s: 郋郕訄 %d: 郇郋赲邿 郈訄郋郅 郋赲迮\n" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "%s: 郋郕訄 %d: 郇迮邽郱赲迮郇邿 郈郋郅郱郋赲訄迮郅 %s\n" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "%s: 郋郕訄 %d: 郇迮 邾郋迣 郋訇郇郋赲邽 郱訄郈邽 郈訄郋郅\n" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "%s: 郋訇郇訄迠迮郇訄 郋邽訇郕訄, 邽郱邾迮郇迮郇邽 邽迣郇郋邽\n" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" msgstr "%s: 郋邽訇郕訄 郋訇郇郋赲郅迮郇邽 訄邿郅訄 shadow\n" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" msgstr "%s: 郋邽訇郕訄 郋訇郇郋赲郅迮郇邽 訄邿郅訄 郈訄郋郅迮邿\n" @@ -538,26 +523,26 @@ msgstr "%s: 郋邽訇郕訄 郋訇郇郋赲郅迮郇邽 訄邿郅訄 郈訄郋郅迮邿\n" msgid "Usage: %s [-s shell] [name]\n" msgstr "訄郈郕: %s [-s 迮郅郅] [邽邾]\n" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" msgstr "虼迮郅郅 郈邽 赲郋迡迮" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" msgstr " 郇迮 邾郋迠迮迮 邽郱邾迮郇邽 迮郅郅 迡郅 %s.\n" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" msgstr "郱邾迮郇迮邾 迮郅郅 郈邽 赲郋迡迮 迡郅 %s\n" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s: 迮赲迮郇訄 郱訄郈邽: %s\n" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" msgstr "%s - 郇迮赲迮郇邿 迮郅郅.\n" @@ -567,12 +552,12 @@ msgstr "%s - 郇迮赲迮郇邿 迮郅郅.\n" msgid "Usage: expiry {-f|-c}\n" msgstr "訄郈郕: expiry {-f|-c}\n" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" msgstr "%s: 苺! 郋郅迠郇郋 訇 set-UID root!\n" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "%s: 郇迮邽郱赲迮郇邿 郈郋郅郱郋赲訄迮郅\n" @@ -586,320 +571,285 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" msgstr "" -#: src/faillog.c:86 +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" -msgstr "邾 迮迡訄 訄郕邽邾邾 郋郅迮迡郇.\n" +msgid "Login Failures Maximum Latest On\n" +msgstr "" -#: src/faillog.c:103 -#, c-format -msgid " %s on %s" -msgstr " %s 郇訄 %s" - -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" msgstr " [%lds 郋.]" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr " [%lds lock]" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "迮邽郱赲迮郇邿 郈郋郅郱郋赲訄迮郅: %s\n" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "訄郈郕: %s [-r|-R] 迣郈郈訄\n" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr " %s [-a 郱迮] 迣郈郈訄\n" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr " %s [-d 郱迮] 迣郈郈訄\n" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr " %s [-A 郱迮,...] [-M 郱迮,...] 迣郈郈訄\n" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr " %s [-M 郱迮,...] 迣郈郈訄\n" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" msgstr "%s: 迡郅 -A 迮訇 shadow-郈訄郋郅邽 迣郈郈\n" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "郋 赲?\n" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr "郇迮邽郱赲迮郇訄 迣郈郈訄: %s\n" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "郋訇訄赲郅 郈郋郅郱郋赲訄迮郅 %s 赲 迣郈郈 %s\n" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "苺迡訄郅 郈郋郅郱郋赲訄迮郅 %s 邽郱 迣郈郈 %s\n" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" msgstr "%s: 郇迮邽郱赲迮郇邿 郅迮郇 %s\n" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "%s: 迮 tty\n" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "郱邾迮郇迮邾 郈訄郋郅 迡郅 迣郈郈 %s\n" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "郋赲邿 郈訄郋郅: " -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " msgstr "迮 訄郱 郇郋赲邿 郈訄郋郅: " -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" msgstr "郇邽 郇迮 郋赲郈訄迡訄; 郈郋郈郋訇邿迮 郇郋赲訄" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" msgstr "%s: 郋郈郋訇邿迮 郈郋郱迠迮\n" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄\n" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 shadow\n" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "%s: 郇迮 邾郋迣 郋郕 訄邿郅\n" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 郱訄郈邽\n" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 shadow-郱訄郈邽\n" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "%s: 郇迮 邾郋迣 郈迮迮郈邽訄 訄邿郅\n" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" msgstr "%s: 郇迮 邾郋迣 郈迮迮郈邽訄 訄邿郅 shadow\n" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "%s: 郇迮 邾郋迣 訄郱訇郅郋郕邽郋赲訄 訄邿郅\n" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 訄邿郅 訇訄郱 迡訄郇郇\n" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 shadow-訄邿郅 訇訄郱 迡訄郇郇\n" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "訄郈郕: groupadd [-g gid [-o]] [-f] 迣郈郈訄\n" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, c-format msgid "%s: error adding new group entry\n" msgstr "%s: 郋邽訇郕訄 迡郋訇訄赲郅迮郇邽 郇郋赲郋邿 郱訄郈邽邽 迣郈郈\n" -#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: 郇迮 邾郋迣 迡郋訇訄赲邽 郇郋赲 郱訄郈邽 迣郈郈 赲 訇訄郱 迡訄郇郇\n" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "%s: 邽邾 %s 郇迮 郇邽郕訄郅郇郋\n" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, fuzzy, c-format msgid "%s: gid %u is not unique\n" msgstr "%s: gid %ld 郇迮 郇邽郕訄郅迮郇\n" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "%s: 郇迮 邾郋迣 郈郋郅邽 郇邽郕訄郅郇邿 gid\n" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, c-format msgid "%s: %s is not a valid group name\n" msgstr "%s: %s 郇迮迡郋郈邽邾郋 郕訄郕 邽邾 迣郈郈\n" -#: src/groupadd.c:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "%s: 郇迮赲迮郇訄 迣郈郈訄 %s\n" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "%s: -O 迮訇迮 觓=虴\n" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s: 郇迮 邾郋迣 郈迮迮郈邽訄 訄邿郅 迣郈郈\n" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s: 郇迮 邾郋迣 郈迮迮郈邽訄 shadow-訄邿郅 迣郈郈\n" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 訄邿郅 迣郈郈\n" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" msgstr "%s: 郇迮 邾郋迣 郋郕 訄邿郅 迣郈郈\n" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 shadow-訄邿郅 迣郈郈\n" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" msgstr "%s: 郇迮 邾郋迣 郋郕 shadow-訄邿郅 迣郈郈\n" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "%s: 迣郈郈訄 %s 迠迮 迮赲迮\n" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, c-format msgid "Usage: groupdel group\n" msgstr "訄郈郕: groupdel 迣郈郈訄\n" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" msgstr "%s: 郋邽訇郕訄 迡訄郅迮郇邽 郱訄郈邽邽 迣郈郈\n" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "%s: 郋邽訇郕訄 迡訄郅迮郇邽 郱訄郈邽邽 迣郈郈 邽郱 訇訄郱 迡訄郇郇\n" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "%s: 郋邽訇郕訄 迡訄郅迮郇邽 shadow-郱訄郈邽邽 迣郈郈\n" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "%s: 郋邽訇郕訄 迡訄郅迮郇邽 shadow-郱訄郈邽邽 迣郈郈 邽郱 訇訄郱 迡訄郇郇\n" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "%s: 郇迮 邾郋迣 迡訄郅邽 郈迮赲邽郇 迣郈郈 郈郋郅郱郋赲訄迮郅.\n" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "%s: 迣郈郈訄 %s 郇迮 迮赲迮\n" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "%s: 迣郈郈訄 %s - 迣郈郈訄 NIS\n" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s: %s - NIS-邾訄迮\n" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "訄郈郕: groupmod [-g gid [-o]] [-n 邽邾] 迣郈郈訄\n" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "%s: %s 郇迮 郇訄邿迡迮郇 赲 /etc/group\n" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s: 郇迮 邾郋迣 迡郋訇訄赲邽 郇郋赲 shadow-郱訄郈邽 迣郈郈 赲 訇訄郱 迡訄郇郇\n" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, fuzzy, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s: %ld - 郇迮 郇邽郕訄郅郇邿 gid\n" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "%s: %s - 郇迮 郇邽郕訄郅郇郋迮 邽邾\n" @@ -909,110 +859,105 @@ msgstr "%s: %s - 郇迮 郇邽郕訄郅郇郋迮 邽邾\n" msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "訄郈郕: %s [-r] [-s] [迣郈郈訄 [shadow-迣郈郈訄]]\n" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "訄郈郕: %s [-r] [-s] [迣郈郈訄]\n" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "迮" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" msgstr "" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 訄邿郅 %s\n" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "%s: 郇迮 邾郋迣 郋郕 訄邿郅 %s\n" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" msgstr "郇迮赲迮郇訄 郱訄郈邽 訄邿郅訄 迣郈郈\n" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "迡訄郅邽 郋郕 `%s'? " -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" msgstr "迡訇郅邽訄 郱訄郈邽 迣郈郈\n" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" msgstr "郇迮赲迮郇郋迮 邽邾 迣郈郈 `%s'\n" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "迣郈郈訄 %s: 郇迮 郈郋郅郱郋赲訄迮郅 %s\n" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " msgstr "迡訄郅邽 郅迮郇訄 `%s'? " -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" msgstr "郇迮赲迮郇訄 shadow-郱訄郈邽 赲 訄邿郅迮 迣郈郈\n" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" msgstr "迡訇郅邽訄 shadow-郱訄郈邽 赲 訄邿郅迮 迣郈郈\n" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" msgstr "郋郋赲迮赲迮邿 郱訄郈邽邽 赲 訄邿郅迮 迣郈郈 郇迮\n" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" msgstr "shadow-迣郈郈訄 %s: 郇迮 訄迡邾邽郇邽訄邽赲郇郋迣郋 郈郋郅郱郋赲訄迮郅 %s\n" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " msgstr "迡訄郅邽 訄迡邾邽郇邽訄邽赲郇郋迣郋 郅迮郇訄 `%s'? " -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" msgstr "shadow-迣郈郈訄 %s: 郇迮 郈郋郅郱郋赲訄迮郅 %s\n" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 訄邿郅 %s\n" -#: src/grpck.c:647 src/pwck.c:612 -#, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: 訄邿郅 訇郅邽 郋訇郇郋赲郅迮郇; 郱訄郈邽迮 mkpasswd\n" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format -msgid "%s: no changes\n" -msgstr "%s: 邽郱邾迮郇迮郇邽邿 郇迮\n" - -#: src/grpck.c:651 src/pwck.c:616 +#: src/grpck.c:640 src/pwck.c:606 #, c-format msgid "%s: the files have been updated\n" msgstr "%s: 訄邿郅 訇郅邽 郋訇郇郋赲郅迮郇\n" +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "%s: 邽郱邾迮郇迮郇邽邿 郇迮\n" + #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" @@ -1028,37 +973,37 @@ msgstr "%s: 郇迮 邾郋迣 郋郕 訄邿郅 迣郈郈\n" msgid "%s: can't lock shadow group file\n" msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 shadow-訄邿郅 迣郈郈\n" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" msgstr "%s: 郇迮 邾郋迣 郋郕 shadow-訄邿郅 迣郈郈\n" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "%s: 郇迮 邾郋迣 迡訄郅邽 shadow-迣郈郈 %s\n" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 shadow-郱訄郈邽 迡郅 %s\n" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 郱訄郈邽 迡郅 迣郈郈 %s\n" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 shadow-訄邿郅 迣郈郈\n" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 訄邿郅 迣郈郈\n" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "%s: 郇迮 邾郋迣 迡訄郅邽 shadow-訄邿郅 迣郈郈\n" @@ -1078,52 +1023,52 @@ msgstr "訄郈郕: id\n" msgid " groups=" msgstr " 迣郈郈=" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" msgstr "邾 郋 郕迡訄 郋郅迮迡郇.\n" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "邾 郋 郋郅迮迡郇.\n" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "**邽郕郋迣迡訄 郇迮 郅郋迣邽郇邽郅***" -#: src/login.c:175 +#: src/login.c:156 #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "訄郈郕: %s [-p] [邽邾]\n" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr " %s [-p] [-h 郋] [-f 邽邾]\n" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr " %s [-p] -r 郋\n" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" msgstr "迮迡郋郈邽邾郋迮 赲迮邾 迡郅 郅郋迣邽郇訄\n" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" @@ -1132,7 +1077,7 @@ msgstr "" "\n" "苤邽迮邾訄 郱訄郕訄 郇訄 郈郅訄郇郋赲郋迮 郋訇郅迠邽赲訄郇邽迮\n" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" @@ -1141,7 +1086,7 @@ msgstr "" "\n" "[訄郋迮迡邽郇迮郇邽迮 郈郋郈迮郇郋 -- root'郋赲邿 郅郋迣邽郇 訄郱迮迮郇.]\n" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" @@ -1150,17 +1095,17 @@ msgstr "" "\n" "苠訄邿邾訄 郅郋迣邽郇訄 赲 迮迮郇邽迮 %d 迮郕郇迡.\n" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" msgstr " 郇訄 `%.100s' `%.200s'" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" msgstr " 郇訄 `%.100s'" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" @@ -1169,38 +1114,29 @@ msgstr "" "\n" "%s login: " -#: src/login.c:819 -msgid "login: " -msgstr "login: " - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" msgstr "迮迡訄郇訄 郈郋郈郕訄" -#: src/login.c:1198 +#: src/login.c:996 msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "迮迡郈迮迠迡迮郇邽迮: 郅郋迣邽郇 郇郋赲訄 郋郕 郈郋郅迮 赲迮邾迮郇郇郋迣郋 郱訄郕邽.\n" -#: src/login.c:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "郋郅迮迡郇邽邿 郅郋迣邽郇: %s 郇訄 %s" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" msgstr "郋郅迮迡郇邽邿 郅郋迣邽郇: %.19s 郇訄 %s" -#: src/login.c:1221 +#: src/login.c:1018 #, fuzzy, c-format msgid " from %.*s" msgstr " %.*s" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "訄郈郕訄 rad_login\n" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" @@ -1241,17 +1177,17 @@ msgstr "%s: 郋邽訇郕訄 迡郋訇訄赲郅迮郇邽 郱訄郈邽邽 迡郅 " msgid "added %d entries, longest was %d\n" msgstr "迡郋訇訄赲郅迮郇郋 %d 郱訄郈邽迮邿, 訄邾訄 迡郅邽郇郇訄 - %d\n" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "訄郈郕: %s [-vf] [-p|g|sp|sg] 訄邿郅\n" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "訄郈郕: %s [-vf] [-p|g|sp] 訄邿郅\n" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "訄郈郕: %s [-vf] [-p|g] 訄邿郅\n" @@ -1271,16 +1207,16 @@ msgstr "訄郈郕: sg 迣郈郈訄 [[-c] 郕郋邾訄郇迡訄]\n" msgid "unknown uid: %u\n" msgstr "郇迮邽郱赲迮郇邿 uid: %d\n" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, fuzzy, c-format msgid "unknown gid: %lu\n" msgstr "郇迮邽郱赲迮郇邿 gid: %ld\n" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "郱赲邽郇邽迮.\n" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "郅邽郕郋邾 邾郇郋迣郋 迣郈郈\n" @@ -1290,91 +1226,91 @@ msgstr "郅邽郕郋邾 邾郇郋迣郋 迣郈郈\n" msgid "Usage: %s [input]\n" msgstr "訄郈郕: %s [赲赲郋迡]\n" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 /etc/passwd.\n" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 訄邿郅; 郈郋郈郋訇邿迮 郈郋郱迠迮\n" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "%s: 郇迮 邾郋迣 郋郕 訄邿郅\n" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "%s: 郋郕訄 %d: 郇迮赲迮郇訄 郋郕訄\n" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "%s: 郋郕訄 %d: 郇迮 邾郋迣 郋郱迡訄 GID\n" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "%s: 郋郕訄 %d: 郇迮 邾郋迣 郋郱迡訄 UID\n" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "%s: 郋郕訄 %d: 郇迮 邾郋迣 郇訄邿邽 郈郋郅郱郋赲訄迮郅 %s\n" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "%s: 郋郕訄 %d: 郇迮 邾郋迣 郋訇郇郋赲邽 郈訄郋郅\n" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "%s: 郋郕訄 %d: 郇迮迡訄訄 mkdir\n" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "%s: 郋郕訄 %d: 郇迮迡訄訄 chown\n" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "%s: 郋郕訄 %d: 郇迮 邾郋迣 郋訇郇郋赲邽 郱訄郈邽\n" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "%s: 郋邽訇郕訄 郋訇郇郋赲郅迮郇邽 訄邿郅郋赲\n" -#: src/passwd.c:155 +#: src/passwd.c:154 #, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "訄郈郕: %s [-f|-s] [邽邾]\n" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr " %s [-x 邾訄郕] [-n 邾邽郇] [-w 郈迮迡郈] [-i 郇迮訄郕] 邽邾\n" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} 邽邾\n" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "苤訄邿 郈訄郋郅: " -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" msgstr "迮赲迮郇邿 郈訄郋郅 迡郅 `%s'\n" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" @@ -1383,16 +1319,16 @@ msgstr "" "赲迮迡邽迮 郇郋赲邿 郈訄郋郅 (邾邽郇邽邾邾 %d, 邾訄郕邽邾邾 %d 邽邾赲郋郅郋赲)\n" "郈郋郅郱邿迮 郕郋邾訇邽郇訄邽 訇郋郅邽 邽 邾訄郅迮郇郕邽 郅訄邽郇郕邽 訇郕赲 邽 邽.\n" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "郋赲邿 郈訄郋郅: " -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" msgstr "郋郈郋訇邿迮 迮迮 訄郱.\n" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" @@ -1402,52 +1338,52 @@ msgstr "" "迮迡郈迮迠迡迮郇邽迮: 郅訄訇邿 郈訄郋郅 (赲赲迮迡邽迮 迮迣郋 迮迮 訄郱 迮郅邽 赲迮-訄郕邽 郋邽迮 " "迮迣郋).\n" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" msgstr "郇邽 郇迮 郋赲郈訄迡訄; 郈郋郈郋訇邿迮 迮迮 訄郱.\n" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "訄郋郅 迡郅 %s 邽郱邾迮郇邽 郇迮郅郱.\n" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" msgstr "郱赲邽郇邽迮, 郈訄郋郅 迡郅 %s 郈郋郕訄 邽郱邾迮郇邽 郇迮郅郱.\n" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "%s: 郇迮赲訄郕訄 郈訄邾邽\n" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "%s: 迮 邾郋迣 邽郈郋郅郇邽 %s" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" msgstr "%s: 訄郇邽郅邽迮 %s 郇迮 郈郋迡迡迮迠邽赲訄迮\n" -#: src/passwd.c:914 -#, c-format -msgid "You may not change the password for %s.\n" +#: src/passwd.c:884 +#, fuzzy, c-format +msgid "%s: You may not view or modify password information for %s.\n" msgstr " 郇迮 邾郋迠迮迮 邽郱邾迮郇邽 郈訄郋郅 迡郅 %s.\n" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "郱邾迮郇迮邾 郈訄郋郅 迡郅 %s\n" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "訄郋郅 迡郅 %s 邽郱邾迮郇迮郇.\n" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "訄郋郅 邽郱邾迮郇迮郇.\n" @@ -1462,49 +1398,49 @@ msgstr "訄郈郕: %s [-q] [-r] [-s] [郈訄郋郅 [shadow]]\n" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "訄郈郕: %s [-q] [-r] [-s] [郈訄郋郅]\n" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" msgstr "郇迮赲迮郇訄 郱訄郈邽 赲 訄邿郅迮 郈訄郋郅迮邿\n" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" msgstr "迡訇郅邽訄 郱訄郈邽 郈訄郋郅\n" -#: src/pwck.c:373 +#: src/pwck.c:370 #, fuzzy, c-format msgid "invalid user name '%s'\n" msgstr "郇迮赲迮郇郋迮 邽邾 郈郋郅郱郋赲訄迮郅 `%s'\n" -#: src/pwck.c:388 +#: src/pwck.c:384 #, fuzzy, c-format msgid "user %s: no group %u\n" msgstr "郈郋郅郱郋赲訄迮郅 %s: 郇迮 迣郈郈 %d\n" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "郈郋郅郱郋赲訄迮郅 %s: 郕訄訄郅郋迣 %s 郇迮 迮赲迮\n" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "郈郋郅郱郋赲訄迮郅 %s: 郈郋迣訄邾邾訄 %s 郇迮 迮赲迮\n" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" msgstr "郇迮赲迮郇訄 郱訄郈邽 赲 shadow-訄邿郅迮 郈訄郋郅迮邿\n" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" msgstr "迡訇郅邽訄 郱訄郈邽 赲 shadow-訄邿郅迮 郈訄郋郅迮邿\n" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" msgstr "郋郋赲迮赲迮邿 郱訄郈邽邽 赲 訄邿郅迮 郈訄郋郅迮邿 郇迮\n" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" msgstr "郈郋郅郱郋赲訄迮郅 %s: 郈郋郅迮迡郇迮迮 邽郱邾迮郇迮郇邽迮 郈訄郋郅 赲 訇迡迮邾\n" @@ -1524,17 +1460,17 @@ msgstr "%s: 郇迮 邾郋迣 郋郕 訄邿郅 郈訄郋郅迮邿\n" msgid "%s: can't remove shadow entry for %s\n" msgstr "%s: 郇迮 邾郋迣 迡訄郅邽 shadow-郱訄郈邽 迡郅 %s\n" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 郱訄郈邽 郈訄郋郅 迡郅 %s\n" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 shadow-訄邿郅\n" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 訄邿郅 郈訄郋郅迮邿\n" @@ -1544,40 +1480,40 @@ msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 訄邿郅 郈訄郋郅迮邿\n" msgid "%s: can't update entry for user %s\n" msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 郱訄郈邽 迡郅 郈郋郅郱郋赲訄迮郅 %s\n" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format msgid "%s: can't delete shadow password file\n" msgstr "%s: 郇迮 邾郋迣 迡訄郅邽 shadow-訄邿郅 郈訄郋郅迮邿\n" -#: src/su.c:133 +#: src/su.c:132 msgid "Sorry." msgstr "郱赲邽郇邽迮." -#: src/su.c:323 +#: src/su.c:320 #, c-format msgid "%s: must be run from a terminal\n" msgstr "%s: 迡郋郅迠郇郋 訇 郱訄郈迮郇郋 迮邾邽郇訄郅訄\n" -#: src/su.c:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "%s: pam_start: 郋邽訇郕訄 %d\n" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" msgstr "迮邽郱赲迮郇邿 id: %s\n" -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, c-format msgid "You are not authorized to su %s\n" msgstr "訄邾 郇迮 訄郱迮迮郇郋 迡迮郅訄 su %s\n" -#: src/su.c:502 +#: src/su.c:495 msgid "(Enter your own password.)" msgstr "(赲迮迡邽迮 赲訄 郋訇赲迮郇郇邿 郈訄郋郅.)" -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" @@ -1586,22 +1522,22 @@ msgstr "" "%s: %s\n" "(迣郇郋邽郋赲訄郇郋)\n" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" msgstr "迮 迮郅郅訄\n" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr "郋郈 郕 su 郋迣郋 訄郕郕訄郇訄 虳.\n" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "迮郇邽郕訄邽 郈郋 郈訄郋郅 郈郋郈迮郇訄.\n" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" msgstr "赲迮迡邽迮 赲訄 苤苤苠衎 郈訄郋郅 迡郅 訄迮郇邽郕訄邽邽.\n" @@ -1616,7 +1552,7 @@ msgstr "迮 訄邿郅訄 郈訄郋郅迮邿\n" msgid "No password entry for 'root'\n" msgstr "迮 郱訄郈邽邽 郈訄郋郅 迡郅 'root'\n" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" @@ -1626,437 +1562,382 @@ msgstr "" "赲迮迡邽迮 control-d 迡郅 郈郋迡郋郅迠迮郇邽 郇郋邾訄郅郇郋邿 郱訄迣郱郕邽,\n" "(邽郅邽 郈訄郋郅 root'訄 迡郅 郋訇郅迠邽赲訄郇邽 邽迮邾):" -#: src/sulogin.c:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" msgstr "郋迡 赲 迮迠邽邾 郋訇郅迠邽赲訄郇邽 邽迮邾\n" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "%s: 郈迮迮郋迮郇邽迮 訇訄郱 迡訄郇郇 迣郈郈\n" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "%s: 郈迮迮郋迮郇邽迮 訇訄郱 迡訄郇郇 shadow-迣郈郈\n" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "%s: 郇迮赲迮郇邿 邽郅郋赲郋邿 訄迣邾迮郇 `%s'\n" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "%s: 郇迮邽郱赲迮郇邿 gid %s\n" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "%s: 郇迮邽郱赲迮郇訄 迣郈郈訄 %s\n" -#: src/useradd.c:475 +#: src/useradd.c:418 #, c-format msgid "%s: cannot create new defaults file\n" msgstr "%s: 郇迮 邾郋迣 郋郱迡訄 郇郋赲邿 訄邿郅 邾郋郅訄郇邽邿\n" -#: src/useradd.c:480 +#: src/useradd.c:423 #, fuzzy, c-format msgid "%s: cannot open new defaults file\n" msgstr "%s: 郇迮 邾郋迣 郋郱迡訄 郇郋赲邿 訄邿郅 邾郋郅訄郇邽邿\n" -#: src/useradd.c:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" msgstr "%s: 郈迮迮邽邾迮郇郋赲訄郇邽迮: %s" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s: 迣郈郈訄 `%s' - 迣郈郈訄 NIS.\n" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "%s: 郱訄迡訄郇郋 郅邽郕郋邾 邾郇郋迣郋 迣郈郈 (邾訄郕. %d).\n" -#: src/useradd.c:721 +#: src/useradd.c:660 #, c-format msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n" msgstr "訄郈郕: useradd [-u uid [-o]] [-g 迣郈郈訄] [-G 迣郈郈訄,...] \n" -#: src/useradd.c:724 +#: src/useradd.c:663 #, c-format msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr " [-d 迡郋邾.] [-s 迮郅郅] [-c 郕郋邾邾迮郇.] [-m [-k 訄訇郅郋郇]]\n" -#: src/useradd.c:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, c-format msgid " [-f inactive] [-e expire]\n" msgstr " [-f 郇迮訄郕邽赲郇.] [-e 邽迮郕訄迮]\n" -#: src/useradd.c:728 +#: src/useradd.c:667 #, c-format msgid " [-p passwd] name\n" msgstr " [-p 郈訄郋郅] 邽邾\n" -#: src/useradd.c:730 +#: src/useradd.c:669 #, c-format msgid " useradd -D [-g group] [-b base] [-s shell]\n" msgstr " useradd -D [-g 迣郈郈訄] [-b 訇訄郱訄] [-s 迮郅郅]\n" -#: src/useradd.c:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, c-format msgid "%s: error locking group file\n" msgstr "%s: 郋邽訇郕訄 訇郅郋郕邽郋赲郕邽 訄邿郅訄 迣郈郈\n" -#: src/useradd.c:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, c-format msgid "%s: error opening group file\n" msgstr "%s: 郋邽訇郕訄 郋郕邽 訄邿郅訄 迣郈郈\n" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, c-format msgid "%s: error locking shadow group file\n" msgstr "%s: 郋邽訇郕訄 訇郅郋郕邽郋赲郕邽 shadow-訄邿郅訄 迣郈郈\n" -#: src/useradd.c:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, c-format msgid "%s: error opening shadow group file\n" msgstr "%s: 郋邽訇郕訄 郋郕邽 shadow-訄邿郅訄 迣郈郈\n" -#: src/useradd.c:1006 +#: src/useradd.c:909 #, fuzzy, c-format msgid "%s: uid %u is not unique\n" msgstr "%s: uid %d 郇迮 郇邽郕訄郅迮郇\n" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "%s: 郇迮 邾郋迣 郈郋郅邽 郇邽郕訄郅郇邿 uid\n" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "%s: 郇迮赲迮郇邿 訇訄郱郋赲邿 郕訄訄郅郋迣 `%s'\n" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "%s: 郇迮赲迮郇邿 郕郋邾邾迮郇訄邽邿 `%s'\n" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "%s: 郇迮赲迮郇邿 迡郋邾訄郇邽邿 郕訄訄郅郋迣 `%s'\n" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s: 郇迮赲迮郇訄 迡訄訄 `%s'\n" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "%s: 迡郅 -e 迮訇 shadow-郈訄郋郅邽\n" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, c-format msgid "%s: shadow passwords required for -f\n" msgstr "%s: 迡郅 -f 迮訇 shadow-郈訄郋郅邽\n" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" msgstr "%s: 郇迮赲迮郇郋迮 郈郋郅迮 `%s'\n" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "%s: 郇迮赲迮郇邿 迮郅郅 `%s'\n" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, fuzzy, c-format msgid "%s: invalid user name '%s'\n" msgstr "%s: 郇迮赲迮郇郋迮 邽邾 郈郋郅郱郋赲訄迮郅 `%s'\n" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "%s: 郇迮 邾郋迣 郈迮迮郈邽訄 訄邿郅 郈訄郋郅迮邿\n" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "%s: 郇迮 邾郋迣 郈迮迮郈邽訄 shadow-訄邿郅 郈訄郋郅迮邿\n" -#: src/useradd.c:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, c-format msgid "%s: unable to lock password file\n" msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 訄邿郅 郈訄郋郅迮邿\n" -#: src/useradd.c:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, c-format msgid "%s: unable to open password file\n" msgstr "%s: 郇迮 邾郋迣 郋郕 訄邿郅 郈訄郋郅迮邿\n" -#: src/useradd.c:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, c-format msgid "%s: cannot lock shadow password file\n" msgstr "%s: 郇迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 shadow-訄邿郅 郈訄郋郅迮邿\n" -#: src/useradd.c:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, c-format msgid "%s: cannot open shadow password file\n" msgstr "%s: 郇迮 邾郋迣 郋郕 shadow-訄邿郅 郈訄郋郅迮邿\n" -#: src/useradd.c:1459 +#: src/useradd.c:1354 #, c-format msgid "%s: error adding new password entry\n" msgstr "%s: 郋邽訇郕訄 迡郋訇訄赲郅迮郇邽 郇郋赲郋邿 郱訄郈邽邽 郈訄郋郅\n" -#: src/useradd.c:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "%s: 郋邽訇郕訄 郋訇郇郋赲郅迮郇邽 郱訄郈邽邽 訇訄郱 迡訄郇郇 郈訄郋郅迮邿\n" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, c-format msgid "%s: error adding new shadow password entry\n" msgstr "%s: 郋邽訇郕訄 迡郋訇訄赲郅迮郇邽 郇郋赲郋邿 shadow-郱訄郈邽邽 郈訄郋郅\n" -#: src/useradd.c:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s: 郋邽訇郕訄 郋訇郇郋赲郅迮郇邽 shadow-郱訄郈邽邽 訇訄郱 迡訄郇郇 郈訄郋郅迮邿\n" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" msgstr "%s: 郇迮 邾郋迣 郋郱迡訄 郕訄訄郅郋迣 %s\n" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, c-format msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n" msgstr "" -#: src/useradd.c:1590 +#: src/useradd.c:1446 #, fuzzy, c-format msgid "Can't create mail spool for user %s.\n" msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 郱訄郈邽 迡郅 郈郋郅郱郋赲訄迮郅 %s\n" -#: src/useradd.c:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "%s: 郈郋郅郱郋赲訄迮郅 %s 迠迮 迮赲迮\n" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" msgstr "" -#: src/useradd.c:1767 +#: src/useradd.c:1602 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" msgstr "%s: 郈迮迡郈迮迠迡迮郇邽迮: CREATE_HOME 郇迮 郈郋迡迡迮迠邽赲訄迮, 邽郈郋郅郱邿迮 -m.\n" -#: src/userdel.c:124 +#: src/userdel.c:108 #, c-format msgid "Usage: %s [-r] name\n" msgstr "訄郈郕: %s [-r] 邽邾\n" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" msgstr "%s: 郋邽訇郕訄 郋訇郇郋赲郅迮郇邽 郱訄郈邽邽 迣郈郈\n" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 郱訄郈邽 訇訄郱 迡訄郇郇 迣郈郈\n" - -#: src/userdel.c:214 -#, fuzzy, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: 郇迮 邾郋迣 郋訇郇郋赲邽 郱訄郈邽 訇訄郱 迡訄郇郇 迣郈郈\n" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "%s: 郇迮 邾郋迣 郋郕 訄邿郅 迣郈郈\n" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "%s: 郇迮 邾郋迣 郋郕 shadow-訄邿郅 迣郈郈\n" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "%s: 郋邽訇郕訄 迡訄郅迮郇邽 郱訄郈邽邽 郈訄郋郅\n" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "%s: 郋邽訇郕訄 迡訄郅迮郇邽 shadow-郱訄郈邽邽 郈訄郋郅\n" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "%s: 郋邽訇郕訄 迡訄郅迮郇邽 郱訄郈邽邽 訇訄郱 迡訄郇郇 郈訄郋郅迮邿\n" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s: 郋邽訇郕訄 迡訄郅迮郇邽 shadow-郱訄郈邽邽 訇訄郱 迡訄郇郇 郈訄郋郅迮邿\n" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "%s: 郈郋郅郱郋赲訄迮郅 %s 赲 郇訄郋迮迮 赲迮邾 赲 邽迮邾迮\n" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "%s: %s 郇迮 郈邽郇訄迡郅迮迠邽 %s, 郇迮 迡訄郅\n" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " msgstr "%s: 郈迮迡郈迮迠迡迮郇邽迮: 郇迮 邾郋迣 迡訄郅邽 " -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" msgstr "%s: 郈郋郅郱郋赲訄迮郅 %s 郇迮 迮赲迮\n" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s: 郈郋郅郱郋赲訄迮郅 %s - 郈郋郅郱郋赲訄迮郅 NIS\n" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "%s: 郇迮 迡訄郅 郕訄訄郅郋迣 %s (郈迮迡郈郋郅訄迣訄郅郋 迡訄郅迮郇邽迮 郕訄訄郅郋迣訄 郱迮訄 %s)\n" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "%s: 郋邽訇郕訄 迡訄郅迮郇邽 郕訄訄郅郋迣訄 %s\n" -#: src/usermod.c:306 +#: src/usermod.c:289 #, c-format msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "訄郈郕: %s\t[-u uid [-o]] [-g 迣郈郈訄] [-G 迣郈郈訄,...] \n" -#: src/usermod.c:310 +#: src/usermod.c:293 #, c-format msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n" msgstr "\t\t[-d 迡郋邾. [-m]] [-s 迮郅郅] [-c 郕郋邾邾迮郇.t] [-l 郇郋赲郋迮_邽邾]\n" -#: src/usermod.c:313 +#: src/usermod.c:296 #, c-format msgid "[-f inactive] [-e expire] " msgstr "[-f 郇迮訄郕邽赲郇.] [-e 邽迮郕訄迮] " -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p 郈訄郋郅] [-L|-U] 邽邾\n" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" msgstr "%s: 郇迮赲訄郕訄 郈訄邾邽 赲 update_group\n" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "%s: 郇迮赲訄郕訄 郈訄邾邽 赲 update_gshadow\n" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "%s: 郋郈邽邽 郇迮 郱訄迡訄郇\n" -#: src/usermod.c:965 +#: src/usermod.c:903 #, c-format msgid "%s: shadow passwords required for -e and -f\n" msgstr "%s: 迡郅 -e 邽 -f 迮訇 shadow-郈訄郋郅邽\n" -#: src/usermod.c:987 +#: src/usermod.c:924 #, fuzzy, c-format msgid "%s: uid %lu is not unique\n" msgstr "%s: uid %ld 郇迮 郇邽郕訄郅迮郇\n" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, c-format msgid "%s: error changing password entry\n" msgstr "%s: 郋邽訇郕訄 邽郱邾迮郇迮郇邽 郱訄郈邽邽 郈訄郋郅\n" -#: src/usermod.c:1122 +#: src/usermod.c:1053 #, c-format msgid "%s: error removing password entry\n" msgstr "%s: 郋邽訇郕訄 迡訄郅迮郇邽 郱訄郈邽邽 郈訄郋郅\n" -#: src/usermod.c:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "%s: 郋邽訇郕訄 迡郋訇訄赲郅迮郇邽 郱訄郈邽邽 郈訄郋郅\n" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "%s: 郋邽訇郕訄 迡訄郅迮郇邽 郱訄郈邽邽 訇訄郱 迡訄郇郇 郈訄郋郅迮邿\n" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "%s: 郋邽訇郕訄 迡訄郅迮郇邽 shadow-郱訄郈邽邽 郈訄郋郅\n" -#: src/usermod.c:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s: 郋邽訇郕訄 迡訄郅迮郇邽 shadow-郱訄郈邽邽 訇訄郱 迡訄郇郇 郈訄郋郅迮邿\n" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "%s: 郕訄訄郅郋迣 %s 迠迮 迮赲迮\n" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "%s: 郇迮 邾郋迣 郋郱迡訄 %s\n" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" msgstr "%s: 郇迮 邾郋迣 迡迮郅訄 chown %s\n" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, c-format msgid "%s: cannot rename directory %s to %s\n" msgstr "%s: 郇迮 邾郋迣 郈迮迮邽邾迮郇郋赲訄 郕訄訄郅郋迣 %s 赲 %s\n" -#: src/usermod.c:1333 +#: src/usermod.c:1223 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "%s: 郈迮迡郈迮迠迡迮郇邽迮 %s 郇迮 郈邽郇訄迡郅迮迠邽 %s\n" -#: src/usermod.c:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" msgstr "郇迮迡訄訄 邽郱邾迮郇迮郇邽 郈邽郇訄迡郅迮迠郇郋邽 郈郋郋赲郋迣郋 邽郕訄" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" msgstr "郇迮迡訄訄 郈迮迮邽邾迮郇郋赲訄郇邽 郈郋郋赲郋迣郋 邽郕訄" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" @@ -2065,20 +1946,20 @@ msgstr "" "\n" "%s: %s 邽郱邾迮郇迮郇郋\n" -#: src/vipw.c:133 +#: src/vipw.c:131 msgid "Couldn't lock file" msgstr "迮 邾郋迣 郱訄訇郅郋郕邽郋赲訄 訄邿郅" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" msgstr "迮 邾郋迣 郋郱迡訄 迮郱迮赲郇 郕郋郈邽" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s: 郇迮 邾郋迣 赲郋訄郇郋赲邽 %s: %s (赲訄邽 邽郱邾迮郇迮郇邽 赲 %s)\n" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/po/shadow.pot b/po/shadow.pot index 5d239180..507fcde7 100644 --- a/po/shadow.pot +++ b/po/shadow.pot @@ -8,20 +8,21 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-26 07:53+0100\n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" #: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" msgstr "" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" msgstr "" @@ -49,17 +50,17 @@ msgstr "" msgid " Choose a new password.\n" msgstr "" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "" -#: libmisc/age.c:174 +#: libmisc/age.c:172 #, c-format msgid "Your password will expire tomorrow.\n" msgstr "" -#: libmisc/age.c:176 +#: libmisc/age.c:174 #, c-format msgid "Your password will expire today.\n" msgstr "" @@ -74,39 +75,27 @@ msgstr "" msgid "Environment overflow\n" msgstr "" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr "" -#: libmisc/failure.c:230 +#: libmisc/failure.c:229 #, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "" +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "" +msgstr[1] "" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" msgstr "" -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "" - #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "" @@ -119,7 +108,7 @@ msgstr "" msgid "You have mail." msgstr "" -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " msgstr "" @@ -134,20 +123,20 @@ msgstr "" msgid "passwd: %s\n" msgstr "" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" msgstr "" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" msgstr "" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr "" @@ -162,189 +151,178 @@ msgstr "" msgid "Can't change root directory to \"%s\"\n" msgstr "" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" msgstr "" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "" -#: lib/pwauth.c:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "" -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "" -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "" - -#: src/chage.c:118 +#: src/chage.c:112 #, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" " [-I inactive] [-E expire] [-d last_day] user\n" msgstr "" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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:155 +#: src/chage.c:149 msgid "Minimum Password Age" msgstr "" -#: src/chage.c:161 +#: src/chage.c:155 msgid "Maximum Password Age" msgstr "" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" msgstr "" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" msgstr "" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "" -#: src/chage.c:238 +#: src/chage.c:231 #, c-format msgid "Last password change\t\t\t\t\t: " msgstr "" -#: src/chage.c:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 #, c-format msgid "never\n" msgstr "" -#: src/chage.c:251 +#: src/chage.c:244 #, c-format msgid "Password expires\t\t\t\t\t: " msgstr "" -#: src/chage.c:267 +#: src/chage.c:260 #, c-format msgid "Password inactive\t\t\t\t\t: " msgstr "" -#: src/chage.c:281 +#: src/chage.c:274 #, c-format msgid "Account expires\t\t\t\t\t\t: " msgstr "" -#: src/chage.c:297 +#: src/chage.c:290 #, c-format msgid "Minimum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:298 +#: src/chage.c:292 #, c-format msgid "Maximum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:299 +#: src/chage.c:294 #, c-format msgid "Number of days of warning before password expires\t: %ld\n" msgstr "" -#: src/chage.c:444 +#: src/chage.c:431 #, c-format msgid "%s: do not include \"l\" with other flags\n" msgstr "" -#: src/chage.c:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 #, c-format msgid "%s: permission denied.\n" msgstr "" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 #, c-format msgid "%s: PAM authentication failed\n" msgstr "" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, c-format msgid "%s: can't open password file\n" msgstr "" -#: src/chage.c:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "" -#: src/chage.c:535 +#: src/chage.c:519 #, c-format msgid "%s: can't lock shadow password file" msgstr "" -#: src/chage.c:543 +#: src/chage.c:527 #, c-format msgid "%s: can't open shadow password file" msgstr "" -#: src/chage.c:604 +#: src/chage.c:587 #, c-format msgid "Changing the aging information for %s\n" msgstr "" -#: src/chage.c:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" msgstr "" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, c-format msgid "%s: can't update password file\n" msgstr "" -#: src/chage.c:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" msgstr "" -#: src/chage.c:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "" - -#: src/chage.c:692 +#: src/chage.c:649 #, c-format msgid "%s: can't rewrite shadow password file\n" msgstr "" -#: src/chage.c:740 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite password file\n" msgstr "" -#: src/chage.c:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 #, c-format msgid "%s: PAM chauthtok failed\n" msgstr "" @@ -361,117 +339,122 @@ msgstr "" msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" msgstr "" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" msgstr "" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, c-format +msgid "%s: Permission denied.\n" +msgstr "" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" msgstr "" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" msgstr "" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" msgstr "" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" msgstr "" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" msgstr "" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" msgstr "" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" msgstr "" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -488,48 +471,48 @@ msgstr "" msgid "%s: can't lock password file\n" msgstr "" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" msgstr "" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" msgstr "" @@ -539,26 +522,26 @@ msgstr "" msgid "Usage: %s [-s shell] [name]\n" msgstr "" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" msgstr "" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" msgstr "" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" msgstr "" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" msgstr "" @@ -568,12 +551,12 @@ msgstr "" msgid "Usage: expiry {-f|-c}\n" msgstr "" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" msgstr "" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "" @@ -587,320 +570,285 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" msgstr "" -#: src/faillog.c:86 +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" +msgid "Login Failures Maximum Latest On\n" msgstr "" -#: src/faillog.c:103 -#, c-format -msgid " %s on %s" -msgstr "" - -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" msgstr "" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr "" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr "" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr "" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr "" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr "" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" msgstr "" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr "" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" msgstr "" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "" -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " msgstr "" -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" msgstr "" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" msgstr "" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" msgstr "" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" msgstr "" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" msgstr "" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, c-format msgid "%s: error adding new group entry\n" msgstr "" -#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" msgstr "" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, c-format msgid "%s: %s is not a valid group name\n" msgstr "" -#: src/groupadd.c:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" msgstr "" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" msgstr "" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" msgstr "" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" msgstr "" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, c-format msgid "Usage: groupdel group\n" msgstr "" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" msgstr "" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "" @@ -910,110 +858,105 @@ msgstr "" msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" msgstr "" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" msgstr "" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "" -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" msgstr "" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" msgstr "" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " msgstr "" -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" msgstr "" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" msgstr "" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" msgstr "" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" msgstr "" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " msgstr "" -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" msgstr "" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "" -#: src/grpck.c:647 src/pwck.c:612 -#, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format -msgid "%s: no changes\n" -msgstr "" - -#: src/grpck.c:651 src/pwck.c:616 +#: src/grpck.c:640 src/pwck.c:606 #, c-format msgid "%s: the files have been updated\n" msgstr "" +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "" + #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" @@ -1029,37 +972,37 @@ msgstr "" msgid "%s: can't lock shadow group file\n" msgstr "" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" msgstr "" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" msgstr "" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" msgstr "" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "" @@ -1079,121 +1022,112 @@ msgstr "" msgid " groups=" msgstr "" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" msgstr "" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "" -#: src/login.c:175 +#: src/login.c:156 #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr "" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr "" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" msgstr "" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" "System closed for routine maintenance\n" msgstr "" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" "[Disconnect bypassed -- root login allowed.]\n" msgstr "" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" "Login timed out after %d seconds.\n" msgstr "" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" msgstr "" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" msgstr "" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" "%s login: " msgstr "" -#: src/login.c:819 -msgid "login: " -msgstr "" - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" msgstr "" -#: src/login.c:1198 +#: src/login.c:996 msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "" -#: src/login.c:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" msgstr "" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" msgstr "" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" @@ -1234,17 +1168,17 @@ msgstr "" msgid "added %d entries, longest was %d\n" msgstr "" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "" @@ -1264,16 +1198,16 @@ msgstr "" msgid "unknown uid: %u\n" msgstr "" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" msgstr "" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "" @@ -1283,159 +1217,159 @@ msgstr "" msgid "Usage: %s [input]\n" msgstr "" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "" -#: src/passwd.c:155 +#: src/passwd.c:154 #, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr "" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr "" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "" -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" msgstr "" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" "Please use a combination of upper and lower case letters and numbers.\n" msgstr "" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "" -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" msgstr "" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" "Warning: weak password (enter it again to use it anyway).\n" msgstr "" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" msgstr "" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" msgstr "" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" msgstr "" -#: src/passwd.c:914 +#: src/passwd.c:884 #, c-format -msgid "You may not change the password for %s.\n" +msgid "%s: You may not view or modify password information for %s.\n" msgstr "" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "" @@ -1450,49 +1384,49 @@ msgstr "" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" msgstr "" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" msgstr "" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" msgstr "" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" msgstr "" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" msgstr "" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" msgstr "" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" msgstr "" @@ -1512,17 +1446,17 @@ msgstr "" msgid "%s: can't remove shadow entry for %s\n" msgstr "" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" msgstr "" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" msgstr "" @@ -1532,62 +1466,62 @@ msgstr "" msgid "%s: can't update entry for user %s\n" msgstr "" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format msgid "%s: can't delete shadow password file\n" msgstr "" -#: src/su.c:133 +#: src/su.c:132 msgid "Sorry." msgstr "" -#: src/su.c:323 +#: src/su.c:320 #, c-format msgid "%s: must be run from a terminal\n" msgstr "" -#: src/su.c:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" msgstr "" -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, c-format msgid "You are not authorized to su %s\n" msgstr "" -#: src/su.c:502 +#: src/su.c:495 msgid "(Enter your own password.)" msgstr "" -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" "(Ignored)\n" msgstr "" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" msgstr "" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr "" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" msgstr "" @@ -1602,464 +1536,409 @@ msgstr "" msgid "No password entry for 'root'\n" msgstr "" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" "(or give root password for system maintenance):" msgstr "" -#: src/sulogin.c:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" msgstr "" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "" -#: src/useradd.c:475 +#: src/useradd.c:418 #, c-format msgid "%s: cannot create new defaults file\n" msgstr "" -#: src/useradd.c:480 +#: src/useradd.c:423 #, c-format msgid "%s: cannot open new defaults file\n" msgstr "" -#: src/useradd.c:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" msgstr "" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "" -#: src/useradd.c:721 +#: src/useradd.c:660 #, c-format msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n" msgstr "" -#: src/useradd.c:724 +#: src/useradd.c:663 #, c-format msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr "" -#: src/useradd.c:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, c-format msgid " [-f inactive] [-e expire]\n" msgstr "" -#: src/useradd.c:728 +#: src/useradd.c:667 #, c-format msgid " [-p passwd] name\n" msgstr "" -#: src/useradd.c:730 +#: src/useradd.c:669 #, c-format msgid " useradd -D [-g group] [-b base] [-s shell]\n" msgstr "" -#: src/useradd.c:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, c-format msgid "%s: error locking group file\n" msgstr "" -#: src/useradd.c:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, c-format msgid "%s: error opening group file\n" msgstr "" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, c-format msgid "%s: error locking shadow group file\n" msgstr "" -#: src/useradd.c:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, c-format msgid "%s: error opening shadow group file\n" msgstr "" -#: src/useradd.c:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, c-format msgid "%s: shadow passwords required for -f\n" msgstr "" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" msgstr "" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "" -#: src/useradd.c:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, c-format msgid "%s: unable to lock password file\n" msgstr "" -#: src/useradd.c:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, c-format msgid "%s: unable to open password file\n" msgstr "" -#: src/useradd.c:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, c-format msgid "%s: cannot lock shadow password file\n" msgstr "" -#: src/useradd.c:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, c-format msgid "%s: cannot open shadow password file\n" msgstr "" -#: src/useradd.c:1459 +#: src/useradd.c:1354 #, c-format msgid "%s: error adding new password entry\n" msgstr "" -#: src/useradd.c:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, c-format msgid "%s: error adding new shadow password entry\n" msgstr "" -#: src/useradd.c:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" msgstr "" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, c-format msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n" msgstr "" -#: src/useradd.c:1590 +#: src/useradd.c:1446 #, c-format msgid "Can't create mail spool for user %s.\n" msgstr "" -#: src/useradd.c:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" msgstr "" -#: src/useradd.c:1767 +#: src/useradd.c:1602 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" msgstr "" -#: src/userdel.c:124 +#: src/userdel.c:108 #, c-format msgid "Usage: %s [-r] name\n" msgstr "" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" msgstr "" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "" - -#: src/userdel.c:214 -#, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " msgstr "" -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" msgstr "" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "" -#: src/usermod.c:306 +#: src/usermod.c:289 #, c-format msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "" -#: src/usermod.c:310 +#: src/usermod.c:293 #, c-format msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n" msgstr "" -#: src/usermod.c:313 +#: src/usermod.c:296 #, c-format msgid "[-f inactive] [-e expire] " msgstr "" -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" msgstr "" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "" -#: src/usermod.c:965 +#: src/usermod.c:903 #, c-format msgid "%s: shadow passwords required for -e and -f\n" msgstr "" -#: src/usermod.c:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, c-format msgid "%s: error changing password entry\n" msgstr "" -#: src/usermod.c:1122 +#: src/usermod.c:1053 #, c-format msgid "%s: error removing password entry\n" msgstr "" -#: src/usermod.c:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "" -#: src/usermod.c:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" msgstr "" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, c-format msgid "%s: cannot rename directory %s to %s\n" msgstr "" -#: src/usermod.c:1333 +#: src/usermod.c:1223 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "" -#: src/usermod.c:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" msgstr "" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" msgstr "" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" "%s: %s is unchanged\n" msgstr "" -#: src/vipw.c:133 +#: src/vipw.c:131 msgid "Couldn't lock file" msgstr "" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" msgstr "" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/po/sk.gmo b/po/sk.gmo index 573f1826..5b0157f7 100644 Binary files a/po/sk.gmo and b/po/sk.gmo differ diff --git a/po/sk.po b/po/sk.po index d1a28b48..be2adb49 100644 --- a/po/sk.po +++ b/po/sk.po @@ -2,22 +2,23 @@ # msgid "" msgstr "" -"Project-Id-Version: shadow\n" +"Project-Id-Version: shadow 4.0.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-26 07:53+0100\n" -"PO-Revision-Date: 2004-05-18 06:30+0200\n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" +"PO-Revision-Date: 2005-04-25 11:14+0200\n" "Last-Translator: Peter KLFMANiK Mann \n" "Language-Team: Slovak \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural= (n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" #: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" msgstr "Varovanie: skupina %s je nezn獺ma\n" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" msgstr "Varovanie: pr穩li禳 mnoho skup穩n\n" @@ -45,17 +46,17 @@ msgstr " Kontaktujte spr獺vcu syst矇mu.\n" msgid " Choose a new password.\n" msgstr " Zvo躂te nov矇 heslo.\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "Za %ld dn穩 uplynie platnos聽 v獺禳ho hesla.\n" -#: libmisc/age.c:174 +#: libmisc/age.c:172 #, c-format msgid "Your password will expire tomorrow.\n" msgstr "Zajtra uplynie platnos聽 v獺禳ho hesla.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:174 #, c-format msgid "Your password will expire today.\n" msgstr "Dnes uplynie platnos聽 v獺禳ho hesla.\n" @@ -70,39 +71,34 @@ msgstr "Ned獺 sa zmeni聽 TTY %s" msgid "Environment overflow\n" msgstr "Preplnenie prostredia\n" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr "Nem繫鱉ete zmeni聽 $%s\n" -#: libmisc/failure.c:230 +#: libmisc/failure.c:229 #, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "%d %s od posledn矇ho prihl獺senia. Posledn矇 bolo %s na %s.\n" +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "" +"%d chybn羸 pokus o prihl獺senie od posledn矇ho prihl獺senia.\n" +"Bol to %s na %s.\n" +msgstr[1] "" +"%d chybn矇 pokusy o prihl獺senie od posledn矇ho prihl獺senia.\n" +"Posledn矇 bolo %s na %s.\n" +msgstr[2] "" +"%d chybn羸ch pokusov o prihl獺senie od posledn矇ho prihl獺senia.\n" +"Posledn矇 bolo %s na %s.\n" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "zlyhan穩" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "zlyhanie" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" msgstr "Pr穩li禳 mnoho prihl獺sen穩.\n" -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "T羸mto heslom sa ned獺 de禳ifrova聽 tajn羸 k躂繳 pre %s.\n" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "Ned獺 sa nastavi聽 tajn羸 k躂繳 pre %s. Je spusten羸 keyserv d矇mon?\n" - #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "M獺te nov繳 po禳tu." @@ -115,7 +111,7 @@ msgstr "Nem獺te 鱉iadnu po禳tu." msgid "You have mail." msgstr "M獺te po禳tu." -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " msgstr "Heslo %s je chybn矇. " @@ -130,20 +126,20 @@ msgstr "passwd: volanie pam_start() zlyhalo, chyba %d\n" msgid "passwd: %s\n" msgstr "passwd: %s\n" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" msgstr "passwd: heslo bolo 繳spe禳ne zmenen矇\n" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "Aktu獺lny adres獺r sa ned獺 nastavi聽 na \"%s\".\n" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" msgstr "鬚iadny adres獺r, nastavujem HOME na /" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr "%s sa ned獺 spusti聽." @@ -158,36 +154,32 @@ msgstr "Chybn羸 koreov羸 adres獺r \"%s\"\n" msgid "Can't change root directory to \"%s\"\n" msgstr "Koreov羸 adres獺r sa ned獺 zmeni聽 na \"%s\".\n" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "volanie malloc(%d) zlyhalo\n" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" msgstr "Nem繫鱉em vyhradi聽 dostatok miesta pre konfiguran矇 繳daje.\n" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format 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:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "Heslo: " -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "Heslo pou鱉穩vate躂a %s:" -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "(Echo zapnut矇)" - -#: src/chage.c:118 +#: src/chage.c:112 #, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" @@ -196,156 +188,149 @@ msgstr "" "Pou鱉itie: chage [-l] [-m min_dn穩] [-M max_dn穩] [-W varovanie]\n" " [-I neinnos聽] [-E uplynutie] [-d posledn羸_de] pou鱉穩vate躂\n" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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:155 +#: src/chage.c:149 msgid "Minimum Password Age" msgstr "Minim獺lna doba platnosti hesla" -#: src/chage.c:161 +#: src/chage.c:155 msgid "Maximum Password Age" msgstr "Maxim獺lna doba platnosti hesla" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" msgstr "Posledn獺 zmena hesla (YYYY-MM-DD)" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" msgstr "Varovanie o uplynut穩 doby platnosti hesla" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "Neinn矇 heslo" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Uplynutie platnosti 繳tu (YYYY-MM-DD)" -#: src/chage.c:238 -#, fuzzy, c-format +#: src/chage.c:231 +#, c-format msgid "Last password change\t\t\t\t\t: " -msgstr "Posledn獺 zmena hesla (YYYY-MM-DD)" +msgstr "Posledn獺 zmena hesla\t\t\t\t\t: " -#: src/chage.c:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 -#, fuzzy, c-format +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 +#, c-format msgid "never\n" -msgstr "Nikdy\n" +msgstr "nikdy\n" -#: src/chage.c:251 -#, fuzzy, c-format +#: src/chage.c:244 +#, c-format msgid "Password expires\t\t\t\t\t: " -msgstr "Platnos聽 hesla uplynie:\t" +msgstr "Platnos聽 hesla uplynie\t\t\t\t\t: " -#: src/chage.c:267 -#, fuzzy, c-format +#: src/chage.c:260 +#, c-format msgid "Password inactive\t\t\t\t\t: " -msgstr "Neinn矇 heslo:\t" +msgstr "Neinn矇 heslo\t\t\t\t\t: " -#: src/chage.c:281 -#, fuzzy, c-format +#: src/chage.c:274 +#, c-format msgid "Account expires\t\t\t\t\t\t: " -msgstr "Platnos聽 繳tu uplynie:\t" +msgstr "Platnos聽 繳tu uplynie\t\t\t\t\t\t: " -#: src/chage.c:297 +#: src/chage.c:290 #, c-format msgid "Minimum number of days between password change\t\t: %ld\n" -msgstr "" +msgstr "Minim獺lny poet dn穩 medzi zmenami hesla\t\t: %ld\n" -#: src/chage.c:298 +#: src/chage.c:292 #, c-format msgid "Maximum number of days between password change\t\t: %ld\n" -msgstr "" +msgstr "Maxim獺lny poet dn穩 medzi zmenami hesla\t\t: %ld\n" -#: src/chage.c:299 +#: src/chage.c:294 #, c-format msgid "Number of days of warning before password expires\t: %ld\n" -msgstr "" +msgstr "Poet dn穩 upozornenia pred vypr禳an穩m platnosti hesla\t: %ld\n" -#: src/chage.c:444 +#: src/chage.c:431 #, 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:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 -#, fuzzy, c-format +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 +#, c-format msgid "%s: permission denied.\n" -msgstr "%s: odmietnut羸 pr穩stup\n" +msgstr "%s: odmietnut羸 pr穩stup.\n" # c-format -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 #, c-format msgid "%s: PAM authentication failed\n" msgstr "%s: PAM autentifik獺cia zlyhala\n" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, c-format msgid "%s: can't open password file\n" msgstr "%s: s繳bor s heslami sa ned獺 otvori聽\n" -#: src/chage.c:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "%s: pou鱉穩vate躂 %s je nezn獺my\n" -#: src/chage.c:535 +#: src/chage.c:519 #, c-format msgid "%s: can't lock shadow password file" msgstr "%s: s繳bor s tieov羸mi heslami sa ned獺 zamkn繳聽" -#: src/chage.c:543 +#: src/chage.c:527 #, c-format msgid "%s: can't open shadow password file" msgstr "%s: s繳bor s tieov羸mi heslami sa ned獺 otvori聽" -#: src/chage.c:604 +#: src/chage.c:587 #, 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:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" msgstr "%s: chyba pri zmene polo鱉iek\n" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, c-format msgid "%s: can't update password file\n" msgstr "%s: s繳bor s heslami sa ned獺 aktualizova聽t\n" -#: src/chage.c:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, 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:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "Chyba pri aktualiz獺cii DBM datab獺zy hesiel.\n" - -#: src/chage.c:692 +#: src/chage.c:649 #, 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:740 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite password file\n" msgstr "%s: s繳bor s heslami sa ned獺 prep穩sa聽\n" -#: src/chage.c:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 #, c-format msgid "%s: PAM chauthtok failed\n" msgstr "%s: PAM met籀da chauthok zlyhala\n" @@ -368,117 +353,122 @@ msgstr "" "telef籀n_do_zamestnania]\n" "\t[-h telef籀n_domov]\n" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "Cel矇 meno" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "\tCel矇 meno: %s\n" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "穩slo miestnosti" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "Telef籀n do zamestnania" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" msgstr "Telef籀n domov" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "Ostatn矇" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s: va禳e pou鱉穩vate躂sk矇 meno sa ned獺 zisti聽.\n" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s: na NIC klientovi sa ned獺 zmeni聽 pou鱉穩vate躂 `%s'.\n" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "%s: `%s' je hlavn羸m NIS serverom pre tohto klienta\n" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, c-format +msgid "%s: Permission denied.\n" +msgstr "%s: Odmietnut羸 pr穩stup.\n" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" msgstr "Men穩m inform獺cie o pou鱉穩vate躂ovi %s\n" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s: chybn矇 meno: \"%s\"\n" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s: chybn矇 穩slo miestnosti: \"%s\"\n" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s: telef籀nne 穩slo do zamestnania (\"%s\") je chybn矇\n" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s: telef籀nne 穩slo domov (\"%s\") je chybn矇\n" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s: \"%s\" obsahuje chybn矇 znaky\n" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "%s: polo鱉ka je pr穩li禳 dlh獺\n" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" msgstr "ID sa ned獺 zmeni聽 na root.\n" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" msgstr "Ned獺 sa zamkn繳聽 s繳bor s heslami; sk繳ste to nesk繫r.\n" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" msgstr "S繳bor s heslami sa ned獺 otvori聽.\n" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s: %s sa nenach獺dza v /etc/passwd\n" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" msgstr "Chyba pri aktualiz獺cii z獺znamu hesla.\n" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" msgstr "Nedaj繳 sa vykona聽 zmeny v s繳bore s heslami.\n" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" msgstr "S繳bor s heslami sa ned獺 odomkn繳聽.\n" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -489,54 +479,61 @@ msgid "" " -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n" "\t\t\tpasswords are not encrypted\n" msgstr "" +"Pou鱉itie: chpasswd [vo躂by]\n" +"\n" +"Vo躂by:\n" +" -e, --encrypted\tzadan矇 hesl獺 s繳 zak籀dovan矇\n" +" -h, --help\t\tvyp穩禳e t繳to n獺povedu a ukon穩 sa\n" +" -m, --md5\t\tpou鱉ije MD5 k籀dovanie namiesto DES, ak zadan矇\n" +"\t\t\thesl獺 nie s繳 zak籀dovan矇\n" #: src/chpasswd.c:189 #, c-format msgid "%s: can't lock password file\n" msgstr "%s: s繳bor s heslami sa ned獺 zamkn繳聽\n" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "%s: s繳bor s tieov羸mi heslami sa ned獺 zamkn繳聽\n" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "%s: s繳bor s tieov羸mi heslami sa ned獺 otvori聽\n" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "%s: riadok %d je pr穩li禳 dlh羸\n" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "%s: riadok %d: ch羸ba nov矇 heslo\n" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "%s: riadok %d: pou鱉穩vate躂 %s je nezn獺my\n" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "%s: riadok %d: z獺znam hesla sa ned獺 aktualizova聽\n" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "%s: zisten獺 chyba, zmeny bud繳 zamietnut矇\n" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" msgstr "%s: chyba pri aktualiz獺cii s繳boru s tieov羸mi heslami\n" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" msgstr "%s: chyba pri aktualiz獺cii s繳boru s heslami\n" @@ -546,26 +543,26 @@ msgstr "%s: chyba pri aktualiz獺cii s繳boru s heslami\n" msgid "Usage: %s [-s shell] [name]\n" msgstr "Pou鱉itie: %s [-s shell] [meno]\n" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" msgstr "Predvolen羸 shell" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" msgstr "Nem繫鱉ete zmeni聽 shell pre %s.\n" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" msgstr "Men穩m predvolen羸 shell pre %s\n" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s: Chybn獺 polo鱉ka: %s\n" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" msgstr "Shell %s je neplatn羸.\n" @@ -575,12 +572,12 @@ msgstr "Shell %s je neplatn羸.\n" msgid "Usage: expiry {-f|-c}\n" msgstr "Pou鱉itie: expiry {-f|-c}\n" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" msgstr "%s: VAROVANIE! Mus穩 ma聽 opr獺vnenie root-a!\n" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "%s: nezn獺my pou鱉穩vate躂\n" @@ -594,323 +591,298 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" msgstr "" +"Pou鱉itie: faillog [vo躂by]\n" +"\n" +"Vo躂by:\n" +" -a, --all\t\t\tzobraz穩 faillog z獺znamy v禳etk羸ch pou鱉穩vate躂ov\n" +" -h, --help\t\t\tzobraz穩 t繳to n獺povedu a ukon穩 sa\n" +" -l, --lock-time SEC\t\tpo chybnom prihl獺sen穩 zablokuje 繳et na SEC sek繳nd\n" +" -m, --maximum MAX\t\tnastav穩 maxim獺lny poet chybn羸ch prihl獺sen穩 na MAX\n" +" -r, --reset\t\t\tvynuluje po穩tadl獺 chybn羸ch prihl獺sen穩\n" +" -t, --time DAYS\t\tzobraz穩 faillog z獺znamy nie star禳ie ako DAYS dn穩\n" +" -u, --user LOGIN\t\tzobraz穩 faillog z獺znam alebo nastav穩 po穩tadl獺 " +"chybn羸ch prihl獺sen穩\n" +"\t\t\t\ta limitov (iba s pou鱉it穩m volieb -r, -m or -l)\n" +"\t\t\t\tpre pou鱉穩vate躂a s loginom LOGIN\n" -#: src/faillog.c:86 +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" -msgstr "Meno Ch羸b Maximum Posledn羸\n" +msgid "Login Failures Maximum Latest On\n" +msgstr "Login Chybn矇 Najviac Posledn矇 Na\n" -#: src/faillog.c:103 -#, c-format -msgid " %s on %s" -msgstr " %s na %s" - -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" msgstr " [%lds ostalo]" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr " [%lds z獺mok]" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "Pou鱉穩vate躂 %s je nezn獺my.\n" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "Pou鱉itie: %s [-r|-R] skupina\n" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr " %s [-a pou鱉穩vate躂] skupina\n" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr " %s [-d pou鱉穩vate躂] skupina\n" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr " %s [-A pou鱉穩vate躂,...] [-M pou鱉穩vate躂,...] skupina\n" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr " %s [-M pou鱉穩vate躂,...] skupina\n" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" msgstr "%s: prep穩na -A funguje iba s tieov羸mi heslami skup穩n\n" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "Kto ste?\n" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr "skupina %s je nezn獺ma\n" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "Prid獺vam pou鱉穩vate躂a %s do skupiny %s.\n" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "Odstraujem pou鱉穩vate躂a %s zo skupiny %s\n" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" msgstr "%s: len %s je nezn獺my\n" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "%s: Nejedn獺 sa o tty\n" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "Men穩m heslo skupiny %s\n" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "Nov矇 heslo: " -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " msgstr "Zadajte znova nov矇 heslo: " -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" msgstr "Nezhoduj繳 sa; sk繳ste to znova" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" msgstr "%s: Sk繳ste to nesk繫r\n" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "%s: ned獺 sa z穩ska聽 z獺mok\n" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" msgstr "%s: ned獺 sa z穩ska聽 z獺mok pre s繳bor s tieov羸mi heslami\n" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "%s: ned獺 sa otvori聽 s繳bor\n" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "%s: polo鱉ka sa ned獺 aktualizova聽\n" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" msgstr "%s: polo鱉ka s繳boru s tieov羸mi heslami sa ned獺 aktualizova聽\n" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "%s: s繳bor sa ned獺 prep穩sa聽\n" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" msgstr "%s: s繳bor s tieov羸mi heslami sa ned獺 prep穩sa聽\n" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "%s: s繳bor sa ned獺 odomkn繳聽\n" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "%s: s繳bory s DBM datab獺zami sa nedaj繳 aktualizova聽\n" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "%s: s繳bory s DBM datab獺zami tieov羸ch hesiel sa nedaj繳 aktualizova聽\n" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "Pou鱉itie: groupadd [-g gid [-o]] [-f] skupina\n" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, 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:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: ned獺 sa prida聽 nov獺 polo鱉ka do s繳boru s dbm datab獺zami skup穩n\n" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "%s: meno %s nie je jedinen矇\n" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" msgstr "%s: uid %u nie je jedinen矇\n" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "%s: ned獺 sa vytvori聽 jedinen矇 gid\n" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, c-format msgid "%s: %s is not a valid group name\n" msgstr "%s: %s nie je platn羸m n獺zvom skupiny\n" -#: src/groupadd.c:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "%s: chybn獺 skupina %s\n" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "%s: prep穩na -O vy鱉aduje argument typu MENO=HODNOTA\n" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s: s繳bor so skupinami sa ned獺 prep穩sa聽\n" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s: s繳bor s tieov羸mi skupinami sa ned獺 prep穩sa聽\n" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" msgstr "%s: s繳bor so skupinami sa ned獺 zamkn繳聽\n" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" msgstr "%s: s繳bor so skupinami sa ned獺 otvori聽\n" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" msgstr "%s: s繳bor s tieov羸mi skupinami sa ned獺 zamkn繳聽\n" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" msgstr "%s: s繳bor s tieov羸mi skupinami sa ned獺 otvori聽\n" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "%s: skupina %s u鱉 existuje\n" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, c-format msgid "Usage: groupdel group\n" msgstr "Pou鱉itie: groupdel skupina\n" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" msgstr "%s: chyba pri odstraovan穩 polo鱉ky zo s繳boru so skupinami\n" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "%s: chyba pri odstraovan穩 polo鱉ky zo s繳boru s dbm datab獺zou skup穩n\n" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "%s: chyba pri odstraovan穩 polo鱉ky zo s繳boru s tieov羸mi skupinami\n" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "" -"%s: chyba pri odstraovan穩 polo鱉ky zo s繳boru s dbm datab獺zou tieov羸ch " -"skup穩n\n" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "%s: prim獺rna skupina pou鱉穩vate躂a sa ned獺 odstr獺ni聽\n" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "%s: skupina %s neexistuje\n" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "%s: skupina %s je NIS skupinou\n" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s: %s je hlavn羸m NIS serverom\n" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "Pou鱉itie: groupmod [-g gid [-o]] [-n meno] skupina\n" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "%s: %s sa nenach獺dza v /etc/group\n" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "" -"%s: ned獺 sa prida聽 polo鱉ka do s繳boru s dbm datab獺zou tieov羸ch skup穩n\n" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s: gid %u nie je jedinen矇\n" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "%s: meno %s nie je jedinen矇\n" @@ -921,110 +893,105 @@ msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "" "Pou鱉itie: %s [-r] [-s] [s繳bor_so_skupinami [s繳bor_s_tieov羸mi_skupinami]]\n" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "Pou鱉itie: %s [-r] [-s] [s繳bor_so_skupinami]\n" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "Nie" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" msgstr "%s: -s a -r nie s繳 zluite躂n矇\n" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "%s: s繳bor %s sa ned獺 zamkn繳聽\n" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "%s: s繳bor %s sa ned獺 otvori聽\n" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" msgstr "chybn獺 polo鱉ka v s繳bore so skupinami\n" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "zmaza聽 riadok `%s'?" -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" msgstr "v s繳bore so skupinami sa vyskytuje zdvojen獺 polo鱉ka\n" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" msgstr "meno skupiny `%s' je chybn矇\n" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "skupina %s: pou鱉穩vate躂 %s neexistuje\n" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " msgstr "zmaza聽 lena `%s'? " -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" msgstr "chybn獺 polo鱉ka v s繳bore s tieov羸mi skupinami\n" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" msgstr "v s繳bore s tieov羸mi skupinami sa vyskytuje zdvojen獺 polo鱉ka\n" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" msgstr "v s繳bore so skupinami neexistuje zodpovedaj繳ca polo鱉ka\n" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" msgstr "tieov獺 skupina %s: administr獺tor %s neexistuje\n" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " msgstr "zmaza聽 administr獺tora `%s'? " -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" msgstr "tieov獺 skupina %s: pou鱉穩vate躂 %s neexistuje\n" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "%s: s繳bor %s sa ned獺 aktualizova聽\n" -#: src/grpck.c:647 src/pwck.c:612 -#, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: s繳bory boli aktualizovan矇; spus聽te mkpasswd\n" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format -msgid "%s: no changes\n" -msgstr "%s: bezo zmien\n" - -#: src/grpck.c:651 src/pwck.c:616 +#: src/grpck.c:640 src/pwck.c:606 #, c-format msgid "%s: the files have been updated\n" msgstr "%s: s繳bory boli aktualizovan矇\n" +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "%s: bezo zmien\n" + #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" @@ -1040,37 +1007,37 @@ msgstr "%s: s繳bor so skupinami sa ned獺 otvori聽\n" msgid "%s: can't lock shadow group file\n" msgstr "%s: s繳bor s tieov羸mi skupinami sa ned獺 zamkn繳聽\n" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" msgstr "%s: s繳bor s tieov羸mi skupinami sa ned獺 otvori聽\n" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "%s: polo鱉ka tieovej skupiny %s sa ned獺 odstr獺ni聽\n" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "%s: polo鱉ka %s s繳boru s tieov羸mi heslami sa ned獺 aktualizova聽\n" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "%s: polo鱉ka skupiny %s sa ned獺 odstr獺ni聽\n" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" msgstr "%s: s繳bor s tieov羸mi heslami sa ned獺 aktualizova聽\n" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" msgstr "%s: s繳bor s heslami sa ned獺 aktualizova聽\n" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "%s: s繳bor s tieov羸mi heslami skup穩n sa ned獺 zmaza聽\n" @@ -1090,52 +1057,59 @@ msgstr "Pou鱉itie: id\n" msgid " groups=" msgstr " skupiny=" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" +"Pou鱉itie: lastlog [vo躂by]\n" +"\n" +"Vo躂by:\n" +" -u, --login LOGIN\tvyp穩禳e posledn矇 prihl獺senia pou鱉穩vate躂a uveden矇ho ako " +"LOGIN\n" +" -h, --help\t\tzobraz穩 t繳to n獺povedu a ukon穩 sa\n" +" -t, --time DAYS\tvyp穩禳e posledn矇 prihl獺senia nie star禳ie ako DAYS dn穩\n" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" msgstr "Pou鱉穩vate躂 Port Z Naposledy\n" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "Pou鱉穩vate躂 Port Naposledy\n" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "**Nebol nikdy prihl獺sen羸**" -#: src/login.c:175 +#: src/login.c:156 #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Pou鱉itie: %s [-p] [meno]\n" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr " %s [-p] [-h po穩ta] [-f meno]\n" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr " %s [-p] -r po穩ta\n" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" msgstr "Chybn羸 as prihl獺senia\n" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" @@ -1144,7 +1118,7 @@ msgstr "" "\n" "Syst矇m je uzavret羸 kv繫li pravidelnej 繳dr鱉be.\n" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" @@ -1153,7 +1127,7 @@ msgstr "" "\n" "[Odpojenie vynechan矇 -- pou鱉穩vate躂 root sa m繫鱉e prihl獺si聽.]\n" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" @@ -1162,17 +1136,17 @@ msgstr "" "\n" "Uplynul asov羸 limit (%d sek繳nd) na prihl獺senie.\n" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" msgstr " na `%.100s' z `%.200s'" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" msgstr " na `%.100s'" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" @@ -1181,38 +1155,29 @@ msgstr "" "\n" "Prihlasovacie meno na %s: " -#: src/login.c:819 -msgid "login: " -msgstr "Prihlasovacie meno: " - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" msgstr "Chybn矇 prihl獺senie" -#: src/login.c:1198 +#: src/login.c:996 msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "Varovanie: po doasnom z獺kaze je prihlasov獺nie op瓣聽 povolen矇.\n" -#: src/login.c:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "Posledn矇 prihl獺senie: %s na %s" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" msgstr "Posledn矇 prihl獺senie: %.19s na %s" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" msgstr " z %.*s" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "Sp繳禳聽am rad_login\n" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" @@ -1229,9 +1194,9 @@ msgid "%s: cannot open DBM files for %s\n" msgstr "%s: s繳bory s DBM datab獺zami pre %s sa nedaj繳 otvori聽\n" #: src/mkpasswd.c:286 -#, fuzzy, c-format +#, c-format msgid "%s: the line beginning with %.16s... is too long\n" -msgstr "%s: zaiatok s " +msgstr "%s: riadok za穩naj繳ci %.16s... je pr穩li禳 dlh羸\n" #: src/mkpasswd.c:313 #, c-format @@ -1239,31 +1204,31 @@ msgid "%s: error parsing line \"%s\"\n" msgstr "%s: chyba pri spracovan穩 riadku \"%s\"\n" #: src/mkpasswd.c:321 src/mkpasswd.c:326 src/mkpasswd.c:331 src/mkpasswd.c:336 -#, fuzzy, c-format +#, c-format msgid "adding record for name %s\n" -msgstr "prid獺vam z獺znam pre meno" +msgstr "prid獺vam z獺znam pre meno %s\n" #: src/mkpasswd.c:342 src/mkpasswd.c:348 src/mkpasswd.c:353 src/mkpasswd.c:358 -#, fuzzy, c-format +#, c-format msgid "%s: error adding record for %s\n" -msgstr "%s: chyba pri prid獺van穩 z獺znamu pre meno" +msgstr "%s: chyba pri prid獺van穩 z獺znamu pre %s\n" #: src/mkpasswd.c:376 #, c-format msgid "added %d entries, longest was %d\n" msgstr "poet pridan羸ch polo鱉iek: %d; d贍鱉ka najv瓣禳ej: %d\n" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "Pou鱉itie: %s [-vf] [-p|g|sp|sg] s繳bor\n" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "Pou鱉itie: %s [-vf] [-p|g|sp] s繳bor\n" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "Pou鱉itie: %s [-vf] [-p|g] s繳bor\n" @@ -1283,16 +1248,16 @@ msgstr "Pou鱉itie: sg skupina [[-c] pr穩kaz]\n" msgid "unknown uid: %u\n" msgstr "uid %u je nezn獺me\n" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" msgstr "gid %lu je nezn獺me\n" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "躅utujem.\n" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "pr穩li禳 mnoho skup穩n\n" @@ -1302,91 +1267,91 @@ msgstr "pr穩li禳 mnoho skup穩n\n" msgid "Usage: %s [input]\n" msgstr "Pou鱉itie: %s [vstup]\n" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "%s: s繳bor /etc/passwd sa ned獺 zamkn繳聽\n" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "%s: s繳bory sa nedaj繳 zamkn繳聽, sk繳ste to nesk繫r znova\n" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "%s: s繳bory sa nedaj繳 otvori聽\n" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "%s: riadok %d: chybn羸 riadok\n" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "%s: riadok %d: ned獺 sa vytvori聽 GID\n" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "%s: riadok %d: ned獺 sa vytvori聽 UID\n" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "%s: riadok %d: ned獺 sa n獺js聽 pou鱉穩vate躂 %s\n" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "%s: riadok %d: heslo sa ned獺 aktualizova聽\n" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "%s: riadok %d: volanie mkdir zlyhalo\n" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "%s: riadok %d: volanie chown zlyhalo\n" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "%s: riadok %d: polo鱉ka sa ned獺 aktualizova聽\n" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "%s: chyba pri aktualiz獺cii s繳borov\n" -#: src/passwd.c:155 +#: src/passwd.c:154 #, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "Pou鱉itie: %s [-f|-s] [meno]\n" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr " %s [-x max] [-n min] [-w varovanie] [-i neinnos聽] meno\n" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} meno\n" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "Star矇 heslo: " -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" msgstr "Chybn矇 heslo pre `%s'\n" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" @@ -1395,16 +1360,16 @@ msgstr "" "Zadajte nov矇 heslo (poet znakov v intervale %d a鱉 %d).\n" "Pou鱉ijte kombin獺ciu ve躂k羸ch a mal羸ch p穩smen s 穩slicami.\n" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "Nov矇 heslo: " -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" msgstr "Sk繳ste to znova.\n" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" @@ -1413,52 +1378,52 @@ msgstr "" "\n" "Varovanie: slab矇 heslo (ak ho chcete naozaj pou鱉i聽, znova ho zadajte).\n" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" msgstr "Nezhoduj繳 sa; sk繳ste to znova.\n" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "Heslo pre %s sa ned獺 zmeni聽.\n" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" msgstr "躅utujem, ale heslo pre %s sa e禳te ned獺 zmeni聽.\n" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "%s: nedostatok pam瓣ti\n" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "%s: %s sa ned獺 spusti聽" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" msgstr "%s: skladisko %s nie je podporovan矇\n" -#: src/passwd.c:914 +#: src/passwd.c:884 #, c-format -msgid "You may not change the password for %s.\n" -msgstr "Nem繫鱉ete meni聽 heslo pre %s.\n" +msgid "%s: You may not view or modify password information for %s.\n" +msgstr "%s: Nem繫鱉ete prezera聽 alebo meni聽 inform獺cie o hesle pre %s.\n" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "Men穩m heslo pou鱉穩vate躂ovi %s\n" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "Heslo pou鱉穩vate躂a %s nebolo zmenen矇.\n" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "Heslo bolo zmenen矇.\n" @@ -1474,49 +1439,49 @@ msgstr "" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "Pou鱉itie: %s [-q] [-r] [-s] [s繳bor_s_heslami]\n" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" msgstr "chybn獺 polo鱉ka v s繳bore s heslami\n" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" msgstr "duplikovan獺 polo鱉ka v s繳bore s heslami\n" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" msgstr "chybn矇 pou鱉穩vate躂sk矇 meno '%s'\n" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "pou鱉穩vate躂 %s: skupina %u neexistuje\n" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "pou鱉穩vate躂 %s: adres獺r %s neexistuje\n" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "pou鱉穩vate躂 %s: program %s neexistuje\n" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" msgstr "chybn獺 polo鱉ka v s繳bore s tieov羸mi heslami\n" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" msgstr "duplikovan獺 polo鱉ka v s繳bore s tieov羸mi heslami\n" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" msgstr "ch羸ba polo鱉ka v s繳bore s heslami\n" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" msgstr "pou鱉穩vate躂 %s: posledn獺 zmena hesla v bud繳cnosti\n" @@ -1536,17 +1501,17 @@ msgstr "%s: s繳bor s heslami sa ned獺 otvori聽\n" msgid "%s: can't remove shadow entry for %s\n" msgstr "%s: polo鱉ka s繳boru s heslami pre pou鱉穩vate躂e %s sa ned獺 odstr獺ni聽\n" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "%s: polo鱉ka s繳boru s heslami pre pou鱉穩vate躂e %s sa ned獺 aktualizova聽\n" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" msgstr "%s: s繳bor s tieov羸mi heslami sa ned獺 aktualizova聽\n" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" msgstr "%s: s繳bor s heslami sa ned獺 aktualizova聽\n" @@ -1556,40 +1521,40 @@ msgstr "%s: s繳bor s heslami sa ned獺 aktualizova聽\n" msgid "%s: can't update entry for user %s\n" msgstr "%s: polo鱉ka pre pou鱉穩vate躂a %s sa ned獺 aktualizova聽\n" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format msgid "%s: can't delete shadow password file\n" msgstr "%s: nem繫鱉ete zmaza聽 s繳bor s tieov羸mi heslami\n" -#: src/su.c:133 +#: src/su.c:132 msgid "Sorry." msgstr "躅utujem." -#: src/su.c:323 +#: src/su.c:320 #, c-format msgid "%s: must be run from a terminal\n" msgstr "%s: mus穩 by聽 spusten矇 z termin獺lu\n" -#: src/su.c:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "%s: pam_start: chyba %d\n" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" msgstr "Id %s je nezn獺me.\n" -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, c-format msgid "You are not authorized to su %s\n" msgstr "Nie ste opr獺vnen穩 pou鱉穩va聽 su %s\n" -#: src/su.c:502 +#: src/su.c:495 msgid "(Enter your own password.)" msgstr "(Zadajte va禳e heslo.)" -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" @@ -1598,22 +1563,22 @@ msgstr "" "%s: %s\n" "(Ignorujem)\n" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" msgstr "鬚iadny shell\n" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr "Z tohto 繳tu je pr穩stup k su ZAKZAN.\n" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "Overenie hesla vynechan矇.\n" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" msgstr "Pre overenie zadajte VAE vlastn矇 heslo.\n" @@ -1628,7 +1593,7 @@ msgstr "S繳bor s heslami neexistuje\n" msgid "No password entry for 'root'\n" msgstr "V datab獺ze nie je polo鱉ka pre pou鱉穩vate躂a 'root'\n" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" @@ -1638,235 +1603,215 @@ 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:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" msgstr "Vstupujem do re鱉imu 繳dr鱉by syst矇mu\n" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "%s: vytvorte znovu datab獺zu skup穩n\n" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "%s: vytvorte znovu datab獺zu tieov羸ch skup穩n\n" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "%s: chybn羸 穩seln羸 argument `%s'\n" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "%s: gid %s je nezn獺me\n" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "%s: skupina %s je nezn獺ma\n" -#: src/useradd.c:475 +#: src/useradd.c:418 #, 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:480 +#: src/useradd.c:423 #, 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:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" msgstr "%s: premenova聽: %s" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s: skupina `%s' je NIS skupinou.\n" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, 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:721 +#: src/useradd.c:660 #, 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:724 +#: src/useradd.c:663 #, c-format 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" -#: src/useradd.c:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, c-format msgid " [-f inactive] [-e expire]\n" msgstr " [-f neinnos聽] [-e uplynutie_lehoty]\n" -#: src/useradd.c:728 +#: src/useradd.c:667 #, c-format msgid " [-p passwd] name\n" msgstr " [-p heslo] meno\n" -#: src/useradd.c:730 +#: src/useradd.c:669 #, 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:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, c-format msgid "%s: error locking group file\n" msgstr "%s: chyba pri zamykan穩 s繳boru so skupinami\n" -#: src/useradd.c:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, c-format msgid "%s: error opening group file\n" msgstr "%s: chyba pri otv獺ran穩 s繳boru so skupinami\n" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, 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:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, 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:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "%s uid %u nie je jedinen矇\n" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "%s: nem繫鱉em z穩ska聽 jedinen矇 uid\n" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "%s: chybn羸 z獺kladn羸 adres獺r `%s'\n" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "%s: chybn羸 koment獺r `%s'\n" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "%s: chybn羸 dom獺ci adres獺r `%s'\n" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s: chybn羸 d獺tum `%s'\n" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "%s: prep穩na -e vy鱉aduje tieov矇 hesl獺\n" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, c-format msgid "%s: shadow passwords required for -f\n" msgstr "%s: prep穩na -f vy鱉aduje tieov矇 hesl獺\n" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" msgstr "%s: chybn獺 polo鱉ka `%s'\n" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "%s: chybn羸 shell `%s'\n" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "%s: chybn矇 pou鱉穩vate躂sk矇 meno `%s'\n" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "%s: s繳bor s heslami sa ned獺 prep穩sa聽\n" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, 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:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, c-format msgid "%s: unable to lock password file\n" msgstr "%s: s繳bor s heslami sa ned獺 zamkn繳聽\n" -#: src/useradd.c:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, c-format msgid "%s: unable to open password file\n" msgstr "%s: s繳bor s heslami sa ned獺 otvori聽\n" -#: src/useradd.c:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, 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:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, 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:1459 +#: src/useradd.c:1354 #, 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:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "%s: chyba pri aktualiz獺cii polo鱉ky dbm datab獺zy hesiel\n" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, 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:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s: chyba pri aktualiz獺cii polo鱉ky dbm datab獺zy tieov羸ch hesiel\n" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" msgstr "%s: ned獺 sa vytvori聽 adres獺r %s\n" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, 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:1590 +#: src/useradd.c:1446 #, 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:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "%s: pou鱉穩vate躂 %s u鱉 existuje\n" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" @@ -1874,205 +1819,170 @@ msgstr "" "%s: skupina %s u鱉 existuje - ak chcete prida聽 tohto pou鱉穩vate躂a do tejto " "skupiny, pou鱉ijte -g.\n" -#: src/useradd.c:1767 +#: src/useradd.c:1602 #, 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" -#: src/userdel.c:124 +#: src/userdel.c:108 #, c-format msgid "Usage: %s [-r] name\n" msgstr "Pou鱉itie: %s [-r] meno\n" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" msgstr "%s: polo鱉ka s繳boru so skupinami sa ned獺 aktualizova聽\n" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "%s: polo鱉ka dbm datab獺zy skup穩n sa ned獺 aktualizova聽\n" - -#: src/userdel.c:214 -#, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: polo鱉ka dbm datab獺zy skup穩n sa ned獺 odstr獺ni聽\n" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "%s: s繳bor so skupinami sa ned獺 otvori聽\n" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "%s: s繳bor s tieov羸mi skupinami sa ned獺 otvori聽\n" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "%s: chyba pri odstraovan穩 polo鱉ky zo s繳boru s heslami\n" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "%s: chyba pri odstraovan穩 polo鱉ky zo s繳boru s tieov羸mi heslami\n" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "%s: chyba pri odstraovan穩 polo鱉ky z dbm datab獺zy hesiel\n" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s: chyba pri odstraovan穩 polo鱉ky z dbm datab獺zy tieov羸ch hesiel\n" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "%s: pou鱉穩vate躂 %s je pr獺ve prihl獺sen羸\n" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "%s: vlastn穩kom %s nie je %s, nema鱉em ho\n" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " msgstr "%s: varovanie: nem繫鱉em zmaza聽 " -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" msgstr "%s: pou鱉穩vate躂 %s neexistuje\n" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s: pou鱉穩vate躂 %s je NIS pou鱉穩vate躂om\n" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "%s: adres獺r %s nebudem maza聽 (je to dom獺ci adres獺r pou鱉穩vate躂a %s)\n" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "%s: chyba pri mazan穩 adres獺ra %s\n" -#: src/usermod.c:306 +#: src/usermod.c:289 #, c-format msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "Pou鱉itie: %s\t[-u uid [-o]] [-g skupina [-G skupina,...] \n" -#: src/usermod.c:310 +#: src/usermod.c:293 #, 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:313 +#: src/usermod.c:296 #, c-format msgid "[-f inactive] [-e expire] " msgstr "[-f neinnos聽] [-e uplynutie_lehoty] " -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p heslo] [-L|-U] meno\n" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" msgstr "%s nedostatok pam瓣ti v update_group\n" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "%s: nedostatok pam瓣ti v update_gshadow\n" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "%s: 鱉iadne prep穩nae\n" -#: src/usermod.c:965 +#: src/usermod.c:903 #, 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:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "%s uid %lu nie je jedinen矇\n" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, 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:1122 +#: src/usermod.c:1053 #, 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:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "%s: chyba pri prid獺van穩 polo鱉ky do dbm datab獺zy hesiel\n" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "%s: chyba pri odstraovan穩 polo鱉ky z dbm datab獺zy hesiel\n" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, 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:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s: chyba pri odstraovan穩 polo鱉ky z dbm datab獺zy tieov羸ch hesiel\n" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "%s: adres獺r %s u鱉 existuje\n" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "%s: %s sa ned獺 vytvori聽\n" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" msgstr "%s: volanie chown pre %s zlyhalo\n" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, 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:1333 +#: src/usermod.c:1223 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "%s: varovanie: vlastn穩kom %s nie je %s\n" -#: src/usermod.c:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" msgstr "chyba pri zmene vlastn穩ka schr獺nky" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" msgstr "chyba pri premenovan穩 schr獺nky" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" @@ -2081,20 +1991,20 @@ msgstr "" "\n" "%s: %s je bezo zmien\n" -#: src/vipw.c:133 +#: src/vipw.c:131 msgid "Couldn't lock file" msgstr "S繳bor sa ned獺 zamkn繳聽" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" msgstr "Z獺lohovanie sa ned獺 vykona聽" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s: %s sa ned獺 obnovi聽: %s (zmeny s繳 v %s)\n" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/po/sq.gmo b/po/sq.gmo index e07d0002..6ab2ae8d 100644 Binary files a/po/sq.gmo and b/po/sq.gmo differ diff --git a/po/sq.po b/po/sq.po index b26539fa..66f95ed5 100644 --- a/po/sq.po +++ b/po/sq.po @@ -8,20 +8,21 @@ msgid "" msgstr "" "Project-Id-Version: shadow 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-26 07:53+0100\n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" "PO-Revision-Date: 2004-11-20 03:28+0100\n" "Last-Translator: Elian Myftiu \n" "Language-Team: Albanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" msgstr "Kujdes: grup i panjohur %s\n" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" msgstr "Kujdes: ka shum禱 grupe\n" @@ -49,17 +50,17 @@ msgstr " Kontakto administratorin e sistemit.\n" msgid " Choose a new password.\n" msgstr " Zgjidh nj禱 fjal禱kalim t禱 ri.\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "" -#: libmisc/age.c:174 +#: libmisc/age.c:172 #, c-format msgid "Your password will expire tomorrow.\n" msgstr "" -#: libmisc/age.c:176 +#: libmisc/age.c:174 #, c-format msgid "Your password will expire today.\n" msgstr "" @@ -74,39 +75,27 @@ msgstr "" msgid "Environment overflow\n" msgstr "" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr "" -#: libmisc/failure.c:230 +#: libmisc/failure.c:229 #, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "" +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "" +msgstr[1] "" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" msgstr "" -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "" - #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "" @@ -119,7 +108,7 @@ msgstr "" msgid "You have mail." msgstr "" -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " msgstr "" @@ -134,20 +123,20 @@ msgstr "" msgid "passwd: %s\n" msgstr "" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" msgstr "" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" msgstr "" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr "" @@ -162,189 +151,178 @@ msgstr "" msgid "Can't change root directory to \"%s\"\n" msgstr "" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" msgstr "" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "" -#: lib/pwauth.c:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "" -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "" -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "" - -#: src/chage.c:118 +#: src/chage.c:112 #, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" " [-I inactive] [-E expire] [-d last_day] user\n" msgstr "" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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:155 +#: src/chage.c:149 msgid "Minimum Password Age" msgstr "" -#: src/chage.c:161 +#: src/chage.c:155 msgid "Maximum Password Age" msgstr "" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" msgstr "" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" msgstr "" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "" -#: src/chage.c:238 +#: src/chage.c:231 #, c-format msgid "Last password change\t\t\t\t\t: " msgstr "" -#: src/chage.c:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 #, c-format msgid "never\n" msgstr "" -#: src/chage.c:251 +#: src/chage.c:244 #, c-format msgid "Password expires\t\t\t\t\t: " msgstr "" -#: src/chage.c:267 +#: src/chage.c:260 #, fuzzy, c-format msgid "Password inactive\t\t\t\t\t: " msgstr "Fjal禱kalimi yt nuk 禱sht禱 aktiv." -#: src/chage.c:281 +#: src/chage.c:274 #, c-format msgid "Account expires\t\t\t\t\t\t: " msgstr "" -#: src/chage.c:297 +#: src/chage.c:290 #, c-format msgid "Minimum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:298 +#: src/chage.c:292 #, c-format msgid "Maximum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:299 +#: src/chage.c:294 #, c-format msgid "Number of days of warning before password expires\t: %ld\n" msgstr "" -#: src/chage.c:444 +#: src/chage.c:431 #, c-format msgid "%s: do not include \"l\" with other flags\n" msgstr "" -#: src/chage.c:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 #, c-format msgid "%s: permission denied.\n" msgstr "" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 #, c-format msgid "%s: PAM authentication failed\n" msgstr "" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, c-format msgid "%s: can't open password file\n" msgstr "" -#: src/chage.c:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "" -#: src/chage.c:535 +#: src/chage.c:519 #, c-format msgid "%s: can't lock shadow password file" msgstr "" -#: src/chage.c:543 +#: src/chage.c:527 #, c-format msgid "%s: can't open shadow password file" msgstr "" -#: src/chage.c:604 +#: src/chage.c:587 #, c-format msgid "Changing the aging information for %s\n" msgstr "" -#: src/chage.c:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" msgstr "" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, c-format msgid "%s: can't update password file\n" msgstr "" -#: src/chage.c:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" msgstr "" -#: src/chage.c:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "" - -#: src/chage.c:692 +#: src/chage.c:649 #, c-format msgid "%s: can't rewrite shadow password file\n" msgstr "" -#: src/chage.c:740 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite password file\n" msgstr "" -#: src/chage.c:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 #, c-format msgid "%s: PAM chauthtok failed\n" msgstr "" @@ -361,117 +339,122 @@ msgstr "" msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" msgstr "" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" msgstr "" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, c-format +msgid "%s: Permission denied.\n" +msgstr "" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" msgstr "" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" msgstr "" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" msgstr "" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" msgstr "" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" msgstr "" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" msgstr "" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" msgstr "" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -488,48 +471,48 @@ msgstr "" msgid "%s: can't lock password file\n" msgstr "" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" msgstr "" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" msgstr "" @@ -539,26 +522,26 @@ msgstr "" msgid "Usage: %s [-s shell] [name]\n" msgstr "" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" msgstr "" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" msgstr "" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" msgstr "" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" msgstr "" @@ -568,12 +551,12 @@ msgstr "" msgid "Usage: expiry {-f|-c}\n" msgstr "" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" msgstr "" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "" @@ -587,320 +570,285 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" msgstr "" -#: src/faillog.c:86 +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" +msgid "Login Failures Maximum Latest On\n" msgstr "" -#: src/faillog.c:103 -#, c-format -msgid " %s on %s" -msgstr "" - -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" msgstr "" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr "" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr "" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr "" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr "" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr "" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" msgstr "" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr "" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" msgstr "" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "" -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " msgstr "" -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" msgstr "" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" msgstr "" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" msgstr "" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" msgstr "" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" msgstr "" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, c-format msgid "%s: error adding new group entry\n" msgstr "" -#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" msgstr "" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, c-format msgid "%s: %s is not a valid group name\n" msgstr "" -#: src/groupadd.c:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" msgstr "" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" msgstr "" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" msgstr "" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" msgstr "" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, c-format msgid "Usage: groupdel group\n" msgstr "" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" msgstr "" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "" @@ -910,110 +858,105 @@ msgstr "" msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" msgstr "" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" msgstr "" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "" -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" msgstr "" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" msgstr "" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " msgstr "" -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" msgstr "" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" msgstr "" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" msgstr "" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" msgstr "" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " msgstr "" -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" msgstr "" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "" -#: src/grpck.c:647 src/pwck.c:612 -#, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format -msgid "%s: no changes\n" -msgstr "" - -#: src/grpck.c:651 src/pwck.c:616 +#: src/grpck.c:640 src/pwck.c:606 #, c-format msgid "%s: the files have been updated\n" msgstr "" +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "" + #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" @@ -1029,37 +972,37 @@ msgstr "" msgid "%s: can't lock shadow group file\n" msgstr "" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" msgstr "" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" msgstr "" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" msgstr "" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "" @@ -1079,121 +1022,112 @@ msgstr "" msgid " groups=" msgstr "" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" msgstr "" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "" -#: src/login.c:175 +#: src/login.c:156 #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr "" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr "" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" msgstr "" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" "System closed for routine maintenance\n" msgstr "" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" "[Disconnect bypassed -- root login allowed.]\n" msgstr "" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" "Login timed out after %d seconds.\n" msgstr "" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" msgstr "" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" msgstr "" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" "%s login: " msgstr "" -#: src/login.c:819 -msgid "login: " -msgstr "" - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" msgstr "" -#: src/login.c:1198 +#: src/login.c:996 msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "" -#: src/login.c:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" msgstr "" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" msgstr "" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" @@ -1234,17 +1168,17 @@ msgstr "" msgid "added %d entries, longest was %d\n" msgstr "" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "" @@ -1264,16 +1198,16 @@ msgstr "" msgid "unknown uid: %u\n" msgstr "" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" msgstr "" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "" @@ -1283,159 +1217,159 @@ msgstr "" msgid "Usage: %s [input]\n" msgstr "" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "" -#: src/passwd.c:155 +#: src/passwd.c:154 #, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr "" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr "" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "" -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" msgstr "" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" "Please use a combination of upper and lower case letters and numbers.\n" msgstr "" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "" -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" msgstr "" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" "Warning: weak password (enter it again to use it anyway).\n" msgstr "" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" msgstr "" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" msgstr "" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" msgstr "" -#: src/passwd.c:914 +#: src/passwd.c:884 #, c-format -msgid "You may not change the password for %s.\n" +msgid "%s: You may not view or modify password information for %s.\n" msgstr "" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "" @@ -1450,49 +1384,49 @@ msgstr "" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" msgstr "" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" msgstr "" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" msgstr "" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" msgstr "" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" msgstr "" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" msgstr "" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" msgstr "" @@ -1512,17 +1446,17 @@ msgstr "" msgid "%s: can't remove shadow entry for %s\n" msgstr "" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" msgstr "" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" msgstr "" @@ -1532,62 +1466,62 @@ msgstr "" msgid "%s: can't update entry for user %s\n" msgstr "" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format msgid "%s: can't delete shadow password file\n" msgstr "" -#: src/su.c:133 +#: src/su.c:132 msgid "Sorry." msgstr "" -#: src/su.c:323 +#: src/su.c:320 #, c-format msgid "%s: must be run from a terminal\n" msgstr "" -#: src/su.c:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" msgstr "" -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, c-format msgid "You are not authorized to su %s\n" msgstr "" -#: src/su.c:502 +#: src/su.c:495 msgid "(Enter your own password.)" msgstr "" -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" "(Ignored)\n" msgstr "" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" msgstr "" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr "" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" msgstr "" @@ -1602,464 +1536,409 @@ msgstr "" msgid "No password entry for 'root'\n" msgstr "" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" "(or give root password for system maintenance):" msgstr "" -#: src/sulogin.c:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" msgstr "" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "" -#: src/useradd.c:475 +#: src/useradd.c:418 #, c-format msgid "%s: cannot create new defaults file\n" msgstr "" -#: src/useradd.c:480 +#: src/useradd.c:423 #, c-format msgid "%s: cannot open new defaults file\n" msgstr "" -#: src/useradd.c:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" msgstr "" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "" -#: src/useradd.c:721 +#: src/useradd.c:660 #, c-format msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n" msgstr "" -#: src/useradd.c:724 +#: src/useradd.c:663 #, c-format msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr "" -#: src/useradd.c:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, c-format msgid " [-f inactive] [-e expire]\n" msgstr "" -#: src/useradd.c:728 +#: src/useradd.c:667 #, c-format msgid " [-p passwd] name\n" msgstr "" -#: src/useradd.c:730 +#: src/useradd.c:669 #, c-format msgid " useradd -D [-g group] [-b base] [-s shell]\n" msgstr "" -#: src/useradd.c:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, c-format msgid "%s: error locking group file\n" msgstr "" -#: src/useradd.c:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, c-format msgid "%s: error opening group file\n" msgstr "" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, c-format msgid "%s: error locking shadow group file\n" msgstr "" -#: src/useradd.c:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, c-format msgid "%s: error opening shadow group file\n" msgstr "" -#: src/useradd.c:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, c-format msgid "%s: shadow passwords required for -f\n" msgstr "" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" msgstr "" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "" -#: src/useradd.c:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, c-format msgid "%s: unable to lock password file\n" msgstr "" -#: src/useradd.c:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, c-format msgid "%s: unable to open password file\n" msgstr "" -#: src/useradd.c:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, c-format msgid "%s: cannot lock shadow password file\n" msgstr "" -#: src/useradd.c:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, c-format msgid "%s: cannot open shadow password file\n" msgstr "" -#: src/useradd.c:1459 +#: src/useradd.c:1354 #, c-format msgid "%s: error adding new password entry\n" msgstr "" -#: src/useradd.c:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, c-format msgid "%s: error adding new shadow password entry\n" msgstr "" -#: src/useradd.c:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" msgstr "" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, c-format msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n" msgstr "" -#: src/useradd.c:1590 +#: src/useradd.c:1446 #, c-format msgid "Can't create mail spool for user %s.\n" msgstr "" -#: src/useradd.c:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" msgstr "" -#: src/useradd.c:1767 +#: src/useradd.c:1602 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" msgstr "" -#: src/userdel.c:124 +#: src/userdel.c:108 #, c-format msgid "Usage: %s [-r] name\n" msgstr "" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" msgstr "" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "" - -#: src/userdel.c:214 -#, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " msgstr "" -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" msgstr "" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "" -#: src/usermod.c:306 +#: src/usermod.c:289 #, c-format msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "" -#: src/usermod.c:310 +#: src/usermod.c:293 #, c-format msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n" msgstr "" -#: src/usermod.c:313 +#: src/usermod.c:296 #, c-format msgid "[-f inactive] [-e expire] " msgstr "" -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" msgstr "" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "" -#: src/usermod.c:965 +#: src/usermod.c:903 #, c-format msgid "%s: shadow passwords required for -e and -f\n" msgstr "" -#: src/usermod.c:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, c-format msgid "%s: error changing password entry\n" msgstr "" -#: src/usermod.c:1122 +#: src/usermod.c:1053 #, c-format msgid "%s: error removing password entry\n" msgstr "" -#: src/usermod.c:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "" -#: src/usermod.c:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" msgstr "" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, c-format msgid "%s: cannot rename directory %s to %s\n" msgstr "" -#: src/usermod.c:1333 +#: src/usermod.c:1223 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "" -#: src/usermod.c:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" msgstr "" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" msgstr "" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" "%s: %s is unchanged\n" msgstr "" -#: src/vipw.c:133 +#: src/vipw.c:131 msgid "Couldn't lock file" msgstr "" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" msgstr "" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/po/sv.gmo b/po/sv.gmo index 6c73b3d2..4bb48a23 100644 Binary files a/po/sv.gmo and b/po/sv.gmo differ diff --git a/po/sv.po b/po/sv.po index c3456372..9e9227e7 100644 --- a/po/sv.po +++ b/po/sv.po @@ -5,20 +5,21 @@ msgid "" msgstr "" "Project-Id-Version: shadow 19990709\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-26 07:53+0100\n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" "PO-Revision-Date: 1999-08-16 21:20+0100\n" "Last-Translator: Kristoffer Br疇nemyr \n" "Language-Team: sv \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" msgstr "Varning: ok瓣nd grupp %s\n" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" msgstr "Varning: f繹r m疇nga grupper\n" @@ -46,17 +47,17 @@ msgstr " Kontakta systemoperat繹ren.\n" msgid " Choose a new password.\n" msgstr " V瓣lj ett nytt l繹senord.\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "Ditt l繹senord upph繹r om %ld dagar.\n" -#: libmisc/age.c:174 +#: libmisc/age.c:172 #, c-format msgid "Your password will expire tomorrow.\n" msgstr "Ditt l繹senord upph繹r imorgon.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:174 #, c-format msgid "Your password will expire today.\n" msgstr "Ditt l繹senord upph繹r idag.\n" @@ -71,40 +72,27 @@ msgstr "Kunde inte byta tty %s" msgid "Environment overflow\n" msgstr "Milj繹n 繹verfl繹dades\n" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr "Du f疇r inte 瓣ndra $%s\n" -#: libmisc/failure.c:230 -#, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "%d %s sedan f繹rra inloggningen. Den sista var %s p疇 %s.\n" +#: libmisc/failure.c:229 +#, fuzzy, c-format +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "%d %s sedan f繹rra inloggningen. Den sista var %s p疇 %s.\n" +msgstr[1] "%d %s sedan f繹rra inloggningen. Den sista var %s p疇 %s.\n" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "felaktiga inloggningar" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "felaktig inloggning" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" msgstr "F繹r m疇nga inloggningar.\n" -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "L繹senordet avkrypterar inte den hemliga nyckeln f繹r %s.\n" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "" -"Kunde inte s瓣tta den hemliga nyckeln f繹r %s: 瓣r keyserv demonen ig疇ng?\n" - #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "Du har ny post." @@ -117,7 +105,7 @@ msgstr "Ingen post." msgid "You have mail." msgstr "Du har post." -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " msgstr "Felaktigt l繹senord: %s. " @@ -132,20 +120,20 @@ msgstr "passwd: pam_start() misslyckades, fel %d\n" msgid "passwd: %s\n" msgstr "passwd: %s\n" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" msgstr "" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "Kunde inte byta aktuell katalog till \"%s\"\n" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" msgstr "Ingen hemkatalog, loggar in med HOME=/" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr "Kan inte starta %s" @@ -160,35 +148,31 @@ msgstr "Felaktig rotkatalog \"%s\"\n" msgid "Can't change root directory to \"%s\"\n" msgstr "Kan inte byta rotkatalog till \"%s\"\n" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "malloc(%d) misslyckades\n" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" msgstr "Kunde inte allokera rum f繹r konfigureringsinformation.\n" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "konfigurerings fel - ok瓣nt object \"%s\" (meddela systemoperat繹ren)\n" -#: lib/pwauth.c:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "L繹senord: " -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "L繹senord f繹r %s: " -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "" - -#: src/chage.c:118 +#: src/chage.c:112 #, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" @@ -197,154 +181,147 @@ msgstr "" "Anv瓣ndning: chage [-l] [-m min_dagar] [-M max_dagar] [-W varna]\n" " [-I inaktiv] [-E utg疇ng] [-d senaste_dag] anv瓣ndare\n" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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:155 +#: src/chage.c:149 msgid "Minimum Password Age" msgstr "Minsta l繹senords疇lder" -#: src/chage.c:161 +#: src/chage.c:155 msgid "Maximum Password Age" msgstr "H繹gsta l繹senords疇lder" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" msgstr "Senaste l繹senords瓣ndring (-MM-DD)" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" msgstr "L繹senords upph繹rningsvarning" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "L繹senord inaktivt" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Kontot upph繹r (-MM-DD)" -#: src/chage.c:238 +#: src/chage.c:231 #, fuzzy, c-format msgid "Last password change\t\t\t\t\t: " msgstr "Senaste l繹senords瓣ndring (-MM-DD)" -#: src/chage.c:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 #, fuzzy, c-format msgid "never\n" msgstr "Aldrig\n" -#: src/chage.c:251 +#: src/chage.c:244 #, fuzzy, c-format msgid "Password expires\t\t\t\t\t: " msgstr "L繹senordet upph繹r:\t" -#: src/chage.c:267 +#: src/chage.c:260 #, fuzzy, c-format msgid "Password inactive\t\t\t\t\t: " msgstr "L繹senord inaktiv:\t" -#: src/chage.c:281 +#: src/chage.c:274 #, fuzzy, c-format msgid "Account expires\t\t\t\t\t\t: " msgstr "L繹senordet upph繹r:\t" -#: src/chage.c:297 +#: src/chage.c:290 #, c-format msgid "Minimum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:298 +#: src/chage.c:292 #, c-format msgid "Maximum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:299 +#: src/chage.c:294 #, c-format msgid "Number of days of warning before password expires\t: %ld\n" msgstr "" -#: src/chage.c:444 +#: src/chage.c:431 #, 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:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 #, fuzzy, c-format msgid "%s: permission denied.\n" msgstr "%s: till疇telse nekas\n" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 #, fuzzy, c-format msgid "%s: PAM authentication failed\n" msgstr "%s: fel under till瓣gning av metod f繹r 瓣kthetsbevisning\n" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, c-format msgid "%s: can't open password file\n" msgstr "%s: kan inte 繹ppna l繹senordsfilen\n" -#: src/chage.c:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "%s: ok瓣nd anv瓣ndare %s\n" -#: src/chage.c:535 +#: src/chage.c:519 #, c-format msgid "%s: can't lock shadow password file" msgstr "%s: kan inte l疇sa skuggl繹senordsfilen" -#: src/chage.c:543 +#: src/chage.c:527 #, c-format msgid "%s: can't open shadow password file" msgstr "%s: kan inte 繹ppna skuggl繹senordsfilen" -#: src/chage.c:604 +#: src/chage.c:587 #, c-format msgid "Changing the aging information for %s\n" msgstr "ndrar 疇ldringsinformation f繹r %s\n" -#: src/chage.c:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" msgstr "%s: fel uppstod under byte av f瓣lt\n" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, c-format msgid "%s: can't update password file\n" msgstr "%s: kan inte uppdatera l繹senordsfilen\n" -#: src/chage.c:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" msgstr "%s: kan inte uppdatera skuggl繹senordsfilen\n" -#: src/chage.c:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "Fel under uppdatering av DBM-l繹senordsnoteringen.\n" - -#: src/chage.c:692 +#: src/chage.c:649 #, c-format msgid "%s: can't rewrite shadow password file\n" msgstr "%s: kan inte skriva om skuggl繹senordsfilen\n" -#: src/chage.c:740 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite password file\n" msgstr "%s: kan inte skriva om l繹senordsfilen\n" -#: src/chage.c:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 #, fuzzy, c-format msgid "%s: PAM chauthtok failed\n" msgstr "%s: kan inte l疇sa upp filen\n" @@ -365,117 +342,122 @@ msgstr "" "Anv瓣ndning: %s [-f hela_namnet] [-r rumsnummer] [-w arbetstele] [-h " "hemtele]\n" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "Hela namnet" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "\tHela namnet: %s\n" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "Rumsnummer" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "Arbetstelefonnummer" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" msgstr "Hemtelefonnummer" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "vrigt" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s: Kan inte avg繹ra ditt anv瓣ndarnamn.\n" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s: kan inte 瓣ndra anv瓣ndare \"%s\" p疇 NIS-klienten.\n" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "%s: \"%s\" 瓣r NIS-m瓣stare f繹r denna klient.\n" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, fuzzy, c-format +msgid "%s: Permission denied.\n" +msgstr "%s: till疇telse nekas\n" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" msgstr "ndrar anv瓣ndarinformation f繹r %s\n" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s: felaktigt namn: \"%s\"\n" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s: felaktigt rumsnummer: \"%s\"\n" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s: felaktigt arbetstelefonnummer: \"%s\"\n" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s: felaktigt hemtelefonnummer: \"%s\"\n" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s: \"%s\" inneh疇ller otill疇tna tecken\n" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "%s: f繹r l疇nga f瓣lt\n" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" msgstr "Kan inte 瓣ndra ID till root.\n" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" msgstr "Kan inte l疇sa l繹senordsfilen; f繹rs繹k igen senare.\n" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" msgstr "Kan inte 繹ppna l繹senordsfilen.\n" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s: %s hittades inte i /etc/passwd\n" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" msgstr "Fel under uppdatering av l繹senordsnoteringen.\n" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" msgstr "Kan inte genomf繹ra 瓣ndringar i l繹senordsfilen.\n" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" msgstr "Kan inte l疇sa upp l繹senordsfilen.\n" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -492,48 +474,48 @@ msgstr "" msgid "%s: can't lock password file\n" msgstr "%s: kan inte l疇sa l繹senordsfilen\n" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "%s: kan inte l疇sa skuggfilen\n" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "%s: kan inte 繹ppna skuggfilen\n" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "%s: rad %d: f繹r l疇ng rad\n" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "%s: rad %d: det nya l繹senordet saknas\n" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "%s: rad %d: ok瓣nd anv瓣ndare %s\n" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "%s: rad %d: kan inte uppdatera l繹senordsnoteringen\n" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "%s: fel uppt瓣cktes, 瓣ndringarna ignorerades\n" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" msgstr "%s: fel under uppdatering av skuggfilen\n" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" msgstr "%s: fel under uppdatering av l繹senordsfilen\n" @@ -543,26 +525,26 @@ msgstr "%s: fel under uppdatering av l繹senordsfilen\n" msgid "Usage: %s [-s shell] [name]\n" msgstr "Anv瓣ndning: %s [-s skal] [namn]\n" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" msgstr "Inloggningsskal" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" msgstr "Du f疇r inte 瓣ndra skal 疇t %s.\n" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" msgstr "ndrar inloggningsskal 疇t %s\n" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s: Felaktig notering: %s\n" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" msgstr "%s 瓣r ett felaktigt skal.\n" @@ -572,12 +554,12 @@ msgstr "%s 瓣r ett felaktigt skal.\n" msgid "Usage: expiry {-f|-c}\n" msgstr "Anv瓣ndning: expiry {-f|-c}\n" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" msgstr "%s: VARNING! M疇ste vara set-UID root!\n" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "%s: ok瓣nd anv瓣ndare\n" @@ -591,320 +573,285 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" msgstr "" -#: src/faillog.c:86 +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" -msgstr "Anv瓣ndarnamn Felaktiga inloggningar H繹gsta Senaste\n" +msgid "Login Failures Maximum Latest On\n" +msgstr "" -#: src/faillog.c:103 -#, c-format -msgid " %s on %s" -msgstr " %s p疇 %s" - -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" msgstr " [%lds kvar]" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr " [%lds l疇sning]" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "Ok瓣nd anv瓣ndare: %s\n" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "Anv瓣ndning: %s [-r|-R] grupp\n" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr " %s [-a anv瓣ndare] grupp\n" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr " %s [-d anv瓣ndare] grupp\n" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr " %s [-A anv瓣ndare,...] [-M anv瓣ndare,...] grupp\n" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr " %s [-M anv瓣ndare,...] grupp\n" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" msgstr "%s: skuggruppl繹senord kr瓣vs f繹r -A\n" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "Vem 瓣r du?\n" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr "ok瓣nd grupp: %s\n" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "L瓣gger till anv瓣ndare %s till grupp %s\n" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "Tar bort anv瓣ndare %s fr疇n grupp %s\n" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" msgstr "%s: ok瓣nd medlem %s\n" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "%s: Inte en tty\n" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "ndrar l繹senordet f繹r grupp %s\n" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "Nytt l繹senord: " -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " msgstr "Skriv in det nya l繹senordet igen: " -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" msgstr "De matchar inte; f繹rs繹k igen" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" msgstr "%s: F繹rs繹k igen senare\n" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "%s: kan inte l疇sa\n" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" msgstr "%s: kan inte l疇sa skuggfilen\n" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "%s: kan inte 繹ppna filen\n" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "%s: kan inte uppdatera noteringen\n" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" msgstr "%s: kan inte uppdatera noteringen i skuggfilen\n" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "%s: kan inte skriva om filen\n" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" msgstr "%s: kan inte skriva om skuggfilen\n" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "%s: kan inte l疇sa upp filen\n" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "%s: kan inte uppdatera DBM-filer\n" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "%s: kan inte uppdatera DBM-skuggfiler\n" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "Anv瓣ndning: groupadd [-g gid [-o]] [-f] grupp\n" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, 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:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: kan inte l瓣gga till en ny dbm-gruppnotering\n" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "%s: namnet %s 瓣r inte unikt\n" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" msgstr "%s: gid %u 瓣r inte unikt\n" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "%s: kan inte hitta ett unikt gid\n" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, c-format msgid "%s: %s is not a valid group name\n" msgstr "%s: %s 瓣r inte ett giltigt gruppnamn\n" -#: src/groupadd.c:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "%s: ogiltig grupp %s\n" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "%s: -O kr瓣ver NAME=VRDE\n" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s: kan inte skriva om gruppfilen\n" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s: kan inte skriva om skuggruppfilen\n" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" msgstr "%s: kan inte l疇sa gruppfilen\n" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" msgstr "%s: kan inte 繹ppna gruppfilen\n" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" msgstr "%s: kan inte l疇sa skuggruppfilen\n" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" msgstr "%s: kan inte 繹ppna skuggruppfilen\n" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "%s: grupp %s existerar\n" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, c-format msgid "Usage: groupdel group\n" msgstr "Anv瓣ndning: groupdel grupp\n" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" msgstr "%s: fel under borttagning av gruppnotering\n" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "%s: fel under borttagning av dbm-gruppnotering\n" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "%s: fel under borttagning av skuggruppnotering\n" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "%s: fel under borttagning av dbm-skuggruppnotering\n" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "%s: kan inte ta bort anv瓣ndarens prim瓣ra grupp.\n" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "%s: grupp %s existerar inte\n" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "%s: grupp %s 瓣r en NIS-grupp\n" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s: %s 瓣r NIS-m瓣steren\n" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "Anv瓣ndning: groupmod [-g gid [-o]] [-n namn] grupp\n" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "%s: %s hittades inte i /etc/group\n" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s: kunde inte l瓣gga till en ny dbm-skuggruppnotering\n" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s: %u 瓣r inte ett unikt gid\n" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "%s: %s 瓣r inte ett unikt namn\n" @@ -914,110 +861,105 @@ msgstr "%s: %s 瓣r inte ett unikt namn\n" msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "Anv瓣ndning: %s [-r] [-s] [grupp [gshadow]]\n" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "Anv瓣ndning: %s [-r] [-s] [grupp]\n" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "Nej" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" msgstr "" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "%s: kan inte l疇sa filen %s\n" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "%s: kan inte 繹ppna filen %s\n" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" msgstr "felaktig gruppfilsnotering\n" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "ta bort rad \"%s\"? " -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" msgstr "dubblett av gruppnotering\n" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" msgstr "ogiltigt gruppnamn \"%s\"\n" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "grupp %s: anv瓣ndaren %s finns inte\n" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " msgstr "ta bort medlem \"%s\"? " -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" msgstr "felaktig skuggruppfilsnotering\n" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" msgstr "dubblett av skuggruppfilsnotering\n" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" msgstr "inga matchande gruppfilsnoteringar\n" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" msgstr "skuggrupp %s: finns ingen administrativ anv瓣ndare %s\n" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " msgstr "ta bort administrativa medlemmen \"%s\"? " -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" msgstr "skuggrupp %s: finns ingen anv瓣ndare %s\n" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "%s: kan inte uppdatera filen %s\n" -#: src/grpck.c:647 src/pwck.c:612 -#, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: filerna 瓣r uppdaterade; k繹r mkpasswd\n" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format -msgid "%s: no changes\n" -msgstr "%s: inga 瓣ndringar\n" - -#: src/grpck.c:651 src/pwck.c:616 +#: src/grpck.c:640 src/pwck.c:606 #, c-format msgid "%s: the files have been updated\n" msgstr "%s: filerna 瓣r uppdaterade\n" +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "%s: inga 瓣ndringar\n" + #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" @@ -1033,37 +975,37 @@ msgstr "%s: kan inte 繹ppna gruppfilen\n" msgid "%s: can't lock shadow group file\n" msgstr "%s: kan inte l疇sa skuggruppfilen\n" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" msgstr "%s: kan inte 繹ppna skuggruppfilen\n" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "%s: kan inte ta bort skuggruppen %s\n" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "%s: kan inte uppdatera skuggnoteringen f繹r %s\n" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "%s: kan inte uppdatera noteringen f繹r gruppen %s\n" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" msgstr "%s: kan inte uppdatera skuggruppfilen\n" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" msgstr "%s: kan inte uppdatera gruppfilen\n" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "%s: kan inte ta bort skuggruppfilen\n" @@ -1083,52 +1025,52 @@ msgstr "Anv瓣ndning: id\n" msgid " groups=" msgstr " grupper=" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" msgstr "Anv瓣ndarnamn Port Fr疇n Senaste\n" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "Anv瓣ndarnamn Port Senaste\n" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "**Aldrig inloggad**" -#: src/login.c:175 +#: src/login.c:156 #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Anv瓣ndning: %s [-p] [namn]\n" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr " %s [-p] [-h v瓣rd] [-f namn]\n" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr " %s [-p] -r v瓣rd\n" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" msgstr "Felaktig inloggningstid\n" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" @@ -1137,7 +1079,7 @@ msgstr "" "\n" "Systemet 瓣r st瓣ngt f繹r rutinunderh疇ll\n" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" @@ -1146,7 +1088,7 @@ msgstr "" "\n" "[Nerkoppling kringgicks -- root inloggning till疇ten.]\n" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" @@ -1155,17 +1097,17 @@ msgstr "" "\n" "Inloggningen avbr繹ts efter %d sekunders inaktivitet.\n" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" msgstr " p疇 \"%.100s\" fr疇n \"%.200s\"" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" msgstr " p疇 \"%.100s\"" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" @@ -1174,38 +1116,29 @@ msgstr "" "\n" "%s anv瓣ndare: " -#: src/login.c:819 -msgid "login: " -msgstr "anv瓣ndare: " - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" msgstr "Felaktig inloggning" -#: src/login.c:1198 +#: src/login.c:996 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:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "Senaste inloggning: %s p疇 %s" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" msgstr "Senaste inloggning: %.19s p疇 %s" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" msgstr " fr疇n %.*s" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "Startar rad_login\n" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" @@ -1246,17 +1179,17 @@ msgstr "%s: fel under till瓣gg av notering f繹r " msgid "added %d entries, longest was %d\n" msgstr "lade till %d noteringar, den l瓣ngsta var %d\n" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "Anv瓣ndning: %s [-vf] [-p|g|sp|sg] fil\n" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "Anv瓣ndning: %s [-vf] [-p|g|sp] fil\n" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "Anv瓣ndning: %s [-vf] [-p|g] fil\n" @@ -1276,16 +1209,16 @@ msgstr "Anv瓣ndning: sg grupp [[-c] kommando]\n" msgid "unknown uid: %u\n" msgstr "ok瓣nt uid: %u\n" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" msgstr "ok瓣nt gid: %lu\n" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "Tyv瓣rr.\n" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "f繹r m疇nga grupper\n" @@ -1295,91 +1228,91 @@ msgstr "f繹r m疇nga grupper\n" msgid "Usage: %s [input]\n" msgstr "Anv瓣ndning: %s [indata]\n" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "%s: kan inte l疇sa /etc/passwd.\n" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "%s: kan inte l疇sa filerna, f繹rs繹k igen senare\n" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "%s: kan inte 繹ppna filerna\n" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "%s: rad %d: ogiltig rad\n" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "%s: rad %d: kan inte skapa GID\n" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "%s: rad %d: kan inte skapa UID\n" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "%s: rad %d: kan inte hitta anv瓣ndaren %s\n" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "%s: rad %d: kan inte uppdatera l繹senordet\n" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "%s: rad %d: mkdir misslyckades\n" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "%s: rad %d: chown misslyckades\n" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "%s: rad %d: kan inte uppdatera notering\n" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "%s: kunde inte uppdatera filerna\n" -#: src/passwd.c:155 +#: src/passwd.c:154 #, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "Anv瓣ndning: %s [-f|-s] [namn]\n" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr " %s [-x h繹gst] [-n minst] [-w varna] [-i inaktiv] namn\n" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} namn\n" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "F繹rra l繹senordet: " -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" msgstr "Felaktigt l繹senord f繹r \"%s\"\n" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" @@ -1388,16 +1321,16 @@ msgstr "" "Skriv in det nya l繹senordet (minst %d, h繹gst %d tecken)\n" "Var god anv瓣nd en kombination av versaler, gemener och siffror.\n" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "Nytt l繹senord: " -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" msgstr "F繹rs繹k igen.\n" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" @@ -1406,52 +1339,52 @@ msgstr "" "\n" "Varning: svagt l繹senord (skriv in det igen f繹r att anv瓣nda det 瓣nd疇).\n" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" msgstr "De matchar inte; f繹rs繹k igen.\n" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "L繹senordet f繹r %s kan inte bytas.\n" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" msgstr "Tyv瓣rr, l繹senordet f繹r %s kan inte 瓣ndras 瓣n.\n" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "%s: slut p疇 minne\n" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "%s: Kan inte starta %s" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" msgstr "%s: f繹rvaringsplatsen %s st繹ds ej\n" -#: src/passwd.c:914 -#, c-format -msgid "You may not change the password for %s.\n" +#: src/passwd.c:884 +#, fuzzy, c-format +msgid "%s: You may not view or modify password information for %s.\n" msgstr "Du f疇r inte 瓣ndra l繹senordet f繹r %s.\n" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "ndrar l繹senord f繹r %s\n" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "L繹senordet f繹r %s 瓣r of繹r瓣ndrat.\n" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "L繹senordet 瓣ndrat.\n" @@ -1466,49 +1399,49 @@ msgstr "Anv瓣ndning: %s [-q] [-r] [-s] [passwd [shadow]]\n" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "Anv瓣ndning: %s [-q] [-r] [-s] [passwd]\n" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" msgstr "felaktig notering i l繹senordsfilen\n" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" msgstr "dubblett av l繹senords notering\n" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" msgstr "ogiltigt anv瓣ndarnamn '%s'\n" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "anv瓣ndare %s: ingen grupp %u\n" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "anv瓣ndare %s: katalogen %s finns inte\n" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "anv瓣ndare %s: programmet %s finns inte\n" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" msgstr "felaktig notering i skuggl繹senordsfilen\n" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" msgstr "dubblett av notering i skuggl繹senordsfilen\n" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" msgstr "ingen matchande notering i l繹senordsfilen\n" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" msgstr "anv瓣ndare %s: senaste l繹senords瓣ndring i framtiden\n" @@ -1528,17 +1461,17 @@ msgstr "%s: kan inte 繹ppna l繹senordsfilen\n" msgid "%s: can't remove shadow entry for %s\n" msgstr "%s: kan inte ta bort notering i skuggl繹senordsfilen f繹r %s\n" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "%s: kan inte uppdatera noteringen i l繹senordsfilen f繹r %s\n" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" msgstr "%s: kan inte uppdatera skuggfilen\n" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" msgstr "%s: kan inte uppdatera l繹senordsfilen\n" @@ -1548,40 +1481,40 @@ msgstr "%s: kan inte uppdatera l繹senordsfilen\n" msgid "%s: can't update entry for user %s\n" msgstr "%s: kan inte uppdatera noteringen f繹r anv瓣ndaren %s\n" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format msgid "%s: can't delete shadow password file\n" msgstr "%s: kan inte ta bort skuggl繹senordsfilen\n" -#: src/su.c:133 +#: src/su.c:132 msgid "Sorry." msgstr "Tyv瓣rr." -#: src/su.c:323 +#: src/su.c:320 #, 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:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "%s: pam_start: fel %d\n" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" msgstr "Ok瓣nt id: %s\n" -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, 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:502 +#: src/su.c:495 msgid "(Enter your own password.)" msgstr "(Skriv in ditt eget l繹senord.)" -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" @@ -1590,22 +1523,22 @@ msgstr "" "%s: %s\n" "(Ignorerad)\n" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" msgstr "Inget skal\n" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr "Du har inte beh繹righet att k繹ra su till det kontot.\n" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "Hoppade 繹ver l繹senordskontroll.\n" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" msgstr "Var god skriv in ditt EGET l繹senord som 瓣kthetsbevis.\n" @@ -1620,7 +1553,7 @@ msgstr "Ingen l繹senordsfil\n" msgid "No password entry for 'root'\n" msgstr "Ingen l繹senordsnotering f繹r \"root\"\n" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" @@ -1630,437 +1563,382 @@ 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:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" msgstr "G疇r in i systemunderh疇llsl瓣ge\n" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "%s: bygg om gruppdatabasen\n" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "%s: bygg om skuggruppdatabasen\n" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "%s: ogiltigt numeriskt argument \"%s\"\n" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "%s: ok瓣nt gid %s\n" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "%s: ok瓣nd grupp %s\n" -#: src/useradd.c:475 +#: src/useradd.c:418 #, c-format msgid "%s: cannot create new defaults file\n" msgstr "%s: kan inte skapa en ny standardfil\n" -#: src/useradd.c:480 +#: src/useradd.c:423 #, c-format msgid "%s: cannot open new defaults file\n" msgstr "%s: kan inte skapa en ny standardfil\n" -#: src/useradd.c:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" msgstr "%s: rename: %s" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s: grupp \"%s\" 瓣r en NIS-grupp.\n" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, 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:721 +#: src/useradd.c:660 #, c-format msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n" msgstr "Anv瓣ndning: useradd [-u uid [-o]] [-g grupp] [-G grupp,...] \n" -#: src/useradd.c:724 +#: src/useradd.c:663 #, c-format msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr " [-d hem] [-s skal] [-c kommentar] [-m [-k mall]]\n" -#: src/useradd.c:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, c-format msgid " [-f inactive] [-e expire]\n" msgstr " [-f inaktiv] [-e upph繹r]\n" -#: src/useradd.c:728 +#: src/useradd.c:667 #, c-format msgid " [-p passwd] name\n" msgstr " [-p passwd] namn\n" -#: src/useradd.c:730 +#: src/useradd.c:669 #, c-format msgid " useradd -D [-g group] [-b base] [-s shell]\n" msgstr " useradd -D [-g grupp] [-b bas] [-s skal]\n" -#: src/useradd.c:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, c-format msgid "%s: error locking group file\n" msgstr "%s: fel under l疇sning av gruppfilen\n" -#: src/useradd.c:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, c-format msgid "%s: error opening group file\n" msgstr "%s: fel under 繹ppning av gruppfilen\n" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, c-format msgid "%s: error locking shadow group file\n" msgstr "%s: fel under l疇sning av skuggruppfilen\n" -#: src/useradd.c:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, c-format msgid "%s: error opening shadow group file\n" msgstr "%s: fel under 繹ppning av skuggruppfilen\n" -#: src/useradd.c:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "%s: uid %u 瓣r inte unikt\n" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "%s: kan inte hitta ett unikt uid\n" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "%s: felaktig baskatalog \"%s\"\n" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "%s: felaktig kommentar \"%s\"\n" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "%s: felaktig hemkatalog \"%s\"\n" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s: felaktigt datum \"%s\"\n" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "%s: skuggl繹senord kr瓣vs f繹r -e\n" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, c-format msgid "%s: shadow passwords required for -f\n" msgstr "%s: skuggl繹senord kr瓣vs f繹r -f\n" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" msgstr "%s: felaktigt f瓣lt \"%s\"\n" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "%s: felaktigt skal \"%s\"\n" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "%s: felaktigt anv瓣ndar namn '%s'\n" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "%s: kan inte skriva om l繹senordsfilen\n" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "%s: kan inte skriva om skuggl繹senordsfilen\n" -#: src/useradd.c:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, c-format msgid "%s: unable to lock password file\n" msgstr "%s: kan inte l疇sa l繹senordsfilen\n" -#: src/useradd.c:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, c-format msgid "%s: unable to open password file\n" msgstr "%s: kan inte 繹ppna l繹senordsfilen\n" -#: src/useradd.c:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, c-format msgid "%s: cannot lock shadow password file\n" msgstr "%s: kan inte l疇sa skuggl繹senordsfilen\n" -#: src/useradd.c:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, c-format msgid "%s: cannot open shadow password file\n" msgstr "%s: kan inte 繹ppna skuggl繹senordsfilen\n" -#: src/useradd.c:1459 +#: src/useradd.c:1354 #, c-format msgid "%s: error adding new password entry\n" msgstr "%s: fel under till瓣ggning av ny l繹senordsnotering\n" -#: src/useradd.c:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "%s: fel under uppdatering av dbm-l繹senordsnotering\n" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, 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:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s: fel under uppdatering av dbm-skuggl繹senordsnotering\n" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" msgstr "%s: kan inte skapa katalog %s\n" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, c-format msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n" msgstr "" -#: src/useradd.c:1590 +#: src/useradd.c:1446 #, 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:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "%s: anv瓣ndare %s existerar\n" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" msgstr "" -#: src/useradd.c:1767 +#: src/useradd.c:1602 #, 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" -#: src/userdel.c:124 +#: src/userdel.c:108 #, c-format msgid "Usage: %s [-r] name\n" msgstr "Anv瓣ndning: %s [-r] namn\n" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" msgstr "%s: fel under uppdatering av gruppnotering\n" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "%s: kan inte uppdatera dbm-gruppnotering\n" - -#: src/userdel.c:214 -#, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: kan inte uppdatera dbm-gruppnotering\n" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "%s: kan inte 繹ppna gruppfilen\n" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "%s: kan inte 繹ppna skuggruppfilen\n" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "%s: fel under borttagning av l繹senordsnotering\n" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "%s: fel under borttagning av skuggl繹senordsnotering\n" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "%s: fel under borttagning av dbm-l繹senordsnotering\n" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s: fel under borttagning av dbm-skuggl繹senordsnotering\n" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "%s: anv瓣ndare %s 瓣r inloggad\n" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "%s: %s 瓣gs inte av %s, tar inte bort\n" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " msgstr "%s: varning: kan inte ta bort " -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" msgstr "%s: anv瓣ndare %s finns inte\n" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s: anv瓣ndare %s 瓣r en NIS-anv瓣ndare\n" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "%s: tar inte bort katalogen %s (skulle ta bort hemkatalogen f繹r %s)\n" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "%s: fel under borttagning av katalogen %s\n" -#: src/usermod.c:306 +#: src/usermod.c:289 #, c-format msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "Anv瓣ndning: %s\t[-u uid [-o]] [-g grupp] [-G grupp,...] \n" -#: src/usermod.c:310 +#: src/usermod.c:293 #, 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:313 +#: src/usermod.c:296 #, c-format msgid "[-f inactive] [-e expire] " msgstr "[-f inaktiv] [-e upph繹r] " -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p passwd] [-L|-U] namn\n" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" msgstr "%s: slut p疇 minne i update_group\n" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "%s: slut p疇 minne i update_gshadow\n" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "%s: inga flaggor givna\n" -#: src/usermod.c:965 +#: src/usermod.c:903 #, 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:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "%s: uid %lu 瓣r inte unikt\n" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, c-format msgid "%s: error changing password entry\n" msgstr "%s: fel under 瓣ndring av l繹senordsnotering\n" -#: src/usermod.c:1122 +#: src/usermod.c:1053 #, c-format msgid "%s: error removing password entry\n" msgstr "%s: fel under borttagning av l繹senordsnotering\n" -#: src/usermod.c:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "%s: fel under till瓣ggning av dbm-l繹senordsnotering\n" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "%s: fel under borttagning av dbm-l繹senordsnotering\n" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "%s: fel under borttagning av skuggl繹senordsnotering\n" -#: src/usermod.c:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s: fel under borttagning av dbm-skuggl繹senordsnotering\n" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "%s: katalogen %s existerar\n" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "%s: kan inte skapa %s\n" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" msgstr "%s: kan inte byta 瓣gare p疇 %s\n" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, 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:1333 +#: src/usermod.c:1223 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "%s: varning: %s 瓣gs inte av %s\n" -#: src/usermod.c:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" msgstr "kunde inte byta 瓣gare av brevl疇dan" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" msgstr "kunde inte byta namn p疇 brevl疇dan" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" @@ -2069,20 +1947,20 @@ msgstr "" "\n" "%s: %s 瓣r of繹r瓣ndrad\n" -#: src/vipw.c:133 +#: src/vipw.c:131 msgid "Couldn't lock file" msgstr "Kunde inte l疇sa filen" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" msgstr "Kunde inte g繹ra en backup" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s: kan inte 疇terst瓣lla %s: %s (dina 瓣ndringar 瓣r i %s)\n" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/po/tl.gmo b/po/tl.gmo new file mode 100644 index 00000000..36c0f93e Binary files /dev/null and b/po/tl.gmo differ diff --git a/po/tl.po b/po/tl.po new file mode 100644 index 00000000..1d2fd932 --- /dev/null +++ b/po/tl.po @@ -0,0 +1,1996 @@ +# Tagalog messages for shadow +# shadow/po/tl.po +# Copyright (C) 2005 Software in the Public Interest, Inc. +# This file is distributed under the same license as shadow +# Itong tipunan ay ipinamamahagi sa parehong lisensya ng shadow +# Eric Pareja , 2005 +# This file is maintained by Eric Pareja +# Itong tipunan ay inaalagaan ni Eric Pareja +msgid "" +msgstr "" +"Project-Id-Version: shadow 4.0.7\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" +"PO-Revision-Date: 2005-01-26 22:00+0800\n" +"Last-Translator: Eric Pareja \n" +"Language-Team: Tagalog \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n>1;\n" + +#: libmisc/addgrps.c:56 +#, c-format +msgid "Warning: unknown group %s\n" +msgstr "Babala: hindi kilalang grupo %s\n" + +#: libmisc/addgrps.c:67 +#, c-format +msgid "Warning: too many groups\n" +msgstr "Babala: labis ang dami ng mga grupo\n" + +#: libmisc/age.c:72 +#, c-format +msgid "Your password has expired." +msgstr "Lumampas sa taning ang inyong password." + +#: libmisc/age.c:75 +#, c-format +msgid "Your password is inactive." +msgstr "Ang inyong password ay hindi aktibo." + +#: libmisc/age.c:78 +#, c-format +msgid "Your login has expired." +msgstr "Lumampas sa taning ang inyong login." + +#: libmisc/age.c:90 +msgid " Contact the system administrator.\n" +msgstr " Kausapin ang tagapangasiwa ng sistema.\n" + +#: libmisc/age.c:93 +msgid " Choose a new password.\n" +msgstr " Pumili ng bagong password.\n" + +#: libmisc/age.c:169 +#, c-format +msgid "Your password will expire in %ld days.\n" +msgstr "Ang inyong password ay may taning na %ld na araw.\n" + +#: libmisc/age.c:172 +#, c-format +msgid "Your password will expire tomorrow.\n" +msgstr "Hanggang bukas ang taning ng inyong password.\n" + +#: libmisc/age.c:174 +#, c-format +msgid "Your password will expire today.\n" +msgstr "Mapapaso ang inyong password ngayong araw na ito.\n" + +#: libmisc/chowntty.c:106 +#, c-format +msgid "Unable to change tty %s" +msgstr "Hindi mabago ang tty %s" + +#: libmisc/env.c:155 +#, c-format +msgid "Environment overflow\n" +msgstr "Umapaw ang kapaligiran\n" + +#: libmisc/env.c:194 +#, c-format +msgid "You may not change $%s\n" +msgstr "Hindi niyo maaaring baguhin ang $%s\n" + +#: libmisc/failure.c:229 +#, fuzzy, c-format +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "%d na kabiguan mula sa huling pagpasok. Ang huli ay %s noong %s.\n" +msgstr[1] "%d na kabiguan mula sa huling pagpasok. Ang huli ay %s noong %s.\n" + +#: libmisc/limits.c:397 +#, c-format +msgid "Too many logins.\n" +msgstr "Sobra ang mga login.\n" + +#: libmisc/mail.c:61 libmisc/mail.c:76 +msgid "You have new mail." +msgstr "May bago kang koreo." + +#: libmisc/mail.c:72 +msgid "No mail." +msgstr "Walang koreo." + +#: libmisc/mail.c:74 +msgid "You have mail." +msgstr "Mayroon kang koreo." + +#: libmisc/obscure.c:273 src/passwd.c:181 +#, c-format +msgid "Bad password: %s. " +msgstr "Masamang password: %s. " + +#: libmisc/pam_pass.c:38 +#, c-format +msgid "passwd: pam_start() failed, error %d\n" +msgstr "passwd: sawi ang pam_start(), error %d\n" + +#: libmisc/pam_pass.c:44 +#, c-format +msgid "passwd: %s\n" +msgstr "passwd: %s\n" + +#: libmisc/pam_pass.c:49 +msgid "passwd: password updated successfully\n" +msgstr "" + +#: libmisc/setupenv.c:207 +#, c-format +msgid "Unable to cd to \"%s\"\n" +msgstr "Hindi makalipat sa \"%s\"\n" + +#: libmisc/setupenv.c:215 +msgid "No directory, logging in with HOME=/" +msgstr "Walang directory, pumapasok na ang HOME=/" + +#: libmisc/shell.c:118 +#, c-format +msgid "Cannot execute %s" +msgstr "Hindi mapatakbo ang %s" + +#: libmisc/sub.c:55 +#, c-format +msgid "Invalid root directory \"%s\"\n" +msgstr "Hindi tanggap na root directory \"%s\"\n" + +#: libmisc/sub.c:67 +#, c-format +msgid "Can't change root directory to \"%s\"\n" +msgstr "Hindi mapalitan ang root directory sa \"%s\"\n" + +#: libmisc/xmalloc.c:22 +#, c-format +msgid "malloc(%d) failed\n" +msgstr "sawi ang malloc(%d)\n" + +#: lib/getdef.c:265 +#, c-format +msgid "Could not allocate space for config info.\n" +msgstr "Hindi makareserba ng lugar para sa impormasyong pagsasaayos.\n" + +#: lib/getdef.c:319 +#, c-format +msgid "configuration error - unknown item '%s' (notify administrator)\n" +msgstr "" +"may mali sa pagsasaayos - hindi kilalang item '%s' (ipaalam sa " +"tagapangasiwa)\n" + +#: lib/pwauth.c:45 src/newgrp.c:341 +msgid "Password: " +msgstr "Password: " + +#: lib/pwauth.c:47 +#, c-format +msgid "%s's Password: " +msgstr "Password ni %s: " + +#: src/chage.c:112 +#, fuzzy, c-format +msgid "" +"Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" +" [-I inactive] [-E expire] [-d last_day] user\n" +msgstr "" +"Pag-gamit: %s [-l] [-m min_araw] [-M max_araw] [-W babala]\n" +"\\t[-I inaktibo] [-E paso] [-d huling_araw] gumagamit\n" + +#: src/chage.c:145 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:149 +msgid "Minimum Password Age" +msgstr "Pinakamaliit na Tanda ng Password" + +#: src/chage.c:155 +msgid "Maximum Password Age" +msgstr "Pinakamalaking Tanda ng Password" + +#: src/chage.c:162 +msgid "Last Password Change (YYYY-MM-DD)" +msgstr "Huling Pagpalit ng Password (YYYY-MM-DD)" + +#: src/chage.c:170 +msgid "Password Expiration Warning" +msgstr "Babala ng Paglipas ng Taning ng Password" + +#: src/chage.c:176 +msgid "Password Inactive" +msgstr "Inaktibo ang Password" + +#: src/chage.c:184 +msgid "Account Expiration Date (YYYY-MM-DD)" +msgstr "Hangganan ng Account (YYYY-MM-DD)" + +#: src/chage.c:231 +#, fuzzy, c-format +msgid "Last password change\t\t\t\t\t: " +msgstr "Huling Pagpalit ng Password (YYYY-MM-DD)" + +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 +#, fuzzy, c-format +msgid "never\n" +msgstr "Hindi kailanman\n" + +#: src/chage.c:244 +#, fuzzy, c-format +msgid "Password expires\t\t\t\t\t: " +msgstr "Taning ng Password:\t" + +#: src/chage.c:260 +#, fuzzy, c-format +msgid "Password inactive\t\t\t\t\t: " +msgstr "Inaktibong Password:\t" + +#: src/chage.c:274 +#, fuzzy, c-format +msgid "Account expires\t\t\t\t\t\t: " +msgstr "Mapapaso ang Account:\t" + +#: src/chage.c:290 +#, c-format +msgid "Minimum number of days between password change\t\t: %ld\n" +msgstr "" + +#: src/chage.c:292 +#, 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:294 +#, c-format +msgid "Number of days of warning before password expires\t: %ld\n" +msgstr "" + +#: src/chage.c:431 +#, 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:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 +#, fuzzy, c-format +msgid "%s: permission denied.\n" +msgstr "%s: hindi pinahintulutan\n" + +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 +#, c-format +msgid "%s: PAM authentication failed\n" +msgstr "%s: sawi ang pagpapakilalang PAM\n" + +#: src/chage.c:494 src/chpasswd.c:193 +#, c-format +msgid "%s: can't open password file\n" +msgstr "%s: hindi mabuksan ang tipunang password\n" + +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 +#, c-format +msgid "%s: unknown user %s\n" +msgstr "%s: di kilalang gumagamit %s\n" + +#: src/chage.c:519 +#, c-format +msgid "%s: can't lock shadow password file" +msgstr "%s: hindi maaldaba ang tipunang shadow password" + +#: src/chage.c:527 +#, c-format +msgid "%s: can't open shadow password file" +msgstr "%s: hindi mabuksan ang tipunang shadow password" + +#: src/chage.c:587 +#, c-format +msgid "Changing the aging information for %s\n" +msgstr "Pinapalitan ang impormasyong pagtanda para kay %s\n" + +#: src/chage.c:589 +#, c-format +msgid "%s: error changing fields\n" +msgstr "%s: error sa pagbabago ng mga field\n" + +#: src/chage.c:613 src/pwunconv.c:137 +#, c-format +msgid "%s: can't update password file\n" +msgstr "%s: hindi maapdeyt ang tipunang password\n" + +#: src/chage.c:636 src/pwunconv.c:132 +#, c-format +msgid "%s: can't update shadow password file\n" +msgstr "%s: hindi maapdeyt ang tipunang shadow password\n" + +#: src/chage.c:649 +#, c-format +msgid "%s: can't rewrite shadow password file\n" +msgstr "%s: hindi maisulat-muli ang tipunang shadow password\n" + +#: src/chage.c:693 +#, c-format +msgid "%s: can't rewrite password file\n" +msgstr "%s: hindi maisulat-muli ang tipunang password\n" + +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 +#, c-format +msgid "%s: PAM chauthtok failed\n" +msgstr "%s: sawi ang PAM chauthtok\n" + +#: src/chfn.c:84 +#, c-format +msgid "" +"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n" +"\t[-h home_ph] [-o other] [user]\n" +msgstr "" +"Pag-gamit: %s [-f buong_pangalan] [-r bilang_ng_silid] [-w " +"telepono_trabaho]\n" +"\t[-h telepono_bahay] [-o iba] [gumagamit]\n" + +#: src/chfn.c:89 +#, c-format +msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" +msgstr "" +"Pag-gamit: %s [-f buong_pangalan] [-r bilang_ng_silid] [-w trabaho] [-h " +"bahay]\n" + +#: src/chfn.c:142 +msgid "Full Name" +msgstr "Buong Pangalan" + +#: src/chfn.c:144 +#, c-format +msgid "\tFull Name: %s\n" +msgstr "\tBuong Pangalan: %s\n" + +#: src/chfn.c:147 src/chfn.c:149 +msgid "Room Number" +msgstr "Bilang ng Silid" + +#: src/chfn.c:152 src/chfn.c:154 +msgid "Work Phone" +msgstr "Telepono sa Trabaho" + +#: src/chfn.c:157 src/chfn.c:159 +msgid "Home Phone" +msgstr "Telepono sa Bahay" + +#: src/chfn.c:162 +msgid "Other" +msgstr "Iba pa" + +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 +#, c-format +msgid "%s: Cannot determine your user name.\n" +msgstr "%s: Hindi makilala ang inyong pangalan.\n" + +#: src/chfn.c:350 src/chsh.c:206 +#, c-format +msgid "%s: cannot change user `%s' on NIS client.\n" +msgstr "%s: hindi mapalitan ang gumagamit `%s' sa NIS client.\n" + +#: src/chfn.c:357 src/chsh.c:213 +#, c-format +msgid "%s: `%s' is the NIS master for this client.\n" +msgstr "%s: `%s' ay ang NIS master ng klienteng ito.\n" + +#: src/chfn.c:382 +#, c-format +msgid "%s: Permission denied.\n" +msgstr "%s: Walang pahintulot.\n" + +#: src/chfn.c:446 +#, c-format +msgid "Changing the user information for %s\n" +msgstr "Pinapalitan ang impormasyon tungkol sa gumagamit na si %s\n" + +#: src/chfn.c:454 +#, c-format +msgid "%s: invalid name: \"%s\"\n" +msgstr "%s: hindi tanggap na pangalan: \"%s\"\n" + +#: src/chfn.c:459 +#, c-format +msgid "%s: invalid room number: \"%s\"\n" +msgstr "%s: hindi tanggap na bilang ng silid: \"%s\"\n" + +#: src/chfn.c:465 +#, c-format +msgid "%s: invalid work phone: \"%s\"\n" +msgstr "%s: hindi tanggap na telepono sa trabaho: \"%s\"\n" + +#: src/chfn.c:471 +#, c-format +msgid "%s: invalid home phone: \"%s\"\n" +msgstr "%s: hindi tanggap na telepono sa bahay: \"%s\"\n" + +#: src/chfn.c:478 +#, c-format +msgid "%s: \"%s\" contains illegal characters\n" +msgstr "%s: \"%s\" ay may hindi tanggap na mga karakter\n" + +#: src/chfn.c:491 +#, c-format +msgid "%s: fields too long\n" +msgstr "%s: mahaba masyado ang mga field\n" + +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 +#, c-format +msgid "Cannot change ID to root.\n" +msgstr "Hindi mabago ang ID sa root.\n" + +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 +#, c-format +msgid "Cannot lock the password file; try again later.\n" +msgstr "Hindi maaldaba ang tipunang password; subukan muli mamaya.\n" + +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 +#, c-format +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:519 src/usermod.c:1023 +#, c-format +msgid "%s: %s not found in /etc/passwd\n" +msgstr "%s: hindi nahanap ang %s sa /etc/passwd\n" + +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 +#, c-format +msgid "Error updating the password entry.\n" +msgstr "Error sa pag-apdeyt ng password entry.\n" + +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 +#, c-format +msgid "Cannot commit password file changes.\n" +msgstr "Hindi maisulat ang pagbabago sa tipunang password.\n" + +#: src/chfn.c:578 src/chsh.c:394 +#, c-format +msgid "Cannot unlock the password file.\n" +msgstr "Hindi maalis ang aldaba sa tipunang password.\n" + +#: src/chpasswd.c:71 +#, c-format +msgid "" +"Usage: chpasswd [options]\n" +"\n" +"Options:\n" +" -e, --encrypted\tsupplied passwords are encrypted\n" +" -h, --help\t\tdisplay this help message and exit\n" +" -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n" +"\t\t\tpasswords are not encrypted\n" +msgstr "" +"Pag-gamit: chpasswd [mga option]\n" +"\n" +"Mga option:\n" +" -e, --encrypted\tang mga bigay na mga password ay naka-encrypt\n" +" -h, --help\t\tipakita itong payo na ito at lumabas\n" +" -m, --md5\t\tgamitin ang MD5 encryption imbes na DES kapag ang\n" +"\t\t\tmga ibinigay na mga password ay hindi naka-encrypt\n" + +#: src/chpasswd.c:189 +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: hindi maaldaba ang tipunang password\n" + +#: src/chpasswd.c:201 src/pwconv.c:95 +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s: hindi maaldaba ang tipunang shadow\n" + +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 +#: src/pwunconv.c:94 +#, c-format +msgid "%s: can't open shadow file\n" +msgstr "%s: hindi mabuksan ang tipunang shadow\n" + +#: src/chpasswd.c:230 src/newusers.c:434 +#, c-format +msgid "%s: line %d: line too long\n" +msgstr "%s: linya %d: sobrang haba ng linya\n" + +#: src/chpasswd.c:250 +#, c-format +msgid "%s: line %d: missing new password\n" +msgstr "%s: linya %d: walang bagong password\n" + +#: src/chpasswd.c:274 +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s: linya %d: di kilalang gumagamit %s\n" + +#: src/chpasswd.c:320 +#, c-format +msgid "%s: line %d: cannot update password entry\n" +msgstr "%s: linya %d: hindi ma-apdeyt password entry\n" + +#: src/chpasswd.c:337 src/newusers.c:561 +#, c-format +msgid "%s: error detected, changes ignored\n" +msgstr "%s: may error na naganap, di pinansin ang mga pagbabago\n" + +#: src/chpasswd.c:349 +#, c-format +msgid "%s: error updating shadow file\n" +msgstr "%s: error sa pag-apdeyt ng tipunang shadow\n" + +#: src/chpasswd.c:357 +#, c-format +msgid "%s: error updating password file\n" +msgstr "%s: error sa pag-apdeyt ng tipunang password\n" + +#: src/chsh.c:76 +#, c-format +msgid "Usage: %s [-s shell] [name]\n" +msgstr "Pag-gamit: %s [-s shell] [pangalan]\n" + +#: src/chsh.c:90 +msgid "Login Shell" +msgstr "Login Shell" + +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 +#, c-format +msgid "You may not change the shell for %s.\n" +msgstr "Hindi niyo mapapalitan ang shell para kay %s.\n" + +#: src/chsh.c:288 +#, c-format +msgid "Changing the login shell for %s\n" +msgstr "Pinapalitan ang login shell ni %s\n" + +#: src/chsh.c:300 +#, c-format +msgid "%s: Invalid entry: %s\n" +msgstr "%s: Hindi tanggap na entry: %s\n" + +#: src/chsh.c:305 +#, c-format +msgid "%s is an invalid shell.\n" +msgstr "Ang %s ay hindi tanggap na shell.\n" + +#: src/expiry.c:59 +#, c-format +msgid "Usage: expiry {-f|-c}\n" +msgstr "Pag-gamit: expiry {-f|-c}\n" + +#: src/expiry.c:112 +#, c-format +msgid "%s: WARNING! Must be set-UID root!\n" +msgstr "%s: BABALA! Kailangang naka-set-UID root!\n" + +#: src/expiry.c:122 +#, c-format +msgid "%s: unknown user\n" +msgstr "%s: hindi kilalang gumagamit\n" + +#: src/faillog.c:59 +#, c-format +msgid "" +"Usage: faillog [options]\n" +"\n" +"Options:\n" +" -a, --all\t\t\tdisplay faillog records for all users\n" +" -h, --help\t\t\tdisplay this help message and exit\n" +" -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" +" -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" +" -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" +"\t\t\t\tand limits (if used with -r, -m or -l options) only\n" +"\t\t\t\tfor user with LOGIN\n" +msgstr "" + +#: src/faillog.c:87 +#, c-format +msgid "Login Failures Maximum Latest On\n" +msgstr "" + +#: src/faillog.c:105 +#, c-format +msgid " [%lds left]" +msgstr " [%lds naiwan]" + +#: src/faillog.c:109 +#, c-format +msgid " [%lds lock]" +msgstr " [%lds lock]" + +#: src/faillog.c:353 src/lastlog.c:187 +#, c-format +msgid "Unknown User: %s\n" +msgstr "Di kilalang Gumagamit: %s\n" + +#: src/gpasswd.c:71 +#, fuzzy, c-format +msgid "Usage: %s [-r|-R] group\n" +msgstr "pag-gamit: %s [-r|-R] grupo\n" + +#: src/gpasswd.c:72 +#, c-format +msgid " %s [-a user] group\n" +msgstr " %s [-a gumagamit] grupo\n" + +#: src/gpasswd.c:73 +#, c-format +msgid " %s [-d user] group\n" +msgstr " %s [-d gumagamit] grupo\n" + +#: src/gpasswd.c:76 +#, c-format +msgid " %s [-A user,...] [-M user,...] group\n" +msgstr " %s [-A gumagamit,...] [-M gumagamit,...] grupo\n" + +#: src/gpasswd.c:78 +#, c-format +msgid " %s [-M user,...] group\n" +msgstr " %s [-M gumagamit,...] grupo\n" + +#: src/gpasswd.c:229 +#, c-format +msgid "%s: shadow group passwords required for -A\n" +msgstr "%s: kailangan ng password ng grupong shadow para sa -A\n" + +#: src/gpasswd.c:280 +#, c-format +msgid "Who are you?\n" +msgstr "Sino ka?\n" + +#: src/gpasswd.c:299 src/newgrp.c:290 +#, c-format +msgid "unknown group: %s\n" +msgstr "di kilalang grupo: %s\n" + +#: src/gpasswd.c:408 +#, c-format +msgid "Adding user %s to group %s\n" +msgstr "Dinadagdag ang gumagamit na si %s sa grupong %s\n" + +#: src/gpasswd.c:426 +#, c-format +msgid "Removing user %s from group %s\n" +msgstr "Tinatanggal ang gumagamit na si %s mula sa grupong %s\n" + +#: src/gpasswd.c:439 +#, c-format +msgid "%s: unknown member %s\n" +msgstr "%s: di kilalang miyembro %s\n" + +#: src/gpasswd.c:485 +#, c-format +msgid "%s: Not a tty\n" +msgstr "%s: Hindi tty\n" + +#: src/gpasswd.c:506 +#, c-format +msgid "Changing the password for group %s\n" +msgstr "Pinapalitan ang password ng grupong %s\n" + +#: src/gpasswd.c:509 +msgid "New Password: " +msgstr "Bagong Password: " + +#: src/gpasswd.c:514 src/passwd.c:278 +msgid "Re-enter new password: " +msgstr "Ibigay muli ang bagong password: " + +#: src/gpasswd.c:526 +msgid "They don't match; try again" +msgstr "Hindi magkapareho; subukan muli" + +#: src/gpasswd.c:530 +#, c-format +msgid "%s: Try again later\n" +msgstr "%s: Subukan muli mamaya\n" + +#: src/gpasswd.c:562 +#, c-format +msgid "%s: can't get lock\n" +msgstr "%s: hindi makakuha ng aldaba\n" + +#: src/gpasswd.c:568 +#, c-format +msgid "%s: can't get shadow lock\n" +msgstr "%s: hindi makuha ang aldaba ng shadow\n" + +#: src/gpasswd.c:574 +#, c-format +msgid "%s: can't open file\n" +msgstr "%s: hindi mabuksan ang tipunan\n" + +#: src/gpasswd.c:586 +#, c-format +msgid "%s: can't update entry\n" +msgstr "%s: hindi ma-apdeyt ang entry\n" + +#: src/gpasswd.c:592 +#, c-format +msgid "%s: can't update shadow entry\n" +msgstr "%s: hindi ma-apdeyt ang entry na shadow\n" + +#: src/gpasswd.c:598 +#, c-format +msgid "%s: can't re-write file\n" +msgstr "%s: hindi maisulat muli ang tipunan\n" + +#: src/gpasswd.c:604 +#, c-format +msgid "%s: can't re-write shadow file\n" +msgstr "%s: hindi maisulat muli ang tipunang shadow\n" + +#: src/gpasswd.c:612 +#, c-format +msgid "%s: can't unlock file\n" +msgstr "%s: hindi matanggal ang aldaba ng tipunan\n" + +#: src/groupadd.c:97 +#, fuzzy, c-format +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:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 +#, c-format +msgid "%s: error adding new group entry\n" +msgstr "%s: error sa pagdagdag ng entry ng bagong grupo\n" + +#: src/groupadd.c:219 src/useradd.c:904 +#, c-format +msgid "%s: name %s is not unique\n" +msgstr "%s: hindi kakaiba ang pangalang %s\n" + +#: src/groupadd.c:234 +#, c-format +msgid "%s: gid %u is not unique\n" +msgstr "%s: hindi kakaiba ang gid na %u\n" + +#: src/groupadd.c:258 +#, c-format +msgid "%s: can't get unique gid\n" +msgstr "%s: hindi makakuha ng kakaibang gid\n" + +#: src/groupadd.c:280 src/groupmod.c:283 +#, fuzzy, c-format +msgid "%s: %s is not a valid group name\n" +msgstr "%s: %s ay hindi tanggap na pangalan ng grupo\n" + +#: src/groupadd.c:309 src/groupmod.c:308 +#, c-format +msgid "%s: invalid group %s\n" +msgstr "%s: hindi tanggap na grupo %s\n" + +#: src/groupadd.c:326 src/useradd.c:1099 +#, c-format +msgid "%s: -O requires NAME=VALUE\n" +msgstr "%s: kinakailangan ng -O ang PANGALAN=HALAGA\n" + +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 +#, c-format +msgid "%s: cannot rewrite group file\n" +msgstr "%s: hindi maisulat muli ang tipunang grupo\n" + +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 +#, c-format +msgid "%s: cannot rewrite shadow group file\n" +msgstr "%s: hindi maisulat muli ang tipunang grupo ng shadow\n" + +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 +#, c-format +msgid "%s: unable to lock group file\n" +msgstr "%s: hindi maaldaba ang tipunang grupo\n" + +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 +#, c-format +msgid "%s: unable to open group file\n" +msgstr "%s: hindi mabuksan ang tipunang grupo\n" + +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 +#, c-format +msgid "%s: unable to lock shadow group file\n" +msgstr "%s: hindi maaldaba ang tipunang grupo ng shadow\n" + +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 +#, c-format +msgid "%s: unable to open shadow group file\n" +msgstr "%s: hindi mabuksan ang tipunang grupo ng shadow\n" + +#: src/groupadd.c:508 +#, c-format +msgid "%s: group %s exists\n" +msgstr "%s: mayroon nang grupong %s\n" + +#: src/groupdel.c:83 +#, fuzzy, c-format +msgid "Usage: groupdel group\n" +msgstr "pag-gamit: groupdel grupo\n" + +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 +#, c-format +msgid "%s: error removing group entry\n" +msgstr "%s: error sa pagtanggal ng entry ng grupo\n" + +#: src/groupdel.c:106 +#, c-format +msgid "%s: error removing shadow group entry\n" +msgstr "%s: error sa pagtanggal ng entry ng grupong shadow\n" + +#: src/groupdel.c:202 +#, c-format +msgid "%s: cannot remove user's primary group.\n" +msgstr "%s: hindi matanggal ang pangunahing grupo ng gumagamit.\n" + +#: src/groupdel.c:290 src/groupmod.c:471 +#, c-format +msgid "%s: group %s does not exist\n" +msgstr "%s: walang grupong %s\n" + +#: src/groupdel.c:303 src/groupmod.c:485 +#, c-format +msgid "%s: group %s is a NIS group\n" +msgstr "%s: ang grupong %s ay grupong NIS\n" + +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 +#, c-format +msgid "%s: %s is the NIS master\n" +msgstr "%s: %s ay ang NIS master\n" + +#: src/groupmod.c:98 +#, fuzzy, c-format +msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" +msgstr "pag-gamit: groupmod [-g gid [-o]] [-n pangalan] grupo\n" + +#: src/groupmod.c:156 +#, c-format +msgid "%s: %s not found in /etc/group\n" +msgstr "%s: %s hindi nahanap sa /etc/group\n" + +#: src/groupmod.c:242 +#, c-format +msgid "%s: %u is not a unique gid\n" +msgstr "%s: %u ay hindi kakaibang gid\n" + +#: src/groupmod.c:272 +#, c-format +msgid "%s: %s is not a unique name\n" +msgstr "%s: %s ay hindi kakaibang pangalan\n" + +#: src/grpck.c:87 +#, c-format +msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" +msgstr "Pag-gamit: %s [-r] [-s] [grupo [gshadow]]\n" + +#: src/grpck.c:89 +#, c-format +msgid "Usage: %s [-r] [-s] [group]\n" +msgstr "Pag-gamit: %s [-r] [-s] [grupo]\n" + +#: src/grpck.c:107 src/pwck.c:108 +msgid "No" +msgstr "Hindi" + +#: src/grpck.c:191 src/pwck.c:175 +#, c-format +msgid "%s: -s and -r are incompatibile\n" +msgstr "%s: -s at -r ay hindi maaring magkasabay\n" + +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 +#, c-format +msgid "%s: cannot lock file %s\n" +msgstr "%s: hindi maaldaba ang tipunang %s\n" + +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 +#, c-format +msgid "%s: cannot open file %s\n" +msgstr "%s: hindi mabuksan ang tipunang %s\n" + +#: src/grpck.c:307 +#, c-format +msgid "invalid group file entry\n" +msgstr "hindi tanggap na entry ng tipunang grupo\n" + +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 +#, c-format +msgid "delete line `%s'? " +msgstr "burahin ang linyang `%s'? " + +#: src/grpck.c:370 +msgid "duplicate group entry\n" +msgstr "pangalawang entry ng grupo\n" + +#: src/grpck.c:387 +#, c-format +msgid "invalid group name `%s'\n" +msgstr "hindi tanggap na pangalan ng grupo `%s'\n" + +#: src/grpck.c:413 +#, c-format +msgid "group %s: no user %s\n" +msgstr "grupong %s: walang gumagamit %s\n" + +#: src/grpck.c:415 src/grpck.c:585 +#, c-format +msgid "delete member `%s'? " +msgstr "tanggalin ang miyembrong `%s'? " + +#: src/grpck.c:452 +#, c-format +msgid "invalid shadow group file entry\n" +msgstr "hindi tanggap na entry sa tipunang shadow group\n" + +#: src/grpck.c:515 +msgid "duplicate shadow group entry\n" +msgstr "dalawahan ang shadow group entry\n" + +#: src/grpck.c:532 +msgid "no matching group file entry\n" +msgstr "walang tumbas na entry sa tipunang grupo\n" + +#: src/grpck.c:553 +#, c-format +msgid "shadow group %s: no administrative user %s\n" +msgstr "grupong shadow %s: walang tagapamahalang %s\n" + +#: src/grpck.c:555 +#, c-format +msgid "delete administrative member `%s'? " +msgstr "tanggaling ang miyembrong tagapamahala `%s'? " + +#: src/grpck.c:583 +#, c-format +msgid "shadow group %s: no user %s\n" +msgstr "grupong shadow %s: walang gumagamit na %s\n" + +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 +#, c-format +msgid "%s: cannot update file %s\n" +msgstr "%s: hindi ma-apdeyt ang tipunang %s\n" + +#: src/grpck.c:640 src/pwck.c:606 +#, c-format +msgid "%s: the files have been updated\n" +msgstr "%s: ang mga tipunan ay na-apdeyt\n" + +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "%s: walang pagbabago\n" + +#: src/grpconv.c:60 src/grpunconv.c:56 +#, c-format +msgid "%s: can't lock group file\n" +msgstr "%s: hindi maaldaba ang tipunang grupo\n" + +#: src/grpconv.c:65 src/grpunconv.c:61 +#, c-format +msgid "%s: can't open group file\n" +msgstr "%s: hindi mabuksan ang tipunang grupo\n" + +#: src/grpconv.c:70 src/grpunconv.c:66 +#, c-format +msgid "%s: can't lock shadow group file\n" +msgstr "%s: hindi maaldaba ang tipunang grupo na shadow\n" + +#: src/grpconv.c:75 src/grpunconv.c:71 +#, c-format +msgid "%s: can't open shadow group file\n" +msgstr "%s: hindi mabuksan ang tipunang grupo na shadow\n" + +#: src/grpconv.c:92 +#, c-format +msgid "%s: can't remove shadow group %s\n" +msgstr "%s: hindi matanggal ang grupong shadow %s\n" + +#: src/grpconv.c:130 src/pwconv.c:153 +#, c-format +msgid "%s: can't update shadow entry for %s\n" +msgstr "%s: hindi ma-apdeyt ang ipinasok sa shadow para kay %s\n" + +#: src/grpconv.c:140 src/grpunconv.c:88 +#, c-format +msgid "%s: can't update entry for group %s\n" +msgstr "%s: hindi ma-apdeyt ang ipinasok para sa grupong %s\n" + +#: src/grpconv.c:147 src/grpunconv.c:96 +#, c-format +msgid "%s: can't update shadow group file\n" +msgstr "%s: hindi ma-apdeyt ang tipunang grupo na shadow\n" + +#: src/grpconv.c:152 src/grpunconv.c:102 +#, c-format +msgid "%s: can't update group file\n" +msgstr "%s: hindi ma-apdeyt ang tipunang grupo\n" + +#: src/grpunconv.c:107 +#, c-format +msgid "%s: can't delete shadow group file\n" +msgstr "%s: hindi matanggal ang tipunang grupo na shadow\n" + +#: src/id.c:53 +#, fuzzy, c-format +msgid "Usage: id [-a]\n" +msgstr "pag-gamit: id [-a]\n" + +#: src/id.c:55 +#, fuzzy, c-format +msgid "Usage: id\n" +msgstr "pag-gamit: id\n" + +#: src/id.c:169 +#, c-format +msgid " groups=" +msgstr " mga grupo=" + +#: src/lastlog.c:64 +#, fuzzy, c-format +msgid "" +"Usage: lastlog [options]\n" +"\n" +"Options:\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" +" -h, --help\t\tdisplay this help message and exit\n" +" -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" +msgstr "" +"Pag-gamit: chpasswd [mga option]\n" +"\n" +"Mga option:\n" +" -e, --encrypted\tang mga bigay na mga password ay naka-encrypt\n" +" -h, --help\t\tipakita itong payo na ito at lumabas\n" +" -m, --md5\t\tgamitin ang MD5 encryption imbes na DES kapag ang\n" +"\t\t\tmga ibinigay na mga password ay hindi naka-encrypt\n" + +#: src/lastlog.c:90 +#, c-format +msgid "Username Port From Latest\n" +msgstr "Pangalan Puerta Mula Hulihan\n" + +#: src/lastlog.c:92 +#, c-format +msgid "Username Port Latest\n" +msgstr "Pangalan Puerta Hulihan\n" + +#: src/lastlog.c:107 +msgid "**Never logged in**" +msgstr "**Di pumasok kailanman**" + +#: src/login.c:156 +#, fuzzy, c-format +msgid "Usage: %s [-p] [name]\n" +msgstr "pag-gamit: %s [-p] [pangalan]\n" + +#: src/login.c:159 +#, c-format +msgid " %s [-p] [-h host] [-f name]\n" +msgstr " %s [-p] [-h host] [-f pangalan]\n" + +#: src/login.c:161 +#, c-format +msgid " %s [-p] -r host\n" +msgstr " %s [-p] -r host\n" + +#: src/login.c:198 +#, c-format +msgid "Invalid login time\n" +msgstr "Di tamang oras ng pagpasok\n" + +#: src/login.c:234 +#, c-format +msgid "" +"\n" +"System closed for routine maintenance\n" +msgstr "" +"\n" +"Sarado ang sistema para sa kinagawiang pagtaguyod\n" + +#: src/login.c:244 +#, c-format +msgid "" +"\n" +"[Disconnect bypassed -- root login allowed.]\n" +msgstr "" +"\n" +"[Nilaktawan ang pag-diskonek -- pinayagang makapasok ang root.]\n" + +#: src/login.c:297 +#, c-format +msgid "" +"\n" +"Login timed out after %d seconds.\n" +msgstr "" +"\n" +"Lumipas ang taning ng pagpasok ng %d segundo.\n" + +#: src/login.c:565 +#, c-format +msgid " on `%.100s' from `%.200s'" +msgstr " ng `%.100s' mula `%.200s'" + +#: src/login.c:568 +#, c-format +msgid " on `%.100s'" +msgstr " ng `%.100s'" + +#: src/login.c:722 +#, c-format +msgid "" +"\n" +"%s login: " +msgstr "" +"\n" +"%s login: " + +#: src/login.c:879 src/sulogin.c:203 +msgid "Login incorrect" +msgstr "Maling pagpasok" + +#: src/login.c:996 +msgid "Warning: login re-enabled after temporary lockout.\n" +msgstr "Babala: pagpasok ay enabled muli matapos ng panandalian pagbawal.\n" + +#: src/login.c:1010 +#, c-format +msgid "Last login: %s on %s" +msgstr "Huling pagpasok: %s sa %s" + +#: src/login.c:1013 +#, c-format +msgid "Last login: %.19s on %s" +msgstr "Huling pagpasok: %.19s sa %s" + +#: src/login.c:1018 +#, c-format +msgid " from %.*s" +msgstr " mula %.*s" + +#: src/mkpasswd.c:47 +#, c-format +msgid "%s: no DBM database on system - no action performed\n" +msgstr "%s: walang DBM database sa sistema - walang ginawa\n" + +#: src/mkpasswd.c:231 src/mkpasswd.c:236 +#, c-format +msgid "%s: cannot overwrite file %s\n" +msgstr "%s: hindi mapatungan ang tipunang %s\n" + +#: src/mkpasswd.c:251 +#, c-format +msgid "%s: cannot open DBM files for %s\n" +msgstr "%s: hindi mabuksan ang tipunang DBM para sa %s\n" + +#: src/mkpasswd.c:286 +#, fuzzy, c-format +msgid "%s: the line beginning with %.16s... is too long\n" +msgstr "%s: nag-umpisa sa " + +#: src/mkpasswd.c:313 +#, c-format +msgid "%s: error parsing line \"%s\"\n" +msgstr "%s: error sa pagbasa ng linya \"%s\"\n" + +#: src/mkpasswd.c:321 src/mkpasswd.c:326 src/mkpasswd.c:331 src/mkpasswd.c:336 +#, fuzzy, c-format +msgid "adding record for name %s\n" +msgstr "dinadagdag ang record para sa pangalan " + +#: src/mkpasswd.c:342 src/mkpasswd.c:348 src/mkpasswd.c:353 src/mkpasswd.c:358 +#, fuzzy, c-format +msgid "%s: error adding record for %s\n" +msgstr "%s: error sa pagdagdag ng record para " + +#: src/mkpasswd.c:376 +#, c-format +msgid "added %d entries, longest was %d\n" +msgstr "nagdagdag ng %d na ipinasok, pinakamahaba ang %d\n" + +#: src/mkpasswd.c:389 +#, c-format +msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" +msgstr "Pag-gamit: %s [-vf] [-p|g|sp|sg] tipunan\n" + +#: src/mkpasswd.c:391 +#, c-format +msgid "Usage: %s [-vf] [-p|g|sp] file\n" +msgstr "Pag-gamit: %s [-vf] [-p|g|sp] tipunan\n" + +#: src/mkpasswd.c:394 +#, c-format +msgid "Usage: %s [-vf] [-p|g] file\n" +msgstr "Pag-gamit: %s [-vf] [-p|g] tipunan\n" + +#: src/newgrp.c:61 +#, fuzzy, c-format +msgid "Usage: newgrp [-] [group]\n" +msgstr "pag-gamit: newgrp [-] [grupo]\n" + +#: src/newgrp.c:63 +#, fuzzy, c-format +msgid "Usage: sg group [[-c] command]\n" +msgstr "pag-gamit: sg grupo [[-c] utos]\n" + +#: src/newgrp.c:131 +#, c-format +msgid "unknown uid: %u\n" +msgstr "di kilalang uid: %u\n" + +#: src/newgrp.c:213 +#, c-format +msgid "unknown gid: %lu\n" +msgstr "di kilalang gid: %lu\n" + +#: src/newgrp.c:358 src/newgrp.c:367 +msgid "Sorry.\n" +msgstr "Ipagpaumanhin.\n" + +#: src/newgrp.c:467 +#, c-format +msgid "too many groups\n" +msgstr "labis ang dami ng mga grupo\n" + +#: src/newusers.c:78 +#, c-format +msgid "Usage: %s [input]\n" +msgstr "Pag-gamit: %s [input]\n" + +#: src/newusers.c:382 +#, c-format +msgid "%s: can't lock /etc/passwd.\n" +msgstr "%s: hindi maaldaba ang /etc/passwd.\n" + +#: src/newusers.c:394 +#, c-format +msgid "%s: can't lock files, try again later\n" +msgstr "%s: hindi makapag-aldaba ng mga tipunan, subukan muli mamaya.\n" + +#: src/newusers.c:409 +#, c-format +msgid "%s: can't open files\n" +msgstr "%s: hindi mabuksan ang mga tipunan\n" + +#: src/newusers.c:454 +#, c-format +msgid "%s: line %d: invalid line\n" +msgstr "%s: linya %d: hindi tanggap na linya\n" + +#: src/newusers.c:473 +#, c-format +msgid "%s: line %d: can't create GID\n" +msgstr "%s: linya %d: hindi makalikha ng GID\n" + +#: src/newusers.c:489 +#, c-format +msgid "%s: line %d: can't create UID\n" +msgstr "%s: linya %d: hindi makalikha ng UID\n" + +#: src/newusers.c:502 +#, c-format +msgid "%s: line %d: cannot find user %s\n" +msgstr "%s: linya %d: hindi mahanap ang gumagamit %s\n" + +#: src/newusers.c:511 +#, c-format +msgid "%s: line %d: can't update password\n" +msgstr "%s: linya %d: hindi ma-apdeyt ang password\n" + +#: src/newusers.c:529 +#, c-format +msgid "%s: line %d: mkdir failed\n" +msgstr "%s: linya %d: sawi ang mkdir\n" + +#: src/newusers.c:534 +#, c-format +msgid "%s: line %d: chown failed\n" +msgstr "%s: linya %d: sawi ang chown\n" + +#: src/newusers.c:544 +#, c-format +msgid "%s: line %d: can't update entry\n" +msgstr "%s: linya %d: hindi ma-apdeyt ang ipinasok\n" + +#: src/newusers.c:576 +#, c-format +msgid "%s: error updating files\n" +msgstr "%s: error sa pag-apdeyt ng mga tipunan\n" + +#: src/passwd.c:154 +#, fuzzy, c-format +msgid "Usage: %s [-f|-s] [name]\n" +msgstr "pag-gamit: %s [-f|-s] [pangalan]\n" + +#: src/passwd.c:158 +#, c-format +msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" +msgstr " %s [-x max] [-n min] [-w babala] [-i inakt] pangalan\n" + +#: src/passwd.c:160 +#, c-format +msgid " %s {-l|-u|-d|-S|-e} name\n" +msgstr " %s {-l|-u|-d|-S|-e} pangalan\n" + +#: src/passwd.c:214 +msgid "Old password: " +msgstr "Lumang password: " + +#: src/passwd.c:223 +#, c-format +msgid "Incorrect password for `%s'\n" +msgstr "Maling password para kay `%s'\n" + +#: src/passwd.c:247 +#, c-format +msgid "" +"Enter the new password (minimum of %d, maximum of %d characters)\n" +"Please use a combination of upper and lower case letters and numbers.\n" +msgstr "" +"Ibigay ang bagong password (minimum na %d, maximum na %d karakter)\n" +"Gumamit ng kombinasyon ng malaki at maliit na titik at mga numero.\n" + +#: src/passwd.c:253 +msgid "New password: " +msgstr "Bagong password: " + +#: src/passwd.c:263 +#, c-format +msgid "Try again.\n" +msgstr "Subukan muli.\n" + +#: src/passwd.c:274 +#, c-format +msgid "" +"\n" +"Warning: weak password (enter it again to use it anyway).\n" +msgstr "" +"\n" +"Babala: mahinang password (ibigay ito muli upang gamitin pa rin).\n" + +#: src/passwd.c:283 +#, c-format +msgid "They don't match; try again.\n" +msgstr "Hindi sila magkapareho; subukan muli.\n" + +#: src/passwd.c:360 src/passwd.c:377 +#, c-format +msgid "The password for %s cannot be changed.\n" +msgstr "Ang password ni %s ay hindi mapapalitan.\n" + +#: src/passwd.c:390 +#, c-format +msgid "Sorry, the password for %s cannot be changed yet.\n" +msgstr "Ipagpaumanhin, ang password ni %s ay hindi pa mapapalitan.\n" + +#: src/passwd.c:472 +#, c-format +msgid "%s: out of memory\n" +msgstr "%s: nagkulang ng memory\n" + +#: src/passwd.c:701 +#, c-format +msgid "%s: Cannot execute %s" +msgstr "%s: Hindi mapatakbo ang %s" + +#: src/passwd.c:786 +#, c-format +msgid "%s: repository %s not supported\n" +msgstr "%s: hindi suportado ang repositoryong %s\n" + +#: src/passwd.c:884 +#, fuzzy, c-format +msgid "%s: You may not view or modify password information for %s.\n" +msgstr "Hindi niyo mapapalitan ang shell para kay %s.\n" + +#: src/passwd.c:934 +#, c-format +msgid "Changing password for %s\n" +msgstr "Pinapalitan ang password ni %s\n" + +#: src/passwd.c:938 +#, c-format +msgid "The password for %s is unchanged.\n" +msgstr "Ang password ni %s ay hindi napalitan.\n" + +#: src/passwd.c:987 +#, c-format +msgid "Password changed.\n" +msgstr "Napalitan ang password.\n" + +#: src/pwck.c:87 +#, c-format +msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n" +msgstr "Pag-gamit: %s [-q] [-r] [-s] [passwd [shadow]]\n" + +#: src/pwck.c:90 +#, c-format +msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" +msgstr "Pag-gamit: %s [-q] [-r] [-s] [passwd]\n" + +#: src/pwck.c:292 +#, c-format +msgid "invalid password file entry\n" +msgstr "hindi tanggap na ipinasok sa tipunang password\n" + +#: src/pwck.c:354 +msgid "duplicate password entry\n" +msgstr "nadobleng ipinasok sa password\n" + +#: src/pwck.c:370 +#, c-format +msgid "invalid user name '%s'\n" +msgstr "hindi tanggap na pangalan '%s'\n" + +#: src/pwck.c:384 +#, c-format +msgid "user %s: no group %u\n" +msgstr "gumagamit %s: walang grupo %u\n" + +#: src/pwck.c:400 +#, c-format +msgid "user %s: directory %s does not exist\n" +msgstr "gumagamit %s: walang directory na %s\n" + +#: src/pwck.c:416 +#, c-format +msgid "user %s: program %s does not exist\n" +msgstr "gumagamit %s: walang programang %s\n" + +#: src/pwck.c:452 +#, c-format +msgid "invalid shadow password file entry\n" +msgstr "hindi tanggap na ipinasok sa tipunang password na shadow\n" + +#: src/pwck.c:514 +msgid "duplicate shadow password entry\n" +msgstr "nadobleng ipinasok sa tipunang password ng shadow\n" + +#: src/pwck.c:538 +msgid "no matching password file entry\n" +msgstr "walang kaparehas na ipinasok sa tipunang password\n" + +#: src/pwck.c:556 +#, c-format +msgid "user %s: last password change in the future\n" +msgstr "gumagamit %s: huling pagpalit ng password ay nasa hinaharap\n" + +#: src/pwconv.c:85 src/pwunconv.c:79 +#, c-format +msgid "%s: can't lock passwd file\n" +msgstr "%s: hindi maaldaba ang tipunang passwd\n" + +#: src/pwconv.c:90 src/pwunconv.c:84 +#, c-format +msgid "%s: can't open passwd file\n" +msgstr "%s: hindi mabuksan ang tipunang passwd\n" + +#: src/pwconv.c:118 +#, c-format +msgid "%s: can't remove shadow entry for %s\n" +msgstr "%s: hindi matanggal ang ipinasok sa shadow para kay %s\n" + +#: src/pwconv.c:163 +#, c-format +msgid "%s: can't update passwd entry for %s\n" +msgstr "%s: hindi maapdeyt ang ipinasok sa passwd para kay %s\n" + +#: src/pwconv.c:170 +#, c-format +msgid "%s: can't update shadow file\n" +msgstr "%s: hindi maapdeyt ang tipunang shadow\n" + +#: src/pwconv.c:174 +#, c-format +msgid "%s: can't update passwd file\n" +msgstr "%s: hindi maapdeyt ang tipunang passwd\n" + +#: src/pwunconv.c:124 +#, c-format +msgid "%s: can't update entry for user %s\n" +msgstr "%s: hindi maapdeyt ang ipinasok para kay %s\n" + +#: src/pwunconv.c:143 +#, c-format +msgid "%s: can't delete shadow password file\n" +msgstr "%s: hindi matanggal ang tipunang password ng shadow\n" + +#: src/su.c:132 +msgid "Sorry." +msgstr "Ipagpaumanhin." + +#: src/su.c:320 +#, c-format +msgid "%s: must be run from a terminal\n" +msgstr "%s: kinakailangang patakbuhin mula sa isang terminal\n" + +#: src/su.c:419 +#, c-format +msgid "%s: pam_start: error %d\n" +msgstr "%s: pam_start: error %d\n" + +#: src/su.c:447 +#, c-format +msgid "Unknown id: %s\n" +msgstr "Di kilalang id: %s\n" + +#: src/su.c:484 src/su.c:500 +#, c-format +msgid "You are not authorized to su %s\n" +msgstr "Hindi kayo awtorisadong gumamit ng su %s\n" + +#: src/su.c:495 +msgid "(Enter your own password.)" +msgstr "(Ibigay ang sarili niyong password.)" + +#: src/su.c:527 +#, c-format +msgid "" +"%s: %s\n" +"(Ignored)\n" +msgstr "" +"%s: %s\n" +"(Di pinansin)\n" + +#: src/su.c:741 +#, c-format +msgid "No shell\n" +msgstr "Walang shell\n" + +#: src/suauth.c:104 +#, c-format +msgid "Access to su to that account DENIED.\n" +msgstr "Ang paggamit ng su sa account na iyan ay IPINAGBAWAL.\n" + +#: src/suauth.c:112 +#, c-format +msgid "Password authentication bypassed.\n" +msgstr "Linampasan ang password authentication.\n" + +#: src/suauth.c:121 +#, c-format +msgid "Please enter your OWN password as authentication.\n" +msgstr "Ibigay ang inyong SARILING password bilang authentication.\n" + +#: src/sulogin.c:118 +#, c-format +msgid "No password file\n" +msgstr "Walang tipunang password\n" + +#: src/sulogin.c:160 +#, c-format +msgid "No password entry for 'root'\n" +msgstr "Walang ipinasok sa password para sa 'root'\n" + +#: src/sulogin.c:175 +msgid "" +"\n" +"Type control-d to proceed with normal startup,\n" +"(or give root password for system maintenance):" +msgstr "" +"\n" +"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 +msgid "Entering System Maintenance Mode\n" +msgstr "Pumapasok sa Modang Pagtataguyod ng Sistema\n" + +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 +#, c-format +msgid "%s: invalid numeric argument `%s'\n" +msgstr "%s: hindi tanggap na argumentong numero `%s'\n" + +#: src/useradd.c:298 +#, c-format +msgid "%s: unknown gid %s\n" +msgstr "%s: di kilalang gid %s\n" + +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 +#, c-format +msgid "%s: unknown group %s\n" +msgstr "%s: di kilalang grupo %s\n" + +#: src/useradd.c:418 +#, c-format +msgid "%s: cannot create new defaults file\n" +msgstr "%s: hindi malikha ang bagong tipunan ng mga default\n" + +#: src/useradd.c:423 +#, c-format +msgid "%s: cannot open new defaults file\n" +msgstr "%s: hindi mabuksan ang bagong tipunan ng mga default\n" + +#: src/useradd.c:515 src/useradd.c:526 +#, c-format +msgid "%s: rename: %s" +msgstr "%s: baguhin ang pangalan: %s" + +#: src/useradd.c:619 src/usermod.c:248 +#, c-format +msgid "%s: group `%s' is a NIS group.\n" +msgstr "%s: ang grupong `%s' ay grupong NIS.\n" + +#: src/useradd.c:628 src/usermod.c:257 +#, 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:660 +#, 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:663 +#, 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:665 src/useradd.c:671 +#, fuzzy, c-format +msgid " [-f inactive] [-e expire]\n" +msgstr "\t\t[-f inaktibo] [-e paso ]\n" + +#: src/useradd.c:667 +#, fuzzy, c-format +msgid " [-p passwd] name\n" +msgstr "[-p passwd] pangalan\n" + +#: src/useradd.c:669 +#, 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:756 src/usermod.c:444 +#, c-format +msgid "%s: error locking group file\n" +msgstr "%s: error sa pagaldaba ng tipunang grupo\n" + +#: src/useradd.c:760 src/usermod.c:449 +#, c-format +msgid "%s: error opening group file\n" +msgstr "%s: error sa pagbukas ng tipunang grupo\n" + +#: src/useradd.c:766 src/usermod.c:542 +#, c-format +msgid "%s: error locking shadow group file\n" +msgstr "%s: error sa pagaldaba ng tipunang grupo ng shadow\n" + +#: src/useradd.c:771 src/usermod.c:548 +#, c-format +msgid "%s: error opening shadow group file\n" +msgstr "%s: error sa pagbukas ng tipunang grupo ng shadow\n" + +#: src/useradd.c:909 +#, c-format +msgid "%s: uid %u is not unique\n" +msgstr "%s: ang uid %u ay hindi kakaiba\n" + +#: src/useradd.c:939 +#, c-format +msgid "%s: can't get unique uid\n" +msgstr "%s: hindi makakuha ng kakaibang uid\n" + +#: src/useradd.c:975 +#, c-format +msgid "%s: invalid base directory `%s'\n" +msgstr "%s: hindi tanggap na batayang directory `%s'\n" + +#: src/useradd.c:985 +#, c-format +msgid "%s: invalid comment `%s'\n" +msgstr "%s: hindi tanggap na komento `%s'\n" + +#: src/useradd.c:996 +#, c-format +msgid "%s: invalid home directory `%s'\n" +msgstr "%s: hindi tanggap na bahay directory `%s'\n" + +#: src/useradd.c:1015 src/usermod.c:796 +#, c-format +msgid "%s: invalid date `%s'\n" +msgstr "%s: hindi tanggap na petsa `%s'\n" + +#: src/useradd.c:1028 +#, c-format +msgid "%s: shadow passwords required for -e\n" +msgstr "%s: kailangan ng shadow password para sa -e\n" + +#: src/useradd.c:1044 +#, c-format +msgid "%s: shadow passwords required for -f\n" +msgstr "%s: kailangan ng shadow password para sa -f\n" + +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 +#, c-format +msgid "%s: invalid field `%s'\n" +msgstr "%s: hindi tanggap na field `%s'\n" + +#: src/useradd.c:1122 +#, c-format +msgid "%s: invalid shell `%s'\n" +msgstr "%s: hindi tanggap na shell `%s'\n" + +#: src/useradd.c:1163 +#, c-format +msgid "%s: invalid user name '%s'\n" +msgstr "%s: hindi tanggap na pangalan `%s'\n" + +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 +#, c-format +msgid "%s: cannot rewrite password file\n" +msgstr "%s: hindi maisulat muli ang tipunang password\n" + +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 +#, c-format +msgid "%s: cannot rewrite shadow password file\n" +msgstr "%s: hindi maisulat muli ang tipunang password na shadow\n" + +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 +#, c-format +msgid "%s: unable to lock password file\n" +msgstr "%s: hindi maaldaba ang tipunang password\n" + +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 +#, c-format +msgid "%s: unable to open password file\n" +msgstr "%s: hindi mabuksan ang tipunang password\n" + +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 +#, c-format +msgid "%s: cannot lock shadow password file\n" +msgstr "%s: hindi maaldaba ang tipunang password ng shadow\n" + +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 +#, c-format +msgid "%s: cannot open shadow password file\n" +msgstr "%s: hindi mabuksan ang tipunang password ng shadow\n" + +#: src/useradd.c:1354 +#, c-format +msgid "%s: error adding new password entry\n" +msgstr "%s: error sa pagdagdag ng bagong ipapasok sa password\n" + +#: src/useradd.c:1365 src/usermod.c:1063 +#, 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:1393 +#, c-format +msgid "%s: cannot create directory %s\n" +msgstr "%s: hindi malikha ang directory %s\n" + +#: src/useradd.c:1423 +#, c-format +msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n" +msgstr "" + +#: src/useradd.c:1446 +#, 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:1550 src/usermod.c:919 +#, c-format +msgid "%s: user %s exists\n" +msgstr "%s: mayroon nang gumagamit na %s\n" + +#: src/useradd.c:1564 +#, c-format +msgid "" +"%s: group %s exists - if you want to add this user to that group, use -g.\n" +msgstr "" +"%s: mayroon nang grupong %s - kung nais niyong idagdag ang gumagamit na ito " +"sa grupong iyon, gamitin ang -g.\n" + +#: src/useradd.c:1602 +#, 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" + +#: src/userdel.c:108 +#, fuzzy, c-format +msgid "Usage: %s [-r] name\n" +msgstr "pag-gamit: %s [-r] pangalan\n" + +#: src/userdel.c:160 src/userdel.c:221 +#, c-format +msgid "%s: error updating group entry\n" +msgstr "%s: error sa pag-apdeyt ng ipinasok sa grupo\n" + +#: src/userdel.c:315 +#, c-format +msgid "%s: cannot open group file\n" +msgstr "%s: hindi mabuksan ang tipunang grupo\n" + +#: src/userdel.c:325 +#, c-format +msgid "%s: cannot open shadow group file\n" +msgstr "%s: hindi mabuksan ang tipunang grupo ng shadow\n" + +#: src/userdel.c:343 +#, c-format +msgid "%s: error deleting password entry\n" +msgstr "%s: error sa pagtanggal ng ipinasok na password\n" + +#: src/userdel.c:347 +#, c-format +msgid "%s: error deleting shadow password entry\n" +msgstr "%s: error sa pagtanggal ng ipinasok na password sa shadow\n" + +#: src/userdel.c:388 +#, c-format +msgid "%s: user %s is currently logged in\n" +msgstr "%s: gumagamit na si %s ay kasalukuyang nakapasok\n" + +#: src/userdel.c:496 src/userdel.c:641 +#, c-format +msgid "%s: %s not owned by %s, not removing\n" +msgstr "%s: %s ay hindi pag-aari ni %s, hindi tatanggalin\n" + +#: src/userdel.c:502 +#, c-format +msgid "%s: warning: can't remove " +msgstr "%s: babala: hindi matanggal " + +#: src/userdel.c:592 src/usermod.c:722 +#, c-format +msgid "%s: user %s does not exist\n" +msgstr "%s: walang gumagamit na nagngangalang %s\n" + +#: src/userdel.c:607 src/usermod.c:738 +#, c-format +msgid "%s: user %s is a NIS user\n" +msgstr "%s: ang gumagamit na %s ay nasa NIS\n" + +#: src/userdel.c:664 +#, c-format +msgid "%s: not removing directory %s (would remove home of user %s)\n" +msgstr "%s: hindi tatanggalin ang directory %s (mawawalan ng bahay si %s)\n" + +#: src/userdel.c:678 +#, c-format +msgid "%s: error removing directory %s\n" +msgstr "%s: error sa pagtanggal ng directory %s\n" + +#: src/usermod.c:289 +#, fuzzy, c-format +msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" +msgstr "pag-gamit: %s\t[-u uid [-o]] [-g grupo] [-G grupo,...] \n" + +#: src/usermod.c:293 +#, 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:296 +#, fuzzy, c-format +msgid "[-f inactive] [-e expire] " +msgstr "[-f inaktibo] [-e paso ] " + +#: src/usermod.c:298 +#, c-format +msgid "[-p passwd] [-L|-U] name\n" +msgstr "[-p passwd] [-L|-U] pangalan\n" + +#: src/usermod.c:476 +#, c-format +msgid "%s: out of memory in update_group\n" +msgstr "%s: naubos ang memory sa update_group\n" + +#: src/usermod.c:585 +#, c-format +msgid "%s: out of memory in update_gshadow\n" +msgstr "%s: naubos ang memory sa update_gshadow\n" + +#: src/usermod.c:896 +#, c-format +msgid "%s: no flags given\n" +msgstr "%s: walang binigay na mga flag\n" + +#: src/usermod.c:903 +#, 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:924 +#, c-format +msgid "%s: uid %lu is not unique\n" +msgstr "%s: uid %lu ay hindi kakaiba\n" + +#: src/usermod.c:1047 +#, c-format +msgid "%s: error changing password entry\n" +msgstr "%s: error sa pagpalit ng ipinasok na password\n" + +#: src/usermod.c:1053 +#, c-format +msgid "%s: error removing password entry\n" +msgstr "%s: error sa pagtanggal ng ipinasok na password\n" + +#: src/usermod.c:1070 +#, c-format +msgid "%s: error removing shadow password entry\n" +msgstr "%s: error sa pagtanggal ng ipinasok na shadow password\n" + +#: src/usermod.c:1098 +#, c-format +msgid "%s: directory %s exists\n" +msgstr "%s: mayroon nang directory na %s\n" + +#: src/usermod.c:1106 +#, c-format +msgid "%s: can't create %s\n" +msgstr "%s: hindi malikha ang %s\n" + +#: src/usermod.c:1111 +#, c-format +msgid "%s: can't chown %s\n" +msgstr "%s: hindi ma-chown %s\n" + +#: src/usermod.c:1128 +#, 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:1223 +#, 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:1229 +msgid "failed to change mailbox owner" +msgstr "sawi sa pagpalit ng may-ari ng mailbox" + +#: src/usermod.c:1237 +msgid "failed to rename mailbox" +msgstr "sawi sa pagpalit ng pangalan ng mailbox" + +#: src/vipw.c:104 +#, c-format +msgid "" +"\n" +"%s: %s is unchanged\n" +msgstr "" +"\n" +"%s: %s ay hindi binago\n" + +#: src/vipw.c:131 +msgid "Couldn't lock file" +msgstr "Hindi maaldaba ang tipunan" + +#: src/vipw.c:140 +msgid "Couldn't make backup" +msgstr "Hindi makagawa ng backup" + +#: src/vipw.c:196 +#, c-format +msgid "%s: can't restore %s: %s (your changes are in %s)\n" +msgstr "%s: hindi maibalik ang %s: %s (ang mga pagbabago ay nasa %s)\n" + +#: src/vipw.c:234 +#, c-format +msgid "" +"Usage:\n" +"`vipw' edits /etc/passwd `vipw -s' edits /etc/shadow\n" +"`vigr' edits /etc/group `vigr -s' edits /etc/gshadow\n" +msgstr "" +"Pag-gamit:\n" +"`vipw' ine-edit /etc/passwd `vipw -s' ine-edit /etc/shadow\n" +"`vigr' ine-edit /etc/group `vigr -s' ine-edit /etc/gshadow\n" diff --git a/po/tr.gmo b/po/tr.gmo index 2934f6c4..588d5b91 100644 Binary files a/po/tr.gmo and b/po/tr.gmo differ diff --git a/po/tr.po b/po/tr.po index 20212ec7..f32d9fc2 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-01-26 07:53+0100\n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" "PO-Revision-Date: 2004-06-13 10:27+0300\n" "Last-Translator: Mehmet T羹rker \n" "Language-Team: Turkish \n" @@ -20,7 +20,7 @@ msgstr "" msgid "Warning: unknown group %s\n" msgstr "Uyar覺: bilinmeyen grup %s\n" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" msgstr "Uyar覺: grup say覺s覺 癟ok fazla\n" @@ -48,17 +48,17 @@ msgstr " Sistem y繹neticisine bavurunuz.\n" msgid " Choose a new password.\n" msgstr "Yeni bir parola se癟in.\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "Parolan覺z覺n kullan覺m s羹resi %ld g羹n sonra dolacakt覺r.\n" -#: libmisc/age.c:174 +#: libmisc/age.c:172 #, c-format msgid "Your password will expire tomorrow.\n" msgstr "Parolan覺z覺n kullan覺m s羹resi yar覺n dolacakt覺r.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:174 #, c-format msgid "Your password will expire today.\n" msgstr "Parolan覺z覺n kullan覺m s羹resi bug羹n dolacakt覺r.\n" @@ -73,42 +73,27 @@ msgstr "Ge癟ilemeyen tty: %s" msgid "Environment overflow\n" msgstr "Ortam tamas覺\n" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr "$%s deitirilemez\n" -#: libmisc/failure.c:230 +#: libmisc/failure.c:229 #, fuzzy, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "" +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "" "Son giriten beri %d baar覺s覺z giriim. En sonuncusu %s 羹zerinde %s idi.\n" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" msgstr "ok fazla oturum.\n" -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "Parola %s kullan覺c覺s覺na ait gizli anahtar覺 癟繹zemez.\n" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "" -"%s kullan覺c覺s覺n覺n gizli anahtar覺 tan覺mlanamad覺: keyserv sunucusu 癟al覺覺yor " -"mu?\n" - #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "Yeni e-postan覺z var." @@ -121,7 +106,7 @@ msgstr "E-Posta yok." msgid "You have mail." msgstr "E-Postan覺z var." -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " msgstr "Hatal覺 parola: %s. " @@ -136,20 +121,20 @@ msgstr "passwd: pam_start() baar覺s覺z, hata %d\n" msgid "passwd: %s\n" msgstr "passwd: %s\n" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" msgstr "" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "\"%s\" dizinine ge癟ilemiyor\n" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" msgstr "Dizin yok, HOME=/ ile giri yap覺l覺yor" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr "%s 癟al覺t覺r覺lam覺yor" @@ -164,36 +149,32 @@ msgstr "Ge癟ersiz k繹k dizin \"%s\"\n" msgid "Can't change root directory to \"%s\"\n" msgstr "K繹k dizin \"%s\" olarak deitirilemiyor\n" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "malloc(%d) baar覺s覺z oldu\n" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" msgstr "Yap覺land覺rma bilgileri i癟in yer ayr覺lamad覺.\n" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format 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:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "Parola: " -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "%s kullan覺c覺 parolas覺: " -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "(G繹r羹nt羹leme etkin) " - -#: src/chage.c:118 +#: src/chage.c:112 #, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" @@ -202,154 +183,147 @@ msgstr "" "Kullan覺m: chage [-l] [-m min_g羹n_say覺s覺] [-M max_g羹n_say覺s覺] [-W uyar覺]\n" " [-I pasif] [-E hesap_bitimi] [-d son_g羹n] kullan覺c覺\n" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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:155 +#: src/chage.c:149 msgid "Minimum Password Age" msgstr "Asgari Parola mr羹" -#: src/chage.c:161 +#: src/chage.c:155 msgid "Maximum Password Age" msgstr "Azami Parola mr羹" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" msgstr "Son Parola Deiimi (YYYY-AA-GG)" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" msgstr "Parola Kullan覺m S羹resi Bitti Uyar覺s覺" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "Parola Pasif" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Hesap Bitimi Tarihi (YYYY-AA-GG)" -#: src/chage.c:238 +#: src/chage.c:231 #, fuzzy, c-format msgid "Last password change\t\t\t\t\t: " msgstr "Son Parola Deiimi (YYYY-AA-GG)" -#: src/chage.c:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 #, fuzzy, c-format msgid "never\n" msgstr "Hi癟bir zaman\n" -#: src/chage.c:251 +#: src/chage.c:244 #, fuzzy, c-format msgid "Password expires\t\t\t\t\t: " msgstr "Parola Kullan覺m S羹resi Dolumu:\t" -#: src/chage.c:267 +#: src/chage.c:260 #, fuzzy, c-format msgid "Password inactive\t\t\t\t\t: " msgstr "Parola Pasif:\t" -#: src/chage.c:281 +#: src/chage.c:274 #, fuzzy, c-format msgid "Account expires\t\t\t\t\t\t: " msgstr "Hesap Bitimi:\t" -#: src/chage.c:297 +#: src/chage.c:290 #, c-format msgid "Minimum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:298 +#: src/chage.c:292 #, 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:299 +#: src/chage.c:294 #, c-format msgid "Number of days of warning before password expires\t: %ld\n" msgstr "" -#: src/chage.c:444 +#: src/chage.c:431 #, 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:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 #, fuzzy, c-format msgid "%s: permission denied.\n" msgstr "%s: m羹saade edilmedi\n" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 #, c-format msgid "%s: PAM authentication failed\n" msgstr "%s: PAM yetkilendirmesi baar覺s覺z oldu\n" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, c-format msgid "%s: can't open password file\n" msgstr "%s: parola dosyas覺 a癟覺lamad覺\n" -#: src/chage.c:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "%s: bilinmeyen kullan覺c覺 %s\n" -#: src/chage.c:535 +#: src/chage.c:519 #, c-format msgid "%s: can't lock shadow password file" msgstr "%s: g繹lge parola dosyas覺 kilitlenemedi" -#: src/chage.c:543 +#: src/chage.c:527 #, c-format msgid "%s: can't open shadow password file" msgstr "%s: g繹lge parola dosyas覺 a癟覺lamad覺" -#: src/chage.c:604 +#: src/chage.c:587 #, c-format msgid "Changing the aging information for %s\n" msgstr "%s i癟in 繹m羹r bilgisi deitiriliyor\n" -#: src/chage.c:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" msgstr "%s: alanlar覺 deitirirken hata olutu\n" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, c-format msgid "%s: can't update password file\n" msgstr "%s: parola dosyas覺 g羹ncellenemedi\n" -#: src/chage.c:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" msgstr "%s: g繹lge parola dosyas覺 g羹ncellenemedi\n" -#: src/chage.c:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "DBM parola kayd覺 g羹ncellenmesinde hata.\n" - -#: src/chage.c:692 +#: src/chage.c:649 #, 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:740 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite password file\n" msgstr "%s: parola dosyas覺na yaz覺lamad覺\n" -#: src/chage.c:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 #, c-format msgid "%s: PAM chauthtok failed\n" msgstr "%s: PAM chauthok baar覺s覺z oldu\n" @@ -368,117 +342,122 @@ msgstr "" msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" msgstr "Kullan覺m: %s [-f tam_isim] [-r oda_no] [-w i_tel] [-h ev_tel]\n" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "Tam 襤sim" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "\tTam 襤sim: %s\n" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "Oda Numaras覺" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "襤 Telefonu" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" msgstr "Ev Telefonu" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "Dier" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s: Kullan覺c覺 isminiz belirlenemedi.\n" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s: kullan覺c覺 `%s' NIS istemcisinde deitirilemedi.\n" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "%s: `%s' bu istemci i癟in NIS efendisidir.\n" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, fuzzy, c-format +msgid "%s: Permission denied.\n" +msgstr "%s: m羹saade edilmedi\n" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" msgstr "%s i癟in kullan覺c覺 bilgileri deitiriliyor\n" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s: ge癟ersiz isim: \"%s\"\n" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s: ge癟ersiz oda numaras覺: \"%s\"\n" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s: ge癟ersiz i telefonu: \"%s\"\n" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s: ge癟ersiz ev telefonu: \"%s\"\n" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s: \"%s\" ge癟ersiz karakterler i癟eriyor\n" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "%s: alanlar 癟ok uzun\n" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" msgstr "ID root kullan覺c覺s覺 olarak deitirilemiyor.\n" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" msgstr "Parola dosyas覺 kilitlenemiyor, daha sonra tekrar deneyin.\n" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" msgstr "Parola dosyas覺 a癟覺lam覺yor.\n" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s: %s /etc/passwd i癟inde bulunamad覺\n" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" msgstr "Parola kayd覺 g羹ncellenmesinde hata.\n" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" msgstr "Parola dosyas覺 deiiklikleri ilenemiyor.\n" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" msgstr "Parola dosyas覺 kilidi a癟覺lam覺yor.\n" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -495,48 +474,48 @@ msgstr "" msgid "%s: can't lock password file\n" msgstr "%s: parola dosyas覺 kilitlenemedi\n" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "%s: g繹lge dosyas覺 kilitlenemiyor\n" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "%s: g繹lge dosyas覺 a癟覺lam覺yor\n" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "%s: sat覺r %d: sat覺r 癟ok uzun\n" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "%s: sat覺r %d: yeni parola eksik\n" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "%s: sat覺r %d: bilinmeyen kullan覺c覺 %s\n" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "%s: sat覺r %d: parola kayd覺 g羹ncellenemiyor\n" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "%s: hata alg覺land覺, deiiklikler g繹rmezden gelindi\n" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" msgstr "%s: g繹lge (shadow9 dosyas覺 g羹ncellenmesinde hata\n" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" msgstr "%s: parola dosyas覺 g羹ncellenmesinde hata\n" @@ -546,26 +525,26 @@ msgstr "%s: parola dosyas覺 g羹ncellenmesinde hata\n" msgid "Usage: %s [-s shell] [name]\n" msgstr "Kullan覺m: %s [-s kabuk] [isim]\n" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" msgstr "Oturum Kabuu" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" msgstr "%s i癟in kabuu deitiremezsiniz.\n" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" msgstr "%s i癟in oturum kabuu deitiriliyor\n" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s: Ge癟ersiz kay覺t: %s\n" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" msgstr "%s ge癟ersiz bir kabuk.\n" @@ -575,12 +554,12 @@ msgstr "%s ge癟ersiz bir kabuk.\n" msgid "Usage: expiry {-f|-c}\n" msgstr "Kullan覺m: expiry {-f|-c}\n" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" msgstr "%s: UYARI! root kullan覺c覺s覺na set-UID olmal覺!\n" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "%s: bilinmeyen kullan覺c覺\n" @@ -594,320 +573,285 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" msgstr "" -#: src/faillog.c:86 +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" -msgstr "Kullan覺c覺 ad覺 Baar覺s覺z Azami Sonuncu\n" +msgid "Login Failures Maximum Latest On\n" +msgstr "" -#: src/faillog.c:103 -#, c-format -msgid " %s on %s" -msgstr " %s 羹zerinde %s" - -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" msgstr " [%lds kald覺]" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr " [%lds kilitli]" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "Bilinmeyen Kullan覺c覺: %s\n" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "Kullan覺m: %s [-r|-R] grup\n" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr " %s [-a kullan覺c覺] grup\n" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr " %s [-d kullan覺c覺] grup\n" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr " %s [-A kullan覺c覺,...] [-M kullan覺c覺,...] grup\n" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr " %s [-M kullan覺c覺,...] grup\n" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" msgstr "%s: -A i癟in g繹lge grup parolalar覺 gerekli\n" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "Siz kimsiniz?\n" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr "bilinmeyen grup: %s\n" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "%s kullan覺c覺s覺 %s grubuna ekleniyor\n" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "%s kullan覺c覺s覺 %s grubundan 癟覺kar覺l覺yor\n" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" msgstr "%s: bilinmeyen 羹ye %s\n" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "%s: Bir tty deil\n" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "%s grubu i癟in parola deitiriliyor\n" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "Yeni parola: " -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " msgstr "Yeni parolay覺 tekrar girin: " -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" msgstr "Elemiyorlar; tekrar deneyin" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" msgstr "%s: Daha sonra tekrar deneyin\n" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "%s: kilitlenemiyor\n" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" msgstr "%s: g繹lge kilidi koyulam覺yor\n" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "%s: dosya a癟覺lam覺yor\n" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "%s: kay覺t g羹ncellenemiyor\n" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" msgstr "%s: g繹lge kayd覺 g羹ncellenemiyor\n" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "%s: dosya tekrar yaz覺lam覺yor\n" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" msgstr "%s: g繹lge dosyas覺 tekrar yaz覺lam覺yor\n" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "%s: dosya kilidi a癟覺lam覺yor\n" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "%s: DBM dosyalar覺 g羹ncellenemiyor\n" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "%s: DBM g繹lge dosyalar覺 g羹ncellenemiyor\n" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "Kullan覺m: groupadd [-g gid [-o]] [-f] grup\n" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, c-format msgid "%s: error adding new group entry\n" msgstr "%s: yeni grup kayd覺 eklenirken hata olutu\n" -#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: yeni dbm grup kayd覺 eklenemiyor\n" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "%s: %s ismi tek deil\n" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" msgstr "%s: %u gid tek deil\n" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "%s: tek (benzersiz) bir gid al覺namad覺\n" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, c-format msgid "%s: %s is not a valid group name\n" msgstr "%s: %s ge癟erli bir grup ad覺 deil\n" -#: src/groupadd.c:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "%s: ge癟ersiz grup %s\n" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "%s: -O se癟enei ISIM=DEER gerektirir\n" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s: grup dosyas覺na yaz覺lam覺yor\n" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s: g繹lge grup dosyas覺na yaz覺lam覺yor\n" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" msgstr "%s: grup dosyas覺 kilitlenemiyor\n" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" msgstr "%s: grup dosyas覺 a癟覺lam覺yor\n" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" msgstr "%s: g繹lge grup dosyas覺 kilitlenemiyor\n" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" msgstr "%s: g繹lge grup dosyas覺 a癟覺lam覺yor\n" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "%s: grup %s zaten var\n" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, c-format msgid "Usage: groupdel group\n" msgstr "Kullan覺m: groupdel grup_ad覺\n" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" msgstr "%s: grup kayd覺n覺 silerken hata olutu\n" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "%s: grup dbm kayd覺n覺 silerken hata olutu\n" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "%s: g繹lge grup kayd覺n覺 silerken hata olutu\n" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "%s: g繹lge grup dbm kayd覺n覺 silerken hata olutu\n" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "%s: kullan覺c覺n覺n birincil grubu silinemez\n" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "%s: grup %s mevcut deil\n" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "%s: grup %s bir NIS grubudur\n" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s: %s NIS efendisidir\n" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "Kullan覺m: groupmod [-g gid [-o]] [-n isim] grup\n" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "%s: %s /etc/group dosyas覺nda bulunamad覺\n" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s: yeni g繹lge dbm grup kayd覺 eklenemiyor\n" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s: %u benzersiz bir gid deil\n" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "%s: %s benzersiz bir isim deil\n" @@ -917,110 +861,105 @@ msgstr "%s: %s benzersiz bir isim deil\n" msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "Kullan覺m: %s [-r] [-s] [grup [gshadow]]\n" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "Kullan覺m: %s [-r] [-s] [grup]\n" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "Hay覺r" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" msgstr "%s: -s ve -r uyumsuz\n" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "%s: %s dosyas覺 kilitlenemiyor\n" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "%s: %s dosyas覺 a癟覺lam覺yor\n" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" msgstr "ge癟ersiz grup dosyas覺 kayd覺\n" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "`%s' sat覺r覺 silinsin mi? " -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" msgstr "m羹kerrer grup kayd覺\n" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" msgstr "ge癟ersiz grup ad覺 `%s'\n" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "grup %s: %s kullan覺c覺s覺 yok\n" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " msgstr "`%s' 羹yesi silinsin mi? " -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" msgstr "ge癟ersiz g繹lge grup dosyas覺 kayd覺\n" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" msgstr "m羹kerrer g繹lge grup kayd覺\n" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" msgstr "grup dosyas覺 kayd覺 elemedi\n" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" msgstr "g繹lge grubu %s: %s y繹netici kullan覺c覺 deil\n" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " msgstr "y繹netici 羹ye `%s' silinsin mi? " -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" msgstr "g繹lge grubu %s: kullan覺c覺 %s mevcut deil\n" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "%s: %s dosyas覺 g羹ncellenemiyor\n" -#: src/grpck.c:647 src/pwck.c:612 -#, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: dosyalar g羹ncellendi; mkpasswd'yi 癟al覺t覺r覺n\n" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format -msgid "%s: no changes\n" -msgstr "%s: deiiklik yok\n" - -#: src/grpck.c:651 src/pwck.c:616 +#: src/grpck.c:640 src/pwck.c:606 #, c-format msgid "%s: the files have been updated\n" msgstr "%s: dosyalar g羹ncellendi\n" +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "%s: deiiklik yok\n" + #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" @@ -1036,37 +975,37 @@ msgstr "%s: grup dosyas覺 a癟覺lam覺yor\n" msgid "%s: can't lock shadow group file\n" msgstr "%s: g繹lge grup dosyas覺 kilitlenemiyor\n" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" msgstr "%s: g繹lge grup dosyas覺 a癟覺lam覺yor\n" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "%s g繹lge grubu %s silinemiyor\n" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "%s: %s i癟in g繹lge kayd覺 g羹ncellenemiyor\n" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "%s: %s grubu i癟in kay覺t g羹ncellenemiyor\n" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" msgstr "%s: g繹lge grup dosyas覺 g羹ncellenemiyor\n" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" msgstr "%s: grup dosyas覺 g羹ncellenemiyor\n" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "%s: g繹lge grup dosyas覺 silinemiyor\n" @@ -1086,52 +1025,52 @@ msgstr "Kullan覺m: id\n" msgid " groups=" msgstr ".gruplar=" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" msgstr "Kullan覺c覺 ad覺 Port Kimden Sonuncu\n" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "Kullan覺c覺 ad覺 Port Sonuncu\n" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "**Hi癟 giri yapmad覺**" -#: src/login.c:175 +#: src/login.c:156 #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Kullan覺m: %s [-p] [isim]\n" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr " %s [-p] [-h host] [-f isim]\n" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr " %s [-p] -r host\n" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" msgstr "Ge癟ersiz giri zaman覺\n" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" @@ -1140,7 +1079,7 @@ msgstr "" "\n" "Sistem rutin bak覺mlar i癟in kapal覺\n" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" @@ -1149,7 +1088,7 @@ msgstr "" "\n" "[Balant覺 kesilmesi atland覺 -- root girii olanakl覺.]\n" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" @@ -1158,17 +1097,17 @@ msgstr "" "\n" "Giri %d saniye sonra zaman a覺m覺na urad覺.\n" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" msgstr " `%.200s'den `%.100s' 羹zerinde" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" msgstr " `%.100s' 羹zerinde" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" @@ -1177,39 +1116,30 @@ msgstr "" "\n" "%s giri: " -#: src/login.c:819 -msgid "login: " -msgstr "giri: " - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" msgstr "Giri ge癟ersiz" -#: src/login.c:1198 +#: src/login.c:996 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:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "Son giri: %s 羹zerinden %s" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" msgstr "Son giri: %s 羹zerinden %.19s" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" msgstr "%.*s'den" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "rad_login balat覺l覺yor\n" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" @@ -1250,17 +1180,17 @@ msgstr "%s: kay覺t eklenirken oluan hata " msgid "added %d entries, longest was %d\n" msgstr "%d kay覺t eklendi, en uzunu %d idi\n" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "Kullan覺m: %s [-vf] [-p|g|sp|sg] dosya\n" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "Kullan覺m: %s [-vf] [-p|g|sp] dosya\n" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "Kullan覺m: %s [-vf] [-p|g] dosya\n" @@ -1280,16 +1210,16 @@ msgstr "Kullan覺m: sg grup [[-c] komut]\n" msgid "unknown uid: %u\n" msgstr "bilinmeyen uid: %u\n" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" msgstr "bilinmeyen gid: %lu\n" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "zg羹n羹m.\n" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "癟ok fazla grup\n" @@ -1299,91 +1229,91 @@ msgstr "癟ok fazla grup\n" msgid "Usage: %s [input]\n" msgstr "Kullan覺m: %s [girdi]\n" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "%s: /etc/passwd kilitlenemiyor.\n" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "%s: dosyalar kilitlenemiyor, daha sonra tekrar deneyin\n" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "%s: dosyalar a癟覺lam覺yor\n" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "%s: sat覺r %d: ge癟ersiz sat覺r\n" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "%s: sat覺r %d: GID yarat覺lam覺yor\n" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "%s: sat覺r %d: UID yarat覺lam覺yor\n" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "%s: sat覺r %d: kullan覺c覺 %s bulunamad覺\n" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "%s: sat覺r %d: parola g羹ncellenemiyor\n" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "%s: sat覺r %d: mkdir baar覺s覺z oldu\n" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "%s: sat覺r %d: chown baar覺s覺z oldu\n" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "%s: sat覺r %d: kay覺t g羹ncellenemiyor\n" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "%s: dosyalar覺n g羹ncellenmesinde hata olutu\n" -#: src/passwd.c:155 +#: src/passwd.c:154 #, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "Kullan覺m: %s [-f|-s] [isim]\n" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr " %s [-x maks] [-n min] [-w uyar覺] [-i pasif] isim\n" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} isim\n" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "Eski parola: " -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" msgstr "`%s' i癟in yanl覺 parola\n" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" @@ -1392,16 +1322,16 @@ msgstr "" "Yeni parolay覺 girin (asgari %d, azami %d karakter)\n" "L羹tfen b羹y羹k, k羹癟羹k harf ve rakamlar覺n bir kombinasyonunu kullan覺n.\n" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "Yeni parola: " -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" msgstr "Yeniden deneyin.\n" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" @@ -1410,52 +1340,52 @@ msgstr "" "\n" "Uyar覺: zay覺f parola (yine de kullanmak i癟in ayn覺s覺n覺 tekrar girin).\n" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" msgstr "Elemediler, tekrar deneyin.\n" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "%s i癟in parola deitirilemedi.\n" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" msgstr "zg羹n羹m, %s i癟in parola hen羹z deitirilemedi.\n" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "%s: yetersiz bellek\n" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "%s: %s 癟al覺t覺r覺lam覺yor" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" msgstr "%s: depo %s desteklenmiyor\n" -#: src/passwd.c:914 +#: src/passwd.c:884 #, fuzzy, c-format -msgid "You may not change the password for %s.\n" +msgid "%s: You may not view or modify password information for %s.\n" msgstr "%s i癟in kabuu deitiremezsiniz.\n" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "%s i癟in parola deitiriliyor\n" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "%s i癟in parola deimedi\n" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "Parola deiti \n" @@ -1470,49 +1400,49 @@ msgstr "Kullan覺m: %s [-q] [-r] [-s] [parola [g繹lge]]\n" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "Kullan覺m: %s [-q] [-r] [-s] [parola]\n" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" msgstr "ge癟ersiz parola dosyas覺 kayd覺\n" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" msgstr "m羹kerrer parola kayd覺\n" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" msgstr "ge癟ersiz kullan覺c覺 ad覺 '%s'\n" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "kullan覺c覺 %s: %u grubu mevcut deil\n" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "kullan覺c覺 %s: %s dizini mevcut deil\n" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "kullan覺c覺 %s: uygulama %s mevcut deil\n" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" msgstr "ge癟ersiz g繹lge parola dosyas覺 kayd覺\n" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" msgstr "m羹kerrer g繹lge parola kayd覺\n" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" msgstr "eleen parola dosyas覺 kayd覺 yok\n" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" msgstr "kullan覺c覺 %s: gelecekteki son parola deiimi\n" @@ -1532,17 +1462,17 @@ msgstr "%s: passwd dosyas覺 a癟覺lamad覺\n" msgid "%s: can't remove shadow entry for %s\n" msgstr "%s: %s i癟in g繹lge kayd覺 silinemedi\n" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "%s: %s i癟in passwd kayd覺 g羹ncellenemedi\n" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" msgstr "%s: g繹lge dosyas覺 g羹ncellenemedi\n" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" msgstr "%s: passwd dosyas覺 g羹ncellenemedi\n" @@ -1552,40 +1482,40 @@ msgstr "%s: passwd dosyas覺 g羹ncellenemedi\n" msgid "%s: can't update entry for user %s\n" msgstr "%s: kullan覺c覺 %s i癟in kay覺t g羹ncellenemiyor\n" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format msgid "%s: can't delete shadow password file\n" msgstr "%s: g繹lge parola dosyas覺 silinemiyor\n" -#: src/su.c:133 +#: src/su.c:132 msgid "Sorry." msgstr "zg羹n羹m." -#: src/su.c:323 +#: src/su.c:320 #, c-format msgid "%s: must be run from a terminal\n" msgstr "%s: bir terminalden 癟al覺t覺r覺lmal覺\n" -#: src/su.c:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "%s: pam_start: hata %d\n" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" msgstr "Bilinmeyen id: %s\n" -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, c-format msgid "You are not authorized to su %s\n" msgstr "su %s i癟in yetkili deilsiniz\n" -#: src/su.c:502 +#: src/su.c:495 msgid "(Enter your own password.)" msgstr "(Kendi parolan覺z覺 girin.)" -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" @@ -1594,22 +1524,22 @@ msgstr "" "%s: %s\n" "(Dikkate al覺nmad覺)\n" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" msgstr "Kabuk yok\n" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr "Bu hesap i癟in 'su'ya eriim ENGELLEND襤.\n" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "Parola yetkilendirmesi atland覺.\n" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" msgstr "L羹tfen yetkilendirme i癟in KEND襤 parolan覺z覺 girin.\n" @@ -1624,7 +1554,7 @@ msgstr "Parola dosyas覺 yok\n" msgid "No password entry for 'root'\n" msgstr "'root' i癟in parola kayd覺 yok\n" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" @@ -1634,234 +1564,214 @@ 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:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" msgstr "Sistem Bak覺m覺 Kipine Giriliyor\n" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "%s: grup veritaban覺n覺 tekrar olutur\n" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "%s: g繹lge grup veritaban覺n覺 tekrar olutur\n" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "%s: ge癟ersiz say覺sal arg羹man `%s'\n" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "%s: bilinmeyen gid %s\n" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "%s: bilinmeyen grup %s\n" -#: src/useradd.c:475 +#: src/useradd.c:418 #, c-format msgid "%s: cannot create new defaults file\n" msgstr "%s: yeni varsay覺lanlar dosyas覺 oluturulamad覺\n" -#: src/useradd.c:480 +#: src/useradd.c:423 #, c-format msgid "%s: cannot open new defaults file\n" msgstr "%s: yeni varsay覺lanlar dosyas覺 a癟覺lamad覺\n" -#: src/useradd.c:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" msgstr "%s: yeniden adland覺rma: %s" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s: grup `%s' bir NIS grubu.\n" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "%s: 癟ok fazla grup verildi (azami %d).\n" -#: src/useradd.c:721 +#: src/useradd.c:660 #, 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:724 +#: src/useradd.c:663 #, c-format msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr "" " [-d ev_dizini] [-s kabuk] [-c a癟覺klama] [-m [-k ablon]]\n" -#: src/useradd.c:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, c-format msgid " [-f inactive] [-e expire]\n" msgstr " [-f pasif] [-e hesap_bitimi ]\n" -#: src/useradd.c:728 +#: src/useradd.c:667 #, c-format msgid " [-p passwd] name\n" msgstr " [-p parola] isim\n" -#: src/useradd.c:730 +#: src/useradd.c:669 #, 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:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, c-format msgid "%s: error locking group file\n" msgstr "%s: grup dosyas覺 kilitlenmesinde hata\n" -#: src/useradd.c:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, c-format msgid "%s: error opening group file\n" msgstr "%s: grup dosyas覺 a癟覺l覺rken hata\n" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, c-format msgid "%s: error locking shadow group file\n" msgstr "%s: g繹lge grup dosyas覺 kilitlenirken hata\n" -#: src/useradd.c:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, c-format msgid "%s: error opening shadow group file\n" msgstr "%s: g繹lge grup dosyas覺 a癟覺l覺rken hata\n" -#: src/useradd.c:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "%s: uid %u benzersiz deil\n" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "%s: benzersiz bir uid elde edilemedi\n" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "%s: ge癟ersiz ana dizin `%s'\n" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "%s: ge癟ersiz a癟覺klama `%s'\n" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "%s: ge癟ersiz ev dizini `%s'\n" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s: ge癟ersiz tarih `%s'\n" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "%s: -e i癟in g繹lge parolalar gerekli\n" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, c-format msgid "%s: shadow passwords required for -f\n" msgstr "%s: -f i癟in g繹lge parolalar gerekli\n" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" msgstr "%s: ge癟ersiz alan `%s'\n" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "%s: ge癟ersiz kabuk `%s'\n" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "%s: ge癟ersiz kullan覺c覺 ad覺 '%s'\n" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "%s: parola dosyas覺 yaz覺lam覺yor\n" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "%s: g繹lge parola dosyas覺 yaz覺lam覺yor\n" -#: src/useradd.c:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, c-format msgid "%s: unable to lock password file\n" msgstr "%s: parola dosyas覺 kilitlenemiyor\n" -#: src/useradd.c:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, c-format msgid "%s: unable to open password file\n" msgstr "%s: parola dosyas覺 a癟覺lam覺yor\n" -#: src/useradd.c:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, c-format msgid "%s: cannot lock shadow password file\n" msgstr "%s: g繹lge parola dosyas覺 kilitlenemiyor\n" -#: src/useradd.c:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, c-format msgid "%s: cannot open shadow password file\n" msgstr "%s: g繹lge parola dosyas覺 a癟覺lam覺yor\n" -#: src/useradd.c:1459 +#: src/useradd.c:1354 #, c-format msgid "%s: error adding new password entry\n" msgstr "%s: yeni parola kayd覺 eklenirken hata\n" -#: src/useradd.c:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "%s: parola dbm kayd覺 g羹ncellenirken hata\n" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, c-format msgid "%s: error adding new shadow password entry\n" msgstr "%s: yeni g繹lge parola kayd覺 eklenirken hata\n" -#: src/useradd.c:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s: g繹lge passwd dbm kayd覺 g羹ncellenirken hata olutu\n" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" msgstr "%s: %s dizini yarat覺lam覺yor\n" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, c-format msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n" msgstr "" -#: src/useradd.c:1590 +#: src/useradd.c:1446 #, 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:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "%s: kullan覺c覺 %s mevcut\n" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" @@ -1869,206 +1779,171 @@ msgstr "" "%s: grup %s mevcut - eer bu kullan覺c覺y覺 bu gruba eklemek istiyorsan覺z, -g " "kullan覺n.\n" -#: src/useradd.c:1767 +#: src/useradd.c:1602 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" msgstr "" "%s: uyar覺: CREATE_HOME desteklenmiyor, l羹tfen bunun yerine -m kullan覺n.\n" -#: src/userdel.c:124 +#: src/userdel.c:108 #, c-format msgid "Usage: %s [-r] name\n" msgstr "Kullan覺m: %s [-r] isim\n" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" msgstr "%s: grup kayd覺 g羹ncellenirken hata olutu\n" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "%s: dbm grup kayd覺 g羹ncellenemiyor\n" - -#: src/userdel.c:214 -#, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: dbm grup kayd覺 silinemiyor\n" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "%s: grup dosyas覺 a癟覺lam覺yor\n" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "%s: g繹lge grup dosyas覺 a癟覺lam覺yor\n" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "%s: parola kayd覺 silinirken hata olutu\n" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "%s: g繹lge parola kayd覺 silinirken hata olutu\n" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "%s: parola dbm kayd覺 silinirken hata olutu\n" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s: g繹lge passwd dbm kayd覺 silinirken hata olutu\n" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "%s: kullan覺c覺 %s u an oturumda\n" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "%s: %s %s kullan覺c覺s覺na ait deil, silinmiyor\n" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " msgstr "%s: uyar覺: silinemiyor " -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" msgstr "%s: kullan覺c覺 %s mevcut deil\n" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s: kullan覺c覺 %s bir NIS kullan覺c覺s覺\n" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "%s: %s dizini silinmiyor (%s kullan覺c覺s覺n覺n ev dizinini silecekti)\n" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "%s: %s dizini silinirken hata olutu\n" -#: src/usermod.c:306 +#: src/usermod.c:289 #, c-format msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "Kullan覺m: %s\t[-u uid [-o]] [-g grup] [-G grup,...] \n" -#: src/usermod.c:310 +#: src/usermod.c:293 #, 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:313 +#: src/usermod.c:296 #, c-format msgid "[-f inactive] [-e expire] " msgstr "[-f pasif] [-e hesap_bitimi] " -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p parola] [-L|-U] isim\n" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" msgstr "%s: update_group i癟in bellek yetersiz\n" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "%s: update_gshadow i癟in bellek yetersiz\n" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "%s: herhangi bir bayrak verilmedi\n" -#: src/usermod.c:965 +#: src/usermod.c:903 #, 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:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "%s: uid %lu benzersiz deil\n" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, c-format msgid "%s: error changing password entry\n" msgstr "%s: parola kayd覺 deitirilirken hata olutu\n" -#: src/usermod.c:1122 +#: src/usermod.c:1053 #, c-format msgid "%s: error removing password entry\n" msgstr "%s: parola kayd覺 silinirken hata olutu\n" -#: src/usermod.c:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "%s: parola dbm kayd覺 eklenirken hata olutu\n" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "%s: passwd dbm kayd覺 silinirken hata olutu\n" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "%s: g繹lge parola kayd覺 silinirken hata olutu\n" -#: src/usermod.c:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s: g繹lge passwd dbm kayd覺 silinirken hata olutu\n" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "%s: %s dizini mevcut\n" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "%s: %s yarat覺lam覺yor\n" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" msgstr "%s: chown %s ger癟ekletirilemiyor\n" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, 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:1333 +#: src/usermod.c:1223 #, 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:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" msgstr "postakutusu sahibi deitirilmedi" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" msgstr "postakutusu isim deiiklii baar覺s覺z" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" @@ -2077,20 +1952,20 @@ msgstr "" "\n" "%s: %s deitirilmedi\n" -#: src/vipw.c:133 +#: src/vipw.c:131 msgid "Couldn't lock file" msgstr "Dosya kilitlenemedi" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" msgstr "Yedek al覺namad覺" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s: %s geri y羹klenemiyor: %s (deiiklikleriniz %s i癟inde)\n" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/po/uk.gmo b/po/uk.gmo index 69aeb60f..eeff4de7 100644 Binary files a/po/uk.gmo and b/po/uk.gmo differ diff --git a/po/uk.po b/po/uk.po index 3968cc2a..71e76067 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1,27 +1,29 @@ -# shadow.pot Ukrainian translation. -# Roman Festchook , 2001. -# Comments and bug-reports are welcomed +# shadow.pot Ukrainian translation. +# Roman Festchook , 2001-2005. +# Comments and bug-reports are welcomed msgid "" msgstr "" -"Project-Id-Version: shadow-20001016\n" +"Project-Id-Version: shadow-4.0.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-26 07:53+0100\n" -"PO-Revision-Date: 2001-08-04 19:45+0200\n" -"Last-Translator: Roman Festchook \n" -"Language-Team: Roman Festchook \n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" +"PO-Revision-Date: 2005-04-19 23:22+0300\n" +"Last-Translator: Roman Festchook \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" msgstr "訄迮迮迠迮郇郇: 郇迮赲迡郋邾訄 迣郈訄 %s\n" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" -msgstr "訄迮迮迠迮郇郇: 郱訄郇訄迡郋 訇訄迣訄郋 迣郈\n" +msgstr "訄迮迮迠迮郇郇: 郱訄訇訄迣訄郋 迣郈\n" #: libmisc/age.c:72 #, c-format @@ -40,23 +42,23 @@ msgstr "訄 郅郋迣郇 郈郋郋迮郇郋." #: libmisc/age.c:90 msgid " Contact the system administrator.\n" -msgstr " '赲迠 郱 邽迮邾郇邽邾 訄迡邾郇訄郋郋邾.\n" +msgstr " 赲'迠 郱 邽迮邾郇邽邾 訄迡邾郇訄郋郋邾.\n" #: libmisc/age.c:93 msgid " Choose a new password.\n" -msgstr " 邽訇迮 郇郋赲邽邿 郈訄郋郅.\n" +msgstr " 訇迮 郇郋赲邽邿 郈訄郋郅.\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "訄 郈訄郋郅 訇迡迮 郈郋郋郋迮郇郋 郱訄 %ld 迡郇赲.\n" -#: libmisc/age.c:174 +#: libmisc/age.c:172 #, c-format msgid "Your password will expire tomorrow.\n" msgstr "訄 郈訄郋郅 訇迡迮 郈郋郋迮郇郋 郱訄赲訄.\n" -#: libmisc/age.c:176 +#: libmisc/age.c:174 #, c-format msgid "Your password will expire today.\n" msgstr "訄 郈訄郋郅 訇迡迮 郈郋郋迮郇郋 郋迣郋迡郇.\n" @@ -71,52 +73,43 @@ msgstr "迮 邾郋迠 郱邾郇邽邽 tty %s" msgid "Environment overflow\n" msgstr "迮迮郈郋赲郇迮郇郇 郋郋迮郇郇\n" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr "邽 郇迮 邾郋迠迮迮 郱邾郇邽邽 $%s\n" -#: libmisc/failure.c:230 +#: libmisc/failure.c:229 #, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "%d %s 郱 訄 郋訄郇郇迣郋 赲郋迡. 訄郇郇邿 赲迡: %s 郱 %s.\n" +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "" +"%d 郈郋邾邽郅郋郕 郱 訄 郋訄郇郇郋迣郋 赲郋迡.\n" +"訄郇郇邿 赲迡: %s 郱 %s.\n" +msgstr[1] "%d 郈郋邾邽郅郕邽 郱 訄 郋訄郇郇迣郋 赲郋迡. 訄郇郇邿 赲迡: %s 郱 %s.\n" +msgstr[2] "%d 郈郋邾邽郅郋郕 郱 訄 郋訄郇郇迣郋 赲郋迡. 訄郇郇邿 赲迡: %s 郱 %s.\n" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "郈郋邾邽郅郕邽" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "郈郋邾邽郅郕訄" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" -msgstr "訄郇訄迡郋 訇訄迣訄郋 迮邿.\n" - -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "訄郋郅 郇迮 迡迮邽 訄邾郇邽邿 郕郅 迡郅 %s.\n" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "迮 邾郋迠 赲訄郇郋赲邽邽 訄邾郇郋迣郋 郕郅訄 迡郅 %s: 邽 郱訄郈迮郇郋 迮赲迮 郕郅赲?\n" +msgstr "訄訇訄迣訄郋 赲郋迡赲.\n" #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." -msgstr "邽 邾訄迮 郇郋赲 郈郋." +msgstr "邽 邾訄迮 郇郋赲 郈郋." #: libmisc/mail.c:72 msgid "No mail." -msgstr "郋邽 郇迮 邾訄." +msgstr "郋邽 郇迮 邾訄." #: libmisc/mail.c:74 msgid "You have mail." -msgstr "邽 邾訄迮 郈郋." +msgstr "邽 邾訄迮 郈郋." -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " msgstr "郋迣訄郇邽邿 郈訄郋郅: %s. " @@ -131,20 +124,20 @@ msgstr "passwd: pam_start() 郇迮 赲邽郕郋郇訄郇郋, 郈郋邾邽郅郕訄 %d\n" msgid "passwd: %s\n" msgstr "passwd: %s\n" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" -msgstr "" +msgstr "passwd: 郈訄郋郅 赲迡訄郅郋 郱邾郇迮郇郋\n" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "迮 邾郋迠 郈迮迮邿邽 迡郋 迮郕邽 \"%s\"\n" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" -msgstr "迮邾訄 迮郕邽, 赲迡郕邽赲訄邾郋 迮 郱 HOME=/" +msgstr "迮邾訄 迮郕邽, 赲郋迡邽邾郋 郱 HOME=/" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr "迮 邾郋迠 赲邽郕郋郇訄邽 %s" @@ -159,36 +152,32 @@ msgstr "迮赲郇訄 郕郋迮郇迮赲訄 迮郕訄 \"%s\"\n" msgid "Can't change root directory to \"%s\"\n" msgstr "迮 邾郋迠 郱邾郇邽邽 郕郋迮郇迮赲 迮郕 郇訄 \"%s\"\n" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "malloc(%d) 郇迮 赲邽郕郋郇訄郇郋\n" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" msgstr "迮 邾郋迠 赲邽迡郅邽邽 迮邽 迡郅 郕郋郇迣訄邿郇邽 迡訄郇郇邽.\n" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "" "郈郋邾邽郅郕訄 郕郋郇迣訄 - 郇迮赲迡郋邾訄 郈郋郱邽 '%s' (郈郋赲迡郋邾迮 訄迡邾郇訄郋訄)\n" -#: lib/pwauth.c:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "訄郋郅: " -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "訄郋郅 郕郋邽赲訄訄 %s: " -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "" - -#: src/chage.c:118 +#: src/chage.c:112 #, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" @@ -198,158 +187,150 @@ msgstr "" " [-I 郇迮訄郕邽赲郇] [-E 郈郋郋迮郇郇郋]\n" " [-d 郋訄郇郇邿_迡迮郇] 郕郋邽赲訄\n" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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" +msgstr "赲迮迡 郇郋赲迮 郱郇訄迮郇郇 訄訇郋 郇訄迠邾 ENTER 迡郅 郱郇訄迮郇郇 郈郋 郱訄邾郋赲赲訄郇郇\n" -#: src/chage.c:155 +#: src/chage.c:149 msgid "Minimum Password Age" msgstr "郇邾訄郅郇邽邿 赲郕 郈訄郋郅" -#: src/chage.c:161 +#: src/chage.c:155 msgid "Maximum Password Age" -msgstr "訄郕邾訄郅郇邽邿 赲郕 郈訄郋郅" +msgstr "訄郕邽邾訄郅郇邽邿 赲郕 郈訄郋郅" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" msgstr "訄郇郇 郱邾郇訄 郈訄郋郅 (--)" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" msgstr "訄迮迮迠迮郇郇 郈郋 郈郋郋迮郇郇 郈訄郋郅" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "訄郋郅 郇迮訄郕邽赲郇邽邿" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "訄訄 郈郋郋迮郇郇 訄郇郕 (--)" -#: src/chage.c:238 -#, fuzzy, c-format +#: src/chage.c:231 +#, c-format msgid "Last password change\t\t\t\t\t: " -msgstr "訄郇郇 郱邾郇訄 郈訄郋郅 (--)" +msgstr "訄郇郇 郱邾郇訄 郈訄郋郅\t\t\t\t\t: " -#: src/chage.c:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 -#, fuzzy, c-format +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 +#, c-format msgid "never\n" -msgstr "郕郋郅邽\n" +msgstr "郇郕郋郅邽\n" -#: src/chage.c:251 -#, fuzzy, c-format +#: src/chage.c:244 +#, c-format msgid "Password expires\t\t\t\t\t: " -msgstr "訄郋郅 郈郋郋迮郇郇郋:\t" +msgstr "訄郋郅 訄 郈郋郋迮郇邽邾\t\t\t\t\t: " -#: src/chage.c:267 -#, fuzzy, c-format +#: src/chage.c:260 +#, c-format msgid "Password inactive\t\t\t\t\t: " -msgstr "訄郋郅 郇迮訄郕邽赲郇邽邿:\t" +msgstr "訄郋郅 郇迮訄郕邽赲郇邽邿\t\t\t\t\t: " -#: src/chage.c:281 -#, fuzzy, c-format +#: src/chage.c:274 +#, c-format msgid "Account expires\t\t\t\t\t\t: " -msgstr "訄郇郋郕 郈郋郋迮郇郋:\t" +msgstr "訄郇郋郕 訄 郈郋郋迮郇邽邾\t\t\t\t\t\t: " -#: src/chage.c:297 +#: src/chage.c:290 #, c-format msgid "Minimum number of days between password change\t\t: %ld\n" -msgstr "" +msgstr "郇邾訄郅郇訄 郕郅郕 迡郇赲 邾迠 郱邾郇訄邾邽 郈訄郋郅\t\t: %ld\n" -#: src/chage.c:298 +#: src/chage.c:292 #, c-format msgid "Maximum number of days between password change\t\t: %ld\n" -msgstr "" +msgstr "訄郕邽邾訄郅郇訄 郕郅郕 迡郇赲 邾迠 郱邾郇訄邾邽 郈訄郋郅\t\t: %ld\n" -#: src/chage.c:299 +#: src/chage.c:294 #, c-format msgid "Number of days of warning before password expires\t: %ld\n" -msgstr "" +msgstr "郅郕 迡郇赲 迡郅 郱訄迮迮迠迮郇郇 郈郋 郈郋郋迮郇郇 郈訄郋郅\t: %ld\n" -#: src/chage.c:444 +#: src/chage.c:431 #, c-format msgid "%s: do not include \"l\" with other flags\n" msgstr "%s: 郇迮 赲邽郕郋邽郋赲邿迮 \"l\" 郱 郇邾邽 郅訄迣訄邾邽\n" -#: src/chage.c:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 -#, fuzzy, c-format +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 +#, c-format msgid "%s: permission denied.\n" -msgstr "%s: 迡郋郈 赲迡邾郋赲郅迮郇郋\n" +msgstr "%s: 迡郋郈 赲迡邾郋赲郅迮郇郋.\n" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 #, c-format msgid "%s: PAM authentication failed\n" msgstr "%s: PAM 訄迮郇邽郕訄 郇迮 郈郋邿郅訄\n" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, c-format msgid "%s: can't open password file\n" msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 郈訄郋郅迮邿\n" -#: src/chage.c:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "%s: 郇迮赲迡郋邾邽邿 郕郋邽赲訄 %s\n" -#: src/chage.c:535 -#, fuzzy, c-format +#: src/chage.c:519 +#, c-format msgid "%s: can't lock shadow password file" -msgstr "%s: 郇迮 邾郋迠 郱訄訇郅郋郕赲訄邽 訄邿郅 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" +msgstr "%s: 郇迮 邾郋迠 郱訄訇郅郋郕赲訄邽 訄邿郅 郈邽郋赲訄郇邽 郈訄郋郅迮邿" -#: src/chage.c:543 -#, fuzzy, c-format +#: src/chage.c:527 +#, c-format msgid "%s: can't open shadow password file" -msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" +msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 郈邽郋赲訄郇邽 郈訄郋郅迮邿" -#: src/chage.c:604 +#: src/chage.c:587 #, c-format msgid "Changing the aging information for %s\n" msgstr "邾郇 赲郕郋赲 郇郋邾訄 迡郅 %s\n" -#: src/chage.c:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" msgstr "%s: 郈郋邾邽郅郕訄 郱訄邾郇邽 郈郋郅\n" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, c-format msgid "%s: can't update password file\n" msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 訄邿郅 郈訄郋郅迮邿\n" -#: src/chage.c:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 訄邿郅 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#: src/chage.c:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "郋邾邽郅郕訄 郋郇郋赲郅迮郇郇 郱訄郈邽 郈訄郋郅 DBM.\n" - -#: src/chage.c:692 +#: src/chage.c:649 #, c-format msgid "%s: can't rewrite shadow password file\n" msgstr "%s: 郇迮 邾郋迠 郈迮迮郈邽訄邽 訄邿郅 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#: src/chage.c:740 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite password file\n" msgstr "%s: 郇迮 邾郋迠 郈迮迮郈邽訄邽 訄邿郅 郈訄郋郅迮邿\n" -#: src/chage.c:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 -#, fuzzy, c-format +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 +#, c-format msgid "%s: PAM chauthtok failed\n" -msgstr "%s: 郇迮 邾郋迠 訄郱訇郅郋郕赲訄邽 訄邿郅\n" +msgstr "%s: 郈郋邾邽郅郕訄 PAM chauthtok\n" #: src/chfn.c:84 #, c-format @@ -367,117 +348,122 @@ msgstr "" "邽郕郋邽郋赲邿迮: %s [-f 郈郋赲郇迮_邾'] [-r 郇郋邾迮_郕邾郇訄邽]\n" "\t[-w 郋訇郋邿_迮郅迮郋郇] [-h 迡郋邾訄郇邿_迮郅迮郋郇]\n" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "郋赲郇迮 邾'" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "\t郋赲郇迮 邾': %s\n" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "郋邾迮 郕邾郇訄邽" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "郋訇郋邿 迮郅迮郋郇" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" msgstr "郋邾訄郇邿 迮郅迮郋郇" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "郇迮" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" -msgstr "%s: 迮 邾郋迠 赲邽郱郇訄邽邽 赲訄迮 邾' 郕郋邽赲訄訄.\n" +msgstr "%s: 迮 邾郋迠 赲邽郱郇訄邽邽 訄迮 邾' 郕郋邽赲訄訄.\n" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s: 郇迮 邾郋迠 郱邾郇邽邽 郕郋邽赲訄訄 `%s' 郕郅郇 NIS.\n" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" -msgstr "%s: `%s' NIS 迮赲迮 迡郅 郋迣郋 郕郅郇訄.\n" +msgstr "%s: `%s' 迮 NIS 迮赲迮 迡郅 郋迣郋 郕郅郇訄.\n" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, c-format +msgid "%s: Permission denied.\n" +msgstr "%s: 苺 迡郋郈 赲迡邾郋赲郅迮郇郋.\n" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" msgstr "邾郇訄 郇郋邾訄 郈郋 郕郋邽赲訄訄 %s\n" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s: 郇迮赲郇迮 邾': \"%s\"\n" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s: 郇迮赲郇邽邿 郇郋邾迮 郕邾郇訄邽: \"%s\"\n" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s: 郇迮赲郇邽邿 郋訇郋邽邿 迮郅迮郋郇: \"%s\"\n" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s: 郇迮赲郇邽邿 迡郋邾訄郇邿 迮郅迮郋郇: \"%s\"\n" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s: \"%s\" 赲郕郅訄 郱訄訇郋郋郇迮郇 邽邾赲郋郅邽\n" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "%s: 郈郋郅 郱訄郇訄迡郋 迡郋赲迣\n" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" msgstr "迮 邾郋迠 郱邾郇邽邽 ID 郇訄 root.\n" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" msgstr "迮 邾郋迠 訇郅郋郕赲訄邽 訄邿郅 郈訄郋郅迮邿; 郈郋訇邿迮 郈郱郇迮.\n" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" msgstr "迮 邾郋迠 赲迡郕邽邽 訄邿郅 郈訄郋郅迮邿.\n" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s: %s 郇迮 郱郇訄邿迡迮郇郋 /etc/passwd\n" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" msgstr "迮 邾郋迠 郋郇郋赲邽邽 郱訄郈邽 訄邿郅 郈訄郋郅迮邿.\n" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" msgstr "迮 邾郋迠 郱訄郈邽訄邽 郱邾郇邽 迡郋 訄邿郅 郈訄郋郅迮邿.\n" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" msgstr "迮 邾郋迠 訄郱訇郅郋郕赲訄邽 訄邿郅 郈訄郋郅迮邿.\n" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -488,54 +474,61 @@ msgid "" " -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n" "\t\t\tpasswords are not encrypted\n" msgstr "" +"邽郕郋邽訄郇郇: chpasswd [郋郈]\n" +"\n" +"郈:\n" +" -e, --encrypted\t赲郕訄郱訄郇邽邿 郈訄郋郅 郱訄邽郋赲訄郇郋\n" +" -h, --help\t\t郈郋郕訄郱訄邽 迡郋郈郋邾郋迣 訄 赲邽邿邽\n" +" -m, --md5\t\t赲邽郕郋邽郋赲赲訄邽 MD5 邽赲訄郇郇 郱訄邾 DES, 郕郋 赲郕訄郱訄郇\n" +"\t\t\t郈訄郋郅 郇迮 郱訄邽郋赲訄郇郋\n" #: src/chpasswd.c:189 #, c-format msgid "%s: can't lock password file\n" msgstr "%s: 郇迮 邾郋迠 郱訄訇郅郋郕赲訄邽 訄邿郅 郈訄郋郅迮邿\n" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "%s: 郇迮 邾郋迠 郱訄訇郅郋郕赲訄邽 訄邿郅 郱 郈邽郋赲訄郇邽邾邽 郈訄郋郅邾邽\n" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 郱 郈邽郋赲訄郇邽邾邽 郈訄郋郅邾邽\n" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "%s: 迡郋郕 %d: 迡郋郕 郱訄郇訄迡郋 迡郋赲迣邽邿\n" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "%s: 迡郋郕 %d: 訇訄郕 郇郋赲郋迣郋 郈訄郋郅\n" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "%s: 迡郋郕 %d: 郇迮赲迡郋邾邽邿 郕郋邽赲訄 %s\n" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "%s: 迡郋郕 %d: 郇迮 邾郋迠 郋郇郋赲邽邽 郱訄郈邽 訇訄郱 郈訄郋郅迮邿\n" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "%s: 赲邽赲郅迮郇郋 郈郋邾邽郅郕, 郱邾郇邽 迣郇郋\n" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" msgstr "%s: 郈郋邾邽郅郕訄 郋郇郋赲郅迮郇郇 訄邿郅 郱 郈邽郋赲訄郇邽邾邽 郈訄郋郅邾邽\n" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" msgstr "%s: 郈郋邾邽郅郕訄 郋郇郋赲郅迮郇郇 訄邿郅 郱 郈訄郋郅邾邽\n" @@ -543,43 +536,43 @@ msgstr "%s: 郈郋邾邽郅郕訄 郋郇郋赲郅迮郇郇 訄邿郅 郱 郈訄郋郅邾邽\n" #: src/chsh.c:76 #, c-format msgid "Usage: %s [-s shell] [name]\n" -msgstr "邽郕郋邽郋赲邿迮: %s [-s shell] [邾']\n" +msgstr "邽郕郋邽郋赲邿迮: %s [-s 郋訇郋郅郋郇郕訄] [邾']\n" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" -msgstr "Login Shell" +msgstr "郋迣郇 訇郋郅郋郇郕訄" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" -msgstr "迮 邾郋迠郇訄 郱邾郇邽邽 shell 迡郅 %s.\n" +msgstr "迮 邾郋迠郇訄 郱邾郇邽邽 郋訇郋郅郋郇郕 迡郅 %s.\n" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" -msgstr "邾郇 shell 迡郅 %s\n" +msgstr "邾郇 郋訇郋郅郋郇郕 迡郅 %s\n" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s: 迮赲郇邽邿 郱訄郈邽: %s\n" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" -msgstr "%s 郇迮赲郇邽邿 shell.\n" +msgstr "%s 郇迮赲郇訄 郋訇郋郅郋郇郕訄.\n" #: src/expiry.c:59 #, c-format msgid "Usage: expiry {-f|-c}\n" msgstr "邽郕郋邽郋赲邿迮: expiry {-f|-c}\n" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" -msgstr "%s: 苤苠觓! 郋迣訄邾訄 郈郋赲邽郇訄 訇邽 SUID root!\n" +msgstr "%s: 苤苠觓! 郋迣訄邾訄 郈郋赲邽郇訄 訇邽 Set-UID root!\n" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "%s: 郇迮赲迡郋邾邽邿 郕郋邽赲訄\n" @@ -593,320 +586,299 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" msgstr "" +"邽郕郋邽訄郇郇: faillog [郋郈]\n" +"\n" +"郈:\n" +" -a, --all\t\t\t郈郋郕訄郱訄邽 郈郋邾邽郅郕邽 赲郋迡 迡郅 赲 郕郋邽赲訄赲\n" +" -h, --help\t\t\t郈郋郕訄郱訄邽 迡郋郈郋邾郋迣 訄 赲邽邿邽\n" +" -l, --lock-time 苤\t\t郈郅 郈郋邾邽郅郕邽 赲郋迡 訇郅郋郕赲訄邽 訄郇郋郕 郇訄 苤 " +"迮郕郇迡\n" +" -m, --maximum 苤\t\t赲訄郇郋赲邽邽 邾訄郕邽邾訄郅郇 郕郅郕 郈郋邾邽郅郋郕 赲郋迡 迡郋 " +"苤\n" +" -r, --reset\t\t\t郈迮迮郱訄赲訄郇訄迠邽邽 郅郅郇邽郕 郈郋邾邽郅郋郕 赲郋迡\n" +" -t, --time \t\t郈郋郕訄郱訄邽 郈郋邾邽郅郕邽 赲郋迡 郇郋赲 郱訄 \n" +" -u, --user \t\t郈郋郕訄郱訄邽 郈郋邾邽郅郕邽 赲郋迡 訄訇郋 赲迮邽 郅郅郇邽郕邽 郈郋邾邽郅郋郕\n" +"\t\t\t\t訄 郅邾邽 (郕郋 赲邽郕郋邽郋赲 郱 -r, -m 訄訇郋 -l 郋郈邾邽) 郅邽迮 迡郅\n" +"\t\t\t\t郕郋邽赲訄訄 郱 郅郋迣郇郋邾 \n" -#: src/faillog.c:86 -#, fuzzy, c-format -msgid "Username Failures Maximum Latest\n" -msgstr "郋邽赲訄 郋邾邽郅郋郕 訄郕邾邾 訄郇郇\n" - -#: src/faillog.c:103 +#: src/faillog.c:87 #, c-format -msgid " %s on %s" -msgstr " %s 郇訄 %s" +msgid "Login Failures Maximum Latest On\n" +msgstr "郋迣郇 郋邾邽郅郋郕 訄郕邾邾 訄郇郇 訄\n" -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" msgstr " [%lds 郱訄郅邽邽郅郋]" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr " [%lds 訇郅郋郕郋赲訄郇郋]" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "迮赲迡郋邾邽邿 郕郋邽赲訄: %s\n" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "邽郕郋邽郋赲邿迮: %s [-r|-R] 迣郈訄\n" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr " %s [-a 郕郋邽赲訄] 迣郈訄\n" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr " %s [-d 郕郋邽赲訄] 迣郈訄\n" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr " %s [-A 郕郋邽赲訄,...] [-M 郕郋邽赲訄,...] 迣郈訄\n" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr " %s [-M 郕郋邽赲訄,...] 迣郈訄\n" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" msgstr "%s: 郈邽郋赲訄郇 郈訄郋郅 迣郈 郈郋訇郇 迡郅 -A\n" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "邽 郋?\n" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr "郇迮赲迡郋邾訄 迣郈訄: %s\n" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "郋迡訄郇郋 郇郋赲郋迣郋 郕郋邽赲訄訄 %s 迡郋 迣郈邽 %s\n" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "邽迡訄郅迮郇郋 郕郋邽赲訄訄 %s 郱 迣郈邽 %s\n" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" msgstr "%s: 郇迮赲迡郋邾邽邿 郅迮郇 %s\n" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "%s: 迮 tty\n" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "邾郇訄 郈訄郋郅 迡郅 迣郈邽 %s\n" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "郋赲邽邿 郈訄郋郅: " -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " msgstr "郋赲郋 郇郋赲邽邿 郈訄郋郅: " -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" msgstr "郇迮 郈赲郈訄迡訄; 郈郋訇邿迮 郱郇郋赲" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" msgstr "%s: 苤郈郋訇邿迮 郱郇郋赲 郈郱郇迮\n" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "%s: 郇迮 邾郋迠 郱訄訇郅郋郕赲訄邽\n" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" msgstr "%s: 郇迮 邾郋迠 郱訄訇郅郋郕赲訄邽 訇訄郱 郈邽郋赲訄郇邽邿 郈訄郋郅迮邿\n" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅\n" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 郱訄郈邽\n" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 郱訄郈邽 訇訄郱 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "%s: 郇迮 邾郋迠 郈迮迮郈邽訄邽 訄邿郅\n" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" -msgstr "%s: 郇迮 邾郋迠 郈迮迮郈邽訄邽 訄邿郅 郈邽郋赲訄郇邽邿 郈訄郋郅迮邿\n" +msgstr "%s: 郇迮 邾郋迠 郈迮迮郈邽訄邽 訄邿郅 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "%s: 郇迮 邾郋迠 訄郱訇郅郋郕赲訄邽 訄邿郅\n" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 DBM 訄邿郅\n" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 DBM 訄邿郅 郱 郈邽郋赲訄郇邽邾邽 郈訄郋郅邾邽\n" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "邽郕郋邽郋赲邿迮: groupadd [-g gid [-o]] [-f] 迣郈訄\n" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, c-format msgid "%s: error adding new group entry\n" msgstr "%s: 郈郋邾邽郅郕訄 迡郋迡訄郇郇 郇郋赲郋迣郋 郱訄郈邽 訄邿郅 迣郈\n" -#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "%s: 郈郋邾邽郅郕訄 迡郋迡訄郇郇 郇郋赲郋迣郋 郱訄郈邽 訄邿郅 迣郈 dbm\n" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "%s: 邾' %s 郇迮 郇郕訄郅郇邽邾\n" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" msgstr "%s: uid %u 郇迮 郇郕訄郅郇邽邾\n" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "%s: 郇迮 邾郋迠 郋邽邾訄邽 郇郕訄郅郇邽邿 gid\n" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, c-format msgid "%s: %s is not a valid group name\n" msgstr "%s: %s: 郋 郇迮 赲郇迮 邾' 迣郈邽\n" -#: src/groupadd.c:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "%s: 郇迮赲郇訄 迣郈訄 %s\n" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "%s: -O 赲邽邾訄迣訄 =虴觓\n" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s: 郇迮 邾郋迠 郈迮迮郈邽訄邽 訄邿郅 迣郈\n" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s: 郇迮 邾郋迠 郈迮迮郈邽訄邽 訄邿郅 郈邽郋赲訄郇邽 迣郈\n" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" msgstr "%s: 郇迮 邾郋迠 郱訄訇郅郋郕赲訄邽 訄邿郅 迣郈\n" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 迣郈\n" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" msgstr "%s: 郇迮 邾郋迠 訇郅郋郕赲訄邽 訄邿郅 郈邽郋赲訄郇邽 迣郈\n" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 郈邽郋赲訄郇邽 迣郈\n" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "%s: 迣郈訄 %s 郇\n" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, c-format msgid "Usage: groupdel group\n" msgstr "邽郕郋邽郋赲邿迮: groupdel 迣郈訄\n" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" msgstr "%s: 郈郋邾邽郅郕訄 赲迡訄郅迮郇郇 郱訄郈邽 郱 訇訄郱邽 迣郈\n" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "%s: 郈郋邾邽郅郕訄 赲迡訄郅迮郇郇 郱訄郈邽 郱 訇訄郱邽 迣郈 dbm\n" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "%s: 郈郋邾邽郅郕訄 赲迡訄郅迮郇郇 郱訄郈邽 郱 訇訄郱邽 郈邽郋赲訄郇邽 迣郈\n" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "%s: 郈郋邾邽郅郕訄 赲迡訄郅迮郇郇 郱訄郈邽 郱 訇訄郱邽 郈邽郋赲訄郇邽 迣郈 dbm\n" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "%s: 郇迮 邾郋迠 赲邽迡訄郅邽邽 迣郋郅郋赲郇 迣郈 郕郋邽赲訄訄.\n" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "%s: 迣郈訄 %s 郇迮 郇\n" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "%s: 迣郈訄 %s 迣郈郋 NIS\n" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s: %s 迮赲迮 NIS\n" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "邽郕郋邽郋赲邿迮: groupmod [-g gid [-o]] [-n 邾'] 迣郈訄\n" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "%s: %s 郇迮 郱郇訄邿迡迮郇郋 /etc/passwd\n" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s: 郇迮 邾郋迠 迡郋迡訄邽 郱訄郈邽 訇訄郱 郈邽郋赲訄郇邽 迣郈 dbm\n" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s: %u 郇迮 郇郕訄郅郇邽邿 gid\n" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "%s: %s 郇迮 郇郕訄郅郇迮 邾'\n" @@ -916,110 +888,105 @@ msgstr "%s: %s 郇迮 郇郕訄郅郇迮 邾'\n" msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "邽郕郋邽郋赲邿迮: %s [-r] [-s] [迣郈訄 [gshadow]]\n" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "邽郕郋邽郋赲邿迮: %s [-r] [-s] [迣郈訄]\n" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" -msgstr "" +msgstr "%s: -s 訄 -r 郇迮邾郇\n" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "%s: 郇迮 邾郋迠 郱訄訇郅郋郕赲訄邽 訄邿郅 %s\n" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 %s\n" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" msgstr "郇迮赲郇邽邿 郱訄郈邽 訄邿郅 迣郈\n" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "赲邽迡訄郅邽邽 郱訄郈邽 `%s'? " -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" -msgstr "郈郋赲郋邽 郱訄郈邽邽 訇訄郱 迣郈\n" +msgstr "迡訇郅邽邿 郱訄郈邽 訇訄郱 迣郈\n" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" msgstr "郇迮赲郇迮 邾' 迣郈邽 `%s'\n" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "迣郈訄 %s: 郇迮 邾訄 郕郋邽赲訄赲 %s\n" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " msgstr "赲邽迡訄郅邽邽 郅迮郇訄 `%s'? " -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" msgstr "郇迮赲郇邽邿 郱訄郈邽 訄邿郅 郈邽郋赲訄郇邽 迣郈\n" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" -msgstr "郈郋赲郋邽邿 郱訄郈邽 訄邿郅 郈邽郋赲訄郇邽 迣郈\n" +msgstr "迡訇郅邽邿 郱訄郈邽 訄邿郅 郈邽郋赲訄郇邽 迣郈\n" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" -msgstr "赲迡郇邿 赲迡郈郋赲迡郇邽邿 郱訄郈邽 訄邿郅 迣郈\n" +msgstr "赲迡郈郋赲迡郇邽邿 郱訄郈邽 訄邿郅 迣郈 赲迡郇邿\n" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" msgstr "郈邽郋赲訄郇訄 迣郈訄 %s: 郇迮 邾訄 訄迡邾郇訄郋訄 %s\n" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " msgstr "赲邽迡訄郅邽邽 訄迡邾郇訄郋訄 `%s'? " -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" msgstr "郈邽郋赲訄郇訄 迣郈訄 %s: 郇迮 邾訄 郕郋邽赲訄赲 %s\n" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 訄邿郅 %s\n" -#: src/grpck.c:647 src/pwck.c:612 -#, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s: 訄邿郅邽 訇郅郋 郋郇郋赲郅迮郇郋; 赲邽郕郋郇訄邿迮 mkpasswd\n" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format -msgid "%s: no changes\n" -msgstr "%s: 訇迮郱 郱邾郇\n" - -#: src/grpck.c:651 src/pwck.c:616 +#: src/grpck.c:640 src/pwck.c:606 #, c-format msgid "%s: the files have been updated\n" msgstr "%s: 訄邿郅邽 訇郅郋 郋郇郋赲郅迮郇郋\n" +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "%s: 訇迮郱 郱邾郇\n" + #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" @@ -1035,37 +1002,37 @@ msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 迣郈\n" msgid "%s: can't lock shadow group file\n" msgstr "%s: 郇迮 邾郋迠 訇郅郋郕赲訄邽 訄邿郅 郈邽郋赲訄郇邽 迣郈\n" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 郈邽郋赲訄郇邽 迣郈\n" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "%s: 郇迮 邾郋迠 赲邽迡訄郅邽邽 郈邽郋赲訄郇 迣郈 %s\n" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 郈邽郋赲訄郇邽邿 郱訄郈邽 迡郅 %s\n" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 郱訄郈邽 迡郅 迣郈邽 %s\n" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 訄邿郅 郈邽郋赲訄郇邽 迣郈\n" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 訄邿郅 迣郈\n" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "%s: 郇迮 邾郋迠 赲邽迡訄郅邽邽 訄邿郅 郈邽郋赲訄郇邽 迣郈\n" @@ -1085,52 +1052,59 @@ msgstr "邽郕郋邽郋赲邿迮: id\n" msgid " groups=" msgstr " 迣郈邽=" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" +"邽郕郋邽訄郇郇: lastlog [郋郈]\n" +"\n" +"郈:\n" +" -u, --login \t赲邽赲迮邽 郱訄郈邽邽 郋訄郇郇 赲郋迡赲 迡郅 郕郋邽赲訄訄 郱 " +"郋邾\n" +" -h, --help\t\t赲邽赲迮邽 迡郋郈郋邾郋迣 訄 赲邽邿邽\n" +" -t, --time \t赲邽赲迮邽 郅邽迮 郱訄郈邽邽 赲迠 郱訄 \n" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" -msgstr "郋邽赲訄 郋郇郋郅 赲迡郕邽 訄郇郇邿 赲迡\n" +msgstr "郋邽赲訄 郋 赲迡郕邽 訄郇郇邿 赲迡\n" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "郋邽赲訄 郋 訄郇郇邿 赲迡\n" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "**郕郋郅邽 郇迮 赲郋迡邽赲**" -#: src/login.c:175 +#: src/login.c:156 #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "邽郕郋邽郋赲邿迮: %s [-p] [邾']\n" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr " %s [-p] [-h 郋] [-f 邾']\n" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr " %s [-p] -r 郋\n" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" msgstr "迮赲郇邽邿 訄 迡郅 赲郋迡\n" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" @@ -1139,75 +1113,66 @@ msgstr "" "\n" "苤邽迮邾 郱訄郕邽郋 迡郅 郈郋郅訄郕邽郕邽.\n" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" "[Disconnect bypassed -- root login allowed.]\n" msgstr "" "\n" -"[郋邿郅郋 赲迡郕郅迮郇郇 -- 迡郋郱赲郋郅迮郇郋 郅邽迮 赲迡 root-a.]\n" +"[苤訄郅郋 赲迡郕郅迮郇郇 -- 迡郋郱赲郋郅迮郇郋 郅邽迮 赲迡 root-a.]\n" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" "Login timed out after %d seconds.\n" msgstr "" "\n" -"虴訄 郅郋迣郇 赲邽迮郈訄郇郋 郱訄 %d 迮郕郇迡.\n" +"虴訄 郅郋迣郇 訇迡迮 赲邽迮郈訄郇郋 郱訄 %d 迮郕郇迡.\n" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" -msgstr " 郇訄 `%s.100s' 郱 `%.200s'" +msgstr " 郇訄 `%.100s' 郱 `%.200s'" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" msgstr " 郇訄 `%.100s'" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" "%s login: " msgstr "" "\n" -"%s login: " +"%s 郅郋迣郇: " -#: src/login.c:819 -msgid "login: " -msgstr "login: " - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" msgstr "迮赲郇邽邿 郅郋迣郇" -#: src/login.c:1198 +#: src/login.c:996 msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "訄迮迮迠迮郇郇: login 郈郋郇郋赲郅迮郇郋 郈郅 邽邾訄郋赲郋迣郋 訇郅郋郕赲訄郇郇.\n" -#: src/login.c:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "訄郇郇邿 赲迡 赲 邽迮邾: %s 郇訄 %s" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" -msgstr "訄郇郇邿 赲迡 赲 邽迮邾: %s 郇訄 %s" +msgstr "訄郇郇邿 赲迡 赲 邽迮邾: %.19s 郇訄 %s" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" msgstr " 郱 %.*s" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "苤訄邾郋 rad_login\n" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" @@ -1224,9 +1189,9 @@ msgid "%s: cannot open DBM files for %s\n" msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅邽 DBM 迡郅 %s\n" #: src/mkpasswd.c:286 -#, fuzzy, c-format +#, c-format msgid "%s: the line beginning with %.16s... is too long\n" -msgstr "%s: 郋郱郈郋邽郇訄邾郋 郱 " +msgstr "%s: 郋郕訄, 郋 郋郱郈郋邽郇訄 郱 %.16s... 郱訄迡郋赲迣訄\n" #: src/mkpasswd.c:313 #, c-format @@ -1234,31 +1199,31 @@ msgid "%s: error parsing line \"%s\"\n" msgstr "%s: 郈郋邾邽郅郕訄 郋訇郋訇郕邽 迡郕 \"%s\"\n" #: src/mkpasswd.c:321 src/mkpasswd.c:326 src/mkpasswd.c:331 src/mkpasswd.c:336 -#, fuzzy, c-format +#, c-format msgid "adding record for name %s\n" -msgstr "迡郋迡訄郇郋 郱訄郈邽 迡郅 邾迮郇 " +msgstr "迡郋迡訄郇郇 郱訄郈邽 迡郅 邾迮郇 %s\n" #: src/mkpasswd.c:342 src/mkpasswd.c:348 src/mkpasswd.c:353 src/mkpasswd.c:358 -#, fuzzy, c-format +#, c-format msgid "%s: error adding record for %s\n" -msgstr "%s: 郈郋邾邽郅郕訄 迡郋迡訄郇郇 郱訄郈邽 " +msgstr "%s: 郈郋邾邽郅郕訄 迡郋迡訄郇郇 郱訄郈邽 迡郅 %s\n" #: src/mkpasswd.c:376 #, c-format msgid "added %d entries, longest was %d\n" msgstr "迡郋迡訄郇郋 %d 郱訄郈邽赲, 迡郋赲迠邽郇郋 %d\n" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "邽郕郋邽郋赲邿迮: %s [-vf] [-p|g|sp|sg] 訄邿郅\n" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "邽郕郋邽郋赲邿迮: %s [-vf] [-p|g|sp] 訄邿郅\n" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "邽郕郋邽郋赲邿迮: %s [-vf] [-p|g] 訄邿郅\n" @@ -1278,16 +1243,16 @@ msgstr "邽郕郋邽郋赲邿迮: sg 迣郈訄 [[-c] 郕郋邾訄郇迡訄]\n" msgid "unknown uid: %u\n" msgstr "郇迮赲迡郋邾邽邿 uid: %u\n" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" msgstr "郇迮赲迡郋邾邽邿 gid: %lu\n" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "邽訇訄迮.\n" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "郱訄郇訄迡郋 訇訄迣訄郋 迣郈\n" @@ -1295,95 +1260,93 @@ msgstr "郱訄郇訄迡郋 訇訄迣訄郋 迣郈\n" #: src/newusers.c:78 #, c-format msgid "Usage: %s [input]\n" -msgstr "邽郕郋邽郋赲邿迮: %s [input]\n" +msgstr "邽郕郋邽郋赲邿迮: %s [赲迡郇_迡訄郇郇]\n" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "%s: 郇迮 邾郋迠 訇郅郋郕赲訄邽 /etc/passwd.\n" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "%s: 郇迮 邾郋迠 訇郅郋郕赲訄邽 訄邿郅邽, 郈郋訇邿迮 郈郱郇迮\n" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅\n" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "%s: 迡郋郕 %d: 郇迮赲郇邽邿 迡郋郕\n" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "%s: 迡郋郕 %d: 郇迮 邾郋迠 赲郋邽邽 GID\n" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "%s: 迡郋郕 %d: 郇迮 邾郋迠 赲郋邽邽 UID\n" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "%s: 迡郋郕 %d: 郇迮 邾郋迠 郱郇訄邿邽 郕郋邽赲訄訄 %s\n" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "%s: 迡郋郕 %d: 郇迮 邾郋迠 郋郇郋赲邽邽 郈訄郋郅\n" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "%s: 迡郋郕 %d: mkdir 郇迮 赲邽郕郋郇訄赲\n" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "%s: 迡郋郕 %d: chown 郇迮 赲邽郕郋郇訄赲\n" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "%s: 迡郋郕 %d: 郇迮 邾郋迠 郋郇郋赲邽邽 郱訄郈邽\n" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "%s: 郈郋邾邽郅郕訄 郋郇郋赲郅迮郇郇 訄邿郅\n" -#: src/passwd.c:155 +#: src/passwd.c:154 #, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "邽郕郋邽郋赲邿迮: %s [-f|-s] [邾']\n" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" -msgstr "" -" %s [-x 邾訄郕] [-n 邾邽郇] [-w 郱訄迮迮迠迮郇郇] [-i 郇迮訄郕邽赲郇邽邿] " -"邾'\n" +msgstr " %s [-x 邾訄郕] [-n 邾邽郇] [-w 郱訄迮迮迠迮郇郇] [-i 郇迮訄郕邽赲郇邽邿] 邾'\n" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} 邾'\n" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "苤訄邽邿 郈訄郋郅: " -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" msgstr "迮赲郇邽邿 郈訄郋郅 迡郅 `%s'\n" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" @@ -1392,16 +1355,16 @@ msgstr "" "赲迮迡 郇郋赲邽邿 郈訄郋郅 (赲迡 %d 迡郋 %d 郱郇訄郕赲)\n" "邾邿迮 赲迮郅邽郕 訄 邾訄郅 郅迮邽 訄 邽邽.\n" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "郋赲邽邿 郈訄郋郅: " -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" -msgstr "苤郈郋訇邿 迮.\n" +msgstr "苤郈郋訇迮 迮.\n" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" @@ -1411,52 +1374,52 @@ msgstr "" "訄迮迮迠迮郇郇: 郋迣訄郇邽邿 郈訄郋郅 (赲赲迮迡 邿郋迣郋 郱郇郋赲, 郕郋 赲迮 郋迡郇郋 訇訄迠訄迮 邿郋迣郋 " "赲邽郕郋邽郋赲赲訄邽).\n" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" msgstr "迮 郈赲郈訄迡訄; 郈郋訇邿迮 郱郇郋赲.\n" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "訄郋郅 迡郅 %s 郇迮 邾郋迠迮 訇邽 郱邾郇迮郇邽邿.\n" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" -msgstr "邽訇訄迮, 郈訄郋郅 迡郅 %s 郇迣迮 邾郋迠迮 訇邽 郱邾郇迮郇郋 郱訄訄郱.\n" +msgstr "邽訇訄迮, 郈訄郋郅 迡郅 %s 郇迮 邾郋迠迮 訇邽 郱邾郇迮郇郋 郱訄訄郱.\n" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "%s: 訇訄郕 郈訄邾'\n" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "%s: 迮 邾郋迠 赲邽郕郋郇訄邽 %s" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" msgstr "%s: 迮郈郋郱邽郋邿 %s 郇迮 郈迡邽邾\n" -#: src/passwd.c:914 +#: src/passwd.c:884 #, c-format -msgid "You may not change the password for %s.\n" -msgstr "邽 郇迮 邾郋迠迮迮 郱邾郇邽邽 郈訄郋郅 迡郅 %s.\n" +msgid "%s: You may not view or modify password information for %s.\n" +msgstr "%s: 邽 郇迮 邾郋迠迮迮 迡邽赲邽邽 訄 郱邾郇赲訄邽 郈訄郋郅郇 郇郋邾訄 迡郅 %s.\n" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "邾郇訄 郈訄郋郅 迡郅 %s\n" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "訄郋郅 迡郅 %s 郇迮 郱邾郇迮郇郋.\n" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "訄郋郅 郱邾郇迮郇郋.\n" @@ -1471,49 +1434,49 @@ msgstr "邽郕郋邽郋赲邿迮: %s [-q] [-r] [-s] [郈訄郋郅 [shadow]]\ msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "邽郕郋邽郋赲邿迮: %s [-q] [-r] [-s] [郈訄郋郅]\n" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" msgstr "郇迮赲郇邽邿 郱訄郈邽 訄邿郅 郈訄郋郅迮邿\n" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" msgstr "迡訇郅邽邿 郱訄郈邽 訄邿郅 郈訄郋郅迮邿\n" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" msgstr "郇迮赲郇迮 邾' 郕郋邽赲訄訄 '%s'\n" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "郕郋邽赲訄 %s: 郇迮 邾訄 迣郈邽 %u\n" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "郕郋邽赲訄 %s: 迮郕訄 %s 郇迮 郇\n" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "郕郋邽赲訄 %s: 郈郋迣訄邾訄 %s 郇迮 郇\n" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" msgstr "郇迮赲郇邽邿 郱訄郈邽 訄邿郅 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" msgstr "迡訇郅邽邿 郱訄郈邽 訄邿郅 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" msgstr "赲迡郇邿 赲迡郈郋赲迡郇邽邿 郱訄郈邽 訄邿郅 郈訄郋郅迮邿\n" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" msgstr "郕郋邽赲訄 %s: 郋訄郇郇 郱邾郇訄 郈訄郋郅 邾訄邿訇郇郋邾\n" @@ -1533,17 +1496,17 @@ msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 郈訄郋郅迮邿\n" msgid "%s: can't remove shadow entry for %s\n" msgstr "%s: 郇迮 邾郋迠 赲迡訄郅邽邽 郱訄郈邽 訄邿郅 郈邽郋赲訄郇邽 郈訄郋郅迮邿 迡郅 %s\n" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 郱訄郈邽 訄邿郅 郈訄郋郅迮邿 迡郅 %s\n" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 訄邿郅 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 訄邿郅 郈訄郋郅迮邿\n" @@ -1553,40 +1516,40 @@ msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 訄邿郅 郈訄郋郅迮邿\n" msgid "%s: can't update entry for user %s\n" msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 郱訄郈邽 迡郅 郕郋邽赲訄訄 %s\n" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format msgid "%s: can't delete shadow password file\n" msgstr "%s: 郇迮 邾郋迠 赲邽迡訄郅邽邽 訄邿郅 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#: src/su.c:133 +#: src/su.c:132 msgid "Sorry." msgstr "邽訇訄迮." -#: src/su.c:323 +#: src/su.c:320 #, c-format msgid "%s: must be run from a terminal\n" msgstr "%s: 郈郋赲邽郇郋 訇邽 郱訄郈迮郇郋 郱 迮邾郇訄郅\n" -#: src/su.c:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "%s: pam_start: 郈郋邾邽郅郕訄 %d\n" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" msgstr "迮赲迡郋邾邽邿 id: %s\n" -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, c-format msgid "You are not authorized to su %s\n" msgstr "邽 郇迮 訄赲郋邽郱郋赲訄郇 迡郅 su %s\n" -#: src/su.c:502 +#: src/su.c:495 msgid "(Enter your own password.)" msgstr "(赲迮迡 赲訄 郈訄郋郅.)" -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" @@ -1595,37 +1558,37 @@ msgstr "" "%s: %s\n" "(迣郇郋)\n" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" -msgstr "迮邾訄 shell\n" +msgstr "迮邾訄 郋訇郋郅郋郇郕邽\n" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr "郋郈 郋迣郋 郕郋邽赲訄訄 迡郋 su .\n" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "迮郇邽郕訄 郈郋邿迡迮郇郋.\n" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" -msgstr "迡郅訄郕訄 赲赲迮迡 赲訄 赲郅訄郇邽邿 郈訄郋郅 迡郅 訄迮郇邽郕訄.\n" +msgstr "迡郅訄郕訄 赲赲迮迡 訄 赲郅訄郇邽邿 郈訄郋郅 迡郅 訄迮郇邽郕訄.\n" #: src/sulogin.c:118 #, c-format msgid "No password file\n" -msgstr "迮邾訄 訄邿郅訄 郈訄郋郅迮邿\n" +msgstr "迮邾訄 訄邿郅 郈訄郋郅迮邿\n" #: src/sulogin.c:160 #, c-format msgid "No password entry for 'root'\n" msgstr "訄郕 郱訄郈邽 訇訄郱 郈訄郋郅迮邿 迡郅 'root'\n" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" @@ -1635,235 +1598,213 @@ msgstr "" "訄邽郇 control-d 迡郅 赲邽郕郋郇訄郇郇 郱赲邽訄邿郇郋迣郋 郱訄赲訄郇訄迠迮郇郇,\n" "(訄訇郋 赲赲迮迡 郈訄郋郅 訄迡邾郇訄郋訄 迡郅 赲迡郇郋赲郅迮郇郇 邽迮邾邽):" -#: src/sulogin.c:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" msgstr "郋迡邽邾郋 迮迠邽邾 赲迡郇郋赲郅迮郇郇 邽迮邾邽\n" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "%s: 郈迮迮郋 訇訄郱 迣郈\n" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "%s: 郈迮迮郋 訇訄郱 郈邽郋赲訄郇邽 迣郈\n" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "%s: 郇迮赲郇邽邿 邽郅郋赲邽邿 訄迣邾迮郇 `%s'\n" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "%s: 郇迮赲迡郋邾邽邿 gid %s\n" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "%s: 郇迮赲迡郋邾訄 迣郈訄 %s\n" -#: src/useradd.c:475 +#: src/useradd.c:418 #, c-format msgid "%s: cannot create new defaults file\n" -msgstr "%s: 郇迮 邾郋迠 赲郋邽邽 郇郋赲邽邿 訄邿郅 郱 郱郇訄迮郇郇邾邽 郈郋 郱訄邾郋赲迮赲訄郇郇\n" +msgstr "%s: 郇迮 邾郋迠 赲郋邽邽 郇郋赲邽邿 訄邿郅 郱 郱郇訄迮郇郇邾邽 郈郋 郱訄邾郋赲赲訄郇郇\n" -#: src/useradd.c:480 -#, fuzzy, c-format +#: src/useradd.c:423 +#, c-format msgid "%s: cannot open new defaults file\n" -msgstr "%s: 郇迮 邾郋迠 赲郋邽邽 郇郋赲邽邿 訄邿郅 郱 郱郇訄迮郇郇邾邽 郈郋 郱訄邾郋赲迮赲訄郇郇\n" +msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 郇郋赲邽邿 訄邿郅 郱 郱郇訄迮郇郇邾邽 郈郋 郱訄邾郋赲赲訄郇郇\n" -#: src/useradd.c:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" msgstr "%s: 郈迮迮邿邾迮郇赲訄郇郇: %s" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s: 迣郈訄 `%s' 迣郈郋 NIS.\n" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, c-format msgid "%s: too many groups specified (max %d).\n" -msgstr "%s: 郱訄郇訄迡郋 訇訄迣訄郋 迣郈 赲郕訄郱訄郇郇郋 (邾訄郕 %d).\n" +msgstr "%s: 赲郕訄郱訄郇郋 郱訄訇訄迣訄郋 迣郈 (邾訄郕 %d).\n" -#: src/useradd.c:721 +#: src/useradd.c:660 #, c-format msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n" msgstr "邽郕郋邽郋赲邿迮: useradd [-u uid [-o]] [-g 迣郈訄] [-G 迣郈訄,...] \n" -#: src/useradd.c:724 +#: src/useradd.c:663 #, c-format msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" -msgstr "" -" [-d 迡郋邾訄郇_迮郕訄] [-s shell] [-c 郕郋邾迮郇訄]\n" -" [-m [-k 訄訇郅郋郇]]\n" +msgstr " [-d 迡郋邾訄郇_迮郕訄] [-s shell] [-c 郕郋邾迮郇訄] [-m [-k 訄訇郅郋郇]]\n" -#: src/useradd.c:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, c-format msgid " [-f inactive] [-e expire]\n" -msgstr " [-f 郇迮訄郕邽赲郇邽邿] [-e 郈郋郋迮郇邽邿]\n" +msgstr " [-f 郇迮訄郕邽赲郇邽邿] [-e 郈郋郋迮郇邽邿]\n" -#: src/useradd.c:728 +#: src/useradd.c:667 #, c-format msgid " [-p passwd] name\n" -msgstr " [-p 郈訄郋郅] 邾'\n" +msgstr " [-p 郈訄郋郅] 邾'\n" -#: src/useradd.c:730 +#: src/useradd.c:669 #, c-format msgid " useradd -D [-g group] [-b base] [-s shell]\n" -msgstr " useradd -D [-g 迣郈訄] [-b 訇訄郱郋赲訄_迮郕訄] [-s shell]\n" +msgstr " useradd -D [-g 迣郈訄] [-b 訇訄郱郋赲訄_迮郕訄] [-s 郋訇郋郅郋郇郕訄]\n" -#: src/useradd.c:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, c-format msgid "%s: error locking group file\n" msgstr "%s: 郇迮 邾郋迠 郱訄訇郅郋郕赲訄邽 訄邿郅 迣郈\n" -#: src/useradd.c:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, c-format msgid "%s: error opening group file\n" msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 迣郈\n" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, c-format msgid "%s: error locking shadow group file\n" msgstr "%s: 郇迮 邾郋迠 郱訄訇郅郋郕赲訄邽 訄邿郅 郈邽郋赲訄郇邽 迣郈\n" -#: src/useradd.c:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, c-format msgid "%s: error opening shadow group file\n" msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 郈邽郋赲訄郇邽 迣郈\n" -#: src/useradd.c:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "%s: uid %u 郇迮 郇郕訄郅郇邽邾\n" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "%s: 郇迮 邾郋迠 郋邽邾訄邽 郇郕訄郅郇邿 uid\n" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "%s: 郇迮赲郇訄 訇訄郱郋赲訄 迮郕訄 `%s'\n" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "%s: 郇迮赲郇邽邿 郕郋邾迮郇訄 `%s'\n" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "%s: 郇迮赲郇訄 迡郋邾訄郇 迮郕訄 `%s'\n" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s: 郇迮赲郇訄 迡訄訄 `%s'\n" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "%s: 郈邽郋赲訄郇 郈訄郋郅 郈郋訇郇 迡郅 -e\n" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, c-format msgid "%s: shadow passwords required for -f\n" msgstr "%s: 郈邽郋赲訄郇 郈訄郋郅 郈郋訇郇 迡郅 -f\n" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" msgstr "%s: 郇迮赲郇迮 郈郋郅迮 `%s'\n" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" -msgstr "%s: 郇迮赲郇邽邿 shell `%s'\n" +msgstr "%s: 郇迮赲郇訄 郋訇郋郅郋郇郕訄 `%s'\n" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "%s: 郇迮赲郇迮 邾' 郕郋邽赲訄訄 '%s'\n" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "%s: 郇迮 邾郋迠 郈迮迮郈邽訄邽 訄邿郅 郈訄郋郅迮邿\n" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "%s: 郇迮 邾郋迠 郈迮迮郈邽訄邽 訄邿郅 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#: src/useradd.c:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, c-format msgid "%s: unable to lock password file\n" msgstr "%s: 郇迮 邾郋迠 訇郅郋郕赲訄邽 訄邿郅 郈訄郋郅迮邿\n" -#: src/useradd.c:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, c-format msgid "%s: unable to open password file\n" msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 郈訄郋郅迮邿\n" -#: src/useradd.c:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, c-format msgid "%s: cannot lock shadow password file\n" msgstr "%s: 郇迮 邾郋迠 訇郅郋郕赲訄邽 訄邿郅 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#: src/useradd.c:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, c-format msgid "%s: cannot open shadow password file\n" msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#: src/useradd.c:1459 +#: src/useradd.c:1354 #, c-format msgid "%s: error adding new password entry\n" msgstr "%s: 郈郋邾邽郅郕訄 迡郋迡訄郇郇 郇郋赲郋迣郋 郱訄郈邽 訇訄郱 郈訄郋郅迮邿\n" -#: src/useradd.c:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "%s: 郈郋邾邽郅郕訄 郋郇郋赲郅迮郇郇 郱訄郈邽 訇訄郱 郈訄郋郅迮邿 dbm\n" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, c-format msgid "%s: error adding new shadow password entry\n" msgstr "%s: 郈郋邾邽郅郕訄 迡郋迡訄郇郇 郇郋赲郋迣郋 郱訄郈邽 訇訄郱 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#: src/useradd.c:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s: 郈郋邾邽郅郕訄 郋郇郋赲郅迮郇郇 郱訄郈邽 訇訄郱 郈邽郋赲訄郇邽 郈訄郋郅迮邿 dbm\n" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" msgstr "%s: 郇迮 邾郋迠 赲郋邽邽 迮郕 %s\n" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, c-format msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n" -msgstr "" +msgstr "迮邾訄 迣郈邽 \"mail\", 赲郋 郈郋郋赲邽邿 郈郅 郱 郈訄赲訄邾邽 600.\n" -#: src/useradd.c:1590 -#, fuzzy, c-format +#: src/useradd.c:1446 +#, c-format msgid "Can't create mail spool for user %s.\n" -msgstr "%s: 郇迮 邾郋迠 郋郇郋赲邽邽 郱訄郈邽 迡郅 郕郋邽赲訄訄 %s\n" +msgstr "迮 邾郋迠 赲郋邽邽 郈郋郋赲邿 郈郅 迡郅 郕郋邽赲訄訄 %s.\n" -#: src/useradd.c:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "%s: 郕郋邽赲訄 %s 郇\n" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" @@ -1871,205 +1812,171 @@ msgstr "" "%s: 迣郈訄 %s 郇 - 郕郋 赲邽 訇訄迠訄迮 迡郋迡訄邽 郕郋邽赲訄訄 迡郋 迣郈邽, " "赲邽郕郋邽郋赲邿迮 -g.\n" -#: src/useradd.c:1767 +#: src/useradd.c:1602 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" msgstr "%s: 郱訄迮迮迠迮郇郇: CREATE_HOME 郇迮 郈迡邽邾, 郕郋邽邿迮 -m.\n" -#: src/userdel.c:124 -#, fuzzy, c-format +#: src/userdel.c:108 +#, c-format msgid "Usage: %s [-r] name\n" -msgstr "赲邽郕郋邽郋赲邿迮: %s [-r] 邾'\n" +msgstr "邽郕郋邽郋赲邿迮: %s [-r] 邾'\n" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" msgstr "%s: 郈郋邾邽郅郕訄 郋郇郋赲郅迮郇郇 郱訄郈邽 訇訄郱 迣郈\n" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "%s: 郈郋邾邽郅郕訄 郋郇郋赲郅迮郇郇 郱訄郈邽 訇訄郱 迣郈 dbm\n" - -#: src/userdel.c:214 -#, fuzzy, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "%s: 郈郋邾邽郅郕訄 赲邽迡訄郅迮郇郇 郱訄郈邽 訇訄郱 迣郈 dbm\n" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 迣郈\n" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "%s: 郇迮 邾郋迠 赲迡郕邽邽 訄邿郅 郈邽郋赲訄郇邽 迣郈\n" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "%s: 郈郋邾邽郅郕訄 赲邽迡訄郅迮郇郇 郱訄郈邽 郱 訇訄郱邽 郈訄郋郅迮邿\n" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "%s: 郈郋邾邽郅郕訄 赲邽迡訄郅迮郇郇 郱訄郈邽 郱 訇訄郱邽 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "%s: 郈郋邾邽郅郕訄 赲邽迡訄郅迮郇郇 郱訄郈邽 dbm 郱 訇訄郱邽 郈訄郋郅迮邿\n" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s: 郈郋邾邽郅郕訄 赲邽迡訄郅迮郇郇 郱訄郈邽 dbm 郱 訇訄郱邽 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "%s: 郕郋邽赲訄 %s 郇訄 迡訄郇郇邽邿 邾郋邾迮郇 邽迮邾\n" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "%s: %s 郇迮 郇訄郅迮迠邽 %s, 郇迮 赲邽迡訄郅迮郇郋\n" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " msgstr "%s: 郱訄迮迮迠迮郇郇: 郇迮 邾郋迠 赲邽迡訄郅邽邽 " -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" -msgstr "%s: 郕郋邽赲訄 %s 郇迮 郇\n" +msgstr "%s: 郕郋邽赲訄 %s 郇迮 郇\n" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" -msgstr "%s: 郕郋邽赲訄 %s 郕郋邽赲訄 NIS\n" +msgstr "%s: 郕郋邽赲訄 %s 郕郋邽赲訄迮邾 NIS\n" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "%s: 郇迮 赲邽迡訄郅迮郇郋 迮郕 %s (邾郋迠郇訄 赲邽迡訄郅邽邽 迡郋邾訄郇 迮郕 郕郋邽赲訄訄 %s)\n" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "%s: 郈郋邾邽郅郕訄 赲邽迡訄郅迮郇郇 迮郕邽 %s\n" -#: src/usermod.c:306 -#, fuzzy, c-format +#: src/usermod.c:289 +#, c-format msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "赲邽郕郋邽郋赲邿迮: %s\t[-u uid [-o]] [-g 迣郈訄] [-G 迣郈訄,...] \n" -#: src/usermod.c:310 +#: src/usermod.c:293 #, 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" +msgstr "" +"\t\t[-d 迡郋邾訄郇_迮郕訄 [-m]] [-s 郋訇郋郅郋郇郕訄] [-c 郕郋邾迮郇訄] [-l 郇郋赲迮_邾']\n" -#: src/usermod.c:313 -#, fuzzy, c-format +#: src/usermod.c:296 +#, c-format msgid "[-f inactive] [-e expire] " msgstr "[-f 郇迮訄郕邽赲郇邽邿] [-e 郈郋郋迮郇邽邿] " -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p 郈訄郋郅] [-L|-U] 邾'\n" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" -msgstr "%s: 訇訄郕 郈訄邾 pdate_group\n" +msgstr "%s: 訇訄郕 郈訄邾 update_group\n" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "%s: 訇訄郕 郈訄邾 update_gshadow\n" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "%s: 郇迮 郈郋迡訄郇郋 郅訄迣赲\n" -#: src/usermod.c:965 +#: src/usermod.c:903 #, c-format msgid "%s: shadow passwords required for -e and -f\n" msgstr "%s: 郈邽郋赲訄郇 郈訄郋郅 郈郋訇郇 迡郅 -e -f\n" -#: src/usermod.c:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "%s: uid %lu 郇迮 郇郕訄郅郇邽邾\n" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, c-format msgid "%s: error changing password entry\n" msgstr "%s: 郈郋邾邽郅郕訄 郱邾郇邽 郱訄郈邽 赲 訇訄郱 郈訄郋郅迮邿\n" -#: src/usermod.c:1122 +#: src/usermod.c:1053 #, c-format msgid "%s: error removing password entry\n" msgstr "%s: 郈郋邾邽郅郕訄 赲邽迡訄郅迮郇郇 郱訄郈邽 郱 訇訄郱邽 郈訄郋郅迮邿\n" -#: src/usermod.c:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "%s: 郈郋邾邽郅郕訄 迡郋迡訄郇郇 郱訄郈邽 dbm 訇訄郱 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "%s: 郈郋邾邽郅郕訄 赲邽迡訄郅迮郇郇 郱訄郈邽 dbm 郱 訇訄郱邽 郈訄郋郅迮邿\n" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "%s: 郈郋邾邽郅郕訄 赲邽迡訄郅迮郇郇 郱訄郈邽 郱 訇訄郱邽 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" -#: src/usermod.c:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s: 郈郋邾邽郅郕訄 赲邽迡訄郅迮郇郇 郱訄郈邽 dbm 郱 訇訄郱邽 郈邽郋赲訄郇邽 郈訄郋郅迮邿\n" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "%s: 迮郕訄 %s 郇\n" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "%s: 郇迮 邾郋迠 赲郋邽邽 %s\n" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" -msgstr "%s: 郇迮 邾郋迠 郱邾郇邽邽 赲郋郅郋迡訄 %s\n" +msgstr "%s: 郇迮 邾郋迠 郱邾郇邽邽 赲郅訄郇邽郕訄 %s\n" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, c-format msgid "%s: cannot rename directory %s to %s\n" msgstr "%s: 郇迮 邾郋迠 郈迮迮邿邾迮郇赲訄邽 迮郕 郱 %s 郇訄 %s\n" -#: src/usermod.c:1333 +#: src/usermod.c:1223 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "%s: 郱訄迮迮迠迮郇郇: %s 郇迮 郇訄郅迮迠邽 %s\n" -#: src/usermod.c:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" -msgstr "郇迮 邾郋迠 郱邾郇邽邽 赲郋郅郋迡訄 郈郋郋赲郋 郕邽郇郕邽" +msgstr "郇迮 邾郋迠 郱邾郇邽邽 赲郅訄郇邽郕訄 郈郋郋赲郋 郕邽郇郕邽" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" msgstr "郇迮 邾郋迠 郈迮迮邿邾迮郇赲訄邽 郈郋郋赲 郕邽郇郕" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" @@ -2078,21 +1985,20 @@ msgstr "" "\n" "%s: %s 郇迮郱邾郇迮郇邽邿\n" -#: src/vipw.c:133 -#, fuzzy +#: src/vipw.c:131 msgid "Couldn't lock file" -msgstr "迮 邾郋迠 訇郅郋郕赲訄邽 訄邿郅\n" +msgstr "迮 邾郋迠 訇郅郋郕赲訄邽 訄邿郅" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" msgstr "迮 邾郋迠 郱郋訇邽邽 迮郱迮赲郇 郕郋郈" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s: 郇迮 邾郋迠 赲迡郇郋赲邽邽 %s: %s (赲訄 郱邾郇邽 %s)\n" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo index 72ec2cd0..447a8b39 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 b892b8a2..ffd69444 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -6,20 +6,21 @@ msgid "" msgstr "" "Project-Id-Version: shadow\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-26 07:53+0100\n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" "PO-Revision-Date: 2004-05-14 10:26+1200\n" "Last-Translator: Carlos Z.F. Liu \n" "Language-Team: Chinese (simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" msgstr "霅血嚗芰亦 %s\n" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" msgstr "霅血嚗冽瑞餈憭\n" @@ -47,17 +48,17 @@ msgstr " 霂瑁蝟餌頂蝏蝞∠\n" msgid " Choose a new password.\n" msgstr " 霂琿拐銝芣啣\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "函撖撠 %ld 憭拙餈\n" -#: libmisc/age.c:174 +#: libmisc/age.c:172 #, c-format msgid "Your password will expire tomorrow.\n" msgstr "函撖撠冽憭抵\n" -#: libmisc/age.c:176 +#: libmisc/age.c:174 #, c-format msgid "Your password will expire today.\n" msgstr "函撖隞憭抵\n" @@ -72,39 +73,26 @@ msgstr "瘜孵 tty %s" msgid "Environment overflow\n" msgstr "臬皞Ｗ暝n" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr "其摨霂交孵 $%s\n" -#: libmisc/failure.c:230 +#: libmisc/failure.c:229 #, fuzzy, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "頝蝳颱銝甈∠餃撌脫 %d 甈%s銝甈⊥ %s %s 銝\n" +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "頝蝳颱銝甈∠餃撌脫 %d 甈%s銝甈⊥ %s %s 銝\n" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "憭梯揖" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "憭梯揖" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" msgstr "餈憭餃圈\n" -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "撖撟園 %s 蝘撖亥圾撖\n" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "瘜霈曄蔭 %s 蝘撖伐keyserv 摰方蝔甇刻銵嚗\n" - #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "冽唬縑隞嗚" @@ -117,7 +105,7 @@ msgstr "靽∩辣" msgid "You have mail." msgstr "冽靽∩辣" -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " msgstr "霂舐撖嚗%s " @@ -132,20 +120,20 @@ msgstr "passwd: pam_start() 憭梯揖嚗霂 %d\n" msgid "passwd: %s\n" msgstr "passwd嚗%s\n" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" msgstr "" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "瘜餈乒%s桀\n" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" msgstr "瘝⊥桀嚗撠隞 HOME=/ 餃" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr "瘜扯 %s" @@ -160,35 +148,31 @@ msgstr "寧桀%s\n" msgid "Can't change root directory to \"%s\"\n" msgstr "瘜撠寧桀孵銝算%s\n" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "malloc(%d) 憭梯揖\n" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" msgstr "瘜銝粹蝵桐縑臬蝛粹氬\n" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "蝵桅霂 - 芰仿★栽%s(霂琿亦恣)\n" -#: lib/pwauth.c:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "撖嚗" -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "%s 撖嚗" -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "(Echo on) " - -#: src/chage.c:118 +#: src/chage.c:112 #, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" @@ -197,154 +181,147 @@ msgstr "" "冽嚗chage [-l] [-m 撠憭拇財 [-M 憭批予財 [-W 霅血]\n" " [-I 憭望包 [-E 餈包 [-d 包 冽愧n" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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:155 +#: src/chage.c:149 msgid "Minimum Password Age" msgstr "撠撖撟湧" -#: src/chage.c:161 +#: src/chage.c:155 msgid "Maximum Password Age" msgstr "憭批撟湧" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" msgstr "餈銝甈∪靽格寞園 (YYYY-MM-DD)" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" msgstr "撖餈霅血" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "撖憭望" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "撣瑁園 (YYYY-MM-DD)" -#: src/chage.c:238 +#: src/chage.c:231 #, fuzzy, c-format msgid "Last password change\t\t\t\t\t: " msgstr "餈銝甈∪靽格寞園 (YYYY-MM-DD)" -#: src/chage.c:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 #, fuzzy, c-format msgid "never\n" msgstr "隞銝\n" -#: src/chage.c:251 +#: src/chage.c:244 #, fuzzy, c-format msgid "Password expires\t\t\t\t\t: " msgstr "撖餈嚗\t" -#: src/chage.c:267 +#: src/chage.c:260 #, fuzzy, c-format msgid "Password inactive\t\t\t\t\t: " msgstr "撖憭望嚗\t" -#: src/chage.c:281 +#: src/chage.c:274 #, fuzzy, c-format msgid "Account expires\t\t\t\t\t\t: " msgstr "撣瑁嚗\t" -#: src/chage.c:297 +#: src/chage.c:290 #, c-format msgid "Minimum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:298 +#: src/chage.c:292 #, c-format msgid "Maximum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:299 +#: src/chage.c:294 #, c-format msgid "Number of days of warning before password expires\t: %ld\n" msgstr "" -#: src/chage.c:444 +#: src/chage.c:431 #, c-format msgid "%s: do not include \"l\" with other flags\n" msgstr "%s嚗霂瑚閬銝嗅敹銝雿輻兩l\n" -#: src/chage.c:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 #, fuzzy, c-format msgid "%s: permission denied.\n" msgstr "%s嚗瘝⊥\n" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 #, c-format msgid "%s: PAM authentication failed\n" msgstr "%s嚗PAM 撉霂憭梯揖\n" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, c-format msgid "%s: can't open password file\n" msgstr "%s嚗瘜撘撖隞跚n" -#: src/chage.c:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "%s嚗芰亦冽瘀%s\n" -#: src/chage.c:535 +#: src/chage.c:519 #, c-format msgid "%s: can't lock shadow password file" msgstr "%s嚗瘜摰敶勗撖隞" -#: src/chage.c:543 +#: src/chage.c:527 #, c-format msgid "%s: can't open shadow password file" msgstr "%s嚗瘜撘敶勗撖隞" -#: src/chage.c:604 +#: src/chage.c:587 #, c-format msgid "Changing the aging information for %s\n" msgstr "甇其蛹 %s 靽格孵僑樴靽⊥珮n" -#: src/chage.c:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" msgstr "%s嚗孵摮畾菜嗅粹\n" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, c-format msgid "%s: can't update password file\n" msgstr "%s嚗瘜湔啣隞跚n" -#: src/chage.c:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" msgstr "%s嚗瘜湔啣蔣摮撖隞跚n" -#: src/chage.c:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "湔 DBM 撖∠格嗅粹\n" - -#: src/chage.c:692 +#: src/chage.c:649 #, c-format msgid "%s: can't rewrite shadow password file\n" msgstr "%s嚗瘜敶勗撖隞跚n" -#: src/chage.c:740 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite password file\n" msgstr "%s嚗瘜撖隞跚n" -#: src/chage.c:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 #, c-format msgid "%s: PAM chauthtok failed\n" msgstr "%s嚗PAM chauthtok 憭梯揖\n" @@ -363,117 +340,122 @@ msgstr "" msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" msgstr "冽嚗%s [-f 典] [-r 輸游愍 [-w 撌乩菔] [-h 摰嗅滬菔]\n" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "典" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "\t典嚗%s\n" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "輸游瑞" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "撌乩菔" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" msgstr "摰嗅滬菔" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "嗅" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s嚗瘜蝖桀函冽瑕\n" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s嚗銝賢 NIS 摰Ｘ瑞垢銝靽格寧冽猾%s\n" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "%s嚗%s舀迨摰Ｘ瑞垢 NIS 蝞∠\n" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, fuzzy, c-format +msgid "%s: Permission denied.\n" +msgstr "%s嚗瘝⊥\n" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" msgstr "甇冽孵 %s 冽瑚縑珮n" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s嚗蝘堆%s\n" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s嚗輸游瑞嚗%s\n" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s嚗撌乩菔嚗%s\n" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s嚗摰嗅滬菔嚗%s\n" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s嚗%s恍瘜摮蝚吒n" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "%s嚗摮畾萄云璞n" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" msgstr "瘜孵 ID root\n" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" msgstr "瘜摰撖隞塚蝔霂\n" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" msgstr "瘜撘撖隞嗚\n" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s嚗芸 /etc/passwd 銝剜曉 %s\n" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" msgstr "湔孵∠格嗅粹\n" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" msgstr "瘜鈭文隞嗆孵具\n" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" msgstr "瘜閫撖隞嗚\n" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -490,48 +472,48 @@ msgstr "" msgid "%s: can't lock password file\n" msgstr "%s嚗瘜摰撖隞跚n" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "%s嚗瘜摰敶勗隞跚n" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "%s嚗瘜撘敶勗隞跚n" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "%s嚗蝚 %d 銵嚗甇方憭芷璞n" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "%s嚗蝚 %d 銵嚗蝻箏啣\n" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "%s嚗蝚 %d 銵嚗芰亦冽 %s\n" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "%s嚗蝚 %d 銵嚗瘜湔啣∠娉n" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "%s嚗圈霂荔敹賜交孵沔n" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" msgstr "%s嚗湔啣蔣摮隞嗆嗅粹\n" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" msgstr "%s嚗湔啣隞嗆嗅粹\n" @@ -541,26 +523,26 @@ msgstr "%s嚗湔啣隞嗆嗅粹\n" msgid "Usage: %s [-s shell] [name]\n" msgstr "冽嚗%s [-s shell] [蝘財\n" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" msgstr "餃 Shell" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" msgstr "其賭蛹 %s 湔 shell\n" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" msgstr "甇冽湔 %s shell\n" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s嚗∠殷%s\n" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" msgstr "%s 舀 shell\n" @@ -570,12 +552,12 @@ msgstr "%s 舀 shell\n" msgid "Usage: expiry {-f|-c}\n" msgstr "冽嚗expiry {-f|-c}\n" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" msgstr "%s嚗霅血嚗敹憿餅 set-UID root嚗\n" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "%s嚗芰亦冽愧n" @@ -589,320 +571,285 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" msgstr "" -#: src/faillog.c:86 +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" -msgstr "冽 霂 憭 \n" +msgid "Login Failures Maximum Latest On\n" +msgstr "" -#: src/faillog.c:103 -#, c-format -msgid " %s on %s" -msgstr " %s %s" - -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" msgstr " [餈 %lds]" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr " [摰 %lds]" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "芰亦冽瘀%s\n" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "冽嚗%s [-r|-R] 蝏\n" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr " %s [-a 冽愍 蝏\n" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr " %s [-d 冽愍 蝏\n" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr " %s [-A 冽,...] [-M 冽,...] 蝏\n" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr " %s [-M 冽,...] 蝏\n" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" msgstr "%s嚗-A 閬敶勗蝏撖\n" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "雿航嚗\n" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr "芰亦嚗%s\n" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "甇典冽猾%s亙售%s蝏銝苒n" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "甇典冽猾%s隞%s蝏銝剖么n" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" msgstr "%s嚗芰交 %s\n" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "%s嚗銝 tty\n" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "甇其耨 %s 蝏撖\n" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "啣嚗" -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " msgstr "霂琿啗交啣嚗" -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" msgstr "隞隞砍僎銝寥嚗霂琿霂" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" msgstr "%s嚗霂瑞霂\n" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "%s嚗瘜瑕\n" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" msgstr "%s嚗瘜瑕敶勗\n" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "%s嚗瘜撘隞跚n" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "%s嚗瘜湔唳∠娉n" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" msgstr "%s嚗瘜湔啣蔣摮∠娉n" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "%s嚗瘜隞跚n" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" msgstr "%s嚗瘜敶勗隞跚n" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "%s 瘜閫隞嗚\n" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "%s嚗瘜湔 DBM 隞跚n" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "%s嚗瘜湔 DBM 敶勗隞跚n" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "冽嚗groupadd [-g gid [-o]] [-f] 蝏\n" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, c-format msgid "%s: error adding new group entry\n" msgstr "%s嚗憓啁∠格嗅粹\n" -#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "%s嚗瘜憓啁 dbm 蝏∠娉n" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "%s嚗蝘 %s 撟嗡臭\n" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" msgstr "%s嚗gid %u 撟嗡臭\n" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "%s嚗瘜瑕祆 gid\n" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, c-format msgid "%s: %s is not a valid group name\n" msgstr "%s嚗%s 銝舀蝏\n" -#: src/groupadd.c:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "%s嚗蝏 %s\n" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "%s嚗-O 閬 NAME=VALUE\n" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s嚗瘜蝏隞跚n" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s嚗瘜敶勗蝏隞跚n" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" msgstr "%s嚗瘜摰蝏隞跚n" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" msgstr "%s嚗瘜撘蝏隞跚n" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" msgstr "%s嚗瘜摰敶勗蝏隞跚n" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" msgstr "%s嚗瘜撘敶勗蝏隞跚n" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "%s嚗%s 蝏撌脣沔n" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, c-format msgid "Usage: groupdel group\n" msgstr "冽嚗groupdel 蝏\n" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" msgstr "%s嚗斤∠格嗅粹\n" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "%s嚗斤 dbm ∠格嗅粹\n" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "%s嚗文蔣摮蝏∠格嗅粹\n" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "%s嚗文蔣摮蝏 dbm ∠格嗅粹\n" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "%s嚗銝賢斤冽瑞銝餌\n" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "%s嚗%s 蝏銝摮沔n" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "%s嚗%s 蝏臭銝 NIS 蝏\n" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s嚗%s NIS 蝞∠\n" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "冽嚗groupmod [-g gid [-o]] [-n 蝘財 蝏\n" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "%s嚗芸 /etc/group 銝剜曉 %s\n" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s嚗瘜憓啁 dbm 敶勗蝏∠娉n" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s嚗%u 銝臭銝芰祆 gid\n" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "%s嚗%s 銝臭銝芰祆蝘豹n" @@ -912,110 +859,105 @@ msgstr "%s嚗%s 銝臭銝芰祆蝘豹n" msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "冽嚗%s [-r] [-s] [蝏 [gshadow]] \n" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "冽嚗%s [-r] [-s] [蝏]\n" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" msgstr "%s嚗-s -r 臭銝澆捆\n" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "%s嚗瘜摰隞 %s\n" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "%s嚗瘜撘隞 %s\n" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" msgstr "蝏隞嗆∠娉n" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "手%s銵嚗" -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" msgstr "憭嗥∠娉n" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" msgstr "蝏%s\n" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "%s 蝏嚗冽 %s\n" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " msgstr "斤冽瑟%s嚗" -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" msgstr "敶勗蝏隞嗆∠娉n" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" msgstr "憭嗅蔣摮蝏∠娉n" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" msgstr "瘝⊥曉啣寥蝏隞嗆∠娉n" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" msgstr "%s 敶勗蝏嚗蝞∠冽 %s\n" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " msgstr "斤恣冽猾%s嚗" -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" msgstr "%s 敶勗蝏嚗冽 %s\n" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "%s嚗瘜湔唳隞 %s\n" -#: src/grpck.c:647 src/pwck.c:612 -#, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s嚗隞嗆芾◤湔堆霂瑁銵 mkpasswd\n" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format -msgid "%s: no changes\n" -msgstr "%s嚗孵\n" - -#: src/grpck.c:651 src/pwck.c:616 +#: src/grpck.c:640 src/pwck.c:606 #, c-format msgid "%s: the files have been updated\n" msgstr "%s嚗隞嗅歇鋡急湔豹n" +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "%s嚗孵\n" + #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" @@ -1031,37 +973,37 @@ msgstr "%s嚗瘜撘蝏隞跚n" msgid "%s: can't lock shadow group file\n" msgstr "%s嚗瘜摰敶勗蝏隞跚n" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" msgstr "%s嚗瘜撘敶勗蝏隞跚n" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "%s嚗瘜文蔣摮蝏 %s\n" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "%s嚗瘜銝 %s 湔啣蔣摮∠娉n" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "%s嚗瘜湔 %s 蝏∠娉n" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" msgstr "%s嚗瘜湔啣蔣摮蝏隞跚n" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" msgstr "%s 瘜湔啁隞跚n" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "%s嚗瘜文蔣摮蝏隞跚n" @@ -1081,52 +1023,52 @@ msgstr "冽嚗id\n" msgid " groups=" msgstr " 蝏=" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" msgstr "冽瑕 蝡臬 亥 駁園廄n" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "冽瑕 蝡臬 駁園廄n" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "**隞芰餃餈**" -#: src/login.c:175 +#: src/login.c:156 #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "冽嚗%s [-p] [蝘財\n" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr " %s [-p] [-h 銝餅榜 [-f 蝘財\n" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr " %s [-p] -r 銝餅暝n" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" msgstr "餃園廄n" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" @@ -1135,7 +1077,7 @@ msgstr "" "\n" "蝟餌喲哨靘銵蝏湔么n" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" @@ -1144,7 +1086,7 @@ msgstr "" "\n" "[敹賜交剔瑪閬瘙 -- 霈 root 餃]\n" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" @@ -1153,17 +1095,17 @@ msgstr "" "\n" "餃頞 %d 蝘\n" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" msgstr " 兩%.100s銝嚗亥芬%.200s" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" msgstr "兩%.100s銝" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" @@ -1172,38 +1114,29 @@ msgstr "" "\n" "%s 冽瑕嚗" -#: src/login.c:819 -msgid "login: " -msgstr "冽瑕嚗" - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" msgstr "餃霂" -#: src/login.c:1198 +#: src/login.c:996 msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "霅血嚗函剜摰撠Ｗ餃\n" -#: src/login.c:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "銝甈∠餃嚗%s %s 銝" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" msgstr "銝甈∠餃嚗%.19s %s 銝" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" msgstr " 亥 %.*s" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "撘憪 rad_login\n" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" @@ -1244,17 +1177,17 @@ msgstr "%s嚗憓霈啣嗅粹 " msgid "added %d entries, longest was %d\n" msgstr "憓 %d 銝芣∠殷踵 %d\n" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "冽嚗%s [-vf] [-p|g|sp|sg] 隞跚n" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "冽嚗%s [-vf] [-p|g|sp] 隞跚n" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "冽嚗%s [-vf] [-p|g] 隞跚n" @@ -1274,16 +1207,16 @@ msgstr "冽嚗sg 蝏 [[-c] 賭誘]\n" msgid "unknown uid: %u\n" msgstr "芰亦 uid嚗%u\n" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" msgstr "芰亦 gid嚗%lu\n" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "望\n" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "冽瑞餈憭\n" @@ -1293,91 +1226,91 @@ msgstr "冽瑞餈憭\n" msgid "Usage: %s [input]\n" msgstr "冽嚗%s [颲包\n" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "%s嚗瘜摰 /etc/passwd\n" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "%s嚗瘜摰隞塚霂瑞霂\n" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "%s嚗瘜撘隞跚n" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "%s嚗蝚 %d 銵嚗銵\n" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "%s嚗蝚 %d 銵嚗瘜撱 GID\n" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "%s嚗蝚 %d 銵嚗瘜撱 UID\n" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "%s嚗蝚 %d 銵嚗瘜曉啁冽 %s\n" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "%s嚗蝚 %d 銵嚗瘜湔啣\n" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "%s嚗蝚 %d 銵嚗撱箇桀憭梯揖\n" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "%s嚗蝚 %d 銵嚗孵蝏怠仃韐功n" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "%s嚗蝚 %d 銵嚗瘜湔唳∠娉n" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "%s嚗湔唳隞嗅粹\n" -#: src/passwd.c:155 +#: src/passwd.c:154 #, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "冽嚗%s [-f|-s] [蝘財\n" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr " %s [-x 憭吞 [-n 撠] [-w 霅血] [-i 憭望] 蝘豹n" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} 蝘豹n" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "批嚗" -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" msgstr "%s撖銝甇蝖娉n" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" @@ -1386,16 +1319,16 @@ msgstr "" "霂瑁交啣(撠 %d 憭 %d 銝芸蝚)\n" "霂瑟毽雿輻典之撠摮瘥啣\n" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "啣嚗" -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" msgstr "霂霂\n" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" @@ -1404,52 +1337,52 @@ msgstr "" "\n" "霅血嚗撘梁撖(啗乩誑撘箏嗡蝙典)\n" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" msgstr "隞隞砍僎銝寥嚗霂琿霂\n" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "瘜湔 %s 撖\n" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" msgstr "望嚗瘜湔 %s 撖\n" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "%s嚗摮皞Ｗ暝n" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "%s嚗瘜扯 %s" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" msgstr "%s嚗銝舀 %s 摮具\n" -#: src/passwd.c:914 +#: src/passwd.c:884 #, fuzzy, c-format -msgid "You may not change the password for %s.\n" +msgid "%s: You may not view or modify password information for %s.\n" msgstr "其賭蛹 %s 湔 shell\n" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "甇其蛹 %s 靽格孵\n" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "%s 撖芾◤孵\n" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "撖芣湔嫘\n" @@ -1464,49 +1397,49 @@ msgstr "冽嚗%s [-q] [-r] [-s] [passwd [shadow]]\n" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "冽嚗%s [-q] [-r] [-s] [passwd]\n" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" msgstr "撖隞園★\n" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" msgstr "憭撖憿鈾n" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" msgstr "冽瑕%s\n" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "冽 %s嚗 %u 蝏\n" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "冽 %s嚗桀 %s 銝摮沔n" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "冽 %s嚗蝔摨 %s 銝摮沔n" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" msgstr "敶勗撖隞園★\n" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" msgstr "憭敶勗撖憿鈾n" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" msgstr "寥撖隞園★\n" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" msgstr "冽 %s嚗餈銝甈∪孵沔n" @@ -1526,17 +1459,17 @@ msgstr "%s嚗瘜撘撖隞跚n" msgid "%s: can't remove shadow entry for %s\n" msgstr "%s嚗瘜銝 %s 文蔣摮∠娉n" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "%s嚗瘜銝 %s 湔啣∠娉n" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" msgstr "%s嚗瘜湔啣蔣摮隞跚n" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" msgstr "%s嚗瘜湔啣隞跚n" @@ -1546,40 +1479,40 @@ msgstr "%s嚗瘜湔啣隞跚n" msgid "%s: can't update entry for user %s\n" msgstr "%s嚗銝賣湔啁冽 %s ∠娉n" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format msgid "%s: can't delete shadow password file\n" msgstr "%s嚗瘜文蔣摮撖隞跚n" -#: src/su.c:133 +#: src/su.c:132 msgid "Sorry." msgstr "望" -#: src/su.c:323 +#: src/su.c:320 #, c-format msgid "%s: must be run from a terminal\n" msgstr "%s嚗敹憿颱蝏蝡臭葉扯\n" -#: src/su.c:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "%s嚗pam_start嚗霂 %d\n" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" msgstr "芰 id嚗%s\n" -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, c-format msgid "You are not authorized to su %s\n" msgstr "冽瓷鋡急 su %s\n" -#: src/su.c:502 +#: src/su.c:495 msgid "(Enter your own password.)" msgstr "(霂瑁交刻芸楛撖)" -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" @@ -1588,22 +1521,22 @@ msgstr "" "%s嚗%s\n" "(敹賜)\n" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" msgstr "瘝⊥ shell\n" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr "su 啗砲撣瑁◤\n" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "敹賜亙霈方\n" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" msgstr "霂瑁交刻芸楛撖雿銝粹霂\n" @@ -1618,7 +1551,7 @@ msgstr "瘝⊥撖隞跚n" msgid "No password entry for 'root'\n" msgstr "瘝⊥root撖憿鈾n" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" @@ -1628,437 +1561,382 @@ msgstr "" "脣 control-d 喳舐誧蝏凋蝙冽桅撣瑞臬嚗\n" "(颲 root 撖隞亥銵蝟餌蝏湔)嚗" -#: src/sulogin.c:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" msgstr "甇刻亦頂蝏蝏湔斗芋撘\n" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "%s嚗撱箇急唳桀\n" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "%s嚗撱箏蔣摮蝏唳桀\n" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "%s嚗啣售%s\n" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "%s嚗芰亦 gid %s\n" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "%s嚗芰亦蝏 %s\n" -#: src/useradd.c:475 +#: src/useradd.c:418 #, c-format msgid "%s: cannot create new defaults file\n" msgstr "%s嚗瘜撱箸啁暺霈斗隞跚n" -#: src/useradd.c:480 +#: src/useradd.c:423 #, c-format msgid "%s: cannot open new defaults file\n" msgstr "%s嚗瘜撘啁暺霈斗隞跚n" -#: src/useradd.c:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" msgstr "%s嚗孵嚗%s" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s嚗%s蝏臭銝 NIS 蝏\n" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "%s嚗摰鈭餈憭蝏(憭 %d)\n" -#: src/useradd.c:721 +#: src/useradd.c:660 #, c-format msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n" msgstr "冽嚗useradd [-u uid [-o]] [-g 蝏] [-G 蝏,...] \n" -#: src/useradd.c:724 +#: src/useradd.c:663 #, c-format msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr " [-d 銝餌桀] [-s shell] [-c 瘜券] [-m [-k 璅⊥瓢]\n" -#: src/useradd.c:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, c-format msgid " [-f inactive] [-e expire]\n" msgstr " [-f 憭望包 [-e 餈 ]\n" -#: src/useradd.c:728 +#: src/useradd.c:667 #, c-format msgid " [-p passwd] name\n" msgstr " [-p 撖] 蝘豹n" -#: src/useradd.c:730 +#: src/useradd.c:669 #, c-format msgid " useradd -D [-g group] [-b base] [-s shell]\n" msgstr " useradd -D [-g 蝏] [-b 銝餌桀] [-s shell]\n" -#: src/useradd.c:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, c-format msgid "%s: error locking group file\n" msgstr "%s嚗摰蝏隞嗆嗅粹\n" -#: src/useradd.c:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, c-format msgid "%s: error opening group file\n" msgstr "%s嚗撘蝏隞嗆嗅粹\n" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, c-format msgid "%s: error locking shadow group file\n" msgstr "%s嚗摰敶勗蝏隞嗆嗅粹\n" -#: src/useradd.c:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, c-format msgid "%s: error opening shadow group file\n" msgstr "%s嚗撘敶勗蝏隞嗆嗅粹\n" -#: src/useradd.c:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "%s嚗uid %u 銝臭\n" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "%s嚗瘜瑕臭 uid\n" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "%s嚗銝餌桀%s\n" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "%s嚗瘜券%s\n" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "%s嚗銝餌桀%s\n" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s嚗交%s\n" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "%s嚗-e 圈閬敶勗撖\n" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, c-format msgid "%s: shadow passwords required for -f\n" msgstr "%s嚗-f 圈閬敶勗撖\n" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" msgstr "%s嚗摮畾 %s\n" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "%s嚗 shell%s\n" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "%s嚗冽瑕%s\n" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "%s嚗瘜撖隞跚n" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "%s嚗瘜敶勗撖隞跚n" -#: src/useradd.c:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, c-format msgid "%s: unable to lock password file\n" msgstr "%s嚗瘜摰撖隞跚n" -#: src/useradd.c:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, c-format msgid "%s: unable to open password file\n" msgstr "%s嚗瘜撘撖隞跚n" -#: src/useradd.c:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, c-format msgid "%s: cannot lock shadow password file\n" msgstr "%s嚗瘜摰敶勗撖隞跚n" -#: src/useradd.c:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, c-format msgid "%s: cannot open shadow password file\n" msgstr "%s嚗瘜撘敶勗撖隞跚n" -#: src/useradd.c:1459 +#: src/useradd.c:1354 #, c-format msgid "%s: error adding new password entry\n" msgstr "%s嚗交啣憿寞嗅粹\n" -#: src/useradd.c:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "%s嚗湔啣 dbm ∠格嗅粹\n" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, c-format msgid "%s: error adding new shadow password entry\n" msgstr "%s嚗交啣蔣摮撖憿寞嗅粹\n" -#: src/useradd.c:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s嚗湔啣蔣摮撖 dbm ∠格嗅粹\n" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" msgstr "%s嚗瘜撱箇桀 %s\n" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, c-format msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n" msgstr "" -#: src/useradd.c:1590 +#: src/useradd.c:1446 #, fuzzy, c-format msgid "Can't create mail spool for user %s.\n" msgstr "%s嚗銝賣湔啁冽 %s ∠娉n" -#: src/useradd.c:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "%s嚗冽 %s 撌脣沔n" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, 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:1767 +#: src/useradd.c:1602 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" msgstr "%s嚗霅血嚗CREATE_HOME 芾◤舀嚗霂瑚蝙 -m 啜\n" -#: src/userdel.c:124 +#: src/userdel.c:108 #, c-format msgid "Usage: %s [-r] name\n" msgstr "冽嚗%s [-r] 蝘豹n" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" msgstr "%s嚗湔啁∠格嗅粹\n" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "%s嚗瘜湔 dbm 蝏∠娉n" - -#: src/userdel.c:214 -#, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "%s嚗瘜 dbm 蝏∠娉n" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "%s嚗瘜撘蝏隞跚n" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "%s嚗瘜撘敶勗蝏隞跚n" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "%s嚗文憿寞嗅粹\n" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "%s嚗文蔣摮撖憿寞嗅粹\n" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "%s嚗文 dbm ∠格嗅粹\n" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s嚗文蔣摮撖 dbm ∠格嗅粹\n" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "%s嚗冽 %s 桀撌脩餃\n" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "%s嚗%s 撟嗡撅鈭 %s嚗隞乩隡么n" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " msgstr "%s嚗霅血嚗瘜" -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" msgstr "%s嚗冽 %s 銝摮沔n" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s嚗冽 %s NIS 冽愧n" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "%s嚗銝賢斤桀 %s (銝箄撠斤冽 %s 銝餌桀)\n" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "%s嚗斤桀 %s 嗅粹\n" -#: src/usermod.c:306 +#: src/usermod.c:289 #, fuzzy, c-format msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "冽嚗%s\t[-u uid [-o]] [-g 蝏] [-G 蝏,...] \n" -#: src/usermod.c:310 +#: src/usermod.c:293 #, 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:313 +#: src/usermod.c:296 #, c-format msgid "[-f inactive] [-e expire] " msgstr "[-f 憭望包 [-e 餈包 " -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p 撖] [-L|-U] 蝘豹n" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" msgstr "%s嚗update_group 摮皞Ｗ暝n" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "%s嚗update_gshadow 摮皞Ｗ暝n" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "%s嚗瘝⊥摰敹\n" -#: src/usermod.c:965 +#: src/usermod.c:903 #, c-format msgid "%s: shadow passwords required for -e and -f\n" msgstr "%s嚗-e -f 圈閬敶勗撖\n" -#: src/usermod.c:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "%s嚗uid %lu 銝臭\n" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, c-format msgid "%s: error changing password entry\n" msgstr "%s嚗孵撖憿寞嗅粹\n" -#: src/usermod.c:1122 +#: src/usermod.c:1053 #, c-format msgid "%s: error removing password entry\n" msgstr "%s嚗文憿寞嗅粹\n" -#: src/usermod.c:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "%s嚗瘛餃撖 dbm ∠格嗅粹\n" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "%s嚗文 dbm ∠格嗅粹\n" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "%s嚗文蔣摮撖憿寞嗅粹\n" -#: src/usermod.c:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s嚗文蔣摮撖 dbm ∠格嗅粹\n" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "%s嚗桀 %s 銝摮沔n" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "%s嚗瘜撱 %s\n" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" msgstr "%s嚗瘜孵 %s 蝏俞n" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, c-format msgid "%s: cannot rename directory %s to %s\n" msgstr "%s嚗瘜撠桀 %s 孵銝 %s\n" -#: src/usermod.c:1333 +#: src/usermod.c:1223 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "%s嚗霅血嚗%s 銝撅鈭 %s\n" -#: src/usermod.c:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" msgstr "孵靽∠拳憭梯揖" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" msgstr "瘜銝箔縑蝞望孵" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" @@ -2067,20 +1945,20 @@ msgstr "" "\n" "%s嚗%s 瘝⊥湔鈾n" -#: src/vipw.c:133 +#: src/vipw.c:131 msgid "Couldn't lock file" msgstr "瘜摰隞" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" msgstr "瘜憭隞" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s嚗瘜Ｗ %s嚗%s (函靽格孵 %s 銝)\n" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo index 1259c92b..48acbb8d 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 8f8e0c6e..732134ab 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: shadow\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-26 07:53+0100\n" +"POT-Creation-Date: 2005-04-25 12:28+0200\n" "PO-Revision-Date: 2005-01-06 09:58+0800\n" "Last-Translator: Asho Yeh \n" "Language-Team: Chinese (traditional) <>\n" @@ -17,13 +17,14 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Poedit-Language: Chinese\n" "X-Poedit-Country: TAIWAN\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: libmisc/addgrps.c:56 #, c-format msgid "Warning: unknown group %s\n" msgstr "霅血嚗芰亦黎蝯 %s\n" -#: libmisc/addgrps.c:68 +#: libmisc/addgrps.c:67 #, c-format msgid "Warning: too many groups\n" msgstr "霅血嚗雿輻刻蝢斤憭\n" @@ -51,17 +52,17 @@ msgstr " 隢舐頂蝟餌絞蝞∠∼\n" msgid " Choose a new password.\n" msgstr " 隢豢銝啣蝣潦\n" -#: libmisc/age.c:170 +#: libmisc/age.c:169 #, c-format msgid "Your password will expire in %ld days.\n" msgstr "函撖蝣澆 %ld 憭拙折\n" -#: libmisc/age.c:174 +#: libmisc/age.c:172 #, c-format msgid "Your password will expire tomorrow.\n" msgstr "函撖蝣澆冽憭拚\n" -#: libmisc/age.c:176 +#: libmisc/age.c:174 #, c-format msgid "Your password will expire today.\n" msgstr "函撖蝣潔憭拚\n" @@ -76,39 +77,26 @@ msgstr "⊥寡 tty %s" msgid "Environment overflow\n" msgstr "啣皞Ｖ\n" -#: libmisc/env.c:195 +#: libmisc/env.c:194 #, c-format msgid "You may not change $%s\n" msgstr "其閰脫寡 $%s\n" -#: libmisc/failure.c:230 +#: libmisc/failure.c:229 #, fuzzy, c-format -msgid "%d %s since last login. Last was %s on %s.\n" -msgstr "頝Ｖ銝甈∠駁撌脫 %d 甈∠駁憭望敺銝甈⊥ %s %s 銝\n" +msgid "" +"%d failure since last login.\n" +"Last was %s on %s.\n" +msgid_plural "" +"%d failures since last login.\n" +"Last was %s on %s.\n" +msgstr[0] "頝Ｖ銝甈∠駁撌脫 %d 甈∠駁憭望敺銝甈⊥ %s %s 銝\n" -#: libmisc/failure.c:232 -msgid "failures" -msgstr "" - -#: libmisc/failure.c:232 -msgid "failure" -msgstr "" - -#: libmisc/limits.c:396 +#: libmisc/limits.c:397 #, c-format msgid "Too many logins.\n" msgstr "憭駁賊\n" -#: libmisc/login_desrpc.c:59 -#, c-format -msgid "Password does not decrypt secret key for %s.\n" -msgstr "撖蝣潔蒂 %s 蝘啗圾撖\n" - -#: libmisc/login_desrpc.c:66 -#, c-format -msgid "Could not set %s's secret key: is the keyserv daemon running?\n" -msgstr "⊥閮剖 %s 蝘堆keyserv daemon 甇券銵嚗\n" - #: libmisc/mail.c:61 libmisc/mail.c:76 msgid "You have new mail." msgstr "冽唬縑隞嗚" @@ -121,7 +109,7 @@ msgstr "∩縑隞嗚" msgid "You have mail." msgstr "冽靽∩辣" -#: libmisc/obscure.c:271 src/passwd.c:183 +#: libmisc/obscure.c:273 src/passwd.c:181 #, c-format msgid "Bad password: %s. " msgstr "航炊撖蝣潘%s " @@ -136,20 +124,20 @@ msgstr "passwd: pam_start() 憭望嚗航炊 %d\n" msgid "passwd: %s\n" msgstr "passwd嚗%s\n" -#: libmisc/pam_pass.c:50 +#: libmisc/pam_pass.c:49 msgid "passwd: password updated successfully\n" msgstr "" -#: libmisc/setupenv.c:208 +#: libmisc/setupenv.c:207 #, c-format msgid "Unable to cd to \"%s\"\n" msgstr "⊥脣乒%s桅\n" -#: libmisc/setupenv.c:216 +#: libmisc/setupenv.c:215 msgid "No directory, logging in with HOME=/" msgstr "瘝桅嚗撠隞 HOME=/ 餃" -#: libmisc/shell.c:119 +#: libmisc/shell.c:118 #, c-format msgid "Cannot execute %s" msgstr "⊥瑁 %s" @@ -164,35 +152,31 @@ msgstr "⊥寧桅%s\n" msgid "Can't change root directory to \"%s\"\n" msgstr "⊥撠寧桅寡算%s\n" -#: libmisc/xmalloc.c:23 +#: libmisc/xmalloc.c:22 #, c-format msgid "malloc(%d) failed\n" msgstr "malloc(%d) 憭望\n" -#: lib/getdef.c:273 +#: lib/getdef.c:265 #, c-format msgid "Could not allocate space for config info.\n" msgstr "⊥箄身摰閮舫蝵桃征\n" -#: lib/getdef.c:327 +#: lib/getdef.c:319 #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" msgstr "蝵桅航炊 - 芰仿栽%s(隢亦恣)\n" -#: lib/pwauth.c:54 src/newgrp.c:343 +#: lib/pwauth.c:45 src/newgrp.c:341 msgid "Password: " msgstr "撖蝣潘" -#: lib/pwauth.c:56 +#: lib/pwauth.c:47 #, c-format msgid "%s's Password: " msgstr "%s 撖蝣潘" -#: lib/pwauth.c:247 -msgid "(Echo on) " -msgstr "(Echo on) " - -#: src/chage.c:118 +#: src/chage.c:112 #, fuzzy, c-format msgid "" "Usage: chage [-l] [-m min_days] [-M max_days] [-W warn]\n" @@ -201,154 +185,147 @@ msgstr "" "冽嚗%s [-l] [-m 撠憭拇窟 [-M 憭批予窟 [-W 霅血]\n" "\t[-I 憭望包 [-E 包 [-d 敺包 雿輻刻\n" -#: src/chage.c:151 src/chfn.c:140 src/chsh.c:90 +#: src/chage.c:145 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:155 +#: src/chage.c:149 msgid "Minimum Password Age" msgstr "撖蝣潭撠" -#: src/chage.c:161 +#: src/chage.c:155 msgid "Maximum Password Age" msgstr "撖蝣潭憭批" -#: src/chage.c:169 +#: src/chage.c:162 msgid "Last Password Change (YYYY-MM-DD)" msgstr "餈銝甈∪蝣潔耨寞 (YYYY-MM-DD)" -#: src/chage.c:177 +#: src/chage.c:170 msgid "Password Expiration Warning" msgstr "撖蝣潮霅血" -#: src/chage.c:183 +#: src/chage.c:176 msgid "Password Inactive" msgstr "撖蝣澆仃" -#: src/chage.c:191 +#: src/chage.c:184 msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "撣單園 (YYYY-MM-DD)" -#: src/chage.c:238 +#: src/chage.c:231 #, fuzzy, c-format msgid "Last password change\t\t\t\t\t: " msgstr "餈銝甈∪蝣潔耨寞 (YYYY-MM-DD)" -#: src/chage.c:240 src/chage.c:254 src/chage.c:270 src/chage.c:283 +#: src/chage.c:233 src/chage.c:247 src/chage.c:263 src/chage.c:276 #, fuzzy, c-format msgid "never\n" msgstr "敺銝\n" -#: src/chage.c:251 +#: src/chage.c:244 #, fuzzy, c-format msgid "Password expires\t\t\t\t\t: " msgstr "撖蝣潮嚗\t" -#: src/chage.c:267 +#: src/chage.c:260 #, fuzzy, c-format msgid "Password inactive\t\t\t\t\t: " msgstr "撖蝣澆仃嚗\t" -#: src/chage.c:281 +#: src/chage.c:274 #, fuzzy, c-format msgid "Account expires\t\t\t\t\t\t: " msgstr "撣單園嚗\t" -#: src/chage.c:297 +#: src/chage.c:290 #, c-format msgid "Minimum number of days between password change\t\t: %ld\n" msgstr "" -#: src/chage.c:298 +#: src/chage.c:292 #, fuzzy, c-format msgid "Maximum number of days between password change\t\t: %ld\n" msgstr "憭批閰行活貉鈭 (%d)\n" -#: src/chage.c:299 +#: src/chage.c:294 #, c-format msgid "Number of days of warning before password expires\t: %ld\n" msgstr "" -#: src/chage.c:444 +#: src/chage.c:431 #, c-format msgid "%s: do not include \"l\" with other flags\n" msgstr "%s嚗隢銝閬嗅璅隤銝雿輻兩l\n" -#: src/chage.c:457 src/chage.c:587 src/chfn.c:272 src/chfn.c:282 -#: src/chfn.c:292 src/chfn.c:302 src/chfn.c:312 src/chfn.c:380 -#: src/gpasswd.c:157 src/login.c:503 src/passwd.c:853 src/passwd.c:890 +#: src/chage.c:443 src/chage.c:571 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/gpasswd.c:150 src/login.c:421 src/passwd.c:823 src/passwd.c:859 #, fuzzy, c-format msgid "%s: permission denied.\n" msgstr "%s嚗瘝甈\n" -#: src/chage.c:488 src/chage.c:727 src/chpasswd.c:177 src/groupadd.c:534 -#: src/groupdel.c:330 src/groupmod.c:523 src/newusers.c:365 src/useradd.c:1672 -#: src/userdel.c:674 src/usermod.c:1425 +#: src/chage.c:476 src/chage.c:682 src/chpasswd.c:178 src/groupadd.c:489 +#: src/groupdel.c:275 src/groupmod.c:457 src/newusers.c:361 src/useradd.c:1527 +#: src/userdel.c:573 src/usermod.c:1314 src/usermod.c:1368 #, c-format msgid "%s: PAM authentication failed\n" msgstr "%s嚗PAM 撽閮澆仃\n" -#: src/chage.c:509 src/chpasswd.c:194 +#: src/chage.c:494 src/chpasswd.c:193 #, c-format msgid "%s: can't open password file\n" msgstr "%s嚗⊥撖蝣潭隞跚n" -#: src/chage.c:517 src/chfn.c:333 src/chsh.c:185 src/gpasswd.c:146 -#: src/gpasswd.c:230 src/groups.c:65 src/passwd.c:903 +#: src/chage.c:501 src/chfn.c:324 src/chsh.c:181 src/gpasswd.c:139 +#: src/gpasswd.c:216 src/groups.c:64 src/passwd.c:865 #, c-format msgid "%s: unknown user %s\n" msgstr "%s嚗芰乩蝙刻嚗%s\n" -#: src/chage.c:535 +#: src/chage.c:519 #, c-format msgid "%s: can't lock shadow password file" msgstr "%s嚗⊥摰shadow撖蝣潭隞" -#: src/chage.c:543 +#: src/chage.c:527 #, c-format msgid "%s: can't open shadow password file" msgstr "%s嚗⊥敶勗撖蝣潭隞" -#: src/chage.c:604 +#: src/chage.c:587 #, c-format msgid "Changing the aging information for %s\n" msgstr "甇函 %s 靽格孵僑朣∟珮n" -#: src/chage.c:607 +#: src/chage.c:589 #, c-format msgid "%s: error changing fields\n" msgstr "%s嚗寡摮畾菜粹珮n" -#: src/chage.c:631 src/pwunconv.c:138 +#: src/chage.c:613 src/pwunconv.c:137 #, c-format msgid "%s: can't update password file\n" msgstr "%s嚗⊥湔啣蝣潭獢\n" -#: src/chage.c:660 src/pwunconv.c:132 +#: src/chage.c:636 src/pwunconv.c:132 #, c-format msgid "%s: can't update shadow password file\n" msgstr "%s嚗⊥湔酒hadow撖蝣潭獢\n" -#: src/chage.c:675 src/chfn.c:571 src/chsh.c:377 src/passwd.c:543 -#: src/passwd.c:615 -#, c-format -msgid "Error updating the DBM password entry.\n" -msgstr "湔 DBM 撖蝣潮格粹胯\n" - -#: src/chage.c:692 +#: src/chage.c:649 #, c-format msgid "%s: can't rewrite shadow password file\n" msgstr "%s嚗⊥撖哀hadow撖蝣潭獢\n" -#: src/chage.c:740 +#: src/chage.c:693 #, c-format msgid "%s: can't rewrite password file\n" msgstr "%s嚗⊥撖怠蝣潭獢\n" -#: src/chage.c:760 src/chpasswd.c:379 src/groupadd.c:595 src/groupdel.c:413 -#: src/groupmod.c:607 src/newusers.c:609 src/useradd.c:1787 src/userdel.c:817 -#: src/usermod.c:1498 +#: src/chage.c:712 src/chpasswd.c:374 src/groupadd.c:535 src/groupdel.c:341 +#: src/groupmod.c:524 src/newusers.c:601 src/useradd.c:1622 src/userdel.c:699 #, c-format msgid "%s: PAM chauthtok failed\n" msgstr "%s嚗PAM chauthtok 憭望\n" @@ -367,117 +344,122 @@ msgstr "" msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" msgstr "冽嚗%s [-f 典] [-r 輸] [-w 撌乩餉店] [-h 摰嗅滬餉店]\n" -#: src/chfn.c:143 +#: src/chfn.c:142 msgid "Full Name" msgstr "典" -#: src/chfn.c:145 +#: src/chfn.c:144 #, c-format msgid "\tFull Name: %s\n" msgstr "\t典嚗%s\n" -#: src/chfn.c:148 src/chfn.c:150 +#: src/chfn.c:147 src/chfn.c:149 msgid "Room Number" msgstr "輸蝣" -#: src/chfn.c:153 src/chfn.c:155 +#: src/chfn.c:152 src/chfn.c:154 msgid "Work Phone" msgstr "撌乩餉店" -#: src/chfn.c:158 src/chfn.c:160 +#: src/chfn.c:157 src/chfn.c:159 msgid "Home Phone" msgstr "摰嗅滬餉店" -#: src/chfn.c:163 +#: src/chfn.c:162 msgid "Other" msgstr "嗅" -#: src/chfn.c:342 src/chsh.c:193 src/passwd.c:834 +#: src/chfn.c:333 src/chsh.c:189 src/passwd.c:805 #, c-format msgid "%s: Cannot determine your user name.\n" msgstr "%s嚗⊥蝣箏函雿輻刻蝔晞\n" -#: src/chfn.c:359 src/chsh.c:210 +#: src/chfn.c:350 src/chsh.c:206 #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" msgstr "%s嚗銝賢 NIS 冽嗥垢銝靽格嫣蝙刻%s\n" -#: src/chfn.c:367 src/chsh.c:218 +#: src/chfn.c:357 src/chsh.c:213 #, c-format msgid "%s: `%s' is the NIS master for this client.\n" msgstr "%s嚗%s舐冽嗥垢 NIS 蝞∠∼\n" -#: src/chfn.c:442 +#: src/chfn.c:382 +#, fuzzy, c-format +msgid "%s: Permission denied.\n" +msgstr "%s嚗瘝甈\n" + +#: src/chfn.c:446 #, c-format msgid "Changing the user information for %s\n" msgstr "甇冽寡 %s 雿輻刻閮珮n" -#: src/chfn.c:451 +#: src/chfn.c:454 #, c-format msgid "%s: invalid name: \"%s\"\n" msgstr "%s嚗⊥蝔梧%s\n" -#: src/chfn.c:457 +#: src/chfn.c:459 #, c-format msgid "%s: invalid room number: \"%s\"\n" msgstr "%s嚗⊥輸蝣潘%s\n" -#: src/chfn.c:463 +#: src/chfn.c:465 #, c-format msgid "%s: invalid work phone: \"%s\"\n" msgstr "%s嚗⊥撌乩餉店嚗%s\n" -#: src/chfn.c:469 +#: src/chfn.c:471 #, c-format msgid "%s: invalid home phone: \"%s\"\n" msgstr "%s嚗⊥摰嗅滬餉店嚗%s\n" -#: src/chfn.c:476 +#: src/chfn.c:478 #, c-format msgid "%s: \"%s\" contains illegal characters\n" msgstr "%s嚗%s恍瘜摮\n" -#: src/chfn.c:489 +#: src/chfn.c:491 #, c-format msgid "%s: fields too long\n" msgstr "%s嚗摮畾萄云愧n" -#: src/chfn.c:505 src/chsh.c:311 src/gpasswd.c:570 src/passwd.c:994 +#: src/chfn.c:506 src/chsh.c:320 src/gpasswd.c:554 src/passwd.c:966 #, c-format msgid "Cannot change ID to root.\n" msgstr "⊥寡 ID root\n" -#: src/chfn.c:520 src/chsh.c:326 src/passwd.c:515 src/passwd.c:567 +#: src/chfn.c:521 src/chsh.c:335 src/passwd.c:508 src/passwd.c:549 #, c-format msgid "Cannot lock the password file; try again later.\n" msgstr "⊥摰撖蝣潭獢儮蝔敺閰艾\n" -#: src/chfn.c:526 src/chsh.c:332 src/passwd.c:520 src/passwd.c:572 +#: src/chfn.c:527 src/chsh.c:341 src/passwd.c:513 src/passwd.c:554 #, c-format msgid "Cannot open the password file.\n" msgstr "⊥撖蝣潭獢\n" -#: src/chfn.c:543 src/chsh.c:347 src/passwd.c:526 src/usermod.c:1092 +#: src/chfn.c:544 src/chsh.c:356 src/passwd.c:519 src/usermod.c:1023 #, c-format msgid "%s: %s not found in /etc/passwd\n" msgstr "%s嚗芸 /etc/passwd 銝剜曉 %s\n" -#: src/chfn.c:562 src/chsh.c:368 src/passwd.c:536 src/passwd.c:608 +#: src/chfn.c:560 src/chsh.c:375 src/passwd.c:528 src/passwd.c:589 #, c-format msgid "Error updating the password entry.\n" msgstr "湔孵蝣潮格粹胯\n" -#: src/chfn.c:586 src/chsh.c:392 src/passwd.c:551 src/passwd.c:623 +#: src/chfn.c:571 src/chsh.c:387 src/passwd.c:533 src/passwd.c:594 #, c-format msgid "Cannot commit password file changes.\n" msgstr "⊥鈭文蝣潭獢霈\n" -#: src/chfn.c:593 src/chsh.c:399 +#: src/chfn.c:578 src/chsh.c:394 #, c-format msgid "Cannot unlock the password file.\n" msgstr "⊥閫撖蝣潭獢\n" -#: src/chpasswd.c:69 +#: src/chpasswd.c:71 #, c-format msgid "" "Usage: chpasswd [options]\n" @@ -500,48 +482,48 @@ msgstr "" msgid "%s: can't lock password file\n" msgstr "%s嚗⊥摰撖蝣潭隞跚n" -#: src/chpasswd.c:203 src/pwconv.c:95 +#: src/chpasswd.c:201 src/pwconv.c:95 #, c-format msgid "%s: can't lock shadow file\n" msgstr "%s嚗⊥摰shadow瑼獢\n" -#: src/chpasswd.c:209 src/gpasswd.c:596 src/pwconv.c:100 src/pwunconv.c:89 +#: src/chpasswd.c:207 src/gpasswd.c:580 src/pwconv.c:100 src/pwunconv.c:89 #: src/pwunconv.c:94 #, c-format msgid "%s: can't open shadow file\n" msgstr "%s嚗⊥shadow瑼獢\n" -#: src/chpasswd.c:232 src/newusers.c:441 +#: src/chpasswd.c:230 src/newusers.c:434 #, c-format msgid "%s: line %d: line too long\n" msgstr "%s嚗蝚 %d 銵嚗甇方憭芷愧n" -#: src/chpasswd.c:252 +#: src/chpasswd.c:250 #, c-format msgid "%s: line %d: missing new password\n" msgstr "%s嚗蝚 %d 銵嚗蝻箏啣蝣墦n" -#: src/chpasswd.c:277 +#: src/chpasswd.c:274 #, c-format msgid "%s: line %d: unknown user %s\n" msgstr "%s嚗蝚 %d 銵嚗芰乩蝙刻 %s\n" -#: src/chpasswd.c:323 +#: src/chpasswd.c:320 #, c-format msgid "%s: line %d: cannot update password entry\n" msgstr "%s嚗蝚 %d 銵嚗⊥湔啣蝣潮娉n" -#: src/chpasswd.c:340 src/newusers.c:569 +#: src/chpasswd.c:337 src/newusers.c:561 #, c-format msgid "%s: error detected, changes ignored\n" msgstr "%s嚗潛暸航炊嚗敹賜交游\n" -#: src/chpasswd.c:352 +#: src/chpasswd.c:349 #, c-format msgid "%s: error updating shadow file\n" msgstr "%s嚗湔酒hadow瑼獢粹胯\n" -#: src/chpasswd.c:361 +#: src/chpasswd.c:357 #, c-format msgid "%s: error updating password file\n" msgstr "%s嚗湔啣蝣潭獢粹胯\n" @@ -551,26 +533,26 @@ msgstr "%s嚗湔啣蝣潭獢粹胯\n" msgid "Usage: %s [-s shell] [name]\n" msgstr "冽嚗%s [-s shell] [蝔崧\n" -#: src/chsh.c:91 +#: src/chsh.c:90 msgid "Login Shell" msgstr "餃 Shell" -#: src/chsh.c:234 src/chsh.c:248 +#: src/chsh.c:229 src/chsh.c:242 src/chsh.c:256 #, c-format msgid "You may not change the shell for %s.\n" msgstr "其賜 %s 湔 shell\n" -#: src/chsh.c:277 +#: src/chsh.c:288 #, c-format msgid "Changing the login shell for %s\n" msgstr "甇冽湔 %s shell\n" -#: src/chsh.c:289 +#: src/chsh.c:300 #, c-format msgid "%s: Invalid entry: %s\n" msgstr "%s嚗⊥殷%s\n" -#: src/chsh.c:296 +#: src/chsh.c:305 #, c-format msgid "%s is an invalid shell.\n" msgstr "%s 舐⊥ shell\n" @@ -580,12 +562,12 @@ msgstr "%s 舐⊥ shell\n" msgid "Usage: expiry {-f|-c}\n" msgstr "冽嚗expiry {-f|-c}\n" -#: src/expiry.c:113 +#: src/expiry.c:112 #, c-format msgid "%s: WARNING! Must be set-UID root!\n" msgstr "%s嚗霅血嚗敹 set-UID root嚗\n" -#: src/expiry.c:124 +#: src/expiry.c:122 #, c-format msgid "%s: unknown user\n" msgstr "%s嚗芰乩蝙刻\n" @@ -599,320 +581,285 @@ msgid "" " -a, --all\t\t\tdisplay faillog records for all users\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -l, --lock-time SEC\t\tafter failed login lock accout to SEC seconds\n" -" -m, --maximum MAX\t\tset maiximum failed login counters to MAX\n" +" -m, --maximum MAX\t\tset maximum failed login counters to MAX\n" " -r, --reset\t\t\treset the counters of login failures\n" +" -t, --time DAYS\t\tdisplay faillog records more recent than DAYS\n" " -u, --user LOGIN\t\tdisplay faillog record or maintains failure counters\n" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" msgstr "" -#: src/faillog.c:86 +#: src/faillog.c:87 #, c-format -msgid "Username Failures Maximum Latest\n" -msgstr "雿輻刻 航炊 憭 敺\n" +msgid "Login Failures Maximum Latest On\n" +msgstr "" -#: src/faillog.c:103 -#, c-format -msgid " %s on %s" -msgstr " %s %s" - -#: src/faillog.c:107 +#: src/faillog.c:105 #, c-format msgid " [%lds left]" msgstr " [ %lds]" -#: src/faillog.c:111 +#: src/faillog.c:109 #, c-format msgid " [%lds lock]" msgstr " [摰 %lds]" -#: src/faillog.c:351 src/lastlog.c:191 +#: src/faillog.c:353 src/lastlog.c:187 #, c-format msgid "Unknown User: %s\n" msgstr "芰乩蝙刻嚗%s\n" -#: src/gpasswd.c:78 +#: src/gpasswd.c:71 #, fuzzy, c-format msgid "Usage: %s [-r|-R] group\n" msgstr "冽嚗%s [-r|-R] 蝢斤\n" -#: src/gpasswd.c:79 +#: src/gpasswd.c:72 #, c-format msgid " %s [-a user] group\n" msgstr " %s [-a 雿輻刻] 蝢斤\n" -#: src/gpasswd.c:80 +#: src/gpasswd.c:73 #, c-format msgid " %s [-d user] group\n" msgstr " %s [-d 雿輻刻] 蝢斤\n" -#: src/gpasswd.c:83 +#: src/gpasswd.c:76 #, c-format msgid " %s [-A user,...] [-M user,...] group\n" msgstr " %s [-A 雿輻刻,...] [-M 雿輻刻,...] 蝢斤\n" -#: src/gpasswd.c:85 +#: src/gpasswd.c:78 #, c-format msgid " %s [-M user,...] group\n" msgstr " %s [-M 雿輻刻,...] 蝢斤\n" -#: src/gpasswd.c:243 +#: src/gpasswd.c:229 #, c-format msgid "%s: shadow group passwords required for -A\n" msgstr "%s嚗-A 閬shadow蝢斤撖蝣墦n" -#: src/gpasswd.c:294 +#: src/gpasswd.c:280 #, c-format msgid "Who are you?\n" msgstr "雿航狐嚗\n" -#: src/gpasswd.c:313 src/newgrp.c:292 +#: src/gpasswd.c:299 src/newgrp.c:290 #, c-format msgid "unknown group: %s\n" msgstr "芰亦黎蝯嚗%s\n" -#: src/gpasswd.c:422 +#: src/gpasswd.c:408 #, c-format msgid "Adding user %s to group %s\n" msgstr "甇典雿輻刻%s亙售%s蝢斤銝苒n" -#: src/gpasswd.c:440 +#: src/gpasswd.c:426 #, c-format msgid "Removing user %s from group %s\n" msgstr "甇典雿輻刻%s敺%s蝢斤銝剖芷么n" -#: src/gpasswd.c:454 +#: src/gpasswd.c:439 #, c-format msgid "%s: unknown member %s\n" msgstr "%s嚗芰交 %s\n" -#: src/gpasswd.c:501 +#: src/gpasswd.c:485 #, c-format msgid "%s: Not a tty\n" msgstr "%s嚗銝 tty\n" -#: src/gpasswd.c:522 +#: src/gpasswd.c:506 #, c-format msgid "Changing the password for group %s\n" msgstr "甇其耨 %s 蝢斤撖蝣墦n" -#: src/gpasswd.c:525 +#: src/gpasswd.c:509 msgid "New Password: " msgstr "啣蝣潘" -#: src/gpasswd.c:530 src/passwd.c:281 +#: src/gpasswd.c:514 src/passwd.c:278 msgid "Re-enter new password: " msgstr "隢啗撓交啣蝣潘" -#: src/gpasswd.c:542 +#: src/gpasswd.c:526 msgid "They don't match; try again" msgstr "隞銝虫寥儮隢閰" -#: src/gpasswd.c:546 +#: src/gpasswd.c:530 #, c-format msgid "%s: Try again later\n" msgstr "%s嚗隢蝔敺閰吒n" -#: src/gpasswd.c:578 +#: src/gpasswd.c:562 #, c-format msgid "%s: can't get lock\n" msgstr "%s嚗⊥脣摰\n" -#: src/gpasswd.c:584 +#: src/gpasswd.c:568 #, c-format msgid "%s: can't get shadow lock\n" msgstr "%s嚗⊥脣shadow摰\n" -#: src/gpasswd.c:590 +#: src/gpasswd.c:574 #, c-format msgid "%s: can't open file\n" msgstr "%s嚗⊥瑼獢\n" -#: src/gpasswd.c:602 +#: src/gpasswd.c:586 #, c-format msgid "%s: can't update entry\n" msgstr "%s嚗⊥湔圈娉n" -#: src/gpasswd.c:608 +#: src/gpasswd.c:592 #, c-format msgid "%s: can't update shadow entry\n" msgstr "%s嚗⊥湔酒hadow娉n" -#: src/gpasswd.c:615 +#: src/gpasswd.c:598 #, c-format msgid "%s: can't re-write file\n" msgstr "%s嚗⊥撖急獢\n" -#: src/gpasswd.c:621 +#: src/gpasswd.c:604 #, c-format msgid "%s: can't re-write shadow file\n" msgstr "%s嚗⊥撖哀hadow瑼獢\n" -#: src/gpasswd.c:630 +#: src/gpasswd.c:612 #, c-format msgid "%s: can't unlock file\n" msgstr "%s ⊥閫瑼獢\n" -#: src/gpasswd.c:635 -#, c-format -msgid "%s: can't update DBM files\n" -msgstr "%s嚗⊥湔 DBM 瑼獢\n" - -#: src/gpasswd.c:642 -#, c-format -msgid "%s: can't update DBM shadow files\n" -msgstr "%s嚗⊥湔 DBM shadow瑼獢\n" - -#: src/groupadd.c:102 +#: src/groupadd.c:97 #, fuzzy, c-format msgid "Usage: groupadd [-g gid [-o]] [-f] group\n" msgstr "冽嚗groupadd [-g gid [-o]] 蝢斤\n" -#: src/groupadd.c:168 src/groupadd.c:193 src/groupmod.c:180 src/groupmod.c:229 -#: src/useradd.c:937 src/usermod.c:533 src/usermod.c:676 +#: src/groupadd.c:161 src/groupadd.c:170 src/groupmod.c:174 src/groupmod.c:197 +#: src/useradd.c:857 src/usermod.c:514 src/usermod.c:636 #, c-format msgid "%s: error adding new group entry\n" msgstr "%s嚗憓啁黎蝯格粹珮n" -#: src/groupadd.c:179 src/groupadd.c:204 src/groupmod.c:198 src/useradd.c:948 -#: src/usermod.c:545 src/usermod.c:689 -#, c-format -msgid "%s: cannot add new dbm group entry\n" -msgstr "%s嚗⊥憓啁 dbm 蝢斤娉n" - -#: src/groupadd.c:256 src/useradd.c:1001 +#: src/groupadd.c:219 src/useradd.c:904 #, c-format msgid "%s: name %s is not unique\n" msgstr "%s嚗蝔 %s 銝虫臭\n" -#: src/groupadd.c:271 +#: src/groupadd.c:234 #, c-format msgid "%s: gid %u is not unique\n" msgstr "%s嚗gid %u 銝虫臭\n" -#: src/groupadd.c:295 +#: src/groupadd.c:258 #, c-format msgid "%s: can't get unique gid\n" msgstr "%s嚗⊥脣冽 gid\n" -#: src/groupadd.c:318 src/groupmod.c:342 +#: src/groupadd.c:280 src/groupmod.c:283 #, fuzzy, c-format msgid "%s: %s is not a valid group name\n" msgstr "%s嚗%s 銝舀蝢斤\n" -#: src/groupadd.c:347 src/groupmod.c:367 +#: src/groupadd.c:309 src/groupmod.c:308 #, c-format msgid "%s: invalid group %s\n" msgstr "%s嚗⊥蝢斤 %s\n" -#: src/groupadd.c:364 src/useradd.c:1197 +#: src/groupadd.c:326 src/useradd.c:1099 #, c-format msgid "%s: -O requires NAME=VALUE\n" msgstr "%s嚗-O 閬 NAME=VALUE\n" -#: src/groupadd.c:408 src/groupdel.c:171 src/groupmod.c:402 src/useradd.c:1312 -#: src/userdel.c:302 src/usermod.c:557 +#: src/groupadd.c:370 src/groupdel.c:124 src/groupmod.c:343 src/useradd.c:1212 +#: src/userdel.c:245 src/usermod.c:522 #, c-format msgid "%s: cannot rewrite group file\n" msgstr "%s嚗⊥撖怎黎蝯瑼獢\n" -#: src/groupadd.c:416 src/groupdel.c:179 src/groupmod.c:410 src/useradd.c:1321 -#: src/userdel.c:309 src/usermod.c:703 +#: src/groupadd.c:377 src/groupdel.c:131 src/groupmod.c:350 src/useradd.c:1220 +#: src/userdel.c:251 src/usermod.c:645 #, c-format msgid "%s: cannot rewrite shadow group file\n" msgstr "%s嚗⊥撖哀hadow蝢斤瑼獢\n" -#: src/groupadd.c:434 src/groupdel.c:197 src/groupmod.c:428 src/userdel.c:374 +#: src/groupadd.c:394 src/groupdel.c:148 src/groupmod.c:367 src/userdel.c:311 #, c-format msgid "%s: unable to lock group file\n" msgstr "%s嚗⊥摰蝢斤瑼獢\n" -#: src/groupadd.c:439 src/groupdel.c:202 src/groupmod.c:433 +#: src/groupadd.c:398 src/groupdel.c:152 src/groupmod.c:371 #, c-format msgid "%s: unable to open group file\n" msgstr "%s嚗⊥蝢斤瑼獢\n" -#: src/groupadd.c:446 src/groupdel.c:209 src/groupmod.c:440 src/userdel.c:385 +#: src/groupadd.c:404 src/groupdel.c:158 src/groupmod.c:377 src/userdel.c:321 #, c-format msgid "%s: unable to lock shadow group file\n" msgstr "%s嚗⊥摰shadow蝢斤瑼獢\n" -#: src/groupadd.c:452 src/groupdel.c:215 src/groupmod.c:446 +#: src/groupadd.c:409 src/groupdel.c:163 src/groupmod.c:382 #, c-format msgid "%s: unable to open shadow group file\n" msgstr "%s嚗⊥shadow蝢斤瑼獢\n" -#: src/groupadd.c:566 +#: src/groupadd.c:508 #, c-format msgid "%s: group %s exists\n" msgstr "%s嚗%s 蝢斤撌脣沔n" -#: src/groupdel.c:88 +#: src/groupdel.c:83 #, fuzzy, c-format msgid "Usage: groupdel group\n" msgstr "冽嚗groupdel 蝢斤\n" -#: src/groupdel.c:105 src/groupmod.c:185 src/groupmod.c:234 +#: src/groupdel.c:96 src/groupmod.c:178 src/groupmod.c:201 #, c-format msgid "%s: error removing group entry\n" msgstr "%s嚗芷斤黎蝯格粹珮n" -#: src/groupdel.c:119 src/groupmod.c:205 -#, c-format -msgid "%s: error removing group dbm entry\n" -msgstr "%s嚗芷斤黎蝯 dbm 格粹珮n" - -#: src/groupdel.c:135 +#: src/groupdel.c:106 #, c-format msgid "%s: error removing shadow group entry\n" msgstr "%s嚗芷山hadow蝢斤格粹珮n" -#: src/groupdel.c:149 src/groupmod.c:255 -#, c-format -msgid "%s: error removing shadow group dbm entry\n" -msgstr "%s嚗芷山hadow蝢斤 dbm 格粹珮n" - -#: src/groupdel.c:255 +#: src/groupdel.c:202 #, c-format msgid "%s: cannot remove user's primary group.\n" msgstr "%s嚗銝賢芷支蝙刻銝餌黎蝯\n" -#: src/groupdel.c:359 src/groupmod.c:552 +#: src/groupdel.c:290 src/groupmod.c:471 #, c-format msgid "%s: group %s does not exist\n" msgstr "%s嚗%s 蝢斤銝摮沔n" -#: src/groupdel.c:373 src/groupmod.c:568 +#: src/groupdel.c:303 src/groupmod.c:485 #, c-format msgid "%s: group %s is a NIS group\n" msgstr "%s嚗%s 蝢斤臭 NIS 蝢斤\n" -#: src/groupdel.c:378 src/groupmod.c:573 src/userdel.c:727 src/usermod.c:805 +#: src/groupdel.c:308 src/groupmod.c:490 src/userdel.c:611 src/usermod.c:743 #, c-format msgid "%s: %s is the NIS master\n" msgstr "%s嚗%s NIS 蝞∠﹏n" -#: src/groupmod.c:104 +#: src/groupmod.c:98 #, fuzzy, c-format msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" msgstr "冽嚗groupmod [-g gid [-o]] [-n 蝔崧 蝢斤\n" -#: src/groupmod.c:162 +#: src/groupmod.c:156 #, c-format msgid "%s: %s not found in /etc/group\n" msgstr "%s嚗芸 /etc/group 銝剜曉 %s\n" -#: src/groupmod.c:248 -#, c-format -msgid "%s: cannot add new dbm shadow group entry\n" -msgstr "%s嚗⊥憓啁 dbm shadow蝢斤娉n" - -#: src/groupmod.c:301 +#: src/groupmod.c:242 #, c-format msgid "%s: %u is not a unique gid\n" msgstr "%s嚗%u 銝臭臭 gid\n" -#: src/groupmod.c:331 +#: src/groupmod.c:272 #, c-format msgid "%s: %s is not a unique name\n" msgstr "%s嚗%s 銝臭臭蝔崤n" @@ -922,110 +869,105 @@ msgstr "%s嚗%s 銝臭臭蝔崤n" msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" msgstr "冽嚗%s [-r] [-s] [蝢斤 [gshadow]] \n" -#: src/grpck.c:90 +#: src/grpck.c:89 #, c-format msgid "Usage: %s [-r] [-s] [group]\n" msgstr "冽嚗%s [-r] [-s] [蝢斤]\n" -#: src/grpck.c:108 src/pwck.c:108 +#: src/grpck.c:107 src/pwck.c:108 msgid "No" msgstr "瘨" -#: src/grpck.c:192 src/pwck.c:175 +#: src/grpck.c:191 src/pwck.c:175 #, c-format msgid "%s: -s and -r are incompatibile\n" msgstr "%s嚗-s -r 臭銝詨捆\n" -#: src/grpck.c:232 src/grpck.c:242 src/pwck.c:215 src/pwck.c:225 +#: src/grpck.c:230 src/grpck.c:239 src/pwck.c:214 src/pwck.c:223 #, c-format msgid "%s: cannot lock file %s\n" msgstr "%s嚗⊥摰瑼獢 %s\n" -#: src/grpck.c:259 src/grpck.c:268 src/mkpasswd.c:201 src/pwck.c:242 -#: src/pwck.c:251 +#: src/grpck.c:255 src/grpck.c:264 src/mkpasswd.c:201 src/pwck.c:239 +#: src/pwck.c:248 #, c-format msgid "%s: cannot open file %s\n" msgstr "%s嚗⊥瑼獢 %s\n" -#: src/grpck.c:311 +#: src/grpck.c:307 #, c-format msgid "invalid group file entry\n" msgstr "⊥蝢斤瑼獢娉n" -#: src/grpck.c:312 src/grpck.c:375 src/grpck.c:458 src/grpck.c:521 -#: src/grpck.c:538 src/pwck.c:296 src/pwck.c:358 src/pwck.c:457 src/pwck.c:519 -#: src/pwck.c:543 +#: src/grpck.c:308 src/grpck.c:371 src/grpck.c:453 src/grpck.c:516 +#: src/grpck.c:533 src/pwck.c:293 src/pwck.c:355 src/pwck.c:453 src/pwck.c:515 +#: src/pwck.c:539 #, c-format msgid "delete line `%s'? " msgstr "芷手%s銵嚗\"" -#: src/grpck.c:374 +#: src/grpck.c:370 msgid "duplicate group entry\n" msgstr "銴鋆賜黎蝯娉n" -#: src/grpck.c:391 +#: src/grpck.c:387 #, c-format msgid "invalid group name `%s'\n" msgstr "⊥蝢斤%s\n" -#: src/grpck.c:418 +#: src/grpck.c:413 #, c-format msgid "group %s: no user %s\n" msgstr "%s 蝢斤嚗∩蝙刻 %s\n" -#: src/grpck.c:420 src/grpck.c:590 +#: src/grpck.c:415 src/grpck.c:585 #, c-format msgid "delete member `%s'? " msgstr "芷支蝙刻﹦%s嚗" -#: src/grpck.c:457 +#: src/grpck.c:452 #, c-format msgid "invalid shadow group file entry\n" msgstr "⊥shadow蝢斤瑼獢娉n" -#: src/grpck.c:520 +#: src/grpck.c:515 msgid "duplicate shadow group entry\n" msgstr "銴鋆編hadow蝢斤娉n" -#: src/grpck.c:537 +#: src/grpck.c:532 msgid "no matching group file entry\n" msgstr "瘝曉啣寥蝢斤瑼獢娉n" -#: src/grpck.c:558 +#: src/grpck.c:553 #, c-format msgid "shadow group %s: no administrative user %s\n" msgstr "%s shadow蝢斤嚗∠頂蝯梁恣 %s\n" -#: src/grpck.c:560 +#: src/grpck.c:555 #, c-format msgid "delete administrative member `%s'? " msgstr "芷斤頂蝯梁恣%s嚗" -#: src/grpck.c:588 +#: src/grpck.c:583 #, c-format msgid "shadow group %s: no user %s\n" msgstr "%s shadow蝢斤嚗∩蝙刻 %s\n" -#: src/grpck.c:616 src/grpck.c:622 src/pwck.c:577 src/pwck.c:585 +#: src/grpck.c:611 src/grpck.c:617 src/pwck.c:573 src/pwck.c:581 #, c-format msgid "%s: cannot update file %s\n" msgstr "%s嚗⊥湔唳獢 %s\n" -#: src/grpck.c:647 src/pwck.c:612 -#, c-format -msgid "%s: the files have been updated; run mkpasswd\n" -msgstr "%s嚗瑼獢芾◤湔堆隢瑁 mkpasswd\n" - -#: src/grpck.c:648 src/grpck.c:652 src/pwck.c:613 src/pwck.c:617 -#, c-format -msgid "%s: no changes\n" -msgstr "%s嚗⊥寡\n" - -#: src/grpck.c:651 src/pwck.c:616 +#: src/grpck.c:640 src/pwck.c:606 #, c-format msgid "%s: the files have been updated\n" msgstr "%s嚗瑼獢撌脰◤湔豹n" +#: src/grpck.c:641 src/pwck.c:607 +#, c-format +msgid "%s: no changes\n" +msgstr "%s嚗⊥寡\n" + #: src/grpconv.c:60 src/grpunconv.c:56 #, c-format msgid "%s: can't lock group file\n" @@ -1041,37 +983,37 @@ msgstr "%s嚗⊥蝢斤瑼獢\n" msgid "%s: can't lock shadow group file\n" msgstr "%s嚗⊥摰shadow蝢斤瑼獢\n" -#: src/grpconv.c:76 src/grpunconv.c:72 +#: src/grpconv.c:75 src/grpunconv.c:71 #, c-format msgid "%s: can't open shadow group file\n" msgstr "%s嚗⊥shadow蝢斤瑼獢\n" -#: src/grpconv.c:94 +#: src/grpconv.c:92 #, c-format msgid "%s: can't remove shadow group %s\n" msgstr "%s嚗⊥蝘駁山hadow蝢斤 %s\n" -#: src/grpconv.c:133 src/pwconv.c:154 +#: src/grpconv.c:130 src/pwconv.c:153 #, c-format msgid "%s: can't update shadow entry for %s\n" msgstr "%s嚗⊥ %s 湔酒hadow娉n" -#: src/grpconv.c:143 src/grpunconv.c:91 +#: src/grpconv.c:140 src/grpunconv.c:88 #, c-format msgid "%s: can't update entry for group %s\n" msgstr "%s嚗⊥湔 %s 蝢斤娉n" -#: src/grpconv.c:150 src/grpunconv.c:99 +#: src/grpconv.c:147 src/grpunconv.c:96 #, c-format msgid "%s: can't update shadow group file\n" msgstr "%s嚗⊥湔酒hadow蝢斤瑼獢\n" -#: src/grpconv.c:155 src/grpunconv.c:105 +#: src/grpconv.c:152 src/grpunconv.c:102 #, c-format msgid "%s: can't update group file\n" msgstr "%s ⊥湔啁黎蝯瑼獢\n" -#: src/grpunconv.c:110 +#: src/grpunconv.c:107 #, c-format msgid "%s: can't delete shadow group file\n" msgstr "%s嚗⊥芷山hadow蝢斤瑼獢\n" @@ -1091,13 +1033,13 @@ msgstr "冽嚗id\n" msgid " groups=" msgstr " 蝢斤=" -#: src/lastlog.c:68 +#: src/lastlog.c:64 #, fuzzy, c-format msgid "" "Usage: lastlog [options]\n" "\n" "Options:\n" -" -u, --login LOGIN\tprint lastlog record for user with specyfied LOGIN\n" +" -u, --login LOGIN\tprint lastlog record for user with specified LOGIN\n" " -h, --help\t\tdisplay this help message and exit\n" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" msgstr "" @@ -1108,41 +1050,41 @@ msgstr "" " -h, --help\t\t憿舐內閰脣鼠抵臭蒂ａ\n" " -m, --md5\t\t撠靘撖蝣潔蝙 MD5 隞 DES 撖\t\t\t撖蝣潭撖\n" -#: src/lastlog.c:94 +#: src/lastlog.c:90 #, c-format msgid "Username Port From Latest\n" msgstr "雿輻刻 靘 敺餃交\n" -#: src/lastlog.c:96 +#: src/lastlog.c:92 #, c-format msgid "Username Port Latest\n" msgstr "雿輻刻 敺餃交\n" -#: src/lastlog.c:111 +#: src/lastlog.c:107 msgid "**Never logged in**" msgstr "**敺芰餃仿**" -#: src/login.c:175 +#: src/login.c:156 #, fuzzy, c-format msgid "Usage: %s [-p] [name]\n" msgstr "冽嚗%s [-p] [蝔崧\n" -#: src/login.c:178 +#: src/login.c:159 #, c-format msgid " %s [-p] [-h host] [-f name]\n" msgstr " %s [-p] [-h 銝餅] [-f 蝔崧\n" -#: src/login.c:180 +#: src/login.c:161 #, c-format msgid " %s [-p] -r host\n" msgstr " %s [-p] -r 銝餅\n" -#: src/login.c:259 +#: src/login.c:198 #, c-format msgid "Invalid login time\n" msgstr "⊥餃交\n" -#: src/login.c:314 +#: src/login.c:234 #, c-format msgid "" "\n" @@ -1151,7 +1093,7 @@ msgstr "" "\n" "蝟餌絞嚗靘銵蝬剛風\n" -#: src/login.c:325 +#: src/login.c:244 #, c-format msgid "" "\n" @@ -1160,7 +1102,7 @@ msgstr "" "\n" "[敹賜交瑞閬瘙 -- 閮 root 餃乓]\n" -#: src/login.c:362 +#: src/login.c:297 #, c-format msgid "" "\n" @@ -1169,17 +1111,17 @@ msgstr "" "\n" "餃仿暹 %d 蝘\n" -#: src/login.c:648 +#: src/login.c:565 #, c-format msgid " on `%.100s' from `%.200s'" msgstr " 兩%.100s銝嚗靘芬%.200s" -#: src/login.c:652 +#: src/login.c:568 #, c-format msgid " on `%.100s'" msgstr "兩%.100s銝" -#: src/login.c:816 +#: src/login.c:722 #, c-format msgid "" "\n" @@ -1188,38 +1130,29 @@ msgstr "" "\n" " %s 雿輻刻蝔梧" -#: src/login.c:819 -msgid "login: " -msgstr "雿輻刻蝔梧" - -#: src/login.c:1018 src/sulogin.c:205 +#: src/login.c:879 src/sulogin.c:203 msgid "Login incorrect" msgstr "餃仿航炊" -#: src/login.c:1198 +#: src/login.c:996 msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "霅血嚗函剜怎摰敺撠Ｗ儔餃乓\n" -#: src/login.c:1212 +#: src/login.c:1010 #, c-format msgid "Last login: %s on %s" msgstr "銝甈∠餃伐%s %s 銝" -#: src/login.c:1215 +#: src/login.c:1013 #, c-format msgid "Last login: %.19s on %s" msgstr "銝甈∠餃伐%.19s %s 銝" -#: src/login.c:1221 +#: src/login.c:1018 #, c-format msgid " from %.*s" msgstr " 靘 %.*s" -#: src/login.c:1298 -#, c-format -msgid "Starting rad_login\n" -msgstr "憪 rad_login\n" - #: src/mkpasswd.c:47 #, c-format msgid "%s: no DBM database on system - no action performed\n" @@ -1260,17 +1193,17 @@ msgstr "%s嚗憓閮粹 " msgid "added %d entries, longest was %d\n" msgstr "憓 %d 殷瑟 %d\n" -#: src/mkpasswd.c:390 +#: src/mkpasswd.c:389 #, c-format msgid "Usage: %s [-vf] [-p|g|sp|sg] file\n" msgstr "冽嚗%s [-vf] [-p|g|sp|sg] 瑼獢\n" -#: src/mkpasswd.c:393 +#: src/mkpasswd.c:391 #, c-format msgid "Usage: %s [-vf] [-p|g|sp] file\n" msgstr "冽嚗%s [-vf] [-p|g|sp] 瑼獢\n" -#: src/mkpasswd.c:396 +#: src/mkpasswd.c:394 #, c-format msgid "Usage: %s [-vf] [-p|g] file\n" msgstr "冽嚗%s [-vf] [-p|g] 瑼獢\n" @@ -1290,16 +1223,16 @@ msgstr "冽嚗sg 蝢斤 [[-c] 賭誘]\n" msgid "unknown uid: %u\n" msgstr "芰亦 uid嚗%u\n" -#: src/newgrp.c:214 +#: src/newgrp.c:213 #, c-format msgid "unknown gid: %lu\n" msgstr "芰亦 gid嚗%lu\n" -#: src/newgrp.c:360 src/newgrp.c:369 +#: src/newgrp.c:358 src/newgrp.c:367 msgid "Sorry.\n" msgstr "望\n" -#: src/newgrp.c:469 +#: src/newgrp.c:467 #, c-format msgid "too many groups\n" msgstr "雿輻刻蝢斤憭\n" @@ -1309,91 +1242,91 @@ msgstr "雿輻刻蝢斤憭\n" msgid "Usage: %s [input]\n" msgstr "冽嚗%s [頛詨包\n" -#: src/newusers.c:388 +#: src/newusers.c:382 #, c-format msgid "%s: can't lock /etc/passwd.\n" msgstr "%s嚗⊥摰 /etc/passwd\n" -#: src/newusers.c:400 +#: src/newusers.c:394 #, c-format msgid "%s: can't lock files, try again later\n" msgstr "%s嚗⊥摰瑼獢嚗隢蝔敺閰艾\n" -#: src/newusers.c:416 +#: src/newusers.c:409 #, c-format msgid "%s: can't open files\n" msgstr "%s嚗⊥瑼獢\n" -#: src/newusers.c:461 +#: src/newusers.c:454 #, c-format msgid "%s: line %d: invalid line\n" msgstr "%s嚗蝚 %d 銵嚗⊥銵\n" -#: src/newusers.c:480 +#: src/newusers.c:473 #, c-format msgid "%s: line %d: can't create GID\n" msgstr "%s嚗蝚 %d 銵嚗⊥撱箇 GID\n" -#: src/newusers.c:496 +#: src/newusers.c:489 #, c-format msgid "%s: line %d: can't create UID\n" msgstr "%s嚗蝚 %d 銵嚗⊥撱箇 UID\n" -#: src/newusers.c:509 +#: src/newusers.c:502 #, c-format msgid "%s: line %d: cannot find user %s\n" msgstr "%s嚗蝚 %d 銵嚗⊥曉唬蝙刻 %s\n" -#: src/newusers.c:518 +#: src/newusers.c:511 #, c-format msgid "%s: line %d: can't update password\n" msgstr "%s嚗蝚 %d 銵嚗⊥湔啣蝣墦n" -#: src/newusers.c:536 +#: src/newusers.c:529 #, c-format msgid "%s: line %d: mkdir failed\n" msgstr "%s嚗蝚 %d 銵嚗撱箇桅憭望\n" -#: src/newusers.c:542 +#: src/newusers.c:534 #, c-format msgid "%s: line %d: chown failed\n" msgstr "%s嚗蝚 %d 銵嚗寡蝢斤憭望\n" -#: src/newusers.c:552 +#: src/newusers.c:544 #, c-format msgid "%s: line %d: can't update entry\n" msgstr "%s嚗蝚 %d 銵嚗⊥湔圈娉n" -#: src/newusers.c:584 +#: src/newusers.c:576 #, c-format msgid "%s: error updating files\n" msgstr "%s嚗湔唳獢粹珮n" -#: src/passwd.c:155 +#: src/passwd.c:154 #, fuzzy, c-format msgid "Usage: %s [-f|-s] [name]\n" msgstr "冽嚗%s [-f|-s] [蝔崧\n" -#: src/passwd.c:159 +#: src/passwd.c:158 #, c-format msgid " %s [-x max] [-n min] [-w warn] [-i inact] name\n" msgstr " %s [-x 憭吞 [-n 撠] [-w 霅血] [-i 憭望] 蝔崤n" -#: src/passwd.c:161 +#: src/passwd.c:160 #, c-format msgid " %s {-l|-u|-d|-S|-e} name\n" msgstr " %s {-l|-u|-d|-S|-e} 蝔崤n" -#: src/passwd.c:216 +#: src/passwd.c:214 msgid "Old password: " msgstr "撖蝣潘" -#: src/passwd.c:225 +#: src/passwd.c:223 #, c-format msgid "Incorrect password for `%s'\n" msgstr "%s撖蝣潔甇蝣暝n" -#: src/passwd.c:249 +#: src/passwd.c:247 #, c-format msgid "" "Enter the new password (minimum of %d, maximum of %d characters)\n" @@ -1402,16 +1335,16 @@ msgstr "" "隢頛詨交啣蝣(撠 %d 憭 %d 摮)\n" "隢瘛瑕雿輻典之撠撖怠瘥詨\n" -#: src/passwd.c:255 +#: src/passwd.c:253 msgid "New password: " msgstr "啣蝣潘" -#: src/passwd.c:266 +#: src/passwd.c:263 #, c-format msgid "Try again.\n" msgstr "閰艾\n" -#: src/passwd.c:277 +#: src/passwd.c:274 #, c-format msgid "" "\n" @@ -1420,52 +1353,52 @@ msgstr "" "\n" "霅血嚗撘梁撖蝣(啗撓乩誑撘瑕嗡蝙典)\n" -#: src/passwd.c:287 +#: src/passwd.c:283 #, c-format msgid "They don't match; try again.\n" msgstr "隞銝虫寥儮隢閰艾\n" -#: src/passwd.c:364 src/passwd.c:382 +#: src/passwd.c:360 src/passwd.c:377 #, c-format msgid "The password for %s cannot be changed.\n" msgstr "⊥湔 %s 撖蝣潦\n" -#: src/passwd.c:396 +#: src/passwd.c:390 #, c-format msgid "Sorry, the password for %s cannot be changed yet.\n" msgstr "望嚗⊥湔 %s 撖蝣潦\n" -#: src/passwd.c:479 +#: src/passwd.c:472 #, c-format msgid "%s: out of memory\n" msgstr "%s嚗閮園銝頞許n" -#: src/passwd.c:730 +#: src/passwd.c:701 #, c-format msgid "%s: Cannot execute %s" msgstr "%s嚗⊥瑁 %s" -#: src/passwd.c:815 +#: src/passwd.c:786 #, c-format msgid "%s: repository %s not supported\n" msgstr "%s嚗銝舀 %s 憟隞嗅摨怒\n" -#: src/passwd.c:914 +#: src/passwd.c:884 #, fuzzy, c-format -msgid "You may not change the password for %s.\n" +msgid "%s: You may not view or modify password information for %s.\n" msgstr "其賜 %s 湔 shell\n" -#: src/passwd.c:962 +#: src/passwd.c:934 #, c-format msgid "Changing password for %s\n" msgstr "甇函 %s 靽格孵蝣墦n" -#: src/passwd.c:966 +#: src/passwd.c:938 #, c-format msgid "The password for %s is unchanged.\n" msgstr "%s 撖蝣潭芾◤寡\n" -#: src/passwd.c:1016 +#: src/passwd.c:987 #, c-format msgid "Password changed.\n" msgstr "撖蝣澆歇湔嫘\n" @@ -1480,49 +1413,49 @@ msgstr "冽嚗%s [-q] [-r] [-s] [passwd [shadow]]\n" msgid "Usage: %s [-q] [-r] [-s] [passwd]\n" msgstr "冽嚗%s [-q] [-r] [-s] [passwd]\n" -#: src/pwck.c:295 +#: src/pwck.c:292 #, c-format msgid "invalid password file entry\n" msgstr "⊥撖蝣潭獢娉n" -#: src/pwck.c:357 +#: src/pwck.c:354 msgid "duplicate password entry\n" msgstr "敺拍撖蝣潮娉n" -#: src/pwck.c:373 +#: src/pwck.c:370 #, c-format msgid "invalid user name '%s'\n" msgstr "⊥雿輻刻蝔晦%s\n" -#: src/pwck.c:388 +#: src/pwck.c:384 #, c-format msgid "user %s: no group %u\n" msgstr "雿輻刻 %s嚗 %u 蝢斤\n" -#: src/pwck.c:404 +#: src/pwck.c:400 #, c-format msgid "user %s: directory %s does not exist\n" msgstr "雿輻刻 %s嚗桅 %s 銝摮沔n" -#: src/pwck.c:420 +#: src/pwck.c:416 #, c-format msgid "user %s: program %s does not exist\n" msgstr "雿輻刻 %s嚗蝔撘 %s 銝摮沔n" -#: src/pwck.c:456 +#: src/pwck.c:452 #, c-format msgid "invalid shadow password file entry\n" msgstr "⊥shadow撖蝣潭獢娉n" -#: src/pwck.c:518 +#: src/pwck.c:514 msgid "duplicate shadow password entry\n" msgstr "敺拍shadow撖蝣潮娉n" -#: src/pwck.c:542 +#: src/pwck.c:538 msgid "no matching password file entry\n" msgstr "∪寥撖蝣潭獢娉n" -#: src/pwck.c:560 +#: src/pwck.c:556 #, c-format msgid "user %s: last password change in the future\n" msgstr "雿輻刻 %s嚗餈銝甈∪蝣潭游\n" @@ -1542,17 +1475,17 @@ msgstr "%s嚗⊥撖蝣潭獢\n" msgid "%s: can't remove shadow entry for %s\n" msgstr "%s嚗⊥ %s 芷山hadow娉n" -#: src/pwconv.c:164 +#: src/pwconv.c:163 #, c-format msgid "%s: can't update passwd entry for %s\n" msgstr "%s嚗⊥ %s 湔啣蝣潮娉n" -#: src/pwconv.c:171 +#: src/pwconv.c:170 #, c-format msgid "%s: can't update shadow file\n" msgstr "%s嚗⊥湔酒hadow瑼獢\n" -#: src/pwconv.c:176 +#: src/pwconv.c:174 #, c-format msgid "%s: can't update passwd file\n" msgstr "%s嚗⊥湔啣蝣潭獢\n" @@ -1562,40 +1495,40 @@ msgstr "%s嚗⊥湔啣蝣潭獢\n" msgid "%s: can't update entry for user %s\n" msgstr "%s嚗銝賣湔唬蝙刻 %s 娉n" -#: src/pwunconv.c:145 +#: src/pwunconv.c:143 #, c-format msgid "%s: can't delete shadow password file\n" msgstr "%s嚗⊥芷山hadow撖蝣潭獢\n" -#: src/su.c:133 +#: src/su.c:132 msgid "Sorry." msgstr "望" -#: src/su.c:323 +#: src/su.c:320 #, c-format msgid "%s: must be run from a terminal\n" msgstr "%s嚗敹敺蝯蝡臭葉瑁\n" -#: src/su.c:423 +#: src/su.c:419 #, c-format msgid "%s: pam_start: error %d\n" msgstr "%s嚗pam_start嚗航炊 %d\n" -#: src/su.c:453 +#: src/su.c:447 #, c-format msgid "Unknown id: %s\n" msgstr "芰 id嚗%s\n" -#: src/su.c:490 src/su.c:507 +#: src/su.c:484 src/su.c:500 #, c-format msgid "You are not authorized to su %s\n" msgstr "冽鋡急甈 su %s\n" -#: src/su.c:502 +#: src/su.c:495 msgid "(Enter your own password.)" msgstr "(隢頛詨交刻芸楛撖蝣)" -#: src/su.c:536 +#: src/su.c:527 #, c-format msgid "" "%s: %s\n" @@ -1604,22 +1537,22 @@ msgstr "" "%s嚗%s\n" "(敹賜)\n" -#: src/su.c:754 +#: src/su.c:741 #, c-format msgid "No shell\n" msgstr "瘝 shell\n" -#: src/suauth.c:105 +#: src/suauth.c:104 #, c-format msgid "Access to su to that account DENIED.\n" msgstr "su 啗府撣單嗉◤\n" -#: src/suauth.c:113 +#: src/suauth.c:112 #, c-format msgid "Password authentication bypassed.\n" msgstr "敹賜亙蝣潸閮墦n" -#: src/suauth.c:122 +#: src/suauth.c:121 #, c-format msgid "Please enter your OWN password as authentication.\n" msgstr "隢頛詨交刻芸楛撖蝣潔粹閮潦\n" @@ -1634,7 +1567,7 @@ msgstr "瘝撖蝣潭獢\n" msgid "No password entry for 'root'\n" msgstr "瘝root撖蝣潮娉n" -#: src/sulogin.c:176 +#: src/sulogin.c:175 msgid "" "\n" "Type control-d to proceed with normal startup,\n" @@ -1644,438 +1577,383 @@ msgstr "" "銝 control-d 喳舐匱蝥雿輻冽桅撣單嗥啣嚗\n" "(頛詨 root 撖蝣潔誑脰蝟餌絞蝬剛風)嚗" -#: src/sulogin.c:212 +#: src/sulogin.c:210 msgid "Entering System Maintenance Mode\n" msgstr "甇券脣亦頂蝯梁雁霅瑟芋撘\n" -#: src/useradd.c:239 -#, c-format -msgid "%s: rebuild the group database\n" -msgstr "%s嚗撱箇黎蝯亥摨俞n" - -#: src/useradd.c:248 -#, c-format -msgid "%s: rebuild the shadow group database\n" -msgstr "%s嚗撱漳hadow蝢斤鞈摨俞n" - -#: src/useradd.c:283 src/useradd.c:297 src/usermod.c:741 src/usermod.c:755 +#: src/useradd.c:230 src/useradd.c:243 src/usermod.c:682 src/usermod.c:695 #, c-format msgid "%s: invalid numeric argument `%s'\n" msgstr "%s嚗⊥詨詹%s\n" -#: src/useradd.c:354 +#: src/useradd.c:298 #, c-format msgid "%s: unknown gid %s\n" msgstr "%s嚗芰亦 gid %s\n" -#: src/useradd.c:362 src/useradd.c:659 src/useradd.c:1153 src/usermod.c:244 -#: src/usermod.c:876 +#: src/useradd.c:306 src/useradd.c:598 src/useradd.c:1055 src/usermod.c:227 +#: src/usermod.c:814 #, c-format msgid "%s: unknown group %s\n" msgstr "%s嚗芰亦蝢斤 %s\n" -#: src/useradd.c:475 +#: src/useradd.c:418 #, c-format msgid "%s: cannot create new defaults file\n" msgstr "%s嚗⊥撱箇啁閮剜獢\n" -#: src/useradd.c:480 +#: src/useradd.c:423 #, c-format msgid "%s: cannot open new defaults file\n" msgstr "%s嚗⊥啁閮剜獢\n" -#: src/useradd.c:574 src/useradd.c:586 +#: src/useradd.c:515 src/useradd.c:526 #, c-format msgid "%s: rename: %s" msgstr "%s嚗游嚗%s" -#: src/useradd.c:680 src/usermod.c:265 +#: src/useradd.c:619 src/usermod.c:248 #, c-format msgid "%s: group `%s' is a NIS group.\n" msgstr "%s嚗%s蝢斤臭 NIS 蝢斤\n" -#: src/useradd.c:689 src/usermod.c:274 +#: src/useradd.c:628 src/usermod.c:257 #, c-format msgid "%s: too many groups specified (max %d).\n" msgstr "%s嚗摰鈭憭蝢斤(憭 %d)\n" -#: src/useradd.c:721 +#: src/useradd.c:660 #, fuzzy, c-format msgid "Usage: useradd [-u uid [-o]] [-g group] [-G group,...] \n" msgstr "冽嚗%s\t[-u uid [-o]] [-g 蝢斤] [-G 蝢斤,...] \n" -#: src/useradd.c:724 +#: src/useradd.c:663 #, fuzzy, c-format msgid " [-d home] [-s shell] [-c comment] [-m [-k template]]\n" msgstr "\t\t[-d 銝餌桅] [-s shell] [-c 瘜券] [-m [-k 璅⊥瓢]\n" -#: src/useradd.c:726 src/useradd.c:732 +#: src/useradd.c:665 src/useradd.c:671 #, fuzzy, c-format msgid " [-f inactive] [-e expire]\n" msgstr "\t\t[-f ⊥包 [-e ]\n" -#: src/useradd.c:728 +#: src/useradd.c:667 #, fuzzy, c-format msgid " [-p passwd] name\n" msgstr "[-p 撖蝣奭 蝔崤n" -#: src/useradd.c:730 +#: src/useradd.c:669 #, fuzzy, c-format msgid " useradd -D [-g group] [-b base] [-s shell]\n" msgstr " %s\t-D [-g 蝢斤] [-b 銝餌桅] [-s shell]\n" -#: src/useradd.c:817 src/usermod.c:461 +#: src/useradd.c:756 src/usermod.c:444 #, c-format msgid "%s: error locking group file\n" msgstr "%s嚗摰蝢斤瑼獢粹珮n" -#: src/useradd.c:822 src/usermod.c:467 +#: src/useradd.c:760 src/usermod.c:449 #, c-format msgid "%s: error opening group file\n" msgstr "%s嚗蝢斤瑼獢粹珮n" -#: src/useradd.c:829 src/usermod.c:578 +#: src/useradd.c:766 src/usermod.c:542 #, c-format msgid "%s: error locking shadow group file\n" msgstr "%s嚗摰shadow蝢斤瑼獢粹珮n" -#: src/useradd.c:834 src/usermod.c:584 +#: src/useradd.c:771 src/usermod.c:548 #, c-format msgid "%s: error opening shadow group file\n" msgstr "%s嚗shadow蝢斤瑼獢粹珮n" -#: src/useradd.c:1006 +#: src/useradd.c:909 #, c-format msgid "%s: uid %u is not unique\n" msgstr "%s嚗uid %u 銝臭\n" -#: src/useradd.c:1036 +#: src/useradd.c:939 #, c-format msgid "%s: can't get unique uid\n" msgstr "%s嚗⊥脣臭 uid\n" -#: src/useradd.c:1073 +#: src/useradd.c:975 #, c-format msgid "%s: invalid base directory `%s'\n" msgstr "%s嚗⊥銝餌桅%s\n" -#: src/useradd.c:1083 +#: src/useradd.c:985 #, c-format msgid "%s: invalid comment `%s'\n" msgstr "%s嚗⊥瘜券%s\n" -#: src/useradd.c:1094 +#: src/useradd.c:996 #, c-format msgid "%s: invalid home directory `%s'\n" msgstr "%s嚗⊥銝餌桅%s\n" -#: src/useradd.c:1113 src/usermod.c:858 +#: src/useradd.c:1015 src/usermod.c:796 #, c-format msgid "%s: invalid date `%s'\n" msgstr "%s嚗⊥交%s\n" -#: src/useradd.c:1126 +#: src/useradd.c:1028 #, c-format msgid "%s: shadow passwords required for -e\n" msgstr "%s嚗-e 賊閬shadow撖蝣墦n" -#: src/useradd.c:1142 +#: src/useradd.c:1044 #, c-format msgid "%s: shadow passwords required for -f\n" msgstr "%s嚗-f 賊閬shadow撖蝣墦n" -#: src/useradd.c:1209 src/usermod.c:834 src/usermod.c:844 src/usermod.c:891 -#: src/usermod.c:935 +#: src/useradd.c:1111 src/usermod.c:772 src/usermod.c:782 src/usermod.c:829 +#: src/usermod.c:873 #, c-format msgid "%s: invalid field `%s'\n" msgstr "%s嚗⊥摮畾 %s\n" -#: src/useradd.c:1220 +#: src/useradd.c:1122 #, c-format msgid "%s: invalid shell `%s'\n" msgstr "%s嚗⊥ shell%s\n" -#: src/useradd.c:1261 +#: src/useradd.c:1163 #, c-format msgid "%s: invalid user name '%s'\n" msgstr "%s嚗⊥雿輻刻蝔晦%s\n" -#: src/useradd.c:1297 src/userdel.c:293 src/usermod.c:1003 +#: src/useradd.c:1199 src/userdel.c:238 src/usermod.c:940 #, c-format msgid "%s: cannot rewrite password file\n" msgstr "%s嚗⊥撖怠蝣潭獢\n" -#: src/useradd.c:1304 src/userdel.c:298 src/usermod.c:1010 +#: src/useradd.c:1205 src/userdel.c:242 src/usermod.c:946 #, c-format msgid "%s: cannot rewrite shadow password file\n" msgstr "%s嚗⊥撖哀hadow撖蝣潭獢\n" -#: src/useradd.c:1345 src/userdel.c:350 src/usermod.c:1044 +#: src/useradd.c:1244 src/userdel.c:291 src/usermod.c:979 #, c-format msgid "%s: unable to lock password file\n" msgstr "%s嚗⊥摰撖蝣潭獢\n" -#: src/useradd.c:1350 src/userdel.c:355 src/usermod.c:1049 +#: src/useradd.c:1248 src/userdel.c:295 src/usermod.c:983 #, c-format msgid "%s: unable to open password file\n" msgstr "%s嚗⊥撖蝣潭獢\n" -#: src/useradd.c:1358 src/userdel.c:362 src/usermod.c:1056 +#: src/useradd.c:1255 src/userdel.c:301 src/usermod.c:989 #, c-format msgid "%s: cannot lock shadow password file\n" msgstr "%s嚗⊥摰shadow撖蝣潭獢\n" -#: src/useradd.c:1365 src/userdel.c:368 src/usermod.c:1062 +#: src/useradd.c:1261 src/userdel.c:306 src/usermod.c:994 #, c-format msgid "%s: cannot open shadow password file\n" msgstr "%s嚗⊥shadow撖蝣潭獢\n" -#: src/useradd.c:1459 +#: src/useradd.c:1354 #, c-format msgid "%s: error adding new password entry\n" msgstr "%s嚗交啣蝣潮格粹珮n" -#: src/useradd.c:1473 -#, c-format -msgid "%s: error updating password dbm entry\n" -msgstr "%s嚗湔啣蝣 dbm 格粹珮n" - -#: src/useradd.c:1489 src/usermod.c:1151 +#: src/useradd.c:1365 src/usermod.c:1063 #, c-format msgid "%s: error adding new shadow password entry\n" msgstr "%s嚗交酒hadow撖蝣潮粹珮n" -#: src/useradd.c:1505 src/usermod.c:1168 -#, c-format -msgid "%s: error updating shadow passwd dbm entry\n" -msgstr "%s嚗湔酒hadow撖蝣 dbm 格粹珮n" - -#: src/useradd.c:1537 +#: src/useradd.c:1393 #, c-format msgid "%s: cannot create directory %s\n" msgstr "%s嚗⊥撱箇桅 %s\n" -#: src/useradd.c:1567 +#: src/useradd.c:1423 #, c-format msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n" msgstr "" -#: src/useradd.c:1590 +#: src/useradd.c:1446 #, fuzzy, c-format msgid "Can't create mail spool for user %s.\n" msgstr "%s嚗銝賣湔唬蝙刻 %s 娉n" -#: src/useradd.c:1714 src/usermod.c:981 +#: src/useradd.c:1550 src/usermod.c:919 #, c-format msgid "%s: user %s exists\n" msgstr "%s嚗雿輻刻 %s 撌脣沔n" -#: src/useradd.c:1729 +#: src/useradd.c:1564 #, 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:1767 +#: src/useradd.c:1602 #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" msgstr "%s嚗霅血嚗CREATE_HOME 銝舀湛隢雿輻 -m 詻\n" -#: src/userdel.c:124 +#: src/userdel.c:108 #, fuzzy, c-format msgid "Usage: %s [-r] name\n" msgstr "冽嚗%s [-r] 蝔崤n" -#: src/userdel.c:176 src/userdel.c:262 +#: src/userdel.c:160 src/userdel.c:221 #, c-format msgid "%s: error updating group entry\n" msgstr "%s嚗湔啁黎蝯格粹珮n" -#: src/userdel.c:186 src/userdel.c:271 -#, c-format -msgid "%s: cannot update dbm group entry\n" -msgstr "%s嚗⊥湔 dbm 蝢斤娉n" - -#: src/userdel.c:214 -#, c-format -msgid "%s: cannot remove dbm group entry\n" -msgstr "%s嚗⊥蝘駁 dbm 蝢斤娉n" - -#: src/userdel.c:379 +#: src/userdel.c:315 #, c-format msgid "%s: cannot open group file\n" msgstr "%s嚗⊥蝢斤瑼獢\n" -#: src/userdel.c:390 +#: src/userdel.c:325 #, c-format msgid "%s: cannot open shadow group file\n" msgstr "%s嚗⊥shadow蝢斤瑼獢\n" -#: src/userdel.c:408 +#: src/userdel.c:343 #, c-format msgid "%s: error deleting password entry\n" msgstr "%s嚗芷文蝣潮格粹珮n" -#: src/userdel.c:412 +#: src/userdel.c:347 #, c-format msgid "%s: error deleting shadow password entry\n" msgstr "%s嚗芷山hadow撖蝣潮格粹珮n" -#: src/userdel.c:421 -#, c-format -msgid "%s: error deleting password dbm entry\n" -msgstr "%s嚗芷文蝣 dbm 格粹珮n" - -#: src/userdel.c:440 -#, c-format -msgid "%s: error deleting shadow passwd dbm entry\n" -msgstr "%s嚗芷山hadow撖蝣 dbm 格粹珮n" - -#: src/userdel.c:484 +#: src/userdel.c:388 #, c-format msgid "%s: user %s is currently logged in\n" msgstr "%s嚗雿輻刻 %s 桀撌脩餃功n" -#: src/userdel.c:594 src/userdel.c:759 +#: src/userdel.c:496 src/userdel.c:641 #, c-format msgid "%s: %s not owned by %s, not removing\n" msgstr "%s嚗%s 銝虫撅祆 %s嚗隞乩芷么n" -#: src/userdel.c:600 +#: src/userdel.c:502 #, c-format msgid "%s: warning: can't remove " msgstr "%s嚗霅血嚗⊥芷" -#: src/userdel.c:706 src/usermod.c:783 +#: src/userdel.c:592 src/usermod.c:722 #, c-format msgid "%s: user %s does not exist\n" msgstr "%s嚗雿輻刻 %s 銝摮沔n" -#: src/userdel.c:721 src/usermod.c:799 +#: src/userdel.c:607 src/usermod.c:738 #, c-format msgid "%s: user %s is a NIS user\n" msgstr "%s嚗雿輻刻 %s NIS 雿輻刻\n" -#: src/userdel.c:782 +#: src/userdel.c:664 #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "%s嚗銝賢芷斤桅 %s (粹撠芷支蝙刻 %s 銝餌桅)\n" -#: src/userdel.c:796 +#: src/userdel.c:678 #, c-format msgid "%s: error removing directory %s\n" msgstr "%s嚗芷斤桅 %s 粹珮n" -#: src/usermod.c:306 +#: src/usermod.c:289 #, fuzzy, c-format msgid "Usage: %s\t[-u uid [-o]] [-g group] [-G group,...] \n" msgstr "冽嚗%s\t[-u uid [-o]] [-g 蝢斤] [-G 蝢斤,...] \n" -#: src/usermod.c:310 +#: src/usermod.c:293 #, 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:313 +#: src/usermod.c:296 #, fuzzy, c-format msgid "[-f inactive] [-e expire] " msgstr "[-f ⊥包 [-e ] " -#: src/usermod.c:315 +#: src/usermod.c:298 #, c-format msgid "[-p passwd] [-L|-U] name\n" msgstr "[-p 撖蝣奭 [-L|-U] 蝔崤n" -#: src/usermod.c:495 +#: src/usermod.c:476 #, c-format msgid "%s: out of memory in update_group\n" msgstr "%s嚗update_group 閮園銝頞許n" -#: src/usermod.c:622 +#: src/usermod.c:585 #, c-format msgid "%s: out of memory in update_gshadow\n" msgstr "%s嚗update_gshadow 閮園銝頞許n" -#: src/usermod.c:958 +#: src/usermod.c:896 #, c-format msgid "%s: no flags given\n" msgstr "%s嚗瘝摰璅隤\n" -#: src/usermod.c:965 +#: src/usermod.c:903 #, c-format msgid "%s: shadow passwords required for -e and -f\n" msgstr "%s嚗-e -f 賊閬shadow撖蝣墦n" -#: src/usermod.c:987 +#: src/usermod.c:924 #, c-format msgid "%s: uid %lu is not unique\n" msgstr "%s嚗uid %lu 銝臭\n" -#: src/usermod.c:1116 +#: src/usermod.c:1047 #, c-format msgid "%s: error changing password entry\n" msgstr "%s嚗寡撖蝣潮格粹珮n" -#: src/usermod.c:1122 +#: src/usermod.c:1053 #, c-format msgid "%s: error removing password entry\n" msgstr "%s嚗蝘駁文蝣潮粹珮n" -#: src/usermod.c:1131 -#, c-format -msgid "%s: error adding password dbm entry\n" -msgstr "%s嚗瘛餃撖蝣 dbm 格粹珮n" - -#: src/usermod.c:1139 -#, c-format -msgid "%s: error removing passwd dbm entry\n" -msgstr "%s嚗蝘駁文蝣 dbm 格粹珮n" - -#: src/usermod.c:1158 +#: src/usermod.c:1070 #, c-format msgid "%s: error removing shadow password entry\n" msgstr "%s嚗芷山hadow撖蝣潮格粹珮n" -#: src/usermod.c:1175 -#, c-format -msgid "%s: error removing shadow passwd dbm entry\n" -msgstr "%s嚗芷山hadow撖蝣 dbm 格粹珮n" - -#: src/usermod.c:1204 +#: src/usermod.c:1098 #, c-format msgid "%s: directory %s exists\n" msgstr "%s嚗桅 %s 銝摮沔n" -#: src/usermod.c:1213 +#: src/usermod.c:1106 #, c-format msgid "%s: can't create %s\n" msgstr "%s嚗⊥撱箇 %s\n" -#: src/usermod.c:1219 +#: src/usermod.c:1111 #, c-format msgid "%s: can't chown %s\n" msgstr "%s嚗⊥寡 %s 蝢斤\n" -#: src/usermod.c:1236 +#: src/usermod.c:1128 #, c-format msgid "%s: cannot rename directory %s to %s\n" msgstr "%s嚗⊥撠桅 %s 孵 %s\n" -#: src/usermod.c:1333 +#: src/usermod.c:1223 #, c-format msgid "%s: warning: %s not owned by %s\n" msgstr "%s嚗霅血嚗%s 銝撅祆 %s\n" -#: src/usermod.c:1339 +#: src/usermod.c:1229 msgid "failed to change mailbox owner" msgstr "寡靽∠拳憭望" -#: src/usermod.c:1347 +#: src/usermod.c:1237 msgid "failed to rename mailbox" msgstr "⊥箔縑蝞望孵" -#: src/vipw.c:105 +#: src/vipw.c:104 #, c-format msgid "" "\n" @@ -2084,20 +1962,20 @@ msgstr "" "\n" "%s嚗%s 瘝湔鈾n" -#: src/vipw.c:133 +#: src/vipw.c:131 msgid "Couldn't lock file" msgstr "⊥摰瑼獢" -#: src/vipw.c:142 +#: src/vipw.c:140 msgid "Couldn't make backup" msgstr "⊥隞" -#: src/vipw.c:200 +#: src/vipw.c:196 #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s嚗⊥敺拙 %s嚗%s (函靽格孵 %s 銝)\n" -#: src/vipw.c:238 +#: src/vipw.c:234 #, c-format msgid "" "Usage:\n" diff --git a/src/.indent.pro b/src/.indent.pro index 149066b8..fe572bb7 100644 --- a/src/.indent.pro +++ b/src/.indent.pro @@ -2,3 +2,4 @@ -i8 -bad -pcs +-l80 diff --git a/src/Makefile.am b/src/Makefile.am index 4eb6a4ea..f9d39d7b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -40,6 +40,10 @@ usbin_PROGRAMS = \ usermod \ vipw +login_SOURCES = \ + login.c \ + login_nopam.c + noinst_PROGRAMS = id sulogin # id and groups are from gnu, sulogin from sysvinit @@ -66,6 +70,8 @@ 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 169a34a6..09ef76e7 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.4 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -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.c logoutd.c mkpasswd.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.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 mkpasswd.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@ @@ -134,8 +134,8 @@ lastlog_OBJECTS = lastlog.$(OBJEXT) lastlog_LDADD = $(LDADD) lastlog_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.a \ $(top_builddir)/lib/libshadow.la -login_SOURCES = login.c -login_OBJECTS = login.$(OBJEXT) +am_login_OBJECTS = login.$(OBJEXT) login_nopam.$(OBJEXT) +login_OBJECTS = $(am_login_OBJECTS) login_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) logoutd_SOURCES = logoutd.c logoutd_OBJECTS = logoutd.$(OBJEXT) @@ -209,16 +209,16 @@ 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 \ gpasswd.c groupadd.c groupdel.c groupmod.c groups.c grpck.c \ - grpconv.c grpunconv.c id.c lastlog.c login.c logoutd.c \ - mkpasswd.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 + grpconv.c grpunconv.c id.c lastlog.c $(login_SOURCES) \ + logoutd.c mkpasswd.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.c logoutd.c \ - mkpasswd.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 + grpconv.c grpunconv.c id.c lastlog.c $(login_SOURCES) \ + logoutd.c mkpasswd.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 ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -257,17 +257,16 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LDFLAGS = @LDFLAGS@ 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@ @@ -348,6 +347,10 @@ 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 @@ -370,6 +373,7 @@ 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: @@ -383,9 +387,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile + $(AUTOMAKE) --foreign src/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -611,6 +615,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lastlog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/login.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/login_nopam.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logoutd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkpasswd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newgrp.Po@am__quote@ diff --git a/src/chage.c b/src/chage.c index 1cf1288b..f5736c80 100644 --- a/src/chage.c +++ b/src/chage.c @@ -30,21 +30,28 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: chage.c,v 1.35 2005/01/17 23:12:04 kloczek Exp $") +RCSID (PKG_VER "$Id: chage.c,v 1.43 2005/04/17 00:07:00 kloczek Exp $") #include -#include +#include #include #include -#include +#include +#include #include -#include "prototypes.h" -#include "defines.h" #ifdef SHADOWPWD #ifdef USE_PAM #include #include #endif /* USE_PAM */ #include +#ifdef WITH_SELINUX +#include +#include +#endif +#include "prototypes.h" +#include "defines.h" +#include "pwio.h" +#include "shadowio.h" /* * Global variables */ @@ -52,12 +59,12 @@ static char *Prog; static int dflg = 0, /* set last password change date */ - Eflg = 0, /* set account expiration date */ - Iflg = 0, /* set password inactive after expiration */ - lflg = 0, /* show account aging information */ - mflg = 0, /* set minimum number of days before password change */ - Mflg = 0, /* set maximim number of days before password change */ - Wflg = 0; /* set expiration warning days */ + Eflg = 0, /* set account expiration date */ + Iflg = 0, /* set password inactive after expiration */ + lflg = 0, /* show account aging information */ + mflg = 0, /* set minimum number of days before password change */ + Mflg = 0, /* set maximim number of days before password change */ + Wflg = 0; /* set expiration warning days */ static int locks; @@ -68,24 +75,11 @@ static long warndays; static long inactdays; static long expdays; -/* - * External identifiers - */ - -extern long a64l (); -extern char *l64a (); - -#include "pwio.h" - -#include "shadowio.h" - -#ifdef NDBM -extern int pw_dbm_mode; -extern int sp_dbm_mode; -#endif - #define EPOCH "1969-12-31" +#define E_SUCCESS 0 /* success */ +#define E_NOPERM 1 /* permission denied */ + /* local function prototypes */ static void usage (void); static void date_to_str (char *, size_t, time_t); @@ -149,7 +143,7 @@ static int new_fields (void) char *cp; printf (_("Enter the new value, or press ENTER for the default\n")); - printf("\n"); + printf ("\n"); snprintf (buf, sizeof buf, "%ld", mindays); change_field (buf, sizeof buf, _("Minimum Password Age")); @@ -165,8 +159,7 @@ static int new_fields (void) date_to_str (buf, sizeof buf, lastday * SCALE); - change_field (buf, sizeof buf, - _("Last Password Change (YYYY-MM-DD)")); + change_field (buf, sizeof buf, _("Last Password Change (YYYY-MM-DD)")); if (strcmp (buf, EPOCH) == 0) lastday = -1; @@ -294,9 +287,12 @@ static void list_fields (void) * password expires that the account becomes unusable. */ - printf (_("Minimum number of days between password change\t\t: %ld\n"), mindays); - printf (_("Maximum number of days between password change\t\t: %ld\n"), maxdays); - printf (_("Number of days of warning before password expires\t: %ld\n"), warndays); + printf (_("Minimum number of days between password change\t\t: %ld\n"), + mindays); + printf (_("Maximum number of days between password change\t\t: %ld\n"), + maxdays); + printf (_("Number of days of warning before password expires\t: %ld\n"), + warndays); } #ifdef USE_PAM @@ -368,29 +364,20 @@ int main (int argc, char **argv) textdomain (PACKAGE); ruid = getuid (); +#ifdef WITH_SELINUX + amroot = (ruid == 0 && checkPasswdAccess (PASSWD__ROOTOK) == 0); +#else amroot = (ruid == 0); +#endif /* * Get the program name so that error messages can use it. */ - Prog = Basename (argv[0]); - OPENLOG ("chage"); - -#ifdef NDBM - sp_dbm_mode = O_RDWR; - pw_dbm_mode = O_RDWR; -#endif - /* - * Parse the flags. The difference between password file formats - * includes the number of fields, and whether the dates are entered - * as days or weeks. Shadow password file info =must= be entered in - * days, while regular password file info =must= be entered in - * weeks. + * Parse the command line options. */ - while ((flag = getopt (argc, argv, "lm:M:W:I:E:d:")) != EOF) { switch (flag) { case 'l': @@ -443,7 +430,6 @@ int main (int argc, char **argv) fprintf (stderr, _("%s: do not include \"l\" with other flags\n"), Prog); - closelog (); usage (); } @@ -455,9 +441,11 @@ int main (int argc, char **argv) if (!amroot && !lflg) { fprintf (stderr, _("%s: permission denied.\n"), Prog); - closelog (); - exit (1); + exit (E_NOPERM); } + + OPENLOG ("chage"); + #ifdef USE_PAM retval = PAM_SUCCESS; @@ -485,12 +473,9 @@ int main (int argc, char **argv) } if (retval != PAM_SUCCESS) { - fprintf (stderr, _("%s: PAM authentication failed\n"), - Prog); - exit (1); + fprintf (stderr, _("%s: PAM authentication failed\n"), Prog); + exit (E_NOPERM); } - - OPENLOG ("chage"); #endif /* USE_PAM */ /* @@ -506,19 +491,18 @@ int main (int argc, char **argv) */ pwrw = 0; if (!pw_open (pwrw ? O_RDWR : O_RDONLY)) { - fprintf (stderr, _("%s: can't open password file\n"), - Prog); + fprintf (stderr, _("%s: can't open password file\n"), Prog); cleanup (1); SYSLOG ((LOG_ERR, "failed opening %s", PASSWD_FILE)); closelog (); - exit (1); + exit (E_NOPERM); } if (!(pw = pw_locate (argv[optind]))) { fprintf (stderr, _("%s: unknown user %s\n"), Prog, argv[optind]); cleanup (1); closelog (); - exit (1); + exit (E_NOPERM); } pwent = *pw; @@ -536,7 +520,7 @@ int main (int argc, char **argv) cleanup (1); SYSLOG ((LOG_ERR, "failed locking %s", SHADOW_FILE)); closelog (); - exit (1); + exit (E_NOPERM); } if (!spw_open (locks ? O_RDWR : O_RDONLY)) { fprintf (stderr, @@ -544,13 +528,13 @@ int main (int argc, char **argv) cleanup (2); SYSLOG ((LOG_ERR, "failed opening %s", SHADOW_FILE)); closelog (); - exit (1); + exit (E_NOPERM); } if (lflg && (setgid (getgid ()) || setuid (ruid))) { fprintf (stderr, "%s: failed to drop privileges (%s)\n", Prog, strerror (errno)); - exit (1); + exit (E_NOPERM); } sp = spw_locate (argv[optind]); @@ -584,15 +568,14 @@ int main (int argc, char **argv) if (lflg) { if (!amroot && (ruid != pwent.pw_uid)) { - fprintf (stderr, _("%s: permission denied.\n"), - Prog); + fprintf (stderr, _("%s: permission denied.\n"), Prog); closelog (); - exit (1); + exit (E_NOPERM); } list_fields (); cleanup (2); closelog (); - exit (0); + exit (E_SUCCESS); } /* @@ -601,14 +584,13 @@ int main (int argc, char **argv) */ if (!mflg && !Mflg && !dflg && !Wflg && !Iflg && !Eflg) { - printf (_("Changing the aging information for %s\n"), - name); + printf (_("Changing the aging information for %s\n"), name); if (!new_fields ()) { fprintf (stderr, _("%s: error changing fields\n"), Prog); cleanup (2); closelog (); - exit (1); + exit (E_NOPERM); } } /* @@ -628,18 +610,12 @@ int main (int argc, char **argv) pwent.pw_passwd = SHADOW_PASSWD_STRING; /* XXX warning: const */ if (!pw_update (&pwent)) { fprintf (stderr, - _("%s: can't update password file\n"), - Prog); + _("%s: can't update password file\n"), Prog); cleanup (2); - SYSLOG ((LOG_ERR, "failed updating %s", - PASSWD_FILE)); + SYSLOG ((LOG_ERR, "failed updating %s", PASSWD_FILE)); closelog (); - exit (1); + exit (E_NOPERM); } -#ifdef NDBM - (void) pw_dbm_update (&pwent); - endpwent (); -#endif } /* @@ -657,79 +633,56 @@ int main (int argc, char **argv) if (!spw_update (&spwd)) { fprintf (stderr, - _("%s: can't update shadow password file\n"), - Prog); + _("%s: can't update shadow password file\n"), Prog); cleanup (2); SYSLOG ((LOG_ERR, "failed updating %s", SHADOW_FILE)); closelog (); - exit (1); + exit (E_NOPERM); } -#ifdef NDBM - - /* - * See if the shadow DBM file exists and try to update it. - */ - - if (sp_dbm_present () && !sp_dbm_update (&spwd)) { - fprintf (stderr, - _("Error updating the DBM password entry.\n")); - cleanup (2); - SYSLOG ((LOG_ERR, "error updating DBM passwd entry")); - closelog (); - exit (1); - } - endspent (); - -#endif /* NDBM */ /* * Now close the shadow password file, which will cause all of the * entries to be re-written. */ - if (!spw_close ()) { fprintf (stderr, - _("%s: can't rewrite shadow password file\n"), - Prog); + _("%s: can't rewrite shadow password file\n"), Prog); cleanup (2); SYSLOG ((LOG_ERR, "failed rewriting %s", SHADOW_FILE)); closelog (); - exit (1); + exit (E_NOPERM); } - #ifdef USE_PAM retval = PAM_SUCCESS; - pampw = getpwuid(getuid()); + pampw = getpwuid (getuid ()); if (pampw == NULL) { retval = PAM_USER_UNKNOWN; } if (retval == PAM_SUCCESS) { - retval = pam_start("chage", pampw->pw_name, &conv, &pamh); + retval = pam_start ("chage", pampw->pw_name, &conv, &pamh); } if (retval == PAM_SUCCESS) { - retval = pam_authenticate(pamh, 0); + retval = pam_authenticate (pamh, 0); if (retval != PAM_SUCCESS) { - pam_end(pamh, retval); + pam_end (pamh, retval); } } if (retval == PAM_SUCCESS) { - retval = pam_acct_mgmt(pamh, 0); + retval = pam_acct_mgmt (pamh, 0); if (retval != PAM_SUCCESS) { - pam_end(pamh, retval); + pam_end (pamh, retval); } } if (retval != PAM_SUCCESS) { fprintf (stderr, _("%s: PAM authentication failed\n"), Prog); - exit (1); + exit (E_NOPERM); } - - OPENLOG("chage"); -#endif /* USE_PAM */ +#endif /* USE_PAM */ /* * Close the password file. If any entries were modified, the file @@ -737,12 +690,11 @@ int main (int argc, char **argv) */ if (!pw_close ()) { - fprintf (stderr, _("%s: can't rewrite password file\n"), - Prog); + fprintf (stderr, _("%s: can't rewrite password file\n"), Prog); cleanup (2); SYSLOG ((LOG_ERR, "failed rewriting %s", PASSWD_FILE)); closelog (); - exit (1); + exit (E_NOPERM); } cleanup (2); SYSLOG ((LOG_INFO, "changed password expiry for %s", name)); @@ -757,9 +709,8 @@ int main (int argc, char **argv) } if (retval != PAM_SUCCESS) { - fprintf (stderr, _("%s: PAM chauthtok failed\n"), - Prog); - exit (1); + fprintf (stderr, _("%s: PAM chauthtok failed\n"), Prog); + exit (E_NOPERM); } } @@ -769,9 +720,7 @@ int main (int argc, char **argv) #endif /* USE_PAM */ closelog (); - - - exit (0); + exit (E_SUCCESS); /* NOTREACHED */ } @@ -779,8 +728,7 @@ int main (int argc, char **argv) int main (int argc, char **argv) { fprintf (stderr, - "%s: not configured for shadow password support.\n", - argv[0]); - exit (1); + "%s: not configured for shadow password support.\n", argv[0]); + exit (E_NOPERM); } #endif /* !SHADOWPWD */ diff --git a/src/chfn.c b/src/chfn.c index bf437d93..43399266 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.23 2005/01/17 23:12:04 kloczek Exp $") +RCSID (PKG_VER "$Id: chfn.c,v 1.27 2005/04/06 04:26:06 kloczek Exp $") #include #include #include @@ -48,6 +48,10 @@ RCSID (PKG_VER "$Id: chfn.c,v 1.23 2005/01/17 23:12:04 kloczek Exp $") #ifdef USE_PAM #include "pam_defs.h" #endif +#ifdef WITH_SELINUX +#include +#include +#endif /* * Global variables. */ @@ -63,10 +67,6 @@ static int amroot; * External identifiers */ -#ifdef NDBM -extern int pw_dbm_mode; -#endif - /* local function prototypes */ static void usage (void); static int may_change_field (int); @@ -136,8 +136,7 @@ static int may_change_field (int field) static void new_fields (void) { - printf (_ - ("Enter the new value, or press ENTER for the default\n")); + printf (_("Enter the new value, or press ENTER for the default\n")); if (may_change_field ('f')) change_field (fullnm, sizeof fullnm, _("Full Name")); @@ -243,9 +242,6 @@ int main (int argc, char **argv) */ amroot = (getuid () == 0); -#ifdef NDBM - pw_dbm_mode = O_RDWR; -#endif /* * Get the program name. The program name is used as a @@ -269,8 +265,7 @@ int main (int argc, char **argv) case 'f': if (!may_change_field ('f')) { fprintf (stderr, - _("%s: permission denied.\n"), - Prog); + _("%s: permission denied.\n"), Prog); exit (1); } fflg++; @@ -279,8 +274,7 @@ int main (int argc, char **argv) case 'r': if (!may_change_field ('r')) { fprintf (stderr, - _("%s: permission denied.\n"), - Prog); + _("%s: permission denied.\n"), Prog); exit (1); } rflg++; @@ -289,8 +283,7 @@ int main (int argc, char **argv) case 'w': if (!may_change_field ('w')) { fprintf (stderr, - _("%s: permission denied.\n"), - Prog); + _("%s: permission denied.\n"), Prog); exit (1); } wflg++; @@ -299,8 +292,7 @@ int main (int argc, char **argv) case 'h': if (!may_change_field ('h')) { fprintf (stderr, - _("%s: permission denied.\n"), - Prog); + _("%s: permission denied.\n"), Prog); exit (1); } hflg++; @@ -309,8 +301,7 @@ int main (int argc, char **argv) case 'o': if (!amroot) { fprintf (stderr, - _("%s: permission denied.\n"), - Prog); + _("%s: permission denied.\n"), Prog); exit (1); } oflg++; @@ -360,8 +351,7 @@ int main (int argc, char **argv) Prog, user); if (!yp_get_default_domain (&nis_domain) && - !yp_master (nis_domain, "passwd.byname", - &nis_master)) { + !yp_master (nis_domain, "passwd.byname", &nis_master)) { fprintf (stderr, _ ("%s: `%s' is the NIS master for this client.\n"), @@ -381,7 +371,21 @@ int main (int argc, char **argv) closelog (); exit (1); } +#ifdef WITH_SELINUX + /* + * If the UID of the user does not match the current real UID, + * check if the change is allowed by SELinux policy. + */ + if ((pw->pw_uid != getuid ()) + && (checkPasswdAccess (PASSWD__CHFN) != 0)) { + fprintf (stderr, _("%s: Permission denied.\n"), Prog); + closelog (); + exit (1); + } +#endif + +#ifndef USE_PAM /* * Non-privileged users are optionally authenticated (must enter the * password of the user whose information is being changed) before @@ -392,6 +396,8 @@ int main (int argc, char **argv) if (!amroot && getdef_bool ("CHFN_AUTH")) passwd_check (pw->pw_name, pw->pw_passwd, "chfn"); +#endif /* !USE_PAM */ + /* * Now get the full name. It is the first comma separated field in * the GECOS field. @@ -425,7 +431,6 @@ int main (int argc, char **argv) /* * Anything left over is "slop". */ - if (cp && !oflg) { if (slop[0]) strcat (slop, ","); @@ -437,7 +442,6 @@ int main (int argc, char **argv) * If none of the fields were changed from the command line, let the * user interactively change them. */ - if (!fflg && !rflg && !wflg && !hflg && !oflg) { printf (_("Changing the user information for %s\n"), user); new_fields (); @@ -446,10 +450,8 @@ int main (int argc, char **argv) /* * Check all of the fields for valid information */ - if (valid_field (fullnm, ":,=")) { - fprintf (stderr, _("%s: invalid name: \"%s\"\n"), Prog, - fullnm); + fprintf (stderr, _("%s: invalid name: \"%s\"\n"), Prog, fullnm); closelog (); exit (1); } @@ -491,8 +493,7 @@ int main (int argc, char **argv) exit (1); } snprintf (new_gecos, sizeof new_gecos, "%s,%s,%s,%s%s%s", - fullnm, roomno, workph, homeph, slop[0] ? "," : "", - slop); + fullnm, roomno, workph, homeph, slop[0] ? "," : "", slop); /* * Before going any further, raise the ulimit to prevent colliding @@ -540,8 +541,7 @@ int main (int argc, char **argv) if (!pw) { pw_unlock (); fprintf (stderr, - _("%s: %s not found in /etc/passwd\n"), Prog, - user); + _("%s: %s not found in /etc/passwd\n"), Prog, user); exit (1); } @@ -556,34 +556,19 @@ int main (int argc, char **argv) * Update the passwd file entry. If there is a DBM file, update that * entry as well. */ - if (!pw_update (&pwent)) { - fprintf (stderr, - _("Error updating the password entry.\n")); + fprintf (stderr, _("Error updating the password entry.\n")); pw_unlock (); SYSLOG ((LOG_ERR, "error updating passwd entry")); closelog (); exit (1); } -#ifdef NDBM - if (pw_dbm_present () && !pw_dbm_update (&pwent)) { - fprintf (stderr, - _("Error updating the DBM password entry.\n")); - pw_unlock (); - SYSLOG ((LOG_ERR, "error updating DBM passwd entry")); - closelog (); - exit (1); - } - endpwent (); -#endif /* * Changes have all been made, so commit them and unlock the file. */ - if (!pw_close ()) { - fprintf (stderr, - _("Cannot commit password file changes.\n")); + fprintf (stderr, _("Cannot commit password file changes.\n")); pw_unlock (); SYSLOG ((LOG_ERR, "can't rewrite /etc/passwd")); closelog (); diff --git a/src/chpasswd.c b/src/chpasswd.c index 71fc3c9e..43009e75 100644 --- a/src/chpasswd.c +++ b/src/chpasswd.c @@ -30,23 +30,27 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: chpasswd.c,v 1.22 2004/12/10 00:27:55 kloczek Exp $") -#include -#include "prototypes.h" -#include "defines.h" -#include +RCSID (PKG_VER "$Id: chpasswd.c,v 1.24 2005/04/06 00:13:45 kloczek Exp $") #include #include -#include "pwio.h" -#ifdef SHADOWPWD -#include "shadowio.h" -#endif -#include "nscd.h" +#include +#include +#include #ifdef USE_PAM #include #include #include #endif /* USE_PAM */ +#include "prototypes.h" +#include "defines.h" +#include "pwio.h" +#include "nscd.h" +#ifdef SHADOWPWD +#include "shadowio.h" +#endif +/* + * Global variables + */ static char *Prog; static int eflg = 0; static int md5flg = 0; @@ -55,8 +59,6 @@ static int md5flg = 0; static int is_shadow_pwd; #endif -extern char *l64a (); - /* local function prototypes */ static void usage (void); @@ -155,8 +157,7 @@ int main (int argc, char **argv) } if (retval == PAM_SUCCESS) { - retval = - pam_start ("chpasswd", pampw->pw_name, &conv, &pamh); + retval = pam_start ("chpasswd", pampw->pw_name, &conv, &pamh); } if (retval == PAM_SUCCESS) { @@ -174,8 +175,7 @@ int main (int argc, char **argv) } if (retval != PAM_SUCCESS) { - fprintf (stderr, _("%s: PAM authentication failed\n"), - Prog); + fprintf (stderr, _("%s: PAM authentication failed\n"), Prog); exit (1); } #endif /* USE_PAM */ @@ -186,13 +186,11 @@ int main (int argc, char **argv) */ if (!pw_lock ()) { - fprintf (stderr, _("%s: can't lock password file\n"), - Prog); + fprintf (stderr, _("%s: can't lock password file\n"), Prog); exit (1); } if (!pw_open (O_RDWR)) { - fprintf (stderr, _("%s: can't open password file\n"), - Prog); + fprintf (stderr, _("%s: can't open password file\n"), Prog); pw_unlock (); exit (1); } @@ -262,8 +260,7 @@ int main (int argc, char **argv) strcat (salt, crypt_make_salt ()); cp = pw_encrypt (newpwd, salt); } else - cp = pw_encrypt (newpwd, - crypt_make_salt ()); + cp = pw_encrypt (newpwd, crypt_make_salt ()); } /* @@ -349,8 +346,7 @@ int main (int argc, char **argv) if (is_shadow_pwd) { if (!spw_close ()) { fprintf (stderr, - _("%s: error updating shadow file\n"), - Prog); + _("%s: error updating shadow file\n"), Prog); pw_unlock (); exit (1); } @@ -358,8 +354,7 @@ int main (int argc, char **argv) } #endif if (!pw_close ()) { - fprintf (stderr, _("%s: error updating password file\n"), - Prog); + fprintf (stderr, _("%s: error updating password file\n"), Prog); exit (1); } diff --git a/src/chsh.c b/src/chsh.c index 476adefd..396f3714 100644 --- a/src/chsh.c +++ b/src/chsh.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: chsh.c,v 1.24 2005/01/17 23:12:04 kloczek Exp $") +RCSID (PKG_VER "$Id: chsh.c,v 1.29 2005/04/06 04:26:06 kloczek Exp $") #include #include #include @@ -48,6 +48,10 @@ RCSID (PKG_VER "$Id: chsh.c,v 1.24 2005/01/17 23:12:04 kloczek Exp $") #ifdef USE_PAM #include "pam_defs.h" #endif +#ifdef WITH_SELINUX +#include +#include +#endif #ifndef SHELLS_FILE #define SHELLS_FILE "/etc/shells" #endif @@ -58,10 +62,6 @@ static char loginsh[BUFSIZ]; /* Name of new login shell */ /* external identifiers */ -#ifdef NDBM -extern int pw_dbm_mode; -#endif - /* local function prototypes */ static void usage (void); static void new_fields (void); @@ -86,8 +86,7 @@ static void usage (void) static void new_fields (void) { - printf (_ - ("Enter the new value, or press ENTER for the default\n")); + printf (_("Enter the new value, or press ENTER for the default\n")); change_field (loginsh, sizeof loginsh, _("Login Shell")); } @@ -135,9 +134,6 @@ int main (int argc, char **argv) */ amroot = getuid () == 0; -#ifdef NDBM - pw_dbm_mode = O_RDWR; -#endif /* * Get the program name. The program name is used as a prefix to @@ -211,8 +207,7 @@ int main (int argc, char **argv) Prog, user); if (!yp_get_default_domain (&nis_domain) && - !yp_master (nis_domain, "passwd.byname", - &nis_master)) { + !yp_master (nis_domain, "passwd.byname", &nis_master)) { fprintf (stderr, _ ("%s: `%s' is the NIS master for this client.\n"), @@ -231,8 +226,7 @@ int main (int argc, char **argv) SYSLOG ((LOG_WARN, "can't change shell for `%s'", user)); closelog (); fprintf (stderr, - _("You may not change the shell for %s.\n"), - user); + _("You may not change the shell for %s.\n"), user); exit (1); } @@ -245,11 +239,26 @@ int main (int argc, char **argv) SYSLOG ((LOG_WARN, "can't change shell for `%s'", user)); closelog (); fprintf (stderr, - _("You may not change the shell for %s.\n"), - user); + _("You may not change the shell for %s.\n"), user); exit (1); } +#ifdef WITH_SELINUX + /* + * If the UID of the user does not match the current real UID, + * check if the change is allowed by SELinux policy. + */ + if ((pw->pw_uid != getuid ()) + && (checkPasswdAccess (PASSWD__CHSH) != 0)) { + SYSLOG ((LOG_WARN, "can't change shell for `%s'", user)); + closelog (); + fprintf (stderr, + _("You may not change the shell for %s.\n"), user); + exit (1); + } +#endif + +#ifndef USE_PAM /* * Non-privileged users are optionally authenticated (must enter * the password of the user whose information is being changed) @@ -257,9 +266,11 @@ int main (int argc, char **argv) * chfn/chsh. --marekm */ - if (!amroot && getdef_bool ("CHFN_AUTH")) + if (!amroot && getdef_bool ("CHSH_AUTH")) passwd_check (pw->pw_name, pw->pw_passwd, "chsh"); +#endif /* !USE_PAM */ + /* * Now get the login shell. Either get it from the password * file, or use the value from the command line. @@ -286,13 +297,11 @@ int main (int argc, char **argv) */ if (valid_field (loginsh, ":,=")) { - fprintf (stderr, _("%s: Invalid entry: %s\n"), Prog, - loginsh); + fprintf (stderr, _("%s: Invalid entry: %s\n"), Prog, loginsh); closelog (); exit (1); } - if (!amroot - && (!check_shell (loginsh) || access (loginsh, X_OK) != 0)) { + if (!amroot && (!check_shell (loginsh) || access (loginsh, X_OK) != 0)) { fprintf (stderr, _("%s is an invalid shell.\n"), loginsh); closelog (); exit (1); @@ -344,8 +353,7 @@ int main (int argc, char **argv) if (!pw) { pw_unlock (); fprintf (stderr, - _("%s: %s not found in /etc/passwd\n"), Prog, - user); + _("%s: %s not found in /etc/passwd\n"), Prog, user); exit (1); } @@ -364,22 +372,10 @@ int main (int argc, char **argv) if (!pw_update (&pwent)) { SYSLOG ((LOG_ERR, "error updating passwd entry")); closelog (); - fprintf (stderr, - _("Error updating the password entry.\n")); + fprintf (stderr, _("Error updating the password entry.\n")); pw_unlock (); exit (1); } -#ifdef NDBM - if (pw_dbm_present () && !pw_dbm_update (&pwent)) { - SYSLOG ((LOG_ERR, "error updating DBM passwd entry")); - closelog (); - fprintf (stderr, - _("Error updating the DBM password entry.\n")); - pw_unlock (); - exit (1); - } - endpwent (); -#endif /* * Changes have all been made, so commit them and unlock the file. @@ -388,8 +384,7 @@ int main (int argc, char **argv) if (!pw_close ()) { SYSLOG ((LOG_ERR, "can't rewrite /etc/passwd")); closelog (); - fprintf (stderr, - _("Cannot commit password file changes.\n")); + fprintf (stderr, _("Cannot commit password file changes.\n")); pw_unlock (); exit (1); } @@ -399,8 +394,7 @@ int main (int argc, char **argv) fprintf (stderr, _("Cannot unlock the password file.\n")); exit (1); } - SYSLOG ((LOG_INFO, "changed user `%s' shell to `%s'", user, - loginsh)); + SYSLOG ((LOG_INFO, "changed user `%s' shell to `%s'", user, loginsh)); nscd_flush_cache ("passwd"); diff --git a/src/expiry.c b/src/expiry.c index aaa507fe..1b00faa6 100644 --- a/src/expiry.c +++ b/src/expiry.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: expiry.c,v 1.12 2002/01/05 15:41:43 kloczek Exp $") +RCSID (PKG_VER "$Id: expiry.c,v 1.13 2005/03/31 05:14:54 kloczek Exp $") #include #include #include @@ -98,8 +98,7 @@ int main (int argc, char **argv) bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); - if (argc != 2 - || (strcmp (argv[1], "-f") && strcmp (argv[1], "-c"))) + if (argc != 2 || (strcmp (argv[1], "-f") && strcmp (argv[1], "-c"))) usage (); #if 0 /* could be setgid shadow with /etc/shadow mode 0640 */ @@ -110,8 +109,7 @@ int main (int argc, char **argv) if (geteuid () != 0) { fprintf (stderr, - _("%s: WARNING! Must be set-UID root!\n"), - argv[0]); + _("%s: WARNING! Must be set-UID root!\n"), argv[0]); exit (10); } #endif diff --git a/src/faillog.c b/src/faillog.c index cd5c78dd..2e1da5da 100644 --- a/src/faillog.c +++ b/src/faillog.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: faillog.c,v 1.17 2005/01/02 06:36:48 kloczek Exp $") +RCSID (PKG_VER "$Id: faillog.c,v 1.22 2005/04/25 10:25:50 kloczek Exp $") #include #include #include @@ -62,8 +62,9 @@ static void usage (void) " -a, --all display faillog records for all users\n" " -h, --help display this help message and exit\n" " -l, --lock-time SEC after failed login lock accout to SEC seconds\n" - " -m, --maximum MAX set maiximum failed login counters to MAX\n" + " -m, --maximum MAX set maximum failed login counters to MAX\n" " -r, --reset reset the counters of login failures\n" + " -t, --time DAYS display faillog records more recent than DAYS\n" " -u, --user LOGIN display faillog record or maintains failure counters\n" " and limits (if used with -r, -m or -l options) only\n" " for user with LOGIN\n")); @@ -83,24 +84,21 @@ static void print_one (const struct faillog *fl, uid_t uid) #endif if (!once) { - printf (_("Username Failures Maximum Latest\n")); + printf (_("Login Failures Maximum Latest On\n")); once++; } pwent = getpwuid (uid); time (&now); tm = localtime (&fl->fail_time); #ifdef HAVE_STRFTIME - strftime (ptime, sizeof (ptime), "%a %b %e %H:%M:%S %z %Y", tm); + strftime (ptime, sizeof (ptime), "%D %H:%M:%S %z", tm); cp = ptime; -#else - cp = asctime (tm); - cp[24] = '\0'; #endif if (pwent) { - printf ("%-12s %4d %4d", + printf ("%-9s %5d %5d ", pwent->pw_name, fl->fail_cnt, fl->fail_max); if (fl->fail_time) { - printf (_(" %s on %s"), cp, fl->fail_line); + printf ("%s %s", cp, fl->fail_line); if (fl->fail_locktime) { if (fl->fail_time + fl->fail_locktime > now && fl->fail_cnt) @@ -180,8 +178,7 @@ static void print (void) return; fseeko (fail, (off_t) user * sizeof faillog, SEEK_SET); - if (fread ((char *) &faillog, sizeof faillog, 1, fail) == - 1) + if (fread ((char *) &faillog, sizeof faillog, 1, fail) == 1) print_one (&faillog, user); else perror (FAILLOG_FILE); @@ -295,7 +292,6 @@ int main (int argc, char **argv) textdomain (PACKAGE); /* try to open for read/write, if that fails - read only */ - fail = fopen (FAILLOG_FILE, "r+"); if (!fail) fail = fopen (FAILLOG_FILE, "r"); @@ -308,24 +304,28 @@ int main (int argc, char **argv) int option_index = 0; int c; static struct option long_options[] = { + {"all", no_argument, NULL, 'a'}, {"help", no_argument, NULL, 'h'}, {"lock-secs", no_argument, NULL, 'l'}, {"maximum", no_argument, NULL, 'm'}, {"reset", no_argument, NULL, 'r'}, + {"time", no_argument, NULL, 't'}, {"user", no_argument, NULL, 'u'}, - {"", no_argument, NULL, 't'}, {NULL, 0, NULL, '\0'} }; while ((c = getopt_long (argc, argv, "ahl:m:rt:u:", long_options, &option_index)) != -1) { - switch (c) { + switch (c) { case 'a': aflg++; if (uflg) usage (); break; + case 'h': + usage (); + break; case 'l': set_locktime ((long) atoi (optarg)); anyflag++; @@ -334,32 +334,29 @@ int main (int argc, char **argv) setmax (atoi (optarg)); anyflag++; break; - case 'p': - print (); - anyflag++; - break; case 'r': reset (); anyflag++; break; + case 't': + days = atoi (optarg); + seconds = days * DAY; + tflg++; + break; case 'u': if (aflg) usage (); pwent = getpwnam (optarg); if (!pwent) { - fprintf (stderr, _("Unknown User: %s\n"), + fprintf (stderr, + _("Unknown User: %s\n"), optarg); exit (1); } uflg++; user = pwent->pw_uid; break; - case 't': - days = atoi (optarg); - seconds = days * DAY; - tflg++; - break; default: usage (); } diff --git a/src/gpasswd.c b/src/gpasswd.c index e0276279..b107c69e 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.22 2005/01/17 23:12:04 kloczek Exp $") +RCSID (PKG_VER "$Id: gpasswd.c,v 1.24 2005/04/06 04:26:06 kloczek Exp $") #include #include #include @@ -57,13 +57,6 @@ static int #define RETRIES 3 #endif -#ifdef NDBM -#ifdef SHADOWGRP -extern int sg_dbm_mode; -#endif -extern int gr_dbm_mode; -#endif - /* local function prototypes */ static void usage (void); static RETSIGTYPE die (int); @@ -205,13 +198,6 @@ int main (int argc, char **argv) */ amroot = getuid () == 0; -#ifdef NDBM -#ifdef SHADOWGRP - sg_dbm_mode = O_RDWR; -#endif - gr_dbm_mode = O_RDWR; -#endif - Prog = Basename (argv[0]); OPENLOG ("gpasswd"); @@ -437,8 +423,7 @@ int main (int argc, char **argv) if (dflg) { int removed = 0; - printf (_("Removing user %s from group %s\n"), user, - group); + printf (_("Removing user %s from group %s\n"), user, group); if (is_on_list (grent.gr_mem, user)) { removed = 1; @@ -482,8 +467,7 @@ int main (int argc, char **argv) */ if (Mflg) { - SYSLOG ((LOG_INFO, "set members of %s to %s", group, - members)); + SYSLOG ((LOG_INFO, "set members of %s to %s", group, members)); #ifdef SHADOWGRP sgent.sg_mem = comma_to_list (members); #endif @@ -605,8 +589,7 @@ int main (int argc, char **argv) } #ifdef SHADOWGRP if (is_shadowgrp && !sgr_update (&sgent)) { - fprintf (stderr, _("%s: can't update shadow entry\n"), - Prog); + fprintf (stderr, _("%s: can't update shadow entry\n"), Prog); SYSLOG ((LOG_WARN, "cannot update /etc/gshadow")); exit (1); } @@ -618,8 +601,7 @@ int main (int argc, char **argv) } #ifdef SHADOWGRP if (is_shadowgrp && !sgr_close ()) { - fprintf (stderr, _("%s: can't re-write shadow file\n"), - Prog); + fprintf (stderr, _("%s: can't re-write shadow file\n"), Prog); SYSLOG ((LOG_WARN, "cannot re-write /etc/gshadow")); exit (1); } @@ -630,24 +612,6 @@ int main (int argc, char **argv) fprintf (stderr, _("%s: can't unlock file\n"), Prog); exit (1); } -#ifdef NDBM - if (gr_dbm_present () && !gr_dbm_update (&grent)) { - fprintf (stderr, _("%s: can't update DBM files\n"), Prog); - SYSLOG ((LOG_WARN, "cannot update /etc/group DBM files")); - exit (1); - } - endgrent (); -#ifdef SHADOWGRP - if (is_shadowgrp && sg_dbm_present () && !sg_dbm_update (&sgent)) { - fprintf (stderr, _("%s: can't update DBM shadow files\n"), - Prog); - SYSLOG ((LOG_WARN, - "cannot update /etc/gshadow DBM files")); - exit (1); - } - endsgent (); -#endif -#endif exit (0); /* NOT REACHED */ } diff --git a/src/groupadd.c b/src/groupadd.c index de8eec65..31882fd1 100644 --- a/src/groupadd.c +++ b/src/groupadd.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: groupadd.c,v 1.29 2004/10/11 06:26:40 kloczek Exp $") +RCSID (PKG_VER "$Id: groupadd.c,v 1.31 2005/04/06 04:26:06 kloczek Exp $") #include #include #include @@ -73,11 +73,6 @@ static int oflg = 0; /* permit non-unique group ID to be specified with -g */ static int gflg = 0; /* ID value for the new group */ static int fflg = 0; /* if group already exists, do nothing and exit(0) */ -#ifdef NDBM -extern int gr_dbm_mode; -extern int sg_dbm_mode; -#endif - /* local function prototypes */ static void usage (void); static void new_grent (struct group *); @@ -154,7 +149,6 @@ static void grp_update (void) /* * Create the initial entries for this new group. */ - new_grent (&grp); #ifdef SHADOWGRP new_sgent (&sgrp); @@ -163,50 +157,19 @@ static void grp_update (void) /* * Write out the new group file entry. */ - if (!gr_update (&grp)) { - fprintf (stderr, _("%s: error adding new group entry\n"), - Prog); + fprintf (stderr, _("%s: error adding new group entry\n"), Prog); fail_exit (E_GRP_UPDATE); } -#ifdef NDBM - - /* - * Update the DBM group file with the new entry as well. - */ - - if (gr_dbm_present () && !gr_dbm_update (&grp)) { - fprintf (stderr, _("%s: cannot add new dbm group entry\n"), - Prog); - fail_exit (E_GRP_UPDATE); - } - endgrent (); -#endif /* NDBM */ #ifdef SHADOWGRP - /* * Write out the new shadow group entries as well. */ - if (is_shadow_grp && !sgr_update (&sgrp)) { - fprintf (stderr, _("%s: error adding new group entry\n"), - Prog); + fprintf (stderr, _("%s: error adding new group entry\n"), Prog); fail_exit (E_GRP_UPDATE); } -#ifdef NDBM - - /* - * Update the DBM group file with the new entry as well. - */ - - if (is_shadow_grp && sg_dbm_present () && !sg_dbm_update (&sgrp)) { - fprintf (stderr, _("%s: cannot add new dbm group entry\n"), - Prog); - fail_exit (E_GRP_UPDATE); - } - endsgent (); -#endif /* NDBM */ #endif /* SHADOWGRP */ SYSLOG ((LOG_INFO, "new group: name=%s, gid=%u", group_name, (unsigned int) group_id)); @@ -292,8 +255,7 @@ static void find_new_gid (void) #endif } if (group_id == gid_max) { - fprintf (stderr, _("%s: can't get unique gid\n"), - Prog); + fprintf (stderr, _("%s: can't get unique gid\n"), Prog); fail_exit (E_GID_IN_USE); } } @@ -405,16 +367,14 @@ static void process_flags (int argc, char **argv) static void close_files (void) { if (!gr_close ()) { - fprintf (stderr, _("%s: cannot rewrite group file\n"), - Prog); + fprintf (stderr, _("%s: cannot rewrite group file\n"), Prog); fail_exit (E_GRP_UPDATE); } gr_unlock (); #ifdef SHADOWGRP if (is_shadow_grp && !sgr_close ()) { fprintf (stderr, - _("%s: cannot rewrite shadow group file\n"), - Prog); + _("%s: cannot rewrite shadow group file\n"), Prog); fail_exit (E_GRP_UPDATE); } if (is_shadow_grp) @@ -431,26 +391,22 @@ static void close_files (void) static void open_files (void) { if (!gr_lock ()) { - fprintf (stderr, _("%s: unable to lock group file\n"), - Prog); + fprintf (stderr, _("%s: unable to lock group file\n"), Prog); exit (E_GRP_UPDATE); } if (!gr_open (O_RDWR)) { - fprintf (stderr, _("%s: unable to open group file\n"), - Prog); + fprintf (stderr, _("%s: unable to open group file\n"), Prog); fail_exit (E_GRP_UPDATE); } #ifdef SHADOWGRP if (is_shadow_grp && !sgr_lock ()) { fprintf (stderr, - _("%s: unable to lock shadow group file\n"), - Prog); + _("%s: unable to lock shadow group file\n"), Prog); fail_exit (E_GRP_UPDATE); } if (is_shadow_grp && !sgr_open (O_RDWR)) { fprintf (stderr, - _("%s: unable to open shadow group file\n"), - Prog); + _("%s: unable to open shadow group file\n"), Prog); fail_exit (E_GRP_UPDATE); } #endif /* SHADOWGRP */ @@ -499,9 +455,9 @@ int main (int argc, char **argv) bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); - OPENLOG("groupadd"); + OPENLOG ("groupadd"); - process_flags(argc, argv); + process_flags (argc, argv); #ifdef USE_PAM retval = PAM_SUCCESS; @@ -512,8 +468,7 @@ int main (int argc, char **argv) } if (retval == PAM_SUCCESS) { - retval = - pam_start ("groupadd", pampw->pw_name, &conv, &pamh); + retval = pam_start ("groupadd", pampw->pw_name, &conv, &pamh); } if (retval == PAM_SUCCESS) { @@ -531,8 +486,7 @@ int main (int argc, char **argv) } if (retval != PAM_SUCCESS) { - fprintf (stderr, _("%s: PAM authentication failed\n"), - Prog); + fprintf (stderr, _("%s: PAM authentication failed\n"), Prog); exit (1); } @@ -543,18 +497,6 @@ int main (int argc, char **argv) is_shadow_grp = sgr_file_present (); #endif - /* - * The open routines for the DBM files don't use read-write as the - * mode, so we have to clue them in. - */ - -#ifdef NDBM - gr_dbm_mode = O_RDWR; -#ifdef SHADOWGRP - sg_dbm_mode = O_RDWR; -#endif /* SHADOWGRP */ -#endif /* NDBM */ - /* * Start with a quick check to see if the group exists. */ @@ -563,8 +505,7 @@ int main (int argc, char **argv) if (fflg) { exit (E_SUCCESS); } - fprintf (stderr, _("%s: group %s exists\n"), Prog, - group_name); + fprintf (stderr, _("%s: group %s exists\n"), Prog, group_name); exit (E_NAME_IN_USE); } @@ -572,7 +513,6 @@ int main (int argc, char **argv) * Do the hard stuff - open the files, create the group entries, * then close and update the files. */ - open_files (); if (!gflg || !oflg) diff --git a/src/groupdel.c b/src/groupdel.c index c4c0bfef..02f7fcf3 100644 --- a/src/groupdel.c +++ b/src/groupdel.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: groupdel.c,v 1.18 2004/10/11 06:26:40 kloczek Exp $") +RCSID (PKG_VER "$Id: groupdel.c,v 1.20 2005/04/06 04:26:06 kloczek Exp $") #include #include #include @@ -49,11 +49,6 @@ static char *group_name; static char *Prog; static int errors; -#ifdef NDBM -extern int gr_dbm_mode; -extern int sg_dbm_mode; -#endif - #include "groupio.h" #ifdef SHADOWGRP @@ -97,62 +92,20 @@ static void usage (void) static void grp_update (void) { -#ifdef NDBM - struct group *ogrp; -#endif - if (!gr_remove (group_name)) { - fprintf (stderr, _("%s: error removing group entry\n"), - Prog); + fprintf (stderr, _("%s: error removing group entry\n"), Prog); errors++; } -#ifdef NDBM - - /* - * Update the DBM group file - */ - - if (gr_dbm_present ()) { - if ((ogrp = getgrnam (group_name)) && - !gr_dbm_remove (ogrp)) { - fprintf (stderr, - _("%s: error removing group dbm entry\n"), - Prog); - errors++; - } - } - endgrent (); -#endif /* NDBM */ #ifdef SHADOWGRP - /* * Delete the shadow group entries as well. */ - if (is_shadow_grp && !sgr_remove (group_name)) { fprintf (stderr, - _("%s: error removing shadow group entry\n"), - Prog); + _("%s: error removing shadow group entry\n"), Prog); errors++; } -#ifdef NDBM - - /* - * Update the DBM shadow group file - */ - - if (is_shadow_grp && sg_dbm_present ()) { - if (!sg_dbm_remove (group_name)) { - fprintf (stderr, - _ - ("%s: error removing shadow group dbm entry\n"), - Prog); - errors++; - } - } - endsgent (); -#endif /* NDBM */ #endif /* SHADOWGRP */ SYSLOG ((LOG_INFO, "remove group `%s'\n", group_name)); return; @@ -168,16 +121,14 @@ static void grp_update (void) static void close_files (void) { if (!gr_close ()) { - fprintf (stderr, _("%s: cannot rewrite group file\n"), - Prog); + fprintf (stderr, _("%s: cannot rewrite group file\n"), Prog); errors++; } gr_unlock (); #ifdef SHADOWGRP if (is_shadow_grp && !sgr_close ()) { fprintf (stderr, - _("%s: cannot rewrite shadow group file\n"), - Prog); + _("%s: cannot rewrite shadow group file\n"), Prog); errors++; } if (is_shadow_grp) @@ -194,26 +145,22 @@ static void close_files (void) static void open_files (void) { if (!gr_lock ()) { - fprintf (stderr, _("%s: unable to lock group file\n"), - Prog); + fprintf (stderr, _("%s: unable to lock group file\n"), Prog); exit (E_GRP_UPDATE); } if (!gr_open (O_RDWR)) { - fprintf (stderr, _("%s: unable to open group file\n"), - Prog); + fprintf (stderr, _("%s: unable to open group file\n"), Prog); exit (E_GRP_UPDATE); } #ifdef SHADOWGRP if (is_shadow_grp && !sgr_lock ()) { fprintf (stderr, - _("%s: unable to lock shadow group file\n"), - Prog); + _("%s: unable to lock shadow group file\n"), Prog); exit (E_GRP_UPDATE); } if (is_shadow_grp && !sgr_open (O_RDWR)) { fprintf (stderr, - _("%s: unable to open shadow group file\n"), - Prog); + _("%s: unable to open shadow group file\n"), Prog); exit (E_GRP_UPDATE); } #endif /* SHADOWGRP */ @@ -252,8 +199,7 @@ static void group_busy (gid_t gid) * Can't remove the group. */ - fprintf (stderr, _("%s: cannot remove user's primary group.\n"), - Prog); + fprintf (stderr, _("%s: cannot remove user's primary group.\n"), Prog); exit (E_GROUP_BUSY); } @@ -295,7 +241,7 @@ int main (int argc, char **argv) textdomain (PACKAGE); if (argc != 2) - usage(); + usage (); group_name = argv[1]; @@ -308,8 +254,7 @@ int main (int argc, char **argv) } if (retval == PAM_SUCCESS) { - retval = - pam_start ("groupdel", pampw->pw_name, &conv, &pamh); + retval = pam_start ("groupdel", pampw->pw_name, &conv, &pamh); } if (retval == PAM_SUCCESS) { @@ -327,8 +272,7 @@ int main (int argc, char **argv) } if (retval != PAM_SUCCESS) { - fprintf (stderr, _("%s: PAM authentication failed\n"), - Prog); + fprintf (stderr, _("%s: PAM authentication failed\n"), Prog); exit (1); } #endif /* USE_PAM */ @@ -339,33 +283,19 @@ int main (int argc, char **argv) is_shadow_grp = sgr_file_present (); #endif - /* - * The open routines for the DBM files don't use read-write - * as the mode, so we have to clue them in. - */ - -#ifdef NDBM - gr_dbm_mode = O_RDWR; -#ifdef SHADOWGRP - sg_dbm_mode = O_RDWR; -#endif /* SHADOWGRP */ -#endif /* NDBM */ - /* * Start with a quick check to see if the group exists. */ - if (!(grp = getgrnam (group_name))) { fprintf (stderr, _("%s: group %s does not exist\n"), Prog, group_name); exit (E_NOTFOUND); } -#ifdef USE_NIS +#ifdef USE_NIS /* * Make sure this isn't a NIS group */ - if (__isgrNIS ()) { char *nis_domain; char *nis_master; @@ -386,14 +316,12 @@ int main (int argc, char **argv) * Now check to insure that this isn't the primary group of * anyone. */ - group_busy (grp->gr_gid); /* * Do the hard stuff - open the files, delete the group entries, * then close and update the files. */ - open_files (); grp_update (); diff --git a/src/groupmod.c b/src/groupmod.c index f3ff66cb..a86e8d73 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.24 2004/10/11 06:26:40 kloczek Exp $") +RCSID (PKG_VER "$Id: groupmod.c,v 1.26 2005/04/06 04:26:06 kloczek Exp $") #include #include #include @@ -72,13 +72,8 @@ static char *Prog; static int oflg = 0, /* permit non-unique group ID to be specified with -g */ - gflg = 0, /* new ID value for the group */ - nflg = 0; /* a new name has been specified for the group */ - -#ifdef NDBM -extern int gr_dbm_mode; -extern int sg_dbm_mode; -#endif + gflg = 0, /* new ID value for the group */ + nflg = 0; /* a new name has been specified for the group */ /* local function prototypes */ static void usage (void); @@ -100,8 +95,7 @@ static void open_files (void); static void usage (void) { - fprintf (stderr, - _("Usage: groupmod [-g gid [-o]] [-n name] group\n")); + fprintf (stderr, _("Usage: groupmod [-g gid [-o]] [-n name] group\n")); exit (E_USAGE); } @@ -177,41 +171,15 @@ static void grp_update (void) */ if (!gr_update (&grp)) { - fprintf (stderr, _("%s: error adding new group entry\n"), - Prog); + fprintf (stderr, _("%s: error adding new group entry\n"), Prog); exit (E_GRP_UPDATE); } if (nflg && !gr_remove (group_name)) { - fprintf (stderr, _("%s: error removing group entry\n"), - Prog); + fprintf (stderr, _("%s: error removing group entry\n"), Prog); exit (E_GRP_UPDATE); } -#ifdef NDBM - - /* - * Update the DBM group file with the new entry as well. - */ - - if (gr_dbm_present ()) { - if (!gr_dbm_update (&grp)) { - fprintf (stderr, - _("%s: cannot add new dbm group entry\n"), - Prog); - exit (E_GRP_UPDATE); - } - if (nflg && (ogrp = getgrnam (group_name)) && - !gr_dbm_remove (ogrp)) { - fprintf (stderr, - _("%s: error removing group dbm entry\n"), - Prog); - exit (E_GRP_UPDATE); - } - endgrent (); - } -#endif /* NDBM */ #ifdef SHADOWGRP - /* * Make sure there was a shadow entry to begin with. Skip down to * "out" if there wasn't. Can't just return because there might be @@ -226,39 +194,13 @@ static void grp_update (void) */ if (!sgr_update (&sgrp)) { - fprintf (stderr, _("%s: error adding new group entry\n"), - Prog); + fprintf (stderr, _("%s: error adding new group entry\n"), Prog); exit (E_GRP_UPDATE); } if (nflg && !sgr_remove (group_name)) { - fprintf (stderr, _("%s: error removing group entry\n"), - Prog); + fprintf (stderr, _("%s: error removing group entry\n"), Prog); exit (E_GRP_UPDATE); } -#ifdef NDBM - - /* - * Update the DBM shadow group file with the new entry as well. - */ - - if (sg_dbm_present ()) { - if (!sg_dbm_update (&sgrp)) { - fprintf (stderr, - _ - ("%s: cannot add new dbm shadow group entry\n"), - Prog); - exit (E_GRP_UPDATE); - } - if (nflg && !sg_dbm_remove (group_name)) { - fprintf (stderr, - _ - ("%s: error removing shadow group dbm entry\n"), - Prog); - exit (E_GRP_UPDATE); - } - endsgent (); - } -#endif /* NDBM */ out: #endif /* SHADOWGRP */ @@ -297,8 +239,7 @@ static void check_new_gid (void) * Tell the user what they did wrong. */ - fprintf (stderr, - _("%s: %u is not a unique gid\n"), Prog, group_newid); + fprintf (stderr, _("%s: %u is not a unique gid\n"), Prog, group_newid); exit (E_GID_IN_USE); } @@ -399,16 +340,14 @@ static void process_flags (int argc, char **argv) static void close_files (void) { if (!gr_close ()) { - fprintf (stderr, _("%s: cannot rewrite group file\n"), - Prog); + fprintf (stderr, _("%s: cannot rewrite group file\n"), Prog); exit (E_GRP_UPDATE); } gr_unlock (); #ifdef SHADOWGRP if (is_shadow_grp && !sgr_close ()) { fprintf (stderr, - _("%s: cannot rewrite shadow group file\n"), - Prog); + _("%s: cannot rewrite shadow group file\n"), Prog); exit (E_GRP_UPDATE); } if (is_shadow_grp) @@ -425,26 +364,22 @@ static void close_files (void) static void open_files (void) { if (!gr_lock ()) { - fprintf (stderr, _("%s: unable to lock group file\n"), - Prog); + fprintf (stderr, _("%s: unable to lock group file\n"), Prog); exit (E_GRP_UPDATE); } if (!gr_open (O_RDWR)) { - fprintf (stderr, _("%s: unable to open group file\n"), - Prog); + fprintf (stderr, _("%s: unable to open group file\n"), Prog); exit (E_GRP_UPDATE); } #ifdef SHADOWGRP if (is_shadow_grp && !sgr_lock ()) { fprintf (stderr, - _("%s: unable to lock shadow group file\n"), - Prog); + _("%s: unable to lock shadow group file\n"), Prog); exit (E_GRP_UPDATE); } if (is_shadow_grp && !sgr_open (O_RDWR)) { fprintf (stderr, - _("%s: unable to open shadow group file\n"), - Prog); + _("%s: unable to open shadow group file\n"), Prog); exit (E_GRP_UPDATE); } #endif /* SHADOWGRP */ @@ -490,7 +425,7 @@ int main (int argc, char **argv) bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); - process_flags(argc, argv); + process_flags (argc, argv); #ifdef USE_PAM retval = PAM_SUCCESS; @@ -501,8 +436,7 @@ int main (int argc, char **argv) } if (retval == PAM_SUCCESS) { - retval = - pam_start ("groupmod", pampw->pw_name, &conv, &pamh); + retval = pam_start ("groupmod", pampw->pw_name, &conv, &pamh); } if (retval == PAM_SUCCESS) { @@ -520,8 +454,7 @@ int main (int argc, char **argv) } if (retval != PAM_SUCCESS) { - fprintf (stderr, _("%s: PAM authentication failed\n"), - Prog); + fprintf (stderr, _("%s: PAM authentication failed\n"), Prog); exit (1); } #endif /* USE_PAM */ @@ -531,23 +464,9 @@ int main (int argc, char **argv) #ifdef SHADOWGRP is_shadow_grp = sgr_file_present (); #endif - - /* - * The open routines for the DBM files don't use read-write as the - * mode, so we have to clue them in. - */ - -#ifdef NDBM - gr_dbm_mode = O_RDWR; -#ifdef SHADOWGRP - sg_dbm_mode = O_RDWR; -#endif /* SHADOWGRP */ -#endif /* NDBM */ - /* * Start with a quick check to see if the group exists. */ - if (!(grp = getgrnam (group_name))) { fprintf (stderr, _("%s: group %s does not exist\n"), Prog, group_name); @@ -556,11 +475,9 @@ int main (int argc, char **argv) group_id = grp->gr_gid; #ifdef USE_NIS - /* * Now make sure it isn't an NIS group. */ - if (__isgrNIS ()) { char *nis_domain; char *nis_master; diff --git a/src/groups.c b/src/groups.c index fc07e023..e143edcb 100644 --- a/src/groups.c +++ b/src/groups.c @@ -30,13 +30,12 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: groups.c,v 1.9 2005/01/17 23:12:04 kloczek Exp $") +RCSID (PKG_VER "$Id: groups.c,v 1.10 2005/03/31 05:14:54 kloczek Exp $") #include #include #include #include "prototypes.h" #include "defines.h" - /* * Global variables */ diff --git a/src/grpck.c b/src/grpck.c index 133f9d29..58465fc7 100644 --- a/src/grpck.c +++ b/src/grpck.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: grpck.c,v 1.21 2004/10/11 06:26:40 kloczek Exp $") +RCSID (PKG_VER "$Id: grpck.c,v 1.23 2005/04/06 04:26:06 kloczek Exp $") #include #include #include @@ -84,8 +84,7 @@ static void delete_member (char **, const char *); static void usage (void) { #ifdef SHADOWGRP - fprintf (stderr, _("Usage: %s [-r] [-s] [group [gshadow]]\n"), - Prog); + fprintf (stderr, _("Usage: %s [-r] [-s] [group [gshadow]]\n"), Prog); #else fprintf (stderr, _("Usage: %s [-r] [-s] [group]\n"), Prog); #endif @@ -189,8 +188,7 @@ int main (int argc, char **argv) } if (sort_mode && read_only) { - fprintf (stderr, _("%s: -s and -r are incompatibile\n"), - Prog); + fprintf (stderr, _("%s: -s and -r are incompatibile\n"), Prog); exit (E_USAGE); } @@ -232,8 +230,7 @@ int main (int argc, char **argv) fprintf (stderr, _("%s: cannot lock file %s\n"), Prog, grp_file); if (optind == argc) - SYSLOG ((LOG_WARN, "cannot lock %s", - grp_file)); + SYSLOG ((LOG_WARN, "cannot lock %s", grp_file)); closelog (); exit (E_CANT_LOCK); } @@ -242,8 +239,7 @@ int main (int argc, char **argv) fprintf (stderr, _("%s: cannot lock file %s\n"), Prog, sgr_file); if (optind == argc) - SYSLOG ((LOG_WARN, "cannot lock %s", - sgr_file)); + SYSLOG ((LOG_WARN, "cannot lock %s", sgr_file)); closelog (); exit (E_CANT_LOCK); } @@ -388,8 +384,7 @@ int main (int argc, char **argv) */ if (!check_group_name (grp->gr_name)) { errors++; - printf (_("invalid group name `%s'\n"), - grp->gr_name); + printf (_("invalid group name `%s'\n"), grp->gr_name); } /* @@ -641,16 +636,9 @@ int main (int argc, char **argv) */ if (errors) -#ifdef NDBM - printf (deleted ? - _ - ("%s: the files have been updated; run mkpasswd\n") - : _("%s: no changes\n"), Prog); -#else printf (deleted ? _("%s: the files have been updated\n") : _("%s: no changes\n"), Prog); -#endif exit (errors ? E_BAD_ENTRY : E_OKAY); } diff --git a/src/grpconv.c b/src/grpconv.c index 56be7fe8..589529a8 100644 --- a/src/grpconv.c +++ b/src/grpconv.c @@ -27,7 +27,7 @@ #include "sgroupio.h" #include "rcsid.h" -RCSID (PKG_VER "$Id: grpconv.c,v 1.15 2003/06/19 18:11:01 kloczek Exp $") +RCSID (PKG_VER "$Id: grpconv.c,v 1.16 2005/03/31 05:14:54 kloczek Exp $") static int group_locked = 0; static int gshadow_locked = 0; @@ -67,14 +67,12 @@ int main (int argc, char **argv) } if (!sgr_lock ()) { - fprintf (stderr, _("%s: can't lock shadow group file\n"), - Prog); + fprintf (stderr, _("%s: can't lock shadow group file\n"), Prog); fail_exit (5); } gshadow_locked++; if (!sgr_open (O_CREAT | O_RDWR)) { - fprintf (stderr, _("%s: can't open shadow group file\n"), - Prog); + fprintf (stderr, _("%s: can't open shadow group file\n"), Prog); fail_exit (1); } @@ -107,8 +105,7 @@ int main (int argc, char **argv) if (sg) { /* update existing shadow group entry */ sgent = *sg; - if (strcmp (gr->gr_passwd, SHADOW_PASSWD_STRING) != - 0) + if (strcmp (gr->gr_passwd, SHADOW_PASSWD_STRING) != 0) sgent.sg_passwd = gr->gr_passwd; } else { static char *empty = 0; @@ -163,8 +160,7 @@ int main (int argc, char **argv) int main (int argc, char **argv) { fprintf (stderr, - "%s: not configured for shadow group support.\n", - argv[0]); + "%s: not configured for shadow group support.\n", argv[0]); exit (1); } #endif /* !SHADOWGRP */ diff --git a/src/grpunconv.c b/src/grpunconv.c index 54b7184b..a2b7d2f0 100644 --- a/src/grpunconv.c +++ b/src/grpunconv.c @@ -11,7 +11,7 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: grpunconv.c,v 1.13 2003/06/19 18:11:01 kloczek Exp $") +RCSID (PKG_VER "$Id: grpunconv.c,v 1.14 2005/03/31 05:14:54 kloczek Exp $") #include #include #include @@ -63,14 +63,12 @@ int main (int argc, char **argv) } if (!sgr_lock ()) { - fprintf (stderr, _("%s: can't lock shadow group file\n"), - Prog); + fprintf (stderr, _("%s: can't lock shadow group file\n"), Prog); fail_exit (5); } gshadow_locked++; if (!sgr_open (O_RDWR)) { - fprintf (stderr, _("%s: can't open shadow group file\n"), - Prog); + fprintf (stderr, _("%s: can't open shadow group file\n"), Prog); fail_exit (1); } @@ -80,8 +78,7 @@ int main (int argc, char **argv) gr_rewind (); while ((gr = gr_next ())) { sg = sgr_locate (gr->gr_name); - if (sg - && strcmp (gr->gr_passwd, SHADOW_PASSWD_STRING) == 0) { + if (sg && strcmp (gr->gr_passwd, SHADOW_PASSWD_STRING) == 0) { /* add password to /etc/group */ grent = *gr; grent.gr_passwd = sg->sg_passwd; @@ -120,8 +117,7 @@ int main (int argc, char **argv) int main (int argc, char **argv) { fprintf (stderr, - "%s: not configured for shadow group support.\n", - argv[0]); + "%s: not configured for shadow group support.\n", argv[0]); exit (1); } #endif /* !SHADOWGRP */ diff --git a/src/lastlog.c b/src/lastlog.c index b6815772..f4d1757d 100644 --- a/src/lastlog.c +++ b/src/lastlog.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: lastlog.c,v 1.15 2004/12/20 02:10:56 kloczek Exp $") +RCSID (PKG_VER "$Id: lastlog.c,v 1.17 2005/04/25 10:26:37 kloczek Exp $") #include #include #include @@ -38,11 +38,7 @@ RCSID (PKG_VER "$Id: lastlog.c,v 1.15 2004/12/20 02:10:56 kloczek Exp $") #include #include "prototypes.h" #include "defines.h" -#if HAVE_LASTLOG_H #include -#else -#include "lastlog_.h" -#endif #include /* * Needed for MkLinux DR1/2/2.1 - J. @@ -68,7 +64,7 @@ static void usage (void) fprintf (stdout, _("Usage: lastlog [options]\n" "\n" "Options:\n" - " -u, --login LOGIN print lastlog record for user with specyfied LOGIN\n" + " -u, --login LOGIN print lastlog record for user with specified LOGIN\n" " -h, --help display this help message and exit\n" " -t, --time DAYS print only lastlog records more recent than DAYS\n")); exit (1); diff --git a/src/login.c b/src/login.c index 83fb37c9..469f912b 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.38 2005/01/17 23:12:04 kloczek Exp $") +RCSID (PKG_VER "$Id: login.c,v 1.52 2005/04/17 15:38:56 kloczek Exp $") #include "prototypes.h" #include "defines.h" #include @@ -39,25 +39,11 @@ RCSID (PKG_VER "$Id: login.c,v 1.38 2005/01/17 23:12:04 kloczek Exp $") #include #include #include -#if HAVE_LASTLOG_H #include -#else -#include "lastlog_.h" -#endif #include "faillog.h" #include "failure.h" #include "pwauth.h" #include "getdef.h" -#ifdef RADIUS -/* - * Support for RADIUS authentication based on a hacked util-linux login - * source sent to me by Jon Lewis. Not tested. You need to link login - * with the radauth.c file (not included here - it doesn't have a clear - * copyright statement, and I don't want to have problems with Debian - * putting the whole package in non-free because of this). --marekm - */ -#include "radlogin.h" -#endif #ifdef UT_ADDR #include #endif @@ -92,12 +78,12 @@ const char *hostname = ""; static struct passwd pwent; #if HAVE_UTMPX_H -extern struct utmpx utxent; +extern struct utmpx utxent; struct utmpx failent; #else struct utmp failent; #endif -extern struct utmp utent; +extern struct utmp utent; struct lastlog lastlog; static int pflg = 0; @@ -131,12 +117,6 @@ extern void dolastlog (struct lastlog *, const struct passwd *, extern char **environ; -#ifndef USE_PAM -extern int login_access (const char *, const char *); -#endif - -extern void login_fbtab (const char *, uid_t, gid_t); - #ifndef ALARM #define ALARM 60 #endif @@ -145,19 +125,20 @@ extern void login_fbtab (const char *, uid_t, gid_t); #define RETRIES 3 #endif -#ifndef USE_PAM -static struct faillog faillog; -#endif - /* local function prototypes */ static void usage (void); static void setup_tty (void); static void check_flags (int, char *const *); #ifndef USE_PAM +extern int login_access (const char *, const char *); + +static struct faillog faillog; + static void bad_time_notify (void); static void check_nologin (void); #endif + static void init_env (void); static RETSIGTYPE alarm_handler (int); @@ -182,7 +163,6 @@ static void usage (void) exit (1); } - static void setup_tty (void) { TERMIO termio; @@ -196,35 +176,8 @@ static void setup_tty (void) termio.c_lflag |= ISIG | ICANON | ECHO | ECHOE; termio.c_iflag |= ICRNL; -#if defined(ECHOKE) && defined(ECHOCTL) - termio.c_lflag |= ECHOKE | ECHOCTL; -#endif -#if defined(ECHOPRT) && defined(NOFLSH) && defined(TOSTOP) - termio.c_lflag &= ~(ECHOPRT | NOFLSH | TOSTOP); -#endif -#ifdef ONLCR - termio.c_oflag |= ONLCR; -#endif - -#ifdef SUN4 - - /* - * Terminal setup for SunOS 4.1 courtesy of Steve Allen - * at UCO/Lick. - */ - - termio.c_cc[VEOF] = '\04'; - termio.c_cflag &= ~CSIZE; - termio.c_cflag |= (PARENB | CS7); - termio.c_lflag |= (ISIG | ICANON | ECHO | IEXTEN); - termio.c_iflag |= - (BRKINT | IGNPAR | ISTRIP | IMAXBEL | ICRNL | IXON); - termio.c_iflag &= ~IXANY; - termio.c_oflag |= (XTABS | OPOST | ONLCR); -#endif /* leave these values unchanged if not specified in login.defs */ - termio.c_cc[VERASE] = - getdef_num ("ERASECHAR", termio.c_cc[VERASE]); + termio.c_cc[VERASE] = getdef_num ("ERASECHAR", termio.c_cc[VERASE]); termio.c_cc[VKILL] = getdef_num ("KILLCHAR", termio.c_cc[VKILL]); /* @@ -236,48 +189,16 @@ static void setup_tty (void) } +#ifndef USE_PAM /* * Tell the user that this is not the right time to login at this tty */ -#ifndef USE_PAM static void bad_time_notify (void) { -#ifdef HUP_MESG_FILE - FILE *mfp; - - if ((mfp = fopen (HUP_MESG_FILE, "r")) != NULL) { - int c; - - while ((c = fgetc (mfp)) != EOF) { - if (c == '\n') - putchar ('\r'); - putchar (c); - } - fclose (mfp); - } else -#endif - printf (_("Invalid login time\n")); + printf (_("Invalid login time\n")); fflush (stdout); } -#endif - -static void check_flags (int argc, char *const *argv) -{ - int arg; - - /* - * Check the flags for proper form. Every argument starting with - * "-" must be exactly two characters long. This closes all the - * clever rlogin, telnet, and getty holes. - */ - for (arg = 1; arg < argc; arg++) { - if (argv[arg][0] == '-' && strlen (argv[arg]) > 2) - usage (); - } -} - -#ifndef USE_PAM static void check_nologin (void) { char *fname; @@ -310,8 +231,7 @@ static void check_nologin (void) fflush (stdout); fclose (nlfp); } else - printf (_ - ("\nSystem closed for routine maintenance\n")); + printf (_("\nSystem closed for routine maintenance\n")); /* * Non-root users must exit. Root gets the message, but * gets to login. @@ -321,12 +241,27 @@ static void check_nologin (void) closelog (); exit (0); } - printf (_ - ("\n[Disconnect bypassed -- root login allowed.]\n")); + printf (_("\n[Disconnect bypassed -- root login allowed.]\n")); } } #endif /* !USE_PAM */ +static void check_flags (int argc, char *const *argv) +{ + int arg; + + /* + * Check the flags for proper form. Every argument starting with + * "-" must be exactly two characters long. This closes all the + * clever rlogin, telnet, and getty holes. + */ + for (arg = 1; arg < argc; arg++) { + if (argv[arg][0] == '-' && strlen (argv[arg]) > 2) + usage (); + } +} + + static void init_env (void) { char *cp, *tmp; @@ -359,8 +294,7 @@ static void init_env (void) static RETSIGTYPE alarm_handler (int sig) { - fprintf (stderr, _("\nLogin timed out after %d seconds.\n"), - timeout); + fprintf (stderr, _("\nLogin timed out after %d seconds.\n"), timeout); exit (0); } @@ -417,22 +351,6 @@ int main (int argc, char **argv) #if defined(SHADOWPWD) && !defined(USE_PAM) struct spwd *spwd = NULL; #endif -#ifdef RADIUS - RAD_USER_DATA rad_user_data; - int is_rad_login; -#endif -#if defined(RADIUS) || defined(DES_RPC) || defined(KERBEROS) - /* from pwauth.c */ - extern char *clear_pass; - extern int wipe_clear_pass; - - /* - * We may need the password later, don't want pw_auth() to wipe it - * (we do it ourselves when it is no longer needed). --marekm - */ - wipe_clear_pass = 0; -#endif - /* * Some quick initialization. */ @@ -541,8 +459,7 @@ int main (int argc, char **argv) * be unknown, etc.). --marekm */ if ((he = gethostbyname (hostname))) { - utent.ut_addr = - *((int32_t *) (he->h_addr_list[0])); + utent.ut_addr = *((int32_t *) (he->h_addr_list[0])); #endif #ifdef UT_HOST strncpy (utent.ut_host, hostname, @@ -645,8 +562,7 @@ int main (int argc, char **argv) if (*cp) snprintf (fromhost, sizeof fromhost, - _(" on `%.100s' from `%.200s'"), tty, - cp); + _(" on `%.100s' from `%.200s'"), tty, cp); else snprintf (fromhost, sizeof fromhost, _(" on `%.100s'"), tty); @@ -698,12 +614,10 @@ int main (int argc, char **argv) "%s login: ", hostn); else snprintf (login_prompt, - sizeof (login_prompt), - "login: "); + sizeof (login_prompt), "login: "); retcode = - pam_set_item (pamh, PAM_USER_PROMPT, - login_prompt); + pam_set_item (pamh, PAM_USER_PROMPT, login_prompt); PAM_FAIL_CHECK; /* if we didn't get a user on the command line, @@ -751,14 +665,12 @@ int main (int argc, char **argv) "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, "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); @@ -780,13 +692,12 @@ int main (int argc, char **argv) First get the username that we are actually using, though. */ retcode = - pam_get_item (pamh, PAM_USER, - (const void **) &pam_user); + pam_get_item (pamh, PAM_USER, (const void **) &pam_user); setpwent (); pwd = getpwnam (pam_user); if (fflg) { - retcode = pam_acct_mgmt(pamh, 0); + retcode = pam_acct_mgmt (pamh, 0); PAM_FAIL_CHECK; } @@ -802,29 +713,16 @@ int main (int argc, char **argv) #else /* ! USE_PAM */ while (1) { /* repeatedly get login/password pairs */ failed = 0; /* haven't failed authentication yet */ -#ifdef RADIUS - is_rad_login = 0; -#endif - if (!username[0]) { /* need to get a login id */ - if (subroot) { - closelog (); - exit (1); + if (!username[0]) { /* need to get a login id */ + if (subroot) { + closelog (); + exit (1); + } + preauth_flag = 0; + login_prompt (_("\n%s login: "), username, + sizeof username); + continue; } - preauth_flag = 0; -#ifndef LOGIN_PROMPT -#ifdef __linux__ /* hostname login: - like in util-linux login */ - login_prompt (_("\n%s login: "), username, - sizeof username); -#else - login_prompt (_("login: "), username, - sizeof username); -#endif -#else - login_prompt (LOGIN_PROMPT, username, - sizeof username); -#endif - continue; - } #endif /* ! USE_PAM */ #ifdef USE_PAM @@ -846,9 +744,7 @@ int main (int argc, char **argv) #ifndef USE_PAM #ifdef SHADOWPWD spwd = NULL; - if (pwd - && strcmp (pwd->pw_passwd, - SHADOW_PASSWD_STRING) == 0) { + if (pwd && strcmp (pwd->pw_passwd, SHADOW_PASSWD_STRING) == 0) { spwd = getspnam (username); if (spwd) pwent.pw_passwd = spwd->sp_pwdp; @@ -864,8 +760,7 @@ int main (int argc, char **argv) * is locked and the user cannot login, even if they have * been "pre-authenticated." */ - if (pwent.pw_passwd[0] == '!' - || pwent.pw_passwd[0] == '*') + if (pwent.pw_passwd[0] == '!' || pwent.pw_passwd[0] == '*') failed = 1; /* @@ -876,30 +771,9 @@ int main (int argc, char **argv) goto auth_ok; if (pw_auth - (pwent.pw_passwd, username, reason, - (char *) 0) == 0) + (pwent.pw_passwd, username, reason, (char *) 0) == 0) goto auth_ok; -#ifdef RADIUS - /* - * If normal passwd authentication didn't work, try radius. - */ - - if (failed) { - pwd = - rad_authenticate (&rad_user_data, - username, - clear_pass ? - clear_pass : ""); - if (pwd) { - is_rad_login = 1; - pwent = *pwd; - failed = 0; - goto auth_ok; - } - } -#endif /* RADIUS */ - /* * Don't log unknown usernames - I mistyped the password for * username at least once. Should probably use LOG_AUTHPRIV @@ -918,32 +792,20 @@ int main (int argc, char **argv) * authenticated and so on. */ -#if defined(RADIUS) && !(defined(DES_RPC) || defined(KERBEROS)) - if (clear_pass) { - strzero (clear_pass); - clear_pass = NULL; - } -#endif - if (!failed && pwent.pw_name && pwent.pw_uid == 0 && !is_console) { - SYSLOG ((LOG_CRIT, "ILLEGAL ROOT LOGIN %s", - fromhost)); + SYSLOG ((LOG_CRIT, "ILLEGAL ROOT LOGIN %s", fromhost)); failed = 1; } -#ifdef LOGIN_ACCESS if (!failed - && !login_access (username, - *hostname ? hostname : tty)) - { - SYSLOG ((LOG_WARN, "LOGIN `%s' REFUSED %s", username, - fromhost)); + && !login_access (username, *hostname ? hostname : tty)) { + SYSLOG ((LOG_WARN, "LOGIN `%s' REFUSED %s", + username, fromhost)); failed = 1; } -#endif if (pwd && getdef_bool ("FAILLOG_ENAB") && !failcheck (pwent.pw_uid, &faillog, failed)) { - SYSLOG ((LOG_CRIT, + SYSLOG ((LOG_CRIT, "exceeded failure limit for `%s' %s", username, fromhost)); failed = 1; @@ -960,14 +822,15 @@ int main (int argc, char **argv) #if HAVE_UTMPX_H failent = utxent; if (sizeof (failent.ut_tv) == sizeof (struct timeval)) - gettimeofday ((struct timeval *) &failent.ut_tv, NULL); - else - { + gettimeofday ((struct timeval *) + &failent.ut_tv, NULL); + else { struct timeval tv; + gettimeofday (&tv, NULL); failent.ut_tv.tv_sec = tv.tv_sec; failent.ut_tv.tv_usec = tv.tv_usec; - } + } #else failent = utent; failent.ut_time = time (NULL); @@ -975,8 +838,7 @@ int main (int argc, char **argv) if (pwd) { failent_user = pwent.pw_name; } else { - if (getdef_bool - ("LOG_UNKFAIL_ENAB")) + if (getdef_bool ("LOG_UNKFAIL_ENAB")) failent_user = username; else failent_user = "UNKNOWN"; @@ -1003,8 +865,7 @@ int main (int argc, char **argv) */ if (pwent.pw_passwd[0] == '\0') - pw_auth ("!", username, reason, - (char *) 0); + pw_auth ("!", username, reason, (char *) 0); #endif /* * Wait a while (a la SVR4 /usr/bin/login) before attempting @@ -1022,9 +883,9 @@ int main (int argc, char **argv) closelog (); exit (1); } - } /* while (1) */ + } /* while (1) */ #endif /* ! USE_PAM */ - alarm (0); /* turn off alarm clock */ + alarm (0); /* turn off alarm clock */ #ifndef USE_PAM /* PAM does this */ /* * porttime checks moved here, after the user has been @@ -1067,8 +928,7 @@ int main (int argc, char **argv) } #ifndef USE_PAM /* pam_lastlog handles this */ if (getdef_bool ("LASTLOG_ENAB")) /* give last login and log this one */ - dolastlog (&lastlog, &pwent, utent.ut_line, - hostname); + dolastlog (&lastlog, &pwent, utent.ut_line, hostname); #endif #ifndef USE_PAM /* PAM handles this as well */ @@ -1079,7 +939,7 @@ int main (int argc, char **argv) * program. --marekm */ #ifdef SHADOWPWD - if (spwd) { /* check for age of password */ + if (spwd) { /* check for age of password */ if (expire (&pwent, spwd)) { pwd = getpwnam (username); spwd = getspnam (username); @@ -1088,59 +948,10 @@ int main (int argc, char **argv) } } #endif /* SHADOWPWD */ - -#ifdef RADIUS - if (is_rad_login) { - char whofilename[128]; - FILE *whofile; - - snprintf (whofilename, sizeof whofilename, - "/var/log/radacct/%.20s", tty); - whofile = fopen (whofilename, "w"); - if (whofile) { - fprintf (whofile, "%s\n", username); - fclose (whofile); - } - } -#endif setup_limits (&pwent); /* nice, ulimit etc. */ #endif /* ! USE_PAM */ chown_tty (tty, &pwent); -#ifdef LOGIN_FBTAB - /* - * XXX - not supported yet. Change permissions and ownerships of - * devices like floppy/audio/mouse etc. for console logins, based - * on /etc/fbtab or /etc/logindevperm configuration files (Suns do - * this with their framebuffer devices). Problems: - * - * - most systems (except BSD) don't have that nice revoke() system - * call to ensure the previous user didn't leave a process holding - * one of these devices open or mmap'ed. Any volunteers to do it - * in Linux? - * - * - what to do with different users logged in on different virtual - * consoles? Maybe permissions should be changed only on user's - * request, by running a separate (setuid root) program? - * - * - init/telnetd/rlogind/whatever should restore permissions after - * the user logs out. - * - * Try the new CONSOLE_GROUPS feature instead. It adds specified - * groups (like "floppy") to the group set if the user is logged in - * on the console. This still has the first problem (users leaving - * processes with these devices open), but doesn't need to change - * any permissions, just make them 0660 root:floppy etc. --marekm - * - * Warning: users can still gain permanent access to these groups - * unless any user-writable filesystems are mounted with the - * "nosuid" option. Alternatively, the kernel could be modified to - * prevent ordinary users from setting the setgid bit on - * executables. - */ - login_fbtab (tty, pwent.pw_uid, pwent.pw_gid); -#endif - /* We call set_groups() above because this clobbers pam_groups.so */ #ifndef USE_PAM if (setup_uid_gid (&pwent, is_console)) @@ -1149,19 +960,6 @@ int main (int argc, char **argv) #endif exit (1); -#ifdef KERBEROS - if (clear_pass) - login_kerberos (username, clear_pass); -#endif -#ifdef DES_RPC - if (clear_pass) - login_desrpc (clear_pass); -#endif -#if defined(DES_RPC) || defined(KERBEROS) - if (clear_pass) - strzero (clear_pass); -#endif - setup_env (&pwent); /* set env vars, cd to the home dir */ #ifdef USE_PAM @@ -1198,13 +996,13 @@ int main (int argc, char **argv) ("Warning: login re-enabled after temporary lockout.\n")); SYSLOG ((LOG_WARN, "login `%s' re-enabled after temporary lockout (%d failures)", - username, - (int) faillog.fail_cnt)); + username, (int) faillog.fail_cnt)); } } if (getdef_bool ("LASTLOG_ENAB") && lastlog.ll_time != 0) { time_t ll_time = lastlog.ll_time; + #ifdef HAVE_STRFTIME strftime (ptime, sizeof (ptime), "%a %b %e %H:%M:%S %z %Y", @@ -1213,8 +1011,7 @@ int main (int argc, char **argv) ptime, lastlog.ll_line); #else printf (_("Last login: %.19s on %s"), - ctime (&ll_time), - lastlog.ll_line); + ctime (&ll_time), lastlog.ll_line); #endif #ifdef HAVE_LL_HOST /* __linux__ || SUN4 */ if (lastlog.ll_host[0]) @@ -1235,8 +1032,7 @@ int main (int argc, char **argv) } else addenv ("HUSHLOGIN=TRUE", NULL); - if (getdef_str ("TTYTYPE_FILE") != NULL - && getenv ("TERM") == NULL) + if (getdef_str ("TTYTYPE_FILE") != NULL && getenv ("TERM") == NULL) ttytype (tty); signal (SIGQUIT, SIG_DFL); /* default quit signal */ @@ -1280,26 +1076,19 @@ int main (int argc, char **argv) #endif signal (SIGINT, SIG_DFL); /* default interrupt signal */ - endpwent (); /* stop access to password file */ - endgrent (); /* stop access to group file */ + endpwent (); /* stop access to password file */ + endgrent (); /* stop access to group file */ #ifdef SHADOWPWD - endspent (); /* stop access to shadow passwd file */ + endspent (); /* stop access to shadow passwd file */ #endif #ifdef SHADOWGRP - endsgent (); /* stop access to shadow group file */ + endsgent (); /* stop access to shadow group file */ #endif if (pwent.pw_uid == 0) SYSLOG ((LOG_NOTICE, "ROOT LOGIN %s", fromhost)); else if (getdef_bool ("LOG_OK_LOGINS")) SYSLOG ((LOG_INFO, "`%s' logged in %s", username, fromhost)); closelog (); -#ifdef RADIUS - if (is_rad_login) { - printf (_("Starting rad_login\n")); - rad_login (&rad_user_data); - exit (0); - } -#endif if ((tmp = getdef_str ("FAKE_SHELL")) != NULL) { shell (tmp, pwent.pw_shell); /* fake shell */ } diff --git a/libmisc/login_access.c b/src/login_nopam.c similarity index 95% rename from libmisc/login_access.c rename to src/login_nopam.c index 8c26ada7..8f124fb2 100644 --- a/libmisc/login_access.c +++ b/src/login_nopam.c @@ -21,9 +21,9 @@ #include #endif -#ifdef LOGIN_ACCESS +#ifndef USE_PAM #include "rcsid.h" -RCSID ("$Id: login_access.c,v 1.9 2003/05/05 21:44:15 kloczek Exp $") +RCSID ("$Id: login_nopam.c,v 1.3 2005/04/17 15:38:56 kloczek Exp $") #include "prototypes.h" /* * This module implements a simple but effective form of login access @@ -154,8 +154,7 @@ static int list_match (char *list, const char *item, int (*match_fn) ()) * the match is affected by any exceptions. */ - for (tok = strtok (list, sep); tok != 0; - tok = strtok ((char *) 0, sep)) { + for (tok = strtok (list, sep); tok != 0; tok = strtok ((char *) 0, sep)) { if (strcasecmp (tok, "EXCEPT") == 0) /* EXCEPT: give up */ break; if ((match = (*match_fn) (tok, item))) /* YES */ @@ -167,8 +166,7 @@ static int list_match (char *list, const char *item, int (*match_fn) ()) while ((tok = strtok ((char *) 0, sep)) && strcasecmp (tok, "EXCEPT")) /* VOID */ ; - if (tok == 0 - || list_match ((char *) 0, item, match_fn) == NO) + if (tok == 0 || list_match ((char *) 0, item, match_fn) == NO) return (match); } return (NO); @@ -262,8 +260,7 @@ char *string; hp = gethostbyname (string); if (hp) - return - inet_ntoa (*((struct in_addr *) *(hp->h_addr_list))); + return inet_ntoa (*((struct in_addr *) *(hp->h_addr_list))); syslog (LOG_ERR, "%s - unknown host", string); return string; @@ -297,8 +294,7 @@ static int from_match (const char *tok, const char *string) if (strchr (string, '.') == 0) return (YES); } else if (tok[(tok_len = strlen (tok)) - 1] == '.' /* network */ - && strncmp (tok, resolve_hostname (string), - tok_len) == 0) { + && strncmp (tok, resolve_hostname (string), tok_len) == 0) { return (YES); } return (NO); @@ -321,4 +317,5 @@ static int string_match (const char *tok, const char *string) } return (NO); } -#endif /* LOGIN_ACCESS */ + +#endif /* !USE_PAM */ diff --git a/src/logoutd.c b/src/logoutd.c index 62d15322..d5532d11 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.24 2004/10/11 06:26:40 kloczek Exp $") +RCSID (PKG_VER "$Id: logoutd.c,v 1.25 2005/03/31 05:14:54 kloczek Exp $") #include #include #include @@ -249,8 +249,7 @@ int main (int argc, char **argv) #define O_NOCTTY 0 #endif tty_fd = - open (tty_name, - O_WRONLY | O_NDELAY | O_NOCTTY); + open (tty_name, O_WRONLY | O_NDELAY | O_NOCTTY); if (tty_fd != -1) { send_mesg_to_tty (tty_fd); close (tty_fd); diff --git a/src/mkpasswd.c b/src/mkpasswd.c index b08104f5..aa9280c3 100644 --- a/src/mkpasswd.c +++ b/src/mkpasswd.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: mkpasswd.c,v 1.11 2005/01/17 23:12:05 kloczek Exp $") +RCSID (PKG_VER "$Id: mkpasswd.c,v 1.12 2005/03/31 05:14:54 kloczek Exp $") #include #include "prototypes.h" #include "defines.h" @@ -323,7 +323,7 @@ int main (int argc, char **argv) #ifdef SHADOWPWD if (sflg && pflg) printf (_ - ("adding record for name %s\n"), + ("adding record for name %s\n"), shadow->sp_namp); #endif if (!sflg && gflg) @@ -373,8 +373,7 @@ int main (int argc, char **argv) */ if (vflg) - printf (_("added %d entries, longest was %d\n"), cnt, - longest); + printf (_("added %d entries, longest was %d\n"), cnt, longest); exit (errors); /*NOTREACHED*/} @@ -387,8 +386,7 @@ static void usage (void) { #ifdef SHADOWPWD #ifdef SHADOWGRP - fprintf (stderr, _("Usage: %s [-vf] [-p|g|sp|sg] file\n"), - Progname); + fprintf (stderr, _("Usage: %s [-vf] [-p|g|sp|sg] file\n"), Progname); #else /* !SHADOWGRP */ fprintf (stderr, _("Usage: %s [-vf] [-p|g|sp] file\n"), Progname); #endif /* SHADOWGRP */ diff --git a/src/newgrp.c b/src/newgrp.c index 8d63ac9d..95dbca75 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.26 2003/07/29 06:16:04 kloczek Exp $") +RCSID (PKG_VER "$Id: newgrp.c,v 1.27 2005/03/31 05:14:54 kloczek Exp $") #include #include #include @@ -153,8 +153,7 @@ int main (int argc, char **argv) * sg [-] groupid [[-c command] */ - if (argc > 0 - && (!strcmp (argv[0], "-") || !strcmp (argv[0], "-l"))) { + if (argc > 0 && (!strcmp (argv[0], "-") || !strcmp (argv[0], "-l"))) { argc--; argv++; initflag = 1; @@ -232,8 +231,7 @@ int main (int argc, char **argv) /* don't use getgroups(0, 0) - it doesn't work on some systems */ i = 16; for (;;) { - grouplist = - (GETGROUPS_T *) xmalloc (i * sizeof (GETGROUPS_T)); + grouplist = (GETGROUPS_T *) xmalloc (i * sizeof (GETGROUPS_T)); ngroups = getgroups (i, grouplist); if (i > ngroups && !(ngroups == -1 && errno == EINVAL)) break; @@ -578,7 +576,7 @@ int main (int argc, char **argv) shell (prog, initflag ? (char *) 0 : cp); /* NOTREACHED */ -failure: + failure: /* * The previous code, when run as newgrp, re-exec'ed the shell in diff --git a/src/newusers.c b/src/newusers.c index 1ae603bc..a9487bd4 100644 --- a/src/newusers.c +++ b/src/newusers.c @@ -36,7 +36,7 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: newusers.c,v 1.19 2004/10/11 06:26:40 kloczek Exp $") +RCSID (PKG_VER "$Id: newusers.c,v 1.21 2005/03/31 05:14:54 kloczek Exp $") #include #include #include "prototypes.h" @@ -104,10 +104,8 @@ static int add_group (const char *name, const char *gid, gid_t * ngid) if (strcmp (grent.gr_mem[i], name) == 0) return 0; - grent.gr_mem = - (char **) xmalloc (sizeof (char *) * (i + 2)); - memcpy (grent.gr_mem, grp->gr_mem, - sizeof (char *) * (i + 2)); + grent.gr_mem = (char **) xmalloc (sizeof (char *) * (i + 2)); + memcpy (grent.gr_mem, grp->gr_mem, sizeof (char *) * (i + 2)); grent.gr_mem[i] = xstrdup (name); grent.gr_mem[i + 1] = (char *) 0; @@ -188,8 +186,7 @@ static int add_group (const char *name, const char *gid, gid_t * ngid) * add_user - create a new user ID */ -static int -add_user (const char *name, const char *uid, uid_t * nuid, gid_t gid) +static int add_user (const char *name, const char *uid, uid_t * nuid, gid_t gid) { const struct passwd *pwd; struct passwd pwent; @@ -343,8 +340,7 @@ int main (int argc, char **argv) } if (retval == PAM_SUCCESS) { - retval = - pam_start ("newusers", pampw->pw_name, &conv, &pamh); + retval = pam_start ("newusers", pampw->pw_name, &conv, &pamh); } if (retval == PAM_SUCCESS) { @@ -362,16 +358,14 @@ int main (int argc, char **argv) } if (retval != PAM_SUCCESS) { - fprintf (stderr, _("%s: PAM authentication failed\n"), - Prog); + fprintf (stderr, _("%s: PAM authentication failed\n"), Prog); exit (1); } #endif /* USE_PAM */ if (argc == 2) { if (!freopen (argv[1], "r", stdin)) { - snprintf (buf, sizeof buf, "%s: %s", Prog, - argv[1]); + snprintf (buf, sizeof buf, "%s: %s", Prog, argv[1]); perror (buf); exit (1); } @@ -397,8 +391,7 @@ int main (int argc, char **argv) #endif { fprintf (stderr, - _("%s: can't lock files, try again later\n"), - Prog); + _("%s: can't lock files, try again later\n"), Prog); (void) pw_unlock (); #ifdef SHADOWPWD if (is_shadow) @@ -531,13 +524,12 @@ int main (int argc, char **argv) if (newpw.pw_dir[0] && access (newpw.pw_dir, F_OK)) { if (mkdir (newpw.pw_dir, - 0777 & ~getdef_num ("UMASK", 077))) + 0777 & ~getdef_num ("UMASK", 022))) fprintf (stderr, _("%s: line %d: mkdir failed\n"), Prog, line); else if (chown - (newpw.pw_dir, newpw.pw_uid, - newpw.pw_gid)) + (newpw.pw_dir, newpw.pw_uid, newpw.pw_gid)) fprintf (stderr, _("%s: line %d: chown failed\n"), Prog, line); diff --git a/src/passwd.c b/src/passwd.c index 40f51e5e..9a640275 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.31 2005/01/17 23:12:05 kloczek Exp $") +RCSID (PKG_VER "$Id: passwd.c,v 1.36 2005/04/15 21:23:49 kloczek Exp $") #include "prototypes.h" #include "defines.h" #include @@ -56,6 +56,10 @@ RCSID (PKG_VER "$Id: passwd.c,v 1.31 2005/01/17 23:12:05 kloczek Exp $") #include "pwio.h" #include "nscd.h" #include "getdef.h" +#ifdef WITH_SELINUX +#include +#include +#endif /* * exit status values */ @@ -77,18 +81,18 @@ static int amroot; /* The real UID was 0 */ static int #ifdef SHADOWPWD eflg = 0, /* -e - force password change */ - iflg = 0, /* -i - set inactive days */ - kflg = 0, /* -k - change only if expired */ - nflg = 0, /* -n - set minimum days */ - wflg = 0, /* -w - set warning days */ - xflg = 0, /* -x - set maximum days */ + iflg = 0, /* -i - set inactive days */ + kflg = 0, /* -k - change only if expired */ + nflg = 0, /* -n - set minimum days */ + wflg = 0, /* -w - set warning days */ + xflg = 0, /* -x - set maximum days */ #endif - aflg = 0, /* -a - show status for all users */ - dflg = 0, /* -d - delete password */ - lflg = 0, /* -l - lock account */ - qflg = 0, /* -q - quiet mode */ - Sflg = 0, /* -S - show password status */ - uflg = 0; /* -u - unlock account */ + aflg = 0, /* -a - show status for all users */ + dflg = 0, /* -d - delete password */ + lflg = 0, /* -l - lock account */ + qflg = 0, /* -q - quiet mode */ + Sflg = 0, /* -S - show password status */ + uflg = 0; /* -u - unlock account */ /* * set to 1 if there are any flags which require root privileges, @@ -114,11 +118,6 @@ static int do_update_pwd = 0; * External identifiers */ -#ifdef NDBM -extern int sp_dbm_mode; -extern int pw_dbm_mode; -#endif - /* local function prototypes */ static void usage (int); @@ -158,8 +157,7 @@ static void usage (int status) _ (" %s [-x max] [-n min] [-w warn] [-i inact] name\n"), Prog); - fprintf (stderr, _(" %s {-l|-u|-d|-S|-e} name\n"), - Prog); + fprintf (stderr, _(" %s {-l|-u|-d|-S|-e} name\n"), Prog); } exit (status); } @@ -261,8 +259,7 @@ Please use a combination of upper and lower case letters and numbers.\n"), getde STRFCPY (pass, cp); strzero (cp); - if (!amroot - && (!obscure (orig, pass, pw) || reuse (pass, pw))) { + if (!amroot && (!obscure (orig, pass, pw) || reuse (pass, pw))) { printf (_("Try again.\n")); continue; } @@ -283,8 +280,7 @@ Please use a combination of upper and lower case letters and numbers.\n"), getde return -1; } if (strcmp (cp, pass)) - fprintf (stderr, - _("They don't match; try again.\n")); + fprintf (stderr, _("They don't match; try again.\n")); else { strzero (cp); break; @@ -363,8 +359,7 @@ static void check_password (const struct passwd *pw) fprintf (stderr, _("The password for %s cannot be changed.\n"), sp->sp_namp); - SYSLOG ((LOG_WARN, "password locked for `%s'", - sp->sp_namp)); + SYSLOG ((LOG_WARN, "password locked for `%s'", sp->sp_namp)); closelog (); exit (E_NOPERM); } @@ -381,8 +376,7 @@ static void check_password (const struct passwd *pw) fprintf (stderr, _("The password for %s cannot be changed.\n"), pw->pw_name); - SYSLOG ((LOG_WARN, "password locked for `%s'", - pw->pw_name)); + SYSLOG ((LOG_WARN, "password locked for `%s'", pw->pw_name)); closelog (); exit (E_NOPERM); } @@ -395,8 +389,7 @@ static void check_password (const struct passwd *pw) _ ("Sorry, the password for %s cannot be changed yet.\n"), pw->pw_name); - SYSLOG ((LOG_WARN, "now < minimum age for `%s'", - pw->pw_name)); + SYSLOG ((LOG_WARN, "now < minimum age for `%s'", pw->pw_name)); closelog (); exit (E_NOPERM); } @@ -532,23 +525,12 @@ static void update_noshadow (void) oom (); npw->pw_passwd = update_crypt_pw (npw->pw_passwd); if (!pw_update (npw)) { - fprintf (stderr, - _("Error updating the password entry.\n")); + fprintf (stderr, _("Error updating the password entry.\n")); SYSLOG ((LOG_ERR, "error updating password entry")); fail_exit (E_FAILURE); } -#ifdef NDBM - if (pw_dbm_present () && !pw_dbm_update (npw)) { - fprintf (stderr, - _("Error updating the DBM password entry.\n")); - SYSLOG ((LOG_ERR, "error updaring dbm password entry")); - fail_exit (E_FAILURE); - } - endpwent (); -#endif if (!pw_close ()) { - fprintf (stderr, - _("Cannot commit password file changes.\n")); + fprintf (stderr, _("Cannot commit password file changes.\n")); SYSLOG ((LOG_ERR, "can't rewrite password file")); fail_exit (E_FAILURE); } @@ -604,23 +586,12 @@ static void update_shadow (void) nsp->sp_lstchg = 0; if (!spw_update (nsp)) { - fprintf (stderr, - _("Error updating the password entry.\n")); + fprintf (stderr, _("Error updating the password entry.\n")); SYSLOG ((LOG_ERR, "error updating password entry")); fail_exit (E_FAILURE); } -#ifdef NDBM - if (sp_dbm_present () && !sp_dbm_update (nsp)) { - fprintf (stderr, - _("Error updating the DBM password entry.\n")); - SYSLOG ((LOG_ERR, "error updaring dbm password entry")); - fail_exit (E_FAILURE); - } - endspent (); -#endif if (!spw_close ()) { - fprintf (stderr, - _("Cannot commit password file changes.\n")); + fprintf (stderr, _("Cannot commit password file changes.\n")); SYSLOG ((LOG_ERR, "can't rewrite password file")); fail_exit (E_FAILURE); } @@ -831,8 +802,7 @@ int main (int argc, char **argv) pw = get_my_pwent (); if (!pw) { fprintf (stderr, - _("%s: Cannot determine your user name.\n"), - Prog); + _("%s: Cannot determine your user name.\n"), Prog); exit (E_NOPERM); } myname = xstrdup (pw->pw_name); @@ -850,8 +820,7 @@ int main (int argc, char **argv) if (anyflag || !Sflg || (optind < argc)) usage (E_USAGE); if (!amroot) { - fprintf (stderr, _("%s: permission denied.\n"), - Prog); + fprintf (stderr, _("%s: permission denied.\n"), Prog); exit (E_NOPERM); } setpwent (); @@ -890,30 +859,33 @@ int main (int argc, char **argv) fprintf (stderr, _("%s: permission denied.\n"), Prog); exit (E_NOPERM); } -#ifdef NDBM - endpwent (); - pw_dbm_mode = O_RDWR; -#ifdef SHADOWPWD - sp_dbm_mode = O_RDWR; -#endif -#endif pw = getpwnam (name); if (!pw) { fprintf (stderr, _("%s: unknown user %s\n"), Prog, name); exit (E_NOPERM); } - +#ifdef WITH_SELINUX /* - * Now I have a name, let's see if the UID for the name matches the - * current real UID. + * If the UID of the user does not match the current real UID, + * check if the change is allowed by SELinux policy. + */ + if ((pw->pw_uid != getuid ()) + && (checkPasswdAccess (PASSWD__PASSWD) != 0)) { +#else + /* + * If the UID of the user does not match the current real UID, + * check if I'm root. */ - if (!amroot && pw->pw_uid != getuid ()) { +#endif fprintf (stderr, - _("You may not change the password for %s.\n"), - name); - SYSLOG ((LOG_WARN, "can't change pwd for `%s'", name)); + _ + ("%s: You may not view or modify password information for %s.\n"), + Prog, name); + SYSLOG ((LOG_WARN, + "%s: can't view or modify password information for %s", + Prog, name)); closelog (); exit (E_NOPERM); } @@ -1009,8 +981,7 @@ int main (int argc, char **argv) nscd_flush_cache ("shadow"); #endif - SYSLOG ((LOG_INFO, "password for `%s' changed by `%s'", name, - myname)); + SYSLOG ((LOG_INFO, "password for `%s' changed by `%s'", name, myname)); closelog (); if (!qflg) printf (_("Password changed.\n")); diff --git a/src/pwck.c b/src/pwck.c index 57bc1624..9284483d 100644 --- a/src/pwck.c +++ b/src/pwck.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: pwck.c,v 1.24 2004/10/11 06:26:40 kloczek Exp $") +RCSID (PKG_VER "$Id: pwck.c,v 1.26 2005/04/06 04:26:06 kloczek Exp $") #include #include #include @@ -172,8 +172,7 @@ int main (int argc, char **argv) } if (sort_mode && read_only) { - fprintf (stderr, _("%s: -s and -r are incompatibile\n"), - Prog); + fprintf (stderr, _("%s: -s and -r are incompatibile\n"), Prog); exit (E_USAGE); } @@ -215,8 +214,7 @@ int main (int argc, char **argv) fprintf (stderr, _("%s: cannot lock file %s\n"), Prog, pwd_file); if (optind == argc) - SYSLOG ((LOG_WARN, "cannot lock %s", - pwd_file)); + SYSLOG ((LOG_WARN, "cannot lock %s", pwd_file)); closelog (); exit (E_CANTLOCK); } @@ -225,8 +223,7 @@ int main (int argc, char **argv) fprintf (stderr, _("%s: cannot lock file %s\n"), Prog, spw_file); if (optind == argc) - SYSLOG ((LOG_WARN, "cannot lock %s", - spw_file)); + SYSLOG ((LOG_WARN, "cannot lock %s", spw_file)); closelog (); exit (E_CANTLOCK); } @@ -370,8 +367,7 @@ int main (int argc, char **argv) * Check for invalid usernames. --marekm */ if (!check_user_name (pwd->pw_name)) { - printf (_("invalid user name '%s'\n"), - pwd->pw_name); + printf (_("invalid user name '%s'\n"), pwd->pw_name); errors++; } @@ -606,16 +602,9 @@ int main (int argc, char **argv) */ if (errors) -#ifdef NDBM - printf (deleted ? - _ - ("%s: the files have been updated; run mkpasswd\n") - : _("%s: no changes\n"), Prog); -#else printf (deleted ? _("%s: the files have been updated\n") : _("%s: no changes\n"), Prog); -#endif closelog (); exit (errors ? E_BADENTRY : E_OKAY); diff --git a/src/pwconv.c b/src/pwconv.c index 89ad42cb..d713c7d7 100644 --- a/src/pwconv.c +++ b/src/pwconv.c @@ -29,7 +29,7 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: pwconv.c,v 1.15 2003/06/19 18:11:01 kloczek Exp $") +RCSID (PKG_VER "$Id: pwconv.c,v 1.16 2005/03/31 05:14:54 kloczek Exp $") #include #include #include @@ -130,8 +130,7 @@ int main (int argc, char **argv) sp = spw_locate (pw->pw_name); if (sp) { /* do we need to update this entry? */ - if (strcmp (pw->pw_passwd, SHADOW_PASSWD_STRING) == - 0) + if (strcmp (pw->pw_passwd, SHADOW_PASSWD_STRING) == 0) continue; /* update existing shadow entry */ spent = *sp; @@ -168,13 +167,11 @@ int main (int argc, char **argv) } if (!spw_close ()) { - fprintf (stderr, _("%s: can't update shadow file\n"), - Prog); + fprintf (stderr, _("%s: can't update shadow file\n"), Prog); fail_exit (E_FAILURE); } if (!pw_close ()) { - fprintf (stderr, _("%s: can't update passwd file\n"), - Prog); + fprintf (stderr, _("%s: can't update passwd file\n"), Prog); fail_exit (E_FAILURE); } chmod (PASSWD_FILE "-", 0600); /* /etc/passwd- (backup file) */ @@ -187,8 +184,7 @@ int main (int argc, char **argv) int main (int argc, char **argv) { fprintf (stderr, - "%s: not configured for shadow password support.\n", - argv[0]); + "%s: not configured for shadow password support.\n", argv[0]); exit (1); } #endif /* !SHADOWPWD */ diff --git a/src/pwunconv.c b/src/pwunconv.c index 1af354cb..f179fe54 100644 --- a/src/pwunconv.c +++ b/src/pwunconv.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: pwunconv.c,v 1.15 2003/06/19 18:11:01 kloczek Exp $") +RCSID (PKG_VER "$Id: pwunconv.c,v 1.16 2005/03/31 05:14:54 kloczek Exp $") #include "defines.h" #include #include @@ -129,21 +129,18 @@ int main (int argc, char **argv) if (!spw_close ()) { fprintf (stderr, - _("%s: can't update shadow password file\n"), - Prog); + _("%s: can't update shadow password file\n"), Prog); fail_exit (3); } if (!pw_close ()) { - fprintf (stderr, _("%s: can't update password file\n"), - Prog); + fprintf (stderr, _("%s: can't update password file\n"), Prog); fail_exit (3); } if (unlink (SHADOW) != 0) { fprintf (stderr, - _("%s: can't delete shadow password file\n"), - Prog); + _("%s: can't delete shadow password file\n"), Prog); fail_exit (3); } @@ -162,8 +159,7 @@ int main (int argc, char **argv) int main (int argc, char **argv) { fprintf (stderr, - "%s: not configured for shadow password support.\n", - argv[0]); + "%s: not configured for shadow password support.\n", argv[0]); exit (1); } #endif /* !SHADOWPWD */ diff --git a/src/su.c b/src/su.c index 0584a4ce..436e9dbd 100644 --- a/src/su.c +++ b/src/su.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: su.c,v 1.28 2004/11/09 03:57:36 kloczek Exp $") +RCSID (PKG_VER "$Id: su.c,v 1.30 2005/04/02 14:09:48 kloczek Exp $") #include #include #ifdef USE_PAM @@ -111,7 +111,7 @@ static int iswheel (const char *username) { struct group *grp; - grp = getgrgid (0); + grp = getgrnam ("wheel");; if (!grp || !grp->gr_mem) return 0; return is_on_list (grp->gr_mem, username); @@ -126,8 +126,7 @@ static void su_failure (const char *tty) if (getdef_bool ("SYSLOG_SU_ENAB")) SYSLOG ((pwent.pw_uid ? LOG_INFO : LOG_NOTICE, "- %s %s-%s", tty, - oldname[0] ? oldname : "???", - name[0] ? name : "???")); + oldname[0] ? oldname : "???", name[0] ? name : "???")); closelog (); #endif puts (_("Sorry.")); @@ -168,8 +167,7 @@ static void run_shell (const char *shellstr, char *args[], int doshell) exit (exit_status); } } else if (child == -1) { - (void) fprintf (stderr, "%s: Cannot fork user shell\n", - Prog); + (void) fprintf (stderr, "%s: Cannot fork user shell\n", Prog); SYSLOG ((LOG_WARN, "Cannot execute %s", pwent.pw_shell)); closelog (); exit (1); @@ -222,8 +220,7 @@ static void run_shell (const char *shellstr, char *args[], int doshell) if (ret != PAM_SUCCESS) { SYSLOG ((LOG_ERR, "pam_close_session: %s", pam_strerror (pamh, ret))); - fprintf (stderr, "%s: %s\n", Prog, - pam_strerror (pamh, ret)); + fprintf (stderr, "%s: %s\n", Prog, pam_strerror (pamh, ret)); pam_end (pamh, ret); exit (1); } @@ -320,8 +317,7 @@ int main (int argc, char **argv) */ if (!amroot) { fprintf (stderr, - _("%s: must be run from a terminal\n"), - Prog); + _("%s: must be run from a terminal\n"), Prog); exit (1); } tty = "???"; @@ -427,13 +423,11 @@ int main (int argc, char **argv) ret = pam_set_item (pamh, PAM_TTY, (const void *) tty); if (ret == PAM_SUCCESS) - ret = - pam_set_item (pamh, PAM_RUSER, (const void *) oldname); + ret = pam_set_item (pamh, PAM_RUSER, (const void *) oldname); if (ret != PAM_SUCCESS) { SYSLOG ((LOG_ERR, "pam_set_item: %s", pam_strerror (pamh, ret))); - fprintf (stderr, "%s: %s\n", Prog, - pam_strerror (pamh, ret)); + fprintf (stderr, "%s: %s\n", Prog, pam_strerror (pamh, ret)); pam_end (pamh, ret); exit (1); } @@ -487,8 +481,7 @@ int main (int argc, char **argv) if (pwent.pw_uid == 0 && getdef_bool ("SU_WHEEL_ONLY") && !iswheel (oldname)) { fprintf (stderr, - _("You are not authorized to su %s\n"), - name); + _("You are not authorized to su %s\n"), name); exit (1); } #ifdef SU_ACCESS @@ -504,8 +497,7 @@ int main (int argc, char **argv) break; default: /* access denied (-1) or unexpected value */ fprintf (stderr, - _("You are not authorized to su %s\n"), - name); + _("You are not authorized to su %s\n"), name); exit (1); } #endif /* SU_ACCESS */ @@ -524,8 +516,7 @@ int main (int argc, char **argv) if (ret != PAM_SUCCESS) { SYSLOG ((LOG_ERR, "pam_authenticate: %s", pam_strerror (pamh, ret))); - fprintf (stderr, "%s: %s\n", Prog, - pam_strerror (pamh, ret)); + fprintf (stderr, "%s: %s\n", Prog, pam_strerror (pamh, ret)); pam_end (pamh, ret); su_failure (tty); } @@ -639,8 +630,7 @@ int main (int argc, char **argv) #ifdef USE_SYSLOG if (getdef_bool ("SYSLOG_SU_ENAB")) SYSLOG ((LOG_INFO, "+ %s %s-%s", tty, - oldname[0] ? oldname : "???", - name[0] ? name : "???")); + oldname[0] ? oldname : "???", name[0] ? name : "???")); #endif #ifdef USE_PAM @@ -656,10 +646,8 @@ int main (int argc, char **argv) */ ret = pam_setcred (pamh, PAM_ESTABLISH_CRED); if (ret != PAM_SUCCESS) { - SYSLOG ((LOG_ERR, "pam_setcred: %s", - pam_strerror (pamh, ret))); - fprintf (stderr, "%s: %s\n", Prog, - pam_strerror (pamh, ret)); + SYSLOG ((LOG_ERR, "pam_setcred: %s", pam_strerror (pamh, ret))); + fprintf (stderr, "%s: %s\n", Prog, pam_strerror (pamh, ret)); pam_end (pamh, ret); exit (1); } @@ -668,8 +656,7 @@ int main (int argc, char **argv) if (ret != PAM_SUCCESS) { SYSLOG ((LOG_ERR, "pam_open_session: %s", pam_strerror (pamh, ret))); - fprintf (stderr, "%s: %s\n", Prog, - pam_strerror (pamh, ret)); + fprintf (stderr, "%s: %s\n", Prog, pam_strerror (pamh, ret)); pam_end (pamh, ret); exit (1); } diff --git a/src/suauth.c b/src/suauth.c index 56aecd73..13249f08 100644 --- a/src/suauth.c +++ b/src/suauth.c @@ -101,8 +101,7 @@ int check_su_auth (const char *actual_id, const char *wanted_id) "DENIED su from `%s' to `%s' (%s)\n", actual_id, wanted_id, SUAUTHFILE)); fprintf (stderr, - _ - ("Access to su to that account DENIED.\n")); + _("Access to su to that account DENIED.\n")); fclose (authfile_fd); return DENY; } else if (!strcmp (action, "NOPASS")) { diff --git a/src/sulogin.c b/src/sulogin.c index b011d7bf..f4dfaad1 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.17 2003/05/12 04:39:17 kloczek Exp $") +RCSID (PKG_VER "$Id: sulogin.c,v 1.18 2005/03/31 05:14:54 kloczek Exp $") #include "prototypes.h" #include "defines.h" #include "getdef.h" @@ -159,8 +159,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); @@ -187,8 +186,7 @@ static RETSIGTYPE catch (int sig) #endif puts ("\n"); #ifdef TELINIT - execl (PATH_TELINIT, "telinit", RUNLEVEL, - (char *) 0); + execl (PATH_TELINIT, "telinit", RUNLEVEL, (char *) 0); #endif exit (0); } else { diff --git a/src/useradd.c b/src/useradd.c index fee0dea2..cbc0861e 100644 --- a/src/useradd.c +++ b/src/useradd.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: useradd.c,v 1.50 2004/11/09 02:45:43 kloczek Exp $") +RCSID (PKG_VER "$Id: useradd.c,v 1.55 2005/04/17 00:15:55 kloczek Exp $") #include "prototypes.h" #include "defines.h" #include "chkname.h" @@ -49,11 +49,7 @@ RCSID (PKG_VER "$Id: useradd.c,v 1.50 2004/11/09 02:45:43 kloczek Exp $") #include #endif /* USE_PAM */ #include "pwauth.h" -#if HAVE_LASTLOG_H #include -#else -#include "lastlog_.h" -#endif #include "faillog.h" #include "nscd.h" #ifndef SKEL_DIR @@ -112,51 +108,25 @@ static char *Prog; static int bflg = 0, /* new default root of home directory */ - cflg = 0, /* comment (GECOS) field for new account */ - dflg = 0, /* home directory for new account */ - Dflg = 0, /* set/show new user default values */ - eflg = 0, /* days since 1970-01-01 when account is locked */ - fflg = 0, /* days until account with expired password is locked */ - gflg = 0, /* primary group ID for new account */ - Gflg = 0, /* secondary group set for new account */ - kflg = 0, /* specify a directory to fill new user directory */ - mflg = 0, /* create user's home directory if it doesn't exist */ - nflg = 0, /* create a group having the same name as the user */ - oflg = 0, /* permit non-unique user ID to be specified with -u */ - sflg = 0, /* shell program for new account */ - uflg = 0; /* specify user ID for new account */ + cflg = 0, /* comment (GECOS) field for new account */ + dflg = 0, /* home directory for new account */ + Dflg = 0, /* set/show new user default values */ + eflg = 0, /* days since 1970-01-01 when account is locked */ + fflg = 0, /* days until account with expired password is locked */ + gflg = 0, /* primary group ID for new account */ + Gflg = 0, /* secondary group set for new account */ + kflg = 0, /* specify a directory to fill new user directory */ + mflg = 0, /* create user's home directory if it doesn't exist */ + nflg = 0, /* create a group having the same name as the user */ + oflg = 0, /* permit non-unique user ID to be specified with -u */ + sflg = 0, /* shell program for new account */ + uflg = 0; /* specify user ID for new account */ extern char *optarg; extern int optind; -#ifdef NDBM -extern int pw_dbm_mode; - -#ifdef SHADOWPWD -extern int sp_dbm_mode; -#endif - -extern int gr_dbm_mode; - -#ifdef SHADOWGRP -extern int sg_dbm_mode; -#endif -#endif - static int home_added; -#ifdef NDBM -static int pw_dbm_added; -static int gr_dbm_added; - -#ifdef SHADOWPWD -static int sp_dbm_added; -#endif -#ifdef SHADOWGRP -static int sg_dbm_added; -#endif -#endif /* NDBM */ - #include "groupio.h" #ifdef SHADOWGRP @@ -227,33 +197,10 @@ static void create_mail (void); static void fail_exit (int code) { -#ifdef NDBM - struct passwd pwent; - - if (pw_dbm_added) { - pwent.pw_name = user_name; - pwent.pw_uid = user_id; - pw_dbm_remove (&pwent); - } - if (gr_dbm_added) - fprintf (stderr, _("%s: rebuild the group database\n"), - Prog); -#ifdef SHADOWPWD - if (sp_dbm_added) - sp_dbm_remove (user_name); -#endif -#ifdef SHADOWGRP - if (sg_dbm_added) - fprintf (stderr, - _("%s: rebuild the shadow group database\n"), - Prog); -#endif -#endif /* NDBM */ if (home_added) rmdir (user_home); - SYSLOG ((LOG_INFO, "failed adding user `%s', data deleted", - user_name)); + SYSLOG ((LOG_INFO, "failed adding user `%s', data deleted", user_name)); exit (code); } @@ -280,8 +227,7 @@ static long get_number (const char *cp) if (*cp != '\0' && *ep == '\0') /* valid number */ return val; - fprintf (stderr, _("%s: invalid numeric argument `%s'\n"), Prog, - cp); + fprintf (stderr, _("%s: invalid numeric argument `%s'\n"), Prog, cp); exit (E_BAD_ARG); } @@ -294,8 +240,7 @@ static uid_t get_uid (const char *cp) if (*cp != '\0' && *ep == '\0') /* valid number */ return val; - fprintf (stderr, _("%s: invalid numeric argument `%s'\n"), Prog, - cp); + fprintf (stderr, _("%s: invalid numeric argument `%s'\n"), Prog, cp); exit (E_BAD_ARG); } @@ -342,8 +287,7 @@ static void get_defaults (void) */ if (MATCH (buf, DGROUP)) { - unsigned int val = - (unsigned int) strtoul (cp, &ep, 10); + unsigned int val = (unsigned int) strtoul (cp, &ep, 10); if (*cp != '\0' && *ep == '\0') { /* valid number */ def_group = val; @@ -359,8 +303,7 @@ static void get_defaults (void) def_gname = xstrdup (cp); } else { fprintf (stderr, - _("%s: unknown group %s\n"), Prog, - cp); + _("%s: unknown group %s\n"), Prog, cp); } } @@ -498,8 +441,7 @@ static int set_defaults (void) *cp = '\0'; if (!out_group && MATCH (buf, DGROUP)) { - fprintf (ofp, DGROUP "%u\n", - (unsigned int) def_group); + fprintf (ofp, DGROUP "%u\n", (unsigned int) def_group); out_group++; } else if (!out_home && MATCH (buf, HOME)) { fprintf (ofp, HOME "%s\n", def_home); @@ -551,8 +493,7 @@ static int set_defaults (void) fprintf (ofp, SKEL "%s\n", def_template); if (!out_create_mail_spool) - fprintf (ofp, CREATE_MAIL_SPOOL "%s\n", - def_create_mail_spool); + fprintf (ofp, CREATE_MAIL_SPOOL "%s\n", def_create_mail_spool); /* * Flush and close the file. Check for errors to make certain @@ -571,8 +512,7 @@ static int set_defaults (void) snprintf (buf, sizeof buf, "%s-", def_file); if (rename (def_file, buf) && errno != ENOENT) { - snprintf (buf, sizeof buf, _("%s: rename: %s"), Prog, - def_file); + snprintf (buf, sizeof buf, _("%s: rename: %s"), Prog, def_file); perror (buf); unlink (new_file); return -1; @@ -583,8 +523,7 @@ static int set_defaults (void) */ if (rename (new_file, def_file)) { - snprintf (buf, sizeof buf, _("%s: rename: %s"), Prog, - new_file); + snprintf (buf, sizeof buf, _("%s: rename: %s"), Prog, new_file); perror (buf); return -1; } @@ -814,13 +753,11 @@ static void grp_update (void) */ if (!gr_lock ()) { - fprintf (stderr, _("%s: error locking group file\n"), - Prog); + fprintf (stderr, _("%s: error locking group file\n"), Prog); fail_exit (E_GRP_UPDATE); } if (!gr_open (O_RDWR)) { - fprintf (stderr, _("%s: error opening group file\n"), - Prog); + fprintf (stderr, _("%s: error opening group file\n"), Prog); fail_exit (E_GRP_UPDATE); } #ifdef SHADOWGRP @@ -869,29 +806,12 @@ static void grp_update (void) ngrp->gr_mem = add_list (ngrp->gr_mem, user_name); if (!gr_update (ngrp)) { fprintf (stderr, - "%s: error adding new group entry\n", - Prog); + "%s: error adding new group entry\n", Prog); fail_exit (E_GRP_UPDATE); } -#ifdef NDBM - /* - * Update the DBM group file with the new entry as well. - */ - - if (!gr_dbm_update (ngrp)) { - fprintf (stderr, - "%s: cannot add new dbm group entry\n", - Prog); - fail_exit (E_GRP_UPDATE); - } else - gr_dbm_added++; -#endif SYSLOG ((LOG_INFO, "add `%s' to group `%s'", user_name, ngrp->gr_name)); } -#ifdef NDBM - endgrent (); -#endif #ifdef SHADOWGRP if (!is_shadow_grp) @@ -934,29 +854,12 @@ static void grp_update (void) nsgrp->sg_mem = add_list (nsgrp->sg_mem, user_name); if (!sgr_update (nsgrp)) { fprintf (stderr, - _("%s: error adding new group entry\n"), - Prog); + _("%s: error adding new group entry\n"), Prog); fail_exit (E_GRP_UPDATE); } -#ifdef NDBM - /* - * Update the DBM group file with the new entry as well. - */ - - if (!sg_dbm_update (nsgrp)) { - fprintf (stderr, - _("%s: cannot add new dbm group entry\n"), - Prog); - fail_exit (E_GRP_UPDATE); - } else - sg_dbm_added++; -#endif /* NDBM */ SYSLOG ((LOG_INFO, "add `%s' to shadow group `%s'", user_name, nsgrp->sg_name)); } -#ifdef NDBM - endsgent (); -#endif /* NDBM */ #endif /* SHADOWGRP */ } @@ -1033,8 +936,7 @@ static void find_new_uid (void) #endif } if (user_id == uid_max) { - fprintf (stderr, _("%s: can't get unique uid\n"), - Prog); + fprintf (stderr, _("%s: can't get unique uid\n"), Prog); fail_exit (E_UID_IN_USE); } } @@ -1294,23 +1196,20 @@ static void process_flags (int argc, char **argv) static void close_files (void) { if (!pw_close ()) { - fprintf (stderr, _("%s: cannot rewrite password file\n"), - Prog); + fprintf (stderr, _("%s: cannot rewrite password file\n"), Prog); fail_exit (E_PW_UPDATE); } #ifdef SHADOWPWD if (is_shadow_pwd && !spw_close ()) { fprintf (stderr, - _("%s: cannot rewrite shadow password file\n"), - Prog); + _("%s: cannot rewrite shadow password file\n"), Prog); fail_exit (E_PW_UPDATE); } #endif if (do_grp_update) { if (!gr_close ()) { fprintf (stderr, - _("%s: cannot rewrite group file\n"), - Prog); + _("%s: cannot rewrite group file\n"), Prog); fail_exit (E_GRP_UPDATE); } gr_unlock (); @@ -1342,28 +1241,24 @@ static void close_files (void) static void open_files (void) { if (!pw_lock ()) { - fprintf (stderr, _("%s: unable to lock password file\n"), - Prog); + fprintf (stderr, _("%s: unable to lock password file\n"), Prog); exit (E_PW_UPDATE); } if (!pw_open (O_RDWR)) { - fprintf (stderr, _("%s: unable to open password file\n"), - Prog); + fprintf (stderr, _("%s: unable to open password file\n"), Prog); pw_unlock (); exit (E_PW_UPDATE); } #ifdef SHADOWPWD if (is_shadow_pwd && !spw_lock ()) { fprintf (stderr, - _("%s: cannot lock shadow password file\n"), - Prog); + _("%s: cannot lock shadow password file\n"), Prog); pw_unlock (); exit (E_PW_UPDATE); } if (is_shadow_pwd && !spw_open (O_RDWR)) { fprintf (stderr, - _("%s: cannot open shadow password file\n"), - Prog); + _("%s: cannot open shadow password file\n"), Prog); spw_unlock (); pw_unlock (); exit (E_PW_UPDATE); @@ -1459,25 +1354,6 @@ static void usr_update (void) _("%s: error adding new password entry\n"), Prog); exit (E_PW_UPDATE); } -#ifdef NDBM - /* - * Update the DBM files. This creates the user before the flat - * files are updated. This is safe before the password field is - * either locked, or set to a valid authentication string. - */ - - if (pw_dbm_present ()) { - if (!pw_dbm_update (&pwent)) { - fprintf (stderr, - _ - ("%s: error updating password dbm entry\n"), - Prog); - exit (E_PW_UPDATE); - } else - pw_dbm_added = 1; - } - endpwent (); -#endif #ifdef SHADOWPWD /* @@ -1490,26 +1366,6 @@ static void usr_update (void) Prog); exit (E_PW_UPDATE); } -#ifdef NDBM - /* - * Update the DBM files for the shadow password. This entry is - * output before the entry in the flat file, but this is safe as - * the password is locked or the authentication string has the - * proper values. - */ - - if (is_shadow_pwd && sp_dbm_present ()) { - if (!sp_dbm_update (&spent)) { - fprintf (stderr, - _ - ("%s: error updating shadow passwd dbm entry\n"), - Prog); - fail_exit (E_PW_UPDATE); - } else - sp_dbm_added++; - endspent (); - } -#endif #endif /* SHADOWPWD */ /* @@ -1578,7 +1434,7 @@ static void create_mail (void) if (access (ms, R_OK) != 0) { fd = open (ms, O_CREAT | O_EXCL | O_WRONLY | - O_TRUNC); + O_TRUNC, 0); if (fd != -1) { fchown (fd, user_id, mail_gid); fchmod (fd, mode); @@ -1625,21 +1481,21 @@ int main (int argc, char **argv) bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); - OPENLOG("useradd"); + OPENLOG ("useradd"); - sys_ngroups = sysconf(_SC_NGROUPS_MAX); - user_groups = malloc((1 + sys_ngroups) * sizeof(char *)); + sys_ngroups = sysconf (_SC_NGROUPS_MAX); + user_groups = malloc ((1 + sys_ngroups) * sizeof (char *)); #ifdef SHADOWPWD - is_shadow_pwd = spw_file_present(); + is_shadow_pwd = spw_file_present (); #endif #ifdef SHADOWGRP - is_shadow_grp = sgr_file_present(); + is_shadow_grp = sgr_file_present (); #endif - get_defaults(); + get_defaults (); - process_flags(argc, argv); + process_flags (argc, argv); #ifdef USE_PAM retval = PAM_SUCCESS; @@ -1650,8 +1506,7 @@ int main (int argc, char **argv) } if (retval == PAM_SUCCESS) { - retval = - pam_start ("useradd", pampw->pw_name, &conv, &pamh); + retval = pam_start ("useradd", pampw->pw_name, &conv, &pamh); } if (retval == PAM_SUCCESS) { @@ -1669,30 +1524,11 @@ int main (int argc, char **argv) } if (retval != PAM_SUCCESS) { - fprintf (stderr, _("%s: PAM authentication failed\n"), - Prog); + fprintf (stderr, _("%s: PAM authentication failed\n"), Prog); exit (1); } - - OPENLOG("useradd"); #endif /* USE_PAM */ - /* - * The open routines for the NDBM files don't use read-write - * as the mode, so we have to clue them in. - */ - -#ifdef NDBM - pw_dbm_mode = O_RDWR; -#ifdef SHADOWPWD - sp_dbm_mode = O_RDWR; -#endif - gr_dbm_mode = O_RDWR; -#ifdef SHADOWGRP - sg_dbm_mode = O_RDWR; -#endif -#endif - /* * See if we are messing with the defaults file, or creating * a new user. @@ -1711,8 +1547,7 @@ int main (int argc, char **argv) */ if (getpwnam (user_name)) { - fprintf (stderr, _("%s: user %s exists\n"), Prog, - user_name); + fprintf (stderr, _("%s: user %s exists\n"), Prog, user_name); exit (E_NAME_IN_USE); } diff --git a/src/userdel.c b/src/userdel.c index de41b64e..ca64527b 100644 --- a/src/userdel.c +++ b/src/userdel.c @@ -30,7 +30,7 @@ #include #include "rcsid.h" -RCSID (PKG_VER "$Id: userdel.c,v 1.32 2005/01/17 23:12:05 kloczek Exp $") +RCSID (PKG_VER "$Id: userdel.c,v 1.37 2005/04/06 04:26:06 kloczek Exp $") #include #include #include @@ -65,19 +65,6 @@ static char *user_home; static char *Prog; static int fflg = 0, rflg = 0; -#ifdef NDBM -extern int pw_dbm_mode; - -#ifdef SHADOWPWD -extern int sp_dbm_mode; -#endif -extern int gr_dbm_mode; - -#ifdef SHADOWGRP -extern int sg_dbm_mode; -#endif -#endif - #include "groupio.h" #include "pwio.h" @@ -110,10 +97,7 @@ static void user_cancel (const char *); static int path_prefix (const char *, const char *); #endif static int is_owner (uid_t, const char *); - -#ifndef NO_REMOVE_MAILBOX static void remove_mailbox (void); -#endif /* * usage - display usage message and exit @@ -173,25 +157,15 @@ static void update_groups (void) ngrp->gr_mem = del_list (ngrp->gr_mem, user_name); if (!gr_update (ngrp)) fprintf (stderr, - _("%s: error updating group entry\n"), - Prog); + _("%s: error updating group entry\n"), Prog); /* * Update the DBM group file with the new entry as well. */ -#ifdef NDBM - if (!gr_dbm_update (ngrp)) - fprintf (stderr, - _("%s: cannot update dbm group entry\n"), - Prog); -#endif /* NDBM */ SYSLOG ((LOG_INFO, "delete `%s' from group `%s'\n", user_name, ngrp->gr_name)); } -#ifdef NDBM - endgrent (); -#endif /* * we've removed their name from all the groups above, so * now if they have a group with the same name as their @@ -204,22 +178,9 @@ static void update_groups (void) gr_remove (grp->gr_name); - /* - * Update the DBM group file with the new entry as well. - */ - -#ifdef NDBM - if (!gr_dbm_remove (grp)) - fprintf (stderr, - _("%s: cannot remove dbm group entry\n"), - Prog); -#endif SYSLOG ((LOG_INFO, "removed group `%s' owned by `%s'\n", grp->gr_name, user_name)); } -#ifdef NDBM - endgrent (); -#endif #ifdef SHADOWGRP if (!is_shadow_grp) return; @@ -250,33 +211,17 @@ static void update_groups (void) } if (was_member) - nsgrp->sg_mem = - del_list (nsgrp->sg_mem, user_name); + nsgrp->sg_mem = del_list (nsgrp->sg_mem, user_name); if (was_admin) - nsgrp->sg_adm = - del_list (nsgrp->sg_adm, user_name); + nsgrp->sg_adm = del_list (nsgrp->sg_adm, user_name); if (!sgr_update (nsgrp)) fprintf (stderr, - _("%s: error updating group entry\n"), - Prog); -#ifdef NDBM - /* - * Update the DBM group file with the new entry as well. - */ - - if (!sg_dbm_update (nsgrp)) - fprintf (stderr, - _("%s: cannot update dbm group entry\n"), - Prog); -#endif /* NDBM */ + _("%s: error updating group entry\n"), Prog); SYSLOG ((LOG_INFO, "delete `%s' from shadow group `%s'\n", user_name, nsgrp->sg_name)); } -#ifdef NDBM - endsgent (); -#endif /* NDBM */ #endif /* SHADOWGRP */ } @@ -290,24 +235,20 @@ static void update_groups (void) static void close_files (void) { if (!pw_close ()) - fprintf (stderr, _("%s: cannot rewrite password file\n"), - Prog); + fprintf (stderr, _("%s: cannot rewrite password file\n"), Prog); #ifdef SHADOWPWD if (is_shadow_pwd && !spw_close ()) fprintf (stderr, - _("%s: cannot rewrite shadow password file\n"), - Prog); + _("%s: cannot rewrite shadow password file\n"), Prog); #endif if (!gr_close ()) - fprintf (stderr, _("%s: cannot rewrite group file\n"), - Prog); + fprintf (stderr, _("%s: cannot rewrite group file\n"), Prog); (void) gr_unlock (); #ifdef SHADOWGRP if (is_shadow_grp && !sgr_close ()) fprintf (stderr, - _("%s: cannot rewrite shadow group file\n"), - Prog); + _("%s: cannot rewrite shadow group file\n"), Prog); if (is_shadow_grp) (void) sgr_unlock (); @@ -347,32 +288,27 @@ static void fail_exit (int code) static void open_files (void) { if (!pw_lock ()) { - fprintf (stderr, _("%s: unable to lock password file\n"), - Prog); + fprintf (stderr, _("%s: unable to lock password file\n"), Prog); exit (E_PW_UPDATE); } if (!pw_open (O_RDWR)) { - fprintf (stderr, _("%s: unable to open password file\n"), - Prog); + fprintf (stderr, _("%s: unable to open password file\n"), Prog); fail_exit (E_PW_UPDATE); } #ifdef SHADOWPWD if (is_shadow_pwd && !spw_lock ()) { fprintf (stderr, - _("%s: cannot lock shadow password file\n"), - Prog); + _("%s: cannot lock shadow password file\n"), Prog); fail_exit (E_PW_UPDATE); } if (is_shadow_pwd && !spw_open (O_RDWR)) { fprintf (stderr, - _("%s: cannot open shadow password file\n"), - Prog); + _("%s: cannot open shadow password file\n"), Prog); fail_exit (E_PW_UPDATE); } #endif if (!gr_lock ()) { - fprintf (stderr, _("%s: unable to lock group file\n"), - Prog); + fprintf (stderr, _("%s: unable to lock group file\n"), Prog); fail_exit (E_GRP_UPDATE); } if (!gr_open (O_RDWR)) { @@ -382,8 +318,7 @@ static void open_files (void) #ifdef SHADOWGRP if (is_shadow_grp && !sgr_lock ()) { fprintf (stderr, - _("%s: unable to lock shadow group file\n"), - Prog); + _("%s: unable to lock shadow group file\n"), Prog); fail_exit (E_GRP_UPDATE); } if (is_shadow_grp && !sgr_open (O_RDWR)) { @@ -409,39 +344,9 @@ static void update_user (void) #ifdef SHADOWPWD if (is_shadow_pwd && !spw_remove (user_name)) fprintf (stderr, - _("%s: error deleting shadow password entry\n"), - Prog); + _("%s: error deleting shadow password entry\n"), Prog); #endif -#ifdef NDBM - if (pw_dbm_present ()) { - if ((pwd = getpwnam (user_name)) - && !pw_dbm_remove (pwd)) - fprintf (stderr, - _ - ("%s: error deleting password dbm entry\n"), - Prog); - /* - * If the user's UID is a duplicate the duplicated - * entry needs to be updated so that a UID match can - * be found in the DBM files. - */ - for (pw_rewind (), pwd = pw_next (); pwd; pwd = pw_next ()) { - if (pwd->pw_uid == user_id) - pw_dbm_update (pwd); - break; - } - } -} -} - -#ifdef SHADOWPWD -if (is_shadow_pwd && sp_dbm_present () - && !sp_dbm_remove (user_name)) - fprintf (stderr, _("%s: error deleting shadow passwd dbm entry\n"), Prog); -#endif -endpwent (); -#endif /* NDBM */ -SYSLOG ((LOG_INFO, "delete user `%s'\n", user_name)); + SYSLOG ((LOG_INFO, "delete user `%s'\n", user_name)); } /* @@ -480,9 +385,7 @@ static void user_busy (const char *name, uid_t uid) if (strncmp (utent->ut_user, name, sizeof utent->ut_user)) continue; fprintf (stderr, - _ - ("%s: user %s is currently logged in\n"), - Prog, name); + _("%s: user %s is currently logged in\n"), Prog, name); exit (E_USER_BUSY); } } @@ -568,7 +471,6 @@ static int is_owner (uid_t uid, const char *path) return (st.st_uid == uid); } -#ifndef NO_REMOVE_MAILBOX static void remove_mailbox (void) { const char *maildir; @@ -601,7 +503,6 @@ static void remove_mailbox (void) perror (mailfile); } } -#endif #ifdef USE_PAM static struct pam_conv conv = { @@ -654,8 +555,7 @@ int main (int argc, char **argv) } if (retval == PAM_SUCCESS) - retval = pam_start ("userdel", pampw->pw_name, &conv, - &pamh); + retval = pam_start ("userdel", pampw->pw_name, &conv, &pamh); if (retval == PAM_SUCCESS) { retval = pam_authenticate (pamh, 0); @@ -670,8 +570,7 @@ int main (int argc, char **argv) } if (retval != PAM_SUCCESS) { - fprintf (stderr, - _("%s: PAM authentication failed\n"), Prog); + fprintf (stderr, _("%s: PAM authentication failed\n"), Prog); exit (E_PW_UPDATE); } #endif /* USE_PAM */ @@ -684,20 +583,7 @@ int main (int argc, char **argv) #ifdef SHADOWGRP is_shadow_grp = sgr_file_present (); #endif - /* - * The open routines for the DBM files don't use read-write as the - * mode, so we have to clue them in. - */ -#ifdef NDBM - pw_dbm_mode = O_RDWR; -#ifdef SHADOWPWD - sp_dbm_mode = O_RDWR; -#endif - gr_dbm_mode = O_RDWR; -#ifdef SHADOWGRP - sg_dbm_mode = O_RDWR; -#endif -#endif + /* * Start with a quick check to see if the user exists. */ @@ -718,11 +604,9 @@ int main (int argc, char **argv) char *nis_master; fprintf (stderr, - _("%s: user %s is a NIS user\n"), - Prog, user_name); + _("%s: user %s is a NIS user\n"), Prog, user_name); if (!yp_get_default_domain (&nis_domain) - && !yp_master (nis_domain, - "passwd.byname", &nis_master)) { + && !yp_master (nis_domain, "passwd.byname", &nis_master)) { fprintf (stderr, _("%s: %s is the NIS master\n"), Prog, nis_master); @@ -750,10 +634,8 @@ int main (int argc, char **argv) nscd_flush_cache ("shadow"); #endif -#ifndef NO_REMOVE_MAILBOX if (rflg) remove_mailbox (); -#endif if (rflg && !fflg && !is_owner (user_id, user_home)) { fprintf (stderr, _("%s: %s not owned by %s, not removing\n"), diff --git a/src/usermod.c b/src/usermod.c index 076e2665..3884520c 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.32 2004/10/11 06:26:40 kloczek Exp $") +RCSID (PKG_VER "$Id: usermod.c,v 1.37 2005/04/17 15:49:01 kloczek Exp $") #include #include #include @@ -49,11 +49,7 @@ RCSID (PKG_VER "$Id: usermod.c,v 1.32 2004/10/11 06:26:40 kloczek Exp $") #include "defines.h" #include "chkname.h" #include "faillog.h" -#if HAVE_LASTLOG_H #include -#else -#include "lastlog_.h" -#endif #include "pwauth.h" #include "nscd.h" #include "getdef.h" @@ -67,12 +63,12 @@ RCSID (PKG_VER "$Id: usermod.c,v 1.32 2004/10/11 06:26:40 kloczek Exp $") #define E_USAGE 2 /* invalid command syntax */ #define E_BAD_ARG 3 /* invalid argument to option */ #define E_UID_IN_USE 4 /* uid already in use (and no -o) */ - /* #define E_BAD_PWFILE 5 *//* passwd file contains errors */ + /* #define E_BAD_PWFILE 5 *//* passwd file contains errors */ #define E_NOTFOUND 6 /* specified user/group doesn't exist */ #define E_USER_BUSY 8 /* user to modify is logged in */ #define E_NAME_IN_USE 9 /* username already in use */ #define E_GRP_UPDATE 10 /* can't update group file */ - /* #define E_NOSPACE 11 *//* insufficient space to move home dir */ + /* #define E_NOSPACE 11 *//* insufficient space to move home dir */ #define E_HOMEDIR 12 /* unable to complete home dir move */ #define VALID(s) (strcspn (s, ":\n") == strlen (s)) static char *user_name; @@ -98,34 +94,21 @@ static char *Prog; static int uflg = 0, /* specify new user ID */ - oflg = 0, /* permit non-unique user ID to be specified with -u */ - 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 */ + oflg = 0, /* permit non-unique user ID to be specified with -u */ + 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 */ #ifdef SHADOWPWD - fflg = 0, /* days until account with expired password is locked */ - eflg = 0, /* days since 1970-01-01 when account becomes expired */ -#endif - Lflg = 0, /* lock the password */ - Uflg = 0, /* unlock the password */ - pflg = 0, /* new encrypted password */ - lflg = 0; /* new user name */ - -#ifdef NDBM -extern int pw_dbm_mode; - -#ifdef SHADOWPWD -extern int sp_dbm_mode; -#endif -extern int gr_dbm_mode; - -#ifdef SHADOWGRP -extern int sg_dbm_mode; -#endif + fflg = 0, /* days until account with expired password is locked */ + eflg = 0, /* days since 1970-01-01 when account becomes expired */ #endif + Lflg = 0, /* lock the password */ + Uflg = 0, /* unlock the password */ + pflg = 0, /* new encrypted password */ + lflg = 0; /* new user name */ #ifdef SHADOWPWD static int is_shadow_pwd; @@ -458,14 +441,12 @@ static int update_group (void) * entries. */ if (!gr_lock ()) { - fprintf (stderr, _("%s: error locking group file\n"), - Prog); + fprintf (stderr, _("%s: error locking group file\n"), Prog); SYSLOG ((LOG_ERR, "error locking group file")); return -1; } if (!gr_open (O_RDWR)) { - fprintf (stderr, _("%s: error opening group file\n"), - Prog); + fprintf (stderr, _("%s: error opening group file\n"), Prog); SYSLOG ((LOG_ERR, "error opening group file")); gr_unlock (); return -1; @@ -530,32 +511,15 @@ static int update_group (void) changed = 0; if (!gr_update (ngrp)) { fprintf (stderr, - _("%s: error adding new group entry\n"), - Prog); + _("%s: error adding new group entry\n"), Prog); SYSLOG ((LOG_ERR, "error adding group entry")); gr_unlock (); return -1; } -#ifdef NDBM - /* - * Update the DBM group file with the new entry as well. - */ - if (!gr_dbm_update (ngrp)) { - fprintf (stderr, - _("%s: cannot add new dbm group entry\n"), - Prog); - SYSLOG ((LOG_ERR, "error adding dbm group entry")); - gr_unlock (); - return -1; - } -#endif /* NDBM */ } -#ifdef NDBM - endgrent (); -#endif /* NDBM */ + if (!gr_close ()) { - fprintf (stderr, _("%s: cannot rewrite group file\n"), - Prog); + fprintf (stderr, _("%s: cannot rewrite group file\n"), Prog); gr_unlock (); return -1; } @@ -609,8 +573,7 @@ static int update_gshadow (void) * See if the user specified this group as one of their * concurrent groups. */ - is_member = Gflg - && is_on_list (user_groups, sgrp->sg_name); + is_member = Gflg && is_on_list (user_groups, sgrp->sg_name); if (!was_member && !was_admin && !is_member) continue; @@ -626,10 +589,8 @@ static int update_gshadow (void) } if (was_admin && lflg) { - nsgrp->sg_adm = - del_list (nsgrp->sg_adm, user_name); - nsgrp->sg_adm = - add_list (nsgrp->sg_adm, user_newname); + nsgrp->sg_adm = del_list (nsgrp->sg_adm, user_name); + nsgrp->sg_adm = add_list (nsgrp->sg_adm, user_newname); changed = 1; SYSLOG ((LOG_INFO, "change admin `%s' to `%s' in shadow group `%s'", @@ -648,8 +609,7 @@ static int update_gshadow (void) nsgrp->sg_name)); } } else if (was_member && Gflg && !is_member) { - nsgrp->sg_mem = - del_list (nsgrp->sg_mem, user_name); + nsgrp->sg_mem = del_list (nsgrp->sg_mem, user_name); changed = 1; SYSLOG ((LOG_INFO, "delete `%s' from shadow group `%s'", @@ -673,35 +633,16 @@ static int update_gshadow (void) */ if (!sgr_update (nsgrp)) { fprintf (stderr, - _("%s: error adding new group entry\n"), - Prog); - SYSLOG ((LOG_ERR, - "error adding shadow group entry")); + _("%s: error adding new group entry\n"), Prog); + SYSLOG ((LOG_ERR, "error adding shadow group entry")); sgr_unlock (); return -1; } -#ifdef NDBM - /* - * Update the DBM group file with the new entry as well. - */ - if (!sg_dbm_update (nsgrp)) { - fprintf (stderr, - _("%s: cannot add new dbm group entry\n"), - Prog); - SYSLOG ((LOG_ERR, - "error adding dbm shadow group entry")); - sgr_unlock (); - return -1; - } -#endif /* NDBM */ } -#ifdef NDBM - endsgent (); -#endif /* NDBM */ + if (!sgr_close ()) { fprintf (stderr, - _("%s: cannot rewrite shadow group file\n"), - Prog); + _("%s: cannot rewrite shadow group file\n"), Prog); sgr_unlock (); return -1; } @@ -738,8 +679,7 @@ static long get_number (const char *cp) if (*cp != '\0' && *ep == '\0') /* valid number */ return val; - fprintf (stderr, _("%s: invalid numeric argument `%s'\n"), Prog, - cp); + fprintf (stderr, _("%s: invalid numeric argument `%s'\n"), Prog, cp); exit (E_BAD_ARG); } @@ -752,8 +692,7 @@ static uid_t get_id (const char *cp) if (*cp != '\0' && *ep == '\0') /* valid number */ return val; - fprintf (stderr, _("%s: invalid numeric argument `%s'\n"), Prog, - cp); + fprintf (stderr, _("%s: invalid numeric argument `%s'\n"), Prog, cp); exit (E_BAD_ARG); } @@ -800,8 +739,7 @@ static void process_flags (int argc, char **argv) Prog, user_name); if (!yp_get_default_domain (&nis_domain) && - !yp_master (nis_domain, "passwd.byname", - &nis_master)) { + !yp_master (nis_domain, "passwd.byname", &nis_master)) { fprintf (stderr, _("%s: %s is the NIS master\n"), Prog, nis_master); } @@ -978,8 +916,7 @@ static void process_flags (int argc, char **argv) uflg = oflg = 0; if (lflg && getpwnam (user_newname)) { - fprintf (stderr, _("%s: user %s exists\n"), Prog, - user_newname); + fprintf (stderr, _("%s: user %s exists\n"), Prog, user_newname); exit (E_NAME_IN_USE); } @@ -1000,15 +937,13 @@ static void process_flags (int argc, char **argv) static void close_files (void) { if (!pw_close ()) { - fprintf (stderr, _("%s: cannot rewrite password file\n"), - Prog); + fprintf (stderr, _("%s: cannot rewrite password file\n"), Prog); fail_exit (E_PW_UPDATE); } #ifdef SHADOWPWD if (is_shadow_pwd && !spw_close ()) { fprintf (stderr, - _("%s: cannot rewrite shadow password file\n"), - Prog); + _("%s: cannot rewrite shadow password file\n"), Prog); fail_exit (E_PW_UPDATE); } #endif @@ -1041,26 +976,22 @@ static void close_files (void) static void open_files (void) { if (!pw_lock ()) { - fprintf (stderr, _("%s: unable to lock password file\n"), - Prog); + fprintf (stderr, _("%s: unable to lock password file\n"), Prog); exit (E_PW_UPDATE); } if (!pw_open (O_RDWR)) { - fprintf (stderr, _("%s: unable to open password file\n"), - Prog); + fprintf (stderr, _("%s: unable to open password file\n"), Prog); fail_exit (E_PW_UPDATE); } #ifdef SHADOWPWD if (is_shadow_pwd && !spw_lock ()) { fprintf (stderr, - _("%s: cannot lock shadow password file\n"), - Prog); + _("%s: cannot lock shadow password file\n"), Prog); fail_exit (E_PW_UPDATE); } if (is_shadow_pwd && !spw_open (O_RDWR)) { fprintf (stderr, - _("%s: cannot open shadow password file\n"), - Prog); + _("%s: cannot open shadow password file\n"), Prog); fail_exit (E_PW_UPDATE); } #endif @@ -1123,25 +1054,6 @@ static void usr_update (void) Prog); fail_exit (E_PW_UPDATE); } -#ifdef NDBM - if (pw_dbm_present ()) { - if (!pw_dbm_update (&pwent)) { - fprintf (stderr, - _ - ("%s: error adding password dbm entry\n"), - Prog); - fail_exit (E_PW_UPDATE); - } - if (lflg && (pwd = getpwnam (user_name)) && - !pw_dbm_remove (pwd)) { - fprintf (stderr, - _ - ("%s: error removing passwd dbm entry\n"), - Prog); - fail_exit (E_PW_UPDATE); - } - } -#endif } #ifdef SHADOWPWD if (spwd && (lflg || eflg || fflg || pflg || Lflg || Uflg)) { @@ -1160,24 +1072,6 @@ static void usr_update (void) fail_exit (E_PW_UPDATE); } } -#ifdef NDBM - if (spwd && sp_dbm_present ()) { - if (!sp_dbm_update (&spent)) { - fprintf (stderr, - _ - ("%s: error updating shadow passwd dbm entry\n"), - Prog); - fail_exit (E_PW_UPDATE); - } - if (lflg && !sp_dbm_remove (user_name)) { - fprintf (stderr, - _ - ("%s: error removing shadow passwd dbm entry\n"), - Prog); - fail_exit (E_PW_UPDATE); - } - } -#endif /* NDBM */ #endif /* SHADOWPWD */ } @@ -1206,15 +1100,13 @@ static void move_home (void) fail_exit (E_HOMEDIR); } else if (rename (user_home, user_newhome)) { if (errno == EXDEV) { - if (mkdir - (user_newhome, sb.st_mode & 0777)) { + if (mkdir (user_newhome, sb.st_mode & 0777)) { fprintf (stderr, _ ("%s: can't create %s\n"), Prog, user_newhome); } - if (chown (user_newhome, - sb.st_uid, sb.st_gid)) { + if (chown (user_newhome, sb.st_uid, sb.st_gid)) { fprintf (stderr, _("%s: can't chown %s\n"), Prog, user_newhome); @@ -1263,8 +1155,7 @@ static void update_files (void) if ((fd = open (LASTLOG_FILE, O_RDWR)) != -1) { lseek (fd, (off_t) user_id * sizeof ll, SEEK_SET); if (read (fd, (char *) &ll, sizeof ll) == sizeof ll) { - lseek (fd, (off_t) user_newid * sizeof ll, - SEEK_SET); + lseek (fd, (off_t) user_newid * sizeof ll, SEEK_SET); write (fd, (char *) &ll, sizeof ll); } close (fd); @@ -1277,8 +1168,7 @@ static void update_files (void) if ((fd = open (FAILLOG_FILE, O_RDWR)) != -1) { lseek (fd, (off_t) user_id * sizeof fl, SEEK_SET); if (read (fd, (char *) &fl, sizeof fl) == sizeof fl) { - lseek (fd, (off_t) user_newid * sizeof fl, - SEEK_SET); + lseek (fd, (off_t) user_newid * sizeof fl, SEEK_SET); write (fd, (char *) &fl, sizeof fl); } close (fd); @@ -1383,7 +1273,7 @@ int main (int argc, char **argv) user_groups = malloc ((1 + sys_ngroups) * sizeof (char *)); user_groups[0] = (char *) 0; - OPENLOG("usermod"); + OPENLOG ("usermod"); #ifdef SHADOWPWD is_shadow_pwd = spw_file_present (); @@ -1403,8 +1293,7 @@ int main (int argc, char **argv) } if (retval == PAM_SUCCESS) { - retval = - pam_start ("usermod", pampw->pw_name, &conv, &pamh); + retval = pam_start ("usermod", pampw->pw_name, &conv, &pamh); } if (retval == PAM_SUCCESS) { @@ -1422,30 +1311,11 @@ int main (int argc, char **argv) } if (retval != PAM_SUCCESS) { - fprintf (stderr, _("%s: PAM authentication failed\n"), - Prog); + fprintf (stderr, _("%s: PAM authentication failed\n"), Prog); exit (1); } - - OPENLOG ("usermod"); #endif /* USE_PAM */ - /* - * The open routines for the NDBM files don't use read-write as the - * mode, so we have to clue them in. - */ - -#ifdef NDBM - pw_dbm_mode = O_RDWR; -#ifdef SHADOWPWD - sp_dbm_mode = O_RDWR; -#endif - gr_dbm_mode = O_RDWR; -#ifdef SHADOWGRP - sg_dbm_mode = O_RDWR; -#endif -#endif /* NDBM */ - /* * Do the hard stuff - open the files, change the user entries, * change the home directory, then close and update the files. @@ -1495,7 +1365,7 @@ int main (int argc, char **argv) } if (retval != PAM_SUCCESS) { - fprintf (stderr, _("%s: PAM chauthtok failed\n"), Prog); + fprintf (stderr, _("%s: PAM authentication failed\n"), Prog); exit (1); } diff --git a/src/vipw.c b/src/vipw.c index 69778993..f40a2675 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.8 2004/12/20 02:19:30 kloczek Exp $") +RCSID (PKG_VER "$Id: vipw.c,v 1.10 2005/04/13 22:59:18 kloczek Exp $") #include "defines.h" #include #include @@ -48,8 +48,7 @@ static int create_backup_file (FILE *, const char *, struct stat *); static void vipwexit (const char *, int, int); static void vipwedit (const char *, int (*)(void), int (*)(void)); -static int -create_backup_file (FILE * fp, const char *backup, struct stat *sb) +static int create_backup_file (FILE * fp, const char *backup, struct stat *sb) { struct utimbuf ub; FILE *bkfp; @@ -63,12 +62,12 @@ create_backup_file (FILE * fp, const char *backup, struct stat *sb) return -1; c = 0; - if (fseeko(fp, 0, SEEK_SET) == 0) - while ((c = getc(fp)) != EOF) { - if (putc(c, bkfp) == EOF) + if (fseeko (fp, 0, SEEK_SET) == 0) + while ((c = getc (fp)) != EOF) { + if (putc (c, bkfp) == EOF) break; } - if (c != EOF || ferror(fp) || fflush(bkfp)) { + if (c != EOF || ferror (fp) || fflush (bkfp)) { fclose (bkfp); unlink (backup); return -1; @@ -94,10 +93,10 @@ static void vipwexit (const char *msg, int syserr, int ret) { int err = errno; - if (filelocked) - (*unlock) (); if (createedit) unlink (fileeditname); + if (filelocked) + (*unlock) (); if (msg) fprintf (stderr, "%s: %s", progname, msg); if (syserr) @@ -111,8 +110,7 @@ static void vipwexit (const char *msg, int syserr, int ret) #endif static void -vipwedit (const char *file, int (*file_lock) (void), - int (*file_unlock) (void)) +vipwedit (const char *file, int (*file_lock) (void), int (*file_unlock) (void)) { const char *editor; pid_t pid; @@ -155,9 +153,7 @@ vipwedit (const char *file, int (*file_lock) (void), command line args in the EDITOR and VISUAL environment vars */ char *buf; - buf = - (char *) malloc (strlen (editor) + strlen (fileedit) + - 2); + buf = (char *) malloc (strlen (editor) + strlen (fileedit) + 2); snprintf (buf, strlen (editor) + strlen (fileedit) + 2, "%s %s", editor, fileedit); if (system (buf) != 0) {