From: nekral-guest Date: Sun, 7 Oct 2007 11:47:22 +0000 (+0000) Subject: [svn-upgrade] Integrating new upstream version, shadow (4.0.15) X-Git-Tag: 4.0.15~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=591830e43bae98cf9f32858b887496cc9dfcb4cd;p=shadow [svn-upgrade] Integrating new upstream version, shadow (4.0.15) --- diff --git a/ChangeLog b/ChangeLog index d5c13e4d..d459f8bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,389 @@ +2006-03-13 Tomasz K³oczko + + * po/it.po: + updated for 4.0.15 (by Danilo Piazzalunga ). + +2006-03-12 Tomasz K³oczko + + * NEWS, po/nb.po: + updated for 4.0.15 (by Bjørn Steensrud ). + + * po/pt.po: + updated for 4.0.15 (by Miguel Figueiredo ). + + * man/Makefile.am, NEWS, configure.in: + do not install translated man pages if shadow is configured with --disable-nls + (based patch submited by Mike Frysinger ). + + * NEWS, po/pt_BR.po: + updated for 4.0.15 (by Andre Luis Lopes ). + + * po/fr.po: + updated for 4.0.15 (by Jean-Luc Coulon (f5ibh) ). + +2006-03-11 Tomasz K³oczko + + * NEWS, configure.in, lib/pwauth.c: + added fixes for detect BSD's S/Key with updated the skeychallenge() function + for take a fourth argument in case BSD version + (patch submited by Mike Frysinger ) + + * README: added paragragraph about S/Key support. + + * po/sk.po: updated for 4.0.15 (by Peter Mann ). + + * NEWS: newgrp: do not link with libselinux. + + * NEWS, po/zh_CN.po: + updated for 4.0.15 (by Carlos Z.F. Liu ). + + * po/ru.po: updated for 4.0.15 (by Yuri Kozlov ). + + * src/Makefile.am: + removed $(LIBSELINUX) from newgrp_LDADD (newgrp does not need to be linked + with SELinux libraries). + + * man/ru/chsh.1, man/ru/expiry.1, man/ru/faillog.5, man/ru/faillog.8, man/ru/gpasswd.1, man/ru/groupadd.8, man/ru/groupdel.8, man/ru/groupmems.8, man/ru/groupmod.8, man/ru/groups.1, man/ru/grpck.8, man/ru/gshadow.5, man/ru/id.1, man/ru/lastlog.8, man/ru/limits.5, man/ru/login.1, man/ru/login.access.5, man/ru/login.defs.5, man/ru/logoutd.8, man/ru/newgrp.1, man/ru/newusers.8, man/ru/nologin.8, man/ru/passwd.1, man/ru/passwd.5, man/ru/porttime.5, man/ru/pw_auth.3, man/ru/pwck.8, man/ru/pwconv.8, man/ru/sg.1, man/ru/shadow.3, man/ru/shadow.5, man/ru/su.1, man/ru/suauth.5, man/ru/sulogin.8, man/ru/useradd.8, man/ru/userdel.8, man/ru/usermod.8, man/ru/vipw.8, NEWS, man/ru/Makefile.am, man/ru/chage.1, man/ru/chfn.1, man/ru/chpasswd.8: + ru man pages: added new nologin(8) and updated all other man pages + (by Yuri Kozlov ). + +2006-03-09 Tomasz K³oczko + + * NEWS, po/nl.po: + updated for 4.0.15 (by cobaco (aka Bart Cornelis) ). + + * po/vi.po: + updated for 4.0.15 (by Clytie Siddall ). + + * po/sv.po: + updated for 4.0.15 (by Daniel Nylander ). + +2006-03-08 Tomasz K³oczko + + * po/eu.po: updated for 4.0.15 (by pi ). + + * po/ro.po: cleanups. + + * NEWS, po/tl.po: + updated for 4.0.15 (by eric pareja ). + + * po/ro.po: updated for 4.0.15 (by Sorin B. ). + + * NEWS, po/es.po: + updated for 4.0.15 (by Ruben Porras ). + +2006-03-07 Tomasz K³oczko + + * NEWS, po/da.po: + updated for 4.0.15 (by Claus Hindsgaul ). + + * NEWS, man/fi/chsh.1, man/fi/su.1: + update fi chsh(1), su(1) man pages generated from XML files + (Tommi Vainikainen ). + + * NEWS, po/fi.po: + updated for 4.0.15 (by Tommi Vainikainen ). + + * NEWS, po/cs.po: + updated for 4.0.15 (by Miroslav Kure ). + + * NEWS, man/cs/Makefile.am, man/cs/expiry.1, man/cs/faillog.5, man/cs/faillog.8, man/cs/gpasswd.1, man/cs/groupadd.8, man/cs/groupdel.8, man/cs/logoutd.8, man/cs/nologin.8, man/cs/vipw.8: + added new cs man pages: expiry(1), faillog(5), faillog(8), gpasswd(1), + groupadd(8), groupdel(8), logoutd(8), nologin(8), vipw(8). + + * NEWS: typo. + + * src/useradd.c, NEWS, lib/getdef.h, man/login.defs.5, man/login.defs.5.xml, src/login.c, src/newusers.c: + default UMASK if not specified in login.defs is 022. + +2006-03-06 Tomasz K³oczko + + * po/pl.po: updated for 4.0.15. + + * NEWS, po/gl.po: + updated for 4.0.15 (by Jacobo Tarrio ). + + * NEWS, configure.in: schedule release 4.0.15 to 13-03-2006. + +2006-03-05 Tomasz K³oczko + + * NEWS: typo (s/onas Meurer/Jonas Meurer/) + + * src/.cvsignore: added chgpasswd. + + * po/sk.po, po/sq.po, po/sv.po, po/tl.po, po/tr.po, po/uk.po, po/vi.po, po/zh_CN.po, po/zh_TW.po, src/Makefile.am, src/chgpasswd.c, NEWS, po/POTFILES.in, 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/gl.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: + chgpasswd: new tool (by onas Meurer ). + + * src/lastlog.c, po/bs.po, po/ca.po, po/cs.po, po/da.po, po/de.po, po/el.po, po/es.po, po/eu.po, po/fi.po, po/fr.po, po/gl.po, po/he.po, po/id.po, po/it.po, po/ja.po, po/ko.po, po/nb.po, po/nl.po, po/nn.po, po/pl.po, po/pt.po, po/pt_BR.po, po/ro.po, po/ru.po, po/sk.po, po/sq.po, po/sv.po, po/tl.po, po/tr.po, po/uk.po, po/vi.po, po/zh_CN.po, po/zh_TW.po: + s/Unexpected/unexpected/ + + * po/fr.po, po/gl.po, po/he.po, po/id.po, po/it.po, po/ja.po, po/ko.po, po/nb.po, po/nl.po, po/nn.po, po/pl.po, po/pt.po, po/pt_BR.po, po/ro.po, po/ru.po, po/sk.po, po/sq.po, po/sv.po, po/tl.po, po/tr.po, po/uk.po, po/vi.po, po/zh_CN.po, po/zh_TW.po, src/lastlog.c, NEWS, po/bs.po, po/ca.po, po/cs.po, po/da.po, po/de.po, po/el.po, po/es.po, po/eu.po, po/fi.po: + print the usage and exit if an additional argument is profided to + lastlog (merge 488_laslog_verify_arguments Debian patch). + +2006-03-02 Tomasz K³oczko + + * man/chpasswd.8, man/chpasswd.8.xml: + fixed CAVEATS section (by Justin Pryzby ) + +2006-02-28 Tomasz K³oczko + + * man/passwd.1, man/passwd.1.xml: + fixed SYNOPSIS section (http://bugs.debian.org/352136). + +2006-02-23 Tomasz K³oczko + + * po/ro.po: updated (by Sorin Batariuc ). + +2006-02-21 Tomasz K³oczko + + * NEWS, lib/Makefile.am, src/Makefile.am: + login, nologin, su: do not link with libselinux + (merge 490_link_selinux_only_when_needed Debian patch). + + * NEWS, src/chage.c, src/chfn.c, src/chsh.c, src/passwd.c: + fixed confusing error message if /proc is not mounted + (http://bugs.debian.org/352494 + patch Nicolas François ) + + * po/ro.po: + updated (commited http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=347755). + + * NEWS, po/ca.po: updated (by Jordi Mallach ). + +2006-02-20 Tomasz K³oczko + + * man/gpasswd.1.xml, man/passwd.1.xml, man/passwd.5.xml, man/pwck.8.xml, man/sg.1.xml, man/useradd.8.xml: + cleanups. + + * po/gl.po: updated (Jacobo Tarrio ). + + * NEWS, po/pt.po: + updated (by Miguel Figueiredo ). + +2006-02-15 Tomasz K³oczko + + * NEWS, po/it.po: + update (by Danilo Piazzalunga ). + + * po/vi.po: update (by Clytie Siddall ). + + * po/sv.po: updated (by Daniel Nylander ). + +2006-02-09 Tomasz K³oczko + + * po/fr.po: updated (by Christian Perrier ). + + * po/bs.po, po/ca.po, po/cs.po, po/da.po, po/de.po, po/el.po, po/es.po, po/fi.po, po/fr.po, po/gl.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/sq.po, po/sv.po, po/tl.po, po/tr.po, po/uk.po, po/vi.po, po/zh_CN.po, po/zh_TW.po: + run "make update-po". + + * po/pl.po: updated. + + * po/sk.po: updated (by Peter Mann ). + + * po/eu.po: update (by ^pi^ ). + +2006-02-08 Tomasz K³oczko + + * NEWS, src/login.c: + merge 433_login_more_LOG_UNKFAIL_ENAB Debian patch: + - TOO MANY LOGIN... logged if PAM_MAXTRIES or failcount >= retries + (was onl test PAM_MAXTRIES), + - print to stderr (in addition to syslog) in case of maximum number of + tries exceeded, + - always prints the number of tries in the syslog entry. + - add special handling for PAM_ABORT + - add an entry to failog, as when USE_PAM is not defined. (#53164) + - changed pam_end to PAM_END. This is certainly was a mistake. + PAM_END is pam_close_seesion + pam_end. Here, the session is still not + open, we don't have to close it. + - a HAVE_PAM_FAIL_DELAY is missing + + * po/ro.po: kill one fuzzy. + + * po/ro.po, NEWS: updated (by Sorin B. ). + + * src/gpasswd.c: s/die/catch_signals/ + + * src/expiry.c, src/sulogin.c: s/catch/catch_signals/ + + * src/su.c: /su_catch_sig/chatch_signals/ + +2006-02-07 Tomasz K³oczko + + * src/id.c, src/groups.c, libmisc/getdate.y: lint code using CC=g++. + + * NEWS, src/su.c: + fixed pam session support (patch from Topi Miettinen; fixed #57526, #55873, + #57532 Debian bugs). + + * NEWS: + fixed pam session support (patch from Topi Miettinen; fixed #57526, + #55873, #57532 Debian bugs). + + * NEWS, src/userdel.c: + user's group is already removed by update_groups(). remove_group() + is not needed (bug introduced in 4.0.14 on merge FC fixes). Fixed by Nicolas + François + + * NEWS, src/useradd.c: allways remove group and gshadow databases lock, + Fixed by Nicolas François + (http://bugs.debian.org/348250) + + * NEWS, src/userdel.c: fixed excess audit_logger() argument. + + * NEWS, lib/prototypes.h: + corrected prototypes in lib/prototypes.h (thre is no audit_help_log(); added + audit_logger() prototype). + + * src/login.c: fixed missing ";" in declaration. + + * man/limits.5, man/limits.5.xml: + fixed example limits string (by Yuri Kozlov ). + +2006-02-06 Tomasz K³oczko + + * NEWS, po/ro.po, po/ru.po, po/sk.po, po/sq.po, po/sv.po, po/tl.po, po/tr.po, po/uk.po, po/vi.po, po/zh_CN.po, po/zh_TW.po, src/chage.c, po/bs.po, po/ca.po, po/cs.po, po/da.po, po/de.po, po/el.po, po/es.po, po/eu.po, po/fi.po, po/fr.po, po/gl.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: + added missing \n on display password status if password must be chaged. + +2006-02-04 Tomasz K³oczko + + * src/useradd.c, NEWS: + fixed allow non-unique UID (http://bugs.debian.org/351281). + +2006-02-01 Tomasz K³oczko + + * po/cs.po: updated (by Miroslav Kure ). + +2006-01-27 Tomasz K³oczko + + * NEWS, po/vi.po: + updated (by Clytie Siddall ). + +2006-01-26 Tomasz K³oczko + + * po/fr.po: + typo (fixed by Christian Perrier ). + + * po/sk.po: updated (by Peter Mann ). + +2006-01-25 Tomasz K³oczko + + * man/pl/grpck.8, man/pl/login.defs.5, man/pl/passwd.1, man/pl/pwck.8, man/de/passwd.1, man/es/login.1, man/es/vipw.8, man/fi/passwd.1, man/hu/passwd.1, man/id/login.1, man/it/grpck.8, man/it/pwck.8, man/ja/grpck.8, man/ja/passwd.1, man/ja/pwck.8, man/ko/login.1, man/ko/su.1: + fixes some issues that cause warnings when the manpages are + displayed (by Nicolas François ). + +2006-01-23 Tomasz K³oczko + + * NEWS, po/eu.po: updated (by pi ). + + * libmisc/addgrps.c, libmisc/xmalloc.c, src/groups.c: + fixes after linting code using CC=g++: cast {m,re}alloc() return value to + proper type. + +2006-01-22 Tomasz K³oczko + + * man/chage.1, man/chage.1.xml, man/passwd.5, man/passwd.5.xml, man/su.1, man/su.1.xml, man/useradd.8, man/useradd.8.xml: + uniformity and grammar fixes (by Christine Spang ). + + * NEWS, po/ru.po: updated (by Yuri Kozlov ). + +2006-01-20 Tomasz K³oczko + + * po/fr.po, NEWS: + updated (by Christian Perrier ). + +2006-01-18 Tomasz K³oczko + + * NEWS, libmisc/setupenv.c, src/chage.c, src/chsh.c, src/gpasswd.c, src/groupadd.c, src/groupdel.c, src/grpck.c, src/grpconv.c, src/grpunconv.c, src/login.c, src/newgrp.c, src/newusers.c, src/passwd.c, src/pwck.c, src/pwconv.c, src/usermod.c, src/vipw.c: + variouse code cleanups for make possible compilation of shadow with + -Wall -Werror (by Alexander Gattin ). + + * libmisc/age.c, libmisc/shell.c, src/login.c, src/newgrp.c, src/su.c, src/sulogin.c, src/userdel.c, NEWS, lib/prototypes.h: + move exit() outside libmisc/shell.c::shell() for handle shell() errors + on higher level (now is better visable where some programs exit with 126 and + 127 exit codes); added new shell() parameter (char *const envp[]) which allow + fix preserving enviloment in su on using -p. + (patch by Alexander Gattin ) + + * NEWS, po/el.po: + updated (by Konstantinos Margaritis ). + +2006-01-17 Tomasz K³oczko + + * lib/exitcodes.h: new #defines: + #define E_CMD_NOEXEC 126 /* can't run command/shell */ + #define E_CMD_NOTFOUND 127 /* can't find command/shell to run */ + +2006-01-16 Tomasz K³oczko + + * man/passwd.1, man/passwd.1.xml: + fixes after reviewed for grammatical and other small errors that detract from the + polish of the content to native English speakers. + I also went ahead and changed all gender references to be a consistent + "his/her" (or equivalent) - the original had a mix of just "his", just + "her", and occasionally "his/her". + (by Christine Spang ). + + * po/it.po: updated (by Danilo Piazzalunga ). + +2006-01-14 Tomasz K³oczko + + * NEWS: updated. + + * libmisc/shell.c: remove DEBUG code. + + * po/LINGUAS, po/gl.po, NEWS: + added new gl translation (by Jacobo Tarrio ). + +2006-01-12 Tomasz K³oczko + + * po/eu.po: small update (by pi ). + +2006-01-10 Tomasz K³oczko + + * src/su.c: fixed compilation error. + +2006-01-08 Tomasz K³oczko + + * po/sv.po: updated (by Daniel Nylander ) + http://bugs.debian.org/346449 + +2006-01-07 Tomasz K³oczko + + * NEWS, man/useradd.8, man/useradd.8.xml: + better document useradd -d option: will not add the user's home directory + if it does not already exist (http://bugs.debian.org/154996) + + * man/su.1, man/su.1.xml, po/zh_CN.po, po/zh_TW.po, NEWS, po/bs.po, po/ca.po, po/cs.po, po/da.po, po/de.po, po/el.po, po/es.po, po/eu.po, po/fi.po, po/fr.po, po/he.po, po/id.po, po/it.po, po/ja.po, po/ko.po, po/nb.po, po/nl.po, po/nn.po, po/pl.po, po/pt.po, po/pt_BR.po, po/ro.po, po/ru.po, po/sk.po, po/sq.po, po/sv.po, po/tl.po, po/tr.po, po/uk.po, po/vi.po, src/su.c: + added handle -c,--command option for GNU su compliance (merge + 437_su_-c_option Debian Patch). + + * man/login.1, man/login.1.xml, man/passwd.1, man/passwd.1.xml, man/su.1, man/su.1.xml: + man pages cleanups. + (http://bugs.debian.org/341489) + + * NEWS, man/Makefile.am, man/nologin.8, man/nologin.8.xml: + nologin(8) man pages added (merge 478_nologin.8.xml Debian patch). + + * po/sk.po: updated (by Peter Mann ) + http://bugs.debian.org/346376 + +2006-01-06 Tomasz K³oczko + + * po/id.po: updated (by Parlin Imanuel ) + http://bugs.debian.org/345514 + + * NEWS, po/bs.po, po/ca.po, po/cs.po, po/da.po, po/de.po, po/el.po, po/es.po, po/eu.po, po/fi.po, po/fr.po, po/he.po, po/id.po, po/it.po, po/ja.po, po/ko.po, po/nb.po, po/nl.po, po/nn.po, po/pl.po, po/pt.po, po/pt_BR.po, po/ro.po, po/ru.po, po/sk.po, po/sq.po, po/sv.po, po/tl.po, po/tr.po, po/uk.po, po/vi.po, po/zh_CN.po, po/zh_TW.po, src/login.c: + added translate login prompt string (suggested by Evgeniy Dushistov). + +2006-01-05 Tomasz K³oczko + + * NEWS, configure.in: start work on 4.1.0. + + * po/sv.po: updated (by Daniel Nylander ). + http://bugs.debian.org/346017 + 2006-01-03 Tomasz K³oczko * NEWS: correct 4.0.14 release date (03-01-2006). diff --git a/Makefile.in b/Makefile.in index 0be4306d..e360b987 100644 --- a/Makefile.in +++ b/Makefile.in @@ -150,6 +150,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ USE_NLS = @USE_NLS@ +USE_NLS_FALSE = @USE_NLS_FALSE@ +USE_NLS_TRUE = @USE_NLS_TRUE@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XMLCATALOG = @XMLCATALOG@ diff --git a/NEWS b/NEWS index 7eff29cf..0c557b67 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,78 @@ -$Id: NEWS,v 1.331 2006/01/03 16:45:47 kloczek Exp $ +$Id: NEWS,v 1.382 2006/03/12 22:35:35 kloczek Exp $ + +shadow-4.0.14 -> shadow-4.0.15 13-03-2006 + +*** general: +- do not install translated man pages if shadow is configured with + --disable-nls + (based patch submited by Mike Frysinger ), +- added fixes for detect BSD's S/Key with updated the skeychallenge() + function for take a fourth argument in case BSD version (patch submited by + Mike Frysinger ), +- login: default UMASK if not specified in login.defs is 022 (pointed by + Peter Vrabec ), +- chgpasswd: new tool (by Jonas Meurer ), +- lastlog: print the usage and exit if an additional argument is profided to + lastlog (merge 488_laslog_verify_arguments Debian patch), +- login, newgrp, nologin, su: do not link with libselinux (merge + 490_link_selinux_only_when_needed Debian patch), +- chage, chfn, chsh, passwd: fixed confusing error message if /proc is not + mounted (http://bugs.debian.org/352494 patch Nicolas François + ), +- login (merge 433_login_more_LOG_UNKFAIL_ENAB Debian patch): + - TOO MANY LOGIN... logged if PAM_MAXTRIES or failcount >= retries (was + onl test PAM_MAXTRIES), + - print to stderr (in addition to syslog) in case of maximum number of + tries exceeded, + - always prints the number of tries in the syslog entry. + - add special handling for PAM_ABORT + - add an entry to failog, as when USE_PAM is not defined. (#53164) + - changed pam_end to PAM_END. This is certainly was a mistake. PAM_END is + pam_close_seesion + pam_end. Here, the session is still not open, we + don't have to close it. + - a HAVE_PAM_FAIL_DELAY is missing, +- su: fixed pam session support (patch from Topi Miettinen; fixed #57526, + #55873, 57532 Debian bugs), +- userdel: user's group is already removed by update_groups(). + remove_group() is not needed (bug introduced in 4.0.14 on merge FC fixes). + Fixed by Nicolas François , +- useradd: allways remove group and gshadow databases lock, Fixed by Nicolas + François + (http://bugs.debian.org/348250) +- auditing fixes: + - corrected prototypes in lib/prototypes.h (thre is no audit_help_log(); + added audit_logger() prototype), + - useradd: fixed excess audit_logger() argument, +- chage: added missing \n on display password status if password must be + chaged, +- useradd: fixed allow non-unique UID (http://bugs.debian.org/351281), +- variouse code cleanups for make possible compilation of shadow with -Wall + -Werror (by Alexander Gattin ), +- su: move exit() outside libmisc/shell.c::shell() for handle shell() errors + on higher level (now is better visable where some programs exit with 126 + and 127 exit codes); added new shell() parameter (char *const envp[]) + which allow fix preserving enviloment in su on using -p, (patch by + Alexander Gattin ), +- su: added handle -c,--command option for GNU su compliance (merge + 437_su_-c_option Debian patch), +- login: added translate login prompt string (suggested by Evgeniy + Dushistov), +- updated translations: ca, cs, da, el, es, eu, gl, fi, fr, it, nb, nl, pt, + pt_BR, ro, ru, sk, sv, tl, vi, zh_CN, +- new translations: gl. +*** documentation: +- ru man pages: added new nologin(8) and updated all other man pages (by + Yuri Kozlov ), +- chsh(1), su(1): update fi translations generated from XML files + (Tommi Vainikainen ), +- expiry(1), faillog(5), faillog(8), gpasswd(1), groupadd(8), groupdel(8), + logoutd(8), nologin(8), vipw(8): added new cs man pages, (by Miroslav Kure + ) +- login.defs(5): default UMASK if not specified in login.defs is 022 + (pointed by Peter Vrabec ), +- useradd(8): better document that -d will not add the user's home directory + if it does not already exist (http://bugs.debian.org/154996), +- nologin(8) man pages added (merge 478_nologin.8.xml Debian patch). shadow-4.0.13 -> shadow-4.0.14 03-01-2006 @@ -36,7 +110,8 @@ shadow-4.0.13 -> shadow-4.0.14 03-01-2006 http://bugs.debian.org/11189), - su, vipw: rewrited for use getopt_long(), - su: log successful/failed through syslog (http://bugs.debian.org/190215), -- updated translations: ca, cs, da, eu, fi, fr, it, pl, pt, ru, sv, tl, vi. +- updated translations: ca, cs, da, eu, fi, fr, it, pl, pt, ru, sv, tl, vi, +- new translations: gl. *** documentation: - added es, ko vigr(8) and vipw(8), hu lastlog(8), ko vipw(8), zh_CN su(1), zh_TW chpasswd(8) and su(1), diff --git a/README b/README index 8013efb4..e8d3cfc4 100644 --- a/README +++ b/README @@ -22,6 +22,13 @@ Mailing lists archives: shadow@pld.org.pl - http://mail.pld.org.pl/mailman/pipermail/shadow/ shadow-commit@pld.org.pl - http://mail.pld.org.pl/mailman/pipermail/shadow-commit/ +S/Key support: + Shadow can be builded with S/Key support using S/Key support from: + + http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libskey/ + and + http://rsync1.it.gentoo.org/gentoo/distfiles/skey-1.1.5.tar.bz2 + Authors and contributors ======================== diff --git a/config.h.in b/config.h.in index 5f4b0496..18ecd046 100644 --- a/config.h.in +++ b/config.h.in @@ -320,6 +320,9 @@ /* Define to support S/Key logins. */ #undef SKEY +/* Define to support newer BSD S/Key API */ +#undef SKEY_BSD_STYLE + /* Define to 1 if the `S_IS*' macros in do not work properly. */ #undef STAT_MACROS_BROKEN diff --git a/configure b/configure index 794c8ec8..22981a2a 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 XSLTPROC XML_CATALOG_FILE XMLCATALOG ENABLE_REGENERATE_MAN_TRUE ENABLE_REGENERATE_MAN_FALSE LIBCRYPT LIBAUDIT LIBCRACK LIBSELINUX LIBPAM LIBSKEY LIBMD MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S YACC CPP EGREP U ANSI2KNR build build_cpu build_vendor build_os host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS XSLTPROC XML_CATALOG_FILE XMLCATALOG ENABLE_REGENERATE_MAN_TRUE ENABLE_REGENERATE_MAN_FALSE LIBCRYPT LIBAUDIT LIBCRACK LIBSELINUX LIBPAM LIBSKEY LIBMD MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB USE_NLS_TRUE USE_NLS_FALSE LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1822,7 +1822,7 @@ fi # Define the identity of the package. PACKAGE=shadow - VERSION=4.0.14 + VERSION=4.0.15 cat >>confdefs.h <<_ACEOF @@ -23836,6 +23836,59 @@ cat >>confdefs.h <<\_ACEOF #define SKEY 1 _ACEOF + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + #include + +int +main () +{ + + skeychallenge((void*)0, (void*)0, (void*)0, 0); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 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_objext' + { (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 + +cat >>confdefs.h <<\_ACEOF +#define SKEY_BSD_STYLE 1 +_ACEOF + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -25721,6 +25774,16 @@ _ACEOF + +if test "x$USE_NLS" = "xyes"; then + USE_NLS_TRUE= + USE_NLS_FALSE='#' +else + USE_NLS_TRUE='#' + USE_NLS_FALSE= +fi + + ac_config_files="$ac_config_files Makefile po/Makefile.in doc/Makefile man/Makefile man/cs/Makefile man/de/Makefile man/es/Makefile man/fi/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/tr/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 @@ -25849,6 +25912,13 @@ echo "$as_me: error: conditional \"ENABLE_REGENERATE_MAN\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${USE_NLS_TRUE}" && test -z "${USE_NLS_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"USE_NLS\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"USE_NLS\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -26512,6 +26582,8 @@ s,@INTLLIBS@,$INTLLIBS,;t t s,@LIBINTL@,$LIBINTL,;t t s,@LTLIBINTL@,$LTLIBINTL,;t t s,@POSUB@,$POSUB,;t t +s,@USE_NLS_TRUE@,$USE_NLS_TRUE,;t t +s,@USE_NLS_FALSE@,$USE_NLS_FALSE,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF diff --git a/configure.in b/configure.in index de9b27e3..5ce5b6c9 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT -AM_INIT_AUTOMAKE(shadow, 4.0.14) +AM_INIT_AUTOMAKE(shadow, 4.0.15) AC_CONFIG_HEADERS([config.h]) dnl Some hacks... @@ -324,10 +324,17 @@ if test "$with_skey" = "yes"; then AC_CHECK_LIB(skey, skeychallenge, [LIBSKEY=-lskey], [AC_MSG_ERROR([liskey missing. You can download S/Key source code from http://rsync1.it.gentoo.org/gentoo/distfiles/skey-1.1.5.tar.bz2])]) AC_DEFINE(SKEY, 1, [Define to support S/Key logins.]) + AC_TRY_COMPILE([ + #include + #include + ],[ + skeychallenge((void*)0, (void*)0, (void*)0, 0); + ],[AC_DEFINE(SKEY_BSD_STYLE, 1, [Define to support newer BSD S/Key API])]) fi AM_GNU_GETTEXT_VERSION(0.12.1) AM_GNU_GETTEXT([external], [need-ngettext]) +AM_CONDITIONAL(USE_NLS, test "x$USE_NLS" = "xyes") AC_CONFIG_FILES([ Makefile diff --git a/contrib/Makefile.in b/contrib/Makefile.in index 7a945567..de0df9f2 100644 --- a/contrib/Makefile.in +++ b/contrib/Makefile.in @@ -128,6 +128,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ USE_NLS = @USE_NLS@ +USE_NLS_FALSE = @USE_NLS_FALSE@ +USE_NLS_TRUE = @USE_NLS_TRUE@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XMLCATALOG = @XMLCATALOG@ diff --git a/doc/Makefile.in b/doc/Makefile.in index d8ffb535..2adb731d 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -128,6 +128,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ USE_NLS = @USE_NLS@ +USE_NLS_FALSE = @USE_NLS_FALSE@ +USE_NLS_TRUE = @USE_NLS_TRUE@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XMLCATALOG = @XMLCATALOG@ diff --git a/etc/Makefile.in b/etc/Makefile.in index 02c6ced2..14f1535b 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -137,6 +137,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ USE_NLS = @USE_NLS@ +USE_NLS_FALSE = @USE_NLS_FALSE@ +USE_NLS_TRUE = @USE_NLS_TRUE@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XMLCATALOG = @XMLCATALOG@ diff --git a/etc/pam.d/Makefile.in b/etc/pam.d/Makefile.in index 797abc36..4fff9a7f 100644 --- a/etc/pam.d/Makefile.in +++ b/etc/pam.d/Makefile.in @@ -128,6 +128,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ USE_NLS = @USE_NLS@ +USE_NLS_FALSE = @USE_NLS_FALSE@ +USE_NLS_TRUE = @USE_NLS_TRUE@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XMLCATALOG = @XMLCATALOG@ diff --git a/lib/Makefile.am b/lib/Makefile.am index a9259a3a..b2bf8576 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) $(LIBSKEY) $(LIBMD) libshadow_la_SOURCES = \ commonio.c \ diff --git a/lib/Makefile.in b/lib/Makefile.in index 5838641c..104618ed 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -58,7 +58,7 @@ 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__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 sgetgrent.lo sgetpwent.lo sgroupio.lo \ @@ -157,6 +157,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ USE_NLS = @USE_NLS@ +USE_NLS_FALSE = @USE_NLS_FALSE@ +USE_NLS_TRUE = @USE_NLS_TRUE@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XMLCATALOG = @XMLCATALOG@ @@ -209,7 +211,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) $(LIBSKEY) $(LIBMD) libshadow_la_SOURCES = \ commonio.c \ commonio.h \ diff --git a/lib/exitcodes.h b/lib/exitcodes.h index 232b7452..f0419119 100644 --- a/lib/exitcodes.h +++ b/lib/exitcodes.h @@ -1,4 +1,4 @@ -/* $Id: exitcodes.h,v 1.7 2005/08/31 17:36:11 kloczek Exp $ */ +/* $Id: exitcodes.h,v 1.8 2006/01/17 22:06:03 kloczek Exp $ */ /* * Exit codes used by shadow programs @@ -11,3 +11,5 @@ #define E_SHADOW_NOTFOUND 15 /* not found shadow password file */ #define E_GROUP_NOTFOUND 16 /* not found group file */ #define E_GSHADOW_NOTFOUND 17 /* not found shadow group file */ +#define E_CMD_NOEXEC 126 /* can't run command/shell */ +#define E_CMD_NOTFOUND 127 /* can't find command/shell to run */ diff --git a/lib/getdef.h b/lib/getdef.h index 3368ae81..1e7e4926 100644 --- a/lib/getdef.h +++ b/lib/getdef.h @@ -9,4 +9,7 @@ extern unsigned int getdef_unum (const char *, unsigned int); extern char *getdef_str (const char *); extern int putdef_str (const char *, const char *); +/* default UMASK value if not specified in /etc/login.defs */ +#define GETDEF_DEFAULT_UMASK 022 + #endif /* _GETDEF_H */ diff --git a/lib/prototypes.h b/lib/prototypes.h index a73e7d11..31c490bb 100644 --- a/lib/prototypes.h +++ b/lib/prototypes.h @@ -6,7 +6,7 @@ * Juha Virtanen, ; November 1995 */ /* - * $Id: prototypes.h,v 1.26 2006/01/02 23:32:51 kloczek Exp $ + * $Id: prototypes.h,v 1.28 2006/02/07 16:36:30 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 @@ -82,13 +82,9 @@ extern int hushed (const struct passwd *); /* audit_help.c */ #ifdef WITH_AUDIT extern int audit_fd; -#endif -void audit_help_open (void); -void audit_help_log (const char *, ...) -#ifdef __GNUC__ - __attribute__ ((format (printf, 1, 2))); -#else -; +extern void audit_help_open (void); +extern void audit_logger (int type, const char *pgname, const char *op, + const char *name, unsigned int id, int result); #endif /* limits.c */ @@ -149,7 +145,7 @@ extern void setup (struct passwd *); extern void setup_env (struct passwd *); /* shell.c */ -extern void shell (const char *, const char *); +extern int shell (const char *, const char *, char *const *); /* strtoday.c */ extern long strtoday (const char *); diff --git a/lib/pwauth.c b/lib/pwauth.c index 63013b9e..80994dee 100644 --- a/lib/pwauth.c +++ b/lib/pwauth.c @@ -30,7 +30,7 @@ #include #ifndef USE_PAM -#ident "$Id: pwauth.c,v 1.19 2005/08/31 17:24:56 kloczek Exp $" +#ident "$Id: pwauth.c,v 1.20 2006/03/11 21:15:55 kloczek Exp $" #include #include @@ -123,6 +123,14 @@ pw_auth (const char *cipher, const char *user, int reason, const char *input) * If there is no SKEY information we default to not using SKEY. */ +# ifdef SKEY_BSD_STYLE + /* + * Some BSD updates to the S/KEY API adds a fourth parameter; the + * sizeof of the challenge info buffer. + */ +# define skeychallenge(s,u,c) skeychallenge(s,u,c,sizeof(c)) +# endif + if (skeychallenge (&skey, user, challenge_info) == 0) use_skey = 1; #endif diff --git a/libmisc/Makefile.in b/libmisc/Makefile.in index c62fa024..4b87d35c 100644 --- a/libmisc/Makefile.in +++ b/libmisc/Makefile.in @@ -162,6 +162,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ USE_NLS = @USE_NLS@ +USE_NLS_FALSE = @USE_NLS_FALSE@ +USE_NLS_TRUE = @USE_NLS_TRUE@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XMLCATALOG = @XMLCATALOG@ diff --git a/libmisc/addgrps.c b/libmisc/addgrps.c index 652d4d77..9833fa8a 100644 --- a/libmisc/addgrps.c +++ b/libmisc/addgrps.c @@ -9,7 +9,7 @@ #include #include -#ident "$Id: addgrps.c,v 1.8 2005/08/31 17:24:57 kloczek Exp $" +#ident "$Id: addgrps.c,v 1.9 2006/01/23 09:46:30 kloczek Exp $" #define SEP ",:" /* @@ -33,7 +33,7 @@ int add_groups (const char *list) i = 16; for (;;) { - grouplist = malloc (i * sizeof (GETGROUPS_T)); + grouplist = (gid_t *) malloc (i * sizeof (GETGROUPS_T)); if (!grouplist) return -1; ngroups = getgroups (i, grouplist); @@ -67,7 +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 = (gid_t *) realloc (grouplist, (ngroups + 1) * sizeof (GETGROUPS_T)); if (!tmp) { free (grouplist); return -1; diff --git a/libmisc/age.c b/libmisc/age.c index 57e9c1d8..a1029716 100644 --- a/libmisc/age.c +++ b/libmisc/age.c @@ -35,10 +35,11 @@ #include #include "prototypes.h" #include "defines.h" +#include "exitcodes.h" #include #include -#ident "$Id: age.c,v 1.12 2005/08/31 17:24:57 kloczek Exp $" +#ident "$Id: age.c,v 1.13 2006/01/18 19:38:27 kloczek Exp $" #ifndef PASSWD_PROGRAM #define PASSWD_PROGRAM "/bin/passwd" @@ -125,7 +126,7 @@ int expire (const struct passwd *pw, const struct spwd *sp) execl (PASSWD_PROGRAM, PASSWD_PROGRAM, pw->pw_name, (char *) 0); err = errno; perror ("Can't execute " PASSWD_PROGRAM); - _exit ((err == ENOENT) ? 127 : 126); + _exit (err == ENOENT ? E_CMD_NOTFOUND : E_CMD_NOEXEC); } else if (pid == -1) { perror ("fork"); exit (1); diff --git a/libmisc/getdate.c b/libmisc/getdate.c index 50134c88..e91436fb 100644 --- a/libmisc/getdate.c +++ b/libmisc/getdate.c @@ -1,7 +1,7 @@ -/* A Bison parser, made by GNU Bison 2.0. */ +/* A Bison parser, made by GNU Bison 2.1. */ /* 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, 2004, 2005 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 @@ -15,8 +15,8 @@ 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. */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /* As a special exception, when this file is copied by Bison into a Bison output file, you may use that output file without restriction. @@ -36,6 +36,9 @@ /* Identify Bison output. */ #define YYBISON 1 +/* Bison version. */ +#define YYBISON_VERSION "2.1" + /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -71,6 +74,7 @@ tZONE = 273 }; #endif +/* Tokens. */ #define tAGO 258 #define tDAY 259 #define tDAY_UNIT 260 @@ -208,7 +212,7 @@ #define yycheck gd_yycheck static int yylex (); -static int yyerror (); +static int yyerror (char *s); #define EPOCH 1970 #define HOUR(x) ((x) * 60) @@ -277,14 +281,19 @@ static int yyRelYear; # define YYERROR_VERBOSE 0 #endif +/* Enabling the token table. */ +#ifndef YYTOKEN_TABLE +# define YYTOKEN_TABLE 0 +#endif + #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) #line 172 "getdate.y" typedef union YYSTYPE { int Number; enum _MERIDIAN Meridian; } YYSTYPE; -/* Line 190 of yacc.c. */ -#line 288 "getdate.c" +/* Line 196 of yacc.c. */ +#line 297 "getdate.c" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 @@ -295,17 +304,36 @@ typedef union YYSTYPE { /* Copy the second part of user declarations. */ -/* Line 213 of yacc.c. */ -#line 300 "getdate.c" +/* Line 219 of yacc.c. */ +#line 309 "getdate.c" -#if ! defined (yyoverflow) || YYERROR_VERBOSE +#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) +# define YYSIZE_T __SIZE_TYPE__ +#endif +#if ! defined (YYSIZE_T) && defined (size_t) +# define YYSIZE_T size_t +#endif +#if ! defined (YYSIZE_T) && (defined (__STDC__) || defined (__cplusplus)) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +#endif +#if ! defined (YYSIZE_T) +# define YYSIZE_T unsigned int +#endif -# ifndef YYFREE -# define YYFREE free +#ifndef YY_ +# if YYENABLE_NLS +# if ENABLE_NLS +# include /* INFRINGES ON USER NAME SPACE */ +# define YY_(msgid) dgettext ("bison-runtime", msgid) +# endif # endif -# ifndef YYMALLOC -# define YYMALLOC malloc +# ifndef YY_ +# define YY_(msgid) msgid # endif +#endif + +#if ! defined (yyoverflow) || YYERROR_VERBOSE /* The parser invokes alloca or malloc; define the necessary symbols. */ @@ -315,6 +343,10 @@ typedef union YYSTYPE { # define YYSTACK_ALLOC __builtin_alloca # else # define YYSTACK_ALLOC alloca +# if defined (__STDC__) || defined (__cplusplus) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYINCLUDED_STDLIB_H +# endif # endif # endif # endif @@ -322,13 +354,39 @@ typedef union YYSTYPE { # ifdef YYSTACK_ALLOC /* Pacify GCC's `empty if-body' warning. */ # define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) -# else -# if defined (__STDC__) || defined (__cplusplus) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t +# ifndef YYSTACK_ALLOC_MAXIMUM + /* The OS might guarantee only one guard page at the bottom of the stack, + and a page size can be as small as 4096 bytes. So we cannot safely + invoke alloca (N) if N exceeds 4096. Use a slightly smaller number + to allow for a few compiler-allocated temporary stack slots. */ +# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2005 */ # endif +# else # define YYSTACK_ALLOC YYMALLOC # define YYSTACK_FREE YYFREE +# ifndef YYSTACK_ALLOC_MAXIMUM +# define YYSTACK_ALLOC_MAXIMUM ((YYSIZE_T) -1) +# endif +# ifdef __cplusplus +extern "C" { +# endif +# ifndef YYMALLOC +# define YYMALLOC malloc +# if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \ + && (defined (__STDC__) || defined (__cplusplus))) +void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# ifndef YYFREE +# define YYFREE free +# if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \ + && (defined (__STDC__) || defined (__cplusplus))) +void free (void *); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# ifdef __cplusplus +} +# endif # endif #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */ @@ -363,7 +421,7 @@ union yyalloc # define YYCOPY(To, From, Count) \ do \ { \ - register YYSIZE_T yyi; \ + YYSIZE_T yyi; \ for (yyi = 0; yyi < (Count); yyi++) \ (To)[yyi] = (From)[yyi]; \ } \ @@ -413,7 +471,7 @@ union yyalloc #define YYUNDEFTOK 2 #define YYMAXUTOK 273 -#define YYTRANSLATE(YYX) \ +#define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ @@ -495,8 +553,8 @@ static const unsigned short int yyrline[] = }; #endif -#if YYDEBUG || YYERROR_VERBOSE -/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. +#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { @@ -621,22 +679,6 @@ static const unsigned char yystos[] = 32 }; -#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) -# define YYSIZE_T __SIZE_TYPE__ -#endif -#if ! defined (YYSIZE_T) && defined (size_t) -# define YYSIZE_T size_t -#endif -#if ! defined (YYSIZE_T) -# if defined (__STDC__) || defined (__cplusplus) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -# endif -#endif -#if ! defined (YYSIZE_T) -# define YYSIZE_T unsigned int -#endif - #define yyerrok (yyerrstatus = 0) #define yyclearin (yychar = YYEMPTY) #define YYEMPTY (-2) @@ -666,8 +708,8 @@ do \ goto yybackup; \ } \ else \ - { \ - yyerror ("syntax error: cannot back up");\ + { \ + yyerror (YY_("syntax error: cannot back up")); \ YYERROR; \ } \ while (0) @@ -746,7 +788,7 @@ do { \ if (yydebug) \ { \ YYFPRINTF (stderr, "%s ", Title); \ - yysymprint (stderr, \ + yysymprint (stderr, \ Type, Value); \ YYFPRINTF (stderr, "\n"); \ } \ @@ -794,13 +836,13 @@ yy_reduce_print (yyrule) #endif { int yyi; - unsigned int yylno = yyrline[yyrule]; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ", + unsigned long int yylno = yyrline[yyrule]; + YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu), ", yyrule - 1, yylno); /* Print the symbols being reduced, and their result. */ for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++) - YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]); - YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]); + YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]); + YYFPRINTF (stderr, "-> %s\n", yytname[yyr1[yyrule]]); } # define YY_REDUCE_PRINT(Rule) \ @@ -829,7 +871,7 @@ int yydebug; if the built-in stack extension method is used). Do not make this value too large; the results are undefined if - SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH) + YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) evaluated with infinite-precision integer arithmetic. */ #ifndef YYMAXDEPTH @@ -853,7 +895,7 @@ yystrlen (yystr) const char *yystr; # endif { - register const char *yys = yystr; + const char *yys = yystr; while (*yys++ != '\0') continue; @@ -878,8 +920,8 @@ yystpcpy (yydest, yysrc) const char *yysrc; # endif { - register char *yyd = yydest; - register const char *yys = yysrc; + char *yyd = yydest; + const char *yys = yysrc; while ((*yyd++ = *yys++) != '\0') continue; @@ -889,7 +931,55 @@ yystpcpy (yydest, yysrc) # endif # endif -#endif /* !YYERROR_VERBOSE */ +# ifndef yytnamerr +/* Copy to YYRES the contents of YYSTR after stripping away unnecessary + quotes and backslashes, so that it's suitable for yyerror. The + heuristic is that double-quoting is unnecessary unless the string + contains an apostrophe, a comma, or backslash (other than + backslash-backslash). YYSTR is taken from yytname. If YYRES is + null, do not copy; instead, return the length of what the result + would have been. */ +static YYSIZE_T +yytnamerr (char *yyres, const char *yystr) +{ + if (*yystr == '"') + { + size_t yyn = 0; + char const *yyp = yystr; + + for (;;) + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; + + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; + + case '"': + if (yyres) + yyres[yyn] = '\0'; + return yyn; + } + do_not_strip_quotes: ; + } + + if (! yyres) + return yystrlen (yystr); + + return yystpcpy (yyres, yystr) - yyres; +} +# endif + +#endif /* YYERROR_VERBOSE */ @@ -1009,13 +1099,13 @@ yyparse (void) #else int yyparse () - + ; #endif #endif { - register int yystate; - register int yyn; + int yystate; + int yyn; int yyresult; /* Number of tokens to shift before error messages enabled. */ int yyerrstatus; @@ -1033,12 +1123,12 @@ yyparse () /* The state stack. */ short int yyssa[YYINITDEPTH]; short int *yyss = yyssa; - register short int *yyssp; + short int *yyssp; /* The semantic value stack. */ YYSTYPE yyvsa[YYINITDEPTH]; YYSTYPE *yyvs = yyvsa; - register YYSTYPE *yyvsp; + YYSTYPE *yyvsp; @@ -1070,9 +1160,6 @@ yyparse () yyssp = yyss; yyvsp = yyvs; - - yyvsp[0] = yylval; - goto yysetstate; /*------------------------------------------------------------. @@ -1105,7 +1192,7 @@ yyparse () data in use in that stack, in bytes. This used to be a conditional around just the two extra args, but that might be undefined if yyoverflow is a macro. */ - yyoverflow ("parser stack overflow", + yyoverflow (YY_("memory exhausted"), &yyss1, yysize * sizeof (*yyssp), &yyvs1, yysize * sizeof (*yyvsp), @@ -1116,11 +1203,11 @@ yyparse () } #else /* no yyoverflow */ # ifndef YYSTACK_RELOCATE - goto yyoverflowlab; + goto yyexhaustedlab; # else /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyoverflowlab; + goto yyexhaustedlab; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) yystacksize = YYMAXDEPTH; @@ -1130,7 +1217,7 @@ yyparse () union yyalloc *yyptr = (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) - goto yyoverflowlab; + goto yyexhaustedlab; YYSTACK_RELOCATE (yyss); YYSTACK_RELOCATE (yyvs); @@ -1666,10 +1753,11 @@ yyreduce: break; + default: break; } -/* Line 1037 of yacc.c. */ -#line 1673 "getdate.c" +/* Line 1126 of yacc.c. */ +#line 1761 "getdate.c" yyvsp -= yylen; yyssp -= yylen; @@ -1708,12 +1796,36 @@ yyerrlab: if (YYPACT_NINF < yyn && yyn < YYLAST) { - YYSIZE_T yysize = 0; int yytype = YYTRANSLATE (yychar); - const char* yyprefix; - char *yymsg; + YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); + YYSIZE_T yysize = yysize0; + YYSIZE_T yysize1; + int yysize_overflow = 0; + char *yymsg = 0; +# define YYERROR_VERBOSE_ARGS_MAXIMUM 5 + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; int yyx; +#if 0 + /* This is so xgettext sees the translatable formats that are + constructed on the fly. */ + YY_("syntax error, unexpected %s"); + YY_("syntax error, unexpected %s, expecting %s"); + YY_("syntax error, unexpected %s, expecting %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); +#endif + char *yyfmt; + char const *yyf; + static char const yyunexpected[] = "syntax error, unexpected %s"; + static char const yyexpecting[] = ", expecting %s"; + static char const yyor[] = " or %s"; + char yyformat[sizeof yyunexpected + + sizeof yyexpecting - 1 + + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) + * (sizeof yyor - 1))]; + char const *yyprefix = yyexpecting; + /* Start YYX at -YYN if negative to avoid negative indexes in YYCHECK. */ int yyxbegin = yyn < 0 ? -yyn : 0; @@ -1721,48 +1833,68 @@ yyerrlab: /* Stay within bounds of both yycheck and yytname. */ int yychecklim = YYLAST - yyn; int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yycount = 0; + int yycount = 1; + + yyarg[0] = yytname[yytype]; + yyfmt = yystpcpy (yyformat, yyunexpected); - yyprefix = ", expecting "; for (yyx = yyxbegin; yyx < yyxend; ++yyx) if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) { - yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]); - yycount += 1; - if (yycount == 5) + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) { - yysize = 0; + yycount = 1; + yysize = yysize0; + yyformat[sizeof yyunexpected - 1] = '\0'; break; } + yyarg[yycount++] = yytname[yyx]; + yysize1 = yysize + yytnamerr (0, yytname[yyx]); + yysize_overflow |= yysize1 < yysize; + yysize = yysize1; + yyfmt = yystpcpy (yyfmt, yyprefix); + yyprefix = yyor; } - yysize += (sizeof ("syntax error, unexpected ") - + yystrlen (yytname[yytype])); - yymsg = (char *) YYSTACK_ALLOC (yysize); - if (yymsg != 0) - { - char *yyp = yystpcpy (yymsg, "syntax error, unexpected "); - yyp = yystpcpy (yyp, yytname[yytype]); - if (yycount < 5) + yyf = YY_(yyformat); + yysize1 = yysize + yystrlen (yyf); + yysize_overflow |= yysize1 < yysize; + yysize = yysize1; + + if (!yysize_overflow && yysize <= YYSTACK_ALLOC_MAXIMUM) + yymsg = (char *) YYSTACK_ALLOC (yysize); + if (yymsg) + { + /* Avoid sprintf, as that infringes on the user's name space. + Don't have undefined behavior even if the translation + produced a string with the wrong number of "%s"s. */ + char *yyp = yymsg; + int yyi = 0; + while ((*yyp = *yyf)) { - yyprefix = ", expecting "; - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - { - yyp = yystpcpy (yyp, yyprefix); - yyp = yystpcpy (yyp, yytname[yyx]); - yyprefix = " or "; - } + if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) + { + yyp += yytnamerr (yyp, yyarg[yyi++]); + yyf += 2; + } + else + { + yyp++; + yyf++; + } } yyerror (yymsg); YYSTACK_FREE (yymsg); } else - yyerror ("syntax error; also virtual memory exhausted"); + { + yyerror (YY_("syntax error")); + goto yyexhaustedlab; + } } else #endif /* YYERROR_VERBOSE */ - yyerror ("syntax error"); + yyerror (YY_("syntax error")); } @@ -1774,18 +1906,9 @@ yyerrlab: if (yychar <= YYEOF) { - /* If at end of input, pop the error token, - then the rest of the stack, then return failure. */ + /* Return failure if at end of input. */ if (yychar == YYEOF) - for (;;) - { - - YYPOPSTACK; - if (yyssp == yyss) - YYABORT; - yydestruct ("Error: popping", - yystos[*yyssp], yyvsp); - } + YYABORT; } else { @@ -1804,12 +1927,11 @@ yyerrlab: `---------------------------------------------------*/ yyerrorlab: -#ifdef __GNUC__ - /* Pacify GCC when the user code never invokes YYERROR and the label - yyerrorlab therefore never appears in user code. */ + /* Pacify compilers like GCC when the user code never invokes + YYERROR and the label yyerrorlab therefore never appears in user + code. */ if (0) goto yyerrorlab; -#endif yyvsp -= yylen; yyssp -= yylen; @@ -1872,23 +1994,29 @@ yyacceptlab: | yyabortlab -- YYABORT comes here. | `-----------------------------------*/ yyabortlab: - yydestruct ("Error: discarding lookahead", - yytoken, &yylval); - yychar = YYEMPTY; yyresult = 1; goto yyreturn; #ifndef yyoverflow -/*----------------------------------------------. -| yyoverflowlab -- parser overflow comes here. | -`----------------------------------------------*/ -yyoverflowlab: - yyerror ("parser stack overflow"); +/*-------------------------------------------------. +| yyexhaustedlab -- memory exhaustion comes here. | +`-------------------------------------------------*/ +yyexhaustedlab: + yyerror (YY_("memory exhausted")); yyresult = 2; /* Fall through. */ #endif yyreturn: + if (yychar != YYEOF && yychar != YYEMPTY) + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval); + while (yyssp != yyss) + { + yydestruct ("Cleanup: popping", + yystos[*yyssp], yyvsp); + YYPOPSTACK; + } #ifndef yyoverflow if (yyss != yyssa) YYSTACK_FREE (yyss); @@ -2058,17 +2186,12 @@ static TABLE const MilitaryTable[] = { /* ARGSUSED */ -static int -yyerror (s) - char *s; +static int yyerror (char *s) { return 0; } -static int -ToHour (Hours, Meridian) - int Hours; - MERIDIAN Meridian; +static int ToHour (int Hours, MERIDIAN Meridian) { switch (Meridian) { @@ -2094,9 +2217,7 @@ ToHour (Hours, Meridian) /* NOTREACHED */ } -static int -ToYear (Year) - int Year; +static int ToYear (int Year) { if (Year < 0) Year = -Year; @@ -2111,9 +2232,7 @@ ToYear (Year) return Year; } -static int -LookupWord (buff) - char *buff; +static int LookupWord (char *buff) { register char *p; register char *q; @@ -2293,9 +2412,7 @@ yylex () #define TM_YEAR_ORIGIN 1900 /* Yield A - B, measured in seconds. */ -static long -difftm (a, b) - struct tm *a, *b; +static long difftm (struct tm *a, struct tm *b) { int ay = a->tm_year + (TM_YEAR_ORIGIN - 1); int by = b->tm_year + (TM_YEAR_ORIGIN - 1); @@ -2314,10 +2431,7 @@ difftm (a, b) + (a->tm_sec - b->tm_sec)); } -time_t -get_date (p, now) - const char *p; - const time_t *now; +time_t get_date (const char *p, const time_t *now) { struct tm tm, tm0, *tmp; time_t Start; diff --git a/libmisc/getdate.y b/libmisc/getdate.y index b8bd565e..e4504e3e 100644 --- a/libmisc/getdate.y +++ b/libmisc/getdate.y @@ -113,7 +113,7 @@ #define yycheck gd_yycheck static int yylex (); -static int yyerror (); +static int yyerror (char *s); #define EPOCH 1970 #define HOUR(x) ((x) * 60) @@ -596,17 +596,12 @@ static TABLE const MilitaryTable[] = { /* ARGSUSED */ -static int -yyerror (s) - char *s; +static int yyerror (char *s) { return 0; } -static int -ToHour (Hours, Meridian) - int Hours; - MERIDIAN Meridian; +static int ToHour (int Hours, MERIDIAN Meridian) { switch (Meridian) { @@ -632,9 +627,7 @@ ToHour (Hours, Meridian) /* NOTREACHED */ } -static int -ToYear (Year) - int Year; +static int ToYear (int Year) { if (Year < 0) Year = -Year; @@ -649,9 +642,7 @@ ToYear (Year) return Year; } -static int -LookupWord (buff) - char *buff; +static int LookupWord (char *buff) { register char *p; register char *q; @@ -831,9 +822,7 @@ yylex () #define TM_YEAR_ORIGIN 1900 /* Yield A - B, measured in seconds. */ -static long -difftm (a, b) - struct tm *a, *b; +static long difftm (struct tm *a, struct tm *b) { int ay = a->tm_year + (TM_YEAR_ORIGIN - 1); int by = b->tm_year + (TM_YEAR_ORIGIN - 1); @@ -852,10 +841,7 @@ difftm (a, b) + (a->tm_sec - b->tm_sec)); } -time_t -get_date (p, now) - const char *p; - const time_t *now; +time_t get_date (const char *p, const time_t *now) { struct tm tm, tm0, *tmp; time_t Start; diff --git a/libmisc/setupenv.c b/libmisc/setupenv.c index 006f83c3..e25206f7 100644 --- a/libmisc/setupenv.c +++ b/libmisc/setupenv.c @@ -33,7 +33,7 @@ #include -#ident "$Id: setupenv.c,v 1.20 2005/09/30 14:29:11 kloczek Exp $" +#ident "$Id: setupenv.c,v 1.21 2006/01/18 19:55:15 kloczek Exp $" #include #include @@ -43,6 +43,8 @@ #include "defines.h" #include #include "getdef.h" + +#ifndef USE_PAM static void addenv_path (const char *varname, const char *dirname, const char *filename) { @@ -54,8 +56,6 @@ addenv_path (const char *varname, const char *dirname, const char *filename) free (buf); } - -#ifndef USE_PAM static void read_env_file (const char *filename) { FILE *fp; diff --git a/libmisc/shell.c b/libmisc/shell.c index 632d740e..297e4903 100644 --- a/libmisc/shell.c +++ b/libmisc/shell.c @@ -29,7 +29,7 @@ #include -#ident "$Id: shell.c,v 1.11 2005/08/31 17:24:58 kloczek Exp $" +#ident "$Id: shell.c,v 1.13 2006/01/18 19:38:27 kloczek Exp $" #include #include @@ -51,13 +51,15 @@ extern size_t newenvc; * the file. If all that fails, give up in disgust ... */ -void shell (const char *file, const char *arg) +int shell (const char *file, const char *arg, char *const envp[]) { char arg0[1024]; int err; - if (file == (char *) 0) - exit (1); + if (file == (char *) 0) { + errno = EINVAL; + return errno; + } /* * The argv[0]'th entry is usually the path name, but @@ -65,22 +67,17 @@ void shell (const char *file, const char *arg) * that. So, we determine the 0'th entry only if they * don't want to tell us what it is themselves. */ - if (arg == (char *) 0) { snprintf (arg0, sizeof arg0, "-%s", Basename ((char *) file)); arg = arg0; } -#ifdef DEBUG - printf ("Executing shell %s\n", file); -#endif /* * First we try the direct approach. The system should be * able to figure out what we are up to without too much * grief. */ - - execle (file, arg, (char *) 0, newenvp); + execle (file, arg, (char *) 0, envp); err = errno; /* Linux handles #! in the kernel, and bash doesn't make @@ -92,7 +89,6 @@ void shell (const char *file, const char *arg) * relies on the standard shell being able to make sense * of the "#!" magic number. */ - if (err == ENOEXEC) { FILE *fp; @@ -100,7 +96,7 @@ void shell (const char *file, const char *arg) if (getc (fp) == '#' && getc (fp) == '!') { fclose (fp); execle ("/bin/sh", "sh", - file, (char *) 0, newenvp); + file, (char *) 0, envp); err = errno; } else { fclose (fp); @@ -114,9 +110,8 @@ void shell (const char *file, const char *arg) * how to execute this stupid shell, so I might as well give * up in disgust ... */ - snprintf (arg0, sizeof arg0, _("Cannot execute %s"), file); errno = err; perror (arg0); - exit (1); + return err; } diff --git a/libmisc/xmalloc.c b/libmisc/xmalloc.c index 881ae7a7..1a2372dd 100644 --- a/libmisc/xmalloc.c +++ b/libmisc/xmalloc.c @@ -9,7 +9,7 @@ #include -#ident "$Id: xmalloc.c,v 1.7 2005/08/31 17:24:58 kloczek Exp $" +#ident "$Id: xmalloc.c,v 1.8 2006/01/23 09:46:30 kloczek Exp $" #include #include "defines.h" @@ -17,7 +17,7 @@ char *xmalloc (size_t size) { char *ptr; - ptr = malloc (size); + ptr = (char *) malloc (size); if (!ptr && size) { fprintf (stderr, _("malloc(%d) failed\n"), (int) size); exit (13); diff --git a/ltmain.sh b/ltmain.sh index 9e71d27d..06823e05 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -43,8 +43,8 @@ EXIT_FAILURE=1 PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.5.20 -TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)" +VERSION=1.5.22 +TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" # See if we are running on zsh, and set the options which allow our # commands through without removal of \ escapes. @@ -132,6 +132,8 @@ run= show="$echo" show_help= execute_dlfiles= +duplicate_deps=no +preserve_args= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" @@ -139,6 +141,43 @@ o2lo="s/\\.${objext}\$/.lo/" # Shell function definitions: # This seems to be the best place for them +# func_mktempdir [string] +# Make a temporary directory that won't clash with other running +# libtool processes, and avoids race conditions if possible. If +# given, STRING is the basename for that directory. +func_mktempdir () +{ + my_template="${TMPDIR-/tmp}/${1-$progname}" + + if test "$run" = ":"; then + # Return a directory name, but don't create it in dry-run mode + my_tmpdir="${my_template}-$$" + else + + # If mktemp works, use that first and foremost + my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + + if test ! -d "$my_tmpdir"; then + # Failing that, at least try and use $RANDOM to avoid a race + my_tmpdir="${my_template}-${RANDOM-0}$$" + + save_mktempdir_umask=`umask` + umask 0077 + $mkdir "$my_tmpdir" + umask $save_mktempdir_umask + fi + + # If we're not in dry-run mode, bomb out on failure + test -d "$my_tmpdir" || { + $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 + exit $EXIT_FAILURE + } + fi + + $echo "X$my_tmpdir" | $Xsed +} + + # func_win32_libid arg # return the library type of file 'arg' # @@ -157,12 +196,11 @@ func_win32_libid () if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then win32_nmres=`eval $NM -f posix -A $1 | \ - sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'` - if test "X$win32_nmres" = "Ximport" ; then - win32_libid_type="x86 archive import" - else - win32_libid_type="x86 archive static" - fi + $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'` + case $win32_nmres in + import*) win32_libid_type="x86 archive import";; + *) win32_libid_type="x86 archive static";; + esac fi ;; *DLL*) @@ -295,9 +333,9 @@ func_extract_archives () $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 + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then + exit $exit_status fi case $host in *-darwin*) @@ -352,6 +390,8 @@ func_extract_archives () # Darwin sucks eval std_shrext=\"$shrext_cmds\" +disable_libs=no + # Parse our command line options once, thoroughly. while test "$#" -gt 0 do @@ -468,7 +508,11 @@ do preserve_args="$preserve_args $arg" ;; - --tag) prevopt="--tag" prev=tag ;; + --tag) + prevopt="--tag" + prev=tag + preserve_args="$preserve_args --tag" + ;; --tag=*) set tag "$optarg" ${1+"$@"} shift @@ -500,6 +544,18 @@ if test -n "$prevopt"; then exit $EXIT_FAILURE fi +case $disable_libs in +no) + ;; +shared) + build_libtool_libs=no + build_old_libs=yes + ;; +static) + build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` + ;; +esac + # If this variable is set in any of the actions, the command in it # will be execed at the end. This prevents here-documents from being # left over by shells. @@ -856,9 +912,9 @@ EOF if test ! -d "${xdir}$objdir"; then $show "$mkdir ${xdir}$objdir" $run $mkdir ${xdir}$objdir - status=$? - if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then + exit $exit_status fi fi @@ -1061,6 +1117,7 @@ EOF no_install=no objs= non_pic_objects= + notinst_path= # paths that contain not-installed libtool libraries precious_files_regex= prefer_static_libs=no preload=no @@ -1089,14 +1146,15 @@ EOF if test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi + prefer_static_libs=yes else if test -z "$pic_flag" && test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi + prefer_static_libs=built fi build_libtool_libs=no build_old_libs=yes - prefer_static_libs=yes break ;; esac @@ -1271,6 +1329,11 @@ EOF if test -z "$pic_object" || test "$pic_object" = none ; then arg="$non_pic_object" fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + non_pic_objects="$non_pic_objects $non_pic_object" fi else # Only an error if not doing a dry-run. @@ -1354,8 +1417,8 @@ EOF prev= continue ;; - darwin_framework) - compiler_flags="$compiler_flags $arg" + darwin_framework|darwin_framework_skip) + test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" prev= @@ -1419,13 +1482,17 @@ EOF continue ;; - -framework|-arch) - prev=darwin_framework - compiler_flags="$compiler_flags $arg" + -framework|-arch|-isysroot) + case " $CC " in + *" ${arg} ${1} "* | *" ${arg} ${1} "*) + prev=darwin_framework_skip ;; + *) compiler_flags="$compiler_flags $arg" + prev=darwin_framework ;; + esac compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" - continue - ;; + continue + ;; -inst-prefix-dir) prev=inst_prefix @@ -1453,7 +1520,8 @@ EOF absdir=`cd "$dir" && pwd` if test -z "$absdir"; then $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - exit $EXIT_FAILURE + absdir="$dir" + notinst_path="$notinst_path $dir" fi dir="$absdir" ;; @@ -1467,10 +1535,15 @@ EOF esac case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; *) dllsearchpath="$dllsearchpath:$dir";; esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + *) dllsearchpath="$dllsearchpath:$testbindir";; + esac ;; esac continue @@ -1479,11 +1552,11 @@ EOF -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in - *-*-cygwin* | *-*-pw32* | *-*-beos*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) # These systems don't actually have a C or math library (as such) continue ;; - *-*-mingw* | *-*-os2*) + *-*-os2*) # These systems don't actually have a C library (as such) test "X$arg" = "X-lc" && continue ;; @@ -1495,6 +1568,15 @@ EOF # Rhapsody C and math libraries are in the System framework deplibs="$deplibs -framework System" continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + test "X$arg" = "X-lc" && continue + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work + test "X$arg" = "X-lc" && continue + ;; esac elif test "X$arg" = "X-lc_r"; then case $host in @@ -1536,7 +1618,12 @@ EOF # +DA*, +DD* enable 64-bit mode on the HP compiler # -q* pass through compiler args for the IBM compiler # -m* pass through architecture-specific compiler args for GCC - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*) + # -m*, -t[45]*, -txscale* pass through architecture-specific + # compiler args for GCC + # -pg pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ + -t[45]*|-txscale*|@*) # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. @@ -1548,9 +1635,7 @@ EOF esac compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" - if test "$with_gcc" = "yes" ; then - compiler_flags="$compiler_flags $arg" - fi + compiler_flags="$compiler_flags $arg" continue ;; @@ -1788,6 +1873,11 @@ EOF if test -z "$pic_object" || test "$pic_object" = none ; then arg="$non_pic_object" fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + non_pic_objects="$non_pic_objects $non_pic_object" fi else # Only an error if not doing a dry-run. @@ -1893,9 +1983,9 @@ EOF if test ! -d "$output_objdir"; then $show "$mkdir $output_objdir" $run $mkdir $output_objdir - status=$? - if test "$status" -ne 0 && test ! -d "$output_objdir"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then + exit $exit_status fi fi @@ -1958,7 +2048,6 @@ EOF newlib_search_path= need_relink=no # whether we're linking any uninstalled libtool libraries notinst_deplibs= # not-installed libtool libraries - notinst_path= # paths that contain not-installed libtool libraries case $linkmode in lib) passes="conv link" @@ -2194,7 +2283,7 @@ EOF esac # case $deplib if test "$found" = yes || test -f "$lib"; then : else - $echo "$modename: cannot find the library \`$lib'" 1>&2 + $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2 exit $EXIT_FAILURE fi @@ -2445,8 +2534,12 @@ EOF fi link_static=no # Whether the deplib will be linked statically + use_static_libs=$prefer_static_libs + if test "$use_static_libs" = built && test "$installed" = yes ; then + use_static_libs=no + fi if test -n "$library_names" && - { test "$prefer_static_libs" = no || test -z "$old_library"; }; then + { test "$use_static_libs" = no || test -z "$old_library"; }; then if test "$installed" = no; then notinst_deplibs="$notinst_deplibs $lib" need_relink=yes @@ -2559,11 +2652,15 @@ EOF if test "$hardcode_direct" = no; then add="$dir/$linklib" case $host in - *-*-sco3.2v5* ) add_dir="-L$dir" ;; + *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; + *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ + *-*-unixware7*) add_dir="-L$dir" ;; *-*-darwin* ) # if the lib is a module then we can not link against # it, someone is ignoring the new warnings I added - if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then + if /usr/bin/file -L $add 2> /dev/null | + $EGREP ": [^:]* bundle" >/dev/null ; then $echo "** Warning, lib $linklib is a module, not a shared library" if test -z "$old_library" ; then $echo @@ -3314,9 +3411,9 @@ EOF # Eliminate all temporary directories. for path in $notinst_path; do - lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'` - deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'` - dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'` + lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` + deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` + dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` done if test -n "$xrpath"; then @@ -3369,7 +3466,12 @@ EOF ;; *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work ;; *) # Add libc to deplibs on all other systems if necessary. @@ -3413,7 +3515,7 @@ EOF int main() { return 0; } EOF $rm conftest - $LTCC -o conftest conftest.c $deplibs + $LTCC $LTCFLAGS -o conftest conftest.c $deplibs if test "$?" -eq 0 ; then ldd_output=`ldd conftest` for i in $deplibs; do @@ -3458,7 +3560,7 @@ EOF # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" != "0"; then $rm conftest - $LTCC -o conftest conftest.c $i + $LTCC $LTCFLAGS -o conftest conftest.c $i # Did it work? if test "$?" -eq 0 ; then ldd_output=`ldd conftest` @@ -3705,6 +3807,35 @@ EOF deplibs=$newdeplibs fi + + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $deplibs " in + *" -L$path/$objdir "*) + new_libs="$new_libs -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$new_libs $deplib" ;; + esac + ;; + *) new_libs="$new_libs $deplib" ;; + esac + done + deplibs="$new_libs" + + # All the library-specific variables (install_libdir is set above). library_names= old_library= @@ -3788,6 +3919,7 @@ EOF fi lib="$output_objdir/$realname" + linknames= for link do linknames="$linknames $link" @@ -4219,6 +4351,35 @@ EOF ;; esac + + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $compile_deplibs " in + *" -L$path/$objdir "*) + new_libs="$new_libs -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $compile_deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$new_libs $deplib" ;; + esac + ;; + *) new_libs="$new_libs $deplib" ;; + esac + done + compile_deplibs="$new_libs" + + compile_command="$compile_command $compile_deplibs" finalize_command="$finalize_command $finalize_deplibs" @@ -4263,10 +4424,15 @@ EOF fi case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; *) dllsearchpath="$dllsearchpath:$libdir";; esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + *) dllsearchpath="$dllsearchpath:$testbindir";; + esac ;; esac done @@ -4383,10 +4549,22 @@ extern \"C\" { export_symbols="$output_objdir/$outputname.exp" $run $rm $export_symbols $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + case $host in + *cygwin* | *mingw* ) + $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' + ;; + esac else - $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' $run eval 'mv "$nlist"T "$nlist"' + case $host in + *cygwin* | *mingw* ) + $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' + ;; + esac fi fi @@ -4503,16 +4681,29 @@ static const void *lt_preloaded_setup() { esac # Now compile the dynamic symbol file. - $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" - $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? + $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" + $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? # Clean up the generated files. $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" # Transform the symbol file into the correct name. - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + case $host in + *cygwin* | *mingw* ) + if test -f "$output_objdir/${outputname}.def" ; then + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` + else + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + fi + ;; + * ) + compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + ;; + esac ;; *) $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 @@ -4537,7 +4728,7 @@ static const void *lt_preloaded_setup() { # We have no uninstalled library dependencies, so finalize right now. $show "$link_command" $run eval "$link_command" - status=$? + exit_status=$? # Delete the generated files. if test -n "$dlsyms"; then @@ -4545,7 +4736,7 @@ static const void *lt_preloaded_setup() { $run $rm "$output_objdir/${outputname}S.${objext}" fi - exit $status + exit $exit_status fi if test -n "$shlibpath_var"; then @@ -4685,10 +4876,12 @@ static const void *lt_preloaded_setup() { esac case $host in *cygwin* | *mingw* ) - cwrappersource=`$echo ${objdir}/lt-${outputname}.c` - cwrapper=`$echo ${output}.exe` - $rm $cwrappersource $cwrapper - trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 + output_name=`basename $output` + output_path=`dirname $output` + cwrappersource="$output_path/$objdir/lt-$output_name.c" + cwrapper="$output_path/$output_name.exe" + $rm $cwrappersource $cwrapper + trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 cat > $cwrappersource < #include #include +#include +#include +#include #if defined(PATH_MAX) # define LT_PATHMAX PATH_MAX @@ -4723,15 +4919,19 @@ EOF #endif #ifndef DIR_SEPARATOR -#define DIR_SEPARATOR '/' +# define DIR_SEPARATOR '/' +# define PATH_SEPARATOR ':' #endif #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ defined (__OS2__) -#define HAVE_DOS_BASED_FILE_SYSTEM -#ifndef DIR_SEPARATOR_2 -#define DIR_SEPARATOR_2 '\\' -#endif +# define HAVE_DOS_BASED_FILE_SYSTEM +# ifndef DIR_SEPARATOR_2 +# define DIR_SEPARATOR_2 '\\' +# endif +# ifndef PATH_SEPARATOR_2 +# define PATH_SEPARATOR_2 ';' +# endif #endif #ifndef DIR_SEPARATOR_2 @@ -4741,17 +4941,32 @@ EOF (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) #endif /* DIR_SEPARATOR_2 */ +#ifndef PATH_SEPARATOR_2 +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) +#else /* PATH_SEPARATOR_2 */ +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) +#endif /* PATH_SEPARATOR_2 */ + #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) #define XFREE(stale) do { \ if (stale) { free ((void *) stale); stale = 0; } \ } while (0) +/* -DDEBUG is fairly common in CFLAGS. */ +#undef DEBUG +#if defined DEBUGWRAPPER +# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) +#else +# define DEBUG(format, ...) +#endif + const char *program_name = NULL; void * xmalloc (size_t num); char * xstrdup (const char *string); -char * basename (const char *name); -char * fnqualify(const char *path); +const char * base_name (const char *name); +char * find_executable(const char *wrapper); +int check_executable(const char *path); char * strendzap(char *str, const char *pat); void lt_fatal (const char *message, ...); @@ -4761,29 +4976,50 @@ main (int argc, char *argv[]) char **newargz; int i; - program_name = (char *) xstrdup ((char *) basename (argv[0])); + program_name = (char *) xstrdup (base_name (argv[0])); + DEBUG("(main) argv[0] : %s\n",argv[0]); + DEBUG("(main) program_name : %s\n",program_name); newargz = XMALLOC(char *, argc+2); EOF - cat >> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF" - newargz[1] = fnqualify(argv[0]); + cat >> $cwrappersource <<"EOF" + newargz[1] = find_executable(argv[0]); + if (newargz[1] == NULL) + lt_fatal("Couldn't find %s", argv[0]); + DEBUG("(main) found exe at : %s\n",newargz[1]); /* we know the script has the same name, without the .exe */ /* so make sure newargz[1] doesn't end in .exe */ strendzap(newargz[1],".exe"); for (i = 1; i < argc; i++) newargz[i+1] = xstrdup(argv[i]); newargz[argc+1] = NULL; + + for (i=0; i> $cwrappersource <> $cwrappersource <> $cwrappersource <> $cwrappersource <<"EOF" + cat >> $cwrappersource <<"EOF" return 127; } @@ -4804,48 +5040,148 @@ xstrdup (const char *string) ; } -char * -basename (const char *name) +const char * +base_name (const char *name) { const char *base; #if defined (HAVE_DOS_BASED_FILE_SYSTEM) /* Skip over the disk name in MSDOS pathnames. */ - if (isalpha (name[0]) && name[1] == ':') + if (isalpha ((unsigned char)name[0]) && name[1] == ':') name += 2; #endif for (base = name; *name; name++) if (IS_DIR_SEPARATOR (*name)) base = name + 1; - return (char *) base; + return base; +} + +int +check_executable(const char * path) +{ + struct stat st; + + DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); + if ((!path) || (!*path)) + return 0; + + if ((stat (path, &st) >= 0) && + ( + /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */ +#if defined (S_IXOTH) + ((st.st_mode & S_IXOTH) == S_IXOTH) || +#endif +#if defined (S_IXGRP) + ((st.st_mode & S_IXGRP) == S_IXGRP) || +#endif + ((st.st_mode & S_IXUSR) == S_IXUSR)) + ) + return 1; + else + return 0; } +/* Searches for the full path of the wrapper. Returns + newly allocated full path name if found, NULL otherwise */ char * -fnqualify(const char *path) +find_executable (const char* wrapper) { - size_t size; - char *p; + int has_slash = 0; + const char* p; + const char* p_next; + /* static buffer for getcwd */ char tmp[LT_PATHMAX + 1]; + int tmp_len; + char* concat_name; - assert(path != NULL); + DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); - /* Is it qualified already? */ + if ((wrapper == NULL) || (*wrapper == '\0')) + return NULL; + + /* Absolute path? */ #if defined (HAVE_DOS_BASED_FILE_SYSTEM) - if (isalpha (path[0]) && path[1] == ':') - return xstrdup (path); + if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':') + { + concat_name = xstrdup (wrapper); + if (check_executable(concat_name)) + return concat_name; + XFREE(concat_name); + } + else + { +#endif + if (IS_DIR_SEPARATOR (wrapper[0])) + { + concat_name = xstrdup (wrapper); + if (check_executable(concat_name)) + return concat_name; + XFREE(concat_name); + } +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + } #endif - if (IS_DIR_SEPARATOR (path[0])) - return xstrdup (path); - /* prepend the current directory */ - /* doesn't handle '~' */ + for (p = wrapper; *p; p++) + if (*p == '/') + { + has_slash = 1; + break; + } + if (!has_slash) + { + /* no slashes; search PATH */ + const char* path = getenv ("PATH"); + if (path != NULL) + { + for (p = path; *p; p = p_next) + { + const char* q; + size_t p_len; + for (q = p; *q; q++) + if (IS_PATH_SEPARATOR(*q)) + break; + p_len = q - p; + p_next = (*q == '\0' ? q : q + 1); + if (p_len == 0) + { + /* empty path: current directory */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal ("getcwd failed"); + tmp_len = strlen(tmp); + concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); + } + else + { + concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1); + memcpy (concat_name, p, p_len); + concat_name[p_len] = '/'; + strcpy (concat_name + p_len + 1, wrapper); + } + if (check_executable(concat_name)) + return concat_name; + XFREE(concat_name); + } + } + /* not found in PATH; assume curdir */ + } + /* Relative path | not found in path: prepend cwd */ if (getcwd (tmp, LT_PATHMAX) == NULL) lt_fatal ("getcwd failed"); - size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */ - p = XMALLOC(char, size); - sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path); - return p; + tmp_len = strlen(tmp); + concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); + + if (check_executable(concat_name)) + return concat_name; + XFREE(concat_name); + return NULL; } char * @@ -4889,16 +5225,16 @@ lt_fatal (const char *message, ...) va_end (ap); } EOF - # we should really use a build-platform specific compiler - # here, but OTOH, the wrappers (shell script and this C one) - # are only useful if you want to execute the "real" binary. - # Since the "real" binary is built for $host, then this - # wrapper might as well be built for $host, too. - $run $LTCC -s -o $cwrapper $cwrappersource - ;; - esac - $rm $output - trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 + # we should really use a build-platform specific compiler + # here, but OTOH, the wrappers (shell script and this C one) + # are only useful if you want to execute the "real" binary. + # Since the "real" binary is built for $host, then this + # wrapper might as well be built for $host, too. + $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource + ;; + esac + $rm $output + trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 $echo > $output "\ #! $SHELL @@ -5128,9 +5464,9 @@ fi\ $run ${rm}r "$gentop" $show "$mkdir $gentop" $run $mkdir "$gentop" - status=$? - if test "$status" -ne 0 && test ! -d "$gentop"; then - exit $status + exit_status=$? + if test "$exit_status" -ne 0 && test ! -d "$gentop"; then + exit $exit_status fi fi @@ -5797,18 +6133,7 @@ relink_command=\"$relink_command\"" outputname= if test "$fast_install" = no && test -n "$relink_command"; then if test "$finalize" = yes && test -z "$run"; then - tmpdir="/tmp" - test -n "$TMPDIR" && tmpdir="$TMPDIR" - tmpdir="$tmpdir/libtool-$$" - save_umask=`umask` - umask 0077 - if $mkdir "$tmpdir"; then - umask $save_umask - else - umask $save_umask - $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 - continue - fi + tmpdir=`func_mktempdir` file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` outputname="$tmpdir/$file" # Replace the output file specification. @@ -5932,7 +6257,7 @@ relink_command=\"$relink_command\"" # Exit here if they wanted silent mode. test "$show" = : && exit $EXIT_SUCCESS - $echo "----------------------------------------------------------------------" + $echo "X----------------------------------------------------------------------" | $Xsed $echo "Libraries have been installed in:" for libdir in $libdirs; do $echo " $libdir" @@ -5965,7 +6290,7 @@ relink_command=\"$relink_command\"" $echo $echo "See any operating system documentation about shared libraries for" $echo "more information, such as the ld(1) and ld.so(8) manual pages." - $echo "----------------------------------------------------------------------" + $echo "X----------------------------------------------------------------------" | $Xsed exit $EXIT_SUCCESS ;; @@ -6182,9 +6507,17 @@ relink_command=\"$relink_command\"" rmfiles="$rmfiles $objdir/$n" done test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" - test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" - if test "$mode" = uninstall; then + case "$mode" in + clean) + case " $library_names " in + # " " in the beginning catches empty $dlname + *" $dlname "*) ;; + *) rmfiles="$rmfiles $objdir/$dlname" ;; + esac + test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" + ;; + uninstall) if test -n "$library_names"; then # Do each command in the postuninstall commands. cmds=$postuninstall_cmds @@ -6217,7 +6550,8 @@ relink_command=\"$relink_command\"" IFS="$save_ifs" fi # FIXME: should reinstall the best remaining shared library. - fi + ;; + esac fi ;; @@ -6516,12 +6850,11 @@ exit $? # configuration. But we'll never go from static-only to shared-only. # ### BEGIN LIBTOOL TAG CONFIG: disable-shared -build_libtool_libs=no -build_old_libs=yes +disable_libs=shared # ### END LIBTOOL TAG CONFIG: disable-shared # ### BEGIN LIBTOOL TAG CONFIG: disable-static -build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac` +disable_libs=static # ### END LIBTOOL TAG CONFIG: disable-static # Local Variables: diff --git a/man/Makefile.am b/man/Makefile.am index 221548f2..981808d3 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,6 +1,11 @@ # subdirectories for translated manual pages -SUBDIRS = cs de es fi fr hu id it ja ko pl pt_BR ru tr zh_CN zh_TW +DIST_SUBDIRS = cs de es fi fr hu id it ja ko pl pt_BR ru tr zh_CN zh_TW +if USE_NLS +SUBDIRS = $(DIST_SUBDIRS) +else +SUBDIRS = +endif man_XMANS = \ chage.1.xml \ @@ -26,6 +31,7 @@ man_XMANS = \ logoutd.8.xml \ newgrp.1.xml \ newusers.8.xml \ + nologin.8.xml \ passwd.1.xml \ passwd.5.xml \ porttime.5.xml \ @@ -67,6 +73,7 @@ man_MANS = \ logoutd.8 \ newgrp.1 \ newusers.8 \ + nologin.8 \ passwd.1 \ passwd.5 \ porttime.5 \ @@ -175,6 +182,9 @@ newgrp.1: newgrp.1.xml newusers.8: newusers.8.xml $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< +nologin.8: nologin.8.xml + $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< + passwd.1: passwd.1.xml $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< diff --git a/man/Makefile.in b/man/Makefile.in index 27db911f..7a13b870 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -63,7 +63,6 @@ NROFF = nroff MANS = $(man_MANS) ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -142,6 +141,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ USE_NLS = @USE_NLS@ +USE_NLS_FALSE = @USE_NLS_FALSE@ +USE_NLS_TRUE = @USE_NLS_TRUE@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XMLCATALOG = @XMLCATALOG@ @@ -193,7 +194,9 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ # subdirectories for translated manual pages -SUBDIRS = cs de es fi fr hu id it ja ko pl pt_BR ru tr zh_CN zh_TW +DIST_SUBDIRS = cs de es fi fr hu id it ja ko pl pt_BR ru tr zh_CN zh_TW +@USE_NLS_FALSE@SUBDIRS = +@USE_NLS_TRUE@SUBDIRS = $(DIST_SUBDIRS) man_XMANS = \ chage.1.xml \ chfn.1.xml \ @@ -218,6 +221,7 @@ man_XMANS = \ logoutd.8.xml \ newgrp.1.xml \ newusers.8.xml \ + nologin.8.xml \ passwd.1.xml \ passwd.5.xml \ porttime.5.xml \ @@ -259,6 +263,7 @@ man_MANS = \ logoutd.8 \ newgrp.1 \ newusers.8 \ + nologin.8 \ passwd.1 \ passwd.5 \ porttime.5 \ @@ -864,6 +869,9 @@ update-po: shadow-man-pages.pot @ENABLE_REGENERATE_MAN_TRUE@newusers.8: newusers.8.xml @ENABLE_REGENERATE_MAN_TRUE@ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< +@ENABLE_REGENERATE_MAN_TRUE@nologin.8: nologin.8.xml +@ENABLE_REGENERATE_MAN_TRUE@ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< + @ENABLE_REGENERATE_MAN_TRUE@passwd.1: passwd.1.xml @ENABLE_REGENERATE_MAN_TRUE@ $(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< diff --git a/man/chage.1 b/man/chage.1 index 425502d4..2a6a1194 100644 --- a/man/chage.1 +++ b/man/chage.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "CHAGE" "1" "11/05/2005" "User Commands" "User Commands" +.TH "CHAGE" "1" "01/22/2006" "User Commands" "User Commands" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -14,8 +14,9 @@ chage \- change user password expiry information \fBchage\fR [\fIoptions\fR] \fIuser\fR .SH "DESCRIPTION" .PP +The \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. +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 his/her password. .SH "OPTIONS" .PP The options which apply to the @@ -26,7 +27,7 @@ command are: 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 format more commonly used in your area). .TP \fB\-E\fR, \fB\-\-expiredate\fR \fIEXPIRE_DATE\fR -Set the date number of days since January 1, 1970 on which the user's account will no longer be accessible. The date may also be expressed in the format 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. +Set the date or number of days since January 1, 1970 on which the user's account will no longer be accessible. The date may also be expressed in the format 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. .sp Passing the number \fI\-1\fR @@ -46,33 +47,33 @@ Passing the number \fI\-1\fR as the \fIINACTIVE\fR -will remove an accounts inactivity. +will remove an account's inactivity. .TP \fB\-l\fR, \fB\-\-list\fR Show account aging information. .TP \fB\-m\fR, \fB\-\-mindays\fR \fIMIN_DAYS\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. +Set the minimum number of days between password changes. A value of zero for this field indicates that the user may change his/her password at any time. .TP \fB\-M\fR, \fB\-\-maxdays\fR \fIMAX_DAYS\fR -Set maximum number of days during which a password is valid. When +Set the maximum number of days during which a password is valid. When \fIMAX_DAYS\fR plus \fILAST_DAY\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 +is less than the current day, the user will be required to change his/her password before being able to use his/her account. This occurrence can be planned for in advance by use of the \fB\-W\fR option, which provides the user with advance warning. .sp Passing the number \fI\-1\fR -as the +as \fIMAX_DAYS\fR -will remove checking a password validation. +will remove checking a password's validity. .TP \fB\-W\fR, \fB\-\-warndays\fR \fIWARN_DAYS\fR Set the number of days of warning before a password change is required. The \fIWARN_DAYS\fR -option is the number of days prior to the password expiring that a user will be warned her password is about to expire. +option is the number of days prior to the password expiring that a user will be warned his/her password is about to expire. .PP If none of the options are selected, \fBchage\fR @@ -83,13 +84,13 @@ marks. .PP The \fBchage\fR -program requires shadow password file to be available. Its functionality is not available when passwords are stored in the passwd file. +program requires a shadow password file to be available. Its functionality is not available when passwords are stored in the passwd file. .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 when her password or account is due to expire. +option, which may be used by an unprivileged user to determine when his/her password or account is due to expire. .SH "FILES" .TP \fI/etc/passwd\fR diff --git a/man/chage.1.xml b/man/chage.1.xml index f52b3956..02739201 100644 --- a/man/chage.1.xml +++ b/man/chage.1.xml @@ -2,7 +2,7 @@ - + chage 1 @@ -25,10 +25,10 @@ DESCRIPTION - chage command changes the number of days between + The chage 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. + his/her password. @@ -56,7 +56,7 @@ - Set the date number of days since January 1, 1970 on which the + Set the date or number of days since January 1, 1970 on which the user's account will no longer be accessible. The date may also be expressed in the format YYYY-MM-DD (or the format more commonly used in your area). A user whose account is locked must @@ -90,7 +90,7 @@ Passing the number -1 as the - INACTIVE will remove an accounts + INACTIVE will remove an account's inactivity. @@ -112,7 +112,7 @@ Set the minimum number of days between password changes. A value - of zero for this field indicates that the user may change her + of zero for this field indicates that the user may change his/her password at any time. @@ -123,18 +123,18 @@ - Set maximum number of days during which a password is valid. + Set the maximum number of days during which a password is valid. When MAX_DAYS plus LAST_DAY 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 + day, the user will be required to change his/her password before + being able to use his/her account. This occurrence can be planned for in advance by use of the option, which provides the user with advance warning. - Passing the number -1 as the + Passing the number -1 as MAX_DAYS will remove checking a - password validation. + password's validity. @@ -147,7 +147,7 @@ Set the number of days of warning before a password change is required. The WARN_DAYS option is the number of days prior to the password expiring that a user will - be warned her password is about to expire. + be warned his/her password is about to expire. @@ -163,13 +163,13 @@ NOTE - The chage program requires shadow password file to + The chage program requires a shadow password file to be available. Its functionality is not available when passwords are stored in the passwd file. The chage command is restricted to the root user, except for the option, which may be used by - an unprivileged user to determine when her password or account is due + an unprivileged user to determine when his/her password or account is due to expire. diff --git a/man/chpasswd.8 b/man/chpasswd.8 index 462c1473..44ad0a9d 100644 --- a/man/chpasswd.8 +++ b/man/chpasswd.8 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "CHPASSWD" "8" "11/05/2005" "System Management Commands" "System Management Commands" +.TH "CHPASSWD" "8" "03/02/2006" "System Management Commands" "System Management Commands" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -38,9 +38,7 @@ Display help message and exit. Use MD5 encryption instead DES when the supplied passwords are not encrypted. .SH "CAVEATS" .PP -Remember keep protected for reading by others file passed to standard input -\fBchpasswd\fR -command if it contains unencrypted passwords. +Remember to set permissions or umask to prevent readability of unencrypted files by other users. .SH "SEE ALSO" .PP \fBpasswd\fR(1), diff --git a/man/chpasswd.8.xml b/man/chpasswd.8.xml index 8e2aa5e6..cd14673d 100644 --- a/man/chpasswd.8.xml +++ b/man/chpasswd.8.xml @@ -2,7 +2,7 @@ - + chpasswd 8 @@ -78,9 +78,8 @@ CAVEATS - Remember keep protected for reading by others file passed to standard - input chpasswd command if it contains unencrypted - passwords. + Remember to set permissions or umask to prevent readability of + unencrypted files by other users. diff --git a/man/cs/Makefile.am b/man/cs/Makefile.am index 8d46af45..592d3938 100644 --- a/man/cs/Makefile.am +++ b/man/cs/Makefile.am @@ -2,11 +2,20 @@ mandir = @mandir@/cs man_MANS = \ + expiry.1 \ + faillog.5 \ + faillog.8 \ + gpasswd.1 \ + groupadd.8 \ + groupdel.8 \ groups.1 \ id.1 \ lastlog.8 \ + nologin.8 \ passwd.5 \ shadow.5 \ - su.1 + su.1 \ + vipw.8 -EXTRA_DIST = $(man_MANS) +EXTRA_DIST = $(man_MANS) \ + logoutd.8 diff --git a/man/cs/Makefile.in b/man/cs/Makefile.in index d55ffb47..97a6d3ac 100644 --- a/man/cs/Makefile.in +++ b/man/cs/Makefile.in @@ -132,6 +132,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ USE_NLS = @USE_NLS@ +USE_NLS_FALSE = @USE_NLS_FALSE@ +USE_NLS_TRUE = @USE_NLS_TRUE@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XMLCATALOG = @XMLCATALOG@ @@ -182,14 +184,24 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ man_MANS = \ + expiry.1 \ + faillog.5 \ + faillog.8 \ + gpasswd.1 \ + groupadd.8 \ + groupdel.8 \ groups.1 \ id.1 \ lastlog.8 \ + nologin.8 \ passwd.5 \ shadow.5 \ - su.1 + su.1 \ + vipw.8 + +EXTRA_DIST = $(man_MANS) \ + logoutd.8 -EXTRA_DIST = $(man_MANS) all: all-am .SUFFIXES: diff --git a/man/cs/expiry.1 b/man/cs/expiry.1 new file mode 100644 index 00000000..99a0b4ef --- /dev/null +++ b/man/cs/expiry.1 @@ -0,0 +1,25 @@ +.TH "EXPIRY" "1" "11/05/2005" "User Commands" "User Commands" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "JMÉNO" +expiry \- zkontroluje a vynutí politiku vyprÅ¡ení platnosti hesla +.SH "POUŽITÍ" +.HP 7 +\fBexpiry\fR [\-c] [\-f] +.SH "POPIS" +.PP +\fBexpiry\fR +zkontroluje (\fB\-c\fR) vyprÅ¡ení platnosti aktuálního hesla a případně vynutí (\fB\-f\fR) změnu. Příkaz lze spustit jako běžný uživatel. +.SH "SOUBORY" +.TP +\fI/etc/passwd\fR +informace o uživatelských účtech +.TP +\fI/etc/shadow\fR +důvěrné informace o uživatelských účtech +.SH "VIZ TAKÉ" +.PP +\fBpasswd\fR(5), +\fBshadow\fR(5). diff --git a/man/cs/faillog.5 b/man/cs/faillog.5 new file mode 100644 index 00000000..99036ff4 --- /dev/null +++ b/man/cs/faillog.5 @@ -0,0 +1,35 @@ +.TH "FAILLOG" "5" "11/05/2005" "" "" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "JMÉNO" +faillog \- Soubor pro zaznamenávání chybných pokusů o přihlášení +.SH "POPIS" +.PP +\fI/var/log/faillog\fR +uchovává pro každý účet počet chybných přihlášení a jejich +limity. Záznamy v souboru mají pevnou délku a jsou indexovány +číselným UID. Každý záznam obsahuje počet chybných pokusů o +přihlášení od posledního úspěšného přihlášení, maximální počet +chybných pokusů o přihlášení před zablokováním účtu, linku, na které +byl zaznamenán poslední chybný pokus o přihlášení, a datum, +kdy byl zaznamenán poslední chybný pokus o přihlášení. +.PP +Struktura souboru vypadá následovně: +.sp +.nf +struct faillog { + short fail_cnt; + short fail_max; + char fail_line[12]; + time_t fail_time; +}; +.fi +.SH "SOUBORY" +.TP +\fI/var/log/faillog\fR +soubor pro záznam chybných pokusů o přihlášení +.SH "VIZ TAKÉ" +.PP +\fBfaillog\fR(8) diff --git a/man/cs/faillog.8 b/man/cs/faillog.8 new file mode 100644 index 00000000..e4dcae0e --- /dev/null +++ b/man/cs/faillog.8 @@ -0,0 +1,86 @@ +.TH "FAILLOG" "8" "11/05/2005" "System Management Commands" "System Management Commands" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "JMÉNO" +faillog \- zobrazí záznamy faillogu nebo nastaví limity na chybná přihlášení +.SH "POUŽITÍ" +.HP 8 +\fBfaillog\fR [\fIvolby\fR] +.SH "POPIS" +.PP +\fBfaillog\fR +formátuje obsah souboru +\fI/var/log/faillog\fR, +ve kterém se zaznamenávají neúspěšné pokusy o přihlášení. Také jej +můžete použít pro správu počitadel neúspěšných přihlášení a pro +nastavení limitů. SpuÅ¡tení programu +\fBfaillog\fR +bez argumentů vypíše záznamy o neúspěšném přihlášení těch uživatelů, +u kterých je zaznamenáno alespoň jedno chybné přihlášení. +.SH "VOLBY" +.PP +Příkaz +\fBfaillog\fR +akceptuje následující volby: +.TP +\fB\-a\fR, \fB\-\-all\fR +Zobrazí záznamy faillogu vÅ¡ech uživatelů. +.TP +\fB\-h\fR, \fB\-\-help\fR +Zobrazí nápovědu a skončí. +.TP +\fB\-l\fR, \fB\-\-lock\-time\fR \fISEK\fR +Po neúspěšném přihlášení zamkne účet na +\fISEK\fR +sekund. +.TP +\fB\-m\fR, \fB\-\-maximum\fR \fIMAX\fR +Nastaví maximální počet chybných přihlášení na MAX. Poté se účet +zablokuje. Hodnotou 0 tento limit zrušíte. Pro uživatele +\fIroot\fR +by hodnota +\fIMAX\fR +měla být vždy 0, abyste předeÅ¡li útokům typu odepření služby. +.TP +\fB\-r\fR, \fB\-\-reset\fR +Vynuluje počitadla chybných přihlášení vÅ¡ech uživatelů. Při použití s +parametrem \-u +\fIÚČET\fR +vynuluje počitadlo pouze pro daný účet. Tato operace vyžaduje práva +zápisu k souboru +\fI/var/log/faillog\fR. +.TP +\fB\-t\fR, \fB\-\-time\fR \fIDNÅ®\fR +Zobrazí záznamy faillogu novější než +\fIDNÅ®\fR. Volba +\fB\-t\fR +má vyšší prioritu než +\fB\-u\fR. +.TP +\fB\-u\fR, \fB\-\-user\fR \fIÚČET\fR +Zobrazí záznamy faillogu (resp. s volbami +\fB\-l\fR, +\fB\-m\fR +nebo +\fB\-r\fR +upraví počitadla nebo limity chybných přihlášení) pouze pro uživatele +\fIÚČET\fR. +.SH "ZÁLUDNOSTI" +.PP +\fBfaillog\fR +vypíše pouze uživatele, bez úspěšného přihlášení od poslední +chyby. Chcete-li vypsat i uživatele, kteří se od poslední chyby +úspěšně přihlásili, musíte si je explicitně vyžádat volbou +\fB\-u\fR +nebo +\fB\-a\fR. +.SH "SOUBORY" +.TP +\fI/var/log/faillog\fR +soubor pro záznam chybných pokusů o přihlášení +.SH "VIZ TAKÉ" +.PP +\fBlogin\fR(1), +\fBfaillog\fR(5). diff --git a/man/cs/gpasswd.1 b/man/cs/gpasswd.1 new file mode 100644 index 00000000..32e4288e --- /dev/null +++ b/man/cs/gpasswd.1 @@ -0,0 +1,76 @@ +.TH "GPASSWD" "1" "11/05/2005" "User Commands" "User Commands" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "JMÉNO" +gpasswd \- spravuje soubor /etc/group +.SH "POUŽITÍ" +.HP 8 +\fBgpasswd\fR \fIskupina\fR +.HP 8 +\fBgpasswd\fR \-a\ \fIuživatel\fR \fIskupina\fR +.HP 8 +\fBgpasswd\fR \-d\ \fIuživatel\fR \fIskupina\fR +.HP 8 +\fBgpasswd\fR \-R\ \fIskupina\fR +.HP 8 +\fBgpasswd\fR \-r\ \fIskupina\fR +.HP 8 +\fBgpasswd\fR [\-A\ \fIuživatel,\fR...] [\-M\ \fIuživatel,\fR...] \fIskupina\fR +.SH "POPIS" +.PP +\fBgpasswd\fR +se používá pro správu souboru +\fI/etc/group\fR +(a pokud je zkompilován s podporou SHADOWGRP, tak i +\fI/etc/gshadow\fR). +Každá skupina může mít správce, členy a heslo. Systémový správce může +volbou +\fB\-A\fR +definovat správce skupiny, volbou +\fB\-M\fR +členy skupiny a má vÅ¡echna práva skupinových správců a členů. +.SS "Poznámka o skupinových heslech" +.PP +Skupinová hesla jsou samozřejmě bezpečnostním problémem, jelikož je +heslo sdíleno více uživateli. Skupiny jsou nicméně užitečným nástrojem +pro spolupráci mezi různými uživateli. +.SH "VOLBY" +.PP +Správce skupiny může přidávat resp. mazat uživatele pomocí +\fB\-a\fR +resp. +\fB\-d\fR. +Správcové mohou odstranit skupinové heslo pomocí přepínače +\fB\-r\fR. +Pokud není heslo nastaveno, mohou použít příkaz +\fBnewgrp\fR +pro zapojení do skupiny pouze členové skupiny. Volba +\fB\-R\fR +zakáže přístup do skupiny skrze příkaz +\fBnewgrp\fR +(členové skupiny se do ní budou moci stále přepnout). +.PP +Pokud je +\fBgpasswd\fR +spuÅ¡ten správcem skupiny a jediným parametrem je jméno skupiny, zeptá +se na skupinové heslo. Pokud je heslo nastaveno, mohou členové používat +\fBnewgrp\fR(1) +stále bez hesla, nečlenové musí heslo zadat. +.SH "SOUBORY" +.TP +\fI/etc/group\fR +informace o skupinových účtech +.TP +\fI/etc/gshadow\fR +citlivé informace o skupinových účtech +.SH "VIZ TAKÉ" +.PP +\fBnewgrp\fR(1), +\fBgshadow\fR(5), +\fBgroupadd\fR(8), +\fBgroupdel\fR(8), +\fBgroupmod\fR(8), +\fBgrpck\fR(8), +\fBgroup\fR(5). diff --git a/man/cs/groupadd.8 b/man/cs/groupadd.8 new file mode 100644 index 00000000..c8e3977b --- /dev/null +++ b/man/cs/groupadd.8 @@ -0,0 +1,113 @@ +.TH "GROUPADD" "8" "01/02/2006" "System Management Commands" "System Management Commands" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "JMÉNO" +groupadd \- Vytvoří skupinu +.SH "POUŽITÍ" +.HP 9 +\fBgroupadd\fR [\-g\ \fIGID\fR\ [\-o]] [\-f] [\-K\ \fIKLÍČ\fR=\fIHODNOTA\fR] \fIskupina\fR +.SH "POPIS" +.PP +Příkaz +\fBgroupadd\fR +vytváří nové skupinové účty na základě zadaných hodnot a výchozích +hodnot nastavených v systému. Nová skupina bude podle pořeby zařazena +do přísluÅ¡ných systémových souborů. +.SH "VOLBY" +.PP +Příkaz +\fBgroupadd\fR +akceptuje následující volby: +.TP +\fB\-f\fR +Tato volba způsobí, že v případě kolize se stávající skupinou se vrátí +úspěšný návratový kód. Při použití s volbou +\fB\-g\fR, pokud již dané GID existuje, vybere se unikární GID +automaticky, (tj. jako kdybyste +\fB\-g\fR +nezadali). +.TP +\fB\-g\fR \fIGID\fR +Číselná hodnota skupinového ID. Tato hodnota musí být unikátní (s +výjimkou volby +\fB\-o\fR). +Hodnota musí být nezáporné celé číslo. Jako výchozí hodnota se použije +nejmenší ID větší než 999 a zároveň větší než ID vÅ¡ech ostatních +skupin. Hodnoty mezi 0 a 999 jsou obvykle rezervovány pro systémové účty. +.TP +\fB\-h\fR, \fB\-\-help\fR +Zobrazí nápovědu a skončí. +.TP +\fB\-K \fR\fB\fIKLÍČ\fR\fR\fB=\fR\fB\fIHODNOTA\fR\fR +Přepíše výchozí nastavení /etc/login.defs (GID_MIN, GID_MAX +apod.). Můžete zadat i více voleb najednou. +.sp +Příklad: +\fB\-K \fR\fIGID_MIN\fR=\fI100\fR\fB \-K \fR\fIGID_MAX\fR=\fI499\fR +.sp +Poznámka: +\fB\-K \fR\fIGID_MIN\fR=\fI10\fR,\fIGID_MAX\fR=\fI499\fR +zatím nefunguje. +.TP +\fB\-o\fR +Tato volba povolí přidání skupiny s neunikátním GID. +.SH "SOUBORY" +.TP +\fI/etc/group\fR +informace o skupinových účtech +.TP +\fI/etc/gshadow\fR +citlivé informace o skupinových účtech +.TP +\fI/etc/login.defs\fR +nastavení systému shadow +.SH "ZÁLUDNOSTI" +.PP +Názvy skupin musí začínat malým písmenem nebo podtržítkem a mohou +obsahovat pouze malá písmena, čísla, podtržítka, pomlčky a závěrečný +dolar. Vyjádřeno regulárním výrazem: [a\-z_][a\-z0\-9_\-]*[$] +.PP +Délka názvu skupiny nesmí překročit 16 znaků. +.PP +Jestliže již název skupiny existuje v externí databázi typu NIS, +příkaz +\fBgroupadd\fR +odmítne požadavek na vytvoření této skupiny. +.SH "NÁVRATOVÉ HODNOTY" +.PP +Příkaz +\fBgroupadd\fR +může skončit s následujícími návratovými hodnotami: +.TP +\fI0\fR +úspěch +.TP +\fI2\fR +chybná syntaxe příkazu +.TP +\fI3\fR +chybný argument parametru +.TP +\fI4\fR +GID není unikátní (pokud nepoužijete +\fB\-o\fR) +.TP +\fI9\fR +název skupiny není unikátní +.TP +\fI10\fR +nelze aktualizovat soubor group +.SH "VIZ TAKÉ" +.PP +\fBchfn\fR(1), +\fBchsh\fR(1), +\fBpasswd\fR(1), +\fBgpasswd\fR(8), +\fBgroupdel\fR(8), +\fBgroupmod\fR(8), +\fBlogin.defs\fR(5), +\fBuseradd\fR(8), +\fBuserdel\fR(8), +\fBusermod\fR(8). diff --git a/man/cs/groupdel.8 b/man/cs/groupdel.8 new file mode 100644 index 00000000..7991d9d3 --- /dev/null +++ b/man/cs/groupdel.8 @@ -0,0 +1,60 @@ +.TH "GROUPDEL" "8" "11/05/2005" "System Management Commands" "System Management Commands" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "JMÉNO" +groupdel \- Smaže skupinu +.SH "POUŽITÍ" +.HP 9 +\fBgroupdel\fR \fIskupina\fR +.SH "POPIS" +.PP +Příkaz +\fBgroupdel\fR +upraví soubory se systémovými účty tak, že smaže vÅ¡echy záznamy, které +se odkazují na +\fIskupinu\fR. Daná skupina musí existovat. +.PP +Abyste zajistili, že na souborových systémech nezůstanou soubory +vlastněné mazanou skupinou, musíte je sami vyhledat a přísluÅ¡ně +opravit. +.SH "ZÁLUDNOSTI" +.PP +Nelze odstranit primární skupinu uživatele. Nejprve musíte odstranit +uživatele a pak teprve danou skupinu. +.SH "SOUBORY" +.TP +\fI/etc/group\fR +informace o skupinových účtech +.TP +\fI/etc/gshadow\fR +citlivé informace o skupinových účtech +.SH "NÁVRATOVÉ HODNOTY" +.PP +Příkaz +\fBgroupdel\fR +může skončit s následujícími návratovými hodnotami: +.TP +\fI0\fR +úspěch +.TP +\fI2\fR +chybná syntaxe příkazu +.TP +\fI8\fR +nelze odstranit primární skupinu uživatele +.TP +\fI10\fR +nelze aktualizovat soubor group +.SH "VIZ TAKÉ" +.PP +\fBchfn\fR(1), +\fBchsh\fR(1), +\fBpasswd\fR(1), +\fBgpasswd\fR(8), +\fBgroupadd\fR(8), +\fBgroupmod\fR(8), +\fBuseradd\fR(8), +\fBuserdel\fR(8), +\fBusermod\fR(8) diff --git a/man/cs/logoutd.8 b/man/cs/logoutd.8 new file mode 100644 index 00000000..ed264c43 --- /dev/null +++ b/man/cs/logoutd.8 @@ -0,0 +1,30 @@ +.TH "LOGOUTD" "8" "11/05/2005" "System Management Commands" "System Management Commands" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "JMÉNO" +logoutd \- Omezuje čas přihlášení +.SH "POUŽITÍ" +.HP 8 +\fBlogoutd\fR +.SH "POPIS" +.PP +\fBlogoutd\fR +omezí čas přihlášení a seznam povolených portů podle pravidel zadaných v +\fI/etc/porttime\fR. +\fBlogoutd\fR +by se měl spouÅ¡tět z +\fI/etc/rc\fR. Program pak pravidelně kontroluje soubor +\fI/var/run/utmp\fR +a zkoumá, zda má daný uživatel oprávnění být přihlášen na daném portu +v daný čas. VÅ¡echna sezení, která poruÅ¡ují pravidla zadaná v +\fI/etc/porttime\fR, +jsou ukončena. +.SH "SOUBORY" +.TP +\fI/etc/porttime\fR +oprávnění k portům a přihlášení +.TP +\fI/var/run/utmp\fR +seznam aktuálních sezení diff --git a/man/cs/nologin.8 b/man/cs/nologin.8 new file mode 100644 index 00000000..92d6be80 --- /dev/null +++ b/man/cs/nologin.8 @@ -0,0 +1,28 @@ +.TH "NOLOGIN" "8" "01/07/2006" "System Management Commands" "System Management Commands" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "JMÉNO" +nologin \- sluÅ¡ně odmítne přihlášení +.SH "PŘEHLED" +.HP 8 +\fBnologin\fR +.SH "POPIS" +.PP +\fBnologin\fR +zobrazí oznámení, že účet není dostupný a skončí s nenulovým +návratovým kódem. Program je zamýšlen jako vhodná náhrada pole shell +v souboru passwd pro zablokované účty. +.PP +Pro zakázání vÅ¡ech přihlášení prozkoumejte +\fBnologin\fR(5). +.SH "VIZ TAKÉ" +.PP +\fBlogin\fR(1), +\fBnologin\fR(5). +.SH "HISTORIE" +.PP +Příkaz +\fBnologin\fR +se objevil v BSD 4.4. diff --git a/man/cs/vipw.8 b/man/cs/vipw.8 new file mode 100644 index 00000000..fbef380f --- /dev/null +++ b/man/cs/vipw.8 @@ -0,0 +1,71 @@ +.TH "VIPW" "8" "12/07/2005" "System Management Commands" "System Management Commands" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "JMÉNO" +vipw, vigr \- slouží k úpravě souborů password, group, shadow-password a shadow-group. +.SH "POUŽITÍ" +.HP 5 +\fBvipw\fR [volby] +.HP 5 +\fBvigr\fR [volby] +.SH "POPIS" +.PP +\fBvipw\fR +a +\fBvigr\fR +upravují soubory +\fI/etc/passwd\fR +a +\fI/etc/group\fR. S přepínačem +\fB\-s\fR +budou upravovat stínové verze obou souborů, tj. +\fI/etc/shadow\fR +a +\fI/etc/gshadow\fR. Programy používají zámky, aby předeÅ¡ly poruÅ¡ení +souborů. Při hledání editoru nejprve zkusí proměnnou prostředí +\fB$VISUAL\fR, poté proměnnou prostředí +\fB$EDITOR\fR a na konec spustí standardní editor +\fBvi\fR(1). +.SH "VOLBY" +.PP +Příkazy +\fBvipw\fR +a +\fBvigr\fR +akceptují následující volby: +.TP +\fB\-g\fR, \fB\-\-group\fR +Upraví databázi skupin. +.TP +\fB\-h\fR, \fB\-\-help\fR +Zobrazí nápovědu a skončí. +.TP +\fB\-p\fR, \fB\-\-passwd\fR +Upraví databázi hesel. +.TP +\fB\-q\fR, \fB\-\-quiet\fR +Tichý režim. +.TP +\fB\-s\fR, \fB\-\-shadow\fR +Upraví databázi shadow nebo gshadow. +.SH "SOUBORY" +.TP +\fI/etc/group\fR +informace o skupinových účtech +.TP +\fI/etc/gshadow\fR +stínový soubor pro skupiny +.TP +\fI/etc/passwd\fR +informace o uživatelských účtech +.TP +\fI/etc/shadow\fR +citlivé informace o uživatelských účtech +.SH "VIZ TAKÉ" +.PP +\fBvi\fR(1), +\fBgroup\fR(5), +\fBgshadow\fR(5)\fBpasswd\fR(5), +\fBshadow\fR(5). diff --git a/man/de/Makefile.in b/man/de/Makefile.in index 93ffaffb..b1ab2e81 100644 --- a/man/de/Makefile.in +++ b/man/de/Makefile.in @@ -132,6 +132,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ USE_NLS = @USE_NLS@ +USE_NLS_FALSE = @USE_NLS_FALSE@ +USE_NLS_TRUE = @USE_NLS_TRUE@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XMLCATALOG = @XMLCATALOG@ diff --git a/man/de/passwd.1 b/man/de/passwd.1 index a191a9b1..f239674d 100644 --- a/man/de/passwd.1 +++ b/man/de/passwd.1 @@ -1,4 +1,4 @@ -.\" $Id: passwd.1,v 1.9 2005/12/01 20:38:25 kloczek Exp $ +.\" $Id: passwd.1,v 1.10 2006/01/25 07:33:59 kloczek Exp $ .\" Copyright 1989 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -140,7 +140,7 @@ zu Ausführungen über diese Felder. .SS Hinweise zu Nutzerpasswörtern Die Sicherheit eines Passworts hängt von der Stärke des Verschlüsselungsalgorithmus und von der Größe des Schlüsselraums (key space) -ab. Die Verschlüsselung auf \fB\s\-2UNIX\s+2\fR\-Systemen basiert auf dem +ab. Die Verschlüsselung auf \fB\s-2UNIX\s+2\fR\-Systemen basiert auf dem NBS\-DES\-Algorithmus und ist sehr sicher. Die Größe des Schlüsselraums hängt von der Zufälligkeit des gewählten Passworts ab. .PP diff --git a/man/es/Makefile.in b/man/es/Makefile.in index 7dda011b..faaecc40 100644 --- a/man/es/Makefile.in +++ b/man/es/Makefile.in @@ -132,6 +132,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ USE_NLS = @USE_NLS@ +USE_NLS_FALSE = @USE_NLS_FALSE@ +USE_NLS_TRUE = @USE_NLS_TRUE@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XMLCATALOG = @XMLCATALOG@ diff --git a/man/es/login.1 b/man/es/login.1 index 9cc26ee1..ae3b7fc9 100644 --- a/man/es/login.1 +++ b/man/es/login.1 @@ -158,7 +158,7 @@ Una sección CLASSES de ejemplo: 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ón GROUPS: 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ón USERS de ejemplo: 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 diff --git a/man/es/vipw.8 b/man/es/vipw.8 index 6366773d..e3f1fbc9 100644 --- a/man/es/vipw.8 +++ b/man/es/vipw.8 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)vipw.8 6.7 (Berkeley) 3/16/91 -.\" $Id: vipw.8,v 1.1 2005/12/13 11:34:59 kloczek Exp $ +.\" $Id: vipw.8,v 1.2 2006/01/25 07:33:59 kloczek Exp $ .\" .\" .\" Translated into Spanish on Fri Aug 28 1998 by Gerardo Aburruzaga @@ -46,7 +46,7 @@ .Nm vipw .Op -V .Op --version - +.Pp .Nm vigr .Op -V .Op --version diff --git a/man/fi/Makefile.in b/man/fi/Makefile.in index 18662d5a..ad357878 100644 --- a/man/fi/Makefile.in +++ b/man/fi/Makefile.in @@ -129,6 +129,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ USE_NLS = @USE_NLS@ +USE_NLS_FALSE = @USE_NLS_FALSE@ +USE_NLS_TRUE = @USE_NLS_TRUE@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XMLCATALOG = @XMLCATALOG@ diff --git a/man/fi/chsh.1 b/man/fi/chsh.1 index 5936fafd..ed9cb959 100644 --- a/man/fi/chsh.1 +++ b/man/fi/chsh.1 @@ -1,53 +1,49 @@ -.\" -.\" 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: 2005/12/01 20:38:25 $ -.\" Proofread by Raimo Koski, Nov-Dec. 1999 -.\" Translated into Finnish by Juha-Pekka Syrjälä (jsyrjala@iki.fi) -.\" Proofread by Raimo Koski (rkoski@pp.weppi.fi) -.\" -.TH CHSH 1 "24. Huhtikuuta 1998" "chsh" "Käyttäjän sovellusohjelmat" -.SH NIMI -chsh \- vaihtaa sisäänkirjautumisessa käytetyn komentotulkin -.SH "YLEISKATSAUS" -.B chsh -[\ \-s\ komentotulkki\ ] [\ \-l\ ] [\ \-u\ ] [\ \-v\ ] [\ käyttäjätunnus\ ] -.SH KUVAUS -.B chsh -- käytetään vaihtamaan sisäänkirjautumisessa käytetty komentotulkki. -Jos komentotulkkia ei ole annettu komentorivillä, -.B chsh -kysyy sitä. -.SS HYVÄKSYTTÄVÄT KOMENTOTULKIT -.B chsh -hyväksyy minkä tahansa ajattavan tiedoston, jolle annetaan koko tiedostonimi polkuineen. -Se kuitenkin varoittaa, jos komentotulkki ei ole määritelty -.I /etc/shells-tiedostossa. -.SH OPTIOT +.\" ** You probably do not want to edit this file directly ** +.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). +.\" Instead of manually editing it, you probably should edit the DocBook XML +.\" source for it and then use the DocBook XSL Stylesheets to regenerate it. +.TH "CHSH" "1" "03/07/2006" "Käyttäjän sovellukset" "Käyttäjän sovellukset" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "NAME" +chsh \- vaihda sisäänkirjautumiskuorta +.SH "SYNOPSIS" +.HP 5 +\fBchsh\fR [\-s\ \fIsisäänkirjautumiskuori\fR] [\fIkäyttäjä\fR] +.SH "KUVAUS" +.PP +\fBchsh\fR +vaihtaa käyttäjän sisäänkirjautumiskuorta. Tämä määrittää käyttäjän ensimmäisen kirjautumiskomennon. Tavallinen käyttäjä voi vaihtaa ainoastaan oman tunnuksensa kirjautumiskuorta, mutta pääkäyttäjä voi vaihtaa kenen tahansa kirjautumiskuoren. +.PP +Ainoa rajoitus kirjautumiskuorelle on, että komennon nimen täytyy olla lueteltuna tiedostossa +\fI/etc/shells\fR +ellei komentoa käynnistänyt pääkäyttäjä, jolloin mikä tahansa arvo voidaan lisätä. Tunnus, jolla on rajoitettu kirjautumiskuori, ei voi vaihtaa omaa kirjautumiskuortaan. Tästä syystä komennon +\fI/bin/rsh\fR +lisääminen tiedostoon +\fI/etc/shells\fR +ei ole suositeltavaa, koska käyttäjän vahingossa vaihtaessa rajoitettuun kuoreen, ei hän voi koskaan vaihtaa kirjautumiskuortaan takaisin alkuperäiseen arvoon. +.SH "VALITSIMET" +.PP +Mikäli valitsinta +\fB\-s\fR +ei ole annettu, +\fBchsh\fR +toimii interaktiivisesti kysyen käyttäjältä kirjautumiskuorta. Syöttämällä uuden arvon vaihdetaan kuorta, ja antamalla tyhjän syötteen, vanha kuori jää voimaan. Nykyinen kuori tulostetaan +\fI[ ]\fR\-merkkiparin välissä. +.SH "TIEDOSTOT" .TP -.I "\-s, \-\-shell" -Määrittele sisäänkirjautumisessa käytetty komentotulkki. +\fI/etc/passwd\fR +käyttäjätunnuksien tiedot .TP -.I "\-l, \-\-list-shells" -Tulostaa listan komentotulkeista, jotka ovat määritelty -.I /etc/shells --tiedostossa ja sulkee ohjelman. +\fI/etc/shells\fR +luettelo sallituista kirjautumiskuorista .TP -.I "\-u, \-\-help" -Tulostaa ohjeen ja sulkee ohjelman. -.TP -.I "-v, \-\-version" -Tulostaa versiota koskevan informaation ja sulkee ohjelman. -.SH TEKIJÄ -Salvatore Valente +\fI/etc/login.defs\fR +varjosalasanakaluston asetukset .SH "KATSO MYÖS" -.BR login (1), -.BR passwd (5), -.BR shells (5), +.PP +\fBchfn\fR(1), +\fBlogin.defs\fR(5), +\fBpasswd\fR(5) diff --git a/man/fi/passwd.1 b/man/fi/passwd.1 index a5727bf0..930300f4 100644 --- a/man/fi/passwd.1 +++ b/man/fi/passwd.1 @@ -85,7 +85,8 @@ Ei tunnettuja virheitä. .BR pam (8), ja .BR pam_chauthok (2). -.sp Monipuolisempi selostus tämän ohjelman ja Linux-PAMin asetuksista +.sp +Monipuolisempi selostus tämän ohjelman ja Linux-PAMin asetuksista löytyy englanninkielisestä .BR "'Linux-PAM System Adminstarators' Guide'":sta WWW-osoitteesta: diff --git a/man/fi/su.1 b/man/fi/su.1 index dc5ec7c5..4c298232 100644 --- a/man/fi/su.1 +++ b/man/fi/su.1 @@ -1,84 +1,119 @@ -.\" Copyright 1989 - 1990, John F. Haugh II -.\" 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. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by John F. Haugh, II -.\" and other contributors. -.\" 4. Neither the name of John F. Haugh, II 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 JOHN 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 JOHN 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: su.1,v 1.1 2005/11/12 17:01:00 kloczek Exp $ -.\" -.TH SU 1 -.SH NAME -su \- Tarjoaa rajoitetut root oikeudet jollekin kayttajalle -.SH SYNTAKSI -.BR su " [" - ] -.RI [ kayttajanimi " [" argumentit ]] -.SH KUVAUS -.B su:ta -kaytetaan jotta voisi valiaikaisesti tulla joksikin toiseksi -kayttajaksi istunnon aikana. Oletuksena ilman argumentteja -kayttaja tulee rootiksi. -is used to become another user during a login session. -Invoked without a username, \fBsu\fR defaults to becoming -the super user. -Optiota \fB\-\fR voidaan kayttaa antamaan samanlainen -ymparisto kuin oikealla kayttajalla joka on tullut -sisaan suoraan omalla tunnuksellaan. +.\" ** You probably do not want to edit this file directly ** +.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). +.\" Instead of manually editing it, you probably should edit the DocBook XML +.\" source for it and then use the DocBook XSL Stylesheets to regenerate it. +.TH "SU" "1" "03/07/2006" "Käyttäjän sovellukset" "Käyttäjän sovellukset" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "NAME" +su \- vaihda käyttäjätunnusta tai tule pääkäyttäjäksi +.SH "SYNOPSIS" +.HP 3 +\fBsu\fR [\fIvalitsimet\fR] [\-] [\fIkäyttäjätunnus\fR\ [\ \fIparametrit\fR\ ]] +.SH "KUVAUS" .PP -Muita optioita voidaan antaa kayttja nimen jalkeen, siina -tapauksessa jos ne ovat tuettuja kayttajan komentotulkissa. -Yksityiskohdissa, argumentti \fB-c\fR aiheuttaa sen etta -seruraavat argumentit ovat komentojen optioita. -Komento toteutetaan siina komentotulkissa joka on maaritelty -\fB$SHELL\fR, tai jos sita ei ole maaritelty niin kaytetaan -komentotulkkia joka on maaritelty \fI/etc/passwd\fR. +\fBsu\fR\-komentoa käytetään vaihtamaan toiseksi käyttäjäksi kesken istunnon. Kun komento ajetaan ilman käyttäjänimeä, +\fBsu\fR +oletuksena vaihtaa pääkäyttäjäksi. Valinnainen parametri +\fB\-\fR +voidaan antaa kun halutaan samanlainen ympäristö kuin käyttäjä odottaa kirjautuessaan suoraan sisään. .PP -Kayttajalta voidaan kysya salasanaa jos se on takavarikoitu. -Vaara salasana tuottaa virheilmoituksen. Kaikki yritykset -menevat kuitenkin jarjestelman logitiedostoon. +Muita parametreja voidaan antaa käyttäjänimen jälkeen, jolloin ne välitetään käyttäjän sisäänkirjautumiskuorelle. Erityisesti parametri +\fB\-c\fR +tarkoittaa, että seuraava parametri on komento useimmissa komentotulkeissa. Komento suoritetaan kuorella, joka on määritetty +\fI/etc/passwd\fR\-tiedostossa kohdekäyttäjälle. .PP -Voimassaoleva ymparisto on myos uudessa komentotulkissa. Arvo -\fB$PATH\fR on uudelleenasetettu kohteessa \fB/bin:/usr/bin\fR -tavallisille kayttajille, tai \fB/bin:/usr/bin:/etc\fR rootille. -.SH OPTIOT +Voit käyttää parametria +\fB\-\-\fR +erottamaan +\fBsu\fR\-valitsimet kuorelle välitettävistä parametreista. .PP -Tassa versiossa \fBsu\fR:lla on monia kaannosoptioita, vain -joitakin voi kayttaa yksityiskohtaisesti. -.SH TIEDOSTOT -/etc/passwd \- Kayttajatiedot -.br -/etc/shadow \- Kryptatut salasanat ja tunnuksen loppumispaivamaara. -.br -$HOME/.profile \- Alustustiedostot oletus komentotulkille -.SH KATSO MYOS -.BR login (1), -.BR sh (1) -.SH SUOMENNUS -.BR Mikko -.BR Hurskainen -.BR 1998 -.BR hurska@dlc.fi +Käyttäjältä pyydetään salasanaa tarvittaessa. Väärä salasana tuottaa virheilmoituksen. Kaikki yritykset, niin kelvolliset kuin virheellisetkin, kirjataan lokiin järjestelmän väärinkäytösten tunnistamiseksi. +.PP +Nykyinen ympäristö välitetään kuorelle. +\fB$PATH\fR\-muuttujan arvo tyhjätään arvoksi +\fI/bin:/usr/bin\fR +tavallisille käyttäjille taikka +\fI/sbin:/bin:/usr/sbin:/usr/bin\fR +pääkäyttäjälle. Tämän käyttäytymisen voi vaihtaa asetuksilla +\fIENV_PATH\fR +ja +\fIENV_SUPATH\fR +tiedostossa +\fI/etc/login.defs\fR. +.PP +Sisäinen kirjautuminen ilmoitetaan lisäämällä "*" ensimmäiseksi merkiksi sisäänkirjautumiskuoreen. Annettua kotihakemistoa käytetään uuden tiedostojärjestelmän juurena, jonne käyttäjä tosiasiassa kirjautuu. +.SH "VALITSIMET" +.PP +\fBsu\fR\-komennon valitsimet ovat: +.TP +\fB\-c\fR, \fB\-\-command\fR \fIKUORI\fR +Määritä komento, jonka kuori käynnistää sen +\fB\-c\fR\-valitsimella. +.TP +\fB\-\fR, \fB\-l\fR, \fB\-\-login\fR +Tarjoa samankaltainen ympäristö kuin käyttäjä saisi kirjautuessaan suoraa sisään. +.sp +Kun +\fB\-\fR +on käytössä, se täytyy antaa viimeisenä valitsimena +\fBsu\fR\-komennolle. Muilla valitsimilla (\fB\-l\fR +sekä +\fB\-\-login\fR) ei ole tätä rajoitusta. +.TP +\fB\-s\fR, \fB\-\-shell\fR \fIKUORI\fR +Käynnistettävä kuori +.sp +Käynnistettävä kuori valitaan seuraavasti (tärkeimmästä alkaen): +.RS +.TP 3 +\(bu +Kuori, joka määritetään valitsimella \-\-shell +.TP +\(bu +Mikäli valitsinta +\fB\-\-preserve\-environment\fR +on käytetty, kuori onka määrittää ympäristömuuttuja +\fB$SHELL\fR. +.TP +\(bu +Kuori, joka on asetettu /etc/passwd\-tietueessa kohdekäyttäjälle. +.TP +\(bu +/bin/sh mikäli kuorta ei löytynyt millään edellisistä tavoista. +.RE +.IP +.sp +Mikäli kohdekäyttäjällä on rajoitettu kuori (esim. kuorikenttä käyttäjän tietueessa +\fI/etc/passwd\fR\-tiedostossa ei löydy tiedostosta +\fI/etc/shell\fR), niin valitsin +\fB\-\-shell\fR +ja ympäristömuuttuja +\fB$SHELL\fR +jätetään huomiotta paitsi kun komennon +\fBsu\fR +käynnistää pääkäyttäjä. +.TP +\fB\-m\fR, \fB\-p\fR, \fB\-\-preserve\-environment\fR +Säilytä nykyinen ympäristö. +.sp +Mikäli kohdekäyttäjällä on rajoitettu ympäristö, tällä valitsimella ei ole vaikutusta (ellei +\fBsu\fR\-komentoa käynnistänyt pääkäyttäjä). +.SH "VAROITUKSET" +.PP +Tällä versiolla +\fBsu\fR\-sovelluksesta on useita käännösaikaisia valitsimia, ja niistä vain osa saattaa olla käytössä tietyissä paikoissa. +.SH "TIEDOSTOT" +.TP +\fI/etc/passwd\fR +käyttäjätunnuksien tiedot +.TP +\fI/etc/shadow\fR +turvalliset käyttäjätunnuksien tiedot +.SH "KATSO MYÖS" +.PP +\fBlogin\fR(1), +\fBlogin.defs\fR(5), +\fBsh\fR(1) diff --git a/man/fr/Makefile.in b/man/fr/Makefile.in index f1b41f77..d4ad2ed3 100644 --- a/man/fr/Makefile.in +++ b/man/fr/Makefile.in @@ -133,6 +133,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ USE_NLS = @USE_NLS@ +USE_NLS_FALSE = @USE_NLS_FALSE@ +USE_NLS_TRUE = @USE_NLS_TRUE@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XMLCATALOG = @XMLCATALOG@ diff --git a/man/gpasswd.1.xml b/man/gpasswd.1.xml index 87af68ec..46ed5754 100644 --- a/man/gpasswd.1.xml +++ b/man/gpasswd.1.xml @@ -2,7 +2,7 @@ - + gpasswd 1 @@ -66,7 +66,7 @@ useful tool for permitting co-operation between different users. - + diff --git a/man/hu/Makefile.in b/man/hu/Makefile.in index 4882d020..da6bfa02 100644 --- a/man/hu/Makefile.in +++ b/man/hu/Makefile.in @@ -132,6 +132,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ USE_NLS = @USE_NLS@ +USE_NLS_FALSE = @USE_NLS_FALSE@ +USE_NLS_TRUE = @USE_NLS_TRUE@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XMLCATALOG = @XMLCATALOG@ diff --git a/man/hu/passwd.1 b/man/hu/passwd.1 index 60d977a3..71518537 100644 --- a/man/hu/passwd.1 +++ b/man/hu/passwd.1 @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: passwd.1,v 1.6 2005/12/01 20:38:25 kloczek Exp $ +.\" $Id: passwd.1,v 1.7 2006/01/25 07:33:59 kloczek Exp $ .\" .TH PASSWD 1 "" \" \-*\- nroff \-*\- .SH NÉV @@ -112,7 +112,7 @@ A következő négy rész a jelszavak minimális és maximális ideje, az első .SS Tippek a felhasználói jelszavakhoz Egy jelszavas rendszer biztonsága a kódolási algoritmus erősségétől és a lehetséges kulcsok számától függ. -A \fB\s\-2UNIX\s+2\fR rendszerek kódolási módja az NBS DES algoritmuson alapul, és nagyon biztonságos. A lehetséges kulcsok száma a választott jelszó véletlenszerűségén múlik. +A \fB\s-2UNIX\s+2\fR rendszerek kódolási módja az NBS DES algoritmuson alapul, és nagyon biztonságos. A lehetséges kulcsok száma a választott jelszó véletlenszerűségén múlik. .PP A jelszavas rendszerek feltörése legtöbbször a gondatlanul megválasztott jelszóválasztásnak vagy a jelszavak cserélgetésének eredménye. Ezen okok miatt célszerű olyan jelszót választanod, ami nem szerepel a szótárban és nem szükséges leírnod. Tipikusan rossz választás még, ha valamilyen nevet, valamilyen azonosítószámodat, születésnapodat, vagy címedet használod jelszóként. diff --git a/man/id/Makefile.in b/man/id/Makefile.in index 72fd9fa5..cd65f0cf 100644 --- a/man/id/Makefile.in +++ b/man/id/Makefile.in @@ -130,6 +130,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ USE_NLS = @USE_NLS@ +USE_NLS_FALSE = @USE_NLS_FALSE@ +USE_NLS_TRUE = @USE_NLS_TRUE@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XMLCATALOG = @XMLCATALOG@ diff --git a/man/id/login.1 b/man/id/login.1 index f43865bc..4d8742c4 100644 --- a/man/id/login.1 +++ b/man/id/login.1 @@ -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 @@ -188,7 +188,7 @@ 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 @@ -217,7 +217,7 @@ 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 diff --git a/man/it/Makefile.in b/man/it/Makefile.in index 5b107c75..7af83544 100644 --- a/man/it/Makefile.in +++ b/man/it/Makefile.in @@ -133,6 +133,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ USE_NLS = @USE_NLS@ +USE_NLS_FALSE = @USE_NLS_FALSE@ +USE_NLS_TRUE = @USE_NLS_TRUE@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XMLCATALOG = @XMLCATALOG@ diff --git a/man/it/grpck.8 b/man/it/grpck.8 index bf3c41a3..101897d5 100644 --- a/man/it/grpck.8 +++ b/man/it/grpck.8 @@ -1,6 +1,6 @@ .\" This file was generated with po4a. Translate the source file. .\" -.\"$Id: grpck.8,v 1.6 2005/12/01 20:38:26 kloczek Exp $ +.\"$Id: grpck.8,v 1.7 2006/01/25 07:33:59 kloczek Exp $ .\" Copyright 1992 - 1993, Julianne Frances Haugh .\" All rights reserved. .\" @@ -47,7 +47,7 @@ Vengono fatti controlli per verificare che ogni voce abbia: \- un nome univoco di gruppo .br \- una lista valida di membri e amministratori -.in \-.5i +.in -.5i .sp .PP Gli errori nelle verifiche sul corretto numero di campi e sull'univocità diff --git a/man/it/pwck.8 b/man/it/pwck.8 index 0499329c..7174c187 100644 --- a/man/it/pwck.8 +++ b/man/it/pwck.8 @@ -1,6 +1,6 @@ .\" This file was generated with po4a. Translate the source file. .\" -.\"$Id: pwck.8,v 1.2 2005/12/01 20:38:26 kloczek Exp $ +.\"$Id: pwck.8,v 1.3 2006/01/25 07:33:59 kloczek Exp $ .\" Copyright 1992, Julianne Frances Haugh .\" All rights reserved. .\" @@ -53,7 +53,7 @@ Vengono fatti controlli per verificare che ogni voce abbia: \- una home directory valida .br \- una shell di login valida -.in \-.5i +.in -.5i .sp .PP Gli errori nelle verifiche sul corretto numero di campi e sull'univocità diff --git a/man/ja/Makefile.in b/man/ja/Makefile.in index af9c0bc5..66f31a7d 100644 --- a/man/ja/Makefile.in +++ b/man/ja/Makefile.in @@ -132,6 +132,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ USE_NLS = @USE_NLS@ +USE_NLS_FALSE = @USE_NLS_FALSE@ +USE_NLS_TRUE = @USE_NLS_TRUE@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XMLCATALOG = @XMLCATALOG@ diff --git a/man/ja/grpck.8 b/man/ja/grpck.8 index 5e7d3970..b1de57e0 100644 --- a/man/ja/grpck.8 +++ b/man/ja/grpck.8 @@ -1,4 +1,4 @@ -.\"$Id: grpck.8,v 1.7 2005/12/01 20:38:26 kloczek Exp $ +.\"$Id: grpck.8,v 1.8 2006/01/25 07:33:59 kloczek Exp $ .\" Copyright 1992 - 1993, Julianne Frances Haugh .\" All rights reserved. .\" @@ -54,7 +54,7 @@ grpck \- グループファイルが正しいかどうか検査する \- グループ名に重複がないか .br \- メンバーのリストと管理者のリストが正しいか -.in \-.5i +.in -.5i .sp がチェックされる。 .P diff --git a/man/ja/passwd.1 b/man/ja/passwd.1 index 9ae45b78..f39fa96d 100644 --- a/man/ja/passwd.1 +++ b/man/ja/passwd.1 @@ -1,4 +1,4 @@ -.\" $Id: passwd.1,v 1.9 2005/12/01 20:38:26 kloczek Exp $ +.\" $Id: passwd.1,v 1.10 2006/01/25 07:33:59 kloczek Exp $ .\" Copyright 1989 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -153,7 +153,7 @@ kill 文字を含めないように注意すること。 使用不能期間である。 .SS ユーザパスワードに対するヒント パスワードの安全性は暗号化アルゴリズムの強力さとキー空間の大きさに依存する。 -\fB\s\-2UNIX\s+2\fR のシステム暗号化の方法は +\fB\s-2UNIX\s+2\fR のシステム暗号化の方法は NBS DES アルゴリズムに基づいており、非常に安全性が高い。 キー空間の大きさは選ばれたパスワードのランダムさに依存する。 .PP diff --git a/man/ja/pwck.8 b/man/ja/pwck.8 index cf360dc4..ad048563 100644 --- a/man/ja/pwck.8 +++ b/man/ja/pwck.8 @@ -1,4 +1,4 @@ -.\"$Id: pwck.8,v 1.7 2005/12/01 20:38:26 kloczek Exp $ +.\"$Id: pwck.8,v 1.8 2006/01/25 07:33:59 kloczek Exp $ .\" Copyright 1992, Julianne Frances Haugh .\" All rights reserved. .\" @@ -61,7 +61,7 @@ pwck \- パスワードファイルが正しいかどうか検査する \- ホームディレクトリが正しいか .br \- ログインシェルが正しいか -.in \-.5i +.in -.5i .sp がチェックされる。 .P diff --git a/man/ko/Makefile.in b/man/ko/Makefile.in index 1a1342bd..17040ffe 100644 --- a/man/ko/Makefile.in +++ b/man/ko/Makefile.in @@ -132,6 +132,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ USE_NLS = @USE_NLS@ +USE_NLS_FALSE = @USE_NLS_FALSE@ +USE_NLS_TRUE = @USE_NLS_TRUE@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XMLCATALOG = @XMLCATALOG@ diff --git a/man/ko/login.1 b/man/ko/login.1 index 7e5770f2..4533bebf 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 diff --git a/man/ko/su.1 b/man/ko/su.1 index 4cc893b4..e509c70e 100644 --- a/man/ko/su.1 +++ b/man/ko/su.1 @@ -1,4 +1,4 @@ -.TH SU 1L "GNU 쉘 유틸리티" "FSF" \" \-*\- nroff \-*\- +.TH SU 1 "GNU 쉘 유틸리티" "FSF" \" \-*\- nroff \-*\- .SH 이름 su \- 사용자와 그룹 ID 를 교체하여 쉘을 실행한다 .SH 개요 diff --git a/man/limits.5 b/man/limits.5 index e2c5af4a..c661ccb9 100644 --- a/man/limits.5 +++ b/man/limits.5 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "LIMITS" "5" "11/05/2005" "File Formats and Conversions" "File Formats and Conversions" +.TH "LIMITS" "5" "02/06/2006" "File Formats and Conversions" "File Formats and Conversions" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -72,8 +72,12 @@ For example, \fIL2D2048N5\fR is a valid \fILIMITS_STRING \fR. For reading convenience, the following entries are equivalent: -.PP -username L2D2048N5username L2 D2048 N5 +.sp +.nf + username L2D2048N5 + username L2 D2048 N5 + +.fi .PP Be aware that after \fIusername\fR diff --git a/man/limits.5.xml b/man/limits.5.xml index 349c6cdd..34ab423b 100644 --- a/man/limits.5.xml +++ b/man/limits.5.xml @@ -2,7 +2,7 @@ - + limits 5 @@ -74,10 +74,10 @@ following entries are equivalent: - username L2D2048N5 - + + username L2D2048N5 username L2 D2048 N5 - + Be aware that after username the rest diff --git a/man/login.1 b/man/login.1 index 8c77f996..0572b32e 100644 --- a/man/login.1 +++ b/man/login.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "LOGIN" "1" "12/15/2005" "User Commands" "User Commands" +.TH "LOGIN" "1" "01/07/2006" "User Commands" "User Commands" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -21,7 +21,7 @@ login \- begin session on the system \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\(aas terminal. +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 diff --git a/man/login.1.xml b/man/login.1.xml index 5e95ccb0..70fccf3b 100644 --- a/man/login.1.xml +++ b/man/login.1.xml @@ -2,7 +2,7 @@ - + login 1 @@ -39,7 +39,7 @@ login is used to establish a new session with the system. It is normally invoked automatically by responding to the - login: prompt on the user´s + login: prompt on the user's terminal. login may be special to the shell and may not be invoked as a sub-process. Typically, login is treated by the shell as exec login diff --git a/man/login.defs.5 b/man/login.defs.5 index 01ffc9aa..365987b2 100644 --- a/man/login.defs.5 +++ b/man/login.defs.5 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "LOGIN.DEFS" "5" "11/05/2005" "File Formats and Conversions" "File Formats and Conversions" +.TH "LOGIN.DEFS" "5" "03/07/2006" "File Formats and Conversions" "File Formats and Conversions" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -74,7 +74,7 @@ Range of user IDs to choose from for the program. .TP UMASK (number) -The permission mask is initialized to this value. If not specified, the permission mask will be initialized to 077. +The permission mask is initialized to this value. If not specified, the permission mask will be initialized to 022. .TP USERDEL_CMD (string) If defined, this command is run when removing a user. It should remove any at/cron/print jobs etc. owned by the user to be removed (passed as the first argument). diff --git a/man/login.defs.5.xml b/man/login.defs.5.xml index 967da6ce..fdb98a8c 100644 --- a/man/login.defs.5.xml +++ b/man/login.defs.5.xml @@ -2,7 +2,7 @@ - + login.defs 5 @@ -162,7 +162,7 @@ The permission mask is initialized to this value. If not - specified, the permission mask will be initialized to 077. + specified, the permission mask will be initialized to 022. diff --git a/man/nologin.8 b/man/nologin.8 new file mode 100644 index 00000000..704efd3b --- /dev/null +++ b/man/nologin.8 @@ -0,0 +1,30 @@ +.\" ** You probably do not want to edit this file directly ** +.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). +.\" Instead of manually editing it, you probably should edit the DocBook XML +.\" source for it and then use the DocBook XSL Stylesheets to regenerate it. +.TH "NOLOGIN" "8" "01/07/2006" "System Management Commands" "System Management Commands" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "NAME" +nologin \- politely refuse a login +.SH "SYNOPSIS" +.HP 8 +\fBnologin\fR +.SH "DESCRIPTION" +.PP +\fBnologin\fR +displays a message that an account is not available and exits non\-zero. It is intended as a replacement shell field for accounts that have been disabled. +.PP +To disable all logins, investigate +\fBnologin\fR(5). +.SH "SEE ALSO" +.PP +\fBlogin\fR(1), +\fBnologin\fR(5). +.SH "HYSTORY" +.PP +The +\fBnologin\fR +command appeared in BSD 4.4. diff --git a/man/nologin.8.xml b/man/nologin.8.xml new file mode 100644 index 00000000..20961701 --- /dev/null +++ b/man/nologin.8.xml @@ -0,0 +1,54 @@ + + + + + + nologin + 8 + System Management Commands + + + nologin + politely refuse a login + + + + + nologin + + + + + DESCRIPTION + + nologin displays a message that an account is not + available and exits non-zero. It is intended as a replacement shell field + for accounts that have been disabled. + + + To disable all logins, investigate + nologin5 + . + + + + + SEE ALSO + + + login1 + , + + nologin5 + . + + + + + HYSTORY + + The nologin command appeared in BSD 4.4. + + + diff --git a/man/passwd.1 b/man/passwd.1 index 2bbe3d0c..a00455e1 100644 --- a/man/passwd.1 +++ b/man/passwd.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "PASSWD" "1" "12/03/2005" "User Commands" "User Commands" +.TH "PASSWD" "1" "02/28/2006" "User Commands" "User Commands" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -11,15 +11,13 @@ passwd \- change user password .SH "SYNOPSIS" .HP 7 -\fBpasswd\fR [\-x\ \fImax\fR] [\-n\ \fImin\fR] [\-w\ \fIwarn\fR] [\-i\ \fIinact\fR] \fIlogin\fR -.HP 7 -\fBpasswd\fR [\-l \-u \-d \-S \-e] \fIlogin\fR +\fBpasswd\fR [\fIoptions\fR] \fIlogin\fR .SH "DESCRIPTION" .PP \fBpasswd\fR -changes passwords for user accounts. A normal user may only change the password for his/her own account, the super user may change the password for any account. +changes passwords for user accounts. A normal user may only change the password for his/her own account, while the super user may change the password for any account. \fBpasswd\fR -also changes account information, such as the full name of the user, user's login shell, or password expiry date and interval. +also changes account information, such as the full name of the user, the user's login shell, or his/her password expiry date and interval. .SS "Password Changes" .PP 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 user has only one chance to enter the correct password. The super user is permitted to bypass this step so that forgotten passwords may be changed. @@ -54,7 +52,7 @@ System encryption method is based on the NBS DES algorithm and is very secure. T .PP Compromises in password security normally result from careless password selection or handling. For this reason, you should not select a password which appears in a dictionary or which must be written down. The password should also not be a proper name, your license number, birth date, or street address. Any of these may be used as guesses to violate system security. .PP -Your password must easily remembered so that you will not be forced to write it on a piece of paper. This can be accomplished by appending two small words together and separating each with a special character or digit. For example, Pass%word. +Your password must be easily remembered so that you will not be forced to write it on a piece of paper. This can be accomplished by appending two small words together and separating each with a special character or digit. For example, Pass%word. .PP Other methods of construction involve selecting an easily remembered phrase from literature and selecting the first or last letter from each word. An example of this is: .TP 3 @@ -83,7 +81,7 @@ and causes show status for all users. Delete a user's password (make it empty). This is a quick way to disable a password for an account. It will set the named account passwordless. .TP \fB\-e\fR, \fB\-\-expire\fR -Immediately expire an account\(cqs password. This in effect can force a user to change his/her password at the user\(cqs next login. +Immediately expire an account's password. This in effect can force a user to change his/her password at the user's next login. .TP \fB\-h\fR, \fB\-\-help\fR Display help message and exit. @@ -100,7 +98,7 @@ Indicate change password should be performed only for expired authentication tok Lock the named account. This option disables an account by changing the password to a value which matches no possible encrypted value. .TP \fB\-n\fR, \fB\-\-mindays\fR \fIMIN_DAYS\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. +Set the minimum number of days between password changes. A value of zero for this field indicates that the user may change his/her password at any time. .TP \fB\-q\fR, \fB\-\-quiet\fR Quiet mode. @@ -111,7 +109,7 @@ change password in repository .TP \fB\-S\fR, \fB\-\-status\fR -Display account status information. The status information consists of 7 fields. The first field is the user\(cqs 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. +Display account status information. 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. .TP \fB\-u\fR, \fB\-\-unlock\fR Unlock the named account. This option re\-enables an account by changing the password back to its previous value (to value before using @@ -121,14 +119,14 @@ option). \fB\-w\fR, \fB\-\-warndays\fR \fIWARN_DAYS\fR Set the number of days of warning before a password change is required. The \fIWARN_DAYS\fR -option is the number of days prior to the password expiring that a user will be warned her password is about to expire. +option is the number of days prior to the password expiring that a user will be warned that his/her password is about to expire. .TP \fB\-x\fR, \fB\-\-maxdays\fR \fIMAX_DAYS\fR Set the maximum number of days a password remains valid. After \fIMAX_DAYS\fR, the password is required to be changed. .SH "CAVEATS" .PP -Not all options may be supported. Password complexity checking may vary from site to site. The user is urged to select a password as complex as he feels comfortable with. Users may not be able to change their password on a system if NIS is enabled and they are not logged into the NIS server. +Not all options may be supported. Password complexity checking may vary from site to site. The user is urged to select a password as complex as he or she feels comfortable with. Users may not be able to change their password on a system if NIS is enabled and they are not logged into the NIS server. .SH "FILES" .TP \fI/etc/passwd\fR diff --git a/man/passwd.1.xml b/man/passwd.1.xml index 927ab18c..1081e72f 100644 --- a/man/passwd.1.xml +++ b/man/passwd.1.xml @@ -2,7 +2,7 @@ - + passwd 1 @@ -16,22 +16,9 @@ passwd - -x max - -n min - -w warn - -i inact - login + + options - - - passwd - - -l - -u - -d - -S - -e - login @@ -40,17 +27,17 @@ DESCRIPTION passwd changes passwords for user accounts. A - normal user may only change the password for his/her own account, the - super user may change the password for any account. + normal user may only change the password for his/her own account, while + the super user may change the password for any account. passwd also changes account information, such as - the full name of the user, user's login shell, or password expiry date - and interval. + the full name of the user, the user's login shell, or his/her password + expiry date and interval. Password Changes - The user is first prompted for his/her old password, if one is + 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 user has only one chance to enter the correct password. The super user is permitted to bypass this step so that @@ -58,14 +45,14 @@ - After the password has been entered, password aging information is + After the password has been entered, password aging information is checked to see if the user is permitted to change the password at this time. If not, passwd refuses to change the password and exits. - The user is then prompted for a replacement password. This password + The user is then prompted for a replacement password. This password is tested for complexity. As a general guideline, passwords should consist of 6 to 8 characters including one or more from each of following sets: @@ -84,22 +71,22 @@ - Care must be taken not to include the system default erase or kill + Care must be taken not to include the system default erase or kill characters. passwd will reject any password which is not suitably complex. - If the password is accepted, passwd 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. + + If the password is accepted, passwd 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. Hints for user passwords - The security of a password depends upon the strength of the + The security of a password depends upon the strength of the encryption algorithm and the size of the key space. The UNIX System encryption method is based on the NBS DES algorithm and is very secure. The size of the key space @@ -107,7 +94,7 @@ - Compromises in password security normally result from careless + Compromises in password security normally result from careless password selection or handling. For this reason, you should not select a password which appears in a dictionary or which must be written down. The password should also not be a proper name, your @@ -116,14 +103,14 @@ - Your password must easily remembered so that you will not be forced + Your password must be easily remembered so that you will not be forced to write it on a piece of paper. This can be accomplished by appending two small words together and separating each with a special character or digit. For example, Pass%word. - Other methods of construction involve selecting an easily remembered + Other methods of construction involve selecting an easily remembered phrase from literature and selecting the first or last letter from each word. An example of this is: @@ -141,7 +128,7 @@ - You may be reasonably sure few crackers will have included this in + You may be reasonably sure few crackers will have included this in their dictionaries. You should, however, select your own methods for constructing passwords and not rely exclusively on the methods given here. @@ -184,8 +171,8 @@ - Immediately expire an account’s password. This in effect can - force a user to change his/her password at the user’s next login. + Immediately expire an account's password. This in effect can + force a user to change his/her password at the user's next login. @@ -238,7 +225,7 @@ Set the minimum number of days between password changes. A value - of zero for this field indicates that the user may change her + of zero for this field indicates that the user may change his/her password at any time. @@ -270,7 +257,7 @@ Display account status information. The status information - consists of 7 fields. The first field is the user’s login name. + 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 @@ -301,7 +288,7 @@ Set the number of days of warning before a password change is required. The WARN_DAYS option is the number of days prior to the password expiring that a user - will be warned her password is about to expire. + will be warned that his/her password is about to expire. @@ -325,9 +312,9 @@ Not all options may be supported. Password complexity checking may vary from site to site. The user is urged to select a password as - complex as he feels comfortable with. Users may not be able to change - their password on a system if NIS is enabled and they are not logged - into the NIS server. + complex as he or she feels comfortable with. Users may not be able to + change their password on a system if NIS is enabled and they are not + logged into the NIS server. diff --git a/man/passwd.5 b/man/passwd.5 index ade5ef01..26c2e74d 100644 --- a/man/passwd.5 +++ b/man/passwd.5 @@ -2,13 +2,13 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "PASSWD" "5" "11/05/2005" "File Formats and Conversions" "File Formats and Conversions" +.TH "PASSWD" "5" "01/22/2006" "File Formats and Conversions" "File Formats and Conversions" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" -passwd \- The password file +passwd \- the password file .SH "DESCRIPTION" .PP \fI/etc/passwd\fR diff --git a/man/passwd.5.xml b/man/passwd.5.xml index db809689..b212e9e1 100644 --- a/man/passwd.5.xml +++ b/man/passwd.5.xml @@ -2,7 +2,7 @@ - + passwd 5 @@ -10,7 +10,7 @@ passwd - The password file + the password file @@ -95,7 +95,7 @@ - /etc/shadow + /etc/shadow optional encrypted password file diff --git a/man/pl/Makefile.in b/man/pl/Makefile.in index a2c3b9ec..6075deaa 100644 --- a/man/pl/Makefile.in +++ b/man/pl/Makefile.in @@ -132,6 +132,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ USE_NLS = @USE_NLS@ +USE_NLS_FALSE = @USE_NLS_FALSE@ +USE_NLS_TRUE = @USE_NLS_TRUE@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XMLCATALOG = @XMLCATALOG@ diff --git a/man/pl/grpck.8 b/man/pl/grpck.8 index 12d009f3..5d318f5c 100644 --- a/man/pl/grpck.8 +++ b/man/pl/grpck.8 @@ -1,4 +1,4 @@ -.\" $Id: grpck.8,v 1.10 2005/12/01 20:38:27 kloczek Exp $ +.\" $Id: grpck.8,v 1.11 2006/01/25 07:34:00 kloczek Exp $ .\" Copyright 1992 - 1993, Julianne Frances Haugh .\" All rights reserved. .\" @@ -46,7 +46,7 @@ Kontrolowane jest czy każda pozycja posiada: \- unikalną nazwę grupy .br \- poprawną listę członków i administratorów -.in \-.5i +.in -.5i .sp .P Kontrola właściwej liczby pól i niepowtarzalnej nazwy grupy jest diff --git a/man/pl/login.defs.5 b/man/pl/login.defs.5 index 102ed48c..da75698b 100644 --- a/man/pl/login.defs.5 +++ b/man/pl/login.defs.5 @@ -1,4 +1,4 @@ -.\" $Id: login.defs.5,v 1.9 2005/12/01 20:38:27 kloczek Exp $ +.\" $Id: login.defs.5,v 1.10 2006/01/25 07:34:00 kloczek Exp $ .\" Copyright 1991 \- 1993, Julianne Frances Haugh and Chip Rosenthal .\" All rights reserved. .\" @@ -255,7 +255,7 @@ Tą wartością inicjowany jest terminalowy znak Jest to obsługiwane tylko w systemach z interfejsem .IR termio, np. System V. Jeżeli nie podano parametru, to znak kasowania zostanie -zainicjowany na \s\-2CTRL/U\s0. Informację powiązaną znajdziesz w opisie +zainicjowany na \s-2CTRL/U\s0. Informację powiązaną znajdziesz w opisie ERASECHAR. .\" .IP "LASTLOG_ENAB (logiczna)" diff --git a/man/pl/passwd.1 b/man/pl/passwd.1 index 93c9bf58..596d2878 100644 --- a/man/pl/passwd.1 +++ b/man/pl/passwd.1 @@ -1,4 +1,4 @@ -.\" $Id: passwd.1,v 1.16 2005/12/01 20:38:27 kloczek Exp $ +.\" $Id: passwd.1,v 1.17 2006/01/25 07:34:00 kloczek Exp $ .\" Copyright 1989 - 1994, Julianne Frances Haugh .\" All rights reserved. .\" @@ -130,7 +130,7 @@ następne cztery to minimalny wiek, maksymalny wiek, okres ostrzegania i okres nieaktywności hasła. .SS Podpowiedzi dotyczące haseł użytkownika Bezpieczeństwo hasła zależy od siły algorytmu kodującego oraz rozmiaru -przestrzeni kluczy. Metoda kodowania używana w Systemie \fB\s\-2UNIX\s+2\fR +przestrzeni kluczy. Metoda kodowania używana w Systemie \fB\s-2UNIX\s+2\fR oparta jest o algorytm NBS DES i jest bardzo bezpieczna. Rozmiar przestrzeni kluczy zależy od losowości wybranego hasła. .PP diff --git a/man/pl/pwck.8 b/man/pl/pwck.8 index 8aa2151f..aa45ac59 100644 --- a/man/pl/pwck.8 +++ b/man/pl/pwck.8 @@ -1,4 +1,4 @@ -.\" $Id: pwck.8,v 1.8 2005/12/01 20:38:27 kloczek Exp $ +.\" $Id: pwck.8,v 1.9 2006/01/25 07:34:00 kloczek Exp $ .\" Copyright 1992, Julianne Frances Haugh .\" All rights reserved. .\" @@ -52,7 +52,7 @@ Kontrolowane jest czy każda pozycja posiada: \- poprawny katalog domowy .br \- poprawną powłokę zgłoszeniową (startową) -.in \-.5i +.in -.5i .sp .P Kontrola właściwej liczby pól i niepowtarzalnej nazwy użytkownika jest diff --git a/man/pt_BR/Makefile.in b/man/pt_BR/Makefile.in index 6df1136c..abb66ec2 100644 --- a/man/pt_BR/Makefile.in +++ b/man/pt_BR/Makefile.in @@ -132,6 +132,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ USE_NLS = @USE_NLS@ +USE_NLS_FALSE = @USE_NLS_FALSE@ +USE_NLS_TRUE = @USE_NLS_TRUE@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XMLCATALOG = @XMLCATALOG@ diff --git a/man/pwck.8.xml b/man/pwck.8.xml index fc0c345f..86716698 100644 --- a/man/pwck.8.xml +++ b/man/pwck.8.xml @@ -2,7 +2,7 @@ - + pwck 8 @@ -106,8 +106,8 @@ - Report errors only. The warnings which do not require any - action from the user won't be displayed. + Report errors only. The warnings which do not require any + action from the user won't be displayed. diff --git a/man/ru/Makefile.am b/man/ru/Makefile.am index c617b4d5..8fc48c30 100644 --- a/man/ru/Makefile.am +++ b/man/ru/Makefile.am @@ -28,6 +28,7 @@ man_MANS = \ logoutd.8 \ newgrp.1 \ newusers.8 \ + nologin.8 \ passwd.1 \ passwd.5 \ porttime.5 \ diff --git a/man/ru/Makefile.in b/man/ru/Makefile.in index 53567b29..e1089102 100644 --- a/man/ru/Makefile.in +++ b/man/ru/Makefile.in @@ -133,6 +133,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ USE_NLS = @USE_NLS@ +USE_NLS_FALSE = @USE_NLS_FALSE@ +USE_NLS_TRUE = @USE_NLS_TRUE@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XMLCATALOG = @XMLCATALOG@ @@ -210,6 +212,7 @@ man_MANS = \ logoutd.8 \ newgrp.1 \ newusers.8 \ + nologin.8 \ passwd.1 \ passwd.5 \ porttime.5 \ diff --git a/man/ru/chage.1 b/man/ru/chage.1 index 99875c9f..ca4c6298 100644 --- a/man/ru/chage.1 +++ b/man/ru/chage.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "chage" "1" "11/10/2005" "Пользовательские команды" "Пользовательские команды" +.TH "chage" "1" "03/11/2006" "Пользовательские команды" "Пользовательские команды" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -11,7 +11,7 @@ chage \- изменяет информацию об устаревании пароля пользователя .SH "СИНТАКСИС" .HP 6 -\fBchage\fR [\fIпараметры\fR] \fIпользователь\fR +\fBchage\fR [\fIпараметры\fR] \fIuser\fR .SH "ОПИСАНИЕ" .PP \fBchage\fR @@ -23,7 +23,7 @@ chage \- изменяет информацию об устаревании па : .TP \fB\-d\fR, \fB\-\-lastday\fR \fILAST_DAY\fR -Установить дату последней смены пароля, которая задаётся числом дней прошедших с 1 января 1970 года. Дата может быть также указана в виде ГГГГ\-ММ\-ДД (или в форме согласно региональным настройкам). +Установить число дней прошедших с 1 января 1970 года, когда была последняя смена пароля. Дата может быть также указана в виде ГГГГ\-ММ\-ДД (или в форме согласно региональным настройкам). .TP \fB\-E\fR, \fB\-\-expiredate\fR \fIEXPIRE_DATE\fR Установить дату устаревания учётной записи пользователя, которая задаётся числом дней прошедших с 1 января 1970 года. Дата может быть также задана в виде ГГГГ\-ММ\-ДД (или в форме согласно региональным настройкам). Пользователь, чья учётная запись была заблокирована, должен обратиться к системному администратору, если хочет в дальнейшем работать с системой. @@ -52,7 +52,7 @@ chage \- изменяет информацию об устаревании па Показать информацию об устаревании учётной записи. .TP \fB\-m\fR, \fB\-\-mindays\fR \fIMIN_DAYS\fR -Установить минимальное число дней между сменами пароля. Значение 0 в этом поле указывает, что пользователь может сменить пароль в любое время. +Задать минимальное количество дней между сменой пароля. Нулевое значение этого поля указывает на то, что пользователь может менять свой пароль когда захочет. .TP \fB\-M\fR, \fB\-\-maxdays\fR \fIMAX_DAYS\fR Установить максимальное число дней работоспособности пароля. Если сумма значений @@ -65,7 +65,7 @@ chage \- изменяет информацию об устаревании па .sp Указание значения \fI\-1\fR -в параметре +как \fIMAX_DAYS\fR отменяет проверку пароля. .TP @@ -74,21 +74,19 @@ chage \- изменяет информацию об устаревании па \fIWARN_DAYS\fR задаётся в днях, в течении которых пользователь будет получать предупреждение об устаревании пароля, перед тем как это случится. .PP -Если не один параметр не указан, то +Если ни один параметр не указан, то \fBchage\fR переходит в интерактивный режим, предлагая запустившему пользователю изменить значения всех полей своей учётной записи. Вводимое значение заменяет текущее значение поля; если введена пустая строка, то текущее значение остаётся неизменным. Текущее значение дано в скобках \fI[ ]\fR. .SH "ЗАМЕЧАНИЕ" .PP -Программа \fBchage\fR требует наличия файла теневых паролей. Если пароли хранятся в файле passwd, то вся функциональность программы становится недоступной. .PP -Программа \fBchage\fR -работает только от суперпользователя, за ислючением параметра +работает только от суперпользователя, за исключением параметра \fB\-l\fR -, который может использоваться непривелегированным пользователем для определения даты устаревания своего пароля. +, который может использоваться непривилегированным пользователем для определения даты устаревания своего пароля. .SH "ФАЙЛЫ" .TP \fI/etc/passwd\fR @@ -98,7 +96,6 @@ chage \- изменяет информацию об устаревании па содержит защищаемую информацию о пользователях .SH "ВОЗВРАЩАЕМЫЕ ЗНАЧЕНИЯ" .PP -Программа \fBchage\fR завершая работу, возвращает следующие значения: .TP @@ -109,7 +106,7 @@ chage \- изменяет информацию об устаревании па доступ запрещён .TP \fI2\fR -ошибка в параметрах командной строки +ошибка в параметрах команды .TP \fI15\fR не удалось найти файл теневых паролей diff --git a/man/ru/chfn.1 b/man/ru/chfn.1 index 656a3c85..135b78bb 100644 --- a/man/ru/chfn.1 +++ b/man/ru/chfn.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "chfn" "1" "11/10/2005" "Пользовательские команды" "Пользовательские команды" +.TH "chfn" "1" "03/11/2006" "Пользовательские команды" "Пользовательские команды" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -11,11 +11,11 @@ chfn \- изменяет информацию о пользователе .SH "СИНТАКСИС" .HP 5 -\fBchfn\fR [\-f\ \fIФИО\fR] [\-r\ \fIномер\ комнаты\fR] [\-w\ \fIрабочий\ телефон\fR] [\-h\ \fIдомашний\ телефон\fR] [\-o\ \fIдругое\fR] [\fIпользователь\fR] +\fBchfn\fR [\-f\ \fIФИО\fR] [\-r\ \fIномер\ комнаты\fR] [\-w\ \fIрабочий\ телефон\fR] [\-h\ \fIдомашний\ телефон\fR] [\-o\ \fIдругое\fR] [\fIuser\fR] .SH "ОПИСАНИЕ" .PP \fBchfn\fR -изменяет полное имя, рабочий телефон, рабочие координаты и домашний номер телефона учётной записи пользователя. Обычно, эти данные выводятся командной +изменяет ФИО, рабочий телефон, рабочие координаты и домашний номер телефона учётной записи пользователя. Обычно, эти данные выводятся командной \fBfinger\fR(1) и ей подобными программами. Обычный пользователь может изменить только определённые поля собственной учётной записи, разрешённые в файле \fI/etc/login.defs\fR. (Настройкой по умолчанию пользователю не разрешается менять своё имя и фамилию.) Суперпользователь может изменять любое поле любой учётной записи. Кроме того, только суперпользователь может использовать параметр @@ -24,11 +24,11 @@ chfn \- изменяет информацию о пользователе .PP Единственным ограничением значений полей является то, что они не должны содержать управляющих символов, запятых, двоеточий или знака равно. На поле " \fIдругое\fR -" не действует это ограничение, и оно может использоваться для хранения информации об учётной записи любых приложений. +" не действует это ограничение, и оно может использоваться для хранения информации об учётной записи для любых приложений. .PP -Если не один параметр не указан, то +Если ни один параметр не указан, то \fBchfn\fR -переходит в интерактивный режим, предлагая запустившему пользователю изменить значения полей своей учётной записи. Вводимое значение заменяет текущее значение поля; если введена пустая строка, то текущее значение остаётся неизменным. Текущее значение дано в скобках +переходит в интерактивный режим, предлагая запустившему пользователю изменить значения полей своей учётной записи. Вводимое значение заменяет текущее значение поля; если введена пустая строка, то текущее значение остаётся неизменным. Текущее значение показано в скобках \fI[ ]\fR. Без параметров, программа chfn изменяет учётную запись запустившего пользователя. .SH "ФАЙЛЫ" .TP diff --git a/man/ru/chpasswd.8 b/man/ru/chpasswd.8 index d66f7dc0..64696d04 100644 --- a/man/ru/chpasswd.8 +++ b/man/ru/chpasswd.8 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "chpasswd" "8" "11/10/2005" "Команды управления системой" "Команды управления системой" +.TH "chpasswd" "8" "03/11/2006" "Команды управления системой" "Команды управления системой" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -19,7 +19,7 @@ chpasswd \- обновляет пароли в пакетном режиме .PP \fIимя_пользователя\fR:\fIпароль\fR .PP -По умолчанию, передаваемый пароль должен быть в виде обычного текста. Алгоритмом шифрования по умолчанию является DES. Также, если используется дата устаревания пароля, то она будет обновлёна. +По умолчанию, передаваемый пароль должен быть в виде обычного текста. Алгоритмом шифрования по умолчанию является DES. Также, если есть срок устаревания пароля, то он будет обновлён. .PP Данная команда предназначена для работы в крупных системных средах, где за один раз заводится несколько учётных записей. .SH "ПАРАМЕТРЫ" @@ -32,15 +32,13 @@ chpasswd \- обновляет пароли в пакетном режиме Передаваемые пароли заданы в шифрованном виде. .TP \fB\-h\fR, \fB\-\-help\fR -Показать это сообщение и выйти. +Показать краткую справку и закончить работу. .TP \fB\-m\fR, \fB\-\-md5\fR Использовать алгоритм шифрования MD5 вместо DES, если пароли передаются не шифрованными. .SH "ПРЕДОСТЕРЕЖЕНИЯ" .PP -Не позволяйте другим читать файл, передаваемый на стандартный ввод команды -\fBchpasswd\fR -, если в нём содержатся не шифрованные пароли. +Не забудьте установить права или umask, чтобы не позволить чтение нешифрованных файлов другими пользователями. .SH "СМОТРИТЕ ТАКЖЕ" .PP \fBpasswd\fR(1), diff --git a/man/ru/chsh.1 b/man/ru/chsh.1 index ef189f56..b3bb93dc 100644 --- a/man/ru/chsh.1 +++ b/man/ru/chsh.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "chsh" "1" "11/10/2005" "Пользовательские команды" "Пользовательские команды" +.TH "chsh" "1" "03/11/2006" "Пользовательские команды" "Пользовательские команды" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -11,11 +11,11 @@ chsh \- изменяет регистрационную оболочку пользователя .SH "СИНТАКСИС" .HP 5 -\fBchsh\fR [\-s\ \fIрегистрационная\ оболочка\ пользователя\fR] [\fIпользователь\fR] +\fBchsh\fR [\-s\ \fIрегистрационная\ оболочка\ пользователя\fR] [\fIuser\fR] .SH "ОПИСАНИЕ" .PP \fBchsh\fR -изменяет регистрационную оболочку пользователя. Она определяет команду, запускаемую после регистрации пользователя в системе. Обычный пользователь может изменять регистрационную оболочку только для своей учётной записи, суперпользователь может изменить регистрационную оболочку любой учётной записи. +изменяет регистрационную оболочку пользователя. Она определяет какая команда будет запущена после регистрации пользователя в системе. Обычный пользователь может изменять регистрационную оболочку только для своей учётной записи, суперпользователь может изменять регистрационную оболочку любой учётной записи. .PP Все допустимые имена регистрационных оболочек должны быть указаны в файле \fI/etc/shells\fR. На суперпользователя это ограничение не действует и поэтому ему разрешено указывать любое значение. Для учётной записи с ограниченной регистрационной оболочкой пользователь не может изменить свою регистрационную оболочку. Поэтому, команду @@ -29,7 +29,7 @@ chsh \- изменяет регистрационную оболочку пол \fB\-s\fR не задан, то \fBchsh\fR -переходит в интерактивный режим, предлагая пользователю изменить свою регистрационную оболочку. Вводимое значение заменяет текущее значение поля; если введена пустая строка, то текущее значение остаётся неизменным. Текущее значение регистрационной оболочки дано в скобках +переходит в интерактивный режим, предлагая пользователю изменить свою регистрационную оболочку. Вводимое значение заменяет текущее значение поля; если введена пустая строка, то текущее значение остаётся неизменным. Текущее значение регистрационной оболочки указано в скобках \fI[ ]\fR. .SH "ФАЙЛЫ" .TP diff --git a/man/ru/expiry.1 b/man/ru/expiry.1 index d51d6d1e..bc15c91d 100644 --- a/man/ru/expiry.1 +++ b/man/ru/expiry.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "expiry" "1" "11/10/2005" "Пользовательские команды" "Пользовательские команды" +.TH "expiry" "1" "03/11/2006" "Пользовательские команды" "Пользовательские команды" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) diff --git a/man/ru/faillog.5 b/man/ru/faillog.5 index daef6b9d..e1bb69ea 100644 --- a/man/ru/faillog.5 +++ b/man/ru/faillog.5 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "faillog" "5" "11/10/2005" "" "" +.TH "faillog" "5" "03/11/2006" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -12,7 +12,7 @@ faillog \- файл протокола неудачных попыток вхо .SH "ОПИСАНИЕ" .PP \fI/var/log/faillog\fR -хранит число неудачных попыток входа в систему и их предельное число для каждой учётной записи. Этот файл состоит из записей постоянной длины, упорядоченных по числовому идентификатору учётной записи. Каждая запись содержит число неудачных попыток входа с момента последнего успешного входа в систему; максимальное число неудачных попыток перед тем как учётная запись будет заблокирована; терминал, с которого осуществлялась последняя неудачная попытка входа и дата этого события. +хранит число неудачных попыток входа в систему и их предельное число для каждой учётной записи. Этот файл состоит из записей постоянной длины, упорядоченных по числовому идентификатору учётной записи. Каждая запись содержит число неудачных попыток входа с момента последнего успешного входа в систему, максимальное число неудачных попыток перед тем как учётная запись будет заблокирована, терминал, с которого осуществлялась последняя неудачная попытка входа и дата этого события. .PP Структура файла: .sp diff --git a/man/ru/faillog.8 b/man/ru/faillog.8 index fdf3810a..004417d0 100644 --- a/man/ru/faillog.8 +++ b/man/ru/faillog.8 @@ -2,13 +2,13 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "faillog" "8" "11/10/2005" "Команды управления системой" "Команды управления системой" +.TH "faillog" "8" "03/11/2006" "Команды управления системой" "Команды управления системой" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .SH "НАЗВАНИЕ" -faillog \- показывает записи faillog или задаёт предел неудачных попыток входа в систему +faillog \- показывает записи из файла faillog или задаёт предел неудачных попыток входа в систему .SH "СИНТАКСИС" .HP 8 \fBfaillog\fR [\fIпараметры\fR] @@ -18,7 +18,7 @@ faillog \- показывает записи faillog или задаёт пре форматирует содержимое журнала неудачных попыток из файла базы данных \fI/var/log/faillog\fR. Также, она может быть использована для управления счётчиком неудачных попыток и его пределом. При запуске \fBfaillog\fR -без параметров выводятся записи faillog только тех пользователей, для которых имеется хотя бы одна неудачная попытка входа. +без параметров выводятся записи faillog только тех пользователей, у которых имеется хотя бы одна неудачная попытка входа. .SH "ПАРАМЕТРЫ" .PP Возможные параметры команды @@ -29,7 +29,7 @@ faillog \- показывает записи faillog или задаёт пре Показать записи faillog для всех пользователей. .TP \fB\-h\fR, \fB\-\-help\fR -Показать это сообщение и выйти. +Показать краткую справку и закончить работу. .TP \fB\-l\fR, \fB\-\-lock\-time\fR \fISEC\fR Блокировать учётную запись на @@ -47,12 +47,11 @@ faillog \- показывает записи faillog или задаёт пре \fB\-r\fR, \fB\-\-reset\fR Обнулить счётчик неудачных попыток входа для всех записей или для одного пользователя, заданного параметром \-u \fILOGIN\fR. Для этого требуются права на запись в файл -\fI/var/log/faillog\fR -. +\fI/var/log/faillog\fR. .TP \fB\-t\fR, \fB\-\-time\fR \fIDAYS\fR -Показать записи faillog новее чем -\fIDAYS\fRдней. Параметр +Показать записи faillog новее чем (дней) +\fIDAYS\fR. \fB\-t\fR отменяет действие параметра \fB\-u\fR. diff --git a/man/ru/gpasswd.1 b/man/ru/gpasswd.1 index fb575a9e..b53009f9 100644 --- a/man/ru/gpasswd.1 +++ b/man/ru/gpasswd.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "gpasswd" "1" "11/10/2005" "Пользовательские команды" "Пользовательские команды" +.TH "gpasswd" "1" "03/11/2006" "Пользовательские команды" "Пользовательские команды" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -13,9 +13,9 @@ gpasswd \- управляет файлом /etc/group .HP 8 \fBgpasswd\fR \fIgroup\fR .HP 8 -\fBgpasswd\fR \-a\ \fIпользователь\fR \fIgroup\fR +\fBgpasswd\fR \-a\ \fIuser\fR \fIgroup\fR .HP 8 -\fBgpasswd\fR \-d\ \fIпользователь\fR \fIgroup\fR +\fBgpasswd\fR \-d\ \fIuser\fR \fIgroup\fR .HP 8 \fBgpasswd\fR \-R\ \fIgroup\fR .HP 8 diff --git a/man/ru/groupadd.8 b/man/ru/groupadd.8 index 3d711f58..af2bb9df 100644 --- a/man/ru/groupadd.8 +++ b/man/ru/groupadd.8 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "groupadd" "8" "11/10/2005" "Команды управления системой" "Команды управления системой" +.TH "groupadd" "8" "03/11/2006" "Команды управления системой" "Команды управления системой" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -11,10 +11,9 @@ groupadd \- создаёт новую группу .SH "СИНТАКСИС" .HP 9 -\fBgroupadd\fR [\-g\ \fIgid\fR\ [\-o]] [\-f] [\-K\ \fIКЛЮЧ\fR=\fIЗНАЧЕНИЕ\fR] \fIгруппа\fR +\fBgroupadd\fR [\-g\ \fIGID\fR\ [\-o]] [\-f] [\-K\ \fIКЛЮЧ\fR=\fIЗНАЧЕНИЕ\fR] \fIgroup\fR .SH "ОПИСАНИЕ" .PP -Команда \fBgroupadd\fR создаёт новую группу, согласно указанным значениям командной строки и системным значениям по умолчанию. Новая группа будет добавлена в системные файлы. .SH "ПАРАМЕТРЫ" @@ -26,28 +25,28 @@ groupadd \- создаёт новую группу \fB\-f\fR Вернуть статус успешного выполнения, если группа уже существует. Если используется вместе с параметром \fB\-g\fR -и указанный gid уже существует, то выбирается другой (уникальный) gid (то есть параметр +и указанный GID уже существует, то выбирается другой (уникальный) GID (то есть параметр \fB\-g\fR игнорируется). .TP \fB\-g\fR \fIGID\fR -Указать числовой идентификатор группы. Если не указан параметр -\fB\-o\fR -, значение должно быть уникальным. Также, оно должно быть не отрицательным. По умолчанию берётся значение больше 999 и идентификатора любой другой группы. Значения от 0 и 999 обычно зарезервированы под системные группы. +Числовое значение идентификатора группы. Значение должно быть уникальным, если не указан параметр +\fB\-o\fR. Также, оно должно быть не отрицательным. По умолчанию, берётся значение больше 999 и больше идентификатора любой другой группы. Значения от 0 и до 999 обычно зарезервированы под системные группы. .TP \fB\-h\fR, \fB\-\-help\fR -Показать это сообщение и выйти. +Показать краткую справку и закончить работу. .TP \fB\-K \fR\fB\fIКЛЮЧ\fR\fR\fB=\fR\fB\fIЗНАЧЕНИЕ\fR\fR -Использовать вместо значений (GID_MIN, GID_MAX и других) по умолчанию, хранимых в файле /etc/login.defs. Можно указать несколько параметров +Изменить значения по умолчанию (GID_MIN, GID_MAX и другие), которые хранятся в файле /etc/login.defs. Можно указать несколько параметров \fB\-K\fR. .sp -Например: +Пример: \fB\-K \fR\fIGID_MIN\fR=\fI100\fR\fB \-K \fR\fIGID_MAX\fR=\fI499\fR .sp -Замечание: передавать параметры в виде -\fB\-K \fR\fIGID_MIN\fR=\fI10\fR,\fIGID_MAX\fR=\fI499\fR -пока нельзя. +Замечание: +\fB\-K \fR\fIGID_MIN\fR=\fI10\fR, +\fIGID_MAX\fR=\fI499\fR +такая форма пока не поддерживается. .TP \fB\-o\fR Разрешить добавление группы с не уникальным GID. @@ -61,7 +60,7 @@ groupadd \- создаёт новую группу .TP \fI/etc/login.defs\fR содержит конфигурацию подсистемы теневых паролей -.SH "ПРЕДУПРЕЖДЕНИЯ" +.SH "ПРЕДОСТЕРЕЖЕНИЯ" .PP Имена групп должны начинаться со строчной буквы или символа подчёркивания. Они могут содержать только строчные буквы, символ подчёркивания, тире и знак доллара. Это можно описать регулярным выражением: [a\-z_][a\-z0\-9_\-]*[$] .PP @@ -74,7 +73,6 @@ groupadd \- создаёт новую группу Имена групп могут быть длиной не более 16 знаков. .SH "ВОЗВРАЩАЕМЫЕ ЗНАЧЕНИЯ" .PP -Команда \fBgroupadd\fR завершая работу, возвращает следующие значения: .TP @@ -82,13 +80,13 @@ groupadd \- создаёт новую группу успешное выполнение .TP \fI2\fR -ошибка в параметрах командной строки +ошибка в параметрах команды .TP \fI3\fR недопустимое значение параметра .TP \fI4\fR -не уникальный gid (если не задан параметр +не уникальный GID (если не задан параметр \fB\-o\fR ) .TP diff --git a/man/ru/groupdel.8 b/man/ru/groupdel.8 index 39bc3072..85d36272 100644 --- a/man/ru/groupdel.8 +++ b/man/ru/groupdel.8 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "groupdel" "8" "11/10/2005" "Команды управления системой" "Команды управления системой" +.TH "groupdel" "8" "03/11/2006" "Команды управления системой" "Команды управления системой" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -11,13 +11,12 @@ groupdel \- удаляет группу .SH "СИНТАКСИС" .HP 9 -\fBgroupdel\fR \fIгруппа\fR +\fBgroupdel\fR \fIgroup\fR .SH "ОПИСАНИЕ" .PP -Команда \fBgroupdel\fR изменяет системные файлы учётных записей, удаляя всё относящееся к группе, заданной параметром -\fIгруппа\fR. Указанная группа должна существовать. +\fIgroup\fR. Указанная группа должна существовать. .PP Вы должны вручную проверить все файловые системы, чтобы убедиться, что не осталось файлов, принадлежащих удалённой группе. .SH "ПРЕДОСТЕРЕЖЕНИЯ" @@ -32,7 +31,6 @@ groupdel \- удаляет группу содержит защищаемую информацию о группах .SH "ВОЗВРАЩАЕМЫЕ ЗНАЧЕНИЯ" .PP -Команда \fBgroupdel\fR завершая работу, возвращает следующие значения: .TP @@ -40,7 +38,7 @@ groupdel \- удаляет группу успешное выполнение .TP \fI2\fR -ошибка в параметрах командной строки +ошибка в параметрах команды .TP \fI8\fR не удалось удалить первичную пользовательскую группу diff --git a/man/ru/groupmems.8 b/man/ru/groupmems.8 index e1e2e06d..7a68447a 100644 --- a/man/ru/groupmems.8 +++ b/man/ru/groupmems.8 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "groupmems" "8" "11/10/2005" "Команды управления системой" "Команды управления системой" +.TH "groupmems" "8" "03/11/2006" "Команды управления системой" "Команды управления системой" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -11,16 +11,15 @@ groupmems \- управляет членами первичной группы пользователя .SH "СИНТАКСИС" .HP 10 -\fBgroupmems\fR \-a\ \fIимя\ пользователя\fR \-d\ \fIимя\ пользователя\fR \-l \-D [\-g\ \fIимя\ группы\fR] +\fBgroupmems\fR \-a\ \fIимя_пользователя\fR \-d\ \fIимя_пользователя\fR \-l \-D [\-g\ \fIимя_группы\fR] .SH "ОПИСАНИЕ" .PP -Команда \fBgroupmems\fR -позволяет пользователю управлять списком членов своей группы не имея привелегий суперпользователя. Команда +позволяет пользователю управлять списком членов своей группы не имея привилегий суперпользователя. Команда \fBgroupmems\fR работает в системах, где в качестве первичной группы пользователя является группа с именем совпадающим с именем пользователя (то есть, guest / guest). .PP -Только суперпользователь, как администратор, может использовать +Только суперпользователь как администратор может использовать \fBgroupmems\fR , чтобы изменить список членов не своей группы. .SH "ПАРАМЕТРЫ" @@ -29,23 +28,22 @@ groupmems \- управляет членами первичной группы \fBgroupmems\fR : .TP -\fB\-a\fR \fIимя пользователя\fR +\fB\-a\fR \fIимя_пользователя\fR Добавить нового пользователя в группу. .TP -\fB\-d\fR \fIимя пользователя\fR +\fB\-d\fR \fIимя_пользователя\fR Удалить пользователя из группы. .TP \fB\-D\fR Удалить всех пользователей из группы. .TP -\fB\-g\fR \fIимя группы\fR +\fB\-g\fR \fIимя_группы\fR Суперпользователь может указать группу, в которой нужно изменить список членов. .TP \fB\-l\fR Показать список членов группы. .SH "НАСТРОЙКА" .PP -Команда \fBgroupmems\fR должна иметь права 2770 diff --git a/man/ru/groupmod.8 b/man/ru/groupmod.8 index 1dd53670..99c36e5d 100644 --- a/man/ru/groupmod.8 +++ b/man/ru/groupmod.8 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "groupmod" "8" "11/10/2005" "Команды управления системой" "Команды управления системой" +.TH "groupmod" "8" "03/11/2006" "Команды управления системой" "Команды управления системой" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -11,10 +11,9 @@ groupmod \- изменяет информацию о группе .SH "СИНТАКСИС" .HP 9 -\fBgroupmod\fR [\-g\ \fIgid\fR\ [\-o\ ]] [\-n\ \fIновое\ имя\ группы\fR] \fIгруппа\fR +\fBgroupmod\fR [\-g\ \fIgid\fR\ [\-o\ ]] [\-n\ \fIновое_имя_группы\fR] \fIgroup\fR .SH "ОПИСАНИЕ" .PP -Команда \fBgroupmod\fR изменяет системные файлы учётных записей согласно параметрам, переданным в командной строке. .SH "ПАРАМЕТРЫ" @@ -24,25 +23,23 @@ groupmod \- изменяет информацию о группе : .TP \fB\-g\fR \fIgid\fR -Числовое значение идентификатора группы. Если не указан параметр -\fB\-o\fR -, значение должно быть уникальным. Также, оно должно быть не отрицательным. Значения от 0 и 999 обычно зарезервированы под системные группы. Изменение принадлежности файлов старой группе необходимо выполнять вручную. +Числовое значение идентификатора группы. Значение должно быть уникальным, если не указан параметр +\fB\-o\fR. Значение должно быть не отрицательным. Значения от 0 до 999 обычно зарезервированы под системные группы. Изменение принадлежности всех файлов старой группе необходимо выполнять вручную. .TP -\fB\-n\fR \fIновое имя группы\fR +\fB\-n\fR \fIновое_имя_группы\fR Новое название группы вместо -\fIгруппа\fR -\(em -\fIновое имя группы\fR. +\fIgroup\fR +на +\fIновое_имя_группы\fR. .SH "ФАЙЛЫ" .TP \fI/etc/group\fR содержит информацию о группах .TP \fI/etc/gshadow\fR -содержит защищаемую информацию о группаx +содержит защищаемую информацию о группах .SH "ВОЗВРАЩАЕМЫЕ ЗНАЧЕНИЯ" .PP -Команда \fBgroupmod\fR завершая работу, возвращает следующие значения: .TP @@ -50,7 +47,7 @@ groupmod \- изменяет информацию о группе успешное выполнение .TP \fI2\fR -ошибка в параметрах командной строки +ошибка в параметрах команды .TP \fI3\fR недопустимое значение параметра diff --git a/man/ru/groups.1 b/man/ru/groups.1 index 218992d0..94a92824 100644 --- a/man/ru/groups.1 +++ b/man/ru/groups.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "groups" "1" "11/10/2005" "Пользовательские команды" "Пользовательские команды" +.TH "groups" "1" "03/11/2006" "Пользовательские команды" "Пользовательские команды" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -11,15 +11,15 @@ groups \- показывает имена групп запустившего программу пользователя .SH "СИНТАКСИС" .HP 7 -\fBgroups\fR [\fIпользователь\fR] +\fBgroups\fR [\fIuser\fR] .SH "ОПИСАНИЕ" .PP \fBgroups\fR показывает имена групп запустившего команду пользователя или их числовые идентификаторы (ID). Если для номера группы нет соответствующей записи в файле -\fI/etc/group\fR, то выводится числовой идентификатор группы. Если указан необязательный параметр -\fIпользователь\fR +\fI/etc/group\fR, то отображается числовое значение без соответствующего имени. При указании необязательного параметра +\fIuser\fR , то выводятся группы учётной записи -\fIпользователь\fR. +\fIuser\fR. .SH "ЗАМЕЧАНИЕ" .PP В системах, не имеющих поддержки одновременного членства в группах, используется информация из файла diff --git a/man/ru/grpck.8 b/man/ru/grpck.8 index 08791d61..b005141d 100644 --- a/man/ru/grpck.8 +++ b/man/ru/grpck.8 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "grpck" "8" "11/10/2005" "Команды управления системой" "Команды управления системой" +.TH "grpck" "8" "03/11/2006" "Команды управления системой" "Команды управления системой" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -11,11 +11,11 @@ grpck \- проверяет корректность файлов групп .SH "СИНТАКСИС" .HP 6 -\fBgrpck\fR [\-r] [\fIфайл_group\fR\ \fIфайл_shadow\fR] +\fBgrpck\fR [\-r] [\fIgroup\fR\ \fIshadow\fR] .SH "ОПИСАНИЕ" .PP \fBgrpck\fR -проверяет корректность системных файлов учётных записей. Проверяется формат всех записей в файлах +проверяет корректность системных файлов учётных записей. Проверяется формат всех записей \fI/etc/group\fR и \fI/etc/gshadow\fR @@ -49,12 +49,12 @@ grpck \- проверяет корректность файлов групп \fI/etc/group\fR и \fI/etc/gshadow\fR. Пользователь может указать другие файлы с помощью параметров -\fIфайл_group\fR +\fIgroup\fR и -\fIфайл_shadow\fR. Также, пользователь может запустить команду в режиме только для чтения, указав параметр +\fIshadow\fR. Также, пользователь может запустить команду в режиме только для чтения, указав параметр \fB\-r\fR. Это приведёт к автоматическому ответу \fIнет\fR -на все вопросы об изменениях. +без подтверждения пользователя. \fBgrpck\fR также может отсортировать записи в файле \fI/etc/group\fR @@ -74,13 +74,12 @@ grpck \- проверяет корректность файлов групп содержит информацию о пользователях .SH "СМОТРИТЕ ТАКЖЕ" .PP -\fBфайл_group\fR(5), +\fBgroup\fR(5), \fBpasswd\fR(5), -\fBфайл_shadow\fR(5), +\fBshadow\fR(5), \fBgroupmod\fR(8). .SH "ВОЗВРАЩАЕМЫЕ ЗНАЧЕНИЯ" .PP -Команда \fBgrpck\fR завершая работу, возвращает следующие значения: .TP @@ -88,7 +87,7 @@ grpck \- проверяет корректность файлов групп успешное выполнение .TP \fI1\fR -ошибка в параметрах командной строки +ошибка в параметрах команды .TP \fI2\fR есть одна или более неправильных записей групп diff --git a/man/ru/gshadow.5 b/man/ru/gshadow.5 index fa2d0034..62af11e3 100644 --- a/man/ru/gshadow.5 +++ b/man/ru/gshadow.5 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "gshadow" "5" "11/10/2005" "Форматы файлов" "Форматы файлов" +.TH "gshadow" "5" "03/11/2006" "Форматы файлов" "Форматы файлов" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -12,7 +12,7 @@ gshadow \- файл с защищаемой информацией о групп .SH "ОПИСАНИЕ" .PP \fI/etc/gshadow\fR -содержит защищаемую информацию о групах. Он состоит из строк с полями, отделёнными друг от друга двоеточием. Поля: +содержит защищаемую информацию о группах. Он состоит из строк с полями, отделёнными друг от друга двоеточием. Поля: .TP 3 \(bu имя группы diff --git a/man/ru/id.1 b/man/ru/id.1 index c0258d22..f4a43f3f 100644 --- a/man/ru/id.1 +++ b/man/ru/id.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "id" "1" "11/10/2005" "Пользовательские команды" "Пользовательские команды" +.TH "id" "1" "03/11/2006" "Пользовательские команды" "Пользовательские команды" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) diff --git a/man/ru/lastlog.8 b/man/ru/lastlog.8 index 390c6aff..f975f7b1 100644 --- a/man/ru/lastlog.8 +++ b/man/ru/lastlog.8 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "lastlog" "8" "11/10/2005" "Команды управления системой" "Команды управления системой" +.TH "lastlog" "8" "03/11/2006" "Команды управления системой" "Команды управления системой" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -30,20 +30,20 @@ lastlog \- показывает файл lastlog \fBlastlog\fR : .TP -\fB\-b\fR, \fB\-\-before\fR \fIДНЕЙ\fR +\fB\-b\fR, \fB\-\-before\fR \fIDAYS\fR Показать записи lastlog за последние -\fIДНЕЙ\fR. +\fIDAYS\fR. .TP \fB\-h\fR, \fB\-\-help\fR -Показать это сообщение и выйти. +Показать краткую справку и закончить работу. .TP -\fB\-t\fR, \fB\-\-time\fR \fIДНЕЙ\fR +\fB\-t\fR, \fB\-\-time\fR \fIDAYS\fR Показать записи lastlog новее чем -\fIДНЕЙ\fR. +\fIDAYS\fR. .TP -\fB\-u\fR, \fB\-\-user\fR \fIИМЯ ПОЛЬЗОВАТЕЛЯ\fR +\fB\-u\fR, \fB\-\-user\fR \fILOGIN\fR Показать запись lastlog только для указанного пользователя -\fIИМЯ ПОЛЬЗОВАТЕЛЯ\fR. +\fILOGIN\fR. .TP \fB\-t\fR отменяет действие параметра \fB\-u\fR. .PP @@ -60,4 +60,4 @@ lastlog \- показывает файл lastlog содержит даты последнего входа пользователей систему .SH "ПРЕДОСТЕРЕЖЕНИЯ" .PP -Большие промежутки в значениях идентификаторов пользователей приводят к тому, что программа некоторое время ничего не выводит на экран (то есть, если mmdf=800 и последний uid=170, то во время обработки uid с 171 по 799 программа кажется повисшей). +Большие промежутки в значениях идентификаторов пользователей приводят к тому, что программа некоторое время ничего не выводит на экран (то есть, если mmdf=800 и последний UID=170, то во время обработки UID с 171 по 799 программа кажется повисшей). diff --git a/man/ru/limits.5 b/man/ru/limits.5 index 77635f42..2f116609 100644 --- a/man/ru/limits.5 +++ b/man/ru/limits.5 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "limits" "5" "11/10/2005" "Форматы файлов" "Форматы файлов" +.TH "limits" "5" "03/11/2006" "Форматы файлов" "Форматы файлов" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -16,7 +16,7 @@ limits \- файл контроля ресурсов .PP По умолчанию учётная запись 'root' ничем не ограничена. Фактически, никак нельзя установить ограничения с помощью этой процедуры на учётные записи, имеющие права суперпользователя (учётные записи с UID равным 0). .PP -Каждая строка описывает ограничение для одного пользователя и имеет вид: +Каждая строка описывает ограничение для одного пользователя имеет вид: .PP \fIuser СТРОКА_ОГРАНИЧЕНИЙ\fR .PP @@ -70,8 +70,12 @@ P: приоритет процесса, устанавливается с пом \fIL2D2048N5\fR допустимо для \fIСТРОКА_ОГРАНИЧЕНИЙ \fR. Для удобства чтения, следующие записи эквивалентны: -.PP -username L2D2048N5 username L2 D2048 N5 +.sp +.nf + username L2D2048N5 + username L2 D2048 N5 + +.fi .PP Заметим, что после \fIusername\fR @@ -82,10 +86,10 @@ username L2D2048N5 username L2 D2048 N5 в файле \fILIMITS_FILE\fR, то будет использоваться последняя. .PP -Чтобы полность снять ограничения с пользователя, используется одиночное тире "\fI\-\fR +Чтобы полностью снять ограничения с пользователя, используется одиночное тире "\fI\-\fR ". .PP -Также заметьте, что все настройки ограничений задаются НА КОНКРЕТНУЮ УЧЁТНУЮ ЗАПИСЬ. Они не являются глобальными и не постоянны. Возможно глобальные ограничения и появяться, но пока это только в планах ;) +Также заметьте, что все настройки ограничений делаются ДЛЯ КОНКРЕТНОЙ УЧЁТНОЙ ЗАПИСИ. Они не являются глобальными и не постоянны. Возможно глобальные ограничения и появятся, но пока это только в планах ;) .SH "ФАЙЛЫ" .TP \fI/etc/limits\fR diff --git a/man/ru/login.1 b/man/ru/login.1 index b6ccd1cd..28d32767 100644 --- a/man/ru/login.1 +++ b/man/ru/login.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "login" "1" "12/14/2005" "Пользовательские команды" "Пользовательские команды" +.TH "login" "1" "03/11/2006" "Пользовательские команды" "Пользовательские команды" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -11,9 +11,9 @@ login \- начинает сеанс в системе .SH "СИНТАКСИС" .HP 6 -\fBlogin\fR [\-p] [\fIимя\ пользователя\fR] [\fIПЕРЕМЕННАЯ_СРЕДЫ=ЗНАЧЕНИЕ\fR...] +\fBlogin\fR [\-p] [\fIusername\fR] [\fIПЕРЕМЕННАЯ_СРЕДЫ=ЗНАЧЕНИЕ\fR...] .HP 6 -\fBlogin\fR [\-p] [\-h\ \fIхост\fR] [\-f\ \fIимя\ пользователя\fR] +\fBlogin\fR [\-p] [\-h\ \fIхост\fR] [\-f\ \fIusername\fR] .HP 6 \fBlogin\fR [\-p] \-r\ \fIхост\fR .SH "ОПИСАНИЕ" @@ -45,16 +45,16 @@ login \- начинает сеанс в системе .PP Значения идентификатора учётной записи и группы будет взято из файла \fI/etc/passwd\fR. Значения переменных -\fI$HOME\fR, -\fI$SHELL\fR, -\fI$PATH\fR, -\fI$LOGNAME\fR +\fB$HOME\fR, +\fB$SHELL\fR, +\fB$PATH\fR, +\fB$LOGNAME\fR и -\fI$MAIL\fR +\fB$MAIL\fR устанавливаются согласно соответствующим полям учётной записи пользователя. Также могут быть установлены значения ulimit, umask и nice из поля GECOS. .PP В некоторых системах переменной среды -\fI$TERM\fR +\fB$TERM\fR будет присвоен тип терминала линии tty, согласно данным из файла \fI/etc/ttytype\fR. .PP diff --git a/man/ru/login.access.5 b/man/ru/login.access.5 index ed147261..7fca4927 100644 --- a/man/ru/login.access.5 +++ b/man/ru/login.access.5 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "login.access" "5" "11/10/2005" "Форматы файлов" "Форматы файлов" +.TH "login.access" "5" "03/11/2006" "Форматы файлов" "Форматы файлов" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -28,7 +28,7 @@ login.access \- файл контроля доступа в систему \fIALL\fR (всегда совпадает) или \fILOCAL\fR -(любая строка, не содержащая символов "."). Если используется NIS, то также можно использовать @имя_сетевой_группы в шаблонах хостов или имён пользователей. +(любая строка, не содержащая символов "."). Если используется NIS, то также можно использовать @имя_сетевой_группы в шаблонах хостов или именах пользователей. .PP \fIОператор EXCEPT\fR помогает в написании компактных правил. diff --git a/man/ru/login.defs.5 b/man/ru/login.defs.5 index c19a7d37..b4633e96 100644 --- a/man/ru/login.defs.5 +++ b/man/ru/login.defs.5 @@ -2,26 +2,26 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "login.defs" "5" "11/10/2005" "Форматы файлов" "Форматы файлов" +.TH "login.defs" "5" "03/11/2006" "Форматы файлов" "Форматы файлов" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .SH "НАЗВАНИЕ" -login.defs \- файл конфигурации подсистемы теневых паролей +login.defs \- содержит конфигурацию подсистемы теневых паролей .SH "ОПИСАНИЕ" .PP -Подсистема теневых паролей (shadow password suite) настраивается в файле -\fI/etc/login.defs\fR. Этот файл является обязательным. Отсутствие данного файла не повлияет на работу системы, но, вероятно, приведёт к выполнению нежелаемых операций. +\fI/etc/login.defs\fR +содержит настройки подсистемы теневых паролей (shadow password suite). Этот файл является обязательным. Отсутствие данного файла не повлияет на работу системы, но, вероятно, приведёт к выполнению нежелаемых операций. .PP Файл представляет собой обычный текстовый файл; каждая строка описывает один параметр конфигурации. Строка состоит из названия параметра и его значения, которые разделяются пробельным символом. Пустые строки и комментарии игнорируются. Комментарии начинаются со знака фунта `#', который должен быть первым непробельным символом в строке. .PP -Значения параметров могут быть четырёх типов: строки, логические, числа и длинные числа. Строки состоят из любых печатных символов. Под логическими значениями подразумеваются \(lqyes\(rq или \(lqno\(rq. Неопределённый логический параметр или имеющий значение, отличное от указанных выше, считается как имеющий значение \(lqno\(rq. Числа (обычные и длинные) можно задавать в десятичной, восьмеричной (перед значением ставится \(lq0\(rq) или шестнадцатеричной (перед значением ставится \(lq0x\(rq) системах счисления. Максимальные значения параметра обычного и длинного числа зависят от архитектуры компьютера. +Значения параметров могут быть четырёх типов: строки, логические значения, числа и длинные числа. Строки состоят из любых печатных символов. Под логическими значениями подразумеваются \(lqyes\(rq или \(lqno\(rq. Неопределённый логический параметр или имеющий значение, отличное от указанных выше, считается как имеющий значение \(lqno\(rq. Числа (обычные и длинные) можно задавать в десятичной, восьмеричной (перед значением ставится \(lq0\(rq) или шестнадцатеричной (перед значением ставится \(lq0x\(rq) системах счисления. Максимальные значения параметра обычного и длинного числа зависят от архитектуры компьютера. .PP Возможны следующие параметры конфигурации: .TP CHFN_AUTH (логический) -Если установлено в +Если \fIyes\fR, то перед выполнением любых изменений программы \fBchfn\fR и @@ -40,7 +40,7 @@ CHFN_RESTRICT (строка) \fIr\fR, \fIw\fR, \fIh\fR -для изменения полного имени пользователя, номера комнаты, рабочего и домашнего телефона соответственно. Для совместимости, значение "yes" эквивалентно "rwh" и "no" эквивалентно "frwh". Если ничего не задано, то только суперпользователь может выполнять любые изменения. Ещё более ограничительная настройка достигается снятием SUID бита с файла chfn. +для изменения полного имени пользователя, номера комнаты, рабочего и домашнего телефона соответственно. Для совместимости, значение "yes" эквивалентно "rwh" и "no" эквивалентно "frwh". Если ничего не задано, то только суперпользователь может выполнять любые изменения. Наиболее ограничительная настройка достигается снятием SUID бита с файла chfn. .TP CREATE_HOME (логический) Этот параметр определяет, должна ли по умолчанию программа useradd создавать домашние каталоги пользователей. Данное значение будет логически сложено с флагом @@ -54,7 +54,7 @@ GID_MAX (число), GID_MIN (число) \fBgroupadd\fR. .TP MAIL_DIR (строка) -Системный почтовый каталог. Данный параметр нужен для управления почтовым ящиком при изменении или удалении учётной записи пользователя. Если параметр не задан, то используется значение указанное при сборке. +Почтовый каталог. Данный параметр нужен для управления почтовым ящиком при изменении или удалении учётной записи пользователя. Если параметр не задан, то используется значение указанное при сборке. .TP PASS_MAX_DAYS (число) Максимальное число дней использования пароля. Если пароль старее этого числа, то будет запущена процедура смены пароля. Если значение не задано, то предполагается значение \-1 (то есть возможность ограничения не используется). @@ -72,7 +72,7 @@ UID_MAX (число), UID_MIN (число) \fBuseradd\fR. .TP UMASK (число) -Задаёт начальное значение маски доступа. Если не указано, то маска доступа устанавливается в 077. +Задаёт начальное значение маски доступа. Если не указано, то маска доступа устанавливается в 022. .TP USERDEL_CMD (строка) Определяет программу, которая будет запущена при удалении пользователя. Она должна удалять любые задания at/cron/печати удаляемого пользователя (передаётся в качестве первого аргумента). diff --git a/man/ru/logoutd.8 b/man/ru/logoutd.8 index a46e1f44..bcf53065 100644 --- a/man/ru/logoutd.8 +++ b/man/ru/logoutd.8 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "logoutd" "8" "11/10/2005" "Команды управления системой" "Команды управления системой" +.TH "logoutd" "8" "03/11/2006" "Команды управления системой" "Команды управления системой" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -19,9 +19,9 @@ logoutd \- контролирует временные интервалы раб \fI/etc/porttime\fR. \fBlogoutd\fR должен запускаться из сценария -\fI/etc/rc\fR. При работе выполняется периодическое сканирование файла +\fI/etc/rc\fR. \fI/var/run/utmp\fR -и для каждого имени пользователя проверяется, разрешено ли данному пользователю работать в настоящий момент на данном порту. Любая сессия, которая нарушает ограничения, описанные в файле +периодически сканируется и для каждого имени пользователя проверяется, разрешено ли данному пользователю работать в настоящий момент на данном порту. Любая сессия, которая нарушает ограничения, описанные в файле \fI/etc/porttime\fR , будет завершена. .SH "ФАЙЛЫ" diff --git a/man/ru/newgrp.1 b/man/ru/newgrp.1 index 49b87a59..42ff4159 100644 --- a/man/ru/newgrp.1 +++ b/man/ru/newgrp.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "newgrp" "1" "11/10/2005" "Пользовательские команды" "Пользовательские команды" +.TH "newgrp" "1" "03/11/2006" "Пользовательские команды" "Пользовательские команды" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) diff --git a/man/ru/newusers.8 b/man/ru/newusers.8 index 28a9f97e..6823a774 100644 --- a/man/ru/newusers.8 +++ b/man/ru/newusers.8 @@ -2,16 +2,16 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "newusers" "8" "11/10/2005" "Команды управления системой" "Команды управления системой" +.TH "newusers" "8" "03/11/2006" "Команды управления системой" "Команды управления системой" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .SH "НАЗВАНИЕ" -newusers \- обновляет и создаёт новые учётные записи в пакетном режиме +newusers \- обновляет и создаёт новые учётные записи пользователей в пакетном режиме .SH "СИНТАКСИС" .HP 9 -\fBnewusers\fR [\fIновые_пользователи\fR] +\fBnewusers\fR [\fInew_users\fR] .SH "ОПИСАНИЕ" .PP \fBnewusers\fR @@ -30,7 +30,7 @@ newusers \- обновляет и создаёт новые учётные за \fIpw_dir\fR Будет проверено существование каталога с именем значения данного поля и если такого каталога нет, то он будет создан. Владельцем каталога будет назначен обновляемый или создаваемый пользователь. .PP -Эта команда предназначена для работы в крупных системных средах, где за один раз обновляется несколько учётных записей. +Данная команда предназначена для работы в крупных системных средах, где за один раз заводится несколько учётных записей. .SH "ПРЕДОСТЕРЕЖЕНИЯ" .PP Файл с входными данными должен быть защищён, так как в нём содержатся не шифрованные пароли. diff --git a/man/ru/nologin.8 b/man/ru/nologin.8 new file mode 100644 index 00000000..2a00743d --- /dev/null +++ b/man/ru/nologin.8 @@ -0,0 +1,29 @@ +.\" ** You probably do not want to edit this file directly ** +.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). +.\" Instead of manually editing it, you probably should edit the DocBook XML +.\" source for it and then use the DocBook XSL Stylesheets to regenerate it. +.TH "nologin" "8" "03/11/2006" "Команды управления системой" "Команды управления системой" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "НАЗВАНИЕ" +nologin \- вежливо отказывает во входе в систему +.SH "СИНТАКСИС" +.HP 8 +\fBnologin\fR +.SH "ОПИСАНИЕ" +.PP +\fBnologin\fR +выдаёт сообщение, что учётная запись недоступна и завершает работу с ненулевым кодом возврата. Она предназначена для замены оболочки командной строки в поле оболочки заблокированных учётных записей. +.PP +Чтобы заблокировать все учётные записи посмотрите страницу руководства +\fBnologin\fR(5). +.SH "СМОТРИТЕ ТАКЖЕ" +.PP +\fBlogin\fR(1), +\fBnologin\fR(5). +.SH "ИСТОРИЯ" +.PP +\fBnologin\fR +впервые появилась в BSD 4.4. diff --git a/man/ru/passwd.1 b/man/ru/passwd.1 index f79b7ea3..b8795a90 100644 --- a/man/ru/passwd.1 +++ b/man/ru/passwd.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "passwd" "1" "12/14/2005" "Пользовательские команды" "Пользовательские команды" +.TH "passwd" "1" "03/11/2006" "Пользовательские команды" "Пользовательские команды" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -11,9 +11,7 @@ passwd \- изменяет пароль пользователя .SH "СИНТАКСИС" .HP 7 -\fBpasswd\fR [\-x\ \fImax\fR] [\-n\ \fImin\fR] [\-w\ \fIwarn\fR] [\-i\ \fIinact\fR] \fIимя\fR -.HP 7 -\fBpasswd\fR [\-l \-u \-d \-S \-e] \fIимя\fR +\fBpasswd\fR [\fIпараметры\fR] \fIlogin\fR .SH "ОПИСАНИЕ" .PP \fBpasswd\fR @@ -28,7 +26,7 @@ passwd \- изменяет пароль пользователя \fBpasswd\fR не производит изменение пароля и завершает работу. .PP -Пользователю предлагается ввести новый пароль. Этот пароль тестируется на сложность подбора. Согласно общим принципам, пароли должны быть от 6 до 8 символов длиной и включать один или более символов каждого типа: +Пользователю предлагается ввести новый пароль. Этот пароль тестируется на сложность подбора. Согласно общим принципам, пароли должны быть длиной от 6 до 8 символов и включать один или более символов каждого типа: .TP 3 \(bu строчные буквы @@ -45,7 +43,7 @@ passwd \- изменяет пароль пользователя .PP Если пароль прошёл проверку, то \fBpasswd\fR -предложит ввести его ещё раз и сравнит с введённым ранее. Для изменения пароля пароли из обеих попыток должны совпасть. +предложит ввести его ещё раз и сравнит с введённым ранее. Для изменения пароли из обеих попыток должны совпасть. .SS "Выбор пароля" .PP Безопасность пароля зависит от стойкости алгоритма шифрования и размера пространства ключа. В @@ -80,13 +78,13 @@ An4wtbt для вывода статуса всех пользователей. .TP \fB\-d\fR, \fB\-\-delete\fR -Удалить пароль пользователя (сделать его пустым). Это быстрый способ заблокировать пароль учётной записи. Это делает указанную учётную запись безпарольной. +Удалить пароль пользователя (сделать его пустым). Это быстрый способ заблокировать пароль учётной записи. Это делает указанную учётную запись беспарольной. .TP \fB\-e\fR, \fB\-\-expire\fR Немедленно сделать пароль устаревшим. В результате это заставит пользователя изменить пароль при следующем входе в систему. .TP \fB\-h\fR, \fB\-\-help\fR -Показать это сообщение и выйти. +Показать краткую справку и закончить работу. .TP \fB\-i\fR, \fB\-\-inactive\fR \fIINACTIVE\fR Этот параметр используется для блокировки учётной записи по прошествии заданного числа дней после устаревания пароля. То есть, если пароль устарел и прошло более @@ -94,7 +92,7 @@ An4wtbt дней, то пользователь больше не сможет использовать данную учётную запись. .TP \fB\-k\fR, \fB\-\-keep\-tokens\fR -Указывает, что изменение пароля нужно выполнить только для устаревших ключей аутентификации (паролей). Пользователи хотят оставить свои не просроченные ключи нетронутыми. +Указывает, что изменение пароля нужно выполнить только для устаревших ключей аутентификации (паролей). Пользователи хотят оставить свои непросроченные ключи нетронутыми. .TP \fB\-l\fR, \fB\-\-lock\fR Заблокировать указанную учётную запись. Этот параметр блокирует учётную запись изменяя значение пароля на вариант, который не может быть шифрованным паролем. @@ -119,7 +117,7 @@ An4wtbt ). .TP \fB\-w\fR, \fB\-\-warndays\fR \fIWARN_DAYS\fR -Установить число дней выдачи предупреждения перед тем как потребуется смена пароля. В параметре +Установить число дней выдачи предупреждения, перед тем как потребуется смена пароля. Параметр \fIWARN_DAYS\fR указывается число дней перед тем как пароль устареет, в течении которых пользователю будут напоминать, что пароль скоро устареет. .TP @@ -139,7 +137,6 @@ An4wtbt содержит защищаемую информацию о пользователях .SH "ВОЗВРАЩАЕМЫЕ ЗНАЧЕНИЯ" .PP -Параметр \fBpasswd\fR завершая работу, возвращает следующие значения: .TP @@ -165,6 +162,6 @@ An4wtbt недопустимое значение параметра .SH "СМОТРИТЕ ТАКЖЕ" .PP -\fBгруппа\fR(5), +\fBgroup\fR(5), \fBpasswd\fR(5), \fBshadow\fR(5). diff --git a/man/ru/passwd.5 b/man/ru/passwd.5 index 371cfc2e..54ca70d0 100644 --- a/man/ru/passwd.5 +++ b/man/ru/passwd.5 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "passwd" "5" "11/10/2005" "Форматы файлов" "Форматы файлов" +.TH "passwd" "5" "03/11/2006" "Форматы файлов" "Форматы файлов" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -27,7 +27,7 @@ passwd \- файл паролей числовой идентификатор группы .TP \(bu -имя\-фамилия пользователя или поле комментария +ФИО пользователя или поле комментария .TP \(bu домашний каталог пользователя @@ -40,9 +40,9 @@ passwd \- файл паролей , могут решить не позволять \fIлюбой\fR доступ, если поле -\fIпароля\fR +\fIпароль\fR пустое. Если поле -\fIпароля\fR +\fIпароль\fR содержит строчную \(Fox\(Fc, то шифрованный пароль хранится в файле \fBshadow\fR(5) @@ -51,7 +51,7 @@ passwd \- файл паролей быть соответствующая строка в файле \fIshadow\fR , иначе учётная запись считается недействительной. Если в поле -\fIпароля\fR +\fIпароль\fR содержится какая\-то другая строка, то она воспринимается как шифрованный пароль, как определено в \fBcrypt\fR(3). .PP @@ -63,7 +63,7 @@ passwd \- файл паролей использует эту информацию для установки значения переменной среды \fB$HOME\fR. .PP -В поле интерпретатора командной строки хранится имя интерпретатора командной строки пользователя или название программы, которая будет запущена первой. Программа +В поле интерпретатора командной строки хранится название интерпретатора командной строки пользователя или программы, которая будет запущена первой. Программа \fBlogin\fR использует эту информацию для установки значения переменной среды \fB$SHELL\fR. Если это поле пустое, то используется значение по умолчанию diff --git a/man/ru/porttime.5 b/man/ru/porttime.5 index 6863c5a3..abe4ddb3 100644 --- a/man/ru/porttime.5 +++ b/man/ru/porttime.5 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "porttime" "5" "11/10/2005" "Форматы файлов" "Форматы файлов" +.TH "porttime" "5" "03/11/2006" "Форматы файлов" "Форматы файлов" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -44,7 +44,8 @@ porttime \- файл с временами доступа к портам и \fIoper\fR с -\fI/dev/console\fR. Это показывает, как файл +\fI/dev/console\fR +в любое время. Это показывает, как файл \fI/etc/porttime\fR обрабатывается в порядке появления записей в файле. Любой другой пользователь попадёт под правило второй записи, которая не разрешает доступ в любое время. .sp diff --git a/man/ru/pw_auth.3 b/man/ru/pw_auth.3 index 71001996..610eb189 100644 --- a/man/ru/pw_auth.3 +++ b/man/ru/pw_auth.3 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "pw_auth" "3" "11/10/2005" "Библиотечные функции" "Библиотечные функции" +.TH "pw_auth" "3" "03/11/2006" "Библиотечные функции" "Библиотечные функции" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -19,10 +19,10 @@ pw_auth \- выполняет процедуры проверки пароля, \fIpw_auth\fR вызывает функции определённые администратором для заданного пользователя. .PP -\fIВ параметре command\fR -задаётся название программы аутентификации. Она выбирает информацию из файла паролей пользователей. В строке содержится один или более имён исполняемых программ, разделённых точкой с запятой. Запускается каждая программа в порядке перечисления. Параметры командной строки, задаваемые для каждого основания (reason), описаны далее. +\fIcommand\fR +задаёт название программы аутентификации. Она выбирает информацию из файла паролей пользователей. В строке содержится один или более имён исполняемых программ, разделённых точкой с запятой. Запускается каждая программа в порядке перечисления. Параметры командной строки, задаваемые для каждого основания (reason), описаны далее. .PP -\fIВ параметре user\fR +\fIuser\fR задаётся имя пользователя, такое же как в файле \fI/etc/passwd\fR , для которого нужно произвести аутентификацию. Пользовательские записи упорядочены по именам пользователей. Это позволяет использовать не уникальные ID пользователей и для каждой пары имя \- ID указать свою программу аутентификации и другую информацию. @@ -73,7 +73,7 @@ pw_auth \- выполняет процедуры проверки пароля, \fIftp\fR. Программа аутентификации будет вызвана с параметром \fB\-f\fR , за которым следует имя пользователя. Стандартные файловые дескрипторы недоступны для связи с пользователем. Стандартный файловый дескриптор ввода будет подсоединён к родительскому процессу, а другие два файловых дескриптора вывода будут подключены к устройству -\fI/dev/null\fR. Функция +\fI/dev/null\fR. \fIpw_auth\fR передаст по каналу единственную строку данных программе аутентификации через файловый дескриптор 0. .TP @@ -82,7 +82,7 @@ pw_auth \- выполняет процедуры проверки пароля, \fIrexec\fR. Программа аутентификации будет вызвана с параметром \fB\-x\fR , за которым следует имя пользователя. Стандартные файловые дескрипторы недоступны для связи с пользователем. Стандартный файловый дескриптор ввода будет подсоединён к родительскому процессу, а другие два файловых дескриптора вывода будут подключены к устройству -\fI/dev/null\fR. Функция +\fI/dev/null\fR. \fIpw_auth\fR передаст по каналу единственную строку данных программе аутентификации через файловый дескриптор 0. .PP @@ -101,7 +101,6 @@ pw_auth \- выполняет процедуры проверки пароля, Сетевые параметры не были протестированы. .SH "ДИАГНОСТИКА" .PP -Функция \fIpw_auth\fR возвращает 0, если программа аутентификации завершила работу с кодом 0, и ненулевое значение в противном случае. .SH "СМОТРИТЕ ТАКЖЕ" diff --git a/man/ru/pwck.8 b/man/ru/pwck.8 index a358bef6..86a70a0f 100644 --- a/man/ru/pwck.8 +++ b/man/ru/pwck.8 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "pwck" "8" "12/14/2005" "Команды управления системой" "Команды управления системой" +.TH "pwck" "8" "03/11/2006" "Команды управления системой" "Команды управления системой" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -17,11 +17,11 @@ pwck \- проверяет целостность файлов паролей .SH "ОПИСАНИЕ" .PP \fBpwck\fR -проверяет целостность аутентификационной информации в системе. Во всех записях файлов +проверяет корректность системных файлов учётных записей. Проверяется формат всех записей \fI/etc/passwd\fR и \fI/etc/shadow\fR -будут проверены правильность формата и допустимость данных каждого поля. Пользователю будет предложено удалить записи, которые имеют неправильный формат или содержащие неисправимые ошибки. +и допустимость данных каждого поля. В случае обнаружения ошибок пользователю предлагается подтвердить удаление записей, восстановление которых невозможно. .PP Выполняются следующие проверки: .TP 3 @@ -100,7 +100,6 @@ Cообщать только об ошибках. Предупреждения, \fBusermod\fR(8). .SH "ВОЗВРАЩАЕМЫЕ ЗНАЧЕНИЯ" .PP -Команда \fBpwck\fR завершая работу, возвращает следующие значения: .TP @@ -108,7 +107,7 @@ Cообщать только об ошибках. Предупреждения, успешное выполнение .TP \fI1\fR -ошибка в параметрах командной строки +ошибка в параметрах команды .TP \fI2\fR есть одна или более записей с недопустимыми паролями diff --git a/man/ru/pwconv.8 b/man/ru/pwconv.8 index b781156f..2ef28542 100644 --- a/man/ru/pwconv.8 +++ b/man/ru/pwconv.8 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "pwconv" "8" "11/10/2005" "Команды управления системой" "Команды управления системой" +.TH "pwconv" "8" "03/11/2006" "Команды управления системой" "Команды управления системой" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -56,7 +56,7 @@ pwconv, pwunconv, grpconv, grpunconv \- преобразует пароли по затем удаляет \fIgshadow\fR. .PP -Данные четыре программы работают с файлами обычных или теневых паролей пользователей и групп: +Эти четыре программы работают с файлами обычных или теневых паролей пользователей и групп: \fI/etc/passwd\fR, \fI/etc/group\fR, \fI/etc/shadow\fR @@ -76,7 +76,7 @@ pwconv, pwunconv, grpconv, grpunconv \- преобразует пароли по и \fIPASS_WARN_AGE\fR из -\fIфайла /etc/login.defs\fR +\fI/etc/login.defs\fR при добавлении новых записей в файл \fI/etc/shadow\fR. .PP @@ -84,7 +84,7 @@ pwconv, pwunconv, grpconv, grpunconv \- преобразует пароли по \fBpwunconv\fR и \fBgrpunconv\fR -такжет выполняют схожий порядок действий. Пароли в главном файле обновляются из теневого файла. Записи, которые существуют в главном файле, но не существуют в теневом файле оставляются как есть. По окончании, теневой файл удаляется. Информация об устаревании пароля не учитывается программой +также выполняют схожий порядок действий. Пароли в главном файле обновляются из теневого файла. Записи, которые существуют в главном файле, но не существуют в теневом файле оставляются как есть. По окончании, теневой файл удаляется. Информация об устаревании пароля не учитывается программой \fBpwunconv\fR. Конвертируется только возможное. .SH "ОШИБКИ" .PP @@ -95,7 +95,7 @@ pwconv, pwunconv, grpconv, grpunconv \- преобразует пароли по , чтобы исправить возможные ошибки. .SH "ФАЙЛЫ" .TP -\fIфайла /etc/login.defs\fR +\fI/etc/login.defs\fR содержит конфигурацию подсистемы теневых паролей .SH "СМОТРИТЕ ТАКЖЕ" .PP diff --git a/man/ru/sg.1 b/man/ru/sg.1 index 49956895..1e830474 100644 --- a/man/ru/sg.1 +++ b/man/ru/sg.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "sg" "1" "11/10/2005" "Пользовательские команды" "Пользовательские команды" +.TH "sg" "1" "03/11/2006" "Пользовательские команды" "Пользовательские команды" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -14,7 +14,6 @@ sg \- выполняет команду с правами другой груп \fBsg\fR [\-] [group\ [\-c\ ]\ command] .SH "ОПИСАНИЕ" .PP -Команда \fBsg\fR работает подобно команде \fBnewgrp\fR @@ -31,7 +30,7 @@ sg \- выполняет команду с правами другой груп \fBnewgrp\fR. Этого не происходит для \fBsg\fR, поэтому после завершения работы команды \fBsg\fR -, вы возвращаетесь в предыдующую группу. +, вы возвращаетесь в предыдущую группу. .SH "ФАЙЛЫ" .TP \fI/etc/passwd\fR diff --git a/man/ru/shadow.3 b/man/ru/shadow.3 index 911b7a57..90c48e8d 100644 --- a/man/ru/shadow.3 +++ b/man/ru/shadow.3 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "shadow" "3" "11/10/2005" "Библиотечные функции" "Библиотечные функции" +.TH "shadow" "3" "03/11/2006" "Библиотечные функции" "Библиотечные функции" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -25,7 +25,7 @@ shadow, getspnam \- процедуры для работы с файлом ши .PP \fIstruct spwd *sgetspent(char\fR\fI*cp\fR\fI);\fR .PP -\fIint putspent(struct spwd\fR\fI*p,\fR\fIFILE\fR\fI*fp\fR\fI);\fR +\fIint putspent(struct spwd\fR\fI*p,\fR\fIФАЙЛ\fR\fI*fp\fR\fI);\fR .PP \fIint lckpwdf();\fR .PP @@ -107,7 +107,6 @@ sp_flag \- зарезервировано \fIendspent\fR можно использовать для перемещения в начало и конец, соответственно, файла теневых паролей. .PP -Функции \fIlckpwdf\fR и \fIulckpwdf\fR diff --git a/man/ru/shadow.5 b/man/ru/shadow.5 index 4dca400b..5e6068e2 100644 --- a/man/ru/shadow.5 +++ b/man/ru/shadow.5 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "shadow" "5" "11/10/2005" "Форматы файлов" "Форматы файлов" +.TH "shadow" "5" "03/11/2006" "Форматы файлов" "Форматы файлов" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -15,7 +15,7 @@ shadow \- файл с защищаемой информацией о польз содержит шифрованные пароли учётных записей пользователей и необязательную информацию об устаревании пароля. Включает в себя: .TP 3 \(bu -имя учётной записи +имя пользователя для входа в систему .TP \(bu шифрованный пароль @@ -57,7 +57,7 @@ shadow \- файл с защищаемой информацией о польз Информация из этого файла заменяет любой пароль или информацию об устаревании, содержащуюся в файле \fI/etc/passwd\fR. .PP -Этот файл не должен быть доступным на чтение обычным пользователям, если должна обеспечиваться безопасность паролей. +Этот файл должен быть недоступен обычному пользователю, если нужно обеспечить безопасность паролей. .SH "ФАЙЛЫ" .TP \fI/etc/passwd\fR diff --git a/man/ru/su.1 b/man/ru/su.1 index 0f7fc626..0b9beb98 100644 --- a/man/ru/su.1 +++ b/man/ru/su.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "su" "1" "11/10/2005" "Пользовательские команды" "Пользовательские команды" +.TH "su" "1" "03/11/2006" "Пользовательские команды" "Пользовательские команды" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -11,7 +11,7 @@ su \- изменяет ID пользователя или делает его суперпользователем .SH "СИНТАКСИС" .HP 3 -\fBsu\fR [\-] [\fIимя_пользователя\fR\ [\ \fIпараметры\fR\ ]] +\fBsu\fR [\fIпараметры\fR] [\-] [\fIusername\fR\ [\ \fIпараметры\fR\ ]] .SH "ОПИСАНИЕ" .PP \fBsu\fR @@ -27,10 +27,16 @@ su \- изменяет ID пользователя или делает его с \fI/etc/passwd\fR , которая является регистрационной для указываемого пользователя. .PP -Пользователю предложат ввести пароль, если он задан. Неправльный пароль вызовет сообщение об ошибке. Все попытки, удачные и неудачные, протоколируются системой с целью обнаружения злоупотреблений. +Вы можете использовать параметр +\fB\-\-\fR +чтобы отделить +\fBsu\fR +параметры от параметров передаваемых оболочке. +.PP +Пользователю предложат ввести пароль, если он задан. При неверном пароле возникает сообщение об ошибке. Все попытки, удачные и неудачные, протоколируются системой с целью обнаружения злоупотреблений. .PP Текущая рабочая среда передаётся оболочке. Значение -\fI$PATH\fR +\fB$PATH\fR устанавливается равным \fI/bin:/usr/bin\fR для обычных пользователей, или @@ -43,11 +49,72 @@ su \- изменяет ID пользователя или делает его с \fI/etc/login.defs\fR. .PP Субсистемный вход в систему можно распознать по наличию символа "*" в начале регистрационной оболочки. Заданный домашний каталог будет использован как корень новой файловой системы, в которой регистрируется пользователь. +.SH "ПАРАМЕТРЫ" +.PP +Возможные параметры команды +\fBsu\fR +: +.TP +\fB\-c\fR, \fB\-\-command\fR \fIОБОЛОЧКА\fR +Указать команду, которая будет запущена оболочкой в виде параметра для +\fB\-c\fR. +.TP +\fB\-\fR, \fB\-l\fR, \fB\-\-login\fR +Предоставляет среду, как если бы пользователь непосредственно регистрировался в системе. +.sp +Если используется +\fB\-\fR +то он должен быть задан +\fBsu\fR +последним. Другая форма (\fB\-l\fR +и +\fB\-\-login\fR) не имеет ограничений. +.TP +\fB\-s\fR, \fB\-\-shell\fR \fIОБОЛОЧКА\fR +Оболочка, которая будет запущена. +.sp +Запущенная оболочка выбирается из (в порядке убывания приоритета): +.RS +.TP 3 +\(bu +Оболочка указанная в параметре \-\-shell +.TP +\(bu +Если +\fB\-\-preserve\-environment\fR +задано, то оболочка задаётся переменной +\fB$SHELL\fR. +.TP +\(bu +Оболочка указанная в записи файла /etc/passwd для заданного пользователя. +.TP +\(bu +/bin/sh, если ни одной оболочке не было найдено с помощью методов, указанных выше. +.RE +.IP +.sp +Если заданный пользователь имел ограниченную оболочку (то есть оболочка в поле этой пользовательской записи в файле +\fI/etc/passwd\fR +не прописана в файле +\fI/etc/shell\fR), то параметр +\fB\-\-shell\fR +или переменная среды +\fB$SHELL\fR +не будет взята из учётной записи, если +\fBsu\fR +не была запущена суперпользователем. +.TP +\fB\-m\fR, \fB\-p\fR, \fB\-\-preserve\-environment\fR +Сохранить имеющуюся рабочую среду. +.sp +Если заданный пользователь имел ограниченную оболочку, то этот параметр не сработает (если +\fBsu\fR +не запускается суперпользователем). .SH "ПРЕДОСТЕРЕЖЕНИЯ" .PP -Данная версия программы +Данная версия \fBsu\fR -имеет много параметров сборки, только некоторые из них могут быть использованы на любой машине. +может быть собрана с разными параметрами и только некоторые из них смогут быть использованы на любой машине. .SH "ФАЙЛЫ" .TP \fI/etc/passwd\fR @@ -59,5 +126,4 @@ su \- изменяет ID пользователя или делает его с .PP \fBlogin\fR(1), \fBlogin.defs\fR(5), -\fBsh\fR(1), -\fBsuauth\fR(5). +\fBsh\fR(1) diff --git a/man/ru/suauth.5 b/man/ru/suauth.5 index 746d9d94..cbe7a0f5 100644 --- a/man/ru/suauth.5 +++ b/man/ru/suauth.5 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "suauth" "5" "11/10/2005" "Форматы файлов" "Форматы файлов" +.TH "suauth" "5" "03/11/2006" "Форматы файлов" "Форматы файлов" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -62,7 +62,7 @@ suauth \- файл управления командой su .nf # пример файла /etc/suauth # - # Пара привелегированных имён пользователей + # Пара привилегированных имён пользователей # могут выполнить su, чтобы получить права суперпользователя введя свой пароль. # root:chris,birddog:OWNPASS @@ -85,7 +85,7 @@ suauth \- файл управления командой su .SH "ФАЙЛЫ" .TP \fI/etc/suauth\fR -.SH "БАГИ" +.SH "ОШИБКИ" .PP Может быть несколько кривостей. Анализатор файла, в частности, не прощает синтаксических ошибок, ожидая, что не будет недопустимых пробелов (кроме как в начале и конце строк), и специальных слов, разделяющих различные вещи. .SH "ДИАГНОСТИКА" diff --git a/man/ru/sulogin.8 b/man/ru/sulogin.8 index 50c366fe..4c81312f 100644 --- a/man/ru/sulogin.8 +++ b/man/ru/sulogin.8 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "sulogin" "8" "11/10/2005" "Команды управления системой" "Команды управления системой" +.TH "sulogin" "8" "03/11/2006" "Команды управления системой" "Команды управления системой" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -22,7 +22,7 @@ sulogin \- регистрация для работы в однопользов \fBinit\fR были модифицированы соответствующим образом, или в которых в файле \fI/etc/inittab\fR -имеется запись для однользовательского входа в систему. +имеется запись для однопользовательского входа в систему. .PP Пользователю выдаётся приглашение: .PP @@ -51,7 +51,7 @@ co:s:respawn:/etc/sulogin /dev/console .PP должна запускать команду sulogin в однопользовательском режиме. .PP -Возможно создание полной рабочей среды. Однако, различные устройства могут быть не смонтированы или не иницилизированы и поэтому многие пользовательские команды могут быть недоступны или не функионировать. +Возможно создание полной рабочей среды. Однако, различные устройства могут быть не смонтированы или не иницилизированы и поэтому многие пользовательские команды могут быть недоступны или не функционировать. .SH "ФАЙЛЫ" .TP \fI/etc/passwd\fR diff --git a/man/ru/useradd.8 b/man/ru/useradd.8 index 74f168e8..0e2a592f 100644 --- a/man/ru/useradd.8 +++ b/man/ru/useradd.8 @@ -2,16 +2,16 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "useradd" "8" "11/10/2005" "Команды управления системой" "Команды управления системой" +.TH "useradd" "8" "03/11/2006" "Команды управления системой" "Команды управления системой" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .SH "НАЗВАНИЕ" -useradd \- регистрирует нового пользователя или изменяет информацию о новом пользователе по умолчанию +useradd \- регистрирует нового пользователя или изменяет информацию по умолчанию о новых пользователях .SH "СИНТАКСИС" .HP 8 -\fBuseradd\fR [\fIпараметры\fR] \fIИМЯ_ПОЛЬЗОВАТЕЛЯ\fR +\fBuseradd\fR [\fIпараметры\fR] \fILOGIN\fR .HP 8 \fBuseradd\fR \-D .HP 8 @@ -30,7 +30,7 @@ useradd \- регистрирует нового пользователя или : .TP \fB\-c\fR, \fB\-\-comment\fR \fIКОММЕНТАРИЙ\fR -Любая текстовая строка. Обычно, здесь коротко описывается учётная запись, и обычно, используется как поле для имени и фамилии пользователя. +Любая текстовая строка. Обычно, здесь коротко описывается учётная запись, и в настоящее время используется как поле для имени и фамилии пользователя. .TP \fB\-b\fR, \fB\-\-base\-dir\fR \fIБАЗОВЫЙ_КАТАЛОГ\fR Базовый системный каталог по умолчанию, если другой каталог не указан с помощью параметра @@ -38,34 +38,38 @@ useradd \- регистрирует нового пользователя или \fIБАЗОВЫЙ_КАТАЛОГ\fR объединяется с именем учётной записи для определения домашнего каталога. Если не используется параметр \fB\-m\fR -, БАЗОВЫЙ_КАТАЛОГ должен существовать. +, то +\fIБАЗОВЫЙ_КАТАЛОГ\fR +должен существовать. .TP \fB\-d\fR, \fB\-\-home\fR \fIДОМАШНИЙ_КАТАЛОГ\fR -Для нового пользователя будет создан +Для создаваемого пользователя будет указан каталог \fIДОМАШНИЙ_КАТАЛОГ\fR в качестве начального каталога. По умолчанию, это значение получается объединением -\fIИМЯ_ПОЛЬЗОВАТЕЛЯ\fR +\fILOGIN\fR с \fIБАЗОВЫЙ_КАТАЛОГ\fR -и используется как имя регистрационного каталога. +и используется как имя регистрационного каталога. Каталог +\fIДОМАШНИЙ_КАТАЛОГ\fR +необязательно должен существовать и не будет создан, если его нет. .TP -\fB\-e\fR, \fB\-\-expiredate\fR \fIДАТА_УСТАРЕВАНИЯ\fR +\fB\-e\fR, \fB\-\-expiredate\fR \fIEXPIRE_DATE\fR Дата, когда учётная запись пользователя будет заблокирована. Дата задаётся в формате \fIГГГГ\-ММ\-ДД\fR. .TP -\fB\-f\fR, \fB\-\-inactive\fR \fIНЕАКТИВНОСТЬ\fR -Число дней, которые должны пройти после устаревания пароля, чтобы учётная запись заблокировалась навсегда. Значение 0 блокирует учётную запись сразу после устаревания пароля, а значение \-1 выключает данную возможность. По умолчанию используется значение \-1. +\fB\-f\fR, \fB\-\-inactive\fR \fIINACTIVE\fR +Число дней, которые должны пройти после устаревания пароля, чтобы учётная запись заблокировалась навсегда. Если указано значение 0, то учётная запись блокируется сразу после устаревания пароля, а при значении \-1 данная возможность не используется. По умолчанию используется значение \-1. .TP -\fB\-g\fR, \fB\-\-gid\fR \fIГРУППА\fR -Имя или числовой идентификатор новой начальной группы пользователя. Группа с таким именем должна существовать. Идентификатор группы должен указывать на уже существующую группу. Идентификатор группы по умолчанию равен 1 или значение указанное в файле +\fB\-g\fR, \fB\-\-gid\fR \fIGROUP\fR +Имя или числовой идентификатор новой начальной группы пользователя. Группа с таким именем должна существовать. Идентификатор группы должен указывать на уже существующую группу. Идентификатор группы по умолчанию равен 1 или значению указанному в файле \fI/etc/default/useradd\fR. .TP \fB\-G\fR, \fB\-\-groups\fR \fIГРУППА1\fR[\fI,ГРУППА2,...\fR[\fI,ГРУППАN\fR]]] -Список дополнительных групп, в которых числится пользователь. Перечесление групп осуществляется через запятую, без пробелов. На указанные группы действуют ограничения, указанные в параметре +Список дополнительных групп, в которых числится пользователь. Перечисление групп осуществляется через запятую, без промежуточных пробелов. На указанные группы действуют ограничения, указанные в параметре \fB\-g\fR. По умолчанию пользователь входит только в начальную группу. .TP \fB\-h\fR, \fB\-\-help\fR -Показать это сообщение и выйти. +Показать краткую справку и закончить работу. .TP \fB\-m\fR, \fB\-\-create\-home\fR Если домашнего каталога пользователя не существует, то он будет создан. Файлы из каталога @@ -83,7 +87,7 @@ useradd \- регистрирует нового пользователя или \fB\-m\fR. По умолчанию, домашний каталог не создаётся и файлы не копируются. .TP \fB\-K\fR, \fB\-\-key\fR \fIКЛЮЧ\fR=\fIЗНАЧЕНИЕ\fR -Используется для изменения значений по умолчанию, хранимых в файле /etc/login.def (UID_MIN, UID_MAX, UMASK, PASS_MAX_DAYS и других). +Используется для изменения значений по умолчанию, хранимых в файле /etc/login.defs (UID_MIN, UID_MAX, UMASK, PASS_MAX_DAYS и других). Пример: \fB\-K \fR\fIPASS_MAX_DAYS\fR=\fI\-1\fR @@ -92,9 +96,10 @@ useradd \- регистрирует нового пользователя или несколько раз, например: \fB\-K \fR\fIUID_MIN\fR=\fI100\fR\fB \-K \fR\fIUID_MAX\fR=\fI499\fR .sp -Замечание: передавать параметры в виде -\fB\-K \fR\fIUID_MIN\fR=\fI10\fR,\fIUID_MAX\fR=\fI499\fR -пока нельзя. +Замечание: +\fB\-K \fR\fIUID_MIN\fR=\fI10\fR, +\fIUID_MAX\fR=\fI499\fR +такая форма пока не поддерживается. .TP \fB\-o\fR, \fB\-\-non\-unique\fR Позволяет создать учётную запись с уже имеющимся (не уникальным) UID. @@ -124,13 +129,13 @@ useradd \- регистрирует нового пользователя или \fB\-d\fR при создании новой учётной записи. .TP -\fB\-e\fR \fIДАТА_УСТАРЕВАНИЯ\fR -Дата, когда учётная запись пользователя будет заблокирована. +\fB\-e\fR \fIEXPIRE_DATE\fR +Дата, когда учётная запись пользователя заблокирована. .TP -\fB\-f\fR \fIНЕАКТИВНОСТЬ\fR +\fB\-f\fR \fIINACTIVE\fR Число дней, которые должны пройти после устаревания пароля, перед тем как учётная запись будет заблокирована. .TP -\fB\-g\fR, \fB\-\-gid\fR \fIГРУППА\fR +\fB\-g\fR, \fB\-\-gid\fR \fIGROUP\fR Имя или числовой идентификатор новой начальной группы пользователя. Группа с таким именем должна существовать и числовой идентификатор группы должен указывать на существующую группу. .TP \fB\-s\fR, \fB\-\-shell\fR \fIОБОЛОЧКА\fR @@ -139,7 +144,7 @@ useradd \- регистрирует нового пользователя или Если программа запущена без параметров, \fBuseradd\fR покажет текущие значения по умолчанию. -.SH "ЗАМЕЧАНИЕ" +.SH "ЗАМЕЧАНИЯ" .PP Системный администратор сам решает, какие файлы нужно положить в каталог \fI/etc/skel/\fR @@ -174,7 +179,6 @@ useradd \- регистрирует нового пользователя или содержит конфигурацию подсистемы теневых паролей .SH "ВОЗВРАЩАЕМЫЕ ЗНАЧЕНИЯ" .PP -Команда \fBuseradd\fR завершая работу, возвращает следующие значения: .TP @@ -185,13 +189,13 @@ useradd \- регистрирует нового пользователя или не удалось изменить файл паролей .TP \fI2\fR -ошибка в параметрах командной строки +ошибка в параметрах команды .TP \fI3\fR -ошибка в агрументе параметра +недопустимое значение параметра .TP \fI4\fR -такой uid уже существует (и не задан параметр +такой UID уже существует (и не задан параметр \fB\-o\fR) .TP \fI6\fR diff --git a/man/ru/userdel.8 b/man/ru/userdel.8 index dafc69cf..a19ed5da 100644 --- a/man/ru/userdel.8 +++ b/man/ru/userdel.8 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "userdel" "8" "11/10/2005" "Команды управления системой" "Команды управления системой" +.TH "userdel" "8" "03/11/2006" "Команды управления системой" "Команды управления системой" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -14,7 +14,6 @@ userdel \- удаляет учётную запись и файлы пользо \fBuserdel\fR [\-f] [\-r] \fIимя_пользователя\fR .SH "ОПИСАНИЕ" .PP -Команда \fBuserdel\fR изменяет системные файлы учётных записей, удаляя все записи, относящиеся к \fIимя_пользователя\fR. Заданная учётная запись должна существовать. @@ -32,7 +31,7 @@ userdel \- удаляет учётную запись и файлы пользо установлена в \fIyes\fR в файле -\fIetc/login.defs\fR +\fI/etc/login.defs\fR и если существует группа с именем удаляемого пользователя, то это группа будет удалена, даже если она является первичной группой другого пользователя. .sp \fIЗамечание:\fR @@ -50,7 +49,7 @@ userdel \- удаляет учётную запись и файлы пользо \fI/etc/group\fR содержит информацию о группах .TP -\fIetc/login.defs\fR +\fI/etc/login.defs\fR содержит конфигурацию подсистемы теневых паролей .TP \fI/etc/passwd\fR @@ -60,7 +59,6 @@ userdel \- удаляет учётную запись и файлы пользо содержит защищаемую информацию о пользователях .SH "ВОЗВРАЩАЕМЫЕ ЗНАЧЕНИЯ" .PP -Команда \fBuserdel\fR завершая работу, возвращает следующие значения: .TP @@ -71,7 +69,7 @@ userdel \- удаляет учётную запись и файлы пользо не удалось изменить файл паролей .TP \fI2\fR -ошибка в параметрах командной строки +ошибка в параметрах команды .TP \fI6\fR указанный пользователь не существует @@ -84,7 +82,7 @@ userdel \- удаляет учётную запись и файлы пользо .TP \fI12\fR не удалось удалить домашний каталог -.SH "ПРЕДУПРЕЖДЕНИЕ" +.SH "ПРЕДОСТЕРЕЖЕНИЯ" .PP \fBuserdel\fR не будет удалять учётную запись, если пользователь в данный момент работает в системе. Вы должны завершить все запущенные процессы, принадлежащие учётной записи, которую нужно удалить. @@ -96,11 +94,11 @@ userdel \- удаляет учётную запись и файлы пользо установлена в \fIyes\fR в файле -\fIetc/login.defs\fR, +\fI/etc/login.defs\fR, \fBuserdel\fR удалит группу с именем как у пользователя. Чтобы избежать противоречий в базах данных групп и паролей, \fBuserdel\fR -проверит, что данная група не используется в качестве первичной для другого пользователя, и выдаст предупреждение без удаления, если такое случится. Параметр +проверит, что данная группа не используется в качестве первичной для другого пользователя, и выдаст предупреждение без удаления, если такое случится. Параметр \fB\-f\fR поможет удалить группу в любом случае. .SH "СМОТРИТЕ ТАКЖЕ" diff --git a/man/ru/usermod.8 b/man/ru/usermod.8 index 03ff52f0..a888dcf5 100644 --- a/man/ru/usermod.8 +++ b/man/ru/usermod.8 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "usermod" "8" "11/21/2005" "Команды управления системой" "Команды управления системой" +.TH "usermod" "8" "03/11/2006" "Команды управления системой" "Команды управления системой" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -11,12 +11,11 @@ usermod \- изменяет учётную запись пользователя .SH "СИНТАКСИС" .HP 8 -\fBusermod\fR [\fIпараметры\fR] \fIПОЛЬЗОВАТЕЛЬ\fR +\fBusermod\fR [\fIпараметры\fR] \fILOGIN\fR .SH "ОПИСАНИЕ" .PP -Команда \fBusermod\fR -изменяет учётные записи в системных файлах, согласно заданным параметрам командной строки. +изменяет системные файлы учётных записей согласно параметрам, переданным в командной строке. .SH "ПАРАМЕТРЫ" .PP Возможные параметры команды @@ -32,25 +31,25 @@ usermod \- изменяет учётную запись пользователя \fB\-m\fR , то содержимое текущего домашнего каталога будет перемещено в новый домашний каталог, который будет создан, если он ещё не существует. .TP -\fB\-e\fR, \fB\-\-expiredate\fR \fIДАТА_УСТАРЕВАНИЯ\fR -Дата блокировки учётной записи. Дата указывается в формате +\fB\-e\fR, \fB\-\-expiredate\fR \fIEXPIRE_DATE\fR +Дата, когда учётная запись пользователя будет заблокирована. Дата задаётся в формате \fIГГГГ\-ММ\-ДД\fR. .TP -\fB\-f\fR, \fB\-\-inactive\fR \fIНЕАКТИВНЫХ_ДНЕЙ\fR -Число дней, которые должны пройти после устаревания пароля, чтобы учётная запись заблокировалась навсегда. Значение 0 блокирует учётную запись сразу после устаревания пароля, а значение \-1 выключает данную возможность. По умолчанию значением является \-1. +\fB\-f\fR, \fB\-\-inactive\fR \fIINACTIVE\fR +Число дней, которые должны пройти после устаревания пароля, чтобы учётная запись заблокировалась навсегда. Если указано значение 0, то учётная запись блокируется сразу после устаревания пароля, а при значении \-1 данная возможность не используется. По умолчанию используется значение \-1. .TP -\fB\-g\fR, \fB\-\-gid\fR \fIГРУППА\fR +\fB\-g\fR, \fB\-\-gid\fR \fIGROUP\fR Имя или числовой идентификатор новой начальной группы пользователя. Группа с таким именем должна существовать. Идентификатор группы должен указывать на уже существующую группу. По умолчанию идентификатор группы установлен в 1. .TP \fB\-G\fR, \fB\-\-groups\fR \fIГРУППА1\fR[\fI,ГРУППА2,...\fR[\fI,ГРУППАN\fR]]] -Список дополнительных групп, в которых числится пользователь. Перечисление групп осуществляется через запятую, без пробелов. На указанные группы действуют ограничения, указанные в параметре +Список дополнительных групп, в которых числится пользователь. Перечисление групп осуществляется через запятую, без промежуточных пробелов. На указанные группы действуют ограничения, указанные в параметре \fB\-g\fR. Если пользователь член группы, которой в указанном списке нет, то пользователь удаляется из этой группы. Такое поведение можно изменить с помощью параметра \fB\-a\fR -, который говорит добавить группы к уже имеющемуся списку групп пользователя. +, который говорит добавить пользователя к уже имеющемуся списку групп пользователя. .TP \fB\-l\fR, \fB\-\-login\fR \fIНОВОЕ_ИМЯ\fR Имя пользователя будет изменено с -\fIПОЛЬЗОВАТЕЛЬ\fR +\fILOGIN\fR на \fIНОВОЕ_ИМЯ\fR. Больше ничего не меняется. В частности, вероятно, нужно изменить имя домашнего каталога пользователя, чтобы отразить изменение в имени пользователя. .TP @@ -63,10 +62,10 @@ usermod \- изменяет учётную запись пользователя \fB\-o\fR, \fB\-\-non\-unique\fR При использовании с параметром \fB\-u\fR -, этот параметр позволяет указать не уникальный числовой идентификатор пользователя. +, этот параметр позволяет указывать не уникальный числовой идентификатор пользователя. .TP \fB\-p\fR, \fB\-\-password\fR \fIПАРОЛЬ\fR -Шифрованный пароль, возвращаемый функцией +Шифрованное значение пароля, которое возвращает функция \fBcrypt\fR(3). .TP \fB\-s\fR, \fB\-\-shell\fR \fIОБОЛОЧКА\fR diff --git a/man/ru/vipw.8 b/man/ru/vipw.8 index b868c972..114be1de 100644 --- a/man/ru/vipw.8 +++ b/man/ru/vipw.8 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "vipw" "8" "12/14/2005" "Команды управления системой" "Команды управления системой" +.TH "vipw" "8" "03/11/2006" "Команды управления системой" "Команды управления системой" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -19,7 +19,7 @@ vipw, vigr \- служат для редактирования файлов па \fBvipw\fR и \fBvigr\fR -редактируют файлы +служат для редактирования файлов \fI/etc/passwd\fR и \fI/etc/group\fR, соответственно. Если указан параметр @@ -33,7 +33,7 @@ vipw, vigr \- служат для редактирования файлов па \fBvi\fR(1). .SH "ПАРАМЕТРЫ" .PP -Возможные параметры для команд +Возможные параметры команды \fBvipw\fR и \fBvigr\fR @@ -43,7 +43,7 @@ vipw, vigr \- служат для редактирования файлов па Редактирует базу данных групп. .TP \fB\-h\fR, \fB\-\-help\fR -Показать это сообщение и выйти. +Показать краткую справку и закончить работу. .TP \fB\-p\fR, \fB\-\-passwd\fR Редактировать базу данных passwd. diff --git a/man/sg.1.xml b/man/sg.1.xml index 6835a2ec..5f9ac7ca 100644 --- a/man/sg.1.xml +++ b/man/sg.1.xml @@ -1,8 +1,8 @@ + "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> - + sg 1 @@ -18,7 +18,7 @@ sg - group - -c + -c command diff --git a/man/su.1 b/man/su.1 index cef2d4ea..77306036 100644 --- a/man/su.1 +++ b/man/su.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "SU" "1" "12/17/2005" "User Commands" "User Commands" +.TH "SU" "1" "01/22/2006" "User Commands" "User Commands" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -21,7 +21,7 @@ defaults to becoming the super user. The optional argument \fB\-\fR may be used to provide an environment similar to 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\(aas login shell. In particular, an argument of +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 command interpreters. The command will be executed by the shell specified in \fI/etc/passwd\fR @@ -33,7 +33,7 @@ argument to separate \fBsu\fR options from the arguments supplied to the shell. .PP -The user will be prompted for a password, if appropriate. Invalid passwords will produce an error message. All attempts, both valid and invalid, are logged to detect abuses of the system. +The user will be prompted for a password, if appropriate. Invalid passwords will produce an error message. All attempts, both valid and invalid, are logged to detect abuse of the system. .PP The current environment is passed to the new shell. The value of \fB$PATH\fR @@ -55,6 +55,10 @@ The options which apply to the \fBsu\fR command are: .TP +\fB\-c\fR, \fB\-\-command\fR \fISHELL\fR +Specify a command that will be invoked by the shell using its +\fB\-c\fR. +.TP \fB\-\fR, \fB\-l\fR, \fB\-\-login\fR Provide an environment similar to what the user would expect had the user logged in directly. .sp diff --git a/man/su.1.xml b/man/su.1.xml index de86b6e2..f9a732b6 100644 --- a/man/su.1.xml +++ b/man/su.1.xml @@ -2,7 +2,7 @@ - + su 1 @@ -42,7 +42,7 @@ Additional arguments may be provided after the username, in which case - they are supplied to the user´s login shell. In particular, an + they are supplied to the user's login shell. In particular, an argument of 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 /etc/passwd @@ -56,7 +56,7 @@ The user will be prompted for a password, if appropriate. Invalid passwords will produce an error message. All attempts, both valid and - invalid, are logged to detect abuses of the system. + invalid, are logged to detect abuse of the system. @@ -80,6 +80,18 @@ The options which apply to the su command are: + + + , + SHELL + + + + Specify a command that will be invoked by the shell using its + . + + + , , diff --git a/man/tr/Makefile.in b/man/tr/Makefile.in index da39fd90..50f925d4 100644 --- a/man/tr/Makefile.in +++ b/man/tr/Makefile.in @@ -132,6 +132,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ USE_NLS = @USE_NLS@ +USE_NLS_FALSE = @USE_NLS_FALSE@ +USE_NLS_TRUE = @USE_NLS_TRUE@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XMLCATALOG = @XMLCATALOG@ diff --git a/man/useradd.8 b/man/useradd.8 index 066e3235..16b10f87 100644 --- a/man/useradd.8 +++ b/man/useradd.8 @@ -2,13 +2,13 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "USERADD" "8" "01/02/2006" "System Management Commands" "System Management Commands" +.TH "USERADD" "8" "01/22/2006" "System Management Commands" "System Management Commands" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" -useradd \- Create a new user or update default new user information +useradd \- create a new user or update default new user information .SH "SYNOPSIS" .HP 8 \fBuseradd\fR [\fIoptions\fR] \fILOGIN\fR @@ -39,7 +39,9 @@ dir is not specified. \fIBASE_DIR\fR is concatenated with the account name to define the home directory. If the \fB\-m\fR -option is not used, base_dir must exist. +option is not used, +\fIBASE_DIR\fR +must exist. .TP \fB\-d\fR, \fB\-\-home\fR \fIHOME_DIR\fR The new user will be created using @@ -48,7 +50,9 @@ as the value for the user's login directory. The default is to append the \fILOGIN\fR name to \fIBASE_DIR\fR -and use that as the login directory name. +and use that as the login directory name. The directory +\fIHOME_DIR\fR +does not have to exist but will not be created if it is missing. .TP \fB\-e\fR, \fB\-\-expiredate\fR \fIEXPIRE_DATE\fR The date on which the user account will be disabled. The date is specified in the format @@ -101,7 +105,7 @@ Note: doesn't work yet. .TP \fB\-o\fR, \fB\-\-non\-unique\fR -Allow create user account with duplicate (non\-unique) UID. +Allow the creation of a user account with a duplicate (non\-unique) UID. .TP \fB\-p\fR, \fB\-\-password\fR \fIPASSWORD\fR The encrypted password, as returned by diff --git a/man/useradd.8.xml b/man/useradd.8.xml index 1ba0b1d5..a53dbe57 100644 --- a/man/useradd.8.xml +++ b/man/useradd.8.xml @@ -2,7 +2,7 @@ - + useradd 8 @@ -10,7 +10,7 @@ useradd - Create a new user or update default new user information + create a new user or update default new user information @@ -73,8 +73,8 @@ The default base directory for the system if dir is not specified. BASE_DIR is concatenated with the account name to define the home directory. - If the option is not used, base_dir must - exist. + If the option is not used, + BASE_DIR must exist. @@ -90,7 +90,8 @@ login directory. The default is to append the LOGIN name to BASE_DIR and use that as the login - directory name. + directory name. The directory HOME_DIR + does not have to exist but will not be created if it is missing. @@ -208,7 +209,7 @@ , - Allow create user account with duplicate (non-unique) UID. + Allow the creation of a user account with a duplicate (non-unique) UID. diff --git a/man/zh_CN/Makefile.in b/man/zh_CN/Makefile.in index 505ce597..67a3dc33 100644 --- a/man/zh_CN/Makefile.in +++ b/man/zh_CN/Makefile.in @@ -132,6 +132,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ USE_NLS = @USE_NLS@ +USE_NLS_FALSE = @USE_NLS_FALSE@ +USE_NLS_TRUE = @USE_NLS_TRUE@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XMLCATALOG = @XMLCATALOG@ diff --git a/man/zh_TW/Makefile.in b/man/zh_TW/Makefile.in index e683e2cc..b77c01ee 100644 --- a/man/zh_TW/Makefile.in +++ b/man/zh_TW/Makefile.in @@ -132,6 +132,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ USE_NLS = @USE_NLS@ +USE_NLS_FALSE = @USE_NLS_FALSE@ +USE_NLS_TRUE = @USE_NLS_TRUE@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XMLCATALOG = @XMLCATALOG@ diff --git a/po/ChangeLog b/po/ChangeLog deleted file mode 100644 index dafc3804..00000000 --- a/po/ChangeLog +++ /dev/null @@ -1,5 +0,0 @@ -2005-05-04 gettextize - - * Makefile.in.in: Upgrade to gettext-0.14.3. - * Rules-quot: Upgrade to gettext-0.14.3. - diff --git a/po/LINGUAS b/po/LINGUAS index b6e3bccc..99650424 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -8,6 +8,7 @@ es eu fi fr +gl he id it diff --git a/po/POTFILES.in b/po/POTFILES.in index f729a1a3..1e4eade5 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -59,6 +59,7 @@ lib/shadowio.c lib/utent.c src/chage.c src/chfn.c +src/chgpasswd.c src/chpasswd.c src/chsh.c src/expiry.c diff --git a/po/bs.gmo b/po/bs.gmo index 636956dd..667b5248 100644 Binary files a/po/bs.gmo and b/po/bs.gmo differ diff --git a/po/bs.po b/po/bs.po index 8fb28882..980a5dcf 100644 --- a/po/bs.po +++ b/po/bs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: shadow\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" "PO-Revision-Date: 2004-05-09 12:03+0100\n" "Last-Translator: Safir Å ećerović \n" "Language-Team: Bosnian \n" @@ -222,7 +222,7 @@ msgid "never\n" msgstr "Nikad\n" #, c-format -msgid "password must be changed" +msgid "password must be changed\n" msgstr "" #, fuzzy, c-format @@ -420,7 +420,7 @@ msgstr "" #, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -430,11 +430,15 @@ msgid "" msgstr "" #, c-format -msgid "%s: can't lock password file\n" +msgid "%s: can't lock group file\n" msgstr "" #, c-format -msgid "%s: can't lock shadow file\n" +msgid "%s: can't open group file\n" +msgstr "" + +#, c-format +msgid "%s: can't lock gshadow file\n" msgstr "" #, c-format @@ -449,9 +453,9 @@ msgstr "" msgid "%s: line %d: missing new password\n" msgstr "" -#, c-format -msgid "%s: line %d: unknown user %s\n" -msgstr "" +#, fuzzy, c-format +msgid "%s: line %d: unknown group %s\n" +msgstr "nepoznata grupa: %s\n" #, c-format msgid "%s: line %d: cannot update password entry\n" @@ -469,6 +473,29 @@ msgstr "" msgid "%s: error updating password file\n" msgstr "" +#, 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 "" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "" @@ -827,14 +854,6 @@ msgstr "" msgid "%s: no changes\n" msgstr "" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "" @@ -901,6 +920,10 @@ msgstr "" msgid "**Never logged in**" msgstr "" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "" @@ -948,9 +971,19 @@ msgid "login: PAM Failure, aborting: %s\n" msgstr "" #, c-format -msgid "" -"\n" -"Login incorrect\n" +msgid "%s login: " +msgstr "" + +#, c-format +msgid "login: " +msgstr "" + +#, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "" + +#, c-format +msgid "login: abort requested by PAM\n" msgstr "" #, c-format @@ -1249,6 +1282,7 @@ msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" diff --git a/po/ca.gmo b/po/ca.gmo index 6be73204..adc217f5 100644 Binary files a/po/ca.gmo and b/po/ca.gmo differ diff --git a/po/ca.po b/po/ca.po index d280e9e4..4cfcafe2 100644 --- a/po/ca.po +++ b/po/ca.po @@ -1,12 +1,12 @@ # Shadow Catalan translation. -# Guillem Jover , 2004, 2005. +# Guillem Jover , 2004, 2005, 2006. # msgid "" msgstr "" "Project-Id-Version: shadow 4.0.14\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" -"PO-Revision-Date: 2005-12-25 02:29+0200\n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" +"PO-Revision-Date: 2006-02-21 20:37+0100\n" "Last-Translator: Guillem Jover \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" @@ -244,8 +244,8 @@ msgid "never\n" msgstr "mai\n" #, c-format -msgid "password must be changed" -msgstr "s'ha de canviar la contrasenya" +msgid "password must be changed\n" +msgstr "s'ha de canviar la contrasenya\n" #, c-format msgid "Password expires\t\t\t\t\t: " @@ -297,7 +297,7 @@ msgstr "%s: el fitxer de contrasenyes ombra no és present\n" #, c-format msgid "%s: can't lock shadow password file\n" -msgstr "%s: no es pot bloquejar el fitxer de contrasenyes ombra\n" +msgstr "%s: no es pot blocar el fitxer de contrasenyes ombra\n" #, c-format msgid "%s: can't open shadow password file\n" @@ -422,8 +422,7 @@ msgstr "No s'ha pogut canviar l'ID al de root.\n" #, 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" +msgstr "No s'ha pogut blocar el fitxer de contrasenyes; intenteu-ho més tard\n" #, c-format msgid "Cannot open the password file.\n" @@ -443,11 +442,11 @@ msgstr "No es poden confirmar els canvis del fitxer de contrasenyes.\n" #, c-format msgid "Cannot unlock the password file.\n" -msgstr "No s'ha pogut desbloquejar el fitxer de contrasenyes.\n" +msgstr "No s'ha pogut desblocar el fitxer de contrasenyes.\n" -#, c-format +#, fuzzy, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -464,12 +463,16 @@ msgstr "" "\t\t\tproveïdes no estan xifrades\n" #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: no es pot bloquejar el fitxer de contrasenyes\n" +msgid "%s: can't lock group file\n" +msgstr "%s: no es pot blocar el fitxer de grups\n" #, c-format -msgid "%s: can't lock shadow file\n" -msgstr "%s: no s'ha pogut bloquejar el fitxer de contrasenyes ombra\n" +msgid "%s: can't open group file\n" +msgstr "%s: no es pot obrir el fitxer de grups\n" + +#, fuzzy, c-format +msgid "%s: can't lock gshadow file\n" +msgstr "%s: no s'ha pogut blocar el fitxer de contrasenyes ombra\n" #, c-format msgid "%s: can't open shadow file\n" @@ -483,8 +486,8 @@ msgstr "%s: línia %d: la línia és massa llarga\n" msgid "%s: line %d: missing new password\n" msgstr "%s: línia %d: manca la nova contrasenya\n" -#, c-format -msgid "%s: line %d: unknown user %s\n" +#, fuzzy, c-format +msgid "%s: line %d: unknown group %s\n" msgstr "%s: línia %d: l'usuari %s és desconegut\n" #, c-format @@ -504,6 +507,36 @@ msgstr "" msgid "%s: error updating password file\n" msgstr "%s: s'ha produït un error en actualitzar el fitxer de contrasenyes\n" +#, 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 "" +"Forma d'ús: chpasswd [opcions]\n" +"\n" +"Opcions:\n" +" -e, --encrypted\tles contrasenyes proveïdes estan xifrades\n" +" -h, --help\t\tmostra aquest missatge d'ajuda i acaba\n" +" -m, --md5\t\tusa xifrat MD5 en comptes de DES quan les contrasenyes\n" +"\t\t\tproveïdes no estan xifrades\n" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: no es pot blocar el fitxer de contrasenyes\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s: no s'ha pogut blocar el fitxer de contrasenyes ombra\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s: línia %d: l'usuari %s és desconegut\n" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "Forma d'ús: %s [-s intèrpret] [nom]\n" @@ -555,7 +588,7 @@ msgstr "" "Opcions:\n" " -a, --all\t\t\tmostra els registres de faillog de tots els usuaris\n" " -h, --help\t\t\tmostra aquest missatge d'ajuda i acaba\n" -" -l, --lock-time SEG\t\tbloqueja durant SEG segons després d'una fallada\n" +" -l, --lock-time SEG\t\tbloca durant SEG segons després d'una fallada\n" "\t\t\t\td'accés\n" " -m, --maximum MÀX\t\tespecifica els comptadors màxims de fallades\n" "\t\t\t\td'accés a MÀX\n" @@ -575,7 +608,7 @@ msgstr " [falten %lds]" #, c-format msgid " [%lds lock]" -msgstr " [bloquejat %lds]" +msgstr " [blocat %lds]" #, c-format msgid "Unknown User: %s\n" @@ -676,7 +709,7 @@ msgstr "%s: no es pot reescriure el fitxer ombra\n" #, c-format msgid "%s: can't unlock file\n" -msgstr "%s: no es pot desbloquejar el fitxer\n" +msgstr "%s: no es pot desblocar el fitxer\n" #, c-format msgid "" @@ -733,7 +766,7 @@ msgstr "%s: no es pot reescriure el fitxer de grups ombra\n" #, c-format msgid "%s: unable to lock group file\n" -msgstr "%s: no es pot bloquejar el fitxer de grup\n" +msgstr "%s: no es pot blocar el fitxer de grup\n" #, c-format msgid "%s: unable to open group file\n" @@ -741,7 +774,7 @@ msgstr "%s: no es pot obrir el fitxer de grup\n" #, c-format msgid "%s: unable to lock shadow group file\n" -msgstr "%s: no es pot bloquejar el fitxer de grup ombra\n" +msgstr "%s: no es pot blocar el fitxer de grup ombra\n" #, c-format msgid "%s: unable to open shadow group file\n" @@ -821,7 +854,7 @@ msgstr "%s: «-s» i «-r» són incompatibles\n" #, c-format msgid "%s: cannot lock file %s\n" -msgstr "%s: no es pot bloquejar el fitxer %s\n" +msgstr "%s: no es pot blocar el fitxer %s\n" #, c-format msgid "%s: cannot open file %s\n" @@ -887,17 +920,9 @@ msgstr "%s: el fitxer s'ha actualitzat\n" msgid "%s: no changes\n" msgstr "%s: no hi ha canvis\n" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "%s: no es pot bloquejar el fitxer de grups\n" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "%s: no es pot obrir el fitxer de grups\n" - #, c-format msgid "%s: can't lock shadow group file\n" -msgstr "%s: no es pot bloquejar el fitxer de grups ombra\n" +msgstr "%s: no es pot blocar el fitxer de grups ombra\n" #, c-format msgid "%s: can't open shadow group file\n" @@ -971,6 +996,10 @@ msgstr "Usuari Port Últim\n" msgid "**Never logged in**" msgstr "**No ha entrat mai**" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Forma d'ús: %s [-p] [nom]\n" @@ -1024,12 +1053,20 @@ msgid "login: PAM Failure, aborting: %s\n" msgstr "login: fallada de PAM, s'està avortant: %s\n" #, c-format -msgid "" -"\n" -"Login incorrect\n" -msgstr "" -"\n" -"Accés incorrecte\n" +msgid "%s login: " +msgstr "%s accés: " + +#, c-format +msgid "login: " +msgstr "accés: " + +#, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "S'ha excedit el nombre màxim d'intents (%d)\n" + +#, c-format +msgid "login: abort requested by PAM\n" +msgstr "accés: avortat a petició del PAM\n" #, c-format msgid "" @@ -1097,11 +1134,11 @@ msgstr "Forma d'ús: %s [entrada]\n" #, c-format msgid "%s: can't lock /etc/passwd.\n" -msgstr "%s: no es pot bloquejar «/etc/passwd».\n" +msgstr "%s: no es pot blocar «/etc/passwd».\n" #, 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" +msgstr "%s: no es poden blocar els fitxers, intenteu-ho més tard\n" #, c-format msgid "%s: can't open files\n" @@ -1166,27 +1203,27 @@ msgid "" " -x, --maxdays MAX_DAYS\tset maximim number of days before password\n" "\t\t\t\tchange to MAX_DAYS\n" msgstr "" -"Forma d'ús: passwd [opcions] [accés]\n" +"Forma d'ús: passwd [opcions] [usuari]\n" "\n" "Opcions:\n" " -a, --all\t\t\tinforma de l'estat de la contrasenya per a tots els\n" "\t\t\t\tcomptes\n" " -d, --delete\t\t\tesborra la contrasenya per al compte anomenat\n" -" -e, --expire\t\t\tforça la caducació de la contrasenya per al compte\n" +" -e, --expire\t\t\tforça la caducitat de la contrasenya per al compte\n" "\t\t\t\tanomenat\n" " -h, --help\t\t\tmostra aquest missatge d'ajuda i acaba\n" " -k, --keep-tokens\t\tcanvia la contrasenya només si ha caducat\n" " -i, --inactive INACTIU\testableix la contrasenya a inactiva després\n" -"\t\t\t\td'INACTIU dies de caducació\n" -" -l, --lock\t\t\tbloqueja el compte anomenat\n" +"\t\t\t\td'INACTIU dies de caducitat\n" +" -l, --lock\t\t\tbloca el compte anomenat\n" " -n, --mindays DIES_MÍN\testableix els dies mínims abans del canvi de\n" "\t\t\t\tcontrasenya a DIES_MÍN\n" " -q, --quiet\t\t\tmode silenciós\n" " -r, --repository REPOSITORI\tcanvia contrasenya en el REPOSITORI\n" " -S, --status\t\t\tinforma de l'estat de la contrasenya per al compte\n" "\t\t\t\tanomenat\n" -" -u, --unlock\t\t\tdesbloqueja el compte anomenat\n" -" -w, --warndays DIES_AVÍS\testableix els dies d'avís de caducació\n" +" -u, --unlock\t\t\tdesbloca el compte anomenat\n" +" -w, --warndays DIES_AVÍS\testableix els dies d'avís de caducitat\n" "\t\t\t\ta DIES_AVÍS\n" " -x, --maxdays DIES_MÀX\testableix els dies màxims abans del canvi de\n" "\t\t\t\tcontrasenya a DIES_MÀX\n" @@ -1304,7 +1341,7 @@ msgstr "usuari %s: l'últim canvi de contrasenya s'ha produït en el futur\n" #, c-format msgid "%s: can't lock passwd file\n" -msgstr "%s: no es pot bloquejar el fitxer de contrasenyes\n" +msgstr "%s: no es pot blocar el fitxer de contrasenyes\n" #, c-format msgid "%s: can't open passwd file\n" @@ -1344,8 +1381,7 @@ msgstr "S'ha evitat l'autenticació de contrasenya.\n" #, c-format msgid "Please enter your OWN password as authentication.\n" -msgstr "" -"Si us plau introduïu la vostra PRÒPIA contrasenya com a autenticació.\n" +msgstr "Si us plau introduïu la VOSTRA contrasenya com a autenticació.\n" msgid "Sorry." msgstr "Disculpeu." @@ -1359,6 +1395,7 @@ msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" @@ -1366,14 +1403,15 @@ msgid "" "\t\t\t\tthe same shell\n" " -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n" msgstr "" -"Forma d'ús: su [opcions] [accés]\n" +"Forma d'ús: su [opcions] [usuari]\n" "\n" "Opcions:\n" +" -c, --command ORDRE\t\tpassa l'ORDRE a l'intèrpret d'ordres invocat\n" " -h, --help\t\t\tmostra aquest missatge d'ajuda i acaba\n" -" -, -l, --login\t\tfa de l'interpret d'ordres un d'accés\n" +" -, -l, --login\t\tfes de l'intèrpret d'ordres un d'accés\n" " -m, -p,\n" -" --preserve-environment\tno reinicialitza les variables d'entorn, i\n" -"\t\t\t\tmanté el mateix interpret d'ordres\n" +" --preserve-environment\tno reinicialitzis les variables d'entorn, i\n" +"\t\t\t\tmantín el mateix intèrpret d'ordres\n" " -s, --shell INTÈRPRET\tfa servir INTÈRPRET en comptes del predeterminat\n" "\t\t\t\ta passwd\n" @@ -1406,7 +1444,7 @@ msgstr "" #, c-format msgid "No shell\n" -msgstr "No hi ha intèrpret\n" +msgstr "No hi ha intèrpret d'ordres\n" #, c-format msgid "No password file\n" @@ -1489,7 +1527,7 @@ msgid "" " -s, --shell SHELL\t\tthe login shell for the new user account\n" " -u, --uid UID\t\t\tforce use the UID for the new user account\n" msgstr "" -"Forma d'ús: useradd [opcions] ACCÉS\n" +"Forma d'ús: useradd [opcions] USUARI\n" "\n" "Opcions:\n" " -b, --base-dir DIR_BASE\tdirectori base per al directori home del\n" @@ -1499,10 +1537,10 @@ msgstr "" " -d, --home-dir DIR_HOME\tdirectori home per al nou compte d'usuari\n" " -D, --defaults\t\tmostra o guarda les modificacions a les\n" "\t\t\t\tconfiguracions predeterminades de useradd\n" -" -e, --expiredate DATA_CADUCA\testableix la data de caducació del\n" -"\t\t\t\tcompte a DATA_CADUCA\n" +" -e, --expiredate DATA_CADUCIT\testableix la data de caducitat del\n" +"\t\t\t\tcompte a DATA_CADUCITAT\n" " -f, --inactive INACTIU\testableix la contrasenya a inactiva després\n" -"\t\t\t\td'INACTIU dies de caducació\n" +"\t\t\t\td'INACTIU dies de caducitat\n" " -g, --gid GRUP\t\tforça l'ús del GRUP per al nou compte creat\n" " -G, --groups GRUPS\t\tllista de grups suplementaris per al nou\n" "\t\t\t\tcompte d'usuari\n" @@ -1573,7 +1611,7 @@ msgstr "%s: no es pot reescriure el fitxer de contrasenyes ombra\n" #, c-format msgid "%s: unable to lock password file\n" -msgstr "%s: no es pot bloquejar el fitxer de contrasenyes\n" +msgstr "%s: no es pot blocar el fitxer de contrasenyes\n" #, c-format msgid "%s: unable to open password file\n" @@ -1581,7 +1619,7 @@ msgstr "%s: no es pot d'obrir el fitxer de contrasenyes\n" #, c-format msgid "%s: cannot lock shadow password file\n" -msgstr "%s: no es pot bloquejar el fitxer de contrasenyes ombra\n" +msgstr "%s: no es pot blocar el fitxer de contrasenyes ombra\n" #, c-format msgid "%s: cannot open shadow password file\n" @@ -1589,7 +1627,7 @@ msgstr "%s: no es pot obrir el fitxer de contrasenyes ombra\n" #, c-format msgid "%s: error locking group file\n" -msgstr "%s: s'ha produït un error en bloquejar el fitxer de grups\n" +msgstr "%s: s'ha produït un error en blocar el fitxer de grups\n" #, c-format msgid "%s: error opening group file\n" @@ -1597,7 +1635,7 @@ msgstr "%s: s'ha produït un error en obrir el fitxer de grups\n" #, 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" +msgstr "%s: s'ha produït un error en blocar el fitxer de grups ombra\n" #, c-format msgid "%s: error opening shadow group file\n" @@ -1732,29 +1770,29 @@ msgid "" " -u, --uid UID\t\t\tnew UID for the user account\n" " -U, --unlock\t\t\tunlock the user account\n" msgstr "" -"Forma d'ús: usermod [opcions] accés\n" +"Forma d'ús: usermod [opcions] usuari\n" "\n" "Opcions:\n" " -a, --append GRUP\t\tafegeix l'usuari al GRUP donat\n" " -c, --comment COMENTARI\t\tnou valor per al camp GECOS\n" " -d, --home DIR_HOME\t\tnou directori d'accés per al nou compte d'usuari\n" -" -e, --expiredate DATA_CADUCA\testableix la data de caducació del compte\n" -"\t\t\t\ta DATA_CADUCA\n" +" -e, --expiredate DATA_CADUCIT\testableix la data de caducitat del compte\n" +"\t\t\t\ta DATA_CADUCITAT\n" " -f, --inactive INACTIU\testableix la contrasenya a inactiva després\n" -"\t\t\t\td'INACTIU dies de caducació\n" +"\t\t\t\td'INACTIU dies de caducitat\n" " -g, --gid GRUP\t\tforça l'ús de GRUP com a nou grup inicial d'accés\n" " -G, --groups GRUPS\t\tllista de GRUPS suplementaris\n" -" -h, --help\t\t\tmostra aquest missatge d'ajuda i acaba\n" +" -h, --help\t\t\tmostra aquest missatge d'ajuda i surt\n" " -l, --login ACCÉS\t\tnou valor per al nom d'accés\n" -" -L, --lock\t\t\tbloqueja el compte d'usuari\n" +" -L, --lock\t\t\tbloca el compte d'usuari\n" " -m, --move-home\t\tmou els continguts del directori home a la nova\n" -"\t\t\t\tlocalització (feu-ho servir només amb -d)\n" +"\t\t\t\tubicació (feu-ho servir només amb -d)\n" " -o, --non-unique\t\tpermet usar UID duplicats (no únics)\n" " -p, --password CONTRASENYA\tusa contrasenya xifrada per a la nova\n" "\t\t\t\tcontrasenya\n" -" -s, --shell INTÈRPRET\tnou intèrpret d'accés per al compte d'usuari\n" +" -s, --shell INTÈRPRET\t\tnou intèrpret d'accés per al compte d'usuari\n" " -u, --uid UID\t\t\tnou UID per al compte d'usuari\n" -" -U, --unlock\t\t\tdesbloqueja el compte d'usuari\n" +" -U, --unlock\t\t\tdesbloca el compte d'usuari\n" #, c-format msgid "%s: out of memory in update_group\n" @@ -1840,7 +1878,7 @@ msgstr "" " -g, --group\t\t\tedita la base de dades de grup\n" " -h, --help\t\t\tmostra aquest missatge d'ajuda i acaba\n" " -p, --passwd\t\t\tedita la base de dades de passwd\n" -" -q, --quiet\t\t\tmodes silenciós\n" +" -q, --quiet\t\t\tmode silenciós\n" " -s, --shadow\t\t\tedita la base de dades de shadow o gshadow\n" #, c-format @@ -1852,7 +1890,7 @@ msgstr "" "%s: no s'ha canviat %s\n" msgid "Couldn't lock file" -msgstr "No s'ha pogut bloquejar el fitxer" +msgstr "No s'ha pogut blocar el fitxer" msgid "Couldn't make backup" msgstr "No s'ha pogut fer una còpia de seguretat" diff --git a/po/cs.gmo b/po/cs.gmo index b322cf66..4c92fab2 100644 Binary files a/po/cs.gmo and b/po/cs.gmo differ diff --git a/po/cs.po b/po/cs.po index 3c5c3565..1e325fb3 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,13 +1,13 @@ # Czech translation of shadow-utils. # Jiří Pavlovský , 1999-2000 -# Miroslav Kuře , 2004-2005 +# Miroslav Kuře , 2004-2006 # msgid "" msgstr "" -"Project-Id-Version: shadow 4.0.14\n" +"Project-Id-Version: shadow 4.0.15\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" -"PO-Revision-Date: 2005-12-14 17:23+0100\n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" +"PO-Revision-Date: 2006-03-07 20:50+0100\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" @@ -245,8 +245,8 @@ msgid "never\n" msgstr "nikdy\n" #, c-format -msgid "password must be changed" -msgstr "heslo musí být změněno" +msgid "password must be changed\n" +msgstr "heslo musí být změněno\n" #, c-format msgid "Password expires\t\t\t\t\t: " @@ -447,7 +447,7 @@ msgstr "Soubor s hesly nelze odemknout.\n" #, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -455,7 +455,7 @@ 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" +"Použití: chgpasswd [volby]\n" "\n" "Volby:\n" " -e, --encrypted\tzadaná hesla jsou zaÅ¡ifrovaná\n" @@ -464,12 +464,16 @@ msgstr "" "\t\t\tpoužije místo DES algoritmus MD5\n" #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: soubor s hesly nelze zamknout\n" +msgid "%s: can't lock group file\n" +msgstr "%s: soubor se skupinami nelze zamknout\n" #, c-format -msgid "%s: can't lock shadow file\n" -msgstr "%s: soubor se stínovými hesly nelze zamknout\n" +msgid "%s: can't open group file\n" +msgstr "%s: soubor se skupinami nelze otevřít\n" + +#, c-format +msgid "%s: can't lock gshadow file\n" +msgstr "%s: soubor stínových skupin nelze zamknout\n" #, c-format msgid "%s: can't open shadow file\n" @@ -484,8 +488,8 @@ msgid "%s: line %d: missing new password\n" msgstr "%s: řádek %d: chybí nové heslo\n" #, c-format -msgid "%s: line %d: unknown user %s\n" -msgstr "%s: řádek %d: neznámý uživatel %s\n" +msgid "%s: line %d: unknown group %s\n" +msgstr "%s: řádek %d: neznámá skupina %s\n" #, c-format msgid "%s: line %d: cannot update password entry\n" @@ -503,6 +507,36 @@ msgstr "%s: chyba při aktualizaci souboru se stínovými hesly\n" msgid "%s: error updating password file\n" msgstr "%s: chyba při aktualizaci souboru s hesly\n" +#, 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 "" +"Použití: chpasswd [volby]\n" +"\n" +"Volby:\n" +" -e, --encrypted\tzadaná hesla jsou zaÅ¡ifrovaná\n" +" -h, --help\t\tzobrazí tuto nápovědu a skončí\n" +" -m, --md5\t\tpokud zadaná hesla nejsou zaÅ¡ifrovaná,\n" +"\t\t\tpoužije místo DES algoritmus MD5\n" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: soubor s hesly nelze zamknout\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s: soubor se stínovými hesly nelze zamknout\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s: řádek %d: neznámý uživatel %s\n" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "Použití: %s [-s shell] [jméno]\n" @@ -884,14 +918,6 @@ msgstr "%s: soubory byly aktualizovány\n" msgid "%s: no changes\n" msgstr "%s: žádné změny nebyly provedeny\n" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "%s: soubor se skupinami nelze zamknout\n" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "%s: soubor se skupinami nelze otevřít\n" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "%s: soubor se stínovými skupinami nelze zamknout\n" @@ -965,6 +991,10 @@ msgstr "Uživatel Port Naposledy\n" msgid "**Never logged in**" msgstr "**Nikdy nebyl přihlášen**" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "lastlog: neočekávaný argument: %s\n" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Použití: %s [-p] [jméno]\n" @@ -1018,12 +1048,20 @@ msgid "login: PAM Failure, aborting: %s\n" msgstr "login: Chyba PAM, končím: %s\n" #, c-format -msgid "" -"\n" -"Login incorrect\n" -msgstr "" -"\n" -"Chybné přihlášení\n" +msgid "%s login: " +msgstr "PřihlaÅ¡ovací jméno na %s: " + +#, c-format +msgid "login: " +msgstr "PřihlaÅ¡ovací jméno: " + +#, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "Maximální počet pokusů vyprÅ¡el (%d)\n" + +#, c-format +msgid "login: abort requested by PAM\n" +msgstr "login: PAM vyžádal přeruÅ¡ení\n" #, c-format msgid "" @@ -1349,6 +1387,7 @@ msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" @@ -1359,6 +1398,7 @@ msgstr "" "Použití: su [volby] [účet]\n" "\n" "Volby:\n" +" -c, --command PŘÍKAZ\t\tvyvolanému shellu předá PŘÍKAZ\n" " -h, --help\t\t\tzobrazí tuto nápovědu a skončí\n" " -, -l, --login\t\tnastaví shell jako přihlaÅ¡ovací\n" " -m, -p,\n" diff --git a/po/da.gmo b/po/da.gmo index 122ac06c..88f6e5ff 100644 Binary files a/po/da.gmo and b/po/da.gmo differ diff --git a/po/da.po b/po/da.po index 39fa370d..5c27eb8c 100644 --- a/po/da.po +++ b/po/da.po @@ -1,20 +1,21 @@ # translation of shadow-da2.po to Danish # translation of shadow-da.po to Danish -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -# Claus Hindsgaul , 2004, 2005. +# Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. # +# Claus Hindsgaul , 2004, 2005. +# Claus Hindsgaul , 2006. msgid "" msgstr "" -"Project-Id-Version: shadow 4.0.14\n" +"Project-Id-Version: shadow 4.0.15\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" -"PO-Revision-Date: 2005-12-14 09:43+0100\n" -"Last-Translator: Claus Hindsgaul \n" -"Language-Team: Danish \n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" +"PO-Revision-Date: 2006-03-07 22:36+0100\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.10.2\n" +"X-Generator: KBabel 1.11.2\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #, c-format @@ -242,8 +243,8 @@ msgid "never\n" msgstr "aldrig\n" #, c-format -msgid "password must be changed" -msgstr "adgangskoden skal ændres" +msgid "password must be changed\n" +msgstr "adgangskoden skal ændres\n" #, c-format msgid "Password expires\t\t\t\t\t: " @@ -443,7 +444,7 @@ msgstr "Kan ikke lÃ¥se adgangskodefilen op.\n" #, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -451,7 +452,7 @@ msgid "" " -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n" "\t\t\tpasswords are not encrypted\n" msgstr "" -"Brug: chpasswd [tilvalg]\n" +"Brug: chgpasswd [tilvalg]\n" "\n" "Tilvalg:\n" " -e, --encrypted\tde angivne adgangskoder er krypterede\n" @@ -460,12 +461,16 @@ msgstr "" "\t\t\tadgangskoder ikke er krypterede\n" #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: kan ikke lÃ¥se adgangskodefil\n" +msgid "%s: can't lock group file\n" +msgstr "%s: kan ikke lÃ¥se gruppefilen\n" #, c-format -msgid "%s: can't lock shadow file\n" -msgstr "%s: Kan ikke lÃ¥se skyggefilen\n" +msgid "%s: can't open group file\n" +msgstr "%s: kan ikke Ã¥bne gruppefilen\n" + +#, c-format +msgid "%s: can't lock gshadow file\n" +msgstr "%s: Kan ikke lÃ¥se gshadow-filen\n" #, c-format msgid "%s: can't open shadow file\n" @@ -480,8 +485,8 @@ msgid "%s: line %d: missing new password\n" msgstr "%s: linje %d: mangler ny adgangskode\n" #, c-format -msgid "%s: line %d: unknown user %s\n" -msgstr "%s: linje %d: ukendt bruger %s\n" +msgid "%s: line %d: unknown group %s\n" +msgstr "%s: linje %d: ukendt gruppe %s\n" #, c-format msgid "%s: line %d: cannot update password entry\n" @@ -499,6 +504,36 @@ msgstr "%s: fejl under opdatering af skyggefil\n" msgid "%s: error updating password file\n" msgstr "%s: fejl under opdatering af adgangskodefil\n" +#, 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 "" +"Brug: chpasswd [tilvalg]\n" +"\n" +"Tilvalg:\n" +" -e, --encrypted\tde angivne adgangskoder er krypterede\n" +" -h, --help\t\tvis denne hjælpetekst og afslut\n" +" -m, --md5\t\tbrug MD5-kryptering i stedet for DES, nÃ¥r de angivne\n" +"\t\t\tadgangskoder ikke er krypterede\n" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: kan ikke lÃ¥se adgangskodefil\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s: Kan ikke lÃ¥se skyggefilen\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s: linje %d: ukendt bruger %s\n" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "Brug: %s [-s skal] [navn]\n" @@ -880,14 +915,6 @@ msgstr "%s: filerne er blevet opdateret\n" msgid "%s: no changes\n" msgstr "%s: ingen ændringer\n" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "%s: kan ikke lÃ¥se gruppefilen\n" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "%s: kan ikke Ã¥bne gruppefilen\n" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "%s: kan ikke lÃ¥se skyggegruppefilen\n" @@ -962,6 +989,10 @@ msgstr "Brugernavn Port Seneste\n" msgid "**Never logged in**" msgstr "**Har aldrig logget pÃ¥**" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "lastlog: uventet argument: %s\n" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Brug: %s [-p] [navn]\n" @@ -1015,12 +1046,20 @@ msgid "login: PAM Failure, aborting: %s\n" msgstr "login: PAM-fejl, afbryder: %s\n" #, c-format -msgid "" -"\n" -"Login incorrect\n" -msgstr "" -"\n" -"Forkert logind\n" +msgid "%s login: " +msgstr "%s logind: " + +#, c-format +msgid "login: " +msgstr "logind: " + +#, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "Maksimalt antal forsøg nÃ¥et (%d)\n" + +#, c-format +msgid "login: abort requested by PAM\n" +msgstr "logind: PAM har anmodet om afbrydelse\n" #, c-format msgid "" @@ -1345,6 +1384,7 @@ msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" @@ -1355,6 +1395,7 @@ msgstr "" "Brug: su [tilvalg] [logind]\n" "\n" "Tilvalg:\n" +" -c, --command KOMMANDO\t\tvideregiv KOMMANDO til den startede skal\n" " -h, --help\t\t\tvis denne hjælpebesked og afslut\n" " -, -l, --login\t\tgør skallen til en logind-skal\n" " -m, -p,\n" @@ -1835,3 +1876,10 @@ msgstr "kunne ikke lave sikkerhedskopi" #, 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" + +#~ msgid "" +#~ "\n" +#~ "Login incorrect\n" +#~ msgstr "" +#~ "\n" +#~ "Forkert logind\n" diff --git a/po/de.gmo b/po/de.gmo index bde6f514..c2d43805 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index 36ee36fe..467fbc09 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: shadow 4.0.12\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" "PO-Revision-Date: 2002-03-11 12:02-0100\n" "Last-Translator: Frank Schmid \n" "Language-Team: Frank Schmid \n" @@ -241,8 +241,8 @@ msgstr "Letzte Kennwortänderung\t\t\t\t\t: " msgid "never\n" msgstr "Nie\n" -#, fuzzy, c-format -msgid "password must be changed" +#, c-format +msgid "password must be changed\n" msgstr "Kennwort geändert.\n" #, c-format @@ -441,9 +441,9 @@ msgstr "Kann Änderungen in der Kennwortdatei nicht schreiben.\n" msgid "Cannot unlock the password file.\n" msgstr "Kann die Kennwortdatei nicht entsperren.\n" -#, c-format +#, fuzzy, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -460,11 +460,15 @@ msgstr "" "\t\t\tdie angegebenen Kennwörter nicht verschlüsselt sind\n" #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: kann Kennwortdatei nicht sperren\n" +msgid "%s: can't lock group file\n" +msgstr "%s: Kann Gruppendatei nicht sperren\n" #, c-format -msgid "%s: can't lock shadow file\n" +msgid "%s: can't open group file\n" +msgstr "%s: Kann Gruppendatei nicht öffnen\n" + +#, fuzzy, c-format +msgid "%s: can't lock gshadow file\n" msgstr "%s: Kann die Shadow-Datei nicht sperren\n" #, c-format @@ -479,8 +483,8 @@ msgstr "%s: Zeile %d: Zeile zu lang\n" msgid "%s: line %d: missing new password\n" msgstr "%s: Zeile %d: Neues Kennwort fehlt\n" -#, c-format -msgid "%s: line %d: unknown user %s\n" +#, fuzzy, c-format +msgid "%s: line %d: unknown group %s\n" msgstr "%s: Zeile %d: Benutzer %s unbekannt\n" #, c-format @@ -499,6 +503,36 @@ msgstr "%s: Fehler beim aktualisieren der Shadow-Datei\n" msgid "%s: error updating password file\n" msgstr "%s: Fehler beim Aktualisieren der Kennwortdatei\n" +#, 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 "" +"Syntax: chpasswd [Optionen]\n" +"\n" +"Optionen:\n" +" -e, --encrypted\tAngegebene Kennwörter sind verschlüsselt\n" +" -h, --help\t\tZeigt diese Hilfe, sonst nichts\n" +" -m, --md5\t\tMD5-Verschlüsselung statt DES verwenden, wen\n" +"\t\t\tdie angegebenen Kennwörter nicht verschlüsselt sind\n" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: kann Kennwortdatei nicht sperren\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s: Kann die Shadow-Datei nicht sperren\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s: Zeile %d: Benutzer %s unbekannt\n" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "Syntax: %s [-s shell] [Name]\n" @@ -877,14 +911,6 @@ msgstr "%s: Die Dateien wurden aktualisiert\n" msgid "%s: no changes\n" msgstr "%s: keine Änderungen\n" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "%s: Kann Gruppendatei nicht sperren\n" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "%s: Kann Gruppendatei nicht öffnen\n" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "%s: Kann Shadow-Gruppendatei nicht sperren\n" @@ -957,6 +983,10 @@ msgstr "Benutzer Port Letzter\n" msgid "**Never logged in**" msgstr "**Nie angemeldet **" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Syntax: %s [-p] [Name]\n" @@ -1010,10 +1040,24 @@ msgid "login: PAM Failure, aborting: %s\n" msgstr "" #, fuzzy, c-format -msgid "" +msgid "%s login: " +msgstr "" "\n" -"Login incorrect\n" -msgstr "Login fehlerhaft" +"%s login: " + +#, fuzzy, c-format +msgid "login: " +msgstr "" +"\n" +"%s login: " + +#, fuzzy, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "Maximale Anzahl der Tage zwischen Kennwortänderungen\t: %ld\n" + +#, c-format +msgid "login: abort requested by PAM\n" +msgstr "" #, c-format msgid "" @@ -1317,6 +1361,7 @@ msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" @@ -1797,6 +1842,12 @@ msgstr "" "%s: Wiederherstellung von %s fehlgeschlagen: %s\n" "(Ihre Änderungen befinden sich in %s)\n" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "Login incorrect\n" +#~ msgstr "Login fehlerhaft" + #, fuzzy #~ msgid "" #~ "Usage:\n" diff --git a/po/el.gmo b/po/el.gmo index ce6dcb62..2ad0c890 100644 Binary files a/po/el.gmo and b/po/el.gmo differ diff --git a/po/el.po b/po/el.po index 03c28649..030ede74 100644 --- a/po/el.po +++ b/po/el.po @@ -4,14 +4,15 @@ # Thanks to Simos Xenitelis (S.Xenitellis@rhbnc.ac.uk) for his # comments about making this translation better. # Kostas Papadimas , 2005. +# Konstantinos Margaritis , 2006. msgid "" msgstr "" -"Project-Id-Version: shadow 4.0.14\n" +"Project-Id-Version: shadow_po_el\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" -"PO-Revision-Date: 2005-12-20 11:00+0200\n" -"Last-Translator: Kostas Papadimas \n" -"Language-Team: Greek \n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" +"PO-Revision-Date: 2006-01-18 16:16+0200\n" +"Last-Translator: Konstantinos Margaritis \n" +"Language-Team: Greek \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -250,8 +251,8 @@ msgid "never\n" msgstr "Ποτέ\n" #, c-format -msgid "password must be changed" -msgstr "το συνθηματικό πρέπει να αλλαχθεί" +msgid "password must be changed\n" +msgstr "το συνθηματικό πρέπει να αλλαχθεί\n" #, c-format msgid "Password expires\t\t\t\t\t: " @@ -450,9 +451,9 @@ msgstr "Αδυναμία εισαγωγής των αλλαγών στο αρχ msgid "Cannot unlock the password file.\n" msgstr "Αδυναμία ξεκλειδώματος του αρχείου συνθηματικών\n" -#, c-format +#, fuzzy, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -470,11 +471,15 @@ msgstr "" "\t\t\tδεν είναι κρυπτογραφημένα\n" #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: αδυναμία κλειδώματος του αρχείου συνθηματικών\n" +msgid "%s: can't lock group file\n" +msgstr "%s: αδυναμία κλειδώματος του αρχείου ομάδων\n" #, c-format -msgid "%s: can't lock shadow file\n" +msgid "%s: can't open group file\n" +msgstr "%s: αδυναμία ανοίγματος του αρχείου ομάδων\n" + +#, fuzzy, c-format +msgid "%s: can't lock gshadow file\n" msgstr "%s: αδυναμία κλειδώματος του αρχείου σκιωδών συνθηματικών\n" #, c-format @@ -489,8 +494,8 @@ msgstr "%s: γραμμή %d: πολύ μεγάλη γραμμή\n" msgid "%s: line %d: missing new password\n" msgstr "%s: γραμμή %d: έλλειψη νέου συνθηματικού\n" -#, c-format -msgid "%s: line %d: unknown user %s\n" +#, fuzzy, c-format +msgid "%s: line %d: unknown group %s\n" msgstr "%s: γραμμή %d: άγνωστος χρήστης %s\n" #, c-format @@ -510,6 +515,37 @@ msgstr "" msgid "%s: error updating password file\n" msgstr "%s: Σφάλμα κατά την ανανέωση καταχωρήσεων στο αρχείο συνθηματικών\n" +#, 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 "" +"Χρήση: chpasswd [options]\n" +"\n" +"Επιλογές:\n" +" -e, --encrypted\tτα παρεχόμενα συνθηματικά είναι κρυπτογραφημένα\n" +" -h, --help\t\tπροβολή αυτού του μηνύματος βοήθειας και έξοδος\n" +" -m, --md5\t\tχρήση κρυπτογράφησης MD5 αντί για DES όταν τα παρεχόμενα " +"συνθηματικά\n" +"\t\t\tδεν είναι κρυπτογραφημένα\n" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: αδυναμία κλειδώματος του αρχείου συνθηματικών\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s: αδυναμία κλειδώματος του αρχείου σκιωδών συνθηματικών\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s: γραμμή %d: άγνωστος χρήστης %s\n" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "Χρήση: %s [-s φλοιός] [όνομα]\n" @@ -898,14 +934,6 @@ msgstr "%s: τα αρχεία ανανεώθηκαν\n" msgid "%s: no changes\n" msgstr "%s: καμιά αλλαγή\n" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "%s: αδυναμία κλειδώματος του αρχείου ομάδων\n" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "%s: αδυναμία ανοίγματος του αρχείου ομάδων\n" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "%s: αδυναμία κλειδώματος του αρχείου σκιωδών συνθηματικών ομάδων\n" @@ -987,6 +1015,10 @@ msgstr "Όνομα_Χρήστη Θύρα Τελευταία\n" msgid "**Never logged in**" msgstr "**Καμιά είσοδος στο σύστημα**" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Χρήση: %s [-p] [όνομα]\n" @@ -1040,12 +1072,20 @@ msgid "login: PAM Failure, aborting: %s\n" msgstr "login: αποτυχία PAM, εγκατάλειψη: %s\n" #, c-format -msgid "" -"\n" -"Login incorrect\n" +msgid "%s login: " +msgstr "%s login: " + +#, c-format +msgid "login: " +msgstr "login: " + +#, fuzzy, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "Μέγιστος αριθμός ημερών μεταξύ των αλλαγών συνθηματικού\t\t: %ld\n" + +#, c-format +msgid "login: abort requested by PAM\n" msgstr "" -"\n" -"Εσφαλμένη προσπάθεια εισόδου\n" #, c-format msgid "" @@ -1379,6 +1419,7 @@ msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" @@ -1389,6 +1430,7 @@ msgstr "" "Χρήση: su [options] [login]\n" "\n" "Επιλογές:\n" +" -c, --command ΕΝΤΟΛΗ\t\tεκτέλεση της ΕΝΤΟΛΗΣ στο καλούμενο κέλυφος\n" " -h, --help\t\t\tπροβολή αυτού του μηνύματος βοήθειας και έξοδος\n" " -, -l, --login\t\tκάνει το κέλυφος ένα κέλυφος εισόδου\n" " -m, -p,\n" @@ -1895,3 +1937,10 @@ msgstr "Αδυναμία δημιουργίας αντιγράφου ασφαλ #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s: αδυναμία επαναφοράς %s: %s (οι αλλαγές είναι στο %s)\n" + +#~ msgid "" +#~ "\n" +#~ "Login incorrect\n" +#~ msgstr "" +#~ "\n" +#~ "Εσφαλμένη προσπάθεια εισόδου\n" diff --git a/po/es.gmo b/po/es.gmo index b29a9506..04483581 100644 Binary files a/po/es.gmo and b/po/es.gmo differ diff --git a/po/es.po b/po/es.po index b81882e6..ddaba306 100644 --- a/po/es.po +++ b/po/es.po @@ -4,10 +4,10 @@ # Reviewed by Ricardo Mones , 2004. msgid "" msgstr "" -"Project-Id-Version: shadow 4.0.13\n" +"Project-Id-Version: shadow 4.0.15\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" -"PO-Revision-Date: 2005-09-26 21:42+0200\n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" +"PO-Revision-Date: 2006-03-08 10:38+0100\n" "Last-Translator: Rubén Porras Campo \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" @@ -161,7 +161,6 @@ 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" -#, fuzzy msgid "No utmp entry. You must exec \"login\" from the lowest level \"sh\"" msgstr "Sin entrada utmp. Debe ejecutar «login» desde el nivel «sh» más bajo" @@ -243,9 +242,9 @@ msgstr "Último cambio de contraseña\t\t\t\t\t:" msgid "never\n" msgstr "nunca\n" -#, fuzzy, c-format -msgid "password must be changed" -msgstr "Contraseña cambiada.\n" +#, c-format +msgid "password must be changed\n" +msgstr "Contraseña cambiada\n" #, c-format msgid "Password expires\t\t\t\t\t: " @@ -446,7 +445,7 @@ msgstr "No se puede desbloquear el fichero de contraseñas.\n" #, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -454,7 +453,7 @@ msgid "" " -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n" "\t\t\tpasswords are not encrypted\n" msgstr "" -"Modo de uso: chpasswd [opciones]\n" +"Modo de uso: chgpasswd [opciones]\n" "\n" "Opciones:\n" " -e, --encrypted\tlas contraseñas proporcionadas están cifradas\n" @@ -463,12 +462,16 @@ msgstr "" " contraseñas proporcionadas no estén cifradas\n" #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: no puedo bloquear el fichero de contraseñas\n" +msgid "%s: can't lock group file\n" +msgstr "%s: no se puede bloquear el fichero de grupos\n" #, c-format -msgid "%s: can't lock shadow file\n" -msgstr "%s: no se puede bloquear el fichero de contraseñas ocultas (shadow)\n" +msgid "%s: can't open group file\n" +msgstr "%s: no se puede abrir el fichero de grupos\n" + +#, c-format +msgid "%s: can't lock gshadow file\n" +msgstr "%s: no se puede abrir el fichero de contraseñas ocultas (shadow)\n" #, c-format msgid "%s: can't open shadow file\n" @@ -483,8 +486,8 @@ msgid "%s: line %d: missing new password\n" msgstr "%s: línea %d: falta la nueva contraseña\n" #, c-format -msgid "%s: line %d: unknown user %s\n" -msgstr "%s: línea %d: usuario desconocido %s\n" +msgid "%s: line %d: unknown group %s\n" +msgstr "%s: línea %d: grupo desconocido %s\n" #, c-format msgid "%s: line %d: cannot update password entry\n" @@ -502,6 +505,36 @@ msgstr "%s: error actualizando el fichero de contraseñas ocultas (shadow)\n" msgid "%s: error updating password file\n" msgstr "%s: error actualizando el fichero de contraseñas\n" +#, 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 "" +"Modo de uso: chpasswd [opciones]\n" +"\n" +"Opciones:\n" +" -e, --encrypted\tlas contraseñas proporcionadas están cifradas\n" +" -h, --help\t\tmuestra este mensaje de ayuda y termina\n" +" -m, --md5\t\tusa cifrado MD5 en vez de DES cuando las\n" +" contraseñas proporcionadas no estén cifradas\n" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: no puedo bloquear el fichero de contraseñas\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s: no se puede bloquear el fichero de contraseñas ocultas (shadow)\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s: línea %d: usuario desconocido %s\n" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "Modo de uso: %s [-s shell] [nombre]\n" @@ -890,14 +923,6 @@ msgstr "%s: los ficheros se han actualizado\n" msgid "%s: no changes\n" msgstr "%s: sin cambios\n" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "%s: no se puede bloquear el fichero de grupos\n" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "%s: no se puede abrir el fichero de grupos\n" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "%s: no se puede bloquear el fichero de grupos oculto (shadow)\n" @@ -972,6 +997,10 @@ msgstr "Nombre Puerto Último\n" msgid "**Never logged in**" msgstr "**Nunca ha entrado**" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "lastlog: argumento inesperado: %s\n" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Modo de uso: %s [-p] [nombre]\n" @@ -1025,12 +1054,20 @@ msgid "login: PAM Failure, aborting: %s\n" msgstr "login: Fallo de PAM, abortando: %s\n" #, c-format -msgid "" -"\n" -"Login incorrect\n" -msgstr "" -"\n" -"Login incorrecto\n" +msgid "%s login: " +msgstr "%s nombre: " + +#, c-format +msgid "login: " +msgstr "nombre: " + +#, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "Número de intentos máximo excedido (%d)\n" + +#, c-format +msgid "login: abort requested by PAM\n" +msgstr "login: petición abortada por PAM\n" #, c-format msgid "" @@ -1038,7 +1075,7 @@ msgid "" "%s login: " msgstr "" "\n" -"%s login: " +"%s nombre: " msgid "Login incorrect" msgstr "Login incorrecto" @@ -1358,6 +1395,7 @@ msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" @@ -1365,6 +1403,16 @@ msgid "" "\t\t\t\tthe same shell\n" " -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n" msgstr "" +"Modo de uso: su [opciones] [nombre]\n" +"\n" +"Opciones:\n" +" -c, --command ORDEN\t\tpasa la ORDEN a la shell invocada\n" +" -h, --help\t\t\tmuestra este mensaje de ayuda y termina\n" +" -, -l, --login\t\thace que la shell sea una shell de acceso\n" +" -m, -p,\n" +" --preserve-environment\tno restablece las variables de entorno a su\n" +" valor original, y conserva la misma shell\n" +" -s, --shell SHELL\t\tusa SHELL en vez de la predeterminada en passwd\n" #, c-format msgid "%s: must be run from a terminal\n" @@ -1650,9 +1698,11 @@ msgstr "Modo de uso: %s [-r] nombre\n" msgid "%s: error updating group entry\n" msgstr "%s: error actualizando la entrada del grupo\n" -#, fuzzy, c-format +#, c-format msgid "%s: Cannot remove group %s which is a primary group for another user.\n" -msgstr "%s: no se puede eliminar el grupo primario del usuario.\n" +msgstr "" +"%s: no se puede eliminar el grupo %s, que es un prupo primario\n" +"para otro usuario.\n" #, c-format msgid "%s: cannot open group file\n" @@ -1700,7 +1750,7 @@ msgstr "" msgid "%s: error removing directory %s\n" msgstr "%s: error eliminando el directorio %s\n" -#, fuzzy, c-format +#, c-format msgid "" "Usage: usermod [options] login\n" "\n" @@ -1724,37 +1774,37 @@ msgid "" " -u, --uid UID\t\t\tnew UID for the user account\n" " -U, --unlock\t\t\tunlock the user account\n" msgstr "" -"Modo de uso: useradd [opciones] nombre\n" +"Modo de uso: usermod [opciones] nombre\n" "\n" "Opciones:\n" -" -b, --base-dir DIR_BASE\tdirectorio base para el nuevo directorio " -"personal\n" -" -c, --comment COMENTARIO\tcomentarios para el nuevo usuario (campo GECOS)\n" -" -d, --home-dir DIR_PERSONAL\tdirectorio personal para el nuevo usuario\n" -" -D, --defaults\t\tmuestra o salva la configuración predeterminada\n" -" modificada para useradd\n" +" -a, --append GRUPO añade al usuario al GRUPO\n" +" -c, --comment COMENTARIO\tnuevo valor del campo GECOS\n" +" -d, --home-dir DIR_PERSONAL\tnuevo directorio personal del nuevo usuario\n" " -e, --expiredate FECHA_EXPIR\testablece la fecha de caducidad de la cuenta " "a\n" " FECHA_EXPIR\n" " -f, --inactive INACTIVO\testablece el tiempo de inactividad después de\n" " que caduque la cuenta a INACTIVO\n" -" -g, --gid GRUPO\t\tforzar el uso de GRUPO para la nueva cuenta de \n" +" -g, --gid GRUPO\t\tfuerza el uso de GRUPO para la nueva cuenta de \n" " usuario\n" -" -G, --groups GRUPOS\t\tlista de grupos suplementarios para la nueva " -"cuenta\n" -" de usuario\n" +" -G, --groups GRUPOS\t\tlista de grupos suplementarios\n" " -h, --help\t\t\tmuestra esta ayuda y termina\n" -" -k, --skel DIR_SKEL\t\tespecifica un directorio skel alternativo\n" -" -K, --key LLAVE=VALOR\t\tmodifica los valores predeterminados de \n" -" /etc/login.defs\n" -" -m, --create-home\t\tcrea el directorio personal para la nueva cuenta \n" +" -l, --login NOMBRE nuevo nombre para el usuario\n" +" -L, --lock bloquea la cuenta de usuario\n" +" -m, --move-home mueve los contenidos del directorio " +"personal\n" +" al directorio nuevo (usar sólo junto con -" +"d)\n" +" -o, --non-unique permite usar UID (identificadores de " +"usuario)\n" +" duplicados (no únicos)\n" +" -p, --password CONTRASEÑA\tusar la contraseña cifrada CONTRASEÑA para la\n" +" nueva cuenta\n" +" -s, --shell SHELL\t\tla shell de entrada para la nueva cuenta de\n" +" usuario\n" +" -u, --uid UID\t\t\tfuerza el uso del UID para la nueva cuenta\n" " de usuario\n" -" -o, --non-unique\t\tpermitir crear usuarios con UIDs duplicadas\n" -" -p, --password CONTRASEÑA\tusar la contraseña cifrada CONTRASEÑA para la " -"nueva \n" -" cuenta\n" -" -s, --shell SHELL\t\tla shell de entrada para la nueva cuenta de usuario\n" -" -u, --uid UID\t\t\tforzar el uso del UID para la nueva cuenta de usuario\n" +" -U, --unlock desbloque la cuenta de usuario\n" #, c-format msgid "%s: out of memory in update_group\n" @@ -1834,6 +1884,14 @@ msgid "" " -q, --quiet\t\t\tquiet mode\n" " -s, --shadow\t\t\tedit shadow or gshadow database\n" msgstr "" +"Modo de uso: vipw [opciones]\n" +"\n" +"Opciones:\n" +" -g, --group\t\t\tedita la base de datos con los grupos\n" +" -h, --help\t\t\tmuestra este mensaje de ayuda y termina\n" +" -p, --passwd\t\t\tedita la base de datos con las contraseñas\n" +" -q, --quiet\t\t\tmodo silencioso\n" +" -s, --shadow\t\t\tedita la base de datos shadow o gshadow\n" #, c-format msgid "" @@ -1852,32 +1910,3 @@ msgstr "No se puede realizar una copia de seguridad" #, 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" - -#, fuzzy -#~ msgid "" -#~ "Usage:\n" -#~ "`vipw' edits /etc/passwd `vipw -s' edits /etc/shadow\n" -#~ "`vigr' edits /etc/group `vigr -s' edits /etc/gshadow\n" -#~ "`{vipw|vigr} -q' quiet mode\n" -#~ msgstr "" -#~ "Modo de uso\n" -#~ "`vipw' edita /etc/passwd `vipw -s' edita /etc/shadow\n" -#~ "`vigr' edita /etc/group `vigr -s' edita /etc/gshadow\n" - -#~ msgid "%s: PAM chauthtok failed\n" -#~ msgstr "%s: PAM chauthtok falló\n" - -#~ msgid "%s: Cannot execute %s" -#~ msgstr "%s: no se puede ejecutar %s" - -#~ msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n" -#~ msgstr "Modo de uso: %s\t[-u uid [-o]] [-g grupo] [-G grupo,...] \n" - -#~ 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" - -#~ msgid "[-f inactive] [-e expire] " -#~ msgstr "[-f inactivo] [-e caduca] " - -#~ msgid "[-p passwd] [-L|-U] name\n" -#~ msgstr "[-p contraseña] [-L|-U] nombre\n" diff --git a/po/eu.gmo b/po/eu.gmo index 02c6736c..b042770b 100644 Binary files a/po/eu.gmo and b/po/eu.gmo differ diff --git a/po/eu.po b/po/eu.po index 6cc61fd4..b37e861b 100644 --- a/po/eu.po +++ b/po/eu.po @@ -1,24 +1,21 @@ -# translation of eu.po to librezale.org -# translation of shadow_perrier_eu_po.po to Euskara -# translation of shadow_po.po to Euskara -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -# Piarres Beobide EgaC1a , 2004. -# Piarres Beobide Egaña , 2004, 2005. -# I�ki Larra�ga Murgoitio , 2005. +# translation of eu.po to librezale +# Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. # +# Piarres Beobide , 2004, 2005, 2006. +# Inaki Larranga Murgoitio , 2005. msgid "" msgstr "" -"Project-Id-Version: shadow 4.0.14\n" +"Project-Id-Version: shadow 4.0.15\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" -"PO-Revision-Date: 2005-12-13 23:25+0100\n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" +"PO-Revision-Date: 2006-03-07 22:38+0100\n" "Last-Translator: Piarres Beobide \n" -"Language-Team: librezale.org \n" +"Language-Team: librezale \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.10.2\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: KBabel 1.11.2\n" #, c-format msgid "Could not allocate space for config info.\n" @@ -88,7 +85,7 @@ msgid_plural "" "%d failures since last login.\n" "Last was %s on %s.\n" msgstr[0] "" -"Hutsegite %d azken saio-hasiertaik.\n" +"%d hutsegite azken saio-hasiertaik.\n" "Azkena %s izan zen %s(e)n.\n" msgstr[1] "" "%d hutsegite azken saio-hasiertaik.\n" @@ -250,8 +247,8 @@ msgid "never\n" msgstr "Inoiz ere ez\n" #, c-format -msgid "password must be changed" -msgstr "Pasahitza aldatu egin behar da" +msgid "password must be changed\n" +msgstr "Pasahitza aldatu egin behar da\n" #, c-format msgid "Password expires\t\t\t\t\t: " @@ -450,7 +447,7 @@ msgstr "Ezin izan da pasahitzen fitxategia desblokeatu.\n" #, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -467,12 +464,16 @@ msgstr "" "\t\t\tpasahitzak enkriptatuta ez daudenean\n" #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: ezin da pasahitzen fitxategia blokeatu\n" +msgid "%s: can't lock group file\n" +msgstr "%s: ezin da talde-fitxategia blokeatu\n" #, c-format -msgid "%s: can't lock shadow file\n" -msgstr "%s: ezin da 'shadow' fitxategia blokeatu\n" +msgid "%s: can't open group file\n" +msgstr "%s: ezin da talde-fitxategia ireki\n" + +#, c-format +msgid "%s: can't lock gshadow file\n" +msgstr "%s: ezin da gshadow fitxategia blokeatu\n" #, c-format msgid "%s: can't open shadow file\n" @@ -487,8 +488,8 @@ msgid "%s: line %d: missing new password\n" msgstr "%s: %d. lerroa: pasahitz berria falta da\n" #, c-format -msgid "%s: line %d: unknown user %s\n" -msgstr "%s: %d. lerroa: %s erabitzaile ezezaguna\n" +msgid "%s: line %d: unknown group %s\n" +msgstr "%s: %d. lerroa: %s talde ezezaguna\n" #, c-format msgid "%s: line %d: cannot update password entry\n" @@ -506,6 +507,36 @@ msgstr "%s: errorea 'shadow' fitxategia eguneratzean\n" msgid "%s: error updating password file\n" msgstr "%s: errorea pasahitzen fitxategia eguneratzean\n" +#, 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 "" +"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" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: ezin da pasahitzen fitxategia blokeatu\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s: ezin da 'shadow' fitxategia blokeatu\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s: %d. lerroa: %s erabitzaile ezezaguna\n" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "Erabilera: %s [-s shell] [izena]\n" @@ -891,14 +922,6 @@ msgstr "%s: fitxategiak eguneratu dira\n" msgid "%s: no changes\n" msgstr "%s: aldaketarik gabe\n" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "%s: ezin da talde-fitxategia blokeatu\n" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "%s: ezin da talde-fitxategia ireki\n" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "%s: ezin da itzalpeko talde-fitxategia blokeatu\n" @@ -974,6 +997,10 @@ msgstr "Erabiltzaile-izena Ataka Azkena\n" msgid "**Never logged in**" msgstr "**Inoiz ez du saiorik hasi**" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "lastlog: argumentu esperogabea: %s\n" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Erabilera: %s [-p] [izena]\n" @@ -1027,12 +1054,20 @@ msgid "login: PAM Failure, aborting: %s\n" msgstr "saio hasiera: PAM hutsa, uzten: %s\n" #, c-format -msgid "" -"\n" -"Login incorrect\n" -msgstr "" -"\n" -"Izen okerra\n" +msgid "%s login: " +msgstr "%s izena: " + +#, c-format +msgid "login: " +msgstr "izena: " + +#, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "Saiakera muga gainditu da (%d)\n" + +#, c-format +msgid "login: abort requested by PAM\n" +msgstr "Saioa hastea: PAM-ek uztea eskatu du\n" #, c-format msgid "" @@ -1359,6 +1394,7 @@ msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" @@ -1369,6 +1405,7 @@ msgstr "" "Erabilera: su [aukerak] [izena]\n" "\n" "Aukerak:\n" +" -c, --command KOMANDOA\t\tdeituriko shell-ari KOMANDOA pasa\n" " -h, --help\t\t\tlaguntza testu hau bistarazi eta irten\n" " -, -l, --login\t\tshell-a saio shell bihurtu\n" " -m, -p,\n" diff --git a/po/fi.gmo b/po/fi.gmo index cfa23de1..a5e01a3e 100644 Binary files a/po/fi.gmo and b/po/fi.gmo differ diff --git a/po/fi.po b/po/fi.po index ab8c2eed..474b2709 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,13 +1,13 @@ # Finnish translation for shadow. -# Copyright (C) 2004-2005 Free Software Foundation, Inc. -# Tommi Vainikainen , 2004-2005. +# Copyright (C) 2004-2006 Free Software Foundation, Inc. +# Tommi Vainikainen , 2004-2006. # msgid "" msgstr "" -"Project-Id-Version: shadow 4.0.13\n" +"Project-Id-Version: shadow 4.0.15\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" -"PO-Revision-Date: 2005-12-14 23:31+0200\n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" +"PO-Revision-Date: 2006-03-07 22:31+0200\n" "Last-Translator: Tommi Vainikainen \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" @@ -243,8 +243,8 @@ msgid "never\n" msgstr "ei koskaan\n" #, c-format -msgid "password must be changed" -msgstr "salasana täytyy vaihtaa" +msgid "password must be changed\n" +msgstr "salasana täytyy vaihtaa\n" #, c-format msgid "Password expires\t\t\t\t\t: " @@ -443,7 +443,7 @@ msgstr "Salasanatiedoston lukitusta ei voi avata.\n" #, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -451,7 +451,7 @@ msgid "" " -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n" "\t\t\tpasswords are not encrypted\n" msgstr "" -"Käyttö: chpasswd [valitsimet]\n" +"Käyttö: chgpasswd [valitsimet]\n" "\n" "Valitsimet:\n" " -e, --encrypted Annetut salasanat ovat salakirjoitettuja\n" @@ -460,12 +460,16 @@ msgstr "" " eivät ole salakirjoitettuja\n" #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: salasanatiedostoa ei voi lukita\n" +msgid "%s: can't lock group file\n" +msgstr "%s: ryhmätiedostoa ei voi lukita\n" #, c-format -msgid "%s: can't lock shadow file\n" -msgstr "%s: varjotiedostoa ei voi lukita\n" +msgid "%s: can't open group file\n" +msgstr "%s: ryhmätiedostoa ei voi avata\n" + +#, c-format +msgid "%s: can't lock gshadow file\n" +msgstr "%s: gshadow-tiedostoa ei voi lukita\n" #, c-format msgid "%s: can't open shadow file\n" @@ -480,8 +484,8 @@ msgid "%s: line %d: missing new password\n" msgstr "%s: rivi %d: uusi salasana puuttuu\n" #, c-format -msgid "%s: line %d: unknown user %s\n" -msgstr "%s: rivi %d: tuntematon käyttäjä %s\n" +msgid "%s: line %d: unknown group %s\n" +msgstr "%s: rivi %d: tuntematon ryhmä %s\n" #, c-format msgid "%s: line %d: cannot update password entry\n" @@ -499,6 +503,36 @@ msgstr "%s: virhe päivitettäessä varjotiedostoa\n" msgid "%s: error updating password file\n" msgstr "%s: virhe päivitettäessä salasanatiedostoa\n" +#, 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 "" +"Käyttö: chpasswd [valitsimet]\n" +"\n" +"Valitsimet:\n" +" -e, --encrypted Annetut salasanat ovat salakirjoitettuja\n" +" -h, --help Näytä tämä ohje ja lopeta\n" +" -m, --md5 Käytä MD5:tä eikä DES:iä kun annetut salasanat\n" +" eivät ole salakirjoitettuja\n" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: salasanatiedostoa ei voi lukita\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s: varjotiedostoa ei voi lukita\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s: rivi %d: tuntematon käyttäjä %s\n" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "Käyttö: %s [-s kuori] [nimi]\n" @@ -883,14 +917,6 @@ msgstr "%s: tiedostot päivitettiin\n" msgid "%s: no changes\n" msgstr "%s: ei muutoksia\n" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "%s: ryhmätiedostoa ei voi lukita\n" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "%s: ryhmätiedostoa ei voi avata\n" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "%s: varjoryhmätiedostoa ei voi lukita\n" @@ -964,6 +990,10 @@ msgstr "Käyttäjä Portti Viimeksi\n" msgid "**Never logged in**" msgstr "**Ei koskaan kirjautunut sisään**" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "lastlog: odottamaton argumentti: %s\n" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Käyttö: %s [-p] [nimi]\n" @@ -1017,12 +1047,20 @@ msgid "login: PAM Failure, aborting: %s\n" msgstr "login: PAM-virhe, keskeytetään: %s\n" #, c-format -msgid "" -"\n" -"Login incorrect\n" -msgstr "" -"\n" -"Sisäänkirjautuminen epäonnistui\n" +msgid "%s login: " +msgstr "%s-tunnus: " + +#, c-format +msgid "login: " +msgstr "tunnus: " + +#, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "Suurin sallittu määrä yrityksiä ylitetty (%d)\n" + +#, c-format +msgid "login: abort requested by PAM\n" +msgstr "login: keskeytyspyyntö PAM:sta\n" #, c-format msgid "" @@ -1351,6 +1389,7 @@ msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" @@ -1361,10 +1400,11 @@ msgstr "" "Käyttö: su [valitsimet] [tunnus]\n" "\n" "Valitsimet:\n" +" -c, --command KOMENTO Välitä KOMENTO käynnistyvälle kuorelle\n" " -h, --help Näytä tämä ohje ja lopeta\n" " -, -l, --login Tee kuoresta sisäänkirjautumiskuori\n" " -m, -p,\n" -" --preserve-environment Älä tyhjää ympäristömuuttijia ja säilytä\n" +" --preserve-environment Älä tyhjää ympäristömuuttujia ja säilytä\n" " sama kuori\n" " -s, --shell KUORI Käytä kuorta KUORI passwd:n oletuksen " "sijaan\n" diff --git a/po/fr.gmo b/po/fr.gmo index 36005e55..3d35a896 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index e87c5b5f..83a53b2e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,22 +1,22 @@ # shadow fr.po -# Copyright (C) 1999, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 1999, 2004, 2005, 2006 Free Software Foundation, Inc. # Patches, suggestions, etc welcome. -# Vincent Renardias , 1999, 2005. -# Christian Perrier , 2005. # +# Vincent Renardias , 1999, 2005. +# Jean-Luc Coulon , 2005, 2006. +# Christian Perrier , 2005, 2006. msgid "" msgstr "" -"Project-Id-Version: shadow 4.0.14\n" +"Project-Id-Version: shadow 4.0.15\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" -"PO-Revision-Date: 2005-12-14 09:04+0100\n" -"Last-Translator: Jean-Luc Coulon \n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" +"PO-Revision-Date: 2006-03-12 14:46+0100\n" +"Last-Translator: Jean-Luc Coulon \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.10.2\n" #, c-format msgid "Could not allocate space for config info.\n" @@ -253,8 +253,8 @@ msgid "never\n" msgstr "jamais\n" #, c-format -msgid "password must be changed" -msgstr "Le mot de passe doit être changé" +msgid "password must be changed\n" +msgstr "Le mot de passe doit être changé\n" #, c-format msgid "Password expires\t\t\t\t\t: " @@ -470,7 +470,7 @@ msgstr "" #, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -478,7 +478,7 @@ msgid "" " -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n" "\t\t\tpasswords are not encrypted\n" msgstr "" -"Utilisation : chpasswd [options]\n" +"Utilisation : chgpasswd [options]\n" "\n" "Options :\n" " -e, --encrypted les mots de passe fournis sont chiffrés\n" @@ -488,15 +488,17 @@ msgstr "" " mots de passe fournis ne sont pas chiffrés\n" #, c-format -msgid "%s: can't lock password file\n" -msgstr "" -"%s : impossible de verrouiller le fichier des mots de passe /etc/passwd\n" +msgid "%s: can't lock group file\n" +msgstr "%s : impossible de verrouiller le fichier des groupes /etc/group\n" #, c-format -msgid "%s: can't lock shadow file\n" +msgid "%s: can't open group file\n" +msgstr "%s : impossible d'ouvrir le fichier des groupes /etc/group\n" + +#, c-format +msgid "%s: can't lock gshadow file\n" msgstr "" -"%s : impossible de verrouiller le fichier des mots de passe cachés /etc/" -"shadow\n" +"%s : impossible de verrouiller le fichier des groupes cachés /etc/gshadow\n" #, c-format msgid "%s: can't open shadow file\n" @@ -512,8 +514,8 @@ msgid "%s: line %d: missing new password\n" msgstr "%s : ligne %d : nouveau mot de passe manquant\n" #, c-format -msgid "%s: line %d: unknown user %s\n" -msgstr "%s : ligne %d : utilisateur %s inconnu\n" +msgid "%s: line %d: unknown group %s\n" +msgstr "%s : ligne %d : groupe %s inconnu\n" #, c-format msgid "%s: line %d: cannot update password entry\n" @@ -535,6 +537,40 @@ msgid "%s: error updating password file\n" msgstr "" "%s : erreur lors de la mise à jour du fichier des mots de passe /etc/passwd\n" +#, 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 "" +"Utilisation : chpasswd [options]\n" +"\n" +"Options :\n" +" -e, --encrypted les mots de passe fournis sont chiffrés\n" +" -h, --help afficher ce message d'aide et quitter\n" +" -m, --md5 utiliser le chiffrage MD5 à la place de DES lorsque " +"les\n" +" mots de passe fournis ne sont pas chiffrés\n" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "" +"%s : impossible de verrouiller le fichier des mots de passe /etc/passwd\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "" +"%s : impossible de verrouiller le fichier des mots de passe cachés /etc/" +"shadow\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s : ligne %d : utilisateur %s inconnu\n" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "Utilisation : %s [-s shell] [nom]\n" @@ -935,15 +971,6 @@ msgstr "%s : les fichiers ont été mis à jour\n" msgid "%s: no changes\n" msgstr "%s : aucun changement\n" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "" -"%s : impossible de verrouiller le fichier des mots de passe /etc/group\n" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "%s : impossible d'ouvrir le fichier des mots de passe /etc/group\n" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "" @@ -1029,6 +1056,10 @@ msgstr "Utilisateur Port Dernière\n" msgid "**Never logged in**" msgstr "**Jamais connecté**" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "lastlog : paramètre inattendu : %s\n" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Utilisation : %s [-p] [nom]\n" @@ -1082,12 +1113,20 @@ msgid "login: PAM Failure, aborting: %s\n" msgstr "login : échec de PAM, abandon : %s\n" #, c-format -msgid "" -"\n" -"Login incorrect\n" -msgstr "" -"\n" -"Identifiant de connexion incorrect\n" +msgid "%s login: " +msgstr "%s login : " + +#, c-format +msgid "login: " +msgstr "login : " + +#, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "Dépassement du nombre maximum de tentatives (%d)\n" + +#, c-format +msgid "login: abort requested by PAM\n" +msgstr "login : interruption requise par PAM\n" #, c-format msgid "" @@ -1142,7 +1181,7 @@ msgstr "L'identifiant d'utilisateur (UID) %u est inconnu\n" #, c-format msgid "unknown GID: %lu\n" -msgstr "Identifiant de groupe (GID) inconnu : %lu\n" +msgstr "L'identifiant de groupe (GID) %lu est inconnu\n" msgid "Sorry.\n" msgstr " \n" @@ -1431,6 +1470,7 @@ msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" @@ -1440,17 +1480,19 @@ msgid "" msgstr "" "Utilisation : su [options] [login]\n" "\n" -"Options:\n" -" -h, --help\t\t\taffiche ce message d'aide et quitte\n" -" -, -l, --login\t\tutilise un interpréteur de commandes initial\n" -" \t\t(« login shell ») ;\n" +"Options :\n" +" -c, --command COMMANDE passer la commande COMMANDE à\n" +" l'interpréteur de commande appelé ;\n" +" -h, --help afficher ce message d'aide et quitter ;\n" +" -, -l, --login utiliser un interpréteur de commandes\n" +" initial (« login shell ») ;\n" " -m, -p,\n" -" --preserve-environment\tne réinitialise pas les variables\n" -"\t\t\t\td'environnement et conserve le même interpréteur de\n" -"\t\t\t\tcommandes ;\n" -" -s, --shell SHELL\t\tutilise SHELL comme interpréteur de\n" -"\t\t\t\tcommandes à la place de celui défini dans le fichier\n" -"\t\t\t\tpasswd.\n" +" --preserve-environment ne pas réinitialisee les variables\n" +" d'environnement et conserver le même\n" +" interpréteur de commandes ;\n" +" -s, --shell SHELL utiliser SHELL comme interpréteur de\n" +" commandes à la place de celui défini\n" +" dans le fichier passwd.\n" #, c-format msgid "%s: must be run from a terminal\n" @@ -1578,7 +1620,7 @@ msgstr "" " défaut modifiée de « useradd »\n" " -e, --expiredate DATE_EXPIR fixer la date de fin de validité du\n" " compte à DATE_EXPIR\n" -" -f, --inactive INACTIF fixer la durée d'inactivité du mot de masse\n" +" -f, --inactive INACTIF fixer la durée d'inactivité du mot de passe\n" " après sa fin de validité à INACTIF\n" " -g, --gid GROUPE forcer l'utilisation de GROUPE pour le compte\n" " du nouvel utilisateur\n" @@ -1595,7 +1637,7 @@ msgstr "" " dupliqué (non unique)\n" " -p, --password MOT_DE_PASSE utiliser un mot de passe chiffré pour le\n" " compte du nouvel utilisateur\n" -" -s, --shell INTERPRÉTEUR interpréteur de commande initial pour le\n" +" -s, --shell INTERPRÉTEUR interpréteur de commandes initial pour le\n" " compte du nouvel utilisateur\n" " -u, --uid UID forcer l'utilisation de l'identifiant « UID »\n" " pour le compte du nouvel utilisateur\n" @@ -1783,7 +1825,7 @@ msgstr "%s : %s n'appartient pas à %s, non supprimé\n" #, c-format msgid "%s: warning: can't remove " -msgstr "%s : attention: suppression impossible " +msgstr "%s : attention : suppression impossible " #, c-format msgid "%s: user %s does not exist\n" @@ -1835,7 +1877,7 @@ msgstr "" " « GECOS »\n" " -d, --home-dir REP_PERS définir un nouveau répertoire personnel pour\n" " le compte de l'utilisateur\n" -" -e, --expiredate DATE_EXPIR fixer la date de fin de validité du comptei\n" +" -e, --expiredate DATE_EXPIR fixer la date de fin de validité du compte\n" " à DATE_EXPIR\n" " -f, --inactive INACTIF fixer la durée d'inactivité du mot de masse\n" " après sa fin de validité à INACTIF\n" @@ -1852,7 +1894,7 @@ msgstr "" " d'utilisateur (UID) dupliqué (non unique)\n" " -p, --password MOT_DE_PASSE utiliser un mot de passe chiffré pour le\n" " nouveau mot de passe\n" -" -s, --shell INTERPRÉTEUR définir un nouvel interpréteur de commande\n" +" -s, --shell INTERPRÉTEUR définir un nouvel interpréteur de commandes\n" " initial pour le compte de l'utilisateur\n" " -u, --uid UID définir un nouvel identifiant (UID) pour le\n" " compte de l'utilisateur\n" @@ -1946,7 +1988,7 @@ msgstr "" " -p, --passwd\t\t\tmodifier la base de données des comptes\n" " \t\t\t(/etc/passwd)\n" " -p, --quiet\t\t\tmode silencieux\n" -" -s, --shadow\t\t\tmodifier les bases de données de mots de passe\n" +" -s, --shadow\t\t\tmodifier la base de données des mots de passe\n" " \t\t\tcachés (« shadow passwords ») : shadow ou gshadow\n" #, c-format diff --git a/po/gl.gmo b/po/gl.gmo new file mode 100644 index 00000000..9f88b862 Binary files /dev/null and b/po/gl.gmo differ diff --git a/po/gl.po b/po/gl.po new file mode 100644 index 00000000..eb50250a --- /dev/null +++ b/po/gl.po @@ -0,0 +1,1888 @@ +# Galician translation of shadow +# Copyright (C) 1999, 2004, 2005 Free Software Foundation, Inc. +# Jacobo Tarrio , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: shadow 4.0.15\n" +"Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" +"PO-Revision-Date: 2006-03-06 16:53+0100\n" +"Last-Translator: Jacobo Tarrio \n" +"Language-Team: Galician \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" + +#, c-format +msgid "Could not allocate space for config info.\n" +msgstr "Non se puido reservar espacio para a información de configuración.\n" + +#, c-format +msgid "configuration error - unknown item '%s' (notify administrator)\n" +msgstr "" +"erro de configuración - elemento \"%s\" descoñecido (avise ao " +"administrador)\n" + +#, c-format +msgid "Warning: unknown group %s\n" +msgstr "Aviso: grupo %s descoñecido\n" + +#, c-format +msgid "Warning: too many groups\n" +msgstr "Aviso: hai grupos de máis\n" + +#, c-format +msgid "Your password has expired." +msgstr "O seu contrasinal caducou." + +#, c-format +msgid "Your password is inactive." +msgstr "O seu contrasinal está inactivo." + +#, c-format +msgid "Your login has expired." +msgstr "O seu identificador de usuario caducou." + +msgid " Contact the system administrator.\n" +msgstr " Póñase en contacto co administrador do sistema.\n" + +msgid " Choose a new password.\n" +msgstr " Escolla un novo contrasinal.\n" + +#, c-format +msgid "Your password will expire in %ld days.\n" +msgstr "O seu contrasinal ha caducar en %ld días.\n" + +#, c-format +msgid "Your password will expire tomorrow.\n" +msgstr "O seu contrasinal ha caducar mañá.\n" + +#, c-format +msgid "Your password will expire today.\n" +msgstr "O seu contrasinal ha caducar hoxe.\n" + +#, c-format +msgid "Unable to change tty %s" +msgstr "Non se puido cambiar o tty %s" + +#, c-format +msgid "Environment overflow\n" +msgstr "Desbordamento nas variables de ambiente\n" + +#, c-format +msgid "You may not change $%s\n" +msgstr "Non pode cambiar $%s\n" + +#, 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 fallo desde a última entrada.\n" +"O último foi o %s en %s.\n" +msgstr[1] "" +"%d fallos desde a última entrada.\n" +"O último foi o %s en %s.\n" + +#, c-format +msgid "Too many logins.\n" +msgstr "Entrou demasiadas veces.\n" + +msgid "You have new mail." +msgstr "Ten novo correo." + +msgid "No mail." +msgstr "Non hai correo." + +msgid "You have mail." +msgstr "Ten correo." + +msgid "no change" +msgstr "ningún cambio" + +msgid "a palindrome" +msgstr "un palíndromo" + +msgid "case changes only" +msgstr "só cambia maiúsculas/minúsculas" + +msgid "too similar" +msgstr "semellantes de máis" + +msgid "too simple" +msgstr "simple de máis" + +msgid "rotated" +msgstr "rotado" + +msgid "too short" +msgstr "curto de máis" + +#, c-format +msgid "Bad password: %s. " +msgstr "Contrasinal non válido: %s. " + +#, c-format +msgid "passwd: pam_start() failed, error %d\n" +msgstr "passwd: a chamada a pam_start() fallou, erro %d\n" + +#, c-format +msgid "passwd: %s\n" +msgstr "passwd: %s\n" + +msgid "passwd: password updated successfully\n" +msgstr "passwd: o contrasinal actualizouse con éxito\n" + +#, c-format +msgid "Incorrect password for %s.\n" +msgstr "Contrasinal incorrecto para %s.\n" + +#, c-format +msgid "Unable to cd to \"%s\"\n" +msgstr "Non se puido cambiar a \"%s\"\n" + +msgid "No directory, logging in with HOME=/" +msgstr "Non hai un directorio, éntrase con HOME=/" + +#, c-format +msgid "Cannot execute %s" +msgstr "Non se pode executar %s" + +#, c-format +msgid "Invalid root directory \"%s\"\n" +msgstr "Directorio raíz \"%s\" non válido\n" + +#, c-format +msgid "Can't change root directory to \"%s\"\n" +msgstr "Non se pode cambiar o directorio raíz a \"%s\"\n" + +msgid "No utmp entry. You must exec \"login\" from the lowest level \"sh\"" +msgstr "" +"Non hai unha entrada en utmp. Debe executar \"login\" dende o \"sh\" de " +"nivel máis baixo" + +msgid "Unable to determine your tty name." +msgstr "Non se pode determinar o nome do seu tty." + +#, c-format +msgid "malloc(%d) failed\n" +msgstr "A chamada a malloc(%d) fallou\n" + +msgid "Password: " +msgstr "Contrasinal: " + +#, c-format +msgid "%s's Password: " +msgstr "Contrasinal de %s: " + +#, c-format +msgid "" +"Usage: chage [options] user\n" +"\n" +"Options:\n" +" -d, --lastday LAST_DAY\tset last password change to LAST_DAY\n" +" -E, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n" +" -h, --help\t\t\tdisplay this help message and exit\n" +" -I, --inactive INACTIVE\tset password inactive after expiration\n" +"\t\t\t\tto INACTIVE\n" +" -l, --list\t\t\tshow account aging information\n" +" -m, --mindays MIN_DAYS\tset minimum number of days before password\n" +"\t\t\t\tchange to MIN_DAYS\n" +" -M, --maxdays MAX_DAYS\tset maximim number of days before password\n" +"\t\t\t\tchange to MAX_DAYS\n" +" -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n" +msgstr "" +"Emprego: chage [opcións] usuario\n" +"\n" +"Opcións:\n" +" -d, --lastday ÚLTIMO\t\tfixa o último cambio de\tcontrasinal ao\n" +"\t\t\t\tdía ÚLTIMO\n" +" -E, --expiredate CADUCA\tfixa a data de caducidade ao día CADUCA\n" +" -h, --help\t\t\tamosa esta mensaxe de axuda e sae\n" +" -I, --inactive INACTIVO\tfixa o tempo de inactividade do contrasinal\n" +"\t\t\t\ttrala caducidade a INACTIVO\n" +" -l, --list\t\t\tamosa a información de caducidade das contas\n" +" -m, --mindays MÍNIMO\t\tfixa o número mínimo de días antes do\n" +"\t\t\t\tcambio de contrasinal a MÍNIMO\n" +" -M, --maxdays MÁXIMO\t\tfixa o número máximo de días antes do\n" +"\t\t\t\tcambio de contrasinal a MÁXIMO\n" +" -W, --warndays AVISO\t\tfixa o número de días de aviso de caducidade\n" +"\t\t\t\ta AVISO\n" + +#, c-format +msgid "Enter the new value, or press ENTER for the default\n" +msgstr "Introduza o novo valor ou prema Intro para o valor por defecto\n" + +msgid "Minimum Password Age" +msgstr "Idade mínima do contrasinal" + +msgid "Maximum Password Age" +msgstr "Idade máxima do contrasinal" + +msgid "Last Password Change (YYYY-MM-DD)" +msgstr "Último cambio de contrasinal (AAAA-MM-DD)" + +msgid "Password Expiration Warning" +msgstr "Aviso de caducidade de contrasinal" + +msgid "Password Inactive" +msgstr "Contrasinal inactivo" + +msgid "Account Expiration Date (YYYY-MM-DD)" +msgstr "Data de caducidade da conta (AAAA-MM-DD)" + +#, c-format +msgid "Last password change\t\t\t\t\t: " +msgstr "Último cambio de contrasinal\t\t\t\t: " + +#, c-format +msgid "never\n" +msgstr "nunca\n" + +#, c-format +msgid "password must be changed\n" +msgstr "debe cambiarse o contrasinal\n" + +#, c-format +msgid "Password expires\t\t\t\t\t: " +msgstr "O contrasinal caduca\t\t\t\t\t: " + +#, c-format +msgid "Password inactive\t\t\t\t\t: " +msgstr "Contrasinal inactivo\t\t\t\t\t: " + +#, c-format +msgid "Account expires\t\t\t\t\t\t: " +msgstr "A conta caduca\t\t\t\t\t\t: " + +#, c-format +msgid "Minimum number of days between password change\t\t: %ld\n" +msgstr "Número mínimo de días entre cambios de contrasinal\t: %ld\n" + +#, c-format +msgid "Maximum number of days between password change\t\t: %ld\n" +msgstr "Número máximo de días entre cambios de contrasinal\t: %ld\n" + +#, 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 caduque o contrasinal: %ld\n" + +#, c-format +msgid "%s: do not include \"l\" with other flags\n" +msgstr "%s: non inclúa \"l\" con outros indicadores\n" + +#, c-format +msgid "%s: Permission denied.\n" +msgstr "%s: Permiso denegado.\n" + +#, c-format +msgid "%s: PAM authentication failed\n" +msgstr "%s: a autenticación con PAM fallou\n" + +#, c-format +msgid "%s: can't open password file\n" +msgstr "%s: non se pode abrir o ficheiro de contrasinais\n" + +#, c-format +msgid "%s: unknown user %s\n" +msgstr "%s: usuario %s descoñecido\n" + +#, c-format +msgid "%s: the shadow password file is not present\n" +msgstr "%s: o ficheiro de contrasinais shadow non está presente\n" + +#, c-format +msgid "%s: can't lock shadow password file\n" +msgstr "%s: non se pode bloquear o ficheiro de contrasinais shadow\n" + +#, c-format +msgid "%s: can't open shadow password file\n" +msgstr "%s: non se pode abrir o ficheiro de contrasinais shadow\n" + +#, c-format +msgid "%s: failed to drop privileges (%s)\n" +msgstr "%s: non se puido deixar os privilexios (%s)\n" + +#, c-format +msgid "Changing the aging information for %s\n" +msgstr "A cambiar a información de caducidade de %s\n" + +#, c-format +msgid "%s: error changing fields\n" +msgstr "%s: erro ao cambiar os campos\n" + +#, c-format +msgid "%s: can't update password file\n" +msgstr "%s: non se pode actualizar o ficheiro de contrasinais\n" + +#, c-format +msgid "%s: can't update shadow password file\n" +msgstr "%s: non se pode actualizar o ficheiro de contrasinais shadow\n" + +#, c-format +msgid "%s: can't rewrite shadow password file\n" +msgstr "%s: non se pode rescribir o ficheiro de contrasinais shadow\n" + +#, c-format +msgid "%s: can't rewrite password file\n" +msgstr "%s: non se pode rescribir o ficheiro de contrasinais\n" + +#, c-format +msgid "" +"Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n" +"\t[-h home_ph] [-o other] [user]\n" +msgstr "" +"Emprego: %s [-f nome] [-r num_cuarto] [-w tlf_traballo]\n" +"\t[-h tlf_casa] [-o outro] [usuario]\n" + +#, c-format +msgid "Usage: %s [-f full_name] [-r room_no] [-w work_ph] [-h home_ph]\n" +msgstr "" +"Emprego: %s [-f nome] [-r num_cuarto] [-w tlf_traballo] [-h tlf_casa]\n" + +msgid "Full Name" +msgstr "Nome completo" + +#, c-format +msgid "\tFull Name: %s\n" +msgstr "\tNome completo: %s\n" + +msgid "Room Number" +msgstr "Número de cuarto" + +#, c-format +msgid "\tRoom Number: %s\n" +msgstr "\tNúmero de cuarto: %s\n" + +msgid "Work Phone" +msgstr "Teléfono do traballo" + +#, c-format +msgid "\tWork Phone: %s\n" +msgstr "\tTeléfono do traballo: %s\n" + +msgid "Home Phone" +msgstr "Teléfono da casa" + +#, c-format +msgid "\tHome Phone: %s\n" +msgstr "\tTeléfono da casa: %s\n" + +msgid "Other" +msgstr "Outro" + +#, c-format +msgid "%s: Cannot determine your user name.\n" +msgstr "%s: Non se pode determinar o seu nome de usuario.\n" + +#, c-format +msgid "%s: cannot change user `%s' on NIS client.\n" +msgstr "%s: non se pode cambiar o usuario \"%s\" no cliente NIS.\n" + +#, c-format +msgid "%s: `%s' is the NIS master for this client.\n" +msgstr "%s: \"%s\" é o mestre NIS deste cliente.\n" + +#, c-format +msgid "Changing the user information for %s\n" +msgstr "A cambiar a información de usuario de %s\n" + +#, c-format +msgid "%s: invalid name: \"%s\"\n" +msgstr "%s: nome non válido: \"%s\"\n" + +#, c-format +msgid "%s: invalid room number: \"%s\"\n" +msgstr "%s: número de cuarto non válido: \"%s\"\n" + +#, c-format +msgid "%s: invalid work phone: \"%s\"\n" +msgstr "%s: teléfono do traballo non válido: \"%s\"\n" + +#, c-format +msgid "%s: invalid home phone: \"%s\"\n" +msgstr "%s: teléfono da casa non válido: \"%s\"\n" + +#, c-format +msgid "%s: \"%s\" contains illegal characters\n" +msgstr "%s: \"%s\" contén caracteres non válidos\n" + +#, c-format +msgid "%s: fields too long\n" +msgstr "%s: campos longos de máis\n" + +#, c-format +msgid "Cannot change ID to root.\n" +msgstr "Non se pode cambiar o ID a root.\n" + +#, c-format +msgid "Cannot lock the password file; try again later.\n" +msgstr "" +"Non se pode bloquear o ficheiro de contrasinais; volva tentalo despois.\n" + +#, c-format +msgid "Cannot open the password file.\n" +msgstr "Non se pode abrir o ficheiro de contrasinais.\n" + +#, c-format +msgid "%s: %s not found in /etc/passwd\n" +msgstr "%s: non se atopou %s en /etc/passwd\n" + +#, c-format +msgid "Error updating the password entry.\n" +msgstr "Erro ao actualizar a entrada de contrasinal.\n" + +#, c-format +msgid "Cannot commit password file changes.\n" +msgstr "Non se poden gravar os cambios no ficheiro de contrasinais.\n" + +#, c-format +msgid "Cannot unlock the password file.\n" +msgstr "Non se pode desbloquear o ficheiro de contrasinais.\n" + +#, c-format +msgid "" +"Usage: chgpasswd [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 "" +"Emprego: chgpasswd [opcións]\n" +"\n" +"Opcións:\n" +" -e, --encrypted\tos contrasinais fornecidos xa están cifrados\n" +" -h, --help\t\tamosa esta mensaxe de axuda e sae\n" +" -m, --md5\t\tempregar cifrado MD5 no canto de DES se os\n" +"\t\t\tcontrasinais fornecidos non están cifrados\n" + +#, c-format +msgid "%s: can't lock group file\n" +msgstr "%s: non se pode bloquear o ficheiro de grupos\n" + +#, c-format +msgid "%s: can't open group file\n" +msgstr "%s: non se pode abrir o ficheiro de grupos\n" + +#, c-format +msgid "%s: can't lock gshadow file\n" +msgstr "%s: non se pode bloquear o ficheiro gshadow\n" + +#, c-format +msgid "%s: can't open shadow file\n" +msgstr "%s: non se pode abrir o ficheiro shadow\n" + +#, c-format +msgid "%s: line %d: line too long\n" +msgstr "%s: liña %d: liña longa de máis\n" + +#, c-format +msgid "%s: line %d: missing new password\n" +msgstr "%s: liña %d: falla o novo contrasinal\n" + +#, c-format +msgid "%s: line %d: unknown group %s\n" +msgstr "%s: liña %d: grupo %s descoñecido\n" + +#, c-format +msgid "%s: line %d: cannot update password entry\n" +msgstr "%s: liña %d: non se pode actualizar a entrada de contrasinal\n" + +#, c-format +msgid "%s: error detected, changes ignored\n" +msgstr "%s: detectouse un erro, ignóranse os cambios\n" + +#, c-format +msgid "%s: error updating shadow file\n" +msgstr "%s: erro ao actualizar o ficheiro shadow\n" + +#, c-format +msgid "%s: error updating password file\n" +msgstr "%s: erro ao actualizar o ficheiro de contrasinais\n" + +#, 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 "" +"Emprego: chpasswd [opcións]\n" +"\n" +"Opcións:\n" +" -e, --encrypted\tos contrasinais fornecidos xa están cifrados\n" +" -h, --help\t\tamosa esta mensaxe de axuda e sae\n" +" -m, --md5\t\tempregar cifrado MD5 no canto de DES se os\n" +"\t\t\tcontrasinais fornecidos non están cifrados\n" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: non se pode bloquear o ficheiro de contrasinais\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s: non se pode bloquear o ficheiro shadow\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s: liña %d: usuario %s descoñecido\n" + +#, c-format +msgid "Usage: %s [-s shell] [name]\n" +msgstr "Emprego: %s [-s intérprete] [nome]\n" + +msgid "Login Shell" +msgstr "Intérprete de ordes" + +#, c-format +msgid "You may not change the shell for %s.\n" +msgstr "Non pode cambiar o intérprete de ordes de %s.\n" + +#, c-format +msgid "Changing the login shell for %s\n" +msgstr "A cambiar o intérprete de ordes de %s\n" + +#, c-format +msgid "%s: Invalid entry: %s\n" +msgstr "%s: Entrada non válida: %s\n" + +#, c-format +msgid "%s is an invalid shell.\n" +msgstr "%s non é un intérprete de ordes válido.\n" + +#, c-format +msgid "Usage: expiry {-f|-c}\n" +msgstr "Emprego: expiry {-f|-c}\n" + +#, c-format +msgid "%s: unknown user\n" +msgstr "%s: usuario descoñecido\n" + +#, 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 "" +"Emprego: faillog [opcións]\n" +"\n" +"Opcións:\n" +" -a, --all\t\tamosa os rexistros de entradas fallidas\tpara\n" +"\t\t\ttódolos usuarios\n" +" -h, --help\t\tamosa esta mensaxe de axuda e sae\n" +" -l, --lock-time SEG\tdespois dunha entrada fallida bloquea a conta\n" +"\t\t\tdurante SEG segundos\n" +" -m, --maximum MÁX\tfixa os contadores de máximas entradas fallidas a MÁX\n" +" -r, --reset\t\treinicia os contadores de entradas fallidas\n" +" -t, --time DÍAS\tamosa os rexistros de entradas fallidas máis\n" +"\t\t\trecentes que DÍAS\n" +" -u, --user USUARIO\tamosa o rexistro de entradas fallidas ou mantén\n" +"\t\t\tos contadores de fallos e límites (se se emprega coas\n" +"\t\t\topcións -r, -m ou -l) só do USUARIO\n" + +#, c-format +msgid "Login Failures Maximum Latest On\n" +msgstr "Usuario Fallos Máximo Último O\n" + +#, c-format +msgid " [%lds left]" +msgstr " [fallan %lds]" + +#, c-format +msgid " [%lds lock]" +msgstr " [bloqueado %lds]" + +#, c-format +msgid "Unknown User: %s\n" +msgstr "Usuario descoñecido: %s\n" + +#, c-format +msgid "Usage: %s [-r|-R] group\n" +msgstr "Emprego: %s [-r|-R] grupo\n" + +#, c-format +msgid " %s [-a user] group\n" +msgstr " %s [-a usuario] grupo\n" + +#, c-format +msgid " %s [-d user] group\n" +msgstr " %s [-d usuario] grupo\n" + +#, c-format +msgid " %s [-A user,...] [-M user,...] group\n" +msgstr " %s [-A usuario,...] [-M usuario,...] grupo\n" + +#, c-format +msgid " %s [-M user,...] group\n" +msgstr " %s [-M usuario,...] grupo\n" + +#, c-format +msgid "%s: shadow group passwords required for -A\n" +msgstr "%s: precísase de contrasinais de grupo shadow para -A\n" + +#, c-format +msgid "Who are you?\n" +msgstr "¿Quen é vostede?\n" + +#, c-format +msgid "unknown group: %s\n" +msgstr "grupo descoñecido: %s\n" + +#, c-format +msgid "Adding user %s to group %s\n" +msgstr "A engadir o usuario %s ao grupo %s\n" + +#, c-format +msgid "Removing user %s from group %s\n" +msgstr "A eliminar o usuario %s do grupo %s\n" + +#, c-format +msgid "%s: unknown member %s\n" +msgstr "%s: membro %s descoñecido\n" + +#, c-format +msgid "%s: Not a tty\n" +msgstr "%s: Non é un tty\n" + +#, c-format +msgid "Changing the password for group %s\n" +msgstr "A cambiar o contrasinal do grupo %s\n" + +msgid "New Password: " +msgstr "Novo contrasinal: " + +msgid "Re-enter new password: " +msgstr "Volva introducir o novo contrasinal: " + +msgid "They don't match; try again" +msgstr "Non coinciden, volva tentalo" + +#, c-format +msgid "%s: Try again later\n" +msgstr "%s: Volva tentalo despois\n" + +#, c-format +msgid "%s: can't get lock\n" +msgstr "%s: non se pode obter un bloqueo\n" + +#, c-format +msgid "%s: can't get shadow lock\n" +msgstr "%s: non se pode obter o bloqueo de shadow\n" + +#, c-format +msgid "%s: can't open file\n" +msgstr "%s: non se pode abrir o ficheiro\n" + +#, c-format +msgid "%s: can't update entry\n" +msgstr "%s: non se pode actualizar a entrada\n" + +#, c-format +msgid "%s: can't update shadow entry\n" +msgstr "%s: non se pode actualizar a entrada de shadow\n" + +#, c-format +msgid "%s: can't re-write file\n" +msgstr "%s: non se pode rescribir o ficheiro\n" + +#, c-format +msgid "%s: can't re-write shadow file\n" +msgstr "%s: non se pode rescribir o ficheiro de shadow\n" + +#, c-format +msgid "%s: can't unlock file\n" +msgstr "%s: non se pode desbloquear o ficheiro\n" + +#, c-format +msgid "" +"Usage: groupadd [options] group\n" +"\n" +"Options:\n" +" -f, --force\t\tforce exit with success status if the specified\n" +"\t\t\t\tgroup already exists\n" +" -g, --gid GID\t\tuse GID for the new group\n" +" -h, --help\t\t\tdisplay this help message and exit\n" +" -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n" +" -o, --non-unique\t\tallow create group with duplicate\n" +"\t\t\t\t(non-unique) GID\n" +msgstr "" +"Emprego: groupadd [opcións] grupo\n" +"\n" +"Opcións:\n" +" -f, --force\t\tforza a saída con éxito se o grupo indicado xa existe\n" +" -g, --gid GID\t\temprega o GID para o novo grupo\n" +" -h, --help\t\tamosa esta mensaxe de axuda e sae\n" +" -K, --key CLAVE=VALOR\tignora os valores de /etc/login.defs\n" +" -o, --non-unique\tpermite crear un grupo cun GID duplicado (non único)\n" + +#, c-format +msgid "%s: error adding new group entry\n" +msgstr "%s: erro ao engadir a entrada do novo grupo\n" + +#, c-format +msgid "%s: name %s is not unique\n" +msgstr "%s: o nome %s non é único\n" + +#, c-format +msgid "%s: GID %u is not unique\n" +msgstr "%s: o GID %u non é único\n" + +#, c-format +msgid "%s: can't get unique GID\n" +msgstr "%s: non se pode obter un GID único\n" + +#, c-format +msgid "%s: %s is not a valid group name\n" +msgstr "%s: %s non é un nome de grupo válido\n" + +#, c-format +msgid "%s: cannot rewrite group file\n" +msgstr "%s: non se pode rescribir o ficheiro de grupos\n" + +#, c-format +msgid "%s: cannot rewrite shadow group file\n" +msgstr "%s: non se pode rescribir o ficheiro de grupos shadow\n" + +#, c-format +msgid "%s: unable to lock group file\n" +msgstr "%s: non se pode bloquear o ficheiro de grupos\n" + +#, c-format +msgid "%s: unable to open group file\n" +msgstr "%s: non se pode abrir o ficheiro de grupos\n" + +#, c-format +msgid "%s: unable to lock shadow group file\n" +msgstr "%s: non se pode bloquear o ficheiro de grupos shadow\n" + +#, c-format +msgid "%s: unable to open shadow group file\n" +msgstr "%s: non se pode abrir o ficheiro de grupos shadow\n" + +#, c-format +msgid "%s: invalid group %s\n" +msgstr "%s: grupo %s non válido\n" + +#, c-format +msgid "%s: -K requires KEY=VALUE\n" +msgstr "%s: -K precisa de CLAVE=VALOR\n" + +#, c-format +msgid "%s: group %s exists\n" +msgstr "%s: o grupo %s existe\n" + +#, c-format +msgid "Usage: groupdel group\n" +msgstr "Emprego: groupdel grupo\n" + +#, c-format +msgid "%s: error removing group entry\n" +msgstr "%s: erro ao eliminar a entrada do grupo\n" + +#, c-format +msgid "%s: error removing shadow group entry\n" +msgstr "%s: erro ao eliminar a entrada do grupo shadow\n" + +#, c-format +msgid "%s: cannot remove user's primary group.\n" +msgstr "%s: non se pode eliminar o grupo primario do usuario.\n" + +#, c-format +msgid "%s: group %s does not exist\n" +msgstr "%s: o grupo %s non existe\n" + +#, c-format +msgid "%s: group %s is a NIS group\n" +msgstr "%s: o grupo %s é un grupo NIS\n" + +#, c-format +msgid "%s: %s is the NIS master\n" +msgstr "%s: %s é o mestre NIS\n" + +#, c-format +msgid "Usage: groupmod [-g gid [-o]] [-n name] group\n" +msgstr "Emprego: groupmod [-g gid [-o]] [-n nome] grupo\n" + +#, c-format +msgid "%s: %s not found in /etc/group\n" +msgstr "%s: non se atopou %s en /etc/group\n" + +#, c-format +msgid "%s: %u is not a unique GID\n" +msgstr "%s: %u non é un GID único\n" + +#, c-format +msgid "%s: %s is not a unique name\n" +msgstr "%s: %s non é un nome único\n" + +#, c-format +msgid "Usage: %s [-r] [-s] [group [gshadow]]\n" +msgstr "Emprego: %s [-r] [-s] [grupo [gshadow]]\n" + +#, c-format +msgid "Usage: %s [-r] [-s] [group]\n" +msgstr "Emprego: %s [-r] [-s] [grupo]\n" + +#, c-format +msgid "No\n" +msgstr "Non\n" + +#, c-format +msgid "%s: -s and -r are incompatibile\n" +msgstr "%s: -s e -r son incompatibles\n" + +#, c-format +msgid "%s: cannot lock file %s\n" +msgstr "%s: non se pode bloquear o ficheiro %s\n" + +#, c-format +msgid "%s: cannot open file %s\n" +msgstr "%s: non se pode abrir o ficheiro %s\n" + +#, c-format +msgid "invalid group file entry\n" +msgstr "entrada do ficheiro de grupos non válida\n" + +#, c-format +msgid "delete line `%s'? " +msgstr "¿borrar a liña \"%s\"? " + +#, c-format +msgid "duplicate group entry\n" +msgstr "entrada de grupo duplicada\n" + +#, c-format +msgid "invalid group name `%s'\n" +msgstr "nome de grupo \"%s\" non válido\n" + +#, c-format +msgid "group %s: no user %s\n" +msgstr "grupo %s: non existe o usuario %s\n" + +#, c-format +msgid "delete member `%s'? " +msgstr "¿borrar o membro \"%s\"? " + +#, c-format +msgid "invalid shadow group file entry\n" +msgstr "entrada do ficheiro de grupos shadow non válida\n" + +#, c-format +msgid "duplicate shadow group entry\n" +msgstr "entrada de grupo shadow duplicada\n" + +#, c-format +msgid "no matching group file entry\n" +msgstr "non hai unha entrada no ficheiro de grupos que coincida\n" + +#, c-format +msgid "shadow group %s: no administrative user %s\n" +msgstr "grupo shadow %s: non existe o usuario administrativo %s\n" + +#, c-format +msgid "delete administrative member `%s'? " +msgstr "¿borrar o membro administrativo \"%s\"? " + +#, c-format +msgid "shadow group %s: no user %s\n" +msgstr "grupo shadow %s: non existe o usuario %s\n" + +#, c-format +msgid "%s: cannot update file %s\n" +msgstr "%s: non se pode actualizar o ficheiro %s\n" + +#, c-format +msgid "%s: the files have been updated\n" +msgstr "%s: actualizáronse os ficheiros\n" + +#, c-format +msgid "%s: no changes\n" +msgstr "%s: non hai cambios\n" + +#, c-format +msgid "%s: can't lock shadow group file\n" +msgstr "%s: non se pode bloquear o ficheiro de grupos shadow\n" + +#, c-format +msgid "%s: can't open shadow group file\n" +msgstr "%s: non se pode abrir o ficheiro de grupos shadow\n" + +#, c-format +msgid "%s: can't remove shadow group %s\n" +msgstr "%s: non se pode eliminar o grupo shadow %s\n" + +#, c-format +msgid "%s: can't update shadow entry for %s\n" +msgstr "%s: non se pode actualizar a entrada shadow para %s\n" + +#, c-format +msgid "%s: can't update entry for group %s\n" +msgstr "%s: non se pode actualizar a entrada do grupo %s\n" + +#, c-format +msgid "%s: can't update shadow group file\n" +msgstr "%s: non se pode actualizar o ficheiro de grupos shadow\n" + +#, c-format +msgid "%s: can't update group file\n" +msgstr "%s: non se pode actualizar o ficheiro de grupos\n" + +#, c-format +msgid "%s: can't delete shadow group file\n" +msgstr "%s: non se pode borrar o ficheiro de grupos shadow\n" + +#, c-format +msgid "Usage: id [-a]\n" +msgstr "Emprego: id [-a]\n" + +#, c-format +msgid "Usage: id\n" +msgstr "Emprego: id\n" + +#, c-format +msgid " groups=" +msgstr " grupos=" + +#, c-format +msgid "" +"Usage: lastlog [options]\n" +"\n" +"Options:\n" +" -b, --before DAYS\tprint only lastlog records older than DAYS\n" +" -h, --help\t\tdisplay this help message and exit\n" +" -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" +" -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n" +msgstr "" +"Emprego: lastlog [opcións]\n" +"\n" +"Opcións:\n" +" -b, --before DÍAS\tamosa só os rexistros de última entrada de máis\n" +"\t\t\tde DÍAS días\n" +" -h, --help\t\tamosa esta mensaxe de axuda e sae\n" +" -t, --time DÍAS\tamosa só os rexistros de última entrada de menos\n" +"\t\t\tde DÍAS días\n" +" -u, --user USUARIO\tamosa o rexistro de última entrada do USUARIO\n" + +#, c-format +msgid "Username Port From Latest\n" +msgstr "Usuario Porto Desde Última\n" + +#, c-format +msgid "Username Port Latest\n" +msgstr "Usuario Porto Última\n" + +msgid "**Never logged in**" +msgstr "**Nunca entrou**" + +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "lastlog: non se esperaba un argumento: %s\n" + +#, c-format +msgid "Usage: %s [-p] [name]\n" +msgstr "Emprego: %s [-p] [nome]\n" + +#, c-format +msgid " %s [-p] [-h host] [-f name]\n" +msgstr " %s [-p] [-h servidor] [-f nome]\n" + +#, c-format +msgid " %s [-p] -r host\n" +msgstr " %s [-p] -r servidor\n" + +#, c-format +msgid "Invalid login time\n" +msgstr "Hora de entrada non válida\n" + +#, c-format +msgid "" +"\n" +"System closed for routine maintenance\n" +msgstr "" +"\n" +"O sistema está pechado por mantemento rutinario\n" + +#, c-format +msgid "" +"\n" +"[Disconnect bypassed -- root login allowed.]\n" +msgstr "" +"\n" +"[Omitida a desconexión -- permítese a entrada coma root.]\n" + +#, c-format +msgid "" +"\n" +"Login timed out after %d seconds.\n" +msgstr "" +"\n" +"A entrada caducou despois de %d segundos.\n" + +#, c-format +msgid " on `%.100s' from `%.200s'" +msgstr " en \"%.100s\" desde \"%.200s\"" + +#, c-format +msgid " on `%.100s'" +msgstr " en \"%.100s\"" + +#, c-format +msgid "login: PAM Failure, aborting: %s\n" +msgstr "login: Fallo en PAM, a abortar: %s\n" + +#, c-format +msgid "%s login: " +msgstr "%s login: " + +#, c-format +msgid "login: " +msgstr "login: " + +#, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "Superouse o número máximo de intentos (%d)\n" + +#, c-format +msgid "login: abort requested by PAM\n" +msgstr "login: cancelación solicitada por PAM\n" + +#, c-format +msgid "" +"\n" +"%s login: " +msgstr "" +"\n" +"%s login: " + +msgid "Login incorrect" +msgstr "Entrada incorrecta" + +#, c-format +msgid "%s: failure forking: %s" +msgstr "%s: fallo ao lanzar o proceso: %s" + +msgid "Warning: login re-enabled after temporary lockout.\n" +msgstr "Aviso: vólvese permitir a entrada despois do bloqueo temporal.\n" + +#, c-format +msgid "Last login: %s on %s" +msgstr "Última entrada: %s en %s" + +#, c-format +msgid "Last login: %.19s on %s" +msgstr "Última entrada: %.19s en %s" + +#, c-format +msgid " from %.*s" +msgstr " desde %.*s" + +msgid "" +"login time exceeded\n" +"\n" +msgstr "" +"superouse o tempo de entrada\n" +"\n" + +#, c-format +msgid "Usage: newgrp [-] [group]\n" +msgstr "Emprego: newgrp [-] [grupo]\n" + +#, c-format +msgid "Usage: sg group [[-c] command]\n" +msgstr "Emprego: sg grupo [[-c] orde]\n" + +#, c-format +msgid "unknown UID: %u\n" +msgstr "UID descoñecido: %u\n" + +#, c-format +msgid "unknown GID: %lu\n" +msgstr "GID descoñecido: %lu\n" + +msgid "Sorry.\n" +msgstr "Perdón.\n" + +#, c-format +msgid "too many groups\n" +msgstr "hai grupos de máis\n" + +#, c-format +msgid "Usage: %s [input]\n" +msgstr "Emprego: %s [entrada]\n" + +#, c-format +msgid "%s: can't lock /etc/passwd.\n" +msgstr "%s: non se pode bloquear /etc/passwd.\n" + +#, c-format +msgid "%s: can't lock files, try again later\n" +msgstr "%s: non se pode bloquear ficheiros, volva tentalo despois\n" + +#, c-format +msgid "%s: can't open files\n" +msgstr "%s: non se pode abrir ficheiros\n" + +#, c-format +msgid "%s: line %d: invalid line\n" +msgstr "%s: liña %d: liña non válida\n" + +#, c-format +msgid "%s: line %d: can't create GID\n" +msgstr "%s: liña %d: non se pode crear o GID\n" + +#, c-format +msgid "%s: line %d: can't create UID\n" +msgstr "%s: liña %d: non se pode crear o UID\n" + +#, c-format +msgid "%s: line %d: cannot find user %s\n" +msgstr "%s: liña %d: non se pode atopar o usuario %s\n" + +#, c-format +msgid "%s: line %d: can't update password\n" +msgstr "%s: liña %d: non se pode actualizar o contrasinal\n" + +#, c-format +msgid "%s: line %d: mkdir failed\n" +msgstr "%s: liña %d: a chamada a mkdir fallou\n" + +#, c-format +msgid "%s: line %d: chown failed\n" +msgstr "%s: liña %d: a chamada a chown fallou\n" + +#, c-format +msgid "%s: line %d: can't update entry\n" +msgstr "%s: liña %d: non se pode actualizar a entrada\n" + +#, c-format +msgid "%s: error updating files\n" +msgstr "%s: erro ao actualizar os ficheiros\n" + +#, c-format +msgid "" +"Usage: passwd [options] [login]\n" +"\n" +"Options:\n" +" -a, --all\t\t\treport password status on all accounts\n" +" -d, --delete\t\t\tdelete the password for the named account\n" +" -e, --expire\t\t\tforce expire the password for the named account\n" +" -h, --help\t\t\tdisplay this help message and exit\n" +" -k, --keep-tokens\t\tchange password only if expired\n" +" -i, --inactive INACTIVE\tset password inactive after expiration\n" +"\t\t\t\tto INACTIVE\n" +" -l, --lock\t\t\tlock the named account\n" +" -n, --mindays MIN_DAYS\tset minimum number of days before password\n" +"\t\t\t\tchange to MIN_DAYS\n" +" -q, --quiet\t\t\tquiet mode\n" +" -r, --repository REPOSITORY\tchange password in REPOSITORY repository\n" +" -S, --status\t\t\treport password status on the named account\n" +" -u, --unlock\t\t\tunlock the named account\n" +" -w, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n" +" -x, --maxdays MAX_DAYS\tset maximim number of days before password\n" +"\t\t\t\tchange to MAX_DAYS\n" +msgstr "" +"Emprego: passwd [opcións] [usuario]\n" +"\n" +"Opcións:\n" +" -a, --all\t\tinforma do estado dos contrasinais en tódalas contas\n" +" -d, --delete\t\telimina o contrasinal da conta indicada\n" +" -e, --expire\t\tfai caducar o contrasinal da conta indicada\n" +" -h, --help\t\tamosa esta mensaxe de axuda e sae\n" +" -k, --keep-tokens\tcambia o contrasinal só se caducou\n" +" -i, --inactive INACT\tcambia o tempo de inactividade trala caducidade\n" +"\t\t\tda conta a INACT\n" +" -l, --lock\t\tbloquea a conta indicada\n" +" -n, --mindays MÍN\tfixa o número mínimo de días antes do cambio de\n" +"\t\t\tcontrasinal a MÍN\n" +" -q, --quiet\t\tmodo silencioso\n" +" -r, --repository REP\tcambia o contrasinal no repositorio REP\n" +" -S, --status\t\tinforma do estado do contrasinal da conta indicada\n" +" -u, --unlock\t\tdesbloquea a conta indicada\n" +" -w, --warndays AVISO\tfixa o tempo de aviso antes da caducidade a AVISO " +"días\n" +" -x, --maxdays MÁX\tfixa o número máximo de días antes do cambio de\n" +"\t\t\tcontrasinal a MÁX\n" + +msgid "Old password: " +msgstr "Contrasinal antigo: " + +#, 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 "" +"Introduza o novo contrasinal (mínimo de %d, máximo de %d caracteres)\n" +"Empregue unha combinación de maiúsculas, minúsculas e números.\n" + +msgid "New password: " +msgstr "Novo contrasinal: " + +#, c-format +msgid "Try again.\n" +msgstr "Volva tentalo.\n" + +#, c-format +msgid "" +"\n" +"Warning: weak password (enter it again to use it anyway).\n" +msgstr "" +"\n" +"Aviso: contrasinal feble (introdúzao outra vez para o empregar igualmente).\n" + +#, c-format +msgid "They don't match; try again.\n" +msgstr "Non coinciden; volva tentalo.\n" + +#, c-format +msgid "The password for %s cannot be changed.\n" +msgstr "Non se pode cambiar o contrasinal de %s.\n" + +#, c-format +msgid "Sorry, the password for %s cannot be changed yet.\n" +msgstr "Aínda non se pode cambiar o contrasinal de %s.\n" + +#, c-format +msgid "%s: out of memory\n" +msgstr "%s: memoria esgotada\n" + +#, c-format +msgid "%s: repository %s not supported\n" +msgstr "%s: non se soporta o repositorio %s\n" + +#, c-format +msgid "%s: You may not view or modify password information for %s.\n" +msgstr "%s: Non pode ver ou modificar a información de contrasinal de %s.\n" + +#, c-format +msgid "Changing password for %s\n" +msgstr "A cambiar o contrasinal de %s\n" + +#, c-format +msgid "The password for %s is unchanged.\n" +msgstr "Non se cambiou o contrasinal de %s\n" + +#, c-format +msgid "Password changed.\n" +msgstr "Cambiouse o contrasinal.\n" + +#, c-format +msgid "Password set to expire.\n" +msgstr "Vai caducar o contrasinal.\n" + +#, c-format +msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n" +msgstr "Emprego: %s [-q] [-r] [-s] [passwd [shadow]]\n" + +#, c-format +msgid "invalid password file entry\n" +msgstr "entrada do ficheiro de contrasinais non válida\n" + +#, c-format +msgid "duplicate password entry\n" +msgstr "entrada de contrasinal duplicada\n" + +#, c-format +msgid "invalid user name '%s'\n" +msgstr "nome de usuario \"%s\" non válido\n" + +#, c-format +msgid "user %s: no group %u\n" +msgstr "usuario %s: non existe o grupo %u\n" + +#, c-format +msgid "user %s: directory %s does not exist\n" +msgstr "usuario %s: o directorio %s non existe\n" + +#, c-format +msgid "user %s: program %s does not exist\n" +msgstr "usuario %s: o programa %s non existe\n" + +#, c-format +msgid "invalid shadow password file entry\n" +msgstr "entrada do ficheiro de contrasinais shadow non válida\n" + +#, c-format +msgid "duplicate shadow password entry\n" +msgstr "entrada de contrasinal shadow duplicada\n" + +#, c-format +msgid "no matching password file entry\n" +msgstr "non hai unha entrada no ficheiro de contrasinais que coincida\n" + +#, c-format +msgid "user %s: last password change in the future\n" +msgstr "usuario %s: último cambio de contrasinal no futuro\n" + +#, c-format +msgid "%s: can't lock passwd file\n" +msgstr "%s: non se pode bloquear o ficheiro de contrasinais\n" + +#, c-format +msgid "%s: can't open passwd file\n" +msgstr "%s: non se pode abrir o ficheiro de contrasinais\n" + +#, c-format +msgid "%s: can't remove shadow entry for %s\n" +msgstr "%s: non se pode eliminar a entrada shadow para %s\n" + +#, c-format +msgid "%s: can't update passwd entry for %s\n" +msgstr "%s: non se pode actualizar a entrada de contrasinal para %s\n" + +#, c-format +msgid "%s: can't update shadow file\n" +msgstr "%s: non se pode actualizar o ficheiro shadow\n" + +#, c-format +msgid "%s: can't update passwd file\n" +msgstr "%s: non se pode actualizar o ficheiro de contrasinais\n" + +#, c-format +msgid "%s: can't update entry for user %s\n" +msgstr "%s: non se pode actualizar a entrada do usuario %s\n" + +#, c-format +msgid "%s: can't delete shadow password file\n" +msgstr "%s: non se pode borrar o ficheiro de contrasinais shadow\n" + +#, c-format +msgid "Access to su to that account DENIED.\n" +msgstr "O acceso a su para esa conta está DENEGADO.\n" + +#, c-format +msgid "Password authentication bypassed.\n" +msgstr "Omitiuse a autenticación por contrasinal.\n" + +#, c-format +msgid "Please enter your OWN password as authentication.\n" +msgstr "Introduza O SEU PROPIO contrasinal para autenticación.\n" + +msgid "Sorry." +msgstr "Perdón." + +#, c-format +msgid "%s: %s\n" +msgstr "%s: %s\n" + +#, c-format +msgid "" +"Usage: su [options] [login]\n" +"\n" +"Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" +" -h, --help\t\t\tdisplay this help message and exit\n" +" -, -l, --login\t\tmake the shell a login shell\n" +" -m, -p,\n" +" --preserve-environment\tdo not reset environment variables, and keep\n" +"\t\t\t\tthe same shell\n" +" -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n" +msgstr "" +"Emprego: su [opcións] [usuario]\n" +"\n" +"Opcións:\n" +" -c, --command ORDE\t\tpasa a ORDE ao intérprete de ordes executado\n" +" -h, --help\t\t\tamosa esta mensaxe de axuda e sae\n" +" -, -l, --login\t\tfai que o intérprete de ordes sexa de \"login\"\n" +" -m, -p,\n" +" --preserve-environment\tnon reinicia as variables de ambiente e\n" +"\t\t\t\tmantén o mesmo intérprete de ordes\n" +" -s, --shell INTÉRPRETE\temprega o INTÉRPRETE no cando do normal\n" + +#, c-format +msgid "%s: must be run from a terminal\n" +msgstr "%s: débese executar dende un terminal\n" + +#, c-format +msgid "%s: pam_start: error %d\n" +msgstr "%s: pam_start(): erro %d\n" + +#, c-format +msgid "Unknown id: %s\n" +msgstr "Id. descoñecido: %s\n" + +#, c-format +msgid "You are not authorized to su %s\n" +msgstr "Non está autorizado para facer su %s\n" + +msgid "(Enter your own password)" +msgstr "(Introduza o seu propio contrasinal)" + +#, c-format +msgid "" +"%s: %s\n" +"(Ignored)\n" +msgstr "" +"%s: %s\n" +"(Ignórase)\n" + +#, c-format +msgid "No shell\n" +msgstr "Non hai un intérprete de ordes\n" + +#, c-format +msgid "No password file\n" +msgstr "Non é un ficheiro de contrasinais\n" + +#, c-format +msgid "No password entry for 'root'\n" +msgstr "Non hai unha entrada de contrasinal para \"root\"\n" + +msgid "" +"\n" +"Type control-d to proceed with normal startup,\n" +"(or give root password for system maintenance):" +msgstr "" +"\n" +"Escriba control-d para seguir co inicio normal,\n" +"(ou escriba o contrasinal de root para o mantemento do sistema):" + +msgid "Entering System Maintenance Mode\n" +msgstr "A entrar no modo de mantemento do sistema\n" + +#, c-format +msgid "%s: invalid numeric argument `%s'\n" +msgstr "%s: argumento numérico \"%s\" non válido\n" + +#, c-format +msgid "%s: unknown GID %s\n" +msgstr "%s: GID %s descoñecido\n" + +#, c-format +msgid "%s: unknown group %s\n" +msgstr "%s: grupo %s descoñecido\n" + +#, c-format +msgid "%s: cannot create new defaults file\n" +msgstr "%s: non se pode crear o novo ficheiro de valores por defecto\n" + +#, c-format +msgid "%s: cannot open new defaults file\n" +msgstr "%s: non se pode abrir o novo ficheiro de valores por defecto\n" + +#, c-format +msgid "%s: rename: %s" +msgstr "%s: rename: %s" + +#, c-format +msgid "%s: group `%s' is a NIS group.\n" +msgstr "%s: o grupo \"%s\" é un grupo NIS.\n" + +#, c-format +msgid "%s: too many groups specified (max %d).\n" +msgstr "%s: especificáronse grupos de máis (máximo %d).\n" + +#, c-format +msgid "" +"Usage: useradd [options] LOGIN\n" +"\n" +"Options:\n" +" -b, --base-dir BASE_DIR\tbase directory for the new user account\n" +"\t\t\t\thome directory\n" +" -c, --comment COMMENT\t\tset the GECOS field for the new user account\n" +" -d, --home-dir HOME_DIR\thome directory for the new user account\n" +" -D, --defaults\t\tprint or save modified default useradd\n" +"\t\t\t\tconfiguration\n" +" -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n" +" -f, --inactive INACTIVE\tset password inactive after expiration\n" +"\t\t\t\tto INACTIVE\n" +" -g, --gid GROUP\t\tforce use GROUP for the new user account\n" +" -G, --groups GROUPS\t\tlist of supplementary groups for the new\n" +"\t\t\t\tuser account\n" +" -h, --help\t\t\tdisplay this help message and exit\n" +" -k, --skel SKEL_DIR\t\tspecify an alternative skel directory\n" +" -K, --key KEY=VALUE\t\toverrides /etc/login.defs defaults\n" +" -m, --create-home\t\tcreate home directory for the new user\n" +"\t\t\t\taccount\n" +" -o, --non-unique\t\tallow create user with duplicate\n" +"\t\t\t\t(non-unique) UID\n" +" -p, --password PASSWORD\tuse encrypted password for the new user\n" +"\t\t\t\taccount\n" +" -s, --shell SHELL\t\tthe login shell for the new user account\n" +" -u, --uid UID\t\t\tforce use the UID for the new user account\n" +msgstr "" +"Emprego: useradd [opcións] USUARIO\n" +"\n" +"Opcións:\n" +" -b, --base-dir DIR_BASE\tdirectorio base para o directorio inicial\n" +"\t\t\t\tda nova conta de usuario\n" +" -c, --comment COMENTARIO\tfixa o campo GECOS da nova conta de usuario\n" +" -d, --home-dir DIR_INICIAL\tdirectorio inicial da nova conta de usuario\n" +" -D, --defaults\t\tamosa ou grave a configuración modificada\n" +"\t\t\t\tde useradd\n" +" -e, --expiredate DATA_CAD\tfixa a data de caducidade da conta a DATA_CAD\n" +" -f, --inactive INACTIVA\tfixa o tempo de inactividade do contrasinal\n" +"\t\t\t\ttrala caducidade a INACTIVA\n" +" -g, --gid GRUPO\t\tusa o GRUPO para a nova conta de usuario\n" +" -G, --groups GRUPOS\t\tlista de grupos suplementarios para a nova\n" +"\t\t\t\tconta de usuario\n" +" -h, --help\t\t\tamosa esta mensaxe de axuda e sae\n" +" -k, --skel DIR_SKEL\t\tespecifica un directorio \"skel\" alternativo\n" +" -K, --key CLAVE=VALOR\t\tomite os valores por defecto de /etc/login.defs\n" +" -m, --create-home\t\tcrea o directorio inicial para a nova conta\n" +"\t\t\t\tde usuario\n" +" -o, --non-unique\t\tpermite crear usuarios con UIDs duplicados\n" +"\t\t\t\t(non únicos)\n" +" -p, --password CONTRASINAL\temprega o CONTRASINAL cifrado para a nova\n" +"\t\t\t\tconta de usuario\n" +" -s, --shell INTÉRPRETE\to intérprete de ordes da nova conta de usuario\n" +" -u, --uid UID\t\t\tusa o UID para a nova conta de usuario\n" + +#, c-format +msgid "%s: UID %u is not unique\n" +msgstr "%s: o UID %u non é único\n" + +#, c-format +msgid "%s: can't get unique UID\n" +msgstr "%s: non se pode obter un UID único\n" + +#, c-format +msgid "%s: invalid base directory `%s'\n" +msgstr "%s: directorio base \"%s\" non válido\n" + +#, c-format +msgid "%s: invalid comment `%s'\n" +msgstr "%s: comentario \"%s\" non válido\n" + +#, c-format +msgid "%s: invalid home directory `%s'\n" +msgstr "%s: directorio inicial \"%s\" non válido\n" + +#, c-format +msgid "%s: invalid date `%s'\n" +msgstr "%s: data \"%s\" non válida\n" + +#, c-format +msgid "%s: shadow passwords required for -e\n" +msgstr "%s: precísase de contrasinais shadow para -e\n" + +#, c-format +msgid "%s: shadow passwords required for -f\n" +msgstr "%s: precísase de contrasinais shadow para -f\n" + +#, c-format +msgid "%s: invalid field `%s'\n" +msgstr "%s: campo \"%s\" non válido\n" + +#, c-format +msgid "%s: invalid shell `%s'\n" +msgstr "%s: intérprete de ordes \"%s\" non válido\n" + +#, c-format +msgid "%s: invalid user name '%s'\n" +msgstr "%s: nome de usuario \"%s\" non válido\n" + +#, c-format +msgid "%s: cannot rewrite password file\n" +msgstr "%s: non se pode rescribir o ficheiro de contrasinais\n" + +#, c-format +msgid "%s: cannot rewrite shadow password file\n" +msgstr "%s: non se pode rescribir o ficheiro de contrasinais shadow\n" + +#, c-format +msgid "%s: unable to lock password file\n" +msgstr "%s: non se pode bloquear o ficheiro de contrasinais\n" + +#, c-format +msgid "%s: unable to open password file\n" +msgstr "%s: non se pode abrir o ficheiro de contrasinais\n" + +#, c-format +msgid "%s: cannot lock shadow password file\n" +msgstr "%s: non se pode bloquear o ficheiro de contrasinais shadow\n" + +#, c-format +msgid "%s: cannot open shadow password file\n" +msgstr "%s: non se pode abrir o ficheiro de contrasinais shadow\n" + +#, c-format +msgid "%s: error locking group file\n" +msgstr "%s: erro ao bloquear o ficheiro de grupos\n" + +#, c-format +msgid "%s: error opening group file\n" +msgstr "%s: erro ao abrir o ficheiro de grupos\n" + +#, c-format +msgid "%s: error locking shadow group file\n" +msgstr "%s: erro ao bloquear o ficheiro de grupos shadow\n" + +#, c-format +msgid "%s: error opening shadow group file\n" +msgstr "%s: erro ao abrir o ficheiro de grupos shadow\n" + +#, c-format +msgid "%s: error adding new password entry\n" +msgstr "%s: erro ao engadir a nova entrada de contrasinal\n" + +#, c-format +msgid "%s: error adding new shadow password entry\n" +msgstr "%s: erro ao engadir a nova entrada de contrasinal shadow\n" + +#, c-format +msgid "%s: cannot create directory %s\n" +msgstr "%s: non se pode crear o directorio %s\n" + +#, c-format +msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n" +msgstr "" +"Non existe ningún grupo chamado \"mail\", créase o spool de correo co modo " +"0600.\n" + +#, c-format +msgid "Can't create mail spool for user %s.\n" +msgstr "Non se pode crear o spool de correo para o usuario %s.\n" + +#, c-format +msgid "%s: user %s exists\n" +msgstr "%s: o usuario %s existe\n" + +#, c-format +msgid "" +"%s: group %s exists - if you want to add this user to that group, use -g.\n" +msgstr "" +"%s: o grupo %s existe - se quere engadir este usuario a este grupo, empregue " +"-g.\n" + +#, c-format +msgid "" +"%s: warning: the home directory already exists.\n" +"Not copying any file from skel directory into it.\n" +msgstr "" +"%s: aviso: o directorio inicial xa existe.\n" +"Non se copia nel ningún ficheiro do directorio skel.\n" + +#, c-format +msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" +msgstr "%s: aviso: CREATE_HOME non está soportado, empregue -m no seu canto.\n" + +#, c-format +msgid "Usage: %s [-r] name\n" +msgstr "Emprego: %s [-r] nome\n" + +#, c-format +msgid "%s: error updating group entry\n" +msgstr "%s: erro ao actualizar a entrada do grupo\n" + +#, c-format +msgid "%s: Cannot remove group %s which is a primary group for another user.\n" +msgstr "" +"%s: Non se pode eliminar o grupo %s, que é o grupo primario de outro " +"usuario.\n" + +#, c-format +msgid "%s: cannot open group file\n" +msgstr "%s: non se pode abrir o ficheiro de grupos\n" + +#, c-format +msgid "%s: cannot open shadow group file\n" +msgstr "%s: non se pode abrir o ficheiro de grupos shadow\n" + +#, c-format +msgid "%s: error deleting password entry\n" +msgstr "%s: erro ao eliminar a entrada de contrasinal\n" + +#, c-format +msgid "%s: error deleting shadow password entry\n" +msgstr "%s: erro ao eliminar a entrada de contrasinal shadow\n" + +#, c-format +msgid "%s: user %s is currently logged in\n" +msgstr "%s: o usuario %s está conectado\n" + +#, c-format +msgid "%s: %s not owned by %s, not removing\n" +msgstr "%s: %s non pertence a %s, non se elimina\n" + +#, c-format +msgid "%s: warning: can't remove " +msgstr "%s: aviso: non se pode eliminar " + +#, c-format +msgid "%s: user %s does not exist\n" +msgstr "%s: o usuario %s non existe\n" + +#, c-format +msgid "%s: user %s is a NIS user\n" +msgstr "%s: o usuario %s é un usuario NIS\n" + +#, c-format +msgid "%s: not removing directory %s (would remove home of user %s)\n" +msgstr "" +"%s: non se elimina o directorio %s (había eliminar o directorio inicial do " +"usuario %s)\n" + +#, c-format +msgid "%s: error removing directory %s\n" +msgstr "%s: erro ao borrar o directorio %s\n" + +#, c-format +msgid "" +"Usage: usermod [options] login\n" +"\n" +"Options:\n" +" -a, --append GROUP\t\tappend the user to the supplemental GROUP\n" +" -c, --comment COMMENT\t\tnew value of the GECOS field\n" +" -d, --home HOME_DIR\t\tnew login directory for the new user account\n" +" -e, --expiredate EXPIRE_DATE\tset account expiration date to EXPIRE_DATE\n" +" -f, --inactive INACTIVE\tset password inactive after expiration\n" +"\t\t\t\tto INACTIVE\n" +" -g, --gid GROUP\t\tforce use GROUP as new initial login group\n" +" -G, --groups GROUPS\t\tlist of supplementary GROUPS\n" +" -h, --help\t\t\tdisplay this help message and exit\n" +" -l, --login LOGIN\t\tnew value of the login name\n" +" -L, --lock\t\t\tlock the user account\n" +" -m, --move-home\t\tmove contents of the home directory to the new\n" +"\t\t\t\tlocation (use only with -d)\n" +" -o, --non-unique\t\tallow using duplicate (non-unique) UID\n" +" -p, --password PASSWORD\tuse encrypted password for the new password\n" +" -s, --shell SHELL\t\tnew login shell for the user account\n" +" -u, --uid UID\t\t\tnew UID for the user account\n" +" -U, --unlock\t\t\tunlock the user account\n" +msgstr "" +"Emprego: usermod [opcións] usuario\n" +"\n" +"Opcións:\n" +" -a, --append GRUPO\t\tengade o usuario ao GRUPO suplementario\n" +" -c, --comment COMENTARIO\tnovo valor do campo GECOS\n" +" -d, --home DIR_INICIAL\tnovo directorio inicial da conta de usuario\n" +" -e, --expiredate DATA_CAD\tfixa a data de caducidade da conta a DATA_CAD\n" +" -f, --inactive INACTIVA\tfixa o tempo de inactividade do contrasinal\n" +"\t\t\t\ttrala caducidade a INACTIVA\n" +" -g, --gid GRUPO\t\tusa o GRUPO coma novo grupo inicial\n" +" -G, --groups GRUPOS\t\tlista de grupos suplementarios\n" +" -h, --help\t\t\tamosa esta mensaxe de axuda e sae\n" +" -l, --login USUARIO novo valor do nome de usuario\n" +" -L, --lock\t\t\tbloquea a conta do usuario\n" +" -m, --move-home\t\tmove o contido do directorio inicial á nova\n" +"\t\t\t\tlocalización (emprégueo só con -d)\n" +" -o, --non-unique\t\tpermite empregar UIDs duplicados (non únicos)\n" +" -p, --password CONTRASINAL\temprega o CONTRASINAL cifrado coma novo\n" +"\t\t\t\tcontrasinal\n" +" -s, --shell INTÉRPRETE\to novo intérprete de ordes da conta de usuario\n" +" -u, --uid UID\t\t\tnovo UID para a conta de usuario\n" +" -U, --unlock\t\t\tdesbloquea a conta do usuario\n" + +#, c-format +msgid "%s: out of memory in update_group\n" +msgstr "%s: esgotouse a memoria en update_group\n" + +#, c-format +msgid "%s: out of memory in update_gshadow\n" +msgstr "%s: esgotouse a memoria en update_gshadow\n" + +#, c-format +msgid "%s: no flags given\n" +msgstr "%s: non se forneceu ningún modificador\n" + +#, c-format +msgid "%s: shadow passwords required for -e and -f\n" +msgstr "%s: precísase de contrasinais de shadow para -e e -f\n" + +#, c-format +msgid "%s: -a flag is ONLY allowed with the -G flag\n" +msgstr "%s: o modificador -a SÓ se admite co modificador -G\n" + +#, c-format +msgid "%s: uid %lu is not unique\n" +msgstr "%s: o uid %lu non é único\n" + +#, c-format +msgid "%s: error changing password entry\n" +msgstr "%s: erro ao cambiar a entrada de contrasinal\n" + +#, c-format +msgid "%s: error removing password entry\n" +msgstr "%s: erro ao eliminar a entrada de contrasinal\n" + +#, c-format +msgid "%s: error removing shadow password entry\n" +msgstr "%s: erro ao eliminar a entrada de contrasinal shadow\n" + +#, c-format +msgid "%s: directory %s exists\n" +msgstr "%s: o directorio %s existe\n" + +#, c-format +msgid "%s: can't create %s\n" +msgstr "%s: non se pode crear %s\n" + +#, c-format +msgid "%s: can't chown %s\n" +msgstr "%s: non se pode cambiar o propietario de %s\n" + +#, c-format +msgid "%s: warning: failed to completely remove old home directory %s" +msgstr "" +"%s: aviso: non se puido eliminar completamente o vello directorio inicial %s" + +#, c-format +msgid "%s: cannot rename directory %s to %s\n" +msgstr "%s: non se pode cambiar o nome do directorio %s a %s\n" + +#, c-format +msgid "%s: warning: %s not owned by %s\n" +msgstr "%s: aviso: %s non pertence a %s\n" + +msgid "failed to change mailbox owner" +msgstr "non se puido cambiar o propietario da caixa do correo" + +msgid "failed to rename mailbox" +msgstr "non se puido cambiar o nome da caixa do correo" + +#, c-format +msgid "" +"Usage: vipw [options]\n" +"\n" +"Options:\n" +" -g, --group\t\t\tedit group database\n" +" -h, --help\t\t\tdisplay this help message and exit\n" +" -p, --passwd\t\t\tedit passwd database\n" +" -q, --quiet\t\t\tquiet mode\n" +" -s, --shadow\t\t\tedit shadow or gshadow database\n" +msgstr "" +"Emprego: vipw [opcións]\n" +"\n" +"Opcións:\n" +" -g, --group\t\tedita a base de datos de grupos\n" +" -h, --help\t\tamosa esta mensaxe de axuda e sae\n" +" -p, --passwd\t\tedita a base de datos de contrasinais\n" +" -q, --quiet\t\tmodo silencioso\n" +" -s, --shadow\t\tedita a base de datos shadow ou gshadow\n" + +#, c-format +msgid "" +"\n" +"%s: %s is unchanged\n" +msgstr "" +"\n" +"%s: %s non ten cambios\n" + +msgid "Couldn't lock file" +msgstr "Non se puido bloquear o ficheiro" + +msgid "Couldn't make backup" +msgstr "Non se puido facer unha copia de seguridade" + +#, c-format +msgid "%s: can't restore %s: %s (your changes are in %s)\n" +msgstr "%s: non se pode restaurar %s: %s (os seus cambios están en %s)\n" diff --git a/po/he.gmo b/po/he.gmo index 5b38b13f..f187b2e9 100644 Binary files a/po/he.gmo and b/po/he.gmo differ diff --git a/po/he.po b/po/he.po index 6a72fa70..60e2183c 100644 --- a/po/he.po +++ b/po/he.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: shadow\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" "PO-Revision-Date: 2004-07-21 23:59+0300\n" "Last-Translator: Lior Kaplan \n" "Language-Team: Hebrew \n" @@ -224,7 +224,7 @@ msgid "never\n" msgstr "אף פעם\n" #, c-format -msgid "password must be changed" +msgid "password must be changed\n" msgstr "" #, fuzzy, c-format @@ -422,7 +422,7 @@ msgstr "לא יכול לשחרר נעילה של קובץ הסיסמאות.\n" #, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -432,11 +432,15 @@ msgid "" msgstr "" #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: לא יכול לנעול קובץ סיסמאות\n" +msgid "%s: can't lock group file\n" +msgstr "" #, c-format -msgid "%s: can't lock shadow file\n" +msgid "%s: can't open group file\n" +msgstr "" + +#, fuzzy, c-format +msgid "%s: can't lock gshadow file\n" msgstr "%s: לא יכול לנעול קובץ צל\n" #, c-format @@ -451,8 +455,8 @@ msgstr "%s: שורה %d: שורה ארוכה מידי\n" msgid "%s: line %d: missing new password\n" msgstr "%s: שורה %d: חסרה סיסמה חדשה\n" -#, c-format -msgid "%s: line %d: unknown user %s\n" +#, fuzzy, c-format +msgid "%s: line %d: unknown group %s\n" msgstr "%s: שורה %d: משתמש לא מוכר %s\n" #, c-format @@ -471,6 +475,29 @@ msgstr "%s: שגיאה בעדכון קובץ צל\n" msgid "%s: error updating password file\n" msgstr "%s: שגיאה בעדכון קובץ סיסמאות\n" +#, 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 "" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: לא יכול לנעול קובץ סיסמאות\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s: לא יכול לנעול קובץ צל\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s: שורה %d: משתמש לא מוכר %s\n" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "שימוש: %s [-s shell] [name]\n" @@ -829,14 +856,6 @@ msgstr "" msgid "%s: no changes\n" msgstr "" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "" @@ -903,6 +922,10 @@ msgstr "" msgid "**Never logged in**" msgstr "" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "" + #, fuzzy, c-format msgid "Usage: %s [-p] [name]\n" msgstr "שימוש: %s [-p] [name]\n" @@ -950,9 +973,19 @@ msgid "login: PAM Failure, aborting: %s\n" msgstr "" #, c-format -msgid "" -"\n" -"Login incorrect\n" +msgid "%s login: " +msgstr "" + +#, c-format +msgid "login: " +msgstr "" + +#, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "" + +#, c-format +msgid "login: abort requested by PAM\n" msgstr "" #, c-format @@ -1249,6 +1282,7 @@ msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" diff --git a/po/id.gmo b/po/id.gmo index f524d244..8de58fbf 100644 Binary files a/po/id.gmo and b/po/id.gmo differ diff --git a/po/id.po b/po/id.po index cbcdf3fb..bb4d28c1 100644 --- a/po/id.po +++ b/po/id.po @@ -3,11 +3,11 @@ # msgid "" msgstr "" -"Project-Id-Version: shadow\n" +"Project-Id-Version: shadow 4.0.14\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" -"PO-Revision-Date: 2004-04-09 00:12+0700\n" -"Last-Translator: Parlin Imanuel Toh \n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" +"PO-Revision-Date: 2005-12-26 02: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" @@ -73,14 +73,16 @@ msgstr "Lingkungan overflow\n" msgid "You may not change $%s\n" msgstr "Anda tidak boleh mengubah $%s\n" -#, fuzzy, c-format +#, 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 sejak login terakhir. Terkahir di %s pada %s.\n" +msgstr[0] "" +"%d sejak login terakhir.\n" +"Terakhir di %s pada %s.\n" #, c-format msgid "Too many logins.\n" @@ -95,27 +97,26 @@ msgstr "Tidak ada surat." msgid "You have mail." msgstr "Anda memiliki surat." -#, fuzzy msgid "no change" -msgstr "%s: tak ada perubahan\n" +msgstr "tak ada perubahan" msgid "a palindrome" -msgstr "" +msgstr "sebuah palindrom" msgid "case changes only" -msgstr "" +msgstr "hanya perubahan huruf besar/kecil" msgid "too similar" -msgstr "" +msgstr "terlalu mirip" msgid "too simple" -msgstr "" +msgstr "terlalu sederhana" msgid "rotated" -msgstr "" +msgstr "pernah dipakai" msgid "too short" -msgstr "" +msgstr "terlalu pendek" #, c-format msgid "Bad password: %s. " @@ -130,11 +131,11 @@ msgid "passwd: %s\n" msgstr "passwd: %s\n" msgid "passwd: password updated successfully\n" -msgstr "" +msgstr "passwd: kata sandi diperbaharui dengan sukses\n" -#, fuzzy, c-format +#, c-format msgid "Incorrect password for %s.\n" -msgstr "Kata sandi tidak tepat untuk `%s'\n" +msgstr "Kata sandi tidak tepat untuk %s\n" #, c-format msgid "Unable to cd to \"%s\"\n" @@ -157,10 +158,10 @@ msgstr "Tidak dapat mengubah direktori root ke \"%s\"\n" msgid "No utmp entry. You must exec \"login\" from the lowest level \"sh\"" msgstr "" +"Tanpa entri utmp. Anda mesti menjalankan \"login\" dari level terendah \"sh\"" -#, fuzzy msgid "Unable to determine your tty name." -msgstr "%s: Tidak dapat menentukan nama pengguna anda.\n" +msgstr "Tak dapat menentukan nama tty anda." #, c-format msgid "malloc(%d) failed\n" @@ -190,6 +191,22 @@ msgid "" "\t\t\t\tchange to MAX_DAYS\n" " -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n" msgstr "" +"Penggunaan: chage [pilihan-pilihan] pengguna\n" +"\n" +"Pilihan-pilihan:\n" +" -d, --lastday LAST_DAY\tatur pergantian password terakhir pada LAST_DAY\n" +" -E, --expiredate EXPIRE_DATE\tatur kadaluarsa akun pada tanggal " +"EXPIRE_DATE\n" +" -h, --help\t\t\ttampilkan pesan bantuan ini dan keluar\n" +" -I, --inactive INACTIVE\tatur masa inaktif kata sandi setelah kadaluarsa\n" +"\t\t\t\tpada INACTIVE\n" +" -l, --list\t\t\ttampilkan informasi umur akun\n" +" -m, --mindays MIN_DAYS\tatur jumlah hari minimum sebelum kata sandi\n" +"\t\t\t\tdiganti menjadi MIN_DAYS\n" +" -M, --maxdays MAX_DAYS\tatur jumlah hari maksimum sebelum kata sandi\n" +"\t\t\t\tdiganti menjadi MAX_DAYS\n" +" -W, --warndays WARN_DAYS\tatur hari peringatan kadaluarsa menjadi " +"WARN_DAYS\n" #, c-format msgid "Enter the new value, or press ENTER for the default\n" @@ -213,49 +230,49 @@ msgstr "Kata Sandi Tak-aktif" msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Waktu Kadaluarsa Akun (TTTT-MM-HH)" -#, fuzzy, c-format +#, c-format msgid "Last password change\t\t\t\t\t: " -msgstr "Penggantian Kata Sandi Terakhir (TTTT-MM-HH)" +msgstr "Penggantian kata sandi terakhir\t\t\t\t\t: " -#, fuzzy, c-format +#, c-format msgid "never\n" -msgstr "Tidak Pernah\n" +msgstr "tak pernah\n" -#, fuzzy, c-format -msgid "password must be changed" -msgstr "Password telah diubah.\n" +#, c-format +msgid "password must be changed\n" +msgstr "password mesti diubah\n" -#, fuzzy, c-format +#, c-format msgid "Password expires\t\t\t\t\t: " -msgstr "Kata Sandi Kadaluarsa:\t" +msgstr "Kata sandi kadaluarsa\t\t\t\t\t: " -#, fuzzy, c-format +#, c-format msgid "Password inactive\t\t\t\t\t: " -msgstr "Kata Sandi Tidak Aktif:\t" +msgstr "Kata sandi tak aktif\t\t\t\t\t: " -#, fuzzy, c-format +#, c-format msgid "Account expires\t\t\t\t\t\t: " -msgstr "Akun Kadaluarsa:\t" +msgstr "Akun kadaluarsa\t\t\t\t\t\t: " #, c-format msgid "Minimum number of days between password change\t\t: %ld\n" -msgstr "" +msgstr "Jumlah hari minimum antara penggantian password\t\t: %ld\n" #, c-format msgid "Maximum number of days between password change\t\t: %ld\n" -msgstr "" +msgstr "Jumlah hari maksimum antara penggantian password\t\t: %ld\n" #, c-format msgid "Number of days of warning before password expires\t: %ld\n" -msgstr "" +msgstr "Jumlah hari pemberian peringatan sebelum kadaluarsa\t: %ld\n" #, c-format msgid "%s: do not include \"l\" with other flags\n" msgstr "%s: jangan gabungkan \"l\" dengan flag lain\n" -#, fuzzy, c-format +#, c-format msgid "%s: Permission denied.\n" -msgstr "%s: ijin ditolak\n" +msgstr "%s: ijin ditolak.\n" #, c-format msgid "%s: PAM authentication failed\n" @@ -269,9 +286,9 @@ msgstr "%s: tidak dapat membuka berkas kata sandi\n" msgid "%s: unknown user %s\n" msgstr "%s: pengguna %s tak dikenal\n" -#, fuzzy, c-format +#, c-format msgid "%s: the shadow password file is not present\n" -msgstr "%s: tidak dapat membuka berkas kata sandi bayangan\n" +msgstr "%s: tak terdapat berkas kata sandi bayangan\n" #, c-format msgid "%s: can't lock shadow password file\n" @@ -283,7 +300,7 @@ msgstr "%s: tidak dapat membuka berkas kata sandi bayangan\n" #, c-format msgid "%s: failed to drop privileges (%s)\n" -msgstr "" +msgstr "%s: gagal membuang hak (%s)\n" #, c-format msgid "Changing the aging information for %s\n" @@ -332,23 +349,23 @@ msgstr "\tNama Lengkap: %s\n" msgid "Room Number" msgstr "Nomor Ruangan" -#, fuzzy, c-format +#, c-format msgid "\tRoom Number: %s\n" -msgstr "Nomor Ruangan" +msgstr "\tNomor Ruangan: %s\n" msgid "Work Phone" msgstr "Telepon Kantor" -#, fuzzy, c-format +#, c-format msgid "\tWork Phone: %s\n" -msgstr "Telepon Kantor" +msgstr "\tTelepon Kantor: %s\n" msgid "Home Phone" msgstr "Telepon Rumah" -#, fuzzy, c-format +#, c-format msgid "\tHome Phone: %s\n" -msgstr "Telepon Rumah" +msgstr "\tTelepon Rumah: %s\n" msgid "Other" msgstr "Lain-lain" @@ -421,9 +438,9 @@ msgstr "Tidak dapat menyimpan perubahan berkas kata sandi.\n" msgid "Cannot unlock the password file.\n" msgstr "Tidak dapat membuka kunci berkas kata sandi.\n" -#, c-format +#, fuzzy, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -431,13 +448,24 @@ msgid "" " -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n" "\t\t\tpasswords are not encrypted\n" msgstr "" +"Penggunaan: chpasswd [pilihan-pilihan]\n" +"\n" +"Pilihan-pilihan:\n" +" -e, --encrypted\tkata sandi yang diberikan telah terenkripsi\n" +" -h, --help\t\ttampilkan pesan bantuan ini dan keluar\n" +" -m, --md5\t\tgunakan enkripsi MD5 daripada DES bila kata sandi\n" +"\t\t\tyang diberikan tak terenkripsi\n" #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: tidak dapat mengunci berkas kata sandi\n" +msgid "%s: can't lock group file\n" +msgstr "%s: tidak dapat mengunci berkas grup\n" #, c-format -msgid "%s: can't lock shadow file\n" +msgid "%s: can't open group file\n" +msgstr "%s: tidak dapat membuka berkas grup\n" + +#, fuzzy, c-format +msgid "%s: can't lock gshadow file\n" msgstr "%s: tidak dapat mengunci berkas kata sandi bayangan\n" #, c-format @@ -452,8 +480,8 @@ msgstr "%s: baris %d: baris terlalu panjang\n" msgid "%s: line %d: missing new password\n" msgstr "%s: baris %d: kata sandi baru hilang\n" -#, c-format -msgid "%s: line %d: unknown user %s\n" +#, fuzzy, c-format +msgid "%s: line %d: unknown group %s\n" msgstr "%s: baris %d: pengguna %s tak dikenal\n" #, c-format @@ -472,6 +500,36 @@ msgstr "%s: kesalahan saat memperbaharui berkas kata sandi bayangan\n" msgid "%s: error updating password file\n" msgstr "%s: kesalahan saat memperbaharui berkas kata sandi\n" +#, 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 "" +"Penggunaan: chpasswd [pilihan-pilihan]\n" +"\n" +"Pilihan-pilihan:\n" +" -e, --encrypted\tkata sandi yang diberikan telah terenkripsi\n" +" -h, --help\t\ttampilkan pesan bantuan ini dan keluar\n" +" -m, --md5\t\tgunakan enkripsi MD5 daripada DES bila kata sandi\n" +"\t\t\tyang diberikan tak terenkripsi\n" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: tidak dapat mengunci berkas kata sandi\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s: tidak dapat mengunci berkas kata sandi bayangan\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s: baris %d: pengguna %s tak dikenal\n" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "Penggunaan: %s [-s shell] [nama]\n" @@ -518,10 +576,23 @@ msgid "" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" msgstr "" +"Penggunaan: faillog [pilihan-pilihan]\n" +"\n" +"Pilihan-pilihan:\n" +" -a, --all\t\t\ttampilkan record faillog records untuk semua pengguna\n" +" -h, --help\t\t\ttampilkan pesan bantuan ini dan keluar\n" +" -l, --lock-time DTK\t\tsetelah kegagalan login blok akun selama DTK detik\n" +" -m, --maximum MAX\t\tatur penghitung kegagalan login maksimum pada MAX\n" +" -r, --reset\t\t\treset penghitung kegagalan login\n" +" -t, --time HARI\t\ttampilkan record faillog yang lebih baru dari HARI\n" +" -u, --user NAMA\t\ttampilkan record faillog atau atur penghitung " +"kegagalan\n" +"\t\t\t\tdan batasnya (bila digunakan dengan -r, -m atau -l) hanya\n" +"\t\t\t\tuntuk pengguna dengan nama NAMA\n" #, c-format msgid "Login Failures Maximum Latest On\n" -msgstr "" +msgstr "Login Gagal Maks. Terakhir Pada\n" #, c-format msgid " [%lds left]" @@ -645,6 +716,15 @@ msgid "" " -o, --non-unique\t\tallow create group with duplicate\n" "\t\t\t\t(non-unique) GID\n" msgstr "" +"Usage: groupadd [pilihan-pilihan] namagroup\n" +"\n" +"Pilihan-pilihan:\n" +" -f, --force\t\tpaksa status sukses saat keluar bila grup telah ada\n" +" -g, --gid GID\t\tgunakan GID untuk grup yang baru ini\n" +" -h, --help\t\t\ttampilkan pesan bantuan ini dan keluar\n" +" -K, --key KEY=VALUE\t\tganti nilai bawaan pada /etc/login.defs\n" +" -o, --non-unique\t\tperbolehkan pembuatan grup dengan GID terduplikasi\n" +"\t\t\t\t(tak-unik)\n" #, c-format msgid "%s: error adding new group entry\n" @@ -654,13 +734,13 @@ msgstr "%s: kesalahan saat menambahkan entri grup yang baru\n" msgid "%s: name %s is not unique\n" msgstr "%s: nama %s tidak unik\n" -#, fuzzy, c-format +#, c-format msgid "%s: GID %u is not unique\n" -msgstr "%s: gid %u tidak unik\n" +msgstr "%s: GID %u tidak unik\n" -#, fuzzy, c-format +#, c-format msgid "%s: can't get unique GID\n" -msgstr "%s: tidak mendapatkan gid yang unik\n" +msgstr "%s: tak mampu mendapatkan GID yang unik\n" #, c-format msgid "%s: %s is not a valid group name\n" @@ -694,9 +774,9 @@ msgstr "%s: tidak dapat membuka berkas grup bayangan\n" msgid "%s: invalid group %s\n" msgstr "%s: grup %s tidak sah\n" -#, fuzzy, c-format +#, c-format msgid "%s: -K requires KEY=VALUE\n" -msgstr "%s: -O memerlukan NAMA=NILAI\n" +msgstr "%s: -K memerlukan NAMA=NILAI\n" #, c-format msgid "%s: group %s exists\n" @@ -738,9 +818,9 @@ msgstr "Penggunaan: groupmod [-g gid [-o]] [-n nama] grup\n" msgid "%s: %s not found in /etc/group\n" msgstr "%s: %s tidak ditemukan dalam /etc/group\n" -#, fuzzy, c-format +#, c-format msgid "%s: %u is not a unique GID\n" -msgstr "%s: %u bukan gid yang unik\n" +msgstr "%s: %u bukan GID yang unik\n" #, c-format msgid "%s: %s is not a unique name\n" @@ -754,9 +834,9 @@ msgstr "Penggunaan: %s [-r] [-s] [grup [gbayangan]]\n" msgid "Usage: %s [-r] [-s] [group]\n" msgstr "Penggunaan: %s [-r] [-s] [grup]\n" -#, fuzzy, c-format +#, c-format msgid "No\n" -msgstr "Tidak" +msgstr "Tidak\n" #, c-format msgid "%s: -s and -r are incompatibile\n" @@ -830,14 +910,6 @@ msgstr "%s: berkas-berkas telah diperbaharui\n" msgid "%s: no changes\n" msgstr "%s: tak ada perubahan\n" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "%s: tidak dapat mengunci berkas grup\n" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "%s: tidak dapat membuka berkas grup\n" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "%s: tidak dapat mengunci berkas grup bayangan\n" @@ -892,6 +964,13 @@ msgid "" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" " -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n" msgstr "" +"Penggunaan: lastlog [pilihan-pilihan]\n" +"\n" +"Pilihan-pilihan:\n" +" -b, --before HARI\tcetak hanya record lastlog yang lebih tua dari HARI\n" +" -h, --help\t\ttampilkan pesan bantuan ini dan keluar\n" +" -t, --time HARI\tcetak hanya record lastlog yang lebih baru dari HARI\n" +" -u, --user NAMA\tcetak record lastlog untuk pengguna dengan nama NAMA\n" #, c-format msgid "Username Port From Latest\n" @@ -902,7 +981,11 @@ msgid "Username Port Latest\n" msgstr "Nama pengguna Port Terakhir\n" msgid "**Never logged in**" -msgstr "**Tidak pernah log in**" +msgstr "**Tak pernah log in**" + +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "" #, c-format msgid "Usage: %s [-p] [name]\n" @@ -954,13 +1037,27 @@ msgstr " pada `%.100s'" #, c-format msgid "login: PAM Failure, aborting: %s\n" +msgstr "login: Kegagalan PAM, berhenti: %s\n" + +#, fuzzy, c-format +msgid "%s login: " msgstr "" +"\n" +"%s login: " #, fuzzy, c-format -msgid "" +msgid "login: " +msgstr "" "\n" -"Login incorrect\n" -msgstr "Login tidak tepat" +"%s login: " + +#, fuzzy, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "Jumlah hari maksimum antara penggantian password\t\t: %ld\n" + +#, c-format +msgid "login: abort requested by PAM\n" +msgstr "" #, c-format msgid "" @@ -975,7 +1072,7 @@ msgstr "Login tidak tepat" #, c-format msgid "%s: failure forking: %s" -msgstr "" +msgstr "%s: gagal membuat proses: %s" msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "Perhatian: login dibolehkan setelah penguncian sementara.\n" @@ -996,6 +1093,8 @@ msgid "" "login time exceeded\n" "\n" msgstr "" +"waktu login telah berlebihan\n" +"\n" #, c-format msgid "Usage: newgrp [-] [group]\n" @@ -1005,9 +1104,9 @@ msgstr "Penggunaan: newgrp [-] [grup]\n" msgid "Usage: sg group [[-c] command]\n" msgstr "Penggunaan: sg grup [[-c] perintah]\n" -#, fuzzy, c-format +#, c-format msgid "unknown UID: %u\n" -msgstr "GID tidak dikenal: %lu\n" +msgstr "UID tak dikenal: %u\n" #, c-format msgid "unknown GID: %lu\n" @@ -1042,35 +1141,35 @@ msgstr "%s: baris %d: baris tidak sah\n" #, c-format msgid "%s: line %d: can't create GID\n" -msgstr "" +msgstr "%s: baris %d: tak dapat membuat GID\n" #, c-format msgid "%s: line %d: can't create UID\n" -msgstr "" +msgstr "%s: baris %d: tak dapat membuat UID\n" #, c-format msgid "%s: line %d: cannot find user %s\n" -msgstr "" +msgstr "%s: baris %d: tak menemukan pengguna %s\n" #, c-format msgid "%s: line %d: can't update password\n" -msgstr "" +msgstr "%s: baris %d: tak dapat memperbaharui kata sandi\n" #, c-format msgid "%s: line %d: mkdir failed\n" -msgstr "" +msgstr "%s: baris %d: mkdir gagal\n" #, c-format msgid "%s: line %d: chown failed\n" -msgstr "" +msgstr "%s: baris %d: chown gagal\n" #, c-format msgid "%s: line %d: can't update entry\n" -msgstr "" +msgstr "%s: baris %d: tak dapat memperbaharui entri\n" #, c-format msgid "%s: error updating files\n" -msgstr "" +msgstr "%s: kesalahan saat memperbaharui berkas-berkas\n" #, c-format msgid "" @@ -1095,6 +1194,26 @@ msgid "" " -x, --maxdays MAX_DAYS\tset maximim number of days before password\n" "\t\t\t\tchange to MAX_DAYS\n" msgstr "" +"Penggunaan: passwd [pilihan-pilihan] [nama-pengguna]\n" +"\n" +"Pilihan-pilihan:\n" +" -a, --all\t\t\tlaporkan status kata sandi untuk semua akun\n" +" -d, --delete\t\t\thapus password untuk pengguna yang diberikan\n" +" -e, --expire\t\t\tpaksakan kadaluarsa kata sandi untuk akun pengguna\n" +" -h, --help\t\t\ttampilkan pesan bantuan ini dan keluar\n" +" -k, --keep-tokens\t\tganti kata sandi hanya bila telah kadaluarsa\n" +" -i, --inactive INAKTIF\tatur masa inaktif kata sandi setelah kadaluarsa\n" +"\t\t\t\tpada INAKTIF\n" +" -l, --lock\t\t\tblok akun pengguna\n" +" -n, --mindays HARI_MIN\tatur jumlah hari minimum sebelum kata sandi\n" +"\t\t\t\tdiganti pada HARI_MIN\n" +" -q, --quiet\t\t\tmode tenang\n" +" -r, --repository REPOSITORI\tubah kata sandi pada repositori REPOSITORI\n" +" -S, --status\t\t\tlaporkan status kata sandi dari akun pengguna\n" +" -u, --unlock\t\t\tbuka bloking akun pengguna\n" +" -w, --warndays HARI\tatur hari peringatan kadaluarsa pada HARI\n" +" -x, --maxdays HARI_MAKS\tatur jumlah hari maksimum sebelum kata sandi\n" +"\t\t\t\tdiganti pada HARI_MAKS\n" msgid "Old password: " msgstr "Kata sandi lama: " @@ -1142,9 +1261,9 @@ msgstr "%s: kehabisan memori\n" msgid "%s: repository %s not supported\n" msgstr "%s: repositori %s tidak didukung\n" -#, fuzzy, c-format +#, c-format msgid "%s: You may not view or modify password information for %s.\n" -msgstr "Anda tidak boleh mengubah shell untuk %s.\n" +msgstr "%s: Anda tak boleh melihat atau mengubah info kata sandi untuk %s.\n" #, c-format msgid "Changing password for %s\n" @@ -1158,89 +1277,89 @@ msgstr "Kata sandi untuk %s tidak diubah.\n" msgid "Password changed.\n" msgstr "Password telah diubah.\n" -#, fuzzy, c-format +#, c-format msgid "Password set to expire.\n" -msgstr "Kata sandi anda telah kadaluarsa." +msgstr "Kata sandi dibuat kadaluarsa.\n" #, c-format msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n" -msgstr "" +msgstr "Penggunaan: %s [-q] [-r] [-s] [passwd [shadow]]\n" #, c-format msgid "invalid password file entry\n" -msgstr "" +msgstr "entri kata sandi tak sah\n" #, c-format msgid "duplicate password entry\n" -msgstr "" +msgstr "entri kata sandi berduplikat\n" #, c-format msgid "invalid user name '%s'\n" -msgstr "" +msgstr "nama pengguna tak sah '%s'\n" #, c-format msgid "user %s: no group %u\n" -msgstr "" +msgstr "pengguna %s: tak ada grup %u\n" #, c-format msgid "user %s: directory %s does not exist\n" -msgstr "" +msgstr "pengguna %s: tak terdapat direktori %s\n" #, c-format msgid "user %s: program %s does not exist\n" -msgstr "" +msgstr "pengguna %s: tak terdapat program %s\n" #, c-format msgid "invalid shadow password file entry\n" -msgstr "" +msgstr "entri kata sandi bayangan tak sah\n" #, c-format msgid "duplicate shadow password entry\n" -msgstr "" +msgstr "entri kata sandi bayangan terduplikasi\n" #, c-format msgid "no matching password file entry\n" -msgstr "" +msgstr "tak terdapat entri kata sandi yang cocok\n" #, c-format msgid "user %s: last password change in the future\n" -msgstr "" +msgstr "pengguna %s: pergantian kata sandi terakhir terjadi dimasa depan\n" #, c-format msgid "%s: can't lock passwd file\n" -msgstr "" +msgstr "%s: tak dapat mengunci berkas passwd\n" #, c-format msgid "%s: can't open passwd file\n" -msgstr "" +msgstr "%s: tak dapat membuka berkas passwd\n" #, c-format msgid "%s: can't remove shadow entry for %s\n" -msgstr "" +msgstr "%s: tak dapat menghapus entri bayangan untuk %s\n" #, c-format msgid "%s: can't update passwd entry for %s\n" -msgstr "" +msgstr "%s: tak dapat menghapus entri passwd untuk %s\n" #, c-format msgid "%s: can't update shadow file\n" -msgstr "" +msgstr "%s: tak dapat memperbaharui berkas shadow\n" #, c-format msgid "%s: can't update passwd file\n" -msgstr "" +msgstr "%s: tak dapat memperbaharui berkas passwd\n" #, c-format msgid "%s: can't update entry for user %s\n" -msgstr "" +msgstr "%s: tak dapat memperbaharui entri untuk pengguna %s\n" #, c-format msgid "%s: can't delete shadow password file\n" -msgstr "" +msgstr "%s: tak dapat menghapus berkas kata sandi bayangan\n" #, c-format msgid "Access to su to that account DENIED.\n" -msgstr "Akses su untuk account it DITOLAK.\n" +msgstr "Akses su untuk account itu DITOLAK.\n" #, c-format msgid "Password authentication bypassed.\n" @@ -1253,15 +1372,16 @@ msgstr "Silakan masukkan kata sandi anda SENDIRI sebagai otentikasi.\n" msgid "Sorry." msgstr "Maaf." -#, fuzzy, c-format +#, c-format msgid "%s: %s\n" -msgstr "passwd: %s\n" +msgstr "%s: %s\n" -#, c-format +#, fuzzy, c-format msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" @@ -1269,6 +1389,16 @@ msgid "" "\t\t\t\tthe same shell\n" " -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n" msgstr "" +"Penggunaan: su [pilihan-pilihan] [nama-pengguna]\n" +"\n" +"Pilihan-pilihan:\n" +" -h, --help\t\t\ttampilkan pesan bantuan ini dan keluar\n" +" -, -l, --login\t\tbuat shell menjadi shell login\n" +" -m, -p,\n" +" --preserve-environment\tjangan reset variabel lingkungan, dan " +"pertahankan\n" +"\t\t\t\tshell yang sama\n" +" -s, --shell SHELL\t\tgunakan shell SHELL daripada bawaan di passwd\n" #, c-format msgid "%s: must be run from a terminal\n" @@ -1280,14 +1410,14 @@ msgstr "%s: pam_start: kesalahan %d\n" #, c-format msgid "Unknown id: %s\n" -msgstr "Id tidak dikenal: %s\n" +msgstr "Id tak dikenal: %s\n" #, c-format msgid "You are not authorized to su %s\n" -msgstr "Anda tidak diperbolehkan untuk su %s\n" +msgstr "Anda tak diperbolehkan untuk su %s\n" msgid "(Enter your own password)" -msgstr "(Masukkan password anda sendiri)" +msgstr "(Masukkan kata sandi anda sendiri)" #, c-format msgid "" @@ -1316,42 +1446,42 @@ msgid "" msgstr "" "\n" "Ketikkan control-d untuk melanjutkan startup normal,\n" -"(ata berikan kata sandi root untuk pengelolaan sistem):" +"(atau berikan kata sandi root untuk pengelolaan sistem):" msgid "Entering System Maintenance Mode\n" msgstr "Memasuki Mode Pengelolaan Sistem\n" #, c-format msgid "%s: invalid numeric argument `%s'\n" -msgstr "" +msgstr "%s: argumen numerik tak sah `%s'\n" -#, fuzzy, c-format +#, c-format msgid "%s: unknown GID %s\n" -msgstr "%s: pengguna %s tak dikenal\n" +msgstr "%s: GID %s tak dikenal\n" #, c-format msgid "%s: unknown group %s\n" -msgstr "" +msgstr "%s: grup %s tak dikenal\n" #, c-format msgid "%s: cannot create new defaults file\n" -msgstr "" +msgstr "%s: tak dapat membuat berkas-berkas bawaan yang baru\n" #, c-format msgid "%s: cannot open new defaults file\n" -msgstr "" +msgstr "%s: tak dapat membuka berkas-berkas bawaan yang baru\n" #, c-format msgid "%s: rename: %s" -msgstr "" +msgstr "%s: ubah nama: %s" #, c-format msgid "%s: group `%s' is a NIS group.\n" -msgstr "" +msgstr "%s: grup `%s' merupakan grup NIS.\n" #, c-format msgid "%s: too many groups specified (max %d).\n" -msgstr "" +msgstr "%s: grup yang diberikan terlalu banyak (maks %d).\n" #, c-format msgid "" @@ -1382,129 +1512,156 @@ msgid "" " -s, --shell SHELL\t\tthe login shell for the new user account\n" " -u, --uid UID\t\t\tforce use the UID for the new user account\n" msgstr "" +"Penggunaan: useradd [pilihan-pilihan] NAMA-LOGIN\n" +"\n" +"Options:\n" +" -b, --base-dir BASE_DIR\tdirektori awal untuk direktori rumah dari\n" +"\t\t\t\tpengguna baru\n" +" -c, --comment KOMENTAR\t\tatur ruas GECOS untuk pengguna baru\n" +" -d, --home-dir DIR_RUMAH\tdirektori rumah untuk pengguna baru\n" +" -D, --defaults\t\tcetak atau simpan konfigurasi bawaan useradd\n" +" -e, --expiredate KADALUARSA\tatur tanggal kadaluarsa pada KADALUARSA\n" +" -f, --inactive INAKTIF\tatur masa inaktif kata sandi setelah\n" +"\t\t\t\tkadaluarsa menjadi INAKTIF\n" +" -g, --gid GRUP\t\tpaksakan grup GRUP untuk pengguna baru\n" +" -G, --groups GRUP-GRUP\t\tdaftar grup-grup tambahan untuk \n" +"\t\t\t\tpengguna baru\n" +" -h, --help\t\t\ttampilkan pesan bantuan ini dan keluar\n" +" -k, --skel SKEL_DIR\t\tberikan direktori skel alternatif\n" +" -K, --key KEY=VALUE\t\tganti nilai-nilai bawaan pada /etc/login.defs\n" +" -m, --create-home\t\tbuat direktori rumah untuk pengguna baru\n" +" -o, --non-unique\t\tperbolehkan pembuatan pengguna dengan \n" +"\t\t\t\tUID terduplikasi (tak-unik)\n" +" -p, --password PASSWORD\tgunakan kata sandi terenkripsi untuk\n" +"\t\t\t\tpengguna baru\n" +" -s, --shell SHELL\t\tshell login untuk pengguna baru\n" +" -u, --uid UID\t\t\tpaksakan uid UID untuk pengguna baru\n" -#, fuzzy, c-format +#, c-format msgid "%s: UID %u is not unique\n" -msgstr "%s: gid %u tidak unik\n" +msgstr "%s: UID %u tidak unik\n" -#, fuzzy, c-format +#, c-format msgid "%s: can't get unique UID\n" -msgstr "%s: tidak mendapatkan gid yang unik\n" +msgstr "%s: tidak bisa mendapatkan UID yang unik\n" #, c-format msgid "%s: invalid base directory `%s'\n" -msgstr "" +msgstr "%s: direktori awal `%s' tak sah\n" #, c-format msgid "%s: invalid comment `%s'\n" -msgstr "" +msgstr "%s: komentar `%s' tak sah\n" #, c-format msgid "%s: invalid home directory `%s'\n" -msgstr "" +msgstr "%s: direktori rumah `%s' tak sah\n" #, c-format msgid "%s: invalid date `%s'\n" -msgstr "" +msgstr "%s: tanggal `%s' tak sah\n" #, c-format msgid "%s: shadow passwords required for -e\n" -msgstr "" +msgstr "%s: kata sandi bayangan dibutuhkan untuk -e\n" #, c-format msgid "%s: shadow passwords required for -f\n" -msgstr "" +msgstr "%s: kata sandi banyangan diperlukan untuk -f\n" #, c-format msgid "%s: invalid field `%s'\n" -msgstr "" +msgstr "%s: ruas `%s' tak sah\n" #, c-format msgid "%s: invalid shell `%s'\n" -msgstr "" +msgstr "%s: shell `%s' tak sah\n" #, c-format msgid "%s: invalid user name '%s'\n" -msgstr "" +msgstr "%s: nama pengguna `%s' tak sah\n" #, c-format msgid "%s: cannot rewrite password file\n" -msgstr "" +msgstr "%s: tak dapat menulis kembali berkas kata sandi\n" #, c-format msgid "%s: cannot rewrite shadow password file\n" -msgstr "" +msgstr "%s: tak dapat menulis kembali berkas kata sandi bayangan\n" #, c-format msgid "%s: unable to lock password file\n" -msgstr "" +msgstr "%s: tak dapat mengunci berkas kata sandi\n" #, c-format msgid "%s: unable to open password file\n" -msgstr "" +msgstr "%s: tak dapat membuka berkas kata sandi\n" #, c-format msgid "%s: cannot lock shadow password file\n" -msgstr "" +msgstr "%s: tak dapat mengunci berkas kata sandi bayangan\n" #, c-format msgid "%s: cannot open shadow password file\n" -msgstr "" +msgstr "%s: tak dapat membuka berkas kata sandi bayangan\n" #, c-format msgid "%s: error locking group file\n" -msgstr "" +msgstr "%s: kesalahan saat mengunci berkas grup\n" #, c-format msgid "%s: error opening group file\n" -msgstr "" +msgstr "%s: kesalahan saat membuka berkas grup\n" #, c-format msgid "%s: error locking shadow group file\n" -msgstr "" +msgstr "%s: kesalahan saat mengunci berkas grup bayangan\n" #, c-format msgid "%s: error opening shadow group file\n" -msgstr "" +msgstr "%s: kesalahan saat membuka berkas grup bayangan\n" #, c-format msgid "%s: error adding new password entry\n" -msgstr "" +msgstr "%s: kesalahan saat menambah entri baru kata sandi\n" #, c-format msgid "%s: error adding new shadow password entry\n" -msgstr "" +msgstr "%s: kesalahan saat menambah entri baru kata sandi bayangan\n" #, c-format msgid "%s: cannot create directory %s\n" -msgstr "" +msgstr "%s: tak dapat membuat direktori %s\n" #, c-format msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n" -msgstr "" +msgstr "Grup bernama \"mail\" tak ada, membuat spul surat dengan mode 0600.\n" #, c-format msgid "Can't create mail spool for user %s.\n" -msgstr "" +msgstr "Tak dapat membuat spul surat untuk pengguna %s.\n" #, c-format msgid "%s: user %s exists\n" -msgstr "" +msgstr "%s: pengguna %s telah ada\n" #, c-format msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" msgstr "" +"%s: grup %s telah ada - jika ingin menambah pengguna ke grup itu, pakai -g.\n" #, c-format msgid "" "%s: warning: the home directory already exists.\n" "Not copying any file from skel directory into it.\n" msgstr "" +"%s: perhatian: direktori rumah telah ada.\n" +"Tak menyalin berkas apapun dari direktori skel ke situ.\n" #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" -msgstr "" +msgstr "%s: perhatian: CREATE_HOME tak didukung, sebaiknya gunakan -m.\n" #, c-format msgid "Usage: %s [-r] name\n" @@ -1512,55 +1669,57 @@ msgstr "Penggunaan: %s [-r] nama\n" #, c-format msgid "%s: error updating group entry\n" -msgstr "" +msgstr "%s: errot memperbaharui entri grup\n" -#, fuzzy, c-format +#, c-format msgid "%s: Cannot remove group %s which is a primary group for another user.\n" -msgstr "%s: tidak dapat menghapus grup utama dari pengguna.\n" +msgstr "" +"%s: tidak dapat menghapus grup %s yg merupakan grup utama dari pengguna " +"lain.\n" #, c-format msgid "%s: cannot open group file\n" -msgstr "" +msgstr "%s: tak dapat membuka berkas grup\n" #, c-format msgid "%s: cannot open shadow group file\n" -msgstr "" +msgstr "%s: tak dapat membuka berkas grup bayangan\n" #, c-format msgid "%s: error deleting password entry\n" -msgstr "" +msgstr "%s: kesalahan saat menghapus entri kata sandi\n" #, c-format msgid "%s: error deleting shadow password entry\n" -msgstr "" +msgstr "%s: kesalahan saat menghapus entri kata sandi bayangan\n" #, c-format msgid "%s: user %s is currently logged in\n" -msgstr "" +msgstr "%s: pengguna %s saat ini sedang login\n" #, c-format msgid "%s: %s not owned by %s, not removing\n" -msgstr "" +msgstr "%s: %s tak dimiliki oleh %s, tidak menghapus\n" #, c-format msgid "%s: warning: can't remove " -msgstr "" +msgstr "%s: perhatian: tak dapat menghapus " #, c-format msgid "%s: user %s does not exist\n" -msgstr "" +msgstr "%s: pengguna %s tak ada\n" #, c-format msgid "%s: user %s is a NIS user\n" -msgstr "" +msgstr "%s: pengguna %s merupakan pengguna NIS\n" #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" -msgstr "" +msgstr "%s: tak menghapus dir %s (karena akan menghapus rumah dari %s)\n" #, c-format msgid "%s: error removing directory %s\n" -msgstr "" +msgstr "%s: kesalahan saat menghapus direktori %s\n" #, c-format msgid "" @@ -1586,72 +1745,92 @@ msgid "" " -u, --uid UID\t\t\tnew UID for the user account\n" " -U, --unlock\t\t\tunlock the user account\n" msgstr "" +"Penggunaan: usermod [pilihan-pilihan] nama-pengguna\n" +"\n" +"Pilihan-pilihan:\n" +" -a, --append GRUP\t\ttambahkan pengguna ke grup tambahan GRUP\n" +" -c, --comment KOMENTAR\t\tnilai baru dari ruas GECOS\n" +" -d, --home DIR_RUMAH\t\tdirektori rumah baru dari pengguna baru\n" +" -e, --expiredate TANGGAL\tatur tanggal kadaluarsa akun pada TANGGAL\n" +" -f, --inactive INAKTIF\tatur masa inaktif setelah kadaluarsa pada INAKTIF\n" +" -g, --gid GRUP\t\tpaksakan GRUP sebagai grup login awalan\n" +" -G, --groups GRUP-GRUP\t\tdaftar grup-grup tambahan\n" +" -h, --help\t\t\ttampilkan pesan bantuan ini dan keluar\n" +" -l, --login LOGIN\t\tnilai baru dari nama pengguna\n" +" -L, --lock\t\t\tblok akun pengguna\n" +" -m, --move-home\t\tpindahkan isi direktori rumah ke lokasi baru\n" +"\t\t\t\t(hanya gunakan dengan -d)\n" +" -o, --non-unique\t\tperbolehkan UID terduplikasi (tak-unik)\n" +" -p, --password PASSWORD\tgunakan kata sandi baru yang terenkripsi\n" +" -s, --shell SHELL\t\tshell login baru bagi pengguna\n" +" -u, --uid UID\t\t\tUID baru untuk pengguna\n" +" -U, --unlock\t\t\tbuka bloking pengguna\n" #, c-format msgid "%s: out of memory in update_group\n" -msgstr "" +msgstr "%s: kehabisan memori saat update_group\n" #, c-format msgid "%s: out of memory in update_gshadow\n" -msgstr "" +msgstr "%s: kehabisan memori saat update_gshadow\n" #, c-format msgid "%s: no flags given\n" -msgstr "" +msgstr "%s: tak diberikan tanda-tanda/bendera\n" #, c-format msgid "%s: shadow passwords required for -e and -f\n" -msgstr "" +msgstr "%s: diperlukan kata sandi bayangan untuk -e dan -f\n" #, c-format msgid "%s: -a flag is ONLY allowed with the -G flag\n" -msgstr "" +msgstr "%s: -a hanya diperbolehkan dengan -G\n" #, c-format msgid "%s: uid %lu is not unique\n" -msgstr "" +msgstr "%s: uid %lu tak unik\n" #, c-format msgid "%s: error changing password entry\n" -msgstr "" +msgstr "%s: kesalahan saat mengganti entri kata sandi\n" #, c-format msgid "%s: error removing password entry\n" -msgstr "" +msgstr "%s: kesalahan saat menghapus entri kata sandi\n" #, c-format msgid "%s: error removing shadow password entry\n" -msgstr "" +msgstr "%s: kesalahan saat menghapus entri kata sandi bayangan\n" #, c-format msgid "%s: directory %s exists\n" -msgstr "" +msgstr "%s: direktori %s telah ada\n" #, c-format msgid "%s: can't create %s\n" -msgstr "" +msgstr "%s: tak dapat membuat %s\n" #, c-format msgid "%s: can't chown %s\n" -msgstr "" +msgstr "%s: tak dapat chown %s\n" #, c-format msgid "%s: warning: failed to completely remove old home directory %s" -msgstr "" +msgstr "%s: perhatian: gagal menghapus direktori rumah lama %s" #, c-format msgid "%s: cannot rename directory %s to %s\n" -msgstr "" +msgstr "%s: tak dapat mengubah nama direktori %s menjadi %s\n" #, c-format msgid "%s: warning: %s not owned by %s\n" -msgstr "" +msgstr "%s: perhatian %s tak dimiliki oleh %s\n" msgid "failed to change mailbox owner" -msgstr "" +msgstr "gagal mengganti pemilik kotak-surat" msgid "failed to rename mailbox" -msgstr "" +msgstr "gagal mengubah nama kotak-surat" #, c-format msgid "" @@ -1664,6 +1843,14 @@ msgid "" " -q, --quiet\t\t\tquiet mode\n" " -s, --shadow\t\t\tedit shadow or gshadow database\n" msgstr "" +"Penggunaan: vipw [pilihan-pilihan]\n" +"\n" +"Pilihan-pilihan:\n" +" -g, --group\t\t\tsunting basisdata grup\n" +" -h, --help\t\t\ttampilkan pesan bantuan ini dan keluar\n" +" -p, --passwd\t\t\tsunting basisdata kata sandi\n" +" -q, --quiet\t\t\tmode tenang\n" +" -s, --shadow\t\t\tsunting basisdata shadow atau gshadow\n" #, c-format msgid "" @@ -1683,31 +1870,9 @@ msgstr "Tidak dapat membuat backup" 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" -#, fuzzy #~ msgid "" -#~ "Usage:\n" -#~ "`vipw' edits /etc/passwd `vipw -s' edits /etc/shadow\n" -#~ "`vigr' edits /etc/group `vigr -s' edits /etc/gshadow\n" -#~ "`{vipw|vigr} -q' quiet mode\n" +#~ "\n" +#~ "Login incorrect\n" #~ msgstr "" -#~ "Penggunaan:\n" -#~ "`vipw' mengedit /etc/passwd `vipw -s' mengedit /etc/shadow\n" -#~ "`vigr' mengedit /etc/group `vigr -s' mengedit /etc/gshadow\n" - -#~ msgid "%s: PAM chauthtok failed\n" -#~ msgstr "%s: chauthok PAM gagal\n" - -#~ msgid "%s: Cannot execute %s" -#~ msgstr "%s: Tidak dapat menjalankan %s" - -#~ msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n" -#~ msgstr "Penggunaan: %s\t[-u uid [-o]] [-g grup] [-G grup,...] \n" - -#~ 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" - -#~ msgid "[-f inactive] [-e expire] " -#~ msgstr "[-f tidak_aktif] [-e kadaluarsa] " - -#~ msgid "[-p passwd] [-L|-U] name\n" -#~ msgstr "[-p kata_sandi] [-L|-U] nama\n" +#~ "\n" +#~ "Login tidak tepat\n" diff --git a/po/it.gmo b/po/it.gmo index aa488c00..f75f1fff 100644 Binary files a/po/it.gmo and b/po/it.gmo differ diff --git a/po/it.po b/po/it.po index b155ffe8..23ec354e 100644 --- a/po/it.po +++ b/po/it.po @@ -2,7 +2,7 @@ # 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-2005. +# Danilo Piazzalunga , 2004-2006. # # Convenzioni utilizzate per tradurre i termini più frequenti: # @@ -23,10 +23,10 @@ # msgid "" msgstr "" -"Project-Id-Version: shadow 4.0.14\n" +"Project-Id-Version: shadow 4.0.15\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" -"PO-Revision-Date: 2005-12-11 02:31+0100\n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" +"PO-Revision-Date: 2006-03-06 21:13+0100\n" "Last-Translator: Danilo Piazzalunga \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" @@ -264,8 +264,8 @@ msgid "never\n" msgstr "mai\n" #, c-format -msgid "password must be changed" -msgstr "la password deve essere cambiata" +msgid "password must be changed\n" +msgstr "la password deve essere cambiata\n" #, c-format msgid "Password expires\t\t\t\t\t: " @@ -467,7 +467,7 @@ msgstr "Impossibile togliere il lock dal file delle password.\n" #, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -475,7 +475,7 @@ msgid "" " -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n" "\t\t\tpasswords are not encrypted\n" msgstr "" -"Uso: chpasswd [OPZIONI]\n" +"Uso: chgpasswd [OPZIONI]\n" "\n" "Opzioni:\n" " -e, --encrypted\tle password fornite sono cifrate\n" @@ -484,12 +484,16 @@ msgstr "" "\t\t\tpassword fornite non sono cifrate\n" #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: impossibile fare il lock del file delle password\n" +msgid "%s: can't lock group file\n" +msgstr "%s: impossibile fare il lock del file dei gruppi\n" #, c-format -msgid "%s: can't lock shadow file\n" -msgstr "%s: impossibile fare il lock del file shadow\n" +msgid "%s: can't open group file\n" +msgstr "%s: impossibile aprire il file dei gruppi\n" + +#, c-format +msgid "%s: can't lock gshadow file\n" +msgstr "%s: impossibile fare il lock del file gshadow\n" #, c-format msgid "%s: can't open shadow file\n" @@ -504,8 +508,8 @@ msgid "%s: line %d: missing new password\n" msgstr "%s: riga %d: manca la nuova password\n" #, c-format -msgid "%s: line %d: unknown user %s\n" -msgstr "%s: riga %d: utente «%s» sconosciuto\n" +msgid "%s: line %d: unknown group %s\n" +msgstr "%s: riga %d: gruppo «%s» sconosciuto\n" #, c-format msgid "%s: line %d: cannot update password entry\n" @@ -523,6 +527,36 @@ msgstr "%s: errore nell'aggiornare il file shadow\n" msgid "%s: error updating password file\n" msgstr "%s: errore nell'aggiornare il file delle password\n" +#, 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 "" +"Uso: chpasswd [OPZIONI]\n" +"\n" +"Opzioni:\n" +" -e, --encrypted\tle password fornite sono cifrate\n" +" -h, --help\t\tmostra questo messaggio di aiuto ed esce\n" +" -m, --md5\t\tusa la cifratura MD5 anziché DES quando le\n" +"\t\t\tpassword fornite non sono cifrate\n" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: impossibile fare il lock del file delle password\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s: impossibile fare il lock del file shadow\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s: riga %d: utente «%s» sconosciuto\n" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "Uso: %s [-s SHELL] [NAME]\n" @@ -913,14 +947,6 @@ msgstr "%s: i file sono stati aggiornati\n" msgid "%s: no changes\n" msgstr "%s: nessuna modifica\n" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "%s: impossibile fare il lock del file dei gruppi\n" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "%s: impossibile aprire il file dei gruppi\n" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "%s: impossibile fare il lock del file dei gruppi shadow\n" @@ -997,6 +1023,10 @@ msgstr "Nome utente Porta Ultimo accesso\n" msgid "**Never logged in**" msgstr "**Nessun accesso effettuato**" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "lastlog: argomento «%s» non previsto\n" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Uso: %s [-p] [NOME]\n" @@ -1051,12 +1081,20 @@ msgid "login: PAM Failure, aborting: %s\n" msgstr "login: PAM ha restituito un errore: %s\n" #, c-format -msgid "" -"\n" -"Login incorrect\n" -msgstr "" -"\n" -"Login non corretto\n" +msgid "%s login: " +msgstr "%s login: " + +#, c-format +msgid "login: " +msgstr "login: " + +#, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "Superato il numero massimo di tentativi (%d)\n" + +#, c-format +msgid "login: abort requested by PAM\n" +msgstr "login: PAM ha richiesto l'uscita immediata\n" #, c-format msgid "" @@ -1388,6 +1426,7 @@ msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" @@ -1398,6 +1437,7 @@ msgstr "" "Uso: su [OPZIONI] [LOGIN]\n" "\n" "Opzioni:\n" +" -c, --command COMANDO\t\tpassa il COMANDO alla shell invocata\n" " -h, --help\t\t\tmostra questo messaggio di aiuto ed esce\n" " -, -l, --login\t\trende la shell una shell di login\n" " -m, -p,\n" diff --git a/po/ja.gmo b/po/ja.gmo index 7093c874..4c7e1d3d 100644 Binary files a/po/ja.gmo and b/po/ja.gmo differ diff --git a/po/ja.po b/po/ja.po index a3780264..fe49928c 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: shadow 1990827\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" "PO-Revision-Date: 2000-06-18 120:22+0900\n" "Last-Translator: Yasuyuki Furukawa \n" "Language-Team: Japanese\n" @@ -223,8 +223,8 @@ msgstr "最後パスワード変更日付 (YYYY-MM-DD)" msgid "never\n" msgstr "なし:\n" -#, fuzzy, c-format -msgid "password must be changed" +#, c-format +msgid "password must be changed\n" msgstr "パスワードは変更されました.\n" #, fuzzy, c-format @@ -424,7 +424,7 @@ msgstr "パスワード・ファイルをロック解除できません.\n" #, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -434,11 +434,15 @@ msgid "" msgstr "" #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: パスワードファイルをロックできません\n" +msgid "%s: can't lock group file\n" +msgstr "%s: グループ・ファイルをロックできません\n" #, c-format -msgid "%s: can't lock shadow file\n" +msgid "%s: can't open group file\n" +msgstr "%s: グループファイルを開けません\n" + +#, fuzzy, c-format +msgid "%s: can't lock gshadow file\n" msgstr "%s: シャドウ・ファイルをロックできません\n" #, c-format @@ -453,8 +457,8 @@ msgstr "%s: %d 行: 1行が長過ぎます\n" msgid "%s: line %d: missing new password\n" msgstr "%s: %d 行: 新規パスワードがありません\n" -#, c-format -msgid "%s: line %d: unknown user %s\n" +#, fuzzy, c-format +msgid "%s: line %d: unknown group %s\n" msgstr "%s: %d 行: 不明なユーザ %s です\n" #, c-format @@ -473,6 +477,29 @@ msgstr "%s: シャドウ・ファイルの更新にエラーです\n" msgid "%s: error updating password file\n" msgstr "%s: パスワード・ファイルの更新のエラーです\n" +#, 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 "" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: パスワードファイルをロックできません\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s: シャドウ・ファイルをロックできません\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s: %d 行: 不明なユーザ %s です\n" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "使用法: %s [-s シェル] [ユーザ名]\n" @@ -831,14 +858,6 @@ msgstr "%s: ファイルは更新されました\n" msgid "%s: no changes\n" msgstr "%s: 変更はありません\n" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "%s: グループ・ファイルをロックできません\n" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "%s: グループファイルを開けません\n" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "%s: シャドウ・グループ・ファイルをロックできません\n" @@ -905,6 +924,10 @@ msgstr "ユーザ名 ポート 最近のログイン\n" msgid "**Never logged in**" msgstr "**一度もログインはありません**" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "使用法: %s [-p] [ユーザ名]\n" @@ -954,10 +977,24 @@ msgid "login: PAM Failure, aborting: %s\n" msgstr "" #, fuzzy, c-format -msgid "" +msgid "%s login: " +msgstr "" "\n" -"Login incorrect\n" -msgstr "ログインが違います" +"%s ログイン: " + +#, fuzzy, c-format +msgid "login: " +msgstr "" +"\n" +"%s ログイン: " + +#, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "" + +#, c-format +msgid "login: abort requested by PAM\n" +msgstr "" #, c-format msgid "" @@ -1258,6 +1295,7 @@ msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" @@ -1678,6 +1716,12 @@ msgstr "バックアップを作成できません" msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s: %sを復旧できませんでした: %s (あなたの変更は%sにあります)\n" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "Login incorrect\n" +#~ msgstr "ログインが違います" + #, fuzzy #~ msgid "" #~ "Usage:\n" diff --git a/po/ko.gmo b/po/ko.gmo index 395a87ce..a9121242 100644 Binary files a/po/ko.gmo and b/po/ko.gmo differ diff --git a/po/ko.po b/po/ko.po index 61403359..fd9edf63 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: shadow 4.0.8\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" "PO-Revision-Date: 2005-04-19 16:02+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" @@ -225,9 +225,9 @@ msgstr "마지막으로 열쇠글 바꾼 날\t\t\t\t\t:" msgid "never\n" msgstr "불가\n" -#, fuzzy, c-format -msgid "password must be changed" -msgstr "열쇠글을 바꿨습니다.\n" +#, c-format +msgid "password must be changed\n" +msgstr "열쇠글을 바꿨습니다\n" #, c-format msgid "Password expires\t\t\t\t\t: " @@ -425,9 +425,9 @@ msgstr "열쇠글 파일 바꾸기를 처리할 수 없습니다.\n" msgid "Cannot unlock the password file.\n" msgstr "열쇠글 파일을 lock할 수 없습니다.\n" -#, c-format +#, fuzzy, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -444,11 +444,15 @@ msgstr "" "\t\t\t열쇠글을 암호화하지 않습니다\n" #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: 열쇠글 파일을 lock할 수 없습니다\n" +msgid "%s: can't lock group file\n" +msgstr "%s: 그룹 파일 잠금을 할 수 없습니다\n" #, c-format -msgid "%s: can't lock shadow file\n" +msgid "%s: can't open group file\n" +msgstr "%s: 그룹 파일을 열 수 없습니다\n" + +#, fuzzy, c-format +msgid "%s: can't lock gshadow file\n" msgstr "%s: 셰도우 파일을 lock할 수 없습니다\n" #, c-format @@ -463,8 +467,8 @@ msgstr "%s: line %d: 너무 깁니다\n" msgid "%s: line %d: missing new password\n" msgstr "%s: line %d: 새로운 열쇠글이 없습니다\n" -#, c-format -msgid "%s: line %d: unknown user %s\n" +#, fuzzy, c-format +msgid "%s: line %d: unknown group %s\n" msgstr "%s: line %d: 알 수 없는 사용자 %s\n" #, c-format @@ -483,6 +487,36 @@ msgstr "%s: 셰도우 파일을 업데이트하는 데 오류발생\n" msgid "%s: error updating password file\n" msgstr "%s: 열쇠글 파일을 업데이트하는 데 오류발생\n" +#, 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 "" +"사용법: chpasswd [옵션]\n" +"\n" +"옵션:\n" +" -e, --encrypted\t열쇠글이 있으면 암호화되어 있습니다\n" +" -h, --help\t\t이 도움말 메세지를 표시하고 끝납니다\n" +" -m, --md5\t\t열쇠글이 있으면 DES가 아니라 MD5 암호화를 사용합니다\n" +"\t\t\t열쇠글을 암호화하지 않습니다\n" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: 열쇠글 파일을 lock할 수 없습니다\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s: 셰도우 파일을 lock할 수 없습니다\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s: line %d: 알 수 없는 사용자 %s\n" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "사용법: %s [-s 쉘] [이름]\n" @@ -854,14 +888,6 @@ msgstr "%s: 파일이 업데이트 되었습니다\n" msgid "%s: no changes\n" msgstr "%s: 바꾸지 않았습니다\n" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "%s: 그룹 파일 잠금을 할 수 없습니다\n" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "%s: 그룹 파일을 열 수 없습니다\n" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "%s: 셰도우 그룹 파일 잠금을 할 수 없습니다\n" @@ -934,6 +960,10 @@ msgstr "사용자이름 포트 최근정보\n" msgid "**Never logged in**" msgstr "**한번도 로그인한 적이 없습니다**" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "사용법: %s [-p] [이름]\n" @@ -987,10 +1017,24 @@ msgid "login: PAM Failure, aborting: %s\n" msgstr "" #, fuzzy, c-format -msgid "" +msgid "%s login: " +msgstr "" "\n" -"Login incorrect\n" -msgstr "로그인이 맞지 않습니다" +"%s 로그인: " + +#, fuzzy, c-format +msgid "login: " +msgstr "" +"\n" +"%s 로그인: " + +#, fuzzy, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "열쇠글 바꿔야 할 최대 날\t\t: %ld\n" + +#, c-format +msgid "login: abort requested by PAM\n" +msgstr "" #, c-format msgid "" @@ -1292,6 +1336,7 @@ msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" @@ -1718,6 +1763,12 @@ msgstr "백업을 만들 수 없습니다" msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s: %s을(를) 복구시킬 수 없습니다: %s (바뀐 사항은 %s에 있습니다)\n" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "Login incorrect\n" +#~ msgstr "로그인이 맞지 않습니다" + #, fuzzy #~ msgid "" #~ "Usage:\n" diff --git a/po/nb.gmo b/po/nb.gmo index cfc0c2ee..c924c4f4 100644 Binary files a/po/nb.gmo and b/po/nb.gmo differ diff --git a/po/nb.po b/po/nb.po index 30b53b01..f6498599 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1,26 +1,23 @@ -# translation of shadow.po to Norwegian (Nynorsk) # translation of shadow.po to Norwegian BokmÃ¥l -# translation of shadow.po to -# translation of shadow.po to Norwegian -# translation of shadow.po to -# Copyright (C) 2004 Free Software Foundation, Inc. +# Copyright (C) 2004, 2006 Free Software Foundation, Inc. # Knut Yrvin , 2004. # Klaus Ade Johnstad , 2004. # Klaus Ade Johnstad , 2004. # HÃ¥vard Korsvoll , 2004. +# Bjørn Steensrud , 2006. # msgid "" msgstr "" -"Project-Id-Version: shadow\n" +"Project-Id-Version: shadow 4.0.15\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" -"PO-Revision-Date: 2004-06-03 21:42+0200\n" -"Last-Translator: HÃ¥vard Korsvoll \n" -"Language-Team: Norwegian (Nynorsk) \n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" +"PO-Revision-Date: 2006-03-12 21:08+0100\n" +"Last-Translator: Bjørn Steensrud \n" +"Language-Team: Norwegian BokmÃ¥l \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" +"X-Generator: KBabel 1.10\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #, c-format @@ -81,15 +78,19 @@ msgstr "Omgivelsene er overfyllt\n" msgid "You may not change $%s\n" msgstr "Du kan ikke endre $%s\n" -#, fuzzy, c-format +#, 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 siden forrige innlogging. Forrige innlogging var %s pÃ¥ %s.\n" -msgstr[1] "%d %s siden forrige innlogging. Forrige innlogging var %s pÃ¥ %s.\n" +msgstr[0] "" +"%d mislykket siden forrige innlogging.\n" +"Forrige var %s pÃ¥ %s.\n" +msgstr[1] "" +"%d mislykte siden forrige innlogging.\n" +"Forrige var %s pÃ¥ %s.\n" #, c-format msgid "Too many logins.\n" @@ -104,27 +105,26 @@ msgstr "Ingen epost." msgid "You have mail." msgstr "Du har epost." -#, fuzzy msgid "no change" -msgstr "%s: ingen endringer\n" +msgstr "ingen endring" msgid "a palindrome" -msgstr "" +msgstr "et palindrom" msgid "case changes only" -msgstr "" +msgstr "bare endring i store/sÃ¥ bokstaver" msgid "too similar" -msgstr "" +msgstr "for likt" msgid "too simple" -msgstr "" +msgstr "for enkelt" msgid "rotated" -msgstr "" +msgstr "rotert" msgid "too short" -msgstr "" +msgstr "for kort" #, c-format msgid "Bad password: %s. " @@ -132,18 +132,18 @@ msgstr "DÃ¥rlig passord: %s. " #, c-format msgid "passwd: pam_start() failed, error %d\n" -msgstr "passwd: pam_start() feilet, feil %d\n" +msgstr "passwd: pam_start() mislyktes, feil %d\n" #, c-format msgid "passwd: %s\n" msgstr "passwd: %s\n" msgid "passwd: password updated successfully\n" -msgstr "" +msgstr "passwd: passorder ble oppdatert\n" -#, fuzzy, c-format +#, c-format msgid "Incorrect password for %s.\n" -msgstr "Feil passord for «%s»\n" +msgstr "Feil passord for «%s».\n" #, c-format msgid "Unable to cd to \"%s\"\n" @@ -165,15 +165,14 @@ msgid "Can't change root directory to \"%s\"\n" msgstr "Kan ikke endre rot mappa til \"%s\"\n" msgid "No utmp entry. You must exec \"login\" from the lowest level \"sh\"" -msgstr "" +msgstr "Ingen oppføring i utmp. Du mÃ¥ kjøre «login» fra «sh» pÃ¥ laveste nivÃ¥" -#, fuzzy msgid "Unable to determine your tty name." -msgstr "%s: Kan ikke avgjøre ditt brukernavn.\n" +msgstr "Kan ikke finne ut ditt terminalnavn." #, c-format msgid "malloc(%d) failed\n" -msgstr "malloc(%d) feilet\n" +msgstr "malloc(%d) mislyktes\n" msgid "Password: " msgstr "Passord: " @@ -199,6 +198,20 @@ msgid "" "\t\t\t\tchange to MAX_DAYS\n" " -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n" msgstr "" +"Bruk: chage [valg] bruker\n" +"\n" +"Valg: -d, --lastday SISTE_DAG\t angi at siste passord-endring skjedde " +"SISTE_DAG\n" +" -E, --expiredate UTLØPSDATO\t angi at kontoen utløper UTLØPSDATO\n" +" -h, .--help\t\t\tvis denne hjelpeteksten og avslutt\n" +" -I, --inaktive INAKTIV\t angi at passordet settes til INAKTIV etter utløp\n" +" -l, --list\t\t\t vis informasjon om kontoens aldring og utløp\n" +" m, --mindays MIN_DAGER\toppgir at passordet først kan endres etter \n" +"\t\t\t\tMIN_DAGER\n" +" M, --maxdays MAKS_DAGER\t oppgir at passordet mÃ¥ endres før det er\n" +"\t\t\t\tgÃ¥tt MAKS_DAGER\n" +" -W, --warndats VARSLDAGER\tetter VARSLDAGER varsles bruker om at\n" +"\t\t\t\tpassordet snart utløper\n" #, c-format msgid "Enter the new value, or press ENTER for the default\n" @@ -215,7 +228,7 @@ msgid "Last Password Change (YYYY-MM-DD)" msgstr "Siste endring av passord (YYYY-MM-DD)" msgid "Password Expiration Warning" -msgstr "Varsel nÃ¥r passordet er utgÃ¥tt pÃ¥ dato" +msgstr "Varsel nÃ¥r passordet snart gÃ¥r ut pÃ¥ dato" msgid "Password Inactive" msgstr "Inaktivt passord" @@ -223,53 +236,53 @@ msgstr "Inaktivt passord" msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Konto utløper (YYYY-MM-DD)" -#, fuzzy, c-format +#, c-format msgid "Last password change\t\t\t\t\t: " -msgstr "Siste endring av passord (YYYY-MM-DD)" +msgstr "Siste endring av passord\t\t\t\t\t: " -#, fuzzy, c-format +#, c-format msgid "never\n" -msgstr "Aldri\n" +msgstr "aldri\n" -#, fuzzy, c-format -msgid "password must be changed" -msgstr "Passordet er endret.\n" +#, c-format +msgid "password must be changed\n" +msgstr "passordet mÃ¥ endres\n" -#, fuzzy, c-format +#, c-format msgid "Password expires\t\t\t\t\t: " -msgstr "Passord utløper:\t" +msgstr "Passord utløper\t\t\t\t\t: " -#, fuzzy, c-format +#, c-format msgid "Password inactive\t\t\t\t\t: " -msgstr "Passord er inaktivt:\t" +msgstr "Passordet inaktivt\t\t\t\t\t: " -#, fuzzy, c-format +#, c-format msgid "Account expires\t\t\t\t\t\t: " -msgstr "Kontoen utløper:\t" +msgstr "Kontoen utløper\t\t\t\t\t: " #, c-format msgid "Minimum number of days between password change\t\t: %ld\n" -msgstr "" +msgstr "Minste antall dager mellom passord-endring\t\t:%ld\n" #, c-format msgid "Maximum number of days between password change\t\t: %ld\n" -msgstr "" +msgstr "Største antall dager mellom passord-endring\t\t:%ld\n" #, c-format msgid "Number of days of warning before password expires\t: %ld\n" -msgstr "" +msgstr "Antall dager med varsling før passordet utløper:\t\t %ld\n" #, c-format msgid "%s: do not include \"l\" with other flags\n" -msgstr "%s: ikke inkluder \"l\" sammen med andre opsjoner\n" +msgstr "%s: ikke ta med «l» sammen med andre valg\n" -#, fuzzy, c-format +#, c-format msgid "%s: Permission denied.\n" -msgstr "%s: ikke tillatelse\n" +msgstr "%s: Ikke tillatelse.\n" #, c-format msgid "%s: PAM authentication failed\n" -msgstr "%s: PAM autentifisering feilet\n" +msgstr "%s: PAM autentisering mislyktes\n" #, c-format msgid "%s: can't open password file\n" @@ -279,9 +292,9 @@ msgstr "%s: kan ikke Ã¥pne passordfila\n" msgid "%s: unknown user %s\n" msgstr "%s: ukjent bruker %s\n" -#, fuzzy, c-format +#, c-format msgid "%s: the shadow password file is not present\n" -msgstr "%s: kan ikke Ã¥pne skyggepassordfila\n" +msgstr "%s: skyggepassordfila finnes ikke\n" #, c-format msgid "%s: can't lock shadow password file\n" @@ -293,7 +306,7 @@ msgstr "%s: kan ikke Ã¥pne skyggepassordfila\n" #, c-format msgid "%s: failed to drop privileges (%s)\n" -msgstr "" +msgstr "%s: klarte ikke minske privilegier (%s)\n" #, c-format msgid "Changing the aging information for %s\n" @@ -324,12 +337,12 @@ msgid "" "Usage: %s [-f full_name] [-r room_no] [-w work_ph]\n" "\t[-h home_ph] [-o other] [user]\n" msgstr "" -"Bruk: %s [-f fullt_navn] [-r room_no] [-w work_ph]\n" -"\t[-h home_ph] [-o other] [bruker]\n" +"Bruk: %s [-f fullt_navn] [-r rom_nr] [-w jobbtlf]\n" +"\t[-h hjemmetlf] [-o annet] [bruker]\n" #, c-format 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" +msgstr "Bruk: %s [-f fullt_navn] [-r rom_nr] [-w jobbtlf] [-h hjemmetlf]\n" msgid "Full Name" msgstr "Fullstendig navn" @@ -341,26 +354,26 @@ msgstr "\tFullstendig navn: %s\n" msgid "Room Number" msgstr "Romnummer" -#, fuzzy, c-format +#, c-format msgid "\tRoom Number: %s\n" -msgstr "Romnummer" +msgstr "\tRomnummer: %s\n" msgid "Work Phone" msgstr "Jobbtelefon" -#, fuzzy, c-format +#, c-format msgid "\tWork Phone: %s\n" -msgstr "Jobbtelefon" +msgstr "\tJobbtelefon: %s\n" msgid "Home Phone" msgstr "Hjemtelefon" -#, fuzzy, c-format +#, c-format msgid "\tHome Phone: %s\n" -msgstr "Hjemtelefon" +msgstr "\tHjemtelefon: %s\n" msgid "Other" -msgstr "Andre" +msgstr "Annet" #, c-format msgid "%s: Cannot determine your user name.\n" @@ -380,23 +393,23 @@ msgstr "Endrer brukerinformasjon for %s\n" #, c-format msgid "%s: invalid name: \"%s\"\n" -msgstr "%s: Ugyldig navn: \"%s\"\n" +msgstr "%s: ugyldig navn: «%s»\n" #, c-format msgid "%s: invalid room number: \"%s\"\n" -msgstr "%s: ugyldig romnummer: \"%s\"\n" +msgstr "%s: ugyldig romnummer: «%s»\n" #, c-format msgid "%s: invalid work phone: \"%s\"\n" -msgstr "%s: ugyldig jobbtelefon: \"%s\"\n" +msgstr "%s: ugyldig jobbtelefon: «%s»\n" #, c-format msgid "%s: invalid home phone: \"%s\"\n" -msgstr "%s: ugyldig hjemtelefon: \"%s\"\n" +msgstr "%s: ugyldig hjemtelefon: «%s»\n" #, c-format msgid "%s: \"%s\" contains illegal characters\n" -msgstr "%s: \"%s\" inneholder ugyldige tegn\n" +msgstr "%s: «%s» inneholder ugyldige tegn\n" #, c-format msgid "%s: fields too long\n" @@ -432,7 +445,7 @@ msgstr "Kan ikke lÃ¥se opp passordfila.\n" #, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -440,18 +453,29 @@ msgid "" " -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n" "\t\t\tpasswords are not encrypted\n" msgstr "" +"Bruk: chgpasswd [valg]\n" +"\n" +"Valg:\n" +" -e, --encrypted\t oppgitte passord er krypterte\n" +" h, --help\t\tvis denne hjelpeteksten og avslutt\n" +" -m, --md5\t\tbruk MD5-kryptering i stedet for DES nÃ¥r de oppgitte\n" +"\t\t\tpassordene ikke er krypterte\n" #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: kan ikke lÃ¥se passordfila\n" +msgid "%s: can't lock group file\n" +msgstr "%s: klarer ikke Ã¥ lÃ¥se gruppefila\n" #, c-format -msgid "%s: can't lock shadow file\n" -msgstr "%s: kan ikke lÃ¥se shadow filen\n" +msgid "%s: can't open group file\n" +msgstr "%s: klarer ikke Ã¥ Ã¥pne gruppefila\n" + +#, c-format +msgid "%s: can't lock gshadow file\n" +msgstr "%s: klarer ikke Ã¥ lÃ¥se gshadow-fila\n" #, c-format msgid "%s: can't open shadow file\n" -msgstr "%s: kan ikke Ã¥pne shadow filen\n" +msgstr "%s: kan ikke Ã¥pne shadow-fila\n" #, c-format msgid "%s: line %d: line too long\n" @@ -462,8 +486,8 @@ msgid "%s: line %d: missing new password\n" msgstr "%s: linje %d: mangler nytt passord\n" #, c-format -msgid "%s: line %d: unknown user %s\n" -msgstr "%s: linje %d: ukjent bruker %s\n" +msgid "%s: line %d: unknown group %s\n" +msgstr "%s: linje %d: ukjent gruppe %s\n" #, c-format msgid "%s: line %d: cannot update password entry\n" @@ -475,22 +499,52 @@ msgstr "%s: feil funnet, endringer er ikke utført\n" #, c-format msgid "%s: error updating shadow file\n" -msgstr "%s: feil ved oppdatering av skyggefilen\n" +msgstr "%s: feil ved oppdatering av shadow-fila\n" #, c-format msgid "%s: error updating password file\n" -msgstr "%s: feil ved oppdatering av passordfilen\n" +msgstr "%s: feil ved oppdatering av passordfila\n" + +#, 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 "" +"Bruk: chpasswd [valg]\n" +"\n" +"Valg:\n" +" -e, --encrypted\t oppgitte passord er krypterte\n" +" h, --help\t\tvis denne hjelpeteksten og avslutt\n" +" -m, --md5\t\tbruk MD5-kryptering i stedet for DES nÃ¥r de oppgitte\n" +"\t\t\tpassordene ikke er krypterte\n" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: kan ikke lÃ¥se passordfila\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s: kan ikke lÃ¥se shadow-fila\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s: linje %d: ukjent bruker %s\n" #, c-format msgid "Usage: %s [-s shell] [name]\n" -msgstr "Bruk: %s [-s skjell] [navn]\n" +msgstr "Bruk: %s [-s skall] [navn]\n" msgid "Login Shell" msgstr "Innloggingsskall" #, c-format msgid "You may not change the shell for %s.\n" -msgstr "Du kan ikke endre skall til %s.\n" +msgstr "Du kan ikke endre skallet til %s.\n" #, c-format msgid "Changing the login shell for %s\n" @@ -527,10 +581,22 @@ msgid "" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" msgstr "" +"Bruk: faillog [valg]\n" +"\n" +"Valg:\n" +" -a, --all\t\t\t vis faillog-oppføringer for alle brukere\n" +" -h, --help\t\t\tvis denne hjelpeteksten og avslutt\n" +" -l, --lock-time SEK\t\tetter mislykket innlogging, lÃ¥s kontoen i SEK\n" +"\t\t\t\t\tsekunder\n" +" -m, --maximum MAX\t\tsett største antall mislykte innlogginger til MAX\n" +" -r, --reset\t\t\tnullstill tellerne for mislykte innlogginger\n" +" -t, --time DAGER\t\tvis mislykte innlogginger nyere enn DAGER\n" +" -u, --user BRUKER\t\tvis mislykte innlogginger eller styr tellene og\n" +"\t\t\t\tgrenseverdiene (med -r, -m eller -l) bare for bruker BRUKER\n" #, c-format msgid "Login Failures Maximum Latest On\n" -msgstr "" +msgstr "Logginn Mislykt Maksimum Siste PÃ¥\n" #, c-format msgid " [%lds left]" @@ -600,7 +666,7 @@ msgid "New Password: " msgstr "Nytt passord: " msgid "Re-enter new password: " -msgstr "Skriv inn passordet pÃ¥nytt: " +msgstr "Skriv inn passordet pÃ¥ nytt: " msgid "They don't match; try again" msgstr "Passordene var ikke like, prøv igjen" @@ -654,6 +720,17 @@ msgid "" " -o, --non-unique\t\tallow create group with duplicate\n" "\t\t\t\t(non-unique) GID\n" msgstr "" +"Bruk: groupadd [valg] gruppe\n" +"\n" +"Valg:\n" +" -f, --force\t\ttving fram normal avslutning hvis den oppgitte\n" +"\t\t\t\tgruppa finnes fra før\n" +" -g, --gid GID\t\t bruk GID for den nye gruppa\n" +" -h, --help\t\t\tvis denne hjelpeteksten og avslutt\n" +" -K, --key NØKKEL=VERDI\t\t overstyrer standardverdier\n" +"\t\t\t\t fra /etc/login.defs\n" +" -o, --non-unique\t\ttillat Ã¥ opprette en gruppe med duplisert\n" +"\t\t\t\tGID\n" #, c-format msgid "%s: error adding new group entry\n" @@ -661,15 +738,15 @@ msgstr "%s: feil ved oppretting av ny gruppeoppføring\n" #, c-format msgid "%s: name %s is not unique\n" -msgstr "%s: navn %s er ikke unikt\n" +msgstr "%s: navn %s er ikke entydig\n" -#, fuzzy, c-format +#, c-format msgid "%s: GID %u is not unique\n" -msgstr "%s: gid %u er ikke unikt\n" +msgstr "%s: GID %u er ikke entydig\n" -#, fuzzy, c-format +#, c-format msgid "%s: can't get unique GID\n" -msgstr "%s: klarer ikke Ã¥ fÃ¥ unik gid\n" +msgstr "%s: klarer ikke Ã¥ fÃ¥ entydig GID\n" #, c-format msgid "%s: %s is not a valid group name\n" @@ -685,31 +762,31 @@ msgstr "%s: klarer ikke Ã¥ omskrive shadow-fila\n" #, c-format msgid "%s: unable to lock group file\n" -msgstr "%s: klarer ikke Ã¥ lÃ¥se gruppefilen\n" +msgstr "%s: klarer ikke Ã¥ lÃ¥se gruppefila\n" #, c-format msgid "%s: unable to open group file\n" -msgstr "%s: klarer ikke Ã¥ Ã¥pne gruppefilen\n" +msgstr "%s: klarer ikke Ã¥ Ã¥pne gruppefila\n" #, c-format msgid "%s: unable to lock shadow group file\n" -msgstr "%s: klarer ikke Ã¥ lÃ¥se shadow gruppefilen\n" +msgstr "%s: klarer ikke Ã¥ lÃ¥se shadow-gruppefila\n" #, c-format msgid "%s: unable to open shadow group file\n" -msgstr "%s: klarer ikke Ã¥ Ã¥pne shadow gruppefila\n" +msgstr "%s: klarer ikke Ã¥ Ã¥pne shadow-gruppefila\n" #, c-format msgid "%s: invalid group %s\n" msgstr "%s: ugyldig gruppe %s\n" -#, fuzzy, c-format +#, c-format msgid "%s: -K requires KEY=VALUE\n" -msgstr "%s: -O krever NAME=VALUE\n" +msgstr "%s: -K krever KEY=VALUE\n" #, c-format msgid "%s: group %s exists\n" -msgstr "%s: gruppen %s finnes allerede\n" +msgstr "%s: gruppa %s finnes allerede\n" #, c-format msgid "Usage: groupdel group\n" @@ -721,7 +798,7 @@ msgstr "%s: feil ved fjerning av gruppeoppføring\n" #, c-format msgid "%s: error removing shadow group entry\n" -msgstr "%s: feil ved sletting av shadow gruppe oppføring\n" +msgstr "%s: feil ved sletting av shadow-gruppeoppføring\n" #, c-format msgid "%s: cannot remove user's primary group.\n" @@ -729,11 +806,11 @@ msgstr "%s: kan ikke fjerne brukerens primærgruppe.\n" #, c-format msgid "%s: group %s does not exist\n" -msgstr "%s: gruppen %s finnes ikke\n" +msgstr "%s: gruppa %s finnes ikke\n" #, c-format msgid "%s: group %s is a NIS group\n" -msgstr "%s: gruppen %s er en NIS gruppe\n" +msgstr "%s: gruppa %s er en NIS gruppe\n" #, c-format msgid "%s: %s is the NIS master\n" @@ -747,9 +824,9 @@ msgstr "Bruk: groupmod [-g gid [-o]] [-n navn] gruppe\n" msgid "%s: %s not found in /etc/group\n" msgstr "%s: %s ikke funnet i /etc/group\n" -#, fuzzy, c-format +#, c-format msgid "%s: %u is not a unique GID\n" -msgstr "%s: %u er ikke en entydig gid\n" +msgstr "%s: %u er ikke en entydig GID\n" #, c-format msgid "%s: %s is not a unique name\n" @@ -763,9 +840,9 @@ msgstr "Bruk: %s [-r] [-s] [gruppe [gshadow]]\n" msgid "Usage: %s [-r] [-s] [group]\n" msgstr "Bruk: %s [-r] [-s] [gruppe]\n" -#, fuzzy, c-format +#, c-format msgid "No\n" -msgstr "Nei" +msgstr "Nei\n" #, c-format msgid "%s: -s and -r are incompatibile\n" @@ -773,11 +850,11 @@ msgstr "%s: -s og -r kan ikke brukes samtidig\n" #, c-format msgid "%s: cannot lock file %s\n" -msgstr "%s: kan ikke lÃ¥se filen %s\n" +msgstr "%s: kan ikke lÃ¥se fila %s\n" #, c-format msgid "%s: cannot open file %s\n" -msgstr "%s: kan ikke Ã¥pne filen %s\n" +msgstr "%s: kan ikke Ã¥pne fila %s\n" #, c-format msgid "invalid group file entry\n" @@ -805,11 +882,11 @@ msgstr "slett medlem `%s'? " #, c-format msgid "invalid shadow group file entry\n" -msgstr "ugyldig oppføring i shadow gruppefila\n" +msgstr "ugyldig oppføring i shadow-gruppefila\n" #, c-format msgid "duplicate shadow group entry\n" -msgstr "duplisert shadowgruppe-oppføring\n" +msgstr "duplisert shadow-gruppeoppføring\n" #, c-format msgid "no matching group file entry\n" @@ -833,20 +910,12 @@ msgstr "%s: kan ikke oppdatere fila %s\n" #, c-format msgid "%s: the files have been updated\n" -msgstr "%s: filene har blitt oppdatert\n" +msgstr "%s: filene er blitt oppdatert\n" #, c-format msgid "%s: no changes\n" msgstr "%s: ingen endringer\n" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "%s: klarer ikke Ã¥ lÃ¥se gruppefila\n" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "%s: klarer ikke Ã¥ Ã¥pne gruppefila\n" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "%s: kan ikke lÃ¥se shadow-gruppefila\n" @@ -901,6 +970,13 @@ msgid "" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" " -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n" msgstr "" +"Bruk: lastlog [valg]\n" +"\n" +"Valg:\n" +" -b, --before DAGER\tskriv bare oppføringer eldre enn DAGER\n" +" -h, --help\t\tvis denne hjelpeteksten og avslutt\n" +" -t, --time DAGER\t skriv bare oppføringer nyere enn DAGER\n" +" -u, --user BRUKER\tskriv oppføringer for bruker BRUKER\n" #, c-format msgid "Username Port From Latest\n" @@ -913,6 +989,10 @@ msgstr "Brukernavn Port Sist\n" msgid "**Never logged in**" msgstr "**Aldri vært innlogget**" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "lastlog: uventet argument: %s\n" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Bruk: %s [-p] [navn]\n" @@ -963,13 +1043,23 @@ msgstr " pÃ¥ `%.100s'" #, c-format msgid "login: PAM Failure, aborting: %s\n" -msgstr "" +msgstr "login: PAM mislyktes, abvbryter: %s\n" -#, fuzzy, c-format -msgid "" -"\n" -"Login incorrect\n" -msgstr "Ugyldig innlogging" +#, c-format +msgid "%s login: " +msgstr "%s login: " + +#, c-format +msgid "login: " +msgstr "login: " + +#, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "Maks. antall forsøk er overskredet (%d)\n" + +#, c-format +msgid "login: abort requested by PAM\n" +msgstr "login: PAM ber om avbrytelse\n" #, c-format msgid "" @@ -984,7 +1074,7 @@ msgstr "Ugyldig innlogging" #, c-format msgid "%s: failure forking: %s" -msgstr "" +msgstr "%s: mislykket fork: %s" msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "Advarsel: innlogging reaktivert etter midlertidig stenging.\n" @@ -1005,6 +1095,8 @@ msgid "" "login time exceeded\n" "\n" msgstr "" +"innloggingstid overskredet\n" +"\n" #, c-format msgid "Usage: newgrp [-] [group]\n" @@ -1014,9 +1106,9 @@ msgstr "Bruk: newgrp [-] [gruppe]\n" msgid "Usage: sg group [[-c] command]\n" msgstr "Bruk: sg group [[-c] command]\n" -#, fuzzy, c-format +#, c-format msgid "unknown UID: %u\n" -msgstr "ukjent GID: %lu\n" +msgstr "ukjent UID: %u\n" #, c-format msgid "unknown GID: %lu\n" @@ -1027,7 +1119,7 @@ msgstr "Beklager.\n" #, c-format msgid "too many groups\n" -msgstr "For mange grupper\n" +msgstr "for mange grupper\n" #, c-format msgid "Usage: %s [input]\n" @@ -1067,11 +1159,11 @@ msgstr "%s: linje %d: kan ikke oppdatere passord\n" #, c-format msgid "%s: line %d: mkdir failed\n" -msgstr "%s: linje %d: mkdir feilet\n" +msgstr "%s: linje %d: mkdir mislyktes\n" #, c-format msgid "%s: line %d: chown failed\n" -msgstr "%s: linje %d: chown feilet\n" +msgstr "%s: linje %d: chown mislyktes\n" #, c-format msgid "%s: line %d: can't update entry\n" @@ -1104,6 +1196,24 @@ msgid "" " -x, --maxdays MAX_DAYS\tset maximim number of days before password\n" "\t\t\t\tchange to MAX_DAYS\n" msgstr "" +"Bruk: passwd [valg] [bruker]\n" +"\n" +"Valg: \n" +" -a, --all\t\t\trapporter passordstatus for alle kontoer\n" +" -d, --delete\t\t\tslett passordet for oppgitt konto\n" +" -e, --expire\t\t\tangi at passordet for konten er utgÃ¥tt\n" +" -h, --help\t\t\tvis denne hjelpeteksten og avslutt\n" +" -k, --keep-tokens\t\tendre passord bare hvis utgÃ¥tt\n" +" -i, --inactive INAKTIV\t set passord inaktivt etter utløp til INAKTIV\n" +" -l, --lock\t\t\tlÃ¥s oppgitt konto\n" +" -n, --mindays MIN_DAGER\tangi at passord ikke kan endres før etter\n" +"\t\t\t\tIN_DAGER\n" +" -q, --quiet\t\t\tordknapp kjøremÃ¥te\n" +" -r, --repository LAGER\tendre passord i lageret LAGER\n" +" -S, --status\t\t\trapporter passordstatus pÃ¥ oppgitt konto\n" +" -u, .--unlock\t\t\t lÃ¥s opp oppgitt konto\n" +" -w, --warndays DAGER\tvarsle om utgÃ¥tt passord DAGER før utløp\n" +" -x, --maxdays DAGER\tpassordet mÃ¥ endres før det er gÃ¥tt DAGER\n" msgid "Old password: " msgstr "Gammelt passord: " @@ -1151,13 +1261,13 @@ msgstr "%s: slapp opp for minne\n" msgid "%s: repository %s not supported\n" msgstr "%s: ikke støtte for lager %s\n" -#, fuzzy, c-format +#, c-format msgid "%s: You may not view or modify password information for %s.\n" -msgstr "Du kan ikke endre skall til %s.\n" +msgstr "%s: Du kan ikke vise eller endre passordinformasjon for %s.\n" #, c-format msgid "Changing password for %s\n" -msgstr "Endrer passordet til %s\n" +msgstr "Endrer passordet for %s\n" #, c-format msgid "The password for %s is unchanged.\n" @@ -1167,9 +1277,9 @@ msgstr "Passordet for %s er uendret.\n" msgid "Password changed.\n" msgstr "Passordet er endret.\n" -#, fuzzy, c-format +#, c-format msgid "Password set to expire.\n" -msgstr "Ditt passord har utgÃ¥tt pÃ¥ dato." +msgstr "Passordet vil utgÃ¥ pÃ¥ dato.\n" #, c-format msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n" @@ -1185,7 +1295,7 @@ msgstr "duplisert oppføring i passordfila\n" #, c-format msgid "invalid user name '%s'\n" -msgstr "ugyldig brukernavn '%s'\n" +msgstr "ugyldig brukernavn «%s»\n" #, c-format msgid "user %s: no group %u\n" @@ -1262,15 +1372,16 @@ msgstr "Oppgi ditt EGET passord som autentisering.\n" msgid "Sorry." msgstr "Beklager." -#, fuzzy, c-format +#, c-format msgid "%s: %s\n" -msgstr "passwd: %s\n" +msgstr "%s: %s\n" #, c-format msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" @@ -1278,6 +1389,17 @@ msgid "" "\t\t\t\tthe same shell\n" " -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n" msgstr "" +"Bruk: su [valg] [konto]\n" +"\n" +"Valg:\n" +" -c, --command KOMMANDO\t\t send KOMMANDO til det skallet\n" +"\t\t\t\tsom startes\n" +" -h, --help\t\t\tvis denne hjelpeteksten og avslutt\n" +" -, --login\t\tgjør det nye skallet til en login-skall\n" +" -m, -p,\n" +" --preserve-environment\tikke endre miljøvariabler, og behold\n" +"\t\t\t\tdet samme skalletn -s, --shell SKALL\t\tbruk SKALL i stedet for " +"det i /etc/passwd\n" #, c-format msgid "%s: must be run from a terminal\n" @@ -1391,14 +1513,35 @@ msgid "" " -s, --shell SHELL\t\tthe login shell for the new user account\n" " -u, --uid UID\t\t\tforce use the UID for the new user account\n" msgstr "" +"Bruk: useradd [valg] KONTO\n" +"\n" +"Valg: \n" +" -b, --base-dir BASIS\tbasis-mappe for hjemmemappa til den nye\n" +"\t\t\t\tbrukerkontoen\n" +" -c, --comment KOMMENTAR\tsett i GECOS-feltet for den nye \t\t\t" +"\tbrukerkontoen\n" +" -d, --home-dir HJEMME\thjemmemappe for den nye brukerkontoen\n" +" -D, --defaults\t\tskriv ut eller lagre endret standardoppsett for useradd\n" +" -e, --expiredate DATO\tangi at kontoen utgÃ¥r pÃ¥ DATO\n" +" -f, --inactive INAKTIV\tsett passordet inaktivt etter utløp\n" +" -g, --gid GRUPPE\tangi GRUPPE for den nye brukerkontoen\n" +" -h, --help\t\t\tvis denne hjelpeteksten og avslutt\n" +" -k, --skel SKJELETT\toppgi en annen skel-mappe\n" +" -K, --key NØKKEL=VERDI\t overstyrer oppsett fra /etc/login.defs\n" +" -m, --create-home\t\topprett hjemmemappe for den nye brukerkontoen\n" +" -o, --non-unique\t\ttillat Ã¥ opprette bruker med duplisert UID\n" +" -p, --password PASSORD\tbruk dette krypterte passordet for\n" +"\t\t\t\tden nye brukerkontoen\n" +" -s, --shell SKALL\t\tinnloggingsskall for den nye brukerkontoen\n" +" -u, --uid UID\t\t\tbruk UID for den nye brukerkontoen\n" -#, fuzzy, c-format +#, c-format msgid "%s: UID %u is not unique\n" -msgstr "%s: gid %u er ikke unikt\n" +msgstr "%s: UID %u er ikke entydig\n" -#, fuzzy, c-format +#, c-format msgid "%s: can't get unique UID\n" -msgstr "%s: klarer ikke Ã¥ fÃ¥ unik gid\n" +msgstr "%s: klarer ikke Ã¥ fÃ¥ entydig UID\n" #, c-format msgid "%s: invalid base directory `%s'\n" @@ -1491,10 +1634,11 @@ msgstr "%s: kan ikke opprette mappa %s\n" #, c-format msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n" msgstr "" +"Gruppe «mail» finnes ikke, oppretter e-postmappe med rettigheter 0600.\n" -#, fuzzy, c-format +#, c-format msgid "Can't create mail spool for user %s.\n" -msgstr "%s: klarer ikke Ã¥ oppdatere oppføring for bruker %s\n" +msgstr "Kan ikke opprette e-postmappe for bruker %s\n" #, c-format msgid "%s: user %s exists\n" @@ -1504,14 +1648,16 @@ msgstr "%s: bruker %s finnes\n" msgid "" "%s: group %s exists - if you want to add this user to that group, use -g.\n" msgstr "" -"%s: gruppen %s finnes - hvis du ønsker Ã¥ legge til denne brukeren til denne " -"gruppen, bruk -g.\n" +"%s: gruppa %s finnes - hvis du ønsker Ã¥ legge til denne brukeren til denne " +"gruppa, bruk -g.\n" #, c-format msgid "" "%s: warning: the home directory already exists.\n" "Not copying any file from skel directory into it.\n" msgstr "" +"%s: advarsel: hjemmemappa finnes fra før.\n" +"Kopierer ikke filer dit fra skel-mappa.\n" #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" @@ -1525,9 +1671,10 @@ msgstr "Bruk: %s [-r] navn\n" msgid "%s: error updating group entry\n" msgstr "%s: feil ved oppdatering av gruppe-oppføring\n" -#, fuzzy, c-format +#, c-format msgid "%s: Cannot remove group %s which is a primary group for another user.\n" -msgstr "%s: kan ikke fjerne brukerens primærgruppe.\n" +msgstr "" +"%s: kan ikke fjerne gruppe %s som er en primærgruppe for en annen bruker.\n" #, c-format msgid "%s: cannot open group file\n" @@ -1598,6 +1745,14 @@ msgid "" " -u, --uid UID\t\t\tnew UID for the user account\n" " -U, --unlock\t\t\tunlock the user account\n" msgstr "" +"Bruk: usermod [valg] konto\n" +"\n" +"Valg:\n" +" -a, --append GRUPPE\t\tlegg til bruker i tilleggsgruppa GRUPPE\n" +" -c, --comment KOMMENTAR\t\tny verdi i GECOS-feltet\n" +" -d, --home HJEMME\t\thjemmemappe for den nye kontoen\n" +" -e, --expiredate DATOt\tkontoen utgÃ¥r pÃ¥ datoen DATE\n" +" -f, --inacttive INAKTIV\t\tangi inaktivt passord etter utløp\n" #, c-format msgid "%s: out of memory in update_group\n" @@ -1617,11 +1772,11 @@ msgstr "%s: shadow-passord kreves for -e og -f\n" #, c-format msgid "%s: -a flag is ONLY allowed with the -G flag\n" -msgstr "" +msgstr "%s: -a er BARE tillatt sammen med -G\n" #, c-format msgid "%s: uid %lu is not unique\n" -msgstr "%s: uid %lu er ikke unik\n" +msgstr "%s: uid %lu er ikke entydig\n" #, c-format msgid "%s: error changing password entry\n" @@ -1641,7 +1796,7 @@ msgstr "%s: mappa %s finnes\n" #, c-format msgid "%s: can't create %s\n" -msgstr "%s: kan ikke lage %s\n" +msgstr "%s: kan ikke opprette %s\n" #, c-format msgid "%s: can't chown %s\n" @@ -1650,6 +1805,7 @@ msgstr "%s: kan ikke chown %s\n" #, c-format msgid "%s: warning: failed to completely remove old home directory %s" msgstr "" +"%s: advarsel: klarte ikke Ã¥ fullstendig fjerne den gamle hjemmemappa %s" #, c-format msgid "%s: cannot rename directory %s to %s\n" @@ -1676,6 +1832,14 @@ msgid "" " -q, --quiet\t\t\tquiet mode\n" " -s, --shadow\t\t\tedit shadow or gshadow database\n" msgstr "" +"Bruk: vipw [valg]\n" +"\n" +"Valg: \n" +" -g, --group\t\t\trediger gruppedatabasen\n" +" -h, --help\t\t\tvis denne hjelpeteksten og avslutt\n" +" -p, --passwd\t\t\trediger passwd-databasen\n" +" -q., --quiet\t\t\tordknapp kjøremÃ¥te\n" +" -s, --shadow \t\t\trediger shadow- eller gshadow-databasen\n" #, c-format msgid "" @@ -1694,33 +1858,3 @@ msgstr "Kunne ikke lage backup" #, 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" - -#, fuzzy -#~ msgid "" -#~ "Usage:\n" -#~ "`vipw' edits /etc/passwd `vipw -s' edits /etc/shadow\n" -#~ "`vigr' edits /etc/group `vigr -s' edits /etc/gshadow\n" -#~ "`{vipw|vigr} -q' quiet mode\n" -#~ msgstr "" -#~ "Bruk:\n" -#~ "«vipw» redigerer /etc/passwd «vipw -s» redigerer /etc/shadow\n" -#~ "«vigr» redigerer /etc/group «vigr -s» redigerer /etc/gshadow\n" - -#~ msgid "%s: PAM chauthtok failed\n" -#~ msgstr "%s: PAM chauthtok feilet\n" - -#~ msgid "%s: Cannot execute %s" -#~ msgstr "%s: Kan ikke utføre %s" - -#~ msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n" -#~ msgstr "Bruk: %s\t[-u uid [-o]] [-g gruppe] [-G gruppe,...] \n" - -#~ 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" - -#, fuzzy -#~ msgid "[-f inactive] [-e expire] " -#~ msgstr "[-f inaktiv] [-e utgÃ¥ ] " - -#~ msgid "[-p passwd] [-L|-U] name\n" -#~ msgstr "[-p passord] [-L|-U] navn\n" diff --git a/po/nl.gmo b/po/nl.gmo index 4e555db3..c4fd8629 100644 Binary files a/po/nl.gmo and b/po/nl.gmo differ diff --git a/po/nl.po b/po/nl.po index 04141da7..5a8366a2 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,11 +1,11 @@ -# Copyright (C) 2004 Free Software Foundation, Inc. -# +# Copyright (C) 2004 Free Software Foundation, Inc. +# msgid "" msgstr "" -"Project-Id-Version: shadow 4.0.12\n" +"Project-Id-Version: shadow 4.0.15\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" -"PO-Revision-Date: 2005-08-16 19:07+0100\n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" +"PO-Revision-Date: 2006-03-09 16:41+0100\n" "Last-Translator: Bart Cornelis \n" "Language-Team: debian-l10n-dutch \n" "MIME-Version: 1.0\n" @@ -100,27 +100,26 @@ msgstr "Geen e-mails" msgid "You have mail." msgstr "U heeft e-mail." -#, fuzzy msgid "no change" -msgstr "%s: geen aanpassingen\n" +msgstr "geen veranderingen" msgid "a palindrome" -msgstr "" +msgstr "een palindroom" msgid "case changes only" -msgstr "" +msgstr "enkel veranderingen van grote naar kleine letters (of omgekeerd)" msgid "too similar" -msgstr "" +msgstr "te gelijkaardig" msgid "too simple" -msgstr "" +msgstr "te simpel" msgid "rotated" -msgstr "" +msgstr "geroteerd" msgid "too short" -msgstr "" +msgstr "te kort" #, c-format msgid "Bad password: %s. " @@ -162,10 +161,11 @@ msgstr "Kan de hoofdmap niet veranderen naar '%s'\n" msgid "No utmp entry. You must exec \"login\" from the lowest level \"sh\"" msgstr "" +"Er is geen utmp-ingang. U dient 'login' uit te voeren vanaf de laagste " +"niveau 'sh'" -#, fuzzy msgid "Unable to determine your tty name." -msgstr "%s: Kan uw gebruikersnaam niet bepalen.\n" +msgstr "Kan de naam van uw tty niet bepalen" #, c-format msgid "malloc(%d) failed\n" @@ -247,8 +247,8 @@ msgstr "Laatste wachtwoord-verandering\t\t\t\t\t: " msgid "never\n" msgstr "nooit\n" -#, fuzzy, c-format -msgid "password must be changed" +#, c-format +msgid "password must be changed\n" msgstr "Wachtwoord veranderd\n" #, c-format @@ -297,9 +297,9 @@ msgstr "%s: kan wachtwoordbestand niet openen\n" msgid "%s: unknown user %s\n" msgstr "%s: onbekende gebruiker %s\n" -#, fuzzy, c-format +#, c-format msgid "%s: the shadow password file is not present\n" -msgstr "%s: kan schaduw-wachtwoordenbestand niet openen\n" +msgstr "%s: het schaduw-wachtwoordenbestand is afwezig\n" #, c-format msgid "%s: can't lock shadow password file\n" @@ -311,7 +311,7 @@ msgstr "%s: kan schaduw-wachtwoordenbestand niet openen\n" #, c-format msgid "%s: failed to drop privileges (%s)\n" -msgstr "" +msgstr "%s: afgeven rechten is mislukt (%s)\n" #, c-format msgid "Changing the aging information for %s\n" @@ -453,7 +453,7 @@ msgstr "Kan het wachtwoordbestand niet ontgrendelen.\n" #, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -466,16 +466,20 @@ msgstr "" "Opties:\n" " -e, --encrypted\tvoorziene wachtwoorden zijn versleutelt\n" " -h, --help\t\ttoon dit bericht en sluit af\n" -" -m, --md5\t\tmaak gebruik van MD5-versleuteling i.p.v. DES wanneer\n" -"\t\t\topgegeven wachtwoorden niet versleutelt zijn\n" +" -m, --md5\t\tmaak gebruik van MD5-versleuteling wanneer\n" +"\t\t\tdde opgegeven wachtwoorden niet versleutelt zijn\n" #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: kan wachtwoordbestand niet vergrendelen\n" +msgid "%s: can't lock group file\n" +msgstr "%s: kan groepbestand niet vergrendelen\n" #, c-format -msgid "%s: can't lock shadow file\n" -msgstr "%s: kan het 'schadow'-bestand niet vergrendelen\n" +msgid "%s: can't open group file\n" +msgstr "%s: kan groepbestand niet openen\n" + +#, c-format +msgid "%s: can't lock gshadow file\n" +msgstr "%s: kan het 'gschadow'-bestand niet vergrendelen\n" #, c-format msgid "%s: can't open shadow file\n" @@ -490,8 +494,8 @@ msgid "%s: line %d: missing new password\n" msgstr "%s: regel %d: nieuw wachtwoord ontbreekt\n" #, c-format -msgid "%s: line %d: unknown user %s\n" -msgstr "%s: regel %d: onbekende gebruiker %s\n" +msgid "%s: line %d: unknown group %s\n" +msgstr "%s: regel %d: onbekende groepr %s\n" #, c-format msgid "%s: line %d: cannot update password entry\n" @@ -509,6 +513,36 @@ msgstr "%s: fout tijdens bijwerken schaduwbestand\n" msgid "%s: error updating password file\n" msgstr "%s: fout tijdens bijwerken van het wachtwoordbestand\n" +#, 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 "" +"Gebruik: chpasswd [opties]\n" +"\n" +"Opties:\n" +" -e, --encrypted\tvoorziene wachtwoorden zijn versleutelt\n" +" -h, --help\t\ttoon dit bericht en sluit af\n" +" -m, --md5\t\tmaak gebruik van MD5-versleuteling i.p.v. DES wanneer\n" +"\t\t\topgegeven wachtwoorden niet versleutelt zijn\n" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: kan wachtwoordbestand niet vergrendelen\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s: kan het 'schadow'-bestand niet vergrendelen\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s: regel %d: onbekende gebruiker %s\n" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "Gebruik: %s [-s shell] [naam]\n" @@ -893,14 +927,6 @@ msgstr "%s: de bestanden zijn bijgewerkt\n" msgid "%s: no changes\n" msgstr "%s: geen aanpassingen\n" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "%s: kan groepbestand niet vergrendelen\n" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "%s: kan groepbestand niet openen\n" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "%s: kan schaduwgroepbestand niet openen\n" @@ -945,7 +971,7 @@ msgstr "Gebruik: id\n" msgid " groups=" msgstr " groepen=" -#, fuzzy, c-format +#, c-format msgid "" "Usage: lastlog [options]\n" "\n" @@ -958,6 +984,8 @@ msgstr "" "Gebruik: lastlog [opties]\n" "\n" "Opties:\n" +" -b, --before DAGEN\ttoon enkel de laslog-ingangen die ouder zijn dan " +"DAGEN\n" " -h, --help\t\ttoon dit bericht en sluit af\n" " -t, --time DAGEN\tprint enkel lastlog-records van de laatste DAGEN dagen\n" " -u, --user LOGIN\tprint het lastlog-record van de gebruiker LOGIN\n" @@ -973,6 +1001,10 @@ msgstr "Gebruikersnaam Poort Laatste\n" msgid "**Never logged in**" msgstr "**Heeft zich nog nooit aangemeld**" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "lastlog: onverwachte parameter: %s\n" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Gebruik: %s [-p] [naam]\n" @@ -1023,13 +1055,23 @@ msgstr " om `%.100s'" #, c-format msgid "login: PAM Failure, aborting: %s\n" -msgstr "" +msgstr "login: PAM-fout, er wordt afgebroken: %s\n" -#, fuzzy, c-format -msgid "" -"\n" -"Login incorrect\n" -msgstr "Gebruikersnaam onjuist" +#, c-format +msgid "%s login: " +msgstr "%s gebruikersnaam: " + +#, c-format +msgid "login: " +msgstr "gebruikersnaam: " + +#, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "Maximaal aantal pogingen overschreden (%d)\n" + +#, c-format +msgid "login: abort requested by PAM\n" +msgstr "login: PAM vraagt om af te breken\n" #, c-format msgid "" @@ -1044,7 +1086,7 @@ msgstr "Gebruikersnaam onjuist" #, c-format msgid "%s: failure forking: %s" -msgstr "" +msgstr "%s: afsplisten process is mislukt: %s" msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "Waarschuwing: aanmelden gereactiveerd na tijdelijke buitensluiting.\n" @@ -1065,6 +1107,8 @@ msgid "" "login time exceeded\n" "\n" msgstr "" +"aanmeldtijd overschreden\n" +"\n" #, c-format msgid "Usage: newgrp [-] [group]\n" @@ -1164,6 +1208,28 @@ msgid "" " -x, --maxdays MAX_DAYS\tset maximim number of days before password\n" "\t\t\t\tchange to MAX_DAYS\n" msgstr "" +"Gebruik: passwd [opties] [gebruikersnaam]\n" +"\n" +"Opties:\n" +" -a, --all\t\t\tgeef wachtwoordstatus van alle accounts weer\n" +" -d, --delete\t\t\tverwijder het wachtwoord voor de genoemde account\n" +" -e, --expire\t\t\tdoe het wachtwoord vervallen voor de genoemde account\n" +" -h, --help\t\t\ttoon deze boodschap en sluit af\n" +" -k, --keep-tokens\t\tverander wachtwoord indien het vervallen is\n" +" -i, --inactive INACTIEF\tmaak wachtwoord inactief als INACTIEF wanneer\n" +"\t\t\t\thet vervalt\n" +" -l, --lock\t\t\tvergrendel de genoemde account\n" +" -n, --mindays MIN_DAGEN\tstel het minumum aantal dagen voor\n" +"\t\t\t\tveranderen van het wachtwoor in op MIN_DAGEN\n" +" -q, --quiet\t\t\tstille modus\n" +" -r, --repository REPOSITORY erander wachtwoord in REPOSITORY repository\n" +" -S, --status\t\t\tgeef de wachtwoordstatus van de genoemde account mee\n" +" -u, --unlock\t\t\tontgrendel de genoemde account\n" +" -w, --warndays WAARSCH_DAGEN\tstel het aantal dagen met waarschuwing in " +"op\n" +"\t\t\t\t WAARSCH_DAGEN\n" +" -x, --maxdays MAX_DAGEN\tstel het maximum aantal dagen voor\n" +"\t\t\t\twachtwoordverandering in op MAX_DAGEN\n" msgid "Old password: " msgstr "Oud wachtwoord: " @@ -1324,15 +1390,16 @@ msgstr "Gelieve uw EIGEN wachtwoord in te voeren voor authenticatie.\n" msgid "Sorry." msgstr "Sorry." -#, fuzzy, c-format +#, c-format msgid "%s: %s\n" -msgstr "passwd: %s\n" +msgstr "%s: %s\n" #, c-format msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" @@ -1340,6 +1407,18 @@ msgid "" "\t\t\t\tthe same shell\n" " -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n" msgstr "" +"Gebruik: su [opties] [gebruikersnaam]\n" +"\n" +"Opties:\n" +" -c, --command COMMANDO\t\tgeef COMMANDO mee aan de aangeroepen shell\n" +" -h, --help\t\t\ttoon deze boodschap en sluit af\n" +" -, -l, --login\t\tmaak de shell een aanmeldshell\n" +" -m, -p,\n" +" --preserve-environment\tstel de omgevingsvariabelen niet opnieuw in, en " +"behoud\n" +"\t\t\t\tdezelfde shell\n" +" -s, --shell SHELL\t\tgebruik SHELL i.p.v. de standaardshell opgegeven in " +"passwd\n" #, c-format msgid "%s: must be run from a terminal\n" @@ -1625,9 +1704,11 @@ msgstr "Gebruik: %s [-r] naam\n" msgid "%s: error updating group entry\n" msgstr ":%s: fout tijdens bijwerken groepingang\n" -#, fuzzy, c-format +#, c-format msgid "%s: Cannot remove group %s which is a primary group for another user.\n" -msgstr "%s: kan de primaire groep van een gebruiker niet verwijderen.\n" +msgstr "" +"%s: kan de groep %s niet verwijderen, daar deze de primaire groep van een " +"andere gebruiker is.\n" #, c-format msgid "%s: cannot open group file\n" @@ -1675,7 +1756,7 @@ msgstr "" msgid "%s: error removing directory %s\n" msgstr "%s: fout tijdens verwijderen van map %s\n" -#, fuzzy, c-format +#, c-format msgid "" "Usage: usermod [options] login\n" "\n" @@ -1699,37 +1780,29 @@ msgid "" " -u, --uid UID\t\t\tnew UID for the user account\n" " -U, --unlock\t\t\tunlock the user account\n" msgstr "" -"Gebruik: useradd [opties] GEBRUIKERSNAAM\n" +"Gebruik: usermod [opties] GEBRUIKERSNAAM\n" "\n" "Opties:\n" -" -b, --base-dir BASIS_MAP\tbasismap vor de thuismap van de nieuwe " -"gebruikersaccount\n" -" -c, --comment OPMERKING\t\tstel het GECOS-veld voor de nieuwe " -"gebruikersaccount in\n" -" -d, --home-dir THUIS_MAP\tthuismap voor de nieuwe gebruikersaccount\n" -" -D, --defaults\t\tprint de aangepaste useradd-configuratie, of sla deze " -"op\n" +" -a, --append GROUP\t\t voeg gebruiker toe aan de extra groep GROEP\n" +" -c, --comment OPMERKING\t\tde nieuwe waarde voor het GECOS-veld\n" +" -d, --home-dir THUIS_MAP\tnieuwe thuismap voor de gebruikersaccount\n" " -e, --expiredate VERVAL_DATUM\tstel de vervaldatum in op VERVAL_DATUM\n" " -f, --inactive INACTIVE\tstel het 'wachtwoord inactief na verval' in op " "INACTIEF\n" -" -g, --gid GROEP\t\tdwing gebruik van GROEP voor de nieuwe " -"gebruikersaccount af\n" -" -G, --groups GROEPEN\t\tlijst met aanvullende groepen voor de " -"gebruikersaccount\n" +" -g, --gid GROEP\t\tdwing gebruik van GROEP af als de nieuwe logingroep\n" +" -G, --groups GROEPEN\t\tlijst met aanvullende groepen\n" " -h, --help\t\t\tgeef deze boodschap weer en sluit af\n" -" -k, --skel SKEL_MAP\t\tgebruik een alternatief map-skelet\n" -" -K, --key SLEUTEL=WAARDE\t\toverstijg de standaardwaarden uit /etc/login." -"defs\n" -" -m, --create-home\t\tmaak een thuismap aan voor de nieuwe " -"gebruikersaccount\n" -" -o, --non-unique\t\tlaat het aanmaken van gebruikersaccounts met een " -"dubbelle\n" -"\t\t\t\t(niet-unieke) UID toe\n" -" -p, --password WACHTWOORD\tgebruik versleuteld wachtwoord voor de nieuwe\n" -"\t\t\t\tgebruikersaccount\n" +" -l, --login GEBRUIKERSNAAM\t\tnieuwe gebruikersnaam\n" +" -L, --lock\t\t\tvergrendel de gebruikersaccount\n" +" -m, --move-home\t\tverplaats de thuismapnaar de nieuwe locatie \n" +"\t\t\t\t(enkel gebruiken in combinatie met -d optie)\n" +" -o, --non-unique\t\tlaat dubbelle (=niet-unieke) UID toe\n" +" -p, --password WACHTWOORD\tgebruik versleuteld wachtwoord als het nieuwe " +"wachtwoord\n" " -s, --shell SHELL\t\tgebruik gegeven shell als aanmeld-shell voor de " "gebruikersaccount\n" -" -u, --uid UID\t\t\tgebruik UID voor de nieuwe gebruikersaccount\n" +" -u, --uid UID\t\t\tnieuwe UID voor de gebruikersaccount\n" +" -U, --unlock\t\t\tontgrendel de gebruikersaccount\n" #, c-format msgid "%s: out of memory in update_group\n" @@ -1809,6 +1882,14 @@ msgid "" " -q, --quiet\t\t\tquiet mode\n" " -s, --shadow\t\t\tedit shadow or gshadow database\n" msgstr "" +"Gebruik: vipw [opties]\n" +"\n" +"Opties:\n" +" -g, --group\t\t\tde groepdatabase bewerken\n" +" -h, --help\t\t\ttoon deze boodschap en sluit af\n" +" -p, --passwd\t\t\tpasswd-database bewerken\n" +" -q, --quiet\t\t\tstille modus\n" +" -s, --shadow\t\t\tshadow- of gshadow-database bewerken\n" #, c-format msgid "" @@ -1827,33 +1908,3 @@ msgstr "Kon geen reservekopie maken" #, 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" - -#, fuzzy -#~ msgid "" -#~ "Usage:\n" -#~ "`vipw' edits /etc/passwd `vipw -s' edits /etc/shadow\n" -#~ "`vigr' edits /etc/group `vigr -s' edits /etc/gshadow\n" -#~ "`{vipw|vigr} -q' quiet mode\n" -#~ msgstr "" -#~ "Gebruik:\n" -#~ "`vipw' bewerkt /etc/passwd `vipw -s' bewerkt /etc/shadow\n" -#~ "`vigr' bewerkt /etc/group `vigr -s' bewerkt /etc/gshadow\n" - -#~ msgid "%s: PAM chauthtok failed\n" -#~ msgstr "%s: PAM-chauthtok is mislukt\n" - -#~ msgid "%s: Cannot execute %s" -#~ msgstr "%s: Kan %s niet uitvoeren" - -#~ msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n" -#~ msgstr "Gebruik: %s\t[-u uid [-o]] [-g groep] [-G groep,...] \n" - -#~ 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" - -#~ msgid "[-f inactive] [-e expire] " -#~ msgstr "[-f inactierf] [-e vervalt] " - -#~ msgid "[-p passwd] [-L|-U] name\n" -#~ msgstr "[-p wachtwoord] [-L|-U] naam\n" diff --git a/po/nn.gmo b/po/nn.gmo index d42c46e2..53f91ac0 100644 Binary files a/po/nn.gmo and b/po/nn.gmo differ diff --git a/po/nn.po b/po/nn.po index 55a725b9..340fc726 100644 --- a/po/nn.po +++ b/po/nn.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: shadow\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" "PO-Revision-Date: 2004-06-03 21:41+0200\n" "Last-Translator: HÃ¥vard Korsvoll \n" "Language-Team: Norwegian (Nynorsk) \n" @@ -223,9 +223,9 @@ msgstr "Førre passordendring (ÅÅÅÅ-MM-DD)" msgid "never\n" msgstr "Aldri\n" -#, fuzzy, c-format -msgid "password must be changed" -msgstr "Passord er endra.\n" +#, c-format +msgid "password must be changed\n" +msgstr "Passord er endra\n" #, fuzzy, c-format msgid "Password expires\t\t\t\t\t: " @@ -424,7 +424,7 @@ msgstr "Klarer ikkje lÃ¥sa opp passordfila.\n" #, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -434,11 +434,15 @@ msgid "" msgstr "" #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: klarer ikkje lÃ¥sa passordfil\n" +msgid "%s: can't lock group file\n" +msgstr "%s: klarer ikkje lÃ¥sa gruppefil\n" #, c-format -msgid "%s: can't lock shadow file\n" +msgid "%s: can't open group file\n" +msgstr "%s: klarer ikkje opna gruppefil\n" + +#, fuzzy, c-format +msgid "%s: can't lock gshadow file\n" msgstr "%s: klarer ikkje lÃ¥sa skuggepassordfila\n" #, c-format @@ -453,8 +457,8 @@ msgstr "%s: linje %d: linja er for lang\n" msgid "%s: line %d: missing new password\n" msgstr "%s: linje %d: manglar nytt passord\n" -#, c-format -msgid "%s: line %d: unknown user %s\n" +#, fuzzy, c-format +msgid "%s: line %d: unknown group %s\n" msgstr "%s: linje %d: ukjent brukar %s\n" #, c-format @@ -473,6 +477,29 @@ msgstr "%s: feil ved oppdatering av skuggepassordfila\n" msgid "%s: error updating password file\n" msgstr "%s: feil ved oppdatering av passordfila\n" +#, 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 "" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: klarer ikkje lÃ¥sa passordfil\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s: klarer ikkje lÃ¥sa skuggepassordfila\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s: linje %d: ukjent brukar %s\n" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "Bruk: %s [-s skal] [namn]\n" @@ -831,14 +858,6 @@ msgstr "%s: filene er oppdaterte\n" msgid "%s: no changes\n" msgstr "%s: ingen endringar\n" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "%s: klarer ikkje lÃ¥sa gruppefil\n" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "%s: klarer ikkje opna gruppefil\n" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "%s: klarer ikkje lÃ¥sa skuggegruppefil\n" @@ -905,6 +924,10 @@ msgstr "Brukarnamn Port Siste \n" msgid "**Never logged in**" msgstr "**Aldri vore innlogga**" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Bruk: %s [-p] [namn]\n" @@ -958,10 +981,24 @@ msgid "login: PAM Failure, aborting: %s\n" msgstr "" #, fuzzy, c-format -msgid "" +msgid "%s login: " +msgstr "" "\n" -"Login incorrect\n" -msgstr "Feil innlogging" +"%s brukarnamn: " + +#, fuzzy, c-format +msgid "login: " +msgstr "" +"\n" +"%s brukarnamn: " + +#, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "" + +#, c-format +msgid "login: abort requested by PAM\n" +msgstr "" #, c-format msgid "" @@ -1265,6 +1302,7 @@ msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" @@ -1689,6 +1727,12 @@ msgstr "Klarte ikkje laga reservekopi" 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" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "Login incorrect\n" +#~ msgstr "Feil innlogging" + #, fuzzy #~ msgid "" #~ "Usage:\n" diff --git a/po/pl.gmo b/po/pl.gmo index d58a2468..428bd4b0 100644 Binary files a/po/pl.gmo and b/po/pl.gmo differ diff --git a/po/pl.po b/po/pl.po index 45b2d22b..937891d4 100644 --- a/po/pl.po +++ b/po/pl.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: shadow-4.0.12\n" +"Project-Id-Version: shadow 4.0.15\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" "PO-Revision-Date: 2005-09-05 13:05+0200\n" "Last-Translator: Tomasz Kłoczko \n" "Language-Team: Polish \n" @@ -249,8 +249,8 @@ msgid "never\n" msgstr "nigdy\n" #, c-format -msgid "password must be changed" -msgstr "Hasło musi zostać zmienione" +msgid "password must be changed\n" +msgstr "Hasło musi zostać zmienione\n" #, c-format msgid "Password expires\t\t\t\t\t: " @@ -450,7 +450,7 @@ msgstr "Nie można usunąć blokady z pliku z hasłami.\n" #, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -458,7 +458,7 @@ msgid "" " -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n" "\t\t\tpasswords are not encrypted\n" msgstr "" -"Użycie: chpasswd [opcje]\n" +"Użycie: chgpasswd [opcje]\n" "\n" "Opcje:\n" " -e, --encrypted\tprzekazywane hasła są w postaci zakodowane\n" @@ -468,12 +468,16 @@ msgstr "" "\t\t\thasła nie są zakodowane\n" #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: nie można zablokować pliku z hasłami\n" +msgid "%s: can't lock group file\n" +msgstr "%s: nie można zablokować pliku z grupami\n" #, c-format -msgid "%s: can't lock shadow file\n" -msgstr "%s: nie można zablokować pliku z ukrytymi hasłami\n" +msgid "%s: can't open group file\n" +msgstr "%s: nie można otworzyć pliku z grupami\n" + +#, c-format +msgid "%s: can't lock gshadow file\n" +msgstr "%s: nie można zablokować pliku gshadow\n" #, c-format msgid "%s: can't open shadow file\n" @@ -488,8 +492,8 @@ msgid "%s: line %d: missing new password\n" msgstr "%s: linia %d: brakuje nowego hasła\n" #, c-format -msgid "%s: line %d: unknown user %s\n" -msgstr "%s: linia %d: nieznany użytkownik %s\n" +msgid "%s: line %d: unknown group %s\n" +msgstr "%s: linia %d: nieznana grupa %s\n" #, c-format msgid "%s: line %d: cannot update password entry\n" @@ -507,6 +511,37 @@ msgstr "%s: błąd podczas aktualizacji pliku z ukrytymi hasłami\n" msgid "%s: error updating password file\n" msgstr "%s: błąd podczas aktualizacji pliku z hasłami\n" +#, 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 "" +"Użycie: chpasswd [opcje]\n" +"\n" +"Opcje:\n" +" -e, --encrypted\tprzekazywane hasła są w postaci zakodowane\n" +" -h, --help\t\twyświetlenie tego opisu i zakończenie\n" +" -m, --md5\t\tużyj kodowania MD5 zamiast DES w przypadku kiedy " +"przekazywane\n" +"\t\t\thasła nie są zakodowane\n" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: nie można zablokować pliku z hasłami\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s: nie można zablokować pliku z ukrytymi hasłami\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s: linia %d: nieznany użytkownik %s\n" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "Użycie: %s [-s powłoka] [nazwa]\n" @@ -889,14 +924,6 @@ msgstr "%s: pliki zostały zaktualizowane\n" msgid "%s: no changes\n" msgstr "%s: bez zmian\n" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "%s: nie można zablokować pliku z grupami\n" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "%s: nie można otworzyć pliku z grupami\n" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "%s: nie można zablokować pliku z ukrytymi hasłami grup\n" @@ -972,6 +999,10 @@ msgstr "Użytkownik Port Ostatnio\n" msgid "**Never logged in**" msgstr "**Nigdy nie zalogowany**" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "lastlog: nieoczekiwany argument: %s\n" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Użycie: %s [-p] [nazwa]\n" @@ -1025,12 +1056,20 @@ msgid "login: PAM Failure, aborting: %s\n" msgstr "login: PAM niepowodzenie, przerwane: %s\n" #, c-format -msgid "" -"\n" -"Login incorrect\n" -msgstr "" -"\n" -"Nieprawidłowe logowanie\n" +msgid "%s login: " +msgstr "%s login: " + +#, c-format +msgid "login: " +msgstr "login: " + +#, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "Maksymalna ilość prób przekroczona (%d)\n" + +#, c-format +msgid "login: abort requested by PAM\n" +msgstr "login: przerwanie wywołane przez PAM\n" #, c-format msgid "" @@ -1144,7 +1183,7 @@ msgstr "%s: linia %d: nie można zaktualizować wpisu\n" msgid "%s: error updating files\n" msgstr "%s: błąd podczas aktualizowania plików\n" -#, fuzzy, c-format +#, c-format msgid "" "Usage: passwd [options] [login]\n" "\n" @@ -1172,20 +1211,20 @@ msgstr "" "Opcje:\n" " -a, --all\t\t\traportuj status hasła dla wszystkich kont\n" " -d, --delete\t\t\tkasuje hasło użytkowanika\n" -" -e, --expire\t\t\tforce expire the password for the named account\n" +" -e, --expire\t\t\twymuś przeterminowanie hasła\n" " -h, --help\t\t\twyświetlenie tego opisu i zakończenie\n" " -k, --keep-tokens\t\tzmiana hasła tylko w przypadku kiedy\n" "\t\t\t\tjest przeterminowane\n" -" -i, --inactive INACTIVE\tset password inactive after expiration\n" -"\t\t\t\tto INACTIVE\n" +" -i, --inactive NIEAKTYWNE\tkonto przeterminowane po upływie NIEAKTYWNE\n" +"\t\t\t\tdni po wygaśnięciu hasła\n" " -l, --lock\t\t\tzablokuj konto\n" -" -n, --mindays MIN_DAYS\tset minimum number of days before password\n" -"\t\t\t\tchange to MIN_DAYS\n" +" -n, --mindays MIN_DNI\tustaw minimalną ilość dni prezed kolejną zmianą\n" +"\t\t\t\thasła na MIN_DNI\n" " -n, --mindays MIN_DNI\t\tustawia minimalną liczbę dni pomiędzy zmianami\n" "\t\t\t\thasła na MIN_DAYS\n" " -q, --quiet\t\t\tcichy tryb pracy\n" -" -r, --repository REPOSITORY\tchange password in REPOSITORY repository\n" -" -S, --status\t\t\treport password status on the named account\n" +" -r, --repository REPOZYTORIUM\tzmień hasło w repozytorium REPOZYTORIUM\n" +" -S, --status\t\t\traportuj status hasła\n" " -u, --unlock\t\t\todblokuj konto\n" " -w, --warndays DNI_OSTRZ\tustawia na DNI_OSTRZ liczbę dni przed\n" "\t\t\t\tupływem ważności hasła\n" @@ -1358,6 +1397,7 @@ msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" @@ -1368,6 +1408,7 @@ msgstr "" "Użycie: su [opcje] [LOGIN]\n" "\n" "Options:\n" +" -c, --command POLECENIE\t\turuchom POLECENIE w to wywoływanym shellu\n" " -h, --help\t\t\twyświetlenie tego opisu i zakończenie\n" " -, -l, --login\turuchom z powłoką z powłoką zgłoszeniową\n" " -m, -p,\n" diff --git a/po/pt.gmo b/po/pt.gmo index 0c983c69..e422fc38 100644 Binary files a/po/pt.gmo and b/po/pt.gmo differ diff --git a/po/pt.po b/po/pt.po index 06c7a428..dbc45f50 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,18 +1,13 @@ # Portuguese (Portugal) Translation Project (traduz@debianpt.org) # Nuno Sénica , 2004 -# -# 18-04-2005 - Miguel Figueiredo - 5f1u -# 12-07-2005 - Miguel Figueiredo - 7u4f -# 14-08-2005 - Miguel Figueiredo - 6f2u -# 03-09-2005 - Miguel Figueiredo - 6f12u -# 2005-12-14 - Miguel Figueiredo - 3f2u +# Miguel Figueiredo , 2005,2006 # msgid "" msgstr "" -"Project-Id-Version: shadow 4.0.14\n" +"Project-Id-Version: shadow 4.0.15\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" -"PO-Revision-Date: 2005-12-14 23:25+0000\n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" +"PO-Revision-Date: 2006-03-12 21:00+0000\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" @@ -245,8 +240,8 @@ msgid "never\n" msgstr "nunca\n" #, c-format -msgid "password must be changed" -msgstr "a password tem de ser alterada" +msgid "password must be changed\n" +msgstr "a password tem de ser alterada\n" #, c-format msgid "Password expires\t\t\t\t\t: " @@ -451,7 +446,7 @@ msgstr "Não é possível libertar o ficheiro de passwords.\n" #, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -459,21 +454,25 @@ msgid "" " -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n" "\t\t\tpasswords are not encrypted\n" msgstr "" -"Utilização: chpasswd [opções]\n" +"Utilização: chgpasswd [opções]\n" "\n" "Opções:\n" " -e, --encrypted\tas passwords fornecidas são encriptadas\n" -" -h, --help\t\tmostra esta mensagem de ajuda e sai\n" +" -h, --help\t\tmostrar esta mensagem de ajuda e sair\n" " -m, --md5\t\tutilizar encriptação MD5 em vez de DES quando as passwords\n" -"\t\t\tfornecidas não são encriptadas\n" +"\t\t\tfornecidas não forem encriptadas\n" #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: não é possível obter acesso exclusivo ao ficheiro de passwords\n" +msgid "%s: can't lock group file\n" +msgstr "%s: não é possível obter acesso exclusivo ao ficheiro dos grupos\n" #, c-format -msgid "%s: can't lock shadow file\n" -msgstr "%s: não é possível obter acesso exclusivo ao ficheiro shadow\n" +msgid "%s: can't open group file\n" +msgstr "%s: não é possível abrir o ficheiro dos grupos\n" + +#, c-format +msgid "%s: can't lock gshadow file\n" +msgstr "%s: não é possível obter acesso exclusivo ao ficheiro gshadow\n" #, c-format msgid "%s: can't open shadow file\n" @@ -488,8 +487,8 @@ msgid "%s: line %d: missing new password\n" msgstr "%s: linha %d: falta a nova password\n" #, c-format -msgid "%s: line %d: unknown user %s\n" -msgstr "%s: linha %d: utilizador %s desconhecido\n" +msgid "%s: line %d: unknown group %s\n" +msgstr "%s: linha %d: grupo %s desconhecido\n" #, c-format msgid "%s: line %d: cannot update password entry\n" @@ -507,6 +506,36 @@ msgstr "%s: erro a actualizar o ficheiro shadow\n" msgid "%s: error updating password file\n" msgstr "%s: erro a actualizar o ficheiro de passwords\n" +#, 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 "" +"Utilização: chpasswd [opções]\n" +"\n" +"Opções:\n" +" -e, --encrypted\tas passwords fornecidas são encriptadas\n" +" -h, --help\t\tmostra esta mensagem de ajuda e sai\n" +" -m, --md5\t\tutilizar encriptação MD5 em vez de DES quando as passwords\n" +"\t\t\tfornecidas não são encriptadas\n" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: não é possível obter acesso exclusivo ao ficheiro de passwords\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s: não é possível obter acesso exclusivo ao ficheiro shadow\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s: linha %d: utilizador %s desconhecido\n" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "Utilização: %s [-s shell] [nome]\n" @@ -887,14 +916,6 @@ msgstr "%s: os ficheiros foram actualizados\n" msgid "%s: no changes\n" msgstr "%s: não houve alterações\n" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "%s: não é possível obter acesso exclusivo ao ficheiro dos grupos\n" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "%s: não é possível abrir o ficheiro dos grupos\n" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "" @@ -971,6 +992,10 @@ msgstr "Utilizador Port Último\n" msgid "**Never logged in**" msgstr "**Nunca entrou no sistema**" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "lastlog: argumento inesperado: %s\n" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Utilização: %s [-p] [nome]\n" @@ -1024,12 +1049,20 @@ msgid "login: PAM Failure, aborting: %s\n" msgstr "login: Falha de PAM, a abortar: %s\n" #, c-format -msgid "" -"\n" -"Login incorrect\n" -msgstr "" -"\n" -"Login incorrecto\n" +msgid "%s login: " +msgstr "%s login: " + +#, c-format +msgid "login: " +msgstr "login: " + +#, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "Número máximo de tentativas excedidas (%d)\n" + +#, c-format +msgid "login: abort requested by PAM\n" +msgstr "login: abortar pedido por PAM\n" #, c-format msgid "" @@ -1356,6 +1389,7 @@ msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" @@ -1366,6 +1400,7 @@ msgstr "" "Utilização: su [opções] [login]\n" "\n" "Opções:\n" +" -c, --command COMANDO\t\tpassar COMANDO à shell invocada\n" " -h, --help\t\t\tmostrar esta mensagem de ajuda e terminar\n" " -, -l, --login\t\ttornar a shell numa shell de login\n" " -m, -p,\n" @@ -1861,3 +1896,10 @@ msgstr "Não é possível efectuar cópia de segurança" #, 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" + +#~ msgid "" +#~ "\n" +#~ "Login incorrect\n" +#~ msgstr "" +#~ "\n" +#~ "Login incorrecto\n" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo index fb25766d..aa9118dd 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 42a2f585..19402865 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: shadow\n" +"Project-Id-Version: shadow 4.0.15\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" -"PO-Revision-Date: 2004-06-12 17:16-0300\n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" +"PO-Revision-Date: 2006-03-12 12:33-0300\n" "Last-Translator: André Luís Lopes \n" "Language-Team: Debian-BR Project \n" "MIME-Version: 1.0\n" @@ -74,15 +74,19 @@ msgstr "Overflow de ambiente\n" msgid "You may not change $%s\n" msgstr "Você não pode mudar $%s\n" -#, fuzzy, c-format +#, 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 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" +msgstr[0] "" +"%d falhas desde o último login.\n" +"O último foi %s em %s.\n" +msgstr[1] "" +"%d falhas desde o último login.\n" +"O último foi %s em %s.\n" #, c-format msgid "Too many logins.\n" @@ -97,27 +101,26 @@ msgstr "Sem mensagens." msgid "You have mail." msgstr "Você possui mensagens." -#, fuzzy msgid "no change" -msgstr "%s : nenhuma mudança\n" +msgstr "nenhuma mudança" msgid "a palindrome" -msgstr "" +msgstr "um palíndromo" msgid "case changes only" -msgstr "" +msgstr "mudanças de caixa somente" msgid "too similar" -msgstr "" +msgstr "muito similar" msgid "too simple" -msgstr "" +msgstr "muito simples" msgid "rotated" -msgstr "" +msgstr "rotacionado" msgid "too short" -msgstr "" +msgstr "muita pequena" #, c-format msgid "Bad password: %s. " @@ -132,11 +135,11 @@ msgid "passwd: %s\n" msgstr "passwd : %s\n" msgid "passwd: password updated successfully\n" -msgstr "" +msgstr "passwd: senha atualizada com sucesso\n" -#, fuzzy, c-format +#, c-format msgid "Incorrect password for %s.\n" -msgstr "Senha incorreta para `%s'\n" +msgstr "Senha incorreta para %s.\n" #, c-format msgid "Unable to cd to \"%s\"\n" @@ -159,10 +162,11 @@ msgstr "Não foi possível mudar o diretório raíz para \"%s\"\n" msgid "No utmp entry. You must exec \"login\" from the lowest level \"sh\"" msgstr "" +"Nenhuma entrada utmp. Voce deve executar \"login\" do \"sh\" de nívelmais " +"baixo" -#, fuzzy msgid "Unable to determine your tty name." -msgstr "%s : Não foi possível determinar seu nome de usuário.\n" +msgstr "Não foi possível determinar o nome de seu tty." #, c-format msgid "malloc(%d) failed\n" @@ -192,6 +196,22 @@ msgid "" "\t\t\t\tchange to MAX_DAYS\n" " -W, --warndays WARN_DAYS\tset expiration warning days to WARN_DAYS\n" msgstr "" +"Uso: chage [opções] usuário\n" +"\n" +"Opções:\n" +" -d, --lastday ULTIMO_DIA\tdefine última mudança de senha para ULTIMO_DIA\n" +" -E, --expiredate DATA_EXPIRAÇÂO\tdefine data de expiração de senha para " +"DATA_EXPIRAÇÂO\n" +" -h, --help\t\t\texibe esta mensagem de ajuda e finaliza\n" +" -I, --inactive INATIVO\tdefine senha inativa após expiração\n" +"\t\t\t\tpara INATIVO\n" +" -l, --list\t\t\texibe informação sobre idade da conta\n" +" -m, --mindays MIN_DIAS\tdefine números mínimo de dias antes da\n" +"\t\t\t\ttroca de senha para MIN_DIAS\n" +" -M, --maxdays MAX_DIAS\tdefine números máximo de dias antes da\n" +"\t\t\t\ttroca de senha para MAX_DIAS\n" +" -W, --warndays AVISO_DIAS\tdefine dias para aviso de expiração para " +"AVISO_DIAS\n" #, c-format msgid "Enter the new value, or press ENTER for the default\n" @@ -215,49 +235,49 @@ msgstr "Senha Inativa" msgid "Account Expiration Date (YYYY-MM-DD)" msgstr "Data de Expiração de Senha (YYYY-MM-DD)" -#, fuzzy, c-format +#, c-format msgid "Last password change\t\t\t\t\t: " -msgstr "Última Mudança de Senha (YYYY-MM-DD)" +msgstr "Última mudança de senha\t\t\t\t\t: " -#, fuzzy, c-format +#, c-format msgid "never\n" -msgstr "Nunca\n" +msgstr "nunca\n" -#, fuzzy, c-format -msgid "password must be changed" -msgstr "Senha modificada.\n" +#, c-format +msgid "password must be changed\n" +msgstr "Senha modificada\n" -#, fuzzy, c-format +#, c-format msgid "Password expires\t\t\t\t\t: " -msgstr "Senha Expira :\t" +msgstr "Senha expira\t\t\t\t\t: " -#, fuzzy, c-format +#, c-format msgid "Password inactive\t\t\t\t\t: " -msgstr "Senha Inativa :\t" +msgstr "Senha inativa\t\t\t\t\t: " -#, fuzzy, c-format +#, c-format msgid "Account expires\t\t\t\t\t\t: " -msgstr "Conta Expira :\t" +msgstr "Conta expira\t\t\t\t\t\t: " #, c-format msgid "Minimum number of days between password change\t\t: %ld\n" -msgstr "" +msgstr "Número mínimo de dias entre troca de senhas\t\t: %ld\n" -#, fuzzy, c-format +#, c-format msgid "Maximum number of days between password change\t\t: %ld\n" -msgstr "Número máximo de tentativas excedido (%d)\n" +msgstr "Número máximo de dias entre troca de senhas\t\t: %ld\n" #, c-format msgid "Number of days of warning before password expires\t: %ld\n" -msgstr "" +msgstr "Número de dias de avisos antes da expiração da senha\t: %ld\n" #, c-format msgid "%s: do not include \"l\" with other flags\n" msgstr "%s : não inclua \"l\" com outras flags\n" -#, fuzzy, c-format +#, c-format msgid "%s: Permission denied.\n" -msgstr "%s : permissão negada\n" +msgstr "%s : Permissão negada.\n" #, c-format msgid "%s: PAM authentication failed\n" @@ -271,9 +291,9 @@ msgstr "%s : não foi possível abrir o arquivo de senhas\n" msgid "%s: unknown user %s\n" msgstr "%s : usuário %s desconhecido\n" -#, fuzzy, c-format +#, c-format msgid "%s: the shadow password file is not present\n" -msgstr "%s : não foi possível abrir arquivo de senhas shadow\n" +msgstr "%s : o arquivo de senhas shadow não está presente\n" #, c-format msgid "%s: can't lock shadow password file\n" @@ -285,7 +305,7 @@ msgstr "%s : não foi possível abrir arquivo de senhas shadow\n" #, c-format msgid "%s: failed to drop privileges (%s)\n" -msgstr "" +msgstr "%s: falha ao abandonar privilégios (%s)\n" #, c-format msgid "Changing the aging information for %s\n" @@ -335,23 +355,23 @@ msgstr "\tNome Completo : %s\n" msgid "Room Number" msgstr "Número da Sala" -#, fuzzy, c-format +#, c-format msgid "\tRoom Number: %s\n" -msgstr "Número da Sala" +msgstr "\tNúmero da Sala: %s\n" msgid "Work Phone" msgstr "Fone de Trabalho" -#, fuzzy, c-format +#, c-format msgid "\tWork Phone: %s\n" -msgstr "Fone de Trabalho" +msgstr "\tFone de Trabalho: %s\n" msgid "Home Phone" msgstr "Fone Doméstico" -#, fuzzy, c-format +#, c-format msgid "\tHome Phone: %s\n" -msgstr "Fone Doméstico" +msgstr "\tFone Doméstico: %s\n" msgid "Other" msgstr "Outro" @@ -428,7 +448,7 @@ msgstr "Não foi possível remover o locak do arquivo de senhas.\n" #, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -436,14 +456,25 @@ msgid "" " -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n" "\t\t\tpasswords are not encrypted\n" msgstr "" +"Uso: chgpasswd [opções]\n" +"\n" +"Opções:\n" +" -e, --encrypted\tsenhas fornecidas estão encriptadas\n" +" -h, --help\t\texibir esta mensagem de ajuda e finalizar\n" +" -m, --md5\t\tutilizar encriptação MD5 ao invés de DES quando as\n" +"\t\t\tsenhas fornecidas não estiverem encriptadas\n" #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s : não foi possível obter lock em arquivo de senhas\n" +msgid "%s: can't lock group file\n" +msgstr "%s : não foi possível obter lock no arquivo de grupo\n" #, c-format -msgid "%s: can't lock shadow file\n" -msgstr "%s : nao foi possível obter lock em arquivo shadow\n" +msgid "%s: can't open group file\n" +msgstr "%s : não foi possível abrir arquivo de grupo\n" + +#, c-format +msgid "%s: can't lock gshadow file\n" +msgstr "%s : nao foi possível obter lock no arquivo gshadow\n" #, c-format msgid "%s: can't open shadow file\n" @@ -458,8 +489,8 @@ msgid "%s: line %d: missing new password\n" msgstr "%s : linha %d : nova senha faltando\n" #, c-format -msgid "%s: line %d: unknown user %s\n" -msgstr "%s : linha %d : usuário %s desconhecido\n" +msgid "%s: line %d: unknown group %s\n" +msgstr "%s : linha %d : grupo %s desconhecido\n" #, c-format msgid "%s: line %d: cannot update password entry\n" @@ -477,6 +508,36 @@ msgstr "%s : erro atualizando arquivo shadow\n" msgid "%s: error updating password file\n" msgstr "%s : erro atualizando arquivo de senhas\n" +#, 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 "" +"Uso: chpasswd [opções]\n" +"\n" +"Opções:\n" +" -e, --encrypted\tsenhas fornecidas estão encriptadas\n" +" -h, --help\t\texibir esta mensagem de ajuda e finalizar\n" +" -m, --md5\t\tutilizar ecriptação MD5 ao invés de DES quando as\n" +"\t\t\tsenhas fornecidas não estiverem encriptadas\n" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s : não foi possível obter lock em arquivo de senhas\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s : nao foi possível obter lock em arquivo shadow\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s : linha %d : usuário %s desconhecido\n" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "Uso : %s [-s shell] [nome]\n" @@ -523,10 +584,22 @@ msgid "" "\t\t\t\tand limits (if used with -r, -m or -l options) only\n" "\t\t\t\tfor user with LOGIN\n" msgstr "" +"Uso: faillog [opções]\n" +"\n" +"Opções:\n" +" -a, --all\t\t\texibir registros faillog para todos os usuários\n" +" -h, --help\t\t\texibiri esta mensagem de ajuda e finalizar\n" +" -l, --lock-time SEG\t\tapós falha de login travar conta por SEG segundos\n" +" -m, --maximum MAX\t\tdefine contadores de logins falhos para MAX\n" +" -r, --reset\t\t\tzerar os contadores de falhas de login\n" +" -t, --time DIAS\t\texibir registros faillog mais recentes que DIAS\n" +" -u, --user LOGIN\t\texibir registros faillog ou manter somente contadores\n" +"\t\t\t\tde falhas e limites (caso usado com as opções -r, -m ou -l)\n" +"\t\t\t\tpara usuário com LOGIN\n" #, c-format msgid "Login Failures Maximum Latest On\n" -msgstr "" +msgstr "Login Falhas Máximo Último Em\n" #, c-format msgid " [%lds left]" @@ -650,6 +723,16 @@ msgid "" " -o, --non-unique\t\tallow create group with duplicate\n" "\t\t\t\t(non-unique) GID\n" msgstr "" +"Uso: groupadd [opções] grupo\n" +"\n" +"Opções:\n" +" -f, --force\t\tforçar sair com estado de sucesso caso grupo especificado\n" +"\t\t\t\tjá exista\n" +" -g, --gid GID\t\tutilizar GID para o novo grupo\n" +" -h, --help\t\t\texibir esta mensagem de ajuda e finalizar\n" +" -K, --key CHAVE=VALOR\t\tsobrepõe os padrões em /etc/login.defs\n" +" -o, --non-unique\t\tpermiti criar grupo com GID duplicado\n" +"\t\t\t\t(não-único)\n" #, c-format msgid "%s: error adding new group entry\n" @@ -659,13 +742,13 @@ msgstr "%s : erro adicionando nova entrada de grupo\n" msgid "%s: name %s is not unique\n" msgstr "%s : o nome %s não é único\n" -#, fuzzy, c-format +#, c-format msgid "%s: GID %u is not unique\n" -msgstr "%s : o gid %u não é único\n" +msgstr "%s : GID %u não é único\n" -#, fuzzy, c-format +#, c-format msgid "%s: can't get unique GID\n" -msgstr "%s : não foi possível obter gid único\n" +msgstr "%s : não foi possível obter GID único\n" #, c-format msgid "%s: %s is not a valid group name\n" @@ -699,9 +782,9 @@ msgstr "%s : não foi possível abrir arquivo de grupo shadow\n" msgid "%s: invalid group %s\n" msgstr "%s : grupo %s inválido\n" -#, fuzzy, c-format +#, c-format msgid "%s: -K requires KEY=VALUE\n" -msgstr "%s : -O requer NOME=VALOR\n" +msgstr "%s : -K requer CHAVE=VALOR\n" #, c-format msgid "%s: group %s exists\n" @@ -743,9 +826,9 @@ msgstr "Uso : groupmod [-g gid [-o]] [-n nome] grupo\n" msgid "%s: %s not found in /etc/group\n" msgstr "%s : %s não encontrado em /etc/group\n" -#, fuzzy, c-format +#, c-format msgid "%s: %u is not a unique GID\n" -msgstr "%s : %u não é um gid único\n" +msgstr "%s : %u não é um GID único\n" #, c-format msgid "%s: %s is not a unique name\n" @@ -759,9 +842,9 @@ msgstr "Uso : %s [-r] [-s] [grupo [gshadow]]\n" msgid "Usage: %s [-r] [-s] [group]\n" msgstr "Uso : %s [-r] [-s] [grupo]\n" -#, fuzzy, c-format +#, c-format msgid "No\n" -msgstr "Não" +msgstr "Não\n" #, c-format msgid "%s: -s and -r are incompatibile\n" @@ -835,14 +918,6 @@ msgstr "%s : os arquivos foram atualizados\n" msgid "%s: no changes\n" msgstr "%s : nenhuma mudança\n" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "%s : não foi possível obter lock no arquivo de grupo\n" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "%s : não foi possível abrir arquivo de grupo\n" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "%s : não foi possível obter lock em arquivo de grupo shadow\n" @@ -897,6 +972,15 @@ msgid "" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" " -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n" msgstr "" +"Uso: lastlog [opções]\n" +"\n" +"Opções:\n" +" -b, --before DIAS\timprime somente registros lastlog mais antigos que " +"DIAS\n" +" -h, --help\t\texibe esta mensagem de ajuda e finaliza\n" +" -t, --time DIAS\timprime somente registros lastlog mais recentes que DIAS\n" +" -u, --user LOGIN\timprime registro lastlog para usuário com LOGIN " +"especificado\n" #, c-format msgid "Username Port From Latest\n" @@ -909,6 +993,10 @@ msgstr "Nome de Usuário Porta Último\n" msgid "**Never logged in**" msgstr "**Nunca logou**" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "lastlog: argumento inesperado: %s\n" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Uso : %s [-p] [nome]\n" @@ -959,13 +1047,23 @@ msgstr " em `%.100s'" #, c-format msgid "login: PAM Failure, aborting: %s\n" -msgstr "" +msgstr "login: Falha do PAM, abortando: %s\n" -#, fuzzy, c-format -msgid "" -"\n" -"Login incorrect\n" -msgstr "Login incorreto" +#, c-format +msgid "%s login: " +msgstr "Login %s: " + +#, c-format +msgid "login: " +msgstr "login:" + +#, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "Número máximo de tentativas excedido (%d)\n" + +#, c-format +msgid "login: abort requested by PAM\n" +msgstr "login: abortar requesitado pelo PAM\n" #, c-format msgid "" @@ -980,7 +1078,7 @@ msgstr "Login incorreto" #, c-format msgid "%s: failure forking: %s" -msgstr "" +msgstr "%s: falha iniciando: %s" msgid "Warning: login re-enabled after temporary lockout.\n" msgstr "Aviso : login rehabilitado após travamento temporário.\n" @@ -1001,6 +1099,8 @@ msgid "" "login time exceeded\n" "\n" msgstr "" +"tempo de login excedido\n" +"\n" #, c-format msgid "Usage: newgrp [-] [group]\n" @@ -1010,9 +1110,9 @@ msgstr "Uso : newgrp [-] [grupo]\n" msgid "Usage: sg group [[-c] command]\n" msgstr "Uso : sg group [[-c] comando]\n" -#, fuzzy, c-format +#, c-format msgid "unknown UID: %u\n" -msgstr "GID desconhecido : %lu\n" +msgstr "GID desconhecido : %u\n" #, c-format msgid "unknown GID: %lu\n" @@ -1101,6 +1201,27 @@ msgid "" " -x, --maxdays MAX_DAYS\tset maximim number of days before password\n" "\t\t\t\tchange to MAX_DAYS\n" msgstr "" +"Uso: passwd [opções] [login]\n" +"\n" +"Opções:\n" +" -a, --all\t\t\treportar estado de senhas em toda as contas\n" +" -d, --delete\t\t\tremover a senha para a conta indicada\n" +" -e, --expire\t\t\tforcçar expiração da senha para a conta indicada\n" +" -h, --help\t\t\texibir esta mensagem de ajuda e finalizar\n" +" -k, --keep-tokens\t\tmudar senha somente caso expirada\n" +" -i, --inactive INATIVO\tdefinir senha inativa após expiração para\n" +"\t\t\t\tINATIVO\n" +" -l, --lock\t\t\ttravar a conta indicada\n" +" -n, --mindays MIN_DIAS\tdefine número mínimo de dias antes da troca\n" +"\t\t\t\tde senhas para MIN_DIAS\n" +" -q, --quiet\t\t\tmodo quieto\n" +" -r, --repository REPOSITÓRIO\tmudar senha no repositório REPOSITÓRIO\n" +" -S, --status\t\t\treportar estado de senha para a conta indicada\n" +" -u, --unlock\t\t\tdestravar a conta indicada\n" +" -w, --warndays DIAS_AVISO\tdefine dias de aviso de expiração para " +"DIAS_AVISO\n" +" -x, --maxdays MAX_DIAS\tdefine número máximo de dias antes da troca\n" +"\t\t\t\tde senhas para MAX_DIAS\n" msgid "Old password: " msgstr "Senha antiga : " @@ -1149,9 +1270,10 @@ msgstr "%s : sem memória\n" msgid "%s: repository %s not supported\n" msgstr "%s : repositório %s não suportado\n" -#, fuzzy, c-format +#, c-format msgid "%s: You may not view or modify password information for %s.\n" -msgstr "Você não pode mudar o shell para %s.\n" +msgstr "" +"%s: Você não pode visualizar ou modificar informações de senha para %s.\n" #, c-format msgid "Changing password for %s\n" @@ -1165,9 +1287,9 @@ msgstr "A senha para %s não foi modificada.\n" msgid "Password changed.\n" msgstr "Senha modificada.\n" -#, fuzzy, c-format +#, c-format msgid "Password set to expire.\n" -msgstr "Sua senha expirou." +msgstr "Senha configurada para expirar.\n" #, c-format msgid "Usage: %s [-q] [-r] [-s] [passwd [shadow]]\n" @@ -1260,15 +1382,16 @@ msgstr "Por favor, informe sua PRÓPRIA senha como autenticação.\n" msgid "Sorry." msgstr "Desculpe." -#, fuzzy, c-format +#, c-format msgid "%s: %s\n" -msgstr "passwd : %s\n" +msgstr "%s: %s\n" #, c-format msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" @@ -1276,6 +1399,16 @@ msgid "" "\t\t\t\tthe same shell\n" " -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n" msgstr "" +"Uso: su [opções] [login]\n" +"\n" +"Opções:\n" +" -c, --command COMANDO\t\tpassa COMANDO para o shell invocado\n" +" -h, --help\t\t\texibe esta mensagem de ajuda e finaliza\n" +" -, -l, --login\t\ttorna o shell um shell de login\n" +" -m, -p,\n" +" --preserver-environment\t\tnão zera variáveis de ambiente e\n" +"\t\t\t\tmantém o mesmo shell\n" +" -s, --shell SHELL\t\tutiliza SHELL ao invés do padrão no passwd\n" #, c-format msgid "%s: must be run from a terminal\n" @@ -1389,14 +1522,43 @@ msgid "" " -s, --shell SHELL\t\tthe login shell for the new user account\n" " -u, --uid UID\t\t\tforce use the UID for the new user account\n" msgstr "" +"Uso: useradd [opções] LOGIN\n" +"\n" +"Opções:\n" +" -b, --base-dir DIR_BASE\tdiretório base para o diretório pessoal\n" +"\t\t\t\tda nova conta de usuário\n" +" -c, --comment COMENTÁRIO\t\tdefine o campo GECOS para a nova conta de " +"usuário\n" +" -d, --home-dir DIR_PESSOAL\tdiretório pessoal para a nova conta de " +"usuário\n" +" -D, --defaults\t\timprime ou salva configuração padrão do useradd\n" +"\t\t\t\tmodificada\n" +" -e, --expiredate DATA_EXPIRA\tdefine data de expiração de conta para " +"DATA_EXPIRA\n" +" -f, --inactive INATIVO\tdefine inatividade de senha após expiração para\n" +"\t\t\t\tINATIVO\n" +" -g, --gid GRUPO\t\tforça utilização de GRUPO para nova conta de usuário\n" +" -G, --groups GRUPOS\t\tlista de grupos suplementares para a nova\n" +"\t\t\t\tconta de usuário\n" +" -h, --help\t\t\texibe esta mensagem de ajuda e finaliza\n" +" -k, --skel DIR_SKEL\t\tespecifica um diretório skel alternativo\n" +" -K, --key CHAVE=VALOR\t\tsobrepões os padrões do /etc/login.defs\n" +" -m, --create-home\t\tcria diretório pessoal para a nova conta de\n" +"\t\t\t\tusuário\n" +" -o, --non-unique\t\tpermite cirar usuário com UID duplicado\n" +"\t\t\t\t(não-único)\n" +" -p, --password SENHA\tutiliza senha encriptada para a nova conta de\n" +"\t\t\t\tusuário\n" +" -s, --shell SHELL\t\to shell de login para a nova conta de usuário\n" +" -u, --uid UID\t\t\tforça o uso de UID para a nova conta de usuário\n" -#, fuzzy, c-format +#, c-format msgid "%s: UID %u is not unique\n" -msgstr "%s : o gid %u não é único\n" +msgstr "%s : UID %u não é único\n" -#, fuzzy, c-format +#, c-format msgid "%s: can't get unique UID\n" -msgstr "%s : não foi possível obter gid único\n" +msgstr "%s : não foi possível obter UID único\n" #, c-format msgid "%s: invalid base directory `%s'\n" @@ -1489,10 +1651,12 @@ msgstr "%s : não foi possível criar diretório %s\n" #, c-format msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n" msgstr "" +"Nenhum grupo com o nome \"mail\" existe, criando o spool de mensagenscom o " +"modo 0600.\n" -#, fuzzy, c-format +#, 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" +msgstr "Não foi possível criar spool de mensagens para o usuário %s.\n" #, c-format msgid "%s: user %s exists\n" @@ -1510,6 +1674,8 @@ msgid "" "%s: warning: the home directory already exists.\n" "Not copying any file from skel directory into it.\n" msgstr "" +"%s: aviso: o diretório pessoal já existe.\n" +"Não copiando nenhum arquivo do diretótio skel.\n" #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" @@ -1523,9 +1689,11 @@ msgstr "Uso : %s [-r] nome\n" msgid "%s: error updating group entry\n" msgstr "%s : erro atualizando entrada de grupo\n" -#, fuzzy, c-format +#, c-format msgid "%s: Cannot remove group %s which is a primary group for another user.\n" -msgstr "%s : não foi possível remover grupo primário do usuário.\n" +msgstr "" +"%s : Não foi possível remover grupo %s, o qual é um grupo primário de outro " +"usuário.\n" #, c-format msgid "%s: cannot open group file\n" @@ -1595,6 +1763,29 @@ msgid "" " -u, --uid UID\t\t\tnew UID for the user account\n" " -U, --unlock\t\t\tunlock the user account\n" msgstr "" +"Uso: usermod [opções] login\n" +"\n" +"Opções:\n" +" -a, --append GRUPO\t\tinserir o usuário no grup suplementar GRUPO\n" +" -c, --comment COMENTÁRIO\t\tnovo valor do campo GECOS\n" +" -d, --home DIR_PESSOAL\t\tnovo diretório de login para a nova conta de " +"usuário\n" +" -e, --expiredate DATA_EXPIRA\tdefine data de expiração de conta para " +"DATA_EXPIRA\n" +" -f, --inactive INATIVO\tdefine inatividade de senha após expiração\n" +"\t\t\t\tpara INATIVO\n" +" -g, --gid GRUPO\t\tforçar usar GRUPO como novo grupo de login inicial\n" +" -G, --groups GRUPOS\t\tlista de GRUPOS suplementares\n" +" -h, --help\t\t\texibe esta mensagem de ajuda e finaliza\n" +" -l, --login LOGIN\t\tnovo valor do nome de login\n" +" -L, --lock\t\t\ttrava a conta de usuário\n" +" -m, --move-home\t\tmove o conteúdo do diretório pessoal para a novo\n" +"\t\t\t\tlocalização (use somente com -d)\n" +" -o, --non-unique\t\tpermitir usar UID duplicados (não-únicos)\n" +" -p, --password SENHA\tusar senha encriptada para a nova senha\n" +" -s, --shell SHELL\t\tnovo shell de login para a conta de usuário\n" +" -u, --uid UID\t\t\tnovo UID para a conta de usuário\n" +" -U, --unlock\t\t\tdestravar a conta de usuário\n" #, c-format msgid "%s: out of memory in update_group\n" @@ -1614,7 +1805,7 @@ msgstr "%s : senhas shadow necessárias para -e e -f\n" #, c-format msgid "%s: -a flag is ONLY allowed with the -G flag\n" -msgstr "" +msgstr "%s: flag -a é permitida SOMENTE com a flag -G\n" #, c-format msgid "%s: uid %lu is not unique\n" @@ -1646,7 +1837,7 @@ msgstr "%s : não foi possível executar chown %s\n" #, c-format msgid "%s: warning: failed to completely remove old home directory %s" -msgstr "" +msgstr "%s: aviso: falha completa ao remover antigo diretório pessoal %s" #, c-format msgid "%s: cannot rename directory %s to %s\n" @@ -1673,6 +1864,14 @@ msgid "" " -q, --quiet\t\t\tquiet mode\n" " -s, --shadow\t\t\tedit shadow or gshadow database\n" msgstr "" +"Uso: vipw [opções]\n" +"\n" +"Opções:\n" +" -g, --group\t\t\teditar base de dados de grupo\n" +" -h, --help\t\t\texibir esta mensagem de ajuda e finalizar\n" +" -p, --passwd\t\t\teditar base de dados de senhas\n" +" -q, --quiet\t\t\tmodo quieto\n" +" -s, --shadow\t\t\teditar base de dados shadow ou gshadow\n" #, c-format msgid "" @@ -1691,32 +1890,3 @@ msgstr "Não foi possível fazer backup" #, 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" - -#, fuzzy -#~ msgid "" -#~ "Usage:\n" -#~ "`vipw' edits /etc/passwd `vipw -s' edits /etc/shadow\n" -#~ "`vigr' edits /etc/group `vigr -s' edits /etc/gshadow\n" -#~ "`{vipw|vigr} -q' quiet mode\n" -#~ msgstr "" -#~ "Uso :\n" -#~ "`vipw' edita /etc/passwd `vipw -s' edita /etc/shadow\n" -#~ "`vigr' edita /etc/group `vigr -s' edita /etc/gshadow\n" - -#~ msgid "%s: PAM chauthtok failed\n" -#~ msgstr "%s : chauthok PAM falhou\n" - -#~ msgid "%s: Cannot execute %s" -#~ msgstr "%s : Não foi possível executar %s" - -#~ msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n" -#~ msgstr "Uso : %s\t[-u uid [-o]] [-g grupo] [-G grupo,...] \n" - -#~ 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" - -#~ msgid "[-f inactive] [-e expire] " -#~ msgstr "[-f inativo] [-e expira] " - -#~ msgid "[-p passwd] [-L|-U] name\n" -#~ msgstr "[-p passwd] [-L|-U] nome\n" diff --git a/po/ro.gmo b/po/ro.gmo index d6fd7659..24e3aaa1 100644 Binary files a/po/ro.gmo and b/po/ro.gmo differ diff --git a/po/ro.po b/po/ro.po index a7f4a0a4..15e3b6a2 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,22 +1,21 @@ -# translation of ro.po to Romanian # translation of shadow_ro.po to Romanian # This file is distributed under the same license as the PACKAGE package. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. -# Sorin Batariuc , 2004, 2005. # +# Sorin Batariuc , 2004, 2005, 2006. msgid "" msgstr "" -"Project-Id-Version: shadow 4.0.13\n" +"Project-Id-Version: shadow 4.0.15\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" -"PO-Revision-Date: 2005-09-13 15:05+0300\n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" +"PO-Revision-Date: 2006-03-08 17:41+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" -"X-Generator: KBabel 1.10.2\n" +"X-Generator: KBabel 1.11.2\n" #, c-format msgid "Could not allocate space for config info.\n" @@ -104,27 +103,26 @@ msgstr "N-aveÅ£i mesaje." msgid "You have mail." msgstr "AveÅ£i mesaje." -#, fuzzy msgid "no change" -msgstr "%s: nici o schimbare\n" +msgstr "nici o schimbare" msgid "a palindrome" msgstr "palindrome" msgid "case changes only" -msgstr "changement de casse uniquement" +msgstr "doar schimbări de caz" msgid "too similar" -msgstr "trop semblable au précédent" +msgstr "prea asemănător" msgid "too simple" -msgstr "trop simple" +msgstr "prea simplu" msgid "rotated" -msgstr "anagramme" +msgstr "rotit" msgid "too short" -msgstr "trop court" +msgstr "prea scurt" #, c-format msgid "Bad password: %s. " @@ -166,16 +164,15 @@ msgstr "Nu pot schimba directorul rădăcină la \"%s\"\n" msgid "No utmp entry. You must exec \"login\" from the lowest level \"sh\"" msgstr "" -"Pas d'entrée utmp. Vous devez exécuter « login » depuis l'interpréteur de " -"commandes de plus bas niveau" +"Nici o intrare utmp. Trebuie să executaÅ£i \"login\" de la nivelul cel mai de " +"jos \"sh\"" -#, fuzzy msgid "Unable to determine your tty name." -msgstr "%s: Nu vă pot determina numele de utilizator.\n" +msgstr "Nu vă pot determina numele tty." #, c-format msgid "malloc(%d) failed\n" -msgstr "malloc(%d)a eşuat\n" +msgstr "malloc(%d) a eşuat\n" msgid "Password: " msgstr "Parola: " @@ -250,9 +247,9 @@ msgstr "Ultima schimbare de parolă\t\t\t\t\t: " msgid "never\n" msgstr "Niciodată\n" -#, fuzzy, c-format -msgid "password must be changed" -msgstr "Parolă schimbată.\n" +#, c-format +msgid "password must be changed\n" +msgstr "parola trebuie schimbată\n" #, c-format msgid "Password expires\t\t\t\t\t: " @@ -260,11 +257,11 @@ msgstr "Parola expiră\t\t\t\t\t: " #, c-format msgid "Password inactive\t\t\t\t\t: " -msgstr "Parolă inactivăs\t\t\t\t\t: " +msgstr "Parolă inactivă\t\t\t\t\t: " #, c-format msgid "Account expires\t\t\t\t\t\t: " -msgstr "Contul expirăs\t\t\t\t\t: " +msgstr "Contul expiră\t\t\t\t\t: " #, c-format msgid "Minimum number of days between password change\t\t: %ld\n" @@ -272,7 +269,7 @@ msgstr "Numărul minim de zile dintre schimbările de parolă\t\t: %ld\n" #, c-format msgid "Maximum number of days between password change\t\t: %ld\n" -msgstr "Numărul maxim de încercări a fost atins\t\t: %ld\n" +msgstr "Numărul maxim de zile dintre schimbările de parolă\t\t: %ld\n" #, c-format msgid "Number of days of warning before password expires\t: %ld\n" @@ -284,7 +281,7 @@ msgstr "%s: nu include \"l\" cu alte semnalizatoare\n" #, c-format msgid "%s: Permission denied.\n" -msgstr "%s: permisiune refuzată.\n" +msgstr "%s: Permisiune refuzată.\n" #, c-format msgid "%s: PAM authentication failed\n" @@ -292,15 +289,15 @@ msgstr "%s: autentificare PAM eşuată\n" #, c-format msgid "%s: can't open password file\n" -msgstr "%s; nu pot deschide fişierul passwd\n" +msgstr "%s: nu pot deschide fişierul passwd\n" #, c-format msgid "%s: unknown user %s\n" msgstr "%s: utilizator necunoscut %s\n" -#, fuzzy, c-format +#, c-format msgid "%s: the shadow password file is not present\n" -msgstr "%s: nu pot deschide fişierul shadow\n" +msgstr "%s: fişierul shadow nu este prezent\n" #, c-format msgid "%s: can't lock shadow password file\n" @@ -312,7 +309,7 @@ msgstr "%s: nu pot deschide fişierul shadow\n" #, c-format msgid "%s: failed to drop privileges (%s)\n" -msgstr "%s : échec lors de l'abandon des privilèges (%s)\n" +msgstr "%s : eşuare în abandonarea privilegiilor (%s)\n" #, c-format msgid "Changing the aging information for %s\n" @@ -453,7 +450,7 @@ msgstr "Nu pot debloca fişierul passwd.\n" #, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -461,7 +458,7 @@ msgid "" " -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n" "\t\t\tpasswords are not encrypted\n" msgstr "" -"Folosire: chpasswd [opÅ£iuni]\n" +"Folosire: chgpasswd [opÅ£iuni]\n" "\n" "OpÅ£iuni:\n" " -e, --encrypted\tparolele oferite sunt criptate\n" @@ -470,12 +467,16 @@ msgstr "" "\t\t\toferite nu sunt criptate\n" #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: nu pot bloca fişierul passwd\n" +msgid "%s: can't lock group file\n" +msgstr "%s: nu pot încuia fişierul de grupuri\n" #, c-format -msgid "%s: can't lock shadow file\n" -msgstr "%s: nu pot închide fişierul shadow\n" +msgid "%s: can't open group file\n" +msgstr "%s: nu pot deschide fişierul de grupuri\n" + +#, c-format +msgid "%s: can't lock gshadow file\n" +msgstr "%s: nu pot închide fişierul gshadow\n" #, c-format msgid "%s: can't open shadow file\n" @@ -490,8 +491,8 @@ msgid "%s: line %d: missing new password\n" msgstr "%s: linia %d: lipseşte noua parolă\n" #, c-format -msgid "%s: line %d: unknown user %s\n" -msgstr "%s: linia %d: utilizator necunoscut %s\n" +msgid "%s: line %d: unknown group %s\n" +msgstr "%s: linia %d: grup necunoscut %s\n" #, c-format msgid "%s: line %d: cannot update password entry\n" @@ -499,7 +500,7 @@ msgstr "%s: linia %d: nu pot actualiza intrarea în passwd\n" #, c-format msgid "%s: error detected, changes ignored\n" -msgstr "%s: eroare detectată, schimbările sunt ignorate\n" +msgstr "%s: a fost detectată o eroare, schimbările sunt ignorate\n" #, c-format msgid "%s: error updating shadow file\n" @@ -509,6 +510,36 @@ msgstr "%s: eroare la actualizarea fişierului shadow\n" msgid "%s: error updating password file\n" msgstr "%s: eroare la actualizarea fişierului passwd\n" +#, 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 "" +"Folosire: chpasswd [opÅ£iuni]\n" +"\n" +"OpÅ£iuni:\n" +" -e, --encrypted\tparolele oferite sunt criptate\n" +" -h, --help\t\tafişează acest mesaj de ajutor şi ieşi\n" +" -m, --md5\t\tfoloseşte criptarea MD5 în loc de DES atunci când parolele\n" +"\t\t\toferite nu sunt criptate\n" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: nu pot închide fişierul passwd\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s: nu pot închide fişierul shadow\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s: linia %d: utilizator necunoscut %s\n" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "Utilizare: %s [-s consolă] [nume]\n" @@ -574,7 +605,7 @@ msgstr "" #, c-format msgid "Login Failures Maximum Latest On\n" -msgstr "autentificare Eşuări Maximum Ultima dată La\n" +msgstr "Autentificare Eşuări Maximum Ultima dată La\n" #, c-format msgid " [%lds left]" @@ -622,11 +653,11 @@ msgstr "grup necunoscut: %s\n" #, c-format msgid "Adding user %s to group %s\n" -msgstr "Adăugare utilizator %s la grupul %s\n" +msgstr "Adaug utilizatorul %s la grupul %s\n" #, c-format msgid "Removing user %s from group %s\n" -msgstr "Ştergere utilizator %s din grupul %s\n" +msgstr "Şterg utilizatorul %s din grupul %s\n" #, c-format msgid "%s: unknown member %s\n" @@ -893,14 +924,6 @@ msgstr "%s: fişierele au fost actualizate\n" msgid "%s: no changes\n" msgstr "%s: nici o schimbare\n" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "%s: nu pot încuia fişierul de grupuri\n" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "%s: nu pot deschide fişierul de grupuri\n" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "%s: nu pot încuia fişierul gshadow\n" @@ -945,7 +968,7 @@ msgstr "Utilizare: id\n" msgid " groups=" msgstr " grupuri=" -#, fuzzy, c-format +#, c-format msgid "" "Usage: lastlog [options]\n" "\n" @@ -958,11 +981,13 @@ msgstr "" "Utilizaree: lastlog [opÅ£iuni]\n" "\n" "OpÅ£iuni:\n" -" -u, --user LOGIN\tafişează jurnalul ultimei înregistrări pentru " -"utilizatorul LOGIN\n" +" -b, --before ZILE\tafişează doar înregistrările ultimului jurnal mai vechi " +"de ZILE\n" " -h, --help\t\tafişează acest mesaj de ajutor şi ieşi\n" -" -t, --time DAYS\tafişează doar ultimul jurnal cu înregistrări mai recente " -"de DAYS zile\n" +" -t, --time ZILE\tafişează doar înregistrările ultimului jurnal mai recente " +"de ZILE\n" +" -u, --user LOGIN\tafişează înregistrarea ultimului jurnal pentru " +"utilizatorul cu autentificarea specificată\n" #, c-format msgid "Username Port From Latest\n" @@ -975,6 +1000,10 @@ msgstr "Nume utilizator Port Cel mai recent\n" msgid "**Never logged in**" msgstr "**Niciodată autentificat**" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "lastlog: argument neaşteptat: %s\n" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Utilizare: %s [-p] [nume]\n" @@ -1021,17 +1050,27 @@ msgstr " pe `%.100s' din `%.200s'" #, c-format msgid " on `%.100s'" -msgstr " în `%.100s'" +msgstr " pe `%.100s'" #, c-format msgid "login: PAM Failure, aborting: %s\n" -msgstr "login : échec de PAM, abandon : %s\n" +msgstr "autentificare: eşuare PAM, abandonare : %s\n" -#, fuzzy, c-format -msgid "" -"\n" -"Login incorrect\n" -msgstr "autentificare incorectă" +#, c-format +msgid "%s login: " +msgstr "%s autentificare: " + +#, c-format +msgid "login: " +msgstr "autentificare: " + +#, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "Numărul maxim de încercări a depăşit (%d)\n" + +#, c-format +msgid "login: abort requested by PAM\n" +msgstr "autentificare: renunÅ£are cerută de PAM\n" #, c-format msgid "" @@ -1039,17 +1078,17 @@ msgid "" "%s login: " msgstr "" "\n" -"%s autentificat: " +"%s autentificare: " msgid "Login incorrect" -msgstr "autentificare incorectă" +msgstr "Autentificare incorectă" #, c-format msgid "%s: failure forking: %s" -msgstr "%s : échec lors du cloange (« forking » : %s" +msgstr "%s : eşuare la bifurcare: %s" msgid "Warning: login re-enabled after temporary lockout.\n" -msgstr "Avertisment: autentificare reactivată după închiderea temporară.\n" +msgstr "Avertisment: autentificare reactivată după blocarea temporară.\n" #, c-format msgid "Last login: %s on %s" @@ -1067,7 +1106,7 @@ msgid "" "login time exceeded\n" "\n" msgstr "" -"Dépassement de temps lors de la connexion\n" +"depăşirea timpului de autentificare\n" "\n" #, c-format @@ -1168,31 +1207,28 @@ msgid "" " -x, --maxdays MAX_DAYS\tset maximim number of days before password\n" "\t\t\t\tchange to MAX_DAYS\n" msgstr "" -"Utilisation : passwd [options] [login]\n" +"Utilizare: passwd [opÅ£iuni] [nume_cont]\n" "\n" -"Options :\n" -" -a, --all afficher l'état des mots de passe de tous les\n" -" comptes\n" -" -d, --delete supprimer le mot de passe du compte indiqué\n" -" -e, --expire forcer la fin de validité du compte indiqué\n" -" -h, --help afficher ce message d'aide et quitter\n" -" -k, --keep-tokens ne changer le mot de passe que d'il est arrivé\n" -" en fin de validité\n" -" -i, --inactive INACTIF fixer la durée d'inactivation du mot de passe\n" -" après sa fin de validité à INACTIF\n" -" de INACTIF\n" -" -l, --lock bloquer le compte indiqué\n" -" -n, --mindays JOURS_MIN fixer le nombre minimum de jour avant le\n" -" changement de mot de passe à JOURS_MIN\n" -" -q, --quiet mode silencieux\n" -" -r, --repository DÉPÔT changer le mot de passe dans le dépôt DÉPÔT\n" -" -S, --status afficher l'état du mot de passe du compte " -"indiqué\n" -" -u, --unlock déverrouiller le compte indiqué\n" -" -w, --warndays JOURS_AVERT fixer le nombre de jours d'avertissement de\n" -" fin de validité à JOURS_AVERT\n" -" -x, --maxdays JOURS_MAX fixer le nombre maximum de jours avant le\n" -" changement de mot de passe à JOURS_MAX\n" +"OpÅ£iuni:\n" +" -a, --all \t\t\tafişează starea parolelor din toate conturile\n" +" -d, --delete \t\t\tşterge parola respectivului cont\n" +" -e, --expire \t\t\tforÅ£ează expirarea parolei pentru respectivul cont\n" +" -h, --help \t\t\tafisează acest mesaj de ajutor şi ieşi\n" +" -k, --keep-tokens \t\tschimbă parola doar dacă este expirată\n" +" -i, --inactive INACTIV\tfixează durata de inactivitate a parolei la " +"INACTIV\n" +"\t\t\t\tdupă expirarea sa\n" +" -l, --lock\t\t\tblochează respectivul cont\n" +" -n, --mindays ZILE_MIN \tfixează numărul minim de zile la ZILE_MIN\n" +"\t\t\t\tînainte de schimbarea parolei\n" +" -q, --quiet\t\t\tmodul silenÅ£ios\n" +" -r, --repository DEPOZIT\tschimbă parola în depozitul DEPOZIT\n" +" -S, --status\t\t\traportează starea parolei respectivului cont\n" +" -u, --unlock\t\t\tdeblochează respectivul cont\n" +" -w, --warndays ZILE_AVERT\tfixează numărul de zile de avertisment de " +"expirare la ZILE_AVERT\n" +" -x, --maxdays ZILE__MAX\tfixează numărul maxim de zile înainde de \n" +"\t\t\t\tschimbarea parolei la ZILE_MAX\n" msgid "Old password: " msgstr "Parola veche: " @@ -1353,15 +1389,16 @@ msgstr "Vă rog introduceÅ£i PROPRIA parolă pentru autentificare.\n" msgid "Sorry." msgstr "Scuze." -#, fuzzy, c-format +#, c-format msgid "%s: %s\n" -msgstr "passwd: %s\n" +msgstr "%s: %s\n" #, c-format msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" @@ -1369,6 +1406,16 @@ msgid "" "\t\t\t\tthe same shell\n" " -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n" msgstr "" +"Utilizare: su [opÅ£iuni] [autentificare]\n" +"\n" +"OpÅ£iuni:\n" +" -c, --command COMANDA\t\ttrimite COMANDA la consola invocată\n" +" -h, --help\t\t\tafişează acest mesaj de ajutor şi ieşi\n" +" -, -l, --login\t\tface din consolă una de autentificare\n" +" -m, -p,\n" +" --preserve-environment\tnu reface variabilele de mediu, şi păstrează\n" +"\t\t\t\taceeaşi consolă\n" +" -s, --shell SHELL\t\tfoloseşte SHELL în locul celei implicite din passwd\n" #, c-format msgid "%s: must be run from a terminal\n" @@ -1415,7 +1462,7 @@ msgid "" "(or give root password for system maintenance):" msgstr "" "\n" -"ApăsaÅ£i ctrl-d pentru pornire normală,\n" +"ApăsaÅ£i ctrl-D pentru pornire normală,\n" "(sau introduceÅ£i parola de root pentru întreÅ£inerea sistemului):" msgid "Entering System Maintenance Mode\n" @@ -1443,7 +1490,7 @@ msgstr "%s: nu pot deschide noile fişiere implicite\n" #, c-format msgid "%s: rename: %s" -msgstr "%s: redenumesc: %s" +msgstr "%s: redenumire: %s" #, c-format msgid "%s: group `%s' is a NIS group.\n" @@ -1634,7 +1681,7 @@ msgid "" "Not copying any file from skel directory into it.\n" msgstr "" "%s: avertisment: directorul personal există deja.\n" -"Nu se copiază nici un fişier în el din directorul skel.\n" +"Nu se copiază nici un fişier în el din directorul schelet.\n" #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" @@ -1648,9 +1695,10 @@ msgstr "Utilizare: %s [-r] nume\n" msgid "%s: error updating group entry\n" msgstr "%s: eroare la actualizarea intrărilor de grupuri\n" -#, fuzzy, c-format +#, c-format msgid "%s: Cannot remove group %s which is a primary group for another user.\n" -msgstr "%s: nu pot şterge grupul primar al utilizatorului.\n" +msgstr "" +"%s: Nu pot şterge grupul %s care este un grup primar pentru alt utilizator.\n" #, c-format msgid "%s: cannot open group file\n" @@ -1698,7 +1746,7 @@ msgstr "" msgid "%s: error removing directory %s\n" msgstr "%s: eroare la ştergerea directorului %s\n" -#, fuzzy, c-format +#, c-format msgid "" "Usage: usermod [options] login\n" "\n" @@ -1722,34 +1770,29 @@ msgid "" " -u, --uid UID\t\t\tnew UID for the user account\n" " -U, --unlock\t\t\tunlock the user account\n" msgstr "" -"Folosire: useradd [opÅ£iuni] LOGIN\n" +"Folosire: useradd [opÅ£iuni] login\n" "\n" "OpÅ£iuni:\n" -" -b, --base-dir DIR_BAZA\tbaza directorului pentru noul director\n" -"\t\t\t\tpersonal al contului\n" -" -c, --comment COMENTARIU\t\tsetează câmpul GECOS pentru noul cont\n" -" -d, --home-dir DIR_ACASA\tdirectorul personal pentru noul cont\n" -" -D, --defaults\t\tafişează sau salvează configuraÅ£ia useradd implicită\n" -"\t\t\t\tmodificată\n" +" -a, --append GRUP\tadaugă utilizatorul în GRUPUL suplimentar\n" +" -c, --comment COMENTARIU\t\tvaloarea nouă a câmpului GECOS\n" +" -d, --home-dir DIR_ACASA\tnoul director personal pentru noul cont\n" " -e, --expiredate DATA_EXPIRĂRII\tsetează data expirării contului la " "DATA_EXPIRĂRII\n" " -f, --inactive INACTIVĂ\tsetează parola inactivă după expirare\n" "\t\t\t\tla INACTIVĂ\n" -" -g, --gid GRUP\t\tforÅ£ează folosirea GRUPULUI pentru noul cont\n" -" -G, --groups GRUPURI\t\tafişează grupurile suplimentare pentru noul\n" -"\t\t\t\tcont utilizator\n" +" -g, --gid GRUP\t\tforÅ£ează folosirea GRUPULUI ca nou iniÅ£ial grup de " +"autentificare\n" +" -G, --groups GRUPURI\t\tafişează grupurile suplimentare GRUPURI\n" " -h, --help\t\t\tafişează acest mesaj de ajutor şi ieşi\n" -" -k, --skel DIR_SKELET\t\tspecifică un schelet director alternativ\n" -" -K, --key KEY=VALOARE\t\tsuprascrie valorile implicite ale /etc/login." -"defs\n" -" -m, --create-home\t\tcrează directorul personal pentru noul cont\n" -"\t\t\t\tutilizator\n" -" -o, --non-unique\t\tpermite creare unui utilizator cu un UID\n" -"\t\t\t\tduplicat (non-unic)\n" -" -p, --password PAROLA\tfoloseşte parola criptată pentru noul cont\n" -"\t\t\t\tutilizator\n" -" -s, --shell SHELL\t\tmediul de autentificare pentru noul cont utilizator\n" -" -u, --uid UID\t\t\tforÅ£ează utilizarea UID pentru noul cont utilizator\n" +" -l, --login LOGIN\t\tnoua valoare a numelui de autentificare\n" +" -L, --lock\t\t\tblochează contul\n" +" -m, --move-home\t\tmută conÅ£inutul directorului personal în noua\n" +"\t\t\t\tlocaÅ£ie (foloseşte doar cu -d)\n" +" -o, --non-unique\t\tpermite folosirea UID-urilor duplicate (non-unice)\n" +" -p, --password PAROLA\tfoloseşte criptarea pentru noua parolă\n" +" -s, --shell SHELL\t\tnoul mediu de autentificare pentru contul utilizator\n" +" -u, --uid UID\t\t\tnoul UID pentru contul utilizator\n" +" -U, --unlock\t\t\tdeblochează contul utilizator\n" #, c-format msgid "%s: out of memory in update_group\n" @@ -1761,11 +1804,11 @@ msgstr "%s: nu mai este memorie pentru update_gshadow\n" #, c-format msgid "%s: no flags given\n" -msgstr "%s: nu s-au dat semnalizatoare\n" +msgstr "%s: nu s-au atribuit semnalizatoare\n" #, c-format msgid "%s: shadow passwords required for -e and -f\n" -msgstr "%s: parole criptate necesare pentru -e şi -f\n" +msgstr "%s: sunt necesare parole criptate pentru -e şi -f\n" #, c-format msgid "%s: -a flag is ONLY allowed with the -G flag\n" @@ -1829,6 +1872,14 @@ msgid "" " -q, --quiet\t\t\tquiet mode\n" " -s, --shadow\t\t\tedit shadow or gshadow database\n" msgstr "" +"Utilizare: vipw [opÅ£iuni]\n" +"\n" +"OpÅ£iuni:\n" +" -g, --group\t\t\teditează baza de date de grupuri\n" +" -h, --help\t\t\tafişează acest mesaj de ajutor şi ieşi\n" +" -p, --passwd\t\t\teditează baza de date de conturi\n" +" -q, --quiet\t\t\tmodul tăcut\n" +" -s, --shadow\t\t\teditează baza de date shadow sau gshadow\n" #, c-format msgid "" @@ -1847,32 +1898,3 @@ msgstr "N-am putut face o copie de rezervă" #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s: nu pot reface %s: %s (schimbările dvs. sunt în %s)\n" - -#, fuzzy -#~ msgid "" -#~ "Usage:\n" -#~ "`vipw' edits /etc/passwd `vipw -s' edits /etc/shadow\n" -#~ "`vigr' edits /etc/group `vigr -s' edits /etc/gshadow\n" -#~ "`{vipw|vigr} -q' quiet mode\n" -#~ msgstr "" -#~ "Utilizare:\n" -#~ "`vipw' editează /etc/passwd `vipw -s' editează /etc/shadow\n" -#~ "`vigr' editează /etc/group `vigr -s' editează /etc/gshadow\n" - -#~ msgid "%s: PAM chauthtok failed\n" -#~ msgstr "%s: eşuare chauthtok PAM\n" - -#~ msgid "%s: Cannot execute %s" -#~ msgstr "%s: nu pot executa %s" - -#~ msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n" -#~ msgstr "Utilizare: %s\t[-u uid [-o]] [-g grup] [-G grup,...] [-a]] \n" - -#~ 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" - -#~ msgid "[-f inactive] [-e expire] " -#~ msgstr "[-f inactivă] [-e expiră ] " - -#~ msgid "[-p passwd] [-L|-U] name\n" -#~ msgstr "[-p passwd] [-L|-U] nume\n" diff --git a/po/ru.gmo b/po/ru.gmo index d5da75b3..5d4d9fe5 100644 Binary files a/po/ru.gmo and b/po/ru.gmo differ diff --git a/po/ru.po b/po/ru.po index 19b3ade4..c2d8d81c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,15 +1,16 @@ +# translation of po_ru.po to Russian # translation of ru.po to Russian -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. # Nikolai Prokoschenko , 2004. # Eugene Konev , 2004. -# Yuri Kozlov , 2004, 2005. +# Yuri Kozlov , 2004, 2005, 2006. # msgid "" msgstr "" -"Project-Id-Version: shadow 4.0.14\n" +"Project-Id-Version: shadow 4.0.15\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" -"PO-Revision-Date: 2005-12-14 19:47+0300\n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" +"PO-Revision-Date: 2006-03-09 21:23+0300\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -72,7 +73,7 @@ msgstr "Не удалось сменить терминал %s" #, c-format msgid "Environment overflow\n" -msgstr "Cлишком большое количество переменных среды выполнения\n" +msgstr "Слишком большое количество переменных среды выполнения\n" #, c-format msgid "You may not change $%s\n" @@ -252,8 +253,8 @@ msgid "never\n" msgstr "никогда\n" #, c-format -msgid "password must be changed" -msgstr "пароль должен быть изменён" +msgid "password must be changed\n" +msgstr "пароль должен быть изменён\n" #, c-format msgid "Password expires\t\t\t\t\t: " @@ -455,7 +456,7 @@ msgstr "Не удалось разблокировать файл паролей #, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -469,15 +470,19 @@ msgstr "" " -e, --encrypted\tвводится уже шифрованный пароль\n" " -h, --help\t\tпоказать это сообщение и завершить работу программы\n" " -m, --md5\t\tиспользовать шифрование MD5 вместо DES, если пароль\n" -"\t\t\tвводится не шифрованным\n" +"\t\t\tвводится нешифрованным\n" #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: не удалось заблокировать файл паролей\n" +msgid "%s: can't lock group file\n" +msgstr "%s: не удалось заблокировать файл групп\n" #, c-format -msgid "%s: can't lock shadow file\n" -msgstr "%s: не удалось заблокировать теневой файл паролей\n" +msgid "%s: can't open group file\n" +msgstr "%s: не удалось открыть файл групп\n" + +#, c-format +msgid "%s: can't lock gshadow file\n" +msgstr "%s: не удалось выполнить блокировку файла gshadow\n" #, c-format msgid "%s: can't open shadow file\n" @@ -492,8 +497,8 @@ msgid "%s: line %d: missing new password\n" msgstr "%s: строка %d: отсутствует новый пароль\n" #, c-format -msgid "%s: line %d: unknown user %s\n" -msgstr "%s: строка %d: неизвестный пользователь %s\n" +msgid "%s: line %d: unknown group %s\n" +msgstr "%s: строка %d: неизвестная группа %s\n" #, c-format msgid "%s: line %d: cannot update password entry\n" @@ -511,6 +516,36 @@ msgstr "%s: не удалось обновить теневой файл пар msgid "%s: error updating password file\n" msgstr "%s: не удалось обновить файл паролей\n" +#, 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 "" +"Использование: chpasswd [параметры]\n" +"\n" +"Параметры:\n" +" -e, --encrypted\tвводится уже шифрованный пароль\n" +" -h, --help\t\tпоказать это сообщение и завершить работу программы\n" +" -m, --md5\t\tиспользовать шифрование MD5 вместо DES, если пароль\n" +"\t\t\tвводится не шифрованным\n" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: не удалось заблокировать файл паролей\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s: не удалось заблокировать теневой файл паролей\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s: строка %d: неизвестный пользователь %s\n" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "Использование: %s [-s командная оболочка] [имя пользователя]\n" @@ -895,14 +930,6 @@ msgstr "%s: файлы были изменены\n" msgid "%s: no changes\n" msgstr "%s: изменений не внесено\n" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "%s: не удалось заблокировать файл групп\n" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "%s: не удалось открыть файл групп\n" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "%s: не удалось заблокировать теневой файл групп\n" @@ -976,6 +1003,10 @@ msgstr "Пользователь Порт Последний ра msgid "**Never logged in**" msgstr "**Никогда не входил в систему**" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "lastlog: неожиданный параметр: %s\n" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Использование: %s [-p] [имя пользователя]\n" @@ -1026,15 +1057,23 @@ msgstr " на `%.100s'" #, c-format msgid "login: PAM Failure, aborting: %s\n" -msgstr "login: ошибка PAM, завершение работы: %s\n" +msgstr "login: ошибка PAM, аварийное завершение работы: %s\n" #, c-format -msgid "" -"\n" -"Login incorrect\n" -msgstr "" -"\n" -"Неверное имя пользователя\n" +msgid "%s login: " +msgstr "%s имя пользователя: " + +#, c-format +msgid "login: " +msgstr "имя пользователя: " + +#, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "Превышено максимальное число попыток (%d)\n" + +#, c-format +msgid "login: abort requested by PAM\n" +msgstr "login: аварийное завершение работы по запросу PAM\n" #, c-format msgid "" @@ -1362,6 +1401,7 @@ msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" @@ -1372,6 +1412,7 @@ msgstr "" "Использование: su [параметры] [имя пользователя]\n" "\n" "Параметры:\n" +" -c, --command КОМАНДА\t\tпередать КОМАНДУ вызываемой оболочке\n" " -h, --help\t\t\tпоказать данное сообщение и закончить работу\n" " -, -l, --login\t\tзапускать оболочку как регистрационную\n" " -m, -p,\n" diff --git a/po/shadow.pot b/po/shadow.pot index 3ca1d04a..8d55b0ae 100644 --- a/po/shadow.pot +++ b/po/shadow.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -223,7 +223,7 @@ msgid "never\n" msgstr "" #, c-format -msgid "password must be changed" +msgid "password must be changed\n" msgstr "" #, c-format @@ -421,7 +421,7 @@ msgstr "" #, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -431,11 +431,15 @@ msgid "" msgstr "" #, c-format -msgid "%s: can't lock password file\n" +msgid "%s: can't lock group file\n" msgstr "" #, c-format -msgid "%s: can't lock shadow file\n" +msgid "%s: can't open group file\n" +msgstr "" + +#, c-format +msgid "%s: can't lock gshadow file\n" msgstr "" #, c-format @@ -451,7 +455,7 @@ msgid "%s: line %d: missing new password\n" msgstr "" #, c-format -msgid "%s: line %d: unknown user %s\n" +msgid "%s: line %d: unknown group %s\n" msgstr "" #, c-format @@ -470,6 +474,29 @@ msgstr "" msgid "%s: error updating password file\n" msgstr "" +#, 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 "" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "" @@ -828,14 +855,6 @@ msgstr "" msgid "%s: no changes\n" msgstr "" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "" @@ -902,6 +921,10 @@ msgstr "" msgid "**Never logged in**" msgstr "" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "" @@ -949,9 +972,19 @@ msgid "login: PAM Failure, aborting: %s\n" msgstr "" #, c-format -msgid "" -"\n" -"Login incorrect\n" +msgid "%s login: " +msgstr "" + +#, c-format +msgid "login: " +msgstr "" + +#, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "" + +#, c-format +msgid "login: abort requested by PAM\n" msgstr "" #, c-format @@ -1248,6 +1281,7 @@ msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" diff --git a/po/sk.gmo b/po/sk.gmo index 2aee0c28..dedd0d37 100644 Binary files a/po/sk.gmo and b/po/sk.gmo differ diff --git a/po/sk.po b/po/sk.po index d0a90a47..db1b3c67 100644 --- a/po/sk.po +++ b/po/sk.po @@ -2,10 +2,10 @@ # msgid "" msgstr "" -"Project-Id-Version: shadow 4.0.12\n" +"Project-Id-Version: shadow 4.0.15\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" -"PO-Revision-Date: 2005-08-21 10:20+0200\n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" +"PO-Revision-Date: 2006-03-11 19:31+0100\n" "Last-Translator: Peter Mann \n" "Language-Team: Slovak \n" "MIME-Version: 1.0\n" @@ -15,7 +15,7 @@ msgstr "" #, c-format msgid "Could not allocate space for config info.\n" -msgstr "Nemôžem vyhradiÅ¥ dostatok miesta pre konfiguračné údaje.\n" +msgstr "Na konfiguračné údaje sa nedá vyhradiÅ¥ dostatok miesta.\n" #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" @@ -24,11 +24,11 @@ msgstr "" #, c-format msgid "Warning: unknown group %s\n" -msgstr "Varovanie: skupina %s je neznáma\n" +msgstr "Upozornenie: skupina %s je neznáma\n" #, c-format msgid "Warning: too many groups\n" -msgstr "Varovanie: príliÅ¡ mnoho skupín\n" +msgstr "Upozornenie: príliÅ¡ mnoho skupín\n" #, c-format msgid "Your password has expired." @@ -102,27 +102,26 @@ msgstr "Nemáte žiadnu poÅ¡tu." msgid "You have mail." msgstr "Máte poÅ¡tu." -#, fuzzy msgid "no change" -msgstr "%s: bezo zmien\n" +msgstr "žiadna zmena" msgid "a palindrome" -msgstr "" +msgstr "palindróm" msgid "case changes only" -msgstr "" +msgstr "iba zmeny vo veľkosti písmen" msgid "too similar" -msgstr "" +msgstr "veľmi podobné" msgid "too simple" -msgstr "" +msgstr "veľmi jednoduché" msgid "rotated" -msgstr "" +msgstr "opakované" msgid "too short" -msgstr "" +msgstr "veľmi krátke" #, c-format msgid "Bad password: %s. " @@ -164,10 +163,10 @@ msgstr "Koreňový adresár sa nedá zmeniÅ¥ na \"%s\".\n" msgid "No utmp entry. You must exec \"login\" from the lowest level \"sh\"" msgstr "" +"Žiaden utmp záznam. Musíte spustiÅ¥ \"login\" z najnižšej úrovne \"sh\"" -#, fuzzy msgid "Unable to determine your tty name." -msgstr "%s: vaÅ¡e používateľské meno sa nedá zistiÅ¥.\n" +msgstr "Nedá sa zistiÅ¥ názov vášho tty." #, c-format msgid "malloc(%d) failed\n" @@ -228,7 +227,7 @@ msgid "Last Password Change (YYYY-MM-DD)" msgstr "Posledná zmena hesla (YYYY-MM-DD)" msgid "Password Expiration Warning" -msgstr "Varovanie o uplynutí doby platnosti hesla" +msgstr "Upozornenie o uplynutí doby platnosti hesla" msgid "Password Inactive" msgstr "Nečinné heslo" @@ -244,9 +243,9 @@ msgstr "Posledná zmena hesla\t\t\t\t\t: " msgid "never\n" msgstr "nikdy\n" -#, fuzzy, c-format -msgid "password must be changed" -msgstr "Heslo bolo zmenené.\n" +#, c-format +msgid "password must be changed\n" +msgstr "heslo sa musí zmeniÅ¥\n" #, c-format msgid "Password expires\t\t\t\t\t: " @@ -293,9 +292,9 @@ msgstr "%s: súbor s heslami sa nedá otvoriÅ¥\n" msgid "%s: unknown user %s\n" msgstr "%s: používateľ %s je neznámy\n" -#, fuzzy, c-format +#, c-format msgid "%s: the shadow password file is not present\n" -msgstr "%s: súbor s tieňovými heslami sa nedá otvoriÅ¥\n" +msgstr "%s: súbor s tieňovými heslami nie je dostupný\n" #, c-format msgid "%s: can't lock shadow password file\n" @@ -307,7 +306,7 @@ msgstr "%s: súbor s tieňovými heslami sa nedá otvoriÅ¥\n" #, c-format msgid "%s: failed to drop privileges (%s)\n" -msgstr "" +msgstr "%s: zlyhalo odstránenie právomocí (%s)\n" #, c-format msgid "Changing the aging information for %s\n" @@ -450,7 +449,7 @@ msgstr "Súbor s heslami sa nedá odomknúť.\n" #, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -458,7 +457,7 @@ 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" +"Použitie: chgpasswd [voľby]\n" "\n" "Voľby:\n" " -e, --encrypted\tzadané heslá sú zakódované\n" @@ -467,12 +466,16 @@ msgstr "" "\t\t\theslá nie sú zakódované\n" #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: súbor s heslami sa nedá zamknúť\n" +msgid "%s: can't lock group file\n" +msgstr "%s: súbor so skupinami sa nedá zamknúť\n" #, c-format -msgid "%s: can't lock shadow file\n" -msgstr "%s: súbor s tieňovými heslami sa nedá zamknúť\n" +msgid "%s: can't open group file\n" +msgstr "%s: súbor so skupinami sa nedá otvoriÅ¥\n" + +#, c-format +msgid "%s: can't lock gshadow file\n" +msgstr "%s: súbor s tieňovými heslami skupín sa nedá zamknúť\n" #, c-format msgid "%s: can't open shadow file\n" @@ -487,8 +490,8 @@ msgid "%s: line %d: missing new password\n" msgstr "%s: riadok %d: chýba nové heslo\n" #, c-format -msgid "%s: line %d: unknown user %s\n" -msgstr "%s: riadok %d: používateľ %s je neznámy\n" +msgid "%s: line %d: unknown group %s\n" +msgstr "%s: riadok %d: skupina %s je neznáma\n" #, c-format msgid "%s: line %d: cannot update password entry\n" @@ -506,6 +509,36 @@ msgstr "%s: chyba pri aktualizácii súboru s tieňovými heslami\n" msgid "%s: error updating password file\n" msgstr "%s: chyba pri aktualizácii súboru s heslami\n" +#, 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 "" +"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" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: súbor s heslami sa nedá zamknúť\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s: súbor s tieňovými heslami sa nedá zamknúť\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s: riadok %d: používateľ %s je neznámy\n" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "Použitie: %s [-s shell] [meno]\n" @@ -888,14 +921,6 @@ msgstr "%s: súbory boli aktualizované\n" msgid "%s: no changes\n" msgstr "%s: bezo zmien\n" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "%s: súbor so skupinami sa nedá zamknúť\n" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "%s: súbor so skupinami sa nedá otvoriÅ¥\n" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "%s: súbor s tieňovými skupinami sa nedá zamknúť\n" @@ -940,7 +965,7 @@ msgstr "Použitie: id\n" msgid " groups=" msgstr " skupiny=" -#, fuzzy, c-format +#, c-format msgid "" "Usage: lastlog [options]\n" "\n" @@ -953,6 +978,7 @@ msgstr "" "Použitie: lastlog [voľby]\n" "\n" "Voľby:\n" +" -b, --before DAYS\tvypíše posledné prihlásenia starÅ¡ie ako DAYS dní\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" " -u, --user LOGIN\tvypíše posledné prihlásenia používateľa uvedeného ako " @@ -969,6 +995,10 @@ msgstr "Používateľ Port Naposledy\n" msgid "**Never logged in**" msgstr "**Nebol nikdy prihlásený**" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "lastlog: neočakávaný argument: %s\n" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Použitie: %s [-p] [meno]\n" @@ -1019,13 +1049,23 @@ msgstr " na `%.100s'" #, c-format msgid "login: PAM Failure, aborting: %s\n" -msgstr "" +msgstr "prihlásenie: Chyba PAM, ukončuje sa: %s\n" -#, fuzzy, c-format -msgid "" -"\n" -"Login incorrect\n" -msgstr "Chybné prihlásenie" +#, c-format +msgid "%s login: " +msgstr "%s prihlasovacie meno: " + +#, c-format +msgid "login: " +msgstr "Prihlasovacie meno: " + +#, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "Prekročený maximálny počet pokusov (%d)\n" + +#, c-format +msgid "login: abort requested by PAM\n" +msgstr "prihlásenie: PAM preruÅ¡enie\n" #, c-format msgid "" @@ -1040,10 +1080,10 @@ msgstr "Chybné prihlásenie" #, c-format msgid "%s: failure forking: %s" -msgstr "" +msgstr "%s: chybné vetvenie: %s" msgid "Warning: login re-enabled after temporary lockout.\n" -msgstr "Varovanie: po dočasnom zákaze je prihlasovánie opäť povolené.\n" +msgstr "Upozornenie: po dočasnom zákaze je prihlasovanie opäť povolené.\n" #, c-format msgid "Last login: %s on %s" @@ -1061,6 +1101,8 @@ msgid "" "login time exceeded\n" "\n" msgstr "" +"čas na prihlásenie uplynul\n" +"\n" #, c-format msgid "Usage: newgrp [-] [group]\n" @@ -1160,6 +1202,29 @@ msgid "" " -x, --maxdays MAX_DAYS\tset maximim number of days before password\n" "\t\t\t\tchange to MAX_DAYS\n" msgstr "" +"Použitie: passwd [voľby] [účet]\n" +"\n" +"Voľby:\n" +" -a, --all\t\t\tzobrazí stav hesiel pre vÅ¡etky účty\n" +" -d, --delete\t\t\todstráni heslo pre zadaný účet\n" +" -e, --expire\t\t\tvynúti platnosÅ¥ hesla pre zadaný účet\n" +" -h, --help\t\t\tzobrazí túto nápovedu a ukončí sa\n" +" -k, --keep-tokens\t\tzmení heslo iba v prípade vyprÅ¡ania času jeho " +"platnosti\n" +" -i, --inactive INACTIVE\tnastaví neplatnosÅ¥ hesla po vyprÅ¡aní času " +"platnosti\n" +"\t\t\t\tna INACTIVE dní\n" +" -l, --lock\t\t\tzablokuje zadaný účet\n" +" -n, --mindays MIN_DAYS\tnastaví minimálny počet dní pred zmenou hesla\n" +"\t\t\t\tna MIN_DAYS dní\n" +" -q, --quiet\t\t\tstručný mód\n" +" -r, --repository REPOSITORY\tzmení heslo v repozitári REPOSITORY\n" +" -S, --status\t\t\tzobrazí stav hesla pre zadaný účet\n" +" -u, --unlock\t\t\todblokuje zadaný účet\n" +" -w, --warndays WARN_DAYS\tnastaví počet dní na upozornenie o vyprÅ¡aní " +"platnosti na WARN_DAYS dní\n" +" -x, --maxdays MAX_DAYS\tnastaví maximálny počet dní pred zmenou hesla na " +"MAX_DAYS dní\n" msgid "Old password: " msgstr "Staré heslo: " @@ -1185,7 +1250,7 @@ msgid "" "Warning: weak password (enter it again to use it anyway).\n" msgstr "" "\n" -"Varovanie: slabé heslo (ak ho chcete naozaj použiÅ¥, znova ho zadajte).\n" +"Upozornenie: slabé heslo (ak ho chcete naozaj použiÅ¥, znova ho zadajte).\n" #, c-format msgid "They don't match; try again.\n" @@ -1319,15 +1384,16 @@ msgstr "Pre overenie zadajte VAÅ E vlastné heslo.\n" msgid "Sorry." msgstr "Ľutujem." -#, fuzzy, c-format +#, c-format msgid "%s: %s\n" -msgstr "passwd: %s\n" +msgstr "%s: %s\n" #, c-format msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" @@ -1335,6 +1401,16 @@ msgid "" "\t\t\t\tthe same shell\n" " -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n" msgstr "" +"Použitie: su [voľby] [účet]\n" +"\n" +"Voľby:\n" +" -c, --command PRÍKAZ\t\tpredá PRÍKAZ vyvolanému shell-u -h, --help\t\t" +"\tzobrazí túto nápovedu a ukončí sa\n" +" -, -l, --login\t\tnastaví shell ako prihlasovací shell\n" +" -m, -p,\n" +" --preserve-environment\tzachová premenné prostredia a ponechá\n" +"\t\t\t\tten istý shell\n" +" -s, --shell SHELL\t\tpoužije SHELL namiesto predvoleného v passwd\n" #, c-format msgid "%s: must be run from a terminal\n" @@ -1611,9 +1687,11 @@ msgstr "Použitie: %s [-r] meno\n" msgid "%s: error updating group entry\n" msgstr "%s: položka súboru so skupinami sa nedá aktualizovaÅ¥\n" -#, fuzzy, c-format +#, c-format msgid "%s: Cannot remove group %s which is a primary group for another user.\n" -msgstr "%s: primárna skupina používateľa sa nedá odstrániÅ¥\n" +msgstr "" +"%s: skupina %s sa nedá odstrániÅ¥, pretože je primárnou skupinou iného " +"používateľa.\n" #, c-format msgid "%s: cannot open group file\n" @@ -1659,7 +1737,7 @@ msgstr "%s: adresár %s nebudem mazaÅ¥ (je to domáci adresár používateľa %s msgid "%s: error removing directory %s\n" msgstr "%s: chyba pri mazaní adresára %s\n" -#, fuzzy, c-format +#, c-format msgid "" "Usage: usermod [options] login\n" "\n" @@ -1683,33 +1761,29 @@ msgid "" " -u, --uid UID\t\t\tnew UID for the user account\n" " -U, --unlock\t\t\tunlock the user account\n" msgstr "" -"Použitie: useradd [voľby] účet\n" +"Použitie: usermod [voľby] účet\n" "\n" "Voľby:\n" -" -b, --base-dir ZÁKL_ADR\tzákladný adresár domáceho adresára nového\n" -"\t\t\t\tpoužívateľského účtu\n" -" -c, --comment KOMENTÁR\tnastaví pole GECOS nového účtu\n" -" -d, --home-dir DOM_ADR\tdomáci adresár nového účtu\n" -" -D, --defaults\t\tvypíše alebo nastaví predvolené nastavenia\n" -"\t\t\t\tprogramu useradd\n" +" -a, --append SKUPINA\t\tpridá používateľa do prídavnej skupiny\n" +" -c, --comment KOMENTÁR\t\tnová hodnota poľa GECOS\n" +" -d, --home DOMACI_ADR\t\tnový domáci adresár pre nový používateľský účet\n" " -e, --expiredate EXP_DATUM\tnastaví čas vyprÅ¡ania platnosti účtu na " "EXP_DATUM\n" -" -f, --inactive NEAKTIV\tzablokuje účet po NEAKTIV dňoch od času vyprÅ¡ania " -"platnosti\n" -" -g, --gid SKUPINA\t\tvynúti použitie tejto skupiny pre nový účet\n" -" -G, --groups SKUPINY\t\tzoznam dodatočných skupín, do ktorých\n" -"\t\t\t\tmá patriÅ¥ nový účet\n" -" -h, --help\t\t\tzobrazí túto nápovedu a skončí\n" -" -k, --skel VZOR_ADR\t\tzadá alternatívny vzorový adresár\n" -" -K, --key KĽÚČ=HODNOTA\tnahradí predvolené nastavenia /etc/login.defs\n" -" -m, --create-home\t\tvytvorí domáci adresár pre nový\n" -"\t\t\t\tpoužívateľský účet\n" -" -o, --non-unique\t\tpovolí vytvorenie používateľa s duplicitným\n" -"\t\t\t\t(nejedinečným) UID\n" -" -p, --password HESLO\t\tpre nový účet použije zadané zaÅ¡ifrované\n" -"\t\t\t\theslo\n" -" -s, --shell SHELL\t\tprihlasovací shell nového účtu\n" -" -u, --uid UID\t\t\tvynúti použitie tohto UID pre nový účet\n" +" -f, --inactive NEAKTIV\tzablokuje platnosÅ¥ hesla po NEAKTIV dňoch \t\t\t" +"\tod času vyprÅ¡ania platnosti\n" +" -g, --gid SKUPINA\t\tvynúti použitie skupiny SKUPINA ako novej prvotnej\n" +"\t\t\t\tprihlasovacej skupiny\n" +" -G, --groups SKUPINY\t\tzobrazí prídavné skupiny\n" +" -h, --help\t\t\tzobrazí túto nápovedu a ukončí sa\n" +" -l, --login LOGIN\t\tnová hodnota prihlasovacieho mena\n" +" -L, --lock\t\t\tzablokuje používateľský účet\n" +" -m, --move-home\t\tpresunie obsah domáceho adresára do nového\n" +"\t\t\t\tumiestnenia (používaÅ¥ iba s -d)\n" +" -o, --non-unique\t\tdovolí použitie duplicitného (nejedinečného) UID\n" +" -p, --password HESLO\tako nové heslo použije zadané zaÅ¡ifrované HESLO\n" +" -s, --shell SHELL\t\tnový prihlasovací shell pre používateľský účet\n" +" -u, --uid UID\t\t\tnový UID pre používateľský účet\n" +" -U, --unlock\t\t\todblokuje používateľský účet\n" #, c-format msgid "%s: out of memory in update_group\n" @@ -1789,6 +1863,14 @@ msgid "" " -q, --quiet\t\t\tquiet mode\n" " -s, --shadow\t\t\tedit shadow or gshadow database\n" msgstr "" +"Použitie: vipw [voľby]\n" +"\n" +"Voľby:\n" +" -g, --group\t\t\tupraví databázu skupín\n" +" -h, --help\t\t\tzobrazí túto nápovedu a ukončí sa\n" +" -p, --passwd\t\t\tupraví databázu passwd\n" +" -q, --quiet\t\t\tstručný mód\n" +" -s, --shadow\t\t\tupraví databázu shadow alebo gshadow\n" #, c-format msgid "" @@ -1796,44 +1878,14 @@ msgid "" "%s: %s is unchanged\n" msgstr "" "\n" -"%s: %s je bezo zmien\n" +"%s: %s je bez zmien\n" msgid "Couldn't lock file" msgstr "Súbor sa nedá zamknúť" msgid "Couldn't make backup" -msgstr "Zálohovanie sa nedá vykonaÅ¥" +msgstr "Nedá sa vytvoriÅ¥ záloha" #, 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" - -#, fuzzy -#~ msgid "" -#~ "Usage:\n" -#~ "`vipw' edits /etc/passwd `vipw -s' edits /etc/shadow\n" -#~ "`vigr' edits /etc/group `vigr -s' edits /etc/gshadow\n" -#~ "`{vipw|vigr} -q' quiet mode\n" -#~ msgstr "" -#~ "Použitie:\n" -#~ "`vipw' edituje /etc/passwd `vipw -s' edituje /etc/shadow\n" -#~ "`vigr' edituje /etc/group `vigr -s' edituje /etc/gshadow\n" - -#~ msgid "%s: PAM chauthtok failed\n" -#~ msgstr "%s: PAM metóda chauthok zlyhala\n" - -#~ msgid "%s: Cannot execute %s" -#~ msgstr "%s: %s sa nedá spustiÅ¥" - -#~ msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n" -#~ msgstr "Použitie: %s\t[-u uid [-o]] [-g skupina [-G skupina,...] \n" - -#~ 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" - -#~ msgid "[-f inactive] [-e expire] " -#~ msgstr "[-f nečinnosÅ¥] [-e uplynutie_lehoty] " - -#~ msgid "[-p passwd] [-L|-U] name\n" -#~ msgstr "[-p heslo] [-L|-U] meno\n" diff --git a/po/sq.gmo b/po/sq.gmo index 1c67a317..ccc0ff7c 100644 Binary files a/po/sq.gmo and b/po/sq.gmo differ diff --git a/po/sq.po b/po/sq.po index b5812ef3..d284ce35 100644 --- a/po/sq.po +++ b/po/sq.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: shadow 4.0.3\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" "PO-Revision-Date: 2004-11-20 03:28+0100\n" "Last-Translator: Elian Myftiu \n" "Language-Team: Albanian \n" @@ -223,7 +223,7 @@ msgid "never\n" msgstr "" #, c-format -msgid "password must be changed" +msgid "password must be changed\n" msgstr "" #, c-format @@ -421,7 +421,7 @@ msgstr "" #, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -431,11 +431,15 @@ msgid "" msgstr "" #, c-format -msgid "%s: can't lock password file\n" +msgid "%s: can't lock group file\n" msgstr "" #, c-format -msgid "%s: can't lock shadow file\n" +msgid "%s: can't open group file\n" +msgstr "" + +#, c-format +msgid "%s: can't lock gshadow file\n" msgstr "" #, c-format @@ -450,9 +454,9 @@ msgstr "" msgid "%s: line %d: missing new password\n" msgstr "" -#, c-format -msgid "%s: line %d: unknown user %s\n" -msgstr "" +#, fuzzy, c-format +msgid "%s: line %d: unknown group %s\n" +msgstr "Kujdes: grup i panjohur %s\n" #, c-format msgid "%s: line %d: cannot update password entry\n" @@ -470,6 +474,29 @@ msgstr "" msgid "%s: error updating password file\n" msgstr "" +#, 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 "" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "" @@ -828,14 +855,6 @@ msgstr "" msgid "%s: no changes\n" msgstr "" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "" @@ -902,6 +921,10 @@ msgstr "" msgid "**Never logged in**" msgstr "" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "" @@ -949,9 +972,19 @@ msgid "login: PAM Failure, aborting: %s\n" msgstr "" #, c-format -msgid "" -"\n" -"Login incorrect\n" +msgid "%s login: " +msgstr "" + +#, c-format +msgid "login: " +msgstr "" + +#, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "" + +#, c-format +msgid "login: abort requested by PAM\n" msgstr "" #, c-format @@ -1248,6 +1281,7 @@ msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" diff --git a/po/sv.gmo b/po/sv.gmo index 6eac31e1..e859f376 100644 Binary files a/po/sv.gmo and b/po/sv.gmo differ diff --git a/po/sv.po b/po/sv.po index 395f1f02..6bc8b37e 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,23 +1,20 @@ -# SOME DESCRIPTIVE TITLE. +# Swedish translation of shadow. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# This file is distributed under the same license as the shadow package. +# Daniel Nylander , 2005. # msgid "" msgstr "" -"Project-Id-Version: shadow\n" +"Project-Id-Version: shadow 4.0.15\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" -"PO-Revision-Date: 2005-10-16 19:00+0100\n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" +"PO-Revision-Date: 2006-03-07 20:06+0100\n" "Last-Translator: Daniel Nylander \n" -"Language-Team: Swedish \n" +"Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Swedish\n" -"X-Poedit-Country: SWEDEN\n" -"X-Poedit-SourceCharset: iso-8859-1\n" -"Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\\n\n" +"Plural-Forms: nplurals=2; plural=n != 1\n" #, c-format msgid "Could not allocate space for config info.\n" @@ -25,7 +22,7 @@ msgstr "Kunde inte allokera plats för konfigurationsinformationen.\n" #, c-format msgid "configuration error - unknown item '%s' (notify administrator)\n" -msgstr "konfigurationsfel - okänd post '%s' (informera administratören)\n" +msgstr "konfigurationsfel - okänd post \"%s\" (informera administratören)\n" #, c-format msgid "Warning: unknown group %s\n" @@ -45,7 +42,7 @@ msgstr "Ditt lösenord är inaktivt." #, c-format msgid "Your login has expired." -msgstr "Ditt login har upphört att gälla." +msgstr "Ditt inloggningskonto har upphört att gälla." msgid " Contact the system administrator.\n" msgstr " Kontakta systemadministratören.\n" @@ -71,7 +68,7 @@ msgstr "Kunde inte ändra tty %s" #, c-format msgid "Environment overflow\n" -msgstr "Miljö-överflöde\n" +msgstr "Överskott av miljövariabler\n" #, c-format msgid "You may not change $%s\n" @@ -85,10 +82,10 @@ msgid_plural "" "%d failures since last login.\n" "Last was %s on %s.\n" msgstr[0] "" -"%d felaktig sedan förra inloggningen\n" +"%d misslyckade sedan förra inloggningen\n" "Senast var %s den %s.\n" msgstr[1] "" -"%d felaktiga sedan förra inloggningen\n" +"%d misslyckanden sedan förra inloggningen\n" "Senast var %s den %s.\n" #, c-format @@ -96,13 +93,13 @@ msgid "Too many logins.\n" msgstr "För mÃ¥nga inloggningsförsök.\n" msgid "You have new mail." -msgstr "Du har ny e-post." +msgstr "Du har ny post." msgid "No mail." msgstr "Ingen post." msgid "You have mail." -msgstr "Du har e-post." +msgstr "Du har post." msgid "no change" msgstr "ingen ändring" @@ -120,7 +117,7 @@ msgid "too simple" msgstr "för enkelt" msgid "rotated" -msgstr "roterad" +msgstr "roterat" msgid "too short" msgstr "för kort" @@ -146,10 +143,10 @@ msgstr "Felaktigt lösenord för %s.\n" #, c-format msgid "Unable to cd to \"%s\"\n" -msgstr "Kunde inte byta mapp till \"%s\"\n" +msgstr "Kunde inte byta katalog till \"%s\"\n" msgid "No directory, logging in with HOME=/" -msgstr "Ingen mapp, loggar in med HOME=/" +msgstr "Ingen katalog, loggar in med HOME=/" #, c-format msgid "Cannot execute %s" @@ -157,11 +154,11 @@ msgstr "Kunde inte starta %s" #, c-format msgid "Invalid root directory \"%s\"\n" -msgstr "Felaktig rotmapp \"%s\"\n" +msgstr "Felaktig rotkatalog \"%s\"\n" #, c-format msgid "Can't change root directory to \"%s\"\n" -msgstr "Kan inte ändra rot-mapp till \"%s\"\n" +msgstr "Kan inte ändra rot-katalog till \"%s\"\n" msgid "No utmp entry. You must exec \"login\" from the lowest level \"sh\"" msgstr "Ingen utmp post. Du mÃ¥ste köra \"login\" frÃ¥n den lägsta nivÃ¥n \"sh\"" @@ -201,16 +198,16 @@ msgstr "" "\n" "Flaggor:\n" " -d, --lastday DAG\t\tsätt senaste lösenordsändringen till DAG\n" -" -E, --expiredate DATUM\tsätt utlöpsdatum för konto till DATUM\n" +" -E, --expiredate DATUM\tsätt utgÃ¥ngsdatum för konto till DATUM\n" " -h, --help\t\t\tvisa detta hjälpmeddelande och avsluta\n" -" -I, --inactive INAKTIV\tsätt lösenordet inaktivt efter utlöpsdatum\n" +" -I, --inactive INAKTIV\tsätt lösenordet inaktivt efter utgÃ¥ngsdatum\n" "\t\t\t\ttill INAKTIV\n" " -l, --list\t\t\tvisa Ã¥ldringsinformation för konto\n" " -m, --mindays MIN_DAG\t\tsätt minimum antal dagar före lösenordet\n" "\t\t\t\tmÃ¥ste bytas till MIN_DAG\n" " -M, --maxdays MAX_DAG\t\tsätt maximum antal dagar före lösenordet\n" "\t\t\t\tmÃ¥ste bytas till MAX_DAG\n" -" -W, --warndays VARN_DAG\tsätt antal dagar för varning före utlöpsdatum\n" +" -W, --warndays VARN_DAG\tsätt antal dagar för varning före utgÃ¥ngsdatum\n" "\t\t\t\ttill VARN_DAG\n" #, c-format @@ -243,9 +240,9 @@ msgstr "Senaste lösenordsändringen\t\t\t\t: " msgid "never\n" msgstr "aldrig\n" -#, fuzzy, c-format -msgid "password must be changed" -msgstr "Lösenordet ändrat.\n" +#, c-format +msgid "password must be changed\n" +msgstr "lösenordet mÃ¥ste ändras\n" #, c-format msgid "Password expires\t\t\t\t\t: " @@ -345,11 +342,11 @@ msgstr "" "Användning: %s [-f fullt_namn] [-r rums_nr] [-w arb_tel] [-h hem_tel]\n" msgid "Full Name" -msgstr "Fullt namn" +msgstr "Helt namn" #, c-format msgid "\tFull Name: %s\n" -msgstr "\tFullt namn: %s\n" +msgstr "\tHelt namn: %s\n" msgid "Room Number" msgstr "Rumsnummer" @@ -373,7 +370,7 @@ msgid "\tHome Phone: %s\n" msgstr "\tTelefonnummer (hem): %s\n" msgid "Other" -msgstr "Annat" +msgstr "Övrigt" #, c-format msgid "%s: Cannot determine your user name.\n" @@ -381,7 +378,7 @@ msgstr "%s: Kan inte fastställa ditt användarnamn.\n" #, c-format msgid "%s: cannot change user `%s' on NIS client.\n" -msgstr "%s: kan inte ändra användare `%s' pÃ¥ NIS-klienten.\n" +msgstr "%s: kan inte ändra användare `%s' pÃ¥ en NIS-klient.\n" #, c-format msgid "%s: `%s' is the NIS master for this client.\n" @@ -429,7 +426,7 @@ msgstr "Kan inte öppna lösenordsfilen.\n" #, c-format msgid "%s: %s not found in /etc/passwd\n" -msgstr "%s: %s hittades inte i /etc/passwd\n" +msgstr "%s: %s finns inte i /etc/passwd\n" #, c-format msgid "Error updating the password entry.\n" @@ -445,7 +442,7 @@ msgstr "Kan inte lÃ¥sa upp lösenordsfilen.\n" #, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -453,21 +450,25 @@ msgid "" " -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n" "\t\t\tpasswords are not encrypted\n" msgstr "" -"Användning: chpasswd [flaggor]\n" +"Användning: chgpasswd [flaggor]\n" "\n" "Flaggor:\n" " -e, --encrypted\tangivna lösenord är krypterade\n" -" -h, --help\t\tvisa detta hjälpmeddelande och avsluta.\n" +" -h, --help\t\tvisa detta hjälpmeddelande och avsluta\n" " -m, --md5\t\tanvänd MD5-kryptering istället för DES när de\n" "\t\t\tangivna lösenorden inte är krypterade\n" #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: kan inte lÃ¥sa lösenordsfilen\n" +msgid "%s: can't lock group file\n" +msgstr "%s: kan inte lÃ¥sa gruppfilen\n" #, c-format -msgid "%s: can't lock shadow file\n" -msgstr "%s: kan inte lÃ¥sa skuggfilen\n" +msgid "%s: can't open group file\n" +msgstr "%s: kan inte öppna gruppfilen\n" + +#, c-format +msgid "%s: can't lock gshadow file\n" +msgstr "%s: kan inte lÃ¥sa gshadow-filen\n" #, c-format msgid "%s: can't open shadow file\n" @@ -482,8 +483,8 @@ msgid "%s: line %d: missing new password\n" msgstr "%s: rad %d: saknar nytt lösenord\n" #, c-format -msgid "%s: line %d: unknown user %s\n" -msgstr "%s: rad %d: okänd användare %s\n" +msgid "%s: line %d: unknown group %s\n" +msgstr "%s: rad %d: okänd grupp %s\n" #, c-format msgid "%s: line %d: cannot update password entry\n" @@ -501,6 +502,36 @@ msgstr "%s: fel vid uppdatering av skuggfil\n" msgid "%s: error updating password file\n" msgstr "%s: fel vid uppdatering av lösenordsfil\n" +#, 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 "" +"Användning: chpasswd [flaggor]\n" +"\n" +"Flaggor:\n" +" -e, --encrypted\tangivna lösenord är krypterade\n" +" -h, --help\t\tvisa detta hjälpmeddelande och avsluta.\n" +" -m, --md5\t\tanvänd MD5-kryptering istället för DES när de\n" +"\t\t\tangivna lösenorden inte är krypterade\n" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: kan inte lÃ¥sa lösenordsfilen\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s: kan inte lÃ¥sa skuggfilen\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s: rad %d: okänd användare %s\n" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "Användning: %s [-s skal] [namn]\n" @@ -514,7 +545,7 @@ msgstr "Du fÃ¥r inte ändra skalet för %s.\n" #, c-format msgid "Changing the login shell for %s\n" -msgstr "Ändrar loginskalet för %s\n" +msgstr "Ändrar inloggningsskal för %s\n" #, c-format msgid "%s: Invalid entry: %s\n" @@ -552,14 +583,16 @@ msgstr "" "Flaggor:\n" " -a, --all\t\t\tvisa faillog information för alla användare\n" " -h, --help\t\t\tvisa detta hjälpmeddelande och avsluta\n" -" -l, --lock-time SEK\t\tlÃ¥s kontot efter misslyckade login i SEK sekunder\n" -" -m, --maximum MAX\t\tsätt maximum misslyckade login till MAX\n" -" -r, --reset\t\t\tÃ¥terställ räknaren för misslyckade login\n" +" -l, --lock-time SEK\t\tlÃ¥s kontot efter misslyckade inloggningar i SEK " +"sekunder\n" +" -m, --maximum MAX\t\tsätt maximum misslyckade inloggningar till MAX\n" +" -r, --reset\t\t\tÃ¥terställ räknaren för misslyckade inloggningar\n" " -t, --time DAGAR\t\tvisa faillog information för senare än DAGAR\n" -" -u, --user LOGIN\t\tvisa faillog information eller hantera räknare för " +" -u, --user KONTO\t\tvisa faillog information eller hantera räknare för " "misslyckade\n" -"\t\t\t\tlogin och begränsa (om använd med -r, -m eller -l flaggor) bara\n" -"\t\t\t\tför användaren LOGIN\n" +"\t\t\t\tinloggningar och begränsa (om använd med -r, -m eller -l flaggor) " +"endast\n" +"\t\t\t\tför användaren KONTO\n" #, c-format msgid "Login Failures Maximum Latest On\n" @@ -599,7 +632,7 @@ msgstr " %s [-M användare,...] grupp\n" #, c-format msgid "%s: shadow group passwords required for -A\n" -msgstr "%s: lösenord för skugg-grupper krävs för -A\n" +msgstr "%s: lösenord för skuggrupper krävs för -A\n" #, c-format msgid "Who are you?\n" @@ -648,7 +681,7 @@ msgstr "%s: kan inte hämta lÃ¥s\n" #, c-format msgid "%s: can't get shadow lock\n" -msgstr "%s: kan inte hämta skugglÃ¥s\n" +msgstr "%s: kan inte fÃ¥ skugglÃ¥s\n" #, c-format msgid "%s: can't open file\n" @@ -694,7 +727,7 @@ msgstr "" "\t\t\tgruppen redan finns\n" " -g, --gid GID\t\tanvänd GID för den nya gruppen\n" " -h, --help\t\tvisa detta hjälpmeddelandet och avsluta\n" -" -K, --key KEY=VÄRDE\tkör över standardvärden frÃ¥n /etc/login.defs\n" +" -K, --key KEY=VÄRDE\tÃ¥sidosätter standardvärden frÃ¥n /etc/login.defs\n" " -o, --non-unique\ttillÃ¥ter skapa grupp med duplikat\n" "\t\t\t(icke-unikt) GID\n" @@ -724,7 +757,7 @@ msgstr "%s: kan inte skriva om gruppfilen\n" #, c-format msgid "%s: cannot rewrite shadow group file\n" -msgstr "%s: kan inte skriva om skugg-gruppfilen\n" +msgstr "%s: kan inte skriva om skuggruppfilen\n" #, c-format msgid "%s: unable to lock group file\n" @@ -736,11 +769,11 @@ msgstr "%s: kunde inte öppna gruppfilen\n" #, c-format msgid "%s: unable to lock shadow group file\n" -msgstr "%s: kunde inte lÃ¥sa skugg-gruppfilen\n" +msgstr "%s: kunde inte lÃ¥sa skuggruppfilen\n" #, c-format msgid "%s: unable to open shadow group file\n" -msgstr "%s: kunde inte öppna skugg-gruppfilen\n" +msgstr "%s: kunde inte öppna skuggruppfilen\n" #, c-format msgid "%s: invalid group %s\n" @@ -764,7 +797,7 @@ msgstr "%s: fel vid borttagning av grupp-post\n" #, c-format msgid "%s: error removing shadow group entry\n" -msgstr "%s: kunde inte ta bort post frÃ¥n skugg-grupp\n" +msgstr "%s: kunde inte ta bort post frÃ¥n skuggrupp\n" #, c-format msgid "%s: cannot remove user's primary group.\n" @@ -832,7 +865,7 @@ msgstr "ta bort rad '%s'? " #, c-format msgid "duplicate group entry\n" -msgstr "duplikata grupp-poster\n" +msgstr "dubblerade grupposter\n" #, c-format msgid "invalid group name `%s'\n" @@ -848,11 +881,11 @@ msgstr "ta bort medlemmen `%s'? " #, c-format msgid "invalid shadow group file entry\n" -msgstr "ogiltig post i fil för skugg-grupper\n" +msgstr "ogiltig post i fil för skuggrupper\n" #, c-format msgid "duplicate shadow group entry\n" -msgstr "duplikata poster i skugg-grupp\n" +msgstr "duplikata poster i skuggrupp\n" #, c-format msgid "no matching group file entry\n" @@ -860,7 +893,7 @@ msgstr "ingen matchande post i gruppfil\n" #, c-format msgid "shadow group %s: no administrative user %s\n" -msgstr "skugg-grupp %s: ingen administrativ användare %s\n" +msgstr "skuggrupp %s: ingen administrativ användare %s\n" #, c-format msgid "delete administrative member `%s'? " @@ -868,7 +901,7 @@ msgstr "ta bort den administrative medlemmen `%s'? " #, c-format msgid "shadow group %s: no user %s\n" -msgstr "skugg-grupp %s: ingen användare %s\n" +msgstr "skuggrupp %s: ingen användare %s\n" #, c-format msgid "%s: cannot update file %s\n" @@ -882,25 +915,17 @@ msgstr "%s: filerna har uppdaterats\n" msgid "%s: no changes\n" msgstr "%s: inga ändringar\n" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "%s: kan inte lÃ¥sa gruppfilen\n" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "%s: kan inte öppna gruppfilen\n" - #, c-format msgid "%s: can't lock shadow group file\n" -msgstr "%s: kan inte lÃ¥sa filen för skugg-grupper\n" +msgstr "%s: kan inte lÃ¥sa filen för skuggrupper\n" #, c-format msgid "%s: can't open shadow group file\n" -msgstr "%s: kan inte öppna filen för skugg-grupper\n" +msgstr "%s: kan inte öppna filen för skuggrupper\n" #, c-format msgid "%s: can't remove shadow group %s\n" -msgstr "%s: kan inte ta bort skugg-gruppen %s\n" +msgstr "%s: kan inte ta bort skuggruppen %s\n" #, c-format msgid "%s: can't update shadow entry for %s\n" @@ -912,7 +937,7 @@ msgstr "%s: kan inte uppdatera post för gruppen %s\n" #, c-format msgid "%s: can't update shadow group file\n" -msgstr "%s: kan inte uppdatera filen för skugg-grupper\n" +msgstr "%s: kan inte uppdatera filen för skuggrupper\n" #, c-format msgid "%s: can't update group file\n" @@ -955,14 +980,18 @@ msgstr "" #, c-format msgid "Username Port From Latest\n" -msgstr "Användarnamn Port FrÃ¥n Senast\n" +msgstr "Användarnamn Port FrÃ¥n Senast\n" #, c-format msgid "Username Port Latest\n" msgstr "Användarnamn Port Senast\n" msgid "**Never logged in**" -msgstr "**Aldrig loggat in**" +msgstr "**Aldrig varit inloggad**" + +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "lastlog: oväntat argument: %s\n" #, c-format msgid "Usage: %s [-p] [name]\n" @@ -994,7 +1023,7 @@ msgid "" "[Disconnect bypassed -- root login allowed.]\n" msgstr "" "\n" -"[Nedkoppling kringgÃ¥tt -- root login tillÃ¥ten.]\n" +"[Nedkoppling kringgÃ¥dd -- rootinloggning tillÃ¥ten.]\n" #, c-format msgid "" @@ -1017,12 +1046,20 @@ msgid "login: PAM Failure, aborting: %s\n" msgstr "login: PAM misslyckades, avbryter: %s\n" #, c-format -msgid "" -"\n" -"Login incorrect\n" -msgstr "" -"\n" -"Felaktigt inloggningsförsök\n" +msgid "%s login: " +msgstr "%s inloggning: " + +#, c-format +msgid "login: " +msgstr "inloggning: " + +#, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "Maximalt antal försök överskreds (%d)\n" + +#, c-format +msgid "login: abort requested by PAM\n" +msgstr "login: avbryt begärdes av PAM\n" #, c-format msgid "" @@ -1044,11 +1081,11 @@ msgstr "Varning: inloggning Ã¥teraktiverad efter temporär nedstängning.\n" #, c-format msgid "Last login: %s on %s" -msgstr "Senast inloggad: %s den %s" +msgstr "Senast inloggad: %s pÃ¥ %s" #, c-format msgid "Last login: %.19s on %s" -msgstr "Senast inloggad: %.19s den %s" +msgstr "Senast inloggad: %.19s pÃ¥ %s" #, c-format msgid " from %.*s" @@ -1170,7 +1207,7 @@ msgstr "" " -i, --inactive INAKTIVT\tsätt lösenordet till inaktivt efter utlöpsdatum\n" "\t\t\t\ttill INAKTIVT\n" " -l, --lock\t\t\tlÃ¥s det angivna kontot\n" -" -n, --mindays MIN_DAG\t\tsätt minimum antal dagar före lösenordet mÃ¥ste\n" +" -n, --mindays MIN_DAG\t\tsätt minimum antal dagar före lösenordet kan\n" "\t\t\t\tändras till MIN_DAG\n" " -q, --quiet\t\t\ttyst läge\n" " -r, --repository REPOSITORY\tändra lösenordet i REPOSITORY repository\n" @@ -1268,7 +1305,7 @@ msgstr "användare %s: ingen grupp %u\n" #, c-format msgid "user %s: directory %s does not exist\n" -msgstr "användare %s: mappen %s finns inte\n" +msgstr "användare %s: katalogen %s finns inte\n" #, c-format msgid "user %s: program %s does not exist\n" @@ -1328,7 +1365,7 @@ msgstr "TillgÃ¥ng med su till det kontot NEKAS.\n" #, c-format msgid "Password authentication bypassed.\n" -msgstr "Lösenordsautentisering kringgÃ¥tt.\n" +msgstr "Lösenordsautentisering kringgÃ¥dd.\n" #, c-format msgid "Please enter your OWN password as authentication.\n" @@ -1346,6 +1383,7 @@ msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" @@ -1353,6 +1391,16 @@ msgid "" "\t\t\t\tthe same shell\n" " -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n" msgstr "" +"Användning: su [flaggor] [konto]\n" +"\n" +"Flaggor:\n" +" -c, --command KOMMANDO\t\tskicka KOMMANDO till anropade skalet\n" +" -h, --help\t\t\tvisa detta hjälpmeddelande och avsluta\n" +" -, -l, --login\t\tgör skalet till inloggningsskal\n" +" -m, -p,\n" +" --preserve-environment\tÃ¥terställ inte miljövariabler och behÃ¥ll\n" +"\t\t\t\tsamma skal\n" +" -s, --shell SKAL\t\tanvänd SKAL istället för det angivna i passwd\n" #, c-format msgid "%s: must be run from a terminal\n" @@ -1423,7 +1471,7 @@ msgstr "%s: kan inte skapa ny standardfil\n" #, c-format msgid "%s: cannot open new defaults file\n" -msgstr "%s: kan inte öppna ny standardfil\n" +msgstr "%s: kan inte öppna ny fil med standardvärden\n" #, c-format msgid "%s: rename: %s" @@ -1469,22 +1517,22 @@ msgstr "" "Användning: useradd [flaggor] LOGIN\n" "\n" "Flaggor:\n" -" -b, --base-dir BAS_MAPP\tbasmapp för det nya användarkontots\n" +" -b, --base-dir BAS_KATALOG\tbaskatalog för det nya användarkontots\n" "\t\t\t\them-map\n" " -c, --comment KOMMENTAR\t\tsätt ett GECOS-fält för det nya användarkontot\n" -" -d, --home-dir HEM_MAPP\them-mapp för det nya kontot\n" +" -d, --home-dir HEM_KATALOG\themkatalog för det nya kontot\n" " -D, --defaults\t\tskriv ut eller spara modifierad standard för useradd\n" "\t\t\t\tkonfiguration\n" -" -e, --expiredate UTLÖPSDATUM\tsätt kontots utlöpsdatum till UTLÖPSDATUM\n" +" -e, --expiredate UTLÖPSDATUM\tsätt kontots utgÃ¥ngsdatum till UTLÖPSDATUM\n" " -f, --inactive INAKTIV\tsätt lösenordet inaktivt efter utlöpsdatum\n" "\t\t\t\ttill INAKTIV\n" " -g, --gid GRUPP\t\ttvinga använda GRUPP för nya användarkontot\n" " -G, --groups GRUPPER\t\tlista av tilläggsgrupper för det nya\n" "\t\t\t\tanvändarkontot\n" " -h, --help\t\t\tvisa detta hjälpmeddelande och avsluta\n" -" -k, --skel SKEL_MAPP\t\tspecificera ett alternativ skel-mapp\n" -" -K, --key KEY=VÄRDE\t\tkör över standardvärden frÃ¥n /etc/login.defs\n" -" -m, --create-home\t\tskapa hem-mapp för det nya användarkontot\n" +" -k, --skel SKEL_KATALOG\t\tspecificera ett alternativ skel-katalog\n" +" -K, --key KEY=VÄRDE\t\tÃ¥sidosätter standardvärden frÃ¥n /etc/login.defs\n" +" -m, --create-home\t\tskapa hem-katalog för det nya användarkontot\n" " -o, --non-unique\t\ttillÃ¥t skapa användare med samma dublerat\n" "\t\t\t\t(icke-unikt) UID\n" " -p, --password LÖSENORD\tanvänd krypterat lösenord för det nya\n" @@ -1498,11 +1546,11 @@ msgstr "%s: UID %u är inte unik\n" #, c-format msgid "%s: can't get unique UID\n" -msgstr "%s: kan inte hämta unikt UID\n" +msgstr "%s: kan inte fÃ¥ tag i unikt UID\n" #, c-format msgid "%s: invalid base directory `%s'\n" -msgstr "%s: ogiltig basmapp `%s'\n" +msgstr "%s: ogiltig baskatalog \"%s\"\n" #, c-format msgid "%s: invalid comment `%s'\n" @@ -1510,7 +1558,7 @@ msgstr "%s: ogiltig kommentar `%s'\n" #, c-format msgid "%s: invalid home directory `%s'\n" -msgstr "%s: ogiltig hem-mapp `%s'\n" +msgstr "%s: ogiltig hem-katalog `%s'\n" #, c-format msgid "%s: invalid date `%s'\n" @@ -1542,7 +1590,7 @@ msgstr "%s: kan inte skriva om lösenordsfilen\n" #, c-format msgid "%s: cannot rewrite shadow password file\n" -msgstr "%s: kan inte skriva om skugg-gruppfilen\n" +msgstr "%s: kan inte skriva om skuggruppfilen\n" #, c-format msgid "%s: unable to lock password file\n" @@ -1570,11 +1618,11 @@ msgstr "%s: fel vid öppning av gruppfil\n" #, c-format msgid "%s: error locking shadow group file\n" -msgstr "%s: fel vid lÃ¥sning av skugg-gruppfil\n" +msgstr "%s: fel vid lÃ¥sning av skuggruppfil\n" #, c-format msgid "%s: error opening shadow group file\n" -msgstr "%s: fel vid öppning av skugg-gruppfil\n" +msgstr "%s: fel vid öppning av skuggruppfil\n" #, c-format msgid "%s: error adding new password entry\n" @@ -1586,7 +1634,7 @@ msgstr "%s: fel vid tilläggning av ny skugglösenordspost\n" #, c-format msgid "%s: cannot create directory %s\n" -msgstr "%s: kan inte skapa mapp %s\n" +msgstr "%s: kan inte skapa katalog %s\n" #, c-format msgid "No group named \"mail\" exists, creating mail spool with mode 0600.\n" @@ -1614,8 +1662,8 @@ msgid "" "%s: warning: the home directory already exists.\n" "Not copying any file from skel directory into it.\n" msgstr "" -"%s: varning: hem-mappen finns redan.\n" -"Kopierar ingen fil frÃ¥n skel-mappen till den.\n" +"%s: varning: hem-katalogen finns redan.\n" +"Kopierar ingen fil frÃ¥n skel-katalogen till den.\n" #, c-format msgid "%s: warning: CREATE_HOME not supported, please use -m instead.\n" @@ -1641,7 +1689,7 @@ msgstr "%s: kan inte öppna gruppfilen\n" #, c-format msgid "%s: cannot open shadow group file\n" -msgstr "%s: kunde inte öppna fil för skugg-grupp\n" +msgstr "%s: kunde inte öppna fil för skuggrupp\n" #, c-format msgid "%s: error deleting password entry\n" @@ -1674,13 +1722,13 @@ msgstr "%s: användaren %s är en NIS-användare\n" #, c-format msgid "%s: not removing directory %s (would remove home of user %s)\n" msgstr "" -"%s: tar inte bort mappen %s (skulle ta bort hemmet för användaren %s)\n" +"%s: tar inte bort katalogen %s (skulle ta bort hemmet för användaren %s)\n" #, c-format msgid "%s: error removing directory %s\n" -msgstr "%s: fel vid borttagning av mappen %s\n" +msgstr "%s: fel vid borttagning av katalogen %s\n" -#, fuzzy, c-format +#, c-format msgid "" "Usage: usermod [options] login\n" "\n" @@ -1704,31 +1752,29 @@ msgid "" " -u, --uid UID\t\t\tnew UID for the user account\n" " -U, --unlock\t\t\tunlock the user account\n" msgstr "" -"Användning: useradd [flaggor] LOGIN\n" +"Användning: usermod [flaggor] login\n" "\n" "Flaggor:\n" -" -b, --base-dir BAS_MAPP\tbasmapp för det nya användarkontots\n" -"\t\t\t\them-map\n" -" -c, --comment KOMMENTAR\t\tsätt ett GECOS-fält för det nya användarkontot\n" -" -d, --home-dir HEM_MAPP\them-mapp för det nya kontot\n" -" -D, --defaults\t\tskriv ut eller spara modifierad standard för useradd\n" -"\t\t\t\tkonfiguration\n" -" -e, --expiredate UTLÖPSDATUM\tsätt kontots utlöpsdatum till UTLÖPSDATUM\n" -" -f, --inactive INAKTIV\tsätt lösenordet inaktivt efter utlöpsdatum\n" +" -a, --append GRUPP\t\tlägg till användaren till tilläggsGRUPP\n" +" -c, --comment KOMMENTAR\t\tnytt värde för GECOS-fält\n" +" -d, --home-dir HEMKATALOG\themkatalog för nya användarkontot\n" +" -e, --expiredate UTGÅNGSDATUM\tsätt kontots utgÃ¥ngsdatum till " +"UTGÅNGSDATUM\n" +" -f, --inactive INAKTIV\tsätt lösenordet inaktivt efter utgÃ¥ngsdatum\n" "\t\t\t\ttill INAKTIV\n" -" -g, --gid GRUPP\t\ttvinga använda GRUPP för nya användarkontot\n" -" -G, --groups GRUPPER\t\tlista av tilläggsgrupper för det nya\n" -"\t\t\t\tanvändarkontot\n" +" -g, --gid GRUPP\t\ttvinga använda GRUPP som ny initial inloggningsgrupp\n" +" -G, --groups GRUPPER\t\tlista tilläggsgrupper\n" " -h, --help\t\t\tvisa detta hjälpmeddelande och avsluta\n" -" -k, --skel SKEL_MAPP\t\tspecificera ett alternativ skel-mapp\n" -" -K, --key KEY=VÄRDE\t\tkör över standardvärden frÃ¥n /etc/login.defs\n" -" -m, --create-home\t\tskapa hem-mapp för det nya användarkontot\n" -" -o, --non-unique\t\ttillÃ¥t skapa användare med samma dublerat\n" -"\t\t\t\t(icke-unikt) UID\n" +" -l, --login KONTO\t\tnytt värde för inloggningskontots namn\n" +" -L, --lock\t\t\tlÃ¥s användarkontot\n" +" -m, --move-home\t\tflytta innehÃ¥llet i hemkatalogen till den nya platsen\n" +"\t\t\t\t(använd endast med -d)\n" +" -o, --non-unique\t\ttillÃ¥t dubblett av (icke-unikt) UID\n" " -p, --password LÖSENORD\tanvänd krypterat lösenord för det nya\n" -"\t\t\t\tanvändarkontot\n" -" -s, --shell SKAL\t\tinloggningsskalet för det nya användarkontot\n" -" -u, --uid UID\t\t\ttvinga använda UID för det nya användarkontot\n" +"\t\t\t\tlösenordet\n" +" -s, --shell SKAL\t\tnytt inloggningsskal för användarkontot\n" +" -u, --uid UID\t\t\tnytt UID för användarkontot\n" +" -U, --unlock\t\t\tlÃ¥s upp användarkontot\n" #, c-format msgid "%s: out of memory in update_group\n" @@ -1768,7 +1814,7 @@ msgstr "%s: fel vid borttagning av skugglösenordspost\n" #, c-format msgid "%s: directory %s exists\n" -msgstr "%s: mappen %s finns redan\n" +msgstr "%s: katalogen %s finns redan\n" #, c-format msgid "%s: can't create %s\n" @@ -1780,11 +1826,11 @@ msgstr "%s: kan inte chown %s\n" #, c-format msgid "%s: warning: failed to completely remove old home directory %s" -msgstr "%s: varning: misslyckades att komplett ta bort gamla hem-mappen %s" +msgstr "%s: varning: misslyckades att komplett ta bort gamla hem-katalogen %s" #, c-format msgid "%s: cannot rename directory %s to %s\n" -msgstr "%s: kunde inte byta namn pÃ¥ mappen %s till %s\n" +msgstr "%s: kunde inte byta namn pÃ¥ katalogen %s till %s\n" #, c-format msgid "%s: warning: %s not owned by %s\n" @@ -1807,6 +1853,14 @@ msgid "" " -q, --quiet\t\t\tquiet mode\n" " -s, --shadow\t\t\tedit shadow or gshadow database\n" msgstr "" +"Användning: vipw [flaggor]\n" +"\n" +"Flaggor:\n" +" -g, --group\t\t\tredigera gruppdatabas\n" +" -h, --help\t\t\tvisa detta hjälpmeddelande och avsluta\n" +" -p, --passwd\t\t\tredigera lösenordsdatabas\n" +" -q, --quiet\t\t\ttyst läge\n" +" -s, --shadow\t\t\tredigera databaserna shadow eller gshadow\n" #, c-format msgid "" @@ -1826,25 +1880,9 @@ msgstr "Kunde inte göra en säkerhetskopia" msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s: kan inte Ã¥terställa %s: %s (dina ändringar finns i %s)\n" -#, fuzzy #~ msgid "" -#~ "Usage:\n" -#~ "`vipw' edits /etc/passwd `vipw -s' edits /etc/shadow\n" -#~ "`vigr' edits /etc/group `vigr -s' edits /etc/gshadow\n" -#~ "`{vipw|vigr} -q' quiet mode\n" +#~ "\n" +#~ "Login incorrect\n" #~ msgstr "" -#~ "Användning:\n" -#~ "`vipw' ändrar /etc/passwd `vipw -s' ändrar /etc/shadow\n" -#~ "`vigr' ändrar /etc/group `vigr -s' ändrar /etc/gshadow\n" - -#~ msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n" -#~ msgstr "Användning: %s\t[-u uid [-o]] [-g grupp] [[-G grupp,...] [-a]] \n" - -#~ 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" - -#~ msgid "[-f inactive] [-e expire] " -#~ msgstr "[-f inaktiv] [-e utlöp] " - -#~ msgid "[-p passwd] [-L|-U] name\n" -#~ msgstr "[-p lösenord] [-L|-U] namn\n" +#~ "\n" +#~ "Felaktigt inloggningsförsök\n" diff --git a/po/tl.gmo b/po/tl.gmo index 6b4ee950..2f1931b4 100644 Binary files a/po/tl.gmo and b/po/tl.gmo differ diff --git a/po/tl.po b/po/tl.po index 0f94b8a7..a6d33386 100644 --- a/po/tl.po +++ b/po/tl.po @@ -8,10 +8,10 @@ # Itong talaksan ay inaalagaan ni Eric Pareja msgid "" msgstr "" -"Project-Id-Version: shadow 4.0.14\n" +"Project-Id-Version: shadow 4.0.15\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" -"PO-Revision-Date: 2005-12-30 13:12+0800\n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" +"PO-Revision-Date: 2006-03-08 17:13+0800\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" "MIME-Version: 1.0\n" @@ -251,8 +251,8 @@ msgid "never\n" msgstr "Hindi kailanman\n" #, c-format -msgid "password must be changed" -msgstr "kailangan palitan ang password" +msgid "password must be changed\n" +msgstr "kailangan palitan ang password\n" #, c-format msgid "Password expires\t\t\t\t\t: " @@ -454,7 +454,7 @@ msgstr "Hindi maalis ang aldaba sa talaksang password.\n" #, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -462,21 +462,25 @@ msgid "" " -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" +"Pag-gamit: chpasswd [mga opsyon]\n" "\n" -"Mga option:\n" +"Mga opsyon:\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" #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: hindi maaldaba ang talaksang password\n" +msgid "%s: can't lock group file\n" +msgstr "%s: hindi maaldaba ang talaksang grupo\n" #, c-format -msgid "%s: can't lock shadow file\n" -msgstr "%s: hindi maaldaba ang talaksang shadow\n" +msgid "%s: can't open group file\n" +msgstr "%s: hindi mabuksan ang talaksang grupo\n" + +#, c-format +msgid "%s: can't lock gshadow file\n" +msgstr "%s: hindi maaldaba ang talaksang gshadow\n" #, c-format msgid "%s: can't open shadow file\n" @@ -491,8 +495,8 @@ msgid "%s: line %d: missing new password\n" msgstr "%s: linya %d: walang bagong password\n" #, c-format -msgid "%s: line %d: unknown user %s\n" -msgstr "%s: linya %d: di kilalang gumagamit %s\n" +msgid "%s: line %d: unknown group %s\n" +msgstr "%s: linya %d: di kilalang grupo %s\n" #, c-format msgid "%s: line %d: cannot update password entry\n" @@ -510,6 +514,36 @@ msgstr "%s: error sa pag-apdeyt ng talaksang shadow\n" msgid "%s: error updating password file\n" msgstr "%s: error sa pag-apdeyt ng talaksang password\n" +#, 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" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: hindi maaldaba ang talaksang password\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s: hindi maaldaba ang talaksang shadow\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s: linya %d: di kilalang gumagamit %s\n" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "Pag-gamit: %s [-s shell] [pangalan]\n" @@ -893,14 +927,6 @@ msgstr "%s: ang mga talaksan ay na-apdeyt\n" msgid "%s: no changes\n" msgstr "%s: walang pagbabago\n" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "%s: hindi maaldaba ang talaksang grupo\n" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "%s: hindi mabuksan ang talaksang grupo\n" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "%s: hindi maaldaba ang talaksang grupo na shadow\n" @@ -974,6 +1000,10 @@ msgstr "Pangalan Puerta Hulihan\n" msgid "**Never logged in**" msgstr "**Di pumasok kailanman**" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "lastlog: hindi inaasahang argumento: %s\n" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Pag-gamit: %s [-p] [pangalan]\n" @@ -1027,12 +1057,20 @@ msgid "login: PAM Failure, aborting: %s\n" msgstr "login: kabiguan sa PAM, humihinto: %s\n" #, c-format -msgid "" -"\n" -"Login incorrect\n" -msgstr "" -"\n" -"Maling pagpasok\n" +msgid "%s login: " +msgstr "%s login: " + +#, c-format +msgid "login: " +msgstr "login: " + +#, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "Lumampas sa bilang ng maaaring pagsubok : (%d)\n" + +#, c-format +msgid "login: abort requested by PAM\n" +msgstr "login: hiniling na mag-abort ng PAM\n" #, c-format msgid "" @@ -1349,6 +1387,7 @@ msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" @@ -1359,6 +1398,7 @@ msgstr "" "Pag-gamit: su [mga opsyon] [login]\n" "\n" "Mga opsyon:\n" +" -c, --command UTOS\t\tipasa ang UTOS sa tinawag na shell\n" " -h, --help\t\t\tipakita ang payo na ito\n" " -, -l, --login\t\tgawing login shell ang shell\n" " -m, -p,\n" diff --git a/po/tr.gmo b/po/tr.gmo index 8ff10943..e630271f 100644 Binary files a/po/tr.gmo and b/po/tr.gmo differ diff --git a/po/tr.po b/po/tr.po index 1d905b1f..eed8c7d4 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: shadow\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" "PO-Revision-Date: 2004-06-13 10:27+0300\n" "Last-Translator: Mehmet Türker \n" "Language-Team: Turkish \n" @@ -223,9 +223,9 @@ msgstr "Son Parola Değişimi (YYYY-AA-GG)" msgid "never\n" msgstr "Hiçbir zaman\n" -#, fuzzy, c-format -msgid "password must be changed" -msgstr "Parola değişti \n" +#, c-format +msgid "password must be changed\n" +msgstr "Parola değişti\n" #, fuzzy, c-format msgid "Password expires\t\t\t\t\t: " @@ -424,7 +424,7 @@ msgstr "Parola dosyası kilidi açılamıyor.\n" #, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -434,11 +434,15 @@ msgid "" msgstr "" #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: parola dosyası kilitlenemedi\n" +msgid "%s: can't lock group file\n" +msgstr "%s: grup dosyası kilitlenemiyor\n" #, c-format -msgid "%s: can't lock shadow file\n" +msgid "%s: can't open group file\n" +msgstr "%s: grup dosyası açılamıyor\n" + +#, fuzzy, c-format +msgid "%s: can't lock gshadow file\n" msgstr "%s: gölge dosyası kilitlenemiyor\n" #, c-format @@ -453,8 +457,8 @@ msgstr "%s: satır %d: satır çok uzun\n" msgid "%s: line %d: missing new password\n" msgstr "%s: satır %d: yeni parola eksik\n" -#, c-format -msgid "%s: line %d: unknown user %s\n" +#, fuzzy, c-format +msgid "%s: line %d: unknown group %s\n" msgstr "%s: satır %d: bilinmeyen kullanıcı %s\n" #, c-format @@ -473,6 +477,29 @@ msgstr "%s: gölge (shadow9 dosyası güncellenmesinde hata\n" msgid "%s: error updating password file\n" msgstr "%s: parola dosyası güncellenmesinde hata\n" +#, 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 "" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: parola dosyası kilitlenemedi\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s: gölge dosyası kilitlenemiyor\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s: satır %d: bilinmeyen kullanıcı %s\n" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "Kullanım: %s [-s kabuk] [isim]\n" @@ -831,14 +858,6 @@ msgstr "%s: dosyalar güncellendi\n" msgid "%s: no changes\n" msgstr "%s: değişiklik yok\n" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "%s: grup dosyası kilitlenemiyor\n" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "%s: grup dosyası açılamıyor\n" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "%s: gölge grup dosyası kilitlenemiyor\n" @@ -905,6 +924,10 @@ msgstr "Kullanıcı adı Port Sonuncu\n" msgid "**Never logged in**" msgstr "**Hiç giriş yapmadı**" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Kullanım: %s [-p] [isim]\n" @@ -958,10 +981,24 @@ msgid "login: PAM Failure, aborting: %s\n" msgstr "" #, fuzzy, c-format -msgid "" +msgid "%s login: " +msgstr "" "\n" -"Login incorrect\n" -msgstr "Giriş geçersiz" +"%s giriş: " + +#, fuzzy, c-format +msgid "login: " +msgstr "" +"\n" +"%s giriş: " + +#, fuzzy, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "Maksimum giriş denemesi sayısı aşıldı (%d)\n" + +#, c-format +msgid "login: abort requested by PAM\n" +msgstr "" #, c-format msgid "" @@ -1264,6 +1301,7 @@ msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" @@ -1688,6 +1726,12 @@ msgstr "Yedek alınamadı" msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s: %s geri yüklenemiyor: %s (değişiklikleriniz %s içinde)\n" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "Login incorrect\n" +#~ msgstr "Giriş geçersiz" + #, fuzzy #~ msgid "" #~ "Usage:\n" diff --git a/po/uk.gmo b/po/uk.gmo index 1f9a5ca6..f298b052 100644 Binary files a/po/uk.gmo and b/po/uk.gmo differ diff --git a/po/uk.po b/po/uk.po index b58cdf97..5ccaf28d 100644 --- a/po/uk.po +++ b/po/uk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: shadow-4.0.13\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" "PO-Revision-Date: 2005-10-23 19:11+0300\n" "Last-Translator: Eugeniy Meshcheryakov \n" "Language-Team: Ukrainian\n" @@ -246,9 +246,9 @@ msgstr "Остання зміна пароля\t\t\t\t\t: " msgid "never\n" msgstr "ніколи\n" -#, fuzzy, c-format -msgid "password must be changed" -msgstr "Пароль змінено.\n" +#, c-format +msgid "password must be changed\n" +msgstr "Пароль змінено\n" #, c-format msgid "Password expires\t\t\t\t\t: " @@ -447,9 +447,9 @@ msgstr "Не можу записати зміни до файлу паролів msgid "Cannot unlock the password file.\n" msgstr "Не можу розблокувати файл паролів.\n" -#, c-format +#, fuzzy, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -466,11 +466,15 @@ msgstr "" "\t\t\tпаролі не зашифровано\n" #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: не можу заблокувати файл паролів\n" +msgid "%s: can't lock group file\n" +msgstr "%s: не можу блокувати файл груп\n" #, c-format -msgid "%s: can't lock shadow file\n" +msgid "%s: can't open group file\n" +msgstr "%s: не можу відкрити файл груп\n" + +#, fuzzy, c-format +msgid "%s: can't lock gshadow file\n" msgstr "%s: не можу заблокувати файл з прихованими паролями\n" #, c-format @@ -485,8 +489,8 @@ msgstr "%s: рядок %d: рядок занадто довгий\n" msgid "%s: line %d: missing new password\n" msgstr "%s: рядок %d: бракує нового пароля\n" -#, c-format -msgid "%s: line %d: unknown user %s\n" +#, fuzzy, c-format +msgid "%s: line %d: unknown group %s\n" msgstr "%s: рядок %d: невідомий користувач %s\n" #, c-format @@ -505,6 +509,36 @@ msgstr "%s: помилка оновлення файлу з прихованим msgid "%s: error updating password file\n" msgstr "%s: помилка оновлення файлу з паролями\n" +#, 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 "" +"Використання: chpasswd [опції]\n" +"\n" +"Опції:\n" +" -e, --encrypted\tвказаний пароль зашифровано\n" +" -h, --help\t\tпоказати цю допомогу та вийти\n" +" -m, --md5\t\tвикористовувати MD5 шифрування замість DES, якщо вказані\n" +"\t\t\tпаролі не зашифровано\n" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: не можу заблокувати файл паролів\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s: не можу заблокувати файл з прихованими паролями\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s: рядок %d: невідомий користувач %s\n" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "Використання: %s [-s оболонка] [ім'я]\n" @@ -887,14 +921,6 @@ msgstr "%s: файли було оновлено\n" msgid "%s: no changes\n" msgstr "%s: без змін\n" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "%s: не можу блокувати файл груп\n" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "%s: не можу відкрити файл груп\n" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "%s: не можу блокувати файл прихованих груп\n" @@ -969,6 +995,10 @@ msgstr "Користувач Порт Останній вхід\ msgid "**Never logged in**" msgstr "**Ніколи не входив**" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Використання: %s [-p] [ім'я]\n" @@ -1021,13 +1051,25 @@ msgstr " на `%.100s'" msgid "login: PAM Failure, aborting: %s\n" msgstr "login: Помилка PAM, перервано: %s\n" -#, c-format -msgid "" +#, fuzzy, c-format +msgid "%s login: " +msgstr "" "\n" -"Login incorrect\n" +"%s логін: " + +#, fuzzy, c-format +msgid "login: " msgstr "" "\n" -"Невірний логін\n" +"%s логін: " + +#, fuzzy, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "Максимальна кількість днів між змінами паролю\t\t: %ld\n" + +#, c-format +msgid "login: abort requested by PAM\n" +msgstr "" #, c-format msgid "" @@ -1353,6 +1395,7 @@ msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" @@ -1827,6 +1870,13 @@ msgstr "Не можу зробити резервну копію" msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s: не можу відновити %s: %s (ваші зміни у %s)\n" +#~ msgid "" +#~ "\n" +#~ "Login incorrect\n" +#~ msgstr "" +#~ "\n" +#~ "Невірний логін\n" + #, fuzzy #~ msgid "" #~ "Usage:\n" diff --git a/po/vi.gmo b/po/vi.gmo index 00b608de..04e71220 100644 Binary files a/po/vi.gmo and b/po/vi.gmo differ diff --git a/po/vi.po b/po/vi.po index 9b31dc39..80a81732 100644 --- a/po/vi.po +++ b/po/vi.po @@ -1,20 +1,20 @@ # Vietnamese translation for Shadow. -# Copyright © 2005 Free Software Foundation, Inc. -# Clytie Siddall , 2005. +# Copyright © 2005-2006 Free Software Foundation, Inc. +# Clytie Siddall , 2005-2006. # msgid "" msgstr "" -"Project-Id-Version: shadow 4.0.14\n" +"Project-Id-Version: shadow 4.0.15\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" -"PO-Revision-Date: 2005-12-12 17:25+1030\n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" +"PO-Revision-Date: 2006-03-09 22:08+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \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" -"X-Generator: LocFactoryEditor 1.5\n" +"X-Generator: LocFactoryEditor 1.6b36\n" #, c-format msgid "Could not allocate space for config info.\n" @@ -83,7 +83,7 @@ msgid_plural "" "Last was %s on %s.\n" msgstr[0] "" "%d lần bị lỗi sau khi đăng nhập cuối cùng.\n" -"Lần gần nhất vào %s.\n" +"Lần gần nhất là %s vào %s.\n" #, c-format msgid "Too many logins.\n" @@ -121,7 +121,7 @@ msgstr "quá ngắn" #, c-format msgid "Bad password: %s. " -msgstr "Mật khẩu sai: %s." +msgstr "Mật khẩu sai: %s. " #, c-format msgid "passwd: pam_start() failed, error %d\n" @@ -170,11 +170,11 @@ msgid "malloc(%d) failed\n" msgstr "malloc(%d) (phân chia bộ nhớ) đã thất bại.\n" msgid "Password: " -msgstr "Mật khẩu :" +msgstr "Mật khẩu : " #, c-format msgid "%s's Password: " -msgstr "Mật khẩu của %s:" +msgstr "Mật khẩu của %s: " #, c-format msgid "" @@ -239,8 +239,8 @@ msgid "never\n" msgstr "chÆ°a bao giờ\n" #, c-format -msgid "password must be changed" -msgstr "phải thay đổi mật khẩu" +msgid "password must be changed\n" +msgstr "phải thay đổi mật khẩu\n" #, c-format msgid "Password expires\t\t\t\t\t: " @@ -248,11 +248,11 @@ msgstr "Mật khẩu hết hạn dùng:\t\t\t\t\t: " #, c-format msgid "Password inactive\t\t\t\t\t: " -msgstr "Mật khẩu không hoạt động\t\t\t\t\t:" +msgstr "Mật khẩu không hoạt động\t\t\t\t\t: " #, c-format msgid "Account expires\t\t\t\t\t\t: " -msgstr "Tài khoản hết hạn dùng\t\t\t\t\t\t" +msgstr "Tài khoản hết hạn dùng\t\t\t\t\t\t " #, c-format msgid "Minimum number of days between password change\t\t: %ld\n" @@ -442,7 +442,7 @@ msgstr "Không thể bỏ khóa tập tin mật khẩu.\n" #, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -450,9 +450,9 @@ msgid "" " -m, --md5\t\tuse MD5 encryption instead DES when the supplied\n" "\t\t\tpasswords are not encrypted\n" msgstr "" -"Cách sá»­ dụng: chpasswd [tùy_chọn]\n" +"Cách sá»­ dụng: chgpasswd [tùy_chọn]\n" "\n" -"[chpasswd: thay đổi mật khẩu]\n" +"[chgpasswd: thay đổi mật khẩu]\n" "\n" "Tùy chọn:\n" " -e, --encrypted\tmọi mật khẩu đã cung cấp cÅ©ng đã _được mật mã_\n" @@ -461,12 +461,16 @@ msgstr "" "\t\t\tmật khẩu đã cung cấp chÆ°a được mật mã\n" #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s: không thể khóa tập tin mật khẩu\n" +msgid "%s: can't lock group file\n" +msgstr "%s: không thể khóa tập tin nhóm\n" #, c-format -msgid "%s: can't lock shadow file\n" -msgstr "%s: không thể khóa tập tin bóng\n" +msgid "%s: can't open group file\n" +msgstr "%s: không thể mở tập tin nhóm\n" + +#, c-format +msgid "%s: can't lock gshadow file\n" +msgstr "%s: không thể khóa tập tin gshadow\n" #, c-format msgid "%s: can't open shadow file\n" @@ -481,8 +485,8 @@ msgid "%s: line %d: missing new password\n" msgstr "%s: dòng %d: thiếu mật khẩu mới\n" #, c-format -msgid "%s: line %d: unknown user %s\n" -msgstr "%s: dòng %d: không biết người dùng %s\n" +msgid "%s: line %d: unknown group %s\n" +msgstr "%s: dòng %d: không biết nhóm %s\n" #, c-format msgid "%s: line %d: cannot update password entry\n" @@ -500,6 +504,38 @@ msgstr "%s: gặp lỗi khi cập nhật tập tin bóng\n" msgid "%s: error updating password file\n" msgstr "%s: gặp lỗi khi cập nhật tập tin mật khẩu\n" +#, 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 "" +"Cách sá»­ dụng: chpasswd [tùy_chọn]\n" +"\n" +"[chpasswd: thay đổi mật khẩu]\n" +"\n" +"Tùy chọn:\n" +" -e, --encrypted\tmọi mật khẩu đã cung cấp cÅ©ng đã _được mật mã_\n" +" -h, --help\t\thiển thị _trợ giúp_ này rồi thoát\n" +" -m, --md5\t\tsá»­ dụng mật mã MD5 thay vào DES khi các\n" +"\t\t\tmật khẩu đã cung cấp chÆ°a được mật mã\n" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s: không thể khóa tập tin mật khẩu\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s: không thể khóa tập tin bóng\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s: dòng %d: không biết người dùng %s\n" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "Cách sá»­ dụng: %s [-s hệ_vỏ] [tên]\n" @@ -634,10 +670,10 @@ msgid "Changing the password for group %s\n" msgstr "Đang thay đổi mật khẩu cho nhóm %s\n" msgid "New Password: " -msgstr "Mật khẩu mới:" +msgstr "Mật khẩu mới: " msgid "Re-enter new password: " -msgstr "Hãy gõ lại mật khẩu mới:" +msgstr "Hãy gõ lại mật khẩu mới: " msgid "They don't match; try again" msgstr "Hai mật khẩu không trùng thì háy thá»­ lại." @@ -838,7 +874,7 @@ msgstr "mục nhập tập tin nhóm không hợp lệ\n" #, c-format msgid "delete line `%s'? " -msgstr "xóa bỏ dòng « %s » chứ?" +msgstr "xóa bỏ dòng « %s » chứ? " #, c-format msgid "duplicate group entry\n" @@ -854,7 +890,7 @@ msgstr "nhóm %s: không có người dùng %s\n" #, c-format msgid "delete member `%s'? " -msgstr "xóa bỏ thành viên « %s » chứ?" +msgstr "xóa bỏ thành viên « %s » chứ? " #, c-format msgid "invalid shadow group file entry\n" @@ -874,7 +910,7 @@ msgstr "nhóm bóng %s: không có người dùng quản lý %s\n" #, c-format msgid "delete administrative member `%s'? " -msgstr "xóa bỏ thành viên quản lý « %s » chứ?" +msgstr "xóa bỏ thành viên quản lý « %s » chứ? " #, c-format msgid "shadow group %s: no user %s\n" @@ -892,14 +928,6 @@ msgstr "%s: những tập tin đã được cập nhật\n" msgid "%s: no changes\n" msgstr "%s: chÆ°a thay đổi gì\n" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "%s: không thể khóa tập tin nhóm\n" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "%s: không thể mở tập tin nhóm\n" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "%s: không thể khóa tập tin nhóm bóng\n" @@ -977,6 +1005,10 @@ msgstr "Tên dùng\t\t\t Cổng Gần nhất\n" msgid "**Never logged in**" msgstr "**ChÆ°a bao giờ đăng nhập**" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "lastlog: đối số bất ngờ : %s\n" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "Cách sá»­ dụng: %s [-p] [tên]\n" @@ -1030,12 +1062,20 @@ msgid "login: PAM Failure, aborting: %s\n" msgstr "login: (đăng nhập) PAM bị lỗi nên hủy bỏ: %s\n" #, c-format -msgid "" -"\n" -"Login incorrect\n" -msgstr "" -"\n" -"Đăng nhập không đúng\n" +msgid "%s login: " +msgstr "%s đăng nhập: " + +#, c-format +msgid "login: " +msgstr "đăng nhập: " + +#, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "Vượt quá số lần thá»­ lại tối đa (%d)\n" + +#, c-format +msgid "login: abort requested by PAM\n" +msgstr "login: (đăng nhập) PAM đã yêu cầu hủy bỏ\n" #, c-format msgid "" @@ -1198,7 +1238,7 @@ msgstr "" " -x, --maxdays SỐ\tlập số _ngày tối đa_ trước khi thay đổi mật khẩu\n" msgid "Old password: " -msgstr "Mật khẩu cÅ© :" +msgstr "Mật khẩu cÅ© : " #, c-format msgid "" @@ -1209,7 +1249,7 @@ msgstr "" "Cần phải gõ phối hợp chữ thường/hoa và số.\n" msgid "New password: " -msgstr "Mật khẩu mới:" +msgstr "Mật khẩu mới: " #, c-format msgid "Try again.\n" @@ -1366,6 +1406,7 @@ msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" @@ -1373,11 +1414,12 @@ msgid "" "\t\t\t\tthe same shell\n" " -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n" msgstr "" -"Cách sá»­ dụng: su [tùy_chọn] [tên_dùng]\n" +"Cách sá»­ dụng: su [tùy_chọn...] [tên_dùng]\n" "\n" "[su: siêu người dùng]\n" "\n" "Tùy chọn:\n" +" -c, --command LỆNH\t\tgởi lệnh này qua cho hệ vỏ đã gọi\n" " -h, --help\t\t\thiển thị _trợ giúp_ này rồi thoát\n" " -, -l, --login\t\tlập hệ vỏ là hệ vỏ _đăng nhập_\n" " -m, -p,\n" @@ -1694,7 +1736,7 @@ msgstr "%1$s: %3$s không sở hữu %2$s thì sẽ không gỡ bỏ nó.\n" #, c-format msgid "%s: warning: can't remove " -msgstr "%s: cảnh báo: không thể gỡ bỏ" +msgstr "%s: cảnh báo: không thể gỡ bỏ " #, c-format msgid "%s: user %s does not exist\n" diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo index 16a65c7a..ffd6ebae 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 ddee54ec..322e2111 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,16 +1,16 @@ # Simplified Chinese translation to shadow # This file is distributed under the same license as the shadow package. # Copyright: -# Carlos Z.F. Liu , 2004. # Ming Hua , 2005. +# Carlos Z.F. Liu , 2004,2006. # msgid "" msgstr "" -"Project-Id-Version: shadow 4.0.13\n" +"Project-Id-Version: shadow 4.0.15\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" -"PO-Revision-Date: 2005-11-16 20:57-0600\n" -"Last-Translator: Ming Hua \n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" +"PO-Revision-Date: 2006-03-11 00:35+1300\n" +"Last-Translator: Carlos Z.F. Liu \n" "Language-Team: Debian Chinese [GB] \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -236,8 +236,8 @@ msgstr "最近一次密码修改时间\t\t\t\t\t：" msgid "never\n" msgstr "从不\n" -#, fuzzy, c-format -msgid "password must be changed" +#, c-format +msgid "password must be changed\n" msgstr "密码未更改。\n" #, c-format @@ -437,7 +437,7 @@ msgstr "无法解锁密码文件。\n" #, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -450,15 +450,19 @@ msgstr "" "选项：\n" " -e, --encrypted\t所提供的密码是加密过的\n" " -h, --help\t\t显示此帮助信息并退出\n" -" -m, --md5\t\t如果所提供的密码没有加密过，使用 MD5 而非 DES 进行加密\n" +" -m, --md5\t\t如果所提供的密码尚未被加密，使用 MD5 而非 DES 进行加密\n" #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s：无法锁定密码文件\n" +msgid "%s: can't lock group file\n" +msgstr "%s：无法锁定组文件\n" #, c-format -msgid "%s: can't lock shadow file\n" -msgstr "%s：无法锁定影子文件\n" +msgid "%s: can't open group file\n" +msgstr "%s：无法打开组文件\n" + +#, c-format +msgid "%s: can't lock gshadow file\n" +msgstr "%s：无法锁定 gshadow 文件\n" #, c-format msgid "%s: can't open shadow file\n" @@ -473,8 +477,8 @@ msgid "%s: line %d: missing new password\n" msgstr "%s：第 %d 行：缺少新密码\n" #, c-format -msgid "%s: line %d: unknown user %s\n" -msgstr "%s：第 %d 行：未知用户 %s\n" +msgid "%s: line %d: unknown group %s\n" +msgstr "%s：第 %d 行：未知组 %s\n" #, c-format msgid "%s: line %d: cannot update password entry\n" @@ -492,6 +496,35 @@ msgstr "%s：更新影子文件时出错。\n" msgid "%s: error updating password file\n" msgstr "%s：更新密码文件时出错。\n" +#, 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 "" +"用法：chpasswd [选项]\n" +"\n" +"选项：\n" +" -e, --encrypted\t所提供的密码是加密过的\n" +" -h, --help\t\t显示此帮助信息并退出\n" +" -m, --md5\t\t如果所提供的密码没有加密过，使用 MD5 而非 DES 进行加密\n" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s：无法锁定密码文件\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s：无法锁定影子文件\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s：第 %d 行：未知用户 %s\n" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "用法：%s [-s shell] [名称]\n" @@ -677,6 +710,14 @@ msgid "" " -o, --non-unique\t\tallow create group with duplicate\n" "\t\t\t\t(non-unique) GID\n" msgstr "" +"用法：groupadd [选项] 组\n" +"\n" +"选项：\n" +" -f, --force\t\t如果指组已经存在，则强制以正常状态退出\n" +" -g, --gid GID\t\t新组使用 GID\n" +" -h, --help\t\t\t显示此帮助信息并退出\n" +" -K, --key KEY=VALUE\t\t覆盖 /etc/login.defs 默认值\n" +" -o, --non-unique\t\t允许使用重复的(非唯一的) GID 创建组\n" #, c-format msgid "%s: error adding new group entry\n" @@ -862,14 +903,6 @@ msgstr "%s：文件已被更新\n" msgid "%s: no changes\n" msgstr "%s：无改变\n" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "%s：无法锁定组文件\n" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "%s：无法打开组文件\n" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "%s：无法锁定影子组文件\n" @@ -924,6 +957,13 @@ msgid "" " -t, --time DAYS\tprint only lastlog records more recent than DAYS\n" " -u, --user LOGIN\tprint lastlog record for user with specified LOGIN\n" msgstr "" +"用法：lastlog [选项]\n" +"\n" +"选项：\n" +" -b, --before DAYS\t仅打印早于 DAYS 的 lastlog 记录\n" +" -h, --help\t\t显示此帮助信息并退出\n" +" -t, --time DAYS\t仅打印晚于 DAYS 的 lastlog 记录\n" +" -u, --user LOGIN\t打印 LOGIN 用户的 lastlog 记录\n" #, c-format msgid "Username Port From Latest\n" @@ -936,6 +976,10 @@ msgstr "用户名 端口 最后登陆时间\n" msgid "**Never logged in**" msgstr "**从未登录过**" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "lastlog：意外的参数：%s\n" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "用法：%s [-p] [名称]\n" @@ -989,12 +1033,20 @@ msgid "login: PAM Failure, aborting: %s\n" msgstr "login: PAM 错误，正在退出：%s\n" #, c-format -msgid "" -"\n" -"Login incorrect\n" -msgstr "" -"\n" -"登录错误\n" +msgid "%s login: " +msgstr "%s 用户名：" + +#, c-format +msgid "login: " +msgstr "用户名：" + +#, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "已经超过最大尝试次数 (%d)\n" + +#, c-format +msgid "login: abort requested by PAM\n" +msgstr "login: PAM 中止请求\n" #, c-format msgid "" @@ -1131,6 +1183,25 @@ msgid "" " -x, --maxdays MAX_DAYS\tset maximim number of days before password\n" "\t\t\t\tchange to MAX_DAYS\n" msgstr "" +"用法：passwd [选项] [用户名]\n" +"\n" +"用法：\n" +" -a, --all\t\t\t报告所有帐户密码的状态\n" +" -d, --delete\t\t\t删除指定帐户的密码\n" +" -e, --expire\t\t\t强制使指定帐户的密码过期\n" +" -h, --help\t\t\t显示此帮助信息并退出\n" +" -k, --keep-tokens\t\t仅在过期后修改密码\n" +" -i, --inactive INACTIVE\t过期 INACTIVE 天数后设置密码为失效\n" +" -l, --lock\t\t\t锁定指定的帐户\n" +" -n, --mindays MIN_DAYS\t设置到下次修改密码所须等待的最短天数\n" +"\t\t\t\t为 MIN_DAYS\n" +" -q, --quiet\t\t\t安静模式\n" +" -r, --repository REPOSITORY\t在 REPOSITORY 库中改变密码\n" +" -S, --status\t\t\t报告指定帐户密码的状态\n" +" -u, --unlock\t\t\t解锁被指定帐户\n" +" -w, --warndays WARN_DAYS\t设置过期警告天数为 WARN_DAYS\n" +" -x, --maxdays MAX_DAYS\t设置到下次修改密码所须等待的最多天数\n" +"\t\t\t\t为 MAX_DAYS\n" msgid "Old password: " msgstr "旧密码：" @@ -1298,6 +1369,7 @@ msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" @@ -1305,6 +1377,15 @@ msgid "" "\t\t\t\tthe same shell\n" " -s, --shell SHELL\t\tuse SHELL instead of the default in passwd\n" msgstr "" +"用法：su [选项] [用户名]\n" +"\n" +"选项：\n" +" -c, --command COMMAND\t\t将 COMMAND 传递至启动的 shell\n" +" -h, --help\t\t\t显示此帮助信息并退出\n" +" -, -l, --login\t\t将 shell 设为登录 shell\n" +" -m, -p,\n" +" --preserve-environment\t不重置环境变量并保持同一 shell\n" +" -s, --shell SHELL\t\t使用 SHELL 而非 passwd 中的默认值\n" #, c-format msgid "%s: must be run from a terminal\n" @@ -1418,6 +1499,25 @@ msgid "" " -s, --shell SHELL\t\tthe login shell for the new user account\n" " -u, --uid UID\t\t\tforce use the UID for the new user account\n" msgstr "" +"用法：useradd [选项] 用户名\n" +"\n" +"Options:\n" +" -b, --base-dir BASE_DIR\t新用户帐号家目录的主目录(base directory)\n" +" -c, --comment 注释\t\t为新用户帐号设置“注释”栏\n" +" -d, --home-dir HOME_DIR\t新用户帐号的家目录\n" +" -D, --defaults\t\t打印或保存修改过的 useradd 默认设置\n" +" -e, --expiredate EXPIRE_DATE\t设定帐户过期的日期为 EXPIRE_DATE\n" +" -f, --inactive INACTIVE\t过期 INACTIVE 天数后，设定密码为失效状态\n" +" -g, --gid GROUP\t\t强制将新用户帐号的组设置为 GROUP\n" +" -G, --groups GROUPS\t\t新用户帐号的补充组列表\n" +" -h, --help\t\t\t显示此帮助信息并退出\n" +" -k, --skel SKEL_DIR\t\t指定另一替代的 skel 目录\n" +" -K, --key KEY=VALUE\t\t覆盖 /etc/login.defs 默认值\n" +" -m, --create-home\t\t为新用户帐号创建家目录\n" +" -o, --non-unique\t\t允许以重复的(非唯一的) UID 创建用户\n" +" -p, --password PASSWORD\t为新用户帐号设定加密过的密码 (PASSWORD)\n" +" -s, --shell SHELL\t\t新用户帐号的登录 shell\n" +" -u, --uid UID\t\t\t强制将新用户帐号的 id 设为 UID\n" #, c-format msgid "%s: UID %u is not unique\n" @@ -1624,6 +1724,25 @@ msgid "" " -u, --uid UID\t\t\tnew UID for the user account\n" " -U, --unlock\t\t\tunlock the user account\n" msgstr "" +"用法：usermod [选项] 用户名\n" +"\n" +"选项：\n" +" -a, --append GROUP\t\t将用户追加至增补的组 GROUP 中\n" +" -c, --comment 注释\t\t重新设置“注释”栏\n" +" -d, --home HOME_DIR\t\t用户的新登录目录(家目录)\n" +" -e, --expiredate EXPIRE_DATE\t设定帐户过期的日期为 EXPIRE_DATE\n" +" -f, --inactive INACTIVE\t过期 INACTIVE 天数后，设定密码为失效状态\n" +" -g, --gid GROUP\t\t强制使用 GROUP 为初始登录组\n" +" -G, --groups GROUPS\t\t增补组 GROUPS 列表\n" +" -h, --help\t\t\t显示此帮助信息并退出\n" +" -l, --login LOGIN\t\t新的登录名称\n" +" -L, --lock\t\t\t锁定用户帐号\n" +" -m, --move-home\t\t将家目录内容移至新位置 (仅于 -d 一起使用)\n" +" -o, --non-unique\t\t允许使用重复的(非唯一的) UID\n" +" -p, --password PASSWORD\t将加密过的密码 (PASSWORD) 设为新密码\n" +" -s, --shell SHELL\t\t用户帐号的新登录 shell\n" +" -u, --uid UID\t\t\t用户帐号的新 UID\n" +" -U, --unlock\t\t\t解锁用户帐号\n" #, c-format msgid "%s: out of memory in update_group\n" @@ -1702,6 +1821,14 @@ msgid "" " -q, --quiet\t\t\tquiet mode\n" " -s, --shadow\t\t\tedit shadow or gshadow database\n" msgstr "" +"用法：vipw [选项]\n" +"\n" +"选项：\n" +" -g, --group\t\t\t编辑组数据库\n" +" -h, --help\t\t\t显示此帮助信息并退出\n" +" -p, --passwd\t\t\t编辑 passwd 数据库\n" +" -q, --quiet\t\t\t安静模式\n" +" -s, --shadow\t\t\t编辑 shadow 或 gshadow 数据库\n" #, c-format msgid "" @@ -1720,33 +1847,3 @@ msgstr "无法备份" #, c-format msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s：无法恢复 %s：%s (您的修改在 %s 中)\n" - -#, fuzzy -#~ msgid "" -#~ "Usage:\n" -#~ "`vipw' edits /etc/passwd `vipw -s' edits /etc/shadow\n" -#~ "`vigr' edits /etc/group `vigr -s' edits /etc/gshadow\n" -#~ "`{vipw|vigr} -q' quiet mode\n" -#~ msgstr "" -#~ "用法：\n" -#~ "“vipw” 编辑 /etc/passwd “vipw -s” 编辑 /etc/shadow\n" -#~ "“vigr” 编辑 /etc/group “vigr -s” 编辑 /etc/gshadow\n" - -#~ msgid "%s: PAM chauthtok failed\n" -#~ msgstr "%s：PAM chauthtok 失败\n" - -#~ msgid "%s: Cannot execute %s" -#~ msgstr "%s：无法执行 %s" - -#, fuzzy -#~ msgid "Usage: %s\t[-u uid [-o]] [-g group] [[-G group,...] [-a]] \n" -#~ msgstr "用法：%s\t[-u uid [-o]] [-g 组] [-G 组,...] \n" - -#~ msgid "\t\t[-d home [-m]] [-s shell] [-c comment] [-l new_name]\n" -#~ msgstr "\t\t[-d 主目录 [-m]] [-s shell] [-c 注释] [-l 新名称]\n" - -#~ msgid "[-f inactive] [-e expire] " -#~ msgstr "[-f 失效日] [-e 过期日] " - -#~ msgid "[-p passwd] [-L|-U] name\n" -#~ msgstr "[-p 密码] [-L|-U] 名称\n" diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo index 5f83e2b2..80d559ec 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 9bc9963c..b7306801 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: shadow 4.0.9\n" "Report-Msgid-Bugs-To: kloczek@pld.org.pl\n" -"POT-Creation-Date: 2005-12-10 21:48+0100\n" +"POT-Creation-Date: 2006-03-05 23:11+0100\n" "PO-Revision-Date: 2005-06-02 22:20+0800\n" "Last-Translator: Asho Yeh \n" "Language-Team: Chinese (traditional) \n" @@ -238,8 +238,8 @@ msgstr "最近一次密碼修改時間\t\t\t\t\t：" msgid "never\n" msgstr "從不\n" -#, fuzzy, c-format -msgid "password must be changed" +#, c-format +msgid "password must be changed\n" msgstr "密碼已更改。\n" #, c-format @@ -437,9 +437,9 @@ msgstr "無法提交密碼檔案變動。\n" msgid "Cannot unlock the password file.\n" msgstr "無法解鎖密碼檔案。\n" -#, c-format +#, fuzzy, c-format msgid "" -"Usage: chpasswd [options]\n" +"Usage: chgpasswd [options]\n" "\n" "Options:\n" " -e, --encrypted\tsupplied passwords are encrypted\n" @@ -456,11 +456,15 @@ msgstr "" "\t\t\t來替代 DES。\n" #, c-format -msgid "%s: can't lock password file\n" -msgstr "%s：無法鎖定密碼檔\n" +msgid "%s: can't lock group file\n" +msgstr "%s：無法鎖定群組檔案\n" #, c-format -msgid "%s: can't lock shadow file\n" +msgid "%s: can't open group file\n" +msgstr "%s：無法打開群組檔案\n" + +#, fuzzy, c-format +msgid "%s: can't lock gshadow file\n" msgstr "%s：無法鎖定 shadow 檔\n" #, c-format @@ -475,8 +479,8 @@ msgstr "%s：第 %d 行：此行太長\n" msgid "%s: line %d: missing new password\n" msgstr "%s：第 %d 行：缺少新密碼\n" -#, c-format -msgid "%s: line %d: unknown user %s\n" +#, fuzzy, c-format +msgid "%s: line %d: unknown group %s\n" msgstr "%s：第 %d 行：未知使用者 %s\n" #, c-format @@ -495,6 +499,36 @@ msgstr "%s：更新shadow檔案時出錯。\n" msgid "%s: error updating password file\n" msgstr "%s：更新密碼檔案時出錯。\n" +#, 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 "" +"用法：chpasswd [選項]\n" +"\n" +"選項：\n" +" -e, --encrypted\t所提供的密碼已經過加密\n" +" -h, --help\t\t顯示這份說明文字然後結束\n" +" -m, --md5\t\t如果所提供的密碼沒有加密，則使用 MD5 加密法\n" +"\t\t\t來替代 DES。\n" + +#, c-format +msgid "%s: can't lock password file\n" +msgstr "%s：無法鎖定密碼檔\n" + +#, c-format +msgid "%s: can't lock shadow file\n" +msgstr "%s：無法鎖定 shadow 檔\n" + +#, c-format +msgid "%s: line %d: unknown user %s\n" +msgstr "%s：第 %d 行：未知使用者 %s\n" + #, c-format msgid "Usage: %s [-s shell] [name]\n" msgstr "用法：%s [-s shell] [名稱]\n" @@ -864,14 +898,6 @@ msgstr "%s：檔案已被更新\n" msgid "%s: no changes\n" msgstr "%s：無改變\n" -#, c-format -msgid "%s: can't lock group file\n" -msgstr "%s：無法鎖定群組檔案\n" - -#, c-format -msgid "%s: can't open group file\n" -msgstr "%s：無法打開群組檔案\n" - #, c-format msgid "%s: can't lock shadow group file\n" msgstr "%s：無法鎖定shadow群組檔案\n" @@ -944,6 +970,10 @@ msgstr "使用者名 埠號 最後登入時間\n" msgid "**Never logged in**" msgstr "**從未登入過**" +#, c-format +msgid "lastlog: unexpected argument: %s\n" +msgstr "" + #, c-format msgid "Usage: %s [-p] [name]\n" msgstr "用法：%s [-p] [名稱]\n" @@ -997,10 +1027,24 @@ msgid "login: PAM Failure, aborting: %s\n" msgstr "" #, fuzzy, c-format -msgid "" +msgid "%s login: " +msgstr "" "\n" -"Login incorrect\n" -msgstr "登入錯誤" +" %s 使用者名稱：" + +#, fuzzy, c-format +msgid "login: " +msgstr "" +"\n" +" %s 使用者名稱：" + +#, fuzzy, c-format +msgid "Maximum number of tries exceeded (%d)\n" +msgstr "最多必須相隔幾天才能改變密碼\t\t\t\t：%ld\n" + +#, c-format +msgid "login: abort requested by PAM\n" +msgstr "" #, c-format msgid "" @@ -1302,6 +1346,7 @@ msgid "" "Usage: su [options] [login]\n" "\n" "Options:\n" +" -c, --command COMMAND\t\tpass COMMAND to the invoked shell\n" " -h, --help\t\t\tdisplay this help message and exit\n" " -, -l, --login\t\tmake the shell a login shell\n" " -m, -p,\n" @@ -1724,6 +1769,12 @@ msgstr "無法備份" msgid "%s: can't restore %s: %s (your changes are in %s)\n" msgstr "%s：無法復原 %s：%s (您的修改在 %s 中)\n" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "Login incorrect\n" +#~ msgstr "登入錯誤" + #, fuzzy #~ msgid "" #~ "Usage:\n" diff --git a/src/Makefile.am b/src/Makefile.am index 519443ca..33892be9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,6 +23,7 @@ INCLUDES = \ bin_PROGRAMS = groups login su ubin_PROGRAMS = faillog lastlog chage chfn chsh expiry gpasswd newgrp passwd usbin_PROGRAMS = \ + chgpasswd \ chpasswd \ groupadd \ groupdel \ @@ -51,29 +52,37 @@ LDADD = $(top_builddir)/libmisc/libmisc.a \ $(top_builddir)/lib/libshadow.la AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -chage_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) -chfn_LDADD = $(LDADD) $(LIBPAM) -chsh_LDADD = $(LDADD) $(LIBPAM) -chpasswd_LDADD = $(LDADD) $(LIBPAM) -gpasswd_LDADD = $(LDADD) $(LIBAUDIT) -groupadd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) -groupdel_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) -groupmod_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) -login_SOURCES = \ +chage_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) +chfn_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) +chgpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) +chsh_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) +chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) +gpasswd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) +groupadd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) +groupdel_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) +groupmod_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) +grpck_LDADD = $(LDADD) $(LIBSELINUX) +grpconv_LDADD = $(LDADD) $(LIBSELINUX) +grpunconv_LDADD = $(LDADD) $(LIBSELINUX) +login_SOURCES = \ login.c \ login_nopam.c login_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) newgrp_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) -newusers_LDADD = $(LDADD) $(LIBPAM) +newusers_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) nologin_LDADD = -passwd_LDADD = $(LDADD) $(LIBPAM) $(LIBCRACK) $(LIBAUDIT) +passwd_LDADD = $(LDADD) $(LIBPAM) $(LIBCRACK) $(LIBAUDIT) $(LIBSELINUX) +pwck_LDADD = $(LDADD) $(LIBSELINUX) +pwconv_LDADD = $(LDADD) $(LIBSELINUX) +pwunconv_LDADD = $(LDADD) $(LIBSELINUX) su_SOURCES = \ su.c \ suauth.c su_LDADD = $(LDADD) $(LIBPAM) -useradd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) -userdel_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) -usermod_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) +useradd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) +userdel_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) +usermod_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) +vipw_LDADD = $(LDADD) $(LIBSELINUX) install-am: all-am $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am diff --git a/src/Makefile.in b/src/Makefile.in index fba062bb..8348e258 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -40,12 +40,13 @@ bin_PROGRAMS = groups$(EXEEXT) login$(EXEEXT) su$(EXEEXT) ubin_PROGRAMS = faillog$(EXEEXT) lastlog$(EXEEXT) chage$(EXEEXT) \ chfn$(EXEEXT) chsh$(EXEEXT) expiry$(EXEEXT) gpasswd$(EXEEXT) \ newgrp$(EXEEXT) passwd$(EXEEXT) -usbin_PROGRAMS = chpasswd$(EXEEXT) groupadd$(EXEEXT) groupdel$(EXEEXT) \ - groupmod$(EXEEXT) grpck$(EXEEXT) grpconv$(EXEEXT) \ - grpunconv$(EXEEXT) logoutd$(EXEEXT) newusers$(EXEEXT) \ - nologin$(EXEEXT) pwck$(EXEEXT) pwconv$(EXEEXT) \ - pwunconv$(EXEEXT) useradd$(EXEEXT) userdel$(EXEEXT) \ - usermod$(EXEEXT) vipw$(EXEEXT) +usbin_PROGRAMS = chgpasswd$(EXEEXT) chpasswd$(EXEEXT) \ + groupadd$(EXEEXT) groupdel$(EXEEXT) groupmod$(EXEEXT) \ + grpck$(EXEEXT) grpconv$(EXEEXT) grpunconv$(EXEEXT) \ + logoutd$(EXEEXT) newusers$(EXEEXT) nologin$(EXEEXT) \ + pwck$(EXEEXT) pwconv$(EXEEXT) pwunconv$(EXEEXT) \ + useradd$(EXEEXT) userdel$(EXEEXT) usermod$(EXEEXT) \ + vipw$(EXEEXT) noinst_PROGRAMS = id$(EXEEXT) sulogin$(EXEEXT) subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in @@ -70,16 +71,23 @@ am__DEPENDENCIES_1 = $(top_builddir)/libmisc/libmisc.a \ $(top_builddir)/lib/libshadow.la am__DEPENDENCIES_2 = chage_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ - $(am__DEPENDENCIES_2) + $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) chfn_SOURCES = chfn.c chfn_OBJECTS = chfn.$(OBJEXT) -chfn_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +chfn_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ + $(am__DEPENDENCIES_2) +chgpasswd_SOURCES = chgpasswd.c +chgpasswd_OBJECTS = chgpasswd.$(OBJEXT) +chgpasswd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ + $(am__DEPENDENCIES_2) chpasswd_SOURCES = chpasswd.c chpasswd_OBJECTS = chpasswd.$(OBJEXT) -chpasswd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +chpasswd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ + $(am__DEPENDENCIES_2) chsh_SOURCES = chsh.c chsh_OBJECTS = chsh.$(OBJEXT) -chsh_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +chsh_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ + $(am__DEPENDENCIES_2) expiry_SOURCES = expiry.c expiry_OBJECTS = expiry.$(OBJEXT) expiry_LDADD = $(LDADD) @@ -92,19 +100,20 @@ faillog_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.a \ $(top_builddir)/lib/libshadow.la gpasswd_SOURCES = gpasswd.c gpasswd_OBJECTS = gpasswd.$(OBJEXT) -gpasswd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +gpasswd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ + $(am__DEPENDENCIES_2) groupadd_SOURCES = groupadd.c groupadd_OBJECTS = groupadd.$(OBJEXT) groupadd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ - $(am__DEPENDENCIES_2) + $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) groupdel_SOURCES = groupdel.c groupdel_OBJECTS = groupdel.$(OBJEXT) groupdel_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ - $(am__DEPENDENCIES_2) + $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) groupmod_SOURCES = groupmod.c groupmod_OBJECTS = groupmod.$(OBJEXT) groupmod_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ - $(am__DEPENDENCIES_2) + $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) groups_SOURCES = groups.c groups_OBJECTS = groups.$(OBJEXT) groups_LDADD = $(LDADD) @@ -112,19 +121,13 @@ groups_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.a \ $(top_builddir)/lib/libshadow.la grpck_SOURCES = grpck.c grpck_OBJECTS = grpck.$(OBJEXT) -grpck_LDADD = $(LDADD) -grpck_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.a \ - $(top_builddir)/lib/libshadow.la +grpck_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) grpconv_SOURCES = grpconv.c grpconv_OBJECTS = grpconv.$(OBJEXT) -grpconv_LDADD = $(LDADD) -grpconv_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.a \ - $(top_builddir)/lib/libshadow.la +grpconv_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) grpunconv_SOURCES = grpunconv.c grpunconv_OBJECTS = grpunconv.$(OBJEXT) -grpunconv_LDADD = $(LDADD) -grpunconv_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.a \ - $(top_builddir)/lib/libshadow.la +grpunconv_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) id_SOURCES = id.c id_OBJECTS = id.$(OBJEXT) id_LDADD = $(LDADD) @@ -150,29 +153,25 @@ newgrp_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_2) newusers_SOURCES = newusers.c newusers_OBJECTS = newusers.$(OBJEXT) -newusers_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +newusers_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ + $(am__DEPENDENCIES_2) nologin_SOURCES = nologin.c nologin_OBJECTS = nologin.$(OBJEXT) nologin_DEPENDENCIES = passwd_SOURCES = passwd.c passwd_OBJECTS = passwd.$(OBJEXT) passwd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ - $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) + $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \ + $(am__DEPENDENCIES_2) pwck_SOURCES = pwck.c pwck_OBJECTS = pwck.$(OBJEXT) -pwck_LDADD = $(LDADD) -pwck_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.a \ - $(top_builddir)/lib/libshadow.la +pwck_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) pwconv_SOURCES = pwconv.c pwconv_OBJECTS = pwconv.$(OBJEXT) -pwconv_LDADD = $(LDADD) -pwconv_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.a \ - $(top_builddir)/lib/libshadow.la +pwconv_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) pwunconv_SOURCES = pwunconv.c pwunconv_OBJECTS = pwunconv.$(OBJEXT) -pwunconv_LDADD = $(LDADD) -pwunconv_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.a \ - $(top_builddir)/lib/libshadow.la +pwunconv_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) am_su_OBJECTS = su.$(OBJEXT) suauth.$(OBJEXT) su_OBJECTS = $(am_su_OBJECTS) su_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) @@ -184,20 +183,18 @@ sulogin_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.a \ useradd_SOURCES = useradd.c useradd_OBJECTS = useradd.$(OBJEXT) useradd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ - $(am__DEPENDENCIES_2) + $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) userdel_SOURCES = userdel.c userdel_OBJECTS = userdel.$(OBJEXT) userdel_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ - $(am__DEPENDENCIES_2) + $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) usermod_SOURCES = usermod.c usermod_OBJECTS = usermod.$(OBJEXT) usermod_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ - $(am__DEPENDENCIES_2) + $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) vipw_SOURCES = vipw.c vipw_OBJECTS = vipw.$(OBJEXT) -vipw_LDADD = $(LDADD) -vipw_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.a \ - $(top_builddir)/lib/libshadow.la +vipw_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -209,15 +206,15 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = chage.c chfn.c chpasswd.c chsh.c expiry.c faillog.c \ - gpasswd.c groupadd.c groupdel.c groupmod.c groups.c grpck.c \ - grpconv.c grpunconv.c id.c lastlog.c $(login_SOURCES) \ +SOURCES = chage.c chfn.c chgpasswd.c chpasswd.c chsh.c expiry.c \ + faillog.c gpasswd.c groupadd.c groupdel.c groupmod.c groups.c \ + grpck.c grpconv.c grpunconv.c id.c lastlog.c $(login_SOURCES) \ logoutd.c newgrp.c newusers.c nologin.c passwd.c pwck.c \ pwconv.c pwunconv.c $(su_SOURCES) sulogin.c useradd.c \ userdel.c usermod.c vipw.c -DIST_SOURCES = chage.c chfn.c chpasswd.c chsh.c expiry.c faillog.c \ - gpasswd.c groupadd.c groupdel.c groupmod.c groups.c grpck.c \ - grpconv.c grpunconv.c id.c lastlog.c $(login_SOURCES) \ +DIST_SOURCES = chage.c chfn.c chgpasswd.c chpasswd.c chsh.c expiry.c \ + faillog.c gpasswd.c groupadd.c groupdel.c groupmod.c groups.c \ + grpck.c grpconv.c grpunconv.c id.c lastlog.c $(login_SOURCES) \ logoutd.c newgrp.c newusers.c nologin.c passwd.c pwck.c \ pwconv.c pwunconv.c $(su_SOURCES) sulogin.c useradd.c \ userdel.c usermod.c vipw.c @@ -301,6 +298,8 @@ SHELL = @SHELL@ STRIP = @STRIP@ U = @U@ USE_NLS = @USE_NLS@ +USE_NLS_FALSE = @USE_NLS_FALSE@ +USE_NLS_TRUE = @USE_NLS_TRUE@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XMLCATALOG = @XMLCATALOG@ @@ -365,31 +364,39 @@ LDADD = $(top_builddir)/libmisc/libmisc.a \ $(top_builddir)/lib/libshadow.la AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -chage_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) -chfn_LDADD = $(LDADD) $(LIBPAM) -chsh_LDADD = $(LDADD) $(LIBPAM) -chpasswd_LDADD = $(LDADD) $(LIBPAM) -gpasswd_LDADD = $(LDADD) $(LIBAUDIT) -groupadd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) -groupdel_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) -groupmod_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) +chage_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) +chfn_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) +chgpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) +chsh_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) +chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) +gpasswd_LDADD = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) +groupadd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) +groupdel_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) +groupmod_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) +grpck_LDADD = $(LDADD) $(LIBSELINUX) +grpconv_LDADD = $(LDADD) $(LIBSELINUX) +grpunconv_LDADD = $(LDADD) $(LIBSELINUX) login_SOURCES = \ login.c \ login_nopam.c login_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) newgrp_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) -newusers_LDADD = $(LDADD) $(LIBPAM) +newusers_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) nologin_LDADD = -passwd_LDADD = $(LDADD) $(LIBPAM) $(LIBCRACK) $(LIBAUDIT) +passwd_LDADD = $(LDADD) $(LIBPAM) $(LIBCRACK) $(LIBAUDIT) $(LIBSELINUX) +pwck_LDADD = $(LDADD) $(LIBSELINUX) +pwconv_LDADD = $(LDADD) $(LIBSELINUX) +pwunconv_LDADD = $(LDADD) $(LIBSELINUX) su_SOURCES = \ su.c \ suauth.c su_LDADD = $(LDADD) $(LIBPAM) -useradd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) -userdel_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) -usermod_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) +useradd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) +userdel_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) +usermod_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX) +vipw_LDADD = $(LDADD) $(LIBSELINUX) all: all-am .SUFFIXES: @@ -520,6 +527,9 @@ chage$(EXEEXT): $(chage_OBJECTS) $(chage_DEPENDENCIES) chfn$(EXEEXT): $(chfn_OBJECTS) $(chfn_DEPENDENCIES) @rm -f chfn$(EXEEXT) $(LINK) $(chfn_LDFLAGS) $(chfn_OBJECTS) $(chfn_LDADD) $(LIBS) +chgpasswd$(EXEEXT): $(chgpasswd_OBJECTS) $(chgpasswd_DEPENDENCIES) + @rm -f chgpasswd$(EXEEXT) + $(LINK) $(chgpasswd_LDFLAGS) $(chgpasswd_OBJECTS) $(chgpasswd_LDADD) $(LIBS) chpasswd$(EXEEXT): $(chpasswd_OBJECTS) $(chpasswd_DEPENDENCIES) @rm -f chpasswd$(EXEEXT) $(LINK) $(chpasswd_LDFLAGS) $(chpasswd_OBJECTS) $(chpasswd_LDADD) $(LIBS) @@ -616,6 +626,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chage.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chfn.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chgpasswd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chpasswd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chsh.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/expiry.Po@am__quote@ diff --git a/src/chage.c b/src/chage.c index 3c567b19..9333fef5 100644 --- a/src/chage.c +++ b/src/chage.c @@ -29,7 +29,7 @@ #include -#ident "$Id: chage.c,v 1.68 2005/12/02 19:42:25 kloczek Exp $" +#ident "$Id: chage.c,v 1.71 2006/02/21 22:44:35 kloczek Exp $" #include #include @@ -235,7 +235,7 @@ static void list_fields (void) if (lastday < 0) { printf (_("never\n")); } else if (lastday == 0) { - printf (_("password must be changed")); + printf (_("password must be changed\n")); } else { changed = lastday * SCALE; print_date (changed); @@ -337,7 +337,6 @@ static void cleanup (int state) int main (int argc, char **argv) { - int flag; const struct spwd *sp; struct spwd spwd; uid_t ruid; @@ -361,11 +360,10 @@ int main (int argc, char **argv) textdomain (PACKAGE); ruid = getuid (); -#ifdef WITH_SELINUX - amroot = (ruid == 0 - && selinux_check_passwd_access (PASSWD__ROOTOK) == 0); -#else amroot = (ruid == 0); +#ifdef WITH_SELINUX + if (amroot && is_selinux_enabled () > 0) + amroot = (selinux_check_passwd_access (PASSWD__ROOTOK) == 0); #endif /* diff --git a/src/chfn.c b/src/chfn.c index b7c866b2..2ec11d79 100644 --- a/src/chfn.c +++ b/src/chfn.c @@ -29,7 +29,7 @@ #include -#ident "$Id: chfn.c,v 1.38 2005/10/19 15:21:07 kloczek Exp $" +#ident "$Id: chfn.c,v 1.39 2006/02/21 22:44:35 kloczek Exp $" #include #include @@ -373,6 +373,7 @@ int main (int argc, char **argv) * check if the change is allowed by SELinux policy. */ if ((pw->pw_uid != getuid ()) + && (is_selinux_enabled () > 0) && (selinux_check_passwd_access (PASSWD__CHFN) != 0)) { fprintf (stderr, _("%s: Permission denied.\n"), Prog); closelog (); diff --git a/src/chgpasswd.c b/src/chgpasswd.c new file mode 100644 index 00000000..765ab535 --- /dev/null +++ b/src/chgpasswd.c @@ -0,0 +1,334 @@ +/* + * 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 + +#ident "$Id: chgpasswd.c,v 1.1 2006/03/05 22:12:38 kloczek Exp $" + +#include +#include +#include +#include +#include +#ifdef USE_PAM +#include "pam_defs.h" +#endif /* USE_PAM */ +#include "defines.h" +#include "nscd.h" +#include "prototypes.h" +#include "groupio.h" +#include "sgroupio.h" +/* + * Global variables + */ +static char *Prog; +static int eflg = 0; +static int md5flg = 0; + +static int is_shadow_pwd; + +/* local function prototypes */ +static void usage (void); + +/* + * usage - display usage message and exit + */ +static void usage (void) +{ + fprintf (stderr, _("Usage: chgpasswd [options]\n" + "\n" + "Options:\n" + " -e, --encrypted supplied passwords are encrypted\n" + " -h, --help display this help message and exit\n" + " -m, --md5 use MD5 encryption instead DES when the supplied\n" + " passwords are not encrypted\n")); + exit (1); +} + +int main (int argc, char **argv) +{ + char buf[BUFSIZ]; + char *name; + char *newpwd; + char *cp; + + const struct sgrp *sg; + struct sgrp newsg; + + const struct group *gr; + struct group newgr; + int errors = 0; + int line = 0; + long now = time ((long *) 0) / (24L * 3600L); + int ok; + +#ifdef USE_PAM + pam_handle_t *pamh = NULL; + struct passwd *pampw; + int retval; +#endif + + Prog = Basename (argv[0]); + + setlocale (LC_ALL, ""); + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + + { + int option_index = 0; + int c; + static struct option long_options[] = { + {"encrypted", no_argument, NULL, 'e'}, + {"help", no_argument, NULL, 'h'}, + {"md5", no_argument, NULL, 'm'}, + {NULL, 0, NULL, '\0'} + }; + + while ((c = + getopt_long (argc, argv, "ehm", long_options, + &option_index)) != -1) { + switch (c) { + case 'e': + eflg = 1; + break; + case 'h': + usage (); + break; + case 'm': + md5flg = 1; + break; + case 0: + /* long option */ + break; + default: + usage (); + break; + } + } + } + +#ifdef USE_PAM + retval = PAM_SUCCESS; + + pampw = getpwuid (getuid ()); + if (pampw == NULL) { + retval = PAM_USER_UNKNOWN; + } + + if (retval == PAM_SUCCESS) { + retval = pam_start ("chpasswd", pampw->pw_name, &conv, &pamh); + } + + if (retval == PAM_SUCCESS) { + retval = pam_authenticate (pamh, 0); + if (retval != PAM_SUCCESS) { + pam_end (pamh, retval); + } + } + + if (retval == PAM_SUCCESS) { + retval = pam_acct_mgmt (pamh, 0); + if (retval != PAM_SUCCESS) { + pam_end (pamh, retval); + } + } + + if (retval != PAM_SUCCESS) { + fprintf (stderr, _("%s: PAM authentication failed\n"), Prog); + exit (1); + } +#endif /* USE_PAM */ + + /* + * Lock the group file and open it for reading. This will bring + * all of the entries into memory where they may be updated. + */ + if (!gr_lock ()) { + fprintf (stderr, _("%s: can't lock group file\n"), Prog); + exit (1); + } + if (!gr_open (O_RDWR)) { + fprintf (stderr, _("%s: can't open group file\n"), Prog); + gr_unlock (); + exit (1); + } + + is_shadow_pwd = sgr_file_present (); + if (is_shadow_pwd) { + if (!sgr_lock ()) { + fprintf (stderr, _("%s: can't lock gshadow file\n"), + Prog); + gr_unlock (); + exit (1); + } + if (!sgr_open (O_RDWR)) { + fprintf (stderr, _("%s: can't open shadow file\n"), + Prog); + gr_unlock (); + sgr_unlock (); + exit (1); + } + } + + /* + * Read each line, separating the group name from the password. The + * password entry for each group will be looked up in the appropriate + * file (gshadow or group) and the password changed. + */ + while (fgets (buf, sizeof buf, stdin) != (char *) 0) { + line++; + if ((cp = strrchr (buf, '\n'))) { + *cp = '\0'; + } else { + fprintf (stderr, _("%s: line %d: line too long\n"), + Prog, line); + errors++; + continue; + } + + /* + * The groupname is the first field. It is separated from the + * password with a ":" character which is replaced with a + * NUL to give the new password. The new password will then + * be encrypted in the normal fashion with a new salt + * generated, unless the '-e' is given, in which case it is + * assumed to already be encrypted. + */ + + name = buf; + if ((cp = strchr (name, ':'))) { + *cp++ = '\0'; + } else { + fprintf (stderr, + _("%s: line %d: missing new password\n"), + Prog, line); + errors++; + continue; + } + newpwd = cp; + if (!eflg) { + if (md5flg) { + char salt[12] = "$1$"; + + strcat (salt, crypt_make_salt ()); + cp = pw_encrypt (newpwd, salt); + } else + cp = pw_encrypt (newpwd, crypt_make_salt ()); + } + + /* + * Get the password file entry for this user. The user must + * already exist. + */ + gr = gr_locate (name); + if (!gr) { + fprintf (stderr, + _("%s: line %d: unknown group %s\n"), Prog, + line, name); + errors++; + continue; + } + if (is_shadow_pwd) + sg = sgr_locate (name); + else + sg = NULL; + + /* + * The freshly encrypted new password is merged into the + * user's password file entry and the last password change + * date is set to the current date. + */ + if (sg) { + newsg = *sg; + newsg.sg_passwd = cp; + } else { + newgr = *gr; + newgr.gr_passwd = cp; + } + + /* + * The updated password file entry is then put back and will + * be written to the password file later, after all the + * other entries have been updated as well. + */ + if (sg) + ok = sgr_update (&newsg); + else + ok = gr_update (&newgr); + + if (!ok) { + fprintf (stderr, + _ + ("%s: line %d: cannot update password entry\n"), + Prog, line); + errors++; + continue; + } + } + + /* + * Any detected errors will cause the entire set of changes to be + * aborted. Unlocking the password file will cause all of the + * changes to be ignored. Otherwise the file is closed, causing the + * changes to be written out all at once, and then unlocked + * afterwards. + */ + if (errors) { + fprintf (stderr, + _("%s: error detected, changes ignored\n"), Prog); + if (is_shadow_pwd) + sgr_unlock (); + gr_unlock (); + exit (1); + } + if (is_shadow_pwd) { + if (!sgr_close ()) { + fprintf (stderr, + _("%s: error updating shadow file\n"), Prog); + gr_unlock (); + exit (1); + } + sgr_unlock (); + } + if (!gr_close ()) { + fprintf (stderr, _("%s: error updating password file\n"), Prog); + exit (1); + } + + nscd_flush_cache ("group"); + + gr_unlock (); + +#ifdef USE_PAM + if (retval == PAM_SUCCESS) + pam_end (pamh, PAM_SUCCESS); +#endif /* USE_PAM */ + + return (0); +} diff --git a/src/chsh.c b/src/chsh.c index 7d4e03f3..5cfbdb4f 100644 --- a/src/chsh.c +++ b/src/chsh.c @@ -29,7 +29,7 @@ #include -#ident "$Id: chsh.c,v 1.37 2006/01/02 23:31:59 kloczek Exp $" +#ident "$Id: chsh.c,v 1.39 2006/02/21 22:44:35 kloczek Exp $" #include #include @@ -68,6 +68,7 @@ static char loginsh[BUFSIZ]; /* Name of new login shell */ /* local function prototypes */ static void usage (void); static void new_fields (void); +static int check_shell (const char *); static int restricted_shell (const char *); /* @@ -117,7 +118,7 @@ static int restricted_shell (const char *sh) * If getusershell() is available (Linux, *BSD, possibly others), use it * instead of re-implementing it. */ -int check_shell (const char *sh) +static int check_shell (const char *sh) { char *cp; int found = 0; @@ -298,6 +299,7 @@ int main (int argc, char **argv) * check if the change is allowed by SELinux policy. */ if ((pw->pw_uid != getuid ()) + && (is_selinux_enabled () > 0) && (selinux_check_passwd_access (PASSWD__CHSH) != 0)) { SYSLOG ((LOG_WARN, "can't change shell for `%s'", user)); closelog (); diff --git a/src/expiry.c b/src/expiry.c index 3cc953b1..d3d78cbf 100644 --- a/src/expiry.c +++ b/src/expiry.c @@ -29,7 +29,7 @@ #include -#ident "$Id: expiry.c,v 1.18 2005/09/07 15:00:45 kloczek Exp $" +#ident "$Id: expiry.c,v 1.19 2006/02/08 10:53:16 kloczek Exp $" #include #include @@ -38,13 +38,13 @@ #include "defines.h" #include "prototypes.h" /* local function prototypes */ -static RETSIGTYPE catch (int); +static RETSIGTYPE catch_signals (int); static void usage (void); /* - * catch - signal catcher + * catch_signals - signal catcher */ -static RETSIGTYPE catch (int sig) +static RETSIGTYPE catch_signals (int sig) { exit (10); } @@ -76,11 +76,11 @@ int main (int argc, char **argv) /* * Start by disabling all of the keyboard signals. */ - signal (SIGHUP, catch); - signal (SIGINT, catch); - signal (SIGQUIT, catch); + signal (SIGHUP, catch_signals); + signal (SIGINT, catch_signals); + signal (SIGQUIT, catch_signals); #ifdef SIGTSTP - signal (SIGTSTP, catch); + signal (SIGTSTP, catch_signals); #endif /* diff --git a/src/gpasswd.c b/src/gpasswd.c index fc7675f4..0c4be305 100644 --- a/src/gpasswd.c +++ b/src/gpasswd.c @@ -29,7 +29,7 @@ #include -#ident "$Id: gpasswd.c,v 1.34 2005/09/07 15:00:45 kloczek Exp $" +#ident "$Id: gpasswd.c,v 1.36 2006/02/08 10:58:46 kloczek Exp $" #include #include @@ -41,6 +41,7 @@ #include "defines.h" #include "exitcodes.h" #include "groupio.h" +#include "nscd.h" #include "prototypes.h" #ifdef SHADOWGRP #include "sgroupio.h" @@ -65,7 +66,7 @@ unsigned int bywho = -1; /* local function prototypes */ static void usage (void); -static RETSIGTYPE die (int); +static RETSIGTYPE catch_signals (int); static int check_list (const char *); /* @@ -86,13 +87,14 @@ static void usage (void) } /* - * die - set or reset termio modes. + * catch_signals - set or reset termio modes. * - * die() is called before processing begins. signal() is then called - * with die() as the signal handler. If signal later calls die() with a - * signal number, the terminal modes are then reset. + * catch_signals() is called before processing begins. signal() is then + * called with catch_signals() as the signal handler. If signal later + * calls catch_signals() with a signal number, the terminal modes are + * then reset. */ -static RETSIGTYPE die (int killed) +static RETSIGTYPE catch_signals (int killed) { static TERMIO sgtty; @@ -555,14 +557,14 @@ int main (int argc, char **argv) exit (1); } - die (0); /* save tty modes */ + catch_signals (0); /* save tty modes */ - signal (SIGHUP, die); - signal (SIGINT, die); - signal (SIGQUIT, die); - signal (SIGTERM, die); + signal (SIGHUP, catch_signals); + signal (SIGINT, catch_signals); + signal (SIGQUIT, catch_signals); + signal (SIGTERM, catch_signals); #ifdef SIGTSTP - signal (SIGTSTP, die); + signal (SIGTSTP, catch_signals); #endif /* diff --git a/src/groupadd.c b/src/groupadd.c index 4c66dee6..35113ca8 100644 --- a/src/groupadd.c +++ b/src/groupadd.c @@ -29,7 +29,7 @@ #include -#ident "$Id: groupadd.c,v 1.50 2005/12/06 20:24:03 kloczek Exp $" +#ident "$Id: groupadd.c,v 1.51 2006/01/18 19:55:15 kloczek Exp $" #include #include @@ -85,7 +85,6 @@ static void new_sgent (struct sgrp *); static void grp_update (void); static void find_new_gid (void); static void check_new_name (void); -static void process_flags (int, char **); static void close_files (void); static void open_files (void); static void fail_exit (int); diff --git a/src/groupdel.c b/src/groupdel.c index 870060d1..b6b990b2 100644 --- a/src/groupdel.c +++ b/src/groupdel.c @@ -29,7 +29,7 @@ #include -#ident "$Id: groupdel.c,v 1.30 2005/10/19 15:21:07 kloczek Exp $" +#ident "$Id: groupdel.c,v 1.31 2006/01/18 19:55:15 kloczek Exp $" #include #include @@ -345,4 +345,5 @@ int main (int argc, char **argv) #endif exit (errors == 0 ? E_SUCCESS : E_GRP_UPDATE); /* NOT REACHED */ + return 0; } diff --git a/src/groups.c b/src/groups.c index ae44f478..6e92876d 100644 --- a/src/groups.c +++ b/src/groups.c @@ -29,7 +29,7 @@ #include -#ident "$Id: groups.c,v 1.13 2005/09/07 15:00:45 kloczek Exp $" +#ident "$Id: groups.c,v 1.15 2006/02/07 22:41:56 kloczek Exp $" #include #include @@ -103,7 +103,7 @@ int main (int argc, char **argv) sys_ngroups = sysconf (_SC_NGROUPS_MAX); #ifdef HAVE_GETGROUPS - groups = malloc (sys_ngroups * sizeof (GETGROUPS_T)); + groups = (GETGROUPS_T *) malloc (sys_ngroups * sizeof (GETGROUPS_T)); #endif setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR); diff --git a/src/grpck.c b/src/grpck.c index 5f70c7d5..7b7578b8 100644 --- a/src/grpck.c +++ b/src/grpck.c @@ -29,7 +29,7 @@ #include -#ident "$Id: grpck.c,v 1.28 2005/09/07 15:00:45 kloczek Exp $" +#ident "$Id: grpck.c,v 1.29 2006/01/18 19:55:15 kloczek Exp $" #include #include @@ -39,6 +39,7 @@ #include "commonio.h" #include "defines.h" #include "groupio.h" +#include "nscd.h" #include "prototypes.h" extern void __gr_del_entry (const struct commonio_entry *); extern struct commonio_entry *__gr_get_head (void); diff --git a/src/grpconv.c b/src/grpconv.c index 84f3695d..c70aa3cd 100644 --- a/src/grpconv.c +++ b/src/grpconv.c @@ -9,7 +9,7 @@ */ #include -#ident "$Id: grpconv.c,v 1.19 2005/08/31 17:25:00 kloczek Exp $" +#ident "$Id: grpconv.c,v 1.20 2006/01/18 19:55:15 kloczek Exp $" #include #include @@ -19,6 +19,7 @@ #include #include #include +#include "nscd.h" #include "prototypes.h" #ifdef SHADOWGRP #include "groupio.h" diff --git a/src/grpunconv.c b/src/grpunconv.c index 232175a2..0242daa8 100644 --- a/src/grpunconv.c +++ b/src/grpunconv.c @@ -10,7 +10,7 @@ #include -#ident "$Id: grpunconv.c,v 1.17 2005/08/31 17:25:00 kloczek Exp $" +#ident "$Id: grpunconv.c,v 1.18 2006/01/18 19:55:15 kloczek Exp $" #include #include @@ -19,6 +19,7 @@ #include #include #include +#include "nscd.h" #include "prototypes.h" #ifdef SHADOWGRP #include "groupio.h" diff --git a/src/id.c b/src/id.c index 5d1e2966..31d76e27 100644 --- a/src/id.c +++ b/src/id.c @@ -37,7 +37,7 @@ #include -#ident "$Id: id.c,v 1.18 2005/09/07 15:00:45 kloczek Exp $" +#ident "$Id: id.c,v 1.19 2006/02/07 22:55:41 kloczek Exp $" #include #include @@ -91,7 +91,7 @@ static void usage (void) */ sys_ngroups = sysconf (_SC_NGROUPS_MAX); #ifdef HAVE_GETGROUPS - groups = malloc (sys_ngroups * sizeof (GETGROUPS_T)); + groups = (GETGROUPS_T *) malloc (sys_ngroups * sizeof (GETGROUPS_T)); /* * See if the -a flag has been given to print out the concurrent * group set. diff --git a/src/lastlog.c b/src/lastlog.c index 68897454..9adaf1e2 100644 --- a/src/lastlog.c +++ b/src/lastlog.c @@ -29,7 +29,7 @@ #include -#ident "$Id: lastlog.c,v 1.23 2005/08/31 17:25:00 kloczek Exp $" +#ident "$Id: lastlog.c,v 1.25 2006/03/05 22:06:58 kloczek Exp $" #include #include @@ -213,6 +213,12 @@ int main (int argc, char **argv) break; } } + if (argc > optind) { + fprintf (stderr, + _("lastlog: unexpected argument: %s\n"), + argv[optind]); + usage(); + } } if ((lastlogfile = fopen (LASTLOG_FILE, "r")) == (FILE *) 0) { diff --git a/src/login.c b/src/login.c index 624a3900..b8186ffd 100644 --- a/src/login.c +++ b/src/login.c @@ -29,7 +29,7 @@ #include -#ident "$Id: login.c,v 1.77 2005/12/13 14:04:54 kloczek Exp $" +#ident "$Id: login.c,v 1.83 2006/03/07 15:47:32 kloczek Exp $" #include #include @@ -47,6 +47,7 @@ #include "getdef.h" #include "prototypes.h" #include "pwauth.h" +#include "exitcodes.h" #ifdef USE_PAM #include "pam_defs.h" @@ -258,7 +259,10 @@ static void check_flags (int argc, char *const *argv) static void init_env (void) { - char *cp, *tmp; +#ifndef USE_PAM + char *cp; +#endif + char *tmp; if ((tmp = getenv ("LANG"))) { addenv ("LANG", tmp); @@ -331,6 +335,7 @@ int main (int argc, char **argv) int flag; int subroot = 0; int is_console; + int err; const char *cp; char *tmp; char fromhost[512]; @@ -490,7 +495,7 @@ int main (int argc, char **argv) setup_tty (); #ifndef USE_PAM - umask (getdef_num ("UMASK", 077)); + umask (getdef_num ("UMASK", GETDEF_DEFAULT_UMASK)); { /* @@ -603,10 +608,10 @@ int main (int argc, char **argv) if (!gethostname (hostn, sizeof (hostn))) snprintf (login_prompt, sizeof (login_prompt), - "%s login: ", hostn); + _("%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); @@ -627,68 +632,60 @@ int main (int argc, char **argv) * pay attention to failure count and get rid of * MAX_LOGIN_TRIES? */ - retcode = pam_authenticate (pamh, 0); - while ((failcount++ < retries) && - ((retcode == PAM_AUTH_ERR) || - (retcode == PAM_USER_UNKNOWN) || - (retcode == PAM_CRED_INSUFFICIENT) || - (retcode == PAM_AUTHINFO_UNAVAIL))) { - pam_get_item (pamh, PAM_USER, - (const void **) &pam_user); - SYSLOG ((LOG_NOTICE, - "FAILED LOGIN %d FROM %s FOR %s, %s", - failcount, hostname, pam_user, - pam_strerror (pamh, retcode))); -#ifdef HAVE_PAM_FAIL_DELAY - pam_fail_delay (pamh, 1000000 * delay); -#endif -#ifdef WITH_AUDIT - { - struct passwd *pw; - char buf[64]; - - audit_fd = audit_open (); - pw = getpwnam (username); - if (pw) { - snprintf (buf, sizeof (buf), - "uid=%d", pw->pw_uid); - audit_log_user_message - (audit_fd, AUDIT_USER_LOGIN, - buf, hostname, NULL, - tty, 0); - } else { - snprintf (buf, sizeof (buf), - "acct=%s", username); - audit_log_user_message - (audit_fd, AUDIT_USER_LOGIN, - buf, hostname, NULL, - tty, 0); - } - close (audit_fd); - } -#endif /* WITH_AUDIT */ - - fprintf (stderr, _("\nLogin incorrect\n")); - pam_set_item (pamh, PAM_USER, NULL); - retcode = pam_authenticate (pamh, 0); - } - - if (retcode != PAM_SUCCESS) { - pam_get_item (pamh, PAM_USER, - (const void **) &pam_user); - - if (retcode == PAM_MAXTRIES) - SYSLOG ((LOG_NOTICE, - "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s", - failcount, hostname, - pam_user, - pam_strerror (pamh, retcode))); - else - SYSLOG ((LOG_NOTICE, - "FAILED LOGIN SESSION FROM %s FOR %s, %s", - hostname, pam_user, - pam_strerror (pamh, retcode))); - + failcount = 0; + while (1) { + const char *failent_user; + failed = 0; + + failcount++; + if (delay > 0) + retcode = pam_fail_delay(pamh, 1000000*delay); + + retcode = pam_authenticate (pamh, 0); + + pam_get_item (pamh, PAM_USER, + (const void **) &pam_user); + + if (pam_user && pam_user[0]) { + pwd = getpwnam(pam_user); + if (pwd) { + pwent = *pwd; + failent_user = pwent.pw_name; + } else { + if (getdef_bool("LOG_UNKFAIL_ENAB") && pam_user) + failent_user = pam_user; + else + failent_user = "UNKNOWN"; + } + } else { + pwd = NULL; + failent_user = "UNKNOWN"; + } + + if (retcode == PAM_MAXTRIES || failcount >= retries) { + SYSLOG ((LOG_NOTICE, + "TOO MANY LOGIN TRIES (%d)%s FOR `%s'", + failcount, fromhost, failent_user)); + fprintf(stderr, + _("Maximum number of tries exceeded (%d)\n"), + failcount); + PAM_END; + exit(0); + } else if (retcode == PAM_ABORT) { + /* Serious problems, quit now */ + fprintf(stderr,_("login: abort requested by PAM\n")); + SYSLOG ((LOG_ERR,"PAM_ABORT returned from pam_authenticate()")); + PAM_END; + exit(99); + } else if (retcode != PAM_SUCCESS) { + SYSLOG ((LOG_NOTICE,"FAILED LOGIN (%d)%s FOR `%s', %s", + failcount, fromhost, failent_user, + pam_strerror (pamh, retcode))); + failed = 1; + } + + if (!failed) + break; #ifdef WITH_AUDIT { @@ -716,11 +713,13 @@ int main (int argc, char **argv) } #endif /* WITH_AUDIT */ - fprintf (stderr, "\nLogin incorrect\n"); - pam_end (pamh, retcode); - exit (0); + fprintf(stderr,"\nLogin incorrect\n"); + + /* Let's give it another go around */ + pam_set_item(pamh,PAM_USER,NULL); } + /* We don't get here unless they were authenticated above */ retcode = pam_acct_mgmt (pamh, 0); if (retcode == PAM_NEW_AUTHTOK_REQD) { @@ -1127,10 +1126,12 @@ int main (int argc, char **argv) SYSLOG ((LOG_INFO, "`%s' logged in %s", username, fromhost)); #endif closelog (); - if ((tmp = getdef_str ("FAKE_SHELL")) != NULL) { - shell (tmp, pwent.pw_shell); /* fake shell */ - } - shell (pwent.pw_shell, (char *) 0); /* exec the shell finally. */ + if ((tmp = getdef_str ("FAKE_SHELL")) != NULL) + err = shell (tmp, pwent.pw_shell, newenvp); /* fake shell */ + else + /* exec the shell finally */ + err = shell (pwent.pw_shell, (char *) 0, newenvp); + exit (err == ENOENT ? E_CMD_NOTFOUND : E_CMD_NOEXEC); /* NOT REACHED */ return 0; } diff --git a/src/newgrp.c b/src/newgrp.c index 8f9314ea..c8ba4f4f 100644 --- a/src/newgrp.c +++ b/src/newgrp.c @@ -29,7 +29,7 @@ #include -#ident "$Id: newgrp.c,v 1.42 2005/11/10 16:01:27 kloczek Exp $" +#ident "$Id: newgrp.c,v 1.44 2006/01/18 19:55:15 kloczek Exp $" #include #include @@ -38,9 +38,11 @@ #include "defines.h" #include "getdef.h" #include "prototypes.h" +#include "exitcodes.h" /* * Global variables */ +extern char **newenvp; extern char **environ; #ifdef HAVE_SETGROUPS @@ -103,6 +105,7 @@ int main (int argc, char **argv) int needspasswd = 0; int i; int cflag = 0; + int err = 0; gid_t gid; char *cp; const char *cpasswd, *name, *prog; @@ -482,8 +485,8 @@ int main (int argc, char **argv) /* wake child when resumed */ kill (child, SIGCONT); } - } while (pid == child && WIFSTOPPED (cst) || - pid != child && errno == EINTR); + } while ((pid == child && WIFSTOPPED (cst)) || + (pid != child && errno == EINTR)); SYSLOG ((LOG_INFO, "user `%s' (login `%s' on %s) returned to group `%s'", name, loginname, tty, @@ -556,13 +559,8 @@ int main (int argc, char **argv) audit_logger (AUDIT_USER_START, Prog, "changing", NULL, getuid (), 0); #endif - if (errno == ENOENT) { - perror ("/bin/sh"); - exit (127); - } else { - perror ("/bin/sh"); - exit (126); - } + perror ("/bin/sh"); + exit (errno == ENOENT ? E_CMD_NOTFOUND : E_CMD_NOEXEC); } /* @@ -631,7 +629,8 @@ int main (int argc, char **argv) * Exec the login shell and go away. We are trying to get back to * the previous environment which should be the user's login shell. */ - shell (prog, initflag ? (char *) 0 : cp); + err = shell (prog, initflag ? (char *) 0 : cp, newenvp); + exit (err == ENOENT ? E_CMD_NOTFOUND : E_CMD_NOEXEC); /* NOTREACHED */ failure: diff --git a/src/newusers.c b/src/newusers.c index a0e1a65b..d6ee4771 100644 --- a/src/newusers.c +++ b/src/newusers.c @@ -35,7 +35,7 @@ #include -#ident "$Id: newusers.c,v 1.31 2005/10/19 15:21:07 kloczek Exp $" +#ident "$Id: newusers.c,v 1.33 2006/03/07 15:47:32 kloczek Exp $" #include #include @@ -49,8 +49,9 @@ #include "prototypes.h" #include "defines.h" #include "getdef.h" -#include "pwio.h" #include "groupio.h" +#include "nscd.h" +#include "pwio.h" #include "shadowio.h" /* * Global variables @@ -474,15 +475,16 @@ 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", 022))) + 0777 & ~getdef_num ("UMASK", + GETDEF_DEFAULT_UMASK))) fprintf (stderr, - _("%s: line %d: mkdir failed\n"), - Prog, line); + _("%s: line %d: mkdir failed\n"), Prog, + line); else if (chown (newpw.pw_dir, newpw.pw_uid, newpw.pw_gid)) fprintf (stderr, - _("%s: line %d: chown failed\n"), - Prog, line); + _("%s: line %d: chown failed\n"), Prog, + line); } /* diff --git a/src/passwd.c b/src/passwd.c index b4e30a17..f4a9fc94 100644 --- a/src/passwd.c +++ b/src/passwd.c @@ -29,7 +29,7 @@ #include -#ident "$Id: passwd.c,v 1.55 2005/12/06 20:19:52 kloczek Exp $" +#ident "$Id: passwd.c,v 1.57 2006/02/21 22:44:35 kloczek Exp $" #include #include @@ -603,7 +603,6 @@ static long getnumber (const char *str) */ int main (int argc, char **argv) { - int flag; /* Current option to process */ const struct passwd *pw; /* Password file entry for user */ #ifndef USE_PAM @@ -803,7 +802,9 @@ int main (int argc, char **argv) * check if the change is allowed by SELinux policy. */ if ((pw->pw_uid != getuid ()) - && (selinux_check_passwd_access (PASSWD__PASSWD) != 0)) { + && (is_selinux_enabled () > 0 ? + (selinux_check_passwd_access (PASSWD__PASSWD) != 0) : + !amroot)) { #else /* * If the UID of the user does not match the current real UID, @@ -898,11 +899,12 @@ int main (int argc, char **argv) SYSLOG ((LOG_INFO, "password for `%s' changed by `%s'", name, myname)); closelog (); - if (!qflg) + if (!qflg) { if (!eflg) printf (_("Password changed.\n")); else printf (_("Password set to expire.\n")); + } exit (E_SUCCESS); /* NOT REACHED */ } diff --git a/src/pwck.c b/src/pwck.c index be50b93d..73f0fdf8 100644 --- a/src/pwck.c +++ b/src/pwck.c @@ -29,7 +29,7 @@ #include -#ident "$Id: pwck.c,v 1.32 2005/09/07 15:00:45 kloczek Exp $" +#ident "$Id: pwck.c,v 1.33 2006/01/18 19:55:15 kloczek Exp $" #include #include @@ -41,6 +41,7 @@ #include "prototypes.h" #include "pwio.h" #include "shadowio.h" +#include "nscd.h" extern void __pw_del_entry (const struct commonio_entry *); extern struct commonio_entry *__pw_get_head (void); diff --git a/src/pwconv.c b/src/pwconv.c index 896be05f..f00045a0 100644 --- a/src/pwconv.c +++ b/src/pwconv.c @@ -28,7 +28,7 @@ #include -#ident "$Id: pwconv.c,v 1.21 2005/09/07 15:00:45 kloczek Exp $" +#ident "$Id: pwconv.c,v 1.22 2006/01/18 19:55:15 kloczek Exp $" #include #include @@ -43,6 +43,7 @@ #include "prototypes.h" #include "pwio.h" #include "shadowio.h" +#include "nscd.h" /* * exit status values */ diff --git a/src/su.c b/src/su.c index 9a27749c..da1c6f48 100644 --- a/src/su.c +++ b/src/su.c @@ -29,7 +29,7 @@ #include -#ident "$Id: su.c,v 1.61 2006/01/02 22:37:47 kloczek Exp $" +#ident "$Id: su.c,v 1.66 2006/02/08 10:52:49 kloczek Exp $" #include #include @@ -147,7 +147,7 @@ static void su_failure (const char *tty) #ifdef USE_PAM /* Signal handler for parent process later */ -static void su_catch_sig (int sig) +static void catch_signals (int sig) { ++caught; } @@ -156,7 +156,8 @@ static void su_catch_sig (int sig) * have been applied. Some work was needed to get it integrated into * su.c from shadow. */ -static void run_shell (const char *shellstr, char *args[], int doshell) +static void run_shell (const char *shellstr, char *args[], int doshell, + char *const envp[]) { int child; sigset_t ourset; @@ -168,14 +169,10 @@ static void run_shell (const char *shellstr, char *args[], int doshell) pam_end (pamh, PAM_SUCCESS); if (doshell) - shell (shellstr, (char *) args[0]); + (void) shell (shellstr, (char *) args[0], envp); else - (void) execv (shellstr, (char **) args); - { - int exit_status = (errno == ENOENT ? 127 : 126); - - exit (exit_status); - } + (void) execve (shellstr, (char **) args, envp); + exit (errno == ENOENT ? E_CMD_NOTFOUND : E_CMD_NOEXEC); } else if (child == -1) { (void) fprintf (stderr, "%s: Cannot fork user shell\n", Prog); SYSLOG ((LOG_WARN, "Cannot execute %s", shellstr)); @@ -191,7 +188,7 @@ static void run_shell (const char *shellstr, char *args[], int doshell) if (!caught) { struct sigaction action; - action.sa_handler = su_catch_sig; + action.sa_handler = catch_signals; sigemptyset (&action.sa_mask); action.sa_flags = 0; sigemptyset (&ourset); @@ -256,6 +253,7 @@ static void usage (void) fprintf (stderr, _("Usage: su [options] [login]\n" "\n" "Options:\n" + " -c, --command COMMAND pass COMMAND to the invoked shell\n" " -h, --help display this help message and exit\n" " -, -l, --login make the shell a login shell\n" " -m, -p,\n" @@ -286,11 +284,13 @@ int main (int argc, char **argv) uid_t my_uid; struct passwd *pw = 0; char **envp = environ; - char *shellstr = 0; + char *shellstr = 0, *command = 0; #ifdef USE_PAM int ret; #else /* !USE_PAM */ + int err = 0; + RETSIGTYPE (*oldsig) (); int is_console = 0; @@ -328,6 +328,7 @@ int main (int argc, char **argv) int option_index = 0; int c; static struct option long_options[] = { + {"command", required_argument, NULL, 'c'}, {"help", no_argument, NULL, 'h'}, {"login", no_argument, NULL, 'l'}, {"preserve-environment", no_argument, NULL, 'p'}, @@ -336,7 +337,7 @@ int main (int argc, char **argv) }; while ((c = - getopt_long (argc, argv, "-hlmps:", long_options, + getopt_long (argc, argv, "-c:hlmps:", long_options, &option_index)) != -1) { switch (c) { case 1: @@ -349,6 +350,9 @@ int main (int argc, char **argv) optind--; goto end_su_options; break; /* NOT REACHED */ + case 'c': + command = optarg; + break; case 'h': usage (); break; @@ -423,6 +427,8 @@ int main (int argc, char **argv) (void) strcpy (name, "root"); doshell = argc == optind; /* any arguments remaining? */ + if (command) + doshell = 0; /* * Get the user's real name. The current UID is used to determine @@ -755,6 +761,7 @@ int main (int argc, char **argv) SYSLOG ((LOG_ERR, "pam_open_session: %s", pam_strerror (pamh, ret))); fprintf (stderr, _("%s: %s\n"), Prog, pam_strerror (pamh, ret)); + pam_setcred(pamh, PAM_DELETE_CRED); pam_end (pamh, ret); exit (1); } @@ -778,6 +785,7 @@ int main (int argc, char **argv) /* become the new user */ if (change_uid (&pwent)) { + pam_close_session(pamh, 0); pam_setcred (pamh, PAM_DELETE_CRED); pam_end (pamh, PAM_ABORT); exit (1); @@ -832,25 +840,32 @@ int main (int argc, char **argv) if (!doshell) { /* Position argv to the remaining arguments */ argv += optind; + if (command) { + argv -= 2; + argv[0] = "-c"; + argv[1] = command; + } /* * Use the shell and create an argv * with the rest of the command line included. */ argv[-1] = shellstr; #ifndef USE_PAM - (void) execv (shellstr, &argv[-1]); -#else - run_shell (shellstr, &argv[-1], 0); -#endif + (void) execve (shellstr, &argv[-1], environ); + err = errno; (void) fprintf (stderr, _("No shell\n")); SYSLOG ((LOG_WARN, "Cannot execute %s", shellstr)); closelog (); - exit (1); + exit (err == ENOENT ? E_CMD_NOTFOUND : E_CMD_NOEXEC); +#else + run_shell (shellstr, &argv[-1], 0, environ); /* no return */ +#endif } #ifndef USE_PAM - shell (shellstr, cp); + err = shell (shellstr, cp, environ); + exit (err == ENOENT ? E_CMD_NOTFOUND : E_CMD_NOEXEC); #else - run_shell (shellstr, &cp, 1); + run_shell (shellstr, &cp, 1, environ); #endif /* NOT REACHED */ exit (1); diff --git a/src/sulogin.c b/src/sulogin.c index d1559e8f..c18f7376 100644 --- a/src/sulogin.c +++ b/src/sulogin.c @@ -29,7 +29,7 @@ #include -#ident "$Id: sulogin.c,v 1.23 2005/09/07 15:00:45 kloczek Exp $" +#ident "$Id: sulogin.c,v 1.25 2006/02/08 10:53:16 kloczek Exp $" #include #include @@ -39,6 +39,7 @@ #include "getdef.h" #include "prototypes.h" #include "pwauth.h" +#include "exitcodes.h" /* * Global variables */ @@ -57,9 +58,9 @@ extern char **environ; #endif /* local function prototypes */ -static RETSIGTYPE catch (int); +static RETSIGTYPE catch_signals (int); -static RETSIGTYPE catch (int sig) +static RETSIGTYPE catch_signals (int sig) { exit (1); } @@ -76,6 +77,7 @@ static RETSIGTYPE catch (int sig) char *cp; char **envp = environ; TERMIO termio; + int err = 0; #ifdef USE_TERMIO ioctl (0, TCGETA, &termio); @@ -153,7 +155,7 @@ static RETSIGTYPE catch (int sig) (void) strcpy (name, "root"); /* KLUDGE!!! */ - signal (SIGALRM, catch); /* exit if the timer expires */ + signal (SIGALRM, catch_signals); /* exit if the timer expires */ alarm (ALARM); /* only wait so long ... */ while (1) { /* repeatedly get login/password pairs */ @@ -220,6 +222,8 @@ static RETSIGTYPE catch (int sig) #ifdef USE_SYSLOG closelog (); #endif - shell (pwent.pw_shell, (char *) 0); /* exec the shell finally. */ + /* exec the shell finally. */ + err = shell (pwent.pw_shell, (char *) 0, environ); + exit (err == ENOENT ? E_CMD_NOTFOUND : E_CMD_NOEXEC); /*NOTREACHED*/ return (0); } diff --git a/src/useradd.c b/src/useradd.c index f386dadf..397628a1 100644 --- a/src/useradd.c +++ b/src/useradd.c @@ -29,7 +29,7 @@ #include -#ident "$Id: useradd.c,v 1.89 2005/12/15 15:06:28 kloczek Exp $" +#ident "$Id: useradd.c,v 1.92 2006/03/07 15:47:33 kloczek Exp $" #include #include @@ -1271,7 +1271,6 @@ static void close_files (void) _("%s: cannot rewrite group file\n"), Prog); fail_exit (E_GRP_UPDATE); } - gr_unlock (); #ifdef SHADOWGRP if (is_shadow_grp && !sgr_close ()) { fprintf (stderr, @@ -1280,13 +1279,16 @@ static void close_files (void) Prog); fail_exit (E_GRP_UPDATE); } - if (is_shadow_grp) - sgr_unlock (); #endif } if (is_shadow_pwd) spw_unlock (); pw_unlock (); + gr_unlock (); +#ifdef SHADOWGRP + if (is_shadow_grp) + sgr_unlock (); +#endif } /* @@ -1564,7 +1566,8 @@ static void create_home (void) fail_exit (E_HOMEDIR); } chown (user_home, user_id, user_gid); - chmod (user_home, 0777 & ~getdef_num ("UMASK", 022)); + chmod (user_home, + 0777 & ~getdef_num ("UMASK", GETDEF_DEFAULT_UMASK)); home_added++; #ifdef WITH_AUDIT audit_logger (AUDIT_USER_CHAUTHTOK, Prog, @@ -1755,10 +1758,12 @@ int main (int argc, char **argv) */ open_files (); - /* first, seek for a valid uid to use for this user. - * We do this because later we can use the uid we found as - * gid too ... --gafton */ - find_new_uid (); + if (!oflg) { + /* first, seek for a valid uid to use for this user. + * We do this because later we can use the uid we found as + * gid too ... --gafton */ + find_new_uid (); + } /* do we have to add a group for that user? This is why we need to * open the group files in the open_files() function --gafton */ diff --git a/src/userdel.c b/src/userdel.c index db464aa1..0c8f6c03 100644 --- a/src/userdel.c +++ b/src/userdel.c @@ -29,7 +29,7 @@ #include -#ident "$Id: userdel.c,v 1.58 2005/12/01 20:10:48 kloczek Exp $" +#ident "$Id: userdel.c,v 1.61 2006/02/07 20:19:46 kloczek Exp $" #include #include @@ -50,6 +50,7 @@ #include "pwauth.h" #include "pwio.h" #include "shadowio.h" +#include "exitcodes.h" #ifdef SHADOWGRP #include "sgroupio.h" #endif @@ -65,9 +66,7 @@ #define E_HOMEDIR 12 /* can't remove home directory */ static char *user_name; static uid_t user_id; -static gid_t user_gid; static char *user_home; -static char *user_group; static char *Prog; static int fflg = 0, rflg = 0; @@ -263,65 +262,6 @@ static void update_groups (void) #endif /* SHADOWGRP */ } -/* - * remove_group - remove the user's group unless it is not really a user-private group - */ -static void remove_group () -{ - char *glist_name; - struct group *gr; - struct passwd *pwd; - - if (user_group == NULL || user_name == NULL) - return; - - if (strcmp (user_name, user_group)) { - return; - } - - glist_name = NULL; - gr = getgrnam (user_group); - if (gr) - glist_name = *(gr->gr_mem); - while (glist_name) { - while (glist_name && *glist_name) { - if (strncmp (glist_name, user_name, 16)) { - return; - } - glist_name++; - } - } - - setpwent (); - while ((pwd = getpwent ())) { - if (strcmp (pwd->pw_name, user_name) == 0) - continue; - - if (pwd->pw_gid == user_gid) { - return; - } - } - - /* now actually do the removal if we haven't already returned */ - - if (!gr_remove (user_group)) { - fprintf (stderr, _("%s: error removing group entry\n"), Prog); - } -#ifdef SHADOWGRP - - /* - * Delete the shadow group entries as well. - */ - - if (is_shadow_grp && !sgr_remove (user_group)) { - fprintf (stderr, _("%s: error removing shadow group entry\n"), - Prog); - } -#endif /* SHADOWGRP */ - SYSLOG ((LOG_INFO, "remove group `%s'\n", user_group)); - return; -} - /* * close_files - close all of the files that were opened * @@ -384,8 +324,7 @@ static void open_files (void) fprintf (stderr, _("%s: unable to lock password file\n"), Prog); #ifdef WITH_AUDIT audit_logger (AUDIT_USER_CHAUTHTOK, Prog, - "locking password file", user_name, user_id, 1, - 0); + "locking password file", user_name, user_id, 0); #endif exit (E_PW_UPDATE); } @@ -572,13 +511,8 @@ static void user_cancel (const char *user) pid = fork (); if (pid == 0) { execl (cmd, cmd, user, (char *) 0); - if (errno == ENOENT) { - perror (cmd); - _exit (127); - } else { - perror (cmd); - _exit (126); - } + perror (cmd); + _exit (errno == ENOENT ? E_CMD_NOTFOUND : E_CMD_NOEXEC); } else if (pid == -1) { perror ("fork"); return; @@ -657,7 +591,6 @@ static void remove_mailbox (void) int main (int argc, char **argv) { struct passwd *pwd; - struct group *grp; int arg; int errors = 0; @@ -765,10 +698,6 @@ int main (int argc, char **argv) #endif user_id = pwd->pw_uid; user_home = xstrdup (pwd->pw_dir); - user_gid = pwd->pw_gid; - grp = getgrgid (user_gid); - if (grp) - user_group = xstrdup (grp->gr_name); /* * Check to make certain the user isn't logged in. */ @@ -822,9 +751,6 @@ int main (int argc, char **argv) } #endif - /* Remove the user's group if appropriate. */ - remove_group (); - if (rflg) { if (remove_tree (user_home) || rmdir (user_home)) { diff --git a/src/usermod.c b/src/usermod.c index 9e153d30..33af3f20 100644 --- a/src/usermod.c +++ b/src/usermod.c @@ -29,7 +29,7 @@ #include -#ident "$Id: usermod.c,v 1.64 2005/12/05 18:19:47 kloczek Exp $" +#ident "$Id: usermod.c,v 1.65 2006/01/18 19:55:15 kloczek Exp $" #include #include @@ -87,19 +87,21 @@ static uid_t user_newid; static gid_t user_gid; static gid_t user_newgid; static char *user_comment; -static char *user_newcomment; /* Audit */ static char *user_home; static char *user_newhome; static char *user_shell; -static char *user_newshell; /* Audit */ - static long user_expire; -static long user_newexpire; /* Audit */ static long user_inactive; -static long user_newinactive; /* Audit */ static long sys_ngroups; static char **user_groups; /* NULL-terminated list */ +#ifdef WITH_AUDIT +static char *user_newcomment; /* Audit */ +static char *user_newshell; /* Audit */ +static long user_newexpire; /* Audit */ +static long user_newinactive; /* Audit */ +#endif + static char *Prog; static int @@ -840,7 +842,6 @@ static void process_flags (int argc, char **argv) const struct spwd *spwd = NULL; int anyflag = 0; - int arg; if (argc == 1 || argv[argc - 1][0] == '-') usage (); diff --git a/src/vipw.c b/src/vipw.c index c316fe1f..7ae620f3 100644 --- a/src/vipw.c +++ b/src/vipw.c @@ -22,7 +22,7 @@ #include -#ident "$Id: vipw.c,v 1.20 2005/12/13 14:01:08 kloczek Exp $" +#ident "$Id: vipw.c,v 1.21 2006/01/18 19:55:15 kloczek Exp $" #include #include @@ -235,7 +235,6 @@ vipwedit (const char *file, int (*file_lock) (void), int (*file_unlock) (void)) int main (int argc, char **argv) { - int flag; int editshadow = 0; char *a; int do_vipw;